Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 558324 Details for
Bug 562050
dev-qt/qtnetwork add libressl support
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
my patch to compile dev-qt/qtnetwork-5.12.9999::qt against dev-libs/libressl-2.9.0
qtnetwork-5.12-libressl-2.9.patch (text/plain), 4.69 KB, created by
jospezial
on 2018-12-22 03:14:45 UTC
(
hide
)
Description:
my patch to compile dev-qt/qtnetwork-5.12.9999::qt against dev-libs/libressl-2.9.0
Filename:
MIME Type:
Creator:
jospezial
Created:
2018-12-22 03:14:45 UTC
Size:
4.69 KB
patch
obsolete
>diff --git a/src/network/configure.json b/src/network/configure.json >index 10c4f87a2e..62d2ff4a56 100644 >--- a/src/network/configure.json >+++ b/src/network/configure.json >@@ -165,7 +165,7 @@ > "test": { > "include": "openssl/opensslv.h", > "tail": [ >- "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L", >+ "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)", > "# error OpenSSL >= 1.1 is required", > "#endif" > ] > > > >diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp >index 35cca9f01a..03afdc5945 100644 >--- a/src/network/ssl/qsslcontext_openssl.cpp >+++ b/src/network/ssl/qsslcontext_openssl.cpp >@@ -249,7 +249,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) > if (sslContext->sslConfiguration.backendConfiguration().isEmpty()) > return; > >-#if OPENSSL_VERSION_NUMBER >= 0x10002000L >+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) > if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) { > QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free); > if (cctx) { >diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp >index 781b3d6640..51ca1eed0f 100644 >--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp >+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp >@@ -214,8 +214,8 @@ DEFINEFUNC3(void *, ASN1_dup, i2d_of_void *a, a, d2i_of_void *b, b, char *c, c, > #endif > DEFINEFUNC2(BIO *, BIO_new_file, const char *filename, filename, const char *mode, mode, return nullptr, return) > DEFINEFUNC(void, ERR_clear_error, DUMMYARG, DUMMYARG, return, DUMMYARG) >-DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return nullptr, return) >-DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return) >+DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return nullptr, return) >+DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return) > DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return) > DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG) > DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG) >@@ -441,7 +441,7 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return - > DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) > DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) > DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) >-#if OPENSSL_VERSION_NUMBER >= 0x10002000L >+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) > DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return); > DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return); > DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return); >diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h >index bfdfbf0efc..ad2bd4056b 100644 >--- a/src/network/ssl/qsslsocket_openssl_symbols_p.h >+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h >@@ -359,7 +359,7 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b); > int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b); > int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c); > X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a); >-#if OPENSSL_VERSION_NUMBER >= 0x10002000L >+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) > SSL_CONF_CTX *q_SSL_CONF_CTX_new(); > void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a); > void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b); >diff --git a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h >index b7bac5d2a2..034038e7a4 100644 >--- a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h >+++ b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h >@@ -78,8 +78,8 @@ > unsigned char * q_ASN1_STRING_data(ASN1_STRING *a); > BIO *q_BIO_new_file(const char *filename, const char *mode); > void q_ERR_clear_error(); >-Q_AUTOTEST_EXPORT BIO *q_BIO_new(BIO_METHOD *a); >-Q_AUTOTEST_EXPORT BIO_METHOD *q_BIO_s_mem(); >+Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a); >+Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem(); > int q_CRYPTO_num_locks(); > void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int)); > void q_CRYPTO_set_id_callback(unsigned long (*a)());
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 562050
:
413512
|
413514
|
414236
|
428320
|
430294
|
430296
|
437876
|
462288
|
502750
|
502766
|
502770
|
502778
|
529810
|
554572
|
554574
|
555740
|
558324
|
580336
|
663100