Attachment 170031 Details for Bug 209317 – ibase and network fixes

[patch] ibase and network fixes

qt4.patch (text/plain), 4.78 KB, created by groot on 2016-05-06 07:42:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: groot

Created: 2016-05-06 07:42:48 UTC

Size: 4.78 KB

patch

obsolete

>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/databases/qt4-ibase-plugin/Makefile /zbigone/src/area51/trunk/QT/databases/qt4-ibase-plugin/Makefile
>--- /zbigone/src/ports-playground/databases/qt4-ibase-plugin/Makefile	2016-04-25 21:54:27.541141000 +0200
>+++ /zbigone/src/area51/trunk/QT/databases/qt4-ibase-plugin/Makefile	2016-05-01 18:46:49.253950000 +0200
>@@ -5,6 +5,6 @@
> 
> COMMENT=	Qt InterBase/Firebird database plugin
> DB=		ibase
>-USES+=		firebird
>+USES=		firebird
> 
> .include "${.CURDIR:H:H}/devel/qt4/Makefile.sqldrivers"
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/net/qt4-network/Makefile /zbigone/src/area51/trunk/QT/net/qt4-network/Makefile
>--- /zbigone/src/ports-playground/net/qt4-network/Makefile	2016-04-01 20:03:19.776969004 +0200
>+++ /zbigone/src/area51/trunk/QT/net/qt4-network/Makefile	2016-04-20 09:25:11.699872000 +0200
>@@ -52,6 +52,7 @@
> 			-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 \
>+		${WRKSRC}/src/network/ssl/qsslsocket_openssl_symbols.cpp
> 
> .include <bsd.port.mk>
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp /zbigone/src/area51/trunk/QT/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp
>--- /zbigone/src/ports-playground/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp	1970-01-01 01:00:00.000000000 +0100
>+++ /zbigone/src/area51/trunk/QT/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp	2016-02-21 11:07:47.314164524 +0100
>@@ -0,0 +1,21 @@
>+--- 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;
>+     }
>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp /zbigone/src/area51/trunk/QT/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
>--- /zbigone/src/ports-playground/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp	1970-01-01 01:00:00.000000000 +0100
>+++ /zbigone/src/area51/trunk/QT/net/qt4-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp	2016-02-21 11:07:47.314164524 +0100
>@@ -0,0 +1,25 @@
>+--- 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;

Actions: View | Diff

Attachments on bug 209317: 170031 | 170651