diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2018-02-23 16:00:56 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2018-02-23 16:00:56 +0300 |
| commit | 57c8c6a8613ffe1e96587e21b34249133e54e4d2 (patch) | |
| tree | a95832bfa28a57a4dd7df2a86fc33a19d98fe4cc /dev-qt/qtnetwork/files/qtnetwork-5.xx-libressl.patch | |
| parent | abbc99af90c96d4f50084e29633b32594b9bbfec (diff) | |
qt 5.10 scm from qt repo
Diffstat (limited to 'dev-qt/qtnetwork/files/qtnetwork-5.xx-libressl.patch')
| -rw-r--r-- | dev-qt/qtnetwork/files/qtnetwork-5.xx-libressl.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.xx-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.xx-libressl.patch new file mode 100644 index 0000000..3a1f80a --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.xx-libressl.patch @@ -0,0 +1,42 @@ +--- a/config.tests/unix/openssl11/openssl.cpp 2017-11-05 16:07:40.963385070 -0500 ++++ b/config.tests/unix/openssl11/openssl.cpp 2017-11-05 16:07:51.755255545 -0500 +@@ -39,7 +39,7 @@ + + #include <openssl/opensslv.h> + +-#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 + +--- a/src/network/ssl/qsslsocket_openssl_symbols_p.h 2017-11-06 00:02:18.919611226 -0500 ++++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h 2017-11-06 00:09:46.879756111 -0500 +@@ -232,7 +232,7 @@ + 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 QT_CONFIG(opensslv11) + int q_BN_is_word(BIGNUM *a, BN_ULONG w); + #else + // BN_is_word is implemented purely as a +@@ -245,7 +245,7 @@ + // + // Users are required to include <openssl/bn.h>. + #define q_BN_is_word BN_is_word +-#endif // OPENSSL_VERSION_NUMBER >= 0x10100000L ++#endif // QT_CONFIG + BN_ULONG q_BN_mod_word(const BIGNUM *a, BN_ULONG w); + #ifndef OPENSSL_NO_EC + const EC_GROUP* q_EC_KEY_get0_group(const EC_KEY* k); +--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp 2017-11-06 00:04:58.843877923 -0500 ++++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp 2017-11-06 00:06:12.985074360 -0500 +@@ -1017,7 +1017,7 @@ + RESOLVEFUNC(EC_GROUP_get_degree) + #endif + RESOLVEFUNC(BN_num_bits) +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if QT_CONFIG(opensslv11) + RESOLVEFUNC(BN_is_word) + #endif + RESOLVEFUNC(BN_mod_word) |