qtbase - update patches

6 files changed, 125 insertions, 211 deletions

diff --git a/qt5/qtbase/DEPENDS b/qt5/qtbase/DEPENDS
index adb406804f..7175f2b0ba 100755
--- a/qt5/qtbase/DEPENDS
+++ b/qt5/qtbase/DEPENDS
@@ -24,7 +24,7 @@ optional_depends  boost  \
                   '-nomake tests' \
                   'to build tests' &&
 
-optional_depends  ccache    '-ccache' '-no-ccache' 'speed compilation' &&
+#optional_depends  ccache    '-ccache' '-no-ccache' 'speed compilation' &&
 optional_depends  libxcb    '-xcb' '-no-xcb' 'Xcb support' &&
 
 if is_depends_enabled $SPELL libxcb; then
diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index fed81650e2..af5d33ae80 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,5 +1,7 @@
 2017-12-07 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 5.10.0
+	* DEPENDS: do not use ccache
+	* patches/*: update
 
 2017-11-22 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 5.9.3
diff --git a/qt5/qtbase/patches/0001-libressl-is-not-openssl-1.1.patch b/qt5/qtbase/patches/0001-libressl-is-not-openssl-1.1.patch
new file mode 100644
index 0000000000..29124af2b6
--- /dev/null
+++ b/qt5/qtbase/patches/0001-libressl-is-not-openssl-1.1.patch
@@ -0,0 +1,25 @@
+From 27341f706b39493d8024c0f6f589d0451d5b169d Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve@sourcemage.org>
+Date: Sat, 21 Oct 2017 14:50:51 +0200
+Subject: [PATCH 1/3] libressl is not openssl-1.1
+
+---
+ config.tests/unix/openssl11/openssl.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config.tests/unix/openssl11/openssl.cpp b/config.tests/unix/openssl11/openssl.cpp
+index c20cc59deb..b31b008afb 100644
+--- a/config.tests/unix/openssl11/openssl.cpp
++++ b/config.tests/unix/openssl11/openssl.cpp
+@@ -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
+ 
+-- 
+2.15.0
+
diff --git a/qt5/qtbase/patches/0002-libressl-2.6.2-fixes.patch b/qt5/qtbase/patches/0002-libressl-2.6.2-fixes.patch
new file mode 100644
index 0000000000..26586d7e46
--- /dev/null
+++ b/qt5/qtbase/patches/0002-libressl-2.6.2-fixes.patch
@@ -0,0 +1,94 @@
+From 92fa35ca26b476f28f3d05b2729b4eb73cffe4e7 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve@sourcemage.org>
+Date: Sat, 21 Oct 2017 16:01:05 +0200
+Subject: [PATCH 2/3] libressl-2.6.2 fixes
+
+---
+ src/network/ssl/qsslkey_openssl.cpp            | 7 ++++++-
+ src/network/ssl/qsslsocket_openssl_symbols.cpp | 9 +++++++++
+ src/network/ssl/qsslsocket_openssl_symbols_p.h | 6 +++++-
+ 3 files changed, 20 insertions(+), 2 deletions(-)
+
+diff --git a/src/network/ssl/qsslkey_openssl.cpp b/src/network/ssl/qsslkey_openssl.cpp
+index aa81b735b9..b17802f5b4 100644
+--- a/src/network/ssl/qsslkey_openssl.cpp
++++ b/src/network/ssl/qsslkey_openssl.cpp
+@@ -326,8 +326,13 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
+     q_EVP_CipherUpdate(ctx,
+         reinterpret_cast<unsigned char *>(output.data()), &len,
+         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
+-    q_EVP_CipherFinal(ctx,
++#ifdef LIBRESSL_VERSION_NUMBER
++    q_EVP_CipherFinal_ex(ctx,
+         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
++#else
++    q_EVP_CipherFinal(&ctx,
++        reinterpret_cast<unsigned char *>(output.data()) + len, &i);
++#endif    
+     len += i;
+ 
+ #if QT_CONFIG(opensslv11)
+diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
+index 3a236a1300..6dc9edcb41 100644
+--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
++++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -321,7 +321,11 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
+ DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
++#ifdef LIBRESSL_VERSION_NUMBER
++DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
++#else
+ DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
++#endif
+ DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return 0, return)
+ DEFINEFUNC(const EVP_CIPHER *, EVP_des_ede3_cbc, DUMMYARG, DUMMYARG, return 0, return)
+ DEFINEFUNC(const EVP_CIPHER *, EVP_rc2_cbc, DUMMYARG, DUMMYARG, return 0, return)
+@@ -623,6 +627,7 @@ static QStringList libraryPathList()
+     paths = QString::fromLatin1(qgetenv("LD_LIBRARY_PATH"))
+             .split(QLatin1Char(':'), QString::SkipEmptyParts);
+ #  endif
++
+     paths << QLatin1String("/lib") << QLatin1String("/usr/lib") << QLatin1String("/usr/local/lib");
+     paths << QLatin1String("/lib64") << QLatin1String("/usr/lib64") << QLatin1String("/usr/local/lib64");
+     paths << QLatin1String("/lib32") << QLatin1String("/usr/lib32") << QLatin1String("/usr/local/lib32");
+@@ -1032,7 +1037,11 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CipherInit)
+     RESOLVEFUNC(EVP_CipherInit_ex)
+     RESOLVEFUNC(EVP_CipherUpdate)
++#ifdef LIBRESSL_VERSION_NUMBER
++    RESOLVEFUNC(EVP_CipherFinal_ex)
++#else
+     RESOLVEFUNC(EVP_CipherFinal)
++#endif
+     RESOLVEFUNC(EVP_des_cbc)
+     RESOLVEFUNC(EVP_des_ede3_cbc)
+     RESOLVEFUNC(EVP_rc2_cbc)
+diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h
+index 796bf2d4f5..a7c513edfd 100644
+--- a/src/network/ssl/qsslsocket_openssl_symbols_p.h
++++ b/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 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
+@@ -263,7 +263,11 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
+ int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
++#ifdef LIBRESSL_VERSION_NUMBER
++int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
++#else
+ int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
++#endif
+ const EVP_CIPHER *q_EVP_des_cbc();
+ const EVP_CIPHER *q_EVP_des_ede3_cbc();
+ const EVP_CIPHER *q_EVP_rc2_cbc();
+-- 
+2.15.0
+
diff --git a/qt5/qtbase/patches/0002-libressl-fix.patch b/qt5/qtbase/patches/0002-libressl-fix.patch
deleted file mode 100644
index 8820a65ad3..0000000000
--- a/qt5/qtbase/patches/0002-libressl-fix.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-From 69332e538525c7af12169e670ee378394e2aa02d Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve@sourcemage.org>
-Date: Wed, 20 Sep 2017 16:00:51 +0200
-Subject: [PATCH 2/2] libressl fix version 2.6.1 of libressl gives an error
- when trying to link with libQt5Network, because of usage of usage of
- EVP_CipherFinal. Previous versions only gave a warning.
-
-error: EVP_CipherFinal is often misused, please use EVP_CipherFinal_ex and
-EVP_CIPHER_CTX_cleanup
----
- src/network/ssl/qsslcontext_openssl.cpp        |  4 ++--
- src/network/ssl/qsslellipticcurve_openssl.cpp  |  2 +-
- src/network/ssl/qsslkey_openssl.cpp            |  5 +++++
- src/network/ssl/qsslsocket_openssl.cpp         |  4 ++--
- src/network/ssl/qsslsocket_openssl_symbols.cpp | 17 +++++++++++++----
- src/network/ssl/qsslsocket_openssl_symbols_p.h | 10 +++++++---
- 6 files changed, 30 insertions(+), 12 deletions(-)
-
-diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp
-index c92d8fc3f8..9f4e8eeb72 100644
---- a/src/network/ssl/qsslcontext_openssl.cpp
-+++ b/src/network/ssl/qsslcontext_openssl.cpp
-@@ -330,7 +330,7 @@ init_context:
-     }
- 
- #ifndef OPENSSL_NO_EC
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && ! defined(LIBRESSL_VERSION_NUMBER)
-     if (q_SSLeay() >= 0x10002000L) {
-         q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_SET_ECDH_AUTO, 1, NULL);
-     } else
-@@ -462,7 +462,7 @@ SSL* QSslContext::createSsl()
-         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
-diff --git a/src/network/ssl/qsslellipticcurve_openssl.cpp b/src/network/ssl/qsslellipticcurve_openssl.cpp
-index e18197b703..7415c6f8c1 100644
---- a/src/network/ssl/qsslellipticcurve_openssl.cpp
-+++ b/src/network/ssl/qsslellipticcurve_openssl.cpp
-@@ -82,7 +82,7 @@ QSslEllipticCurve QSslEllipticCurve::fromShortName(const QString &name)
- 
-     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
-diff --git a/src/network/ssl/qsslkey_openssl.cpp b/src/network/ssl/qsslkey_openssl.cpp
-index 26119023d1..da80e6f06a 100644
---- a/src/network/ssl/qsslkey_openssl.cpp
-+++ b/src/network/ssl/qsslkey_openssl.cpp
-@@ -305,8 +305,13 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(&ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
-+#ifdef LIBRESSL_VERSION_NUMBER
-+    q_EVP_CipherFinal_ex(&ctx,
-+        reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-+#else
-     q_EVP_CipherFinal(&ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-+#endif
-     len += i;
-     q_EVP_CIPHER_CTX_cleanup(&ctx);
- 
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
-index ab82cdcfc9..0847ad4052 100644
---- a/src/network/ssl/qsslsocket_openssl.cpp
-+++ b/src/network/ssl/qsslsocket_openssl.cpp
-@@ -1602,7 +1602,7 @@ void QSslSocketBackendPrivate::continueHandshake()
-     } else {
-         const unsigned char *proto = 0;
-         unsigned int proto_len = 0;
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L  && ! defined(LIBRESSL_VERSION_NUMBER)
-         if (q_SSLeay() >= 0x10002000L) {
-             q_SSL_get0_alpn_selected(ssl, &proto, &proto_len);
-             if (proto_len && mode == QSslSocket::SslClientMode) {
-@@ -1625,7 +1625,7 @@ void QSslSocketBackendPrivate::continueHandshake()
-     }
- #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))
-diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index c344a94427..ff10d21ff9 100644
---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -175,7 +175,11 @@ DEFINEFUNC4(int, EVP_CIPHER_CTX_ctrl, EVP_CIPHER_CTX *ctx, ctx, int type, type,
- DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int keylen, keylen, return 0, return)
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return);
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return);
-+#ifdef LIBRESSL_VERSION_NUMBER
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return);
-+#else
- DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return);
-+#endif
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return 0, return)
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_ede3_cbc, DUMMYARG, DUMMYARG, return 0, return)
- DEFINEFUNC(const EVP_CIPHER *, EVP_rc2_cbc, DUMMYARG, DUMMYARG, return 0, return)
-@@ -427,7 +431,7 @@ DEFINEFUNC3(void, SSL_CTX_set_next_proto_select_cb, SSL_CTX *s, s,
-             void *arg, arg, return, DUMMYARG)
- DEFINEFUNC3(void, SSL_get0_next_proto_negotiated, const SSL *s, s,
-             const unsigned char **data, data, unsigned *len, len, return, DUMMYARG)
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L  && ! defined(LIBRESSL_VERSION_NUMBER)
- DEFINEFUNC3(int, SSL_set_alpn_protos, SSL *s, s, const unsigned char *protos, protos,
-             unsigned protos_len, protos_len, return -1, return)
- DEFINEFUNC3(void, SSL_CTX_set_alpn_select_cb, SSL_CTX *s, s,
-@@ -451,7 +455,7 @@ DEFINEFUNC(EC_KEY *, EC_KEY_dup, const EC_KEY *ec, ec, return 0, return)
- 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
-@@ -552,6 +556,7 @@ static QStringList libraryPathList()
-     paths = QString::fromLatin1(qgetenv("LD_LIBRARY_PATH"))
-             .split(QLatin1Char(':'), QString::SkipEmptyParts);
- #  endif
-+
-     paths << QLatin1String("/lib") << QLatin1String("/usr/lib") << QLatin1String("/usr/local/lib");
-     paths << QLatin1String("/lib64") << QLatin1String("/usr/lib64") << QLatin1String("/usr/local/lib64");
-     paths << QLatin1String("/lib32") << QLatin1String("/usr/lib32") << QLatin1String("/usr/local/lib32");
-@@ -809,7 +814,11 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_set_key_length)
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherUpdate)
-+#ifdef LIBRESSL_VERSION_NUMBER
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-+#else
-     RESOLVEFUNC(EVP_CipherFinal)
-+#endif
-     RESOLVEFUNC(EVP_des_cbc)
-     RESOLVEFUNC(EVP_des_ede3_cbc)
-     RESOLVEFUNC(EVP_rc2_cbc)
-@@ -1003,7 +1012,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_set_next_proto_select_cb)
-     RESOLVEFUNC(SSL_get0_next_proto_negotiated)
- #endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ...
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && ! defined(LIBRESSL_VERSION_NUMBER)
-     RESOLVEFUNC(SSL_set_alpn_protos)
-     RESOLVEFUNC(SSL_CTX_set_alpn_select_cb)
-     RESOLVEFUNC(SSL_get0_alpn_selected)
-@@ -1019,7 +1028,7 @@ bool q_resolveOpenSslSymbols()
-     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
-diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index b35a895d38..a031d82ce5 100644
---- a/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -263,7 +263,11 @@ int q_EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr);
- int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
-+#ifdef LIBRESSL_VERSION_NUMBER
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+#else
- int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+#endif
- const EVP_CIPHER *q_EVP_des_cbc();
- const EVP_CIPHER *q_EVP_des_ede3_cbc();
- const EVP_CIPHER *q_EVP_rc2_cbc();
-@@ -509,11 +513,11 @@ void q_EC_KEY_free(EC_KEY *ecdh);
- 
- // 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_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
- 
-@@ -585,7 +589,7 @@ void q_SSL_CTX_set_next_proto_select_cb(SSL_CTX *s,
-                                         void *arg);
- void q_SSL_get0_next_proto_negotiated(const SSL *s, const unsigned char **data,
-                                       unsigned *len);
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L  && ! defined(LIBRESSL_VERSION_NUMBER)
- int q_SSL_set_alpn_protos(SSL *ssl, const unsigned char *protos,
-                           unsigned protos_len);
- void q_SSL_CTX_set_alpn_select_cb(SSL_CTX *ctx,
--- 
-2.14.1
-
diff --git a/qt5/qtbase/patches/0001-fix-config-tests-for-firebird.patch b/qt5/qtbase/patches/0003-fix-config-tests-for-firebird-fix-linking-with-fireb.patch
index 996b77afaa..5296905112 100644
--- a/qt5/qtbase/patches/0001-fix-config-tests-for-firebird.patch
+++ b/qt5/qtbase/patches/0003-fix-config-tests-for-firebird-fix-linking-with-fireb.patch
@@ -1,7 +1,7 @@
-From 8747f6bda21b1a9d5c182e3b1fbdb4c084892f8c Mon Sep 17 00:00:00 2001
+From ae327fa2bf891530ce59188c446b0232697a3b5b Mon Sep 17 00:00:00 2001
 From: Treeve Jelbert <treeve@sourcemage.org>
 Date: Mon, 9 May 2011 21:06:05 +0200
-Subject: [PATCH 1/2] fix config tests for firebird fix linking with firebird
+Subject: [PATCH 3/3] fix config tests for firebird fix linking with firebird
  it also use -lpthread now
 
 firebird uses libtommath
@@ -23,5 +23,5 @@ index 234f880579..6a282069b0 100644
          },
          "mysql": {
 -- 
-2.14.1
+2.15.0