commit:     79b80c4292f25235cb15be86ac6e5fef7821cb7d
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun May 26 08:51:59 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun May 26 21:29:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79b80c42

app-crypt/tpm2-tss: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/tpm2-tss-4.1.1-Remove-bash-syntax.patch  | 28 -------------------
 ...piler-common.sh-Remove-dependency-on-whic.patch | 32 ----------------------
 2 files changed, 60 deletions(-)

diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-4.1.1-Remove-bash-syntax.patch 
b/app-crypt/tpm2-tss/files/tpm2-tss-4.1.1-Remove-bash-syntax.patch
deleted file mode 100644
index 81673e55f4fa..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-4.1.1-Remove-bash-syntax.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 03726ba7684d672201dd773a49b7bec86ca877f5 Mon Sep 17 00:00:00 2001
-From: David Seifert <s...@gentoo.org>
-Date: Tue, 7 May 2024 20:37:14 +0200
-Subject: [PATCH] Remove bash syntax
-
-* `==` is bash and not POSIX
-Bug: https://bugs.gentoo.org/931239
-Signed-off-by: David Seifert <s...@gentoo.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index a763b683..eb6051ea 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -652,7 +652,7 @@ AS_IF([test "x$enable_self_generated_certificate" = xyes],
-       [AC_DEFINE([SELF_GENERATED_CERTIFICATE], [1], [Allow usage of self 
generated root certificate])],
-       [AS_IF([test "x$integration_tcti" != "xdevice"], 
[AC_DEFINE([FAPI_TEST_EK_CERT_LESS], [1], [Perform integration tests without EK 
certificate verification])])])
- 
--AM_CONDITIONAL([INIT_CA], [test "x$enable_self_generated_certificate" == 
xyes])
-+AM_CONDITIONAL([INIT_CA], [test "x$enable_self_generated_certificate" = xyes])
- 
- AS_IF([test "x$enable_integration" = "xyes" && test 
"x$enable_self_generated_certificate" != "xyes" && test "x$integration_tcti" != 
"xdevice"],
-       [AC_MSG_WARN([Running integration tests without EK certificate 
verification, use --enable-self-generated-certificate for full test coverage])])
--- 
-2.43.2
-

diff --git 
a/app-crypt/tpm2-tss/files/tpm2-tss-4.1.1-int-log-compiler-common.sh-Remove-dependency-on-whic.patch
 
b/app-crypt/tpm2-tss/files/tpm2-tss-4.1.1-int-log-compiler-common.sh-Remove-dependency-on-whic.patch
deleted file mode 100644
index 1a3a203ae5b1..000000000000
--- 
a/app-crypt/tpm2-tss/files/tpm2-tss-4.1.1-int-log-compiler-common.sh-Remove-dependency-on-whic.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ce2ca92af5f215e9c3fa262ea40de0c1d2ff71a3 Mon Sep 17 00:00:00 2001
-From: Christopher Byrne <salah.coro...@gmail.com>
-Date: Fri, 3 May 2024 10:30:34 -0500
-Subject: [PATCH] int-log-compiler-common.sh: Remove dependency on which
-
-Signed-off-by: Christopher Byrne <salah.coro...@gmail.com>
----
- script/int-log-compiler-common.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/script/int-log-compiler-common.sh 
b/script/int-log-compiler-common.sh
-index 5d0b3b95..5dddd77a 100755
---- a/script/int-log-compiler-common.sh
-+++ b/script/int-log-compiler-common.sh
-@@ -55,12 +55,12 @@ sanity_test ()
-         exit 1
-     fi
- 
--    if [ -z "$(which ${sock_tool})" ]; then
-+    if [ -z "$(command -v ${sock_tool})" ]; then
-         echo "ss not on PATH; exiting"
-         exit 1
-     fi
- 
--    if [[ ! -z ${simulator_bin} && -z "$(which ${simulator_bin})" ]]; then
-+    if [[ ! -z ${simulator_bin} && -z "$(command -v ${simulator_bin})" ]]; 
then
-         echo "${simulator_bin} not on PATH; exiting"
-         exit 1
-     fi
--- 
-2.43.2
-

Reply via email to