summaryrefslogtreecommitdiff
path: root/security/trousers/files/patch-dist-Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'security/trousers/files/patch-dist-Makefile.am')
-rw-r--r--security/trousers/files/patch-dist-Makefile.am31
1 files changed, 15 insertions, 16 deletions
diff --git a/security/trousers/files/patch-dist-Makefile.am b/security/trousers/files/patch-dist-Makefile.am
index 2604e06a3909..ba062c7db9d1 100644
--- a/security/trousers/files/patch-dist-Makefile.am
+++ b/security/trousers/files/patch-dist-Makefile.am
@@ -1,20 +1,19 @@
---- dist/Makefile.am.orig 2010-03-12 05:41:54.000000000 +0900
-+++ dist/Makefile.am 2010-10-24 21:04:04.818560844 +0900
-@@ -1,17 +1,7 @@
+--- dist/Makefile.am.orig 2014-04-24 18:05:43 UTC
++++ dist/Makefile.am
+@@ -1,14 +1,14 @@
EXTRA_DIST = system.data.auth system.data.noauth \
fedora/fedora.initrd.tcsd
- install: install-exec-hook
-- if test ! -e ${DESTDIR}/@sysconfdir@/tcsd.conf; then mkdir -p ${DESTDIR}/@sysconfdir@ && cp tcsd.conf ${DESTDIR}/@sysconfdir@; fi
-- /bin/chown tss:tss ${DESTDIR}/@sysconfdir@/tcsd.conf || true
-- /bin/chmod 0600 ${DESTDIR}/@sysconfdir@/tcsd.conf
- install-exec-hook:
-- /usr/sbin/groupadd tss || true
-- /usr/sbin/useradd -r tss -g tss || true
-- /bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/lib/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/lib/tpm; fi'
-- /bin/chown tss:tss ${DESTDIR}/@localstatedir@/lib/tpm || true
-- /bin/chmod 0700 ${DESTDIR}/@localstatedir@/lib/tpm
+-install: install-exec-hook
++Xinstall: install-exec-hook
+ if test ! -e ${DESTDIR}/@sysconfdir@/tcsd.conf; then mkdir -p ${DESTDIR}/@sysconfdir@ && cp tcsd.conf ${DESTDIR}/@sysconfdir@; fi
+ if !NOUSERCHECK
+ /bin/chown tss:tss ${DESTDIR}/@sysconfdir@/tcsd.conf || true
+ /bin/chmod 0600 ${DESTDIR}/@sysconfdir@/tcsd.conf
+ endif
- uninstall-hook:
-- /usr/sbin/userdel tss || true
-- /usr/sbin/groupdel tss || true
+-install-exec-hook:
++Xinstall-exec-hook:
+ /bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/lib/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/lib/tpm; fi'
+ if !NOUSERCHECK
+ /usr/sbin/groupadd tss || true