| 1 |
commit: 905e47b8328eec88fd9b02fa71934ed0aeb729d2 |
| 2 |
Author: orbea <orbea <AT> riseup <DOT> net> |
| 3 |
AuthorDate: Wed Nov 30 19:37:00 2022 +0000 |
| 4 |
Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com> |
| 5 |
CommitDate: Thu Dec 1 18:18:57 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=905e47b8 |
| 7 |
|
| 8 |
dev-qt/qtnetwork: Add 5.15.7 |
| 9 |
|
| 10 |
The patch was rebased and trimmed down from the 5.15.5 version. |
| 11 |
|
| 12 |
Signed-off-by: orbea <orbea <AT> riseup.net> |
| 13 |
Closes: https://github.com/gentoo/libressl/pull/478 |
| 14 |
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com> |
| 15 |
|
| 16 |
dev-qt/qtnetwork/Manifest | 5 +- |
| 17 |
.../files/qtnetwork-5.15.7-libressl.patch | 253 +++++++++++++++++++++ |
| 18 |
dev-qt/qtnetwork/qtnetwork-5.15.7.ebuild | 79 +++++++ |
| 19 |
3 files changed, 335 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest |
| 22 |
index 271f1b4..fa3592d 100644 |
| 23 |
--- a/dev-qt/qtnetwork/Manifest |
| 24 |
+++ b/dev-qt/qtnetwork/Manifest |
| 25 |
@@ -1,5 +1,6 @@ |
| 26 |
DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f |
| 27 |
-DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373 |
| 28 |
+DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497 |
| 29 |
DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7 |
| 30 |
-DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3 |
| 31 |
+DIST qtbase-5.15.7-gentoo-kde-1.tar.xz 798056 BLAKE2B 3c7fefa65ab6de25c2c82261ad0f1371e32acd4bd4b3303f20a5ebf36d19690df94290d102c65e4941a6c51a5d5f2db0253bafca5ac85cf480f7434405cb2671 SHA512 20ab17220489009c98d7f783a02614507e157974c7cb16f47d50d3954ccd1cd065562effc393df6e07c9ba6ad8ccd4e6b3f0bf5b5b890183b8631b8b570bf064 |
| 32 |
DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87 |
| 33 |
+DIST qtbase-everywhere-opensource-src-5.15.7.tar.xz 50260196 BLAKE2B 69029a910af0e3bfe742b5870334406e03274b0677ef47f9c7c10f730ff031bae49bd21a686497215505b19a183ca395c275d8afefaaa903125297f8e693bb4d SHA512 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343 |
| 34 |
|
| 35 |
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.7-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.7-libressl.patch |
| 36 |
new file mode 100644 |
| 37 |
index 0000000..c9e7653 |
| 38 |
--- /dev/null |
| 39 |
+++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.7-libressl.patch |
| 40 |
@@ -0,0 +1,253 @@ |
| 41 |
+From 282db75a652b230c83b3d99954b7a3fc2f6ae64c Mon Sep 17 00:00:00 2001 |
| 42 |
+From: Stefan Strogin <steils@g.o> |
| 43 |
+Date: Wed, 30 Nov 2022 10:58:50 -0800 |
| 44 |
+Subject: [PATCH] QSslSocket: add LibreSSL support |
| 45 |
+ |
| 46 |
+Upstream-Status: Inappropriate |
| 47 |
+[Upstream is not willing to accept any patches for LibreSSL support] |
| 48 |
+ |
| 49 |
+diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp |
| 50 |
+index d1794d4d..1f1aa5ed 100644 |
| 51 |
+--- a/src/network/ssl/qsslcertificate_openssl.cpp |
| 52 |
++++ b/src/network/ssl/qsslcertificate_openssl.cpp |
| 53 |
+@@ -727,7 +727,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name) |
| 54 |
+ unsigned char *data = nullptr; |
| 55 |
+ int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e)); |
| 56 |
+ info.insert(name, QString::fromUtf8((char*)data, size)); |
| 57 |
+-#if QT_CONFIG(opensslv11) |
| 58 |
++#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER) |
| 59 |
+ q_CRYPTO_free(data, nullptr, 0); |
| 60 |
+ #else |
| 61 |
+ q_CRYPTO_free(data); |
| 62 |
+diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp |
| 63 |
+index c992da9d..f659255a 100644 |
| 64 |
+--- a/src/network/ssl/qsslcontext_openssl.cpp |
| 65 |
++++ b/src/network/ssl/qsslcontext_openssl.cpp |
| 66 |
+@@ -77,9 +77,9 @@ extern "C" int q_verify_cookie_callback(SSL *ssl, const unsigned char *cookie, |
| 67 |
+ } |
| 68 |
+ #endif // dtls |
| 69 |
+ |
| 70 |
+-#ifdef TLS1_3_VERSION |
| 71 |
++#if defined(TLS1_3_VERSION) && !defined(LIBRESSL_VERSION_NUMBER) |
| 72 |
+ extern "C" int q_ssl_sess_set_new_cb(SSL *context, SSL_SESSION *session); |
| 73 |
+-#endif // TLS1_3_VERSION |
| 74 |
++#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBER |
| 75 |
+ |
| 76 |
+ // Defined in qsslsocket.cpp |
| 77 |
+ QList<QSslCipher> q_getDefaultDtlsCiphers(); |
| 78 |
+@@ -351,9 +351,11 @@ init_context: |
| 79 |
+ return; |
| 80 |
+ } |
| 81 |
+ |
| 82 |
++#ifndef LIBRESSL_VERSION_NUMBER |
| 83 |
+ // A nasty hacked OpenSSL using a level that will make our auto-tests fail: |
| 84 |
+ if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel()) |
| 85 |
+ q_SSL_CTX_set_security_level(sslContext->ctx, 1); |
| 86 |
++#endif // LIBRESSL_VERSION_NUMBER |
| 87 |
+ |
| 88 |
+ const long anyVersion = |
| 89 |
+ #if QT_CONFIG(dtls) |
| 90 |
+@@ -627,14 +629,14 @@ init_context: |
| 91 |
+ q_X509Callback); |
| 92 |
+ } |
| 93 |
+ |
| 94 |
+-#ifdef TLS1_3_VERSION |
| 95 |
++#if defined(TLS1_3_VERSION) && !defined(LIBRESSL_VERSION_NUMBER) |
| 96 |
+ // NewSessionTicket callback: |
| 97 |
+ if (mode == QSslSocket::SslClientMode && !isDtls) { |
| 98 |
+ q_SSL_CTX_sess_set_new_cb(sslContext->ctx, q_ssl_sess_set_new_cb); |
| 99 |
+ q_SSL_CTX_set_session_cache_mode(sslContext->ctx, SSL_SESS_CACHE_CLIENT); |
| 100 |
+ } |
| 101 |
+ |
| 102 |
+-#endif // TLS1_3_VERSION |
| 103 |
++#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBER |
| 104 |
+ |
| 105 |
+ #if QT_CONFIG(dtls) |
| 106 |
+ // DTLS cookies: |
| 107 |
+@@ -722,6 +724,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) |
| 108 |
+ } |
| 109 |
+ #endif // ocsp |
| 110 |
+ |
| 111 |
++#ifndef LIBRESSL_VERSION_NUMBER |
| 112 |
+ QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free); |
| 113 |
+ if (cctx) { |
| 114 |
+ q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx); |
| 115 |
+@@ -768,7 +771,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) |
| 116 |
+ sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed")); |
| 117 |
+ sslContext->errorCode = QSslError::UnspecifiedError; |
| 118 |
+ } |
| 119 |
+- } else { |
| 120 |
++ } else |
| 121 |
++#endif // LIBRESSL_VERSION_NUMBER |
| 122 |
++ { |
| 123 |
+ sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed")); |
| 124 |
+ sslContext->errorCode = QSslError::UnspecifiedError; |
| 125 |
+ } |
| 126 |
+diff --git a/src/network/ssl/qsslcontext_openssl_p.h b/src/network/ssl/qsslcontext_openssl_p.h |
| 127 |
+index 70cb97aa..01a61cf5 100644 |
| 128 |
+--- a/src/network/ssl/qsslcontext_openssl_p.h |
| 129 |
++++ b/src/network/ssl/qsslcontext_openssl_p.h |
| 130 |
+@@ -61,6 +61,13 @@ |
| 131 |
+ |
| 132 |
+ QT_BEGIN_NAMESPACE |
| 133 |
+ |
| 134 |
++#ifndef DTLS_ANY_VERSION |
| 135 |
++#define DTLS_ANY_VERSION 0x1FFFF |
| 136 |
++#endif |
| 137 |
++#ifndef TLS_ANY_VERSION |
| 138 |
++#define TLS_ANY_VERSION 0x10000 |
| 139 |
++#endif |
| 140 |
++ |
| 141 |
+ #ifndef QT_NO_SSL |
| 142 |
+ |
| 143 |
+ class QSslContextPrivate; |
| 144 |
+diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp |
| 145 |
+index d9742fd6..fac28b5c 100644 |
| 146 |
+--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp |
| 147 |
++++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp |
| 148 |
+@@ -150,16 +150,27 @@ DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return) |
| 149 |
+ DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return) |
| 150 |
+ DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return) |
| 151 |
+ DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return) |
| 152 |
++#ifndef LIBRESSL_VERSION_NUMBER |
| 153 |
+ DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return) |
| 154 |
+ DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG) |
| 155 |
+ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return) |
| 156 |
+ DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG) |
| 157 |
+ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG) |
| 158 |
+ DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return) |
| 159 |
++#else |
| 160 |
++DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) |
| 161 |
++DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) |
| 162 |
++DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return) |
| 163 |
++DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG) |
| 164 |
++DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG) |
| 165 |
++DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return) |
| 166 |
++#endif // LIBRESSL_VERSION_NUMBER |
| 167 |
+ DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return) |
| 168 |
+ DEFINEFUNC2(qssloptions, SSL_CTX_set_options, SSL_CTX *ctx, ctx, qssloptions op, op, return 0, return) |
| 169 |
++#ifndef LIBRESSL_VERSION_NUMBER |
| 170 |
+ DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return) |
| 171 |
+ DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return) |
| 172 |
++#endif // LIBRESSL_VERSION_NUMBER |
| 173 |
+ #ifdef TLS1_3_VERSION |
| 174 |
+ DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return) |
| 175 |
+ DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG) |
| 176 |
+@@ -185,7 +196,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver |
| 177 |
+ DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return) |
| 178 |
+ DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return) |
| 179 |
+ DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return) |
| 180 |
++#ifndef LIBRESSL_VERSION_NUMBER |
| 181 |
+ DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG) |
| 182 |
++#else |
| 183 |
++DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) |
| 184 |
++#endif |
| 185 |
+ DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return) |
| 186 |
+ DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return) |
| 187 |
+ DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return) |
| 188 |
+@@ -358,12 +373,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return - |
| 189 |
+ DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) |
| 190 |
+ DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) |
| 191 |
+ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) |
| 192 |
++#ifndef LIBRESSL_VERSION_NUMBER |
| 193 |
+ DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return); |
| 194 |
+ DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return); |
| 195 |
+ DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return); |
| 196 |
+ DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return); |
| 197 |
+ DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return); |
| 198 |
+ DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return); |
| 199 |
++#endif |
| 200 |
+ DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG) |
| 201 |
+ DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return) |
| 202 |
+ DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return) |
| 203 |
+@@ -1089,12 +1106,14 @@ bool q_resolveOpenSslSymbols() |
| 204 |
+ RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey) |
| 205 |
+ RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) |
| 206 |
+ RESOLVEFUNC(SSL_CTX_get_cert_store); |
| 207 |
++#ifndef LIBRESSL_VERSION_NUMBER |
| 208 |
+ RESOLVEFUNC(SSL_CONF_CTX_new); |
| 209 |
+ RESOLVEFUNC(SSL_CONF_CTX_free); |
| 210 |
+ RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx); |
| 211 |
+ RESOLVEFUNC(SSL_CONF_CTX_set_flags); |
| 212 |
+ RESOLVEFUNC(SSL_CONF_CTX_finish); |
| 213 |
+ RESOLVEFUNC(SSL_CONF_cmd); |
| 214 |
++#endif |
| 215 |
+ RESOLVEFUNC(SSL_accept) |
| 216 |
+ RESOLVEFUNC(SSL_clear) |
| 217 |
+ RESOLVEFUNC(SSL_connect) |
| 218 |
+diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h |
| 219 |
+index 27aeffa1..32a21221 100644 |
| 220 |
+--- a/src/network/ssl/qsslsocket_openssl_symbols_p.h |
| 221 |
++++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h |
| 222 |
+@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE |
| 223 |
+ |
| 224 |
+ #define DUMMYARG |
| 225 |
+ |
| 226 |
++#ifdef LIBRESSL_VERSION_NUMBER |
| 227 |
++typedef _STACK STACK; |
| 228 |
++typedef STACK OPENSSL_STACK; |
| 229 |
++typedef void OPENSSL_INIT_SETTINGS; |
| 230 |
++typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx); |
| 231 |
++#endif |
| 232 |
++ |
| 233 |
+ #if !defined QT_LINKED_OPENSSL |
| 234 |
+ // **************** Shared declarations ****************** |
| 235 |
+ // ret func(arg) |
| 236 |
+@@ -238,12 +245,28 @@ EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e); |
| 237 |
+ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx); |
| 238 |
+ int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx); |
| 239 |
+ int q_RSA_bits(RSA *a); |
| 240 |
++#ifndef LIBRESSL_VERSION_NUMBER |
| 241 |
+ Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a); |
| 242 |
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *)); |
| 243 |
+ Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null(); |
| 244 |
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data); |
| 245 |
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a); |
| 246 |
+ Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b); |
| 247 |
++#else // LIBRESSL_VERSION_NUMBER |
| 248 |
++int q_sk_num(STACK *a); |
| 249 |
++#define q_OPENSSL_sk_num(a) q_sk_num(a) |
| 250 |
++void q_sk_pop_free(STACK *a, void (*b)(void *)); |
| 251 |
++#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b) |
| 252 |
++STACK *q_sk_new_null(); |
| 253 |
++#define q_OPENSSL_sk_new_null() q_sk_new_null() |
| 254 |
++void q_sk_push(STACK *st, void *data); |
| 255 |
++#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data) |
| 256 |
++void q_sk_free(STACK *a); |
| 257 |
++#define q_OPENSSL_sk_free q_sk_free |
| 258 |
++void *q_sk_value(STACK *a, int b); |
| 259 |
++#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b) |
| 260 |
++#endif // LIBRESSL_VERSION_NUMBER |
| 261 |
++ |
| 262 |
+ int q_SSL_session_reused(SSL *a); |
| 263 |
+ qssloptions q_SSL_CTX_set_options(SSL_CTX *ctx, qssloptions op); |
| 264 |
+ int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); |
| 265 |
+@@ -497,12 +520,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b); |
| 266 |
+ int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b); |
| 267 |
+ int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c); |
| 268 |
+ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a); |
| 269 |
++#ifndef LIBRESSL_VERSION_NUMBER |
| 270 |
+ SSL_CONF_CTX *q_SSL_CONF_CTX_new(); |
| 271 |
+ void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a); |
| 272 |
+ void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b); |
| 273 |
+ unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b); |
| 274 |
+ int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a); |
| 275 |
+ int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c); |
| 276 |
++#endif // LIBRESSL_VERSION_NUMBER |
| 277 |
+ void q_SSL_free(SSL *a); |
| 278 |
+ STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a); |
| 279 |
+ const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a); |
| 280 |
+@@ -743,8 +768,13 @@ int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b); |
| 281 |
+ |
| 282 |
+ void *q_CRYPTO_malloc(size_t num, const char *file, int line); |
| 283 |
+ #define q_OPENSSL_malloc(num) q_CRYPTO_malloc(num, "", 0) |
| 284 |
++#ifndef LIBRESSL_VERSION_NUMBER |
| 285 |
+ void q_CRYPTO_free(void *str, const char *file, int line); |
| 286 |
+ #define q_OPENSSL_free(addr) q_CRYPTO_free(addr, "", 0) |
| 287 |
++#else // LIBRESSL_VERSION_NUMBER |
| 288 |
++void q_CRYPTO_free(void *a); |
| 289 |
++#define q_OPENSSL_free(addr) q_CRYPTO_free(addr) |
| 290 |
++#endif // LIBRESSL_VERSION_NUMBER |
| 291 |
+ |
| 292 |
+ int q_SSL_CTX_get_security_level(const SSL_CTX *ctx); |
| 293 |
+ void q_SSL_CTX_set_security_level(SSL_CTX *ctx, int level); |
| 294 |
|
| 295 |
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.7.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.7.ebuild |
| 296 |
new file mode 100644 |
| 297 |
index 0000000..ce836b8 |
| 298 |
--- /dev/null |
| 299 |
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.7.ebuild |
| 300 |
@@ -0,0 +1,79 @@ |
| 301 |
+# Copyright 1999-2022 Gentoo Authors |
| 302 |
+# Distributed under the terms of the GNU General Public License v2 |
| 303 |
+ |
| 304 |
+EAPI=8 |
| 305 |
+ |
| 306 |
+if [[ ${PV} != *9999* ]]; then |
| 307 |
+ QT5_KDEPATCHSET_REV=1 |
| 308 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" |
| 309 |
+fi |
| 310 |
+ |
| 311 |
+QT5_MODULE="qtbase" |
| 312 |
+inherit qt5-build |
| 313 |
+ |
| 314 |
+DESCRIPTION="Network abstraction library for the Qt5 framework" |
| 315 |
+ |
| 316 |
+IUSE="connman gssapi libproxy networkmanager sctp +ssl" |
| 317 |
+ |
| 318 |
+DEPEND=" |
| 319 |
+ =dev-qt/qtcore-${QT5_PV}*:5= |
| 320 |
+ sys-libs/zlib:= |
| 321 |
+ connman? ( =dev-qt/qtdbus-${QT5_PV}* ) |
| 322 |
+ gssapi? ( virtual/krb5 ) |
| 323 |
+ libproxy? ( net-libs/libproxy ) |
| 324 |
+ networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* ) |
| 325 |
+ sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) |
| 326 |
+ ssl? ( >=dev-libs/openssl-1.1.1:0= ) |
| 327 |
+" |
| 328 |
+RDEPEND="${DEPEND} |
| 329 |
+ connman? ( net-misc/connman ) |
| 330 |
+ networkmanager? ( net-misc/networkmanager ) |
| 331 |
+" |
| 332 |
+ |
| 333 |
+QT5_TARGET_SUBDIRS=( |
| 334 |
+ src/network |
| 335 |
+ src/plugins/bearer/generic |
| 336 |
+) |
| 337 |
+ |
| 338 |
+QT5_GENTOO_CONFIG=( |
| 339 |
+ libproxy:libproxy: |
| 340 |
+ ssl::SSL |
| 341 |
+ ssl::OPENSSL |
| 342 |
+ ssl:openssl-linked:LINKED_OPENSSL |
| 343 |
+) |
| 344 |
+ |
| 345 |
+QT5_GENTOO_PRIVATE_CONFIG=( |
| 346 |
+ :network |
| 347 |
+) |
| 348 |
+ |
| 349 |
+PATCHES=( |
| 350 |
+ "${FILESDIR}"/${PN}-5.15.7-libressl.patch # Bug 562050, not upstreamable |
| 351 |
+) |
| 352 |
+ |
| 353 |
+pkg_setup() { |
| 354 |
+ use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) |
| 355 |
+ use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) |
| 356 |
+} |
| 357 |
+ |
| 358 |
+src_configure() { |
| 359 |
+ local myconf=( |
| 360 |
+ $(usev connman -dbus-linked) |
| 361 |
+ $(qt_use gssapi feature-gssapi) |
| 362 |
+ $(qt_use libproxy) |
| 363 |
+ $(usev networkmanager -dbus-linked) |
| 364 |
+ $(qt_use sctp) |
| 365 |
+ $(usev ssl -openssl-linked) |
| 366 |
+ -no-dtls # Required for libressl |
| 367 |
+ ) |
| 368 |
+ qt5-build_src_configure |
| 369 |
+} |
| 370 |
+ |
| 371 |
+src_install() { |
| 372 |
+ qt5-build_src_install |
| 373 |
+ |
| 374 |
+ # workaround for bug 652650 |
| 375 |
+ if use ssl; then |
| 376 |
+ sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ |
| 377 |
+ -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die |
| 378 |
+ fi |
| 379 |
+} |
Archives