From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9082515ACFB for ; Thu, 13 Apr 2023 18:50:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CFFD5E07E1; Thu, 13 Apr 2023 18:50:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B7282E07E1 for ; Thu, 13 Apr 2023 18:50:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D7264340AD2 for ; Thu, 13 Apr 2023 18:50:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4AF66108 for ; Thu, 13 Apr 2023 18:50:29 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1681411768.489a9221d41f98d87b5a48c81a2018ef0d010e62.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/qca/files/, app-crypt/qca/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch app-crypt/qca/qca-2.3.5-r1.ebuild X-VCS-Directories: app-crypt/qca/files/ app-crypt/qca/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 489a9221d41f98d87b5a48c81a2018ef0d010e62 X-VCS-Branch: master Date: Thu, 13 Apr 2023 18:50:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c02f2861-0d30-4aea-98f1-73cde2c30c62 X-Archives-Hash: 44006941fbc8dac0c87e05e6e66e53d6 commit: 489a9221d41f98d87b5a48c81a2018ef0d010e62 Author: Sam James gentoo org> AuthorDate: Thu Apr 13 18:49:28 2023 +0000 Commit: Sam James gentoo org> CommitDate: Thu Apr 13 18:49:28 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=489a9221 app-crypt/qca: backport OpenSSL 3 test fixes Test-only fixes. Closes: https://bugs.gentoo.org/904234 Signed-off-by: Sam James gentoo.org> app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch | 54 ++++++++++++++++++++++ app-crypt/qca/qca-2.3.5-r1.ebuild | 5 +- 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch b/app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch new file mode 100644 index 000000000000..c9c581e87a10 --- /dev/null +++ b/app-crypt/qca/files/qca-2.3.5-openssl3-tests.patch @@ -0,0 +1,54 @@ +https://bugs.gentoo.org/904234 +https://invent.kde.org/libraries/qca/-/commit/33a35a699928318032f62eab0e39e263c604ad9e +https://invent.kde.org/libraries/qca/-/commit/714073747c4a3ccff7a8c85c72872bdf6bd3db4a + +From 33a35a699928318032f62eab0e39e263c604ad9e Mon Sep 17 00:00:00 2001 +From: Pino Toscano +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. +--- 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); +-- +GitLab + +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 + +--- 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() +-- +GitLab diff --git a/app-crypt/qca/qca-2.3.5-r1.ebuild b/app-crypt/qca/qca-2.3.5-r1.ebuild index 61e57608b494..3c45a569717c 100644 --- a/app-crypt/qca/qca-2.3.5-r1.ebuild +++ b/app-crypt/qca/qca-2.3.5-r1.ebuild @@ -42,7 +42,10 @@ BDEPEND=" ) " -PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-disable-pgp-test.patch" + "${FILESDIR}/${PN}-2.3.5-openssl3-tests.patch" +) qca_plugin_use() { echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")