4 files changed, 2 insertions, 178 deletions
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
index 729e8a8c56db..ba7c51251a4a 100644
--- a/app-crypt/tpm2-abrmd/Manifest
+++ b/app-crypt/tpm2-abrmd/Manifest
@@ -1,8 +1,5 @@
-AUX tpm2-abrmd-2.1.1-build.patch 4350 BLAKE2B 9d8dd854954bb79239a2b443d7d6a8eb4ada564036ef480438d716f06c30ec5d45476d1fee194fbb669d323ea4c67bb7f049f6acd3745ab5f8284cb8efab1e6e SHA512 2fb6f5a63928064612175f822a41295e1c74afe3850ff4b2709384bc7eb54e5ec14a2af60b8720500fa5d91a102a89d9c6b177e8cd880e3f2f8dafc9f82e08d8
 AUX tpm2-abrmd.confd 17 BLAKE2B f3b6301cb29f0f741c26025bded10af8948eb7f16faca051828b063f4fdab823309fac085e69e281600f77646f3e2bd91c1a5079bd675569aef8db762fdbe991 SHA512 ca7c4782ccc3ee7592bb4b24a6a81c624d22969cf9b9e1c3e22d45e85d3720836b1f22735ccf2ba51258c6eb0b30c4d88d7bed893f58b1aac7423fb7013529f9
 AUX tpm2-abrmd.initd 390 BLAKE2B 5dbaccf073eba208e13c24f92127e41c4c71fe62dd9bf2062301efbcc16daa1559ffba127399a189d6466e21a8cf9b85ac0e09d34f495be58430eb3cfe0886ef SHA512 aef622face110e22831dddab8a6474b4d003e6d50da9d334653a88ef0a7fca88377379a56fef9c404af5222c8c2fb97090eca913aa7d96183c4e14d7ab470044
-DIST tpm2-abrmd-2.1.1.tar.gz 561352 BLAKE2B 4106811b238fee7b503bf0afb4ed857371bab023d8e449d5864eebb2386779e2bc8fb0f2bf8e334ebd8d7abe5c569f2b2cc2ea60b07672b1d3294092e63c2a5a SHA512 d685812c26a097190ced5a9e8ceb1544eb9e3858606123644d5496031706af91e5ba9fb54eb371bcb4eed4d236617f7a21a49a792196db9c5ebf277582ac7124
-DIST tpm2-abrmd-2.3.1.tar.gz 566988 BLAKE2B 281c1288baaa07b93939219143f4ecc2420b353d04d751746b6e43c93e092d0facb3d0ddbc20129328666d69954dd16ea7e709fea99690af80b2c83e1ac855e4 SHA512 144ab2b147cd18f892f3c05181efdbed2ac422fe8507eb42871ffe571340b6395431743a4f1995a7ce7a914fd5e7afd2b17328062c893a0403708c2c4d92e0cb
-EBUILD tpm2-abrmd-2.1.1-r2.ebuild 1211 BLAKE2B ae3015831a8031e1bce98392f65b7c699c6bdbb4ae0abce74e9860939b6fc64c2d28af158d7d891fba18fedc633b2f10d5aaa948ff7cc6751917958157bf0d9f SHA512 3d2e9786b3e41ffbe30ab123c509d535f89b460ec91dcc3ee031b7fe00e5e2355cf567f91ea8f2182a84b0c4934d3cac94a43a083f29b28eaf8d130c87cff1cb
-EBUILD tpm2-abrmd-2.3.1.ebuild 1170 BLAKE2B 18af00b2e1596539fbc3f4d8e760129544a8912188df9319c6f8d53ea64f9a7f68dc3da265ca8c203cf61acdc0fa5115a99fd9aeb234497d78ba3137a26edda0 SHA512 20d7a6601a5e89f0921761d8b8341e7be729dd991a624ada4ff1ed2eddb36584fddf2560b6e8405872b6a9bdb2edb4e71f2cea794a2d939bd8f9486a1847a85e
+DIST tpm2-abrmd-2.3.3.tar.gz 573449 BLAKE2B c3bc0311a73a0c69060a4d19517c3b5d09077ee8efdcd6e7d605675111cb5ac568d1e43bf9c329d4fad21fd44fb50b20e502205360461533c68866d329c320db SHA512 2191c7e466271cb85fcb20fcd91c78df80f53030fb055d0b4670db33708939b60a9124955356f27662975abdcb9c8d144df884003986ffdbd801ca4e47edc21a
+EBUILD tpm2-abrmd-2.3.3.ebuild 1170 BLAKE2B 18af00b2e1596539fbc3f4d8e760129544a8912188df9319c6f8d53ea64f9a7f68dc3da265ca8c203cf61acdc0fa5115a99fd9aeb234497d78ba3137a26edda0 SHA512 20d7a6601a5e89f0921761d8b8341e7be729dd991a624ada4ff1ed2eddb36584fddf2560b6e8405872b6a9bdb2edb4e71f2cea794a2d939bd8f9486a1847a85e
 MISC metadata.xml 458 BLAKE2B 049bd6e5ef39abed2d063afe42162fbd7afa04776d9cae8d35c2704ed9ebcdd7ab575dd87350744d443211d6ed4a7a8f3a8d1a12abc4f0673d0c642d3b9412ff SHA512 c44d5ffb197cca46a7c06e1d7d74351590624a0ac62d2fd41e07c8f2dd51877a3770b7c047c4880f3bbea9ac4488a8045bf5aa364c8faf5e0c9bc030620702f7
diff --git a/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.1.1-build.patch b/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.1.1-build.patch
deleted file mode 100644
index e58bb7f72ef5..000000000000
--- a/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.1.1-build.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From a0a961c05c8916863a67a61f469c717f617e1c58 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Fri, 31 May 2019 01:03:03 +0300
-Subject: [PATCH 1/2] build: let autoconf detect system extensions
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- configure.ac | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-https://github.com/tpm2-software/tpm2-abrmd/pull/632
-
-diff --git a/configure.ac b/configure.ac
-index 35a0c21..0cc8ce8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,6 +7,7 @@ AC_INIT([tpm2-abrmd],
- AC_CONFIG_MACRO_DIR([m4])
- AC_PROG_CC
- AC_PROG_LN_S
-+AC_USE_SYSTEM_EXTENSIONS
- LT_INIT()
- PKG_INSTALLDIR()
- AM_INIT_AUTOMAKE([foreign subdir-objects])
-@@ -151,9 +152,6 @@ AX_ADD_TOOLCHAIN_FLAG([-fstack-protector-all])
- AX_ADD_COMPILER_FLAG([-fpic])
- AX_ADD_COMPILER_FLAG([-fPIC])
- AX_ADD_COMPILER_FLAG([-Wstrict-overflow=5])
--AX_ADD_PREPROC_FLAG([-D_GNU_SOURCE])
--AX_ADD_PREPROC_FLAG([-U_FORTIFY_SOURCE])
--AX_ADD_PREPROC_FLAG([-D_FORTIFY_SOURCE=2])
- AX_ADD_LINK_FLAG([-Wl,--gc-sections])
- AX_ADD_LINK_FLAG([-Wl,--no-undefined])
- AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
--- 
-2.21.0
-
-From 977de33fe1499e7e8fa25f4c1247aaf9b71ba3a2 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Fri, 31 May 2019 01:03:08 +0300
-Subject: [PATCH 2/2] build: add --disable-defaultflags
-
-Align with other tpm2 build systems.
-Enable downstream to override flags.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- configure.ac | 54 ++++++++++++++++++++++++++++++----------------------
- 1 file changed, 31 insertions(+), 23 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0cc8ce8..dc32b09 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -134,29 +134,37 @@ AS_IF([test \( "x$enable_integration" = "xyes" \) -a \( "x$enable_test_hwtpm" =
-     [AC_MSG_NOTICE([Integration tests will be executed against the TPM device.])])
- AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"])
- 
--# preprocessor / compiler / linker flags
--#   these macros are defined in m4/flags.m4
--AX_ADD_COMPILER_FLAG([-Wall])
--AX_ADD_COMPILER_FLAG([-Wextra])
--AX_ADD_COMPILER_FLAG([-Werror])
--AX_ADD_COMPILER_FLAG([-std=gnu99])
--AX_ADD_COMPILER_FLAG([-Wformat])
--AX_ADD_COMPILER_FLAG([-Wformat-security])
--AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
--# work around for Glib usage of function pointers type casting
--#   https://bugzilla.gnome.org/show_bug.cgi?id=793272
--AX_ADD_COMPILER_FLAG([-Wno-cast-function-type])
--AX_ADD_COMPILER_FLAG([-fdata-sections])
--AX_ADD_COMPILER_FLAG([-ffunction-sections])
--AX_ADD_TOOLCHAIN_FLAG([-fstack-protector-all])
--AX_ADD_COMPILER_FLAG([-fpic])
--AX_ADD_COMPILER_FLAG([-fPIC])
--AX_ADD_COMPILER_FLAG([-Wstrict-overflow=5])
--AX_ADD_LINK_FLAG([-Wl,--gc-sections])
--AX_ADD_LINK_FLAG([-Wl,--no-undefined])
--AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
--AX_ADD_LINK_FLAG([-Wl,-z,now])
--AX_ADD_LINK_FLAG([-Wl,-z,relro])
-+AC_ARG_ENABLE([defaultflags],
-+              [AS_HELP_STRING([--disable-defaultflags],
-+                              [Disable default preprocessor, compiler, and linker flags.])],
-+              [enable_defaultflags=$enableval],
-+              [enable_defaultflags=yes])
-+AS_IF([test "x$enable_defaultflags" = "xyes"],
-+      [
-+      # preprocessor / compiler / linker flags
-+      #   these macros are defined in m4/flags.m4
-+      AX_ADD_COMPILER_FLAG([-Wall])
-+      AX_ADD_COMPILER_FLAG([-Wextra])
-+      AX_ADD_COMPILER_FLAG([-Werror])
-+      AX_ADD_COMPILER_FLAG([-std=gnu99])
-+      AX_ADD_COMPILER_FLAG([-Wformat])
-+      AX_ADD_COMPILER_FLAG([-Wformat-security])
-+      AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
-+      # work around for Glib usage of function pointers type casting
-+      #   https://bugzilla.gnome.org/show_bug.cgi?id=793272
-+      AX_ADD_COMPILER_FLAG([-Wno-cast-function-type])
-+      AX_ADD_COMPILER_FLAG([-fdata-sections])
-+      AX_ADD_COMPILER_FLAG([-ffunction-sections])
-+      AX_ADD_TOOLCHAIN_FLAG([-fstack-protector-all])
-+      AX_ADD_COMPILER_FLAG([-fpic])
-+      AX_ADD_COMPILER_FLAG([-fPIC])
-+      AX_ADD_COMPILER_FLAG([-Wstrict-overflow=5])
-+      AX_ADD_LINK_FLAG([-Wl,--gc-sections])
-+      AX_ADD_LINK_FLAG([-Wl,--no-undefined])
-+      AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
-+      AX_ADD_LINK_FLAG([-Wl,-z,now])
-+      AX_ADD_LINK_FLAG([-Wl,-z,relro])
-+      ])
- 
- AC_SUBST([PATH])
- 
--- 
-2.21.0
-
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r2.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r2.ebuild
deleted file mode 100644
index dddc82c0e866..000000000000
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="TPM2 Access Broker & Resource Manager"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-abrmd"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static-libs test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/dbus:=
-	acct-group/tss
-	acct-user/tss
-	dev-libs/glib:=
-	app-crypt/tpm2-tss:="
-DEPEND="${RDEPEND}
-	test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
-	dev-util/gdbus-codegen"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable test unit) \
-		--disable-defaultflags \
-		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \
-		--with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \
-		--with-systemdpresetdisable \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.3.1.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.3.3.ebuild
index 53562b771fdc..53562b771fdc 100644
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.3.1.ebuild
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.3.3.ebuild