diff options
| author |   Zhao Yongming <ming.zym@gmail.com> | 2017-04-11 15:16:08 +0800 |
|---|---|---|
| committer |   Davide Pesavento <pesa@gentoo.org> | 2017-05-14 02:13:39 +0200 |
| commit | 43c10326958cf85bccdb6270b5963cba45052412 (patch) | |
| tree | 4c8bffdf308a24c1b76967da579e6307db2dbf31 /dev-qt/qtcore | |
| parent | profiles: Restore xfce-base/xfwm4 USE mask on ppc. (diff) | |
| download | gentoo-43c10326958cf85bccdb6270b5963cba45052412.tar.gz gentoo-43c10326958cf85bccdb6270b5963cba45052412.tar.bz2 gentoo-43c10326958cf85bccdb6270b5963cba45052412.zip | |
dev-qt/qtcore: fix building against libressl
Patch from libressl overlay.
Closes: https://github.com/gentoo/gentoo/pull/4409
Gentoo-Bug: 584796
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'dev-qt/qtcore')
| -rw-r--r-- | dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch | 52 | ||||
| -rw-r--r-- | dev-qt/qtcore/qtcore-4.8.7-r2.ebuild | 1 |
2 files changed, 53 insertions, 0 deletions
diff --git a/dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch b/dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch new file mode 100644 index 000000000000..b838c7a687b6 --- /dev/null +++ b/dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch @@ -0,0 +1,52 @@ +--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2015-11-25 01:38:42.103898399 -0500 ++++ src/network/ssl/qsslsocket_openssl_symbols.cpp 2015-11-25 01:40:50.146247648 -0500 +@@ -224,13 +224,17 @@ + #ifndef OPENSSL_NO_SSL2 + DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) + #endif ++#ifndef OPENSSL_NO_SSL3 + DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif + DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) + DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) + #ifndef OPENSSL_NO_SSL2 + DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) + #endif ++#ifndef OPENSSL_NO_SSL3 + DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) ++#endif + DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) + DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) + #else +@@ -818,13 +822,17 @@ + #ifndef OPENSSL_NO_SSL2 + RESOLVEFUNC(SSLv2_client_method) + #endif ++#ifndef OPENSSL_NO_SSL3 + RESOLVEFUNC(SSLv3_client_method) ++#endif + RESOLVEFUNC(SSLv23_client_method) + RESOLVEFUNC(TLSv1_client_method) + #ifndef OPENSSL_NO_SSL2 + RESOLVEFUNC(SSLv2_server_method) + #endif ++#ifndef OPENSSL_NO_SSL3 + RESOLVEFUNC(SSLv3_server_method) ++#endif + RESOLVEFUNC(SSLv23_server_method) + RESOLVEFUNC(TLSv1_server_method) + RESOLVEFUNC(X509_NAME_entry_count) +--- src/network/ssl/qsslsocket_openssl.cpp.orig 2015-11-25 01:44:55.235087906 -0500 ++++ src/network/ssl/qsslsocket_openssl.cpp 2015-11-25 01:45:45.194443818 -0500 +@@ -263,7 +263,11 @@ + #endif + break; + case QSsl::SslV3: ++#ifndef OPENSSL_NO_SSL3 + 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 diff --git a/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild index dd67e084f00b..d7f2cb00d273 100644 --- a/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild +++ b/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild @@ -37,6 +37,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968 "${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968 "${FILESDIR}/${PN}-4.8.6-moc-boost-1.60.patch" # bug 556104 + "${FILESDIR}/${PN}-4.8.7-libressl.patch" # bug 584796 ) QT4_TARGET_DIRECTORIES=" |