From 480afee911dad1e6e003d58877ee9528fc475412 Mon Sep 17 00:00:00 2001 From: Martin Banky Date: Thu, 30 Sep 2010 12:03:34 -0700 Subject: coreutils: bump to 8.5 Signed-off-by: Martin Banky Acked-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/coreutils/coreutils-7.4-hostname-man.patch | 51 ---------------------- .../coreutils/coreutils-7.4-rename-m4-fix.patch | 44 ------------------- package/coreutils/coreutils-8.5-hostname-man.patch | 51 ++++++++++++++++++++++ package/coreutils/coreutils.mk | 10 +---- 4 files changed, 52 insertions(+), 104 deletions(-) delete mode 100644 package/coreutils/coreutils-7.4-hostname-man.patch delete mode 100644 package/coreutils/coreutils-7.4-rename-m4-fix.patch create mode 100644 package/coreutils/coreutils-8.5-hostname-man.patch (limited to 'package') diff --git a/package/coreutils/coreutils-7.4-hostname-man.patch b/package/coreutils/coreutils-7.4-hostname-man.patch deleted file mode 100644 index 843ecaaae..000000000 --- a/package/coreutils/coreutils-7.4-hostname-man.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- /dev/null 2010-09-18 00:21:07.280000001 -0700 -+++ 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" -+.SH NAME -+hostname \- set or print the name of the current host system -+.SH SYNOPSIS -+.B hostname -+[\fINAME\fR] -+.br -+.B hostname -+\fIOPTION\fR -+.SH DESCRIPTION -+.\" Add any additional description here -+.PP -+Print or set the hostname of the current system. -+.TP -+\fB\-\-help\fR -+display this help and exit -+.TP -+\fB\-\-version\fR -+output version information and exit -+.SH AUTHOR -+Written by Jim Meyering. -+.SH "REPORTING BUGS" -+Report hostname bugs to bug\-coreutils@gnu.org -+.br -+GNU coreutils home page: -+.br -+General help using GNU software: -+.br -+Report hostname translation bugs to -+.SH COPYRIGHT -+Copyright \(co 2010 Free Software Foundation, Inc. -+License GPLv3+: GNU GPL version 3 or later . -+.br -+This is free software: you are free to change and redistribute it. -+There is NO WARRANTY, to the extent permitted by law. -+.SH "SEE ALSO" -+The full documentation for -+.B hostname -+is maintained as a Texinfo manual. If the -+.B info -+and -+.B hostname -+programs are properly installed at your site, the command -+.IP -+.B info coreutils \(aqhostname invocation\(aq -+.PP -+should give you access to the complete manual. 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-8.5-hostname-man.patch b/package/coreutils/coreutils-8.5-hostname-man.patch new file mode 100644 index 000000000..6025f56eb --- /dev/null +++ b/package/coreutils/coreutils-8.5-hostname-man.patch @@ -0,0 +1,51 @@ +--- /dev/null 2010-09-18 00:21:07.280000001 -0700 ++++ 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 8.5" "User Commands" ++.SH NAME ++hostname \- set or print the name of the current host system ++.SH SYNOPSIS ++.B hostname ++[\fINAME\fR] ++.br ++.B hostname ++\fIOPTION\fR ++.SH DESCRIPTION ++.\" Add any additional description here ++.PP ++Print or set the hostname of the current system. ++.TP ++\fB\-\-help\fR ++display this help and exit ++.TP ++\fB\-\-version\fR ++output version information and exit ++.SH AUTHOR ++Written by Jim Meyering. ++.SH "REPORTING BUGS" ++Report hostname bugs to bug\-coreutils@gnu.org ++.br ++GNU coreutils home page: ++.br ++General help using GNU software: ++.br ++Report hostname translation bugs to ++.SH COPYRIGHT ++Copyright \(co 2010 Free Software Foundation, Inc. ++License GPLv3+: GNU GPL version 3 or later . ++.br ++This is free software: you are free to change and redistribute it. ++There is NO WARRANTY, to the extent permitted by law. ++.SH "SEE ALSO" ++The full documentation for ++.B hostname ++is maintained as a Texinfo manual. If the ++.B info ++and ++.B hostname ++programs are properly installed at your site, the command ++.IP ++.B info coreutils \(aqhostname invocation\(aq ++.PP ++should give you access to the complete manual. 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 \ -- cgit v1.2.3