Fix build issue, bug#551440, thanks to blueness

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

5 files changed, 32 insertions, 33 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/Manifest b/app-crypt/tpm-tools/Manifest
index 694fa237569d..c79cf7784276 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -1,6 +1,16 @@
-AUX tpm-tools-1.3.1-gold.patch 992 SHA256 d7bc063cfb23c3f5c9de726e99b3f370f28add16b169d7ef378bbb9f7a6e5a53 SHA512 b409a2596585bb2f36f25ad8afa92347f4e2720f59c3848e0ed45ec03c7f00c8acca24a900af60c5e8dc9691d2366397bb1e799ba0ca121abbe9b103e463d8c8 WHIRLPOOL 473de7e45253cf7df55ae5d4c9bf0de81862d88187dbda6d508406d29da8c956b750e7610a8b0ec07a81101aa51af2d4e711a93acfc1dd0dc8e9009d74fcdd71
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX tpm-tools-1.3.8-build.patch 290 SHA256 b926fe78a70dbe95929148636361680428a55ea660dbfb7737b72d524c7fc0a7 SHA512 76f78f49457fbfd7989cd0d3f4efcf150ecb1f26a5d450b62e1883ce5a8a5f1663c38142382254d6402b52c608535ae817538e74766e666834d23fe82f1df44f WHIRLPOOL c540c3584bae44e791b482d219f5a4d59e1ecac67b112efb36c0e39b44b229d9d711a625a64c6f23d750db807fcc487db4eddd3ab1208ccf04871e690ce6cf88
 AUX tpm-tools-1.3.8-gold.patch 429 SHA256 96ea994f5d6dea33dce3c89109614bf1b63229b0059c4e56feb188d231f43bdc SHA512 ab3bef2cf028b2ee316088b9391b4bd0a964f72b49676c8053b212bf82f9b1e8603e7f678bbbff70f346d6f790edd8eea970da11c5ac100bbfd993e92a229f50 WHIRLPOOL 39d6277467bfd9bf9a79eeb4e0d9d5893822307dca6eb57edcd1fbdeb8fea3cb46a027447e9b8199f9055167e290d8eb4ae4356ea3ba267ae159a482a27678d1
 DIST tpm-tools-1.3.8.tar.gz 473339 SHA256 66eb4ff095542403db6b4bd4b574e8a5c08084fe4e9e5aa9a829ee84e20bea83 SHA512 727113625645b01f8e77817d7f1cc6a8bf814f96061754fdfefceb125da4eebbea54804d1fec9e36559ffd61801b318bbc327907a3bdd661f872c32f811c7e74 WHIRLPOOL 201677976c97961a20578f7ca1b4dd0a8a9b105a718c0c67c34b9f1de0c75332532c62389711f732c99edda8fe45639dd3c8293df0a62a11f88ed4c9dc987270
-EBUILD tpm-tools-1.3.8.ebuild 1198 SHA256 c0427b805068ba91a3adfc3fc6019129c281459b7f9c881ddfcb438267ccbfb6 SHA512 56f3daa3ab3a450227f6f5cc82bb0559de905bc4731551069c398f2fa3ff237e38e730f39961c5a834dd310a3612b28704c478ba59c931f757252f188a77d8f4 WHIRLPOOL 73689de91b1eefc2e9ed69da1e85c54d9db54fa0b65ce02d71c972c731899c0ae44d98104cbe33cddda5cd001a760007e1d0cfe267cfe513bdb3cba090bc8d93
-MISC ChangeLog 4268 SHA256 b35ac4a07f201f84be8dd5cb6409a85d50541d46f702be745f93490acbd2ef4b SHA512 dc4dd5057879f3a17c27398d87928d758a43c720387a10c61f36d0bf910c0f2dbadde8a27017e6676366df1043f7334f934c6c1d7e40927e5b5c3dca620f13e8 WHIRLPOOL feb6e18d41a51007c274b85c83ee7d8d803ecb0f712b5c47a608007246763eafc34cad4e65ccfbf4da5603b1739fd492daf27bb02b68bf0cd3454b8d4b68c3f7
+EBUILD tpm-tools-1.3.8.ebuild 1233 SHA256 37e2135dc0825748864311acff32dacea84d25df15b283beab3e0c20d73c0ecd SHA512 de4df8aef76f47c84618b88526ec6d7a7a5f007f487af531460e126447d6b9f0a3b04f98eeb9a5e23f46199a773517f58c8f20d42dc5661f1192b3686a73a1dc WHIRLPOOL e15e36760e9d6c46f11b896e7294a811c08d615a9271271ef2c57831582434f740e7ee2c5822ead1e682d238890b1e80a250b8fc6543918e654a561f035c4582
+MISC ChangeLog 4467 SHA256 faa93fb7898206617a4e99075005a675a99f89c40fa840cfe2e5aeb771310774 SHA512 1c7aba18d71c5bee882447c44ab9155819cd2389110e8a2534510682510ededa9c76466d73d59f1a5f2e03ac93381c36c4e1dc534bb3d0ee2702f72bf1edee42 WHIRLPOOL dafa4b1932395e449200573e599a09d3705422f4e0bad0f6318933903460452b0f081825f30652bee592bb4c225741d286b427fc839b9b273181d8339f034c3c
 MISC metadata.xml 348 SHA256 4aa61f23ef00934c4a847a774386367856bca672be07be30f8aa2d988eee2385 SHA512 6c001cab327d568ec42e649c40c9394cdb7495c9f53c6b9ba046e2b9d8b2416975e8f6dcdc3d5ea1c73f1d298b4a09ba159ff8b5d8965df01e68b7d54f9a5cce WHIRLPOOL 6ea85aeded4aa93f58b98481bd7fca47d96cf6361583787207a017c543e2b16092fdef2caa202fa24a37ba618a435bdeabc110e2f757a70101517059fe216016
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlV0YEoACgkQXYk9GL8g3FFyjAD/brPhBbWA7nJ3AaPxBp4CotKb
+1A8+/Timb4K6O39P/4QA/jzmZ3NvfO//crIuXcHfSKzr/owbV24I3s0Q/y9DexB6
+=hHuL
+-----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
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
 }