as-needed patch per bug #131849. Version bump to 1.2.3 also done.

(Portage version: 2.1_pre10-r2)

7 files changed, 116 insertions, 5 deletions

diff --git a/app-crypt/tpm-tools/ChangeLog b/app-crypt/tpm-tools/ChangeLog
index ee0436284fd6..d10773a42806 100644
--- a/app-crypt/tpm-tools/ChangeLog
+++ b/app-crypt/tpm-tools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-crypt/tpm-tools
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/ChangeLog,v 1.2 2005/09/17 13:35:48 dragonheart Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/ChangeLog,v 1.3 2006/05/06 22:28:05 dragonheart Exp $
+
+*tpm-tools-1.2.3 (06 May 2006)
+
+  06 May 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/tpm-tools-1.1.0-as-needed.patch,
+  +files/tpm-tools-1.2.3-as-needed.patch, tpm-tools-1.1.0.ebuild,
+  +tpm-tools-1.2.3.ebuild:
+  as-needed patch per bug #131849 thanks to TGL <degrenier@easyconnect.fr>.
+  Version bump to 1.2.3 also done.
 
 *tpm-tools-1.1.0 (17 Sep 2005)
 
diff --git a/app-crypt/tpm-tools/files/digest-tpm-tools-1.1.0 b/app-crypt/tpm-tools/files/digest-tpm-tools-1.1.0
index 38690ce406cc..02102fe38b9d 100644
--- a/app-crypt/tpm-tools/files/digest-tpm-tools-1.1.0
+++ b/app-crypt/tpm-tools/files/digest-tpm-tools-1.1.0
@@ -1 +1,3 @@
 MD5 50e31ab36b4b84667c7d9b8d70f346a6 tpm-tools-1.1.0.tar.gz 717441
+RMD160 57974ac508b8daf917b9191b28a7404b20863c9b tpm-tools-1.1.0.tar.gz 717441
+SHA256 06ac96fc29d35dfa64d514e2761d8b11769f45de04f394cf1f25c5211928033b tpm-tools-1.1.0.tar.gz 717441
diff --git a/app-crypt/tpm-tools/files/digest-tpm-tools-1.2.3 b/app-crypt/tpm-tools/files/digest-tpm-tools-1.2.3
new file mode 100644
index 000000000000..4f85ca0dcd7e
--- /dev/null
+++ b/app-crypt/tpm-tools/files/digest-tpm-tools-1.2.3
@@ -0,0 +1,3 @@
+MD5 29671c0ca5c8ea032b968f5ab4421de8 tpm-tools-1.2.3.tar.gz 845943
+RMD160 b1c4035314a929786360bbfaad3bd35e4a2abcc1 tpm-tools-1.2.3.tar.gz 845943
+SHA256 641331f126fdcfac773d09971fdd98069b96c56d5fd38be7d4e1a4e660a5b59d tpm-tools-1.2.3.tar.gz 845943
diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.1.0-as-needed.patch b/app-crypt/tpm-tools/files/tpm-tools-1.1.0-as-needed.patch
new file mode 100644
index 000000000000..c9ff79a7c9ca
--- /dev/null
+++ b/app-crypt/tpm-tools/files/tpm-tools-1.1.0-as-needed.patch
@@ -0,0 +1,22 @@
+--- tpm-tools-1.1.0/src/tpm_mgmt/Makefile.am.orig	2006-04-30 22:01:47.000000000 +0200
++++ tpm-tools-1.1.0/src/tpm_mgmt/Makefile.am	2006-04-30 22:02:05.000000000 +0200
+@@ -37,8 +37,6 @@
+ 
+ AM_CPPFLAGS	=	-I$(top_builddir)/include -D_LINUX
+ 
+-AM_LDFLAGS	=	-ltspi
+-
+ LDADD		=	$(top_builddir)/lib/libtpm_tspi.la
+ 
+ tpm_changeownerauth_SOURCES =	tpm_changeauth.c
+--- tpm-tools-1.1.0/lib/Makefile.am.orig	2006-04-30 22:04:54.000000000 +0200
++++ tpm-tools-1.1.0/lib/Makefile.am	2006-04-30 22:04:59.000000000 +0200
+@@ -40,7 +40,7 @@
+ #
+ # TSPI interface library
+ libtpm_tspi_la_SOURCES	=	tpm_tspi.c
+-libtpm_tspi_la_LIBADD	=	libtpm_utils.la
++libtpm_tspi_la_LIBADD	=	libtpm_utils.la -ltspi
+ 
+ #
+ # PKCS#11 interface library
diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.2.3-as-needed.patch b/app-crypt/tpm-tools/files/tpm-tools-1.2.3-as-needed.patch
new file mode 100644
index 000000000000..3b3e81b5eef6
--- /dev/null
+++ b/app-crypt/tpm-tools/files/tpm-tools-1.2.3-as-needed.patch
@@ -0,0 +1,24 @@
+diff -ru tpm-tools-1.2.3.orig/lib/Makefile.am tpm-tools-1.2.3/lib/Makefile.am
+--- tpm-tools-1.2.3.orig/lib/Makefile.am	2005-08-09 06:10:04.000000000 +1000
++++ tpm-tools-1.2.3/lib/Makefile.am	2006-05-07 08:23:17.000000000 +1000
+@@ -40,7 +40,7 @@
+ #
+ # TSPI interface library
+ libtpm_tspi_la_SOURCES	=	tpm_tspi.c
+-libtpm_tspi_la_LIBADD	=	libtpm_utils.la
++libtpm_tspi_la_LIBADD	=	libtpm_utils.la -ltspi
+ 
+ #
+ # PKCS#11 interface library
+diff -ru tpm-tools-1.2.3.orig/src/tpm_mgmt/Makefile.am tpm-tools-1.2.3/src/tpm_mgmt/Makefile.am
+--- tpm-tools-1.2.3.orig/src/tpm_mgmt/Makefile.am	2005-11-08 08:26:03.000000000 +1100
++++ tpm-tools-1.2.3/src/tpm_mgmt/Makefile.am	2006-05-07 08:22:56.000000000 +1000
+@@ -39,8 +39,6 @@
+ 
+ AM_CPPFLAGS	=	-I$(top_builddir)/include -D_LINUX
+ 
+-AM_LDFLAGS	=	-ltspi
+-
+ LDADD		=	$(top_builddir)/lib/libtpm_tspi.la
+ 
+ tpm_startup_SOURCES = 		tpm_startup.c
diff --git a/app-crypt/tpm-tools/tpm-tools-1.1.0.ebuild b/app-crypt/tpm-tools/tpm-tools-1.1.0.ebuild
index 82e36237ecbe..1702a1b3224b 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.1.0.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.1.0.ebuild,v 1.1 2005/09/17 13:35:48 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.1.0.ebuild,v 1.2 2006/05/06 22:28:05 dragonheart Exp $
 
 inherit autotools
 
@@ -34,7 +34,9 @@ src_unpack() {
 	sed -i '/\<po\>/d' Makefile.am
 	sed -i -e '/AM_GNU_GETTEXT/d' -e '\:po/Makefile.in:d' configure.in
 
-	eautoconf
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+
+	eautoreconf
 }
 
 src_compile() {
diff --git a/app-crypt/tpm-tools/tpm-tools-1.2.3.ebuild b/app-crypt/tpm-tools/tpm-tools-1.2.3.ebuild
new file mode 100644
index 000000000000..4189342d5929
--- /dev/null
+++ b/app-crypt/tpm-tools/tpm-tools-1.2.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.2.3.ebuild,v 1.1 2006/05/06 22:28:05 dragonheart Exp $
+
+inherit autotools
+
+DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
+HOMEPAGE="http://trousers.sf.net"
+SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND="virtual/libc
+	>=dev-libs/openssl-0.9.7
+	>=app-crypt/trousers-0.1.1"
+# TODO: add optionnal opencryptoki support
+
+DEPEND="${RDEPEND}
+	sys-devel/autoconf"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+	cd "${S}"
+
+	# workaround econf "updating config.sub" sandbox violation
+	## (bug #96242 for instance):	
+	#touch config.sub
+
+	# no translation so far -> no need to gettextize it 
+	# (makes compilation a bit simpler...):
+	sed -i '/^gettextize/d' ./bootstrap.sh
+	sed -i '/\<po\>/d' Makefile.am
+	sed -i -e '/AM_GNU_GETTEXT/d' -e '\:po/Makefile.in:d' configure.in
+
+	eautoreconf
+}
+
+src_compile() {
+	econf --disable-nls || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc README
+}