From 48d0393e219b0e9acf9a74aaa3b09f0210ca5eaf Mon Sep 17 00:00:00 2001
From: Emily Ratliff <ejratl@fedoraproject.org>
Date: Wed, 4 Jun 2008 04:11:48 +0000
Subject: [PATCH] fix build error on ppc64 & x86_64

---
 trousers-0.3.1-cast.patch | 12 ++++++++++++
 trousers.spec             |  3 +++
 2 files changed, 15 insertions(+)
 create mode 100644 trousers-0.3.1-cast.patch

diff --git a/trousers-0.3.1-cast.patch b/trousers-0.3.1-cast.patch
new file mode 100644
index 0000000..43416d2
--- /dev/null
+++ b/trousers-0.3.1-cast.patch
@@ -0,0 +1,12 @@
+diff -Naur trousers-0.3.1-orig/src/tspi/tspi_nv.c trousers-0.3.1/src/tspi/tspi_nv.c
+--- trousers-0.3.1-orig/src/tspi/tspi_nv.c	2007-09-25 13:57:58.000000000 -0500
++++ trousers-0.3.1/src/tspi/tspi_nv.c	2008-06-03 22:20:30.000000000 -0500
+@@ -217,7 +217,7 @@
+ 
+ 	nv_data_public.tag = TPM_TAG_NV_DATA_PUBLIC;
+ 
+-	if ((result = obj_nvstore_create_pcrshortinfo(hNvstore, (TSS_HPCRS)NULL, &pPCR_len, &pPCR)))
++	if ((result = obj_nvstore_create_pcrshortinfo(hNvstore, (TSS_HPCRS)0, &pPCR_len, &pPCR)))
+ 		return result;
+ 
+ 	NVPublic_DataSize = 0;
diff --git a/trousers.spec b/trousers.spec
index 1797bd3..07579fb 100644
--- a/trousers.spec
+++ b/trousers.spec
@@ -24,6 +24,7 @@ Requires(preun):	/sbin/chkconfig
 Requires(preun):	/sbin/service
 Patch0:			trousers-0.3.1-remove-group-install-code.patch
 Patch1:			trousers-0.3.1-limits.patch
+Patch2:			trousers-0.3.1-cast.patch
 
 %description
 TrouSerS is an implementation of the Trusted Computing Group's Software Stack
@@ -55,6 +56,7 @@ applications.
 %setup -q
 %patch0 -p1
 %patch1 -p2
+%patch2 -p1
 
 %build
 %configure
@@ -121,6 +123,7 @@ fi
 %changelog
 * Tue Jun 03 2008 Emily Ratliff <ratliff@austin.ibm.com> - 0.3.1-7
 - Fix for BZ #434267 and #440733. Patch authored by Debora Velarde
+- Fix cast issue preventing successful build on ppc64 and x86_64
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.3.1-6
 - Autorebuild for GCC 4.3