gentoo resync : 14.05.2020

5 files changed, 50 insertions, 66 deletions

diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 87261b5ff305..25801fabaad3 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,5 +1,4 @@
-DIST tpm2-tss-2.2.3.tar.gz 912179 BLAKE2B 36b2a462512822dccb3adab605ea9922132f027455a1d2895b6735f6200fe44f08288477c99afd0f6c06b4bff3090104b6412b12ea4a518888cf756fb8ee53c4 SHA512 68087cbf2b7acc33788e90b3825bf2c91faa65cfc04b576790634c88876a8a6930d6943f83b7cf0858e37e5e7307703d0c975b9fc0b0ad1d87f66c74b65bd411
-DIST tpm2-tss-2.3.3.tar.gz 1171185 BLAKE2B de88d3301bf05239ac9644b4d0e8f257f483bd7a8196ba957a68da9f47cd88ca47422fded5fa8939ccb3bcdf4b39c1dd363c65b9e675f3e03021fb12ec723117 SHA512 df83908508fc8add8ca1aaf7144bcf369f13797f7e5d39fe29654d82e2de2cddf324cd06cb3154318ef767d706d863a7781d98c7b29a90945f081a54594128e5
-EBUILD tpm2-tss-2.2.3-r2.ebuild 1277 BLAKE2B aeda0dcbeffe97619fd36effb25a419c0eb19a8bbc08535cfc18e9f7f099fdf3cfcf07d0558fdfca8bfff5fd8428cd93b17dbbb66b0185482071df144d338458 SHA512 3c1e19d927bd3a129c38dc0c5c203c2247010c9350028736615d0d6aa74b9b8647d68c442ee98df6227bf6bd272b010725dfe6713b75930a1ce6236d2fde3b88
-EBUILD tpm2-tss-2.3.3.ebuild 1224 BLAKE2B 18acb65638c296c0d1f3326857c9a9d6396a6e2e062d5110f58262a9afe0ca1ce1ff7f9e0e1c240fb41275df8783e8ff5f3f848b6d75cc0c5d547d156c615de6 SHA512 39e04c983c696dc579e22acad09bcce367a66f15b4fc9fce90a6231f5be8fe017f92a9c3536a53de1f49b1986bf88020405478970fd01e8858050dab69eb732e
-MISC metadata.xml 630 BLAKE2B 71c85033656a3bccc387016c188d9e51bf46d5063ce3f910dc204073ee5f8f48f7b18db5630c182de2f4d6745960edf84c0e369c18c4ba222e6d79f76b5ddbb0 SHA512 c7a8877acd32975f5cb57369f268da56ca7494f6552876f212e87c6dbf2df321dff634cefeda8819f4a7c95768884ef93b9d8a7aa640051b21ee3b6ae3aec1a1
+AUX tpm2-tss-2.4.0-fix-tmpfiles-path.patch 1145 BLAKE2B 2cb265a5ae605982765675b5911c111c76d433f5ed1803dedbe06766abf9a0e00abd6dd1e378e6d2e30e9f8acdaf2795595c6a83e7fc08b96377c3b125b62ffc SHA512 60a7af4e6aff18837bc6f97211f14af99799942dae197193daa81ceec9a5c889056321abbf3734ec45daf2d873cb978946b6a77f1f5fe4ec2c2df78d3c59c7dd
+DIST tpm2-tss-2.4.0.tar.gz 1446509 BLAKE2B bb078719fa85d9ea07b9710b5ac5d2f9c2b842700ed5b26a30ab2708a227b4bd599563c76e648d6f0b9dfe7785a25c049826f953baffdd39113bd62e7b4563df SHA512 763370381584f2124f751f0736e6a8b34428fd52134fd9966f3581e128f3b74b3f1261992f5d6162d7c866e47f7e5519ea80c1d1d39b80d5ed6e067eb2cd35a0
+EBUILD tpm2-tss-2.4.0.ebuild 1610 BLAKE2B 8f230e65c4327c443c809cc0af7b6f6f5ccd339cfa94c9c5d167898eaa645f1af35bef8e6bd711a153feda87e898e0dfa8d2fa20a6fff3b6da9d7155b814f4f7 SHA512 284e5f7f3d96f1d52b3ddd58fdf051ff56642ae66129f8e09daaa2c81902264741fb0e625c0e1469957ef2554040fa1f0deb3cc40a6f66e2c96606ae3547a04c
+MISC metadata.xml 713 BLAKE2B 2abdfb26f5f48d666fb73603855baca019806420a262855faa4d4b00c90cdb260f2d6db4fab0752b13ef67dcfcd0e6462889eed7797545b1893a8c6ed137d563 SHA512 d48e14b074bcaaf77b723671a49979f94b592812d55a1e42acbe9b609be4e799bab939fdd4db66a2f9e37b40a0c2a13b47ef48d0e6c30e0ba88110e28dfaa4d2
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-fix-tmpfiles-path.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-fix-tmpfiles-path.patch
new file mode 100644
index 000000000000..93a1fed8a877
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.0-fix-tmpfiles-path.patch
@@ -0,0 +1,22 @@
+diff --git a/dist/fapi-config.json.in b/dist/fapi-config.json.in
+index e32a3c36..4aa636e2 100644
+--- a/dist/fapi-config.json.in
++++ b/dist/fapi-config.json.in
+@@ -2,7 +2,7 @@
+      "profile_name": "P_RSA2048SHA256",
+      "profile_dir": "@sysconfdir@/tpm2-tss/fapi-profiles/",
+      "user_dir": "~/@userstatedir@/tpm2-tss/user/keystore",
+-     "system_dir": "@localstatedir@/lib/tpm2-tss/system/keystore",
++     "system_dir": "@localstatedir@/tpm2-tss/system/keystore",
+      "tcti": "",
+      "system_pcrs" : [],
+      "log_dir" : "@runstatedir@/tpm2-tss/eventlog/"
+diff --git a/dist/tmpfiles.d/tpm2-tss-fapi.conf.in b/dist/tmpfiles.d/tpm2-tss-fapi.conf.in
+index 1793c4d7..3f0c8380 100644
+--- a/dist/tmpfiles.d/tpm2-tss-fapi.conf.in
++++ b/dist/tmpfiles.d/tpm2-tss-fapi.conf.in
+@@ -1,3 +1,3 @@
+ #Type   Path                                           Mode User Group Age         Argument
+-d       @localstatedir@/lib/tpm2-tss/system/keystore   775  tss  tss   -           -
++d       @localstatedir@/tpm2-tss/system/keystore       775  tss  tss   -           -
+ d       @runstatedir@/tpm2-tss/eventlog                775  tss  tss   -           -
diff --git a/app-crypt/tpm2-tss/metadata.xml b/app-crypt/tpm2-tss/metadata.xml
index 227ecac58567..ca0c0ecca084 100644
--- a/app-crypt/tpm2-tss/metadata.xml
+++ b/app-crypt/tpm2-tss/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
+		<flag name="fapi">Enable feature API (requires openssl as crypto backend)</flag>
 		<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> as crypto engine</flag>
 		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as crypto engine</flag>
 	</use>
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.2.3-r2.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.2.3-r2.ebuild
deleted file mode 100644
index cc1d9f37f2ab..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-2.2.3-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info 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/0"	# sublot is libtss2-sys number
-KEYWORDS="~amd64"
-IUSE="doc +gcrypt openssl static-libs test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	gcrypt? ( !openssl )
-	openssl? ( !gcrypt )
-	|| ( gcrypt openssl )"
-
-RDEPEND="
-	acct-group/tss
-	acct-user/tss
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	openssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-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_configure() {
-	econf \
-		$(use_enable doc doxygen-doc) \
-		$(use_enable static-libs static) \
-		$(use_enable test unit) \
-		--disable-defaultflags \
-		--with-crypto="$(usex gcrypt gcrypt ossl)" \
-		--with-udevrulesdir="$(get_udevdir)/rules.d" \
-		--with-udevrulesprefix=60-
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.3.3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild
index c73c89ca37d3..f8986d88dc98 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.3.3.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-info udev
+inherit linux-info tmpfiles udev
 
 DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
 HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
@@ -11,15 +11,20 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc +gcrypt openssl static-libs test"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc +fapi gcrypt +openssl static-libs test"
 
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="^^ ( gcrypt openssl )"
+REQUIRED_USE="^^ ( gcrypt openssl )
+		fapi ( !gcrypt )"
 
 RDEPEND="acct-group/tss
 	 acct-user/tss
+	 fapi? (
+		dev-libs/json-c
+	        net-misc/curl
+	 )
 	 gcrypt? ( dev-libs/libgcrypt:0= )
 	 openssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND}
@@ -27,6 +32,10 @@ DEPEND="${RDEPEND}
 BDEPEND="virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.0-fix-tmpfiles-path.patch"
+)
+
 pkg_setup() {
 	local CONFIG_CHECK=" \
 		~TCG_TPM
@@ -38,16 +47,25 @@ pkg_setup() {
 src_configure() {
 	econf \
 		$(use_enable doc doxygen-doc) \
+		$(use_enable fapi) \
 		$(use_enable static-libs static) \
 		$(use_enable test unit) \
+		--disable-tcti-mssim \
 		--disable-defaultflags \
 		--disable-weakcrypto \
 		--with-crypto="$(usex gcrypt gcrypt ossl)" \
+		--with-runstatedir=/run \
 		--with-udevrulesdir="$(get_udevdir)/rules.d" \
-		--with-udevrulesprefix=60-
+		--with-udevrulesprefix=60- \
+		--with-sysusersdir="/usr/lib/sysusers.d"
+		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
 }
 
 src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
 }
+
+pkg_postinst() {
+	tmpfiles_process tpm2-tss-fapi.conf
+}