From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 135B1139694 for ; Sun, 14 May 2017 00:14:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D476CE0BF0; Sun, 14 May 2017 00:14:50 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A15F1E0BF0 for ; Sun, 14 May 2017 00:14:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E25C3416AD for ; Sun, 14 May 2017 00:14:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5C9A303 for ; Sun, 14 May 2017 00:14:47 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1494720819.43c10326958cf85bccdb6270b5963cba45052412.pesa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/files/, dev-qt/qtcore/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch dev-qt/qtcore/qtcore-4.8.7-r2.ebuild X-VCS-Directories: dev-qt/qtcore/files/ dev-qt/qtcore/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 43c10326958cf85bccdb6270b5963cba45052412 X-VCS-Branch: master Date: Sun, 14 May 2017 00:14:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 675dac56-2528-4fb4-a8c3-616dfc94ebd0 X-Archives-Hash: 9fa64482e50433e6849904f8f831dc70 commit: 43c10326958cf85bccdb6270b5963cba45052412 Author: Zhao Yongming gmail com> AuthorDate: Tue Apr 11 07:16:08 2017 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun May 14 00:13:39 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43c10326 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 dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch | 52 +++++++++++++++++++++++++ dev-qt/qtcore/qtcore-4.8.7-r2.ebuild | 1 + 2 files changed, 53 insertions(+) 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 00000000000..b838c7a687b --- /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 dd67e084f00..d7f2cb00d27 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="