svn commit: r483554 - in head/net/qt4-network: . files
Antoine Brodin
antoine at FreeBSD.org
Wed Oct 31 06:54:15 UTC 2018
Author: antoine
Date: Wed Oct 31 06:54:14 2018
New Revision: 483554
URL: https://svnweb.freebsd.org/changeset/ports/483554
Log:
And revert r483545, it breaks linkage of qt4-network consumers
Deleted:
head/net/qt4-network/files/patch-src_network_ssl_qsslcertificate.cpp
head/net/qt4-network/files/patch-src_network_ssl_qsslkey.cpp
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 Wed Oct 31 06:31:34 2018 (r483553)
+++ head/net/qt4-network/Makefile Wed Oct 31 06:54:14 2018 (r483554)
@@ -3,7 +3,7 @@
PORTNAME= network
DISTVERSION= ${QT4_VERSION}
-PORTREVISION= 6
+PORTREVISION= 7
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 Wed Oct 31 06:31:34 2018 (r483553)
+++ head/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp Wed Oct 31 06:54:14 2018 (r483554)
@@ -2,17 +2,7 @@
*
--- src/network/ssl/qsslsocket_openssl.cpp.orig 2015-05-07 14:14:44 UTC
+++ src/network/ssl/qsslsocket_openssl.cpp
-@@ -222,8 +222,7 @@ QSslCipher QSslSocketBackendPrivate::QSslCipher_from_S
- ciph.d->encryptionMethod = descriptionList.at(4).mid(4);
- ciph.d->exportable = (descriptionList.size() > 6 && descriptionList.at(6) == QLatin1String("export"));
-
-- ciph.d->bits = cipher->strength_bits;
-- ciph.d->supportedBits = cipher->alg_bits;
-+ ciph.d->bits = SSL_CIPHER_get_bits(cipher, &ciph.d->supportedBits);
-
- }
- return ciph;
-@@ -267,9 +266,13 @@ init_context:
+@@ -267,9 +267,13 @@ init_context:
#endif
break;
case QSsl::SslV3:
@@ -27,7 +17,7 @@
case QSsl::TlsV1SslV3: // SslV2 will be disabled below
case QSsl::AnyProtocol:
default:
-@@ -297,8 +300,10 @@ init_context:
+@@ -297,8 +301,10 @@ init_context:
// Enable bug workarounds.
long options;
@@ -38,40 +28,4 @@
+ options = SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3;
else
options = SSL_OP_ALL;
-
-@@ -325,7 +330,7 @@ init_context:
- options |= SSL_OP_NO_COMPRESSION;
- #endif
-
-- q_SSL_CTX_set_options(ctx, options);
-+ SSL_CTX_set_options(ctx, options);
-
- // Initialize ciphers
- QByteArray cipherString;
-@@ -363,7 +368,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(SSL_CTX_get_cert_store(ctx), (X509 *)caCertificate.handle());
- }
- }
-
-@@ -659,13 +664,17 @@ void QSslSocketPrivate::resetDefaultCiphers()
- 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 OPENSSL_VERSION_NUMBER < 0x10100005L
- if (cipher->valid) {
-+#endif
- QSslCipher ciph = QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(cipher);
- if (!ciph.isNull()) {
- if (!ciph.name().toLower().startsWith(QLatin1String("adh")))
- ciphers << ciph;
- }
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
- }
-+#endif
- }
- }
More information about the svn-ports-head
mailing list