community/qt5-qtbase: upgrade to 5.10.1

1 files changed, 16 insertions, 102 deletions

diff --git a/community/qt5-qtbase/libressl-compat.patch b/community/qt5-qtbase/libressl-compat.patch
index 5b21dc2d8f..65ca82bb9e 100644
--- a/community/qt5-qtbase/libressl-compat.patch
+++ b/community/qt5-qtbase/libressl-compat.patch
@@ -1,109 +1,23 @@
---- qtbase/src/network/ssl/qsslellipticcurve_openssl.cpp	2017-01-18 15:20:58.000000000 +0100
-+++ qtbase/src/network/ssl/qsslellipticcurve_openssl.cpp	2017-02-21 16:25:56.477986158 +0100
-@@ -82,7 +82,7 @@
- 
-     int nid = q_OBJ_sn2nid(curveNameLatin1.data());
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER)
-     if (nid == 0 && q_SSLeay() >= 0x10002000L)
-         nid = q_EC_curve_nist2nid(curveNameLatin1.data());
- #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp	2017-01-18 15:20:58.000000000 +0100
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp	2017-02-21 19:12:22.200604090 +0100
-@@ -1626,7 +1626,7 @@
-     }
- #endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ...
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER)
-     if (q_SSLeay() >= 0x10002000L && mode == QSslSocket::SslClientMode) {
-         EVP_PKEY *key;
-         if (q_SSL_get_server_tmp_key(ssl, &key))
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp	2017-01-18 15:20:58.000000000 +0100
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp	2017-02-21 19:14:32.805677245 +0100
-@@ -151,7 +151,7 @@
- DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
- DEFINEFUNC3(int, BIO_write, BIO *a, a, const void *b, b, int c, c, return -1, return)
- DEFINEFUNC(int, BN_num_bits, const BIGNUM *a, a, return 0, return)
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
- DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- #endif
- DEFINEFUNC2(BN_ULONG, BN_mod_word, const BIGNUM *a, a, BN_ULONG w, w, return -1, return)
-@@ -451,7 +451,7 @@
- DEFINEFUNC(EC_KEY *, EC_KEY_new_by_curve_name, int nid, nid, return 0, return)
- DEFINEFUNC(void, EC_KEY_free, EC_KEY *ecdh, ecdh, return, DUMMYARG)
- DEFINEFUNC2(size_t, EC_get_builtin_curves, EC_builtin_curve * r, r, size_t nitems, nitems, return 0, return)
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER)
- DEFINEFUNC(int, EC_curve_nist2nid, const char *name, name, return 0, return)
- #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
- #endif // OPENSSL_NO_EC
-@@ -791,7 +791,7 @@
-     RESOLVEFUNC(EC_GROUP_get_degree)
+--- ./config.tests/unix/openssl11/openssl.cpp.orig	2018-04-24 09:59:45.918038335 +0200
++++ ./config.tests/unix/openssl11/openssl.cpp	2018-04-24 10:01:21.255182441 +0200
+@@ -42,6 +42,9 @@
+ #if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L
+ #  error "OpenSSL >= 1.1 is required"
  #endif
-     RESOLVEFUNC(BN_num_bits)
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
-     RESOLVEFUNC(BN_is_word)
- #endif
-     RESOLVEFUNC(BN_mod_word)
-@@ -1020,7 +1020,7 @@
-     RESOLVEFUNC(EC_KEY_new_by_curve_name)
-     RESOLVEFUNC(EC_KEY_free)
-     RESOLVEFUNC(EC_get_builtin_curves)
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER)
-     if (q_SSLeay() >= 0x10002000L)
-         RESOLVEFUNC(EC_curve_nist2nid)
- #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h	2017-01-18 15:20:58.000000000 +0100
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h	2017-02-21 19:15:38.083714302 +0100
-@@ -228,7 +228,7 @@
- Q_AUTOTEST_EXPORT BIO_METHOD *q_BIO_s_mem();
++#ifdef LIBRESSL_VERSION_NUMBER
++#  error "LibreSSL does not support all used OpenSSL-1.1 APIs yet."
++#endif
+ 
+ int main()
+ {
+--- ./src/network/ssl/qsslsocket_openssl_symbols_p.h.orig	2018-04-24 10:40:49.121761681 +0200
++++ ./src/network/ssl/qsslsocket_openssl_symbols_p.h	2018-04-24 10:41:43.082843248 +0200
+@@ -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 (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
  int q_BN_is_word(BIGNUM *a, BN_ULONG w);
  #else
  // BN_is_word is implemented purely as a
-@@ -241,7 +241,7 @@
- //
- // Users are required to include <openssl/bn.h>.
- #define q_BN_is_word BN_is_word
--#endif // OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#endif // (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
- 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);
-@@ -509,13 +509,13 @@
- 
- // EC curves management
- size_t q_EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems);
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER)
- int q_EC_curve_nist2nid(const char *name);
--#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#endif // (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER)
- #endif // OPENSSL_NO_EC
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER)
- #define q_SSL_get_server_tmp_key(ssl, key) q_SSL_ctrl((ssl), SSL_CTRL_GET_SERVER_TMP_KEY, 0, (char *)key)
--#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#endif // (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER)
- 
- // PKCS#12 support
- int q_PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, STACK_OF(X509) **ca);
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp	2017-01-18 15:20:58.000000000 +0100
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp	2017-02-21 19:23:04.291975945 +0100
-@@ -462,7 +462,7 @@
-         m_npnContext.data = reinterpret_cast<unsigned char *>(m_supportedNPNVersions.data());
-         m_npnContext.len = m_supportedNPNVersions.count();
-         m_npnContext.status = QSslConfiguration::NextProtocolNegotiationNone;
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER)
-         if (q_SSLeay() >= 0x10002000L) {
-             // Callback's type has a parameter 'const unsigned char ** out'
-             // since it was introduced in 1.0.2. Internally, OpenSSL's own code