1 |
commit: c0884c4ab3ffd73a7bfb0fa9a318982ed6f7e070 |
2 |
Author: orbea <orbea <AT> riseup <DOT> net> |
3 |
AuthorDate: Sat Apr 30 15:44:22 2022 +0000 |
4 |
Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com> |
5 |
CommitDate: Sun May 1 00:19:06 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=c0884c4a |
7 |
|
8 |
dev-qt/qtnetwork: Remove old versions |
9 |
|
10 |
Signed-off-by: orbea <orbea <AT> riseup.net> |
11 |
Closes: https://github.com/gentoo/libressl/pull/401 |
12 |
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com> |
13 |
|
14 |
.../files/qtnetwork-5.15.2-r11-libressl.patch | 407 --------------------- |
15 |
dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild | 80 ---- |
16 |
dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild | 80 ---- |
17 |
dev-qt/qtnetwork/qtnetwork-5.15.2-r14.ebuild | 80 ---- |
18 |
4 files changed, 647 deletions(-) |
19 |
|
20 |
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r11-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r11-libressl.patch |
21 |
deleted file mode 100644 |
22 |
index 97e7f15..0000000 |
23 |
--- a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r11-libressl.patch |
24 |
+++ /dev/null |
25 |
@@ -1,407 +0,0 @@ |
26 |
-From 89e6ffbf5e2febb9cedaf9e533fbcca9da398a2d Mon Sep 17 00:00:00 2001 |
27 |
-From: Stefan Strogin <steils@g.o> |
28 |
-Date: Sat, 28 Nov 2020 06:12:22 +0200 |
29 |
-Subject: [PATCH] QSslSocket: add LibreSSL support |
30 |
- |
31 |
-Upstream-Status: Inappropriate |
32 |
-[Upstream is not willing to accept any patches for LibreSSL support] |
33 |
-Signed-off-by: Stefan Strogin <steils@g.o> |
34 |
-Signed-off-by: orbea <orbea@××××××.net> |
35 |
---- |
36 |
- src/network/ssl/qsslcertificate_openssl.cpp | 2 +- |
37 |
- src/network/ssl/qsslcontext_openssl.cpp | 27 ++++++++--- |
38 |
- src/network/ssl/qsslcontext_openssl_p.h | 7 +++ |
39 |
- src/network/ssl/qsslsocket_openssl.cpp | 2 +- |
40 |
- .../ssl/qsslsocket_openssl_symbols.cpp | 31 +++++++++++++ |
41 |
- .../ssl/qsslsocket_openssl_symbols_p.h | 45 +++++++++++++++++++ |
42 |
- 6 files changed, 107 insertions(+), 7 deletions(-) |
43 |
- |
44 |
-diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp |
45 |
-index ca9d61cc..19774432 100644 |
46 |
---- a/src/network/ssl/qsslcertificate_openssl.cpp |
47 |
-+++ b/src/network/ssl/qsslcertificate_openssl.cpp |
48 |
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name) |
49 |
- unsigned char *data = nullptr; |
50 |
- int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e)); |
51 |
- info.insert(name, QString::fromUtf8((char*)data, size)); |
52 |
--#if QT_CONFIG(opensslv11) |
53 |
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER) |
54 |
- q_CRYPTO_free(data, nullptr, 0); |
55 |
- #else |
56 |
- q_CRYPTO_free(data); |
57 |
-diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp |
58 |
-index c9f202f5..4963474c 100644 |
59 |
---- a/src/network/ssl/qsslcontext_openssl.cpp |
60 |
-+++ b/src/network/ssl/qsslcontext_openssl.cpp |
61 |
-@@ -77,9 +77,9 @@ extern "C" int q_verify_cookie_callback(SSL *ssl, const unsigned char *cookie, |
62 |
- } |
63 |
- #endif // dtls |
64 |
- |
65 |
--#ifdef TLS1_3_VERSION |
66 |
-+#if defined(TLS1_3_VERSION) && !defined(LIBRESSL_VERSION_NUMBER) |
67 |
- extern "C" int q_ssl_sess_set_new_cb(SSL *context, SSL_SESSION *session); |
68 |
--#endif // TLS1_3_VERSION |
69 |
-+#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBER |
70 |
- |
71 |
- // Defined in qsslsocket.cpp |
72 |
- QList<QSslCipher> q_getDefaultDtlsCiphers(); |
73 |
-@@ -351,9 +351,11 @@ init_context: |
74 |
- return; |
75 |
- } |
76 |
- |
77 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
78 |
- // A nasty hacked OpenSSL using a level that will make our auto-tests fail: |
79 |
- if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel()) |
80 |
- q_SSL_CTX_set_security_level(sslContext->ctx, 1); |
81 |
-+#endif // LIBRESSL_VERSION_NUMBER |
82 |
- |
83 |
- const long anyVersion = |
84 |
- #if QT_CONFIG(dtls) |
85 |
-@@ -408,16 +410,28 @@ init_context: |
86 |
- maxVersion = DTLS1_VERSION; |
87 |
- break; |
88 |
- case QSsl::DtlsV1_0OrLater: |
89 |
-+#ifdef DTLS_MAX_VERSION |
90 |
- minVersion = DTLS1_VERSION; |
91 |
- maxVersion = DTLS_MAX_VERSION; |
92 |
-+#else |
93 |
-+ Q_UNREACHABLE(); |
94 |
-+#endif // DTLS_MAX_VERSION |
95 |
- break; |
96 |
- case QSsl::DtlsV1_2: |
97 |
-+#ifdef DTLS1_2_VERSION |
98 |
- minVersion = DTLS1_2_VERSION; |
99 |
- maxVersion = DTLS1_2_VERSION; |
100 |
-+#else |
101 |
-+ Q_UNREACHABLE(); |
102 |
-+#endif // DTLS1_2_VERSION |
103 |
- break; |
104 |
- case QSsl::DtlsV1_2OrLater: |
105 |
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION) |
106 |
- minVersion = DTLS1_2_VERSION; |
107 |
- maxVersion = DTLS_MAX_VERSION; |
108 |
-+#else |
109 |
-+ Q_UNREACHABLE(); |
110 |
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION |
111 |
- break; |
112 |
- case QSsl::TlsV1_3OrLater: |
113 |
- #ifdef TLS1_3_VERSION |
114 |
-@@ -627,14 +641,14 @@ init_context: |
115 |
- q_X509Callback); |
116 |
- } |
117 |
- |
118 |
--#ifdef TLS1_3_VERSION |
119 |
-+#if defined(TLS1_3_VERSION) && !defined(LIBRESSL_VERSION_NUMBER) |
120 |
- // NewSessionTicket callback: |
121 |
- if (mode == QSslSocket::SslClientMode && !isDtls) { |
122 |
- q_SSL_CTX_sess_set_new_cb(sslContext->ctx, q_ssl_sess_set_new_cb); |
123 |
- q_SSL_CTX_set_session_cache_mode(sslContext->ctx, SSL_SESS_CACHE_CLIENT); |
124 |
- } |
125 |
- |
126 |
--#endif // TLS1_3_VERSION |
127 |
-+#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBER |
128 |
- |
129 |
- #if QT_CONFIG(dtls) |
130 |
- // DTLS cookies: |
131 |
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) |
132 |
- } |
133 |
- #endif // ocsp |
134 |
- |
135 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
136 |
- QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free); |
137 |
- if (cctx) { |
138 |
- q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx); |
139 |
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) |
140 |
- sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed")); |
141 |
- sslContext->errorCode = QSslError::UnspecifiedError; |
142 |
- } |
143 |
-- } else { |
144 |
-+ } else |
145 |
-+#endif // LIBRESSL_VERSION_NUMBER |
146 |
-+ { |
147 |
- sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed")); |
148 |
- sslContext->errorCode = QSslError::UnspecifiedError; |
149 |
- } |
150 |
-diff --git a/src/network/ssl/qsslcontext_openssl_p.h b/src/network/ssl/qsslcontext_openssl_p.h |
151 |
-index 70cb97aa..01a61cf5 100644 |
152 |
---- a/src/network/ssl/qsslcontext_openssl_p.h |
153 |
-+++ b/src/network/ssl/qsslcontext_openssl_p.h |
154 |
-@@ -61,6 +61,13 @@ |
155 |
- |
156 |
- QT_BEGIN_NAMESPACE |
157 |
- |
158 |
-+#ifndef DTLS_ANY_VERSION |
159 |
-+#define DTLS_ANY_VERSION 0x1FFFF |
160 |
-+#endif |
161 |
-+#ifndef TLS_ANY_VERSION |
162 |
-+#define TLS_ANY_VERSION 0x10000 |
163 |
-+#endif |
164 |
-+ |
165 |
- #ifndef QT_NO_SSL |
166 |
- |
167 |
- class QSslContextPrivate; |
168 |
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp |
169 |
-index af47dbf9..f4381efa 100644 |
170 |
---- a/src/network/ssl/qsslsocket_openssl.cpp |
171 |
-+++ b/src/network/ssl/qsslsocket_openssl.cpp |
172 |
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext() |
173 |
- else if (mode == QSslSocket::SslServerMode) |
174 |
- q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback); |
175 |
- |
176 |
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L |
177 |
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER) |
178 |
- // Set the client callback for TLSv1.3 PSK |
179 |
- if (mode == QSslSocket::SslClientMode |
180 |
- && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) { |
181 |
-diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp |
182 |
-index ed80fc14..6941b4db 100644 |
183 |
---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp |
184 |
-+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp |
185 |
-@@ -145,11 +145,14 @@ DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return |
186 |
- DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) |
187 |
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return) |
188 |
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return) |
189 |
-+#ifdef OPENSSL_NO_DEPRECATED_3_0 |
190 |
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return) |
191 |
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return) |
192 |
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return) |
193 |
-+#endif // OPENSSL_NO_DEPRECATED_3_0 |
194 |
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return) |
195 |
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return) |
196 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
197 |
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return) |
198 |
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return) |
199 |
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG) |
200 |
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null |
201 |
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG) |
202 |
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG) |
203 |
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return) |
204 |
-+#else |
205 |
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) |
206 |
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) |
207 |
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return) |
208 |
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG) |
209 |
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG) |
210 |
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return) |
211 |
-+#endif // LIBRESSL_VERSION_NUMBER |
212 |
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return) |
213 |
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return) |
214 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
215 |
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return) |
216 |
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return) |
217 |
-+#endif // LIBRESSL_VERSION_NUMBER |
218 |
- #ifdef TLS1_3_VERSION |
219 |
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return) |
220 |
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG) |
221 |
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver |
222 |
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return) |
223 |
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return) |
224 |
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return) |
225 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
226 |
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG) |
227 |
-+#else |
228 |
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) |
229 |
-+#endif |
230 |
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return) |
231 |
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return) |
232 |
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return) |
233 |
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash, |
234 |
- ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid, |
235 |
- return 0, return) |
236 |
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return) |
237 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
238 |
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return) |
239 |
-+#endif |
240 |
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return) |
241 |
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s, |
242 |
- int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return) |
243 |
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return - |
244 |
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) |
245 |
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) |
246 |
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) |
247 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
248 |
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return); |
249 |
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return); |
250 |
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return); |
251 |
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return); |
252 |
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return); |
253 |
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return); |
254 |
-+#endif |
255 |
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG) |
256 |
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return) |
257 |
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return) |
258 |
-@@ -845,17 +866,21 @@ bool q_resolveOpenSslSymbols() |
259 |
- RESOLVEFUNC(ASN1_STRING_get0_data) |
260 |
- RESOLVEFUNC(EVP_CIPHER_CTX_reset) |
261 |
- RESOLVEFUNC(EVP_PKEY_up_ref) |
262 |
-+#ifdef OPENSSL_NO_DEPRECATED_3_0 |
263 |
- RESOLVEFUNC(EVP_PKEY_CTX_new) |
264 |
- RESOLVEFUNC(EVP_PKEY_param_check) |
265 |
- RESOLVEFUNC(EVP_PKEY_CTX_free) |
266 |
-+#endif // OPENSSL_NO_DEPRECATED_3_0 |
267 |
- RESOLVEFUNC(EVP_PKEY_base_id) |
268 |
- RESOLVEFUNC(RSA_bits) |
269 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
270 |
- RESOLVEFUNC(OPENSSL_sk_new_null) |
271 |
- RESOLVEFUNC(OPENSSL_sk_push) |
272 |
- RESOLVEFUNC(OPENSSL_sk_free) |
273 |
- RESOLVEFUNC(OPENSSL_sk_num) |
274 |
- RESOLVEFUNC(OPENSSL_sk_pop_free) |
275 |
- RESOLVEFUNC(OPENSSL_sk_value) |
276 |
-+#endif |
277 |
- RESOLVEFUNC(DH_get0_pqg) |
278 |
- RESOLVEFUNC(SSL_CTX_set_options) |
279 |
- RESOLVEFUNC(SSL_CTX_get_security_level) |
280 |
-@@ -898,7 +923,9 @@ bool q_resolveOpenSslSymbols() |
281 |
- |
282 |
- RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint) |
283 |
- RESOLVEFUNC(DH_bits) |
284 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
285 |
- RESOLVEFUNC(DSA_bits) |
286 |
-+#endif |
287 |
- |
288 |
- #if QT_CONFIG(dtls) |
289 |
- RESOLVEFUNC(DTLSv1_listen) |
290 |
-@@ -928,7 +955,9 @@ bool q_resolveOpenSslSymbols() |
291 |
- RESOLVEFUNC(OCSP_check_validity) |
292 |
- RESOLVEFUNC(OCSP_cert_to_id) |
293 |
- RESOLVEFUNC(OCSP_id_get0_info) |
294 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
295 |
- RESOLVEFUNC(OCSP_resp_get0_certs) |
296 |
-+#endif |
297 |
- RESOLVEFUNC(OCSP_basic_sign) |
298 |
- RESOLVEFUNC(OCSP_response_create) |
299 |
- RESOLVEFUNC(i2d_OCSP_RESPONSE) |
300 |
-@@ -1058,12 +1087,14 @@ bool q_resolveOpenSslSymbols() |
301 |
- RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey) |
302 |
- RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) |
303 |
- RESOLVEFUNC(SSL_CTX_get_cert_store); |
304 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
305 |
- RESOLVEFUNC(SSL_CONF_CTX_new); |
306 |
- RESOLVEFUNC(SSL_CONF_CTX_free); |
307 |
- RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx); |
308 |
- RESOLVEFUNC(SSL_CONF_CTX_set_flags); |
309 |
- RESOLVEFUNC(SSL_CONF_CTX_finish); |
310 |
- RESOLVEFUNC(SSL_CONF_cmd); |
311 |
-+#endif |
312 |
- RESOLVEFUNC(SSL_accept) |
313 |
- RESOLVEFUNC(SSL_clear) |
314 |
- RESOLVEFUNC(SSL_connect) |
315 |
-diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h |
316 |
-index c46afcf5..42a31119 100644 |
317 |
---- a/src/network/ssl/qsslsocket_openssl_symbols_p.h |
318 |
-+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h |
319 |
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE |
320 |
- |
321 |
- #define DUMMYARG |
322 |
- |
323 |
-+#ifdef LIBRESSL_VERSION_NUMBER |
324 |
-+typedef _STACK STACK; |
325 |
-+typedef STACK OPENSSL_STACK; |
326 |
-+typedef void OPENSSL_INIT_SETTINGS; |
327 |
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx); |
328 |
-+#endif |
329 |
-+ |
330 |
- #if !defined QT_LINKED_OPENSSL |
331 |
- // **************** Shared declarations ****************** |
332 |
- // ret func(arg) |
333 |
-@@ -230,20 +237,43 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x); |
334 |
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a); |
335 |
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem(); |
336 |
- |
337 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
338 |
- int q_DSA_bits(DSA *a); |
339 |
-+#else |
340 |
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p) |
341 |
-+#endif |
342 |
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c); |
343 |
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a); |
344 |
-+#ifdef OPENSSL_NO_DEPRECATED_3_0 |
345 |
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e); |
346 |
- void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx); |
347 |
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx); |
348 |
-+#endif // OPENSSL_NO_DEPRECATED_3_0 |
349 |
- int q_EVP_PKEY_base_id(EVP_PKEY *a); |
350 |
- int q_RSA_bits(RSA *a); |
351 |
-+ |
352 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
353 |
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a); |
354 |
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *)); |
355 |
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null(); |
356 |
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data); |
357 |
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a); |
358 |
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b); |
359 |
-+#else // LIBRESSL_VERSION_NUMBER |
360 |
-+int q_sk_num(STACK *a); |
361 |
-+#define q_OPENSSL_sk_num(a) q_sk_num(a) |
362 |
-+void q_sk_pop_free(STACK *a, void (*b)(void *)); |
363 |
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b) |
364 |
-+STACK *q_sk_new_null(); |
365 |
-+#define q_OPENSSL_sk_new_null() q_sk_new_null() |
366 |
-+void q_sk_push(STACK *st, void *data); |
367 |
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data) |
368 |
-+void q_sk_free(STACK *a); |
369 |
-+#define q_OPENSSL_sk_free q_sk_free |
370 |
-+void *q_sk_value(STACK *a, int b); |
371 |
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b) |
372 |
-+#endif // LIBRESSL_VERSION_NUMBER |
373 |
-+ |
374 |
- int q_SSL_session_reused(SSL *a); |
375 |
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op); |
376 |
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); |
377 |
-@@ -269,8 +299,13 @@ int q_DH_bits(DH *dh); |
378 |
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \ |
379 |
- | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL) |
380 |
- |
381 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
382 |
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st) |
383 |
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i) |
384 |
-+#else |
385 |
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st) |
386 |
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i) |
387 |
-+#endif // LIBRESSL_VERSION_NUMBER |
388 |
- |
389 |
- #define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ |
390 |
- | OPENSSL_INIT_ADD_ALL_DIGESTS \ |
391 |
-@@ -279,7 +314,11 @@ int q_DH_bits(DH *dh); |
392 |
- | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL) |
393 |
- |
394 |
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); |
395 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
396 |
- void q_CRYPTO_free(void *str, const char *file, int line); |
397 |
-+#else |
398 |
-+void q_CRYPTO_free(void *a); |
399 |
-+#endif |
400 |
- |
401 |
- long q_OpenSSL_version_num(); |
402 |
- const char *q_OpenSSL_version(int type); |
403 |
-@@ -497,12 +536,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b); |
404 |
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b); |
405 |
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c); |
406 |
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a); |
407 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
408 |
- SSL_CONF_CTX *q_SSL_CONF_CTX_new(); |
409 |
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a); |
410 |
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b); |
411 |
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b); |
412 |
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a); |
413 |
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c); |
414 |
-+#endif |
415 |
- void q_SSL_free(SSL *a); |
416 |
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a); |
417 |
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a); |
418 |
-@@ -728,7 +769,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n |
419 |
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash, |
420 |
- ASN1_INTEGER **pserial, OCSP_CERTID *cid); |
421 |
- |
422 |
-+#ifndef LIBRESSL_VERSION_NUMBER |
423 |
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs); |
424 |
-+#else |
425 |
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs) |
426 |
-+#endif |
427 |
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer); |
428 |
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid); |
429 |
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b); |
430 |
--- |
431 |
-2.32.0 |
432 |
- |
433 |
|
434 |
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild |
435 |
deleted file mode 100644 |
436 |
index 463019c..0000000 |
437 |
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild |
438 |
+++ /dev/null |
439 |
@@ -1,80 +0,0 @@ |
440 |
-# Copyright 1999-2021 Gentoo Authors |
441 |
-# Distributed under the terms of the GNU General Public License v2 |
442 |
- |
443 |
-EAPI=8 |
444 |
- |
445 |
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd |
446 |
-QT5_MODULE="qtbase" |
447 |
-inherit qt5-build |
448 |
- |
449 |
-DESCRIPTION="Network abstraction library for the Qt5 framework" |
450 |
- |
451 |
-if [[ ${QT5_BUILD_TYPE} == release ]]; then |
452 |
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" |
453 |
-fi |
454 |
- |
455 |
-IUSE="bindist connman dtls gssapi libproxy networkmanager sctp +ssl" |
456 |
-REQUIRED_USE="!dtls" |
457 |
- |
458 |
-DEPEND=" |
459 |
- =dev-qt/qtcore-${QT5_PV}*:5= |
460 |
- sys-libs/zlib:= |
461 |
- connman? ( =dev-qt/qtdbus-${QT5_PV}* ) |
462 |
- gssapi? ( virtual/krb5 ) |
463 |
- libproxy? ( net-libs/libproxy ) |
464 |
- networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* ) |
465 |
- sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) |
466 |
- ssl? ( >=dev-libs/openssl-1.1.1:0=[bindist(-)=] ) |
467 |
-" |
468 |
-RDEPEND="${DEPEND} |
469 |
- connman? ( net-misc/connman ) |
470 |
- networkmanager? ( net-misc/networkmanager ) |
471 |
-" |
472 |
- |
473 |
-QT5_TARGET_SUBDIRS=( |
474 |
- src/network |
475 |
- src/plugins/bearer/generic |
476 |
-) |
477 |
- |
478 |
-QT5_GENTOO_CONFIG=( |
479 |
- libproxy:libproxy: |
480 |
- ssl::SSL |
481 |
- ssl::OPENSSL |
482 |
- ssl:openssl-linked:LINKED_OPENSSL |
483 |
-) |
484 |
- |
485 |
-QT5_GENTOO_PRIVATE_CONFIG=( |
486 |
- :network |
487 |
-) |
488 |
- |
489 |
-PATCHES=( |
490 |
- "${FILESDIR}"/${PN}-5.15.2-r11-libressl.patch # Bug 562050, not upstreamable |
491 |
-) |
492 |
- |
493 |
-pkg_setup() { |
494 |
- use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) |
495 |
- use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) |
496 |
-} |
497 |
- |
498 |
-src_configure() { |
499 |
- local myconf=( |
500 |
- $(usev connman -dbus-linked) |
501 |
- $(qt_use gssapi feature-gssapi) |
502 |
- $(qt_use libproxy) |
503 |
- $(usev networkmanager -dbus-linked) |
504 |
- $(qt_use sctp) |
505 |
- $(qt_use dtls) |
506 |
- $(usev ssl -openssl-linked) |
507 |
- ) |
508 |
- qt5-build_src_configure |
509 |
-} |
510 |
- |
511 |
-src_install() { |
512 |
- qt5-build_src_install |
513 |
- |
514 |
- # workaround for bug 652650 |
515 |
- if use ssl; then |
516 |
- sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ |
517 |
- -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die |
518 |
- fi |
519 |
-} |
520 |
|
521 |
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild |
522 |
deleted file mode 100644 |
523 |
index c9d0b35..0000000 |
524 |
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild |
525 |
+++ /dev/null |
526 |
@@ -1,80 +0,0 @@ |
527 |
-# Copyright 1999-2021 Gentoo Authors |
528 |
-# Distributed under the terms of the GNU General Public License v2 |
529 |
- |
530 |
-EAPI=8 |
531 |
- |
532 |
-KDE_ORG_COMMIT=7c6c0030cf80ef7b9ace42996b0e0c3a72f76860 |
533 |
-QT5_MODULE="qtbase" |
534 |
-inherit qt5-build |
535 |
- |
536 |
-DESCRIPTION="Network abstraction library for the Qt5 framework" |
537 |
- |
538 |
-if [[ ${QT5_BUILD_TYPE} == release ]]; then |
539 |
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" |
540 |
-fi |
541 |
- |
542 |
-IUSE="connman dtls gssapi libproxy networkmanager sctp +ssl" |
543 |
-REQUIRED_USE="!dtls" |
544 |
- |
545 |
-DEPEND=" |
546 |
- =dev-qt/qtcore-${QT5_PV}*:5= |
547 |
- sys-libs/zlib:= |
548 |
- connman? ( =dev-qt/qtdbus-${QT5_PV}* ) |
549 |
- gssapi? ( virtual/krb5 ) |
550 |
- libproxy? ( net-libs/libproxy ) |
551 |
- networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* ) |
552 |
- sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) |
553 |
- ssl? ( >=dev-libs/openssl-1.1.1:0= ) |
554 |
-" |
555 |
-RDEPEND="${DEPEND} |
556 |
- connman? ( net-misc/connman ) |
557 |
- networkmanager? ( net-misc/networkmanager ) |
558 |
-" |
559 |
- |
560 |
-QT5_TARGET_SUBDIRS=( |
561 |
- src/network |
562 |
- src/plugins/bearer/generic |
563 |
-) |
564 |
- |
565 |
-QT5_GENTOO_CONFIG=( |
566 |
- libproxy:libproxy: |
567 |
- ssl::SSL |
568 |
- ssl::OPENSSL |
569 |
- ssl:openssl-linked:LINKED_OPENSSL |
570 |
-) |
571 |
- |
572 |
-QT5_GENTOO_PRIVATE_CONFIG=( |
573 |
- :network |
574 |
-) |
575 |
- |
576 |
-PATCHES=( |
577 |
- "${FILESDIR}"/${PN}-5.15.2-r11-libressl.patch # Bug 562050, not upstreamable |
578 |
-) |
579 |
- |
580 |
-pkg_setup() { |
581 |
- use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) |
582 |
- use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) |
583 |
-} |
584 |
- |
585 |
-src_configure() { |
586 |
- local myconf=( |
587 |
- $(usev connman -dbus-linked) |
588 |
- $(qt_use gssapi feature-gssapi) |
589 |
- $(qt_use libproxy) |
590 |
- $(usev networkmanager -dbus-linked) |
591 |
- $(qt_use sctp) |
592 |
- $(qt_use dtls) |
593 |
- $(usev ssl -openssl-linked) |
594 |
- ) |
595 |
- qt5-build_src_configure |
596 |
-} |
597 |
- |
598 |
-src_install() { |
599 |
- qt5-build_src_install |
600 |
- |
601 |
- # workaround for bug 652650 |
602 |
- if use ssl; then |
603 |
- sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ |
604 |
- -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die |
605 |
- fi |
606 |
-} |
607 |
|
608 |
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r14.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r14.ebuild |
609 |
deleted file mode 100644 |
610 |
index 8ac35cf..0000000 |
611 |
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r14.ebuild |
612 |
+++ /dev/null |
613 |
@@ -1,80 +0,0 @@ |
614 |
-# Copyright 1999-2022 Gentoo Authors |
615 |
-# Distributed under the terms of the GNU General Public License v2 |
616 |
- |
617 |
-EAPI=8 |
618 |
- |
619 |
-KDE_ORG_COMMIT=38ad2f39daec09168728033969265834b6a2d924 |
620 |
-QT5_MODULE="qtbase" |
621 |
-inherit qt5-build |
622 |
- |
623 |
-DESCRIPTION="Network abstraction library for the Qt5 framework" |
624 |
- |
625 |
-if [[ ${QT5_BUILD_TYPE} == release ]]; then |
626 |
- KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" |
627 |
-fi |
628 |
- |
629 |
-IUSE="connman dtls gssapi libproxy networkmanager sctp +ssl" |
630 |
-REQUIRED_USE="!dtls" |
631 |
- |
632 |
-DEPEND=" |
633 |
- =dev-qt/qtcore-${QT5_PV}*:5= |
634 |
- sys-libs/zlib:= |
635 |
- connman? ( =dev-qt/qtdbus-${QT5_PV}* ) |
636 |
- gssapi? ( virtual/krb5 ) |
637 |
- libproxy? ( net-libs/libproxy ) |
638 |
- networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* ) |
639 |
- sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) |
640 |
- ssl? ( >=dev-libs/openssl-1.1.1:0= ) |
641 |
-" |
642 |
-RDEPEND="${DEPEND} |
643 |
- connman? ( net-misc/connman ) |
644 |
- networkmanager? ( net-misc/networkmanager ) |
645 |
-" |
646 |
- |
647 |
-QT5_TARGET_SUBDIRS=( |
648 |
- src/network |
649 |
- src/plugins/bearer/generic |
650 |
-) |
651 |
- |
652 |
-QT5_GENTOO_CONFIG=( |
653 |
- libproxy:libproxy: |
654 |
- ssl::SSL |
655 |
- ssl::OPENSSL |
656 |
- ssl:openssl-linked:LINKED_OPENSSL |
657 |
-) |
658 |
- |
659 |
-QT5_GENTOO_PRIVATE_CONFIG=( |
660 |
- :network |
661 |
-) |
662 |
- |
663 |
-PATCHES=( |
664 |
- "${FILESDIR}"/${PN}-5.15.2-r14-libressl.patch # Bug 562050, not upstreamable |
665 |
-) |
666 |
- |
667 |
-pkg_setup() { |
668 |
- use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) |
669 |
- use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) |
670 |
-} |
671 |
- |
672 |
-src_configure() { |
673 |
- local myconf=( |
674 |
- $(usev connman -dbus-linked) |
675 |
- $(qt_use gssapi feature-gssapi) |
676 |
- $(qt_use libproxy) |
677 |
- $(usev networkmanager -dbus-linked) |
678 |
- $(qt_use sctp) |
679 |
- $(qt_use dtls) |
680 |
- $(usev ssl -openssl-linked) |
681 |
- ) |
682 |
- qt5-build_src_configure |
683 |
-} |
684 |
- |
685 |
-src_install() { |
686 |
- qt5-build_src_install |
687 |
- |
688 |
- # workaround for bug 652650 |
689 |
- if use ssl; then |
690 |
- sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ |
691 |
- -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die |
692 |
- fi |
693 |
-} |