tpm-tools: upgraded package to upstream
Upgraded app-crypt/tpm-tools to version 1.3.8.
The new tpm-tools supports reading and writing NV data.
BUG=none
TEST=emerge-link tpm-tools; emerge-nyan tpm-tools.
Change-Id: Idce817bc0ba8a007fb612543a58d9c76f6cedda2
Reviewed-on: https://chromium-review.googlesource.com/234621
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Darren Krahn <dkrahn@chromium.org>
Commit-Queue: Hung-Te Lin <hungte@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
diff --git a/app-crypt/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
index 8d84e93..91d8e0f 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -1 +1 @@
-DIST tpm-tools-1.3.5.tar.gz 439922 RMD160 bce7bfa1b6df718b1e671c4926db80488294fdf0 SHA1 ee9000ec7e5ad7f8a8a931083aca293e11371d1c SHA256 60717336302bffff5044ed945a79f07594962fa3b989cf37f6eb042874d8fc45
+DIST tpm-tools-1.3.8.tar.gz 473339 SHA256 66eb4ff095542403db6b4bd4b574e8a5c08084fe4e9e5aa9a829ee84e20bea83 SHA512 727113625645b01f8e77817d7f1cc6a8bf814f96061754fdfefceb125da4eebbea54804d1fec9e36559ffd61801b318bbc327907a3bdd661f872c32f811c7e74 WHIRLPOOL 201677976c97961a20578f7ca1b4dd0a8a9b105a718c0c67c34b9f1de0c75332532c62389711f732c99edda8fe45639dd3c8293df0a62a11f88ed4c9dc987270
diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.3.5-password.patch b/app-crypt/tpm-tools/files/tpm-tools-1.3.5-password.patch
deleted file mode 100644
index 1bad425..0000000
--- a/app-crypt/tpm-tools/files/tpm-tools-1.3.5-password.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/src/tpm_mgmt/tpm_clear.c b/src/tpm_mgmt/tpm_clear.c
-index c7b286f..6549a67 100644
---- a/src/tpm_mgmt/tpm_clear.c
-+++ b/src/tpm_mgmt/tpm_clear.c
-@@ -25,6 +25,7 @@
- //Controled by input options
- static BOOL bValue = FALSE; //If true FORCE CLEAR
- static BOOL isWellKnown = FALSE;
-+static char *szTpmPasswd = NULL;
- TSS_HCONTEXT hContext = 0;
-
- static inline TSS_RESULT tpmClearOwner(TSS_HTPM a_hTpm, BOOL a_bValue)
-@@ -42,6 +43,7 @@ static void help(const char *aCmd)
- logCmdHelp(aCmd);
- logUnicodeCmdOption();
- logCmdOption("-f, --force", _("Use physical presence authorization."));
-+ logCmdOption("-p, --password", _("TPM authorization data."));
- logCmdOption("-z, --well-known",
- _("Use 20 bytes of zeros (TSS_WELL_KNOWN_SECRET) as the TPM secret authorization data"));
- }
-@@ -54,6 +56,10 @@ static int parse(const int aOpt, const char *aArg)
- logDebug(_("Changing mode to use force authorization\n"));
- bValue = TRUE;
- break;
-+ case 'p':
-+ logDebug(_("Setting password\n"));
-+ szTpmPasswd = strdup(aArg);
-+ break;
- case 'z':
- logDebug(_("Using TSS_WELL_KNOWN_SECRET to authorize the TPM command\n"));
- isWellKnown = TRUE;
-@@ -68,13 +74,13 @@ static int parse(const int aOpt, const char *aArg)
- int main(int argc, char **argv)
- {
-
-- char *szTpmPasswd = NULL;
- int pswd_len;
- TSS_HTPM hTpm;
- TSS_HPOLICY hTpmPolicy;
- int iRc = -1;
- struct option opts[] = {
- {"force", no_argument, NULL, 'f'},
-+ {"pass", required_argument, NULL, 'p'},
- {"well-known", no_argument, NULL, 'z'},
- };
- BYTE well_known[] = TSS_WELL_KNOWN_SECRET;
-@@ -82,7 +88,7 @@ int main(int argc, char **argv)
- initIntlSys();
-
- if (genericOptHandler
-- (argc, argv, "fz", opts, sizeof(opts) / sizeof(struct option),
-+ (argc, argv, "fpz", opts, sizeof(opts) / sizeof(struct option),
- parse, help) != 0)
- goto out;
-
-@@ -99,12 +105,14 @@ int main(int argc, char **argv)
- if (isWellKnown){
- szTpmPasswd = (char *)well_known;
- pswd_len = sizeof(well_known);
-- }else{
-+ }else if (!szTpmPasswd){
- szTpmPasswd = GETPASSWD(_("Enter owner password: "), &pswd_len, FALSE);
- if (!szTpmPasswd) {
- logMsg(_("Failed to get password\n"));
- goto out_close;
- }
-+ }else{
-+ pswd_len = strlen(szTpmPasswd);
- }
-
- if (policyGet(hTpm, &hTpmPolicy) != TSS_SUCCESS)
diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.3.8-gold.patch b/app-crypt/tpm-tools/files/tpm-tools-1.3.8-gold.patch
new file mode 100644
index 0000000..bc52c30
--- /dev/null
+++ b/app-crypt/tpm-tools/files/tpm-tools-1.3.8-gold.patch
@@ -0,0 +1,10 @@
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index cef6a2f..d7092a7 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
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.5-r1.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.5-r1.ebuild
deleted file mode 100644
index 9e65c34..0000000
--- a/app-crypt/tpm-tools/tpm-tools-1.3.5-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 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.5-r1.ebuild,v 1.1 2011/03/31 22:19:40 flameeyes Exp $
-
-EAPI=4
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
-HOMEPAGE="http://trousers.sourceforge.net"
-SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="*"
-IUSE="nls pkcs11 debug"
-
-COMMON_DEPEND="
- >=app-crypt/trousers-0.3.0
- dev-libs/openssl
- pkcs11? ( dev-libs/opencryptoki )
- "
-RDEPEND="${COMMON_DEPEND}
- nls? ( virtual/libintl )"
-DEPEND="${COMMON_DEPEND}
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- sed -i -e "s/-Werror //" configure.in || die "Sed failed"
- epatch "${FILESDIR}"/${PN}-1.3.1-gold.patch
-
- eautoreconf
-}
-
-src_configure() {
- local myconf="$(use_enable nls)"
-
- # don't use --enable-pkcs11-support, configure is a mess.
- use pkcs11 || myconf+=" --disable-pkcs11-support"
-
- use debug && append-flags -DDEBUG || append-flags -DNDEBUG
-
- econf ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc README
-}
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.5-r2.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.8.ebuild
similarity index 69%
rename from app-crypt/tpm-tools/tpm-tools-1.3.5-r2.ebuild
rename to app-crypt/tpm-tools/tpm-tools-1.3.8.ebuild
index a9dbe58..e5ee675 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.5-r2.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 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.5-r1.ebuild,v 1.1 2011/03/31 22:19:40 flameeyes Exp $
+# $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 $
EAPI=4
inherit autotools eutils flag-o-matic
@@ -8,6 +8,7 @@
DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
HOMEPAGE="http://trousers.sourceforge.net"
SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
+
LICENSE="CPL-1.0"
SLOT="0"
KEYWORDS="*"
@@ -27,24 +28,24 @@
sed -i -r \
-e '/CFLAGS/s/ -(Werror|m64)//' \
configure.in || die
- epatch "${FILESDIR}"/${PN}-1.3.1-gold.patch
- epatch "${FILESDIR}"/${PN}-1.3.5-password.patch
+ epatch "${FILESDIR}/${P}-gold.patch"
eautoreconf
}
src_configure() {
- local myconf="$(use_enable nls)"
-
+ local myconf
# don't use --enable-pkcs11-support, configure is a mess.
use pkcs11 || myconf+=" --disable-pkcs11-support"
- use debug && append-flags -DDEBUG || append-flags -DNDEBUG
+ append-cppflags $(usex debug -DDEBUG -DNDEBUG)
- econf ${myconf}
+ econf \
+ $(use_enable nls) \
+ ${myconf}
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc README
+ default
+ rm -f "${ED}"/usr/lib*/libtpm_unseal.la
}
diff --git a/metadata/md5-cache/app-crypt/tpm-tools-1.3.5-r1 b/metadata/md5-cache/app-crypt/tpm-tools-1.3.5-r1
deleted file mode 100644
index 78a8d33..0000000
--- a/metadata/md5-cache/app-crypt/tpm-tools-1.3.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-crypt/trousers-0.3.0 dev-libs/openssl pkcs11? ( dev-libs/opencryptoki ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=TrouSerS' support tools for the Trusted Platform Modules
-EAPI=4
-HOMEPAGE=http://trousers.sourceforge.net
-IUSE=nls pkcs11 debug
-KEYWORDS=*
-LICENSE=CPL-1.0
-RDEPEND=>=app-crypt/trousers-0.3.0 dev-libs/openssl pkcs11? ( dev-libs/opencryptoki ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/trousers/tpm-tools-1.3.5.tar.gz
-_eclasses_=autotools 1b0fa473be98091220edff9f51d06153 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic c3131dc67d3bd39f044e92b8280505e4 libtool eba09ed440f2692f73024ff3621a1f4b multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 48b38a216afb92db6314d6c3187abea3
-_md5_=6a597a564fedc60ffb88af72a1e81106
diff --git a/metadata/md5-cache/app-crypt/tpm-tools-1.3.5-r2 b/metadata/md5-cache/app-crypt/tpm-tools-1.3.8
similarity index 89%
rename from metadata/md5-cache/app-crypt/tpm-tools-1.3.5-r2
rename to metadata/md5-cache/app-crypt/tpm-tools-1.3.8
index 42ebfbb..21ed170 100644
--- a/metadata/md5-cache/app-crypt/tpm-tools-1.3.5-r2
+++ b/metadata/md5-cache/app-crypt/tpm-tools-1.3.8
@@ -8,6 +8,6 @@
LICENSE=CPL-1.0
RDEPEND=>=app-crypt/trousers-0.3.0 dev-libs/openssl pkcs11? ( dev-libs/opencryptoki ) nls? ( virtual/libintl )
SLOT=0
-SRC_URI=mirror://sourceforge/trousers/tpm-tools-1.3.5.tar.gz
+SRC_URI=mirror://sourceforge/trousers/tpm-tools-1.3.8.tar.gz
_eclasses_=autotools 1b0fa473be98091220edff9f51d06153 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic c3131dc67d3bd39f044e92b8280505e4 libtool eba09ed440f2692f73024ff3621a1f4b multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 48b38a216afb92db6314d6c3187abea3
-_md5_=7a0d685994ed03e97da8047e53b9940b
+_md5_=547cc9b72d7bcab4677f72ca9ccc09c5
