Attachment #170651 for bug #209317

Lines 52-57 Link Here

(-)net/qt4-network/Makefile (-1 / +2 lines)
52	-E -e 's\|(.location=).uic\|\1${PREFIX}/${QT_BINDIR_REL}/${UIC:T}\|g' \	52	-E -e 's\|(.location=).uic\|\1${PREFIX}/${QT_BINDIR_REL}/${UIC:T}\|g' \
53	${WRKSRC}/lib/pkgconfig/QtNetwork.pc	53	${WRKSRC}/lib/pkgconfig/QtNetwork.pc
54	${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \	54	${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \
55	${WRKSRC}/src/network/ssl/qsslsocket_openssl.cpp	55	${WRKSRC}/src/network/ssl/qsslsocket_openssl.cpp \
		56	${WRKSRC}/src/network/ssl/qsslsocket_openssl_symbols.cpp
56		57
57	.include <bsd.port.mk>	58	.include <bsd.port.mk>




--- 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:
 #endif
         break;
     case QSsl::SslV3:
-        ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());
+        ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error
         break;
-    case QSsl::SecureProtocols: // SslV2 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;
     }




--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2015-05-07 14:14:44 UTC
+++ src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -511,9 +511,9 @@ static QPair<QLibrary*, QLibrary*> loadO
     libcrypto->setLoadHints(libcrypto->loadHints() | QLibrary::ImprovedSearchHeuristics);
 #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->setLoadHints(QLibrary::ImprovedSearchHeuristics);
-    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
+    libcrypto->setFileNameAndVersion(QLatin1String("/usr/local/lib/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
@@ -525,8 +525,8 @@ static QPair<QLibrary*, QLibrary*> loadO
 #endif
 
     // 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);
     if (libcrypto->load() && libssl->load()) {
         // libssl.so.0 and libcrypto.so.0 found
         return pair;

Return to bug 209317

Line 0 Link Here

(-)net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp (+21 lines)
	1	--- src/network/ssl/qsslsocket_openssl.cpp.orig 2015-05-07 14:14:44 UTC
	2	+++ src/network/ssl/qsslsocket_openssl.cpp
	3	@@ -267,15 +267,14 @@ init_context:
	4	#endif
	5	break;
	6	case QSsl::SslV3:
	7	- ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());
	8	+ ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error
	9	break;
	10	- case QSsl::SecureProtocols: // SslV2 will be disabled below
	11	- case QSsl::TlsV1SslV3: // SslV2 will be disabled below
	12	case QSsl::AnyProtocol:
	13	- default:
	14	ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method());
	15	break;
	16	case QSsl::TlsV1:
	17	+ case QSsl::SecureProtocols:
	18	+ default:
	19	ctx = q_SSL_CTX_new(client ? q_TLSv1_client_method() : q_TLSv1_server_method());
	20	break;
	21	}

Line 0 Link Here

(-)net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp (+25 lines)
	1	--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2015-05-07 14:14:44 UTC
	2	+++ src/network/ssl/qsslsocket_openssl_symbols.cpp
	3	@@ -511,9 +511,9 @@ static QPair<QLibrary, QLibrary> loadO
	4	libcrypto->setLoadHints(libcrypto->loadHints() \| QLibrary::ImprovedSearchHeuristics);
	5	#elif defined(SHLIB_VERSION_NUMBER)
	6	// first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
	7	- libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
	8	+ libssl->setFileNameAndVersion(QLatin1String("/usr/local/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
	9	libssl->setLoadHints(QLibrary::ImprovedSearchHeuristics);
	10	- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
	11	+ libcrypto->setFileNameAndVersion(QLatin1String("/usr/local/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
	12	libcrypto->setLoadHints(libcrypto->loadHints() \| QLibrary::ImprovedSearchHeuristics);
	13	if (libcrypto->load() && libssl->load()) {
	14	// libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
	15	@@ -525,8 +525,8 @@ static QPair<QLibrary, QLibrary> loadO
	16	#endif
	17
	18	// second attempt: find the development files libssl.so and libcrypto.so
	19	- libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
	20	- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
	21	+ libssl->setFileNameAndVersion(QLatin1String("/usr/local/lib/libssl"), -1);
	22	+ libcrypto->setFileNameAndVersion(QLatin1String("/usr/local/lib/libcrypto"), -1);
	23	if (libcrypto->load() && libssl->load()) {
	24	// libssl.so.0 and libcrypto.so.0 found
	25	return pair;