diff --git a/.gitignore b/.gitignore index 80c18b9..fc75480 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ tpm-tools-1.3.4.tar.gz tpm-tools-1.3.5.tar.gz /tpm-tools-1.3.7.tar.gz +/tpm-tools-1.3.8.tar.gz diff --git a/sources b/sources index 6f3688a..a20d762 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e8cdfff5b766f9db31a6184824251b03 tpm-tools-1.3.7.tar.gz +85a978c4e03fefd4b73cbeadde7c4d0b tpm-tools-1.3.8.tar.gz diff --git a/tpm-tools-1.3.7-build.patch b/tpm-tools-1.3.7-build.patch index 6df6c48..070b69f 100644 --- a/tpm-tools-1.3.7-build.patch +++ b/tpm-tools-1.3.7-build.patch @@ -1,7 +1,7 @@ -diff -ur ./lib/Makefile.am /home/sgrubb/working/BUILD/tpm-tools/lib/Makefile.am ---- ./lib/Makefile.am 2011-09-19 10:12:49.000000000 -0400 -+++ /home/sgrubb/working/BUILD/tpm-tools/lib/Makefile.am 2011-09-19 10:32:47.000000000 -0400 -@@ -52,7 +52,7 @@ +diff -urp tpm-tools-1.3.8.orig/lib/Makefile.am tpm-tools-1.3.8/lib/Makefile.am +--- tpm-tools-1.3.8.orig/lib/Makefile.am 2012-05-17 13:50:39.000000000 -0400 ++++ tpm-tools-1.3.8/lib/Makefile.am 2012-06-21 13:07:29.624445940 -0400 +@@ -52,7 +52,7 @@ if P11_SUPPORT noinst_LTLIBRARIES += libtpm_pkcs11.la libtpm_pkcs11_la_SOURCES= tpm_pkcs11.c @@ -10,10 +10,10 @@ diff -ur ./lib/Makefile.am /home/sgrubb/working/BUILD/tpm-tools/lib/Makefile.am endif # -diff -ur ./lib/tpm_tspi.c /home/sgrubb/working/BUILD/tpm-tools/lib/tpm_tspi.c ---- ./lib/tpm_tspi.c 2011-09-19 10:12:49.000000000 -0400 -+++ /home/sgrubb/working/BUILD/tpm-tools/lib/tpm_tspi.c 2011-09-19 10:26:38.000000000 -0400 -@@ -702,14 +702,14 @@ +diff -urp tpm-tools-1.3.8.orig/lib/tpm_tspi.c tpm-tools-1.3.8/lib/tpm_tspi.c +--- tpm-tools-1.3.8.orig/lib/tpm_tspi.c 2011-08-17 08:20:35.000000000 -0400 ++++ tpm-tools-1.3.8/lib/tpm_tspi.c 2012-06-21 13:07:29.654445942 -0400 +@@ -702,14 +702,14 @@ TSS_RESULT unloadNVDataPublic(UINT64 *offset, BYTE *blob, UINT32 blob_len, TPM_NV_DATA_PUBLIC *v) { UINT64 off = *offset; @@ -31,15 +31,16 @@ diff -ur ./lib/tpm_tspi.c /home/sgrubb/working/BUILD/tpm-tools/lib/tpm_tspi.c return result; } -diff -ur ./src/tpm_mgmt/Makefile.am /home/sgrubb/working/BUILD/tpm-tools/src/tpm_mgmt/Makefile.am ---- ./src/tpm_mgmt/Makefile.am 2011-09-19 10:12:49.000000000 -0400 -+++ /home/sgrubb/working/BUILD/tpm-tools/src/tpm_mgmt/Makefile.am 2011-09-19 10:23:59.000000000 -0400 -@@ -21,6 +21,8 @@ - # http://www.opensource.org/licenses/cpl1.0.php. - # +diff -urp tpm-tools-1.3.8.orig/src/tpm_mgmt/Makefile.am tpm-tools-1.3.8/src/tpm_mgmt/Makefile.am +--- tpm-tools-1.3.8.orig/src/tpm_mgmt/Makefile.am 2012-05-17 13:50:39.000000000 -0400 ++++ tpm-tools-1.3.8/src/tpm_mgmt/Makefile.am 2012-06-21 13:07:29.655445942 -0400 +@@ -23,6 +23,8 @@ + + noinst_HEADERS = tpm_nvcommon.h +noinst_HEADERS = tpm_nvcommon.h + noinst_PROGRAMS = tpm_startup \ tpm_reset +Only in tpm-tools-1.3.8/src/tpm_mgmt: Makefile.am.orig diff --git a/tpm-tools-1.3.7-header.patch b/tpm-tools-1.3.7-header.patch deleted file mode 100644 index a5c82f9..0000000 --- a/tpm-tools-1.3.7-header.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -urN tpm-tools-1.3.7.orig/src/tpm_mgmt/tpm_nvcommon.h tpm-tools-1.3.7/src/tpm_mgmt/tpm_nvcommon.h ---- tpm-tools-1.3.7.orig/src/tpm_mgmt/tpm_nvcommon.h 1969-12-31 19:00:00.000000000 -0500 -+++ tpm-tools-1.3.7/src/tpm_mgmt/tpm_nvcommon.h 2011-09-19 10:16:39.000000000 -0400 -@@ -0,0 +1,66 @@ -+/* -+ * The Initial Developer of the Original Code is International -+ * Business Machines Corporation. Portions created by IBM -+ * Corporation are Copyright (C) 2005 International Business -+ * Machines Corporation. All Rights Reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the Common Public License as published by -+ * IBM Corporation; either version 1 of the License, or (at your option) -+ * any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * Common Public License for more details. -+ * -+ * You should have received a copy of the Common Public License -+ * along with this program; if not, a copy can be viewed at -+ * http://www.opensource.org/licenses/cpl1.0.php. -+ */ -+#ifndef TPM_NVCOMMON_H -+#define TPM_NVCOMMON_H -+ -+#include "tpm_tspi.h" -+ -+ -+struct strings_with_values -+{ -+ const char *name; -+ UINT32 value; -+ const char *desc; -+}; -+ -+extern const struct strings_with_values permvalues[]; -+ -+int parseStringWithValues(const char *aArg, -+ const struct strings_with_values *svals, -+ unsigned int *x, unsigned int maximum, -+ const char *name); -+ -+char *printValueAsStrings(unsigned int value, -+ const struct strings_with_values *svals); -+ -+int parseHexOrDecimal(const char *aArg, unsigned int *x, -+ unsigned int minimum, unsigned int maximum, -+ const char *name); -+ -+void displayStringsAndValues(const struct strings_with_values *svals, const char *indent); -+ -+TSS_RESULT getNVDataPublic(TSS_HTPM hTpm, TPM_NV_INDEX nvindex, TPM_NV_DATA_PUBLIC **pub); -+void freeNVDataPublic(TPM_NV_DATA_PUBLIC *pub); -+ -+static inline UINT32 -+Decode_UINT32(BYTE * y) -+{ -+ UINT32 x = 0; -+ -+ x = y[0]; -+ x = ((x << 8) | (y[1] & 0xFF)); -+ x = ((x << 8) | (y[2] & 0xFF)); -+ x = ((x << 8) | (y[3] & 0xFF)); -+ -+ return x; -+} -+ -+#endif /* TPM_NVCOMMON_H */ diff --git a/tpm-tools.spec b/tpm-tools.spec index e501e21..c2791e2 100644 --- a/tpm-tools.spec +++ b/tpm-tools.spec @@ -1,18 +1,17 @@ Name: tpm-tools Summary: Management tools for the TPM hardware -Version: 1.3.7 -Release: 2%{?dist} +Version: 1.3.8 +Release: 1%{?dist} License: CPL Group: Applications/System Source0: http://downloads.sourceforge.net/trousers/%{name}-%{version}.tar.gz -Patch0: tpm-tools-1.3.7-header.patch # Package unnecessarily has -Werror and any problem kills the build -Patch1: tpm-tools-1.3.5-no-werror.patch +Patch0: tpm-tools-1.3.5-no-werror.patch # Package has other flaws preventing proper build -Patch2: tpm-tools-1.3.7-build.patch +Patch1: tpm-tools-1.3.7-build.patch URL: http://trousers.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: trousers-devel openssl-devel opencryptoki-devel +BuildRequires: trousers-devel openssl-devel opencryptoki-devel chrpath # Working with upstream to fix this, but in the mean time we need this BuildRequires: automake @@ -47,7 +46,6 @@ for developing tpm-tools applications. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build %configure @@ -58,6 +56,8 @@ mkdir -p ${RPM_BUILD_ROOT} make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" rm -f $RPM_BUILD_ROOT/%{_libdir}/libtpm_unseal.la rm -f $RPM_BUILD_ROOT/%{_libdir}/libtpm_unseal.a +chrpath -d %{buildroot}/usr/bin/tpm_unsealdata +chrpath -d %{buildroot}/usr/bin/tpm_sealdata %clean rm -rf $RPM_BUILD_ROOT @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/tpmUnseal* %changelog +* Thu Jun 21 2012 Steve Grubb 1.3.8-1 +- New upstream release + * Sat Jan 14 2012 Fedora Release Engineering - 1.3.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild