diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-04-30 12:36:13 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-04-30 12:36:13 +0000 |
| commit | bddd2f871c2091852bfabe595e125582f06b1bab (patch) | |
| tree | f0546c97c0d92a35f10c589e5bb2b94cf20d3be5 /app-crypt | |
| parent | Version bumped. Unconditionally install to /lib/udev, also on multilib, Bug #... (diff) | |
| download | gentoo-2-bddd2f871c2091852bfabe595e125582f06b1bab.tar.gz gentoo-2-bddd2f871c2091852bfabe595e125582f06b1bab.tar.bz2 gentoo-2-bddd2f871c2091852bfabe595e125582f06b1bab.zip | |
Extend the gold patch to work even when trousers is not installing .la files.
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/tpm-tools/ChangeLog | 6 | ||||
| -rw-r--r-- | app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch | 18 |
2 files changed, 21 insertions, 3 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/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 \ |