findutils: update to latest, musl patches no longer required, as upstream updated included gnulib copy

11 files changed, 4 insertions, 163 deletions

diff --git a/package/findutils/Makefile b/package/findutils/Makefile
index a2ad47c3a..46d8d1499 100644
--- a/package/findutils/Makefile
+++ b/package/findutils/Makefile
@@ -4,12 +4,12 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		findutils
-PKG_VERSION:=		4.4.2
-PKG_RELEASE:=		7
-PKG_HASH:=		434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a
+PKG_VERSION:=		4.6.0
+PKG_RELEASE:=		1
+PKG_HASH:=		ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d
 PKG_DESCR:=		utilities for finding files
 PKG_SECTION:=		base/apps
-HOST_BUILDDEP:=		autoconf-host bison-host
+HOST_BUILDDEP:=		bison-host
 PKG_NEEDS:=		treads
 PKG_URL:=		http://www.gnu.org/software/findutils/
 PKG_SITES:=		http://ftp.gnu.org/pub/gnu/findutils/
@@ -33,7 +33,6 @@ $(eval $(call PKG_template,FIND,find,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS
 $(eval $(call PKG_template,LOCATE,locate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LOCATE},${PKG_SECTION}))
 $(eval $(call PKG_template,XARGS,xargs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XARGS},${PKG_SECTION}))
 
-AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ENV+=		gl_cv_func_wcwidth_works=yes \
 			ac_cv_func_working_mktime=yes
 
diff --git a/package/findutils/patches/patch-Makefile_am b/package/findutils/patches/patch-Makefile_am
deleted file mode 100644
index 40a1b3c5b..000000000
--- a/package/findutils/patches/patch-Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
---- findutils-4.4.2.orig/Makefile.am	2009-05-16 17:17:01.000000000 +0200
-+++ findutils-4.4.2/Makefile.am	2014-04-23 16:03:42.290460470 +0200
-@@ -8,7 +8,7 @@ DISTCLEANFILES = tool-versions.txt
- 
- 
- # "tests" is the gnulib unit test dir.
--SUBDIRS = gnulib tests build-aux lib find xargs locate doc po m4 
-+SUBDIRS = gnulib tests build-aux lib find xargs locate m4 
- 
- ACLOCAL_AMFLAGS = -I gnulib/m4 -I m4
- 
diff --git a/package/findutils/patches/patch-configure_ac b/package/findutils/patches/patch-configure_ac
deleted file mode 100644
index 7a4dacf45..000000000
--- a/package/findutils/patches/patch-configure_ac
+++ /dev/null
@@ -1,22 +0,0 @@
---- findutils-4.4.2.orig/configure.ac	Sat May 16 17:27:39 2009
-+++ findutils-4.4.2/configure.ac	Sat May 24 15:13:05 2014
-@@ -77,8 +77,6 @@ AC_PROG_CPP
- dnl for gnulib
- gl_EARLY
- 
--AM_C_PROTOTYPES
--
- AC_PROG_INSTALL
- AC_PROG_RANLIB
- dnl AC_PROG_LIBTOOL
-@@ -203,10 +201,6 @@ AC_CHECK_MEMBER(struct dirent.d_type,,,[
- #include <dirent.h>])
- 
- jy_AC_ATTRIBUTE_NORETURN
--
--dnl internationalization macros
--AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION(0.14.5)
- 
- dnl regextype.c and regexprops.c are designed to be usable outside findutils,
- dnl but findutils doesn't want to support all the regex types in gnulib,
diff --git a/package/findutils/patches/patch-find_Makefile_am b/package/findutils/patches/patch-find_Makefile_am
deleted file mode 100644
index a0fdf5855..000000000
--- a/package/findutils/patches/patch-find_Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
---- findutils-4.4.2.orig/find/Makefile.am	2009-05-16 17:17:01.000000000 +0200
-+++ findutils-4.4.2/find/Makefile.am	2014-04-23 15:59:19.953700220 +0200
-@@ -26,7 +26,7 @@ endif
- 
- EXTRA_DIST = defs.h $(man_MANS)
- INCLUDES = -I../gnulib/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gnulib/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
--LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@
-+LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @LIB_CLOCK_GETTIME@ @FINDLIBS@
- man_MANS = find.1
- SUBDIRS = . testsuite
- 
diff --git a/package/findutils/patches/patch-gnulib_lib_freadahead_c b/package/findutils/patches/patch-gnulib_lib_freadahead_c
deleted file mode 100644
index d998fbf6c..000000000
--- a/package/findutils/patches/patch-gnulib_lib_freadahead_c
+++ /dev/null
@@ -1,15 +0,0 @@
---- findutils-4.4.2.orig/gnulib/lib/freadahead.c	2009-05-10 23:23:57.000000000 +0200
-+++ findutils-4.4.2/gnulib/lib/freadahead.c	2014-03-23 16:27:43.000000000 +0100
-@@ -19,6 +19,7 @@
- /* Specification.  */
- #include "freadahead.h"
- 
-+#ifndef HAVE___FREADAHEAD
- size_t
- freadahead (FILE *fp)
- {
-@@ -64,3 +65,4 @@ freadahead (FILE *fp)
-  #error "Please port gnulib freadahead.c to your platform! Look at the definition of fflush, fread on your system, then report this to bug-gnulib."
- #endif
- }
-+#endif
diff --git a/package/findutils/patches/patch-gnulib_lib_freadahead_h b/package/findutils/patches/patch-gnulib_lib_freadahead_h
deleted file mode 100644
index 6cd605e41..000000000
--- a/package/findutils/patches/patch-gnulib_lib_freadahead_h
+++ /dev/null
@@ -1,23 +0,0 @@
---- findutils-4.4.2.orig/gnulib/lib/freadahead.h	Sun May 10 23:23:57 2009
-+++ findutils-4.4.2/gnulib/lib/freadahead.h	Sat May 24 15:13:05 2014
-@@ -29,7 +29,20 @@ extern "C" {
- 
-    STREAM must not be wide-character oriented.  */
- 
-+#if HAVE___FREADAHEAD || (defined(__linux__) && !defined(__GLIBC__) && !defined(__UCLIBC__)) /* musl libc */
-+
-+#ifndef HAVE___FREADAHEAD
-+#define HAVE___FREADAHEAD 1
-+#endif
-+
-+# include <stdio_ext.h>
-+# define freadahead(stream) __freadahead (stream)
-+
-+#else
-+
- extern size_t freadahead (FILE *stream);
-+
-+#endif
- 
- #ifdef __cplusplus
- }
diff --git a/package/findutils/patches/patch-gnulib_lib_fseeko_c b/package/findutils/patches/patch-gnulib_lib_fseeko_c
deleted file mode 100644
index d3ae84a8d..000000000
--- a/package/findutils/patches/patch-gnulib_lib_fseeko_c
+++ /dev/null
@@ -1,18 +0,0 @@
---- findutils-4.4.2.orig/gnulib/lib/fseeko.c	Sun May 10 23:25:10 2009
-+++ findutils-4.4.2/gnulib/lib/fseeko.c	Sat May 24 15:13:05 2014
-@@ -94,8 +94,14 @@ rpl_fseeko (FILE *fp, off_t offset, int whence)
-   if ((fp->_Mode & _MWRITE ? fp->_Next == fp->_Buf : fp->_Next == fp->_Rend)
-       && fp->_Rback == fp->_Back + sizeof (fp->_Back)
-       && fp->_Rsave == NULL)
-+#elif FUNC_FFLUSH_STDIN < 0 && 200809 <= _POSIX_VERSION
-+  /* Cross-compiling to some other system advertising conformance to
-+     POSIX.1-2008 or later.  Assume fseeko and fflush work as advertised.
-+     If this assumption is incorrect, please report the bug to
-+     bug-gnulib.  */
-+  if (0)
- #else
--  #error "Please port gnulib fseeko.c to your platform! Look at the code in fpurge.c, then report this to bug-gnulib."
-+  #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib."
- #endif
-     {
-       off_t pos = lseek (fileno (fp), offset, whence);
diff --git a/package/findutils/patches/patch-gnulib_lib_getdate_y b/package/findutils/patches/patch-gnulib_lib_getdate_y
deleted file mode 100644
index 32445eab7..000000000
--- a/package/findutils/patches/patch-gnulib_lib_getdate_y
+++ /dev/null
@@ -1,11 +0,0 @@
---- findutils-4.4.2.orig/gnulib/lib/getdate.y	Sun May 10 23:23:57 2009
-+++ findutils-4.4.2/gnulib/lib/getdate.y	Sat May 24 15:28:27 2014
-@@ -114,7 +114,7 @@
-    wraps around, but there's no portable way to check for that at
-    compile-time.  */
- verify (TYPE_IS_INTEGER (time_t));
--verify (LONG_MIN <= TYPE_MINIMUM (time_t) && TYPE_MAXIMUM (time_t) <= LONG_MAX);
-+//verify (LONG_MIN <= TYPE_MINIMUM (time_t) && TYPE_MAXIMUM (time_t) <= LONG_MAX);
- 
- /* An integer value, and the number of digits in its textual
-    representation.  */
diff --git a/package/findutils/patches/patch-gnulib_m4_fflush_m4 b/package/findutils/patches/patch-gnulib_m4_fflush_m4
deleted file mode 100644
index b3dd6a082..000000000
--- a/package/findutils/patches/patch-gnulib_m4_fflush_m4
+++ /dev/null
@@ -1,25 +0,0 @@
---- findutils-4.4.2.orig/gnulib/m4/fflush.m4	2009-05-10 23:23:57.000000000 +0200
-+++ findutils-4.4.2/gnulib/m4/fflush.m4	2014-03-23 18:40:09.000000000 +0100
-@@ -32,12 +32,18 @@ AC_DEFUN([gl_FUNC_FFLUSH],
- 	   return 4;
- 	 return !(lseek (fd, 0, SEEK_CUR) == 5);
-        ]])], [gl_cv_func_fflush_stdin=yes], [gl_cv_func_fflush_stdin=no],
--     [dnl Pessimistically assume fflush is broken.  This is wrong for
--      dnl at least glibc and cygwin; but lib/fflush.c takes this into account.
--      gl_cv_func_fflush_stdin=no])
-+	[gl_cv_func_fflush_stdin=cross])
-      rm conftest.txt
-     ])
--  if test $gl_cv_func_fflush_stdin = no; then
-+  case $gl_cv_func_fflush_stdin in
-+    yes) gl_func_fflush_stdin=1 ;;
-+    no)  gl_func_fflush_stdin=0 ;;
-+    *)   gl_func_fflush_stdin='(-1)' ;;
-+  esac
-+  AC_DEFINE_UNQUOTED([FUNC_FFLUSH_STDIN], [$gl_func_fflush_stdin],
-+    [Define to 1 if fflush is known to work on stdin as per POSIX.1-2008,
-+     0 if fflush is known to not work, -1 if unknown.])
-+  if test $gl_cv_func_fflush_stdin != yes; then
-     gl_REPLACE_FFLUSH
-   fi
- ])
diff --git a/package/findutils/patches/patch-locate_Makefile_am b/package/findutils/patches/patch-locate_Makefile_am
deleted file mode 100644
index 5ecedd78c..000000000
--- a/package/findutils/patches/patch-locate_Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
---- findutils-4.4.2.orig/locate/Makefile.am	2009-05-16 17:17:01.000000000 +0200
-+++ findutils-4.4.2/locate/Makefile.am	2014-04-23 16:01:53.762138276 +0200
-@@ -19,7 +19,7 @@ code_SOURCES = code.c word_io.c
- 
- INCLUDES = -I$(top_srcdir)/lib -I../gnulib/lib -I$(top_srcdir)/gnulib/lib -I../intl -DLOCATE_DB=\"$(LOCATE_DB)\" -DLOCALEDIR=\"$(localedir)\"
- 
--LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@
-+LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a
- 
- $(PROGRAMS) $(LIBPROGRAMS): ../lib/libfind.a ../gnulib/lib/libgnulib.a
- 
diff --git a/package/findutils/patches/patch-xargs_Makefile_am b/package/findutils/patches/patch-xargs_Makefile_am
deleted file mode 100644
index 0cff32335..000000000
--- a/package/findutils/patches/patch-xargs_Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
---- findutils-4.4.2.orig/xargs/Makefile.am	2009-05-16 17:17:01.000000000 +0200
-+++ findutils-4.4.2/xargs/Makefile.am	2014-04-23 16:00:55.249971596 +0200
-@@ -3,7 +3,7 @@ localedir = $(datadir)/locale
- bin_PROGRAMS = xargs
- man_MANS = xargs.1
- INCLUDES = -I.. -I../gnulib/lib -I$(top_srcdir)/gnulib/lib -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
--LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@
-+LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a
- EXTRA_DIST = $(man_MANS)
- SUBDIRS = . testsuite
-