From 785047acce64d1217286105397cc6fe433c34cb3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Sep 2023 16:33:39 +0100 Subject: gentoo auto-resync : 09:09:2023 - 16:33:38 --- .../tpm2-tools-5.1.1-no-efivar-automagic.patch | 34 ---------------------- ...testparms-fix-condition-for-negative-test.patch | 33 --------------------- 2 files changed, 67 deletions(-) delete mode 100644 app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-no-efivar-automagic.patch delete mode 100644 app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch (limited to 'app-crypt/tpm2-tools/files') diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-no-efivar-automagic.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-no-efivar-automagic.patch deleted file mode 100644 index 25f3ef43fe3d..000000000000 --- a/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-no-efivar-automagic.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://bugs.gentoo.org/812047 - -From 0cea7f0f78f1a9e8dca789eb5f2ece052e026bed Mon Sep 17 00:00:00 2001 -From: Christopher Byrne -Date: Tue, 7 Sep 2021 20:22:27 -0500 -Subject: [PATCH] configure.ac: Fix automagic depency on libefivar - -Signed-off-by: Christopher Byrne ---- - configure.ac | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f1c17116..bdb4abda 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -62,8 +62,12 @@ PKG_CHECK_MODULES([CRYPTO], [libcrypto >= 1.1.0]) - PKG_CHECK_MODULES([CURL], [libcurl]) - - # pretty print of devicepath if efivar library is present --PKG_CHECK_MODULES([EFIVAR], [efivar],,[true]) --AC_CHECK_HEADERS([efivar/efivar.h]) -+AC_ARG_WITH([efivar], AS_HELP_STRING([--without-efivar], [Build without efivar library (default: test)])) -+ -+AS_IF([test "x$with_efivar" != "xno"], [ -+ PKG_CHECK_MODULES([EFIVAR], [efivar]) -+ AC_CHECK_HEADERS([efivar/efivar.h]) -+]) - - # backwards compat with older pkg-config - # - pull in AC_DEFUN from pkg.m4 --- -2.32.0 - diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch deleted file mode 100644 index e1094647bdfd..000000000000 --- a/app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3d80fad66694ad14a58dd89204a25e9248c4ab0c Mon Sep 17 00:00:00 2001 -From: Jonas Witschel -Date: Wed, 29 Sep 2021 17:08:07 +0200 -Subject: [PATCH] testparms: fix condition for negative test - -Commit e858dec76686bb4c42e74e0984b433231e530f93 ("testparms: ensure curve not -supported before negative test") is supposed to ensure that the negative test -is run only if ecc521 is *not* supported, but instead it runs the negative test -if ecc521 is *available*. This worked anyway for libtpms < 0.9.0 because camellia -was not supported, but since libtpms 0.9.0 added support for this algorithm, the -test suite fails now with swtpm. - -Signed-off-by: Jonas Witschel ---- - test/integration/tests/testparms.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/integration/tests/testparms.sh b/test/integration/tests/testparms.sh -index 8c3548e5..a587a60a 100644 ---- a/test/integration/tests/testparms.sh -+++ b/test/integration/tests/testparms.sh -@@ -63,7 +63,7 @@ else - fi - - # Attempt to specify a suite that is not supported (error from TPM) --if tpm2 getcap ecc-curves | grep -q TPM2_ECC_NIST_P521; then -+if ! tpm2 getcap ecc-curves | grep -q TPM2_ECC_NIST_P521; then - if tpm2 testparms "ecc521:ecdsa:camellia" &>/dev/null; then - echo "tpm2 testparms succeeded while it shouldn't or TPM failed" - exit 1 --- -2.32.0 - -- cgit v1.2.3