summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-10-13 16:26:11 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-10-18 18:15:28 +0200
commit1c0947091db651f4e7d136e22d4887b47d9245cd (patch)
treedd264a79b23c6103b138807ca5b05d76fcd07959 /dev-qt/qtnetwork
parentmedia-sound/alsa-utils: x86 stable (bug #749159) (diff)
downloadgentoo-1c0947091db651f4e7d136e22d4887b47d9245cd.tar.gz
gentoo-1c0947091db651f4e7d136e22d4887b47d9245cd.tar.bz2
gentoo-1c0947091db651f4e7d136e22d4887b47d9245cd.zip
dev-qt: Drop Qt 5.14.2
Bug: https://bugs.gentoo.org/734600 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt/qtnetwork')
-rw-r--r--dev-qt/qtnetwork/Manifest1
-rw-r--r--dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch172
-rw-r--r--dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild66
3 files changed, 0 insertions, 239 deletions
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index d72f3b48819..98e054ddcf5 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,2 +1 @@
-DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch b/dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch
deleted file mode 100644
index 9bbdda61a25..00000000000
--- a/dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From 8ddffc6ba4f38bb8dbeb0cf61b6b10ee73505bbb Mon Sep 17 00:00:00 2001
-From: Timur Pocheptsov <timur.pocheptsov@qt.io>
-Date: Mon, 13 Apr 2020 20:31:34 +0200
-Subject: [PATCH] OpenSSL: handle SSL_shutdown's errors properly
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Do not call SSL_shutdown on a session that is in handshake state (SSL_in_init(s)
-returns 1). Also, do not call SSL_shutdown if a session encountered a fatal
-error (SSL_ERROR_SYSCALL or SSL_ERROR_SSL was found before). If SSL_shutdown
-was unsuccessful (returned code != 1), we have to clear the error(s) it queued.
-Unfortunately, SSL_in_init was a macro in OpenSSL 1.0.x. We have to
-resolve SSL_state to implement SSL_in_init.
-
-Fixes: QTBUG-83450
-Change-Id: I6326119f4e79605429263045ac20605c30dccca3
-Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
-(cherry picked from commit 8907635da59c2ae0e8db01f27b24a841b830e655)
----
- src/network/ssl/qsslsocket.cpp | 2 +-
- src/network/ssl/qsslsocket_openssl.cpp | 23 ++++++++++++++++------
- src/network/ssl/qsslsocket_openssl11_symbols_p.h | 7 +++++++
- src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++++++
- .../ssl/qsslsocket_opensslpre11_symbols_p.h | 2 ++
- src/network/ssl/qsslsocket_p.h | 1 +
- 6 files changed, 36 insertions(+), 7 deletions(-)
-
-diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
-index 4e9e9472631..5c9e589ec39 100644
---- a/src/network/ssl/qsslsocket.cpp
-+++ b/src/network/ssl/qsslsocket.cpp
-@@ -2166,7 +2166,7 @@ void QSslSocketPrivate::init()
- pendingClose = false;
- flushTriggered = false;
- ocspResponses.clear();
--
-+ systemOrSslErrorDetected = false;
- // we don't want to clear the ignoreErrorsList, so
- // that it is possible setting it before connecting
- // ignoreErrorsList.clear();
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
-index 51510f1c60b..855865209bc 100644
---- a/src/network/ssl/qsslsocket_openssl.cpp
-+++ b/src/network/ssl/qsslsocket_openssl.cpp
-@@ -648,10 +648,16 @@ bool QSslSocketBackendPrivate::initSslContext()
- void QSslSocketBackendPrivate::destroySslContext()
- {
- if (ssl) {
-- // We do not send a shutdown alert here. Just mark the session as
-- // resumable for qhttpnetworkconnection's "optimization", otherwise
-- // OpenSSL won't start a session resumption.
-- q_SSL_shutdown(ssl);
-+ if (!q_SSL_in_init(ssl) && !systemOrSslErrorDetected) {
-+ // We do not send a shutdown alert here. Just mark the session as
-+ // resumable for qhttpnetworkconnection's "optimization", otherwise
-+ // OpenSSL won't start a session resumption.
-+ if (q_SSL_shutdown(ssl) != 1) {
-+ // Some error may be queued, clear it.
-+ const auto errors = getErrorsFromOpenSsl();
-+ Q_UNUSED(errors);
-+ }
-+ }
- q_SSL_free(ssl);
- ssl = nullptr;
- }
-@@ -1084,6 +1090,7 @@ void QSslSocketBackendPrivate::transmit()
- case SSL_ERROR_SSL: // error in the SSL library
- // we do not know exactly what the error is, nor whether we can recover from it,
- // so just return to prevent an endless loop in the outer "while" statement
-+ systemOrSslErrorDetected = true;
- {
- const ScopedBool bg(inSetAndEmitError, true);
- setErrorAndEmit(QAbstractSocket::SslInternalError,
-@@ -1681,8 +1688,12 @@ bool QSslSocketBackendPrivate::checkOcspStatus()
- void QSslSocketBackendPrivate::disconnectFromHost()
- {
- if (ssl) {
-- if (!shutdown) {
-- q_SSL_shutdown(ssl);
-+ if (!shutdown && !q_SSL_in_init(ssl) && !systemOrSslErrorDetected) {
-+ if (q_SSL_shutdown(ssl) != 1) {
-+ // Some error may be queued, clear it.
-+ const auto errors = getErrorsFromOpenSsl();
-+ Q_UNUSED(errors);
-+ }
- shutdown = true;
- transmit();
- }
-diff --git a/src/network/ssl/qsslsocket_openssl11_symbols_p.h b/src/network/ssl/qsslsocket_openssl11_symbols_p.h
-index 0fe0899d4fd..b7193ad1807 100644
---- a/src/network/ssl/qsslsocket_openssl11_symbols_p.h
-+++ b/src/network/ssl/qsslsocket_openssl11_symbols_p.h
-@@ -192,4 +192,11 @@ typedef int (*q_SSL_psk_use_session_cb_func_t)(SSL *, const EVP_MD *, const unsi
- }
- void q_SSL_set_psk_use_session_callback(SSL *s, q_SSL_psk_use_session_cb_func_t);
-
-+#if OPENSSL_VERSION_NUMBER < 0x10101000L
-+// What a mess!
-+int q_SSL_in_init(SSL *s);
-+#else
-+int q_SSL_in_init(const SSL *s);
-+#endif // 1.1.1 or 1.1.0
-+
- #endif
-diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index 85029a6ff3f..d1bd84cf25f 100644
---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -160,6 +160,11 @@ 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)
-+#if OPENSSL_VERSION_NUMBER < 0x10101000L
-+DEFINEFUNC(int, SSL_in_init, SSL *a, a, return 0, return)
-+#else
-+DEFINEFUNC(int, SSL_in_init, const SSL *a, a, return 0, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -242,6 +247,7 @@ DEFINEFUNC2(void, BIO_set_shutdown, BIO *a, a, int shut, shut, return, DUMMYARG)
- // Functions below are either deprecated or removed in OpenSSL >= 1.1:
-
- DEFINEFUNC(unsigned char *, ASN1_STRING_data, ASN1_STRING *a, a, return nullptr, return)
-+DEFINEFUNC(int, SSL_state, const SSL *a, a, return 0, return)
-
- #ifdef SSLEAY_MACROS
- DEFINEFUNC3(void *, ASN1_dup, i2d_of_void *a, a, d2i_of_void *b, b, char *c, c, return nullptr, return)
-@@ -971,6 +977,7 @@ bool q_resolveOpenSslSymbols()
- #if QT_CONFIG(opensslv11)
-
- RESOLVEFUNC(OPENSSL_init_ssl)
-+ RESOLVEFUNC(SSL_in_init)
- RESOLVEFUNC(OPENSSL_init_crypto)
- RESOLVEFUNC(ASN1_STRING_get0_data)
- RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-@@ -1066,6 +1073,7 @@ bool q_resolveOpenSslSymbols()
- #else // !opensslv11
-
- RESOLVEFUNC(ASN1_STRING_data)
-+ RESOLVEFUNC(SSL_state)
-
- #ifdef SSLEAY_MACROS
- RESOLVEFUNC(ASN1_dup)
-diff --git a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h
-index f5626d5d164..92841017793 100644
---- a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h
-+++ b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h
-@@ -121,6 +121,8 @@ SSL_CTX *q_SSL_CTX_new(const SSL_METHOD *a);
-
- int q_SSL_library_init();
- void q_SSL_load_error_strings();
-+int q_SSL_state(const SSL *a);
-+#define q_SSL_in_init(a) (q_SSL_state(a) & SSL_ST_INIT)
-
- #if OPENSSL_VERSION_NUMBER >= 0x10001000L
- int q_SSL_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h
-index daa9be23f4a..350b1f1fc18 100644
---- a/src/network/ssl/qsslsocket_p.h
-+++ b/src/network/ssl/qsslsocket_p.h
-@@ -208,6 +208,7 @@ protected:
- bool verifyErrorsHaveBeenIgnored();
- bool paused;
- bool flushTriggered;
-+ bool systemOrSslErrorDetected = false;
- QVector<QOcspResponse> ocspResponses;
- };
-
---
-2.16.3
diff --git a/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild
deleted file mode 100644
index e26d2f3855c..00000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Network abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}:5=
- sys-libs/zlib:=
- connman? ( ~dev-qt/qtdbus-${PV} )
- gssapi? ( virtual/krb5 )
- libproxy? ( net-libs/libproxy )
- networkmanager? ( ~dev-qt/qtdbus-${PV} )
- sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
- ssl? ( dev-libs/openssl:0=[bindist=] )
-"
-RDEPEND="${DEPEND}
- connman? ( net-misc/connman )
- networkmanager? ( net-misc/networkmanager )
-"
-
-QT5_TARGET_SUBDIRS=(
- src/network
- src/plugins/bearer/generic
-)
-
-QT5_GENTOO_CONFIG=(
- libproxy:libproxy:
- ssl::SSL
- ssl::OPENSSL
- ssl:openssl-linked:LINKED_OPENSSL
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
- :network
-)
-
-PATCHES=(
- "${FILESDIR}/${P}-CVE-2020-13962.patch" # bug 727604, QTBUG-83450
-)
-
-pkg_setup() {
- use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
- use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
-}
-
-src_configure() {
- local myconf=(
- $(usex connman -dbus-linked '')
- $(usex gssapi -feature-gssapi -no-feature-gssapi)
- $(qt_use libproxy)
- $(usex networkmanager -dbus-linked '')
- $(qt_use sctp)
- $(usex ssl -openssl-linked '')
- )
- qt5-build_src_configure
-}