app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch - Issue 6905157: app-crypt/tpm-tools update gold patch

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch

Issue 6905157: app-crypt/tpm-tools update gold patch (Closed) Base URL: http://git.chromium.org/git/portage-stable.git@master

Patch Set: Created 9 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 diff --git a/tpm-tools-1.3.1/src/data_mgmt/Makefile.am b/tpm-tools-1.3.1-orig/sr c/data_mgmt/Makefile.am	1 --- a/lib/Makefile.am

2 index 697f031..cff5897 100644	2 +++ b/lib/Makefile.am

	3 @@ -80,4 +80,4 @@ endif

	4 # Unseal library - for addition to existing apps, counter part of seal cmd

	5 libtpm_unseal_la_SOURCES =» tpm_unseal.c

	6 libtpm_unseal_la_LDFLAGS =» -shared -version-info 1:0:0

	7 -libtpm_unseal_la_LIBADD =» -ltspi libtpm_tspi.la

	8 +libtpm_unseal_la_LIBADD =» -ltspi libtpm_tspi.la -lcrypto

	9 --- a/src/cmds/Makefile.am

	10 +++ b/src/cmds/Makefile.am

	11 @@ -33,4 +33,5 @@ endif

	12 LDADD» » =» $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir )/lib/libtpm_unseal.la -ltpm_unseal

	13

	14 tpm_sealdata_SOURCES = tpm_sealdata.c

	15 +tpm_sealdata_LDADD = $(LDADD) -lcrypto

	16 tpm_unsealdata_SOURCES = tpm_unsealdata.c

3 --- tpm-tools-1.3.1/src/data_mgmt/Makefile.am	17 --- tpm-tools-1.3.1/src/data_mgmt/Makefile.am

4 +++ tpm-tools-1.3.1/src/data_mgmt/Makefile.am	18 +++ tpm-tools-1.3.1/src/data_mgmt/Makefile.am

5 @@ -31,7 +31,7 @@ bin_PROGRAMS = tpmtoken_init \	19 @@ -31,7 +31,7 @@ bin_PROGRAMS = tpmtoken_init \

6 # Common build flags	20 # Common build flags

7 AM_CPPFLAGS = -I$(top_builddir)/include -D_LINUX	21 AM_CPPFLAGS = -I$(top_builddir)/include -D_LINUX

8	22

9 -LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi	23 -LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi

10 +LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl	24 +LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl

11	25

12	26

13 #	27 #

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »