Bug#1031438: qca2: diff for NMU version 2.3.5-1.1
Control: tags 1031438 + patch
Control: tags 1031438 + pending
Dear maintainer,
I've prepared an NMU for qca2 (versioned as 2.3.5-1.1) and uploaded
it to DELAYED/5. Please feel free to tell me if I should cancel it.
cu
Adrian
diff -Nru qca2-2.3.5/debian/changelog qca2-2.3.5/debian/changelog
--- qca2-2.3.5/debian/changelog 2022-10-22 17:37:05.000000000 +0300
+++ qca2-2.3.5/debian/changelog 2023-02-25 17:03:48.000000000 +0200
@@ -1,3 +1,11 @@
+qca2 (2.3.5-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add upstream fix to disable test that no longer works with
+ OpenSSL 3.0.8. (Closes: #1031438)
+
+ -- Adrian Bunk <bunk@debian.org> Sat, 25 Feb 2023 17:03:48 +0200
+
qca2 (2.3.5-1) unstable; urgency=medium
* New upstream release.
diff -Nru qca2-2.3.5/debian/patches/0001-Remove-test-that-openssl-has-decided-it-s-wrong.patch qca2-2.3.5/debian/patches/0001-Remove-test-that-openssl-has-decided-it-s-wrong.patch
--- qca2-2.3.5/debian/patches/0001-Remove-test-that-openssl-has-decided-it-s-wrong.patch 1970-01-01 02:00:00.000000000 +0200
+++ qca2-2.3.5/debian/patches/0001-Remove-test-that-openssl-has-decided-it-s-wrong.patch 2023-02-25 17:03:29.000000000 +0200
@@ -0,0 +1,34 @@
+From 714073747c4a3ccff7a8c85c72872bdf6bd3db4a Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Mon, 20 Feb 2023 00:19:19 +0100
+Subject: Remove test that openssl has decided it's wrong
+
+---
+ unittest/pkits/pkits.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/unittest/pkits/pkits.cpp b/unittest/pkits/pkits.cpp
+index 8f4af29f..7a41121c 100644
+--- a/unittest/pkits/pkits.cpp
++++ b/unittest/pkits/pkits.cpp
+@@ -256,6 +256,9 @@ void Pkits::pkits4_1_4()
+
+ void Pkits::pkits4_1_5()
+ {
++ // openssl has decided that they don't want to support this ¯\_(ツ)_/¯
++ // https://github.com/openssl/openssl/issues/20233
++#if 0
+ QStringList providersToTest;
+ providersToTest.append(QStringLiteral("qca-ossl"));
+
+@@ -298,6 +301,7 @@ void Pkits::pkits4_1_5()
+ QCOMPARE(cert.validate(trusted, untrusted), QCA::ValidityGood);
+ }
+ }
++#endif
+ }
+
+ void Pkits::pkits4_1_6()
+--
+2.30.2
+
diff -Nru qca2-2.3.5/debian/patches/series qca2-2.3.5/debian/patches/series
--- qca2-2.3.5/debian/patches/series 2022-10-22 16:06:35.000000000 +0300
+++ qca2-2.3.5/debian/patches/series 2023-02-25 17:03:48.000000000 +0200
@@ -1,3 +1,4 @@
upstream_hashunittest-run-sha384longtest-only-for-providers-t.patch
pipeunittest_more_wait.diff
disable_pgpunittest.diff
+0001-Remove-test-that-openssl-has-decided-it-s-wrong.patch
Reply to: