gentoo resync : 14.05.2020

6 files changed, 18 insertions, 129 deletions

diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index a411def2a4ae..f3e781a03b81 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,7 +1,4 @@
-AUX tpm2-tools-3.1.3-libressl.patch 2589 BLAKE2B 2d949ed3d8470bbfee647e691f03ee4a53cc70230140dddba85424238670f147465eecaf85ce95696782e2cf3e8229fa5233300e93e33f4d48c0d56485f3d0a5 SHA512 e45ba9fa0f758105cccd4ded4422f285fdf3c8bd35240c8301ac911049618ae35ad5084045dc72658aced371a4af807dc521e830fdafe1cf9b71bc0f1a7a1325
-AUX tpm2-tools-4.1.1-libressl.patch 825 BLAKE2B c6cd9fd6f8aaacd3aa672a31fd727cfae6c64a015e95e2e0fb282b541168a8ad7a45c65186a18651c3bf6d4252de951891b03719c472b0b23639fd1c09729132 SHA512 202aef9a49c9ace31cac0030867c9842c7426e1c11a16c95740fc8818ef83d7e4c7723b09ef372dc8958576f8204f94aa1bd0a8fb7782c6e7b3eb1f37b675cf5
-DIST tpm2-tools-3.1.4.tar.gz 589388 BLAKE2B aaaa9a0158d0658dc2db4734b18ea1d49bd6c0aef84c4f1236f3134245165dccdb0bada69d92f0e5a59ecb1f2973e5cd25924d2b9c4cad2891d9e4f9fb94a84b SHA512 c5e1be4ffab305ee42a8b4a9c9aa4373158259a58844e273465f97a74f913fb12098b9fd81127148be95ecba7378f6a45b96af256dde3101a237e5e33e8e8ccb
-DIST tpm2-tools-4.1.1.tar.gz 779914 BLAKE2B 5b347b00508183cbde407e01454df0a7eb3a8080cb5b8f73d153c4972b38b98ac7c066664b54aeedef03b9bfd97b3cff482dbc44d5f11215af9c3c7754380d75 SHA512 25952cf947f0acd16b1a8dbd3ac8573bce85ff970a7e24c290c4f9cd29418e77a3e48ac82c932fbd250887a9303ab301ff92db594c2fffaba47b873382444d26
-EBUILD tpm2-tools-3.1.4.ebuild 720 BLAKE2B 496847fa7e4159f6ef979582e0f5924c7ee2087b245b7eb271a1527f466daeec997befe10c12be9c00ae1f43de83ec3d94f5411da6ed399bc81080c723badc8c SHA512 a1076e0809cbf374ecaaa6dffe6b3f4c6e2c0b928daefc0b894c2f6d0df2215d2957f5fca5232ce4e11eb7d9f44eb26b6505be1f3b20f0b72c65a1851d5e082f
-EBUILD tpm2-tools-4.1.1.ebuild 729 BLAKE2B 8c0fe6c6a4592db23e60b40305687f3a3dc8b3bdebefddb6c0c29466c9d727500a8f4377d169970d8c79a6bf844d6facd510bbb9914c9f74b74c4793ed4f333c SHA512 c525f61453f097becb19cfd013231ef0eca394381dadf5649a16da0d657a6200d7bab62db8da31c1bf7a9c517e84fb1e12bb443eec08508da711a3e9207653b6
-MISC metadata.xml 458 BLAKE2B 74440e0ad0ec6ee767ed199a4852cb113ba0ff8a721b3239e1520e3b3ab60049755a27e6bf11e0c374a0167e6902247cac05be95d09cbb25d0317f7e09846406 SHA512 7d29bd3b94ab72846cc99b5ea427b607ccff1671097769721e242dd6b555872fa9c8869a5a3ad75a312f9415a59f58a801cba0a22c6542dd9e4a2ded1d3b1f79
+AUX tpm2-tools-4.2-libressl.patch 825 BLAKE2B c6cd9fd6f8aaacd3aa672a31fd727cfae6c64a015e95e2e0fb282b541168a8ad7a45c65186a18651c3bf6d4252de951891b03719c472b0b23639fd1c09729132 SHA512 202aef9a49c9ace31cac0030867c9842c7426e1c11a16c95740fc8818ef83d7e4c7723b09ef372dc8958576f8204f94aa1bd0a8fb7782c6e7b3eb1f37b675cf5
+DIST tpm2-tools-4.2.tar.gz 889062 BLAKE2B 434b88e90f953785e57a9e9f18d717c8b6632206dabfc7478ae866e245eadf032ec4f26bb9597d04ea887bc23a8096d7e6fc2748b0e96806cb2989fd7edf9071 SHA512 7aaf549dd77307e5ad93d4b34737d684c8a7384996143124f10b188f5e99860940902cee83538e6957997859420dd430d6d27979b223beae515aab94ac8fb235
+EBUILD tpm2-tools-4.2.ebuild 930 BLAKE2B 45b35129e0551cedd898d62118a11cb93bbd44fedcf02a76579e890e6c0eebb6b89b4045e6f2ca9a7a98495ea58771e83755e6997c483e4491644a5d435ca682 SHA512 17145939f7dab63047a6ee355be78198abbdd172defb18be2d77d17574d64d3c879c45261a3546d8c804dbe57fab38aea7ac8938dbca6dbed52952e39db067b0
+MISC metadata.xml 525 BLAKE2B 5fa89e3cfb69fe00abe745690aafc6e45b8394e1673521049ae2bb834454f3100ef65d4080010c4fed7265bcd6c9dd6cb9015a159674bb71622646d5dd5dd57b SHA512 533cc4a3dc31600a948c931d144eeee3cdb265286677966ed7bf26953deec79f1c9e0c2c7152e1a5ef3bc067bbc3d88a7ae0678b9395be3a7b01d76976a9a4d9
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-3.1.3-libressl.patch b/app-crypt/tpm2-tools/files/tpm2-tools-3.1.3-libressl.patch
deleted file mode 100644
index 7c26d6e14f8c..000000000000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-3.1.3-libressl.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From a3447989483e09638e6ebeab7eabe6273aa5f3db Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Fri, 4 Jan 2019 10:33:15 +0200
-Subject: [PATCH] build: fixup libressl support and add libressl-2.7
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
-Backport: 5d4cc4ee
----
- lib/conversion.c |  6 +++++-
- lib/tpm_kdfa.c   | 10 +++++++---
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/lib/conversion.c b/lib/conversion.c
-index ce0f5b3..f55af6f 100644
---- a/lib/conversion.c
-+++ b/lib/conversion.c
-@@ -45,6 +45,10 @@
- #include "tpm2_alg_util.h"
- #include "tpm2_util.h"
- 
-+#if (OPENSSL_VERSION_NUMBER < 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) /* OpenSSL 1.1.0 */
-+#define LIB_TPM2_OPENSSL_OPENSSL_PRE11
-+#endif
-+
- static bool tpm2_convert_pubkey_ssl(TPMT_PUBLIC *public, pubkey_format format, const char *path);
- 
- pubkey_format tpm2_parse_pubkey_format(const char *label) {
-@@ -134,7 +138,7 @@ static bool tpm2_convert_pubkey_ssl(TPMT_PUBLIC *public, pubkey_format format, c
-         goto error;
-     }
- 
--#if OPENSSL_VERSION_NUMBER < 0x1010000fL /* OpenSSL 1.1.0 */
-+#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11)
-     ssl_rsa_key->e = e;
-     ssl_rsa_key->n = n;
- #else
-diff --git a/lib/tpm_kdfa.c b/lib/tpm_kdfa.c
-index 3d1ed50..fc03af8 100644
---- a/lib/tpm_kdfa.c
-+++ b/lib/tpm_kdfa.c
-@@ -34,6 +34,10 @@
- #include "log.h"
- #include "tpm2_util.h"
- 
-+#if (OPENSSL_VERSION_NUMBER < 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) /* OpenSSL 1.1.0 */
-+#define LIB_TPM2_OPENSSL_OPENSSL_PRE11
-+#endif
-+
- static const EVP_MD *tpm_algorithm_to_openssl_digest(TPMI_ALG_HASH algorithm) {
- 
-     switch(algorithm) {
-@@ -54,7 +58,7 @@ static const EVP_MD *tpm_algorithm_to_openssl_digest(TPMI_ALG_HASH algorithm) {
- static HMAC_CTX *hmac_alloc()
- {
-     HMAC_CTX *ctx;
--#if OPENSSL_VERSION_NUMBER < 0x1010000fL /* OpenSSL 1.1.0 */
-+#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11)
-     ctx = malloc(sizeof(*ctx));
- #else
-     ctx = HMAC_CTX_new();
-@@ -62,7 +66,7 @@ static HMAC_CTX *hmac_alloc()
-     if (!ctx)
-         return NULL;
- 
--#if OPENSSL_VERSION_NUMBER < 0x1010000fL
-+#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11)
-     HMAC_CTX_init(ctx);
- #endif
- 
-@@ -71,7 +75,7 @@ static HMAC_CTX *hmac_alloc()
- 
- static void hmac_del(HMAC_CTX *ctx)
- {
--#if OPENSSL_VERSION_NUMBER < 0x1010000fL
-+#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11)
-     HMAC_CTX_cleanup(ctx);
-     free(ctx);
- #else
--- 
-2.19.2
-
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-4.1.1-libressl.patch b/app-crypt/tpm2-tools/files/tpm2-tools-4.2-libressl.patch
index 2f39db3283c3..2f39db3283c3 100644
--- a/app-crypt/tpm2-tools/files/tpm2-tools-4.1.1-libressl.patch
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-4.2-libressl.patch
diff --git a/app-crypt/tpm2-tools/metadata.xml b/app-crypt/tpm2-tools/metadata.xml
index b28056e87941..26b4dcbaf517 100644
--- a/app-crypt/tpm2-tools/metadata.xml
+++ b/app-crypt/tpm2-tools/metadata.xml
@@ -9,6 +9,9 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="fapi">Enable feature API tools</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">tpm2-software/tpm2-tools</remote-id>
 	</upstream>
diff --git a/app-crypt/tpm2-tools/tpm2-tools-3.1.4.ebuild b/app-crypt/tpm2-tools/tpm2-tools-3.1.4.ebuild
deleted file mode 100644
index 2e1a75c96bbf..000000000000
--- a/app-crypt/tpm2-tools/tpm2-tools-3.1.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libressl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-crypt/tpm2-tss-2.0:=
-	net-misc/curl:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.1.3-libressl.patch"
-)
-
-src_configure() {
-	econf \
-		--disable-hardening \
-		$(use_enable test unit)
-}
diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.1.1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-4.2.ebuild
index a2ad7f1f2dcc..f791854a95a5 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-4.1.1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.2.ebuild
@@ -10,23 +10,25 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libressl test"
-RESTRICT="!test? ( test )"
+IUSE="+fapi libressl"
 
-RDEPEND=">=app-crypt/tpm2-tss-2.3.1:=
-	net-misc/curl:=
+# Integration test are now run as part of the testing suite, which will fail
+# because none of the supported TPM emulators are in Portage. In a future
+# version of tpm2-tools, swtpm will be supported and the tests can be run.
+RESTRICT="test"
+
+RDEPEND="net-misc/curl:=
+	fapi? ( >=app-crypt/tpm2-tss-2.4.0:=[fapi?] )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cmocka )"
+DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
-
 PATCHES=(
 	"${FILESDIR}/${P}-libressl.patch"
 )
 
 src_configure() {
 	econf \
-		$(use_enable !libressl hardening) \
-		$(use_enable test unit)
+		$(use_enable fapi) \
+		$(use_enable !libressl hardening)
 }