From 2ec45e3dc9b85d33c3f9dc145d7eaf7e4691e0de Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Sat, 20 Jul 2019 10:38:32 +0300
Subject: [PATCH] fakeroot: Fix build.

---
 core/fakeroot/build                         |  2 --
 core/fakeroot/checksums                     |  2 --
 core/fakeroot/patches/fakeroot-uclibc.patch | 20 --------------------
 core/fakeroot/patches/xstatjunk.patch       | 11 -----------
 core/fakeroot/sources                       |  2 --
 core/fakeroot/version                       |  2 +-
 6 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 core/fakeroot/patches/fakeroot-uclibc.patch
 delete mode 100644 core/fakeroot/patches/xstatjunk.patch

diff --git a/core/fakeroot/build b/core/fakeroot/build
index 8e6899f4..56c5b64c 100755
--- a/core/fakeroot/build
+++ b/core/fakeroot/build
@@ -4,8 +4,6 @@ patch -p1 < silence-dlerror.patch
 patch -p0 < fakeroot-no64.patch
 patch -p0 < fakeroot-stdint.patch
 patch -p0 < busybox_compat_force_abslibpath.patch
-patch -p1 < fakeroot-uclibc.patch
-patch -p1 < xstatjunk.patch
 
 export CONFIG_SHELL=/bin/sh
 export CFLAGS="-D_STAT_VER=0 $CFLAGS"
diff --git a/core/fakeroot/checksums b/core/fakeroot/checksums
index bb9d433b..c066042d 100644
--- a/core/fakeroot/checksums
+++ b/core/fakeroot/checksums
@@ -2,6 +2,4 @@
 d0a6aa8aa462eb4b390d02e177d07df3f2ed5b7961595a22dd38a94043ad8290  busybox_compat_force_abslibpath.patch
 4fd7a4c8d05dd71414c3e82887780b76d93f599944260c41d769cb463e660bbf  fakeroot-no64.patch
 1b0be39e41ce78116de4db7aed1b025a64427d780f666a860ed30ad1512588ad  fakeroot-stdint.patch
-e325ad9aad310caa71002adea220795f706c621c5794093f16c0f319b3d58977  fakeroot-uclibc.patch
 347f6496c93ed0d91dcb554db92602b50520a16308e3b8bc33822bd69966267b  silence-dlerror.patch
-5694b33fcfc9682f42b4c11ab49a8b5b402128dd9f0cd870eaad659c9b2679cf  xstatjunk.patch
diff --git a/core/fakeroot/patches/fakeroot-uclibc.patch b/core/fakeroot/patches/fakeroot-uclibc.patch
deleted file mode 100644
index 63708092..00000000
--- a/core/fakeroot/patches/fakeroot-uclibc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- fakeroot-1.18.2.orig/libfakeroot.c
-+++ fakeroot-1.18.2/libfakeroot.c
-@@ -1551,7 +1551,7 @@
- #endif /* LIBFAKEROOT_DEBUGGING */
-   r=next_fts_read(ftsp);
-   if(r && r->fts_statp) {  /* Should we bother checking fts_info here? */
--# if defined(STAT64_SUPPORT) && !defined(__APPLE__)
-+# if defined(STAT64_SUPPORT) && !defined(__APPLE__) && !defined(__UCLIBC__)
-     SEND_GET_STAT64(r->fts_statp, _STAT_VER);
- # else
-     SEND_GET_STAT(r->fts_statp, _STAT_VER);
-@@ -1574,7 +1574,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__)
-+# if defined(STAT64_SUPPORT) && !defined(__APPLE__) && !defined(__UCLIBC__)
-       SEND_GET_STAT64(r->fts_statp, _STAT_VER);
- # else
-       SEND_GET_STAT(r->fts_statp, _STAT_VER);
diff --git a/core/fakeroot/patches/xstatjunk.patch b/core/fakeroot/patches/xstatjunk.patch
deleted file mode 100644
index 12f2759b..00000000
--- a/core/fakeroot/patches/xstatjunk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fakeroot-1.18.4.orig/configure.ac	2012-06-02 18:23:41.000000000 +0000
-+++ fakeroot-1.18.4configure.ac	2015-09-24 23:15:56.917470073 +0000
-@@ -301,7 +301,7 @@
-   FUNC=`echo $SEARCH|sed -e 's/.*%//'`
-   PRE=`echo $SEARCH|sed -e 's/%.*//'`
-   FOUND=
--  for WRAPPED in __${PRE}x${FUNC} _${PRE}x${FUNC} __${PRE}${FUNC}13 ${PRE}${FUNC}; do
-+  for WRAPPED in ${PRE}${FUNC}; do
-     AC_CHECK_FUNCS($WRAPPED,FOUND=$WRAPPED)
- dnl
- dnl to unconditionally define only the _* functions, comment out the 2 lines above,
diff --git a/core/fakeroot/sources b/core/fakeroot/sources
index bd26f375..86675ddc 100644
--- a/core/fakeroot/sources
+++ b/core/fakeroot/sources
@@ -2,6 +2,4 @@ https://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.23.orig.tar.xz
 patches/busybox_compat_force_abslibpath.patch
 patches/fakeroot-no64.patch
 patches/fakeroot-stdint.patch
-patches/fakeroot-uclibc.patch
 patches/silence-dlerror.patch
-patches/xstatjunk.patch
diff --git a/core/fakeroot/version b/core/fakeroot/version
index 9c133595..54a2883e 100644
--- a/core/fakeroot/version
+++ b/core/fakeroot/version
@@ -1 +1 @@
-1.23 4
+1.23 5