1 |
commit: 423d689e2c7c85b606582909e5acf6d139341702 |
2 |
Author: Stefan Strogin <steils <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 28 19:17:13 2020 +0000 |
4 |
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 28 19:18:11 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=423d689e |
7 |
|
8 |
dev-qt/qtnetwork: drop old 5.14.2 |
9 |
|
10 |
Package-Manager: Portage-3.0.10, Repoman-3.0.2 |
11 |
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> |
12 |
|
13 |
dev-qt/qtnetwork/Manifest | 1 - |
14 |
.../files/qtnetwork-5.12.1-libressl.patch | 93 ----------- |
15 |
.../files/qtnetwork-5.12.4-libressl.patch | 14 -- |
16 |
.../files/qtnetwork-5.14.2-CVE-2020-13962.patch | 172 --------------------- |
17 |
dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild | 71 --------- |
18 |
5 files changed, 351 deletions(-) |
19 |
|
20 |
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest |
21 |
index f458c94..7dbec38 100644 |
22 |
--- a/dev-qt/qtnetwork/Manifest |
23 |
+++ b/dev-qt/qtnetwork/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9 |
26 |
DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a |
27 |
|
28 |
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.12.1-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.12.1-libressl.patch |
29 |
deleted file mode 100644 |
30 |
index bd86269..0000000 |
31 |
--- a/dev-qt/qtnetwork/files/qtnetwork-5.12.1-libressl.patch |
32 |
+++ /dev/null |
33 |
@@ -1,93 +0,0 @@ |
34 |
-diff --git a/src/network/configure.json b/src/network/configure.json |
35 |
-index f3e18662aa..8990763756 100644 |
36 |
---- a/src/network/configure.json |
37 |
-+++ b/src/network/configure.json |
38 |
-@@ -165,7 +165,7 @@ |
39 |
- "test": { |
40 |
- "include": "openssl/opensslv.h", |
41 |
- "tail": [ |
42 |
-- "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L", |
43 |
-+ "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)", |
44 |
- "# error OpenSSL >= 1.1 is required", |
45 |
- "#endif" |
46 |
- ] |
47 |
-diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp |
48 |
-index 35cca9f01a..03afdc5945 100644 |
49 |
---- a/src/network/ssl/qsslcontext_openssl.cpp |
50 |
-+++ b/src/network/ssl/qsslcontext_openssl.cpp |
51 |
-@@ -249,7 +249,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) |
52 |
- if (sslContext->sslConfiguration.backendConfiguration().isEmpty()) |
53 |
- return; |
54 |
- |
55 |
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L |
56 |
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) |
57 |
- if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) { |
58 |
- QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free); |
59 |
- if (cctx) { |
60 |
-diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp |
61 |
-index 299df6b685..670314d7e5 100644 |
62 |
---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp |
63 |
-+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp |
64 |
-@@ -216,8 +216,13 @@ DEFINEFUNC3(void *, ASN1_dup, i2d_of_void *a, a, d2i_of_void *b, b, char *c, c, |
65 |
- #endif |
66 |
- DEFINEFUNC2(BIO *, BIO_new_file, const char *filename, filename, const char *mode, mode, return nullptr, return) |
67 |
- DEFINEFUNC(void, ERR_clear_error, DUMMYARG, DUMMYARG, return, DUMMYARG) |
68 |
-+#ifdef LIBRESSL_VERSION_NUMBER |
69 |
-+DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return nullptr, return) |
70 |
-+DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return) |
71 |
-+#else |
72 |
- DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return nullptr, return) |
73 |
- DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return) |
74 |
-+#endif |
75 |
- DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return) |
76 |
- DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG) |
77 |
- DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG) |
78 |
-@@ -443,7 +448,7 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return - |
79 |
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) |
80 |
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) |
81 |
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) |
82 |
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L |
83 |
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) |
84 |
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return); |
85 |
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return); |
86 |
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return); |
87 |
-@@ -1246,7 +1251,7 @@ bool q_resolveOpenSslSymbols() |
88 |
- RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey) |
89 |
- RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) |
90 |
- RESOLVEFUNC(SSL_CTX_get_cert_store); |
91 |
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L |
92 |
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) |
93 |
- RESOLVEFUNC(SSL_CONF_CTX_new); |
94 |
- RESOLVEFUNC(SSL_CONF_CTX_free); |
95 |
- RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx); |
96 |
-diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h |
97 |
-index bfdfbf0efc..ad2bd4056b 100644 |
98 |
---- a/src/network/ssl/qsslsocket_openssl_symbols_p.h |
99 |
-+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h |
100 |
-@@ -359,7 +359,7 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b); |
101 |
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b); |
102 |
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c); |
103 |
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a); |
104 |
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L |
105 |
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) |
106 |
- SSL_CONF_CTX *q_SSL_CONF_CTX_new(); |
107 |
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a); |
108 |
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b); |
109 |
-diff --git a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h |
110 |
-index b7bac5d2a2..9a1a89b0e4 100644 |
111 |
---- a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h |
112 |
-+++ b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h |
113 |
-@@ -78,8 +78,13 @@ |
114 |
- unsigned char * q_ASN1_STRING_data(ASN1_STRING *a); |
115 |
- BIO *q_BIO_new_file(const char *filename, const char *mode); |
116 |
- void q_ERR_clear_error(); |
117 |
-+#ifdef LIBRESSL_VERSION_NUMBER |
118 |
-+Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a); |
119 |
-+Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem(); |
120 |
-+#else |
121 |
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(BIO_METHOD *a); |
122 |
- Q_AUTOTEST_EXPORT BIO_METHOD *q_BIO_s_mem(); |
123 |
-+#endif |
124 |
- int q_CRYPTO_num_locks(); |
125 |
- void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int)); |
126 |
- void q_CRYPTO_set_id_callback(unsigned long (*a)()); |
127 |
|
128 |
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.12.4-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.12.4-libressl.patch |
129 |
deleted file mode 100644 |
130 |
index b200efa..0000000 |
131 |
--- a/dev-qt/qtnetwork/files/qtnetwork-5.12.4-libressl.patch |
132 |
+++ /dev/null |
133 |
@@ -1,14 +0,0 @@ |
134 |
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp |
135 |
-index c8bc6e06..76324ea5 100644 |
136 |
---- a/src/network/ssl/qsslsocket_openssl.cpp |
137 |
-+++ b/src/network/ssl/qsslsocket_openssl.cpp |
138 |
-@@ -460,7 +460,7 @@ bool QSslSocketBackendPrivate::initSslContext() |
139 |
- q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback); |
140 |
- } |
141 |
- #endif |
142 |
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L |
143 |
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER) |
144 |
- // Set the client callback for TLSv1.3 PSK |
145 |
- if (mode == QSslSocket::SslClientMode |
146 |
- && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) { |
147 |
- |
148 |
|
149 |
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 |
150 |
deleted file mode 100644 |
151 |
index 9bbdda6..0000000 |
152 |
--- a/dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch |
153 |
+++ /dev/null |
154 |
@@ -1,172 +0,0 @@ |
155 |
-From 8ddffc6ba4f38bb8dbeb0cf61b6b10ee73505bbb Mon Sep 17 00:00:00 2001 |
156 |
-From: Timur Pocheptsov <timur.pocheptsov@××.io> |
157 |
-Date: Mon, 13 Apr 2020 20:31:34 +0200 |
158 |
-Subject: [PATCH] OpenSSL: handle SSL_shutdown's errors properly |
159 |
-MIME-Version: 1.0 |
160 |
-Content-Type: text/plain; charset=utf8 |
161 |
-Content-Transfer-Encoding: 8bit |
162 |
- |
163 |
-Do not call SSL_shutdown on a session that is in handshake state (SSL_in_init(s) |
164 |
-returns 1). Also, do not call SSL_shutdown if a session encountered a fatal |
165 |
-error (SSL_ERROR_SYSCALL or SSL_ERROR_SSL was found before). If SSL_shutdown |
166 |
-was unsuccessful (returned code != 1), we have to clear the error(s) it queued. |
167 |
-Unfortunately, SSL_in_init was a macro in OpenSSL 1.0.x. We have to |
168 |
-resolve SSL_state to implement SSL_in_init. |
169 |
- |
170 |
-Fixes: QTBUG-83450 |
171 |
-Change-Id: I6326119f4e79605429263045ac20605c30dccca3 |
172 |
-Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@××.io> |
173 |
-(cherry picked from commit 8907635da59c2ae0e8db01f27b24a841b830e655) |
174 |
---- |
175 |
- src/network/ssl/qsslsocket.cpp | 2 +- |
176 |
- src/network/ssl/qsslsocket_openssl.cpp | 23 ++++++++++++++++------ |
177 |
- src/network/ssl/qsslsocket_openssl11_symbols_p.h | 7 +++++++ |
178 |
- src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++++++ |
179 |
- .../ssl/qsslsocket_opensslpre11_symbols_p.h | 2 ++ |
180 |
- src/network/ssl/qsslsocket_p.h | 1 + |
181 |
- 6 files changed, 36 insertions(+), 7 deletions(-) |
182 |
- |
183 |
-diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp |
184 |
-index 4e9e9472631..5c9e589ec39 100644 |
185 |
---- a/src/network/ssl/qsslsocket.cpp |
186 |
-+++ b/src/network/ssl/qsslsocket.cpp |
187 |
-@@ -2166,7 +2166,7 @@ void QSslSocketPrivate::init() |
188 |
- pendingClose = false; |
189 |
- flushTriggered = false; |
190 |
- ocspResponses.clear(); |
191 |
-- |
192 |
-+ systemOrSslErrorDetected = false; |
193 |
- // we don't want to clear the ignoreErrorsList, so |
194 |
- // that it is possible setting it before connecting |
195 |
- // ignoreErrorsList.clear(); |
196 |
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp |
197 |
-index 51510f1c60b..855865209bc 100644 |
198 |
---- a/src/network/ssl/qsslsocket_openssl.cpp |
199 |
-+++ b/src/network/ssl/qsslsocket_openssl.cpp |
200 |
-@@ -648,10 +648,16 @@ bool QSslSocketBackendPrivate::initSslContext() |
201 |
- void QSslSocketBackendPrivate::destroySslContext() |
202 |
- { |
203 |
- if (ssl) { |
204 |
-- // We do not send a shutdown alert here. Just mark the session as |
205 |
-- // resumable for qhttpnetworkconnection's "optimization", otherwise |
206 |
-- // OpenSSL won't start a session resumption. |
207 |
-- q_SSL_shutdown(ssl); |
208 |
-+ if (!q_SSL_in_init(ssl) && !systemOrSslErrorDetected) { |
209 |
-+ // We do not send a shutdown alert here. Just mark the session as |
210 |
-+ // resumable for qhttpnetworkconnection's "optimization", otherwise |
211 |
-+ // OpenSSL won't start a session resumption. |
212 |
-+ if (q_SSL_shutdown(ssl) != 1) { |
213 |
-+ // Some error may be queued, clear it. |
214 |
-+ const auto errors = getErrorsFromOpenSsl(); |
215 |
-+ Q_UNUSED(errors); |
216 |
-+ } |
217 |
-+ } |
218 |
- q_SSL_free(ssl); |
219 |
- ssl = nullptr; |
220 |
- } |
221 |
-@@ -1084,6 +1090,7 @@ void QSslSocketBackendPrivate::transmit() |
222 |
- case SSL_ERROR_SSL: // error in the SSL library |
223 |
- // we do not know exactly what the error is, nor whether we can recover from it, |
224 |
- // so just return to prevent an endless loop in the outer "while" statement |
225 |
-+ systemOrSslErrorDetected = true; |
226 |
- { |
227 |
- const ScopedBool bg(inSetAndEmitError, true); |
228 |
- setErrorAndEmit(QAbstractSocket::SslInternalError, |
229 |
-@@ -1681,8 +1688,12 @@ bool QSslSocketBackendPrivate::checkOcspStatus() |
230 |
- void QSslSocketBackendPrivate::disconnectFromHost() |
231 |
- { |
232 |
- if (ssl) { |
233 |
-- if (!shutdown) { |
234 |
-- q_SSL_shutdown(ssl); |
235 |
-+ if (!shutdown && !q_SSL_in_init(ssl) && !systemOrSslErrorDetected) { |
236 |
-+ if (q_SSL_shutdown(ssl) != 1) { |
237 |
-+ // Some error may be queued, clear it. |
238 |
-+ const auto errors = getErrorsFromOpenSsl(); |
239 |
-+ Q_UNUSED(errors); |
240 |
-+ } |
241 |
- shutdown = true; |
242 |
- transmit(); |
243 |
- } |
244 |
-diff --git a/src/network/ssl/qsslsocket_openssl11_symbols_p.h b/src/network/ssl/qsslsocket_openssl11_symbols_p.h |
245 |
-index 0fe0899d4fd..b7193ad1807 100644 |
246 |
---- a/src/network/ssl/qsslsocket_openssl11_symbols_p.h |
247 |
-+++ b/src/network/ssl/qsslsocket_openssl11_symbols_p.h |
248 |
-@@ -192,4 +192,11 @@ typedef int (*q_SSL_psk_use_session_cb_func_t)(SSL *, const EVP_MD *, const unsi |
249 |
- } |
250 |
- void q_SSL_set_psk_use_session_callback(SSL *s, q_SSL_psk_use_session_cb_func_t); |
251 |
- |
252 |
-+#if OPENSSL_VERSION_NUMBER < 0x10101000L |
253 |
-+// What a mess! |
254 |
-+int q_SSL_in_init(SSL *s); |
255 |
-+#else |
256 |
-+int q_SSL_in_init(const SSL *s); |
257 |
-+#endif // 1.1.1 or 1.1.0 |
258 |
-+ |
259 |
- #endif |
260 |
-diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp |
261 |
-index 85029a6ff3f..d1bd84cf25f 100644 |
262 |
---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp |
263 |
-+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp |
264 |
-@@ -160,6 +160,11 @@ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG) |
265 |
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return) |
266 |
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return) |
267 |
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return) |
268 |
-+#if OPENSSL_VERSION_NUMBER < 0x10101000L |
269 |
-+DEFINEFUNC(int, SSL_in_init, SSL *a, a, return 0, return) |
270 |
-+#else |
271 |
-+DEFINEFUNC(int, SSL_in_init, const SSL *a, a, return 0, return) |
272 |
-+#endif |
273 |
- #ifdef TLS1_3_VERSION |
274 |
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return) |
275 |
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG) |
276 |
-@@ -242,6 +247,7 @@ DEFINEFUNC2(void, BIO_set_shutdown, BIO *a, a, int shut, shut, return, DUMMYARG) |
277 |
- // Functions below are either deprecated or removed in OpenSSL >= 1.1: |
278 |
- |
279 |
- DEFINEFUNC(unsigned char *, ASN1_STRING_data, ASN1_STRING *a, a, return nullptr, return) |
280 |
-+DEFINEFUNC(int, SSL_state, const SSL *a, a, return 0, return) |
281 |
- |
282 |
- #ifdef SSLEAY_MACROS |
283 |
- DEFINEFUNC3(void *, ASN1_dup, i2d_of_void *a, a, d2i_of_void *b, b, char *c, c, return nullptr, return) |
284 |
-@@ -971,6 +977,7 @@ bool q_resolveOpenSslSymbols() |
285 |
- #if QT_CONFIG(opensslv11) |
286 |
- |
287 |
- RESOLVEFUNC(OPENSSL_init_ssl) |
288 |
-+ RESOLVEFUNC(SSL_in_init) |
289 |
- RESOLVEFUNC(OPENSSL_init_crypto) |
290 |
- RESOLVEFUNC(ASN1_STRING_get0_data) |
291 |
- RESOLVEFUNC(EVP_CIPHER_CTX_reset) |
292 |
-@@ -1066,6 +1073,7 @@ bool q_resolveOpenSslSymbols() |
293 |
- #else // !opensslv11 |
294 |
- |
295 |
- RESOLVEFUNC(ASN1_STRING_data) |
296 |
-+ RESOLVEFUNC(SSL_state) |
297 |
- |
298 |
- #ifdef SSLEAY_MACROS |
299 |
- RESOLVEFUNC(ASN1_dup) |
300 |
-diff --git a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h |
301 |
-index f5626d5d164..92841017793 100644 |
302 |
---- a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h |
303 |
-+++ b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h |
304 |
-@@ -121,6 +121,8 @@ SSL_CTX *q_SSL_CTX_new(const SSL_METHOD *a); |
305 |
- |
306 |
- int q_SSL_library_init(); |
307 |
- void q_SSL_load_error_strings(); |
308 |
-+int q_SSL_state(const SSL *a); |
309 |
-+#define q_SSL_in_init(a) (q_SSL_state(a) & SSL_ST_INIT) |
310 |
- |
311 |
- #if OPENSSL_VERSION_NUMBER >= 0x10001000L |
312 |
- 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); |
313 |
-diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h |
314 |
-index daa9be23f4a..350b1f1fc18 100644 |
315 |
---- a/src/network/ssl/qsslsocket_p.h |
316 |
-+++ b/src/network/ssl/qsslsocket_p.h |
317 |
-@@ -208,6 +208,7 @@ protected: |
318 |
- bool verifyErrorsHaveBeenIgnored(); |
319 |
- bool paused; |
320 |
- bool flushTriggered; |
321 |
-+ bool systemOrSslErrorDetected = false; |
322 |
- QVector<QOcspResponse> ocspResponses; |
323 |
- }; |
324 |
- |
325 |
--- |
326 |
-2.16.3 |
327 |
|
328 |
diff --git a/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild |
329 |
deleted file mode 100644 |
330 |
index fec0386..0000000 |
331 |
--- a/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild |
332 |
+++ /dev/null |
333 |
@@ -1,71 +0,0 @@ |
334 |
-# Copyright 1999-2020 Gentoo Authors |
335 |
-# Distributed under the terms of the GNU General Public License v2 |
336 |
- |
337 |
-EAPI=7 |
338 |
-QT5_MODULE="qtbase" |
339 |
-inherit qt5-build |
340 |
- |
341 |
-DESCRIPTION="Network abstraction library for the Qt5 framework" |
342 |
- |
343 |
-if [[ ${QT5_BUILD_TYPE} == release ]]; then |
344 |
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" |
345 |
-fi |
346 |
- |
347 |
-IUSE="bindist connman gssapi libproxy libressl networkmanager sctp +ssl" |
348 |
- |
349 |
-DEPEND=" |
350 |
- ~dev-qt/qtcore-${PV}:5= |
351 |
- sys-libs/zlib:= |
352 |
- connman? ( ~dev-qt/qtdbus-${PV} ) |
353 |
- gssapi? ( virtual/krb5 ) |
354 |
- libproxy? ( net-libs/libproxy ) |
355 |
- networkmanager? ( ~dev-qt/qtdbus-${PV} ) |
356 |
- sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) |
357 |
- ssl? ( |
358 |
- !libressl? ( dev-libs/openssl:0=[bindist=] ) |
359 |
- libressl? ( dev-libs/libressl:0= ) |
360 |
- ) |
361 |
-" |
362 |
-RDEPEND="${DEPEND} |
363 |
- connman? ( net-misc/connman ) |
364 |
- networkmanager? ( net-misc/networkmanager ) |
365 |
-" |
366 |
- |
367 |
-PATCHES=( |
368 |
- "${FILESDIR}/${P}-CVE-2020-13962.patch" # bug 727604, QTBUG-83450 |
369 |
- "${FILESDIR}"/${PN}-5.12.1-libressl.patch |
370 |
- "${FILESDIR}"/${PN}-5.12.4-libressl.patch |
371 |
-) |
372 |
- |
373 |
-QT5_TARGET_SUBDIRS=( |
374 |
- src/network |
375 |
- src/plugins/bearer/generic |
376 |
-) |
377 |
- |
378 |
-QT5_GENTOO_CONFIG=( |
379 |
- libproxy:libproxy: |
380 |
- ssl::SSL |
381 |
- ssl::OPENSSL |
382 |
- ssl:openssl-linked:LINKED_OPENSSL |
383 |
-) |
384 |
- |
385 |
-QT5_GENTOO_PRIVATE_CONFIG=( |
386 |
- :network |
387 |
-) |
388 |
- |
389 |
-pkg_setup() { |
390 |
- use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) |
391 |
- use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) |
392 |
-} |
393 |
- |
394 |
-src_configure() { |
395 |
- local myconf=( |
396 |
- $(usex connman -dbus-linked '') |
397 |
- $(usex gssapi -feature-gssapi -no-feature-gssapi) |
398 |
- $(qt_use libproxy) |
399 |
- $(usex networkmanager -dbus-linked '') |
400 |
- $(qt_use sctp) |
401 |
- $(usex ssl -openssl-linked '') |
402 |
- ) |
403 |
- qt5-build_src_configure |
404 |
-} |