diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest index 25adb5daaa34d..52e82a3ab58d6 100644 --- a/app-crypt/tpm2-tss/Manifest +++ b/app-crypt/tpm2-tss/Manifest @@ -1,2 +1 @@ -DIST tpm2-tss-4.0.2.tar.gz 1833499 BLAKE2B 91e70bcc66099fe5d7d53cf98a2c46582e96f204fc7bcb89c46497cc811ca1eb39c752be077a6e8132fc980a6581a2df075fcc6670d646d1270e642c144f043c SHA512 e92038de985ac928bf87a707b0f9b190aaa936827923ea5e3cbdda216cbc6cf8590af650c59c2e1e420ad9914dc6c1f14232ab7930ffc1a50fb0c49fdef6d3f0 DIST tpm2-tss-4.1.3.tar.gz 1902009 BLAKE2B d8592f4797a4254883667476efb2fdf3c95547d9c472fe3557031e934c725e20e3cc70a9b7b41eaddac71e8d9f94beb5fbb39aec5d81b3eeb1b612df27312923 SHA512 c9a5e1e90f6545a466d43790ab2d67c52c4b788a0b21f8212575e27e04e0ac663105863fe00824e08a4e56a4f8c6b00c48c1a1c132531b8569cd5042c3bb9e69 diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-4.0.1-Do-not-consider-failures-to-write-files-in-sys-hard.patch b/app-crypt/tpm2-tss/files/tpm2-tss-4.0.1-Do-not-consider-failures-to-write-files-in-sys-hard.patch deleted file mode 100644 index 83f123ffdc52c..0000000000000 --- a/app-crypt/tpm2-tss/files/tpm2-tss-4.0.1-Do-not-consider-failures-to-write-files-in-sys-hard.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0632885d08917092ffc8d98febd158745a74465a Mon Sep 17 00:00:00 2001 -From: Daan De Meyer -Date: Fri, 4 Aug 2023 16:07:52 +0200 -Subject: [PATCH] Do not consider failures to write files in /sys hard errors - -systemd-tmpfiles can run in containers, chroots, ... where writing to /sys will fail, so let's suffix these lines with "-" to avoid considering these cases hard errors. - -Signed-off-by: Daan De Meyer ---- - dist/tmpfiles.d/tpm2-tss-fapi.conf.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dist/tmpfiles.d/tpm2-tss-fapi.conf.in b/dist/tmpfiles.d/tpm2-tss-fapi.conf.in -index 7ea3c652..51ff78e5 100644 ---- a/dist/tmpfiles.d/tpm2-tss-fapi.conf.in -+++ b/dist/tmpfiles.d/tpm2-tss-fapi.conf.in -@@ -3,5 +3,5 @@ d @localstatedir@/lib/tpm2-tss/system/keystore 2775 tss tss - - a+ @localstatedir@/lib/tpm2-tss/system/keystore - - - - default:group:tss:rwx - d @runstatedir@/tpm2-tss/eventlog 2775 tss tss - - - a+ @runstatedir@/tpm2-tss/eventlog - - - - default:group:tss:rwx --z /sys/kernel/security/tpm[0-9]/binary_bios_measurements 0440 root tss - - --z /sys/kernel/security/ima/binary_runtime_measurements 0440 root tss - - -+z- /sys/kernel/security/tpm[0-9]/binary_bios_measurements 0440 root tss - - -+z- /sys/kernel/security/ima/binary_runtime_measurements 0440 root tss - - --- -2.43.0 - diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-4.0.1-Make-sysusers-and-tmpfiles-optional.patch b/app-crypt/tpm2-tss/files/tpm2-tss-4.0.1-Make-sysusers-and-tmpfiles-optional.patch deleted file mode 100644 index d93fcf9ef2d6f..0000000000000 --- a/app-crypt/tpm2-tss/files/tpm2-tss-4.0.1-Make-sysusers-and-tmpfiles-optional.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 75f53cf7eab591870ce735203995d01d2f577187 Mon Sep 17 00:00:00 2001 -From: Christopher Byrne -Date: Tue, 13 Jun 2023 21:40:56 -0500 -Subject: [PATCH] configure.ac: Make sysusers and tmpfiles optional - -Signed-off-by: Christopher Byrne ---- - Makefile.am | 6 +++++- - configure.ac | 4 ++-- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 2c81cfa9..98965fa7 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -563,10 +563,14 @@ fapi-config.json: dist/fapi-config.json.in - -e 's|[@]sysmeasurements@|$(sysmeasurements)|g' \ - < "$<" > "$@" - -+if SYSD_SYSUSERS - sysusers_DATA = dist/sysusers.d/tpm2-tss.conf --tmpfiles_DATA = tpm2-tss-fapi.conf -+endif - -+if SYSD_TMPFILES -+tmpfiles_DATA = tpm2-tss-fapi.conf - CLEANFILES += tpm2-tss-fapi.conf -+endif - - # We have to do this ourselves, in order to get absolute paths - tpm2-tss-fapi.conf: dist/tmpfiles.d/tpm2-tss-fapi.conf.in -diff --git a/configure.ac b/configure.ac -index b6550278..2d478147 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -550,9 +550,9 @@ AS_IF([test "x$enable_integration" = "xyes" && test "x$enable_self_generated_cer - - # Check for systemd helper tools used by make install - AC_CHECK_PROG(systemd_sysusers, systemd-sysusers, yes) --AM_CONDITIONAL(SYSD_SYSUSERS, test "x$systemd_sysusers" = "xyes") -+AM_CONDITIONAL([SYSD_SYSUSERS], [test "x$systemd_sysusers" = "xyes" && test "x$sysusersdir" != "xno"]) - AC_CHECK_PROG(systemd_tmpfiles, systemd-tmpfiles, yes) --AM_CONDITIONAL(SYSD_TMPFILES, test "x$systemd_tmpfiles" = "xyes") -+AM_CONDITIONAL([SYSD_TMPFILES], [test "x$systemd_tmpfiles" = "xyes" && test "x$tmpfilesdir" != "xno"]) - - # Check all tools used by make install - AS_IF([test "$HOSTOS" = "Linux" && test "x$systemd_sysusers" != "xyes"], --- -2.39.3 - diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-4.0.2-Hide-write-all-function.patch b/app-crypt/tpm2-tss/files/tpm2-tss-4.0.2-Hide-write-all-function.patch deleted file mode 100644 index bd682df53bac2..0000000000000 --- a/app-crypt/tpm2-tss/files/tpm2-tss-4.0.2-Hide-write-all-function.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/util/io.c b/src/util/io.c -index c6446826..50c0fd6c 100644 ---- a/src/util/io.c -+++ b/src/util/io.c -@@ -81,6 +81,7 @@ read_all ( - return recvd_total; - } - -+__attribute__ ((visibility("hidden"))) - ssize_t - write_all ( - SOCKET fd, -diff --git a/src/util/io.h b/src/util/io.h -index 25dd5c45..fec391d8 100644 ---- a/src/util/io.h -+++ b/src/util/io.h -@@ -70,6 +70,7 @@ read_all ( - * are detected. This is currently limited to interrupted system calls and - * short writes. - */ -+__attribute__ ((visibility("hidden"))) - ssize_t - write_all ( - SOCKET fd, diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r2.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r2.ebuild deleted file mode 100644 index b5f0eb1e70492..0000000000000 --- a/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r2.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic linux-info multilib-minimal tmpfiles udev - -DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack" -HOMEPAGE="https://github.com/tpm2-software/tpm2-tss" -SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0/4" -KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" -IUSE="doc +fapi +openssl mbedtls +policy static-libs test" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - ^^ ( mbedtls openssl ) - fapi? ( openssl !mbedtls ) - policy? ( openssl !mbedtls ) -" - -RDEPEND=" - acct-group/tss - acct-user/tss - sys-apps/util-linux:=[${MULTILIB_USEDEP}] - fapi? ( - dev-libs/json-c:=[${MULTILIB_USEDEP}] - >=net-misc/curl-7.80.0[${MULTILIB_USEDEP}] - ) - mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] ) - openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) -" - -DEPEND=" - ${RDEPEND} - test? ( app-crypt/swtpm - dev-libs/uthash - dev-util/cmocka - fapi? ( >=net-misc/curl-7.80.0 ) ) -" - -BDEPEND=" - sys-apps/acl - virtual/pkgconfig - doc? ( app-text/doxygen ) -" - -PATCHES=( - "${FILESDIR}/${PN}-4.0.2-Dont-install-files-into-run.patch" - "${FILESDIR}/${PN}-4.0.1-Make-sysusers-and-tmpfiles-optional.patch" - "${FILESDIR}/${PN}-4.0.1-Do-not-consider-failures-to-write-files-in-sys-hard.patch" - "${FILESDIR}/${PN}-4.0.2-Hide-write-all-function.patch" -) - -pkg_setup() { - local CONFIG_CHECK="~TCG_TPM" - linux-info_pkg_setup - kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required" -} - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - # Fails with inlining - filter-flags -fno-semantic-interposition - # tests fail with LTO enabbled. See bug 865275 and 865279 - filter-lto - - local myconf=( - --localstatedir=/var - $(multilib_native_use_enable doc doxygen-doc) - $(use_enable fapi) - $(use_enable policy) - $(use_enable static-libs static) - $(multilib_native_use_enable test unit) - $(multilib_native_use_enable test integration) - $(multilib_native_use_enable test self-generated-certificate) - --disable-tcti-libtpms - --disable-defaultflags - --disable-weakcrypto - --with-crypto="$(usex mbedtls mbed ossl)" - --with-runstatedir=/run - --with-udevrulesdir="$(get_udevdir)/rules.d" - --with-udevrulesprefix=60- - --without-sysusersdir - --with-tmpfilesdir="/usr/lib/tmpfiles.d" - ) - - ECONF_SOURCE=${S} econf "${myconf[@]}" -} - -multilib_src_install() { - default - keepdir /var/lib/tpm2-tss/system/keystore - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - tmpfiles_process tpm2-tss-fapi.conf - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.1.3-r1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.1.3-r1.ebuild deleted file mode 100644 index c9b5cd0a29b19..0000000000000 --- a/app-crypt/tpm2-tss/tpm2-tss-4.1.3-r1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic linux-info multilib-minimal tmpfiles udev - -DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack" -HOMEPAGE="https://github.com/tpm2-software/tpm2-tss" -SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0/4" -KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" -IUSE="doc +fapi +openssl mbedtls +policy static-libs test" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - ^^ ( mbedtls openssl ) - fapi? ( openssl !mbedtls ) - policy? ( openssl !mbedtls ) -" - -RDEPEND=" - acct-group/tss - acct-user/tss - sys-apps/util-linux:=[${MULTILIB_USEDEP}] - fapi? ( - dev-libs/json-c:=[${MULTILIB_USEDEP}] - >=net-misc/curl-7.80.0[${MULTILIB_USEDEP}] - ) - mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] ) - openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) -" - -DEPEND=" - ${RDEPEND} - test? ( app-crypt/swtpm - dev-libs/uthash - dev-util/cmocka - fapi? ( >=net-misc/curl-7.80.0 ) ) -" - -BDEPEND=" - sys-apps/acl - virtual/pkgconfig - doc? ( app-text/doxygen ) -" - -PATCHES=( - "${FILESDIR}/${PN}-4.0.2-Dont-install-files-into-run.patch" -) - -pkg_setup() { - local CONFIG_CHECK="~TCG_TPM" - linux-info_pkg_setup - kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required" -} - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - # Fails with inlining - filter-flags -fno-semantic-interposition - # tests fail with LTO enabbled. See bug 865275 and 865279 - filter-lto - - local myconf=( - --localstatedir=/var - $(multilib_native_use_enable doc doxygen-doc) - $(use_enable fapi) - $(use_enable policy) - $(use_enable static-libs static) - $(multilib_native_use_enable test unit) - $(multilib_native_use_enable test integration) - $(multilib_native_use_enable test self-generated-certificate) - --disable-tcti-libtpms - --disable-tcti-spi-ltt2go - --disable-tcti-spi-ftdi - --disable-tcti-i2c-ftdi - --disable-defaultflags - --disable-weakcrypto - --with-crypto="$(usex mbedtls mbed ossl)" - --with-runstatedir=/run - --with-udevrulesdir="$(get_udevdir)/rules.d" - --with-udevrulesprefix=60- - --without-sysusersdir - --with-tmpfilesdir="/usr/lib/tmpfiles.d" - ) - - ECONF_SOURCE=${S} econf "${myconf[@]}" -} - -multilib_src_install() { - default - keepdir /var/lib/tpm2-tss/system/keystore - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - tmpfiles_process tpm2-tss-fapi.conf - udev_reload -} - -pkg_postrm() { - udev_reload -}