1 |
commit: 8b83aca60b827f17b3e56b24f1c6807443fb57a4 |
2 |
Author: orbea <orbea <AT> riseup <DOT> net> |
3 |
AuthorDate: Wed Nov 3 17:09:10 2021 +0000 |
4 |
Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com> |
5 |
CommitDate: Sat Nov 6 18:15:50 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=8b83aca6 |
7 |
|
8 |
dev-qt/qtnetwork: Update keywords + remove old version |
9 |
|
10 |
Signed-off-by: orbea <orbea <AT> riseup.net> |
11 |
Closes: https://github.com/gentoo/libressl/pull/363 |
12 |
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com> |
13 |
|
14 |
dev-qt/qtnetwork/Manifest | 2 - |
15 |
...work-5.15.2-QNetworkAccessManager-memleak.patch | 41 --- |
16 |
.../files/qtnetwork-5.15.2-libressl.patch | 377 --------------------- |
17 |
dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild | 2 +- |
18 |
dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild | 80 ----- |
19 |
5 files changed, 1 insertion(+), 501 deletions(-) |
20 |
|
21 |
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest |
22 |
index c69b3ee..4b89203 100644 |
23 |
--- a/dev-qt/qtnetwork/Manifest |
24 |
+++ b/dev-qt/qtnetwork/Manifest |
25 |
@@ -1,3 +1 @@ |
26 |
DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 |
27 |
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 |
28 |
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 |
29 |
|
30 |
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch |
31 |
deleted file mode 100644 |
32 |
index be2c1f6..0000000 |
33 |
--- a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch |
34 |
+++ /dev/null |
35 |
@@ -1,41 +0,0 @@ |
36 |
-From 0807f16eb407eaf8a5b34b67602d0a97778d945d Mon Sep 17 00:00:00 2001 |
37 |
-From: =?utf8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@××.io> |
38 |
-Date: Fri, 6 Nov 2020 12:51:42 +0100 |
39 |
-Subject: [PATCH] QNAM: Work around QObject finicky orphan cleanup details |
40 |
- |
41 |
-Details described in a comment. |
42 |
- |
43 |
-Task-number: QTBUG-88063 |
44 |
-Change-Id: I763ecfedf518de97615e04a8eaae0fe1fd784f52 |
45 |
-Reviewed-by: Timur Pocheptsov <timur.pocheptsov@××.io> |
46 |
-(cherry picked from commit 1c6d6cbb62c5e93cbcad2d740c3b0ed01095618c) |
47 |
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@××××××××××.org> |
48 |
---- |
49 |
- src/network/access/qnetworkreplyhttpimpl.cpp | 12 +++++++++++- |
50 |
- 1 file changed, 11 insertions(+), 1 deletion(-) |
51 |
- |
52 |
-diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp |
53 |
-index 21916f53f15..727c1a0316d 100644 |
54 |
---- a/src/network/access/qnetworkreplyhttpimpl.cpp |
55 |
-+++ b/src/network/access/qnetworkreplyhttpimpl.cpp |
56 |
-@@ -808,7 +808,17 @@ void QNetworkReplyHttpImplPrivate::postRequest(const QNetworkRequest &newHttpReq |
57 |
- |
58 |
- // For the synchronous HTTP, this is the normal way the delegate gets deleted |
59 |
- // For the asynchronous HTTP this is a safety measure, the delegate deletes itself when HTTP is finished |
60 |
-- QObject::connect(thread, SIGNAL(finished()), delegate, SLOT(deleteLater())); |
61 |
-+ QMetaObject::Connection threadFinishedConnection = |
62 |
-+ QObject::connect(thread, SIGNAL(finished()), delegate, SLOT(deleteLater())); |
63 |
-+ |
64 |
-+ // QTBUG-88063: When 'delegate' is deleted the connection will be added to 'thread''s orphaned |
65 |
-+ // connections list. This orphaned list will be cleaned up next time 'thread' emits a signal, |
66 |
-+ // unfortunately that's the finished signal. It leads to a soft-leak so we do this to disconnect |
67 |
-+ // it on deletion so that it cleans up the orphan immediately. |
68 |
-+ QObject::connect(delegate, &QObject::destroyed, delegate, [threadFinishedConnection]() { |
69 |
-+ if (bool(threadFinishedConnection)) |
70 |
-+ QObject::disconnect(threadFinishedConnection); |
71 |
-+ }); |
72 |
- |
73 |
- // Set the properties it needs |
74 |
- delegate->httpRequest = httpRequest; |
75 |
--- |
76 |
-2.16.3 |
77 |
|
78 |
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch |
79 |
deleted file mode 100644 |
80 |
index f7fe32f..0000000 |
81 |
--- a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch |
82 |
+++ /dev/null |
83 |
@@ -1,377 +0,0 @@ |
84 |
-From 07a00f9c6d87f1fa5360cfb8f086670f3fa5bd3f Mon Sep 17 00:00:00 2001 |
85 |
-From: Stefan Strogin <steils@g.o> |
86 |
-Date: Sat, 28 Nov 2020 06:12:22 +0200 |
87 |
-Subject: [PATCH] QSslSocket: add LibreSSL support |
88 |
- |
89 |
-Upstream-Status: Inappropriate |
90 |
-[Upstream is not willing to accept any patches for LibreSSL support] |
91 |
-Signed-off-by: Stefan Strogin <steils@g.o> |
92 |
---- |
93 |
- src/network/ssl/qsslcertificate_openssl.cpp | 2 +- |
94 |
- src/network/ssl/qsslcontext_openssl.cpp | 19 +++++++- |
95 |
- src/network/ssl/qsslcontext_openssl_p.h | 7 +++ |
96 |
- src/network/ssl/qsslsocket_openssl.cpp | 2 +- |
97 |
- .../ssl/qsslsocket_openssl_symbols.cpp | 31 +++++++++++++ |
98 |
- .../ssl/qsslsocket_openssl_symbols_p.h | 45 +++++++++++++++++++ |
99 |
- 6 files changed, 103 insertions(+), 3 deletions(-) |
100 |
- |
101 |
-diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp |
102 |
-index ca9d61cc..19774432 100644 |
103 |
---- a/src/network/ssl/qsslcertificate_openssl.cpp |
104 |
-+++ b/src/network/ssl/qsslcertificate_openssl.cpp |
105 |
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name) |
106 |
- unsigned char *data = nullptr; |
107 |
- int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e)); |
108 |
- info.insert(name, QString::fromUtf8((char*)data, size)); |
109 |
--#if QT_CONFIG(opensslv11) |
110 |
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER) |
111 |
- q_CRYPTO_free(data, nullptr, 0); |
112 |
- #else |
113 |
- q_CRYPTO_free(data); |
114 |
-diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp |
115 |
-index c9f202f5..d3626cab 100644 |
116 |
---- a/src/network/ssl/qsslcontext_openssl.cpp |
117 |
-+++ b/src/network/ssl/qsslcontext_openssl.cpp |
118 |
-@@ -351,9 +351,11 @@ init_context: |
119 |
- return; |
120 |
- } |
121 |
- |
122 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
123 |
- // A nasty hacked OpenSSL using a level that will make our auto-tests fail: |
124 |
- if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel()) |
125 |
- q_SSL_CTX_set_security_level(sslContext->ctx, 1); |
126 |
-+#endif // LIBRESSL_VERSION_NUMBER |
127 |
- |
128 |
- const long anyVersion = |
129 |
- #if QT_CONFIG(dtls) |
130 |
-@@ -408,16 +410,28 @@ init_context: |
131 |
- maxVersion = DTLS1_VERSION; |
132 |
- break; |
133 |
- case QSsl::DtlsV1_0OrLater: |
134 |
-+#ifdef DTLS_MAX_VERSION |
135 |
- minVersion = DTLS1_VERSION; |
136 |
- maxVersion = DTLS_MAX_VERSION; |
137 |
-+#else |
138 |
-+ Q_UNREACHABLE(); |
139 |
-+#endif // DTLS_MAX_VERSION |
140 |
- break; |
141 |
- case QSsl::DtlsV1_2: |
142 |
-+#ifdef DTLS1_2_VERSION |
143 |
- minVersion = DTLS1_2_VERSION; |
144 |
- maxVersion = DTLS1_2_VERSION; |
145 |
-+#else |
146 |
-+ Q_UNREACHABLE(); |
147 |
-+#endif // DTLS1_2_VERSION |
148 |
- break; |
149 |
- case QSsl::DtlsV1_2OrLater: |
150 |
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION) |
151 |
- minVersion = DTLS1_2_VERSION; |
152 |
- maxVersion = DTLS_MAX_VERSION; |
153 |
-+#else |
154 |
-+ Q_UNREACHABLE(); |
155 |
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION |
156 |
- break; |
157 |
- case QSsl::TlsV1_3OrLater: |
158 |
- #ifdef TLS1_3_VERSION |
159 |
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) |
160 |
- } |
161 |
- #endif // ocsp |
162 |
- |
163 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
164 |
- QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free); |
165 |
- if (cctx) { |
166 |
- q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx); |
167 |
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) |
168 |
- sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed")); |
169 |
- sslContext->errorCode = QSslError::UnspecifiedError; |
170 |
- } |
171 |
-- } else { |
172 |
-+ } else |
173 |
-+#endif // LIBRESSL_VERSION_NUMBER |
174 |
-+ { |
175 |
- sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed")); |
176 |
- sslContext->errorCode = QSslError::UnspecifiedError; |
177 |
- } |
178 |
-diff --git a/src/network/ssl/qsslcontext_openssl_p.h b/src/network/ssl/qsslcontext_openssl_p.h |
179 |
-index 70cb97aa..01a61cf5 100644 |
180 |
---- a/src/network/ssl/qsslcontext_openssl_p.h |
181 |
-+++ b/src/network/ssl/qsslcontext_openssl_p.h |
182 |
-@@ -61,6 +61,13 @@ |
183 |
- |
184 |
- QT_BEGIN_NAMESPACE |
185 |
- |
186 |
-+#ifndef DTLS_ANY_VERSION |
187 |
-+#define DTLS_ANY_VERSION 0x1FFFF |
188 |
-+#endif |
189 |
-+#ifndef TLS_ANY_VERSION |
190 |
-+#define TLS_ANY_VERSION 0x10000 |
191 |
-+#endif |
192 |
-+ |
193 |
- #ifndef QT_NO_SSL |
194 |
- |
195 |
- class QSslContextPrivate; |
196 |
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp |
197 |
-index 277037e5..f599498d 100644 |
198 |
---- a/src/network/ssl/qsslsocket_openssl.cpp |
199 |
-+++ b/src/network/ssl/qsslsocket_openssl.cpp |
200 |
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext() |
201 |
- else if (mode == QSslSocket::SslServerMode) |
202 |
- q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback); |
203 |
- |
204 |
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L |
205 |
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER) |
206 |
- // Set the client callback for TLSv1.3 PSK |
207 |
- if (mode == QSslSocket::SslClientMode |
208 |
- && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) { |
209 |
-diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp |
210 |
-index ed80fc14..6941b4db 100644 |
211 |
---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp |
212 |
-+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp |
213 |
-@@ -145,11 +145,14 @@ DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return |
214 |
- DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) |
215 |
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return) |
216 |
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return) |
217 |
-+#ifdef OPENSSL_NO_DEPRECATED_3_0 |
218 |
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return) |
219 |
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return) |
220 |
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return) |
221 |
-+#endif // OPENSSL_NO_DEPRECATED_3_0 |
222 |
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return) |
223 |
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return) |
224 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
225 |
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return) |
226 |
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return) |
227 |
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG) |
228 |
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null |
229 |
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG) |
230 |
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG) |
231 |
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return) |
232 |
-+#else |
233 |
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) |
234 |
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) |
235 |
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return) |
236 |
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG) |
237 |
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG) |
238 |
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return) |
239 |
-+#endif // LIBRESSL_VERSION_NUMBER |
240 |
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return) |
241 |
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return) |
242 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
243 |
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return) |
244 |
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return) |
245 |
-+#endif // LIBRESSL_VERSION_NUMBER |
246 |
- #ifdef TLS1_3_VERSION |
247 |
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return) |
248 |
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG) |
249 |
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver |
250 |
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return) |
251 |
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return) |
252 |
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return) |
253 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
254 |
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG) |
255 |
-+#else |
256 |
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) |
257 |
-+#endif |
258 |
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return) |
259 |
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return) |
260 |
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return) |
261 |
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash, |
262 |
- ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid, |
263 |
- return 0, return) |
264 |
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return) |
265 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
266 |
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return) |
267 |
-+#endif |
268 |
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return) |
269 |
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s, |
270 |
- int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return) |
271 |
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return - |
272 |
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) |
273 |
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) |
274 |
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) |
275 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
276 |
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return); |
277 |
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return); |
278 |
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return); |
279 |
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return); |
280 |
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return); |
281 |
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return); |
282 |
-+#endif |
283 |
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG) |
284 |
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return) |
285 |
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return) |
286 |
-@@ -845,17 +866,21 @@ bool q_resolveOpenSslSymbols() |
287 |
- RESOLVEFUNC(ASN1_STRING_get0_data) |
288 |
- RESOLVEFUNC(EVP_CIPHER_CTX_reset) |
289 |
- RESOLVEFUNC(EVP_PKEY_up_ref) |
290 |
-+#ifdef OPENSSL_NO_DEPRECATED_3_0 |
291 |
- RESOLVEFUNC(EVP_PKEY_CTX_new) |
292 |
- RESOLVEFUNC(EVP_PKEY_param_check) |
293 |
- RESOLVEFUNC(EVP_PKEY_CTX_free) |
294 |
-+#endif // OPENSSL_NO_DEPRECATED_3_0 |
295 |
- RESOLVEFUNC(EVP_PKEY_base_id) |
296 |
- RESOLVEFUNC(RSA_bits) |
297 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
298 |
- RESOLVEFUNC(OPENSSL_sk_new_null) |
299 |
- RESOLVEFUNC(OPENSSL_sk_push) |
300 |
- RESOLVEFUNC(OPENSSL_sk_free) |
301 |
- RESOLVEFUNC(OPENSSL_sk_num) |
302 |
- RESOLVEFUNC(OPENSSL_sk_pop_free) |
303 |
- RESOLVEFUNC(OPENSSL_sk_value) |
304 |
-+#endif |
305 |
- RESOLVEFUNC(DH_get0_pqg) |
306 |
- RESOLVEFUNC(SSL_CTX_set_options) |
307 |
- RESOLVEFUNC(SSL_CTX_get_security_level) |
308 |
-@@ -898,7 +923,9 @@ bool q_resolveOpenSslSymbols() |
309 |
- |
310 |
- RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint) |
311 |
- RESOLVEFUNC(DH_bits) |
312 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
313 |
- RESOLVEFUNC(DSA_bits) |
314 |
-+#endif |
315 |
- |
316 |
- #if QT_CONFIG(dtls) |
317 |
- RESOLVEFUNC(DTLSv1_listen) |
318 |
-@@ -928,7 +955,9 @@ bool q_resolveOpenSslSymbols() |
319 |
- RESOLVEFUNC(OCSP_check_validity) |
320 |
- RESOLVEFUNC(OCSP_cert_to_id) |
321 |
- RESOLVEFUNC(OCSP_id_get0_info) |
322 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
323 |
- RESOLVEFUNC(OCSP_resp_get0_certs) |
324 |
-+#endif |
325 |
- RESOLVEFUNC(OCSP_basic_sign) |
326 |
- RESOLVEFUNC(OCSP_response_create) |
327 |
- RESOLVEFUNC(i2d_OCSP_RESPONSE) |
328 |
-@@ -1058,12 +1087,14 @@ bool q_resolveOpenSslSymbols() |
329 |
- RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey) |
330 |
- RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) |
331 |
- RESOLVEFUNC(SSL_CTX_get_cert_store); |
332 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
333 |
- RESOLVEFUNC(SSL_CONF_CTX_new); |
334 |
- RESOLVEFUNC(SSL_CONF_CTX_free); |
335 |
- RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx); |
336 |
- RESOLVEFUNC(SSL_CONF_CTX_set_flags); |
337 |
- RESOLVEFUNC(SSL_CONF_CTX_finish); |
338 |
- RESOLVEFUNC(SSL_CONF_cmd); |
339 |
-+#endif |
340 |
- RESOLVEFUNC(SSL_accept) |
341 |
- RESOLVEFUNC(SSL_clear) |
342 |
- RESOLVEFUNC(SSL_connect) |
343 |
-diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h |
344 |
-index c46afcf5..42a31119 100644 |
345 |
---- a/src/network/ssl/qsslsocket_openssl_symbols_p.h |
346 |
-+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h |
347 |
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE |
348 |
- |
349 |
- #define DUMMYARG |
350 |
- |
351 |
-+#ifdef LIBRESSL_VERSION_NUMBER |
352 |
-+typedef _STACK STACK; |
353 |
-+typedef STACK OPENSSL_STACK; |
354 |
-+typedef void OPENSSL_INIT_SETTINGS; |
355 |
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx); |
356 |
-+#endif |
357 |
-+ |
358 |
- #if !defined QT_LINKED_OPENSSL |
359 |
- // **************** Shared declarations ****************** |
360 |
- // ret func(arg) |
361 |
-@@ -230,20 +237,43 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x); |
362 |
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a); |
363 |
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem(); |
364 |
- |
365 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
366 |
- int q_DSA_bits(DSA *a); |
367 |
-+#else |
368 |
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p) |
369 |
-+#endif |
370 |
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c); |
371 |
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a); |
372 |
-+#ifdef OPENSSL_NO_DEPRECATED_3_0 |
373 |
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e); |
374 |
- void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx); |
375 |
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx); |
376 |
-+#endif // OPENSSL_NO_DEPRECATED_3_0 |
377 |
- int q_EVP_PKEY_base_id(EVP_PKEY *a); |
378 |
- int q_RSA_bits(RSA *a); |
379 |
-+ |
380 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
381 |
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a); |
382 |
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *)); |
383 |
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null(); |
384 |
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data); |
385 |
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a); |
386 |
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b); |
387 |
-+#else // LIBRESSL_VERSION_NUMBER |
388 |
-+int q_sk_num(STACK *a); |
389 |
-+#define q_OPENSSL_sk_num(a) q_sk_num(a) |
390 |
-+void q_sk_pop_free(STACK *a, void (*b)(void *)); |
391 |
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b) |
392 |
-+STACK *q_sk_new_null(); |
393 |
-+#define q_OPENSSL_sk_new_null() q_sk_new_null() |
394 |
-+void q_sk_push(STACK *st, void *data); |
395 |
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data) |
396 |
-+void q_sk_free(STACK *a); |
397 |
-+#define q_OPENSSL_sk_free q_sk_free |
398 |
-+void *q_sk_value(STACK *a, int b); |
399 |
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b) |
400 |
-+#endif // LIBRESSL_VERSION_NUMBER |
401 |
-+ |
402 |
- int q_SSL_session_reused(SSL *a); |
403 |
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op); |
404 |
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); |
405 |
-@@ -269,8 +299,13 @@ int q_DH_bits(DH *dh); |
406 |
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \ |
407 |
- | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL) |
408 |
- |
409 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
410 |
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st) |
411 |
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i) |
412 |
-+#else |
413 |
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st) |
414 |
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i) |
415 |
-+#endif // LIBRESSL_VERSION_NUMBER |
416 |
- |
417 |
- #define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ |
418 |
- | OPENSSL_INIT_ADD_ALL_DIGESTS \ |
419 |
-@@ -279,7 +314,11 @@ int q_DH_bits(DH *dh); |
420 |
- | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL) |
421 |
- |
422 |
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); |
423 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
424 |
- void q_CRYPTO_free(void *str, const char *file, int line); |
425 |
-+#else |
426 |
-+void q_CRYPTO_free(void *a); |
427 |
-+#endif |
428 |
- |
429 |
- long q_OpenSSL_version_num(); |
430 |
- const char *q_OpenSSL_version(int type); |
431 |
-@@ -497,12 +536,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b); |
432 |
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b); |
433 |
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c); |
434 |
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a); |
435 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
436 |
- SSL_CONF_CTX *q_SSL_CONF_CTX_new(); |
437 |
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a); |
438 |
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b); |
439 |
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b); |
440 |
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a); |
441 |
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c); |
442 |
-+#endif |
443 |
- void q_SSL_free(SSL *a); |
444 |
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a); |
445 |
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a); |
446 |
-@@ -728,7 +769,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n |
447 |
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash, |
448 |
- ASN1_INTEGER **pserial, OCSP_CERTID *cid); |
449 |
- |
450 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
451 |
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs); |
452 |
-+#else |
453 |
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs) |
454 |
-+#endif |
455 |
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer); |
456 |
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid); |
457 |
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b); |
458 |
--- |
459 |
-2.29.2 |
460 |
- |
461 |
|
462 |
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild |
463 |
index df5b465..463019c 100644 |
464 |
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild |
465 |
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild |
466 |
@@ -10,7 +10,7 @@ inherit qt5-build |
467 |
DESCRIPTION="Network abstraction library for the Qt5 framework" |
468 |
|
469 |
if [[ ${QT5_BUILD_TYPE} == release ]]; then |
470 |
- KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" |
471 |
+ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" |
472 |
fi |
473 |
|
474 |
IUSE="bindist connman dtls gssapi libproxy networkmanager sctp +ssl" |
475 |
|
476 |
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild |
477 |
deleted file mode 100644 |
478 |
index ce01f17..0000000 |
479 |
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild |
480 |
+++ /dev/null |
481 |
@@ -1,80 +0,0 @@ |
482 |
-# Copyright 1999-2021 Gentoo Authors |
483 |
-# Distributed under the terms of the GNU General Public License v2 |
484 |
- |
485 |
-EAPI=7 |
486 |
- |
487 |
-QT5_MODULE="qtbase" |
488 |
-inherit qt5-build |
489 |
- |
490 |
-DESCRIPTION="Network abstraction library for the Qt5 framework" |
491 |
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" |
492 |
- |
493 |
-if [[ ${QT5_BUILD_TYPE} == release ]]; then |
494 |
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" |
495 |
-fi |
496 |
- |
497 |
-IUSE="bindist connman dtls gssapi libproxy networkmanager sctp +ssl" |
498 |
- |
499 |
-DEPEND=" |
500 |
- ~dev-qt/qtcore-${PV}:5= |
501 |
- sys-libs/zlib:= |
502 |
- connman? ( ~dev-qt/qtdbus-${PV} ) |
503 |
- gssapi? ( virtual/krb5 ) |
504 |
- libproxy? ( net-libs/libproxy ) |
505 |
- networkmanager? ( ~dev-qt/qtdbus-${PV} ) |
506 |
- sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) |
507 |
- ssl? ( >=dev-libs/openssl-1.1.1:0=[bindist=] ) |
508 |
-" |
509 |
-RDEPEND="${DEPEND} |
510 |
- connman? ( net-misc/connman ) |
511 |
- networkmanager? ( net-misc/networkmanager ) |
512 |
-" |
513 |
- |
514 |
-QT5_TARGET_SUBDIRS=( |
515 |
- src/network |
516 |
- src/plugins/bearer/generic |
517 |
-) |
518 |
- |
519 |
-QT5_GENTOO_CONFIG=( |
520 |
- libproxy:libproxy: |
521 |
- ssl::SSL |
522 |
- ssl::OPENSSL |
523 |
- ssl:openssl-linked:LINKED_OPENSSL |
524 |
-) |
525 |
- |
526 |
-QT5_GENTOO_PRIVATE_CONFIG=( |
527 |
- :network |
528 |
-) |
529 |
- |
530 |
-PATCHES=( |
531 |
- "${FILESDIR}"/${P}-QNetworkAccessManager-memleak.patch # QTBUG-88063 |
532 |
- "${FILESDIR}"/${PN}-5.15.2-libressl.patch # Bug 562050, not upstreamable |
533 |
- "${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012 |
534 |
-) |
535 |
- |
536 |
-pkg_setup() { |
537 |
- use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) |
538 |
- use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) |
539 |
-} |
540 |
- |
541 |
-src_configure() { |
542 |
- local myconf=( |
543 |
- $(usex connman -dbus-linked '') |
544 |
- $(usex gssapi -feature-gssapi -no-feature-gssapi) |
545 |
- $(qt_use libproxy) |
546 |
- $(usex networkmanager -dbus-linked '') |
547 |
- $(qt_use sctp) |
548 |
- $(qt_use dtls) |
549 |
- $(usex ssl -openssl-linked '') |
550 |
- ) |
551 |
- qt5-build_src_configure |
552 |
-} |
553 |
- |
554 |
-src_install() { |
555 |
- qt5-build_src_install |
556 |
- # workaround for bug 652650 |
557 |
- if use ssl; then |
558 |
- sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ |
559 |
- -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die |
560 |
- fi |
561 |
-} |