rpms/ecryptfs-utils/F-11 ecryptfs-utils-75-werror.patch,1.3,1.4

[Michal Hlavinka]

Author: mhlavink

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

Modified Files:
	ecryptfs-utils-75-werror.patch 
Log Message:
update werror patch


ecryptfs-utils-75-werror.patch:

Index: ecryptfs-utils-75-werror.patch
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/ecryptfs-utils-75-werror.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ecryptfs-utils-75-werror.patch	5 May 2009 12:00:02 -0000	1.3
+++ ecryptfs-utils-75-werror.patch	5 May 2009 12:18:58 -0000	1.4
@@ -1,20 +1,18 @@
 diff -up ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c
---- ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c.werror	2009-05-05 13:56:57.142283441 +0200
-+++ ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c	2009-05-05 13:56:45.788095782 +0200
-@@ -100,8 +100,8 @@ static int ecryptfs_process_flags(struct
- 	return rc;
- }
- 
--#define ECRYPTFS_DONT_VALIDATE_HEADER_SIZE 0
--#define ECRYPTFS_VALIDATE_HEADER_SIZE 1
-+#define ECRYPTFS_DONT_VALIDATE_HEADER_SIZE 0UL
-+#define ECRYPTFS_VALIDATE_HEADER_SIZE 1UL
- static int
- ecryptfs_parse_header_metadata(struct ecryptfs_crypt_stat_user *crypt_stat,
- 			       char *buf, int *bytes_read,
+--- ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c.werror	2009-03-05 22:17:36.000000000 +0100
++++ ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c	2009-05-05 14:16:47.965159244 +0200
+@@ -146,7 +146,7 @@ int ecryptfs_parse_stat(struct ecryptfs_
+ 	if (buf_size < (ECRYPTFS_FILE_SIZE_BYTES
+ 			+ MAGIC_ECRYPTFS_MARKER_SIZE_BYTES
+ 			+ 4)) {
+-		printf("%s: Invalid metadata size; must have at least [%lu] "
++		printf("%s: Invalid metadata size; must have at least [%zu] "
+ 		       "bytes; there are only [%zu] bytes\n", __FUNCTION__,
+ 		       (ECRYPTFS_FILE_SIZE_BYTES
+ 			+ MAGIC_ECRYPTFS_MARKER_SIZE_BYTES
 diff -up ecryptfs-utils-75/src/libecryptfs/key_management.c.werror ecryptfs-utils-75/src/libecryptfs/key_management.c
 --- ecryptfs-utils-75/src/libecryptfs/key_management.c.werror	2009-05-01 00:53:13.000000000 +0200
-+++ ecryptfs-utils-75/src/libecryptfs/key_management.c	2009-05-05 13:38:57.597408166 +0200
++++ ecryptfs-utils-75/src/libecryptfs/key_management.c	2009-05-05 13:57:18.142095484 +0200
 @@ -18,6 +18,7 @@
   * 02111-1307, USA.
   */
@@ -33,7 +31,7 @@ diff -up ecryptfs-utils-75/src/libecrypt
  #ifndef ENOKEY
 diff -up ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c
 --- ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c.werror	2009-04-30 23:40:12.000000000 +0200
-+++ ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c	2009-05-05 13:40:11.506220610 +0200
++++ ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c	2009-05-05 13:57:18.142095484 +0200
 @@ -42,31 +42,6 @@
  
  #define PRIVATE_DIR "Private"
@@ -95,7 +93,7 @@ diff -up ecryptfs-utils-75/src/pam_ecryp
  	saved_uid = geteuid();
 diff -up ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c
 --- ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror	2009-05-01 01:04:38.000000000 +0200
-+++ ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c	2009-05-05 13:38:57.603470839 +0200
++++ ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c	2009-05-05 13:57:18.142095484 +0200
 @@ -42,7 +42,6 @@ int main(int argc, char *argv[])
  	char *wrapping_passphrase;
  	char salt[ECRYPTFS_SALT_SIZE];