1 |
commit: ecc8b9aacec323b065486d85c252a9231b210080 |
2 |
Author: orbea <orbea <AT> riseup <DOT> net> |
3 |
AuthorDate: Wed Jan 19 23:26:54 2022 +0000 |
4 |
Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com> |
5 |
CommitDate: Thu Jan 20 01:29:12 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=ecc8b9aa |
7 |
|
8 |
dev-qt/qtnetwork: Updated for 5.15.2-r14 |
9 |
|
10 |
Signed-off-by: orbea <orbea <AT> riseup.net> |
11 |
Closes: https://github.com/gentoo/libressl/pull/377 |
12 |
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com> |
13 |
|
14 |
dev-qt/qtnetwork/Manifest | 1 + |
15 |
.../files/qtnetwork-5.15.2-r14-libressl.patch | 367 +++++++++++++++++++++ |
16 |
dev-qt/qtnetwork/qtnetwork-5.15.2-r14.ebuild | 80 +++++ |
17 |
3 files changed, 448 insertions(+) |
18 |
|
19 |
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest |
20 |
index 6b292bf..bb0067a 100644 |
21 |
--- a/dev-qt/qtnetwork/Manifest |
22 |
+++ b/dev-qt/qtnetwork/Manifest |
23 |
@@ -1,2 +1,3 @@ |
24 |
+DIST qtbase-5.15.2-38ad2f39.tar.gz 67969272 BLAKE2B 9071c96e8162d8141676f63aab82ca61ba29039e79066939fb74501187ae95cca34c924f1105827411f021efca2f40a62b7acde845d0d463604b234a3a8f8370 SHA512 df4f2dce732f62c797f77c266e268097f32a5d7605b3464c9a76d323d8ec069c902994df6afa28823d3c03f5d4ca0295cac47e28773b25e2f9387e3475f52f82 |
25 |
DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc |
26 |
DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 |
27 |
|
28 |
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r14-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r14-libressl.patch |
29 |
new file mode 100644 |
30 |
index 0000000..b0a1aaa |
31 |
--- /dev/null |
32 |
+++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r14-libressl.patch |
33 |
@@ -0,0 +1,367 @@ |
34 |
+From bd917c12865c773b882f45a8ed66735e39b4f013 Mon Sep 17 00:00:00 2001 |
35 |
+From: Stefan Strogin <steils@g.o> |
36 |
+Date: Sat, 28 Nov 2020 06:12:22 +0200 |
37 |
+Subject: [PATCH] QSslSocket: add LibreSSL support |
38 |
+ |
39 |
+Upstream-Status: Inappropriate |
40 |
+[Upstream is not willing to accept any patches for LibreSSL support] |
41 |
+Signed-off-by: Stefan Strogin <steils@g.o> |
42 |
+Signed-off-by: orbea <orbea@××××××.net> |
43 |
+--- |
44 |
+ src/network/ssl/qsslcertificate_openssl.cpp | 2 +- |
45 |
+ src/network/ssl/qsslcontext_openssl.cpp | 15 ++++-- |
46 |
+ src/network/ssl/qsslcontext_openssl_p.h | 7 +++ |
47 |
+ src/network/ssl/qsslsocket_openssl.cpp | 2 +- |
48 |
+ .../ssl/qsslsocket_openssl_symbols.cpp | 29 ++++++++++++ |
49 |
+ .../ssl/qsslsocket_openssl_symbols_p.h | 47 ++++++++++++++++++- |
50 |
+ 6 files changed, 94 insertions(+), 8 deletions(-) |
51 |
+ |
52 |
+diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp |
53 |
+index 5022b899..73be1cf2 100644 |
54 |
+--- a/src/network/ssl/qsslcertificate_openssl.cpp |
55 |
++++ b/src/network/ssl/qsslcertificate_openssl.cpp |
56 |
+@@ -691,7 +691,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name) |
57 |
+ unsigned char *data = nullptr; |
58 |
+ int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e)); |
59 |
+ info.insert(name, QString::fromUtf8((char*)data, size)); |
60 |
+-#if QT_CONFIG(opensslv11) |
61 |
++#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER) |
62 |
+ q_CRYPTO_free(data, nullptr, 0); |
63 |
+ #else |
64 |
+ q_CRYPTO_free(data); |
65 |
+diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp |
66 |
+index d0a428c2..319cfc00 100644 |
67 |
+--- a/src/network/ssl/qsslcontext_openssl.cpp |
68 |
++++ b/src/network/ssl/qsslcontext_openssl.cpp |
69 |
+@@ -77,9 +77,9 @@ extern "C" int q_verify_cookie_callback(SSL *ssl, const unsigned char *cookie, |
70 |
+ } |
71 |
+ #endif // dtls |
72 |
+ |
73 |
+-#ifdef TLS1_3_VERSION |
74 |
++#if defined(TLS1_3_VERSION) && !defined(LIBRESSL_VERSION_NUMBER) |
75 |
+ extern "C" int q_ssl_sess_set_new_cb(SSL *context, SSL_SESSION *session); |
76 |
+-#endif // TLS1_3_VERSION |
77 |
++#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBER |
78 |
+ |
79 |
+ // Defined in qsslsocket.cpp |
80 |
+ QList<QSslCipher> q_getDefaultDtlsCiphers(); |
81 |
+@@ -351,9 +351,11 @@ init_context: |
82 |
+ return; |
83 |
+ } |
84 |
+ |
85 |
++#ifndef LIBRESSL_VERSION_NUMBER |
86 |
+ // A nasty hacked OpenSSL using a level that will make our auto-tests fail: |
87 |
+ if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel()) |
88 |
+ q_SSL_CTX_set_security_level(sslContext->ctx, 1); |
89 |
++#endif // LIBRESSL_VERSION_NUMBER |
90 |
+ |
91 |
+ const long anyVersion = |
92 |
+ #if QT_CONFIG(dtls) |
93 |
+@@ -627,14 +629,14 @@ init_context: |
94 |
+ q_X509Callback); |
95 |
+ } |
96 |
+ |
97 |
+-#ifdef TLS1_3_VERSION |
98 |
++#if defined(TLS1_3_VERSION) && !defined(LIBRESSL_VERSION_NUMBER) |
99 |
+ // NewSessionTicket callback: |
100 |
+ if (mode == QSslSocket::SslClientMode && !isDtls) { |
101 |
+ q_SSL_CTX_sess_set_new_cb(sslContext->ctx, q_ssl_sess_set_new_cb); |
102 |
+ q_SSL_CTX_set_session_cache_mode(sslContext->ctx, SSL_SESS_CACHE_CLIENT); |
103 |
+ } |
104 |
+ |
105 |
+-#endif // TLS1_3_VERSION |
106 |
++#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBER |
107 |
+ |
108 |
+ #if QT_CONFIG(dtls) |
109 |
+ // DTLS cookies: |
110 |
+@@ -722,6 +724,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) |
111 |
+ } |
112 |
+ #endif // ocsp |
113 |
+ |
114 |
++#ifndef LIBRESSL_VERSION_NUMBER |
115 |
+ QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free); |
116 |
+ if (cctx) { |
117 |
+ q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx); |
118 |
+@@ -768,7 +771,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) |
119 |
+ sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed")); |
120 |
+ sslContext->errorCode = QSslError::UnspecifiedError; |
121 |
+ } |
122 |
+- } else { |
123 |
++ } else |
124 |
++#endif // LIBRESSL_VERSION_NUMBER |
125 |
++ { |
126 |
+ sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed")); |
127 |
+ sslContext->errorCode = QSslError::UnspecifiedError; |
128 |
+ } |
129 |
+diff --git a/src/network/ssl/qsslcontext_openssl_p.h b/src/network/ssl/qsslcontext_openssl_p.h |
130 |
+index 70cb97aa..01a61cf5 100644 |
131 |
+--- a/src/network/ssl/qsslcontext_openssl_p.h |
132 |
++++ b/src/network/ssl/qsslcontext_openssl_p.h |
133 |
+@@ -61,6 +61,13 @@ |
134 |
+ |
135 |
+ QT_BEGIN_NAMESPACE |
136 |
+ |
137 |
++#ifndef DTLS_ANY_VERSION |
138 |
++#define DTLS_ANY_VERSION 0x1FFFF |
139 |
++#endif |
140 |
++#ifndef TLS_ANY_VERSION |
141 |
++#define TLS_ANY_VERSION 0x10000 |
142 |
++#endif |
143 |
++ |
144 |
+ #ifndef QT_NO_SSL |
145 |
+ |
146 |
+ class QSslContextPrivate; |
147 |
+diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp |
148 |
+index af47dbf9..f4381efa 100644 |
149 |
+--- a/src/network/ssl/qsslsocket_openssl.cpp |
150 |
++++ b/src/network/ssl/qsslsocket_openssl.cpp |
151 |
+@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext() |
152 |
+ else if (mode == QSslSocket::SslServerMode) |
153 |
+ q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback); |
154 |
+ |
155 |
+-#if OPENSSL_VERSION_NUMBER >= 0x10101006L |
156 |
++#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER) |
157 |
+ // Set the client callback for TLSv1.3 PSK |
158 |
+ if (mode == QSslSocket::SslClientMode |
159 |
+ && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) { |
160 |
+diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp |
161 |
+index 0f48e498..0b47ccde 100644 |
162 |
+--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp |
163 |
++++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp |
164 |
+@@ -145,10 +145,13 @@ DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return |
165 |
+ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) |
166 |
+ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return) |
167 |
+ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return) |
168 |
++#ifdef OPENSSL_NO_DEPRECATED_3_0 |
169 |
+ DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return) |
170 |
+ DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return) |
171 |
+ DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return) |
172 |
++#endif // OPENSSL_NO_DEPRECATED_3_0 |
173 |
+ DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return) |
174 |
++#ifndef LIBRESSL_VERSION_NUMBER |
175 |
+ DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return) |
176 |
+ DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return) |
177 |
+ DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG) |
178 |
+@@ -156,10 +159,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null |
179 |
+ DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG) |
180 |
+ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG) |
181 |
+ DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return) |
182 |
++#else |
183 |
++DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) |
184 |
++DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) |
185 |
++DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return) |
186 |
++DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG) |
187 |
++DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG) |
188 |
++DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return) |
189 |
++#endif // LIBRESSL_VERSION_NUMBER |
190 |
+ DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return) |
191 |
+ DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return) |
192 |
++#ifndef LIBRESSL_VERSION_NUMBER |
193 |
+ DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return) |
194 |
+ DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return) |
195 |
++#endif // LIBRESSL_VERSION_NUMBER |
196 |
+ #ifdef TLS1_3_VERSION |
197 |
+ DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return) |
198 |
+ DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG) |
199 |
+@@ -183,7 +196,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver |
200 |
+ DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return) |
201 |
+ DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return) |
202 |
+ DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return) |
203 |
++#ifndef LIBRESSL_VERSION_NUMBER |
204 |
+ DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG) |
205 |
++#else |
206 |
++DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) |
207 |
++#endif |
208 |
+ DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return) |
209 |
+ DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return) |
210 |
+ DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return) |
211 |
+@@ -223,7 +240,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash, |
212 |
+ ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid, |
213 |
+ return 0, return) |
214 |
+ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return) |
215 |
++#ifndef LIBRESSL_VERSION_NUMBER |
216 |
+ DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return) |
217 |
++#endif |
218 |
+ DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return) |
219 |
+ DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s, |
220 |
+ int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return) |
221 |
+@@ -355,12 +374,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return - |
222 |
+ DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) |
223 |
+ DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) |
224 |
+ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) |
225 |
++#ifndef LIBRESSL_VERSION_NUMBER |
226 |
+ DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return); |
227 |
+ DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return); |
228 |
+ DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return); |
229 |
+ DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return); |
230 |
+ DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return); |
231 |
+ DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return); |
232 |
++#endif |
233 |
+ DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG) |
234 |
+ DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return) |
235 |
+ DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return) |
236 |
+@@ -850,9 +871,11 @@ bool q_resolveOpenSslSymbols() |
237 |
+ RESOLVEFUNC(ASN1_STRING_get0_data) |
238 |
+ RESOLVEFUNC(EVP_CIPHER_CTX_reset) |
239 |
+ RESOLVEFUNC(EVP_PKEY_up_ref) |
240 |
++#ifdef OPENSSL_NO_DEPRECATED_3_0 |
241 |
+ RESOLVEFUNC(EVP_PKEY_CTX_new) |
242 |
+ RESOLVEFUNC(EVP_PKEY_param_check) |
243 |
+ RESOLVEFUNC(EVP_PKEY_CTX_free) |
244 |
++#endif // OPENSSL_NO_DEPRECATED_3_0 |
245 |
+ RESOLVEFUNC(RSA_bits) |
246 |
+ RESOLVEFUNC(OPENSSL_sk_new_null) |
247 |
+ RESOLVEFUNC(OPENSSL_sk_push) |
248 |
+@@ -902,7 +925,9 @@ bool q_resolveOpenSslSymbols() |
249 |
+ |
250 |
+ RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint) |
251 |
+ RESOLVEFUNC(DH_bits) |
252 |
++#ifndef LIBRESSL_VERSION_NUMBER |
253 |
+ RESOLVEFUNC(DSA_bits) |
254 |
++#endif |
255 |
+ |
256 |
+ #if QT_CONFIG(dtls) |
257 |
+ RESOLVEFUNC(DTLSv1_listen) |
258 |
+@@ -932,7 +957,9 @@ bool q_resolveOpenSslSymbols() |
259 |
+ RESOLVEFUNC(OCSP_check_validity) |
260 |
+ RESOLVEFUNC(OCSP_cert_to_id) |
261 |
+ RESOLVEFUNC(OCSP_id_get0_info) |
262 |
++#ifndef LIBRESSL_VERSION_NUMBER |
263 |
+ RESOLVEFUNC(OCSP_resp_get0_certs) |
264 |
++#endif |
265 |
+ RESOLVEFUNC(OCSP_basic_sign) |
266 |
+ RESOLVEFUNC(OCSP_response_create) |
267 |
+ RESOLVEFUNC(i2d_OCSP_RESPONSE) |
268 |
+@@ -1062,12 +1089,14 @@ bool q_resolveOpenSslSymbols() |
269 |
+ RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey) |
270 |
+ RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) |
271 |
+ RESOLVEFUNC(SSL_CTX_get_cert_store); |
272 |
++#ifndef LIBRESSL_VERSION_NUMBER |
273 |
+ RESOLVEFUNC(SSL_CONF_CTX_new); |
274 |
+ RESOLVEFUNC(SSL_CONF_CTX_free); |
275 |
+ RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx); |
276 |
+ RESOLVEFUNC(SSL_CONF_CTX_set_flags); |
277 |
+ RESOLVEFUNC(SSL_CONF_CTX_finish); |
278 |
+ RESOLVEFUNC(SSL_CONF_cmd); |
279 |
++#endif |
280 |
+ RESOLVEFUNC(SSL_accept) |
281 |
+ RESOLVEFUNC(SSL_clear) |
282 |
+ RESOLVEFUNC(SSL_connect) |
283 |
+diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h |
284 |
+index b36d0bc1..99412bf2 100644 |
285 |
+--- a/src/network/ssl/qsslsocket_openssl_symbols_p.h |
286 |
++++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h |
287 |
+@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE |
288 |
+ |
289 |
+ #define DUMMYARG |
290 |
+ |
291 |
++#ifdef LIBRESSL_VERSION_NUMBER |
292 |
++typedef _STACK STACK; |
293 |
++typedef STACK OPENSSL_STACK; |
294 |
++typedef void OPENSSL_INIT_SETTINGS; |
295 |
++typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx); |
296 |
++#endif |
297 |
++ |
298 |
+ #if !defined QT_LINKED_OPENSSL |
299 |
+ // **************** Shared declarations ****************** |
300 |
+ // ret func(arg) |
301 |
+@@ -230,19 +237,42 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x); |
302 |
+ Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a); |
303 |
+ Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem(); |
304 |
+ |
305 |
+-int q_DSA_bits(DSA *a); |
306 |
++#ifndef LIBRESSL_VERSION_NUMBER |
307 |
++int q_DSA_bits(DSA *a);o#else |
308 |
++#else |
309 |
++#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p) |
310 |
++#endif |
311 |
+ int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c); |
312 |
+ Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a); |
313 |
++#ifdef OPENSSL_NO_DEPRECATED_3_0 |
314 |
+ EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e); |
315 |
+ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx); |
316 |
++#endif // OPENSSL_NO_DEPRECATED_3_0 |
317 |
+ int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx); |
318 |
+ int q_RSA_bits(RSA *a); |
319 |
++ |
320 |
++#ifndef LIBRESSL_VERSION_NUMBER |
321 |
+ Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a); |
322 |
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *)); |
323 |
+ Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null(); |
324 |
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data); |
325 |
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a); |
326 |
+ Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b); |
327 |
++#else // LIBRESSL_VERSION_NUMBER |
328 |
++int q_sk_num(STACK *a); |
329 |
++#define q_OPENSSL_sk_num(a) q_sk_num(a) |
330 |
++void q_sk_pop_free(STACK *a, void (*b)(void *)); |
331 |
++#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b) |
332 |
++STACK *q_sk_new_null(); |
333 |
++#define q_OPENSSL_sk_new_null() q_sk_new_null() |
334 |
++void q_sk_push(STACK *st, void *data); |
335 |
++#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data) |
336 |
++void q_sk_free(STACK *a); |
337 |
++#define q_OPENSSL_sk_free q_sk_free |
338 |
++void *q_sk_value(STACK *a, int b); |
339 |
++#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b) |
340 |
++#endif // LIBRESSL_VERSION_NUMBER |
341 |
++ |
342 |
+ int q_SSL_session_reused(SSL *a); |
343 |
+ unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op); |
344 |
+ int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); |
345 |
+@@ -268,8 +298,13 @@ int q_DH_bits(DH *dh); |
346 |
+ # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \ |
347 |
+ | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL) |
348 |
+ |
349 |
++#ifndef LIBRESSL_VERSION_NUMBER |
350 |
+ #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st) |
351 |
+ #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i) |
352 |
++#else |
353 |
++#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st) |
354 |
++#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i) |
355 |
++#endif // LIBRESSL_VERSION_NUMBER |
356 |
+ |
357 |
+ #define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ |
358 |
+ | OPENSSL_INIT_ADD_ALL_DIGESTS \ |
359 |
+@@ -278,7 +313,11 @@ int q_DH_bits(DH *dh); |
360 |
+ | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL) |
361 |
+ |
362 |
+ int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); |
363 |
++#ifndef LIBRESSL_VERSION_NUMBER |
364 |
+ void q_CRYPTO_free(void *str, const char *file, int line); |
365 |
++#else |
366 |
++void q_CRYPTO_free(void *a); |
367 |
++#endif |
368 |
+ |
369 |
+ long q_OpenSSL_version_num(); |
370 |
+ const char *q_OpenSSL_version(int type); |
371 |
+@@ -496,12 +535,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b); |
372 |
+ int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b); |
373 |
+ int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c); |
374 |
+ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a); |
375 |
++#ifndef LIBRESSL_VERSION_NUMBER |
376 |
+ SSL_CONF_CTX *q_SSL_CONF_CTX_new(); |
377 |
+ void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a); |
378 |
+ void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b); |
379 |
+ unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b); |
380 |
+ int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a); |
381 |
+ int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c); |
382 |
++#endif |
383 |
+ void q_SSL_free(SSL *a); |
384 |
+ STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a); |
385 |
+ const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a); |
386 |
+@@ -723,7 +764,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n |
387 |
+ int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash, |
388 |
+ ASN1_INTEGER **pserial, OCSP_CERTID *cid); |
389 |
+ |
390 |
++#ifndef LIBRESSL_VERSION_NUMBER |
391 |
+ const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs); |
392 |
++#else |
393 |
++#define q_OCSP_resp_get0_certs(bs) ((bs)->certs) |
394 |
++#endif |
395 |
+ Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer); |
396 |
+ Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid); |
397 |
+ int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b); |
398 |
+-- |
399 |
+2.34.1 |
400 |
+ |
401 |
|
402 |
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r14.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r14.ebuild |
403 |
new file mode 100644 |
404 |
index 0000000..8ac35cf |
405 |
--- /dev/null |
406 |
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.2-r14.ebuild |
407 |
@@ -0,0 +1,80 @@ |
408 |
+# Copyright 1999-2022 Gentoo Authors |
409 |
+# Distributed under the terms of the GNU General Public License v2 |
410 |
+ |
411 |
+EAPI=8 |
412 |
+ |
413 |
+KDE_ORG_COMMIT=38ad2f39daec09168728033969265834b6a2d924 |
414 |
+QT5_MODULE="qtbase" |
415 |
+inherit qt5-build |
416 |
+ |
417 |
+DESCRIPTION="Network abstraction library for the Qt5 framework" |
418 |
+ |
419 |
+if [[ ${QT5_BUILD_TYPE} == release ]]; then |
420 |
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" |
421 |
+fi |
422 |
+ |
423 |
+IUSE="connman dtls gssapi libproxy networkmanager sctp +ssl" |
424 |
+REQUIRED_USE="!dtls" |
425 |
+ |
426 |
+DEPEND=" |
427 |
+ =dev-qt/qtcore-${QT5_PV}*:5= |
428 |
+ sys-libs/zlib:= |
429 |
+ connman? ( =dev-qt/qtdbus-${QT5_PV}* ) |
430 |
+ gssapi? ( virtual/krb5 ) |
431 |
+ libproxy? ( net-libs/libproxy ) |
432 |
+ networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* ) |
433 |
+ sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) |
434 |
+ ssl? ( >=dev-libs/openssl-1.1.1:0= ) |
435 |
+" |
436 |
+RDEPEND="${DEPEND} |
437 |
+ connman? ( net-misc/connman ) |
438 |
+ networkmanager? ( net-misc/networkmanager ) |
439 |
+" |
440 |
+ |
441 |
+QT5_TARGET_SUBDIRS=( |
442 |
+ src/network |
443 |
+ src/plugins/bearer/generic |
444 |
+) |
445 |
+ |
446 |
+QT5_GENTOO_CONFIG=( |
447 |
+ libproxy:libproxy: |
448 |
+ ssl::SSL |
449 |
+ ssl::OPENSSL |
450 |
+ ssl:openssl-linked:LINKED_OPENSSL |
451 |
+) |
452 |
+ |
453 |
+QT5_GENTOO_PRIVATE_CONFIG=( |
454 |
+ :network |
455 |
+) |
456 |
+ |
457 |
+PATCHES=( |
458 |
+ "${FILESDIR}"/${PN}-5.15.2-r14-libressl.patch # Bug 562050, not upstreamable |
459 |
+) |
460 |
+ |
461 |
+pkg_setup() { |
462 |
+ use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) |
463 |
+ use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) |
464 |
+} |
465 |
+ |
466 |
+src_configure() { |
467 |
+ local myconf=( |
468 |
+ $(usev connman -dbus-linked) |
469 |
+ $(qt_use gssapi feature-gssapi) |
470 |
+ $(qt_use libproxy) |
471 |
+ $(usev networkmanager -dbus-linked) |
472 |
+ $(qt_use sctp) |
473 |
+ $(qt_use dtls) |
474 |
+ $(usev ssl -openssl-linked) |
475 |
+ ) |
476 |
+ qt5-build_src_configure |
477 |
+} |
478 |
+ |
479 |
+src_install() { |
480 |
+ qt5-build_src_install |
481 |
+ |
482 |
+ # workaround for bug 652650 |
483 |
+ if use ssl; then |
484 |
+ sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ |
485 |
+ -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die |
486 |
+ fi |
487 |
+} |