gentoo resync : 16.09.2020

6 files changed, 191 insertions, 1 deletions

diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 22a7ca4bd2fe..be3e35ae7877 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,5 +1,11 @@
 AUX tpm2-tss-2.4.1-Dont-run-systemd-sysusers-in-Makefile.patch 531 BLAKE2B 45a14e0d23b1dcba9eb92465fb6d6a57c3c97f1d574a987214475c40403c554066076a16432ee68ae1a58677c22c72612c08bf91e8cbfae98d941580c0a3598f SHA512 0840be27e1742d5999531cefbc20a661136e44d44728ee5b968d96a7d82baf1d14e5e4e671f8f34fdaf37a0214dc23bd5286c914f6f579e8f4d1dd959779a5a1
 AUX tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch 2073 BLAKE2B 09e64b791b75a6bb673402fe94bd4b4bac91f07f98e9053941470b0f44034d6892e6070aaa08326b25c1567018eef898b6508ded8bdbdfd0dd342ca22d0cdcc6 SHA512 d354f656481db5ead0d48ae0389954cc6735a037a6b09cda251360b937128b5807d4b3c5819dbceaa1767db2232ff8dea2f00af3998c182ee3533f97365aeda2
+AUX tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch 452 BLAKE2B 8b05bcdbe62333226d89a0275de8cfaa6b4f87d508a5f5c7da260d713244f468e07fbcb5e5c071bd9f8679dd369120d4d41c3c2d9a6c6cf81e17498e1a8b397b SHA512 c8255213c3712cc9f0bdce0080c9f14644926bd45103c89e0dfdbd8dfb4d4c1168bd6c0582b4c671d4c65f6b965246eaefb86e9ae2f43d354a67584f97ef9745
+AUX tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch 478 BLAKE2B 0739aa873be6b3faa025fc38ab562da07afc0a7016856bc99f5b1fdd9202a24124d8f5789de0381ec136480cf24337754ae795f84252d8b38ead94dee1362317 SHA512 d94fab5dca4823a5839e54a1a284331dda449b7a76b01de390cf21535e88531b002b433ec0b4b8246c0f16417b2116ef4a6c63863c0aaf151f1885f0bab66945
 DIST tpm2-tss-2.4.1.tar.gz 1445103 BLAKE2B c7be91b93d19b5afeddb6ec455db9ba06795f8dc76ee2a0c6cbabbd8f623930d7c9fdf6319497c70790445531d1e36fe3f904f4c1f4bc9254d833b6d19280f1f SHA512 51551d63fa404e23664aaad1b247bd4b1f93812ced1aed144c37f28cdb3adb4e696aa9e93a502c8fa0eb7e9b4376ac9377f0537eb4c717b68c0b014fee7a0643
+DIST tpm2-tss-2.4.2.tar.gz 1461987 BLAKE2B 7d37818ba91c4128862206d5179dcde2c5149b5b00807b242a0b4311531ad2da9e8ad435a6b46872aab5eb91777012010a352ba0f478737740175e0353275643 SHA512 db31d216abcefdad76f5d9ff2995c99c552400392a4dec800b962fa1fa3ac83effacca831602a9b7f814045c996a1bb066802c5373b54233aa24ddafd636c27e
+DIST tpm2-tss-3.0.0.tar.gz 1509288 BLAKE2B 23c46ba6c9ea2b61703556d3aab5b4e75b1a0242a688c44e8c254a4defd8258e100a933598755373ffec9db3ca0ab9d35e6a290a73851c2a456449e04bd8313a SHA512 ba54904f2cd8cbcca85ce4d4ac5c8650da6ab076e8d8d142e1b7ee75c5e9a645520f1a5ac8ffe5269deceba84762c9074b131296e8b2d4c684ddc335a828d7a8
 EBUILD tpm2-tss-2.4.1.ebuild 1773 BLAKE2B 0b8ad6d1eb92cae0c57fa37a28b3415427cf0a6310aa120e4224dce23c433e8f9dfd8b1005717d4c8e1672c3e59a8c1ce6119e67327cc23bdb999069eb464373 SHA512 a609ca5ff1c17ce961335d0eaabd53a11a7c9d9090f83004bfe336dfa2e85b04d09937e26336f26be044c258668adc8fbab568f2d3dd45670abaebd7b77b8ca7
-MISC metadata.xml 713 BLAKE2B 2abdfb26f5f48d666fb73603855baca019806420a262855faa4d4b00c90cdb260f2d6db4fab0752b13ef67dcfcd0e6462889eed7797545b1893a8c6ed137d563 SHA512 d48e14b074bcaaf77b723671a49979f94b592812d55a1e42acbe9b609be4e799bab939fdd4db66a2f9e37b40a0c2a13b47ef48d0e6c30e0ba88110e28dfaa4d2
+EBUILD tpm2-tss-2.4.2.ebuild 1703 BLAKE2B 853fb221ab9c00a9f13ec06e57047595ebe611625d2ff405a29fb79b53a11d9546e3ae910e46f5a5ac1afdd8f3a314eb64bd7453f9e1e8ae629e1f0971e14ac8 SHA512 075ff834e07e11c8df2fadce856441bb45f1e30c47c46f839e5e6b5487edb4bb87ad1b27be239b0261ab4e6a583a611bdf69493e5e890388b0d813ed14d2bd2f
+EBUILD tpm2-tss-3.0.0.ebuild 1700 BLAKE2B 757cfe421b8efdadddc692c87d022a4cc9b2cb81b8f164853a0452007b41e6507275e2d6843e9893accdb12cdbf013f8a4c378454535fc5bb2d22a3c7b372615 SHA512 4c8002a932997356daf5cf3ac4aefc26baf5bb3624a8369ba4ff09a81092c6516ca40037e002016f65e5f9361a1a5fe6c8e32db95266c4ab0d5915aaf9fbea0c
+MISC metadata.xml 792 BLAKE2B fe3f4ee796a06707683eb6fab993d34075a23267c4838bec5f063187c323b74e81e4e21c9e314be01d2a07853b7d2bbb0288b379c77053d6f6d2c99c372ba3a0 SHA512 7d1441a4bb5fbeb10fce0673f5b572edd4eef3be89184d2296e019b676cddd39d590da558ee3a83eba31cba56caf0eab6ec4b8bff9bed421660a5688ad38ae64
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch
new file mode 100644
index 000000000000..c37a73531c02
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile.am b/Makefile.am
+index 322415b8..39e09063 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -602,10 +602,6 @@ endif #FAPI
+ EXTRA_DIST += dist/tpm-udev.rules
+ 
+ install-dirs:
+-if HOSTOS_LINUX
+-	(systemd-sysusers && systemd-tmpfiles --create) || \
+-	($(call make_tss_user_and_group) && $(call make_fapi_dirs) && ($call set_fapi_permissions)) || true
+-endif
+ 
+ install-data-hook: install-dirs
+ 	-if [ ! -z "$(udevrulesprefix)" ]; then \
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch
new file mode 100644
index 000000000000..fd1d462151fb
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile.am b/Makefile.am
+index f2fa515a..7d2aca29 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -664,11 +664,6 @@ endif #FAPI
+ EXTRA_DIST += dist/tpm-udev.rules
+ 
+ install-dirs:
+-if HOSTOS_LINUX
+-	(systemd-sysusers && systemd-tmpfiles --create) || \
+-	($(call make_tss_user_and_group) && $(call make_fapi_dirs) && ($call set_fapi_permissions)) || true
+-	$(call check_fapi_dirs)
+-endif
+ 
+ install-data-hook: install-dirs
+ 	-if [ ! -z "$(udevrulesprefix)" ]; then \
diff --git a/app-crypt/tpm2-tss/metadata.xml b/app-crypt/tpm2-tss/metadata.xml
index ca0c0ecca084..eec8488de47c 100644
--- a/app-crypt/tpm2-tss/metadata.xml
+++ b/app-crypt/tpm2-tss/metadata.xml
@@ -12,6 +12,7 @@
 	<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="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as crypto engine</flag>
 		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as crypto engine</flag>
 	</use>
 	<upstream>
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.2.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.2.ebuild
new file mode 100644
index 000000000000..6f62e2098b94
--- /dev/null
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc +fapi gcrypt +openssl static-libs test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="^^ ( gcrypt openssl )
+		fapi? ( openssl !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}
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-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
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		$(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-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
+}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.0.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.0.0.ebuild
new file mode 100644
index 000000000000..b746508251c2
--- /dev/null
+++ b/app-crypt/tpm2-tss/tpm2-tss-3.0.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~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
+		net-misc/curl )
+	mbedtls? ( net-libs/mbedtls:= )
+	openssl? ( dev-libs/openssl:= )"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-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
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		$(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 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"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process tpm2-tss-fapi.conf
+}