* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/, app-crypt/tpm2-tools/files/
@ 2019-01-04 8:37 Alon Bar-Lev
0 siblings, 0 replies; 11+ messages in thread
From: Alon Bar-Lev @ 2019-01-04 8:37 UTC (permalink / raw
To: gentoo-commits
commit: a66b106e25440d56b008371c60cb347c6fc62fe7
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 4 08:36:03 2019 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Fri Jan 4 08:37:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a66b106e
app-crypt/tpm2-tools: fix libressl support
Closes: https://bugs.gentoo.org/show_bug.cgi?id=674158
Thanks: Toralf Förster
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../files/tpm2-tools-3.1.3-libressl.patch | 81 ++++++++++++++++++++++
app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild | 6 +-
2 files changed, 86 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000000..7c26d6e14f8
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-3.1.3-libressl.patch
@@ -0,0 +1,81 @@
+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/tpm2-tools-3.1.3.ebuild b/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild
index a23c0b4d9a6..df27445aa2b 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,6 +20,10 @@ DEPEND="${RDEPEND}
test? ( dev-util/cmocka )"
BDEPEND="virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}/${P}-libressl.patch"
+)
+
src_configure() {
econf \
--disable-hardening \
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/, app-crypt/tpm2-tools/files/
@ 2020-02-26 16:17 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2020-02-26 16:17 UTC (permalink / raw
To: gentoo-commits
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 <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/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)
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/, app-crypt/tpm2-tools/files/
@ 2020-05-13 13:17 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2020-05-13 13:17 UTC (permalink / raw
To: gentoo-commits
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 <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 b28056e8794..26b4dcbaf51 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-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)
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/, app-crypt/tpm2-tools/files/
@ 2020-05-13 13:17 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2020-05-13 13:17 UTC (permalink / raw
To: gentoo-commits
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 <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.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 <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/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)
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/, app-crypt/tpm2-tools/files/
@ 2020-10-08 6:57 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2020-10-08 6:57 UTC (permalink / raw
To: gentoo-commits
commit: 9eb6f4ebf5710b1979b864e81c8d191b7f113ffd
Author: Salah Coronya <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Wed Sep 9 22:22:52 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Oct 8 06:43:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eb6f4eb
app-crypt/tpm2-tools: Bump to 4.3.0
Closes: https://bugs.gentoo.org/744436
Package-Manager: Portage-3.0.4, Repoman-3.0.1
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.3.0-Remove-WError.patch | 12 +++++++
app-crypt/tpm2-tools/tpm2-tools-4.3.0.ebuild | 42 ++++++++++++++++++++++
3 files changed, 55 insertions(+)
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index bb9cff37586..78b6b400522 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1 +1,2 @@
DIST tpm2-tools-4.2.1.tar.gz 879294 BLAKE2B 7619f72f0fe39360f111822b4ec7a0bb90156f295977115c4612efac33059dd786abfa5d5f46a8fcc134fce11d099b03cb7f9ee01aa3addf5a3bb2455e1eb2d4 SHA512 4da103e70880d72a9aa402dea39ea439a0657729af22f08ac7275022c475ab46cb3dd6123d6846669d9b7f8f9af7b3e3df7c3b1d33cd0149b649b7941c84c339
+DIST tpm2-tools-4.3.0.tar.gz 881544 BLAKE2B 0415f30845658e84e97a964abebc3082e45fb880c10bec405cd89c7bfa373ace10b669c4af78e7e47f2d2bb62fc7cc34b2e54e392a95c8f9b8956b8c92af6aee SHA512 4e622bbc8642ba7fd93a7343900560fe3779cba03e363d16f391fc8929724a11913d238e3986de06982cbced27c3c2ca8c7e73d75796407b8646c101ccf393a8
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch b/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch
new file mode 100644
index 00000000000..caa3fac23bf
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index 7b5c2196..d07d5433 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -210,7 +210,6 @@ AS_IF([test x"$enable_hardening" != x"no"], [
+
+ add_hardened_c_flag([-Wall])
+ add_hardened_c_flag([-Wextra])
+- add_hardened_c_flag([-Werror])
+
+ add_hardened_c_flag([-Wformat])
+ add_hardened_c_flag([-Wformat-security])
diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.3.0.ebuild b/app-crypt/tpm2-tools/tpm2-tools-4.3.0.ebuild
new file mode 100644
index 00000000000..7ccea9899c4
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+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:=
+ >=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}/${PN}-4.2.1-libressl.patch"
+ "${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
+)
+
+src_prepare() {
+ eautoreconf
+ default
+}
+
+src_configure() {
+ econf \
+ $(use_enable fapi) \
+ $(use_enable !libressl hardening)
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/, app-crypt/tpm2-tools/files/
@ 2021-07-14 6:25 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2021-07-14 6:25 UTC (permalink / raw
To: gentoo-commits
commit: eabdf05da8ad3080e931873efc6833f58d0eed47
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Sat Jul 3 04:02:04 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 06:25:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eabdf05d
app-crypt/tpm2-tools: Enable tests & fix bash completions
Closes: https://bugs.gentoo.org/797685
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../tpm2-tools-5.1.1-fix-tpm-checkquote.patch | 34 +++++++++++
app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild | 69 ++++++++++++++++++++++
2 files changed, 103 insertions(+)
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch
new file mode 100644
index 00000000000..73fb0e3f487
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch
@@ -0,0 +1,34 @@
+From 3d7edb1c70cba6c34c71c9b856c07b8adcebb15c Mon Sep 17 00:00:00 2001
+From: Alberto Planas <aplanas@suse.com>
+Date: Thu, 17 Jun 2021 11:07:25 +0200
+Subject: [PATCH] tpm2_checkquote: fix uninitialized variable
+
+The variable `temp_pcrs` is uninitialized, and later partially
+uninitialized when reading the selection data from file.
+
+When activating lto optimizations, this bug presents itself showing an
+error during the read of the quote:
+
+ERROR: Malformed PCR file, pcr count cannot be greater than 32, got: ...
+
+Fixes: #2767
+
+Co-authored-by: Martin Liska <marxin.liska@gmail.com>
+Signed-off-by: Alberto Planas <aplanas@suse.com>
+---
+ tools/misc/tpm2_checkquote.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/misc/tpm2_checkquote.c b/tools/misc/tpm2_checkquote.c
+index 531508579..8d780f111 100644
+--- a/tools/misc/tpm2_checkquote.c
++++ b/tools/misc/tpm2_checkquote.c
+@@ -376,7 +376,7 @@ static tool_rc init(void) {
+ TPM2B_ATTEST *msg = NULL;
+ TPML_PCR_SELECTION pcr_select;
+ tpm2_pcrs *pcrs;
+- tpm2_pcrs temp_pcrs;
++ tpm2_pcrs temp_pcrs = {};
+ tool_rc return_value = tool_rc_general_error;
+
+ msg = message_from_file(ctx.msg_file_path);
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild
new file mode 100644
index 00000000000..9dde2c97d8e
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+inherit autotools bash-completion-r1 python-single-r1
+
+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 test"
+
+RDEPEND="net-misc/curl:=
+ >=app-crypt/tpm2-tss-3.0.1:=[fapi?]
+ dev-libs/openssl:=
+ ${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+ test? (
+ app-crypt/swtpm
+ app-crypt/tpm2-abrmd
+ app-editors/vim-core
+ dev-util/cmocka
+ dev-python/pyyaml
+ )"
+BDEPEND="virtual/pkgconfig
+ sys-devel/autoconf-archive"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE=" ${PYTHON_REQUIRED_USE} "
+
+# One of the tests fails without this patch. See
+# https://github.com/tpm2-software/tpm2-tools/issues/2767
+PATCHES=(
+ "${FILESDIR}/${PN}-5.1.1-fix-tpm-checkquote.patch"
+)
+
+src_prepare() {
+ sed -i \
+ "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
+ "${S}/configure.ac" || die
+ "${S}/scripts/utils/man_to_bashcompletion.sh"
+ eautoreconf
+ default
+}
+
+src_configure() {
+ econf \
+ $(use_enable fapi) \
+ $(use_enable test unit) \
+ --with-bashcompdir=$(get_bashcompdir) \
+ --enable-hardening
+}
+
+src_install() {
+ default
+
+ mv "${D}/$(get_bashcompdir)/tpm2_completion.bash" \
+ "${D}/$(get_bashcompdir)/tpm2" || die
+ for B in "${D}"/usr/bin/tpm2_*
+ do
+ TPM2_UTILS="${TPM2_UTILS} $(basename ${B})"
+ done
+ bashcomp_alias tpm2 ${TPM2_UTILS}
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/, app-crypt/tpm2-tools/files/
@ 2024-01-20 13:33 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2024-01-20 13:33 UTC (permalink / raw
To: gentoo-commits
commit: 8f5a21555823773364e1c2df95151652b6627dba
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Mon Nov 13 16:06:39 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 13:27:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f5a2155
app-crypt/tpm2-tools: add 5.6
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33930
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-crypt/tpm2-tools/Manifest | 2 +
...Makefile-am-Dont-require-pandoc-for-tests.patch | 15 +++
...og-fix-check-eventlog.sh-if-efivar.h-exis.patch | 123 +++++++++++++++++++++
app-crypt/tpm2-tools/tpm2-tools-5.6.ebuild | 78 +++++++++++++
4 files changed, 218 insertions(+)
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index efbfb742fe01..f9a3d2cb3763 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1 +1,3 @@
DIST tpm2-tools-5.5.tar.gz 1241390 BLAKE2B 2225f9e0835988351f84ed06f914616e25fd65bacaa93b51d0bb04185314efb9a6f60eb3539b250f54b2c2ba590f1b76594df3e625e45c8d37e38d13371bea26 SHA512 24f72a3e9840d531d900e96771a863baae1c71a76fcad0fda8020dff06acd8e3b65b86401ace21f034766403caf9ae97ce710ff6013bb7ed25657a6ecf325470
+DIST tpm2-tools-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch.xz 47916 BLAKE2B 1bbc84f58ad46507417c89be1b4ce2450fb33cf3abe8f080c23890d96be85379f135ef1dbf4b580e1a386fa6d5ebc4fbaab351b5238bbf1011bb97b0f49a847b SHA512 3db0daa39a8dc756d7cb25e3673149dc3eeafd7410f2c6537464431b501e3704a886d9b7a9acd71440d6d419649dd471fd6f9247d593c89a30b05774a8d1b3de
+DIST tpm2-tools-5.6.tar.gz 1266731 BLAKE2B fe88722c26d62128cd6dfbdd8ef2568656a75fe27b1443fed28387d0db1f50b7d0651819d34dfa98acde785b4cfb4e7c11420b110bb5333ed2bb6b67cdd4fc70 SHA512 14216f29ed3ecca5fbe356ed3744c8b6b25a62ff11b2aed596d11101328c8bfd29a02f6ca5a218f9a4477a5e9648c50f0ae96e71de0b4ff5ea1f98ebeeb73cd7
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch
new file mode 100644
index 000000000000..7b6fc8821940
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile.am b/Makefile.am
+index 627983ca..d32f109c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -659,10 +659,3 @@ else
+ endif
+
+ check: prepare-check
+-
+-if !HAVE_PANDOC
+-# If pandoc is not enabled, we want to complain that you need pandoc for make dist,
+-# so hook the target and complain.
+- @(>&2 echo "You do not have pandoc, a requirement for the distribution of manpages")
+- @exit 1
+-endif
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch
new file mode 100644
index 000000000000..f24cf50aff5c
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch
@@ -0,0 +1,123 @@
+From 9cd74df24dbeee81b408e12ac10a98a088008d07 Mon Sep 17 00:00:00 2001
+From: Juergen Repp <juergen_repp@web.de>
+Date: Mon, 20 Nov 2023 13:55:36 +0100
+Subject: [PATCH] test eventlog: fix check eventlog.sh if efivar.h exists
+
+If efivar.h exist a pretty print function for the DevicePath
+is executed. Therefore two yaml test files are needed for
+the bin test file uefiservices.
+Fixes #3302.
+
+Signed-off-by: Juergen Repp <juergen_repp@web.de>
+---
+ Makefile.am | 13 ++++++
+ configure.ac | 3 ++
+ .../event-uefiservices.bin.yaml.pretty | 45 +++++++++++++++++++
+ ...n.yaml => event-uefiservices.bin.yaml.raw} | 0
+ 4 files changed, 61 insertions(+)
+ create mode 100644 test/integration/fixtures/event-uefiservices.bin.yaml.pretty
+ rename test/integration/fixtures/{event-uefiservices.bin.yaml => event-uefiservices.bin.yaml.raw} (100%)
+
+diff --git a/Makefile.am b/Makefile.am
+index 413345cd..ef76dca8 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -352,6 +352,7 @@ TEST_EXTENSIONS = .sh
+
+ check-hook:
+ rm -rf .lock_file
++ rm -f $(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml
+
+ EXTRA_DIST_IGNORE = \
+ .gitignore \
+@@ -647,6 +648,18 @@ dist-hook:
+ for f in $(EXTRA_DIST_IGNORE); do \
+ rm -rf `find $(distdir) -name $$f`; \
+ done;
++
++prepare-check:
++if HAVE_EFIVAR_H
++ cp $(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml.pretty \
++ $(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml
++else
++ cp $(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml.raw \
++ $(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml
++endif
++
++check: prepare-check
++
+ if !HAVE_PANDOC
+ # If pandoc is not enabled, we want to complain that you need pandoc for make dist,
+ # so hook the target and complain.
+diff --git a/configure.ac b/configure.ac
+index 362ae0aa..54224048 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -97,6 +97,9 @@ AS_IF([test "x$with_efivar" == "xauto"],
+ [PKG_CHECK_MODULES([EFIVAR], [efivar], [AC_CHECK_HEADERS([efivar/efivar.h])])],
+ )
+
++AC_CHECK_HEADERS([efivar/efivar.h],[efivar_h=yes ], [efivar = no ])
++AM_CONDITIONAL([HAVE_EFIVAR_H], [test "$efivar_h" = yes])
++
+ # backwards compat with older pkg-config
+ # - pull in AC_DEFUN from pkg.m4
+ m4_ifndef([PKG_CHECK_VAR], [
+diff --git a/test/integration/fixtures/event-uefiservices.bin.yaml.pretty b/test/integration/fixtures/event-uefiservices.bin.yaml.pretty
+new file mode 100644
+index 00000000..f0819f70
+--- /dev/null
++++ b/test/integration/fixtures/event-uefiservices.bin.yaml.pretty
+@@ -0,0 +1,45 @@
++---
++version: 1
++events:
++- EventNum: 0
++ PCRIndex: 0
++ EventType: EV_NO_ACTION
++ Digest: "0000000000000000000000000000000000000000"
++ EventSize: 37
++ SpecID:
++ - Signature: Spec ID Event03
++ platformClass: 0
++ specVersionMinor: 0
++ specVersionMajor: 2
++ specErrata: 0
++ uintnSize: 2
++ numberOfAlgorithms: 2
++ Algorithms:
++ - Algorithm[0]:
++ algorithmId: sha1
++ digestSize: 20
++ - Algorithm[1]:
++ algorithmId: sha256
++ digestSize: 32
++ vendorInfoSize: 0
++- EventNum: 1
++ PCRIndex: 2
++ EventType: EV_EFI_BOOT_SERVICES_DRIVER
++ DigestCount: 2
++ Digests:
++ - AlgorithmId: sha1
++ Digest: "855685b4dbd4b67d50e0594571055054cfe2b1e9"
++ - AlgorithmId: sha256
++ Digest: "dd8576b4ff346c19c56c3e4f97ce55c5afa646f9c669be0a7cdd05057a0ecdf3"
++ EventSize: 84
++ Event:
++ ImageLocationInMemory: 0x7dcf6018
++ ImageLengthInMemory: 171464
++ ImageLinkTimeAddress: 0x0
++ LengthOfDevicePath: 52
++ DevicePath1: 'PciRoot(0x0)/Pci(0x2,0x0)/Pci(0x0,0x0)/Offset(0x12600,0x3c3ff)'
++pcrs:
++ sha1:
++ 2 : 0x5b5f4d5c31664f01670a98a5796a36473671befc
++ sha256:
++ 2 : 0x35fcf9d737c52c971f7c74058d36937dbd7824177fa0f1de3eba3934fcb83b9d
+diff --git a/test/integration/fixtures/event-uefiservices.bin.yaml b/test/integration/fixtures/event-uefiservices.bin.yaml.raw
+similarity index 100%
+rename from test/integration/fixtures/event-uefiservices.bin.yaml
+rename to test/integration/fixtures/event-uefiservices.bin.yaml.raw
+--
+2.41.0
+
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.6.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.6.ebuild
new file mode 100644
index 000000000000..a324ea94a31b
--- /dev/null
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.6.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools bash-completion-r1 flag-o-matic python-any-r1
+
+DESCRIPTION="Tools for the TPM 2.0 TSS"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
+SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/tpm2-tools-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+fapi test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
+ dev-libs/openssl:=
+ net-misc/curl
+ sys-libs/efivar:="
+DEPEND="${RDEPEND}
+ test? (
+ app-crypt/swtpm
+ app-crypt/tpm2-abrmd
+ dev-util/cmocka
+ )"
+BDEPEND="virtual/pkgconfig
+ sys-devel/autoconf-archive
+ test? (
+ app-editors/vim-core
+ dev-tcltk/expect
+ $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+ )
+ ${PYTHON_DEPS}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch"
+ "${WORKDIR}/${PN}-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch"
+ "${FILESDIR}/${PN}-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch"
+)
+
+python_check_deps() {
+ python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # tests fail with LTO enabbled. See bug 865275 and 865277
+ filter-lto
+ econf \
+ $(use_enable fapi) \
+ $(use_enable test unit) \
+ --with-bashcompdir=$(get_bashcompdir) \
+ --enable-hardening
+}
+
+src_install() {
+ default
+ mv "${ED}"/$(get_bashcompdir)/tpm2{_completion.bash,} || die
+ local utils=( "${ED}"/usr/bin/tpm2_* )
+ utils=("${utils[@]##*/}")
+ # these utiltites don't have bash completions
+ local nobashcomp=( tpm2_encodeobject tpm2_getpolicydigest tpm2_sessionconfig )
+ mapfile -d $'\0' -t utils < <(printf '%s\0' "${utils[@]}" | grep -Ezvw "${nobashcomp[@]/#/-e}")
+ bashcomp_alias tpm2 "${utils[@]}"
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/, app-crypt/tpm2-tools/files/
@ 2024-01-21 8:12 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2024-01-21 8:12 UTC (permalink / raw
To: gentoo-commits
commit: 2cff69fec866f90fb9743ebfbae0dec140553e2b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 21 08:11:52 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 08:12:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cff69fe
app-crypt/tpm2-tools: fix bashism in configure
Closes: https://bugs.gentoo.org/922592
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../tpm2-tools/files/tpm2-tools-5.6-bashism.patch | 47 ++++++++++++++++++++++
...2-tools-5.6.ebuild => tpm2-tools-5.6-r1.ebuild} | 1 +
2 files changed, 48 insertions(+)
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-bashism.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-bashism.patch
new file mode 100644
index 000000000000..01ce4301d4e3
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-bashism.patch
@@ -0,0 +1,47 @@
+https://github.com/tpm2-software/tpm2-tools/pull/3339
+
+From 9f244c3f74747b7f79c8c6813657b2f2f8a1c844 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 21 Jan 2024 08:08:28 +0000
+Subject: [PATCH] configure.ac: fix bashisms
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+
+Fixes configure warnings/errors like:
+```
+checking for libcurl... yes
+./configure: 15201: test: xauto: unexpected operator
+./configure: 15286: test: xauto: unexpected operator
+checking for efivar/efivar.h... yes
+```
+
+This fixes a build error later on too:
+```
+/usr/lib/gcc/x86_64-pc-linux-gnu/14/../../../../x86_64-pc-linux-gnu/bin/ld: lib/libcommon.a(libcommon_a-tpm2_eventlog_yaml.o): in function `yaml_devicepath':
+tpm2_eventlog_yaml.c:(.text.yaml_devicepath+0x2f): undefined reference to `efidp_format_device_path'
+/usr/lib/gcc/x86_64-pc-linux-gnu/14/../../../../x86_64-pc-linux-gnu/bin/ld: tpm2_eventlog_yaml.c:(.text.yaml_devicepath+0x61): undefined reference to `efidp_format_device_path'
+```
+
+Bug: https://bugs.gentoo.org/922592
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -94,9 +94,9 @@ AC_ARG_WITH([efivar],
+ )
+
+ # use the true program to avoid failing hard
+-AS_IF([test "x$with_efivar" == "xauto"],
++AS_IF([test "x$with_efivar" = "xauto"],
+ [PKG_CHECK_MODULES([EFIVAR], [efivar], [AC_CHECK_HEADERS([efivar/efivar.h], , [true])], [true])],
+- [test "x$with_efivar" == "xyes"],
++ [test "x$with_efivar" = "xyes"],
+ [PKG_CHECK_MODULES([EFIVAR], [efivar], [AC_CHECK_HEADERS([efivar/efivar.h])])],
+ )
+
+
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.6.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild
similarity index 98%
rename from app-crypt/tpm2-tools/tpm2-tools-5.6.ebuild
rename to app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild
index 3eb1badf0637..04fb5536f1f5 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.6.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild
@@ -41,6 +41,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch"
"${WORKDIR}/${PN}-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch"
"${FILESDIR}/${PN}-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch"
+ "${FILESDIR}/${PN}-5.6-bashism.patch"
)
python_check_deps() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/, app-crypt/tpm2-tools/files/
@ 2024-10-02 1:22 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2024-10-02 1:22 UTC (permalink / raw
To: gentoo-commits
commit: b86b4f7d1520d21fbf77f71ded8eb01988419094
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Tue Oct 1 23:05:09 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 2 01:21:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b86b4f7d
app-crypt/tpm2-tools: Remove requirement for 'which' in tests
Closes: https://bugs.gentoo.org/930088
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...s-5.7-tests-Eliminate-dependency-on-which.patch | 42 ++++++++++++++++++++++
app-crypt/tpm2-tools/tpm2-tools-5.7.ebuild | 1 +
2 files changed, 43 insertions(+)
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.7-tests-Eliminate-dependency-on-which.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.7-tests-Eliminate-dependency-on-which.patch
new file mode 100644
index 000000000000..1872d7d2389e
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-5.7-tests-Eliminate-dependency-on-which.patch
@@ -0,0 +1,42 @@
+From e9af1553f26ebad6e8db14b599dc74bab5663806 Mon Sep 17 00:00:00 2001
+From: Christopher Byrne <salah.coronya@gmail.com>
+Date: Tue, 16 Apr 2024 09:32:30 -0500
+Subject: [PATCH] tests: Eliminate dependency on 'which'
+
+See https://lwn.net/Articles/874049/
+
+Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
+---
+ test/integration/tests/pcrevent.sh | 2 +-
+ test/integration/tests/symlink.sh | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/integration/tests/pcrevent.sh b/test/integration/tests/pcrevent.sh
+index 5484cfbe..d7166789 100644
+--- a/test/integration/tests/pcrevent.sh
++++ b/test/integration/tests/pcrevent.sh
+@@ -44,7 +44,7 @@ yaml_verify $hash_out_file
+ while IFS='' read -r l || [[ -n "$l" ]]; do
+
+ alg=`echo -n $l | cut -d\: -f 1-1`
+- if ! which "$alg"sum >/dev/null 2>&1; then
++ if ! command -v "$alg"sum >/dev/null 2>&1; then
+ echo "Ignore checking $alg algorithm due to unavailable \"${alg}sum\" program"
+ continue
+ fi
+diff --git a/test/integration/tests/symlink.sh b/test/integration/tests/symlink.sh
+index 606e1a1a..f65a7567 100644
+--- a/test/integration/tests/symlink.sh
++++ b/test/integration/tests/symlink.sh
+@@ -17,7 +17,7 @@ start_up
+ # Positive tests:
+ #
+ fail=0
+-TPM2_TOOL="$(which tpm2)"
++TPM2_TOOL="$(command -v tpm2)"
+
+ if [ -z "$TPM2_TOOL" ]; then
+ echo "unable to locate tpm2 tool"
+--
+2.45.2
+
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.7.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.7.ebuild
index 99c2a66f1a7f..aa2d0dcdcc58 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.7.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.7.ebuild
@@ -38,6 +38,7 @@ BDEPEND="virtual/pkgconfig
PATCHES=(
"${FILESDIR}/${PN}-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch"
+ "${FILESDIR}/${PN}-5.7-tests-Eliminate-dependency-on-which.patch"
)
python_check_deps() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/, app-crypt/tpm2-tools/files/
@ 2024-10-02 1:22 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2024-10-02 1:22 UTC (permalink / raw
To: gentoo-commits
commit: 2c0906dc4a92b03518ccc289309873124a3fa76f
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Tue Oct 1 23:10:32 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 2 01:21:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c0906dc
app-crypt/tpm2-tools: drop 5.6.1
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38845
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-crypt/tpm2-tools/Manifest | 2 -
...og-fix-check-eventlog.sh-if-efivar.h-exis.patch | 123 ---------------------
...test-eventlog.sh-Fix-accidental-deletions.patch | 68 ------------
app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild | 87 ---------------
4 files changed, 280 deletions(-)
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index a9e2aab45b83..46c013c241bf 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,3 +1 @@
-DIST tpm2-tools-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch.xz 47916 BLAKE2B 1bbc84f58ad46507417c89be1b4ce2450fb33cf3abe8f080c23890d96be85379f135ef1dbf4b580e1a386fa6d5ebc4fbaab351b5238bbf1011bb97b0f49a847b SHA512 3db0daa39a8dc756d7cb25e3673149dc3eeafd7410f2c6537464431b501e3704a886d9b7a9acd71440d6d419649dd471fd6f9247d593c89a30b05774a8d1b3de
-DIST tpm2-tools-5.6.1.tar.gz 1255474 BLAKE2B 7fda0084283bbd592c3323605f598ebb77ba267ebb900e62b2eff2742257378d95f99b48aab090f80438a6c86f168e1863f9350c18571a23e17eea90a1b9bdd9 SHA512 7a5903db0578a1364c44ca8ac3672c3cae745e2b0ab66ddf6a91fdb75146441af32dfe4ccad6825bea343fea74bed97f9e45bf752594ee56f32e4cb7be2bed33
DIST tpm2-tools-5.7.tar.gz 1339035 BLAKE2B 3984f25176e0b092793a33a0b40b396bc650de989e0b600989d11439cccdf7bc410535c01e1a0e985ab67b36b63eb02d392342aa1746b86727ba22d67d522389 SHA512 629b0b1826815877f452935285f7b3fe0f32bd24fe9130eb169a2dc9b7b254a737797043af9eea68be706b87c32ab2b7189151360c9c00bc5c31dce62a799670
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch
deleted file mode 100644
index f24cf50aff5c..000000000000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 9cd74df24dbeee81b408e12ac10a98a088008d07 Mon Sep 17 00:00:00 2001
-From: Juergen Repp <juergen_repp@web.de>
-Date: Mon, 20 Nov 2023 13:55:36 +0100
-Subject: [PATCH] test eventlog: fix check eventlog.sh if efivar.h exists
-
-If efivar.h exist a pretty print function for the DevicePath
-is executed. Therefore two yaml test files are needed for
-the bin test file uefiservices.
-Fixes #3302.
-
-Signed-off-by: Juergen Repp <juergen_repp@web.de>
----
- Makefile.am | 13 ++++++
- configure.ac | 3 ++
- .../event-uefiservices.bin.yaml.pretty | 45 +++++++++++++++++++
- ...n.yaml => event-uefiservices.bin.yaml.raw} | 0
- 4 files changed, 61 insertions(+)
- create mode 100644 test/integration/fixtures/event-uefiservices.bin.yaml.pretty
- rename test/integration/fixtures/{event-uefiservices.bin.yaml => event-uefiservices.bin.yaml.raw} (100%)
-
-diff --git a/Makefile.am b/Makefile.am
-index 413345cd..ef76dca8 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -352,6 +352,7 @@ TEST_EXTENSIONS = .sh
-
- check-hook:
- rm -rf .lock_file
-+ rm -f $(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml
-
- EXTRA_DIST_IGNORE = \
- .gitignore \
-@@ -647,6 +648,18 @@ dist-hook:
- for f in $(EXTRA_DIST_IGNORE); do \
- rm -rf `find $(distdir) -name $$f`; \
- done;
-+
-+prepare-check:
-+if HAVE_EFIVAR_H
-+ cp $(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml.pretty \
-+ $(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml
-+else
-+ cp $(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml.raw \
-+ $(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml
-+endif
-+
-+check: prepare-check
-+
- if !HAVE_PANDOC
- # If pandoc is not enabled, we want to complain that you need pandoc for make dist,
- # so hook the target and complain.
-diff --git a/configure.ac b/configure.ac
-index 362ae0aa..54224048 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -97,6 +97,9 @@ AS_IF([test "x$with_efivar" == "xauto"],
- [PKG_CHECK_MODULES([EFIVAR], [efivar], [AC_CHECK_HEADERS([efivar/efivar.h])])],
- )
-
-+AC_CHECK_HEADERS([efivar/efivar.h],[efivar_h=yes ], [efivar = no ])
-+AM_CONDITIONAL([HAVE_EFIVAR_H], [test "$efivar_h" = yes])
-+
- # backwards compat with older pkg-config
- # - pull in AC_DEFUN from pkg.m4
- m4_ifndef([PKG_CHECK_VAR], [
-diff --git a/test/integration/fixtures/event-uefiservices.bin.yaml.pretty b/test/integration/fixtures/event-uefiservices.bin.yaml.pretty
-new file mode 100644
-index 00000000..f0819f70
---- /dev/null
-+++ b/test/integration/fixtures/event-uefiservices.bin.yaml.pretty
-@@ -0,0 +1,45 @@
-+---
-+version: 1
-+events:
-+- EventNum: 0
-+ PCRIndex: 0
-+ EventType: EV_NO_ACTION
-+ Digest: "0000000000000000000000000000000000000000"
-+ EventSize: 37
-+ SpecID:
-+ - Signature: Spec ID Event03
-+ platformClass: 0
-+ specVersionMinor: 0
-+ specVersionMajor: 2
-+ specErrata: 0
-+ uintnSize: 2
-+ numberOfAlgorithms: 2
-+ Algorithms:
-+ - Algorithm[0]:
-+ algorithmId: sha1
-+ digestSize: 20
-+ - Algorithm[1]:
-+ algorithmId: sha256
-+ digestSize: 32
-+ vendorInfoSize: 0
-+- EventNum: 1
-+ PCRIndex: 2
-+ EventType: EV_EFI_BOOT_SERVICES_DRIVER
-+ DigestCount: 2
-+ Digests:
-+ - AlgorithmId: sha1
-+ Digest: "855685b4dbd4b67d50e0594571055054cfe2b1e9"
-+ - AlgorithmId: sha256
-+ Digest: "dd8576b4ff346c19c56c3e4f97ce55c5afa646f9c669be0a7cdd05057a0ecdf3"
-+ EventSize: 84
-+ Event:
-+ ImageLocationInMemory: 0x7dcf6018
-+ ImageLengthInMemory: 171464
-+ ImageLinkTimeAddress: 0x0
-+ LengthOfDevicePath: 52
-+ DevicePath1: 'PciRoot(0x0)/Pci(0x2,0x0)/Pci(0x0,0x0)/Offset(0x12600,0x3c3ff)'
-+pcrs:
-+ sha1:
-+ 2 : 0x5b5f4d5c31664f01670a98a5796a36473671befc
-+ sha256:
-+ 2 : 0x35fcf9d737c52c971f7c74058d36937dbd7824177fa0f1de3eba3934fcb83b9d
-diff --git a/test/integration/fixtures/event-uefiservices.bin.yaml b/test/integration/fixtures/event-uefiservices.bin.yaml.raw
-similarity index 100%
-rename from test/integration/fixtures/event-uefiservices.bin.yaml
-rename to test/integration/fixtures/event-uefiservices.bin.yaml.raw
---
-2.41.0
-
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog.sh-Fix-accidental-deletions.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog.sh-Fix-accidental-deletions.patch
deleted file mode 100644
index 7274ee40827a..000000000000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog.sh-Fix-accidental-deletions.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 4dec5295361d753c3466bc9e8b0ae3a3cc58dff5 Mon Sep 17 00:00:00 2001
-From: Juergen Repp <juergen_repp@web.de>
-Date: Thu, 4 Apr 2024 09:42:51 +0200
-Subject: [PATCH] test eventlog.sh Fix accidental deletions.
-
-* Accidental deletions made in commit 196e3d439407e81040ced054a8ed302489348a9d
- are undone.
-* python3 is used as default instead of python.
-
-Signed-off-by: Juergen Repp <juergen_repp@web.de>
----
- test/integration/tests/eventlog.sh | 33 ++++++++++++++++++++++++++++--
- 1 file changed, 31 insertions(+), 2 deletions(-)
-
-diff --git a/test/integration/tests/eventlog.sh b/test/integration/tests/eventlog.sh
-index 9d5290f0..e7c13706 100755
---- a/test/integration/tests/eventlog.sh
-+++ b/test/integration/tests/eventlog.sh
-@@ -3,7 +3,7 @@
- set -E
- shopt -s expand_aliases
-
--alias python=${PYTHON-python}
-+alias python=${PYTHON-python3}
-
- yaml_validate() {
- cmd=$1
-@@ -88,7 +88,36 @@ expect_pass() {
- expect_fail
- expect_fail foo
- expect_fail foo bar
--expect_fail ${srcdir}/test/integration/fix
-+expect_fail ${srcdir}/test/integration/fixtures/event-bad.bin
-+
-+expect_pass ${srcdir}/test/integration/fixtures/specid-vendordata.bin
-+expect_pass ${srcdir}/test/integration/fixtures/event.bin
-+expect_pass ${srcdir}/test/integration/fixtures/event-uefivar.bin
-+expect_pass ${srcdir}/test/integration/fixtures/event-uefiaction.bin
-+expect_pass ${srcdir}/test/integration/fixtures/event-uefiservices.bin
-+expect_pass ${srcdir}/test/integration/fixtures/event-uefi-sha1-log.bin
-+expect_pass ${srcdir}/test/integration/fixtures/event-bootorder.bin
-+expect_pass ${srcdir}/test/integration/fixtures/event-postcode.bin
-+
-+# Make sure that --eventlog-version=2 works on complete TPM2 logs
-+expect_pass ${srcdir}/test/integration/fixtures/event-arch-linux.bin --eventlog-version=2
-+expect_pass ${srcdir}/test/integration/fixtures/event-gce-ubuntu-2104-log.bin --eventlog-version=2
-+expect_pass ${srcdir}/test/integration/fixtures/event-sd-boot-fedora37.bin --eventlog-version=2
-+expect_pass ${srcdir}/test/integration/fixtures/event-moklisttrusted.bin --eventlog-version=2
-+
-+# Pick an event with leading whitespace and validate we have
-+# preserved it correctly after parsing the YAML
-+event=$(yaml_validate "print(y['events'][80]['Event']['String'])" < ${srcdir}/test/integration/fixtures/event-moklisttrusted.bin.yaml | tr -d '\0')
-+expect=$(echo -e "grub_cmd: menuentry UEFI Firmware Settings --id uefi-firmware {\n\t\tfwsetup\n\t}")
-+if test "$event" != "$expect"
-+then
-+ echo "Got $event"
-+ echo "Want $expect"
-+ exit 1
-+fi
-+
-+# Compare strings generated by tpm2_eventlog with binary data of the corresponding
-+# events.
- hex_file="${srcdir}/test/integration/fixtures/event-moklisttrusted-hex.yaml"
- tool_file="${srcdir}/test/integration/fixtures/event-moklisttrusted.bin.yaml"
-
---
-2.43.2
-
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
deleted file mode 100644
index d66c553ca767..000000000000
--- a/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools bash-completion-r1 flag-o-matic python-any-r1
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
-SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/tpm2-tools-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="+fapi test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
- dev-libs/openssl:=
- net-misc/curl
- sys-libs/efivar:="
-DEPEND="${RDEPEND}
- test? (
- app-crypt/swtpm
- app-crypt/tpm2-abrmd
- dev-util/cmocka
- )"
-BDEPEND="virtual/pkgconfig
- dev-build/autoconf-archive
- test? (
- app-editors/vim-core
- dev-tcltk/expect
- $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
- )
- ${PYTHON_DEPS}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch"
- "${WORKDIR}/${PN}-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch"
- "${FILESDIR}/${PN}-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch"
- "${FILESDIR}/${PN}-5.6-test-eventlog.sh-Fix-accidental-deletions.patch"
-)
-
-python_check_deps() {
- python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # tests fail with LTO enabbled. See bug 865275 and 865277
- filter-lto
- econf \
- $(use_enable fapi) \
- $(use_enable test unit) \
- --with-bashcompdir=$(get_bashcompdir) \
- --enable-hardening
-}
-
-src_install() {
- default
- mv "${ED}"/$(get_bashcompdir)/tpm2{_completion.bash,} || die
- local utils=( "${ED}"/usr/bin/tpm2_* )
- utils=("${utils[@]##*/}")
- # these utiltites don't have bash completions
- local nobashcomp=( tpm2_encodeobject tpm2_getpolicydigest\
- tpm2_sessionconfig tpm2_tr_encode)
- mapfile -d $'\0' -t utils < <(printf '%s\0' "${utils[@]}" | grep -Ezvw "${nobashcomp[@]/#/-e}")
- bashcomp_alias tpm2 "${utils[@]}"
-}
-
-src_test() {
-# This hook doesn't get invoked consisently, so call it manually
-# else one of the tests will fail
- emake prepare-check
- default
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/, app-crypt/tpm2-tools/files/
@ 2024-10-02 1:22 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2024-10-02 1:22 UTC (permalink / raw
To: gentoo-commits
commit: b200184022967a83c1f289f50039010723c05bcc
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Tue Oct 1 23:09:11 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 2 01:21:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2001840
app-crypt/tpm2-tools: drop 5.6-r1
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-crypt/tpm2-tools/Manifest | 1 -
.../tpm2-tools/files/tpm2-tools-5.6-bashism.patch | 47 -------------
app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild | 81 ----------------------
3 files changed, 129 deletions(-)
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index bfd53a735d4b..a9e2aab45b83 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,4 +1,3 @@
DIST tpm2-tools-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch.xz 47916 BLAKE2B 1bbc84f58ad46507417c89be1b4ce2450fb33cf3abe8f080c23890d96be85379f135ef1dbf4b580e1a386fa6d5ebc4fbaab351b5238bbf1011bb97b0f49a847b SHA512 3db0daa39a8dc756d7cb25e3673149dc3eeafd7410f2c6537464431b501e3704a886d9b7a9acd71440d6d419649dd471fd6f9247d593c89a30b05774a8d1b3de
DIST tpm2-tools-5.6.1.tar.gz 1255474 BLAKE2B 7fda0084283bbd592c3323605f598ebb77ba267ebb900e62b2eff2742257378d95f99b48aab090f80438a6c86f168e1863f9350c18571a23e17eea90a1b9bdd9 SHA512 7a5903db0578a1364c44ca8ac3672c3cae745e2b0ab66ddf6a91fdb75146441af32dfe4ccad6825bea343fea74bed97f9e45bf752594ee56f32e4cb7be2bed33
-DIST tpm2-tools-5.6.tar.gz 1266731 BLAKE2B fe88722c26d62128cd6dfbdd8ef2568656a75fe27b1443fed28387d0db1f50b7d0651819d34dfa98acde785b4cfb4e7c11420b110bb5333ed2bb6b67cdd4fc70 SHA512 14216f29ed3ecca5fbe356ed3744c8b6b25a62ff11b2aed596d11101328c8bfd29a02f6ca5a218f9a4477a5e9648c50f0ae96e71de0b4ff5ea1f98ebeeb73cd7
DIST tpm2-tools-5.7.tar.gz 1339035 BLAKE2B 3984f25176e0b092793a33a0b40b396bc650de989e0b600989d11439cccdf7bc410535c01e1a0e985ab67b36b63eb02d392342aa1746b86727ba22d67d522389 SHA512 629b0b1826815877f452935285f7b3fe0f32bd24fe9130eb169a2dc9b7b254a737797043af9eea68be706b87c32ab2b7189151360c9c00bc5c31dce62a799670
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-bashism.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-bashism.patch
deleted file mode 100644
index 01ce4301d4e3..000000000000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-bashism.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://github.com/tpm2-software/tpm2-tools/pull/3339
-
-From 9f244c3f74747b7f79c8c6813657b2f2f8a1c844 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 21 Jan 2024 08:08:28 +0000
-Subject: [PATCH] configure.ac: fix bashisms
-
-configure scripts need to be runnable with a POSIX-compliant /bin/sh.
-
-On many (but not all!) systems, /bin/sh is provided by Bash, so errors
-like this aren't spotted. Notably Debian defaults to /bin/sh provided
-by dash which doesn't tolerate such bashisms as '=='.
-
-This retains compatibility with bash.
-
-Fixes configure warnings/errors like:
-```
-checking for libcurl... yes
-./configure: 15201: test: xauto: unexpected operator
-./configure: 15286: test: xauto: unexpected operator
-checking for efivar/efivar.h... yes
-```
-
-This fixes a build error later on too:
-```
-/usr/lib/gcc/x86_64-pc-linux-gnu/14/../../../../x86_64-pc-linux-gnu/bin/ld: lib/libcommon.a(libcommon_a-tpm2_eventlog_yaml.o): in function `yaml_devicepath':
-tpm2_eventlog_yaml.c:(.text.yaml_devicepath+0x2f): undefined reference to `efidp_format_device_path'
-/usr/lib/gcc/x86_64-pc-linux-gnu/14/../../../../x86_64-pc-linux-gnu/bin/ld: tpm2_eventlog_yaml.c:(.text.yaml_devicepath+0x61): undefined reference to `efidp_format_device_path'
-```
-
-Bug: https://bugs.gentoo.org/922592
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -94,9 +94,9 @@ AC_ARG_WITH([efivar],
- )
-
- # use the true program to avoid failing hard
--AS_IF([test "x$with_efivar" == "xauto"],
-+AS_IF([test "x$with_efivar" = "xauto"],
- [PKG_CHECK_MODULES([EFIVAR], [efivar], [AC_CHECK_HEADERS([efivar/efivar.h], , [true])], [true])],
-- [test "x$with_efivar" == "xyes"],
-+ [test "x$with_efivar" = "xyes"],
- [PKG_CHECK_MODULES([EFIVAR], [efivar], [AC_CHECK_HEADERS([efivar/efivar.h])])],
- )
-
-
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild
deleted file mode 100644
index ab59eed9520d..000000000000
--- a/app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools bash-completion-r1 flag-o-matic python-any-r1
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
-SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/tpm2-tools-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+fapi test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
- dev-libs/openssl:=
- net-misc/curl
- sys-libs/efivar:="
-DEPEND="${RDEPEND}
- test? (
- app-crypt/swtpm
- app-crypt/tpm2-abrmd
- dev-util/cmocka
- )"
-BDEPEND="virtual/pkgconfig
- dev-build/autoconf-archive
- test? (
- app-editors/vim-core
- dev-tcltk/expect
- $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
- )
- ${PYTHON_DEPS}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch"
- "${WORKDIR}/${PN}-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch"
- "${FILESDIR}/${PN}-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch"
- "${FILESDIR}/${PN}-5.6-bashism.patch"
- "${FILESDIR}/${PN}-5.6-test-eventlog.sh-Fix-accidental-deletions.patch"
-)
-
-python_check_deps() {
- python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # tests fail with LTO enabbled. See bug 865275 and 865277
- filter-lto
- econf \
- $(use_enable fapi) \
- $(use_enable test unit) \
- --with-bashcompdir=$(get_bashcompdir) \
- --enable-hardening
-}
-
-src_install() {
- default
- mv "${ED}"/$(get_bashcompdir)/tpm2{_completion.bash,} || die
- local utils=( "${ED}"/usr/bin/tpm2_* )
- utils=("${utils[@]##*/}")
- # these utiltites don't have bash completions
- local nobashcomp=( tpm2_encodeobject tpm2_getpolicydigest\
- tpm2_sessionconfig tpm2_tr_encode)
- mapfile -d $'\0' -t utils < <(printf '%s\0' "${utils[@]}" | grep -Ezvw "${nobashcomp[@]/#/-e}")
- bashcomp_alias tpm2 "${utils[@]}"
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-10-02 1:22 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-13 13:17 [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/, app-crypt/tpm2-tools/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2024-10-02 1:22 Sam James
2024-10-02 1:22 Sam James
2024-10-02 1:22 Sam James
2024-01-21 8:12 Sam James
2024-01-20 13:33 Sam James
2021-07-14 6:25 Joonas Niilola
2020-10-08 6:57 Joonas Niilola
2020-05-13 13:17 Joonas Niilola
2020-02-26 16:17 Joonas Niilola
2019-01-04 8:37 Alon Bar-Lev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox