added udev permissions. Added tpm-emulator as optional dependancy. script file fixes and old version cleanout

Package-Manager: portage-2.0.51.22-r1

4 files changed, 3 insertions, 60 deletions

diff --git a/app-crypt/trousers/files/0.1.7-makefile-statedir.patch b/app-crypt/trousers/files/0.1.7-makefile-statedir.patch
deleted file mode 100644
index 14b6648dde8d..000000000000
--- a/app-crypt/trousers/files/0.1.7-makefile-statedir.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- ./src/tcs/Makefile.am.orig	2005-01-28 08:19:35.000000000 +0930
-+++ ./src/tcs/Makefile.am	2005-02-06 17:28:55.191846984 +0930
-@@ -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 $@ $<
---- ./src/tcsd/Makefile.am.orig	2004-12-11 01:07:06.000000000 +0930
-+++ ./src/tcsd/Makefile.am	2005-02-06 17:28:55.191846984 +0930
-@@ -1,5 +1,5 @@
- sbin_PROGRAMS=tcsd
- 
- tcsd_SOURCES=svrside.c tcsd_wrap.c tcsd_conf.c tcsd_threads.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
---- ./src/tspi/Makefile.am.orig	2005-01-28 08:17:36.000000000 +0930
-+++ ./src/tspi/Makefile.am	2005-02-06 17:28:55.191846984 +0930
-@@ -1,6 +1,6 @@
- all: libtspi.so
- 
--AM_CFLAGS=-I../include -DAPPID=\"TSPI\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" @GTK_CFLAGS@
-+AM_CFLAGS=-I../include -DAPPID=\"TSPI\" -DVAR_PREFIX=\"@localstatedir@/state\" -DETC_PREFIX=\"@sysconfdir@\" @GTK_CFLAGS@
- AM_LDFLAGS=@GTK_LIBS@
- 
- AM_OBJS=ConvertLib.o obj.o spi_context.o spi_getset.o spi_key.o spi_policy.o spi_utils.o keyreg.o memmgr.o secrets.o spi_data.o spi_hash.o spi_pcr.o spi_tpm.o ../tcsd_api/calltcsapi.o ../tcsd_api/tcstp.o ../tcsd_api/hosttable.o ../tcsd_api/clntside.o gtk/main.o gtk/support.o gtk/interface.o gtk/callbacks.o crypto/@CRYPTO_PACKAGE@/crypto.o ps/tspps.o ps/ps_utils.o log.o
---- ./dist/tcsd.conf.in.orig	2005-02-06 17:32:11.449871920 +0930
-+++ ./dist/tcsd.conf.in	2005-02-06 17:28:55.192845832 +0930
-@@ -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
---- ./dist/Makefile.am.orig	2005-01-21 07:08:52.000000000 +0930
-+++ ./dist/Makefile.am	2005-02-06 17:28:55.192845832 +0930
-@@ -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@/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/tpm; fi'
--	/bin/chown tss:tss ${DESTDIR}/@localstatedir@/tpm
--	/bin/chmod 1777 ${DESTDIR}/@localstatedir@/tpm
-+	/bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/state/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/tpm; fi'
-+	/bin/chown tss:tss ${DESTDIR}/@localstatedir@/state/tpm
-+	/bin/chmod 1777 ${DESTDIR}/@localstatedir@/state/tpm
- 
- uninstall-hook:
- 	/usr/sbin/groupdel tss
diff --git a/app-crypt/trousers/files/digest-trousers-0.1.11 b/app-crypt/trousers/files/digest-trousers-0.1.11-r1
index 091d9b2bdf23..091d9b2bdf23 100644
--- a/app-crypt/trousers/files/digest-trousers-0.1.11
+++ b/app-crypt/trousers/files/digest-trousers-0.1.11-r1
diff --git a/app-crypt/trousers/files/digest-trousers-0.1.7 b/app-crypt/trousers/files/digest-trousers-0.1.7
deleted file mode 100644
index 26bf24958871..000000000000
--- a/app-crypt/trousers/files/digest-trousers-0.1.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fd1e13927c93cfdf07e98409da4f1091 trousers-0.1.7.tar.gz 785977
diff --git a/app-crypt/trousers/files/tcsd.initd b/app-crypt/trousers/files/tcsd.initd
index 6001564dca15..4a1daa9a05de 100644
--- a/app-crypt/trousers/files/tcsd.initd
+++ b/app-crypt/trousers/files/tcsd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/files/tcsd.initd,v 1.1 2005/06/19 12:54:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/files/tcsd.initd,v 1.2 2005/06/23 13:03:55 dragonheart Exp $
 
 depend() {
 	use logger
@@ -28,12 +28,12 @@ checkconfig() {
 start() {
 	ebegin "Starting TrouSerS' TCS daemon (tcsd)"
 	checkconfig || eend $?
-	start-stop-daemon --start --quiet --exec /usr/sbin/tcsd
+	start-stop-daemon --start --chuid tss --exec /usr/sbin/tcsd
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping TrouSerS' TCS daemon (tcsd)"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/tcsd
+	start-stop-daemon --stop --quiet --exec /usr/sbin/tcsd --user tss
 	eend $?
 }