[ecryptfs-utils] update werror patch

[Michal Hlavinka]

commit 5d320b9d7bba7ae5acd10a16c316f639c3988a45
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Tue Feb 1 11:17:02 2011 +0100

    update werror patch

 ecryptfs-utils-75-werror.patch |   61 +++++++++++++++++++++++++++++++--------
 1 files changed, 48 insertions(+), 13 deletions(-)
---
diff --git a/ecryptfs-utils-75-werror.patch b/ecryptfs-utils-75-werror.patch
index ee65fc4..54fb587 100644
--- a/ecryptfs-utils-75-werror.patch
+++ b/ecryptfs-utils-75-werror.patch
@@ -1,6 +1,6 @@
-diff -up ecryptfs-utils-84/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror ecryptfs-utils-84/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c
---- ecryptfs-utils-84/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror	2010-12-17 18:34:04.000000000 +0100
-+++ ecryptfs-utils-84/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c	2011-01-04 14:15:47.117777798 +0100
+diff -up ecryptfs-utils-85/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror ecryptfs-utils-85/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c
+--- ecryptfs-utils-85/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror	2010-12-17 18:34:04.000000000 +0100
++++ ecryptfs-utils-85/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c	2011-02-01 11:12:14.813646937 +0100
 @@ -86,7 +86,7 @@ static int ecryptfs_pkcs11h_deserialize(
  		pkcs11h_data->serialized_id = NULL;
  	}
@@ -150,9 +150,9 @@ diff -up ecryptfs-utils-84/src/key_mod/ecryptfs_key_mod_pkcs11_helper.c.werror e
  
  	subgraph_key_ctx = (struct pkcs11h_subgraph_key_ctx *)(*foo);
  
-diff -up ecryptfs-utils-84/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils-84/src/libecryptfs/ecryptfs-stat.c
---- ecryptfs-utils-84/src/libecryptfs/ecryptfs-stat.c.werror	2010-12-17 18:34:04.000000000 +0100
-+++ ecryptfs-utils-84/src/libecryptfs/ecryptfs-stat.c	2011-01-04 14:13:41.746022440 +0100
+diff -up ecryptfs-utils-85/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils-85/src/libecryptfs/ecryptfs-stat.c
+--- ecryptfs-utils-85/src/libecryptfs/ecryptfs-stat.c.werror	2010-12-17 18:34:04.000000000 +0100
++++ ecryptfs-utils-85/src/libecryptfs/ecryptfs-stat.c	2011-02-01 11:12:14.813646937 +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-84/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils
  		       "bytes; there are only [%zu] bytes\n", __FUNCTION__,
  		       (ECRYPTFS_FILE_SIZE_BYTES
  			+ MAGIC_ECRYPTFS_MARKER_SIZE_BYTES
-diff -up ecryptfs-utils-84/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils-84/src/pam_ecryptfs/pam_ecryptfs.c
---- ecryptfs-utils-84/src/pam_ecryptfs/pam_ecryptfs.c.werror	2010-12-17 18:34:04.000000000 +0100
-+++ ecryptfs-utils-84/src/pam_ecryptfs/pam_ecryptfs.c	2011-01-04 14:13:41.747022438 +0100
+diff -up ecryptfs-utils-85/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils-85/src/pam_ecryptfs/pam_ecryptfs.c
+--- ecryptfs-utils-85/src/pam_ecryptfs/pam_ecryptfs.c.werror	2010-12-17 18:34:04.000000000 +0100
++++ ecryptfs-utils-85/src/pam_ecryptfs/pam_ecryptfs.c	2011-02-01 11:12:18.061664154 +0100
 @@ -43,31 +43,6 @@
  
  #define PRIVATE_DIR "Private"
@@ -233,7 +233,21 @@ diff -up ecryptfs-utils-84/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils
  				fd = open("/var/lib/update-notifier/dpkg-run-stamp", O_WRONLY|O_CREAT|O_NONBLOCK, 0666);
  				close(fd);
  			}
-@@ -428,7 +399,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand
+@@ -410,7 +381,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand
+ 	char *old_passphrase = NULL;
+ 	char *new_passphrase = NULL;
+ 	char *wrapped_pw_filename;
+-	char *name = NULL;
++// 	char *name = NULL;
+ 	char salt[ECRYPTFS_SALT_SIZE];
+ 	char salt_hex[ECRYPTFS_SALT_SIZE_HEX];
+ 	pid_t child_pid, tmp_pid;
+@@ -424,11 +395,11 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand
+ 		if (pwd) {
+ 			uid = pwd->pw_uid;
+ 			homedir = pwd->pw_dir;
+-			name = pwd->pw_name;
++// 			name = pwd->pw_name;
  		}
  	} else {
  		syslog(LOG_ERR, "Error getting passwd info for user [%s]; "
@@ -242,9 +256,30 @@ diff -up ecryptfs-utils-84/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils
  		goto out;
  	}
  	saved_uid = geteuid();
-diff -up ecryptfs-utils-84/src/utils/test.c.werror ecryptfs-utils-84/src/utils/test.c
---- ecryptfs-utils-84/src/utils/test.c.werror	2010-12-17 18:34:04.000000000 +0100
-+++ ecryptfs-utils-84/src/utils/test.c	2011-01-04 14:13:41.750022429 +0100
+diff -up ecryptfs-utils-85/src/utils/mount.ecryptfs.c.werror ecryptfs-utils-85/src/utils/mount.ecryptfs.c
+--- ecryptfs-utils-85/src/utils/mount.ecryptfs.c.werror	2010-12-17 18:34:04.000000000 +0100
++++ ecryptfs-utils-85/src/utils/mount.ecryptfs.c	2011-02-01 11:12:14.818646964 +0100
+@@ -461,7 +461,7 @@ static int ecryptfs_do_mount(int argc, c
+ {
+ 	int rc;
+ 	int flags = 0;
+-	int num_opts = 0;
++// 	int num_opts = 0;
+ 	char *src = NULL, *targ = NULL, *opts = NULL, *new_opts = NULL, *temp;
+ 	char *val;
+ 
+@@ -472,7 +472,7 @@ static int ecryptfs_do_mount(int argc, c
+ 	rc = strip_userland_opts(opts);
+ 	if (rc)
+ 		goto out;
+-	num_opts = ecryptfs_generate_mount_flags(opts, &flags);
++	ecryptfs_generate_mount_flags(opts, &flags);
+ 	if (!(temp = strdup("ecryptfs_unlink_sigs"))) {
+ 		rc = -ENOMEM;
+ 		goto out;
+diff -up ecryptfs-utils-85/src/utils/test.c.werror ecryptfs-utils-85/src/utils/test.c
+--- ecryptfs-utils-85/src/utils/test.c.werror	2010-12-17 18:34:04.000000000 +0100
++++ ecryptfs-utils-85/src/utils/test.c	2011-02-01 11:12:14.818646964 +0100
 @@ -281,7 +281,7 @@ int ecryptfs_encrypt_page(int page_cache
  	struct inode *lower_inode;
  	struct ecryptfs_crypt_stat *crypt_stat;