Merge branch 'master' of git+ssh://openadk.org/git/openadk

7 files changed, 33 insertions, 63 deletions

diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile
index 26a501fd8..1d0a9830d 100644
--- a/package/coreutils/Makefile
+++ b/package/coreutils/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		coreutils
-PKG_VERSION:=		8.21
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		065ba41828644eca5dd8163446de5d64
+PKG_VERSION:=		8.22
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		8fb0ae2267aa6e728958adc38f8163a2
 PKG_DESCR:=		basic file, shell and text manipulation utilities
 PKG_SECTION:=		base
 PKG_BUILDDEP:=		gmp autotool
diff --git a/package/coreutils/patches/patch-Makefile_am b/package/coreutils/patches/patch-Makefile_am
new file mode 100644
index 000000000..7a8549921
--- /dev/null
+++ b/package/coreutils/patches/patch-Makefile_am
@@ -0,0 +1,8 @@
+--- coreutils-8.22.orig/Makefile.am	2013-12-04 15:48:30.000000000 +0100
++++ coreutils-8.22/Makefile.am	2014-02-21 16:15:49.000000000 +0100
+@@ -187,5 +187,4 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib
+ include $(top_srcdir)/lib/local.mk
+ include $(top_srcdir)/src/local.mk
+ include $(top_srcdir)/doc/local.mk
+-include $(top_srcdir)/man/local.mk
+ include $(top_srcdir)/tests/local.mk
diff --git a/package/coreutils/patches/patch-lib_fseeko_c b/package/coreutils/patches/patch-lib_fseeko_c
deleted file mode 100644
index 9687be6b8..000000000
--- a/package/coreutils/patches/patch-lib_fseeko_c
+++ /dev/null
@@ -1,15 +0,0 @@
---- coreutils-8.21.orig/lib/fseeko.c	2013-01-04 15:07:03.000000000 +0100
-+++ coreutils-8.21/lib/fseeko.c	2013-11-04 20:32:38.000000000 +0100
-@@ -99,6 +99,12 @@ fseeko (FILE *fp, off_t offset, int when
- #elif defined EPLAN9                /* Plan9 */
-   if (fp->rp == fp->buf
-       && fp->wp == fp->buf)
-+#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."
- #endif
diff --git a/package/coreutils/patches/patch-m4_fflush_m4 b/package/coreutils/patches/patch-m4_fflush_m4
deleted file mode 100644
index 19ad1b49b..000000000
--- a/package/coreutils/patches/patch-m4_fflush_m4
+++ /dev/null
@@ -1,31 +0,0 @@
---- coreutils-8.21.orig/m4/fflush.m4	2013-01-02 13:34:46.000000000 +0100
-+++ coreutils-8.21/m4/fflush.m4	2013-11-04 20:32:38.000000000 +0100
-@@ -14,7 +14,7 @@ AC_DEFUN([gl_FUNC_FFLUSH],
- [
-   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-   gl_FUNC_FFLUSH_STDIN
--  if test $gl_cv_func_fflush_stdin = no; then
-+  if test $gl_cv_func_fflush_stdin != yes; then
-     REPLACE_FFLUSH=1
-   fi
- ])
-@@ -72,10 +72,17 @@ AC_DEFUN([gl_FUNC_FFLUSH_STDIN],
-            return 7;
-          return 0;
-        ]])], [gl_cv_func_fflush_stdin=yes], [gl_cv_func_fflush_stdin=no],
--     [dnl Pessimistically assume fflush is broken.
--      gl_cv_func_fflush_stdin=no])
-+      [gl_cv_func_fflush_stdin=cross])
-      rm conftest.txt
-     ])
-+   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.])
- ])
- 
- # Prerequisites of lib/fflush.c.
diff --git a/package/coreutils/patches/patch-m4_fseeko_m4 b/package/coreutils/patches/patch-m4_fseeko_m4
deleted file mode 100644
index 1d6da43f8..000000000
--- a/package/coreutils/patches/patch-m4_fseeko_m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- coreutils-8.21.orig/m4/fseeko.m4	2013-01-02 13:34:46.000000000 +0100
-+++ coreutils-8.21/m4/fseeko.m4	2013-11-04 20:32:38.000000000 +0100
-@@ -37,7 +37,7 @@ AC_DEFUN([gl_FUNC_FSEEKO],
-     fi
-     m4_ifdef([gl_FUNC_FFLUSH_STDIN], [
-       gl_FUNC_FFLUSH_STDIN
--      if test $gl_cv_func_fflush_stdin = no; then
-+      if test $gl_cv_func_fflush_stdin != yes; then
-         REPLACE_FSEEKO=1
-       fi
-     ])
diff --git a/package/coreutils/patches/patch-m4_spawn_h_m4 b/package/coreutils/patches/patch-m4_spawn_h_m4
new file mode 100644
index 000000000..5273ee3d3
--- /dev/null
+++ b/package/coreutils/patches/patch-m4_spawn_h_m4
@@ -0,0 +1,18 @@
+--- coreutils-8.22.orig/m4/spawn_h.m4	2013-12-04 15:53:33.000000000 +0100
++++ coreutils-8.22/m4/spawn_h.m4	2014-02-21 15:19:26.000000000 +0100
+@@ -64,7 +64,14 @@ AC_DEFUN([gl_HAVE_POSIX_SPAWN],
+   dnl once only, before all statements that occur in other macros.
+   AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
+ 
+-  AC_CHECK_FUNCS_ONCE([posix_spawn])
++  LIB_POSIX_SPAWN=
++  AC_SUBST([LIB_POSIX_SPAWN])
++  gl_saved_libs=$LIBS
++    AC_SEARCH_LIBS([posix_spawn], [rt],
++                   [test "$ac_cv_search_posix_spawn" = "none required" ||
++                    LIB_POSIX_SPAWN=$ac_cv_search_posix_spawn])
++    AC_CHECK_FUNCS([posix_spawn])
++  LIBS=$gl_saved_libs
+   if test $ac_cv_func_posix_spawn != yes; then
+     HAVE_POSIX_SPAWN=0
+   fi
diff --git a/package/coreutils/patches/patch-man_local_mk b/package/coreutils/patches/patch-man_local_mk
index b8e739505..5bf9e5cc1 100644
--- a/package/coreutils/patches/patch-man_local_mk
+++ b/package/coreutils/patches/patch-man_local_mk
@@ -1,5 +1,5 @@
---- coreutils-8.21.orig/man/local.mk	2013-02-05 15:01:21.000000000 +0100
-+++ coreutils-8.21/man/local.mk	2013-11-04 20:32:38.000000000 +0100
+--- coreutils-8.22.orig/man/local.mk	2013-12-04 15:48:30.000000000 +0100
++++ coreutils-8.22/man/local.mk	2014-02-21 16:08:08.000000000 +0100
 @@ -18,12 +18,7 @@
  
  EXTRA_DIST += man/help2man man/dummy-man
@@ -8,8 +8,9 @@
 -if HAVE_PERL
 -run_help2man = $(PERL) -- $(srcdir)/man/help2man
 -else
- run_help2man = $(SHELL) $(srcdir)/man/dummy-man
+-run_help2man = $(SHELL) $(srcdir)/man/dummy-man
 -endif
++run_help2man = echo
  
  man1_MANS = @man1_MANS@
  EXTRA_DIST += $(man1_MANS:.1=.x)