public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Jan Grulich <jgrulich@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/qt6-qtopcua] f45: 6.11.2
Date: Mon, 24 Aug 2026 12:03:45 GMT [thread overview]
Message-ID: <178757302534.1.18297831495664781247.rpms-qt6-qtopcua-6f5ff10e405c@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/qt6-qtopcua
Branch : f45
Commit : 6f5ff10e405cfcff65666a9a7318ebfe021d46f8
Author : Jan Grulich <jgrulich@redhat.com>
Date : 2026-08-24T14:03:22+02:00
Stats : +87/-3 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/qt6-qtopcua/c/6f5ff10e405cfcff65666a9a7318ebfe021d46f8?branch=f45
Log:
6.11.2
---
diff --git a/.gitignore b/.gitignore
index f184be2..ad0c915 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
/qtopcua-6.10.3.tar.gz
/qtopcua-6.11.0.tar.gz
/qtopcua-6.11.1.tar.gz
+/qtopcua-6.11.2.tar.gz
diff --git a/qt6-qtopcua.spec b/qt6-qtopcua.spec
index c5d63c3..ad42b15 100644
--- a/qt6-qtopcua.spec
+++ b/qt6-qtopcua.spec
@@ -10,8 +10,8 @@
Summary: Qt6 - OPC UA component
Name: qt6-%{qt_module}
-Version: 6.11.1
-Release: 2%{?dist}
+Version: 6.11.2
+Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@@ -24,6 +24,7 @@ Source0: https://github.com/qt/%{qt_module}/archive/refs/tags/v%{qt_version}-%{t
Source0: https://github.com/qt/%{qt_module}/archive/refs/tags/v%{version}/%{qt_module}-%{version}.tar.gz
%endif
+Patch0: qtopcua-fix-openssl4-build.patch
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -111,6 +112,9 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%changelog
+* Fri Aug 21 2026 Jan Grulich <jgrulich@redhat.com> - 6.11.2-1
+- 6.11.2
+
* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 6.11.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
diff --git a/qtopcua-fix-openssl4-build.patch b/qtopcua-fix-openssl4-build.patch
new file mode 100644
index 0000000..77c7c04
--- /dev/null
+++ b/qtopcua-fix-openssl4-build.patch
@@ -0,0 +1,79 @@
+diff --git a/src/3rdparty/open62541/open62541.c b/src/3rdparty/open62541/open62541.c
+index 2c65911..fd9f959 100644
+--- a/src/3rdparty/open62541/open62541.c
++++ b/src/3rdparty/open62541/open62541.c
+@@ -122171,7 +122171,7 @@ UA_CertificateVerification_VerifyApplicationURI (const UA_CertificateVerificatio
+ for (i = 0; i < sk_GENERAL_NAME_num (pNames); i++) {
+ GENERAL_NAME * value = sk_GENERAL_NAME_value (pNames, i);
+ if (value->type == GEN_URI) {
+- subjectURI.length = (size_t) (value->d.ia5->length);
++ subjectURI.length = (size_t) ASN1_STRING_length(value->d.ia5);
+ subjectURI.data = (UA_Byte *) UA_malloc (subjectURI.length);
+ if (subjectURI.data == NULL) {
+ UA_LOG_ERROR(cv->logging, UA_LOGCATEGORY_USERLAND, "Error Empty subjectURI");
+@@ -122179,7 +122179,11 @@ UA_CertificateVerification_VerifyApplicationURI (const UA_CertificateVerificatio
+ sk_GENERAL_NAME_pop_free(pNames, GENERAL_NAME_free);
+ return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+ }
+- (void) memcpy (subjectURI.data, value->d.ia5->data, subjectURI.length);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ (void) memcpy (subjectURI.data, ASN1_STRING_get0_data(value->d.ia5), subjectURI.length);
++#else
++ (void) memcpy (subjectURI.data, ASN1_STRING_data(value->d.ia5), subjectURI.length);
++#endif
+ break;
+ }
+
+diff --git a/src/opcua/x509/openssl_symbols.cpp b/src/opcua/x509/openssl_symbols.cpp
+index 84230d9..98fa00a 100644
+--- a/src/opcua/x509/openssl_symbols.cpp
++++ b/src/opcua/x509/openssl_symbols.cpp
+@@ -134,12 +134,21 @@ DEFINEFUNC(void, X509_free, X509 *a, a, return, DUMMYARG)
+ DEFINEFUNC2(ASN1_TIME *, X509_gmtime_adj, ASN1_TIME *s, s, long adj, adj, return nullptr, return)
+ DEFINEFUNC4(void *, X509_get_ext_d2i, X509 *a, a, int b, b, int *c, c, int *d, d, return nullptr, return)
+ DEFINEFUNC(void, AUTHORITY_KEYID_free, AUTHORITY_KEYID *a, a, return, DUMMYARG)
++#ifdef QT_LINKED_OPENSSL
++X509_NAME *q_X509_get_issuer_name(X509 *a) { return const_cast<X509_NAME *>(X509_get_issuer_name(a)); }
++X509_NAME *q_X509_get_subject_name(X509 *a) { return const_cast<X509_NAME *>(X509_get_subject_name(a)); }
++#else
+ DEFINEFUNC(X509_NAME *, X509_get_issuer_name, X509 *a, a, return nullptr, return)
+ DEFINEFUNC(X509_NAME *, X509_get_subject_name, X509 *a, a, return nullptr, return)
++#endif
+ DEFINEFUNC(ASN1_INTEGER *, X509_get_serialNumber, X509 *a, a, return nullptr, return)
+ DEFINEFUNC(X509_REQ*, X509_REQ_new, void, DUMMYARG, return NULL, return);
+ DEFINEFUNC(void, X509_REQ_free, X509_REQ *req, req, return, return);
++#ifdef QT_LINKED_OPENSSL
++X509_NAME *q_X509_REQ_get_subject_name(X509_REQ *req) { return const_cast<X509_NAME *>(X509_REQ_get_subject_name(req)); }
++#else
+ DEFINEFUNC(X509_NAME*, X509_REQ_get_subject_name, X509_REQ *req, req, return NULL, return);
++#endif
+ DEFINEFUNC2(EVP_PKEY_CTX*, EVP_PKEY_CTX_new_id, int id, id, ENGINE *e, e, return NULL, return);
+ DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return);
+ DEFINEFUNC(int, EVP_PKEY_keygen_init, EVP_PKEY_CTX *ctx, ctx, return 0, return);
+@@ -637,10 +646,14 @@ bool q_resolveOpenSslSymbols()
+ //==============================================================================
+ QDateTime q_getTimeFromASN1(const ASN1_TIME *aTime)
+ {
+- size_t lTimeLength = aTime->length;
+- char *pString = (char *) aTime->data;
++ size_t lTimeLength = ASN1_STRING_length(aTime);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ const char *pString = (const char *) ASN1_STRING_get0_data(aTime);
++#else
++ const char *pString = (const char *) ASN1_STRING_data((ASN1_TIME *)aTime);
++#endif
+
+- if (aTime->type == V_ASN1_UTCTIME) {
++ if (ASN1_STRING_type(aTime) == V_ASN1_UTCTIME) {
+
+ char lBuffer[24];
+ char *pBuffer = lBuffer;
+@@ -700,7 +713,7 @@ QDateTime q_getTimeFromASN1(const ASN1_TIME *aTime)
+ result = result.addSecs(lSecondsFromUCT);
+ return result;
+
+- } else if (aTime->type == V_ASN1_GENERALIZEDTIME) {
++ } else if (ASN1_STRING_type(aTime) == V_ASN1_GENERALIZEDTIME) {
+
+ if (lTimeLength < 15)
+ return QDateTime(); // hopefully never triggered
diff --git a/sources b/sources
index 387f035..d7f9e20 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtopcua-6.11.1.tar.gz) = b08125dbccd0b0a7f7fc4c4277e1cd4eadbed8fe76c2f0d9c7242b48d9cdd25284d4caf1de135ddf3f501985c6b43fb3d1e4a16b052f9ff4980aa13d5732cf42
+SHA512 (qtopcua-6.11.2.tar.gz) = 6bdf068f1a79bc6d03cf28cdd9257fae583a1b4d87367d00e558cd148704fa6c190498fb0ba53b2e8356618cbf590b3c4aee18bb8371add7de7cc3250225637a
reply other threads:[~2026-08-24 12:03 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178757302534.1.18297831495664781247.rpms-qt6-qtopcua-6f5ff10e405c@fedoraproject.org \
--to=jgrulich@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox