From 0b14ef0a88793c6abbef16da65174f8c45088465 Mon Sep 17 00:00:00 2001
From: Michal Schmidt <michich@fedoraproject.org>
Date: Wed, 21 Oct 2009 16:04:43 +0000
Subject: [PATCH] - Upstream release 1.3.4: - adds SRK password support on
 unsealing - LICENSE is back. - Remove no longer needed patch:
 tpm-tools-1.3.3-check-fwrite-success.patch

---
 .cvsignore                                 |  2 +-
 sources                                    |  2 +-
 tpm-tools-1.3.3-check-fwrite-success.patch | 21 ---------------------
 tpm-tools.spec                             | 18 +++++++++++-------
 4 files changed, 13 insertions(+), 30 deletions(-)
 delete mode 100644 tpm-tools-1.3.3-check-fwrite-success.patch

diff --git a/.cvsignore b/.cvsignore
index ab29c4b..00c240c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-tpm-tools-1.3.3-1.tar.gz
+tpm-tools-1.3.4.tar.gz
diff --git a/sources b/sources
index 5f5f6a1..4e8fd4c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3d9c657a3dfe1978ecc300108da708a  tpm-tools-1.3.3-1.tar.gz
+a07183c6e5ea51a847adf7208c2b078f  tpm-tools-1.3.4.tar.gz
diff --git a/tpm-tools-1.3.3-check-fwrite-success.patch b/tpm-tools-1.3.3-check-fwrite-success.patch
deleted file mode 100644
index fdafa84..0000000
--- a/tpm-tools-1.3.3-check-fwrite-success.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Upstream uses -Werror and Fedora adds -D_FORTIFY_SOURCE=2, so the return value
-from fwrite must be checked.
-
-Patch sent to upstream maintainer Rajiv Andrade on 2009-08-07.
-
-Index: tpm-tools-1.3.3/src/cmds/tpm_unsealdata.c
-===================================================================
---- tpm-tools-1.3.3.orig/src/cmds/tpm_unsealdata.c
-+++ tpm-tools-1.3.3/src/cmds/tpm_unsealdata.c
-@@ -91,7 +91,10 @@ int main(int argc, char **argv)
- 			return rc;
- 	}
- 
--	fwrite(tss_data, tss_size, 1, fp);
-+	if (fwrite(tss_data, tss_size, 1, fp) != 1) {
-+		logError(_("Unable to write output file"));
-+		return rc;
-+	}
- 	fclose(fp);
- 	free(tss_data);
- 	return rc;
diff --git a/tpm-tools.spec b/tpm-tools.spec
index 92e7d90..5029ad8 100644
--- a/tpm-tools.spec
+++ b/tpm-tools.spec
@@ -1,7 +1,6 @@
 %global name            tpm-tools
-%global version         1.3.3
-%global tarballrev      -1
-%global release         2
+%global version         1.3.4
+%global release         1
 
 Name:             %{name}
 Summary:          Management tools for the TPM hardware
@@ -9,8 +8,7 @@ Version:          %{version}
 Release:          %{release}%{?dist}
 License:          CPL
 Group:            Applications/System
-Source0:          http://downloads.sourceforge.net/trousers/%{name}-%{version}%{tarballrev}.tar.gz
-Patch0:           %{name}-1.3.3-check-fwrite-success.patch
+Source0:          http://downloads.sourceforge.net/trousers/%{name}-%{version}.tar.gz
 URL:              http://trousers.sourceforge.net
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    trousers-devel openssl-devel opencryptoki-devel
@@ -44,7 +42,6 @@ for developing tpm-tools applications.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure --disable-rpath
@@ -67,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README
+%doc LICENSE README
 %attr(755, root, root) %{_bindir}/tpm_*
 %attr(755, root, root) %{_sbindir}/tpm_*
 %attr(755, root, root) %{_libdir}/libtpm_unseal.so.?.?.?
@@ -87,6 +84,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/tpmUnseal*
 
 %changelog
+* Wed Oct 21 2009 Michal Schmidt <mschmidt@redhat.com> - 1.3.4-1
+- Upstream release 1.3.4:
+  - adds SRK password support on unsealing
+- LICENSE is back.
+- Remove no longer needed patch:
+  tpm-tools-1.3.3-check-fwrite-success.patch
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 1.3.3-2
 - rebuilt with new openssl