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

Package-Manager: portage-2.1_pre10-r2

8 files changed, 151 insertions, 12 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/Manifest b/app-crypt/tpm-tools/Manifest
index 1bd22442908c..8d5f48836303 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -1,14 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX tpm-tools-1.1.0-as-needed.patch 713 RMD160 730a4b08989261107d36ca1576631c862c3d4c63 SHA1 3b6f922cd54c14994bc595841573b3f8a1cb457a SHA256 579a3529755fcb1e5e8329057b2e132582ce5fdc4f72c540e50a6e0f76d0b87c size 713
+MD5 7fa6893acb41f8ccd71a7f8aff7e0778 files/tpm-tools-1.1.0-as-needed.patch 713
+RMD160 730a4b08989261107d36ca1576631c862c3d4c63 files/tpm-tools-1.1.0-as-needed.patch 713
+SHA256 579a3529755fcb1e5e8329057b2e132582ce5fdc4f72c540e50a6e0f76d0b87c files/tpm-tools-1.1.0-as-needed.patch 713
+AUX tpm-tools-1.2.3-as-needed.patch 878 RMD160 91775881386a2e1431112eaa4f4efd71b7d1846c SHA1 c14009d1d0534af0b0a4c76354a70a220a2141b9 SHA256 ac402886d88dc93694de9a567ade23132128782fcc88df5271dc0844ca6bd16c size 878
+MD5 26aacde98626c14a9dffb26f937490e2 files/tpm-tools-1.2.3-as-needed.patch 878
+RMD160 91775881386a2e1431112eaa4f4efd71b7d1846c files/tpm-tools-1.2.3-as-needed.patch 878
+SHA256 ac402886d88dc93694de9a567ade23132128782fcc88df5271dc0844ca6bd16c files/tpm-tools-1.2.3-as-needed.patch 878
+DIST tpm-tools-1.1.0.tar.gz 717441 RMD160 57974ac508b8daf917b9191b28a7404b20863c9b SHA256 06ac96fc29d35dfa64d514e2761d8b11769f45de04f394cf1f25c5211928033b size 717441
+DIST tpm-tools-1.2.3.tar.gz 845943 RMD160 b1c4035314a929786360bbfaad3bd35e4a2abcc1 SHA256 641331f126fdcfac773d09971fdd98069b96c56d5fd38be7d4e1a4e660a5b59d size 845943
+EBUILD tpm-tools-1.1.0.ebuild 1249 RMD160 af1be8db66fb6fe9d87c3a935dfeff6c67e07949 SHA1 0c6382970e67e8ca4699d75433277661a2fbd3b1 SHA256 fb5ef92226b34b25d9edad10a1d2cc9502384c6a1ead543a8abe1e7ee93f4a58 size 1249
+MD5 e2b32ee0d0c09834d9489197768dba51 tpm-tools-1.1.0.ebuild 1249
+RMD160 af1be8db66fb6fe9d87c3a935dfeff6c67e07949 tpm-tools-1.1.0.ebuild 1249
+SHA256 fb5ef92226b34b25d9edad10a1d2cc9502384c6a1ead543a8abe1e7ee93f4a58 tpm-tools-1.1.0.ebuild 1249
+EBUILD tpm-tools-1.2.3.ebuild 1248 RMD160 e748f00601070f9397119e5bf5d31c36ef348900 SHA1 d5eac47b4c3c5e56d60cb2e530831c6a5468a502 SHA256 5a79f1ee80bae094f836a6eada5e7ec29da05c6dd3312b88b3074c099df09c9c size 1248
+MD5 2848d644dc6a7f032e75b4f87a44fb1d tpm-tools-1.2.3.ebuild 1248
+RMD160 e748f00601070f9397119e5bf5d31c36ef348900 tpm-tools-1.2.3.ebuild 1248
+SHA256 5a79f1ee80bae094f836a6eada5e7ec29da05c6dd3312b88b3074c099df09c9c tpm-tools-1.2.3.ebuild 1248
+MISC ChangeLog 921 RMD160 aa3882f1e278f8bb098c43da3bb264be766925ca SHA1 c24371e684dab54c3b00857de0c491411d10d75f SHA256 5e99a75a1e18f81b75351b4c70007aef6ddec1831a177cd6dcfae1c23058999f size 921
+MD5 c9c22667cd5b0aeac0790f8af1fe783f ChangeLog 921
+RMD160 aa3882f1e278f8bb098c43da3bb264be766925ca ChangeLog 921
+SHA256 5e99a75a1e18f81b75351b4c70007aef6ddec1831a177cd6dcfae1c23058999f ChangeLog 921
+MISC metadata.xml 251 RMD160 9c13ff790c7419d4e0d2d370036b7f4e4594ea4f SHA1 563aa19984b291a6cade6d6487dbf4a2a17e6874 SHA256 1739a4e8833a2a5b9501182eb830cbd3e26014ccef5e9ae1b4d7a0686c665c1b size 251
 MD5 2603eeeb20b24caddac3e9ce6996f357 metadata.xml 251
-MD5 80a451ed422dc9c603dee4cfd5c9e3c6 ChangeLog 589
-MD5 ce00b740236eb00506803a11a62a83bf tpm-tools-1.1.0.ebuild 1203
-MD5 5782fe9901a3650c816e0f3fe45d3b33 files/digest-tpm-tools-1.1.0 67
+RMD160 9c13ff790c7419d4e0d2d370036b7f4e4594ea4f metadata.xml 251
+SHA256 1739a4e8833a2a5b9501182eb830cbd3e26014ccef5e9ae1b4d7a0686c665c1b metadata.xml 251
+MD5 bf773261b12093aab2dc1339ab9a38c4 files/digest-tpm-tools-1.1.0 247
+RMD160 8b9930c67a5069eb65fa2a615d0976bb01d3091e files/digest-tpm-tools-1.1.0 247
+SHA256 65830d9b0eb249fbf3b3ffba7afb7d6abbc1474c9590ac97163f313d5ff27eaf files/digest-tpm-tools-1.1.0 247
+MD5 0e5858ee9f5cb15a66b26695f2ff9ca7 files/digest-tpm-tools-1.2.3 247
+RMD160 94637307c2215c68af80b120701191fbd30a5639 files/digest-tpm-tools-1.2.3 247
+SHA256 754e141cc1c8a72d39975b2b95e268e9812cd12411941a44c24dc2db492637c1 files/digest-tpm-tools-1.2.3 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFDLBvNmdTrptrqvGERAgX0AJ9Zqyu/hsa6QQeG2HUKQc1akH3qewCfab5Y
-edBa/5TB6z4m8IqN+mK51q4=
-=wGc6
+iD8DBQFEXSOgmdTrptrqvGERAt8IAJwJA2Nt3Kcx0AkPn/C1OuEne1eNnQCgiieN
+ASz8W9yUIWAjjlPum5qlcoI=
+=L3KP
 -----END PGP SIGNATURE-----
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
+}