]> git.pld-linux.org Git - packages/tpm2-tss.git/commitdiff
- readded install patch
authorJakub Bogusz <qboosh@pld-linux.org>
Mon, 21 Feb 2022 17:38:32 +0000 (18:38 +0100)
committerJakub Bogusz <qboosh@pld-linux.org>
Mon, 21 Feb 2022 17:38:32 +0000 (18:38 +0100)
tpm2-tss-install.patch [new file with mode: 0644]
tpm2-tss.spec

diff --git a/tpm2-tss-install.patch b/tpm2-tss-install.patch
new file mode 100644 (file)
index 0000000..efabbe1
--- /dev/null
@@ -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
index 8655ad3fa503ccca4ba502360783051b316f6a1e..e1ffd824e8059cf531b8d398b027410e9d7034ca 100644 (file)
@@ -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
This page took 0.125425 seconds and 4 git commands to generate.