From 62136a869a56d4ad2b61fec2b8bbd23626433056 Mon Sep 17 00:00:00 2001
From: Qing He <qing.he@intel.com>
Date: Thu, 8 Jul 2010 13:46:40 +0800
Subject: findutils: upgrade to version 4.2.31 and 4.4.2

from 4.2.29
4.2.31 is the last known GPL2 version

changes for 4.4:
  - pulled upstream patch to fix bug #27017, #28824 and #28872
  - using a workaround to address bug #27299, this was fixed in
    development branch 4.5.3 by using a new version of gnulib.
    however, upgrading gnulib needs too much effort here.

changes for 4.2:
  - 4.2.31's gnulib/m4/extension.m4 won't work with autoconf 2.65,
    fix it by removing gnulib's AC_USE_SYSTEM_EXTENSIONS

Signed-off-by: Qing He <qing.he@intel.com>
---
 .../findutils-4.2.31/gnulib-extension.patch        | 54 ++++++++++++++++++++++
 .../findutils/findutils-4.2.31/mkdir.patch         | 26 +++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 meta/packages/findutils/findutils-4.2.31/gnulib-extension.patch
 create mode 100644 meta/packages/findutils/findutils-4.2.31/mkdir.patch

(limited to 'meta/packages/findutils/findutils-4.2.31')

diff --git a/meta/packages/findutils/findutils-4.2.31/gnulib-extension.patch b/meta/packages/findutils/findutils-4.2.31/gnulib-extension.patch
new file mode 100644
index 000000000..2bc54e929
--- /dev/null
+++ b/meta/packages/findutils/findutils-4.2.31/gnulib-extension.patch
@@ -0,0 +1,54 @@
+the old AC_USE_SYSTEM_EXTENSIONS won't work with AC_GNU_SOURCE
+
+against 4.2.31
+07/08/2010 - qhe
+
+diff --git a/gnulib/m4/extensions.m4 b/gnulib/m4/extensions.m4
+index 143a9e5..0f27ceb 100644
+--- a/gnulib/m4/extensions.m4
++++ b/gnulib/m4/extensions.m4
+@@ -12,44 +12,6 @@
+ # enough in this area it's likely we'll need to redefine
+ # AC_USE_SYSTEM_EXTENSIONS for quite some time.
+ 
+-# AC_USE_SYSTEM_EXTENSIONS
+-# ------------------------
+-# Enable extensions on systems that normally disable them,
+-# typically due to standards-conformance issues.
+-AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
+-[
+-  AC_BEFORE([$0], [AC_COMPILE_IFELSE])
+-  AC_BEFORE([$0], [AC_RUN_IFELSE])
+-
+-  AC_REQUIRE([AC_GNU_SOURCE])
+-  AC_REQUIRE([AC_AIX])
+-  AC_REQUIRE([AC_MINIX])
+-
+-  AH_VERBATIM([__EXTENSIONS__],
+-[/* Enable extensions on Solaris.  */
+-#ifndef __EXTENSIONS__
+-# undef __EXTENSIONS__
+-#endif
+-#ifndef _POSIX_PTHREAD_SEMANTICS
+-# undef _POSIX_PTHREAD_SEMANTICS
+-#endif
+-#ifndef _TANDEM_SOURCE
+-# undef _TANDEM_SOURCE
+-#endif])
+-  AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
+-    [ac_cv_safe_to_define___extensions__],
+-    [AC_COMPILE_IFELSE(
+-       [AC_LANG_PROGRAM([
+-#	  define __EXTENSIONS__ 1
+-	  AC_INCLUDES_DEFAULT])],
+-       [ac_cv_safe_to_define___extensions__=yes],
+-       [ac_cv_safe_to_define___extensions__=no])])
+-  test $ac_cv_safe_to_define___extensions__ = yes &&
+-    AC_DEFINE([__EXTENSIONS__])
+-  AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
+-  AC_DEFINE([_TANDEM_SOURCE])
+-])
+-
+ # gl_USE_SYSTEM_EXTENSIONS
+ # ------------------------
+ # Enable extensions on systems that normally disable them,
diff --git a/meta/packages/findutils/findutils-4.2.31/mkdir.patch b/meta/packages/findutils/findutils-4.2.31/mkdir.patch
new file mode 100644
index 000000000..98ffbd2e7
--- /dev/null
+++ b/meta/packages/findutils/findutils-4.2.31/mkdir.patch
@@ -0,0 +1,26 @@
+Index: findutils-4.2.29/configure.in
+===================================================================
+--- findutils-4.2.29.orig/configure.in	2006-11-25 18:06:00.000000000 +0000
++++ findutils-4.2.29/configure.in	2009-08-19 18:01:06.000000000 +0100
+@@ -209,6 +209,8 @@
+ dnl Hence they need to know if they are being compiled into findutils or not.
+ AC_DEFINE([FINDUTILS], 1, [Define if we are compiling GNU findutils])
+ 
++MKINSTALLDIRS="mkdir -p"
++AC_SUBST(MKINSTALLDIRS)
+ 
+ # This is necessary so that .o files in LIBOBJS are also built via
+ # the ANSI2KNR-filtering rules.
+Index: findutils-4.2.29/po/Makefile.in.in
+===================================================================
+--- findutils-4.2.29.orig/po/Makefile.in.in	2009-08-19 18:05:47.000000000 +0100
++++ findutils-4.2.29/po/Makefile.in.in	2009-08-19 18:05:58.000000000 +0100
+@@ -30,7 +30,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
++mkinstalldirs = $(MKINSTALLDIRS)
+ 
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@
-- 
cgit v1.2.3