PSARC 2012/170 GNU coreutils 8.16 s11u1-sru
authorRich Burridge <rich.burridge@oracle.com>
Fri, 18 Apr 2014 06:38:30 -0700
branchs11u1-sru
changeset 3083 6826bd655a25
parent 3082 087fefd1546e
child 3086 649b12aa87ce
PSARC 2012/170 GNU coreutils 8.16 PSARC 2012/291 Remove /usr/gnu/bin/whoami 15785512 SUNBT7161373 Update coreutils to version 8.16 15798583 SUNBT7177497 Remove GNU version of whoami in /usr/gnu/bin 17338978 stdbuf searching for libstdbuf.so in wrong place 17408935 GNU coreutils should be 64-bit
components/coreutils/Makefile
components/coreutils/coreutils.license
components/coreutils/coreutils.p5m
components/coreutils/patches/configure.patch
components/coreutils/patches/coreutils-8_5.patch
components/coreutils/patches/file-type.c.patch
components/coreutils/patches/fix-od.patch
components/coreutils/patches/manpages.patch
components/coreutils/patches/mountlist.c.patch
components/coreutils/patches/stdbuf.c.patch
components/coreutils/patches/tests-misc-expr.patch
--- a/components/coreutils/Makefile	Fri Apr 18 06:34:38 2014 -0700
+++ b/components/coreutils/Makefile	Fri Apr 18 06:38:30 2014 -0700
@@ -18,38 +18,51 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		coreutils
-COMPONENT_VERSION=	8.5
+COMPONENT_VERSION=	8.16
 COMPONENT_PROJECT_URL=	http://www.gnu.org/software/coreutils/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:dd243e2ac7d0ed203b170ecfb8299643779e7501fec2b45ae1cea8a450fa8ca0
+    sha256:2a458fead15d9336f46bb4304cc3eaa6ed9407b9130e7ee2ec533909881d2067
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/coreutils/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB=	utility/gnu-coreutils
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
 CONFIGURE_PREFIX	 =	/usr/gnu
+CONFIGURE_OPTIONS	+=	--bindir=/usr/gnu/bin
 CONFIGURE_OPTIONS	+=	--libdir=/usr/lib
 CONFIGURE_OPTIONS	+=	--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS	+=	CPPFLAGS=-I/usr/include/gmp
 CONFIGURE_OPTIONS	+=	CFLAGS="$(CFLAGS)"
 
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_32_and_64)
+
+install:	$(INSTALL_32_and_64)
 
-#
-# whoami is in both /usr/bin and /usr/gnu/bin; mistake?
-#
-install:	$(INSTALL_32)
+# Needed for "gmake test" to work successfully.
+# If SHELLOPTS is exported (as it is by the userland makefiles),
+# then all shell options get exported to child invocations of bash,
+# which results in test failures due to nounset and xtrace being
+# set unexpectedly, and errors such as "$1: unbound variable" and
+# diffs failing due to script tracing in output files.
+unexport SHELLOPTS
 
-test:		$(TEST_32)
+# Get the binaries to test from the component proto area.
+COMPONENT_TEST_ENV +=   PATH=$(PROTOUSRSBINDIR):/usr/bin
+
+# There are two known test failures:
+# misc/stdbuf             - see CR #15941179
+# misc/timeout-parameters - see CR #17425658
+test:		install $(TEST_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/coreutils/coreutils.license	Fri Apr 18 06:34:38 2014 -0700
+++ b/components/coreutils/coreutils.license	Fri Apr 18 06:38:30 2014 -0700
@@ -1,13 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-
---
-   
-Copyright (C) 1984-1986, 1988-2009 Free Software Foundation, Inc. And others
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
--- a/components/coreutils/coreutils.p5m	Fri Apr 18 06:34:38 2014 -0700
+++ b/components/coreutils/coreutils.p5m	Fri Apr 18 06:38:30 2014 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,143 +27,14 @@
 set name=pkg.description \
     value="GNU Core Utilities are the basic file, shell and text manipulation utilities"
 set name=pkg.summary value="GNU Core Utilities"
+set name=com.oracle.info.description value="GNU Core Utilities"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
-    value=PSARC/2010/170
+    value=PSARC/2010/170 value=PSARC/2012/170
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/bin
-dir path=usr/gnu
-dir path=usr/gnu/bin
-dir path=usr/gnu/share
-dir path=usr/gnu/share/locale
-dir path=usr/gnu/share/locale/af
-dir path=usr/gnu/share/locale/af/LC_MESSAGES
-dir path=usr/gnu/share/locale/af/LC_TIME
-dir path=usr/gnu/share/locale/be
-dir path=usr/gnu/share/locale/be/LC_MESSAGES
-dir path=usr/gnu/share/locale/be/LC_TIME
-dir path=usr/gnu/share/locale/bg
-dir path=usr/gnu/share/locale/bg/LC_MESSAGES
-dir path=usr/gnu/share/locale/bg/LC_TIME
-dir path=usr/gnu/share/locale/ca
-dir path=usr/gnu/share/locale/ca/LC_MESSAGES
-dir path=usr/gnu/share/locale/ca/LC_TIME
-dir path=usr/gnu/share/locale/cs
-dir path=usr/gnu/share/locale/cs/LC_MESSAGES
-dir path=usr/gnu/share/locale/cs/LC_TIME
-dir path=usr/gnu/share/locale/da
-dir path=usr/gnu/share/locale/da/LC_MESSAGES
-dir path=usr/gnu/share/locale/da/LC_TIME
-dir path=usr/gnu/share/locale/de
-dir path=usr/gnu/share/locale/de/LC_MESSAGES
-dir path=usr/gnu/share/locale/de/LC_TIME
-dir path=usr/gnu/share/locale/el
-dir path=usr/gnu/share/locale/el/LC_MESSAGES
-dir path=usr/gnu/share/locale/el/LC_TIME
-dir path=usr/gnu/share/locale/en
-dir path=usr/gnu/share/locale/en/LC_MESSAGES
-dir path=usr/gnu/share/locale/en/LC_TIME
-dir path=usr/gnu/share/locale/es
-dir path=usr/gnu/share/locale/es/LC_MESSAGES
-dir path=usr/gnu/share/locale/es/LC_TIME
-dir path=usr/gnu/share/locale/et
-dir path=usr/gnu/share/locale/et/LC_MESSAGES
-dir path=usr/gnu/share/locale/et/LC_TIME
-dir path=usr/gnu/share/locale/eu
-dir path=usr/gnu/share/locale/eu/LC_MESSAGES
-dir path=usr/gnu/share/locale/eu/LC_TIME
-dir path=usr/gnu/share/locale/fi
-dir path=usr/gnu/share/locale/fi/LC_MESSAGES
-dir path=usr/gnu/share/locale/fi/LC_TIME
-dir path=usr/gnu/share/locale/fr
-dir path=usr/gnu/share/locale/fr/LC_MESSAGES
-dir path=usr/gnu/share/locale/fr/LC_TIME
-dir path=usr/gnu/share/locale/ga
-dir path=usr/gnu/share/locale/ga/LC_MESSAGES
-dir path=usr/gnu/share/locale/ga/LC_TIME
-dir path=usr/gnu/share/locale/gl
-dir path=usr/gnu/share/locale/gl/LC_MESSAGES
-dir path=usr/gnu/share/locale/gl/LC_TIME
-dir path=usr/gnu/share/locale/hu
-dir path=usr/gnu/share/locale/hu/LC_MESSAGES
-dir path=usr/gnu/share/locale/hu/LC_TIME
-dir path=usr/gnu/share/locale/id
-dir path=usr/gnu/share/locale/id/LC_MESSAGES
-dir path=usr/gnu/share/locale/id/LC_TIME
-dir path=usr/gnu/share/locale/it
-dir path=usr/gnu/share/locale/it/LC_MESSAGES
-dir path=usr/gnu/share/locale/it/LC_TIME
-dir path=usr/gnu/share/locale/ja
-dir path=usr/gnu/share/locale/ja/LC_MESSAGES
-dir path=usr/gnu/share/locale/ja/LC_TIME
-dir path=usr/gnu/share/locale/ko
-dir path=usr/gnu/share/locale/ko/LC_MESSAGES
-dir path=usr/gnu/share/locale/ko/LC_TIME
-dir path=usr/gnu/share/locale/lg
-dir path=usr/gnu/share/locale/lg/LC_MESSAGES
-dir path=usr/gnu/share/locale/lg/LC_TIME
-dir path=usr/gnu/share/locale/lt
-dir path=usr/gnu/share/locale/lt/LC_MESSAGES
-dir path=usr/gnu/share/locale/lt/LC_TIME
-dir path=usr/gnu/share/locale/ms
-dir path=usr/gnu/share/locale/ms/LC_MESSAGES
-dir path=usr/gnu/share/locale/ms/LC_TIME
-dir path=usr/gnu/share/locale/nb
-dir path=usr/gnu/share/locale/nb/LC_MESSAGES
-dir path=usr/gnu/share/locale/nb/LC_TIME
-dir path=usr/gnu/share/locale/nl
-dir path=usr/gnu/share/locale/nl/LC_MESSAGES
-dir path=usr/gnu/share/locale/nl/LC_TIME
-dir path=usr/gnu/share/locale/pl
-dir path=usr/gnu/share/locale/pl/LC_MESSAGES
-dir path=usr/gnu/share/locale/pl/LC_TIME
-dir path=usr/gnu/share/locale/pt
-dir path=usr/gnu/share/locale/pt/LC_MESSAGES
-dir path=usr/gnu/share/locale/pt/LC_TIME
-dir path=usr/gnu/share/locale/pt_BR
-dir path=usr/gnu/share/locale/pt_BR/LC_MESSAGES
-dir path=usr/gnu/share/locale/pt_BR/LC_TIME
-dir path=usr/gnu/share/locale/ro
-dir path=usr/gnu/share/locale/ro/LC_MESSAGES
-dir path=usr/gnu/share/locale/ro/LC_TIME
-dir path=usr/gnu/share/locale/ru
-dir path=usr/gnu/share/locale/ru/LC_MESSAGES
-dir path=usr/gnu/share/locale/ru/LC_TIME
-dir path=usr/gnu/share/locale/sk
-dir path=usr/gnu/share/locale/sk/LC_MESSAGES
-dir path=usr/gnu/share/locale/sk/LC_TIME
-dir path=usr/gnu/share/locale/sl
-dir path=usr/gnu/share/locale/sl/LC_MESSAGES
-dir path=usr/gnu/share/locale/sl/LC_TIME
-dir path=usr/gnu/share/locale/sv
-dir path=usr/gnu/share/locale/sv/LC_MESSAGES
-dir path=usr/gnu/share/locale/sv/LC_TIME
-dir path=usr/gnu/share/locale/tr
-dir path=usr/gnu/share/locale/tr/LC_MESSAGES
-dir path=usr/gnu/share/locale/tr/LC_TIME
-dir path=usr/gnu/share/locale/uk
-dir path=usr/gnu/share/locale/uk/LC_MESSAGES
-dir path=usr/gnu/share/locale/uk/LC_TIME
-dir path=usr/gnu/share/locale/vi
-dir path=usr/gnu/share/locale/vi/LC_MESSAGES
-dir path=usr/gnu/share/locale/vi/LC_TIME
-dir path=usr/gnu/share/locale/zh_CN
-dir path=usr/gnu/share/locale/zh_CN/LC_MESSAGES
-dir path=usr/gnu/share/locale/zh_CN/LC_TIME
-dir path=usr/gnu/share/locale/zh_TW
-dir path=usr/gnu/share/locale/zh_TW/LC_MESSAGES
-dir path=usr/gnu/share/locale/zh_TW/LC_TIME
-dir path=usr/gnu/share/man
-dir path=usr/gnu/share/man/man1
-dir path=usr/lib
-dir path=usr/share
-dir path=usr/share/info
-dir path=usr/share/man
-dir path=usr/share/man/man1
 file usr/gnu/bin/base64 path=usr/bin/base64
 file usr/gnu/bin/dir path=usr/bin/dir
 file usr/gnu/bin/dircolors path=usr/bin/dircolors
@@ -173,6 +44,7 @@
 file usr/gnu/bin/printenv path=usr/bin/printenv
 file usr/gnu/bin/ptx path=usr/bin/ptx
 file usr/gnu/bin/readlink path=usr/bin/readlink
+file usr/gnu/bin/realpath path=usr/bin/realpath
 file usr/gnu/bin/seq path=usr/bin/seq
 file usr/gnu/bin/sha1sum path=usr/bin/sha1sum
 file usr/gnu/bin/sha224sum path=usr/bin/sha224sum
@@ -262,7 +134,6 @@
 file path=usr/gnu/bin/uptime
 file path=usr/gnu/bin/wc
 file path=usr/gnu/bin/who
-file path=usr/gnu/bin/whoami
 file path=usr/gnu/bin/yes
 file path=usr/gnu/share/locale/af/LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/be/LC_MESSAGES/coreutils.mo
@@ -272,7 +143,7 @@
 file path=usr/gnu/share/locale/da/LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/de/LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/el/LC_MESSAGES/coreutils.mo
-file path=usr/gnu/share/locale/en/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/eo/LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/es/LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/et/LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/eu/LC_MESSAGES/coreutils.mo
@@ -284,6 +155,7 @@
 file path=usr/gnu/share/locale/id/LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/it/LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/ja/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/kk/LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/ko/LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/lg/LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/lt/LC_MESSAGES/coreutils.mo
@@ -375,9 +247,9 @@
 file path=usr/gnu/share/man/man1/uptime.1
 file path=usr/gnu/share/man/man1/wc.1
 file path=usr/gnu/share/man/man1/who.1
-file path=usr/gnu/share/man/man1/whoami.1
 file path=usr/gnu/share/man/man1/yes.1
-file usr/lib/coreutils/libstdbuf.so path=usr/lib/libstdbuf.so
+file $(MACH32)/src/libstdbuf.so path=usr/lib/libstdbuf.so
+file $(MACH64)/src/libstdbuf.so path=usr/lib/$(MACH64)/libstdbuf.so
 file path=usr/share/info/coreutils.info
 file usr/gnu/share/man/man1/base64.1 path=usr/share/man/man1/base64.1
 file usr/gnu/share/man/man1/dir.1 path=usr/share/man/man1/dir.1
@@ -388,6 +260,7 @@
 file usr/gnu/share/man/man1/printenv.1 path=usr/share/man/man1/printenv.1
 file usr/gnu/share/man/man1/ptx.1 path=usr/share/man/man1/ptx.1
 file usr/gnu/share/man/man1/readlink.1 path=usr/share/man/man1/readlink.1
+file usr/gnu/share/man/man1/realpath.1 path=usr/share/man/man1/realpath.1
 file usr/gnu/share/man/man1/seq.1 path=usr/share/man/man1/seq.1
 file usr/gnu/share/man/man1/sha1sum.1 path=usr/share/man/man1/sha1sum.1
 file usr/gnu/share/man/man1/sha224sum.1 path=usr/share/man/man1/sha224sum.1
@@ -421,7 +294,7 @@
     target=../LC_MESSAGES/coreutils.mo
 link path=usr/gnu/share/locale/el/LC_TIME/coreutils.mo \
     target=../LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/en/LC_TIME/coreutils.mo \
+link path=usr/gnu/share/locale/eo/LC_TIME/coreutils.mo \
     target=../LC_MESSAGES/coreutils.mo
 link path=usr/gnu/share/locale/es/LC_TIME/coreutils.mo \
     target=../LC_MESSAGES/coreutils.mo
@@ -445,6 +318,8 @@
     target=../LC_MESSAGES/coreutils.mo
 link path=usr/gnu/share/locale/ja/LC_TIME/coreutils.mo \
     target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/kk/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
 link path=usr/gnu/share/locale/ko/LC_TIME/coreutils.mo \
     target=../LC_MESSAGES/coreutils.mo
 link path=usr/gnu/share/locale/lg/LC_TIME/coreutils.mo \
@@ -628,156 +503,152 @@
     target=../gnu/bin/wc facet.compat.gnulinks=true
 link path=usr/bin/gwho \
     target=../gnu/bin/who facet.compat.gnulinks=true
-link path=usr/bin/gwhoami \
-    target=../gnu/bin/whoami facet.compat.gnulinks=true
 link path=usr/bin/gyes \
     target=../gnu/bin/yes facet.compat.gnulinks=true
 
 link path=usr/share/man/man1/gbasename.1 \
-    target=../../../gnu/share/man/man1/basename.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/basename.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gcat.1 \
-    target=../../../gnu/share/man/man1/cat.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/cat.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gchgrp.1 \
-    target=../../../gnu/share/man/man1/chgrp.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/chgrp.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gchmod.1 \
-    target=../../../gnu/share/man/man1/chmod.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/chmod.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gchown.1 \
-    target=../../../gnu/share/man/man1/chown.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/chown.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gchroot.1 \
-    target=../../../gnu/share/man/man1/chroot.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/chroot.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gcksum.1 \
-    target=../../../gnu/share/man/man1/cksum.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/cksum.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gcomm.1 \
-    target=../../../gnu/share/man/man1/comm.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/comm.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gcp.1 \
-    target=../../../gnu/share/man/man1/cp.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/cp.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gcsplit.1 \
-    target=../../../gnu/share/man/man1/csplit.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/csplit.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gcut.1 \
-    target=../../../gnu/share/man/man1/cut.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/cut.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gdate.1 \
-    target=../../../gnu/share/man/man1/date.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/date.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gdd.1 \
-    target=../../../gnu/share/man/man1/dd.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/dd.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gdf.1 \
-    target=../../../gnu/share/man/man1/df.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/df.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gdirname.1 \
-    target=../../../gnu/share/man/man1/dirname.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/dirname.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gdu.1 \
-    target=../../../gnu/share/man/man1/du.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/du.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gecho.1 \
-    target=../../../gnu/share/man/man1/echo.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/echo.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/genv.1 \
-    target=../../../gnu/share/man/man1/env.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/env.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gexpand.1 \
-    target=../../../gnu/share/man/man1/expand.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/expand.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gexpr.1 \
-    target=../../../gnu/share/man/man1/expr.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/expr.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gfactor.1 \
-    target=../../../gnu/share/man/man1/factor.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/factor.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gfalse.1 \
-    target=../../../gnu/share/man/man1/false.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/false.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gfmt.1 \
-    target=../../../gnu/share/man/man1/fmt.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/fmt.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gfold.1 \
-    target=../../../gnu/share/man/man1/fold.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/fold.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/ggroups.1 \
-    target=../../../gnu/share/man/man1/groups.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/groups.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/ghead.1 \
-    target=../../../gnu/share/man/man1/head.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/head.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/ghostid.1 \
-    target=../../../gnu/share/man/man1/hostid.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/hostid.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gid.1 \
-    target=../../../gnu/share/man/man1/id.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/id.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/ginstall.1 \
-    target=../../../gnu/share/man/man1/install.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/install.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gjoin.1 \
-    target=../../../gnu/share/man/man1/join.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/join.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gkill.1 \
-    target=../../../gnu/share/man/man1/kill.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/kill.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/glink.1 \
-    target=../../../gnu/share/man/man1/link.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/link.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gln.1 \
-    target=../../../gnu/share/man/man1/ln.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/ln.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/glogname.1 \
-    target=../../../gnu/share/man/man1/logname.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/logname.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gls.1 \
-    target=../../../gnu/share/man/man1/ls.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/ls.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gmkdir.1 \
-    target=../../../gnu/share/man/man1/mkdir.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/mkdir.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gmkfifo.1 \
-    target=../../../gnu/share/man/man1/mkfifo.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/mkfifo.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gmknod.1 \
-    target=../../../gnu/share/man/man1/mknod.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/mknod.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gmktemp.1 \
-    target=../../../gnu/share/man/man1/mktemp.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/mktemp.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gmv.1 \
-    target=../../../gnu/share/man/man1/mv.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/mv.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gnice.1 \
-    target=../../../gnu/share/man/man1/nice.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/nice.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gnl.1 \
-    target=../../../gnu/share/man/man1/nl.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/nl.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gnohup.1 \
-    target=../../../gnu/share/man/man1/nohup.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/nohup.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/god.1 \
-    target=../../../gnu/share/man/man1/od.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/od.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gpaste.1 \
-    target=../../../gnu/share/man/man1/paste.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/paste.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gpathchk.1 \
-    target=../../../gnu/share/man/man1/pathchk.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/pathchk.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gpr.1 \
-    target=../../../gnu/share/man/man1/pr.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/pr.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gprintf.1 \
-    target=../../../gnu/share/man/man1/printf.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/printf.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gpwd.1 \
-    target=../../../gnu/share/man/man1/pwd.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/pwd.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/grm.1 \
-    target=../../../gnu/share/man/man1/rm.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/rm.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/grmdir.1 \
-    target=../../../gnu/share/man/man1/rmdir.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/rmdir.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gsleep.1 \
-    target=../../../gnu/share/man/man1/sleep.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/sleep.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gsort.1 \
-    target=../../../gnu/share/man/man1/sort.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/sort.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gsplit.1 \
-    target=../../../gnu/share/man/man1/split.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/split.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gstty.1 \
-    target=../../../gnu/share/man/man1/stty.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/stty.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gsum.1 \
-    target=../../../gnu/share/man/man1/sum.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/sum.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gsync.1 \
-    target=../../../gnu/share/man/man1/sync.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/sync.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gtail.1 \
-    target=../../../gnu/share/man/man1/tail.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/tail.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gtee.1 \
-    target=../../../gnu/share/man/man1/tee.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/tee.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gtest.1 \
-    target=../../../gnu/share/man/man1/test.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/test.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gtouch.1 \
-    target=../../../gnu/share/man/man1/touch.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/touch.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gtr.1 \
-    target=../../../gnu/share/man/man1/tr.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/tr.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gtrue.1 \
-    target=../../../gnu/share/man/man1/true.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/true.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gtsort.1 \
-    target=../../../gnu/share/man/man1/tsort.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/tsort.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gtty.1 \
-    target=../../../gnu/share/man/man1/tty.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/tty.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/guname.1 \
-    target=../../../gnu/share/man/man1/uname.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/uname.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gunexpand.1 \
-    target=../../../gnu/share/man/man1/unexpand.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/unexpand.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/guniq.1 \
-    target=../../../gnu/share/man/man1/uniq.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/uniq.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gunlink.1 \
-    target=../../../gnu/share/man/man1/unlink.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/unlink.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/guptime.1 \
-    target=../../../gnu/share/man/man1/uptime.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/uptime.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gwc.1 \
-    target=../../../gnu/share/man/man1/wc.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/wc.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gwho.1 \
-    target=../../../gnu/share/man/man1/who.1 facet.compat.gnulinks=true
-link path=usr/share/man/man1/gwhoami.1 \
-    target=../../../gnu/share/man/man1/whoami.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/who.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/gyes.1 \
-    target=../../../gnu/share/man/man1/yes.1 facet.compat.gnulinks=true
+    target=../../../gnu/share/man/man1/yes.1 facet.compat.gnulinks=all
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/coreutils/patches/configure.patch	Fri Apr 18 06:38:30 2014 -0700
@@ -0,0 +1,40 @@
+Adjust the tests in the configure script for whether to include stdbuf
+when running on Solaris.
+
+--- coreutils-8.16/configure.orig	2012-04-18 07:35:04.318609521 -0700
++++ coreutils-8.16/configure	2012-04-18 07:36:27.319985971 -0700
+@@ -62005,7 +62005,6 @@
+ }
+ fi
+ 
+-# Limit stdbuf to ELF systems with GCC
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether this is an ELF system" >&5
+ $as_echo_n "checking whether this is an ELF system... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -62024,15 +62023,17 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $elf_sys" >&5
+ $as_echo "$elf_sys" >&6; }
+-if test "$elf_sys" = "yes" && \
+-   test "$GCC" = "yes"; then
+-  {
+-  if test -z "$optional_bin_progs"; then
+-    optional_bin_progs=stdbuf
+-  else
+-    optional_bin_progs="$optional_bin_progs stdbuf"
+-  fi
+-}
++
++if test -z "$optional_bin_progs"; then
++  optional_bin_progs=stdbuf
++else
++  optional_bin_progs="$optional_bin_progs stdbuf"
++ fi
++
++if test -z "$optional_pkglib_progs"; then
++  optional_pkglib_progs=libstdbuf.so
++else
++  optional_pkglib_progs="$optional_pkglib_progs libstdbuf.so"
+ fi
+ 
+ ############################################################################
--- a/components/coreutils/patches/coreutils-8_5.patch	Fri Apr 18 06:34:38 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
---- coreutils-8.5/configure_orig	2011-02-08 16:13:56.850317000 -0800
-+++ coreutils-8.5/configure	2011-02-08 16:14:04.872411000 -0800
-@@ -53254,11 +53254,10 @@
-     optional_bin_progs="$optional_bin_progs df"
-   fi
- }
- fi
- 
--# Limit stdbuf to ELF systems with GCC
- optional_pkglib_progs=
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether this is an ELF system" >&5
- $as_echo_n "checking whether this is an ELF system... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-@@ -53274,28 +53273,24 @@
- fi
- rm -f conftest*
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $elf_sys" >&5
- $as_echo "$elf_sys" >&6; }
--if test "$elf_sys" = "yes" && \
--   test "$GCC" = "yes"; then
--  {
--  if test -z "$optional_bin_progs"; then
--    optional_bin_progs=stdbuf
--  else
--    optional_bin_progs="$optional_bin_progs stdbuf"
--  fi
--}
--  {
--  if test -z "$optional_pkglib_progs"; then
--    optional_pkglib_progs=libstdbuf.so
--  else
--    optional_pkglib_progs="$optional_pkglib_progs libstdbuf.so"
--  fi
--}
-+
-+if test -z "$optional_bin_progs"; then
-+  optional_bin_progs=stdbuf
-+else
-+  optional_bin_progs="$optional_bin_progs stdbuf"
- fi
- 
-+if test -z "$optional_pkglib_progs"; then
-+  optional_pkglib_progs=libstdbuf.so
-+else
-+  optional_pkglib_progs="$optional_pkglib_progs libstdbuf.so"
-+fi
-+
-+
- ############################################################################
- mk="$srcdir/src/Makefile.am"
- # Extract all literal names from the definition of $(EXTRA_PROGRAMS)
- # in $mk but don't expand the variable references.
- # Append each literal name to $optional_bin_progs.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/coreutils/patches/file-type.c.patch	Fri Apr 18 06:38:30 2014 -0700
@@ -0,0 +1,17 @@
+Add support for the Solaris "door" file type with the GNU stat command
+(CR #16575088)
+
+This patch will be submitted upstream.
+
+--- coreutils-8.16/lib/file-type.c.orig	2014-02-04 08:45:32.295255617 -0800
++++ coreutils-8.16/lib/file-type.c	2014-02-04 14:31:27.647845083 -0800
+@@ -55,6 +55,9 @@
+   if (S_ISSOCK (st->st_mode))
+     return _("socket");
+ 
++  if (S_ISDOOR (st->st_mode))
++    return _("door");
++
+   if (S_TYPEISMQ (st))
+     return _("message queue");
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/coreutils/patches/fix-od.patch	Fri Apr 18 06:38:30 2014 -0700
@@ -0,0 +1,75 @@
+Fix for CR #16833210 - god does not handle large values of -w well
+
+GNU od -wN with N larger than 64K on a system with 32-bit size_t would
+print approximately 2*N bytes of extraneous padding.
+[Bug introduced in coreutils-7.0]
+
+From: Jim Meyering <address@hidden>
+Date: Sat, 1 Jun 2013 19:20:06 -0700
+Subject: [PATCH] od: -wN, N>64K, avoid misbehavior on systems with 32-bit
+ size_t
+
+* src/od.c (PRINT_FIELDS): Declare "i" to be of type uintmax_t, so that
+the numerator in the expression for "next_pad" does not overflow.
+(print_named_ascii): Likewise.
+(print_ascii): Likewise.
+Bug introduced via commit v6.12-42-g20c0b87.
+* tests/misc/od.pl: Exercise each of the three affected code paths.
+* NEWS (Bug fixes): Mention it.
+Reported by Rich Burridge.
+---
+ NEWS             | 4 ++++
+ THANKS.in        | 1 +
+ src/od.c         | 6 +++---
+ tests/misc/od.pl | 7 +++++++
+ 4 files changed, 15 insertions(+), 3 deletions(-)
+
+Also see the email thread at:
+http://lists.gnu.org/archive/html/bug-coreutils/2013-06/msg00009.html
+
+--- coreutils-8.16/src/od.c.orig	2013-06-03 06:32:09.966956225 -0700
++++ coreutils-8.16/src/od.c	2013-06-03 07:15:29.690420676 -0700
+@@ -394,7 +394,7 @@
+    char const *FMT_STRING, int width, int pad)                          \
+ {                                                                       \
+   T const *p = block;                                                   \
+-  size_t i;                                                             \
++  uintmax_t i;                                                          \
+   int pad_remaining = pad;                                              \
+   for (i = fields; blank < i; i--)                                      \
+     {                                                                   \
+@@ -450,7 +450,7 @@
+                    int width, int pad)
+ {
+   unsigned char const *p = block;
+-  size_t i;
++  uintmax_t i;
+   int pad_remaining = pad;
+   for (i = fields; blank < i; i--)
+     {
+@@ -481,7 +481,7 @@
+              int pad)
+ {
+   unsigned char const *p = block;
+-  size_t i;
++  uintmax_t i;
+   int pad_remaining = pad;
+   for (i = fields; blank < i; i--)
+     {
+--- coreutils-8.16/tests/misc/od.orig	2013-06-03 06:34:10.913221535 -0700
++++ coreutils-8.16/tests/misc/od	2013-06-03 06:34:46.766226767 -0700
+@@ -57,6 +57,14 @@
+      # even if the kernel reports that the file has stat.st_size = 0.
+      ['j-proc', "-An -c -j $proc_file_byte_count $proc_file",
+                                {IN=>{f2=>'e'}}, {OUT=>"   e\n"}],
++
++     # Ensure that a large width does not cause trouble.
++     # From coreutils-7.0 through coreutils-8.21, these would print
++     # approximately 128KiB of padding.
++     ['wide-a',   '-a -w65537 -An', {IN=>{g=>'x'}}, {OUT=>"   x\n"}],
++     ['wide-c',   '-c -w65537 -An', {IN=>{g=>'x'}}, {OUT=>"   x\n"}],
++     ['wide-x', '-tx1 -w65537 -An', {IN=>{g=>'B'}}, {OUT=>" 42\n"}],
++
+     );
+ 
+ my $save_temps = $ENV{DEBUG};
--- a/components/coreutils/patches/manpages.patch	Fri Apr 18 06:34:38 2014 -0700
+++ b/components/coreutils/patches/manpages.patch	Fri Apr 18 06:38:30 2014 -0700
@@ -70,7 +70,7 @@
  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"
--\fBrev\fP(1).
+-\fBrev\fP(1)
 -.PP
  The full documentation for
  .B tac
--- a/components/coreutils/patches/mountlist.c.patch	Fri Apr 18 06:34:38 2014 -0700
+++ b/components/coreutils/patches/mountlist.c.patch	Fri Apr 18 06:38:30 2014 -0700
@@ -1,26 +1,20 @@
-*** coreutils-8.5/lib/mountlist.c.orig	Wed Nov  9 06:19:54 2011
---- coreutils-8.5/lib/mountlist.c	Wed Nov  9 07:25:30 2011
-***************
-*** 157,166 ****
-  #endif
-  
-  #ifndef ME_REMOTE
-! /* A file system is `remote' if its Fs_name contains a `:'
-!    or if (it is of type (smbfs or cifs) and its Fs_name starts with `//').  */
-  # define ME_REMOTE(Fs_name, Fs_type)            \
-!     (strchr (Fs_name, ':') != NULL              \
-       || ((Fs_name)[0] == '/'                    \
-           && (Fs_name)[1] == '/'                 \
-           && (strcmp (Fs_type, "smbfs") == 0     \
---- 157,167 ----
-  #endif
-  
-  #ifndef ME_REMOTE
-! /* A file system is `remote' if its Fs_name contains a `:' (and isn't of 
-!    type pcfs), or if (it is of type (smbfs or cifs) and its Fs_name starts
-!    with `//').  */
-  # define ME_REMOTE(Fs_name, Fs_type)            \
-!     ((strchr (Fs_name, ':') != NULL && strcmp (Fs_type, "pcfs") != 0) \
-       || ((Fs_name)[0] == '/'                    \
-           && (Fs_name)[1] == '/'                 \
-           && (strcmp (Fs_type, "smbfs") == 0     \
+Properly detect remote mounted file systems with /usr/gnu/bin/df on Solaris.
+See the comments in CR# 15595871 for more details.
+
+--- coreutils-8.16/lib/mountlist.c.orig	2012-04-18 07:41:27.645801306 -0700
++++ coreutils-8.16/lib/mountlist.c	2012-04-18 07:42:23.796304225 -0700
+@@ -187,10 +187,11 @@
+ #endif
+ 
+ #ifndef ME_REMOTE
+-/* A file system is "remote" if its Fs_name contains a ':'
+-   or if (it is of type (smbfs or cifs) and its Fs_name starts with '//').  */
++/* A file system is `remote' if its Fs_name contains a `:' (and isn't of 
++   type pcfs), or if (it is of type (smbfs or cifs) and its Fs_name starts
++   with `//').  */
+ # define ME_REMOTE(Fs_name, Fs_type)            \
+-    (strchr (Fs_name, ':') != NULL              \
++    ((strchr (Fs_name, ':') != NULL && strcmp (Fs_type, "pcfs") != 0) \
+      || ((Fs_name)[0] == '/'                    \
+          && (Fs_name)[1] == '/'                 \
+          && (strcmp (Fs_type, "smbfs") == 0     \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/coreutils/patches/stdbuf.c.patch	Fri Apr 18 06:38:30 2014 -0700
@@ -0,0 +1,50 @@
+Changes needed to get stdbuf to successfully preload libstdbuf.so
+for both 32-bit and 64-bit applications. See comment in the patch
+for more details.
+
+--- coreutils-8.16/src/stdbuf.c.orig	2013-09-04 19:05:35.225857588 -0700
++++ coreutils-8.16/src/stdbuf.c	2013-09-04 19:11:51.945113130 -0700
+@@ -195,37 +195,13 @@
+      gcc stdbuf.c -Wl,-rpath,'$ORIGIN' -Wl,-rpath,$PKGLIBEXECDIR
+      However we want the lookup done for the exec'd command not stdbuf.
+ 
+-     Since we don't link against libstdbuf.so add it to PKGLIBEXECDIR
+-     rather than to LIBDIR.  */
+-  char const *const search_path[] = {
+-    program_path,
+-    PKGLIBEXECDIR,
+-    NULL
+-  };
++     Since we don't link against libstdbuf.so, we need to LD_PRELOAD it.
++     As libstdbuf.so lives in /usr/lib and /usr/lib/64, we just use
++     LD_PRELOAD=libstdbuf.so, and ld.so.1 finds the right one associated
++     with the process class. ie. we don't use full path names for the
++     preload names.  */
+ 
+-  char const *const *path = search_path;
+-  char *libstdbuf;
+-
+-  while (true)
+-    {
+-      struct stat sb;
+-
+-      if (!**path)              /* system default  */
+-        {
+-          libstdbuf = xstrdup (LIB_NAME);
+-          break;
+-        }
+-      ret = asprintf (&libstdbuf, "%s/%s", *path, LIB_NAME);
+-      if (ret < 0)
+-        xalloc_die ();
+-      if (stat (libstdbuf, &sb) == 0)   /* file_exists  */
+-        break;
+-      free (libstdbuf);
+-
+-      ++path;
+-      if ( ! *path)
+-        error (EXIT_CANCELED, 0, _("failed to find %s"), quote (LIB_NAME));
+-    }
++  char *libstdbuf = xstrdup (LIB_NAME);
+ 
+   /* FIXME: Do we need to support libstdbuf.dll, c:, '\' separators etc?  */
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/coreutils/patches/tests-misc-expr.patch	Fri Apr 18 06:38:30 2014 -0700
@@ -0,0 +1,37 @@
+The tests/misc/expr test is broken by default in version 8.16.
+
+Looking at the ChangeLog for GNU coreutils 8.19, I found:
+
+2012-04-03  Jim Meyering  <[email protected]>
+...
+        tests: avoid spurious misc/expr failure on AIX 6.1
+        * tests/misc/expr: Avoid spurious failure on AIX 6.1 due to
+        differing regexp diagnostic.  Reported by Michael Felt.
+
+If I use the .../tests/misc/expr test script from 8.19, it works fine.
+So I've added the 'tests-misc-expr.patch' file to do just that.
+
+---  coreutils-8.16/tests/misc/expr.orig	2012-09-03 07:18:28.214998564 -0700
++++  coreutils-8.16/tests/misc/expr	2012-09-03 07:22:12.547808280 -0700
+@@ -140,7 +140,11 @@
+      ['bre48', '_ : "a\\{1,x"',
+       {ERR => "$prog: Unmatched \\{\n"}, {EXIT => 2}],
+      ['bre49', '_ : "a\\{32768\\}"',
+-      {ERR => "$prog: Invalid content of \\{\\}\n"}, {EXIT => 2}],
++      {ERR => "$prog: Invalid content of \\{\\}\n"}, {EXIT => 2},
++      # Map AIX-6's different diagnostic to the one we expect:
++      {ERR_SUBST =>
++       's,Regular expression too big,Invalid content of \\\\{\\\\},'},
++      ],
+      ['bre50', '_ : "a\\{1,0\\}"',
+       {ERR => "$prog: Invalid content of \\{\\}\n"}, {EXIT => 2}],
+      ['bre51', '"acabc" : ".*ab\\{0,0\\}c"', {OUT => '2'}],
+@@ -171,7 +175,7 @@
+     );
+ 
+ # If using big numbers fails, remove all /^bignum-/ tests
+-`expr $big_prod '*' $big_prod '*' $big_prod`
++qx!expr $big_prod '*' $big_prod '*' $big_prod!
+   or @Tests = grep {$_->[0] !~ /^bignum-/} @Tests;
+ 
+ # Append a newline to end of each expected 'OUT' string.