sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (50dcfb97cd428d346b2b50498f5eaf13f996b0ca)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (50dcfb97cd428d346b2b50498f5eaf13f996b0ca)
- Date: Tue, 7 Oct 2025 10:58:12 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
openprinting/pdfio/DETAILS | 2
openprinting/pdfio/HISTORY | 3
qt6/QT6_VERSIONS | 2
qt6/qt6base/CONFLICTS | 9
qt6/qt6base/FINAL | 7
qt6/qt6base/HISTORY | 4
qt6/qt6base/patches/0001-Fix-build-against-LibreSSL.patch | 332
--------------
qt6/sha5sum.txt | 56 +-
8 files changed, 46 insertions(+), 369 deletions(-)
New commits:
commit 50dcfb97cd428d346b2b50498f5eaf13f996b0ca
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
pdfio: => 1.6.0
commit 1d4280943b979af3c48c104db55e00f8d88f4c50
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qt6base - move qt6wayland logic to conflicts
commit f0cf7b5091be7a7ef11fc2e3a0bd30d05222ba0b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qt6* => 6.10.0
commit 1a7b4633538c45c680933a42ab13e2a016d14257
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qt6base - delete bad patch
diff --git a/openprinting/pdfio/DETAILS b/openprinting/pdfio/DETAILS
index b8ca728..932c303 100755
--- a/openprinting/pdfio/DETAILS
+++ b/openprinting/pdfio/DETAILS
@@ -1,5 +1,5 @@
SPELL=pdfio
- VERSION=1.5.4
+ VERSION=1.6.0
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$SPELL-$VERSION
diff --git a/openprinting/pdfio/HISTORY b/openprinting/pdfio/HISTORY
index 64a1c98..4a895ca 100644
--- a/openprinting/pdfio/HISTORY
+++ b/openprinting/pdfio/HISTORY
@@ -1,3 +1,6 @@
+2025-10-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.0
+
2025-08-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.5.4
diff --git a/qt6/QT6_VERSIONS b/qt6/QT6_VERSIONS
index 439eee0..daae1e5 100644
--- a/qt6/QT6_VERSIONS
+++ b/qt6/QT6_VERSIONS
@@ -1,6 +1,6 @@
# this script list the file name, source hash and url for all the Qt6 spells
# together with the file sha5sum.txt, it simplifies updating of all these
spells
-VERSION=6.9.3
+VERSION=6.10.0
# map spell name to qt name
SPELLX=${SPELL//6}
SPELLX=${SPELLX//-}-everywhere-src # for qt3d
diff --git a/qt6/qt6base/CONFLICTS b/qt6/qt6base/CONFLICTS
new file mode 100755
index 0000000..0213172
--- /dev/null
+++ b/qt6/qt6base/CONFLICTS
@@ -0,0 +1,9 @@
+# qt-6.10 moves some wayland files
+if spell_ok qt6wayland;then
+ QTW=`installed_version qt6wayland`
+ if [[ ${VERSION%.*} != ${QTW%.*} ]];then
+ message "${MESSAGE_COLOR}qt-6.10 moves some qt6wayland files to qt6base"
+ conflicts qt6wayland y
+# cleanse --nofix_quick qt6wayland
+ fi
+fi
diff --git a/qt6/qt6base/FINAL b/qt6/qt6base/FINAL
index 07dcb7a..0574cda 100755
--- a/qt6/qt6base/FINAL
+++ b/qt6/qt6base/FINAL
@@ -2,11 +2,4 @@ if ! grep -q qt6 "${INSTALL_ROOT}/etc/ld.so.conf";then
message "${MESSAGE_COLOR}Adding qt6 lib directory to
ld.so.conf$DEFAULT_COLOR"
echo "${INSTALL_ROOT}/opt/qt6/lib" >> "${INSTALL_ROOT}/etc/ld.so.conf"
ldconfig
-fi &&
-# qt-6.10 moves some wayland files
-if spell_ok qt6wayland;then
- QTW=`installed_version qt6wayland`
- if [[ ${VERSION%.*} != ${QTW%.*} ]];then
- cleanse --nofix_quick qt6wayland
- fi
fi
diff --git a/qt6/qt6base/HISTORY b/qt6/qt6base/HISTORY
index f1475ec..1cef360 100644
--- a/qt6/qt6base/HISTORY
+++ b/qt6/qt6base/HISTORY
@@ -1,3 +1,7 @@
+2025-10-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * 0001-Fix-build-against-LibreSSL.patch: deleted bad patch
+ * FINAL CONFLICTS: move qt6wayand logic to conflicts
+
2025-09-20 Treeve Jelbert <treeve AT sourcemage.org>
* FINAL: check for qtwayland changes in qt-6.10
diff --git a/qt6/qt6base/patches/0001-Fix-build-against-LibreSSL.patch
b/qt6/qt6base/patches/0001-Fix-build-against-LibreSSL.patch
deleted file mode 100644
index 7d2ea88..0000000
--- a/qt6/qt6base/patches/0001-Fix-build-against-LibreSSL.patch
+++ /dev/null
@@ -1,332 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-Subject: [PATCH] Fix build against LibreSSL
-Date: Sun, 23 Jun 2024 05:57:33 +0200
-From: rsadowski <rsadowski AT openbsd.org>
-
-Co-developed-by: tb <tb AT openbsd.org>
-Upstream-Status: Denied [Qt refuses to support LibreSSL]
-Origin: OpenBSD
-[ismael AT sourcemage.org: Patch normalised]
-Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
----
- src/network/kernel/qnetworkinterface_unix.cpp | 5 ++
- src/plugins/tls/openssl/qopenssl_p.h | 7 ++
- src/plugins/tls/openssl/qsslcontext_openssl.cpp | 13 +++--
- src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp | 26 +++++++++++
- src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h | 40
+++++++++++++++++
- src/plugins/tls/openssl/qx509_openssl.cpp | 8 +++
- 6 files changed, 94 insertions(+), 5 deletions(-)
-
-Index: src/network/kernel/qnetworkinterface_unix.cpp
---- a/src/network/kernel/qnetworkinterface_unix.cpp
-+++ b/src/network/kernel/qnetworkinterface_unix.cpp
-@@ -32,6 +32,9 @@
- # endif
- #endif // QT_LINUXBASE
-
-+#include <netinet/in.h>
-+#include <netinet6/in6_var.h>
-+
- #include <qplatformdefs.h>
-
- QT_BEGIN_NAMESPACE
-@@ -421,7 +424,9 @@ static QNetworkInterface::InterfaceType probeIfType(in
- return QNetworkInterface::Ieee1394;
-
- case IFT_GIF:
-+#ifdef IFT_STF
- case IFT_STF:
-+#endif
- return QNetworkInterface::Virtual;
- }
-
-disable EVP_PKEY_param_check
-use old sk_num, ..., sk_value
-disable SSL_CONF_CTX
-
-... and resolve accordingly
-
-Index: src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
---- a/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
-+++ b/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
-@@ -113,14 +113,25 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w,
- 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)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE
*e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0,
return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- 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)
- DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return
nullptr, return)
- 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(qssloptions, SSL_CTX_set_options, SSL_CTX *ctx, ctx,
qssloptions op, op, return 0, return)
- using info_callback = void (*) (const SSL *ssl, int type, int val);
-@@ -289,12 +300,14 @@ DEFINEFUNC3(int, SSL_CTX_use_certificate_file, SSL_CTX
- 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)
-+#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)
-@@ -866,14 +879,25 @@ bool q_resolveOpenSslSymbols()
- RESOLVEFUNC(AUTHORITY_INFO_ACCESS_free)
- RESOLVEFUNC(EVP_PKEY_up_ref)
- RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
- RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
- RESOLVEFUNC(EVP_PKEY_CTX_free)
-+#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)
-+#else
-+ RESOLVEFUNC(sk_new_null)
-+ RESOLVEFUNC(sk_push)
-+ RESOLVEFUNC(sk_free)
-+ RESOLVEFUNC(sk_num)
-+ RESOLVEFUNC(sk_pop_free)
-+ RESOLVEFUNC(sk_value)
-+#endif
- RESOLVEFUNC(SSL_CTX_set_options)
- RESOLVEFUNC(SSL_set_info_callback)
- RESOLVEFUNC(SSL_alert_type_string)
-@@ -1056,12 +1080,14 @@ bool q_resolveOpenSslSymbols()
- RESOLVEFUNC(SSL_CTX_use_PrivateKey)
- 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)
-Index: src/plugins/tls/openssl/qopenssl_p.h
---- a/src/plugins/tls/openssl/qopenssl_p.h
-+++ b/src/plugins/tls/openssl/qopenssl_p.h
-@@ -70,6 +70,13 @@
-
- QT_BEGIN_NAMESPACE
-
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- struct QSslErrorEntry {
- int code = 0;
- int depth = 0;
-Index: src/plugins/tls/openssl/qsslcontext_openssl.cpp
---- a/src/plugins/tls/openssl/qsslcontext_openssl.cpp
-+++ b/src/plugins/tls/openssl/qsslcontext_openssl.cpp
-@@ -49,9 +49,9 @@ extern "C" int q_verify_cookie_callback(SSL *ssl, cons
- }
- #endif // dtls
-
--#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);
--#endif // TLS1_3_VERSION
-+#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBER
-
- static inline QString msgErrorSettingBackendConfig(const QString &why)
- {
-@@ -663,14 +663,14 @@ QT_WARNING_POP
- q_SSL_CTX_set_verify(sslContext->ctx, verificationMode,
verificationCallback);
- }
-
--#ifdef TLS1_3_VERSION
-+#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_set_session_cache_mode(sslContext->ctx,
SSL_SESS_CACHE_CLIENT);
- }
-
--#endif // TLS1_3_VERSION
-+#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBER
-
- #if QT_CONFIG(dtls)
- // DTLS cookies:
-@@ -758,6 +758,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
- }
- #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);
-@@ -804,7 +805,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
- 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;
- }
-Index: src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h
---- a/src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h
-+++ b/src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h
-@@ -46,6 +46,12 @@ QT_BEGIN_NAMESPACE
-
- #define DUMMYARG
-
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -205,6 +211,7 @@ int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
- void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
-@@ -212,6 +219,20 @@ OPENSSL_STACK *q_OPENSSL_sk_new_null();
- void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- 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);
- 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 +258,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)
-
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(st) q_OPENSSL_sk_num((OPENSSL_STACK *)st)
- #define q_SKM_sk_value(type, st,i) (type
*)q_OPENSSL_sk_value((OPENSSL_STACK *)st, i)
-+#else // LIBRESSL_VERSION_NUMBER
-+#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 \
-@@ -423,12 +449,14 @@ int q_SSL_CTX_use_certificate_file(SSL_CTX *a, const c
- 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);
-+#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 // LIBRESSL_VERSION_NUMBER
- 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);
-@@ -536,14 +564,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)
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_sk_GENERAL_NAME_num(st) q_SKM_sk_num((st))
-+#else
-+#define q_sk_GENERAL_NAME_num(st) q_SKM_sk_num(GENERAL_NAME, (st))
-+#endif
- #define q_sk_GENERAL_NAME_value(st, i) q_SKM_sk_value(GENERAL_NAME, (st),
(i))
-
- void q_GENERAL_NAME_free(GENERAL_NAME *a);
-
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_sk_X509_num(st) q_SKM_sk_num((st))
-+#else
-+#define q_sk_X509_num(st) q_SKM_sk_num(X509, (st))
-+#endif
- #define q_sk_X509_value(st, i) q_SKM_sk_value(X509, (st), (i))
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_sk_SSL_CIPHER_num(st) q_SKM_sk_num((st))
-+#else
-+#define q_sk_SSL_CIPHER_num(st) q_SKM_sk_num(SSL_CIPHER, (st))
-+#endif
- #define q_sk_SSL_CIPHER_value(st, i) q_SKM_sk_value(SSL_CIPHER, (st), (i))
- #define q_SSL_CTX_add_extra_chain_cert(ctx,x509) \
- q_SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509)
-Index: src/plugins/tls/openssl/qx509_openssl.cpp
---- a/src/plugins/tls/openssl/qx509_openssl.cpp
-+++ b/src/plugins/tls/openssl/qx509_openssl.cpp
-@@ -190,7 +190,11 @@ QVariant x509UnknownExtensionToValue(X509_EXTENSION *e
- QVariantList list;
- bool isMap = false;
-
-+#if defined(LIBRESSL_VERSION_NUMBER)
-+ for (int j = 0; j < q_SKM_sk_num(CONF_VALUE, val); j++) {
-+#else
- for (int j = 0; j < q_SKM_sk_num(val); j++) {
-+#endif
- 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)
- if (!info)
- return {};
- QVariantMap result;
-+#if defined(LIBRESSL_VERSION_NUMBER)
-+ for (int i=0; i < q_SKM_sk_num(ACCESS_DESCRIPTION, info); i++) {
-+#else
- for (int i=0; i < q_SKM_sk_num(info); i++) {
-+#endif
- ACCESS_DESCRIPTION *ad = q_SKM_sk_value(ACCESS_DESCRIPTION,
info, i);
-
- GENERAL_NAME *name = ad->location;
---
-Fixed up by sm-checkpatch 0.1
-
diff --git a/qt6/sha5sum.txt b/qt6/sha5sum.txt
index 62a70e0..934dc1f 100644
--- a/qt6/sha5sum.txt
+++ b/qt6/sha5sum.txt
@@ -1,28 +1,28 @@
-652a0675cf702c5a292b363fae572f3256981f8861fa32407a889f92ec23f5bddf265f492bf5de615dc840854cb6f6ef42563b97d81ace2ed22eab8e33b473ad
qt3d-everywhere-src-6.9.3.tar.xz
-03714f8f378d7663e9e3d6e888e1924842f50fff501abb976937cd9ef322292edcfd1b63dfe72f28dfc9b4117293f7b88ba5f950886a94a60b39e88c1570ed26
qt5compat-everywhere-src-6.9.3.tar.xz
-d49b6356869830b7421e8bb94354884c132dcb37b9b2d56c88671bff0fe60e51a4ee961a7db3f248da84d0eda64af1636f1bdf59fdc0bbf8e50147c370e901de
qtbase-everywhere-src-6.9.3.tar.xz
-58f2614c1e78650faeb4eaa38bfa1ce4a5ca764252a96ecc8306aac24e90a9dd22eef10ab7b3eef2da175fc17c68cef51d5f51d6c80e6d29fbcbacc4288dbe0f
qtcharts-everywhere-src-6.9.3.tar.xz
-e6403422b20d272fc120063513e56c965f9325a765964abcbe04fa8e195a1f1db187b613329112a99dfd8ed661b6d6b888d1ab72cf22b7cb53f3d609b7ece0d7
qtdeclarative-everywhere-src-6.9.3.tar.xz
-20a3549dcd48369133d08062ea6b69fce6f990452ed8fc37f12523fa147cc005ea390ed70f95e62c8b836df4eb2c44dd525d633bb6d7d691d249d968346f2a5d
qtgraphs-everywhere-src-6.9.3.tar.xz
-ec60ebba5c338013082e9b1cc546ac0072ef6e2dc10495ec86fcd3ee1af15a0bea3cdca075cf78fdfee44bc862dd450e6b77acbe33702b5ac226acfabc85a4ee
qthttpserver-everywhere-src-6.9.3.tar.xz
-0c3d9af2c8a447733bae296414560a9412e38d1ac70aacfe847fd44cbe1fea9690eb5daf6c25f7d3ba55e19c15070af288ee355c5d81c5db0533358b8eb34d3b
qtimageformats-everywhere-src-6.9.3.tar.xz
-230ba0fe5a57407a95dab43e6e9afe21cad70220972ad03bfcc2d258cc42b4fe0ad8a6becaa212d5cf1e9c07a45c3275515ee01b8b47930dda3accb634519ee8
qtlocation-everywhere-src-6.9.3.tar.xz
-8e6a9c8692b9a23d5480d1a2c40f0fc3c1bb96f66236e5d700976b95a41e34d7afc44a596018597b110d9f676d9047f43e9b80cb7206c786b5f86fda3b17b7bf
qtlottie-everywhere-src-6.9.3.tar.xz
-086cb84d345054d4d262de3824044101fb30d1309cc80e917db4d696a38ca8f1aa0ecde2bb8b4a343f49454acdbf52802e38cf684a087bfdfe9b35d901fde55a
qtmultimedia-everywhere-src-6.9.3.tar.xz
-79d08a2120247ef76cef885c82b8ad96bc1c98edd15ad20b2e752cb5ffb391802fede6f52415287c51b5a5ab33559f044fc8f1a6017b46d453539a0e2ae42ec9
qtnetworkauth-everywhere-src-6.9.3.tar.xz
-d76acf54df301b678e138486f1fda1a5ccb814bc80c8f5bfd16b075b1abc300f19798c54190be072ecbd2961060c19b370f72ff490cee0b23684dd8fa95dc250
qtpositioning-everywhere-src-6.9.3.tar.xz
-c0f440da01728b2ccee8ad8dc87e9439ccad7e76d8d1fa82a915fff008590ec2423f9b6ca4ffb063fc01700b08aece485df398a3717bac4de16c6e06679b3219
qtquick3d-everywhere-src-6.9.3.tar.xz
-61ebd7dcd4964fffb077e5de88b0281e0a10d170a6a70442d23abbf6a8e1ba36f6976890ba0182fb93b62f69f4c019836d45173d764d4c96581fc2c89d05145f
qtquicktimeline-everywhere-src-6.9.3.tar.xz
-61c7109f39a6db05eb9e14ad559531f6798aa23365a3d57e4431aa271edc0f1b163d7441294bb2f7a3a8249151d9d03c3d1f7ef8847c158f36ee9691dd633314
qtscxml-everywhere-src-6.9.3.tar.xz
-2f851033dc74c2f2302294dc14b26de9ef23532eae3cc0938d612ea34862f70d55b8cd166fea55e9a3fe84af570186b4dfcd21445e41564664ec127122a67ea4
qtsensors-everywhere-src-6.9.3.tar.xz
-04d2802f6742e0ac95c1273c3ff4913dd94ac0b7f974b54354b605c3d6af794d07de249f4fcfffc942f4bb4990af0fb81531643be876c675f9d1b907e9ae01d5
qtserialport-everywhere-src-6.9.3.tar.xz
-178d082e570e963094f1ffc44120895aa20ae05ddb0639646d8eaf222aa816d41ca06b1d7b951c0eca132c0efc021b25ef38dcdcd06e9029673484dc3bffccd1
qtshadertools-everywhere-src-6.9.3.tar.xz
-5ee34f7f7e509f18d9ff8f88d6a291f63ee89d70bb5d8c3823154a656d13ad3fbaaa1f5aa8ed7f34e1b90be736673544030cc6a989988524448f2add9a031769
qtspeech-everywhere-src-6.9.3.tar.xz
-fada311fd274694bca2b1a58b430449de91f10021cac7fe7f7fd92af324df2556fd9b88167c44b23d1fc0af13037e58589345fc1cc37e0d1eede67fc1a8ad682
qtsvg-everywhere-src-6.9.3.tar.xz
-529aae86f9d4ba52b6ec1f72d19c611ce17c8e6644974cb1f202a5eef54f83167b072dfae9d94d29f0ab2269ba97a99bd7744b573b3dbd1aa2e40a55729242c0
qttools-everywhere-src-6.9.3.tar.xz
-98a91be495adde8a0e8396883fe147f34d90f8985903c885a74a76cd6946f6d366338880f306767eee171a74df7cf5ddff079e6a67be86045c82e0356e8f7890
qtvirtualkeyboard-everywhere-src-6.9.3.tar.xz
-cb405830a52c46d00a06ee0e3dcf3778d80e20e4f798d0f0a3a1a7aee0ee63b092b262a336ca08099fdaa2355fc2eba5b7440a4199d5227e64691f05444b2fd6
qtwayland-everywhere-src-6.9.3.tar.xz
-f5701a99d526d895d0a2875d5dc2526d0ecfb5f5532643a86b9278b9b86e9617182764ab19af90474ebf2a9664fb2087e34e5ac56416c96cd52f98ea4d7bff52
qtwebchannel-everywhere-src-6.9.3.tar.xz
-6ebdb077205c2c6e8d5c77a88bb84fb4b66e33868c0abdf866a32203354884a67e6633a9a350b405fd863e46117d08a1b4a6d32b98e2ba288bbde4ddcef213f4
qtwebengine-everywhere-src-6.9.3.tar.xz
-4ab9fc8edd54732d09048208e64ccbce86800ea9d163270de0058827f0866c46e46ba9694634873272fdb6e0a0375873546464ab43142b21410fa1dbba8d5e12
qtwebsockets-everywhere-src-6.9.3.tar.xz
-fe57468fc601f2f45bfac6b419609d15a4a6c74bc0e11a7c42b2c39a215d16b6cad405afffd330062eb4c784bef67f8d4dd82ef477acf2ab39e6f613a8f26b30
qtwebview-everywhere-src-6.9.3.tar.xz
+8c7d7f7c1975c05024fe5a5672840d10fecae84cd057c44d00815a13f75f1aa3647b4b1963f4a906a2a8269bb38bc2c62a1c23b6165f6004313d911f46fd7b20
qt3d-everywhere-src-6.10.0.tar.xz
+688483f91a838c976e9af79a5f19c3fa80127756a627ab0e8a9ef9d37c4c4f9d1d2aa461e8afb1dd61d7759c55f9761119d27e8bf626bf81d33e300e8d97ffcc
qt5compat-everywhere-src-6.10.0.tar.xz
+bc3b98f8b2387ca207f6cd87478bdefa911442fd9981d38ecd8793856439e415ce9182b524dabc6b0a1ba5c27e22badfc7ca67a0a43e00186ee6865886937917
qtbase-everywhere-src-6.10.0.tar.xz
+c25eb7e051de685ed1830efb51c112877dd6baff801cca94b87f5307f14fe956aec36ce74979533ea2942e4374e8316431deeb667735c197207ac0341eac1639
qtcharts-everywhere-src-6.10.0.tar.xz
+104d0d237bbde943d739bfa4831f85576b67fb838d06b1d4760976aaa74fadac3523544eecdcf4d614991adc9c73294c2494bf094217ce648e6a721ab95a5415
qtdeclarative-everywhere-src-6.10.0.tar.xz
+77e5f740c583df9ec2d7d007d612725f6e4751a796757a354d89b889649f23f1a1ca23879e2432088071e0e4b95bd687d14586fbd3083c52a2b650c5d3c8e3c5
qtgraphs-everywhere-src-6.10.0.tar.xz
+051065ca1ff62a4b3d8d94c5a388578c9a40a1cda83da737a985125cfe59a24cde98ac5c3a50fee500fdc5597d2bfa6c0f28f345d23a8441a1be2f2256ff9da3
qthttpserver-everywhere-src-6.10.0.tar.xz
+29688d1be069ba9910d0c39b58fdcb32306a7deb73a3274d6aab9cf0229bc490793f07f4e14fb4ddf2ebc07158440ceeef2eb08e30908b5850c90e545291100f
qtimageformats-everywhere-src-6.10.0.tar.xz
+fc8c0e9bca7d8c47ecde8827bb348c1cd20a4ec97e60871746a8a6fc11f47e72a76cce73b6672436ae6bdc110b1b433401243f64dcc9a28ccc906fa27d6393de
qtlocation-everywhere-src-6.10.0.tar.xz
+76f1ac07237307dac6e79f51cb3be22caed297f80260c3519a143793f840352da36394de8530f02242b6f31ac2ed847ec28e12d45f59749263df440598b3dc48
qtlottie-everywhere-src-6.10.0.tar.xz
+2b67d53fd004b5c2a98893253f21f47f980b08ee34d868b9acd5935211363e70e6fe189c950a8ce9dff752572b6b3055942aacf561523545b16cd105a7eb29fa
qtmultimedia-everywhere-src-6.10.0.tar.xz
+65366dc7ad6332259ac038753fb1215f44cc5e8d0bafde5e872a82a97e1a8064342c5641c71ad3654d2c4579d79cc50567ab6b5206e47f907fbdb82ee9b7dc74
qtnetworkauth-everywhere-src-6.10.0.tar.xz
+5fe4b12d9e8464a5f730e36045079742939abad6dc4279e79df5620ef9522406f8e659559fcb1dc60aa92a9af93cc3f14bbeeccc5efb05774ccc2c4788392cf1
qtpositioning-everywhere-src-6.10.0.tar.xz
+5e86ec1f92b49b4fe44a8b1c67190e1969e4385e1b106e09c186be61a0f3f4d7809791334b72ae9f6f5d75372cc9a97d248aeb0876651f4f156d2c365d4b9dfa
qtquick3d-everywhere-src-6.10.0.tar.xz
+64cc369b01f7d037509ad1a1c18b34c7bf12bf2689546386177cd7382ce7733aaf9cc0154483991cecda8e324e0936d0c3841f93d1fb5da1e0023e7a1366b82d
qtquicktimeline-everywhere-src-6.10.0.tar.xz
+d3fbccd0f529dd008515d0a449a388fa5969f215a8583aa15e8a3115f3141888f3a3808da8131fe82301f71d7f6301f9d31297aacdc22c7659c9e606c9efbc2d
qtscxml-everywhere-src-6.10.0.tar.xz
+536c646f5612c3170527ebcf96df957891a50e155f485f8b5f47605e80a3ac0dbba383643879bb25e533a4d7117837bd02705637510ff1bc14c4149c078b9374
qtsensors-everywhere-src-6.10.0.tar.xz
+46b1aa80d25984d209dea1ca9db2a36c90078e76b8a0738af7a5eb6b0cc3616dfe66717b0d2d12b73b0ad750c23dab09e7fabfc56b9648c82a94c34e11016455
qtserialport-everywhere-src-6.10.0.tar.xz
+3c1490e488f5f5608fecb2d4f0ba1255356b2d4d2aa1d5324469cac2bdea7e4f69794caeca170e663c75f0ae5c774abdda2857801cd5e561696a887efbdc84ac
qtshadertools-everywhere-src-6.10.0.tar.xz
+e57178952e79eb17af8ac85a80a2555a24130d2b4b42dbdca091ca5836661fe7d46f85c9ba51dca7d53f2547411691302d835a24b745876cd2a556a59dd4db38
qtspeech-everywhere-src-6.10.0.tar.xz
+5f185575b7bc865068dce567a653b7603ef6b4ec44034f18534ad7d389a29d7137d6de132d2a962f0b83c4ce21edb22956ec4b03e37d93d5bdc81d55f7f8d39a
qtsvg-everywhere-src-6.10.0.tar.xz
+48d5449b286d0f39ed2dc5f583965bfc40767b607e658f7139f185bdd96616854950fd317e46165ee031ec431cfd1ef0d0bce5824ec3149dcbcf3ac9683097ef
qttools-everywhere-src-6.10.0.tar.xz
+9465bf6ac8671450357b003aeb1f62fe4972231bbecf892f0f4d1537ce2ac6c74ae2a1595fa57f69e7a5f21b4ad5f9e5838733e24fc06f53389e3677f2d4d9a7
qtvirtualkeyboard-everywhere-src-6.10.0.tar.xz
+421fd79b3d10ffcfff9c04be73dbc23a91cae53728f6f03384f79744ec7ec997506e650c0f79f43d6121b80b71c94d0b24e0a57ef7178e4431eee6f2c4466bf4
qtwayland-everywhere-src-6.10.0.tar.xz
+33723bf5dc35b9baf70527827528c291000b81fde647d1d7499fc145057bd3df0b5be2510a3cf145bd93055fde6e8b22f9341f34a04c38c9a0924a3506036fff
qtwebchannel-everywhere-src-6.10.0.tar.xz
+924da838e4f70baede96b2ead94cacb69ecbe1b0f93b447dab41b864a5583e4113165827d5be4727b4a742802b9da6b5c488437ba4c62aeb5ce84d8a88eefda6
qtwebengine-everywhere-src-6.10.0.tar.xz
+fe83f256f94cf96339e29c0cd60f52e95e1b4b4dd474210c1cb845c50809202a8c41db170ecfe960726090a977353dc74b5608644f6e2577dca6c48d78d54bb7
qtwebsockets-everywhere-src-6.10.0.tar.xz
+f9f54f8e1bfdea0de82e341b9a86e68537b63d8c2902e2032a16bdbbe37759c381a2b171a949f7e0c0adeb13899afc122004bf8424152573924889c9a53fdb0d
qtwebview-everywhere-src-6.10.0.tar.xz
- [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (50dcfb97cd428d346b2b50498f5eaf13f996b0ca), Treeve Jelbert, 10/07/2025
Archive powered by MHonArc 2.6.24.