diff options
| -rw-r--r-- | app-crypt/trousers/ChangeLog | 12 | ||||
| -rw-r--r-- | app-crypt/trousers/files/61-trousers.rules | 2 | ||||
| -rw-r--r-- | app-crypt/trousers/files/trousers-0.2.3-nouseradd.patch | 22 | ||||
| -rw-r--r-- | app-crypt/trousers/trousers-0.3.5.ebuild | 18 | ||||
| -rw-r--r-- | app-crypt/trousers/trousers-0.3.6.ebuild (renamed from app-crypt/trousers/trousers-0.3.2.1-r1.ebuild) | 42 |
5 files changed, 52 insertions, 44 deletions
diff --git a/app-crypt/trousers/ChangeLog b/app-crypt/trousers/ChangeLog index 12a7b2f0edad..1f0bc65645b1 100644 --- a/app-crypt/trousers/ChangeLog +++ b/app-crypt/trousers/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-crypt/trousers # 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 $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.26 2010/08/06 01:22:57 robbat2 Exp $ + +*trousers-0.3.6 (06 Aug 2010) + + 06 Aug 2010; Robin H. Johnson <robbat2@gentoo.org> + +files/61-trousers.rules, -files/trousers-0.2.3-nouseradd.patch, + -trousers-0.3.2.1-r1.ebuild, trousers-0.3.5.ebuild, + +trousers-0.3.6.ebuild: + Bug #329451: version bump. Bug #330287: setup for USE=gtk, but disable for + now as USE=gtk does not even build for me, due to missing support.h. Bug + #232190: include udev rules. *trousers-0.3.5 (27 Jun 2010) diff --git a/app-crypt/trousers/files/61-trousers.rules b/app-crypt/trousers/files/61-trousers.rules new file mode 100644 index 000000000000..20e89cbe3acd --- /dev/null +++ b/app-crypt/trousers/files/61-trousers.rules @@ -0,0 +1,2 @@ +KERNEL=="tpm[0-9]*", MODE="0660", OWNER="tss", GROUP="tss", SYMLINK+="tpm" +# vim: ft=udevrules: diff --git a/app-crypt/trousers/files/trousers-0.2.3-nouseradd.patch b/app-crypt/trousers/files/trousers-0.2.3-nouseradd.patch deleted file mode 100644 index 3b44ed320111..000000000000 --- a/app-crypt/trousers/files/trousers-0.2.3-nouseradd.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- dist/Makefile.am.orig 2005-07-30 19:33:46.000000000 +1000 -+++ dist/Makefile.am 2005-07-30 19:34:09.000000000 +1000 -@@ -9,8 +9,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/chown tss:tss ${DESTDIR}/@sbindir@/tcsd - /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 ---- dist/Makefile.in.orig 2005-07-30 19:33:52.000000000 +1000 -+++ dist/Makefile.in 2005-07-30 19:34:22.000000000 +1000 -@@ -369,8 +369,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/chown tss:tss ${DESTDIR}/@sbindir@/tcsd - /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 diff --git a/app-crypt/trousers/trousers-0.3.5.ebuild b/app-crypt/trousers/trousers-0.3.5.ebuild index 67364ebd4306..104ad5494b68 100644 --- a/app-crypt/trousers/trousers-0.3.5.ebuild +++ b/app-crypt/trousers/trousers-0.3.5.ebuild @@ -1,6 +1,6 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.5.ebuild,v 1.2 2010/08/06 01:22:57 robbat2 Exp $ EAPI="3" @@ -14,10 +14,12 @@ SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz" LICENSE="CPL-1.0" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc" +IUSE="doc" # gtk + +# gtk support presently does NOT compile. +# gtk? ( >=x11-libs/gtk+-2 ) RDEPEND=">=dev-libs/glib-2 - >=x11-libs/gtk+-2 >=dev-libs/openssl-0.9.7" DEPEND="${RDEPEND} @@ -67,12 +69,17 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}/${P}-nouseradd.patch" + epatch "${FILESDIR}/${PN}-0.3.5-nouseradd.patch" sed -e "s/ -Werror//" -i configure.in eautoreconf } +src_configure() { + #econf --with-gui=$(usev gtk || echo openssl) || die "econf failed" + econf --with-gui=openssl || die "econf failed" +} + src_install() { keepdir /var/lib/tpm make DESTDIR="${D}" install || die @@ -80,6 +87,9 @@ src_install() { use doc && dodoc doc/* newinitd "${FILESDIR}/tcsd.initd" tcsd newconfd "${FILESDIR}/tcsd.confd" tcsd + insinto /etc/udev/rules.d + doins "${FILESDIR}"/61-trousers.rules + fowners tss:tss /var/lib/tpm } pkg_postinst() { diff --git a/app-crypt/trousers/trousers-0.3.2.1-r1.ebuild b/app-crypt/trousers/trousers-0.3.6.ebuild index f45d7202659a..15452dc7b8bd 100644 --- a/app-crypt/trousers/trousers-0.3.2.1-r1.ebuild +++ b/app-crypt/trousers/trousers-0.3.6.ebuild @@ -1,31 +1,31 @@ -# Copyright 1999-2009 Gentoo Foundation +# 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.2.1-r1.ebuild,v 1.1 2009/09/06 22:50:29 ikelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.6.ebuild,v 1.1 2010/08/06 01:22:57 robbat2 Exp $ -EAPI="2" +EAPI="3" -inherit autotools base eutils linux-info +inherit autotools eutils linux-info -MY_P="${PN}-${PV%.*}-${PV##*.}" +#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/${MY_P}.tar.gz" +SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz" LICENSE="CPL-1.0" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc" +IUSE="doc" # gtk + +# gtk support presently does NOT compile. +# gtk? ( >=x11-libs/gtk+-2 ) RDEPEND=">=dev-libs/glib-2 - >=x11-libs/gtk+-2 >=dev-libs/openssl-0.9.7" DEPEND="${RDEPEND} dev-util/pkgconfig" -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}/${PN}-0.2.3-nouseradd.patch" ) +# S="${WORKDIR}/${P}git" pkg_setup() { # Check for driver (not sure it can be an rdep, because ot depends on the @@ -39,16 +39,16 @@ pkg_setup() { ewarn "No kernel configuration could be found." fi has_version app-crypt/tpm-emulator && tpm_module="yes" - if [[ -n "${tpm_kernel_present}" ]] ; then + if [[ -n "${tpm_kernel_present}" ]]; then einfo "Good, you seem to have in-kernel TPM support." - elif [[ -n "${tpm_module}" ]] ; then + elif [[ -n "${tpm_module}" ]]; then einfo "Good, you seem to have TPM support with the external module." - if [[ -n "${tpm_kernel_version}" ]] ; then + 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 + 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," @@ -69,12 +69,17 @@ pkg_setup() { } src_prepare() { - base_src_prepare + epatch "${FILESDIR}/${PN}-0.3.5-nouseradd.patch" - sed -e "s/-Werror //" -i configure.in + sed -e "s/ -Werror//" -i configure.in eautoreconf } +src_configure() { + #econf --with-gui=$(usev gtk || echo openssl) || die "econf failed" + econf --with-gui=openssl || die "econf failed" +} + src_install() { keepdir /var/lib/tpm make DESTDIR="${D}" install || die @@ -82,6 +87,9 @@ src_install() { use doc && dodoc doc/* newinitd "${FILESDIR}/tcsd.initd" tcsd newconfd "${FILESDIR}/tcsd.confd" tcsd + insinto /etc/udev/rules.d + doins "${FILESDIR}"/61-trousers.rules + fowners tss:tss /var/lib/tpm } pkg_postinst() { |