Attachment 180114 Details for Bug 216781 – fix qt4-network SSL patch

[patch] fix qt4-network SSL patch

qt4patch (text/plain), 4.98 KB, created by Matthew Rezny on 2017-02-18 16:39:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Rezny

Created: 2017-02-18 16:39:05 UTC

Size: 4.98 KB

patch

obsolete

>Index: net/qt4-network/Makefile
>===================================================================
>--- net/qt4-network/Makefile	(revision 434282)
>+++ net/qt4-network/Makefile	(working copy)
>@@ -14,11 +14,11 @@
> 
> RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
> 
>+USES=		ssl
> USE_QT4=	qmake_build moc_build rcc_build corelib
> QT_DIST=	yes
> HAS_CONFIGURE=	yes
> USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
>-USE_OPENSSL=	yes
> 
> ALL_TARGET=	first
> CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
>@@ -54,7 +54,8 @@
> 			-E -e 's|(.*location=).*uic|\1${PREFIX}/${QT_BINDIR_REL}/${UIC:T}|g' \
> 		${WRKSRC}/lib/pkgconfig/QtNetwork.pc
> 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
>-		${WRKSRC}/src/network/ssl/qsslsocket_openssl.cpp \
>+		${WRKSRC}/src/network/ssl/qsslsocket_openssl.cpp
>+	${REINPLACE_CMD} -e 's|%%OPENSSLLIB%%|${OPENSSLLIB}|g' \
> 		${WRKSRC}/src/network/ssl/qsslsocket_openssl_symbols.cpp
> 
> .include <bsd.port.mk>
>Index: net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp
>===================================================================
>--- net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp	(revision 434282)
>+++ net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp	(working copy)
>@@ -1,21 +1,29 @@
> --- src/network/ssl/qsslsocket_openssl.cpp.orig	2015-05-07 14:14:44 UTC
> +++ src/network/ssl/qsslsocket_openssl.cpp
>-@@ -267,15 +267,14 @@ init_context:
>+@@ -267,9 +267,13 @@ init_context:
>  #endif
>          break;
>      case QSsl::SslV3:
>--        ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());
>++#ifndef OPENSSL_NO_SSL3_METHOD
>+         ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());
>++#else
> +        ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error
>++#endif
>          break;
> -    case QSsl::SecureProtocols: // SslV2 will be disabled below
>--    case QSsl::TlsV1SslV3: // SslV2 will be disabled below
>++    case QSsl::SecureProtocols: // SslV2/3 will be disabled below
>+     case QSsl::TlsV1SslV3: // SslV2 will be disabled below
>      case QSsl::AnyProtocol:
>--    default:
>-         ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method());
>-         break;
>-     case QSsl::TlsV1:
>-+    case QSsl::SecureProtocols:
>-+    default:
>-         ctx = q_SSL_CTX_new(client ? q_TLSv1_client_method() : q_TLSv1_server_method());
>-         break;
>-     }
>+     default:
>+@@ -297,8 +301,10 @@ init_context:
>+ 
>+     // Enable bug workarounds.
>+     long options;
>+-    if (configuration.protocol == QSsl::TlsV1SslV3 || configuration.protocol == QSsl::SecureProtocols)
>++    if (configuration.protocol == QSsl::TlsV1SslV3)
>+         options = SSL_OP_ALL|SSL_OP_NO_SSLv2;
>++    else if (configuration.protocol == QSsl::SecureProtocols)
>++        options = SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3;
>+     else
>+         options = SSL_OP_ALL;
>+ 
>Index: net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
>===================================================================
>--- net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp	(revision 434282)
>+++ net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp	(working copy)
>@@ -5,10 +5,10 @@
>  #elif defined(SHLIB_VERSION_NUMBER)
>      // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
> -    libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
>-+    libssl->setFileNameAndVersion(QLatin1String("/usr/local/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
>++    libssl->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
>      libssl->setLoadHints(QLibrary::ImprovedSearchHeuristics);
> -    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
>-+    libcrypto->setFileNameAndVersion(QLatin1String("/usr/local/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
>++    libcrypto->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
>      libcrypto->setLoadHints(libcrypto->loadHints() | QLibrary::ImprovedSearchHeuristics);
>      if (libcrypto->load() && libssl->load()) {
>          // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
>@@ -18,8 +18,8 @@
>      // second attempt: find the development files libssl.so and libcrypto.so
> -    libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
> -    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
>-+    libssl->setFileNameAndVersion(QLatin1String("/usr/local/lib/libssl"), -1);
>-+    libcrypto->setFileNameAndVersion(QLatin1String("/usr/local/lib/libcrypto"), -1);
>++    libssl->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libssl"), -1);
>++    libcrypto->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libcrypto"), -1);
>      if (libcrypto->load() && libssl->load()) {
>          // libssl.so.0 and libcrypto.so.0 found
>          return pair;

Actions: View | Diff

Attachments on bug 216781: 179597 | 180112 | 180114 | 180133