host-fakeroot: version bump 1.24 -> 1.25.1

The new version adds statx support.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

5 files changed, 9 insertions, 43 deletions

diff --git a/patches/fakeroot-1.24/0002-hide-dlsym-error.patch b/patches/fakeroot-1.24/0002-hide-dlsym-error.patch
deleted file mode 100644
index a17f25601..000000000
--- a/patches/fakeroot-1.24/0002-hide-dlsym-error.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Sat, 28 Sep 2019 13:39:36 +0200
-Subject: [PATCH] hide-dlsym-error
-
-Imported from fakeroot_1.24-1.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 5b92bbea5fb8..7f394da6096f 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.24/0001-eglibc-fts-without-LFS.patch b/patches/fakeroot-1.25.1/0001-eglibc-fts-without-LFS.patch
index 39b5bb465..dca76eff7 100644
--- a/patches/fakeroot-1.24/0001-eglibc-fts-without-LFS.patch
+++ b/patches/fakeroot-1.25.1/0001-eglibc-fts-without-LFS.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Sat, 28 Sep 2019 13:39:36 +0200
+Date: Wed, 23 Sep 2020 09:21:09 +0200
 Subject: [PATCH] eglibc-fts-without-LFS
 
-Imported from fakeroot_1.24-1.debian.tar.xz
+Imported from fakeroot_1.25.1-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 8 deletions(-)
 
 diff --git a/libfakeroot.c b/libfakeroot.c
-index f867758febd6..5b92bbea5fb8 100644
+index 01de9da25c39..badb7235a166 100644
 --- a/libfakeroot.c
 +++ b/libfakeroot.c
-@@ -1949,11 +1949,7 @@ FTSENT *fts_read(FTS *ftsp) {
+@@ -2006,11 +2006,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? */
@@ -25,7 +25,7 @@ index f867758febd6..5b92bbea5fb8 100644
    }
  
    return r;
-@@ -1972,11 +1968,7 @@ FTSENT *fts_children(FTS *ftsp, int options) {
+@@ -2029,11 +2025,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? */
diff --git a/patches/fakeroot-1.24/0100-make-fakeroot-relocatable.patch b/patches/fakeroot-1.25.1/0100-make-fakeroot-relocatable.patch
index 5efe9ad55..9d203b4c1 100644
--- a/patches/fakeroot-1.24/0100-make-fakeroot-relocatable.patch
+++ b/patches/fakeroot-1.25.1/0100-make-fakeroot-relocatable.patch
@@ -12,7 +12,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/scripts/fakeroot.in b/scripts/fakeroot.in
-index eaf3f56f05aa..8ff3125a3d5b 100755
+index 0f6bf66088a5..bedf9aeb39c2 100755
 --- a/scripts/fakeroot.in
 +++ b/scripts/fakeroot.in
 @@ -30,12 +30,12 @@ fatal ()
@@ -25,7 +25,7 @@ index eaf3f56f05aa..8ff3125a3d5b 100755
 +FAKEROOT_PREFIX="`dirname "$FAKEROOT_BINDIR"`"
  
  USEABSLIBPATH=@LDPRELOADABS@
- LIB=lib@fakeroot_transformed@@DLSUFFIX@
+ FAKEROOT_LIB=lib@fakeroot_transformed@@DLSUFFIX@
 -PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
 +PATHS="${FAKEROOT_PREFIX}@libdir@":${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
  FAKED=${FAKEROOT_BINDIR}/@faked_transformed@
diff --git a/patches/fakeroot-1.25.1/autogen.sh b/patches/fakeroot-1.25.1/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/fakeroot-1.25.1/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/fakeroot-1.24/series b/patches/fakeroot-1.25.1/series
index 21908765c..60dad17f9 100644
--- a/patches/fakeroot-1.24/series
+++ b/patches/fakeroot-1.25.1/series
@@ -2,7 +2,6 @@
 #tag:base --start-number 1
 #tag:debian --start-number 1
 0001-eglibc-fts-without-LFS.patch
-0002-hide-dlsym-error.patch
 #tag:ptxdist --start-number 100
 0100-make-fakeroot-relocatable.patch
-# 13637ed278d8b6e0949f06ed0e08b488  - git-ptx-patches magic
+# e69f7ec6ca564a31bcbb10ed0dcc2fa2  - git-ptx-patches magic