summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2022-04-25 19:47:30 +0200
committerConrad Kostecki <conikost@gentoo.org>2022-04-25 23:45:44 +0200
commit8edbc85f29a3205269831f737509c74accc10744 (patch)
tree5dc8174994e48852462f60dc2a86b3eb208aa1b7 /app-crypt/tpm2-tss
parentapp-crypt/tpm2-tools: remove unused patch (diff)
downloadgentoo-8edbc85f29a3205269831f737509c74accc10744.tar.gz
gentoo-8edbc85f29a3205269831f737509c74accc10744.tar.bz2
gentoo-8edbc85f29a3205269831f737509c74accc10744.zip
app-crypt/tpm2-tss: remove unused patches
Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/25197 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'app-crypt/tpm2-tss')
-rw-r--r--app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch53
-rw-r--r--app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch15
2 files changed, 0 insertions, 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 \