summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2011-04-30 12:36:13 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2011-04-30 12:36:13 +0000
commita8ebde0f8c5667ab297a6be76674a12d7d82ca02 (patch)
treefbea707990afee88f1f2c0b8412eb95f64f719dd /app-crypt/tpm-tools
parentVersion bumped. Unconditionally install to /lib/udev, also on multilib, Bug #... (diff)
downloadhistorical-a8ebde0f8c5667ab297a6be76674a12d7d82ca02.tar.gz
historical-a8ebde0f8c5667ab297a6be76674a12d7d82ca02.tar.bz2
historical-a8ebde0f8c5667ab297a6be76674a12d7d82ca02.zip
Extend the gold patch to work even when trousers is not installing .la files.
Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64
Diffstat (limited to 'app-crypt/tpm-tools')
-rw-r--r--app-crypt/tpm-tools/ChangeLog6
-rw-r--r--app-crypt/tpm-tools/Manifest14
-rw-r--r--app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch18
3 files changed, 23 insertions, 15 deletions
diff --git a/app-crypt/tpm-tools/ChangeLog b/app-crypt/tpm-tools/ChangeLog
index 4bb6e4c9a0a3..98073dbcc436 100644
--- a/app-crypt/tpm-tools/ChangeLog
+++ b/app-crypt/tpm-tools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-crypt/tpm-tools
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/ChangeLog,v 1.15 2011/03/31 22:19:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/ChangeLog,v 1.16 2011/04/30 12:36:13 flameeyes Exp $
+
+ 30 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+ files/tpm-tools-1.3.1-gold.patch:
+ Extend the gold patch to work even when trousers is not installing .la files.
*tpm-tools-1.3.5-r1 (31 Mar 2011)
diff --git a/app-crypt/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
index 41117c591fae..b0cc6866813d 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX tpm-tools-1.3.1-gold.patch 470 RMD160 931fbc89d2f2bfbeebfc05e91f1ec4cc41691bfe SHA1 f76307bd1fbc0c2b8d200e61c1b997447ba7bab3 SHA256 93ef6552ba10d765020963b30e39364c6474a8dfe3f1cb53fa072aa784973b7a
+AUX tpm-tools-1.3.1-gold.patch 992 RMD160 4dd2b20d6bf32f4bc2572ad5b43d011d529dc2f3 SHA1 4af72f46eaee9ac17030d3c3305bcf8292d96bda SHA256 d7bc063cfb23c3f5c9de726e99b3f370f28add16b169d7ef378bbb9f7a6e5a53
DIST tpm-tools-1.3.5.tar.gz 439922 RMD160 bce7bfa1b6df718b1e671c4926db80488294fdf0 SHA1 ee9000ec7e5ad7f8a8a931083aca293e11371d1c SHA256 60717336302bffff5044ed945a79f07594962fa3b989cf37f6eb042874d8fc45
EBUILD tpm-tools-1.3.5-r1.ebuild 1200 RMD160 cd229dc6f717a68b9393389750be2a8c6f98784e SHA1 fa97d55b21177acfa80fa16fe7dc2af1f376cd3c SHA256 f3d0f3b1e02db1682f8fa3a4406a7b60f0f820e20da570491adeaa57b7b814ed
EBUILD tpm-tools-1.3.5.ebuild 898 RMD160 0e57fb1078f9ba6a3979344bbf85adfe28170850 SHA1 d03ae866fd995c751fb9198c732d9c80231db300 SHA256 e943394f8e1cdeec6618457acec36858dd661fe5720b61e5e890ba894eab952a
-MISC ChangeLog 2957 RMD160 e726ba8f3ddb4eb73ce82cc4237aeac33881b67a SHA1 0108d6f3226777ad631d253c4624ca1cc1f1b05b SHA256 d64cd1be0fcbcc11b7002ec02280c9a4b721a54751050972614dd8190a2c659a
+MISC ChangeLog 3130 RMD160 8c3b68b3bc0bdb87702d9fa02728f3e08ace9d56 SHA1 29f093535e70a86710b41080dd1b33c0975a2cc3 SHA256 081216c84074aebea4976a569aa106dd90879e82385d7d2840bf03f2faa9dc8a
MISC metadata.xml 446 RMD160 f3a49da300db340fbc234ff3da1ca30b10744997 SHA1 d5d4015d47d9e45bdf573573fb50beb2b561b8a0 SHA256 e7914205902a4f67c69e4a9f8b1df12e3297442d197f719835be1f8a27662eaa
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2U/f4ACgkQAiZjviIA2Xj97wCg2NBNjdd0atV/SA9l3H9Q6cMT
-fsAAoLlmzWb6g/uLtJcXDH4fD1nTptr5
-=iQrr
------END PGP SIGNATURE-----
diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch b/app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch
index 68d7ea3e26a5..37a1945c15a3 100644
--- a/app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch
+++ b/app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch
@@ -1,5 +1,19 @@
-diff --git a/tpm-tools-1.3.1/src/data_mgmt/Makefile.am b/tpm-tools-1.3.1-orig/src/data_mgmt/Makefile.am
-index 697f031..cff5897 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -80,4 +80,4 @@ endif
+ # Unseal library - for addition to existing apps, counter part of seal cmd
+ libtpm_unseal_la_SOURCES = tpm_unseal.c
+ libtpm_unseal_la_LDFLAGS = -shared -version-info 1:0:0
+-libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la
++libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la -lcrypto
+--- a/src/cmds/Makefile.am
++++ b/src/cmds/Makefile.am
+@@ -33,4 +33,5 @@ endif
+ LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal
+
+ tpm_sealdata_SOURCES = tpm_sealdata.c
++tpm_sealdata_LDADD = $(LDADD) -lcrypto
+ tpm_unsealdata_SOURCES = tpm_unsealdata.c
--- tpm-tools-1.3.1/src/data_mgmt/Makefile.am
+++ tpm-tools-1.3.1/src/data_mgmt/Makefile.am
@@ -31,7 +31,7 @@ bin_PROGRAMS = tpmtoken_init \