rpms/trousers/F-11 trousers-0.3.1-gcc44.patch, NONE, 1.1 trousers.spec, 1.13, 1.14

[Miloš Jakubíček]

Author: mjakubicek

Update of /cvs/pkgs/rpms/trousers/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6892/F-11

Modified Files:
	trousers.spec 
Added Files:
	trousers-0.3.1-gcc44.patch 
Log Message:
- Fix FTBFS: added trousers-0.3.1-gcc44.patch



trousers-0.3.1-gcc44.patch:

--- NEW FILE trousers-0.3.1-gcc44.patch ---
--- tools/ps_convert.c.orig	2009-04-27 16:33:31.000000000 +0200
+++ tools/ps_convert.c	2009-04-27 16:33:53.000000000 +0200
@@ -136,13 +136,14 @@
 version_0_convert(FILE *in, FILE *out)
 {
 	int rc, members = 0;
-	UINT32 i, u32 = *(UINT32 *)buf;
+	UINT32 i;
+	UINT32 *u32 = (UINT32 *) &buf;
 
 	/* output the PS version */
 	OUT(out, "\1", 1);
 
 	/* number of keys */
-	OUT(out, &u32, sizeof(UINT32));
+	OUT(out, u32, sizeof(UINT32));
 
 	/* The +- 1's below account for the byte we read in to determine
 	 * if the PS file had a version byte at the beginning */
@@ -163,7 +163,7 @@
 		return -1;
 	}
 
-	for (i = 1; i < u32; i++) {
+	for (i = 1; i < *u32; i++) {
 		/* read in subsequent key's headers */
 		if ((members = fread(buf, 2*sizeof(TSS_UUID) + 3*sizeof(UINT16),
 					1, in)) != 1) {
--- tools/ps_inspect.c.orig	2009-04-27 17:49:46.000000000 +0200
+++ tools/ps_inspect.c	2009-04-27 17:51:52.000000000 +0200
@@ -179,10 +179,11 @@
 version_0_print(FILE *f)
 {
 	int rc, members = 0;
-	UINT32 i, u32 = *(UINT32 *)buf;
+	UINT32 i;
+	UINT32 *u32 = (UINT32 *) &buf;
 
 	PRINT("version:        0\n");
-	PRINT("number of keys: %u\n", u32);
+	PRINT("number of keys: %u\n", *u32);
 
 	/* The +- 1's below account for the byte we read in to determine
 	 * if the PS file had a version byte at the beginning */
@@ -203,7 +204,7 @@
 		return -1;
 	}
 
-	for (i = 1; i < u32; i++) {
+	for (i = 1; i < *u32; i++) {
 		/* read in subsequent key's headers */
 		if ((members = fread(buf, 2*sizeof(TSS_UUID) + 3*sizeof(UINT16),
 					1, f)) != 1) {


Index: trousers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trousers/F-11/trousers.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- trousers.spec	25 Feb 2009 21:56:48 -0000	1.13
+++ trousers.spec	27 Apr 2009 16:07:23 -0000	1.14
@@ -3,7 +3,7 @@
 
 %define name		trousers
 %define version		0.3.1
-%define release		14
+%define release		15
 
 Name:			%{name}
 Summary:		TCG's Software Stack v1.2 
@@ -29,6 +29,9 @@
 Patch4:			trousers-0.3.1-workaround-selinux-namespace-pollution.patch
 Patch5:			trousers-0.3.1-reuseaddr.patch
 Patch6:			trousers-0.3.1-use-tpm-emu.patch
+# Filed into upstream bugtracker at:
+# https://sourceforge.net/tracker/?func=detail&aid=2782253&group_id=126012&atid=704358
+Patch7:			trousers-0.3.1-gcc44.patch
 
 %description
 TrouSerS is an implementation of the Trusted Computing Group's Software Stack
@@ -66,10 +69,11 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7
 
 %build
 %configure
-make %{?_smp_mflags}
+make -k %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -131,6 +135,9 @@
 %{_libdir}/libtddl.a
 
 %changelog
+* Mon Apr 27 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.3.1-15
+- Fix FTBFS: added trousers-0.3.1-gcc44.patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild