rpms/ecryptfs-utils/F-11 ecryptfs-utils-75-fnekonfail.patch, NONE, 1.1 ecryptfs-utils.spec, 1.46, 1.47

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/extras/rpms/ecryptfs-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20667

Modified Files:
	ecryptfs-utils.spec 
Added Files:
	ecryptfs-utils-75-fnekonfail.patch 
Log Message:
add fnek in keyring if fnek support check fails


ecryptfs-utils-75-fnekonfail.patch:

--- NEW FILE ecryptfs-utils-75-fnekonfail.patch ---
=== modified file 'src/libecryptfs/key_management.c'
--- src/libecryptfs/key_management.c	2009-05-19 10:57:10 +0000
+++ src/libecryptfs/key_management.c	2009-05-25 12:08:40 +0000
@@ -671,7 +671,7 @@
 	/* If the kernel supports filename encryption, add the associated
 	 * filename encryption key to the keyring as well
 	 */
-	if (ecryptfs_get_version(&version) == 0 &&
+	if (ecryptfs_get_version(&version) != 0 ||
 	    ecryptfs_supports_filename_encryption(version)) {
 		if ((rc = ecryptfs_add_passphrase_key_to_keyring(
 					auth_tok_sig,



Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/ecryptfs-utils.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- ecryptfs-utils.spec	22 May 2009 09:56:23 -0000	1.46
+++ ecryptfs-utils.spec	4 Jun 2009 08:52:27 -0000	1.47
@@ -3,7 +3,7 @@
 
 Name: ecryptfs-utils
 Version: 75
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
@@ -28,9 +28,12 @@ Patch5: ecryptfs-utils-75-blkid.patch
 #rhbz#500829
 Patch6: ecryptfs-utils-75-nocryptdisks.patch
 
-#rhbz#500829
+#sent upstream, rhbz#495143
 Patch7: ecryptfs-utils-75-pamcheck.patch
 
+#sent upstream, rhbz#495143
+Patch8: ecryptfs-utils-75-fnekonfail.patch
+
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires: keyutils, cryptsetup-luks, e2fsprogs
 BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel
@@ -72,6 +75,7 @@ the interface supplied by the ecryptfs-u
 %patch5 -p0 -b .blkid
 %patch6 -p0 -b .nocryptdisks
 %patch7 -p0 -b .pamcheck
+%patch8 -p0 -b .fnekonfail
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -ggdb -O2 -Werror"
@@ -189,6 +193,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Thu Jun 04 2009 Michal Hlavinka <mhlavink at redhat.com> 75-3
+- add fnek sig to keyring if fnek support check fails
+
 * Fri May 22 2009 Michal Hlavinka <mhlavink at redhat.com> 75-2
 - fix check for file name encryption support in pam (#495143)
 - removed executable permission from ecryptfs-dot-private (#500817)