Fix build issue, bug#551440, thanks to blueness

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

4 files changed, 19 insertions, 30 deletions

diff --git a/app-crypt/tpm-tools/ChangeLog b/app-crypt/tpm-tools/ChangeLog
index f387ebbceba0..f656e4755f7d 100644
--- a/app-crypt/tpm-tools/ChangeLog
+++ b/app-crypt/tpm-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/tpm-tools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/ChangeLog,v 1.26 2015/05/17 13:53:07 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/ChangeLog,v 1.27 2015/06/07 15:16:11 alonbl Exp $
+
+  07 Jun 2015; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/tpm-tools-1.3.8-build.patch, -files/tpm-tools-1.3.1-gold.patch,
+  tpm-tools-1.3.8.ebuild:
+  Fix build issue, bug#551440, thanks to blueness
 
   17 May 2015; Manuel Rüger <mrueg@gentoo.org> -tpm-tools-1.3.5-r1.ebuild,
   -tpm-tools-1.3.5.ebuild:
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
deleted file mode 100644
index 37a1945c15a3..000000000000
--- a/app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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		\
- # Common build flags
- AM_CPPFLAGS	=	-I$(top_builddir)/include -D_LINUX
- 
--LDADD		=	$(top_builddir)/lib/libtpm_pkcs11.la -ltspi
-+LDADD		=	$(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl
- 
- 
- #
diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.3.8-build.patch b/app-crypt/tpm-tools/files/tpm-tools-1.3.8-build.patch
new file mode 100644
index 000000000000..928f94f8e695
--- /dev/null
+++ b/app-crypt/tpm-tools/files/tpm-tools-1.3.8-build.patch
@@ -0,0 +1,10 @@
+--- a/src/tpm_mgmt/tpm_nvread.c	2015-06-07 13:00:30.250314575 +0000
++++ b/src/tpm_mgmt/tpm_nvread.c	2015-06-07 12:54:45.590302275 +0000
+@@ -23,6 +23,7 @@
+ #include <ctype.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ 
+ #include "tpm_nvcommon.h"
+ #include "tpm_tspi.h"
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.8.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.8.ebuild
index e289558e65dc..ba75351ef7f6 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.8.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.3.8.ebuild,v 1.5 2014/08/14 16:59:01 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.3.8.ebuild,v 1.6 2015/06/07 15:16:11 alonbl Exp $
 
 EAPI=4
 inherit autotools eutils flag-o-matic
@@ -29,6 +29,7 @@ src_prepare() {
 		-e '/CFLAGS/s/ -(Werror|m64)//' \
 		configure.in || die
 	epatch "${FILESDIR}/${P}-gold.patch"
+	epatch "${FILESDIR}/${P}-build.patch"
 
 	eautoreconf
 }