diff options
Diffstat (limited to 'devel/qt6-base/files')
14 files changed, 84 insertions, 153 deletions
diff --git a/devel/qt6-base/files/patch-sock_seqpacket b/devel/qt6-base/files/patch-sock_seqpacket deleted file mode 100644 index 0ce628239939..000000000000 --- a/devel/qt6-base/files/patch-sock_seqpacket +++ /dev/null @@ -1,105 +0,0 @@ -https://codereview.qt-project.org/c/qt/qtbase/+/681531 -https://codereview.qt-project.org/c/qt/qtbase/+/682568 - -From 8e06365bee31ef5a1980b7b24d1564e3d769cfc7 Mon Sep 17 00:00:00 2001 -From: Gleb Popov <arrowd@FreeBSD.org> -Date: Thu, 2 Oct 2025 13:14:54 +0300 -Subject: [PATCH] QNativeSocketEngine::read: Only treat readBytes==0 as a EOF - condition with stream sockets - -This change also covers SOCK_SEQPACKET type of sockets, which isn't great, -but allows to avoid an endless polling loop when waiting for read on -a disconnected socket. - -Pick-to: 6.10 -Change-Id: I6117b97c2c9b775e9e6fe9757bf4374365e3227d -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> ---- - src/network/socket/qnativesocketengine.cpp | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git src/network/socket/qnativesocketengine.cpp src/network/socket/qnativesocketengine.cpp -index f33e5a26bd94..4c83ef7e5df6 100644 ---- src/network/socket/qnativesocketengine.cpp -+++ src/network/socket/qnativesocketengine.cpp -@@ -910,12 +910,11 @@ qint64 QNativeSocketEngine::read(char *data, qint64 maxSize) - - qint64 readBytes = d->nativeRead(data, maxSize); - -- // Handle remote close -- if (readBytes == 0 && (d->socketType == QAbstractSocket::TcpSocket --#ifndef QT_NO_SCTP -- || d->socketType == QAbstractSocket::SctpSocket --#endif -- )) { -+ // Handle remote close. -+ // Non-datagram socket types signal the EOF state with a zero read. -+ // Note that it is perfectly fine to have a 0-byte message with datagram -+ // sockets (SOCK_DGRAM or SOCK_SEQPACKET). -+ if (readBytes == 0 && d->socketType != QAbstractSocket::UdpSocket) { - d->setError(QAbstractSocket::RemoteHostClosedError, - QNativeSocketEnginePrivate::RemoteHostClosedErrorString); - close(); --- -2.43.0 - -From a395c091a56781352113670b72ba619367486e7e Mon Sep 17 00:00:00 2001 -From: Gleb Popov <arrowd@FreeBSD.org> -Date: Tue, 7 Oct 2025 10:53:18 +0300 -Subject: [PATCH] Teach QNativeSocketEnginePrivate::fetchConnectionParameters() - about SOCK_SEQPACKET - -Pick-to: 6.10 -Change-Id: I4136ef3b4c198e3bd155884bde53171bd34959e4 -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> ---- - .../socket/qnativesocketengine_unix.cpp | 23 ++++++++++++------- - 1 file changed, 15 insertions(+), 8 deletions(-) - -diff --git src/network/socket/qnativesocketengine_unix.cpp src/network/socket/qnativesocketengine_unix.cpp -index b5fbb5c2e003..bcd9aecdea97 100644 ---- src/network/socket/qnativesocketengine_unix.cpp -+++ src/network/socket/qnativesocketengine_unix.cpp -@@ -1244,6 +1244,7 @@ bool QNativeSocketEnginePrivate::fetchConnectionParameters() - QT_SOCKOPTLEN_T valueSize = sizeof(int); - if (::getsockopt(socketDescriptor, SOL_SOCKET, SO_TYPE, &value, &valueSize) == 0) { - if (value == SOCK_STREAM) { -+ socketType = QAbstractSocket::TcpSocket; - #ifndef QT_NO_SCTP - if (option(QNativeSocketEngine::MaxStreamsSocketOption) != -1) { - socketType = QAbstractSocket::SctpSocket; -@@ -1266,17 +1267,23 @@ bool QNativeSocketEnginePrivate::fetchConnectionParameters() - return false; - } - } -- } else { -- socketType = QAbstractSocket::TcpSocket; - } --#else -- socketType = QAbstractSocket::TcpSocket; -+#endif -+ } else if (value == SOCK_DGRAM) { -+ socketType = QAbstractSocket::UdpSocket; -+#ifdef SOCK_SEQPACKET -+ } else if (value == SOCK_SEQPACKET) { -+ // We approximate the SEQPACKET socket type to TCP, because -+ // this enum is actually used to determine if the socket type has -+ // a notion of connection. SOCK_DGRAM are connectionless, while -+ // SOCK_STREAM and SOCK_SEQPACKET are connection-orientired. -+ // This mapping is still suboptimal, because it is possible to send -+ // a 0-byte packet via SEQPACKET socket and Qt will treat it as -+ // a disconnect. -+ socketType = QAbstractSocket::TcpSocket; - #endif - } else { -- if (value == SOCK_DGRAM) -- socketType = QAbstractSocket::UdpSocket; -- else -- socketType = QAbstractSocket::UnknownSocketType; -+ socketType = QAbstractSocket::UnknownSocketType; - } - } - #if defined (QNATIVESOCKETENGINE_DEBUG) --- -2.43.0 - diff --git a/devel/qt6-base/files/patch-src_corelib_CMakeLists.txt b/devel/qt6-base/files/patch-src_corelib_CMakeLists.txt index 32dfb0e5e986..f816905017cc 100644 --- a/devel/qt6-base/files/patch-src_corelib_CMakeLists.txt +++ b/devel/qt6-base/files/patch-src_corelib_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/corelib/CMakeLists.txt.orig 2025-02-19 13:05:34 UTC +--- src/corelib/CMakeLists.txt.orig 2025-05-14 09:43:58 UTC +++ src/corelib/CMakeLists.txt -@@ -402,6 +402,10 @@ endif() +@@ -412,6 +412,10 @@ endif() target_link_libraries(Platform INTERFACE Threads::Threads) endif() diff --git a/devel/qt6-base/files/patch-src_corelib_global_qcompilerdetection.h b/devel/qt6-base/files/patch-src_corelib_global_qcompilerdetection.h index 5047f42ef687..a0bb0a31a996 100644 --- a/devel/qt6-base/files/patch-src_corelib_global_qcompilerdetection.h +++ b/devel/qt6-base/files/patch-src_corelib_global_qcompilerdetection.h @@ -5,9 +5,9 @@ error: use of the 'nodiscard' attribute is a C++20 extension https://github.com/llvm/llvm-project/issues/32865 ---- src/corelib/global/qcompilerdetection.h.orig 2025-05-28 10:22:57 UTC +--- src/corelib/global/qcompilerdetection.h.orig 2025-05-14 09:43:58 UTC +++ src/corelib/global/qcompilerdetection.h -@@ -966,7 +966,7 @@ +@@ -972,7 +972,7 @@ # define Q_REQUIRED_RESULT [[nodiscard]] #endif diff --git a/devel/qt6-base/files/patch-src_corelib_io_qlockfile__unix.cpp b/devel/qt6-base/files/patch-src_corelib_io_qlockfile__unix.cpp index 776dd9fd0447..05b9ba9b69f0 100644 --- a/devel/qt6-base/files/patch-src_corelib_io_qlockfile__unix.cpp +++ b/devel/qt6-base/files/patch-src_corelib_io_qlockfile__unix.cpp @@ -1,6 +1,6 @@ ---- src/corelib/io/qlockfile_unix.cpp.orig 2024-11-14 11:02:40 UTC +--- src/corelib/io/qlockfile_unix.cpp.orig 2025-05-14 09:43:58 UTC +++ src/corelib/io/qlockfile_unix.cpp -@@ -46,6 +46,8 @@ +@@ -47,6 +47,8 @@ # include <sys/sysctl.h> # if !defined(Q_OS_NETBSD) # include <sys/user.h> @@ -9,7 +9,7 @@ # endif #endif -@@ -237,23 +239,44 @@ QString QLockFilePrivate::processNameByPid(qint64 pid) +@@ -238,23 +240,44 @@ QString QLockFilePrivate::processNameByPid(qint64 pid) struct kinfo_proc kp; int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, (int)pid, sizeof(struct kinfo_proc), 1 }; # else diff --git a/devel/qt6-base/files/patch-src_corelib_time_qtimezoneprivate__tz.cpp b/devel/qt6-base/files/patch-src_corelib_time_qtimezoneprivate__tz.cpp index e77da3e4be7a..0c9359be1f14 100644 --- a/devel/qt6-base/files/patch-src_corelib_time_qtimezoneprivate__tz.cpp +++ b/devel/qt6-base/files/patch-src_corelib_time_qtimezoneprivate__tz.cpp @@ -1,6 +1,6 @@ ---- src/corelib/time/qtimezoneprivate_tz.cpp.orig 2025-03-11 12:45:59 UTC +--- src/corelib/time/qtimezoneprivate_tz.cpp.orig 2025-05-14 09:43:58 UTC +++ src/corelib/time/qtimezoneprivate_tz.cpp -@@ -1312,8 +1312,16 @@ class ZoneNameReader (public) +@@ -1313,8 +1313,16 @@ class ZoneNameReader (public) const StatIdent local = identify("/etc/localtime"); const StatIdent tz = identify("/etc/TZ"); const StatIdent timezone = identify("/etc/timezone"); diff --git a/devel/qt6-base/files/patch-src_network_socket_qnativesocketengine__unix.cpp b/devel/qt6-base/files/patch-src_network_socket_qnativesocketengine__unix.cpp index a61cd8a94a13..4f6b594d0575 100644 --- a/devel/qt6-base/files/patch-src_network_socket_qnativesocketengine__unix.cpp +++ b/devel/qt6-base/files/patch-src_network_socket_qnativesocketengine__unix.cpp @@ -1,8 +1,8 @@ https://codereview.qt-project.org/c/qt/qtbase/+/651678 ---- src/network/socket/qnativesocketengine_unix.cpp.orig 2025-06-08 12:42:24 UTC +--- src/network/socket/qnativesocketengine_unix.cpp.orig 2025-05-14 09:43:58 UTC +++ src/network/socket/qnativesocketengine_unix.cpp -@@ -1379,7 +1379,7 @@ int QNativeSocketEnginePrivate::nativeSelect(QDeadline +@@ -1387,7 +1387,7 @@ int QNativeSocketEnginePrivate::nativeSelect(QDeadline } static const short read_flags = POLLIN | POLLHUP | POLLERR; diff --git a/devel/qt6-base/files/patch-src_plugins_platforms_wayland_plugins_shellintegration_xdg-shell_qwaylandxdgshell__p.h b/devel/qt6-base/files/patch-src_plugins_platforms_wayland_plugins_shellintegration_xdg-shell_qwaylandxdgshell__p.h new file mode 100644 index 000000000000..ac5c4f661c66 --- /dev/null +++ b/devel/qt6-base/files/patch-src_plugins_platforms_wayland_plugins_shellintegration_xdg-shell_qwaylandxdgshell__p.h @@ -0,0 +1,13 @@ +Companion change to patch-src_plugins_shellintegration_xdg-shell_qwaylandxdgshell__p.h + +--- src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h.orig 2025-05-14 09:43:58 UTC ++++ src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell_p.h +@@ -74,7 +74,7 @@ class Q_WAYLANDCLIENT_EXPORT QWaylandXdgSurface : publ + + void setSizeHints(); + +- void *nativeResource(const QByteArray &resource); ++ void *nativeResource(const QByteArray &resource) override; + + std::any surfaceRole() const override; + diff --git a/devel/qt6-base/files/patch-src_plugins_platforms_wayland_qwaylandshellsurface__p.h b/devel/qt6-base/files/patch-src_plugins_platforms_wayland_qwaylandshellsurface__p.h new file mode 100644 index 000000000000..e0728427ffa9 --- /dev/null +++ b/devel/qt6-base/files/patch-src_plugins_platforms_wayland_qwaylandshellsurface__p.h @@ -0,0 +1,23 @@ +Add QWaylandShellSurface::nativeResource() to allow using it instead of +surfaceRole(). The problem with latter is that it relies on RTTI, which is not +stable across shared modules loaded with RTLD_LOCAL. + +x11/plasma6-layer-shell-qt calls into this private API and crashes. Linux/GCC +users are not seeing this because libstdc++ use different algorithm for comparing +RTTI. Our libc++ can be switched to this algorithm too by building with +-DLIBCXX_TYPEINFO_COMPARISON_IMPLEMENTATION=2, but this is too drastic approach. + +Related URLs: +* https://bugs.kde.org/show_bug.cgi?id=479679 +* https://github.com/llvm/llvm-project/issues/36746 + +--- src/plugins/platforms/wayland/qwaylandshellsurface_p.h.orig 2025-05-14 09:43:58 UTC ++++ src/plugins/platforms/wayland/qwaylandshellsurface_p.h +@@ -84,6 +84,7 @@ class Q_WAYLANDCLIENT_EXPORT QWaylandShellSurface : pu + QPlatformWindow *platformWindow(); + struct wl_surface *wlSurface(); + ++ virtual void* nativeResource(const QByteArray&) { return nullptr; } + virtual std::any surfaceRole() const { return std::any(); }; + + virtual void attachPopup(QWaylandShellSurface *popup) { Q_UNUSED(popup); } diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qopenssl__p.h b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qopenssl__p.h index e6298f935613..ec2e8651c07f 100644 --- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qopenssl__p.h +++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qopenssl__p.h @@ -1,6 +1,6 @@ ---- src/plugins/tls/openssl/qopenssl_p.h.orig 2023-09-21 19:24:26 UTC +--- src/plugins/tls/openssl/qopenssl_p.h.orig 2025-05-14 09:43:58 UTC +++ src/plugins/tls/openssl/qopenssl_p.h -@@ -70,6 +70,13 @@ QT_BEGIN_NAMESPACE +@@ -71,6 +71,13 @@ QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslcontext__openssl.cpp b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslcontext__openssl.cpp index 02dc9a1f8e2a..010b3de27a8c 100644 --- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslcontext__openssl.cpp +++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslcontext__openssl.cpp @@ -1,18 +1,18 @@ ---- src/plugins/tls/openssl/qsslcontext_openssl.cpp.orig 2025-02-19 13:05:34 UTC +--- src/plugins/tls/openssl/qsslcontext_openssl.cpp.orig 2025-05-14 09:43:58 UTC +++ src/plugins/tls/openssl/qsslcontext_openssl.cpp -@@ -49,9 +49,9 @@ extern "C" int q_verify_cookie_callback(SSL *ssl, cons - } - #endif // dtls +@@ -36,9 +36,9 @@ int qt_OCSP_status_server_callback(SSL *ssl, void *); + int qt_OCSP_status_server_callback(SSL *ssl, void *); + #endif // ocsp -#ifdef TLS1_3_VERSION +#if defined(TLS1_3_VERSION) && !defined(LIBRESSL_VERSION_NUMBER) - extern "C" int q_ssl_sess_set_new_cb(SSL *context, SSL_SESSION *session); + int q_ssl_sess_set_new_cb(SSL *context, SSL_SESSION *session); -#endif // TLS1_3_VERSION -+#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBE ++#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBER + + } // namespace QTlsPrivate - static inline QString msgErrorSettingBackendConfig(const QString &why) - { -@@ -370,9 +370,11 @@ QT_WARNING_POP +@@ -369,9 +369,11 @@ QT_WARNING_POP return; } @@ -24,7 +24,7 @@ const long anyVersion = #if QT_CONFIG(dtls) -@@ -663,14 +665,14 @@ QT_WARNING_POP +@@ -662,14 +664,14 @@ QT_WARNING_POP q_SSL_CTX_set_verify(sslContext->ctx, verificationMode, verificationCallback); } @@ -32,7 +32,7 @@ +#if defined(TLS1_3_VERSION) && !defined(LIBRESSL_VERSION_NUMBER) // NewSessionTicket callback: if (mode == QSslSocket::SslClientMode && !isDtls) { - q_SSL_CTX_sess_set_new_cb(sslContext->ctx, q_ssl_sess_set_new_cb); + q_SSL_CTX_sess_set_new_cb(sslContext->ctx, QTlsPrivate::q_ssl_sess_set_new_cb); q_SSL_CTX_set_session_cache_mode(sslContext->ctx, SSL_SESS_CACHE_CLIENT); } @@ -41,7 +41,7 @@ #if QT_CONFIG(dtls) // DTLS cookies: -@@ -760,6 +762,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC +@@ -759,6 +761,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC } #endif // ocsp @@ -49,7 +49,7 @@ 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); -@@ -803,7 +806,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC +@@ -802,7 +805,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed")); sslContext->errorCode = QSslError::UnspecifiedError; } diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp index 23d57861e45e..88a92e4d5b83 100644 --- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp +++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp @@ -1,6 +1,6 @@ ---- src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp.orig 2025-02-19 13:05:34 UTC +--- src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp.orig 2025-05-14 09:43:58 UTC +++ src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp -@@ -113,23 +113,36 @@ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, retur +@@ -114,23 +114,36 @@ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, retur DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) 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) @@ -37,7 +37,7 @@ #ifdef TLS1_3_VERSION DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return) DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG) -@@ -194,7 +207,9 @@ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int +@@ -195,7 +208,9 @@ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int 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) @@ -47,7 +47,7 @@ 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) -@@ -215,7 +230,9 @@ DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char ** +@@ -216,7 +231,9 @@ DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char ** DEFINEFUNC2(int, ASN1_INTEGER_cmp, const ASN1_INTEGER *a, a, const ASN1_INTEGER *b, b, return 1, return) DEFINEFUNC(int, ASN1_STRING_length, ASN1_STRING *a, a, return 0, return) DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return) @@ -57,7 +57,7 @@ DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return) DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return) DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return nullptr, return) -@@ -290,12 +307,14 @@ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const +@@ -291,12 +308,14 @@ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *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) @@ -72,7 +72,7 @@ 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) -@@ -764,8 +783,8 @@ static LoadedOpenSsl loadOpenSsl() +@@ -765,8 +784,8 @@ static LoadedOpenSsl loadOpenSsl() libcrypto->setFileNameAndVersion("crypto"_L1, shlibVersion); #elif defined(SHLIB_VERSION_NUMBER) // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER> @@ -83,7 +83,7 @@ #endif // OPENSSL_SHLIB_VERSION if (libcrypto->load() && libssl->load()) { -@@ -798,8 +817,8 @@ static LoadedOpenSsl loadOpenSsl() +@@ -799,8 +818,8 @@ static LoadedOpenSsl loadOpenSsl() libssl->setFileNameAndVersion("ssl"_L1 + suffix, -1); libcrypto->setFileNameAndVersion("crypto"_L1 + suffix, -1); # else @@ -94,7 +94,7 @@ # endif if (libcrypto->load() && libssl->load()) { // libssl.so.0 and libcrypto.so.0 found -@@ -868,21 +887,34 @@ bool q_resolveOpenSslSymbols() +@@ -869,21 +888,34 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(EVP_CIPHER_CTX_reset) RESOLVEFUNC(AUTHORITY_INFO_ACCESS_free) RESOLVEFUNC(EVP_PKEY_up_ref) @@ -129,7 +129,7 @@ #ifdef TLS1_3_VERSION RESOLVEFUNC(SSL_CTX_set_ciphersuites) RESOLVEFUNC(SSL_set_psk_use_session_callback) -@@ -964,7 +996,9 @@ bool q_resolveOpenSslSymbols() +@@ -965,7 +997,9 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(OCSP_check_validity) RESOLVEFUNC(OCSP_cert_to_id) RESOLVEFUNC(OCSP_id_get0_info) @@ -140,7 +140,7 @@ RESOLVEFUNC(OCSP_basic_sign) RESOLVEFUNC(OCSP_response_create) RESOLVEFUNC(i2d_OCSP_RESPONSE) -@@ -1059,12 +1093,14 @@ bool q_resolveOpenSslSymbols() +@@ -1060,12 +1094,14 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_CTX_use_PrivateKey) RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) RESOLVEFUNC(SSL_CTX_get_cert_store); @@ -155,7 +155,7 @@ RESOLVEFUNC(SSL_accept) RESOLVEFUNC(SSL_clear) RESOLVEFUNC(SSL_connect) -@@ -1124,7 +1160,9 @@ bool q_resolveOpenSslSymbols() +@@ -1125,7 +1161,9 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(RSA_free) RESOLVEFUNC(DH_bits) diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols__p.h b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols__p.h index 0f92172a0f4c..bd8bebfad15e 100644 --- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols__p.h +++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols__p.h @@ -1,6 +1,6 @@ ---- src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h.orig 2024-03-19 15:46:43 UTC +--- src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h.orig 2025-05-14 09:43:58 UTC +++ src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h -@@ -46,6 +46,13 @@ QT_BEGIN_NAMESPACE +@@ -47,6 +47,13 @@ QT_BEGIN_NAMESPACE #define DUMMYARG @@ -14,7 +14,7 @@ #if !defined QT_LINKED_OPENSSL // **************** Shared declarations ****************** // ret func(arg) -@@ -203,15 +210,32 @@ int q_EVP_PKEY_up_ref(EVP_PKEY *a); +@@ -204,15 +211,32 @@ int q_EVP_PKEY_up_ref(EVP_PKEY *a); void q_AUTHORITY_INFO_ACCESS_free(AUTHORITY_INFO_ACCESS *a); int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c); int q_EVP_PKEY_up_ref(EVP_PKEY *a); @@ -47,7 +47,7 @@ int q_SSL_session_reused(SSL *a); qssloptions q_SSL_CTX_set_options(SSL_CTX *ctx, qssloptions op); int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); -@@ -237,8 +261,13 @@ STACK_OF(X509) *q_X509_STORE_CTX_get0_chain(X509_STORE +@@ -238,8 +262,13 @@ STACK_OF(X509) *q_X509_STORE_CTX_get0_chain(X509_STORE # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \ | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL) @@ -61,7 +61,7 @@ #define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ | OPENSSL_INIT_ADD_ALL_DIGESTS \ -@@ -423,12 +452,14 @@ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a) +@@ -424,12 +453,14 @@ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a) int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *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); @@ -76,7 +76,7 @@ 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); -@@ -537,14 +568,26 @@ void q_PKCS12_free(PKCS12 *pkcs12); +@@ -538,14 +569,26 @@ void q_PKCS12_free(PKCS12 *pkcs12); #define q_BIO_get_mem_data(b, pp) (int)q_BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp) #define q_BIO_pending(b) (int)q_BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL) #define q_SSL_CTX_set_mode(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,(op),NULL) diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qtls__openssl.cpp b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qtls__openssl.cpp index e0a2e68f7f96..26499c299a37 100644 --- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qtls__openssl.cpp +++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qtls__openssl.cpp @@ -1,6 +1,6 @@ ---- src/plugins/tls/openssl/qtls_openssl.cpp.orig 2023-09-21 19:24:26 UTC +--- src/plugins/tls/openssl/qtls_openssl.cpp.orig 2025-05-14 09:43:58 UTC +++ src/plugins/tls/openssl/qtls_openssl.cpp -@@ -1438,13 +1438,13 @@ bool TlsCryptographOpenSSL::initSslContext() +@@ -1435,13 +1435,13 @@ bool TlsCryptographOpenSSL::initSslContext() else if (mode == QSslSocket::SslServerMode) q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback); diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qx509__openssl.cpp b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qx509__openssl.cpp index a391e32bdd42..52a9061e792a 100644 --- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qx509__openssl.cpp +++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qx509__openssl.cpp @@ -1,6 +1,6 @@ ---- src/plugins/tls/openssl/qx509_openssl.cpp.orig 2024-03-19 15:46:43 UTC +--- src/plugins/tls/openssl/qx509_openssl.cpp.orig 2025-05-14 09:43:58 UTC +++ src/plugins/tls/openssl/qx509_openssl.cpp -@@ -190,7 +190,11 @@ QVariant x509UnknownExtensionToValue(X509_EXTENSION *e +@@ -191,7 +191,11 @@ QVariant x509UnknownExtensionToValue(X509_EXTENSION *e QVariantList list; bool isMap = false; @@ -12,7 +12,7 @@ CONF_VALUE *nval = q_SKM_sk_value(CONF_VALUE, val, j); if (nval->name && nval->value) { isMap = true; -@@ -286,7 +290,11 @@ QVariant x509ExtensionToValue(X509_EXTENSION *ext) +@@ -287,7 +291,11 @@ QVariant x509ExtensionToValue(X509_EXTENSION *ext) if (!info) return {}; QVariantMap result; |