[Fakeroot-commits] [SCM] fakeroot branch, master, updated. debian/1.14.3-237-gc87d227

[Clint Adams]

The following commit has been merged in the master branch:
commit d64a268931488f3d2feee699ffa3caf8cb0fd570
Author: Clint Adams <clint at debian.org>
Date:   Wed Jun 6 19:11:07 2012 -0400

    (Thorsten Glaser) Disable stat64 for FTS functions in a Debian-local patch, since FTS is always built without LFS in eglibc. Fixes pax on hurd-i386 (at least).

diff --git a/debian/patches/eglibc-fts-without-LFS b/debian/patches/eglibc-fts-without-LFS
new file mode 100644
index 0000000..aec9009
--- /dev/null
+++ b/debian/patches/eglibc-fts-without-LFS
@@ -0,0 +1,28 @@
+Index: fakeroot-1.18.4/libfakeroot.c
+===================================================================
+--- fakeroot-1.18.4.orig/libfakeroot.c	2012-06-02 18:23:41.000000000 +0000
++++ fakeroot-1.18.4/libfakeroot.c	2012-06-06 20:32:25.000000000 +0000
+@@ -1579,11 +1579,7 @@
+     r->fts_statp = NULL;  /* Otherwise fts_statp may be a random pointer */
+ #endif
+   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;
+@@ -1602,11 +1598,7 @@
+   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/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8800c89
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+eglibc-fts-without-LFS

-- 
fakeroot