From 3c8e7c2d81b70a28c10809abfbef7b009f83d0b6 Mon Sep 17 00:00:00 2001
From: Dan Horák <dan@danny.cz>
Date: Jan 11 2011 10:10:47 +0000
Subject: - fix build on arches where char is unsigned by default


---

diff --git a/ecryptfs-utils-84-fgetc.patch b/ecryptfs-utils-84-fgetc.patch
new file mode 100644
index 0000000..9a6a4b4
--- /dev/null
+++ b/ecryptfs-utils-84-fgetc.patch
@@ -0,0 +1,13 @@
+diff -up ecryptfs-utils-84/src/utils/mount.ecryptfs_private.c.fgetc ecryptfs-utils-84/src/utils/mount.ecryptfs_private.c
+--- ecryptfs-utils-84/src/utils/mount.ecryptfs_private.c.fgetc	2011-01-11 10:44:20.000000000 +0100
++++ ecryptfs-utils-84/src/utils/mount.ecryptfs_private.c	2011-01-11 10:44:32.000000000 +0100
+@@ -88,7 +88,8 @@ char *fetch_sig(char *pw_dir, int entry)
+ /* Read ecryptfs signature from file and validate
+  * Return signature as a string, or NULL on failure
+  */
+-	char *sig_file, c;
++	char *sig_file;
++	int c;
+ 	FILE *fh;
+ 	char *sig;
+ 	int i;
diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec
index 4bd29dc..6c32444 100644
--- a/ecryptfs-utils.spec
+++ b/ecryptfs-utils.spec
@@ -5,7 +5,7 @@
 
 Name: ecryptfs-utils
 Version: 84
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
@@ -29,6 +29,9 @@ Patch4: ecryptfs-utils-83-splitnss.patch
 # rhbz#664474, fix unsigned < 0 test
 Patch5: ecryptfs-utils-84-fixsigness.patch
 
+# fix build on arches where char is unsigned by default
+Patch6: ecryptfs-utils-84-fgetc.patch
+
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires: keyutils, cryptsetup-luks, util-linux-ng, gettext
 BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel
@@ -71,6 +74,7 @@ the interface supplied by the ecryptfs-utils library.
 %patch3 -p1 -b .fixsalt
 %patch4 -p1 -b .splitnss
 %patch5 -p1 -b .fixsigness
+%patch6 -p1 -b .fgetc
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -ggdb -O2 -Werror -Wtype-limits"
@@ -198,6 +202,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Tue Jan 11 2011 Dan Horák <dan[at]danny.cz> - 84-3
+- fix build on arches where char is unsigned by default
+
 * Mon Jan 04 2011 Michal Hlavinka <mhlavink@redhat.com> - 84-2
 - fix unsigned < 0 test (#664474)