[patch] 0.1.11-makefile-statedir.patch

0.1.11-makefile-statedir.patch (text/plain), 3.53 KB, created by Marcelo Goes (RETIRED) on 2005-06-11 09:45:51 UTC

diff --exclude='*~' -Naur trousers-0.1.11.orig/dist/Makefile.am trousers-0.1.11/dist/Makefile.am
--- trousers-0.1.11.orig/dist/Makefile.am	2005-06-11 13:38:07.000000000 -0300
+++ trousers-0.1.11/dist/Makefile.am	2005-06-11 13:45:38.000000000 -0300
@@ -12,9 +12,9 @@
 	/usr/sbin/groupadd tss || true
 	/usr/sbin/useradd -r tss -g tss || true
 	/bin/chown tss:tss ${DESTDIR}/@sbindir@/tcsd
-	/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
-	/bin/chmod 1777 ${DESTDIR}/@localstatedir@/lib/tpm
+	/bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/state/lib/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/lib/tpm; fi'
+	/bin/chown tss:tss ${DESTDIR}/@localstatedir@/state/lib/tpm
+	/bin/chmod 1777 ${DESTDIR}/@localstatedir@/state/lib/tpm
 
 uninstall-hook:
 	/usr/sbin/userdel tss
diff --exclude='*~' -Naur trousers-0.1.11.orig/dist/tcsd.conf.in trousers-0.1.11/dist/tcsd.conf.in
--- trousers-0.1.11.orig/dist/tcsd.conf.in	2005-06-11 13:38:07.000000000 -0300
+++ trousers-0.1.11/dist/tcsd.conf.in	2005-06-11 13:43:10.000000000 -0300
@@ -26,7 +26,7 @@
 # Values: Any absolute directory path
 # Description: Path where the tcsd creates its persistent storage file.
 #
-# system_ps_file = @localstatedir@/tpm/system.data
+# system_ps_file = @localstatedir@/state/tpm/system.data
 #
 
 # Option: firmware_log_file
diff --exclude='*~' -Naur trousers-0.1.11.orig/src/tcs/Makefile.am trousers-0.1.11/src/tcs/Makefile.am
--- trousers-0.1.11.orig/src/tcs/Makefile.am	2005-06-11 13:38:07.000000000 -0300
+++ trousers-0.1.11/src/tcs/Makefile.am	2005-06-11 13:39:06.000000000 -0300
@@ -1,7 +1,7 @@
 noinst_LIBRARIES=libtcs.a
 
 AM_OBJS=atmel.o cache.o cxt.o tcscm.o tcsem.o imaem.o tcskcm.o tcspbg.o tcs_utils.o log.o ps/ps_utils.o ps/tcsps.o req_mgr.o auth_mgr.o
-AM_CFLAGS=-DAPPID=\"TCS\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\"
+AM_CFLAGS=-DAPPID=\"TCS\" -DVAR_PREFIX=\"@localstatedir@/state\" -DETC_PREFIX=\"@sysconfdir@\"
 
 .c.o:
 	$(CC) $(CFLAGS) $(AM_CFLAGS) -c -o $@ $<
diff --exclude='*~' -Naur trousers-0.1.11.orig/src/tcsd/Makefile.am trousers-0.1.11/src/tcsd/Makefile.am
--- trousers-0.1.11.orig/src/tcsd/Makefile.am	2005-06-11 13:38:07.000000000 -0300
+++ trousers-0.1.11/src/tcsd/Makefile.am	2005-06-11 13:39:37.000000000 -0300
@@ -1,5 +1,5 @@
 sbin_PROGRAMS=tcsd
 
 tcsd_SOURCES=svrside.c tcsd_wrap.c tcsd_conf.c tcsd_threads.c platform.c
-tcsd_CFLAGS=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\"
+tcsd_CFLAGS=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"@localstatedir@/state\" -DETC_PREFIX=\"@sysconfdir@\"
 tcsd_LDFLAGS=../tcs/libtcs.a ../tddl/libtddl.a -lpthread
diff --exclude='*~' -Naur trousers-0.1.11.orig/src/tspi/Makefile.am trousers-0.1.11/src/tspi/Makefile.am
--- trousers-0.1.11.orig/src/tspi/Makefile.am	2005-06-11 13:38:07.000000000 -0300
+++ trousers-0.1.11/src/tspi/Makefile.am	2005-06-11 13:42:05.000000000 -0300
@@ -19,7 +19,7 @@
 
 libtspi_la_LDFLAGS=-version-info 0:0:0 -lcrypto -lpthread
 
-libtspi_la_CFLAGS=-I../include -DAPPID=\"TSPI\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\"
+libtspi_la_CFLAGS=-I../include -DAPPID=\"TSPI\" -DVAR_PREFIX=\"@localstatedir@/state\" -DETC_PREFIX=\"@sysconfdir@\"
 libtspi_la_SOURCES=ConvertLib.c obj.c spi_context.c spi_getset.c spi_key.c spi_policy.c spi_utils.c keyreg.c memmgr.c secrets.c spi_data.c spi_hash.c spi_pcr.c spi_tpm.c ../tcsd_api/calltcsapi.c ../tcsd_api/tcstp.c ../tcsd_api/hosttable.c ../tcsd_api/clntside.c ps/tspps.c ps/ps_utils.c log.c
 
 if HAVE_GTK