coreutils: bump version

sys-apps/coreutils/coreutils-8.23.recipe

@@ -0,0 +1,272 @@
+SUMMARY="Standard GNU core utilities"
+DESCRIPTION="
+Most of these programs have significant advantages over their Unix \
+counterparts, such as greater speed, additional options, and fewer \
+arbitrary limits.
+
+The programs that can be built with this package are:
+
+  [ arch base64 basename cat chcon chgrp chmod chown chroot cksum comm cp \
+csplit cut date dd df dir dircolors dirname du echo env expand expr \
+factor false fmt fold groups head hostid hostname id install join kill \
+link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup \
+nproc numfmt od paste pathchk pinky pr printenv printf ptx pwd readlink \
+realpath rm rmdir runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum \
+shred shuf sleep sort split stat stdbuf stty sum sync tac tail tee test \
+timeout touch tr true truncate tsort tty uname unexpand uniq unlink \
+uptime users vdir wc who whoami yes
+"
+HOMEPAGE="http://www.gnu.org/software/coreutils"
+COPYRIGHT="1994-2013 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3"
+SRC_URI="http://ftp.gnu.org/gnu/coreutils/coreutils-$portVersion.tar.xz"
+CHECKSUM_SHA256="ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+
+PATCHES="
+	coreutils-$portVersion.patchset
+	import-Haiku-changes.patch
+	"
+if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
+	PATCHES+="
+		coreutils-$portVersion.gcc2.patchset
+	"
+fi
+
+PROVIDES="
+	coreutils = $portVersion compat >= 8
+	cmd:[ = $portVersion compat >= 8
+	cmd:base64 = $portVersion compat >= 8
+	cmd:basename = $portVersion compat >= 8
+	cmd:cat = $portVersion compat >= 8
+	cmd:chcon = $portVersion compat >= 8
+	cmd:chgrp = $portVersion compat >= 8
+	cmd:chmod = $portVersion compat >= 8
+	cmd:chown = $portVersion compat >= 8
+	cmd:chroot = $portVersion compat >= 8
+	cmd:cksum = $portVersion compat >= 8
+	cmd:comm = $portVersion compat >= 8
+	cmd:cp = $portVersion compat >= 8
+	cmd:csplit = $portVersion compat >= 8
+	cmd:cut = $portVersion compat >= 8
+	cmd:date = $portVersion compat >= 8
+	cmd:dd = $portVersion compat >= 8
+	cmd:dir = $portVersion compat >= 8
+	cmd:dircolors = $portVersion compat >= 8
+	cmd:dirname = $portVersion compat >= 8
+	cmd:du = $portVersion compat >= 8
+	cmd:echo = $portVersion compat >= 8
+	cmd:env = $portVersion compat >= 8
+	cmd:expand = $portVersion compat >= 8
+	cmd:expr = $portVersion compat >= 8
+	cmd:factor = $portVersion compat >= 8
+	cmd:false = $portVersion compat >= 8
+	cmd:fmt = $portVersion compat >= 8
+	cmd:fold = $portVersion compat >= 8
+	cmd:groups = $portVersion compat >= 8
+	cmd:head = $portVersion compat >= 8
+	cmd:hostname = $portVersion compat >= 8
+	cmd:id = $portVersion compat >= 8
+	cmd:install = $portVersion compat >= 8
+	cmd:join = $portVersion compat >= 8
+	cmd:kill = $portVersion compat >= 8
+	cmd:link = $portVersion compat >= 8
+	cmd:ln = $portVersion compat >= 8
+	cmd:logname = $portVersion compat >= 8
+	cmd:ls = $portVersion compat >= 8
+	cmd:md5sum = $portVersion compat >= 8
+	cmd:mkdir = $portVersion compat >= 8
+	cmd:mkfifo = $portVersion compat >= 8
+	cmd:mknod = $portVersion compat >= 8
+	cmd:mktemp = $portVersion compat >= 8
+	cmd:mv = $portVersion compat >= 8
+	cmd:nl = $portVersion compat >= 8
+	cmd:nohup = $portVersion compat >= 8
+	cmd:nproc = $portVersion compat >= 8
+	cmd:numfmt = $portVersion compat >= 8
+	cmd:od = $portVersion compat >= 8
+	cmd:paste = $portVersion compat >= 8
+	cmd:pathchk = $portVersion compat >= 8
+	cmd:pr = $portVersion compat >= 8
+	cmd:printenv = $portVersion compat >= 8
+	cmd:printf = $portVersion compat >= 8
+	cmd:ptx = $portVersion compat >= 8
+	cmd:pwd = $portVersion compat >= 8
+	cmd:readlink = $portVersion compat >= 8
+	cmd:realpath = $portVersion compat >= 8
+	cmd:rm = $portVersion compat >= 8
+	cmd:rmdir = $portVersion compat >= 8
+	cmd:runcon = $portVersion compat >= 8
+	cmd:seq = $portVersion compat >= 8
+	cmd:sha1sum = $portVersion compat >= 8
+	cmd:sha224sum = $portVersion compat >= 8
+	cmd:sha256sum = $portVersion compat >= 8
+	cmd:sha384sum = $portVersion compat >= 8
+	cmd:sha512sum = $portVersion compat >= 8
+	cmd:shred = $portVersion compat >= 8
+	cmd:shuf = $portVersion compat >= 8
+	cmd:sleep = $portVersion compat >= 8
+	cmd:sort = $portVersion compat >= 8
+	cmd:split = $portVersion compat >= 8
+	cmd:stat = $portVersion compat >= 8
+	cmd:stdbuf = $portVersion compat >= 8
+	cmd:stty = $portVersion compat >= 8
+	cmd:sum = $portVersion compat >= 8
+	cmd:sync = $portVersion compat >= 8
+	cmd:tac = $portVersion compat >= 8
+	cmd:tail = $portVersion compat >= 8
+	cmd:tee = $portVersion compat >= 8
+	cmd:test = $portVersion compat >= 8
+	cmd:timeout = $portVersion compat >= 8
+	cmd:touch = $portVersion compat >= 8
+	cmd:tr = $portVersion compat >= 8
+	cmd:true = $portVersion compat >= 8
+	cmd:truncate = $portVersion compat >= 8
+	cmd:tsort = $portVersion compat >= 8
+	cmd:tty = $portVersion compat >= 8
+	cmd:uname = $portVersion compat >= 8
+	cmd:unexpand = $portVersion compat >= 8
+	cmd:uniq = $portVersion compat >= 8
+	cmd:unlink = $portVersion compat >= 8
+	cmd:vdir = $portVersion compat >= 8
+	cmd:wc = $portVersion compat >= 8
+	cmd:whoami = $portVersion compat >= 8
+	cmd:yes = $portVersion compat >= 8
+	"
+
+REQUIRES="
+	haiku
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel
+	cmd:gcc
+	cmd:grep
+	cmd:ld
+	cmd:make
+	cmd:awk
+	cmd:sed
+	cmd:help2man
+	cmd:makeinfo
+	"
+
+defineDebugInfoPackage coreutils \
+	$binDir/[ \
+	$binDir/base64 \
+	$binDir/basename \
+	$binDir/cat \
+	$binDir/chcon \
+	$binDir/chgrp \
+	$binDir/chmod \
+	$binDir/chown \
+	$binDir/chroot \
+	$binDir/cksum \
+	$binDir/comm \
+	$binDir/cp \
+	$binDir/csplit \
+	$binDir/cut \
+	$binDir/date \
+	$binDir/dd \
+	$binDir/dir \
+	$binDir/dircolors \
+	$binDir/dirname \
+	$binDir/du \
+	$binDir/echo \
+	$binDir/env \
+	$binDir/expand \
+	$binDir/expr \
+	$binDir/factor \
+	$binDir/false \
+	$binDir/fmt \
+	$binDir/fold \
+	$binDir/groups \
+	$binDir/head \
+	$binDir/hostname \
+	$binDir/id \
+	$binDir/install \
+	$binDir/join \
+	$binDir/kill \
+	$binDir/link \
+	$binDir/ln \
+	$binDir/logname \
+	$binDir/ls \
+	$binDir/md5sum \
+	$binDir/mkdir \
+	$binDir/mkfifo \
+	$binDir/mknod \
+	$binDir/mktemp \
+	$binDir/mv \
+	$binDir/nl \
+	$binDir/nohup \
+	$binDir/nproc \
+	$binDir/numfmt \
+	$binDir/od \
+	$binDir/paste \
+	$binDir/pathchk \
+	$binDir/pr \
+	$binDir/printenv \
+	$binDir/printf \
+	$binDir/ptx \
+	$binDir/pwd \
+	$binDir/readlink \
+	$binDir/realpath \
+	$binDir/rm \
+	$binDir/rmdir \
+	$binDir/runcon \
+	$binDir/seq \
+	$binDir/sha1sum \
+	$binDir/sha224sum \
+	$binDir/sha256sum \
+	$binDir/sha384sum \
+	$binDir/sha512sum \
+	$binDir/shred \
+	$binDir/shuf \
+	$binDir/sleep \
+	$binDir/sort \
+	$binDir/split \
+	$binDir/stat \
+	$binDir/stdbuf \
+	$binDir/stty \
+	$binDir/sum \
+	$binDir/sync \
+	$binDir/tac \
+	$binDir/tail \
+	$binDir/tee \
+	$binDir/test \
+	$binDir/timeout \
+	$binDir/touch \
+	$binDir/tr \
+	$binDir/true \
+	$binDir/truncate \
+	$binDir/tsort \
+	$binDir/tty \
+	$binDir/uname \
+	$binDir/unexpand \
+	$binDir/uniq \
+	$binDir/unlink \
+	$binDir/vdir \
+	$binDir/wc \
+	$binDir/whoami \
+	$binDir/yes \
+	
+PATCH()
+{
+	sed -i -e 's|O_NOCACHE|DD_NOCACHE|g' src/dd.c
+}
+
+BUILD()
+{
+	FORCE_UNSAFE_CONFIGURE=1 runConfigure ./configure \
+		--without-included-regex \
+		--disable-rpath --with-gnu-ld \
+		--enable-no-install-program=df,uptime \
+		--enable-install-program=hostname
+	touch doc/*.info
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}

sys-apps/coreutils/patches/coreutils-8.23.patchset

@@ -0,0 +1,182 @@
+From 90f65fb0a317f6c00b1d239a2208fadc44176f2f Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 13 May 2014 17:18:52 +0000
+Subject: define __USE_GNU for wempcpy
+
+
+diff --git a/lib/fnmatch.c b/lib/fnmatch.c
+index 4246d82..1e30fdc 100644
+--- a/lib/fnmatch.c
++++ b/lib/fnmatch.c
+@@ -21,6 +21,9 @@
+ #ifndef _GNU_SOURCE
+ # define _GNU_SOURCE    1
+ #endif
++#ifndef __USE_GNU
++# define __USE_GNU		1
++#endif
+ 
+ #if ! defined __builtin_expect && __GNUC__ < 3
+ # define __builtin_expect(expr, expected) (expr)
+-- 
+1.8.3.4
+
+
+From 21c5406c9a6b2711e4a8b49c6ace954899a48cc8 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 13 May 2014 17:22:10 +0000
+Subject: force declaration of rpl_inet_ntop
+
+
+diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h
+index b8c2e18..30c4756 100644
+--- a/lib/arpa_inet.in.h
++++ b/lib/arpa_inet.in.h
+@@ -72,7 +72,7 @@
+ 
+    For more details, see the POSIX:2001 specification
+    <http://www.opengroup.org/susv3xsh/inet_ntop.html>.  */
+-# if @REPLACE_INET_NTOP@
++# if 1
+ #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+ #   undef inet_ntop
+ #   define inet_ntop rpl_inet_ntop
+-- 
+1.8.3.4
+
+
+From 9f4cb757ba81534fe7822bbc9517001456a85aa9 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 13 May 2014 17:32:36 +0000
+Subject: Haiku defines mknod in unistd.h
+
+
+diff --git a/lib/mknod.c b/lib/mknod.c
+index c738e59..4d816fd 100644
+--- a/lib/mknod.c
++++ b/lib/mknod.c
+@@ -18,6 +18,7 @@
+ 
+ #include <config.h>
+ 
++#include <unistd.h>
+ #include <sys/stat.h>
+ 
+ #include <errno.h>
+-- 
+1.8.3.4
+
+
+From 20e9b53ba7b53dd6a658a42fa6c1c74c62c08596 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 13 May 2014 17:35:25 +0000
+Subject: protect the label, not used on Haiku
+
+
+diff --git a/lib/mountlist.c b/lib/mountlist.c
+index b3be011..8711915 100644
+--- a/lib/mountlist.c
++++ b/lib/mountlist.c
+@@ -954,7 +954,7 @@ read_file_system_list (bool need_fs_type)
+   *mtail = NULL;
+   return mount_list;
+ 
+-
++#ifndef __HAIKU__
+  free_then_fail:
+   {
+     int saved_errno = errno;
+@@ -970,6 +970,7 @@ read_file_system_list (bool need_fs_type)
+     errno = saved_errno;
+     return NULL;
+   }
++#endif
+ }
+ 
+ /* Free a mount entry as returned from read_file_system_list ().  */
+-- 
+1.8.3.4
+
+
+From d0dfbd6e63a6f45521e29dcbb7fecd7cc6cde8cb Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 15 May 2014 15:40:32 +0000
+Subject: strchrnul needs __USE_GNU on Haiku
+
+
+diff --git a/lib/regex.h b/lib/regex.h
+index 70f2126..d7fbf88 100644
+--- a/lib/regex.h
++++ b/lib/regex.h
+@@ -31,8 +31,10 @@ extern "C" {
+ /* Define __USE_GNU to declare GNU extensions that violate the
+    POSIX name space rules.  */
+ #ifdef _GNU_SOURCE
++#ifndef __USE_GNU
+ # define __USE_GNU 1
+ #endif
++#endif
+ 
+ #ifdef _REGEX_LARGE_OFFSETS
+ 
+diff --git a/lib/string.in.h b/lib/string.in.h
+index 9062142..ab445d1 100644
+--- a/lib/string.in.h
++++ b/lib/string.in.h
+@@ -23,6 +23,9 @@
+ @PRAGMA_COLUMNS@
+ 
+ /* The include_next requires a split double-inclusion guard.  */
++#ifndef __USE_GNU
++#define __USE_GNU
++#endif
+ #@INCLUDE_NEXT@ @NEXT_STRING_H@
+ 
+ #ifndef _@GUARD_PREFIX@_STRING_H
+-- 
+1.8.3.4
+
+
+From 746465bd39c160537daf2bfce500702d53e22675 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 15 May 2014 20:13:58 +0000
+Subject: don't build hostid, uptime, nice, users, who, dd
+
+
+diff --git a/Makefile.in b/Makefile.in
+index 140a428..f3f5596 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1495,16 +1495,15 @@ nodist_src_libver_a_OBJECTS = src/version.$(OBJEXT)
+ src_libver_a_OBJECTS = $(nodist_src_libver_a_OBJECTS)
+ am__EXEEXT_1 = src/arch$(EXEEXT) src/coreutils$(EXEEXT) \
+ 	src/hostname$(EXEEXT)
+-am__EXEEXT_2 = src/chroot$(EXEEXT) src/df$(EXEEXT) src/hostid$(EXEEXT) \
+-	src/libstdbuf.so$(EXEEXT) src/nice$(EXEEXT) src/pinky$(EXEEXT) \
+-	src/stdbuf$(EXEEXT) src/stty$(EXEEXT) src/uptime$(EXEEXT) \
+-	src/users$(EXEEXT) src/who$(EXEEXT)
++am__EXEEXT_2 = src/chroot$(EXEEXT) src/df$(EXEEXT) \
++	src/libstdbuf.so$(EXEEXT) \
++	src/stdbuf$(EXEEXT) src/stty$(EXEEXT)
+ am__EXEEXT_3 = src/[$(EXEEXT) src/base64$(EXEEXT) \
+ 	src/basename$(EXEEXT) src/cat$(EXEEXT) src/chcon$(EXEEXT) \
+ 	src/chgrp$(EXEEXT) src/chmod$(EXEEXT) src/chown$(EXEEXT) \
+ 	src/cksum$(EXEEXT) src/comm$(EXEEXT) src/cp$(EXEEXT) \
+ 	src/csplit$(EXEEXT) src/cut$(EXEEXT) src/date$(EXEEXT) \
+-	src/dd$(EXEEXT) src/dir$(EXEEXT) src/dircolors$(EXEEXT) \
++	src/dir$(EXEEXT) src/dircolors$(EXEEXT) \
+ 	src/dirname$(EXEEXT) src/du$(EXEEXT) src/echo$(EXEEXT) \
+ 	src/env$(EXEEXT) src/expand$(EXEEXT) src/expr$(EXEEXT) \
+ 	src/factor$(EXEEXT) src/false$(EXEEXT) src/fmt$(EXEEXT) \
+@@ -4320,7 +4319,7 @@ WARN_ON_USE_H = lib/warn-on-use.h
+ # FIXME: once lib/ and gnulib-tests/ are also converted, hoist to Makefile.am
+ AM_CFLAGS = $(WERROR_CFLAGS)
+ no_install__progs = src/arch src/coreutils src/hostname
+-build_if_possible__progs = src/chroot src/df src/hostid \
++build_if_possible__progs = src/chroot src/df \
+ 	src/libstdbuf.so src/nice src/pinky src/stdbuf src/stty \
+ 	src/uptime src/users src/who
+ default__progs = src/[ src/base64 src/basename src/cat src/chcon \
+-- 
+1.8.3.4
+