diff -Nru qca2-2.3.5/debian/changelog qca2-2.3.5/debian/changelog --- qca2-2.3.5/debian/changelog 2022-10-22 14:37:05.000000000 +0000 +++ qca2-2.3.5/debian/changelog 2023-02-25 16:05:23.000000000 +0000 @@ -1,3 +1,14 @@ +qca2 (2.3.5-2) unstable; urgency=medium + + * 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) + * Set upstream metadata fields: Bug-Database, Bug-Submit. + * Update standards version to 4.6.2, no changes needed. + + -- Pino Toscano Sat, 25 Feb 2023 17:05:23 +0100 + qca2 (2.3.5-1) unstable; urgency=medium * New upstream release. diff -Nru qca2-2.3.5/debian/control qca2-2.3.5/debian/control --- qca2-2.3.5/debian/control 2022-10-22 14:35:07.000000000 +0000 +++ qca2-2.3.5/debian/control 2023-02-25 15:43:35.000000000 +0000 @@ -15,7 +15,7 @@ Build-Depends-Indep: doxygen, graphviz, Build-Conflicts: libqca2-dev, qca-dev -Standards-Version: 4.6.1 +Standards-Version: 4.6.2 Rules-Requires-Root: no Homepage: https://userbase.kde.org/QCA Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/qca2.git 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 13:06:35.000000000 +0000 +++ qca2-2.3.5/debian/patches/series 2023-02-25 15:43:10.000000000 +0000 @@ -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 -Nru qca2-2.3.5/debian/patches/upstream_Remove-test-that-openssl-has-decided-it-s-wrong.patch qca2-2.3.5/debian/patches/upstream_Remove-test-that-openssl-has-decided-it-s-wrong.patch --- qca2-2.3.5/debian/patches/upstream_Remove-test-that-openssl-has-decided-it-s-wrong.patch 1970-01-01 00:00:00.000000000 +0000 +++ qca2-2.3.5/debian/patches/upstream_Remove-test-that-openssl-has-decided-it-s-wrong.patch 2023-02-25 15:43:10.000000000 +0000 @@ -0,0 +1,34 @@ +From 714073747c4a3ccff7a8c85c72872bdf6bd3db4a Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +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 + diff -Nru qca2-2.3.5/debian/upstream/metadata qca2-2.3.5/debian/upstream/metadata --- qca2-2.3.5/debian/upstream/metadata 2020-12-31 09:20:56.000000000 +0000 +++ qca2-2.3.5/debian/upstream/metadata 2023-02-25 15:43:25.000000000 +0000 @@ -1,5 +1,5 @@ --- -Bug-Database: https://invent.kde.org/libraries/qca/issues -Bug-Submit: https://invent.kde.org/libraries/qca/issues/new +Bug-Database: https://invent.kde.org/libraries/qca/-/issues +Bug-Submit: https://invent.kde.org/libraries/qca/-/issues/new Repository: https://invent.kde.org/libraries/qca.git Repository-Browse: https://invent.kde.org/libraries/qca