[ecryptfs-utils/f14/master] - fix build on arches where char is unsigned by default
Michal Hlavinka
mhlavink at fedoraproject.org
Tue Jan 18 11:15:43 UTC 2011
commit a5a62787be9e73709d097473556006e17deee9e9
Author: Michal Hlavinka <mhlavink at redhat.com>
Date: Tue Jan 18 12:15:32 2011 +0100
- fix build on arches where char is unsigned by default
ecryptfs-utils-84-fgetc.patch | 13 +++++++++++++
ecryptfs-utils.spec | 11 +++++++++--
2 files changed, 22 insertions(+), 2 deletions(-)
---
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 170e880..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,7 +202,10 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitearch}/ecryptfs-utils/_libecryptfs.so
%changelog
-* Tue Jan 04 2011 Michal Hlavinka <mhlavink at redhat.com> - 84-2
+* 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 at redhat.com> - 84-2
- fix unsigned < 0 test (#664474)
* Mon Dec 20 2010 Michal Hlavinka <mhlavink at redhat.com> - 84-1
More information about the scm-commits
mailing list