fakeroot: version bump to 1.20.2

Add patch to support fakerooting "evmctl sign".

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

6 files changed, 193 insertions, 7 deletions

diff --git a/patches/fakeroot-1.18.4/series b/patches/fakeroot-1.18.4/series
deleted file mode 100644
index 956da0a92..000000000
--- a/patches/fakeroot-1.18.4/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch
-# 0b5c55a649361728ec3b552266fc1dab  - git-ptx-patches magic
diff --git a/patches/fakeroot-1.20.2/0001-eglibc-fts-without-LFS.patch b/patches/fakeroot-1.20.2/0001-eglibc-fts-without-LFS.patch
new file mode 100644
index 000000000..9e080cd9b
--- /dev/null
+++ b/patches/fakeroot-1.20.2/0001-eglibc-fts-without-LFS.patch
@@ -0,0 +1,36 @@
+From: unknown author <unknown.author@example.com>
+Date: Wed, 27 May 2015 15:58:57 +0200
+Subject: [PATCH] eglibc-fts-without-LFS
+
+---
+ libfakeroot.c | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/libfakeroot.c b/libfakeroot.c
+index f867758febd6..5b92bbea5fb8 100644
+--- a/libfakeroot.c
++++ b/libfakeroot.c
+@@ -1949,11 +1949,7 @@ FTSENT *fts_read(FTS *ftsp) {
+             || r->fts_info == FTS_NS || r->fts_info == FTS_NSOK))
+     r->fts_statp = NULL;  /* Otherwise fts_statp may be a random pointer */
+   if(r && r->fts_statp) {  /* Should we bother checking fts_info here? */
+-# if defined(STAT64_SUPPORT) && !defined(__APPLE__)
+-    SEND_GET_STAT64(r->fts_statp, _STAT_VER);
+-# else
+     SEND_GET_STAT(r->fts_statp, _STAT_VER);
+-# endif
+   }
+ 
+   return r;
+@@ -1972,11 +1968,7 @@ FTSENT *fts_children(FTS *ftsp, int options) {
+   first=next_fts_children(ftsp, options);
+   for(r = first; r; r = r->fts_link) {
+     if(r && r->fts_statp) {  /* Should we bother checking fts_info here? */
+-# if defined(STAT64_SUPPORT) && !defined(__APPLE__)
+-      SEND_GET_STAT64(r->fts_statp, _STAT_VER);
+-# else
+       SEND_GET_STAT(r->fts_statp, _STAT_VER);
+-# endif
+     }
+   }
+ 
diff --git a/patches/fakeroot-1.20.2/0002-glibc-xattr-types.patch b/patches/fakeroot-1.20.2/0002-glibc-xattr-types.patch
new file mode 100644
index 000000000..a6104de09
--- /dev/null
+++ b/patches/fakeroot-1.20.2/0002-glibc-xattr-types.patch
@@ -0,0 +1,119 @@
+From: unknown author <unknown.author@example.com>
+Date: Wed, 27 May 2015 15:58:57 +0200
+Subject: [PATCH] glibc-xattr-types
+
+Fix the type of xattr functions to match the glibc headers.
+---
+ libfakeroot.c | 16 ++++++++--------
+ wrapfunc.inp  | 12 ++++++------
+ 2 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/libfakeroot.c b/libfakeroot.c
+index 5b92bbea5fb8..4fd620f8a5f0 100644
+--- a/libfakeroot.c
++++ b/libfakeroot.c
+@@ -1570,7 +1570,7 @@ int capset(cap_user_header_t hdrp, const cap_user_data_t datap)
+ #endif /* HAVE_CAPSET */
+ 
+ #if defined(HAVE_SETXATTR) || defined(HAVE_LSETXATTR) || defined(HAVE_FSETXATTR)
+-static size_t common_setxattr(INT_STRUCT_STAT *st, const char *name, void * value, size_t size, int flags)
++static int common_setxattr(INT_STRUCT_STAT *st, const char *name, const void * value, size_t size, int flags)
+ {
+   xattr_args xattr;
+   xattr.name = name;
+@@ -1625,7 +1625,7 @@ static size_t common_listxattr(INT_STRUCT_STAT *st, char *list, size_t size)
+ #endif /* defined(HAVE_LISTXATTR) || defined(HAVE_LLISTXATTR) || defined(HAVE_FLISTXATTR) */
+ 
+ #if defined(HAVE_REMOVEXATTR) || defined(HAVE_LREMOVEXATTR) || defined(HAVE_FREMOVEXATTR)
+-static size_t common_removexattr(INT_STRUCT_STAT *st, const char *name)
++static int common_removexattr(INT_STRUCT_STAT *st, const char *name)
+ {
+   xattr_args xattr;
+   xattr.name = name;
+@@ -1643,7 +1643,7 @@ static size_t common_removexattr(INT_STRUCT_STAT *st, const char *name)
+ #endif /* defined(HAVE_REMOVEXATTR) || defined(HAVE_LREMOVEXATTR) || defined(HAVE_FREMOVEXATTR) */
+ 
+ #ifdef HAVE_SETXATTR
+-ssize_t setxattr(const char *path, const char *name, void *value, size_t size, int flags)
++int setxattr(const char *path, const char *name, const void *value, size_t size, int flags)
+ {
+   INT_STRUCT_STAT st;
+   int r;
+@@ -1664,7 +1664,7 @@ ssize_t setxattr(const char *path, const char *name, void *value, size_t size, i
+ #endif /* HAVE_SETXATTR */
+ 
+ #ifdef HAVE_LSETXATTR
+-ssize_t lsetxattr(const char *path, const char *name, void *value, size_t size, int flags)
++int lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags)
+ {
+   INT_STRUCT_STAT st;
+   int r;
+@@ -1685,7 +1685,7 @@ ssize_t lsetxattr(const char *path, const char *name, void *value, size_t size,
+ #endif /* HAVE_LSETXATTR */
+ 
+ #ifdef HAVE_FSETXATTR
+-ssize_t fsetxattr(int fd, const char *name, void *value, size_t size, int flags)
++int fsetxattr(int fd, const char *name, const void *value, size_t size, int flags)
+ {
+   INT_STRUCT_STAT st;
+   int r;
+@@ -1832,7 +1832,7 @@ ssize_t flistxattr(int fd, char *list, size_t size)
+ #endif /* HAVE_FLISTXATTR */
+ 
+ #ifdef HAVE_REMOVEXATTR
+-ssize_t removexattr(const char *path, const char *name)
++int removexattr(const char *path, const char *name)
+ {
+   INT_STRUCT_STAT st;
+   int r;
+@@ -1853,7 +1853,7 @@ ssize_t removexattr(const char *path, const char *name)
+ #endif /* HAVE_REMOVEXATTR */
+ 
+ #ifdef HAVE_LREMOVEXATTR
+-ssize_t lremovexattr(const char *path, const char *name)
++int lremovexattr(const char *path, const char *name)
+ {
+   INT_STRUCT_STAT st;
+   int r;
+@@ -1874,7 +1874,7 @@ ssize_t lremovexattr(const char *path, const char *name)
+ #endif /* HAVE_LREMOVEXATTR */
+ 
+ #ifdef HAVE_FREMOVEXATTR
+-ssize_t fremovexattr(int fd, const char *name)
++int fremovexattr(int fd, const char *name)
+ {
+   INT_STRUCT_STAT st;
+   int r;
+diff --git a/wrapfunc.inp b/wrapfunc.inp
+index 5eff0cc08412..15855018c6a4 100644
+--- a/wrapfunc.inp
++++ b/wrapfunc.inp
+@@ -168,22 +168,22 @@ lgetxattr;ssize_t;(const char *path, const char *name, void *value, size_t size)
+ fgetxattr;ssize_t;(int fd, const char *name, void *value, size_t size);(fd, name, value, size)
+ #endif /* HAVE_FGETXATTR */
+ #ifdef HAVE_SETXATTR
+-setxattr;ssize_t;(const char *path, const char *name, void *value, size_t size, int flags);(path, name, value, size, flags)
++setxattr;int;(const char *path, const char *name, const void *value, size_t size, int flags);(path, name, value, size, flags)
+ #endif /* HAVE_SETXATTR */
+ #ifdef HAVE_LSETXATTR
+-lsetxattr;ssize_t;(const char *path, const char *name, void *value, size_t size, int flags);(path, name, value, size, flags)
++lsetxattr;int;(const char *path, const char *name, const void *value, size_t size, int flags);(path, name, value, size, flags)
+ #endif /* HAVE_LSETXATTR */
+ #ifdef HAVE_FSETXATTR
+-fsetxattr;ssize_t;(int fd, const char *name, void *value, size_t size, int flags);(fd, name, value, size, flags)
++fsetxattr;int;(int fd, const char *name, const void *value, size_t size, int flags);(fd, name, value, size, flags)
+ #endif /* HAVE_FSETXATTR */
+ #ifdef HAVE_REMOVEXATTR
+-removexattr;ssize_t;(const char *path, const char *name);(path, name)
++removexattr;int;(const char *path, const char *name);(path, name)
+ #endif /* HAVE_REMOVEXATTR */
+ #ifdef HAVE_LREMOVEXATTR
+-lremovexattr;ssize_t;(const char *path, const char *name);(path, name)
++lremovexattr;int;(const char *path, const char *name);(path, name)
+ #endif /* HAVE_LREMOVEXATTR */
+ #ifdef HAVE_FREMOVEXATTR
+-fremovexattr;ssize_t;(int fd, const char *name);(fd, name)
++fremovexattr;int;(int fd, const char *name);(fd, name)
+ #endif /* HAVE_FREMOVEXATTR */
+ 
+ #ifdef HAVE_FSTATAT
diff --git a/patches/fakeroot-1.20.2/0003-xattr-increase-MAX_IPC_BUFFER_SIZE-to-1024.patch b/patches/fakeroot-1.20.2/0003-xattr-increase-MAX_IPC_BUFFER_SIZE-to-1024.patch
new file mode 100644
index 000000000..75afeded7
--- /dev/null
+++ b/patches/fakeroot-1.20.2/0003-xattr-increase-MAX_IPC_BUFFER_SIZE-to-1024.patch
@@ -0,0 +1,28 @@
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Thu, 28 May 2015 11:03:40 +0200
+Subject: [PATCH] xattr: increase MAX_IPC_BUFFER_SIZE to 1024
+
+The program "evmctl" from the ima-evm-utils creates during "sign" operation
+quite large extended attributes. For example a sha256 "security.ima" attributes
+is 521 bytes long.
+
+This patch increases the MAX_IPC_BUFFER_SIZE to 1024 to fix the problem.
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ message.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/message.h b/message.h
+index 0b64fb98bf94..9dfce9446df1 100644
+--- a/message.h
++++ b/message.h
+@@ -64,7 +64,7 @@ struct fakestat {
+ #pragma pack()
+ #endif
+ 
+-#define MAX_IPC_BUFFER_SIZE 256
++#define MAX_IPC_BUFFER_SIZE 1024
+ 
+ #if __SUNPRO_C
+ #pragma pack(4)
diff --git a/patches/fakeroot-1.18.4/0001-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch b/patches/fakeroot-1.20.2/0004-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch
index 3f8493f8c..52bb63b9f 100644
--- a/patches/fakeroot-1.18.4/0001-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch
+++ b/patches/fakeroot-1.20.2/0004-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch
@@ -9,11 +9,11 @@ Not for upstream.
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- scripts/fakeroot.in |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ scripts/fakeroot.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/scripts/fakeroot.in b/scripts/fakeroot.in
-index d4f888d..4c998c8 100755
+index 88ff313cc12a..701e8b3f0888 100755
 --- a/scripts/fakeroot.in
 +++ b/scripts/fakeroot.in
 @@ -30,12 +30,12 @@ fatal ()
diff --git a/patches/fakeroot-1.20.2/series b/patches/fakeroot-1.20.2/series
new file mode 100644
index 000000000..164f4003c
--- /dev/null
+++ b/patches/fakeroot-1.20.2/series
@@ -0,0 +1,7 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-eglibc-fts-without-LFS.patch
+0002-glibc-xattr-types.patch
+0003-xattr-increase-MAX_IPC_BUFFER_SIZE-to-1024.patch
+0004-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch
+# 31372702de1f19144b034e0e424a2ab7  - git-ptx-patches magic