[neon/extras/qca2/Neon/release] debian: disable test that fails with openssl 3.0.8 (#1031438)

Pino Toscano null at kde.org
Thu May 16 11:36:01 BST 2024


Git commit 68604ad9b81958923fbf281953e37d360244eee7 by Pino Toscano.
Committed on 25/02/2023 at 15:43.
Pushed by jriddell into branch 'Neon/release'.

disable test that fails with openssl 3.0.8 (#1031438)

backport upstream commit 714073747c4a3ccff7a8c85c72872bdf6bd3db4a

M  +5    -0    debian/changelog
M  +1    -0    debian/patches/series
A  +34   -0    debian/patches/upstream_Remove-test-that-openssl-has-decided-it-s-wrong.patch

https://invent.kde.org/neon/extras/qca2/-/commit/68604ad9b81958923fbf281953e37d360244eee7

diff --git a/debian/changelog b/debian/changelog
index 01a2dd0..b9c0ded 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 qca2 (2.3.5-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Backport upstream commit 714073747c4a3ccff7a8c85c72872bdf6bd3db4a to disable
+    one test that fails with OpenSSL 3.0.8; patch
+    upstream_Remove-test-that-openssl-has-decided-it-s-wrong.patch.
+    (Closes: #1031438)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 25 Feb 2023 16:38:00 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index ac85b11..169ee16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 upstream_hashunittest-run-sha384longtest-only-for-providers-t.patch
+upstream_Remove-test-that-openssl-has-decided-it-s-wrong.patch
 pipeunittest_more_wait.diff
 disable_pgpunittest.diff
diff --git a/debian/patches/upstream_Remove-test-that-openssl-has-decided-it-s-wrong.patch b/debian/patches/upstream_Remove-test-that-openssl-has-decided-it-s-wrong.patch
new file mode 100644
index 0000000..68c9272
--- /dev/null
+++ b/debian/patches/upstream_Remove-test-that-openssl-has-decided-it-s-wrong.patch
@@ -0,0 +1,34 @@
+From 714073747c4a3ccff7a8c85c72872bdf6bd3db4a Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid at kde.org>
+Date: Mon, 20 Feb 2023 00:19:19 +0100
+Subject: [PATCH] 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.39.1
+



More information about the Neon-commits mailing list