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 65681158089 for ; Thu, 14 Sep 2023 15:10:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 256442BC02A; Thu, 14 Sep 2023 15:10:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 0BB9E2BC02A for ; Thu, 14 Sep 2023 15:10:08 +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 42E8C335CE9 for ; Thu, 14 Sep 2023 15:10:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9855A1148 for ; Thu, 14 Sep 2023 15:10:05 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1694703950.e470d198cc9fe863a54e392fb7e8bf963b5be5e9.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/swtpm/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/swtpm/metadata.xml app-crypt/swtpm/swtpm-0.8.0-r1.ebuild app-crypt/swtpm/swtpm-0.8.0.ebuild app-crypt/swtpm/swtpm-0.8.1-r1.ebuild app-crypt/swtpm/swtpm-0.8.1.ebuild X-VCS-Directories: app-crypt/swtpm/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: e470d198cc9fe863a54e392fb7e8bf963b5be5e9 X-VCS-Branch: master Date: Thu, 14 Sep 2023 15:10:05 +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: 769c9b16-3c05-4505-b60f-41e0f53d2d9e X-Archives-Hash: 1480a6dd15e1e5fe6ddc00dd3586acd0 commit: e470d198cc9fe863a54e392fb7e8bf963b5be5e9 Author: Matthias Maier gentoo org> AuthorDate: Thu Sep 14 15:04:21 2023 +0000 Commit: Matthias Maier gentoo org> CommitDate: Thu Sep 14 15:05:50 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e470d198 app-crypt/swtpm: add back support for swtpm_cert, improve description Bug: https://bugs.gentoo.org/909754 Closes: https://bugs.gentoo.org/913586 Signed-off-by: Matthias Maier gentoo.org> app-crypt/swtpm/metadata.xml | 2 +- app-crypt/swtpm/{swtpm-0.8.0.ebuild => swtpm-0.8.0-r1.ebuild} | 5 +++-- app-crypt/swtpm/{swtpm-0.8.1.ebuild => swtpm-0.8.1-r1.ebuild} | 7 ++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app-crypt/swtpm/metadata.xml b/app-crypt/swtpm/metadata.xml index f93b188345c2..0cef26f8515d 100644 --- a/app-crypt/swtpm/metadata.xml +++ b/app-crypt/swtpm/metadata.xml @@ -15,7 +15,7 @@ Support sys-fs/fuse based /dev/tpm interface - Use net-libs/gnutls as crypto engine + Build the swtpm_cert binary which depends on net-libs/gnutls stefanberger/swtpm diff --git a/app-crypt/swtpm/swtpm-0.8.0.ebuild b/app-crypt/swtpm/swtpm-0.8.0-r1.ebuild similarity index 91% rename from app-crypt/swtpm/swtpm-0.8.0.ebuild rename to app-crypt/swtpm/swtpm-0.8.0-r1.ebuild index 3ecf2ac06a0d..96cec582841b 100644 --- a/app-crypt/swtpm/swtpm-0.8.0.ebuild +++ b/app-crypt/swtpm/swtpm-0.8.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9,10,11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools python-any-r1 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" IUSE="fuse +gnutls seccomp test" RESTRICT="!test? ( test )" @@ -26,6 +26,7 @@ RDEPEND="fuse? ( >=net-libs/gnutls-3.4.0:=[tools,pkcs11] ) seccomp? ( sys-libs/libseccomp ) + dev-libs/libtasn1:= acct-group/tss acct-user/tss dev-libs/openssl:0= diff --git a/app-crypt/swtpm/swtpm-0.8.1.ebuild b/app-crypt/swtpm/swtpm-0.8.1-r1.ebuild similarity index 90% rename from app-crypt/swtpm/swtpm-0.8.1.ebuild rename to app-crypt/swtpm/swtpm-0.8.1-r1.ebuild index b7d305979779..96cec582841b 100644 --- a/app-crypt/swtpm/swtpm-0.8.1.ebuild +++ b/app-crypt/swtpm/swtpm-0.8.1-r1.ebuild @@ -14,13 +14,17 @@ SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -IUSE="fuse seccomp test" +IUSE="fuse +gnutls seccomp test" RESTRICT="!test? ( test )" RDEPEND="fuse? ( dev-libs/glib:2 sys-fs/fuse:0 ) + gnutls? ( + dev-libs/libtasn1:= + >=net-libs/gnutls-3.4.0:=[tools,pkcs11] + ) seccomp? ( sys-libs/libseccomp ) dev-libs/libtasn1:= acct-group/tss @@ -53,6 +57,7 @@ src_configure() { --with-openssl \ --without-selinux \ $(use_with fuse cuse) \ + $(use_with gnutls) \ $(use_with seccomp) \ $(use_enable test) }