fakeroot: version bump 1.20.2 -> 1.21

Also, import all Debian patches for fakeroot. This includes a fix for error
messages like this (caused by glibc >= 2.24):

dlsym(acl_get_fd): /usr/lib/libfakeroot/libfakeroot.so: undefined symbol: acl_get_fd
dlsym(acl_get_file): /usr/lib/libfakeroot/libfakeroot.so: undefined symbol: acl_get_file
dlsym(acl_set_fd): /usr/lib/libfakeroot/libfakeroot.so: undefined symbol: acl_set_fd
dlsym(acl_set_file): /usr/lib/libfakeroot/libfakeroot.so: undefined symbol: acl_set_file

See also: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=830912

The patch "0003-xattr-increase-MAX_IPC_BUFFER_SIZE-to-1024.patch" is now
upstream and was dropped.

To generate the docs 'po4a' is needed. A patch is necessary to disabled
building this.

Signed-off-by: Alexander Aring <aar@pengutronix.de>
[mol: cleanup patches and commit message]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

7 files changed, 265 insertions, 0 deletions

diff --git a/patches/fakeroot-1.21/0001-eglibc-fts-without-LFS.patch b/patches/fakeroot-1.21/0001-eglibc-fts-without-LFS.patch
new file mode 100644
index 000000000..9f8c43884
--- /dev/null
+++ b/patches/fakeroot-1.21/0001-eglibc-fts-without-LFS.patch
@@ -0,0 +1,39 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 6 Sep 2016 13:04:27 +0200
+Subject: [PATCH] eglibc-fts-without-LFS
+
+Imported from fakeroot_1.21-2.debian.tar.xz
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ 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.21/0002-glibc-xattr-types.patch b/patches/fakeroot-1.21/0002-glibc-xattr-types.patch
new file mode 100644
index 000000000..40c1c65f7
--- /dev/null
+++ b/patches/fakeroot-1.21/0002-glibc-xattr-types.patch
@@ -0,0 +1,123 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 6 Sep 2016 13:04:27 +0200
+Subject: [PATCH] glibc-xattr-types
+
+Fix the type of xattr functions to match the glibc headers.
+
+Imported from fakeroot_1.21-2.debian.tar.xz
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ 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.21/0003-hide-dlsym-error.patch b/patches/fakeroot-1.21/0003-hide-dlsym-error.patch
new file mode 100644
index 000000000..03db0baa6
--- /dev/null
+++ b/patches/fakeroot-1.21/0003-hide-dlsym-error.patch
@@ -0,0 +1,34 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 6 Sep 2016 13:04:27 +0200
+Subject: [PATCH] hide-dlsym-error
+
+Imported from fakeroot_1.21-2.debian.tar.xz
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ libfakeroot.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/libfakeroot.c b/libfakeroot.c
+index 4fd620f8a5f0..ca7494a97263 100644
+--- a/libfakeroot.c
++++ b/libfakeroot.c
+@@ -256,10 +256,16 @@ void load_library_symbols(void){
+  /* clear dlerror() just in case dlsym() legitimately returns NULL */
+     msg = dlerror();
+     *(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name);
++
+     if ( (msg = dlerror()) != NULL){
+-      fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg);
+-/*    abort ();*/
++#ifdef LIBFAKEROOT_DEBUGGING
++      if (fakeroot_debug) {
++        fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg);
++/*      abort ();*/
++      }
++#endif
+     }
++
+   }
+ }
+ 
diff --git a/patches/fakeroot-1.21/0100-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch b/patches/fakeroot-1.21/0100-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch
new file mode 100644
index 000000000..52bb63b9f
--- /dev/null
+++ b/patches/fakeroot-1.21/0100-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch
@@ -0,0 +1,34 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:16:53 +0100
+Subject: [PATCH] add FAKEROOT_SYSROOT prefix for relocation
+
+Prefix all paths with FAKEROOT_SYSROOT
+It will be replaced by the current sysroot.
+
+Not for upstream.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ scripts/fakeroot.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/fakeroot.in b/scripts/fakeroot.in
+index 88ff313cc12a..701e8b3f0888 100755
+--- a/scripts/fakeroot.in
++++ b/scripts/fakeroot.in
+@@ -30,12 +30,12 @@ fatal ()
+ }
+ 
+ # strip /bin/fakeroot to find install prefix
+-FAKEROOT_PREFIX=@prefix@
+-FAKEROOT_BINDIR=@bindir@
++FAKEROOT_PREFIX="FAKEROOT_SYSROOT@prefix@"
++FAKEROOT_BINDIR="FAKEROOT_SYSROOT@bindir@"
+ 
+ USEABSLIBPATH=@LDPRELOADABS@
+ LIB=lib@fakeroot_transformed@@DLSUFFIX@
+-PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
++PATHS="FAKEROOT_SYSROOT@libdir@":${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
+ FAKED=${FAKEROOT_BINDIR}/@faked_transformed@
+ 
+ FAKED_MODE="unknown-is-root"
diff --git a/patches/fakeroot-1.21/0101-fakeroot-disable-build-of-doc-and-test.patch b/patches/fakeroot-1.21/0101-fakeroot-disable-build-of-doc-and-test.patch
new file mode 100644
index 000000000..6ae24dc84
--- /dev/null
+++ b/patches/fakeroot-1.21/0101-fakeroot-disable-build-of-doc-and-test.patch
@@ -0,0 +1,24 @@
+From: Alexander Aring <aar@pengutronix.de>
+Date: Fri, 26 Aug 2016 18:44:36 +0200
+Subject: [PATCH] fakeroot: disable build of doc and test
+
+Otherwise po4a is needed to generate the docs.
+
+Signed-off-by: Alexander Aring <aar@pengutronix.de>
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 6d6f07f46ac8..9ab5d078e396 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS=foreign
+ ACLOCAL_AMFLAGS = -I build-aux
+-SUBDIRS=scripts doc test
++SUBDIRS=scripts
+ 
+ noinst_LTLIBRARIES = libcommunicate.la libmacosx.la
+ libcommunicate_la_SOURCES = communicate.c
diff --git a/patches/fakeroot-1.21/autogen.sh b/patches/fakeroot-1.21/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/fakeroot-1.21/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/fakeroot-1.21/series b/patches/fakeroot-1.21/series
new file mode 100644
index 000000000..9c2b5eb15
--- /dev/null
+++ b/patches/fakeroot-1.21/series
@@ -0,0 +1,10 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+#tag:debian --start-number 1
+0001-eglibc-fts-without-LFS.patch
+0002-glibc-xattr-types.patch
+0003-hide-dlsym-error.patch
+#tag:ptxdist --start-number 100
+0100-add-FAKEROOT_SYSROOT-prefix-for-relocation.patch
+0101-fakeroot-disable-build-of-doc-and-test.patch
+# 5ca44e32b3f56954f5e5f253d7c2d302  - git-ptx-patches magic