[ptxdist] [PATCH] bash: Updated bash to release 4.3.30

[carsten.schlote@gmx.net]

From: Carsten Schlote <schlote@vahanus.net>

systemd seems to use modern bash features like readarray, which is not
provided by version 3.2.48, which is packaged with ptxdist.

So I updated the bash package to a more recent bash version.

Config fragment was updated with actual configure arguments, so that bash
should be configurable similiar as for 3.2 version.

Signed-off-by: Carsten Schlote <schlote@vahanus.net>
---
 rules/bash.in   | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 rules/bash.make | 29 +++++++++++++++++-----
 2 files changed, 96 insertions(+), 7 deletions(-)

diff --git a/rules/bash.in b/rules/bash.in
index 8295ad5..b22a726 100644
--- a/rules/bash.in
+++ b/rules/bash.in
@@ -76,12 +76,48 @@ config BASH_BRACE
 	  to pathname expansion, but the filenames generated
 	  need not exist.
 
+config BASH_CASEMODATTR
+	bool
+	prompt "include case-modifying variable attributes"
+	depends on BASH
+
+config BASH_CASEMODEXP
+	bool
+	prompt "include case-modifying word expansions"
+	depends on BASH
+
+config BASH_CMDTIMING
+	bool
+	prompt "enable the time reserved word and command timing"
+	depends on BASH
+
 config BASH_CONDITIONAL
 	bool
 	default y
 	prompt "Enable the conditional command"
 	depends on BASH
 
+config BASH_CONDITIONAL_REGEX
+	bool
+	prompt "enable extended regular expression matching in conditional commands"
+	depends on BASH && BASH_CONDITIONAL
+
+config BASH_COPROCESSES
+	bool
+	default y
+	prompt "enable coprocess support and the coproc reserved word"
+	depends on BASH
+
+config BASH_DEBUGGER
+	bool
+	prompt "enable support for bash debugger"
+	depends on BASH
+
+config BASH_DIREXPDEFLT
+	bool
+	prompt "enable the direxpand shell option by default"
+	depends on BASH
+
 config BASH_DIRSTACK
 	bool
 	prompt "Enable builtins pushd/popd/dirs"
@@ -94,15 +130,36 @@ config BASH_DIRSTACK
 	   added to the list with the pushd command;
 	   the popd command removes entries from the list.
 
+config BASH_DISABLED_BUILDINS
+	bool
+	prompt "allow disabled builtins to still be invoked"
+	depends on BASH
+
+config BASH_DPARAN_ARITH
+	bool
+	default y
+	prompt "include ((...)) command"
+	depends on BASH
+
 config BASH_EXTPATTERN
 	bool
-#	default y
 	prompt "Include ksh-style extended pattern matching"
 	depends on BASH
 
+config BASH_EXTPATTERN_DEFLT
+	bool
+	prompt "force extended pattern matching to be enabled by default"
+	depends on BASH
+
+config BASH_GLOB_ASCIIRANGE_DEFLT
+	bool
+	prompt "force bracket range expressions in pattern matching to use the C locale by default"
+	depends on BASH
+
 config BASH_HELP
 	bool
 	prompt "Include the help builtin"
+	depends on BASH
 	help
 	  This builtin supports minimal help features inside bash
 
@@ -110,6 +167,7 @@ config BASH_CMDHISTORY
 	bool
 	prompt "Turn on command history"
 	default y
+	depends on BASH
 	help
 	  This enables command history features. The shell
 	  buffers commands in a ringbuffer, which can be listed,
@@ -120,10 +178,16 @@ config BASH_JOBS
 	bool
 	prompt "Enable job control features"
 	default y
+	depends on BASH
 	help
 	  This enables support for background jobs in bash.
 	  You can list the actual managed jobs by the "jobs" command.
 
+config BASH_MULTIBYTE
+	bool
+	prompt "enable multibyte characters if OS supports them"
+	default y
+
 config BASH_PROCSUBST
 	bool
 	prompt "Enable process substitution"
@@ -179,6 +243,14 @@ config BASH_SELECT
 	  Include the select builtin, which allows the generation of
 	  simple menus.
 
+config BASH_SEP_HELPFILES
+	bool
+	prompt "use external files for help builtin documentation"
+
+config BASH_SINGLE_HELPLINE
+	bool
+	prompt "store help documentation as a single string to ease translation"
+
 endif
 
 config BASH_GPROF
diff --git a/rules/bash.make b/rules/bash.make
index 18d59ea..238eb75 100644
--- a/rules/bash.make
+++ b/rules/bash.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_BASH) += bash
 #
 # Paths and names
 #
-BASH_VERSION	:= 3.2.48
-BASH_MD5	:= 338dcf975a93640bb3eaa843ca42e3f8
+BASH_VERSION	:= 4.3.30
+BASH_MD5	:= a27b3ee9be83bd3ba448c0ff52b28447
 BASH		:= bash-$(BASH_VERSION)
 BASH_SUFFIX	:= tar.gz
 BASH_URL	:= $(call ptx/mirror, GNU, bash/$(BASH).$(BASH_SUFFIX))
@@ -37,28 +37,45 @@ BASH_AUTOCONF	:= \
 	$(CROSS_AUTOCONF_ROOT) \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--without-bash-malloc \
-	--disable-net-redirections \
 	--$(call ptx/endis, PTXCONF_BASH_SHLIKE)-minimal-config \
 	--$(call ptx/endis, PTXCONF_BASH_ALIASES)-alias \
 	--$(call ptx/endis, PTXCONF_BASH_ARITHMETIC_FOR)-arith-for-command \
 	--$(call ptx/endis, PTXCONF_BASH_ARRAY)-array-variables \
 	--$(call ptx/endis, PTXCONF_BASH_HISTORY)-bang-history \
 	--$(call ptx/endis, PTXCONF_BASH_BRACE)-brace-expansion \
+	--$(call ptx/endis, PTXCONF_BASH_CASEMODATTR)-casemod-attributes \
+	--$(call ptx/endis, PTXCONF_BASH_CASEMODEXP)-casemod-expansions \
+	--$(call ptx/endis, PTXCONF_BASH_CMDTIMING)-command-timing \
 	--$(call ptx/endis, PTXCONF_BASH_CONDITIONAL)-cond-command \
+	--$(call ptx/endis, PTXCONF_BASH_CONDITIONAL_REGEX)-cond-regexp \
+	--$(call ptx/endis, PTXCONF_BASH_COPROCESSES)-coprocesses \
+	--$(call ptx/endis, PTXCONF_BASH_DEBUGGER)-debugger \
+	--$(call ptx/endis, PTXCONF_BASH_DIREXPDEFLT)-direxpand-default \
 	--$(call ptx/endis, PTXCONF_BASH_DIRSTACK)-directory-stack \
+	--$(call ptx/endis, PTXCONF_BASH_DISABLED_BUILDINS)-disabled-builtins \
+	--$(call ptx/endis, PTXCONF_BASH_DPARAN_ARITH)-dparen-arithmetic \
 	--$(call ptx/endis, PTXCONF_BASH_EXTPATTERN)-extended-glob \
+	--$(call ptx/endis, PTXCONF_BASH_EXTPATTERN_DEFLT)-extended-glob-default \
+	--$(call ptx/endis, PTXCONF_BASH_GLOB_ASCIIRANGE_DEFLT)-glob-asciiranges-default \
 	--$(call ptx/endis, PTXCONF_BASH_HELP)-help-builtin \
 	--$(call ptx/endis, PTXCONF_BASH_CMDHISTORY)-history \
 	--$(call ptx/endis, PTXCONF_BASH_JOBS)-job-control \
+	--$(call ptx/endis, PTXCONF_BASH_MULTIBYTE)-multibyte \
+ 	--disable-net-redirections \
 	--$(call ptx/endis, PTXCONF_BASH_PROCSUBST)-process-substitution \
 	--$(call ptx/endis, PTXCONF_BASH_COMPLETION)-progcomp \
 	--$(call ptx/endis, PTXCONF_BASH_ESC)-prompt-string-decoding \
 	--$(call ptx/endis, PTXCONF_BASH_EDIT)-readline \
 	--$(call ptx/endis, PTXCONF_BASH_RESTRICTED)-restricted \
 	--$(call ptx/endis, PTXCONF_BASH_SELECT)-select \
-	--$(call ptx/endis, PTXCONF_BASH_GPROF)-profiling \
-	--$(call ptx/endis, PTXCONF_BASH_STATIC)-static-link \
-	--$(call ptx/endis, PTXCONF_BASH_CURSES)-curses
+	--$(call ptx/endis, PTXCONF_BASH_SEP_HELPFILES)-separate-helpfiles \
+	--$(call ptx/endis, PTXCONF_BASH_SINGLE_HELPLINE)-single-help-strings \
+ 	--$(call ptx/endis, PTXCONF_BASH_GPROF)-profiling \
+	--$(call ptx/endis, PTXCONF_BASH_STATIC)-static-link
+
+ifdef PTXCONF_BASH_CURSES
+BASH_AUTOCONF += --with-curses
+endif
 
 ifdef PTXCONF_BASH_JOBS
 BASH_ENV	+= bash_cv_job_control_missing=present
-- 
2.3.1


-- 
ptxdist mailing list
ptxdist@pengutronix.de