diff options
Diffstat (limited to 'app-crypt/tpm2-tools')
| -rw-r--r-- | app-crypt/tpm2-tools/Manifest | 5 | ||||
| -rw-r--r-- | app-crypt/tpm2-tools/files/tpm2-tools-4.1.1-libressl.patch | 26 | ||||
| -rw-r--r-- | app-crypt/tpm2-tools/metadata.xml | 9 | ||||
| -rw-r--r-- | app-crypt/tpm2-tools/tpm2-tools-4.1.1.ebuild | 32 |
4 files changed, 70 insertions, 2 deletions
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest index 666901454dd2..a411def2a4ae 100644 --- a/app-crypt/tpm2-tools/Manifest +++ b/app-crypt/tpm2-tools/Manifest @@ -1,4 +1,7 @@ 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 -MISC metadata.xml 256 BLAKE2B 471e60418669580a7ce88f03ff1ad8243c73ab7829ea0ba1701ce1de665c49a06914cb466832681d616240835dcba2d6059dfd4786374150a9379a4f365b6e5b SHA512 e8d9bb2aa327e85ef4df414e504633815b18b74a5ba11a9943b6e6870ad76392af0fa85344ec0e6cfbd2a1b5cecef32a6330e742249064cbb34d04c5140e33b3 +EBUILD tpm2-tools-4.1.1.ebuild 729 BLAKE2B 8c0fe6c6a4592db23e60b40305687f3a3dc8b3bdebefddb6c0c29466c9d727500a8f4377d169970d8c79a6bf844d6facd510bbb9914c9f74b74c4793ed4f333c SHA512 c525f61453f097becb19cfd013231ef0eca394381dadf5649a16da0d657a6200d7bab62db8da31c1bf7a9c517e84fb1e12bb443eec08508da711a3e9207653b6 +MISC metadata.xml 458 BLAKE2B 74440e0ad0ec6ee767ed199a4852cb113ba0ff8a721b3239e1520e3b3ab60049755a27e6bf11e0c374a0167e6902247cac05be95d09cbb25d0317f7e09846406 SHA512 7d29bd3b94ab72846cc99b5ea427b607ccff1671097769721e242dd6b555872fa9c8869a5a3ad75a312f9415a59f58a801cba0a22c6542dd9e4a2ded1d3b1f79 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 000000000000..2f39db3283c3 --- /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 <salah.coronya@gmail.com> +Date: Sun, 12 Jan 2020 19:17:48 -0600 +Subject: [PATCH] lib/tpm2_openssl.c: Fix build for libressl + +Signed-off-by: Salah Coronya <salah.coronya@gmail.com> +--- + 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 42a8d7b7aea8..b28056e87941 100644 --- a/app-crypt/tpm2-tools/metadata.xml +++ b/app-crypt/tpm2-tools/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>salah.coronya@gmail.com</email> + <name>Salah Coronya</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <remote-id type="github">tpm2-software/tpm2-tools</remote-id> </upstream> 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 000000000000..a2ad7f1f2dcc --- /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) +} |