FreeBSD Bugzilla – Attachment 196524 Details for
Bug 230884
Update Qt5 to 5.11.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Updated svn diff for net/qt5-network
patch-net_qt5-network-5.11.1 (text/plain), 19.27 KB, created by
Bernard Spil
on 2018-08-25 11:52:57 UTC
(
hide
)
Description:
Updated svn diff for net/qt5-network
Filename:
MIME Type:
Creator:
Bernard Spil
Created:
2018-08-25 11:52:57 UTC
Size:
19.27 KB
patch
obsolete
>Index: net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp >=================================================================== >--- net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp (nonexistent) >+++ net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp (working copy) >@@ -0,0 +1,12 @@ >+--- src/network/kernel/qnetworkinterface_unix.cpp.orig 2018-06-15 07:29:31 UTC >++++ src/network/kernel/qnetworkinterface_unix.cpp >+@@ -463,9 +463,6 @@ static QNetworkInterface::InterfaceType probeIfType(in >+ case IFM_ETHER: >+ return QNetworkInterface::Ethernet; >+ >+- case IFM_FDDI: >+- return QNetworkInterface::Fddi; >+- >+ case IFM_IEEE80211: >+ return QNetworkInterface::Ieee80211; >+ } > >Property changes on: net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp >=================================================================== >--- net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp (nonexistent) >+++ net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp (working copy) >@@ -0,0 +1,11 @@ >+--- src/network/ssl/qsslcontext_openssl.cpp.orig 2018-06-15 07:29:31 UTC >++++ src/network/ssl/qsslcontext_openssl.cpp >+@@ -248,7 +248,7 @@ void QSslContext::applyBackendConfig(QSs >+ 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) { > >Property changes on: net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl11__symbols__p.h >=================================================================== >--- net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl11__symbols__p.h (nonexistent) >+++ net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl11__symbols__p.h (working copy) >@@ -0,0 +1,85 @@ >+--- src/network/ssl/qsslsocket_openssl11_symbols_p.h.orig 2018-06-15 07:29:31 UTC >++++ src/network/ssl/qsslsocket_openssl11_symbols_p.h >+@@ -75,15 +75,48 @@ >+ #error "You are not supposed to use this header file, include qsslsocket_openssl_symbols_p.h instead" >+ #endif >+ >++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L >++// LibreSSL 2.7 has stack_st but not OPENSSL_STACK >++typedef struct stack_st OPENSSL_STACK; /* Use STACK_OF(...) instead */ >++// From the signature in LibreSSL >++#define OPENSSL_INIT_SETTINGS void >++// https://github.com/openssl/openssl/blob/master/include/openssl/x509_vfy.h#L63 >++typedef int (*X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX *); >++// https://github.com/openssl/openssl/blob/master/include/openssl/tls1.h#L31 >++# define TLS1_2_VERSION 0x0303 >++# define TLS_MAX_VERSION TLS1_2_VERSION >++# define TLS_ANY_VERSION 0x10000 >++#endif >++ >+ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x); >+ >+ Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a); >+ Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem(); >+ >++#ifdef LIBRESSL_VERSION_NUMBER >++#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p) >++#else >+ int q_DSA_bits(DSA *a); >++#endif >+ int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c); >+ int q_EVP_PKEY_base_id(EVP_PKEY *a); >+ int q_RSA_bits(RSA *a); >++#ifdef LIBRESSL_VERSION_NUMBER >++int q_sk_num(OPENSSL_STACK *a); >++void q_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *)); >++OPENSSL_STACK *q_sk_new_null(); >++void q_sk_push(OPENSSL_STACK *st, void *data); >++void q_sk_free(OPENSSL_STACK *a); >++void * q_sk_value(OPENSSL_STACK *a, int b); >++#define q_OPENSSL_sk_num(a) q_sk_num(a) >++#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b) >++#define q_OPENSSL_sk_new_null() q_sk_new_null() >++#define q_OPENSSL_sk_push(a, b) q_sk_push(a, b) >++#define q_OPENSSL_sk_free q_sk_free >++#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b) >++#define q_SSL_CTX_set_options(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL) >++#define q_SSL_session_reused(ssl) q_SSL_ctrl((ssl),SSL_CTRL_GET_SESSION_REUSED,0,NULL) >++#else >+ int q_OPENSSL_sk_num(OPENSSL_STACK *a); >+ void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *)); >+ OPENSSL_STACK *q_OPENSSL_sk_new_null(); >+@@ -92,6 +125,7 @@ void q_OPENSSL_sk_free(OPENSSL_STACK *a) >+ void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b); >+ int q_SSL_session_reused(SSL *a); >+ unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op); >++#endif >+ int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); >+ size_t q_SSL_get_client_random(SSL *a, unsigned char *out, size_t outlen); >+ size_t q_SSL_SESSION_get_master_key(const SSL_SESSION *session, unsigned char *out, size_t outlen); >+@@ -102,7 +136,11 @@ const SSL_METHOD *q_TLS_server_method(); >+ ASN1_TIME *q_X509_getm_notBefore(X509 *a); >+ ASN1_TIME *q_X509_getm_notAfter(X509 *a); >+ >++#ifdef LIBRESSL_VERSION_NUMBER >++#define q_X509_get_version(x509) q_ASN1_INTEGER_get((x509)->cert_info->version) >++#else >+ long q_X509_get_version(X509 *a); >++#endif >+ EVP_PKEY *q_X509_get_pubkey(X509 *a); >+ void q_X509_STORE_set_verify_cb(X509_STORE *ctx, X509_STORE_CTX_verify_cb verify_cb); >+ STACK_OF(X509) *q_X509_STORE_CTX_get0_chain(X509_STORE_CTX *ctx); >+@@ -112,8 +150,13 @@ int q_DH_bits(DH *dh); >+ # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \ >+ | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL) >+ >++#ifdef LIBRESSL_VERSION_NUMBER >++#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st) >++#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i) >++#else >+ #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st) >+ #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i) >++#endif >+ >+ #define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ >+ | OPENSSL_INIT_ADD_ALL_DIGESTS \ > >Property changes on: net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl11__symbols__p.h >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp >=================================================================== >--- net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp (revision 478017) >+++ net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp (working copy) >@@ -1,11 +1,48 @@ >-* Boilerplate for SSL_CTX_set1_groups() used in qsslcontext_openssl.cpp >-* >-* Prepend the path of the SSL libraries used for building so the same libraries are >-* found and loaded at runtime. Normal search finds base SSL libraries before ports. >-* >---- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2017-11-30 13:49:46 UTC >+--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2018-06-15 07:29:31 UTC > +++ src/network/ssl/qsslsocket_openssl_symbols.cpp >-@@ -524,6 +524,9 @@ DEFINEFUNC(void, EC_KEY_free, EC_KEY *ecdh, ecdh, retu >+@@ -150,6 +150,14 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, >+ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return) >+ DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return) >+ DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return) >++#ifdef LIBRESSL_VERSION_NUMBER >++DEFINEFUNC(int, sk_num, OPENSSL_STACK *a, a, return -1, return) >++DEFINEFUNC2(void, sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG) >++DEFINEFUNC(OPENSSL_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return 0, return) >++DEFINEFUNC2(void, sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG) >++DEFINEFUNC(void, sk_free, OPENSSL_STACK *a, a, return, DUMMYARG) >++DEFINEFUNC2(void *, sk_value, OPENSSL_STACK *a, a, int b, b, return 0, return) >++#else >+ DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return) >+ DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return) >+ DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG) >+@@ -159,6 +167,7 @@ DEFINEFUNC(void, OPENSSL_sk_free, OPENSS >+ DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return 0, return) >+ DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return) >+ DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return) >++#endif >+ DEFINEFUNC3(size_t, SSL_get_client_random, SSL *a, a, unsigned char *out, out, size_t outlen, outlen, return 0, return) >+ DEFINEFUNC3(size_t, SSL_SESSION_get_master_key, const SSL_SESSION *ses, ses, unsigned char *out, out, size_t outlen, outlen, return 0, return) >+ DEFINEFUNC6(int, CRYPTO_get_ex_new_index, int class_index, class_index, long argl, argl, void *argp, argp, CRYPTO_EX_new *new_func, new_func, CRYPTO_EX_dup *dup_func, dup_func, CRYPTO_EX_free *free_func, free_func, return -1, return) >+@@ -168,7 +177,9 @@ DEFINEFUNC(const SSL_METHOD *, TLS_clien >+ DEFINEFUNC(const SSL_METHOD *, TLS_server_method, DUMMYARG, DUMMYARG, return 0, return) >+ DEFINEFUNC(ASN1_TIME *, X509_getm_notBefore, X509 *a, a, return 0, return) >+ DEFINEFUNC(ASN1_TIME *, X509_getm_notAfter, X509 *a, a, return 0, return) >++#ifndef LIBRESSL_VERSION_NUMBER >+ DEFINEFUNC(long, X509_get_version, X509 *a, a, return -1, return) >++#endif >+ DEFINEFUNC(EVP_PKEY *, X509_get_pubkey, X509 *a, a, return 0, return) >+ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_verify_cb verify_cb, verify_cb, return, DUMMYARG) >+ DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return 0, return) >+@@ -406,7 +417,7 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, >+ 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 0, 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 0, 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); >+@@ -537,6 +548,9 @@ DEFINEFUNC(void, EC_KEY_free, EC_KEY *ec > DEFINEFUNC2(size_t, EC_get_builtin_curves, EC_builtin_curve * r, r, size_t nitems, nitems, return 0, return) > #if OPENSSL_VERSION_NUMBER >= 0x10002000L > DEFINEFUNC(int, EC_curve_nist2nid, const char *name, name, return 0, return) >@@ -15,29 +52,81 @@ > #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L > #endif // OPENSSL_NO_EC > >-@@ -769,8 +772,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl() >+@@ -782,8 +796,8 @@ static QPair<QLibrary*, QLibrary*> loadO > #endif > #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so > // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER> > - libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER)); > - libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER)); >-+ libssl->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libssl"), QLatin1String(SHLIB_VERSION_NUMBER)); >-+ libcrypto->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER)); >++ libssl->setFileNameAndVersion(QLatin1String("/usr/local/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER)); >++ libcrypto->setFileNameAndVersion(QLatin1String("/usr/local/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER)); > if (libcrypto->load() && libssl->load()) { > // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found > return pair; >-@@ -787,8 +790,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl() >+@@ -800,8 +814,8 @@ static QPair<QLibrary*, QLibrary*> loadO > // macOS's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third > // attempt, _after_ <bundle>/Contents/Frameworks has been searched. > // iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place. > - libssl->setFileNameAndVersion(QLatin1String("ssl"), -1); > - libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1); >-+ libssl->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libssl"), -1); >-+ libcrypto->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libcrypto"), -1); >++ libssl->setFileNameAndVersion(QLatin1String("/usr/local/lib/libssl"), -1); >++ libcrypto->setFileNameAndVersion(QLatin1String("/usr/local/lib/libcrypto"), -1); > if (libcrypto->load() && libssl->load()) { > // libssl.so.0 and libcrypto.so.0 found > return pair; >-@@ -979,10 +982,9 @@ bool q_resolveOpenSslSymbols() >+@@ -885,17 +899,30 @@ bool q_resolveOpenSslSymbols() >+ RESOLVEFUNC(EVP_CIPHER_CTX_reset) >+ RESOLVEFUNC(EVP_PKEY_base_id) >+ RESOLVEFUNC(RSA_bits) >++#ifdef LIBRESSL_VERSION_NUMBER >++ RESOLVEFUNC(sk_new_null) >++ RESOLVEFUNC(sk_push) >++ RESOLVEFUNC(sk_free) >++ RESOLVEFUNC(sk_num) >++ RESOLVEFUNC(sk_pop_free) >++ RESOLVEFUNC(sk_value) >++#else >+ RESOLVEFUNC(OPENSSL_sk_new_null) >+ RESOLVEFUNC(OPENSSL_sk_push) >+ RESOLVEFUNC(OPENSSL_sk_free) >+ RESOLVEFUNC(OPENSSL_sk_num) >+ RESOLVEFUNC(OPENSSL_sk_pop_free) >+ RESOLVEFUNC(OPENSSL_sk_value) >++#endif >+ RESOLVEFUNC(DH_get0_pqg) >++#ifdef LIBRESSL_VERSION_NUMBER >++ RESOLVEFUNC(SSL_ctrl) >++#else >+ RESOLVEFUNC(SSL_CTX_set_options) >++ RESOLVEFUNC(SSL_session_reused) >++#endif >+ RESOLVEFUNC(SSL_get_client_random) >+ RESOLVEFUNC(SSL_SESSION_get_master_key) >+- RESOLVEFUNC(SSL_session_reused) >+ RESOLVEFUNC(SSL_get_session) >+ RESOLVEFUNC(CRYPTO_get_ex_new_index) >+ RESOLVEFUNC(TLS_method) >+@@ -904,7 +931,9 @@ bool q_resolveOpenSslSymbols() >+ RESOLVEFUNC(X509_STORE_CTX_get0_chain) >+ RESOLVEFUNC(X509_getm_notBefore) >+ RESOLVEFUNC(X509_getm_notAfter) >++#ifndef LIBRESSL_VERSION_NUMBER >+ RESOLVEFUNC(X509_get_version) >++#endif >+ RESOLVEFUNC(X509_get_pubkey) >+ RESOLVEFUNC(X509_STORE_set_verify_cb) >+ RESOLVEFUNC(CRYPTO_free) >+@@ -921,7 +950,9 @@ bool q_resolveOpenSslSymbols() >+ >+ RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint) >+ RESOLVEFUNC(DH_bits) >++#ifndef LIBRESSL_VERSION_NUMBER >+ RESOLVEFUNC(DSA_bits) >++#endif >+ >+ #else // !opensslv11 >+ >+@@ -992,10 +1023,9 @@ bool q_resolveOpenSslSymbols() > RESOLVEFUNC(OPENSSL_add_all_algorithms_conf) > RESOLVEFUNC(SSLeay) > >@@ -49,7 +138,7 @@ > delete libs.first; > delete libs.second; > qCWarning(lcSsl, "Incompatible version of OpenSSL"); >-@@ -994,8 +996,12 @@ bool q_resolveOpenSslSymbols() >+@@ -1007,8 +1037,12 @@ bool q_resolveOpenSslSymbols() > > #ifndef OPENSSL_NO_EC > #if OPENSSL_VERSION_NUMBER >= 0x10002000L >@@ -63,12 +152,12 @@ > #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L > #endif // OPENSSL_NO_EC > >-@@ -1017,7 +1023,7 @@ bool q_resolveOpenSslSymbols() >- RESOLVEFUNC(EC_GROUP_get_degree) >- #endif >- RESOLVEFUNC(BN_num_bits) >--#if OPENSSL_VERSION_NUMBER >= 0x10100000L >-+#if !defined(BN_is_word) >- RESOLVEFUNC(BN_is_word) >- #endif >- RESOLVEFUNC(BN_mod_word) >+@@ -1122,7 +1156,7 @@ bool q_resolveOpenSslSymbols() >+ RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey) >+ RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) >+ RESOLVEFUNC(SSL_CTX_get_cert_store); >+-#if OPENSSL_VERSION_NUMBER >= 0x10002000L >++#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) >+ RESOLVEFUNC(SSL_CONF_CTX_new); >+ RESOLVEFUNC(SSL_CONF_CTX_free); >+ RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx); >Index: net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h >=================================================================== >--- net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h (revision 478017) >+++ net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h (working copy) >@@ -1,16 +1,15 @@ >-Boilerplate for SSL_CTX_set1_groups() used in qsslcontext_openssl.cpp. >---- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2017-11-30 13:49:46 UTC >+--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2018-06-15 07:29:31 UTC > +++ src/network/ssl/qsslsocket_openssl_symbols_p.h >-@@ -232,7 +232,7 @@ BIO *q_BIO_new_mem_buf(void *a, int b); >- int q_BIO_read(BIO *a, void *b, int c); >- Q_AUTOTEST_EXPORT int q_BIO_write(BIO *a, const void *b, int c); >- int q_BN_num_bits(const BIGNUM *a); >--#if OPENSSL_VERSION_NUMBER >= 0x10100000L >-+#if !defined(BN_is_word) >- int q_BN_is_word(BIGNUM *a, BN_ULONG w); >- #else >- // BN_is_word is implemented purely as a >-@@ -454,6 +454,9 @@ void q_EC_KEY_free(EC_KEY *ecdh); >+@@ -356,7 +356,7 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, >+ 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); >+@@ -468,6 +468,9 @@ void q_EC_KEY_free(EC_KEY *ecdh); > size_t q_EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems); > #if OPENSSL_VERSION_NUMBER >= 0x10002000L > int q_EC_curve_nist2nid(const char *name); >Index: net/qt5-network/pkg-plist >=================================================================== >--- net/qt5-network/pkg-plist (revision 478017) >+++ net/qt5-network/pkg-plist (working copy) >@@ -50,6 +50,8 @@ > %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkdiskcache_p.h > %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkfile_p.h > %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkinterface_p.h >+%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkinterface_uikit_p.h >+%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkinterface_unix_p.h > %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreply_p.h > %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplydataimpl_p.h > %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyfileimpl_p.h
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
Flags:
brnrd
:
maintainer-approval?
Actions:
View
|
Diff
Attachments on
bug 230884
:
196521
| 196524 |
196565
|
196584
|
196918