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 D479D138334 for ; Sun, 2 Dec 2018 22:28:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A81F5E0B43; Sun, 2 Dec 2018 22:28:00 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6407AE0B43 for ; Sun, 2 Dec 2018 22:28:00 +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 F1EC3335C06 for ; Sun, 2 Dec 2018 22:27:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C1AC2A7 for ; Sun, 2 Dec 2018 22:27:55 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1543789658.007b79d537cf1f67753f8b86907042567d1908a3.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtnetwork/files/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtnetwork/files/qtnetwork-5.12.0_rc-openssl-1.1.0.patch dev-qt/qtnetwork/qtnetwork-5.12.0_rc.ebuild X-VCS-Directories: dev-qt/qtnetwork/files/ dev-qt/qtnetwork/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 007b79d537cf1f67753f8b86907042567d1908a3 X-VCS-Branch: master Date: Sun, 2 Dec 2018 22:27:55 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fc87b1b9-ba23-4c61-97ee-36bffd3e1337 X-Archives-Hash: ac7a9bc62b83b92043cbbaca63fe3bce commit: 007b79d537cf1f67753f8b86907042567d1908a3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 2 22:27:38 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 2 22:27:38 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=007b79d5 dev-qt/qtnetwork: Fix build with =OpenSSL-1.1.0 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/qtnetwork-5.12.0_rc-openssl-1.1.0.patch | 35 ++++++++++++++++++++++ dev-qt/qtnetwork/qtnetwork-5.12.0_rc.ebuild | 2 ++ 2 files changed, 37 insertions(+) diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.12.0_rc-openssl-1.1.0.patch b/dev-qt/qtnetwork/files/qtnetwork-5.12.0_rc-openssl-1.1.0.patch new file mode 100644 index 00000000..7012eae7 --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.12.0_rc-openssl-1.1.0.patch @@ -0,0 +1,35 @@ +From 05892bca9b0dc57dc3b4fbc57e2aab3dac1ad830 Mon Sep 17 00:00:00 2001 +From: Timur Pocheptsov +Date: Thu, 22 Nov 2018 18:32:50 +0100 +Subject: [PATCH] Fix build errors in OpenSSL 1.1 backend +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +SSL_CTX_set_ciphers is new in 1.1.1. + +Task-number: QTBUG-71983 +Change-Id: If0ae9f95dcc867c62ed0d3a6a60c22c7f5e1cc9f +Reviewed-by: MÃ¥rten Nordheim +(cherry picked from commit 36f3eeaf3ec12126956d151a026379ab0385ab72) +Reviewed-by: Timur Pocheptsov +--- + src/network/ssl/qsslsocket_openssl_symbols.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp +index 781b3d6640a..fd58e9548e5 100644 +--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp ++++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp +@@ -161,7 +161,9 @@ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG) + DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return) + DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return) + DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return) ++#ifdef TLS1_3_VERSION + DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return) ++#endif + DEFINEFUNC3(size_t, SSL_get_client_random, SSL *a, a, unsigned char *out, out, size_t outlen, outlen, return 0, return) + DEFINEFUNC3(size_t, SSL_SESSION_get_master_key, const SSL_SESSION *ses, ses, unsigned char *out, out, size_t outlen, outlen, return 0, return) + DEFINEFUNC6(int, CRYPTO_get_ex_new_index, int class_index, class_index, long argl, argl, void *argp, argp, CRYPTO_EX_new *new_func, new_func, CRYPTO_EX_dup *dup_func, dup_func, CRYPTO_EX_free *free_func, free_func, return -1, return) +-- +2.16.3 diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.0_rc.ebuild b/dev-qt/qtnetwork/qtnetwork-5.12.0_rc.ebuild index be09aeb3..d59a4de7 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.12.0_rc.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.12.0_rc.ebuild @@ -42,6 +42,8 @@ QT5_GENTOO_PRIVATE_CONFIG=( :network ) +PATCHES=( "${FILESDIR}/${P}-openssl-1.1.0.patch" ) # QTBUG-71983 + pkg_setup() { use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)