public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/khealthcertificate] rawhide: 26.07.90
@ 2026-07-31 19:51 Steve Cossette
  0 siblings, 0 replies; only message in thread
From: Steve Cossette @ 2026-07-31 19:51 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/khealthcertificate
Branch : rawhide
Commit : 15b8164424d5a19666cd222eceb982c61637f7ce
Author : Steve Cossette <farchord@gmail.com>
Date   : 2026-07-31T15:51:40-04:00
Stats  : +10/-74 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/khealthcertificate/c/15b8164424d5a19666cd222eceb982c61637f7ce?branch=rawhide

Log:
26.07.90

---
diff --git a/.gitignore b/.gitignore
index a88cf00..2bc5cc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@
 /khealthcertificate-26.04.1.tar.xz
 /khealthcertificate-26.04.2.tar.xz
 /khealthcertificate-26.04.3.tar.xz
+/khealthcertificate-26.07.90.tar.xz

diff --git a/23.patch b/23.patch
deleted file mode 100644
index 1e7cb51..0000000
--- a/23.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From a9ba7f016641002f2d49c4a3d67dda1aec3fc8fd Mon Sep 17 00:00:00 2001
-From: Hadi Chokr <hadichokr@icloud.com>
-Date: Fri, 3 Jul 2026 20:13:59 +0200
-Subject: [PATCH] Fix compiling against OpenSSL 4.0.
-
-Signed-off-by: Hadi Chokr <hadichokr@icloud.com>
----
- src/lib/icao/icaovdsparser.cpp                 | 2 +-
- src/lib/nl-coronacheck/nlcoronacheckparser.cpp | 6 ++++--
- src/lib/openssl/asn1_p.h                       | 4 ++--
- 3 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/lib/icao/icaovdsparser.cpp b/src/lib/icao/icaovdsparser.cpp
-index 39a9b23..8264cd1 100644
---- a/src/lib/icao/icaovdsparser.cpp
-+++ b/src/lib/icao/icaovdsparser.cpp
-@@ -85,7 +85,7 @@ static KHealthCertificate::SignatureValidation verifyCertificate(const openssl::
-     if (!keyId) {
-         return KHealthCertificate::InvalidSignature;
-     }
--    const auto keyIdStr = QString::fromUtf8(QByteArray(reinterpret_cast<const char*>(keyId->data), keyId->length).toHex());
-+    const auto keyIdStr = QString::fromUtf8(QByteArray(reinterpret_cast<const char*>(ASN1_STRING_get0_data(keyId)), ASN1_STRING_length(keyId)).toHex());
-     qCDebug(Log) << keyIdStr;
- 
-     // single certificate file for keyId
-diff --git a/src/lib/nl-coronacheck/nlcoronacheckparser.cpp b/src/lib/nl-coronacheck/nlcoronacheckparser.cpp
-index ea13e04..95fd72e 100644
---- a/src/lib/nl-coronacheck/nlcoronacheckparser.cpp
-+++ b/src/lib/nl-coronacheck/nlcoronacheckparser.cpp
-@@ -34,9 +34,11 @@ static QByteArray nlDecodeAsn1ByteArray(const ASN1::Object &obj)
-     }
-     auto bn = openssl::bn_ptr(BN_new());
-     BN_zero(bn.get());
--    for (auto i = 0; i < ai->length; ++i) {
-+    const auto *aiData = ASN1_STRING_get0_data(ai.get());
-+    const auto aiLength = ASN1_STRING_length(ai.get());
-+    for (auto i = 0; i < aiLength; ++i) {
-         BN_mul_word(bn.get(), 1 << 8);
--        BN_add_word(bn.get(), ai->data[i]);
-+        BN_add_word(bn.get(), aiData[i]);
-     }
-     BN_div_word(bn.get(), 2);
-     return Bignum::toByteArray(bn);
-diff --git a/src/lib/openssl/asn1_p.h b/src/lib/openssl/asn1_p.h
-index 59958c6..ae33233 100644
---- a/src/lib/openssl/asn1_p.h
-+++ b/src/lib/openssl/asn1_p.h
-@@ -86,7 +86,7 @@ public:
-         }
-         auto it = begin();
-         const auto os = openssl::asn1_octet_string_ptr(d2i_ASN1_OCTET_STRING(nullptr, &it, size()));
--        return QByteArray(reinterpret_cast<const char*>(os->data), os->length);
-+        return QByteArray(reinterpret_cast<const char*>(ASN1_STRING_get0_data(os.get())), ASN1_STRING_length(os.get()));
-     }
- 
-     inline QByteArray readPrintableString() const
-@@ -96,7 +96,7 @@ public:
-         }
-         auto it = begin();
-         const auto ps = openssl::asn1_printable_string_ptr(d2i_ASN1_PRINTABLESTRING(nullptr, &it, size()));
--        return QByteArray(reinterpret_cast<const char*>(ps->data), ps->length);
-+        return QByteArray(reinterpret_cast<const char*>(ASN1_STRING_get0_data(ps.get())), ASN1_STRING_length(ps.get()));
-     }
- private:
-     int m_tag = 0;
--- 
-GitLab
-

diff --git a/khealthcertificate.spec b/khealthcertificate.spec
index 1f7e550..9cdfffa 100644
--- a/khealthcertificate.spec
+++ b/khealthcertificate.spec
@@ -1,15 +1,12 @@
 Name:           khealthcertificate
-Version:        26.04.3
-Release:        2%{?dist}
+Version:        26.07.90
+Release:        1%{?dist}
 License:        W3C-20150513 AND LGPL-2.0-or-later AND BSD-3-Clause AND CC0-1.0 AND MIT AND Apache-2.0
 Summary:        Handling of digital vaccination, test and recovery certificates.
 Url:            https://invent.kde.org/pim/khealthcertificate
 Source:         https://download.kde.org/%{stable_kf6}/release-service/%{version}/src/%{name}-%{version}.tar.xz
 
 # Upstream fixes
-# Fix for building on OpenSSL 4.0
-# https://invent.kde.org/pim/khealthcertificate/-/merge_requests/23
-Patch0:        23.patch
 
 BuildRequires: extra-cmake-modules
 BuildRequires: kf6-rpm-macros
@@ -60,6 +57,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %{_kf6_libdir}/*.so
 
 %changelog
+* Fri Jul 31 2026 Steve Cossette <farchord@gmail.com> - 26.07.90-1
+- 26.07.90
+
+* Wed Jul 29 2026 Steve Cossette <farchord@gmail.com> - 26.07.80-1
+- 26.07.80
+
 * Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 26.04.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 

diff --git a/sources b/sources
index 1e3f5bc..df8d098 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (khealthcertificate-26.04.3.tar.xz) = 9bb9be8c3374ec0359aecf43f8015e86b4e1a65e4df362209cbd621027ff5335136472427f257bed54c04832f6523f73093cb348bccacdfd6e70c910941cbf4b
+SHA512 (khealthcertificate-26.07.90.tar.xz) = 9ecc9add92d60421bae55d41775185cdc1c59a15b5bbcdc6924b0287b6e84d0204cefe5cfcbcbaa2f4a34c732764872dd6b05524127b704a5a800fd740a0b73c

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-31 19:51 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-31 19:51 [rpms/khealthcertificate] rawhide: 26.07.90 Steve Cossette

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox