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 B3D0F15800A for ; Tue, 25 Jul 2023 08:23:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0401E08EF; Tue, 25 Jul 2023 08:23:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 BCF81E08EF for ; Tue, 25 Jul 2023 08:23:09 +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 AE49B33BE41 for ; Tue, 25 Jul 2023 08:23:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 06EF5ACD for ; Tue, 25 Jul 2023 08:23:07 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1690273316.6533022d21cd2f298942770d6f5fce24f12bf2c7.asturm@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/Manifest app-crypt/qca/files/qca-2.3.7-use-sha256-not-sha1.patch app-crypt/qca/qca-2.3.7.ebuild X-VCS-Directories: app-crypt/qca/ app-crypt/qca/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6533022d21cd2f298942770d6f5fce24f12bf2c7 X-VCS-Branch: master Date: Tue, 25 Jul 2023 08:23:07 +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: 076c0271-566e-4e9a-a87a-ff8d17a14c17 X-Archives-Hash: 387a048e587ee844aebfdc3bcb3c1d99 commit: 6533022d21cd2f298942770d6f5fce24f12bf2c7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jul 25 07:58:29 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jul 25 08:21:56 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6533022d app-crypt/qca: add 2.3.7 See also: https://mail.kde.org/pipermail/kde-announce-apps/2023-July/005763.html Also backporting: https://invent.kde.org/libraries/qca/-/merge_requests/101 Signed-off-by: Andreas Sturmlechner gentoo.org> app-crypt/qca/Manifest | 1 + .../qca/files/qca-2.3.7-use-sha256-not-sha1.patch | 29 +++++ app-crypt/qca/qca-2.3.7.ebuild | 118 +++++++++++++++++++++ 3 files changed, 148 insertions(+) diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest index dab768773b90..e75edf151c57 100644 --- a/app-crypt/qca/Manifest +++ b/app-crypt/qca/Manifest @@ -1 +1,2 @@ DIST qca-2.3.6.tar.xz 745864 BLAKE2B a3a5955215504b5703db304f241ae9c0c9b243c280cacb6180f631b3259b5f9a8af1c08b233f70e8e4130ac2e957dc3d8a99817b4dec2df0fab41b39bc54f8c8 SHA512 018bde919df28cfc9e5d6c5ad30724199a1a17437022751fb92bfc1ce691d8a56c62b661526e346f5a0c5ff7ffd556499f2ee25efe9f8b1698b3f8eee480811c +DIST qca-2.3.7.tar.xz 745880 BLAKE2B 87a029a3cca93f14c764a105e8f0b3c2a32a39ab16ea34e60fe155712ecd351dcb8d67659228ad339db7e3b572ce8ca9c50b9cdc2a5bf8511b482329497843ee SHA512 8932c3ea82378cacd408f787dbfd38a5ffe7a9a5e4c90a53a44b9a386c827f70b19094d4188d5ace8dc0a9c84caa4b242aa85967ef5948591e8d74d7cf3109f6 diff --git a/app-crypt/qca/files/qca-2.3.7-use-sha256-not-sha1.patch b/app-crypt/qca/files/qca-2.3.7-use-sha256-not-sha1.patch new file mode 100644 index 000000000000..e16fa76f6c57 --- /dev/null +++ b/app-crypt/qca/files/qca-2.3.7-use-sha256-not-sha1.patch @@ -0,0 +1,29 @@ +From 123123453bd4f3ac87ca6dd641a9028e6e7a29f0 Mon Sep 17 00:00:00 2001 +From: Albert Vaca Cintora +Date: Mon, 24 Jul 2023 13:32:30 +0000 +Subject: [PATCH] Sign self-signed certs with SHA256 + +--- + plugins/qca-ossl/qca-ossl.cpp | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp +index 893631c9..f340ee2f 100644 +--- a/plugins/qca-ossl/qca-ossl.cpp ++++ b/plugins/qca-ossl/qca-ossl.cpp +@@ -3470,10 +3470,8 @@ public: + X509_EXTENSION *ex; + + const EVP_MD *md; +- if (priv.key()->type() == PKey::RSA) +- md = EVP_sha1(); +- else if (priv.key()->type() == PKey::DSA) +- md = EVP_sha1(); ++ if (priv.key()->type() == PKey::RSA || priv.key()->type() == PKey::DSA) ++ md = EVP_sha256(); + else + return false; + +-- +GitLab + diff --git a/app-crypt/qca/qca-2.3.7.ebuild b/app-crypt/qca/qca-2.3.7.ebuild new file mode 100644 index 000000000000..7016ffd72ba9 --- /dev/null +++ b/app-crypt/qca/qca-2.3.7.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake kde.org multibuild out-of-source-utils qmake-utils + +DESCRIPTION="Qt Cryptographic Architecture (QCA)" +HOMEPAGE="https://userbase.kde.org/QCA" +SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + +LICENSE="LGPL-2.1" +SLOT="2" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 +qt5 qt6 sasl softstore +ssl test" +REQUIRED_USE="|| ( qt5 qt6 )" + +RESTRICT="!test? ( test )" + +RDEPEND=" + botan? ( dev-libs/botan:3= ) + gcrypt? ( dev-libs/libgcrypt:= ) + gpg? ( app-crypt/gnupg ) + nss? ( dev-libs/nss ) + pkcs11? ( + >=dev-libs/openssl-1.1 + dev-libs/pkcs11-helper + ) + qt5? ( >=dev-qt/qtcore-5.14:5 ) + qt6? ( + dev-qt/qtbase:6 + dev-qt/qt5compat:6 + ) + sasl? ( dev-libs/cyrus-sasl:2 ) + ssl? ( >=dev-libs/openssl-1.1:= ) +" +DEPEND="${RDEPEND} + test? ( + qt5? ( + dev-qt/qtnetwork:5 + dev-qt/qttest:5 + ) + qt6? ( dev-qt/qtbase:6[network,test] ) + ) +" +BDEPEND=" + doc? ( + app-doc/doxygen[dot] + virtual/latex-base + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-disable-pgp-test.patch" + "${FILESDIR}/${P}-use-sha256-not-sha1.patch" # git master +) + +qca_plugin_use() { + echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1") +} + +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) +} + +src_configure() { + myconfigure() { + local mycmakeargs=( + -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_mkspecsdir)/features" + -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_plugindir)" + $(qca_plugin_use botan) + $(qca_plugin_use gcrypt) + $(qca_plugin_use gpg gnupg) + $(qca_plugin_use logger) + $(qca_plugin_use nss) + $(qca_plugin_use pkcs11) + $(qca_plugin_use sasl cyrus-sasl) + $(qca_plugin_use softstore) + $(qca_plugin_use ssl ossl) + -DBUILD_TESTS=$(usex test) + ) + if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then + mycmakeargs+=( -DBUILD_WITH_QT6=ON ) + else + mycmakeargs+=( -DBUILD_WITH_QT6=OFF ) + fi + cmake_src_configure + } + + multibuild_foreach_variant myconfigure +} + +src_compile() { + multibuild_foreach_variant cmake_src_compile + if use doc; then + multibuild_for_best_variant cmake_build doc + fi +} + +src_test() { + mytest() { + local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca" + cmake_src_test + } + multibuild_foreach_variant mytest +} + +src_install() { + multibuild_foreach_variant cmake_src_install + + if use doc; then + multibuild_for_best_variant run_in_build_dir dodoc -r apidocs/html + fi + + if use examples; then + dodoc -r "${S}"/examples + fi +}