Version bump (bug #325533). Fix building with >=sys-devel/autoconf-2.64 (bug #282345).

Package-Manager: portage-HEAD/cvs/Linux x86_64

4 files changed, 115 insertions, 20 deletions

diff --git a/app-crypt/trousers/ChangeLog b/app-crypt/trousers/ChangeLog
index 7b687e8ff6bc..12a7b2f0edad 100644
--- a/app-crypt/trousers/ChangeLog
+++ b/app-crypt/trousers/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-crypt/trousers
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.24 2009/09/06 22:50:29 ikelos Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.25 2010/06/27 22:38:43 arfrever Exp $
+
+*trousers-0.3.5 (27 Jun 2010)
+
+  27 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -trousers-0.3.1.ebuild, -files/trousers-0.3.1-gcc43.patch,
+  -files/trousers-0.3.1-qa.patch, -trousers-0.3.2.ebuild,
+  -trousers-0.3.2.1.ebuild, +trousers-0.3.5.ebuild,
+  +files/trousers-0.3.5-nouseradd.patch:
+  Version bump (bug #325533). Fix building with >=sys-devel/autoconf-2.64
+  (bug #282345).
 
 *trousers-0.3.2.1-r1 (06 Sep 2009)
 
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index 48ededaeca36..fed8f7d605c6 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -1,24 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX tcsd.confd 372 RMD160 d265222136e80a0fe0cdb535abba0e07078f08c2 SHA1 05a81dc90a2df80b3c0ea7a8cefc3c59098aadd8 SHA256 5a1f9150ce0d8cc3e9e80971e073ee0b1db018ec3af6809087a7c626b9ffa327
 AUX tcsd.initd 958 RMD160 f90e6d4ec4d2dd0bd8218b3b2ef28328461d50b6 SHA1 34ab9b7cbf60e58b1f7b732891d30e053f2039a1 SHA256 388cef25be74c6263b9cb0e5de3bd08fbc0613e1a9fef958b006c571e4b691c8
 AUX trousers-0.2.3-nouseradd.patch 1008 RMD160 dc1d81d6ceaf18d8464c5d7418b6733fae5fb6ab SHA1 404467a26d2e736ac3853969678d47a881579aec SHA256 5fa359ba96ac0c3e6130af1c9269f26fb28551ac6c0b76a4796aa0dfb1ce6dc2
-AUX trousers-0.3.1-gcc43.patch 852 RMD160 9392a7ef5f24dfeb0a7af78e83a7e738891b44cd SHA1 0c65705193adc4153f0e57b91ab98b3c73ca44fe SHA256 fe937a9dd111f60614c53308937a037c57ec22a96a9bdcf2c65c996cffad09ed
-AUX trousers-0.3.1-qa.patch 568 RMD160 918120a32124e3bf1b9a677698da1a6fb6a9e38f SHA1 27e7f1d1d3cbd23d63800e0e0f0a086fbeb83137 SHA256 518f14dc01c225b02f009cbfa34ff07f9fee91a9ad510f751acc929a13afdb6c
-DIST trousers-0.3.1.tar.gz 1306672 RMD160 1dc088249b4fc4aaf354caa216ffe25c8cecc9aa SHA1 0598efbb2282556a5edf0ce8c074175a33573951 SHA256 79d190a214584ceedd3900b4bc7484244d6e0d74289de5a38adcc7415cde3500
+AUX trousers-0.3.5-nouseradd.patch 439 RMD160 8c412e10335f896535718a51d94499abc854faf9 SHA1 539efce53bd2757f51a98c8bc1cdb020aac9ebdd SHA256 927040d4ef30657717a75318320330f12364a624e0ce6f0d2e6a25c53e5ba11b
 DIST trousers-0.3.2-1.tar.gz 1238691 RMD160 a8d59051fcf8b42f7a789b5719dfa88ad7cddf6d SHA1 0cec8b667e4d173ecf8f486e5dd62d3ff66f101e SHA256 27bb906cc06d29ead85ca95e7268401b914c2eac81663a7db0e241f1178a4ba4
-DIST trousers-0.3.2.tar.bz2 1205561 RMD160 ecb046dbf8bd36143d3435345887961139e9784f SHA1 6502597eb801529ba2a7cdc4ca230772e178da9b SHA256 7681e0a80a68b55a24b4de888a32d13533eaf6988b613b59d02155151ecbd182
-EBUILD trousers-0.3.1.ebuild 2457 RMD160 4c6dcf919e773e07f59eda581ca367ad66bf6121 SHA1 206c1617eab865371be3e63c68989808239b02b3 SHA256 f0bfb0fd6766b12df4e9d6ee421c62eb1008529f8623f127c7728f7fd045b2b6
+DIST trousers-0.3.5.tar.gz 1335262 RMD160 e242f79c410c8043e6f119ee44dd92766cdc3adf SHA1 8fee28572c4bc88f6e2bcd30a65b0788f93262c2 SHA256 9145db73d7080e86f1a990db4735715ea5f1eae4d47a1d43f775747a7ca580ad
 EBUILD trousers-0.3.2.1-r1.ebuild 2713 RMD160 df011e7bc831178e7d1b24a153df0512e50eded9 SHA1 ae3227c35bb547954c481d1b14f8b04a8c87c533 SHA256 70922b537a3d7c32895b0c01584e7fc82ccbc45e384e582657b42583f62c3bde
-EBUILD trousers-0.3.2.1.ebuild 2621 RMD160 31e17d01f40a70e48aa2da0ee73459eefd08ef53 SHA1 cf26c7a14e140333157aab1211fcd197f0724ba2 SHA256 f63c42a0df368500aed0c8f3cd6553bf46c3ac4ddae3074b009912e1a990ab39
-EBUILD trousers-0.3.2.ebuild 2560 RMD160 458555c43a3b5ee47b91176af00282239ccdd39b SHA1 14d7bf29cf53bbe1461883fa0ce2be710ea4dcc1 SHA256 94dc727a981796db535f7c6bf4e66d48d459256368f7c5777ca93bc42b1f040b
-MISC ChangeLog 4605 RMD160 86ee7ff6f7219d8ec5b3ad2d132cda6638787978 SHA1 f8b9911adf14c4574c04c17751763d75c7d8309c SHA256 fa32df714a0b480bd8b351b693e40550ea5d74769b029bc04e6f7f1ef0e3fe06
+EBUILD trousers-0.3.5.ebuild 2669 RMD160 807ba3ebb482f16f224251a8a5fa57554bdedb40 SHA1 7962b0053faa39f7365fb84c084e8d217ba8d3a0 SHA256 e9471178998fd3da1091ceeddc36cf6245454123ff5145f554bb7c50cc2d16e2
+MISC ChangeLog 5015 RMD160 1880c20f0654b17bd9224252db8a6dea94def631 SHA1 a56f15d3c9a94980fed0bf592f4741b4dddc97c3 SHA256 19c4e132fa3abfc6ecadb7fe878bd8d9a35b467f17d8078479f98e92b27bb4b1
 MISC metadata.xml 251 RMD160 9c13ff790c7419d4e0d2d370036b7f4e4594ea4f SHA1 563aa19984b291a6cade6d6487dbf4a2a17e6874 SHA256 1739a4e8833a2a5b9501182eb830cbd3e26014ccef5e9ae1b4d7a0686c665c1b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqkPMMACgkQu7rWomwgFXqGOQCfaSK7+TxlNp/6bPbNU7Nfh3uJ
-3+0An2J5mH8P4aHleuKQQ1vxkwd/6ZsY
-=u2eg
------END PGP SIGNATURE-----
diff --git a/app-crypt/trousers/files/trousers-0.3.5-nouseradd.patch b/app-crypt/trousers/files/trousers-0.3.5-nouseradd.patch
new file mode 100644
index 000000000000..32114134daff
--- /dev/null
+++ b/app-crypt/trousers/files/trousers-0.3.5-nouseradd.patch
@@ -0,0 +1,11 @@
+--- dist/Makefile.am
++++ dist/Makefile.am
+@@ -6,8 +6,6 @@
+ 	/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
diff --git a/app-crypt/trousers/trousers-0.3.5.ebuild b/app-crypt/trousers/trousers-0.3.5.ebuild
new file mode 100644
index 000000000000..67364ebd4306
--- /dev/null
+++ b/app-crypt/trousers/trousers-0.3.5.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.5.ebuild,v 1.1 2010/06/27 22:38:43 arfrever Exp $
+
+EAPI="3"
+
+inherit autotools eutils linux-info
+
+#MY_P="${PN}-${PV%.*}-${PV##*.}"
+
+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="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/glib-2
+	>=x11-libs/gtk+-2
+	>=dev-libs/openssl-0.9.7"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${P}git"
+
+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"
+	if linux_config_exists; then
+		linux_chkconfig_present TCG_TPM && tpm_kernel_present="yes"
+	else
+		ewarn "No kernel configuration could be found."
+	fi
+	has_version app-crypt/tpm-emulator && 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
+			elog
+			elog "Note that since you have a >=2.6.12 kernel, you could use"
+			elog "the in-kernel driver instead of (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 have the following options:"
+		eerror "  - install app-crypt/tpm-emulator"
+		eerror "  - switch to a >=2.6.12 kernel and compile the kernel module"
+		eerror
+	fi
+
+	# New user/group for the daemon
+	enewgroup tss
+	enewuser tss -1 -1 /var/lib/tpm tss
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-nouseradd.patch"
+
+	sed -e "s/ -Werror//" -i configure.in
+	eautoreconf
+}
+
+src_install() {
+	keepdir /var/lib/tpm
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NICETOHAVES README TODO
+	use doc && dodoc doc/*
+	newinitd "${FILESDIR}/tcsd.initd" tcsd
+	newconfd "${FILESDIR}/tcsd.confd" tcsd
+}
+
+pkg_postinst() {
+	elog "If you have problems starting tcsd, please check permissions and"
+	elog "ownership on /dev/tpm* and ~tss/system.data"
+}