commit: e3f888a442e6edcc605f7c02f4ffb09c41e23f46 Author: Salah Coronya <salah.coronya <AT> gmail <DOT> com> AuthorDate: Thu Feb 20 02:06:06 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Wed Feb 26 16:17:24 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3f888a4
app-crypt/tpm2-tools: Bump version to 4.1.1 Closes: https://bugs.gentoo.org/694988 Package-Manager: Portage-2.3.79, Repoman-2.3.16 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 + .../files/tpm2-tools-4.1.1-libressl.patch | 26 ++++++++++++++++++ app-crypt/tpm2-tools/tpm2-tools-4.1.1.ebuild | 32 ++++++++++++++++++++++ 3 files changed, 59 insertions(+) diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest index fe23dab9fc3..5c398b78b3c 100644 --- a/app-crypt/tpm2-tools/Manifest +++ b/app-crypt/tpm2-tools/Manifest @@ -1 +1,2 @@ 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 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 new file mode 100644 index 00000000000..2f39db3283c --- /dev/null +++ b/app-crypt/tpm2-tools/files/tpm2-tools-4.1.1-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/tpm2-tools-4.1.1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-4.1.1.ebuild new file mode 100644 index 00000000000..a2ad7f1f2dc --- /dev/null +++ b/app-crypt/tpm2-tools/tpm2-tools-4.1.1.ebuild @@ -0,0 +1,32 @@ +# 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) +}
