diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-12-02 23:27:38 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-12-02 23:27:38 +0100 |
| commit | 007b79d537cf1f67753f8b86907042567d1908a3 (patch) | |
| tree | 161d32657c41bcafe04e3938ed2a993f2639a692 | |
| parent | dev-qt/qtpositioning: Switch to app-misc/geoclue:2.0 (diff) | |
| download | qt-007b79d5.tar.gz qt-007b79d5.tar.bz2 qt-007b79d5.zip | |
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 <asturm@gentoo.org>
| -rw-r--r-- | dev-qt/qtnetwork/files/qtnetwork-5.12.0_rc-openssl-1.1.0.patch | 35 | ||||
| -rw-r--r-- | dev-qt/qtnetwork/qtnetwork-5.12.0_rc.ebuild | 2 |
2 files changed, 37 insertions, 0 deletions
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 <timur.pocheptsov@qt.io> +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 <marten.nordheim@qt.io> +(cherry picked from commit 36f3eeaf3ec12126956d151a026379ab0385ab72) +Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> +--- + 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) |