commit: 3ea12f993b67f45c05a4fb35db9c0d5f0387ea76 Author: Salah Coronya <salah.coronya <AT> gmail <DOT> com> AuthorDate: Sat Apr 11 04:25:42 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Wed May 13 13:16:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ea12f99
app-crypt/tpm2-tools: Remove old Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Salah Coronya <salah.coronya <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/15311 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> app-crypt/tpm2-tools/Manifest | 2 - .../files/tpm2-tools-3.1.3-libressl.patch | 81 ---------------------- .../files/tpm2-tools-4.1.1-libressl.patch | 26 ------- app-crypt/tpm2-tools/tpm2-tools-3.1.4.ebuild | 32 --------- app-crypt/tpm2-tools/tpm2-tools-4.1.1.ebuild | 32 --------- 5 files changed, 173 deletions(-) diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest index 27bb8e1ebee..eb3869a2746 100644 --- a/app-crypt/tpm2-tools/Manifest +++ b/app-crypt/tpm2-tools/Manifest @@ -1,3 +1 @@ -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 DIST tpm2-tools-4.2.tar.gz 889062 BLAKE2B 434b88e90f953785e57a9e9f18d717c8b6632206dabfc7478ae866e245eadf032ec4f26bb9597d04ea887bc23a8096d7e6fc2748b0e96806cb2989fd7edf9071 SHA512 7aaf549dd77307e5ad93d4b34737d684c8a7384996143124f10b188f5e99860940902cee83538e6957997859420dd430d6d27979b223beae515aab94ac8fb235 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 7c26d6e14f8..00000000000 --- 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 <[email protected]> -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 <[email protected]> -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.1.1-libressl.patch deleted file mode 100644 index 2f39db3283c..00000000000 --- a/app-crypt/tpm2-tools/files/tpm2-tools-4.1.1-libressl.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a1ac2ee0c6592e6f730458c03a2abd1532c66046 Mon Sep 17 00:00:00 2001 -From: Salah Coronya <[email protected]> -Date: Sun, 12 Jan 2020 19:17:48 -0600 -Subject: [PATCH] lib/tpm2_openssl.c: Fix build for libressl - -Signed-off-by: Salah Coronya <[email protected]> ---- - lib/tpm2_openssl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/tpm2_openssl.c b/lib/tpm2_openssl.c -index 505dd7a0..fd3861d9 100644 ---- a/lib/tpm2_openssl.c -+++ b/lib/tpm2_openssl.c -@@ -14,7 +14,7 @@ - #include "tpm2_openssl.h" - - /* compatibility function for OpenSSL versions < 1.1.0 */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - static int BN_bn2binpad(const BIGNUM *a, unsigned char *to, int tolen) { - int r; - int topad; --- -2.24.1 - 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 2e1a75c96bb..00000000000 --- 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.1.1.ebuild deleted file mode 100644 index a2ad7f1f2dc..00000000000 --- a/app-crypt/tpm2-tools/tpm2-tools-4.1.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 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.3.1:= - net-misc/curl:= - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= )" -DEPEND="${RDEPEND} - test? ( dev-util/cmocka )" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${P}-libressl.patch" -) - -src_configure() { - econf \ - $(use_enable !libressl hardening) \ - $(use_enable test unit) -}
