Version bump as per bug #95764.

(Portage version: 2.0.51.22-r1)

6 files changed, 138 insertions, 11 deletions

diff --git a/app-crypt/trousers/ChangeLog b/app-crypt/trousers/ChangeLog
index 1ef9ebeca775..3eb7979f08c2 100644
--- a/app-crypt/trousers/ChangeLog
+++ b/app-crypt/trousers/ChangeLog
@@ -1,6 +1,12 @@
 # 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.1 2005/02/06 08:29:08 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.2 2005/06/19 12:54:19 dragonheart Exp $
+
+*trousers-0.1.11 (19 Jun 2005)
+
+  19 Jun 2005; Daniel Black <dragonheart@gentoo.org> +files/tcsd.confd,
+  +files/tcsd.initd, +trousers-0.1.11.ebuild:
+  Version bump as per bug #95764. Thankyou TGL
 
 *trousers-0.1.7 (06 Feb 2005)
 
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index bf109a8c252f..e9f3d33db0cd 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -1,15 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 826a2e8e20b3a3a58cb7583b68d89344 trousers-0.1.7.ebuild 1353
 MD5 2603eeeb20b24caddac3e9ce6996f357 metadata.xml 251
 MD5 4ae4a98a8f1a402626633a4602ce8db7 ChangeLog 395
+MD5 64defbb5d7ed56798fe55600f84a8455 trousers-0.1.11.ebuild 2285
 MD5 6ced7c6423b5d94e01d6e03e435f620e files/digest-trousers-0.1.7 66
 MD5 1c0953f370d4ecddd3307f0b64bccb0d files/0.1.7-makefile-statedir.patch 2978
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCBdVamdTrptrqvGERAvUTAKCdjhB0nMtGa02mvjmUTxQNnnN3swCfcnAT
-2PEgfOtR4Gl1BJoBlc/zgPY=
-=51fv
------END PGP SIGNATURE-----
+MD5 05e27e046284f46a7da59bf3dbbdddf0 files/tcsd.confd 372
+MD5 988768a402c7d67b4bedf8bda089356d files/tcsd.initd 841
+MD5 a0c59b3b9088b1773498e993ccdad67c files/digest-trousers-0.1.11 68
diff --git a/app-crypt/trousers/files/digest-trousers-0.1.11 b/app-crypt/trousers/files/digest-trousers-0.1.11
new file mode 100644
index 000000000000..091d9b2bdf23
--- /dev/null
+++ b/app-crypt/trousers/files/digest-trousers-0.1.11
@@ -0,0 +1 @@
+MD5 b3687784a2070a18ba27a91318261d93 trousers-0.1.11.tar.gz 1349939
diff --git a/app-crypt/trousers/files/tcsd.confd b/app-crypt/trousers/files/tcsd.confd
new file mode 100644
index 000000000000..78bedb9fda30
--- /dev/null
+++ b/app-crypt/trousers/files/tcsd.confd
@@ -0,0 +1,9 @@
+# /etc/conf.d/tscd
+
+# Configuration file for the TrouSerS' TCS daemon (tcsd) init script
+# Have a look on /etc/tcsd.conf too, there is more to configure there.
+
+# TPM_MODULES: name of the module(s) that should be loaded. You only need to
+# set this if your driver is not compiled in kernel and is not already loaded
+# on boot.    (default: unset)
+#TPM_MODULES="tpm_atmel"
diff --git a/app-crypt/trousers/files/tcsd.initd b/app-crypt/trousers/files/tcsd.initd
new file mode 100644
index 000000000000..6001564dca15
--- /dev/null
+++ b/app-crypt/trousers/files/tcsd.initd
@@ -0,0 +1,39 @@
+#!/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 $
+
+depend() {
+	use logger
+	need net
+}
+
+checkconfig() {
+	local mod
+	if [ -n "${TPM_MODULES}" ] ; then
+		for mod in ${TPM_MODULES} ; do
+			lsmod | grep -q "^${mod}\b" \
+				|| modprobe ${mod} &>/dev/null \
+				|| ewarn "Failed to load module ${mod}"
+		done
+		# Should we sleep or something to wait for device creation?
+	fi
+	if [ ! -c /dev/tpm ] && [ ! -c /dev/tpm0 ] ; then
+		eerror "No TPM device found!"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	ebegin "Starting TrouSerS' TCS daemon (tcsd)"
+	checkconfig || eend $?
+	start-stop-daemon --start --quiet --exec /usr/sbin/tcsd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping TrouSerS' TCS daemon (tcsd)"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/tcsd
+	eend $?
+}
diff --git a/app-crypt/trousers/trousers-0.1.11.ebuild b/app-crypt/trousers/trousers-0.1.11.ebuild
new file mode 100644
index 000000000000..e6aede338caa
--- /dev/null
+++ b/app-crypt/trousers/trousers-0.1.11.ebuild
@@ -0,0 +1,78 @@
+# 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 $
+
+inherit eutils linux-info
+
+DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
+HOMEPAGE="http://trousers.sf.net"
+SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc"
+
+RDEPEND="virtual/libc
+	>=dev-libs/glib-2
+	dev-libs/atk
+	x11-libs/pango
+	>=x11-libs/gtk+-2
+	>=dev-libs/openssl-0.9.7"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	# Check for driver (not sure it can be an rdep, because ot depends on the
+	# version of virtual/linux-sources... Is that supported by portage?)
+	linux-info_pkg_setup
+	local tpm_kernel_version tpm_kernel_present tpm_module
+	kernel_is ge 2 6 12 && tpm_kernel_version="yes"
+	linux_chkconfig_present TCG_TPM && tpm_kernel_present="yes"
+	has_version app-crypt/tpm-module && tpm_module="yes"
+	if [ -n "${tpm_kernel_present}" ] ; then
+		einfo "Good, you seem to have in-kernel TPM support."
+	elif [ -n "${tpm_module}" ] ; then
+		einfo "Good, you seem to have TPM support with the external module."
+		if [ -n "${tpm_kernel_version}" ] ; then
+			einfo
+			einfo "Note that since you have a >=2.6.12 kernel, you could use"
+			einfo "the in-kernel driver instead (CONFIG_TCG_TPM)."
+		fi
+	elif [ -n "${tpm_kernel_version}" ] ; then
+		eerror
+		eerror "To use this package, you will have to activate TPM support"
+		eerror "in your kernel configuration. That's at least CONFIG_TCG_TPM,"
+		eerror "plus probably a chip specific driver (like CONFIG_TCG_ATMEL)."
+		eerror
+	else
+		eerror
+		eerror "To use this package, you should install a TPM driver."
+		eerror "You can either:"
+		eerror "  - install app-crypt/tpm-module"
+		eerror "  - switch to a >=2.6.12 kernel"
+		eerror
+	fi
+
+	# New user/group for the daemon
+	enewgroup tss
+	enewuser tss -1 /bin/false /var/lib/tpm tss
+}
+
+src_unpack() {
+	unpack ${A}
+	sed -i -e 's:@localstatedir@/tpm:@localstatedir@/lib/tpm:' \
+		"${S}/dist/tcsd.conf.in"
+}
+
+src_install() {
+	keepdir /var/lib/tpm
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS ChangeLog NICETOHAVES README TODO
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		doins doc/*
+	fi
+	newinitd "${FILESDIR}/tcsd.initd" tcsd
+	newconfd "${FILESDIR}/tcsd.confd" tcsd
+}