qt5: update to 5.15.0.

closes 
This commit is contained in:
John 2020-06-13 13:14:53 +02:00
parent caf9d369aa
commit 4b2bb7c3c5
8 changed files with 452 additions and 183 deletions

View file

@ -1951,87 +1951,87 @@ libgltf-0.1.so.1 libgltf-0.1.0_1
libabw-0.1.so.1 libabw-0.1.0_1
libcmis-0.5.so.5 libcmis-0.5.0_1
libcmis-c-0.5.so.5 libcmis-0.5.0_1
libQt5Bluetooth.so.5 qt5-connectivity-5.14.1_1
libQt53DAnimation.so.5 qt5-3d-5.14.1_1
libQt53DCore.so.5 qt5-3d-5.14.1_1
libQt53DInput.so.5 qt5-3d-5.14.1_1
libQt53DLogic.so.5 qt5-3d-5.14.1_1
libQt53DRender.so.5 qt5-3d-5.14.1_1
libQt53DQuick.so.5 qt5-3d-5.14.1_1
libQt53DQuickInput.so.5 qt5-3d-5.14.1_1
libQt53DQuickRender.so.5 qt5-3d-5.14.1_1
libQt53DQuickScene2D.so.5 qt5-3d-5.14.1_1
libQt53DExtras.so.5 qt5-3d-5.14.1_1
libQt53DQuickExtras.so.5 qt5-3d-5.14.1_1
libQt53DQuickAnimation.so.5 qt5-3d-5.14.1_1
libQt53DQuickInput.so.5 qt5-3d-5.14.1_1
libQt5Charts.so.5 qt5-charts-5.14.1_1
libQt5DataVisualization.so.5 qt5-datavis3d-5.14.1_1
libQt5Gamepad.so.5 qt5-gamepad-5.14.1_1
libQt5Nfc.so.5 qt5-connectivity-5.14.1_1
libQt5WebView.so.5 qt5-webview-5.14.1_1
libQt5Qml.so.5 qt5-declarative-5.14.1_1
libQt5QmlDevTools.so.5 qt5-declarative-5.14.1_1
libQt5Quick.so.5 qt5-declarative-5.14.1_1
libQt5QuickTest.so.5 qt5-declarative-5.14.1_1
libQt5QuickWidgets.so.5 qt5-declarative-5.14.1_1
libQt5QuickParticles.so.5 qt5-declarative-5.14.1_1
libQt5QuickShapes.so.5 qt5-declarative-5.14.1_1
libQt5QmlModels.so.5 qt5-declarative-5.14.1_1
libQt5QmlWorkerScript.so.5 qt5-declarative-5.14.1_1
libQt5QuickControls2.so.5 qt5-quickcontrols2-5.14.1_1
libQt5QuickTemplates2.so.5 qt5-quickcontrols2-5.14.1_1
libQt5Positioning.so.5 qt5-location-5.14.1_1
libQt5Location.so.5 qt5-location-5.14.1_1
libQt5PositioningQuick.so.5 qt5-location-5.14.1_1
libQt5VirtualKeyboard.so.5 qt5-virtualkeyboard-5.14.1_1
libQt5Multimedia.so.5 qt5-multimedia-5.14.1_1
libQt5MultimediaGstTools.so.5 qt5-multimedia-5.14.1_1
libQt5MultimediaQuick.so.5 qt5-multimedia-5.14.1_1
libQt5MultimediaQuick_p.so.5 qt5-multimedia-5.14.1_1
libQt5MultimediaWidgets.so.5 qt5-multimedia-5.14.1_1
libQt5NetworkAuth.so.5 qt5-networkauth-5.14.1_1
libQt5Purchasing.so.5 qt5-purchasing-5.14.1_1
libQt5RemoteObjects.so.5 qt5-remoteobjects-5.14.1_1
libqgsttools_p.so.1 qt5-multimedia-5.14.1_1
libQt5LabsTemplates.so.5 qt5-quickcontrols2-5.14.1_1
libQt5Scxml.so.5 qt5-scxml-5.14.1_1
libQt5Script.so.5 qt5-script-5.14.1_1
libQt5ScriptTools.so.5 qt5-script-5.14.1_1
libQt5Sensors.so.5 qt5-sensors-5.14.1_1
libQt5SerialBus.so.5 qt5-serialbus-5.14.1_1
libQt5SerialPort.so.5 qt5-serialport-5.14.1_1
libQt5Svg.so.5 qt5-svg-5.14.1_1
libQt5CLucene.so.5 qt5-tools-5.14.1_1
libQt5Help.so.5 qt5-tools-5.14.1_1
libQt5Designer.so.5 qt5-tools-5.14.1_1
libQt5DesignerComponents.so.5 qt5-tools-5.14.1_1
libQt5WaylandClient.so.5 qt5-wayland-5.14.1_1
libQt5WaylandCompositor.so.5 qt5-wayland-5.14.1_1
libQt5WebChannel.so.5 qt5-webchannel-5.14.1_1
libQt5WebEngineCore.so.5 qt5-webengine-5.14.1_1
libQt5WebEngine.so.5 qt5-webengine-5.14.1_1
libQt5WebEngineWidgets.so.5 qt5-webengine-5.14.1_1
libQt5WebSockets.so.5 qt5-websockets-5.14.1_1
libQt5X11Extras.so.5 qt5-x11extras-5.14.1_1
libQt5XmlPatterns.so.5 qt5-xmlpatterns-5.14.1_1
libQt5Core.so.5 qt5-core-5.14.1_1
libQt5EglFSDeviceIntegration.so.5 qt5-gui-5.14.1_1
libQt5Network.so.5 qt5-network-5.14.1_1
libQt5Sql.so.5 qt5-sql-5.14.1_1
libQt5Xml.so.5 qt5-xml-5.14.1_1
libQt5Gui.so.5 qt5-gui-5.14.1_1
libQt5Widgets.so.5 qt5-widgets-5.14.1_1
libQt5Test.so.5 qt5-test-5.14.1_1
libQt5DBus.so.5 qt5-dbus-5.14.1_1
libQt5Concurrent.so.5 qt5-concurrent-5.14.1_1
libQt5OpenGL.so.5 qt5-opengl-5.14.1_1
libQt5PrintSupport.so.5 qt5-printsupport-5.14.1_1
libQt5XcbQpa.so.5 qt5-gui-5.14.1_1
libQt5EglDeviceIntegration.so.5 qt5-gui-5.14.1_1
libQt5EglFsKmsSupport.so.5 qt5-gui-5.14.1_1
libQt5TextToSpeech.so.5 qt5-speech-5.14.1_1
libQt5Bodymovin.so.5 qt5-lottie-5.14.1_1
libQt5Bluetooth.so.5 qt5-connectivity-5.15.0_1
libQt53DAnimation.so.5 qt5-3d-5.15.0_1
libQt53DCore.so.5 qt5-3d-5.15.0_1
libQt53DInput.so.5 qt5-3d-5.15.0_1
libQt53DLogic.so.5 qt5-3d-5.15.0_1
libQt53DRender.so.5 qt5-3d-5.15.0_1
libQt53DQuick.so.5 qt5-3d-5.15.0_1
libQt53DQuickInput.so.5 qt5-3d-5.15.0_1
libQt53DQuickRender.so.5 qt5-3d-5.15.0_1
libQt53DQuickScene2D.so.5 qt5-3d-5.15.0_1
libQt53DExtras.so.5 qt5-3d-5.15.0_1
libQt53DQuickExtras.so.5 qt5-3d-5.15.0_1
libQt53DQuickAnimation.so.5 qt5-3d-5.15.0_1
libQt53DQuickInput.so.5 qt5-3d-5.15.0_1
libQt5Charts.so.5 qt5-charts-5.15.0_1
libQt5DataVisualization.so.5 qt5-datavis3d-5.15.0_1
libQt5Gamepad.so.5 qt5-gamepad-5.15.0_1
libQt5Nfc.so.5 qt5-connectivity-5.15.0_1
libQt5WebView.so.5 qt5-webview-5.15.0_1
libQt5Qml.so.5 qt5-declarative-5.15.0_1
libQt5QmlDevTools.so.5 qt5-declarative-5.15.0_1
libQt5Quick.so.5 qt5-declarative-5.15.0_1
libQt5QuickTest.so.5 qt5-declarative-5.15.0_1
libQt5QuickWidgets.so.5 qt5-declarative-5.15.0_1
libQt5QuickParticles.so.5 qt5-declarative-5.15.0_1
libQt5QuickShapes.so.5 qt5-declarative-5.15.0_1
libQt5QmlModels.so.5 qt5-declarative-5.15.0_1
libQt5QmlWorkerScript.so.5 qt5-declarative-5.15.0_1
libQt5QuickControls2.so.5 qt5-quickcontrols2-5.15.0_1
libQt5QuickTemplates2.so.5 qt5-quickcontrols2-5.15.0_1
libQt5Positioning.so.5 qt5-location-5.15.0_1
libQt5Location.so.5 qt5-location-5.15.0_1
libQt5PositioningQuick.so.5 qt5-location-5.15.0_1
libQt5VirtualKeyboard.so.5 qt5-virtualkeyboard-5.15.0_1
libQt5Multimedia.so.5 qt5-multimedia-5.15.0_1
libQt5MultimediaGstTools.so.5 qt5-multimedia-5.15.0_1
libQt5MultimediaQuick.so.5 qt5-multimedia-5.15.0_1
libQt5MultimediaQuick_p.so.5 qt5-multimedia-5.15.0_1
libQt5MultimediaWidgets.so.5 qt5-multimedia-5.15.0_1
libQt5NetworkAuth.so.5 qt5-networkauth-5.15.0_1
libQt5Purchasing.so.5 qt5-purchasing-5.15.0_1
libQt5RemoteObjects.so.5 qt5-remoteobjects-5.15.0_1
libqgsttools_p.so.1 qt5-multimedia-5.15.0_1
libQt5LabsTemplates.so.5 qt5-quickcontrols2-5.15.0_1
libQt5Scxml.so.5 qt5-scxml-5.15.0_1
libQt5Script.so.5 qt5-script-5.15.0_1
libQt5ScriptTools.so.5 qt5-script-5.15.0_1
libQt5Sensors.so.5 qt5-sensors-5.15.0_1
libQt5SerialBus.so.5 qt5-serialbus-5.15.0_1
libQt5SerialPort.so.5 qt5-serialport-5.15.0_1
libQt5Svg.so.5 qt5-svg-5.15.0_1
libQt5CLucene.so.5 qt5-tools-5.15.0_1
libQt5Help.so.5 qt5-tools-5.15.0_1
libQt5Designer.so.5 qt5-tools-5.15.0_1
libQt5DesignerComponents.so.5 qt5-tools-5.15.0_1
libQt5WaylandClient.so.5 qt5-wayland-5.15.0_1
libQt5WaylandCompositor.so.5 qt5-wayland-5.15.0_1
libQt5WebChannel.so.5 qt5-webchannel-5.15.0_1
libQt5WebEngineCore.so.5 qt5-webengine-5.15.0_1
libQt5WebEngine.so.5 qt5-webengine-5.15.0_1
libQt5WebEngineWidgets.so.5 qt5-webengine-5.15.0_1
libQt5WebSockets.so.5 qt5-websockets-5.15.0_1
libQt5X11Extras.so.5 qt5-x11extras-5.15.0_1
libQt5XmlPatterns.so.5 qt5-xmlpatterns-5.15.0_1
libQt5Core.so.5 qt5-core-5.15.0_1
libQt5EglFSDeviceIntegration.so.5 qt5-gui-5.15.0_1
libQt5Network.so.5 qt5-network-5.15.0_1
libQt5Sql.so.5 qt5-sql-5.15.0_1
libQt5Xml.so.5 qt5-xml-5.15.0_1
libQt5Gui.so.5 qt5-gui-5.15.0_1
libQt5Widgets.so.5 qt5-widgets-5.15.0_1
libQt5Test.so.5 qt5-test-5.15.0_1
libQt5DBus.so.5 qt5-dbus-5.15.0_1
libQt5Concurrent.so.5 qt5-concurrent-5.15.0_1
libQt5OpenGL.so.5 qt5-opengl-5.15.0_1
libQt5PrintSupport.so.5 qt5-printsupport-5.15.0_1
libQt5XcbQpa.so.5 qt5-gui-5.15.0_1
libQt5EglDeviceIntegration.so.5 qt5-gui-5.15.0_1
libQt5EglFsKmsSupport.so.5 qt5-gui-5.15.0_1
libQt5TextToSpeech.so.5 qt5-speech-5.15.0_1
libQt5Bodymovin.so.5 qt5-lottie-5.15.0_1
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
libx265.so.192 x265-3.4_1

View file

@ -0,0 +1,16 @@
QT = core qml qmldevtools-private
SOURCES += main.cpp \
commentastvisitor.cpp \
dumpastvisitor.cpp \
restructureastvisitor.cpp \
../../src/qml/qqmljsgrammar.cpp
QMAKE_TARGET_DESCRIPTION = QML Formatter
HEADERS += \
commentastvisitor.h \
dumpastvisitor.h \
restructureastvisitor.h
load(qt_tool)

View file

@ -2,11 +2,11 @@ QT = core qml qmldevtools-private
SOURCES += main.cpp \
componentversion.cpp \
fakemetaobject.cpp \
findunqualified.cpp \
qmljstypedescriptionreader.cpp \
importedmembersvisitor.cpp \
qcoloroutput.cpp \
scopetree.cpp \
typedescriptionreader.cpp \
../../src/qml/qqmljsgrammar.cpp
QMAKE_TARGET_DESCRIPTION = QML Syntax Verifier
@ -15,8 +15,9 @@ load(qt_tool)
HEADERS += \
componentversion.h \
fakemetaobject.h \
findunqualified.h \
qmljstypedescriptionreader.h \
qcoloroutput_p.h \
scopetree.h
importedmembersvisitor.h \
metatypes.h \
qcoloroutput.h \
scopetree.h \
typedescriptionreader.h

View file

@ -1,51 +0,0 @@
diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp
index 41b759364b..17ce5b4b30 100644
--- qtbase/src/network/ssl/qsslcontext_openssl.cpp
+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
@@ -248,7 +248,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 82ff5e9e3a..77e5d03b7d 100644
--- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -402,7 +402,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 4fb8f26cf6..3a7de93113 100644
--- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
@@ -352,7 +352,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);
--- qtbase/src/network/configure.json 2019-01-28 18:11:52.000000000 +0100
+++ - 2019-03-11 00:31:42.883264246 +0100
@@ -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"
]

View file

@ -1,11 +0,0 @@
--- qtbase/src/network/ssl/qsslsocket_openssl.cpp 2019-06-13 06:18:18.000000000 +0200
+++ - 2019-06-17 14:59:22.501460882 +0200
@@ -604,7 +604,7 @@
q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
}
#endif
-#if OPENSSL_VERSION_NUMBER >= 0x10101006L
+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
// Set the client callback for TLSv1.3 PSK
if (mode == QSslSocket::SslClientMode
&& QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {

View file

@ -1,28 +0,0 @@
--- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp.orig
+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -190,8 +190,8 @@
#endif
DEFINEFUNC2(BIO *, BIO_new_file, const char *filename, filename, const char *mode, mode, return 0, 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)
--- qtbase/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h.orig
+++ qtbase/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)());

View file

@ -0,0 +1,340 @@
From 4774fcd31a49f6f193bf10990601ad494fab2013 Mon Sep 17 00:00:00 2001
From: Stefan Strogin <steils@gentoo.org>
Date: Wed, 5 Feb 2020 03:49:35 +0200
Subject: [PATCH] QSslSocket - add LibreSSL support
Upstream-Status: Inappropriate
[Upstream is not willing to accept any patches for LibreSSL support]
Signed-off-by: Stefan Strogin <steils@gentoo.org>
---
src/network/ssl/qsslcertificate_openssl.cpp | 2 +-
src/network/ssl/qsslcontext_openssl.cpp | 17 +++++++-
src/network/ssl/qsslcontext_openssl_p.h | 7 +++
src/network/ssl/qsslsocket_openssl.cpp | 2 +-
.../ssl/qsslsocket_openssl_symbols.cpp | 25 +++++++++++
.../ssl/qsslsocket_openssl_symbols_p.h | 43 +++++++++++++++++++
6 files changed, 93 insertions(+), 3 deletions(-)
diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
index 6f1fb26a..eba5a729 100644
--- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
@@ -658,7 +658,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
unsigned char *data = nullptr;
int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
info.insert(name, QString::fromUtf8((char*)data, size));
-#if QT_CONFIG(opensslv11)
+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
q_CRYPTO_free(data, nullptr, 0);
#else
q_CRYPTO_free(data);
diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
index 0aa8a4f4..f161af8a 100644
--- qtbase/src/network/ssl/qsslcontext_openssl.cpp
+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
@@ -397,16 +397,28 @@ init_context:
maxVersion = DTLS1_VERSION;
break;
case QSsl::DtlsV1_0OrLater:
+#ifdef DTLS_MAX_VERSION
minVersion = DTLS1_VERSION;
maxVersion = DTLS_MAX_VERSION;
+#else
+ Q_UNREACHABLE();
+#endif // DTLS_MAX_VERSION
break;
case QSsl::DtlsV1_2:
+#ifdef DTLS1_2_VERSION
minVersion = DTLS1_2_VERSION;
maxVersion = DTLS1_2_VERSION;
+#else
+ Q_UNREACHABLE();
+#endif // DTLS1_2_VERSION
break;
case QSsl::DtlsV1_2OrLater:
+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
minVersion = DTLS1_2_VERSION;
maxVersion = DTLS_MAX_VERSION;
+#else
+ Q_UNREACHABLE();
+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
break;
case QSsl::TlsV1_3OrLater:
#ifdef TLS1_3_VERSION
@@ -696,6 +708,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
}
#endif // ocsp
+#ifndef LIBRESSL_VERSION_NUMBER
QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
if (cctx) {
q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
@@ -742,7 +755,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
sslContext->errorCode = QSslError::UnspecifiedError;
}
- } else {
+ } else
+#endif // LIBRESSL_VERSION_NUMBER
+ {
sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
sslContext->errorCode = QSslError::UnspecifiedError;
}
diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
index 70cb97aa..01a61cf5 100644
--- qtbase/src/network/ssl/qsslcontext_openssl_p.h
+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
@@ -61,6 +61,13 @@
QT_BEGIN_NAMESPACE
+#ifndef DTLS_ANY_VERSION
+#define DTLS_ANY_VERSION 0x1FFFF
+#endif
+#ifndef TLS_ANY_VERSION
+#define TLS_ANY_VERSION 0x10000
+#endif
+
#ifndef QT_NO_SSL
class QSslContextPrivate;
diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
index 4be27aff..1f33911e 100644
--- qtbase/src/network/ssl/qsslsocket_openssl.cpp
+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
@@ -598,7 +598,7 @@ bool QSslSocketBackendPrivate::initSslContext()
else if (mode == QSslSocket::SslServerMode)
q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
-#if OPENSSL_VERSION_NUMBER >= 0x10101006L
+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
// Set the client callback for TLSv1.3 PSK
if (mode == QSslSocket::SslClientMode
&& QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
index 71a268ae..8a43035b 100644
--- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -147,6 +147,7 @@ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, 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)
+#ifndef LIBRESSL_VERSION_NUMBER
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)
@@ -154,6 +155,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
+#else
+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
+#endif // LIBRESSL_VERSION_NUMBER
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)
#ifdef TLS1_3_VERSION
@@ -179,7 +188,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
+#ifndef LIBRESSL_VERSION_NUMBER
DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
+#else
+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
+#endif
DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
@@ -219,7 +232,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
return 0, return)
DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
+#ifndef LIBRESSL_VERSION_NUMBER
DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
+#endif
DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
@@ -351,12 +366,14 @@ 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)
+#ifndef 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);
DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
+#endif
DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
@@ -833,12 +850,14 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(EVP_PKEY_up_ref)
RESOLVEFUNC(EVP_PKEY_base_id)
RESOLVEFUNC(RSA_bits)
+#ifndef LIBRESSL_VERSION_NUMBER
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)
RESOLVEFUNC(SSL_CTX_set_options)
@@ -880,7 +899,9 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
RESOLVEFUNC(DH_bits)
+#ifndef LIBRESSL_VERSION_NUMBER
RESOLVEFUNC(DSA_bits)
+#endif
#if QT_CONFIG(dtls)
RESOLVEFUNC(DTLSv1_listen)
@@ -910,7 +931,9 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(OCSP_check_validity)
RESOLVEFUNC(OCSP_cert_to_id)
RESOLVEFUNC(OCSP_id_get0_info)
+#ifndef LIBRESSL_VERSION_NUMBER
RESOLVEFUNC(OCSP_resp_get0_certs)
+#endif
RESOLVEFUNC(OCSP_basic_sign)
RESOLVEFUNC(OCSP_response_create)
RESOLVEFUNC(i2d_OCSP_RESPONSE)
@@ -1040,12 +1063,14 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
RESOLVEFUNC(SSL_CTX_get_cert_store);
+#ifndef LIBRESSL_VERSION_NUMBER
RESOLVEFUNC(SSL_CONF_CTX_new);
RESOLVEFUNC(SSL_CONF_CTX_free);
RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
RESOLVEFUNC(SSL_CONF_CTX_set_flags);
RESOLVEFUNC(SSL_CONF_CTX_finish);
RESOLVEFUNC(SSL_CONF_cmd);
+#endif
RESOLVEFUNC(SSL_accept)
RESOLVEFUNC(SSL_clear)
RESOLVEFUNC(SSL_connect)
diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
index f35e0ba2..30097317 100644
--- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
#define DUMMYARG
+#ifdef LIBRESSL_VERSION_NUMBER
+typedef _STACK STACK;
+typedef STACK OPENSSL_STACK;
+typedef void OPENSSL_INIT_SETTINGS;
+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
+#endif
+
#if !defined QT_LINKED_OPENSSL
// **************** Shared declarations ******************
// ret func(arg)
@@ -230,17 +237,38 @@ 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();
+#ifndef LIBRESSL_VERSION_NUMBER
int q_DSA_bits(DSA *a);
+#else
+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
+#endif
int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
int q_EVP_PKEY_base_id(EVP_PKEY *a);
int q_RSA_bits(RSA *a);
+
+#ifndef LIBRESSL_VERSION_NUMBER
Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
+#else // LIBRESSL_VERSION_NUMBER
+int q_sk_num(STACK *a);
+#define q_OPENSSL_sk_num(a) q_sk_num(a)
+void q_sk_pop_free(STACK *a, void (*b)(void *));
+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
+STACK *q_sk_new_null();
+#define q_OPENSSL_sk_new_null() q_sk_new_null()
+void q_sk_push(STACK *st, void *data);
+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
+void q_sk_free(STACK *a);
+#define q_OPENSSL_sk_free q_sk_free
+void *q_sk_value(STACK *a, int b);
+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
+#endif // LIBRESSL_VERSION_NUMBER
+
int q_SSL_session_reused(SSL *a);
unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
@@ -266,8 +294,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)
+#ifndef LIBRESSL_VERSION_NUMBER
#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)
+#else
+#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)
+#endif // LIBRESSL_VERSION_NUMBER
#define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
| OPENSSL_INIT_ADD_ALL_DIGESTS \
@@ -276,7 +309,11 @@ int q_DH_bits(DH *dh);
| OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
+#ifndef LIBRESSL_VERSION_NUMBER
void q_CRYPTO_free(void *str, const char *file, int line);
+#else
+void q_CRYPTO_free(void *a);
+#endif
long q_OpenSSL_version_num();
const char *q_OpenSSL_version(int type);
@@ -494,12 +531,14 @@ 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);
+#ifndef 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);
unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
+#endif
void q_SSL_free(SSL *a);
STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
@@ -715,7 +754,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
ASN1_INTEGER **pserial, OCSP_CERTID *cid);
+#ifndef LIBRESSL_VERSION_NUMBER
const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
+#else
+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
+#endif
Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--
2.25.0

View file

@ -1,7 +1,7 @@
# Template file for 'qt5'
pkgname=qt5
version=5.14.2
revision=5
version=5.15.0
revision=1
wrksrc="qt-everywhere-src-${version}"
build_style=meta
hostmakedepends="cmake clang flex perl glib-devel pkg-config
@ -18,11 +18,11 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
qt5-test qt5-sql qt5-concurrent qt5-printsupport qt5-opengl"
short_desc="Cross-platform application and UI framework (QT5)"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
maintainer="John <johnz@posteo.net>"
license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://qt.io/"
distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-src-${version}.tar.xz"
checksum=c6fcd53c744df89e7d3223c02838a33309bd1c291fcb6f9341505fe99f7f19fa
checksum=22b63d7a7a45183865cc4141124f12b673e7a17b1fe2b91e433f6547c5d548c3
python_version=2 #unverified
replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
@ -100,6 +100,7 @@ _install_devel() {
mv -nv ${PKGDESTDIR}${wrksrc}/host/mkspecs/modules/* \
${PKGDESTDIR}/usr/lib/qt5/mkspecs/modules/
fi
rm -rf ${PKGDESTDIR}/usr/lib/metatypes
rm -rf ${PKGDESTDIR}/builddir
rm -rf ${PKGDESTDIR}/usr/share
rm -rf ${PKGDESTDIR}/usr/lib/qt5/bin
@ -321,7 +322,7 @@ do_install() {
dir=qtdeclarative/src
_msg_cross " Building ${base}"
cd ${wrksrc}/${dir}/${base}
[ -f "${base}.pro" ] && cp -a ${base}.pro{,.orig}
[ -f "${base}.pro" ] && cp -v -a ${base}.pro{,.orig}
vsed -i ${base}.pro \
-e "/option(host_build)/d" \
-e "/include(..\/3rdparty\/masm\/masm-defs.pri)/i include(../3rdparty/masm/masm.pri)"
@ -341,6 +342,7 @@ do_install() {
#
dirs+=" qtdeclarative/tools/qmlmin"
dirs+=" qtdeclarative/tools/qmllint"
dirs+=" qtdeclarative/tools/qmlformat"
dirs+=" qtdeclarative/tools/qmlcachegen"
dirs+=" qtdeclarative/tools/qmlimportscanner"
dirs+=" qtbase/src/tools/moc"
@ -590,7 +592,7 @@ qt5-declarative_package() {
short_desc+=" - Declarative component"
pkg_install() {
_install_subpkg qtdeclarative
_move_target_binaries qmlmin qmllint qmlimportscanner qmlcachegen
_move_target_binaries qmlmin qmllint qmlformat qmlimportscanner qmlcachegen
}
}