commit: f1b23e789dfc6359d1967a199f48eb44ca2f33ef Author: Salah Coronya <salah.coronya <AT> gmail <DOT> com> AuthorDate: Sat Apr 11 00:43:55 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=f1b23e78
app-crypt/tpm2-tools: Bump to 4.2 Closes: https://bugs.gentoo.org/722018 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Salah Coronya <salah.coronya <AT> gmail.com> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> app-crypt/tpm2-tools/Manifest | 1 + .../tpm2-tools/files/tpm2-tools-4.2-libressl.patch | 26 +++++++++++++++++ app-crypt/tpm2-tools/metadata.xml | 3 ++ app-crypt/tpm2-tools/tpm2-tools-4.2.ebuild | 34 ++++++++++++++++++++++ 4 files changed, 64 insertions(+) diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest index 5c398b78b3c..27bb8e1ebee 100644 --- a/app-crypt/tpm2-tools/Manifest +++ b/app-crypt/tpm2-tools/Manifest @@ -1,2 +1,3 @@ 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-4.2-libressl.patch b/app-crypt/tpm2-tools/files/tpm2-tools-4.2-libressl.patch new file mode 100644 index 00000000000..2f39db3283c --- /dev/null +++ b/app-crypt/tpm2-tools/files/tpm2-tools-4.2-libressl.patch @@ -0,0 +1,26 @@ +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/metadata.xml b/app-crypt/tpm2-tools/metadata.xml index b28056e8794..26b4dcbaf51 100644 --- a/app-crypt/tpm2-tools/metadata.xml +++ b/app-crypt/tpm2-tools/metadata.xml @@ -9,6 +9,9 @@ <email>[email protected]</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-4.2.ebuild b/app-crypt/tpm2-tools/tpm2-tools-4.2.ebuild new file mode 100644 index 00000000000..f791854a95a --- /dev/null +++ b/app-crypt/tpm2-tools/tpm2-tools-4.2.ebuild @@ -0,0 +1,34 @@ +# 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="+fapi libressl" + +# 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}" +BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}/${P}-libressl.patch" +) + +src_configure() { + econf \ + $(use_enable fapi) \ + $(use_enable !libressl hardening) +}
