From 6303232662da11759ea7ffa054db681c7db1b9d6 Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@redhat.com>
Date: Jun 04 2012 10:08:03 +0000
Subject: update werror patch


---

diff --git a/ecryptfs-utils-75-werror.patch b/ecryptfs-utils-75-werror.patch
index a76a825..70eeb43 100644
--- a/ecryptfs-utils-75-werror.patch
+++ b/ecryptfs-utils-75-werror.patch
@@ -402,3 +402,57 @@ diff -up ecryptfs-utils-96/tests/kernel/trunc-file/test.c.werror ecryptfs-utils-
  
  	if (argc < 2) {
  		fprintf(stderr, "Syntax: %s filename [size_in_K]\n", argv[0]);
+diff -up ecryptfs-utils-96/tests/kernel/extend-file-random/test.c.werror ecryptfs-utils-96/tests/kernel/extend-file-random/test.c
+--- ecryptfs-utils-96/tests/kernel/extend-file-random/test.c.werror	2012-06-04 11:58:32.578277305 +0200
++++ ecryptfs-utils-96/tests/kernel/extend-file-random/test.c	2012-06-04 12:00:46.906332541 +0200
+@@ -48,7 +48,7 @@ int test_write(int fd, char *buffer, siz
+ 	}
+ 
+ 	if (write(fd, buffer, len) != len) {
+-		fprintf(stderr, "Failed to write %lu bytes, position %lu: %s\n", 
++		fprintf(stderr, "Failed to write %zu bytes, position %lu: %s\n", 
+ 			len, offset, strerror(errno));
+ 		return TEST_FAILED;
+ 	}
+@@ -58,7 +58,7 @@ int test_write(int fd, char *buffer, siz
+ int test_read(int fd, char *buffer, size_t len, off_t offset)
+ {
+ 	if (lseek(fd, offset, SEEK_SET) < 0) {
+-		fprintf(stderr, "Failed to seek to position %lu: %s\n", 
++		fprintf(stderr, "Failed to seek to position %zu: %s\n", 
+ 			offset, strerror(errno));
+ 		return TEST_FAILED;
+ 	}
+diff -up ecryptfs-utils-96/tests/kernel/inode-race-stat/test.c.werror ecryptfs-utils-96/tests/kernel/inode-race-stat/test.c
+--- ecryptfs-utils-96/tests/kernel/inode-race-stat/test.c.werror	2012-06-04 12:01:00.421438843 +0200
++++ ecryptfs-utils-96/tests/kernel/inode-race-stat/test.c	2012-06-04 12:02:45.331263972 +0200
+@@ -121,7 +121,7 @@ static void do_test(const int fdin, cons
+ 		if (cmd[0] == CMD_TEST) {
+ 			int ret;
+ 			off_t sz;
+-			sscanf(cmd+1, "%zd", &sz);
++			sscanf(cmd+1, "%ld", &sz);
+ 
+ 			ret = check_size(filename, sz);
+ 			switch (ret) {
+@@ -289,7 +289,7 @@ int main(int argc, char **argv)
+ 		}
+ 
+ 		/* Now tell children to stat the file */
+-		snprintf(cmd, sizeof(cmd), "%c%zd", CMD_TEST, sz);
++		snprintf(cmd, sizeof(cmd), "%c%ld", CMD_TEST, sz);
+ 		for (i = 0; i < threads; i++) {
+ 			if (write(pipe_to[i][1], cmd, strlen(cmd)+1) < 0) {
+ 				fprintf(stderr, "write to pipe failed: %s\n",
+diff -up ecryptfs-utils-96/tests/kernel/trunc-file/test.c.werror ecryptfs-utils-96/tests/kernel/trunc-file/test.c
+--- ecryptfs-utils-96/tests/kernel/trunc-file/test.c.werror	2012-06-04 12:02:53.609329111 +0200
++++ ecryptfs-utils-96/tests/kernel/trunc-file/test.c	2012-06-04 12:03:36.410666006 +0200
+@@ -268,7 +268,7 @@ int main(int argc, char **argv)
+ 
+ 	len *= 1024;
+ 	if (len > SSIZE_MAX) {
+-		fprintf(stderr, "size should be < %zd\n", SSIZE_MAX / 1024);
++		fprintf(stderr, "size should be < %zd\n", (size_t)SSIZE_MAX / 1024);
+ 		exit(TEST_ERROR);
+ 	}
+