--- a/components/bash/Makefile Tue Nov 22 10:16:59 2016 +0100
+++ b/components/bash/Makefile Fri Dec 02 08:08:33 2016 -0800
@@ -75,32 +75,6 @@
# -z redlocsym -- let's shrink the SHT_SYMTAB as much as we can
LDFLAGS = $(LD_Z_REDLOCSYM)
-# Results output is slightly different on Intel vs. SPARC.
-COMPONENT_TEST_MASTER = \
- $(COMPONENT_TEST_RESULTS_DIR)/results-$(MACH).master
-
-# Do not change the order of these regexp transforms.
-COMPONENT_TEST_TRANSFORMS += \
- '-e "/^</d"' \
- '-e "/^>/d"' \
- '-e "/^---/d"' \
- '-e "/^Testing/d"' \
- '-e "/m64/d"' \
- '-e "/DPROGRAM/d"' \
- '-e "/^rm -f/d"' \
- '-e "/^ls -l/d"' \
- '-e "/text/d"' \
- '-e "/size/d"' \
- '-e "/bash$$/d"' \
- '-e "/warning/d"' \
- '-e "s/^[0-9]\{1,\}[a-z]\{1,\}[0-9]\{1,\}//g"' \
- '-e "s/^[0-9]\{1,\},[0-9]\{1,\}[a-z]\{1,\}[0-9]\{1,\},[0-9]\{1,\}//g"' \
- '-e "s/^[0-9]\{1,\},[0-9]\{1,\}[a-z]\{1,\}[0-9]\{1,\}//g"' \
- '-e "/^$$/d"'
-
-# The bash test harness needs the GNU userland utilities
-TEST_PATH = "PATH=$(BUILD_DIR_64):$(GNUBIN):$(USRBINDIR)"
-
# This avoids the need to patch configure or other files for these dependencies.
ifeq ($(OS_VERSION), 5.11)
CONFIGURE_ENV += LD_OPTIONS="-lc -lm -lgen -lsocket -lnsl -lresolv $(LD_Z_IGNORE)"
@@ -117,10 +91,6 @@
CONFIGURE_ENV += ac_cv_lib_ncurses_tgetent=yes
CONFIGURE_ENV += bash_cv_termcap_lib=libncurses
-# bash will trigger an autoconf during the build; so apply above again
-# XXX just apply configure_env?
-# COMPONENT_BUILD_ENV += $(CONFIGURE_ENV)
-
CONFIGURE_OPTIONS += --disable-profiling
CONFIGURE_OPTIONS += --disable-strict-posix-default
CONFIGURE_OPTIONS += --enable-alias
@@ -163,14 +133,36 @@
CONFIGURE_OPTIONS += --with-bash-malloc=yes
CONFIGURE_OPTIONS += --with-curses
CONFIGURE_OPTIONS += --with-installed-readline=no
-COMPONENT_TEST_DIR = $(BUILD_DIR_64)
-COMPONENT_TEST_ENV = - $(TEST_PATH)
+
+COMPONENT_TEST_DIR = $(BUILD_DIR_64)
+COMPONENT_TEST_ENV = - $(TEST_PATH)
+# The bash test harness needs the GNU userland utilities
+TEST_PATH = "PATH=$(GNUBIN):$(USRBINDIR)"
+# Results output is slightly different on Intel vs. SPARC.
+COMPONENT_TEST_MASTER = \
+ $(COMPONENT_TEST_RESULTS_DIR)/results-$(MACH).master
+
-# The tests use /tmp/xx, and there can only be one user running
-# the them at a time. Need to remove /tmp/xx after testing to
-# avoid permission issues for other users running these tests
-COMPONENT_PRE_TEST_ACTION = rm -f /tmp/xx
-COMPONENT_POST_TEST_ACTION = rm -f /tmp/xx
+# The goal is to remove lines like
+# 71d70
+# < +[8] cat
+# from the test-trap output. To have full controll over the output I use -n
+# gsed parameter (don't print the output automatically)
+COMPONENT_TEST_TRANSFORMS += \
+ -n \
+ '-e " \n\
+ /^run-trap$$/,/^run-/ { \n\
+ \# For text region from ^run-trap$$ till any line beginning with ^run- \n\
+ /^[^0-9<>]/ { \n\
+ \# If the line does _NOT_ start with number or < or >, print it \n\
+ p \n\
+ } \n\
+ \# and delete the line so that it does not get printed by the last p command \n\
+ d \n\
+ } \n\
+ \# Everything else gets printed \n\
+ p \n\
+ "'
COMPONENT_POST_INSTALL_ACTION += \
( cd $(PROTOUSRSHAREDIR)/locale ; \
--- a/components/bash/TESTING Tue Nov 22 10:16:59 2016 +0100
+++ b/components/bash/TESTING Fri Dec 02 08:08:33 2016 -0800
@@ -1,10 +1,26 @@
Bash test results are stored in test/*/test-64-results. They are then filtered
by COMPONENT_TEST_TRANSFORMS to make the test produce stable/reproducible
-results. Unfortunatelly COMPONENT_TEST_TRANSFORMS remove any problems
-encountered too. This is not ideal and should be fixed. The problem is that
-bash tests are sensitive to environment they are executed in (your ~/.bash*
-files for example). It's not easy to tell that bash tests finished
-successfully, you have to read it through.
+results. Currently the only test which is not sometimes passing is 'run-trap'.
+Explanation is in the test output itself, and this is what the output looks like:
+
+ warning: UNIX versions number signals and schedule processes differently.
+ warning: If output differing only in line numbers is produced, please
+ warning: do not consider this a test failure.
+ 71d70
+ < +[8] cat
+ 72a72
+ > +[8] cat
+
-To compare the results before and after a fix one has to store test-64-results
-file and compare it to the one generated after your change.
+COMPONENT_TEST_TRANSFORMS thus remove this test output. When testing bash it is
+necessary to observe full test-64-results.
+
+
+To test new version of bash installed on new machine I did:
+
+- install new bash
+- reboot
+- svcs -x # to see if it caused any issue
+- bash --version
+ - to see if we are testing right bash version
+
--- a/components/bash/bash.p5m Tue Nov 22 10:16:59 2016 +0100
+++ b/components/bash/bash.p5m Fri Dec 02 08:08:33 2016 -0800
@@ -147,6 +147,7 @@
file path=usr/share/locale/it/LC_MESSAGES/bash.mo
file path=usr/share/locale/ja/LC_MESSAGES/bash.mo
file path=usr/share/locale/lt/LC_MESSAGES/bash.mo
+file path=usr/share/locale/nb/LC_MESSAGES/bash.mo
file path=usr/share/locale/nl/LC_MESSAGES/bash.mo
file path=usr/share/locale/pl/LC_MESSAGES/bash.mo
file path=usr/share/locale/pt_BR/LC_MESSAGES/bash.mo
--- a/components/bash/patches/solaris-000.config.h.in.patch Tue Nov 22 10:16:59 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# config-top.h should be included by default in config.h
-# otherwise some of the macros aren't visible.
-# Solaris-specific patch. Not for upstream.
---- config.h.in 2009-08-18 20:34:36.000000000 -0700
-+++ config.h.in 2010-09-01 10:21:00.756734104 -0700
-@@ -32,6 +32,8 @@
- #undef _TANDEM_SOURCE
- #undef _MINIX
-
-+#include "config-top.h"
-+
- /* Configuration feature settings controllable by autoconf. */
-
- /* Define JOB_CONTROL if your operating system supports
--- a/components/bash/patches/solaris-001.config-top.h.patch Tue Nov 22 10:16:59 2016 +0100
+++ b/components/bash/patches/solaris-001.config-top.h.patch Fri Dec 02 08:08:33 2016 -0800
@@ -1,6 +1,8 @@
# Define defaults for Solaris.
# Solaris-specific patch.
+#
# Not for upstream.
+
--- config-top.h 2012-08-18 17:51:30.000000000 -0700
+++ config-top.h 2015-04-02 10:08:29.143843829 -0700
@@ -63,14 +63,14 @@
--- a/components/bash/patches/solaris-002.Makefile.in.3.patch Tue Nov 22 10:16:59 2016 +0100
+++ b/components/bash/patches/solaris-002.Makefile.in.3.patch Fri Dec 02 08:08:33 2016 -0800
@@ -1,35 +1,11 @@
-# We need $(CFLAGS) appended to SYSTEM_FLAGS. Otherwise things
-# end up being built with different CFLAGS.
-# Solaris-specific patch. Not for upstream.
---- Makefile.in 2014-01-25 13:27:30.000000000 -0800
-+++ Makefile.in 2015-04-02 11:18:58.143893640 -0700
-@@ -136,13 +136,14 @@
- LOCALE_DEFS = -DLOCALEDIR='"$(localedir)"' -DPACKAGE='"$(PACKAGE)"'
-
- LOCAL_LIBS = @LOCAL_LIBS@
--LIBS = $(BUILTINS_LIB) $(LIBRARIES) @LIBS@
-+LOCAL_LIBS += -lncurses
-+LIBS = $(BUILTINS_LIB) $(LIBRARIES) @LIBS@ @LOCAL_LIBS@
- LIBS_FOR_BUILD =
-
- STATIC_LD = @STATIC_LD@
- LOCAL_LDFLAGS = @LOCAL_LDFLAGS@
-
--SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DCONF_HOSTTYPE='"$(Machine)"' -DCONF_OSTYPE='"$(OS)"' -DCONF_MACHTYPE='"$(MACHTYPE)"' -DCONF_VENDOR='"$(VENDOR)"' $(LOCALE_DEFS)
-+SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DCONF_HOSTTYPE='"$(Machine)"' -DCONF_OSTYPE='"$(OS)"' -DCONF_MACHTYPE='"$(MACHTYPE)"' -DCONF_VENDOR='"$(VENDOR)"' $(LOCALE_DEFS) $(CFLAGS)
-
- BASE_CCFLAGS = $(PROFILE_FLAGS) $(SYSTEM_FLAGS) $(LOCAL_DEFS) \
- $(DEFS) $(LOCAL_CFLAGS) $(INCLUDES)
-@@ -570,7 +571,7 @@
-
- $(Program): .build $(OBJECTS) $(BUILTINS_DEP) $(LIBDEP)
- $(RM) $@
-- $(PURIFY) $(CC) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS)
-+ $(PURIFY) $(CC) $(CFLAGS) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS) $(LD_OPTIONS) -s
- ls -l $(Program)
- -$(SIZE) $(Program)
-
-@@ -584,10 +585,10 @@
+# Our compiler flags contain percent sign which get mixed up with percent sign
+# seprators used by sed.
+#
+# Submitted to [email protected]
+
+--- Makefile.in 2016-12-06 14:52:25.890038489 +0100
++++ Makefile.in 2016-12-06 14:52:15.493002959 +0100
+@@ -584,10 +584,11 @@ $(Program): .build $(OBJECTS) $(BUILTIN
@echo
bashbug: $(SUPPORT_SRC)bashbug.sh config.h Makefile $(VERSPROG)
@@ -37,19 +13,11 @@
- -e "s%!CFLAGS!%$(CCFLAGS)%" -e "s%!CC!%$(CC)%" \
- -e "s%!RELEASE!%$(Version)%" -e "s%!PATCHLEVEL!%$(PatchLevel)%" \
- -e "s%!MACHTYPE!%$(MACHTYPE)%" -e "s%!RELSTATUS!%$(RELSTATUS)%" \
-+ @sed -e "s^!MACHINE!^$(Machine)^" -e "s^!OS!^$(OS)^" \
-+ -e "s^!CFLAGS!^$(CCFLAGS)^" -e "s^!CC!^$(CC)^" \
-+ -e "s^!RELEASE!^$(Version)^" -e "s^!PATCHLEVEL!^$(PatchLevel)^" \
-+ -e "s^!MACHTYPE!^$(MACHTYPE)^" -e "s^!RELSTATUS!^$(RELSTATUS)^" \
++ @s=$$(printf '\001'); \
++ sed -e "s$${s}!MACHINE!$${s}$(Machine)$${s}" -e "s$${s}!OS!$${s}$(OS)$${s}" \
++ -e "s$${s}!CFLAGS!$${s}$(CCFLAGS)$${s}" -e "s$${s}!CC!$${s}$(CC)$${s}" \
++ -e "s$${s}!RELEASE!$${s}$(Version)$${s}" -e "s$${s}!PATCHLEVEL!$${s}$(PatchLevel)$${s}" \
++ -e "s$${s}!MACHTYPE!$${s}$(MACHTYPE)$${s}" -e "s$${s}!RELSTATUS!$${s}$(RELSTATUS)$${s}" \
$(SUPPORT_SRC)bashbug.sh > $@
@chmod a+rx bashbug
-@@ -922,7 +923,7 @@
- @-test -d tests || mkdir tests
- @cp $(TESTS_SUPPORT) tests
- @( cd $(srcdir)/tests && \
-- PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} )
-+ PATH=/usr/gnu/bin:$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} )
-
- symlinks:
- $(SHELL) $(SUPPORT_SRC)fixlinks -s $(srcdir)
--- a/components/bash/patches/solaris-003.glob.c.patch Tue Nov 22 10:16:59 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# Solaris-specific patch. alloca(3c) is not visible without
-# including <alloca.h>.
-# Not for upstream.
---- lib/glob/glob.c 2009-11-14 15:39:30.000000000 -0800
-+++ lib/glob/glob.c 2010-09-01 10:28:10.161379481 -0700
-@@ -34,6 +34,10 @@
- # include <unistd.h>
- #endif
-
-+#if defined (HAVE_ALLOCA) && defined (HAVE_ALLOCA_H)
-+# include <alloca.h>
-+#endif
-+
- #include "bashansi.h"
- #include "posixdir.h"
- #include "posixstat.h"
--- a/components/bash/patches/solaris-004.snprintf.c.patch Tue Nov 22 10:16:59 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# We need to include <math.h> for bash's own implementation
-# of snprintf.
-# Solaris-specific patch. Not for upstream.
---- lib/sh/snprintf.c 2010-05-30 15:34:52.000000000 -0700
-+++ lib/sh/snprintf.c 2011-11-29 09:31:46.751983149 -0800
-@@ -119,6 +119,8 @@
- # include <locale.h>
- #endif
-
-+#include <math.h>
-+
- #include "stdc.h"
- #include <shmbutil.h>
-
--- a/components/bash/patches/solaris-005.variables.c.patch Tue Nov 22 10:16:59 2016 +0100
+++ b/components/bash/patches/solaris-005.variables.c.patch Fri Dec 02 08:08:33 2016 -0800
@@ -2,6 +2,10 @@
# Otherwise we end up with inconsistently defined/exported
# defaults.
# Solaris-specific patch.
+#
+# I don't fully understand what this does. It would be worth discussing with
+# upstream. They clerly were using the commands at some point in time.
+
--- variables.c 2011-01-24 17:07:48.000000000 -0800
+++ variables.c 2011-11-29 09:29:51.902791524 -0800
@@ -471,14 +471,12 @@
--- a/components/bash/patches/solaris-007.rlprivate.h.patch Tue Nov 22 10:16:59 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# bash's own private copy of libreadline.
-# It needs some header file help for handling Unicode and/or
-# multi-byte encodings.
-# This is Solaris-specific.
---- lib/readline/rlprivate.h 2009-01-22 21:56:49.000000000 -0500
-+++ lib/readline/rlprivate.h 2009-08-16 10:55:56.178609000 -0400
-@@ -23,6 +23,18 @@
- #if !defined (_RL_PRIVATE_H_)
- #define _RL_PRIVATE_H_
-
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#if defined(HANDLE_MULTIBYTE)
-+
-+#include <limits.h>
-+#include <wchar.h>
-+#include <wctype.h>
-+
-+#endif /* HANDLE_MULTIBYTE */
-+
- #include "rlconf.h" /* for VISIBLE_STATS */
- #include "rlstdc.h"
- #include "posixjmp.h" /* defines procenv_t */
--- a/components/bash/patches/solaris-008.xmbsrtowcs.c.patch Tue Nov 22 10:16:59 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# Setting the freed pointer to NULL after free'ing
-# prevents it from being double-free'd.
-# Solaris-specific patch.
---- lib/glob/xmbsrtowcs.c 2010-05-30 15:36:27.000000000 -0700
-+++ lib/glob/xmbsrtowcs.c 2011-11-29 09:34:23.471481937 -0800
-@@ -38,7 +38,7 @@
- #define WSBUF_INC 32
-
- #ifndef FREE
--# define FREE(x) do { if (x) free (x); } while (0)
-+# define FREE(x) do { if (x) free (x); x = 0; } while (0)
- #endif
-
- #if ! HAVE_STRCHRNUL
--- a/components/bash/patches/solaris-010.input.c.patch Tue Nov 22 10:16:59 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# libreadline needs to include <sys/filio.h> (FIONREAD) on Solaris.
-# Solaris-specific patch.
-# Not for upstream.
---- lib/readline/input.c 2009-04-19 10:12:03.000000000 -0700
-+++ lib/readline/input.c 2010-09-01 10:46:23.386144948 -0700
-@@ -53,6 +53,10 @@
- # include <sys/ioctl.h>
- #endif
-
-+#if defined(SOLARIS)
-+# include <sys/filio.h>
-+#endif
-+
- #include <stdio.h>
- #include <errno.h>
-
--- a/components/bash/patches/solaris-011.input_avail.c.patch Tue Nov 22 10:16:59 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# bash itself needs to include <sys/filio.h> (FIONREAD) on Solaris.
-# Solaris-specific patch.
-# Not for upstream.
---- lib/sh/input_avail.c 2009-04-19 10:01:14.000000000 -0700
-+++ lib/sh/input_avail.c 2010-09-01 10:47:30.418016819 -0700
-@@ -45,6 +45,10 @@
- # include <sys/ioctl.h>
- #endif
-
-+#if defined(SOLARIS)
-+# include <sys/filio.h> /* Solaris FIONREAD */
-+#endif
-+
- #include <stdio.h>
- #include <errno.h>
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-012.inputrc.location.patch Fri Dec 02 08:08:33 2016 -0800
@@ -0,0 +1,87 @@
+# Solaris-specific system paths.
+# Our bash configuration lives in /etc/bash/inputrc.
+# Not for upstream.
+
+--- lib/readline/rlconf.h 2009-01-04 11:32:33.000000000 -0800
++++ lib/readline/rlconf.h 2010-09-01 10:48:13.018894232 -0700
+@@ -43,7 +43,7 @@
+ #define DEFAULT_INPUTRC "~/.inputrc"
+
+ /* The ultimate last-ditch filenname for an init file -- system-wide. */
+-#define SYS_INPUTRC "/etc/inputrc"
++#define SYS_INPUTRC "/etc/bash/inputrc"
+
+ /* If defined, expand tabs to spaces. */
+ #define DISPLAY_TABS
+--- doc/bashref.info 2016-11-20 11:39:05.161711301 +0100
++++ doc/bashref.info 2016-11-20 11:38:49.065536928 +0100
+@@ -7124,7 +7124,7 @@ putting commands in an "inputrc" file, c
+ directory. The name of this file is taken from the value of the shell
+ variable 'INPUTRC'. If that variable is unset, the default is
+ '~/.inputrc'. If that file does not exist or cannot be read, the
+-ultimate default is '/etc/inputrc'.
++ultimate default is '/etc/bash/inputrc'.
+
+ When a program which uses the Readline library starts up, the init
+ file is read, and the key bindings are set.
+@@ -7636,8 +7636,8 @@ four parser directives used.
+ '$include'
+ This directive takes a single filename as an argument and reads
+ commands and bindings from that file. For example, the following
+- directive reads from '/etc/inputrc':
+- $include /etc/inputrc
++ directive reads from '/etc/bash/inputrc':
++ $include /etc/bash/inputrc
+
+
+ File: bashref.info, Node: Sample Init File, Prev: Conditional Init Constructs, Up: Readline Init File
+@@ -7656,8 +7656,8 @@ variable assignment, and conditional syn
+ # Lines beginning with '#' are comments.
+ #
+ # First, include any system-wide bindings and variable
+- # assignments from /etc/Inputrc
+- $include /etc/Inputrc
++ # assignments from /etc/bash/inputrc
++ $include /etc/bash/inputrc
+
+ #
+ # Set various bindings for emacs mode.
+# Solaris-specific configuration defaults.
+# Our bash system configuration files are in /etc/bash.
+# Not for upstream.
+--- doc/bash.1 2011-01-16 12:31:39.000000000 -0800
++++ doc/bash.1 2011-11-29 09:57:25.406978670 -0800
+@@ -5810,11 +5810,11 @@
+ .IP \fB$include\fP
+ This directive takes a single filename as an argument and reads commands
+ and bindings from that file. For example, the following directive
+-would read \fI/etc/inputrc\fP:
++would read \fI/etc/bash/inputrc\fP:
+ .sp 1
+ .RS
+ .nf
+-\fB$include\fP \^ \fI/etc/inputrc\fP
++\fB$include\fP \^ \fI/etc/bash/inputrc\fP
+ .fi
+ .RE
+ .SS Searching
+--- doc/bash.info 2016-12-02 09:24:09.777589027 +0000
++++ doc/bash.info 2016-12-02 09:23:42.588282332 +0000
+@@ -7124,7 +7124,7 @@ putting commands in an "inputrc" file, c
+ directory. The name of this file is taken from the value of the shell
+ variable 'INPUTRC'. If that variable is unset, the default is
+ '~/.inputrc'. If that file does not exist or cannot be read, the
+-ultimate default is '/etc/inputrc'.
++ultimate default is '/etc/bash/inputrc'.
+
+ When a program which uses the Readline library starts up, the init
+ file is read, and the key bindings are set.
+@@ -7636,7 +7636,7 @@ four parser directives used.
+ '$include'
+ This directive takes a single filename as an argument and reads
+ commands and bindings from that file. For example, the following
+- directive reads from '/etc/inputrc':
++ directive reads from '/etc/bash/inputrc':
+ $include /etc/inputrc
+
+
--- a/components/bash/patches/solaris-012.rlconf.h.patch Tue Nov 22 10:16:59 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# Solaris-specific system paths.
-# Our bash configuration lives in /etc/bash.
-# Not for upstream.
---- lib/readline/rlconf.h 2009-01-04 11:32:33.000000000 -0800
-+++ lib/readline/rlconf.h 2010-09-01 10:48:13.018894232 -0700
-@@ -43,7 +43,7 @@
- #define DEFAULT_INPUTRC "~/.inputrc"
-
- /* The ultimate last-ditch filenname for an init file -- system-wide. */
--#define SYS_INPUTRC "/etc/inputrc"
-+#define SYS_INPUTRC "/etc/bash/inputrc"
-
- /* If defined, expand tabs to spaces. */
- #define DISPLAY_TABS
--- a/components/bash/patches/solaris-013.bashref.info.patch Tue Nov 22 10:16:59 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-# Solaris-specific configuration defaults.
-# Our bash system configuration files are in /etc/bash.
-# Not for upstream.
---- doc/bashref.info 2016-11-20 11:39:05.161711301 +0100
-+++ doc/bashref.info 2016-11-20 11:38:49.065536928 +0100
-@@ -7124,7 +7124,7 @@ putting commands in an "inputrc" file, c
- directory. The name of this file is taken from the value of the shell
- variable 'INPUTRC'. If that variable is unset, the default is
- '~/.inputrc'. If that file does not exist or cannot be read, the
--ultimate default is '/etc/inputrc'.
-+ultimate default is '/etc/bash/inputrc'.
-
- When a program which uses the Readline library starts up, the init
- file is read, and the key bindings are set.
-@@ -7636,8 +7636,8 @@ four parser directives used.
- '$include'
- This directive takes a single filename as an argument and reads
- commands and bindings from that file. For example, the following
-- directive reads from '/etc/inputrc':
-- $include /etc/inputrc
-+ directive reads from '/etc/bash/inputrc':
-+ $include /etc/bash/inputrc
-
-
- File: bashref.info, Node: Sample Init File, Prev: Conditional Init Constructs, Up: Readline Init File
-@@ -7656,8 +7656,8 @@ variable assignment, and conditional syn
- # Lines beginning with '#' are comments.
- #
- # First, include any system-wide bindings and variable
-- # assignments from /etc/Inputrc
-- $include /etc/Inputrc
-+ # assignments from /etc/bash/inputrc
-+ $include /etc/bash/inputrc
-
- #
- # Set various bindings for emacs mode.
--- a/components/bash/patches/solaris-014.bash.man.patch Tue Nov 22 10:16:59 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-# Solaris-specific configuration defaults.
-# Our bash system configuration files are in /etc/bash.
-# Not for upstream.
---- doc/bash.1 2011-01-16 12:31:39.000000000 -0800
-+++ doc/bash.1 2011-11-29 09:57:25.406978670 -0800
-@@ -4293,7 +4293,7 @@
- .B \fIexpr\fP?\fIexpr\fP:\fIexpr\fP
- conditional operator
- .TP
--.B = *= /= %= += \-= <<= >>= &= ^= |=
-+.B "= *= /= %= += \-= <<= >>= &= ^= |="
- assignment
- .TP
- .B \fIexpr1\fP , \fIexpr2\fP
-@@ -5810,11 +5810,11 @@
- .IP \fB$include\fP
- This directive takes a single filename as an argument and reads commands
- and bindings from that file. For example, the following directive
--would read \fI/etc/inputrc\fP:
-+would read \fI/etc/bash/inputrc\fP:
- .sp 1
- .RS
- .nf
--\fB$include\fP \^ \fI/etc/inputrc\fP
-+\fB$include\fP \^ \fI/etc/bash/inputrc\fP
- .fi
- .RE
- .SS Searching
--- a/components/bash/patches/solaris-015.rbash.man.patch Tue Nov 22 10:16:59 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# Solaris-specific tweaks to the rbash(1) man page.
-# Also, say the correct bash version and release date.
-# Not for upstream.
---- doc/rbash.1 2008-08-12 06:24:51.000000000 -0700
-+++ doc/rbash.1 2010-09-01 10:52:04.397206373 -0700
-@@ -1,8 +1,8 @@
--.TH RBASH 1 "2004 Apr 20" "GNU Bash-4.0"
-+.TH RBASH 1 "2014 Feb 26" "GNU Bash-4.3"
- .SH NAME
- rbash \- restricted bash, see \fBbash\fR(1)
- .SH RESTRICTED SHELL
- .nr zY 1
--.so bash.1
-+.so /usr/share/man/man1/bash.1
- .SH SEE ALSO
- bash(1)
--- a/components/bash/patches/solaris-016.run-all.patch Tue Nov 22 10:16:59 2016 +0100
+++ b/components/bash/patches/solaris-016.run-all.patch Fri Dec 02 08:08:33 2016 -0800
@@ -1,35 +1,17 @@
-# Test for a /tmp/xx leftover from running the giant bash
-# test harness. This can happen in the test harness run is
-# interrupted with ^C.
-# Without this test, the test harness will start failing
-# for no real reason.
-# Solaris-specific. Not for upstream.
---- tests/run-all 2016-11-20 11:42:26.312258214 +0100
-+++ tests/run-all 2016-11-20 11:41:12.703622687 +0100
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#!/bin/bash
-
- : ${TMPDIR:=/tmp}
- export TMPDIR
-@@ -26,6 +26,11 @@ ${THIS_SH} ./version
-
- rm -f ${BASH_TSTOUT}
+# Our build system exports SHELLOPTS which makes testing fail We could have set
+# "unexport SHELLOPTS" in our Makefile, but maybe this will be accepted by
+# community?
+#
+# Reported to [email protected]
+
+--- tests/run-all 2016-11-28 00:46:51.812583704 -0800
++++ tests/run-all 2016-11-28 00:45:20.302845042 -0800
+@@ -17,7 +17,7 @@ export PATH
+ # unset BASH_ENV only if it is set
+ [ "${BASH_ENV+set}" = "set" ] && unset BASH_ENV
+ # ditto for SHELLOPTS
+-#[ "${SHELLOPTS+set}" = "set" ] && unset SHELLOPTS
++[ "${SHELLOPTS+set}" = "set" ] && unset SHELLOPTS
-+if [ -f /tmp/xx ] ; then
-+ echo "someone left a /tmp/xx around. I can't test."
-+ exit 1
-+fi
-+
- echo Any output from any test, unless otherwise noted, indicates a possible anomaly
-
- for x in run-*
-@@ -33,7 +38,7 @@ do
- case $x in
- $0|run-minimal|run-gprof) ;;
- *.orig|*~) ;;
-- *) echo $x ; sh $x ; rm -f ${BASH_TSTOUT} ;;
-+ *) echo $x ; ${THIS_SH} $x ; rm -f ${BASH_TSTOUT} ;;
- esac
- done
-
+ : ${THIS_SH:=../bash}
+ export THIS_SH
--- a/components/bash/patches/solaris-018.posixexp2.tests.patch Tue Nov 22 10:16:59 2016 +0100
+++ b/components/bash/patches/solaris-018.posixexp2.tests.patch Fri Dec 02 08:08:33 2016 -0800
@@ -1,5 +1,8 @@
-# Unset xpg_echo when running the posix2 regexp tests.
-# Solaris-specific. Not for upstream.
+# solaris is compiled with --enable-xpg-echo-default=yes which makes some
+# tests fail. Should we use printf '%s\n' "..." instead?
+#
+# Reported on [email protected]
+
--- tests/posixexp2.tests 2010-11-11 17:50:47.000000000 -0800
+++ tests/posixexp2.tests 2012-07-12 13:15:14.818468328 -0700
@@ -2,6 +2,11 @@
@@ -14,3 +17,89 @@
(echo 1 ${IFS+'}'z}) 2>&- || echo failed in 1
(echo 2 "${IFS+'}'z}") 2>&- || echo failed in 2
(echo 3 "foo ${IFS+'bar} baz") 2>&- || echo failed in 3
+--- tests/comsub2.sub 2016-11-28 01:04:23.177652643 -0800
++++ tests/comsub2.sub 2016-11-28 01:01:49.330747645 -0800
+@@ -4,5 +4,5 @@ echo "$qpath"
+
+ # it's crazy that all three of these produce the same result
+ echo ${qpath//\\/}
+-echo ${qpath//"`echo \\`"/}
+-echo ${qpath//`echo "\\\\\\\\"`/}
++echo ${qpath//"`echo -E \\`"/}
++echo ${qpath//`echo -E "\\\\\\\\"`/}
+--- tests/exp5.sub 2016-11-28 02:38:32.148794257 -0800
++++ tests/exp5.sub 2016-11-28 02:33:12.133199473 -0800
+@@ -1,18 +1,18 @@
+ # expansions involving patterns
+
+ var='[hello'
+-echo "${var//[/}"
++echo -E "${var//[/}"
+
+ red='\[\e[0;31m\]'
+-echo "${red//\\[\\e/}"
++echo -E "${red//\\[\\e/}"
+
+ foo="${red//\\[\\e/}"
+
+ # foo == [0;31m\]
+-echo "${foo//[0;31m\\/}"
++echo -E "${foo//[0;31m\\/}"
+
+-echo "${var//[]/}"
+-echo "${red//[]/}"
++echo -E "${var//[]/}"
++echo -E "${red//[]/}"
+
+ v=hello
+ foo='[:alpha:]'
+--- tests/exp8.sub 2016-11-28 03:44:56.875686938 -0800
++++ tests/exp8.sub 2016-11-28 03:39:21.761054928 -0800
+@@ -10,11 +10,11 @@ declare -p var | sed -n l
+
+ recho ${var@Q}
+ recho ${var@P}
+-echo ${var@A}
++echo -E ${var@A}
+
+ unset array
+ array=( [$'x\001y\177z']=foo ) # should be error
+-echo ${array[@]@A}
++echo -E ${array[@]@A}
+
+ unset array
+ declare -a array=([0]=$'x\001y\177z')
+@@ -23,9 +23,9 @@ declare -p array
+ unset array
+ array=( "$var" )
+ recho ${array[@]}
+-echo ${array[@]@A}
++echo -E ${array[@]@A}
+
+ unset array
+ declare -A array
+ array=( [$'x\001y\177z']=$'a\242b\002c' )
+-echo ${array[@]@A}
++echo -E ${array[@]@A}
+--- tests/heredoc3.sub 2016-11-28 03:58:47.587299575 -0800
++++ tests/heredoc3.sub 2016-11-28 03:55:11.935894965 -0800
+@@ -69,7 +69,7 @@ cat <<END
+ hello
+ \END
+ END
+-echo end 'hello<NL>\END'
++echo -E end 'hello<NL>\END'
+
+ # this has to be last -- results in a syntax error
+ # doesn't currently parse because EOF is not on a line by itself -- should it?
+--- tests/quote1.sub 2016-11-28 04:11:46.210688369 -0800
++++ tests/quote1.sub 2016-11-28 04:08:49.101872596 -0800
+@@ -14,7 +14,7 @@ echo "'${test//"'"/}'"
+
+ echo "'${test//"'"/"'\\''"}'"
+
+-echo "'${test//"'"/\'\\'\'}'"
++echo -E "'${test//"'"/\'\\'\'}'"
+
+ #echo "'${test//'/}'" # hangs waiting for '
+ #echo "'${test//"'"/'\\''}'" # hangs waiting for '
--- a/components/bash/patches/solaris-019.eaccess.c.patch Tue Nov 22 10:16:59 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-# Fix for CVE-2012-3410.
-# Solaris-specific. There are no threads in bash, therefore
-# no concurrency issues on accessing a static buffer.
-# Not for upstream, their fix is too Linux-specific
---- lib/sh/eaccess.c 2012-10-09 12:45:17.924274300 -0700
-+++ lib/sh/eaccess.c 2012-10-09 12:44:21.930979200 -0700
-@@ -40,6 +40,10 @@
- #if !defined (_POSIX_VERSION) && defined (HAVE_SYS_FILE_H)
- # include <sys/file.h>
- #endif /* !_POSIX_VERSION */
-+
-+#include <string.h> /* memset(3C) */
-+#include <limits.h> /* _XOPEN_PATH_MAX */
-+
- #include "posixstat.h"
- #include "filecntl.h"
-
-@@ -82,7 +86,7 @@
- const char *path;
- struct stat *finfo;
- {
-- static char *pbuf = 0;
-+ static char pbuf[_XOPEN_PATH_MAX + 1];
-
- if (*path == '\0')
- {
-@@ -108,9 +112,11 @@
- trailing slash. Make sure /dev/fd/xx really uses DEV_FD_PREFIX/xx.
- On most systems, with the notable exception of linux, this is
- effectively a no-op. */
-- pbuf = xrealloc (pbuf, sizeof (DEV_FD_PREFIX) + strlen (path + 8));
-+ /* The way CVE-2012-3410 was fixed is wrong */
-+ (void) memset (pbuf, '\0', sizeof(pbuf));
- strcpy (pbuf, DEV_FD_PREFIX);
-- strcat (pbuf, path + 8);
-+ strncat (pbuf, path + 8,
-+ (size_t) (sizeof(pbuf) - sizeof(DEV_FD_PREFIX)));
- return (stat (pbuf, finfo));
- #endif /* !HAVE_DEV_FD */
- }
--- a/components/bash/patches/solaris-020.xcase.c.patch Tue Nov 22 10:16:59 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# Let's use ANSI C, perhaps?
-# Solaris-specific. Not for upstream.
---- support/xcase.c 2015-04-02 10:22:38.727863382 -0700
-+++ support/xcase.c 2015-04-02 10:23:44.651812788 -0700
-@@ -42,9 +42,7 @@
- #define UPPER 2
-
- int
--main(ac, av)
--int ac;
--char **av;
-+main(int ac, char **av)
- {
- int c, x;
- int op;
--- a/components/bash/patches/solaris-021.builtins.makefile.in.patch Tue Nov 22 10:16:59 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# Append $(CFLAGS_FOR_BUILD) to $(CCFLAGS_FOR_BUILD),
-# so that we get everything we want.
-# Solaris-specific. Not for upstream.
---- builtins/Makefile.in 2010-12-21 05:37:18.000000000 -0800
-+++ builtins/Makefile.in 2013-03-19 10:25:27.019593825 -0700
-@@ -96,7 +96,7 @@
-
- CCFLAGS = $(BASE_CCFLAGS) $(CPPFLAGS) $(CFLAGS)
-
--CCFLAGS_FOR_BUILD = $(BASE_CCFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
-+CCFLAGS_FOR_BUILD = $(CFLAGS) $(BASE_CCFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
-
- GCC_LINT_FLAGS = -Wall -Wshadow -Wpointer-arith -Wcast-qual \
- -Wcast-align -Wstrict-prototypes -Wconversion \
--- a/components/bash/patches/solaris-023.eaccess.c.patch Tue Nov 22 10:16:59 2016 +0100
+++ b/components/bash/patches/solaris-023.eaccess.c.patch Fri Dec 02 08:08:33 2016 -0800
@@ -2,6 +2,11 @@
# X_OK even if the execute bit isn't set.
# So, we want to use stat(2) instead, which returns the actual
# permission bits.
+#
+# I do know nothing about the mentioned bug, keeping the patch just to be sure.
+#
+# Not suitable for upstream
+
--- lib/sh/eaccess.c 2015-04-02 10:24:43.401129429 -0700
+++ lib/sh/eaccess.c 2015-04-02 10:28:57.704781076 -0700
@@ -211,7 +211,8 @@
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-025.false_exit_code.patch Fri Dec 02 08:08:33 2016 -0800
@@ -0,0 +1,16 @@
+# This test prints return value of various commands. In this particular case
+# it's the return value of /bin/false which on Solaris returns 255.
+#
+# Not suitable for upstream.
+
+--- tests/exec.right 2016-11-28 01:58:36.053039919 -0800
++++ tests/exec.right 2016-11-28 01:58:07.419101147 -0800
+@@ -83,7 +83,7 @@ foo 0
+ after
+ exit code: 1
+ exit code: 1
+-exit code: 1
++exit code: 255
+ exit code: 127
+ exit code: 127
+ exit code: 127
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-026.cd_in_rcfile.patch Fri Dec 02 08:08:33 2016 -0800
@@ -0,0 +1,26 @@
+# There seems to be problem with bash
+#
+# $ bash -c 'bash -i i; bash -i i'
+# bash -c 'bash -i i; bash -i i'
+# bash: i: No such file or directory
+#
+# [1]+ Stopped bash -c 'bash -i i; bash -i i'
+#
+# I found out because the tests were stopped in the middle. It was caused by
+# having 'cd /somewhere' in my ~/.bashrc. The tests were being stopped in
+# read-test, exactly in read2.sub when 'read -t 2 a < /dev/tty' was executed.
+# This workaround stops the tests to be stopped in the middle.
+#
+# reported to [email protected]
+
+--- tests/execscript 2016-11-28 03:07:12.420018055 -0800
++++ tests/execscript 2016-11-28 03:03:36.431541831 -0800
+@@ -108,7 +108,7 @@ ${THIS_SH} ./exec6.sub
+ # checks for properly deciding what constitutes an executable file
+ ${THIS_SH} ./exec7.sub
+
+-${THIS_SH} -i ./exec8.sub
++${THIS_SH} --rcfile /dev/null -i ./exec8.sub
+
+ ${THIS_SH} ./exec9.sub
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-027.bad_file_number_text.patch Fri Dec 02 08:08:33 2016 -0800
@@ -0,0 +1,64 @@
+# Solaris says 'Bad file number' instead of 'Bad file descriptor' on Linux.
+# Make sure the test finds what it expects
+#
+# Not suitable for upstream
+
+--- tests/redir.right 2016-11-28 04:38:00.494117081 -0800
++++ tests/redir.right 2016-11-28 04:36:49.995612525 -0800
+@@ -84,9 +84,9 @@ f ()
+ echo "$line";
+ done
+ }
+-./redir5.sub: line 20: read: 5: invalid file descriptor: Bad file descriptor
++./redir5.sub: line 20: read: 5: invalid file descriptor: Bad file number
+ after read
+-./redir5.sub: line 27: read: read error: 0: Bad file descriptor
++./redir5.sub: line 27: read: read error: 0: Bad file number
+ # tests of ksh93-like dup-and-close redirection operators
+ /
+ /
+@@ -141,20 +141,20 @@ bix ()
+ foo
+ ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+ 1
+-./redir11.sub: line 8: $a: Bad file descriptor
+-./redir11.sub: line 9: $(echo $a): Bad file descriptor
++./redir11.sub: line 8: $a: Bad file number
++./redir11.sub: line 9: $(echo $a): Bad file number
+ 7
+ after: 42
+-./redir11.sub: line 24: echo: write error: Bad file descriptor
+-./redir11.sub: line 25: echo: write error: Bad file descriptor
+-./redir11.sub: line 26: $(a=4 foo): Bad file descriptor
+-./redir11.sub: line 27: $(a=4 foo): Bad file descriptor
+-./redir11.sub: line 30: $a: Bad file descriptor
+-./redir11.sub: line 31: $(echo $a): Bad file descriptor
++./redir11.sub: line 24: echo: write error: Bad file number
++./redir11.sub: line 25: echo: write error: Bad file number
++./redir11.sub: line 26: $(a=4 foo): Bad file number
++./redir11.sub: line 27: $(a=4 foo): Bad file number
++./redir11.sub: line 30: $a: Bad file number
++./redir11.sub: line 31: $(echo $a): Bad file number
+ ./redir11.sub: line 39: $(ss= declare -i ss): ambiguous redirect
+ after: 42
+ a+=3
+ foo
+ foo
+-./redir11.sub: line 53: $(echo $a): Bad file descriptor
++./redir11.sub: line 53: $(echo $a): Bad file number
+ 123
+--- tests/vredir.right 2016-11-28 04:38:01.014664808 -0800
++++ tests/vredir.right 2016-11-28 04:36:47.695701154 -0800
+@@ -11,9 +11,9 @@ bar ()
+ ./vredir.tests: line 6: v: readonly variable
+ ./vredir.tests: line 6: v: cannot assign fd to variable
+ 42
+-./vredir.tests: line 25: $v: Bad file descriptor
+-./vredir.tests: line 26: $v: Bad file descriptor
+-./vredir.tests: line 27: $v: Bad file descriptor
++./vredir.tests: line 25: $v: Bad file number
++./vredir.tests: line 26: $v: Bad file number
++./vredir.tests: line 27: $v: Bad file number
+ bar is a function
+ bar ()
+ {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-028.missing_HOME.patch Fri Dec 02 08:08:33 2016 -0800
@@ -0,0 +1,17 @@
+# If $HOME is not set (running from cron perhaps), the tests will output:
+# 26d25
+# < ./comsub-posix.tests: line 103: cd: HOME not set
+# 28d26
+# < ./comsub-posix.tests: line 106: cd: HOME not set
+#
+# Reported to [email protected]
+
+--- tests/comsub-posix.tests 2016-11-29 03:41:57.414081235 +0000
++++ tests/comsub-posix.tests 2016-11-29 03:36:30.425718528 +0000
+@@ -1,4 +1,5 @@
+-
++HOME=${HOME:-/}
++export HOME
+ # works right
+ echo ab$(echo mnop)yz
+ # works right
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-029.undef_SHELL.patch Fri Dec 02 08:08:33 2016 -0800
@@ -0,0 +1,23 @@
+# When SHELL is unset the test fails with
+#
+# 150,151c150,151
+# < ./redir11.sub: line 26: echo: write error: Bad file number
+# < ./redir11.sub: line 27: echo: write error: Bad file number
+# ---
+# > ./redir11.sub: line 26: $(a=4 foo): Bad file number
+# > ./redir11.sub: line 27: $(a=4 foo): Bad file number
+#
+# Reported to [email protected], but they can't reproduce. Needs more work on
+# our side.
+
+--- tests/redir.tests 2016-12-01 11:20:04.910983199 +0000
++++ tests/redir.tests 2016-12-01 11:19:34.114069067 +0000
+@@ -1,7 +1,7 @@
+ : ${TMPDIR:=/tmp}
+
+ export LC_ALL=C
+-export LANG=C
++export LANG=C; export SHELL=
+
+ # catch-all for remaining untested redirection stuff
+ set +o posix
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-030.SHOBJ_STATUS_install.patch Fri Dec 02 08:08:33 2016 -0800
@@ -0,0 +1,18 @@
+# If $ac_cv_func_dlopen is not 'yes' a bit earlier, SHOBJ_LIBS remains
+# undefiled. Later during 'make install' stage, examples/loadables/Makefile
+# calls install-$(SHOBJ_STATUS), and since the target 'install-' is undefined,
+# make prints error.
+#
+# Reported to [email protected]
+
+--- configure.ac 2016-12-06 05:07:31.808614344 +0000
++++ configure.ac 2016-12-06 05:07:26.791244255 +0000
+@@ -1151,6 +1151,8 @@ then
+ AC_SUBST(SHOBJ_LIBS)
+ AC_SUBST(SHOBJ_STATUS)
+ AC_MSG_RESULT($SHOBJ_STATUS)
++else
++ SHOBJ_STATUS=unsupported
+ fi
+
+ # try to create a directory tree if the source is elsewhere
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bash/patches/solaris-031.use_dynamic_temp_file.patch Fri Dec 02 08:08:33 2016 -0800
@@ -0,0 +1,27 @@
+# The test new-exp1 used /tmp/x which is too common file to and might be
+# already present. The test then fails with:
+#
+# run-new-exp
+# ...
+# 171,172c171
+# < ./new-exp1.sub: line 8: /tmp/x: Permission denied
+# < rm: cannot remove '/tmp/x': Permission denied
+# ---
+# > this is test 2
+#
+# Reported to [email protected]
+
+--- tests/new-exp1.sub 2016-12-07 07:06:57.268664317 +0000
++++ tests/new-exp1.sub 2016-12-07 07:06:13.299361999 +0000
+@@ -5,7 +5,8 @@ expect()
+
+ expect this is a test of proc subst
+ cat <(echo this is a test of proc subst)
+-echo this is test 2 > /tmp/x
++OUTFILE=${BASH_TSTOUT}.new-exp1
++echo this is test 2 > "$OUTFILE"
+ expect this is test 2
+-cat <(cat /tmp/x)
+-rm -f /tmp/x
++cat <(cat "$OUTFILE")
++rm -f "$OUTFILE"
--- a/components/bash/test/results-i386.master Tue Nov 22 10:16:59 2016 +0100
+++ b/components/bash/test/results-i386.master Fri Dec 02 08:08:33 2016 -0800
@@ -1,8 +1,11 @@
+
***********************************************************
* *
* GNU bash, version 4.4.5(1)-release (x86_64-pc-solaris2.12)
* *
***********************************************************
+
+Testing $(@D)/bash
version: 4.4.5(1)-release
versinfo: 4 4 5 1 release x86_64-pc-solaris2.12
HOSTTYPE = x86_64
@@ -14,17 +17,32 @@
run-arith
run-arith-for
run-array
+warning: all of these tests will fail if arrays have not
+warning: been compiled into the shell
+warning: the BASH_ARGC and BASH_ARGV tests will fail if debugging support
+warning: has not been compiled into the shell
run-array2
+warning: all of these tests will fail if arrays have not
+warning: been compiled into the shell
run-assoc
+warning: all of these tests will fail if arrays have not
+warning: been compiled into the shell
run-attr
run-braces
run-builtins
+warning: some of these tests may fail if process substitution has not
+warning: been compiled into the shell or if the OS does not provide
+warning: /dev/fd.
run-case
run-casemod
run-comsub
run-comsub-eof
run-comsub-posix
run-cond
+warning: all of these tests will fail if the conditional command has not
+warning: been compiled into the shell
+warning: some of these tests will fail if extended pattern matching has not
+warning: been compiled into the shell
run-coproc
run-cprint
run-dbg-support
@@ -33,36 +51,76 @@
run-dollars
run-errors
run-execscript
+warning: the text of a system error message may vary between systems and
+warning: produce diff output.
+warning: if the text of the error messages concerning `notthere' or
+warning: `/tmp/bash-notthere' not being found or `/' being a directory
+warning: produce diff output, please do not consider this a test failure
+warning: if diff output differing only in the location of the bash
+warning: binary appears, please do not consider this a test failure
run-exp-tests
run-exportfunc
run-extglob
run-extglob2
run-extglob3
run-func
+warning: if you have exported functions defined in your environment,
+warning: they may show up as diff output.
+warning: if so, please do not consider this a test failure
run-getopts
run-glob-test
run-globstar
run-heredoc
+warning: UNIX versions number signals and schedule processes differently.
+warning: If output differing only in line numbers is produced, please
+warning: do not consider this a test failure.
run-herestr
run-histexpand
+warning: all of these tests will fail if history has not been compiled
+warning: into the shell
run-history
+warning: all of these tests will fail if history has not been compiled
+warning: into the shell
run-ifs
run-ifs-posix
run-input-test
run-intl
+warning: some of these tests will fail if you do not have UTF-8
+warning: locales installed on your system.
run-invert
run-iquote
run-jobs
+warning: some of these tests may fail if job control has not been compiled
+warning: into the shell
+warning: there may be a message regarding a cat process dying due to a
+warning: SIGHUP. Please disregard.
run-lastpipe
run-mapfile
run-more-exp
run-nameref
+warning: some of these tests will fail if arrays have not
+warning: been compiled into the shell
run-new-exp
+warning: two of these tests will fail if your OS does not support
+warning: named pipes or the /dev/fd filesystem. If the tests of the
+warning: process substitution mechanism fail, please do not consider
+warning: this a test failure
+warning: if you have exported variables beginning with the string _Q,
+warning: diff output may be generated. If so, please do not consider
+warning: this a test failure
run-nquote
run-nquote1
+warning: several of these tests will fail if arrays have not
+warning: been compiled into the shell.
run-nquote2
+warning: several of these tests will fail if arrays have not
+warning: been compiled into the shell.
run-nquote3
+warning: several of these tests will fail if arrays have not
+warning: been compiled into the shell.
run-nquote4
+warning: some of these tests will fail if you do not have UTF-8
+warning: locales installed on your system
run-nquote5
run-parser
run-posix2
@@ -74,7 +132,14 @@
run-printf
run-quote
run-read
+warning: please do not consider output differing only in the amount of
+warning: white space to be an error.
run-redir
+warning: the text of a system error message may vary between systems and
+warning: produce diff output.
+warning: if the text of an error message concerning `redir1.*' not being
+warning: found or messages concerning bad file descriptors produce diff
+warning: output, please do not consider it a test failure
run-rhs-exp
run-rsh
run-set-e
@@ -85,6 +150,9 @@
run-tilde
run-tilde2
run-trap
+warning: UNIX versions number signals and schedule processes differently.
+warning: If output differing only in line numbers is produced, please
+warning: do not consider this a test failure.
run-type
run-varenv
run-vredir
--- a/components/bash/test/results-sparc.master Tue Nov 22 10:16:59 2016 +0100
+++ b/components/bash/test/results-sparc.master Fri Dec 02 08:08:33 2016 -0800
@@ -1,8 +1,11 @@
+
***********************************************************
* *
* GNU bash, version 4.4.5(1)-release (sparc-sun-solaris2.12)
* *
***********************************************************
+
+Testing $(@D)/bash
version: 4.4.5(1)-release
versinfo: 4 4 5 1 release sparc-sun-solaris2.12
HOSTTYPE = sparc
@@ -14,17 +17,32 @@
run-arith
run-arith-for
run-array
+warning: all of these tests will fail if arrays have not
+warning: been compiled into the shell
+warning: the BASH_ARGC and BASH_ARGV tests will fail if debugging support
+warning: has not been compiled into the shell
run-array2
+warning: all of these tests will fail if arrays have not
+warning: been compiled into the shell
run-assoc
+warning: all of these tests will fail if arrays have not
+warning: been compiled into the shell
run-attr
run-braces
run-builtins
+warning: some of these tests may fail if process substitution has not
+warning: been compiled into the shell or if the OS does not provide
+warning: /dev/fd.
run-case
run-casemod
run-comsub
run-comsub-eof
run-comsub-posix
run-cond
+warning: all of these tests will fail if the conditional command has not
+warning: been compiled into the shell
+warning: some of these tests will fail if extended pattern matching has not
+warning: been compiled into the shell
run-coproc
run-cprint
run-dbg-support
@@ -33,36 +51,76 @@
run-dollars
run-errors
run-execscript
+warning: the text of a system error message may vary between systems and
+warning: produce diff output.
+warning: if the text of the error messages concerning `notthere' or
+warning: `/tmp/bash-notthere' not being found or `/' being a directory
+warning: produce diff output, please do not consider this a test failure
+warning: if diff output differing only in the location of the bash
+warning: binary appears, please do not consider this a test failure
run-exp-tests
run-exportfunc
run-extglob
run-extglob2
run-extglob3
run-func
+warning: if you have exported functions defined in your environment,
+warning: they may show up as diff output.
+warning: if so, please do not consider this a test failure
run-getopts
run-glob-test
run-globstar
run-heredoc
+warning: UNIX versions number signals and schedule processes differently.
+warning: If output differing only in line numbers is produced, please
+warning: do not consider this a test failure.
run-herestr
run-histexpand
+warning: all of these tests will fail if history has not been compiled
+warning: into the shell
run-history
+warning: all of these tests will fail if history has not been compiled
+warning: into the shell
run-ifs
run-ifs-posix
run-input-test
run-intl
+warning: some of these tests will fail if you do not have UTF-8
+warning: locales installed on your system.
run-invert
run-iquote
run-jobs
+warning: some of these tests may fail if job control has not been compiled
+warning: into the shell
+warning: there may be a message regarding a cat process dying due to a
+warning: SIGHUP. Please disregard.
run-lastpipe
run-mapfile
run-more-exp
run-nameref
+warning: some of these tests will fail if arrays have not
+warning: been compiled into the shell
run-new-exp
+warning: two of these tests will fail if your OS does not support
+warning: named pipes or the /dev/fd filesystem. If the tests of the
+warning: process substitution mechanism fail, please do not consider
+warning: this a test failure
+warning: if you have exported variables beginning with the string _Q,
+warning: diff output may be generated. If so, please do not consider
+warning: this a test failure
run-nquote
run-nquote1
+warning: several of these tests will fail if arrays have not
+warning: been compiled into the shell.
run-nquote2
+warning: several of these tests will fail if arrays have not
+warning: been compiled into the shell.
run-nquote3
+warning: several of these tests will fail if arrays have not
+warning: been compiled into the shell.
run-nquote4
+warning: some of these tests will fail if you do not have UTF-8
+warning: locales installed on your system
run-nquote5
run-parser
run-posix2
@@ -74,7 +132,14 @@
run-printf
run-quote
run-read
+warning: please do not consider output differing only in the amount of
+warning: white space to be an error.
run-redir
+warning: the text of a system error message may vary between systems and
+warning: produce diff output.
+warning: if the text of an error message concerning `redir1.*' not being
+warning: found or messages concerning bad file descriptors produce diff
+warning: output, please do not consider it a test failure
run-rhs-exp
run-rsh
run-set-e
@@ -85,6 +150,9 @@
run-tilde
run-tilde2
run-trap
+warning: UNIX versions number signals and schedule processes differently.
+warning: If output differing only in line numbers is produced, please
+warning: do not consider this a test failure.
run-type
run-varenv
run-vredir