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

Package-Manager: portage-2.0.51.22-r1

8 files changed, 26 insertions, 126 deletions

diff --git a/app-crypt/trousers/ChangeLog b/app-crypt/trousers/ChangeLog
index 3eb7979f08c2..e0131ab5080a 100644
--- a/app-crypt/trousers/ChangeLog
+++ b/app-crypt/trousers/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-crypt/trousers
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.2 2005/06/19 12:54:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.3 2005/06/23 13:03:55 dragonheart Exp $
+
+*trousers-0.1.11-r1 (23 Jun 2005)
+
+  23 Jun 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/0.1.7-makefile-statedir.patch, files/tcsd.initd,
+  -trousers-0.1.7.ebuild, -trousers-0.1.11.ebuild,
+  +trousers-0.1.11-r1.ebuild:
+  added udev permissions. Added tpm-emulator as optional dependancy. script
+  file fixes and old version cleanout
 
 *trousers-0.1.11 (19 Jun 2005)
 
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index e5d70e743be5..6aba5614e212 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -1,19 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 826a2e8e20b3a3a58cb7583b68d89344 trousers-0.1.7.ebuild 1353
 MD5 2603eeeb20b24caddac3e9ce6996f357 metadata.xml 251
-MD5 8c0a74b1bcc693bd243e63a8172168e2 ChangeLog 593
-MD5 2e2f35cae17f3e5a8440d8889e3016e5 trousers-0.1.11.ebuild 2393
-MD5 6ced7c6423b5d94e01d6e03e435f620e files/digest-trousers-0.1.7 66
-MD5 1c0953f370d4ecddd3307f0b64bccb0d files/0.1.7-makefile-statedir.patch 2978
+MD5 3463919d77ad73755da490ac67fa468a ChangeLog 935
+MD5 1906afd62fd11874fce2580feb769857 trousers-0.1.11-r1.ebuild 2598
 MD5 05e27e046284f46a7da59bf3dbbdddf0 files/tcsd.confd 372
-MD5 3b7548b0904848bef6723446075e7678 files/tcsd.initd 943
-MD5 a0c59b3b9088b1773498e993ccdad67c files/digest-trousers-0.1.11 68
+MD5 edcaf716f7fc47ab4eeb301291a53fb4 files/tcsd.initd 958
+MD5 a0c59b3b9088b1773498e993ccdad67c files/digest-trousers-0.1.11-r1 68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCtWsTmdTrptrqvGERArWmAJsFeld2ILj9QU96P8QXeg8HEmyrzgCfcENI
-mnV/NWW7F6vV6qo40P8K3bw=
-=fpS3
+iD8DBQFCurNTmdTrptrqvGERAqUFAJ4n/w1jt+ABnkMLIcJixiukG7QryQCcD1Py
+yt2GOsw+d31vBLZdzLHUU8o=
+=VRln
 -----END PGP SIGNATURE-----
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 $?
 }
diff --git a/app-crypt/trousers/trousers-0.1.11.ebuild b/app-crypt/trousers/trousers-0.1.11-r1.ebuild
index e6aede338caa..6495a4af75db 100644
--- a/app-crypt/trousers/trousers-0.1.11.ebuild
+++ b/app-crypt/trousers/trousers-0.1.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.1.11.ebuild,v 1.1 2005/06/19 12:54:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.1.11-r1.ebuild,v 1.1 2005/06/23 13:03:55 dragonheart Exp $
 
 inherit eutils linux-info
 
@@ -48,9 +48,10 @@ pkg_setup() {
 	else
 		eerror
 		eerror "To use this package, you should install a TPM driver."
-		eerror "You can either:"
+		eerror "You can have the following options:"
 		eerror "  - install app-crypt/tpm-module"
-		eerror "  - switch to a >=2.6.12 kernel"
+		eerror "  - install app-crypt/tpm-emulator"
+		eerror "  - switch to a >=2.6.12 kernel and compile the kernel module"
 		eerror
 	fi
 
@@ -75,4 +76,6 @@ src_install() {
 	fi
 	newinitd "${FILESDIR}/tcsd.initd" tcsd
 	newconfd "${FILESDIR}/tcsd.confd" tcsd
+	into /etc/udev/permissions.d/
+	echo "tpm*:tss:tss:0600" > ${D}/etc/udev/permissions.d/30-tpm.permissions
 }
diff --git a/app-crypt/trousers/trousers-0.1.7.ebuild b/app-crypt/trousers/trousers-0.1.7.ebuild
deleted file mode 100644
index 98d438ca9039..000000000000
--- a/app-crypt/trousers/trousers-0.1.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.1.7.ebuild,v 1.1 2005/02/06 08:29:08 dragonheart Exp $
-
-inherit eutils
-
-DESCRIPTION="Trousers is an open-source TCG Software Stack (TSS)"
-HOMEPAGE="http://trousers.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="virtual/libc
-	x11-libs/pango
-	>=x11-libs/gtk+-2
-	app-crypt/tpm-module
-	>=dev-libs/openssl-0.9.7"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.7.9
-	>=sys-devel/autoconf-2.59
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	enewgroup tss
-	enewuser tss -1 /bin/false /var/state/tpm tss
-}
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-makefile-statedir.patch || die "patch failed"
-	sed -i -e "s/#undef TPM_IOCTL/#define TPM_IOCTL/" src/include/tddl.h
-}
-src_compile() {
-	aclocal || die "aclocal failed"
-	libtoolize --force || die "libtoolize failed"
-	WANT_AUTOMAKE=1.7 automake --add-missing -c || die "automake failed"
-	WANT_AUTOCONF=2.59 autoconf || die "autoconf failed"
-
-	econf --localstatedir=/var/state || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	keepdir /var/state/tpm
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog LICENSE NICETOHAVES  README  TODO
-}