[neon/extras/qca2/Neon/release] debian: update the patches

[Pino Toscano]

Git commit 2cc4419f373ab255269dd16b756c514f5ce14454 by Pino Toscano.
Committed on 11/06/2023 at 21:41.
Pushed by jriddell into branch 'Neon/release'.

update the patches

- upstream_hashunittest-run-sha384longtest-only-for-providers-t.patch:
  drop, backported from upstream
- upstream_Remove-test-that-openssl-has-decided-it-s-wrong.patch: drop,
  backported from upstream

M  +5    -0    debian/changelog
M  +0    -2    debian/patches/series
D  +0    -34   debian/patches/upstream_Remove-test-that-openssl-has-decided-it-s-wrong.patch
D  +0    -29   debian/patches/upstream_hashunittest-run-sha384longtest-only-for-providers-t.patch

https://invent.kde.org/neon/extras/qca2/-/commit/2cc4419f373ab255269dd16b756c514f5ce14454

diff --git a/debian/changelog b/debian/changelog
index f6b6b5f..4da4bd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ qca2 (2.3.6-0r1) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * New upstream release.
+  * Update the patches:
+    - upstream_hashunittest-run-sha384longtest-only-for-providers-t.patch: drop,
+      backported from upstream
+    - upstream_Remove-test-that-openssl-has-decided-it-s-wrong.patch: drop,
+      backported from upstream
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 11 Jun 2023 23:38:50 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 169ee16..a55c8f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-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
deleted file mode 100644
index 68c9272..0000000
--- a/debian/patches/upstream_Remove-test-that-openssl-has-decided-it-s-wrong.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
-
diff --git a/debian/patches/upstream_hashunittest-run-sha384longtest-only-for-providers-t.patch b/debian/patches/upstream_hashunittest-run-sha384longtest-only-for-providers-t.patch
deleted file mode 100644
index b18c237..0000000
--- a/debian/patches/upstream_hashunittest-run-sha384longtest-only-for-providers-t.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 33a35a699928318032f62eab0e39e263c604ad9e Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Sat, 22 Oct 2022 13:51:17 +0200
-Subject: [PATCH] hashunittest: run sha384longtest only for providers that
- support sha384
-
-Fixes commit bdb0e9d37d78ec8e01d4008dba5243afe9029346 that accidentally
-left the wrong logic when refactoring the file, and makes the check as
-done in the other longtest tests.
----
- unittest/hashunittest/hashunittest.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/unittest/hashunittest/hashunittest.cpp b/unittest/hashunittest/hashunittest.cpp
-index c2c25a0e..b208c94f 100644
---- a/unittest/hashunittest/hashunittest.cpp
-+++ b/unittest/hashunittest/hashunittest.cpp
-@@ -581,7 +581,7 @@ void HashUnitTest::sha384longtest()
-     fillerString.fill('a', 1000);
- 
-     foreach (QString provider, providersToTest) {
--        if (!QCA::isSupported("sha384", provider)) {
-+        if (QCA::isSupported("sha384", provider)) {
-             // QTime t;
-             // t.start();
-             QCA::Hash shaHash(QStringLiteral("sha384"), provider);
--- 
-2.35.1
-