Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-crypt/tpm-tools/files: tpm-tools-1.3.1-gold.patch
Date: Sat, 30 Apr 2011 12:36:23
Message-Id: 20110430123613.2AB3420057@flycatcher.gentoo.org
1 flameeyes 11/04/30 12:36:13
2
3 Modified: tpm-tools-1.3.1-gold.patch
4 Log:
5 Extend the gold patch to work even when trousers is not installing .la files.
6
7 (Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch?r1=1.1&r2=1.2
15
16 Index: tpm-tools-1.3.1-gold.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- tpm-tools-1.3.1-gold.patch 31 Mar 2011 22:19:41 -0000 1.1
23 +++ tpm-tools-1.3.1-gold.patch 30 Apr 2011 12:36:13 -0000 1.2
24 @@ -1,5 +1,19 @@
25 -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
26 -index 697f031..cff5897 100644
27 +--- a/lib/Makefile.am
28 ++++ b/lib/Makefile.am
29 +@@ -80,4 +80,4 @@ endif
30 + # Unseal library - for addition to existing apps, counter part of seal cmd
31 + libtpm_unseal_la_SOURCES = tpm_unseal.c
32 + libtpm_unseal_la_LDFLAGS = -shared -version-info 1:0:0
33 +-libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la
34 ++libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la -lcrypto
35 +--- a/src/cmds/Makefile.am
36 ++++ b/src/cmds/Makefile.am
37 +@@ -33,4 +33,5 @@ endif
38 + LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal
39 +
40 + tpm_sealdata_SOURCES = tpm_sealdata.c
41 ++tpm_sealdata_LDADD = $(LDADD) -lcrypto
42 + tpm_unsealdata_SOURCES = tpm_unsealdata.c
43 --- tpm-tools-1.3.1/src/data_mgmt/Makefile.am
44 +++ tpm-tools-1.3.1/src/data_mgmt/Makefile.am
45 @@ -31,7 +31,7 @@ bin_PROGRAMS = tpmtoken_init \