rpms/tpm-tools/devel tpm-tools-1.3.3-check-fwrite-success.patch, NONE, 1.1 tpm-tools.spec, 1.7, 1.8 tpm-tools-conditionally-build-tpmtoken-manpages-Makefile.in.patch, 1.1, NONE

[Michal Schmidt]

Author: michich

Update of /cvs/pkgs/rpms/tpm-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6223

Modified Files:
	tpm-tools.spec 
Added Files:
	tpm-tools-1.3.3-check-fwrite-success.patch 
Removed Files:
	tpm-tools-conditionally-build-tpmtoken-manpages-Makefile.in.patch 
Log Message:
* Fri Aug 07 2009 Michal Schmidt <mschmidt at redhat.com> 1.3.3-1
- New upstream release 1.3.3.
- No longer needed patch, dropped:
  tpm-tools-conditionally-build-tpmtoken-manpages-Makefile.in.patch
- Use global instead of define for macros.
- Remove rpaths.
- LICENSE file is suddenly missing in upstream tarball.
- Added patch to allow compilation:
  tpm-tools-1.3.3-check-fwrite-success.patch


tpm-tools-1.3.3-check-fwrite-success.patch:
 tpm_unsealdata.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE tpm-tools-1.3.3-check-fwrite-success.patch ---
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;


Index: tpm-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tpm-tools/devel/tpm-tools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tpm-tools.spec	29 Jul 2009 11:36:28 -0000	1.7
+++ tpm-tools.spec	7 Aug 2009 14:06:03 -0000	1.8
@@ -1,6 +1,7 @@
-%define name            tpm-tools
-%define version         1.3.1
-%define release         10
+%global name            tpm-tools
+%global version         1.3.3
+%global tarballrev      -1
+%global release         1
 
 Name:             %{name}
 Summary:          Management tools for the TPM hardware
@@ -8,11 +9,11 @@ Version:          %{version}
 Release:          %{release}%{?dist}
 License:          CPL
 Group:            Applications/System
-Source0:          http://downloads.sourceforge.net/trousers/%{name}-%{version}.tar.gz
+Source0:          http://downloads.sourceforge.net/trousers/%{name}-%{version}%{tarballrev}.tar.gz
+Patch0:           %{name}-1.3.3-check-fwrite-success.patch
 URL:              http://trousers.sourceforge.net
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    trousers-devel openssl-devel opencryptoki-devel
-Patch0:           tpm-tools-conditionally-build-tpmtoken-manpages-Makefile.in.patch
 
 %description
 tpm-tools is a group of tools to manage and utilize the Trusted Computing
@@ -46,7 +47,9 @@ for developing tpm-tools applications.
 %patch0 -p1
 
 %build
-%configure
+%configure --disable-rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 %install
@@ -64,7 +67,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README
+%doc README
 %attr(755, root, root) %{_bindir}/tpm_*
 %attr(755, root, root) %{_sbindir}/tpm_*
 %attr(755, root, root) %{_libdir}/libtpm_unseal.so.?.?.?
@@ -84,6 +87,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/tpmUnseal*
 
 %changelog
+* Fri Aug 07 2009 Michal Schmidt <mschmidt at redhat.com> 1.3.3-1
+- New upstream release 1.3.3.
+- No longer needed patch, dropped:
+  tpm-tools-conditionally-build-tpmtoken-manpages-Makefile.in.patch
+- Use global instead of define for macros.
+- Remove rpaths.
+- LICENSE file is suddenly missing in upstream tarball.
+- Added patch to allow compilation:
+  tpm-tools-1.3.3-check-fwrite-success.patch
+
 * Wed Jul 29 2009 Michal Schmidt <mschmidt at redhat.com> 1.3.1-10
 - Split the pkcs11 utilities into a subpackage.
 


--- tpm-tools-conditionally-build-tpmtoken-manpages-Makefile.in.patch DELETED ---