From e3c4237fd7fcd1dfe0bb086d61122c3704c9e835 Mon Sep 17 00:00:00 2001
From: Joshua Lock <josh@linux.intel.com>
Date: Mon, 22 Mar 2010 18:18:50 +0000
Subject: [PATCH] fakechroot: Update to 2.9 and add a patch from Debian

This update includes a refresh of our existing readlink patch and a (trimmed)
copy of the patch Debian are shipping in their package which includes
unreleased fixes from SVN for building against more recent glibc.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../fakechroot/fakechroot/fix-readlink.patch  | 22 +++++++------------
 .../{fakechroot_2.5.bb => fakechroot_2.9.bb}  |  5 +++--
 2 files changed, 11 insertions(+), 16 deletions(-)
 rename meta/packages/fakechroot/{fakechroot_2.5.bb => fakechroot_2.9.bb} (54%)

diff --git a/meta/packages/fakechroot/fakechroot/fix-readlink.patch b/meta/packages/fakechroot/fakechroot/fix-readlink.patch
index f218956790..9321564922 100644
--- a/meta/packages/fakechroot/fakechroot/fix-readlink.patch
+++ b/meta/packages/fakechroot/fakechroot/fix-readlink.patch
@@ -2,11 +2,11 @@
  src/libfakechroot.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
---- fakechroot-2.5.orig/src/libfakechroot.c
-+++ fakechroot-2.5/src/libfakechroot.c
-@@ -596,11 +596,11 @@ void fakechroot_init (void)
-     nextsym(open64, "open64");
- #if !defined(HAVE___OPENDIR2)
+Index: fakechroot-2.9/src/libfakechroot.c
+===================================================================
+--- fakechroot-2.9.orig/src/libfakechroot.c	2009-03-31 11:20:41.000000000 +0100
++++ fakechroot-2.9/src/libfakechroot.c	2010-03-22 17:40:17.386783375 +0000
+@@ -775,7 +775,7 @@
      nextsym(opendir, "opendir");
  #endif
      nextsym(pathconf, "pathconf");
@@ -15,18 +15,12 @@
      nextsym(realpath, "realpath");
      nextsym(remove, "remove");
  #ifdef HAVE_REMOVEXATTR
-     nextsym(removexattr, "removexattr");
- #endif
-@@ -1864,11 +1864,11 @@ long pathconf (const char *path, int nam
-     return next_pathconf(path, name);
- }
+@@ -2492,7 +2492,7 @@
  
  
  /* #include <unistd.h> */
--int readlink (const char *path, char *buf, READLINK_TYPE_ARG3)
-+int own_readlink (const char *path, char *buf, READLINK_TYPE_ARG3)
+-READLINK_TYPE_RETURN readlink (const char *path, char *buf, READLINK_TYPE_ARG3)
++READLINK_TYPE_RETURN own_readlink (const char *path, char *buf, READLINK_TYPE_ARG3)
  {
      int status;
      char tmp[FAKECHROOT_MAXPATH], *tmpptr;
-     char *fakechroot_path, *fakechroot_ptr, fakechroot_buf[FAKECHROOT_MAXPATH];
- 
diff --git a/meta/packages/fakechroot/fakechroot_2.5.bb b/meta/packages/fakechroot/fakechroot_2.9.bb
similarity index 54%
rename from meta/packages/fakechroot/fakechroot_2.5.bb
rename to meta/packages/fakechroot/fakechroot_2.9.bb
index a72dfdaf05..6d45e01940 100644
--- a/meta/packages/fakechroot/fakechroot_2.5.bb
+++ b/meta/packages/fakechroot/fakechroot_2.9.bb
@@ -3,9 +3,10 @@ DESCRIPTION = "Gives a fake root environment which can support chroot"
 LICENSE = "GPL"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/f/fakechroot/fakechroot_${PV}.orig.tar.gz \
-           file://fix-readlink.patch;patch=1"
+           file://fix-readlink.patch;patch=1 \
+           ${DEBIAN_MIRROR}/main/f/fakechroot/fakechroot_2.9-1.1.diff.gz"
 
-inherit autotools_stage
+inherit autotools
 
 PR = "r2"