Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 7 Oct 2018 21:29:01 +0000 (UTC)
From:      Adriaan de Groot <adridg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r481494 - in head/net/qt4-network: . files
Message-ID:  <201810072129.w97LT18p042587@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: adridg
Date: Sun Oct  7 21:29:01 2018
New Revision: 481494
URL: https://svnweb.freebsd.org/changeset/ports/481494

Log:
  Revert 481493, net/qt4-network update to OpenSSL 1.1.1
  
     "Something's wrong. Perhaps you forgot to build and run ports that
      depend on the one you just patched."
  
  PR:		214691
  Reported by:	antoine

Deleted:
  head/net/qt4-network/files/patch-src_network_ssl_qsslcertificate.cpp
  head/net/qt4-network/files/patch-src_network_ssl_qsslkey.cpp
  head/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
Modified:
  head/net/qt4-network/Makefile
  head/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp

Modified: head/net/qt4-network/Makefile
==============================================================================
--- head/net/qt4-network/Makefile	Sun Oct  7 20:39:11 2018	(r481493)
+++ head/net/qt4-network/Makefile	Sun Oct  7 21:29:01 2018	(r481494)
@@ -3,7 +3,7 @@
 
 PORTNAME=	network
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net ipv6
 PKGNAMEPREFIX=	qt4-
 
@@ -12,6 +12,9 @@ COMMENT=	Qt network module
 
 LICENSE=	GPLv3 LGPL21 LGPL3 GFDL
 LICENSE_COMB=	dual
+
+BROKEN_SSL=	openssl-devel
+BROKEN_SSL_REASON_openssl-devel=	error: member access into incomplete type 'RSA' (aka 'rsa_st')
 
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 

Modified: head/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp
==============================================================================
--- head/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp	Sun Oct  7 20:39:11 2018	(r481493)
+++ head/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp	Sun Oct  7 21:29:01 2018	(r481494)
@@ -1,31 +1,8 @@
 * Make availability of SSLv3 in Qt4 same as in Qt5, i.e. not part of SecureProtocols
 *
- 
 --- src/network/ssl/qsslsocket_openssl.cpp.orig	2015-05-07 14:14:44 UTC
 +++ src/network/ssl/qsslsocket_openssl.cpp
-@@ -222,9 +222,12 @@ QSslCipher QSslSocketBackendPrivate::QSs
-             ciph.d->encryptionMethod = descriptionList.at(4).mid(4);
-         ciph.d->exportable = (descriptionList.size() > 6 && descriptionList.at(6) == QLatin1String("export"));
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-         ciph.d->bits = cipher->strength_bits;
-         ciph.d->supportedBits = cipher->alg_bits;
--
-+#else
-+        ciph.d->bits = q_SSL_CIPHER_get_bits(cipher, &ciph.d->supportedBits);
-+#endif
-     }
-     return ciph;
- }
-@@ -260,16 +263,20 @@ bool QSslSocketBackendPrivate::initSslCo
- init_context:
-     switch (configuration.protocol) {
-     case QSsl::SslV2:
--#ifndef OPENSSL_NO_SSL2
-+#if OPENSSL_VERSION_NUMBER <= 0x1010000L && !defined(OPENSSL_NO_SSL2)
-         ctx = q_SSL_CTX_new(client ? q_SSLv2_client_method() : q_SSLv2_server_method());
- #else
-         ctx = 0; // SSL 2 not supported by the system, but chosen deliberately -> error
+@@ -267,9 +267,13 @@ init_context:
  #endif
          break;
      case QSsl::SslV3:
@@ -40,7 +17,7 @@
      case QSsl::TlsV1SslV3: // SslV2 will be disabled below
      case QSsl::AnyProtocol:
      default:
-@@ -297,8 +304,10 @@ init_context:
+@@ -297,8 +301,10 @@ init_context:
  
      // Enable bug workarounds.
      long options;
@@ -51,32 +28,4 @@
 +        options = SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3;
      else
          options = SSL_OP_ALL;
- 
-@@ -363,7 +372,7 @@ init_context:
-         //
-         // See also: QSslContext::fromConfiguration()
-         if (caCertificate.expiryDate() >= QDateTime::currentDateTime()) {
--            q_X509_STORE_add_cert(ctx->cert_store, (X509 *)caCertificate.handle());
-+            q_X509_STORE_add_cert(q_SSL_CTX_get_cert_store(ctx), (X509 *)caCertificate.handle());
-         }
-     }
- 
-@@ -659,13 +668,11 @@ void QSslSocketPrivate::resetDefaultCiph
-     STACK_OF(SSL_CIPHER) *supportedCiphers = q_SSL_get_ciphers(mySsl);
-     for (int i = 0; i < q_sk_SSL_CIPHER_num(supportedCiphers); ++i) {
-         if (SSL_CIPHER *cipher = q_sk_SSL_CIPHER_value(supportedCiphers, i)) {
--            if (cipher->valid) {
--                QSslCipher ciph = QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(cipher);
--                if (!ciph.isNull()) {
--                    if (!ciph.name().toLower().startsWith(QLatin1String("adh")))
--                        ciphers << ciph;
--                }
--            }
-+	    QSslCipher ciph = QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(cipher);
-+	    if (!ciph.isNull()) {
-+               if (!ciph.name().toLower().startsWith(QLatin1String("adh")))
-+		    ciphers << ciph;
-+	    }
-         }
-     }

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810072129.w97LT18p042587>