[ecryptfs-utils/f17] ecryptfs-utils updated to 101

Michal Hlavinka mhlavink at fedoraproject.org
Mon Oct 29 16:45:42 UTC 2012


commit ec96d5dc64e895289de1a7a9d4a2bebbb714fed6
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Mon Oct 29 17:45:36 2012 +0100

    ecryptfs-utils updated to 101

 .gitignore                       |    1 +
 ecryptfs-utils-75-werror.patch   |  102 ++++++++++++++++++++------------------
 ecryptfs-utils-87-autoload.patch |   22 ++++----
 ecryptfs-utils.spec              |    7 ++-
 sources                          |    2 +-
 5 files changed, 72 insertions(+), 62 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7c2cdea..3e7058d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ ecryptfs-mount-private.png
 /ecryptfs-utils_97.orig.tar.gz
 /ecryptfs-utils_99.orig.tar.gz
 /ecryptfs-utils_100.orig.tar.gz
+/ecryptfs-utils_101.orig.tar.gz
diff --git a/ecryptfs-utils-75-werror.patch b/ecryptfs-utils-75-werror.patch
index 63a4f0f..036609f 100644
--- a/ecryptfs-utils-75-werror.patch
+++ b/ecryptfs-utils-75-werror.patch
@@ -1,6 +1,6 @@
-diff -up ecryptfs-utils-100/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror ecryptfs-utils-100/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c
---- ecryptfs-utils-100/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror	2012-08-20 15:46:19.795460481 +0200
-+++ ecryptfs-utils-100/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c	2012-08-20 15:46:19.844460878 +0200
+diff -up ecryptfs-utils-101/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror ecryptfs-utils-101/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c
+--- ecryptfs-utils-101/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror	2012-10-29 17:18:53.063121595 +0100
++++ ecryptfs-utils-101/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c	2012-10-29 17:18:53.077121720 +0100
 @@ -99,7 +99,7 @@ static int ecryptfs_pkcs11h_deserialize(
  		pkcs11h_data->serialized_id = NULL;
  	}
@@ -150,9 +150,9 @@ diff -up ecryptfs-utils-100/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror
  
  	subgraph_key_ctx = (struct pkcs11h_subgraph_key_ctx *)(*foo);
  
-diff -up ecryptfs-utils-100/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils-100/src/libecryptfs/ecryptfs-stat.c
---- ecryptfs-utils-100/src/libecryptfs/ecryptfs-stat.c.werror	2012-05-18 21:06:17.000000000 +0200
-+++ ecryptfs-utils-100/src/libecryptfs/ecryptfs-stat.c	2012-08-20 15:46:19.845460886 +0200
+diff -up ecryptfs-utils-101/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils-101/src/libecryptfs/ecryptfs-stat.c
+--- ecryptfs-utils-101/src/libecryptfs/ecryptfs-stat.c.werror	2012-05-18 21:06:17.000000000 +0200
++++ ecryptfs-utils-101/src/libecryptfs/ecryptfs-stat.c	2012-10-29 17:18:53.077121720 +0100
 @@ -146,7 +146,7 @@ int ecryptfs_parse_stat(struct ecryptfs_
  	if (buf_size < (ECRYPTFS_FILE_SIZE_BYTES
  			+ MAGIC_ECRYPTFS_MARKER_SIZE_BYTES
@@ -162,9 +162,9 @@ diff -up ecryptfs-utils-100/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-util
  		       "bytes; there are only [%zu] bytes\n", __FUNCTION__,
  		       (ECRYPTFS_FILE_SIZE_BYTES
  			+ MAGIC_ECRYPTFS_MARKER_SIZE_BYTES
-diff -up ecryptfs-utils-100/src/libecryptfs/key_management.c.werror ecryptfs-utils-100/src/libecryptfs/key_management.c
---- ecryptfs-utils-100/src/libecryptfs/key_management.c.werror	2012-08-20 15:46:19.791460449 +0200
-+++ ecryptfs-utils-100/src/libecryptfs/key_management.c	2012-08-20 15:46:19.845460886 +0200
+diff -up ecryptfs-utils-101/src/libecryptfs/key_management.c.werror ecryptfs-utils-101/src/libecryptfs/key_management.c
+--- ecryptfs-utils-101/src/libecryptfs/key_management.c.werror	2012-10-29 17:18:53.059121560 +0100
++++ ecryptfs-utils-101/src/libecryptfs/key_management.c	2012-10-29 17:18:53.077121720 +0100
 @@ -228,7 +228,6 @@ int ecryptfs_wrap_passphrase_file(char *
  	int rc = 0;
  	ssize_t size;
@@ -173,9 +173,9 @@ diff -up ecryptfs-utils-100/src/libecryptfs/key_management.c.werror ecryptfs-uti
  	char *p = NULL;
  	char decrypted_passphrase[ECRYPTFS_MAX_PASSPHRASE_BYTES + 1];
  
-diff -up ecryptfs-utils-100/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils-100/src/pam_ecryptfs/pam_ecryptfs.c
---- ecryptfs-utils-100/src/pam_ecryptfs/pam_ecryptfs.c.werror	2012-08-02 15:20:17.000000000 +0200
-+++ ecryptfs-utils-100/src/pam_ecryptfs/pam_ecryptfs.c	2012-08-20 15:48:15.233393985 +0200
+diff -up ecryptfs-utils-101/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils-101/src/pam_ecryptfs/pam_ecryptfs.c
+--- ecryptfs-utils-101/src/pam_ecryptfs/pam_ecryptfs.c.werror	2012-08-02 15:20:17.000000000 +0200
++++ ecryptfs-utils-101/src/pam_ecryptfs/pam_ecryptfs.c	2012-10-29 17:18:53.078121728 +0100
 @@ -47,31 +47,6 @@
  
  #define PRIVATE_DIR "Private"
@@ -208,19 +208,17 @@ diff -up ecryptfs-utils-100/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-util
  /* returns: 0 if file does not exist, 1 if it exists, <0 for error */
  static int file_exists_dotecryptfs(const char *homedir, char *filename)
  {
-@@ -110,10 +85,8 @@ static int wrap_passphrase_if_necessary(
+@@ -110,9 +85,7 @@ static int wrap_passphrase_if_necessary(
  	    stat(wrapped_pw_filename, &s) != 0  &&
  	    passphrase != NULL && *passphrase != '\0' &&
  	    username != NULL && *username != '\0') {
 -		setuid(uid);
 -		rc = ecryptfs_wrap_passphrase_file(wrapped_pw_filename, passphrase, salt, unwrapped_pw_filename);
 -		if (rc != 0) {
--			syslog(LOG_ERR, "pam_ecryptfs: Error wrapping cleartext password; " "rc = [%d]\n", rc);
 +		if ((rc = setuid(uid))<0 || ((rc = ecryptfs_wrap_passphrase_file(wrapped_pw_filename, passphrase, salt, unwrapped_pw_filename)) != 0)) {
-+			syslog(LOG_ERR, "pam_ecryptfs: Error wrapping cleartext password; " "rc = [%d]\n", rc);
+ 			syslog(LOG_ERR, "pam_ecryptfs: Error wrapping cleartext password; " "rc = [%d]\n", rc);
  		}
  		return rc;
- 	}
 @@ -211,8 +184,6 @@ PAM_EXTERN int pam_sm_authenticate(pam_h
  		if ((argc == 1)
  		    && (memcmp(argv[0], "unwrap\0", 7) == 0)) {
@@ -300,9 +298,9 @@ diff -up ecryptfs-utils-100/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-util
  
  outnouid:
  	return rc;
-diff -up ecryptfs-utils-100/src/utils/mount.ecryptfs.c.werror ecryptfs-utils-100/src/utils/mount.ecryptfs.c
---- ecryptfs-utils-100/src/utils/mount.ecryptfs.c.werror	2012-08-20 15:46:19.805460562 +0200
-+++ ecryptfs-utils-100/src/utils/mount.ecryptfs.c	2012-08-20 15:46:19.847460902 +0200
+diff -up ecryptfs-utils-101/src/utils/mount.ecryptfs.c.werror ecryptfs-utils-101/src/utils/mount.ecryptfs.c
+--- ecryptfs-utils-101/src/utils/mount.ecryptfs.c.werror	2012-10-29 17:18:53.074121695 +0100
++++ ecryptfs-utils-101/src/utils/mount.ecryptfs.c	2012-10-29 17:18:53.078121728 +0100
 @@ -34,6 +34,7 @@
  #include <sys/mount.h>
  #include <sys/stat.h>
@@ -311,10 +309,18 @@ diff -up ecryptfs-utils-100/src/utils/mount.ecryptfs.c.werror ecryptfs-utils-100
  #include "config.h"
  #include "ecryptfs.h"
  #include "decision_graph.h"
-diff -up ecryptfs-utils-100/src/utils/mount.ecryptfs_private.c.werror ecryptfs-utils-100/src/utils/mount.ecryptfs_private.c
---- ecryptfs-utils-100/src/utils/mount.ecryptfs_private.c.werror	2012-08-20 15:46:19.801460530 +0200
-+++ ecryptfs-utils-100/src/utils/mount.ecryptfs_private.c	2012-08-20 15:46:19.847460902 +0200
-@@ -95,7 +95,7 @@ int read_config(char *pw_dir, int uid, c
+diff -up ecryptfs-utils-101/src/utils/mount.ecryptfs_private.c.werror ecryptfs-utils-101/src/utils/mount.ecryptfs_private.c
+--- ecryptfs-utils-101/src/utils/mount.ecryptfs_private.c.werror	2012-10-29 17:18:53.069121651 +0100
++++ ecryptfs-utils-101/src/utils/mount.ecryptfs_private.c	2012-10-29 17:19:12.958287311 +0100
+@@ -42,6 +42,7 @@
+ #include <unistd.h>
+ #include <syslog.h>
+ #include <values.h>
++#include <ctype.h>
+ #include "../include/ecryptfs.h"
+ 
+ /* Perhaps a future version of this program will allow these to be configurable
+@@ -95,7 +96,7 @@ int read_config(char *pw_dir, int uid, c
  	*s = strdup(e->mnt_fsname);
  	if (!*s)
  		return -2;
@@ -323,7 +329,7 @@ diff -up ecryptfs-utils-100/src/utils/mount.ecryptfs_private.c.werror ecryptfs-u
  	return 0;
  }
  
-@@ -686,8 +686,8 @@ int main(int argc, char *argv[]) {
+@@ -692,8 +693,8 @@ int main(int argc, char *argv[]) {
   		 * update mtab for us, and replace the current process.
  		 * Do not use the umount.ecryptfs helper (-i).
   		 */
@@ -334,9 +340,9 @@ diff -up ecryptfs-utils-100/src/utils/mount.ecryptfs_private.c.werror ecryptfs-u
  		clearenv();
  
  		/* Since we're doing a lazy unmount anyway, just unmount the current
-diff -up ecryptfs-utils-100/src/utils/test.c.werror ecryptfs-utils-100/src/utils/test.c
---- ecryptfs-utils-100/src/utils/test.c.werror	2012-05-18 21:06:17.000000000 +0200
-+++ ecryptfs-utils-100/src/utils/test.c	2012-08-20 15:46:19.847460902 +0200
+diff -up ecryptfs-utils-101/src/utils/test.c.werror ecryptfs-utils-101/src/utils/test.c
+--- ecryptfs-utils-101/src/utils/test.c.werror	2012-05-18 21:06:17.000000000 +0200
++++ ecryptfs-utils-101/src/utils/test.c	2012-10-29 17:18:53.079121737 +0100
 @@ -281,7 +281,7 @@ int ecryptfs_encrypt_page(int page_cache
  	struct inode *lower_inode;
  	struct ecryptfs_crypt_stat *crypt_stat;
@@ -346,9 +352,9 @@ diff -up ecryptfs-utils-100/src/utils/test.c.werror ecryptfs-utils-100/src/utils
  	int orig_byte_offset = 0;
  	int num_extents_per_page;
  #define ECRYPTFS_PAGE_STATE_UNREAD    0
-diff -up ecryptfs-utils-100/tests/kernel/directory-concurrent/test.c.werror ecryptfs-utils-100/tests/kernel/directory-concurrent/test.c
---- ecryptfs-utils-100/tests/kernel/directory-concurrent/test.c.werror	2012-05-18 21:06:17.000000000 +0200
-+++ ecryptfs-utils-100/tests/kernel/directory-concurrent/test.c	2012-08-20 15:46:19.848460910 +0200
+diff -up ecryptfs-utils-101/tests/kernel/directory-concurrent/test.c.werror ecryptfs-utils-101/tests/kernel/directory-concurrent/test.c
+--- ecryptfs-utils-101/tests/kernel/directory-concurrent/test.c.werror	2012-05-18 21:06:17.000000000 +0200
++++ ecryptfs-utils-101/tests/kernel/directory-concurrent/test.c	2012-10-29 17:18:53.079121737 +0100
 @@ -149,7 +149,7 @@ int hang_check(int option, const char *f
  
  int test_dirs(const char *path, const int max_dirs)
@@ -358,9 +364,9 @@ diff -up ecryptfs-utils-100/tests/kernel/directory-concurrent/test.c.werror ecry
  	char *filename;
  	size_t len = strlen(path) + 32;
  	int ret = TEST_PASSED;
-diff -up ecryptfs-utils-100/tests/kernel/enospc/test.c.werror ecryptfs-utils-100/tests/kernel/enospc/test.c
---- ecryptfs-utils-100/tests/kernel/enospc/test.c.werror	2012-08-02 15:20:17.000000000 +0200
-+++ ecryptfs-utils-100/tests/kernel/enospc/test.c	2012-08-20 15:46:19.848460910 +0200
+diff -up ecryptfs-utils-101/tests/kernel/enospc/test.c.werror ecryptfs-utils-101/tests/kernel/enospc/test.c
+--- ecryptfs-utils-101/tests/kernel/enospc/test.c.werror	2012-08-02 15:20:17.000000000 +0200
++++ ecryptfs-utils-101/tests/kernel/enospc/test.c	2012-10-29 17:18:53.080121747 +0100
 @@ -37,9 +37,6 @@
  int test_exercise(char *filename, ssize_t size)
  {
@@ -371,9 +377,9 @@ diff -up ecryptfs-utils-100/tests/kernel/enospc/test.c.werror ecryptfs-utils-100
  	ssize_t nbytes = size;
  	int ret = TEST_FAILED;
  
-diff -up ecryptfs-utils-100/tests/kernel/extend-file-random/test.c.werror ecryptfs-utils-100/tests/kernel/extend-file-random/test.c
---- ecryptfs-utils-100/tests/kernel/extend-file-random/test.c.werror	2012-05-18 21:06:17.000000000 +0200
-+++ ecryptfs-utils-100/tests/kernel/extend-file-random/test.c	2012-08-20 15:46:19.848460910 +0200
+diff -up ecryptfs-utils-101/tests/kernel/extend-file-random/test.c.werror ecryptfs-utils-101/tests/kernel/extend-file-random/test.c
+--- ecryptfs-utils-101/tests/kernel/extend-file-random/test.c.werror	2012-05-18 21:06:17.000000000 +0200
++++ ecryptfs-utils-101/tests/kernel/extend-file-random/test.c	2012-10-29 17:18:53.080121747 +0100
 @@ -48,7 +48,7 @@ int test_write(int fd, char *buffer, siz
  	}
  
@@ -399,9 +405,9 @@ diff -up ecryptfs-utils-100/tests/kernel/extend-file-random/test.c.werror ecrypt
  			len, offset, strerror(errno));
  		return TEST_FAILED;
  	}
-diff -up ecryptfs-utils-100/tests/kernel/file-concurrent/test.c.werror ecryptfs-utils-100/tests/kernel/file-concurrent/test.c
---- ecryptfs-utils-100/tests/kernel/file-concurrent/test.c.werror	2012-05-18 21:06:17.000000000 +0200
-+++ ecryptfs-utils-100/tests/kernel/file-concurrent/test.c	2012-08-20 15:46:19.849460918 +0200
+diff -up ecryptfs-utils-101/tests/kernel/file-concurrent/test.c.werror ecryptfs-utils-101/tests/kernel/file-concurrent/test.c
+--- ecryptfs-utils-101/tests/kernel/file-concurrent/test.c.werror	2012-05-18 21:06:17.000000000 +0200
++++ ecryptfs-utils-101/tests/kernel/file-concurrent/test.c	2012-10-29 17:18:53.080121747 +0100
 @@ -177,7 +177,7 @@ int hang_check(int option, const char *f
  
  int test_files(const char *path, const int max_files)
@@ -411,9 +417,9 @@ diff -up ecryptfs-utils-100/tests/kernel/file-concurrent/test.c.werror ecryptfs-
  	char *filename;
  	size_t len = strlen(path) + 32;
  	int ret = TEST_PASSED;
-diff -up ecryptfs-utils-100/tests/kernel/inode-race-stat/test.c.werror ecryptfs-utils-100/tests/kernel/inode-race-stat/test.c
---- ecryptfs-utils-100/tests/kernel/inode-race-stat/test.c.werror	2012-08-02 15:20:17.000000000 +0200
-+++ ecryptfs-utils-100/tests/kernel/inode-race-stat/test.c	2012-08-20 15:46:19.849460918 +0200
+diff -up ecryptfs-utils-101/tests/kernel/inode-race-stat/test.c.werror ecryptfs-utils-101/tests/kernel/inode-race-stat/test.c
+--- ecryptfs-utils-101/tests/kernel/inode-race-stat/test.c.werror	2012-08-02 15:20:17.000000000 +0200
++++ ecryptfs-utils-101/tests/kernel/inode-race-stat/test.c	2012-10-29 17:18:53.081121757 +0100
 @@ -106,7 +106,6 @@ static void do_test(const int fdin, cons
  {
  	for (;;) {
@@ -448,9 +454,9 @@ diff -up ecryptfs-utils-100/tests/kernel/inode-race-stat/test.c.werror ecryptfs-
  		(void)waitpid(pids[i], &status, 0);
  
  		(void)close(pipe_to[i][1]);
-diff -up ecryptfs-utils-100/tests/kernel/lp-509180/test.c.werror ecryptfs-utils-100/tests/kernel/lp-509180/test.c
---- ecryptfs-utils-100/tests/kernel/lp-509180/test.c.werror	2012-05-18 21:06:17.000000000 +0200
-+++ ecryptfs-utils-100/tests/kernel/lp-509180/test.c	2012-08-20 15:46:19.850460926 +0200
+diff -up ecryptfs-utils-101/tests/kernel/lp-509180/test.c.werror ecryptfs-utils-101/tests/kernel/lp-509180/test.c
+--- ecryptfs-utils-101/tests/kernel/lp-509180/test.c.werror	2012-05-18 21:06:17.000000000 +0200
++++ ecryptfs-utils-101/tests/kernel/lp-509180/test.c	2012-10-29 17:18:53.081121757 +0100
 @@ -48,7 +48,6 @@ int main(int argc, char **argv)
  	int fd;
  	int opt, flags = 0;
@@ -459,9 +465,9 @@ diff -up ecryptfs-utils-100/tests/kernel/lp-509180/test.c.werror ecryptfs-utils-
  	char *file;
  	unsigned char buffer[1];
  
-diff -up ecryptfs-utils-100/tests/kernel/trunc-file/test.c.werror ecryptfs-utils-100/tests/kernel/trunc-file/test.c
---- ecryptfs-utils-100/tests/kernel/trunc-file/test.c.werror	2012-05-18 21:06:17.000000000 +0200
-+++ ecryptfs-utils-100/tests/kernel/trunc-file/test.c	2012-08-20 15:46:19.850460926 +0200
+diff -up ecryptfs-utils-101/tests/kernel/trunc-file/test.c.werror ecryptfs-utils-101/tests/kernel/trunc-file/test.c
+--- ecryptfs-utils-101/tests/kernel/trunc-file/test.c.werror	2012-05-18 21:06:17.000000000 +0200
++++ ecryptfs-utils-101/tests/kernel/trunc-file/test.c	2012-10-29 17:18:53.081121757 +0100
 @@ -39,7 +39,7 @@
  
  int write_buff(int fd, unsigned char *data, ssize_t size)
diff --git a/ecryptfs-utils-87-autoload.patch b/ecryptfs-utils-87-autoload.patch
index 6d491f9..ad7e0ba 100644
--- a/ecryptfs-utils-87-autoload.patch
+++ b/ecryptfs-utils-87-autoload.patch
@@ -1,6 +1,6 @@
-diff -up ecryptfs-utils-93/src/utils/ecryptfs-mount-private.autoload ecryptfs-utils-93/src/utils/ecryptfs-mount-private
---- ecryptfs-utils-93/src/utils/ecryptfs-mount-private.autoload	2011-10-27 17:53:07.000000000 +0200
-+++ ecryptfs-utils-93/src/utils/ecryptfs-mount-private	2011-10-31 12:40:46.066315002 +0100
+diff -up ecryptfs-utils-101/src/utils/ecryptfs-mount-private.autoload ecryptfs-utils-101/src/utils/ecryptfs-mount-private
+--- ecryptfs-utils-101/src/utils/ecryptfs-mount-private.autoload	2012-05-18 21:06:17.000000000 +0200
++++ ecryptfs-utils-101/src/utils/ecryptfs-mount-private	2012-10-29 17:04:41.989524805 +0100
 @@ -33,6 +33,9 @@ if /sbin/mount.ecryptfs_private >/dev/nu
  	exit 0
  fi
@@ -11,9 +11,9 @@ diff -up ecryptfs-utils-93/src/utils/ecryptfs-mount-private.autoload ecryptfs-ut
  # Otherwise, interactively prompt for the user's password
  if [ -f "$WRAPPED_PASSPHRASE_FILE" -a -f "$MOUNT_PASSPHRASE_SIG_FILE" ]; then
  	tries=0
-diff -up ecryptfs-utils-93/src/utils/ecryptfs-setup-private.autoload ecryptfs-utils-93/src/utils/ecryptfs-setup-private
---- ecryptfs-utils-93/src/utils/ecryptfs-setup-private.autoload	2011-10-27 17:53:07.000000000 +0200
-+++ ecryptfs-utils-93/src/utils/ecryptfs-setup-private	2011-10-31 12:40:46.066315002 +0100
+diff -up ecryptfs-utils-101/src/utils/ecryptfs-setup-private.autoload ecryptfs-utils-101/src/utils/ecryptfs-setup-private
+--- ecryptfs-utils-101/src/utils/ecryptfs-setup-private.autoload	2012-05-18 21:06:17.000000000 +0200
++++ ecryptfs-utils-101/src/utils/ecryptfs-setup-private	2012-10-29 17:04:41.989524805 +0100
 @@ -101,6 +101,7 @@ random_passphrase () {
  }
  
@@ -22,11 +22,11 @@ diff -up ecryptfs-utils-93/src/utils/ecryptfs-setup-private.autoload ecryptfs-ut
  	version=$(cat /sys/fs/ecryptfs/version 2>/dev/null)
  	[ -z "$version" ] && error "$(gettext 'Cannot get ecryptfs version, ecryptfs kernel module not loaded?')"
  	[ $(($version & 0x100)) -eq 0 ] && return 1
-diff -up ecryptfs-utils-93/src/utils/mount.ecryptfs_private.c.autoload ecryptfs-utils-93/src/utils/mount.ecryptfs_private.c
---- ecryptfs-utils-93/src/utils/mount.ecryptfs_private.c.autoload	2011-10-31 12:40:46.000000000 +0100
-+++ ecryptfs-utils-93/src/utils/mount.ecryptfs_private.c	2011-10-31 13:40:14.990679286 +0100
-@@ -489,6 +489,13 @@ int main(int argc, char *argv[]) {
- 	char *sig, *sig_fnek;
+diff -up ecryptfs-utils-101/src/utils/mount.ecryptfs_private.c.autoload ecryptfs-utils-101/src/utils/mount.ecryptfs_private.c
+--- ecryptfs-utils-101/src/utils/mount.ecryptfs_private.c.autoload	2012-10-08 20:27:17.000000000 +0200
++++ ecryptfs-utils-101/src/utils/mount.ecryptfs_private.c	2012-10-29 17:17:24.284378216 +0100
+@@ -503,6 +503,13 @@ int main(int argc, char *argv[]) {
+ 	char **sig;
  	FILE *fh_counter = NULL;
  
 +	if (argc == 2 && !strcmp(argv[1],"--loadmodule"))
diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec
index 7d66165..8bdc35a 100644
--- a/ecryptfs-utils.spec
+++ b/ecryptfs-utils.spec
@@ -4,8 +4,8 @@
 %global _sbindir /sbin
 
 Name: ecryptfs-utils
-Version: 100
-Release: 6%{?dist}
+Version: 101
+Release: 1%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
@@ -265,6 +265,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Mon Oct 29 2012 Michal Hlavinka <mhlavink at redhat.com> - 101-1
+- ecryptfs-utils updated to 101
+
 * Thu Oct 25 2012 Michal Hlavinka <mhlavink at redhat.com> - 100-6
 - home migration did not work under sudo (#868330)
 
diff --git a/sources b/sources
index a425f76..9b88153 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 e612ddb9ccb17f8fec79df26e626a8c6  ecryptfs-mount-private.png
-efaa5eabbd368268874536036397f73b  ecryptfs-utils_100.orig.tar.gz
+7a17714b2e4555a79d464e260b179f4f  ecryptfs-utils_101.orig.tar.gz


More information about the scm-commits mailing list