From f825a07e99d541191205c56bbb764df582767d7e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 13 Jan 2025 07:04:54 +0000 Subject: [PATCH] app-crypt/tpm2-tss: Sync with Gentoo It's from Gentoo commit bd4956fd5f9f58e0c7e4cf5a85e3f4de7b9f3246. --- .../app-crypt/tpm2-tss/Manifest | 1 - ...ss-4.0.0-Dont-install-files-into-run.patch | 26 ----- .../tpm2-tss/tpm2-tss-4.0.1-r1.ebuild | 109 ------------------ .../app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild | 97 ---------------- ...0.2-r1.ebuild => tpm2-tss-4.0.2-r2.ebuild} | 4 +- .../app-crypt/tpm2-tss/tpm2-tss-4.0.2.ebuild | 109 ------------------ ...-4.1.3.ebuild => tpm2-tss-4.1.3-r1.ebuild} | 4 +- 7 files changed, 4 insertions(+), 346 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/files/tpm2-tss-4.0.0-Dont-install-files-into-run.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.0.1-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild rename sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/{tpm2-tss-4.0.2-r1.ebuild => tpm2-tss-4.0.2-r2.ebuild} (96%) delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.0.2.ebuild rename sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/{tpm2-tss-4.1.3.ebuild => tpm2-tss-4.1.3-r1.ebuild} (96%) diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/Manifest b/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/Manifest index e08c54ad4a..25adb5daaa 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/Manifest @@ -1,3 +1,2 @@ -DIST tpm2-tss-4.0.1.tar.gz 1787139 BLAKE2B 627cdefeff6c64148f9da1425922a0a7a72debcee4930ffab208a3b9b66127c2d4f923e3e105bfd45410cdb13c19cb40cc15a720e9a05dd32ff622dabf5fcc32 SHA512 ed6ddc52cb0e8c1082a4bb001e1225eb9905fd2380da88db5fd69ff5b5d9d43a93eb67b634e49d53eb5d586832da3aef2c4c7e5f18d51bb730481f8913319d7d 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/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/files/tpm2-tss-4.0.0-Dont-install-files-into-run.patch b/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/files/tpm2-tss-4.0.0-Dont-install-files-into-run.patch deleted file mode 100644 index ca51ab7f93..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/files/tpm2-tss-4.0.0-Dont-install-files-into-run.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 2c81cfa9..2673995c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -767,13 +767,11 @@ define set_tss_permissions - endef - - define make_fapi_dirs -- ($(call make_tss_dir,$(DESTDIR)$(runstatedir)/tpm2-tss/eventlog/) || true) && \ - ($(call make_tss_dir,$(DESTDIR)$(localstatedir)/lib/tpm2-tss/system/keystore/)) - endef - - define set_fapi_permissions - if test -z "${DESTDIR}"; then \ e -- ($(call set_tss_permissions,$(DESTDIR)$(runstatedir)/tpm2-tss)) && \ - ($(call set_tss_permissions,$(DESTDIR)$(localstatedir)/lib/tpm2-tss)) \ - fi - endef -@@ -784,7 +782,6 @@ endef - - define check_fapi_dirs - if test -z "${DESTDIR}"; then \ -- ($(call check_dir,$(DESTDIR)$(runstatedir)/tpm2-tss/eventlog/)) && \ - ($(call check_dir,$(DESTDIR)$(localstatedir)/lib/tpm2-tss/system/keystore/)) \ - fi; - endef diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.0.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.0.1-r1.ebuild deleted file mode 100644 index 558f221a5b..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.0.1-r1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2024 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:=[${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.0-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" -) - -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/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild deleted file mode 100644 index d4391f09ea..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.0.1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2024 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:=[${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.0-Dont-install-files-into-run.patch" - "${FILESDIR}/${PN}-4.0.1-Make-sysusers-and-tmpfiles-optional.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 - - ECONF_SOURCE=${S} econf \ - --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" -} - -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/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r2.ebuild similarity index 96% rename from sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r1.ebuild rename to sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r2.ebuild index d9036d26ba..b5f0eb1e70 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -29,7 +29,7 @@ RDEPEND=" dev-libs/json-c:=[${MULTILIB_USEDEP}] >=net-misc/curl-7.80.0[${MULTILIB_USEDEP}] ) - mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] ) + mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] ) openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) " diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.0.2.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.0.2.ebuild deleted file mode 100644 index 40a410cf2a..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.0.2.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2024 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:=[${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" -) - -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/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.1.3.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.1.3-r1.ebuild similarity index 96% rename from sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.1.3.ebuild rename to sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.1.3-r1.ebuild index 0f0b23883e..c9b5cd0a29 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.1.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/tpm2-tss/tpm2-tss-4.1.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -29,7 +29,7 @@ RDEPEND=" dev-libs/json-c:=[${MULTILIB_USEDEP}] >=net-misc/curl-7.80.0[${MULTILIB_USEDEP}] ) - mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] ) + mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] ) openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) "