From 9ed24fae8ceb02c52fe979ad74a820632e11d93f Mon Sep 17 00:00:00 2001
From: Xin Ouyang <Xin.Ouyang@windriver.com>
Date: Sat, 11 Aug 2012 15:25:21 +0800
Subject: findutils-4.4.2: suitable version of gnulib for selinux

Add a suitable version of gnulib into SRC_URI, and run
import-gnulib.sh to update it.

Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
---
 .../findutils-with-selinux-gnulib.patch            | 55 ++++++++++++++++++++++
 .../findutils-with-selinux-supplemental.patch      | 32 -------------
 .../findutils/findutils_4.4.2.bbappend             | 13 +++--
 3 files changed, 61 insertions(+), 39 deletions(-)
 create mode 100644 recipes-extended/findutils/findutils-4.4.2/findutils-with-selinux-gnulib.patch
 delete mode 100644 recipes-extended/findutils/findutils-4.4.2/findutils-with-selinux-supplemental.patch

diff --git a/recipes-extended/findutils/findutils-4.4.2/findutils-with-selinux-gnulib.patch b/recipes-extended/findutils/findutils-4.4.2/findutils-with-selinux-gnulib.patch
new file mode 100644
index 0000000..285c495
--- /dev/null
+++ b/recipes-extended/findutils/findutils-4.4.2/findutils-with-selinux-gnulib.patch
@@ -0,0 +1,55 @@
+Subject: [PATCH] selinux: fetch proper version of gnulib.
+
+This patch will fetch a proper version of gnulib, and import
+needed modules including selinux-at.
+
+* lstat module has removed lstat.h and now we should include
+  <sys/stat.h> instead.
+  - http://git.savannah.gnu.org/cgit/gnulib.git/tree/modules/lstat
+
+Upstream-Status: Backport
+
+Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
+---
+ import-gnulib.config |    3 ++-
+ lib/dircallback.c    |    2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/import-gnulib.config b/import-gnulib.config
+index f2e8998..aeeb638 100644
+--- a/import-gnulib.config
++++ b/import-gnulib.config
+@@ -1,7 +1,7 @@
+ # findutils gnulib.config -*- sh -*-
+ 
+ # What version of gnulib to use?
+-gnulib_version="e5573b1bad88bfabcda181b9e0125fb0c52b7d3b"
++gnulib_version="0e0635af0b23826911dc456bd0da40dcb19247de"
+ destdir="gnulib"
+ 
+ # Random extra gnulib files needed for findutils.
+@@ -68,6 +68,7 @@ realloc
+ regex
+ rpmatch
+ savedir
++selinux-at
+ stat-macros
+ stat-time
+ stpcpy
+diff --git a/lib/dircallback.c b/lib/dircallback.c
+index 5dbf3b3..a692b38 100644
+--- a/lib/dircallback.c
++++ b/lib/dircallback.c
+@@ -28,8 +28,8 @@
+ #include <errno.h>
+ 
+ #include "fcntl--.h"
+-#include "lstat.h"
+ #include "save-cwd.h"
++#include <sys/stat.h>
+ 
+ 
+ #ifdef HAVE_LOCALE_H
+-- 
+1.7.5.4
+
diff --git a/recipes-extended/findutils/findutils-4.4.2/findutils-with-selinux-supplemental.patch b/recipes-extended/findutils/findutils-4.4.2/findutils-with-selinux-supplemental.patch
deleted file mode 100644
index f4db6ac..0000000
--- a/recipes-extended/findutils/findutils-4.4.2/findutils-with-selinux-supplemental.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Subject: [PATCH] Fetch support for selinux in gnulib
-
-This eliminates the need for the following patch:
-findutils: support selinux and gnulib
-
-This is done by fetching the latest gnulib updates
-up to the point where the selinux-at module was
-introduced from coreutils.
-
-Upstream-Status: Backport
-
-diff --git a/import-gnulib.config b/import-gnulib.config
-index f2e8998..fa24d99 100644
---- a/import-gnulib.config
-+++ b/import-gnulib.config
-@@ -1,7 +1,8 @@
- # findutils gnulib.config -*- sh -*-
- 
- # What version of gnulib to use?
--gnulib_version="e5573b1bad88bfabcda181b9e0125fb0c52b7d3b"
-+gnulib_version="7dfa1250265017223e36c72713a7521421b4d27c"
- destdir="gnulib"
- 
- # Random extra gnulib files needed for findutils.
-@@ -68,6 +69,7 @@ realloc
- regex
- rpmatch
- savedir
-+selinux-at
- stat-macros
- stat-time
- stpcpy
diff --git a/recipes-extended/findutils/findutils_4.4.2.bbappend b/recipes-extended/findutils/findutils_4.4.2.bbappend
index 5488839..ba56fbe 100644
--- a/recipes-extended/findutils/findutils_4.4.2.bbappend
+++ b/recipes-extended/findutils/findutils_4.4.2.bbappend
@@ -1,17 +1,16 @@
-PR .= ".3"
+PR .= ".4"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
 
-SRC_URI += "git://git.yoctogit.savannah.gnu.org/gnulib.git"
+SRC_URI += "git://git.savannah.gnu.org/gnulib.git;protocol=git;rev=0e0635af0b23826911dc456bd0da40dcb19247de"
 SRC_URI += "file://findutils-with-selinux.patch"
-SRC_URI += "file://findutils-with-selinux-supplemental.patch"
-SRCREV = "7dfa1250265017223e36c72713a7521421b4d27c"
+SRC_URI += "file://findutils-with-selinux-gnulib.patch"
 
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}"
 
 EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}"
 
-#Make sure we call import-gnulib to reflect on the new changes to its config.
-do_configure_prepend () {
- ${S}/import-gnulib.sh
+do_configure_prepend() {
+       ./import-gnulib.sh -d ${WORKDIR}/git
 }
+
-- 
cgit v1.2.3-54-g00ecf