Version bump, bug#545882, thanks to Kristian

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

diff --git a/app-crypt/trousers/ChangeLog b/app-crypt/trousers/ChangeLog
index 72094daf2972e47813e371ae9073d4cf04d9a6d3..459238d06ab3af39a471133062d99a9cd3bec3d1 100644 (file)
--- a/app-crypt/trousers/ChangeLog
+++ b/app-crypt/trousers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/trousers
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.55 2014/11/12 00:45:24 blueness Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.56 2015/04/08 07:12:41 alonbl Exp $
+
+*trousers-0.3.13 (08 Apr 2015)
+
+  08 Apr 2015; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/trousers-0.3.13-nouseradd.patch, +trousers-0.3.13.ebuild:
+  Version bump, bug#545882, thanks to Kristian
 
   12 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
   trousers-0.3.10-r1.ebuild:

diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index 770519ae2c3cfb8ba48441c3cbc953b1f997f835..23ec4945ab667ee05e65ff3272007e80888b23a4 100644 (file)
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -5,25 +5,18 @@ AUX 61-trousers.rules 96 SHA256 8f25b51dca45b75caa85a00ef476fb40c09d6cc82e2351cb
 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.13-nouseradd.patch 606 SHA256 af43a38991c10db8a817faaa4ff244f3600c90a10e26a0232e7668f15f84e911 SHA512 a6c9074e535429f09ce5e850d943378348b54bed479b7fef0fff7bb18ab2547421407900aa35533749a764275a241ddbd083c4e2f3d6a9ad6f9b1d40d090f783 WHIRLPOOL 2ca8c22aa11aee2f06ce0dfc7c2d035b10724999302818461e72ed9fc29d813112dd52ac80ac7c1027b301f7bdcffe085537dfbf05affebf3ca96992026ae11b
 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.13.tar.gz 1371901 SHA256 bb908e4a3c88a17b247a4fc8e0fff3419d8a13170fe7bdfbe0e2c5c082a276d3 SHA512 c54407e538712f738b593707ffc6d617348d73de91dfddd9057273c2fcec26e5738e89db005d36d52596630a9d583f7fcb8cc388f597da6212891e2d79dce699 WHIRLPOOL 8099d2f01b1c64b2e92c78130c9f66766f9054a1ab557f0d6da149ca4869c9fed7ee3a26454ab50bd67069d30c758ccabb450dead1d9100ffacac9f596f6d46b
 EBUILD trousers-0.3.10-r1.ebuild 3127 SHA256 cd1f2efc8087f78ec65d90830c60d584955f5247b8230169f01a306c420e5bf9 SHA512 925bce568537d1f01e060551117a34abb74cae6ef092900881d6355b75234cd49cdc8c14c71d5790821f5752d0717e05b587846459bac6d1ebcb2a508397ea66 WHIRLPOOL 41709dc02e864ee9dca1af2357dee5791415df474e1eb9eb29b236d85c41519bbce0126366e4a05239ceb253356cab73f90cea7532836c1dc2c5e4edb860fed6
-MISC ChangeLog 9224 SHA256 2eed30fbb0ead346e471c2f5b08ba696873bb7f01c5e913533ed08a7e5f1bb7a SHA512 bf9ea7ce3592a15883c451ec10b76fd44c92425e6e95397b530de575347c29c7819590dc9540b6e273e384466757022cee2c3b2e8a6712a705dc5b572d36e384 WHIRLPOOL e0a0075754a16acb275dbac234888fcc636b729616e77791e85b3b57273c7c9b09014fe474189d5da6fa22725dba43915b712439a3d5dd72ddca269264fc7ced
+EBUILD trousers-0.3.13.ebuild 3024 SHA256 d84ab88dbb4efdb4093598dfcf0e838952040704187882f374db37ec050889e9 SHA512 f0ccca18575265b36b53c970acd7254b1400edf1ff9653b7a1d168c0d94b601c12e34fbe3d7f8a3a4f93297659b96a2443f45642fd924aba18cb3009dd3025cc WHIRLPOOL 1ddde41c87f151b30e6eb53967e68266604ae14c19e8b422d216ff40d82dc354bb4dfa0db4253fdb7f31a08a1cb14e336356874bcd04a2acd11cc896fc8323ee
+MISC ChangeLog 9417 SHA256 086abef612b4faf2d5d4b56ad368bb9de7e9b0ba2d0b4fb2d9d496d7367c0c45 SHA512 634cee8794e0e1729298ec4ef40fed3099c673494264ab634ff5da78a8975c30597628d08f3fd05876aff305fdf16735b10c7e5cbd80eed7fbda3ddac6bcd9c4 WHIRLPOOL 40d41ceaf01ded9fa745556496c4926987787946f78ca367a1a302a182079d01e1482c4de27cad221b3990e8083305c70eccb2bd934b632838153ff65100c6b8
 MISC metadata.xml 241 SHA256 e2bdcf9828d343566ed4718acd860b34d38c2b7a86656d4fc1a7d819889fbf91 SHA512 99e8603796d9d6d5fe9b9ddd4d3c468a77d706a665df2cd75db5e96630dd2a8866f85cab017fa3ed87d230b87d8546176e624835e64d101accc7d9dc10b95593 WHIRLPOOL 23d89eb8ee02379cc1b46ed4efc25eeb153e0dca6c59993e6806e9a281c0c85405fd30c00877c5e35d87216eb9ed504fc996972dd71dec2889ea5e2880b15572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUYq4uAAoJEJOE+m71LUu6KFkP/RQTeJ1EVCzXmAGoXaFMYc1d
-bzEbXBguPzuQvmPPPIbEfIVayvg70h3KNZMVsNbxxsjhatnVIMolwQ6lc92sRhmY
-fgbZBP8b0nH2Lq4rfjJFZ+FSzzyAg0EebbXmxVlxYVXj09pTBngaSf8muMEGMyKO
-thL2wTRaXDtRcIYjo1buh3/GNjxtNs/Q5Ofl3gLpvqQGM59191a04Aaiw8EIpHdu
-6OIx3Q5FKH17vQNBlLMD8oZa04mcKL4fFBJshzoWw08eM+hW2t5Zoix9IAdzwn7d
-ovimhIRSreYmNI5+2vDyrbz8pMhTvpnnR1LgHHxqTRhKNPh7gho73eBYyUlGnepA
-NdkwsDsVsfkb8CCVEj1qBRX/v0CkbS5TYEvLBXAUjuDJi5gGszBa80ITHZV3Hvw5
-w/vtek4bAaPNQFCQrLRXEZO17xrYan7gLNhTmxgDtX/1gLDIe7s5JZA9e2mOCD52
-LsgizOMNmdVEWdV4ROU1zzGgO0jqprbP3SMVpJyND2ft6Sxu9hHClEv9C3VPe6Pb
-OysoCSQFzua6dLEGa3Gos5ynnMFqVZgeVczYCWLoHm/JWXIDD1bcYvbrtGQ0NVIY
-Gtn4uq9iN8Onk5iRNgUgI0z0h1lvuXm9zw1EpDPM8dbFCJGOXDYnfawZ0Dcg9bVv
-0pNOkJjf7pznwFLAKYB6
-=i024
+iF4EAREIAAYFAlUk1PAACgkQXYk9GL8g3FGlrAEAhMhNKEJ8hU/vwxNY6qz8aDsF
+MSqpuLbosaSNPRICVFYBAJVm/U3qiam7UaOycGGYR40CFOlXdYgn0YLd0ynuJcP+
+=jhYK
 -----END PGP SIGNATURE-----

diff --git a/app-crypt/trousers/files/trousers-0.3.13-nouseradd.patch b/app-crypt/trousers/files/trousers-0.3.13-nouseradd.patch
new file mode 100644 (file)
index 0000000..5426e99
--- /dev/null
+++ b/app-crypt/trousers/files/trousers-0.3.13-nouseradd.patch
@@ -0,0 +1,12 @@
+diff -urNp trousers-0.3.13.org/dist/Makefile.am trousers-0.3.13/dist/Makefile.am
+--- trousers-0.3.13.org/dist/Makefile.am       2014-04-24 21:05:43.000000000 +0300
++++ trousers-0.3.13/dist/Makefile.am   2015-04-08 10:05:51.018955728 +0300
+@@ -11,8 +11,6 @@ endif
+ install-exec-hook:
+       /bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/lib/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/lib/tpm; fi'
+ if !NOUSERCHECK
+-      /usr/sbin/groupadd tss || true
+-      /usr/sbin/useradd -r tss -g tss || true
+       /bin/chown tss:tss ${DESTDIR}/@localstatedir@/lib/tpm || true
+       /bin/chmod 0700 ${DESTDIR}/@localstatedir@/lib/tpm
+ endif

diff --git a/app-crypt/trousers/trousers-0.3.13.ebuild b/app-crypt/trousers/trousers-0.3.13.ebuild
new file mode 100644 (file)
index 0000000..174d169
--- /dev/null
+++ b/app-crypt/trousers/trousers-0.3.13.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.13.ebuild,v 1.1 2015/04/08 07:12:41 alonbl Exp $
+
+EAPI=5
+
+inherit 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 ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86"
+IUSE="doc selinux" # gtk
+
+# gtk support presently does NOT compile.
+#      gtk? ( >=x11-libs/gtk+-2 )
+
+CDEPEND=">=dev-libs/glib-2
+       >=dev-libs/openssl-0.9.7:0"
+DEPEND="${CDEPEND}
+       virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+       selinux? ( sec-policy/selinux-tcsd )"
+# 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}"/${P}-nouseradd.patch
+}
+
+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
+}