* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tss/files/
@ 2020-12-26 22:05 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-12-26 22:05 UTC (permalink / raw
To: gentoo-commits
commit: d254b65d931a177284b13d92b5c1433637beb533
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Dec 18 14:46:36 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 22:04:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d254b65d
app-crypt/tpm2-tss: remove unused patch
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18708
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...m2-tss-2.4.1-Dont-run-systemd-sysusers-in-Makefile.patch | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-Dont-run-systemd-sysusers-in-Makefile.patch
deleted file mode 100644
index 81c223df957..00000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-Dont-run-systemd-sysusers-in-Makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 85683f9b..986d4c8d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -582,8 +582,6 @@ EXTRA_DIST += dist/tpm-udev.rules
-
- install-data-hook:
- -mv $(DESTDIR)$(udevrulesdir)/tpm-udev.rules $(DESTDIR)$(udevrulesdir)/$(udevrulesprefix)tpm-udev.rules
-- (systemd-sysusers && systemd-tmpfiles --create) || \
-- ($(call make_tss_user_and_group) && $(call make_fapi_dirs) && ($call set_fapi_permissions)) || true
-
- uninstall-local:
- -rm $(DESTDIR)$(udevrulesdir)/$(udevrulesprefix)tpm-udev.rules
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tss/files/
@ 2022-04-25 21:48 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2022-04-25 21:48 UTC (permalink / raw
To: gentoo-commits
commit: 8edbc85f29a3205269831f737509c74accc10744
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Apr 25 17:47:30 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 21:45:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8edbc85f
app-crypt/tpm2-tss: remove unused patches
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25197
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
...igure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch | 53 ----------------------
...4.2-Dont-run-systemd-sysusers-in-Makefile.patch | 15 ------
2 files changed, 68 deletions(-)
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch
deleted file mode 100644
index 111c3d75c690..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 94cc338b0c5b97702e994ec628d684ee2c114547 Mon Sep 17 00:00:00 2001
-From: Tadeusz Struk <tadeusz.struk@intel.com>
-Date: Tue, 24 Mar 2020 16:42:14 -0700
-Subject: [PATCH] configure.ac: wrap PKG_CHECK_MODULES in braces
-
-PKG_CHECK_MODULES needs to be wrapped inside squere
-brackets when inside AS_IF, or it spit out errors:
-
-./configure: line 13054: JSONC_CFLAGS: command not found
-./configure: line 13055: C: command not found
-./configure: line 13056: JSONC_LIBS: command not found
-./configure: line 13155: CURL_CFLAGS: command not found
-./configure: line 13156: CURL_LIBS: command not found
-
-Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
----
- Makefile.am | 2 +-
- configure.ac | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 85683f9b..9144a5ad 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -467,7 +467,7 @@ src_tss2_fapi_libtss2_fapi_la_LIBADD = $(libtss2_sys) $(libtss2_mu) $(libtss2_e
-
- src_tss2_fapi_libtss2_fapi_la_SOURCES = $(TSS2_FAPI_SRC)
- src_tss2_fapi_libtss2_fapi_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/tss2-fapi
--src_tss2_fapi_libtss2_fapi_la_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LIBS) $(JSON_C_LIBS) $(CURL_LIBS)
-+src_tss2_fapi_libtss2_fapi_la_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LIBS) $(JSONC_LIBS) $(CURL_LIBS)
- if HAVE_LD_VERSION_SCRIPT
- src_tss2_fapi_libtss2_fapi_la_LDFLAGS += -Wl,--version-script=$(srcdir)/lib/tss2-fapi.map
- endif # HAVE_LD_VERSION_SCRIPT
-diff --git a/configure.ac b/configure.ac
-index a202d4a6..2edf609e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -165,10 +165,10 @@ AS_IF([test "x$enable_fapi" != xno -a "x$with_crypto" != "xossl"],
- AC_MSG_ERROR([FAPI has to be compiled with OpenSSL]))
-
- AS_IF([test "x$enable_fapi" = xyes ],
-- PKG_CHECK_MODULES([JSON_C], [json-c]))
-+ [PKG_CHECK_MODULES([JSONC], [json-c])])
-
- AS_IF([test "x$enable_fapi" = xyes ],
-- PKG_CHECK_MODULES([CURL], [libcurl]))
-+ [PKG_CHECK_MODULES([CURL], [libcurl])])
-
- AC_ARG_WITH([tctidefaultmodule],
- [AS_HELP_STRING([--with-tctidefaultmodule],
---
-2.26.2
-
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch
deleted file mode 100644
index c37a73531c02..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 322415b8..39e09063 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -602,10 +602,6 @@ endif #FAPI
- EXTRA_DIST += dist/tpm-udev.rules
-
- install-dirs:
--if HOSTOS_LINUX
-- (systemd-sysusers && systemd-tmpfiles --create) || \
-- ($(call make_tss_user_and_group) && $(call make_fapi_dirs) && ($call set_fapi_permissions)) || true
--endif
-
- install-data-hook: install-dirs
- -if [ ! -z "$(udevrulesprefix)" ]; then \
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tss/files/
@ 2024-05-26 21:31 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2024-05-26 21:31 UTC (permalink / raw
To: gentoo-commits
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 <soap@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 <soap@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.coronya@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.coronya@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
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-26 21:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-26 21:31 [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tss/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2022-04-25 21:48 Conrad Kostecki
2020-12-26 22:05 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox