coreutils: bump to 8.5

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

3 files changed, 2 insertions, 54 deletions

diff --git a/package/coreutils/coreutils-7.4-rename-m4-fix.patch b/package/coreutils/coreutils-7.4-rename-m4-fix.patch
deleted file mode 100644
index 817720066..000000000
--- a/package/coreutils/coreutils-7.4-rename-m4-fix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Commit 7fcb389fb4cd5ba26e330fef991ffdc05392f289 from gnulib, to fix
-the rename bugs detection macros.
----
- m4/rename.m4 |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: coreutils-7.4/m4/rename.m4
-===================================================================
---- coreutils-7.4.orig/m4/rename.m4
-+++ coreutils-7.4/m4/rename.m4
-@@ -51,12 +51,12 @@
-     AC_LIBOBJ([rename])
-     AC_DEFINE([rename], [rpl_rename],
-       [Define to rpl_rename if the replacement function should be used.])
--    if test $gl_cv_func_rename_trailing_slash_bug; then
-+    if test $gl_cv_func_rename_trailing_slash_bug = yes; then
-       AC_DEFINE([RENAME_TRAILING_SLASH_BUG], [1],
- 	[Define if rename does not work for source file names with a trailing
- 	 slash, like the one from SunOS 4.1.1_U1.])
-     fi
--    if test $gl_cv_func_rename_dest_exists_bug; then
-+    if test $gl_cv_func_rename_dest_exists_bug = yes; then
-       AC_DEFINE([RENAME_DEST_EXISTS_BUG], [1],
- 	[Define if rename does not work when the destination file exists,
- 	 as on Windows.])
-Index: coreutils-7.4/configure
-===================================================================
---- coreutils-7.4.orig/configure
-+++ coreutils-7.4/configure
-@@ -28698,12 +28698,12 @@ $as_echo "$gl_cv_func_rename_dest_exists
- 
- $as_echo "#define rename rpl_rename" >>confdefs.h
- 
--    if test $gl_cv_func_rename_trailing_slash_bug; then
-+    if test $gl_cv_func_rename_trailing_slash_bug = yes; then
- 
- $as_echo "#define RENAME_TRAILING_SLASH_BUG 1" >>confdefs.h
- 
-     fi
--    if test $gl_cv_func_rename_dest_exists_bug; then
-+    if test $gl_cv_func_rename_dest_exists_bug = yes; then
- 
- $as_echo "#define RENAME_DEST_EXISTS_BUG 1" >>confdefs.h
- 
diff --git a/package/coreutils/coreutils-7.4-hostname-man.patch b/package/coreutils/coreutils-8.5-hostname-man.patch
index 843ecaaae..6025f56eb 100644
--- a/package/coreutils/coreutils-7.4-hostname-man.patch
+++ b/package/coreutils/coreutils-8.5-hostname-man.patch
@@ -2,7 +2,7 @@
 +++ b/man/hostname.1	2010-09-23 12:08:06.000000000 -0700
 @@ -0,0 +1,48 @@
 +.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
-+.TH HOSTNAME "1" "September 2010" "GNU coreutils 7.4" "User Commands"
++.TH HOSTNAME "1" "September 2010" "GNU coreutils 8.5" "User Commands"
 +.SH NAME
 +hostname \- set or print the name of the current host system
 +.SH SYNOPSIS
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index 7e64d25ea..73dd66294 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -3,7 +3,7 @@
 # coreutils
 #
 #############################################################
-COREUTILS_VERSION = 7.4
+COREUTILS_VERSION = 8.5
 COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.gz
 COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils
 
@@ -57,14 +57,6 @@ COREUTILS_CONF_OPT = --disable-rpath \
 		--disable-dependency-tracking \
 		--enable-install-program=hostname
 
-define COREUTILS_TOUCH_RENAME_M4
-	# ensure rename.m4 file is older than configure / aclocal.m4 so
-	# auto* isn't rerun
-	touch -d '1979-01-01' $(@D)/m4/rename.m4
-endef
-
-COREUTILS_POST_PATCH_HOOKS += COREUTILS_TOUCH_RENAME_M4
-
 define COREUTILS_POST_INSTALL
 	# some things go in root rather than usr
 	for f in $(COREUTILS_BIN_PROGS); do \