summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Maier <tamiko@gentoo.org>2023-09-14 10:04:21 -0500
committerMatthias Maier <tamiko@gentoo.org>2023-09-14 10:05:50 -0500
commite470d198cc9fe863a54e392fb7e8bf963b5be5e9 (patch)
tree2b75f278c128a7d757def651206c9cb6dabcd0ff /app-crypt
parentdev-db/postgresql: add 16.0, drop 16_rc1-r1 (diff)
downloadgentoo-e470d198cc9fe863a54e392fb7e8bf963b5be5e9.tar.gz
gentoo-e470d198cc9fe863a54e392fb7e8bf963b5be5e9.tar.bz2
gentoo-e470d198cc9fe863a54e392fb7e8bf963b5be5e9.zip
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 <tamiko@gentoo.org>
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/swtpm/metadata.xml2
-rw-r--r--app-crypt/swtpm/swtpm-0.8.0-r1.ebuild (renamed from app-crypt/swtpm/swtpm-0.8.0.ebuild)5
-rw-r--r--app-crypt/swtpm/swtpm-0.8.1-r1.ebuild (renamed from app-crypt/swtpm/swtpm-0.8.1.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 @@
</maintainer>
<use>
<flag name="fuse">Support <pkg>sys-fs/fuse</pkg> based /dev/tpm interface</flag>
- <flag name="gnutls">Use <pkg>net-libs/gnutls</pkg> as crypto engine</flag>
+ <flag name="gnutls">Build the swtpm_cert binary which depends on <pkg>net-libs/gnutls</pkg></flag>
</use>
<upstream>
<remote-id type="github">stefanberger/swtpm</remote-id>
diff --git a/app-crypt/swtpm/swtpm-0.8.0.ebuild b/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
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)
}