[packages/tpm2-tss] - readded install patch

qboosh qboosh at pld-linux.org
Mon Feb 21 18:36:42 CET 2022


commit 5edc37b9180bf668f92a0d4d15c16dc726db42bc
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Feb 21 18:38:32 2022 +0100

    - readded install patch

 tpm2-tss-install.patch | 43 +++++++++++++++++++++++++++++++++++++++++++
 tpm2-tss.spec          |  2 ++
 2 files changed, 45 insertions(+)
---
diff --git a/tpm2-tss.spec b/tpm2-tss.spec
index 8655ad3..e1ffd82 100644
--- a/tpm2-tss.spec
+++ b/tpm2-tss.spec
@@ -12,6 +12,7 @@ Group:		Libraries
 #Source0Download: https://github.com/tpm2-software/tpm2-tss/releases
 Source0:	https://github.com/tpm2-software/tpm2-tss/releases/download/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	0d60d0df3fd0daae66881a3022281323
+Patch0:		%{name}-install.patch
 URL:		https://github.com/tpm2-software/tpm2-tss
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -89,6 +90,7 @@ Biblioteka statyczna tpm2-tss.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # set VERSION properly when there is no .git directory
 %{__sed} -i -e 's/m4_esyscmd_s(\[git describe --tags --always --dirty\])/%{version}/' configure.ac
diff --git a/tpm2-tss-install.patch b/tpm2-tss-install.patch
new file mode 100644
index 0000000..efabbe1
--- /dev/null
+++ b/tpm2-tss-install.patch
@@ -0,0 +1,43 @@
+--- tpm2-tss-3.2.0/configure.ac.orig	2022-02-21 18:18:21.091907007 +0100
++++ tpm2-tss-3.2.0/configure.ac	2022-02-21 18:31:28.940972195 +0100
+@@ -484,12 +484,12 @@ AS_IF([test "x$enable_integration" = "xy
+ 
+ # Check for systemd helper tools used by make install
+ AC_CHECK_PROG(systemd_sysusers, systemd-sysusers, yes)
+-AM_CONDITIONAL(SYSD_SYSUSERS, test "x$systemd_sysusers" = "xyes")
++AM_CONDITIONAL(SYSD_SYSUSERS, false)
+ AC_CHECK_PROG(systemd_tmpfiles, systemd-tmpfiles, yes)
+-AM_CONDITIONAL(SYSD_TMPFILES, test "x$systemd_tmpfiles" = "xyes")
++AM_CONDITIONAL(SYSD_TMPFILES, false)
+ 
+ # Check all tools used by make install
+-AS_IF([test "$HOSTOS" = "Linux"],
++AS_IF([false],
+     [ AC_CHECK_PROG(useradd, useradd, yes)
+       AC_CHECK_PROG(groupadd, groupadd, yes)
+       AC_CHECK_PROG(adduser, adduser, yes)
+--- tpm2-tss-3.2.0/Makefile.am.orig	2022-02-21 18:32:44.257230839 +0100
++++ tpm2-tss-3.2.0/Makefile.am	2022-02-21 18:32:46.707217566 +0100
+@@ -636,21 +636,7 @@ define make_parent_dir
+ endef
+ 
+ define make_tss_user_and_group
+-    if type -p groupadd > /dev/null; then \
+-        id -g tss 2>/dev/null || groupadd --system tss; \
+-    else \
+-        id -g tss 2>/dev/null || \
+-        addgroup --system tss; \
+-    fi && \
+-    if type -p useradd > /dev/null; then \
+-        id -u tss 2>/dev/null || \
+-        useradd --system --home-dir / --shell `type -p nologin` \
+-                         --no-create-home -g tss tss; \
+-    else \
+-        id -u tss 2>/dev/null || \
+-        adduser --system --home / --shell `type -p nologin` \
+-                --no-create-home --ingroup tss tss; \
+-    fi
++    true
+ endef
+ 
+ define make_tss_dir
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/tpm2-tss.git/commitdiff/5edc37b9180bf668f92a0d4d15c16dc726db42bc



More information about the pld-cvs-commit mailing list