Add unit file (#510822 by Salah Coronya), fix license (#425894 by Ian Stakenvicius), use readme.gentoo.eclass.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 128 insertions, 17 deletions

diff --git a/app-crypt/trousers/ChangeLog b/app-crypt/trousers/ChangeLog
index fc2b3d06c73e..0db3b99b32ec 100644
--- a/app-crypt/trousers/ChangeLog
+++ b/app-crypt/trousers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/trousers
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.44 2013/06/09 22:55:23 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.45 2014/05/24 09:55:21 pacho Exp $
+
+*trousers-0.3.10-r1 (24 May 2014)
+
+  24 May 2014; Pacho Ramos <pacho@gentoo.org> +files/tcsd.service,
+  +trousers-0.3.10-r1.ebuild:
+  Add unit file (#510822 by Salah Coronya), fix license (#425894 by Ian
+  Stakenvicius), use readme.gentoo.eclass.
 
   09 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index 02c638bdece4..54d0a0a72f77 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -4,28 +4,20 @@ Hash: SHA256
 AUX 61-trousers.rules 96 SHA256 8f25b51dca45b75caa85a00ef476fb40c09d6cc82e2351cb7af24ebc805dd949 SHA512 83fa5b8666bcb0111f69456e6b9ea73eca2e1933e44bf7b705ff4d3c7b63a63ae4d0a1c30b0a00ebe6a8b4206ed7df80abca8503ace1c795119213f3546e9307 WHIRLPOOL a6ff89249a9ea7d5a7d308f0446e304b4429992bd51953e4dbe1a87731c7b8c824b1d158fc1f734965c082508b1ed334ff4303bf610228228c858e29cfe71664
 AUX tcsd.confd 372 SHA256 5a1f9150ce0d8cc3e9e80971e073ee0b1db018ec3af6809087a7c626b9ffa327 SHA512 1e33f521156d55ff450907e01a7c60750e2880520700de1e8fb42ed03d5a16a20332f6f437f2cc7ed155f65b9306bf2d670f46c4b7055d4c9248beaeb06f8a75 WHIRLPOOL d94c3719b438c2758d97f00dab463b9b76b0fc2d9329dcc9cd8867150a7f5351379254868165df8e19ef33ae0e9d6ab333706952dcabaf0da18833750c35f42e
 AUX tcsd.initd 954 SHA256 c3944c51317c8e1a3019ec062f091cdb2e11b974852a22e0fb8f0e6d9cfb7907 SHA512 33515433fc43848af92d0863d7343d40e2818980e596f309a54af293aa532418823692772df58f079d59a69adc974d8b26b8a06dd542202f4b0357e4939d76f8 WHIRLPOOL 25914fe7bddc33e955103838f56b62daebafa03306d0d48f3de41866b4e0017ecb608b13d56660af128f779cd1757b555b7be8747b2632286b3058eb041edcbd
+AUX tcsd.service 131 SHA256 704dbb2b06a3e357fe2363d2cc88632ccd18dcdf14dc7640cd67272df5a52ade SHA512 e516bde8ce45fe4ad687aaaabae475da9c20a9fbd8ebee736d09ceb6efa597efb6f3bb99840a4c0d2c9eb77c2824df6ee45985b46dc8cf924b4eed67eeec1468 WHIRLPOOL 851f6ef31d93a7fd119cc4bc70c28410539fb572158e8238b72ea177e5a75e2a48382807ac14203eb48a21e5432c5c0c35cf25619557d9ba741328f3f79ebfc0
 AUX trousers-0.3.5-nouseradd.patch 439 SHA256 927040d4ef30657717a75318320330f12364a624e0ce6f0d2e6a25c53e5ba11b SHA512 d5f218fb2cd50e81eed2fc3fb48c613f33e17be9be39368e6d0aef5cd2237ef4505736bebc00b30e3133cab81ac2551edbdb8d83aaab0614cbc1747b34bff806 WHIRLPOOL eb01c789159dab0b662065ce155e27f7dbbb5bf5a41c470598be08dcb41fafd77c242c77618f2c118d943b716dea95934bed19c7fd5634442a9b17bd74a943dd
 DIST trousers-0.3.10.tar.gz 1658652 SHA256 eb9569de5c66d9698f6c3303de03777b95ec72827f68b7744454bfa9227bc530 SHA512 1835246f846d20bc1b2731d68440a9ca45865fcd52ad847d95485e4b126fae8bec09feaad559c27d83e243d92b8adc3a67934bff2034b318df075842fe9df4f0 WHIRLPOOL 7a27ef57b0038178cbf384c9fdec2d2e3e58dbeb5e5bc1503d2a7058a8312df54fa72b87968554631e4b5e483ae5e8c5e0a2367346bf3ae001b523a507ceff40
 DIST trousers-0.3.6.tar.gz 1335084 SHA256 91025f60248af44df192e8df16fa6b0c0f1e48c54f6dc51626567ed95758b0d6 SHA512 a9eba2f8e06b163c29e2e9079e62240d96dc630d12fbe61aa0c6b2bc93f88d7f528ae0cabae1de82aba9676e91c2c338da2ce1690bbf21b768af803f7cdff6c3 WHIRLPOOL b13e46f3e2f95bd28a4ad3f7686638709d2484b56ac96f98823f56aafd1be852275a1831ae82a1b11b4eb3e4e9ad051012e59368425374b918e41ecf41d70f01
+EBUILD trousers-0.3.10-r1.ebuild 3026 SHA256 1dc01a5903056b046bb32a0037964075f2318abbfdda7027223df8d5e96a00cd SHA512 cd8b0bc9a8fefd6ceb6af8be620c872d11345283de7c9932045970f6dbab54a219067a0e03b622797e38f6f6c2e46ea098c043dfb89815243f7bd855ab7abbef WHIRLPOOL 56060ec94ef506ae48be0933bd2cf8086513609e14e499c2a4aba3f87922a13d71b1de8d476e4635f5d2710df6755d308b203190a6ab1c2090c4b4a324f82f31
 EBUILD trousers-0.3.10.ebuild 2954 SHA256 c74793f046dd598de03bea18c3013c9ca8b4a0c504bfaf2c9fbd59285a100c9e SHA512 7b9a4633f6f4b0889c2349845376c44be651b6a142ca3c4652aee83c677d77168e6516ca806f627bad2475cb5a22fa2002320df2e7dc57f02d2a54e0f4eb61eb WHIRLPOOL 547cb8ebda7d9c2c22a77e94dc06af370ccd2fe51b31f34a831771487e8b2aba31c17a4bac44f30330c16cdc6339032cb754d666f6a9e022d7ae7f596a69b3ce
 EBUILD trousers-0.3.6-r1.ebuild 3013 SHA256 ad0f6f3f560ac0fe2201c4c35535d3485677a212baaacd16abf8cf36e9926c44 SHA512 64c5ac6c675a7656137941fae6219331ecb973b39c6c75a81b9c4bea2700ed223093dfd4260be6f9534b449b6101d56a7c71ce80c02add795481637989d198bf WHIRLPOOL 580d273eb84c1c3542df46e5352739bc3fd6c8abfbdadfbb68094c3bd11ae271b5c8a12ca03c826637d8e0b3cbee6ba3edc404d85f8c3ee0ac0ed0647b1b1dbf
 EBUILD trousers-0.3.6.ebuild 2976 SHA256 5a08fc9d3d8e8cbb941015f8c5f00addda7792f47ec417777419fa6d7fb27eb9 SHA512 2120db171f95c29e7971c85c76c4378c348a6ce728c1c34073c271e6e55576ed42020307d2677ad0a74e81a9b7f9acb0bb699ae839298b82873ae85915a1a995 WHIRLPOOL 1e75ae789c402baa2a928bd1518b68da36e0b9ffc5f21074eb7bfdd7f094e9896ee6b7f9673729b9268c1dce1d78615a42a373a90cf1b8a5d9766626c279fd7d
-MISC ChangeLog 7728 SHA256 b30314f620b9316430baa8995eb691713601a219025ee3f9cc8c404002b2c2cb SHA512 6a83613743e46a007fb0b8e3e7df09701d50c486ab38482f6965c43299ebd1f62171242902997fa4a1bbea169f2b39d9fc2f8d03ee9281212f41b3e6f9337871 WHIRLPOOL 7623bdc413ea7f8ffb7c6c4779f7d86c5335b1ed7e2f509e061480faa40246cbb09a0c532dd1fc9bde8d4487141b28018377d94139ccdac055716106c5b241f2
+MISC ChangeLog 7975 SHA256 5d39803f9c491fc498762eb960501e77e3d96f899fefb281b90b405d897e3894 SHA512 008e3f518d5c362e86e1e7f41c0233fea9e364026dfd0b40e49691570140d28033406855222070d63a0f995c386df8bd3fea1a230e239e8b2a1dab38ad1e4336 WHIRLPOOL d660c542844bbab5777896626f2031b03865d25373acaf141b9d01ba9a38466657ff3cc79b5737b37d6f88c0ea179464a84e0e4ec90654711ae39cc013cce465
 MISC metadata.xml 241 SHA256 e2bdcf9828d343566ed4718acd860b34d38c2b7a86656d4fc1a7d819889fbf91 SHA512 99e8603796d9d6d5fe9b9ddd4d3c468a77d706a665df2cd75db5e96630dd2a8866f85cab017fa3ed87d230b87d8546176e624835e64d101accc7d9dc10b95593 WHIRLPOOL 23d89eb8ee02379cc1b46ed4efc25eeb153e0dca6c59993e6806e9a281c0c85405fd30c00877c5e35d87216eb9ed504fc996972dd71dec2889ea5e2880b15572
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRtQfhAAoJELEHsLL7fEFW12YP/icu4m29SLSd5LYAs/TRf+oK
-pQzFOiNe0UUHQsExf3JW8YLhtwai+ti11SpE/4e78o0tM+vbIcmHU//vZ2H2eGQ2
-Rp+G9e3A83I7Ru/zBVIspf2jznmlddAbB/BzBW2neQ2sMi8GqMIn5KA6LE5xO2ts
-jxSdAhjCZNY7j8VaCXBirxkAtRrT2a4LuHx+l++IUi34FWRLWhOMlnMj2z+60zHx
-+RwLH8/L+Pw8B9U58bwp2qxXxowPkxtHTQZ1y41ymp/xzoDI9xetwkIIjNfz2QO+
-8TfigCof1L1mq8DKmozfUHKZpau3vipjdp5EV80Jv/b7s++MWNb4HTF+dqaDCxgg
-54IRjA3Y4X+5/PIPFvU3uu1R5tFJ8hNTn51X+7MAriGYT8cVSIA/uyTs+Q9U0z9+
-65qD8Dnzhl2ADnIaH2Ro+bDZfTWUODNII9SR6QEa9qNdA0ZrRcsRdY7A5kfXnKdT
-3gVgKcaNq12F7pZr69aIQDrbAKEiAtowxKdAv1zHzV6Z32CDeALuuH6YYqRhers3
-RLg6aaPUvnTgYWkJU5C8UL4x+FHMogy8DVoX/ZNK4iaKpVZKN0l9eVpz94cl3s/s
-Xpfl+7+3B/yGzY84AKAGy0xuSBBg16EcsakYM9ETrvEbf/xGcG7G+QhwPIXn5jtX
-11KEG8S0Jm/SfSwErsuk
-=04j7
+iEYEAREIAAYFAlOAbIoACgkQCaWpQKGI+9SckACeJVW8M5/0jIXh7zZYuv5E2Sbz
+160An1ve6hLCGT00mFMJwgojaBTL6m/M
+=R8j7
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/trousers/files/tcsd.service b/app-crypt/trousers/files/tcsd.service
new file mode 100644
index 000000000000..4a46e6143bc1
--- /dev/null
+++ b/app-crypt/trousers/files/tcsd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=TCG Core Services Daemon
+
+[Service]
+User=tss
+ExecStart=/usr/sbin/tcsd -f
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/app-crypt/trousers/trousers-0.3.10-r1.ebuild b/app-crypt/trousers/trousers-0.3.10-r1.ebuild
new file mode 100644
index 000000000000..b07fe7a17b60
--- /dev/null
+++ b/app-crypt/trousers/trousers-0.3.10-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.10-r1.ebuild,v 1.1 2014/05/24 09:55:21 pacho Exp $
+
+EAPI=5
+
+inherit autotools eutils linux-info readme.gentoo systemd user udev
+
+#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 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc" # gtk
+
+# gtk support presently does NOT compile.
+#	gtk? ( >=x11-libs/gtk+-2 )
+
+RDEPEND=">=dev-libs/glib-2
+	>=dev-libs/openssl-0.9.7:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+# S="${WORKDIR}/${P}git"
+
+DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"
+
+DOC_CONTENTS="
+	If you have problems starting tcsd, please check permissions and
+	ownership on /dev/tpm* and ~tss/system.data
+"
+
+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}"/${PN}-0.3.5-nouseradd.patch
+
+	sed -i -r \
+		-e '/CFLAGS/s/ -(Werror|m64)//' \
+		configure.in || die
+	eautoreconf
+}
+
+src_configure() {
+	# econf --with-gui=$(usex gtk gtk openssl)
+	econf --with-gui=openssl
+}
+
+src_install() {
+	keepdir /var/lib/tpm
+	default
+	use doc && dodoc doc/*
+	newinitd "${FILESDIR}"/tcsd.initd tcsd
+	newconfd "${FILESDIR}"/tcsd.confd tcsd
+	systemd_dounit "${FILESDIR}"/tcsd.service
+	udev_dorules "${FILESDIR}"/61-trousers.rules
+	fowners tss:tss /var/lib/tpm
+	prune_libtool_files
+	readme.gentoo_create_doc
+}