diff --git a/.gitignore b/.gitignore index 864694a..c6be709 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ ecryptfs-mount-private.png /ecryptfs-utils_87.orig.tar.gz /ecryptfs-utils_90.orig.tar.gz /ecryptfs-utils_93.orig.tar.gz +/ecryptfs-utils_95.orig.tar.gz diff --git a/ecryptfs-utils-84-fgetc.patch b/ecryptfs-utils-84-fgetc.patch deleted file mode 100644 index 9a6a4b4..0000000 --- a/ecryptfs-utils-84-fgetc.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 f67bca6..f14ed03 100644 --- a/ecryptfs-utils.spec +++ b/ecryptfs-utils.spec @@ -4,8 +4,8 @@ %global _sbindir /sbin Name: ecryptfs-utils -Version: 93 -Release: 2%{?dist} +Version: 95 +Release: 1%{?dist} Summary: The eCryptfs mount helper and support libraries Group: System Environment/Base License: GPLv2+ @@ -25,10 +25,6 @@ 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 -# also fixes this issue: char c; while((c = fgetc(fh)) != EOF) -Patch6: ecryptfs-utils-84-fgetc.patch - # fix man pages Patch8: ecryptfs-utils-86-manpage.patch @@ -105,7 +101,6 @@ the interface supplied by the ecryptfs-utils library. %patch3 -p1 -b .fixsalt %patch4 -p1 -b .splitnss %patch5 -p1 -b .fixsigness -%patch6 -p1 -b .fgetc %patch8 -p1 -b .manfix %patch9 -p1 -b .autoload %patch10 -p1 -b .mtabfix @@ -257,6 +252,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/ecryptfs-utils/_libecryptfs.so %changelog +* Fri Dec 16 2011 Michal Hlavinka - 95-1 +- updated to v. 95 + * Wed Dec 07 2011 Michal Hlavinka - 93-2 - update pam config in post install phase diff --git a/sources b/sources index ab082b6..d523cf8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ e612ddb9ccb17f8fec79df26e626a8c6 ecryptfs-mount-private.png -7a162a2102a2c1701a156498d9218685 ecryptfs-utils_93.orig.tar.gz +b015c89d9c684bd1c10b57c7c8d40577 ecryptfs-utils_95.orig.tar.gz