diff options
author | Christopher Byrne <salah.coronya@gmail.com> | 2022-12-13 13:09:05 -0600 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2022-12-21 23:35:42 +0000 |
commit | 9729ee777cebe423731bbbbab153a2ffae660d8d (patch) | |
tree | fb58d6697530de5e4b297563aefdb10a79c72cfb /app-crypt/tpm2-tss | |
parent | app-crypt/tpm2-tss: add 3.2.1 (diff) | |
download | gentoo-9729ee777cebe423731bbbbab153a2ffae660d8d.tar.gz gentoo-9729ee777cebe423731bbbbab153a2ffae660d8d.tar.bz2 gentoo-9729ee777cebe423731bbbbab153a2ffae660d8d.zip |
app-crypt/tpm2-tss: drop 3.2.0-r3
Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28655
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-crypt/tpm2-tss')
-rw-r--r-- | app-crypt/tpm2-tss/files/tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch | 29 | ||||
-rw-r--r-- | app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild | 102 |
2 files changed, 0 insertions, 131 deletions
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch deleted file mode 100644 index b66b6e79c143..000000000000 --- a/app-crypt/tpm2-tss/files/tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 183289f7..c791896c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -689,24 +689,6 @@ endif #FAPI - EXTRA_DIST += dist/tpm-udev.rules - - install-dirs: --if HOSTOS_LINUX --if SYSD_SYSUSERS -- @echo "systemd-sysusers $(DESTDIR)$(sysconfdir)/sysusers.d/tpm2-tss.conf" -- @systemd-sysusers $(DESTDIR)$(sysconfdir)/sysusers.d/tpm2-tss.conf || echo "WARNING Failed to create the tss user and group" --else -- @echo "call make_tss_user_and_group" -- @$(call make_tss_user_and_group) || echo "WARNING Failed to create the tss user and group" --endif --if SYSD_TMPFILES -- @echo "systemd-tmpfiles --create $(DESTDIR)$(sysconfdir)/tmpfiles.d/tpm2-tss-fapi.conf" -- @systemd-tmpfiles --create $(DESTDIR)$(sysconfdir)/tmpfiles.d/tpm2-tss-fapi.conf|| echo "WARNING Failed to create the FAPI directories with the correct permissions" --else -- @echo "(call make_fapi_dirs) && (call set_fapi_permissions)" -- @-$(call make_fapi_dirs) && $(call set_fapi_permissions) || echo "WARNING Failed to create the FAPI directories with the correct permissions" --endif -- @echo "call check_fapi_dirs" -- @$(call check_fapi_dirs) --endif - - install-data-hook: install-dirs - -if [ ! -z "$(udevrulesprefix)" ]; then \ diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild deleted file mode 100644 index 6b9f088e71d1..000000000000 --- a/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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/3" -KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86" -IUSE="doc +fapi +openssl mbedtls static-libs test" - -RESTRICT="!test? ( test )" - -REQUIRED_USE="^^ ( mbedtls openssl ) - fapi? ( openssl !mbedtls )" - -RDEPEND="acct-group/tss - acct-user/tss - 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-doc/doxygen )" - -PATCHES=( - "${FILESDIR}/${PN}-3.1.0-Dont-run-systemd-sysusers-in-Makefile.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 - - # See bug #833887 (and similar); eautoreconf means .pc file gets wrong version. - sed -i \ - "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \ - "configure.ac" || die - - eautoreconf -} - -multilib_src_configure() { - # 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 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- \ - --with-sysusersdir="/usr/lib/sysusers.d" \ - --with-tmpfilesdir="/usr/lib/tmpfiles.d" -} - -multilib_src_install() { - default - - if [[ ${PV} != $(sed -n -e 's/^Version: //p' "${ED}/usr/$(get_libdir)/pkgconfig/tss2-sys.pc" || die) ]] ; then - # Safeguard for bug #833887 - die "pkg-config file version doesn't match ${PV}! Please report a bug!" - fi - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - tmpfiles_process tpm2-tss-fapi.conf - udev_reload -} - -pkg_postrm() { - udev_reload -} |