From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Carsten Schlote Date: Mon, 2 Mar 2015 15:40:16 +0000 Message-ID: <87EB530CFD0AAB46BD93A302F9EF57EE2A84F672@kpladc0011.konzeptpark.intra> Content-Language: de-DE MIME-Version: 1.0 Subject: [ptxdist] PATCH: Updated bash shell from 3.2 to 4.3 Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============1921291454==" Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: "ptxdist@pengutronix.de" Cc: Michael Olbrich --===============1921291454== Content-Language: de-DE Content-Type: multipart/alternative; boundary="_000_87EB530CFD0AAB46BD93A302F9EF57EE2A84F672kpladc0011konze_" --_000_87EB530CFD0AAB46BD93A302F9EF57EE2A84F672kpladc0011konze_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable commit cffc8f58066f0a96dbc9805fe6b0a8ca98255355 Author: Carsten Schlote Date: Wed Feb 25 11:05:06 2015 +0100 bash: Updated bash to release 4.3.30 systemd/kernel-install 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 ba= sh should be configurable similiar as for 3.2 version. Signed-off-by: Carsten Schlote diff --git a/rules/bash.in b/rules/bash.in index 8295ad5..11d5090 100644 --- a/rules/bash.in +++ b/rules/bash.in @@ -76,12 +76,54 @@ config BASH_BRACE to pathname expansion, but the filenames generated need not exist. +config BASH_CASEMODATTR + bool +# default y + prompt "include case-modifying variable attributes" + depends on BASH + +config BASH_CASEMODEXP + bool +# default y + prompt "include case-modifying word expansions" + depends on BASH + +config BASH_CMDTIMING + bool +# default y + 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 +# default y + 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 +# default y + prompt "enable support for bash debugger" + depends on BASH + +config BASH_DIREXPDEFLT + bool +# default y + prompt "enable the direxpand shell option by default" + depends on BASH + config BASH_DIRSTACK bool prompt "Enable builtins pushd/popd/dirs" @@ -94,15 +136,40 @@ config BASH_DIRSTACK added to the list with the pushd command; the popd command removes entries from the list. +config BASH_DISABLED_BUILDINS + bool +# default y + 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 +# default y + prompt "force extended pattern matching to be enabled by default" + depends on BASH + +config BASH_GLOB_ASCIIRANGE_DEFLT + bool +# default y + 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 +177,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 +188,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 +253,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 transla= tion" + 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) +=3D bash # # Paths and names # -BASH_VERSION :=3D 3.2.48 -BASH_MD5 :=3D 338dcf975a93640bb3eaa843ca42e3f8 +BASH_VERSION :=3D 4.3.30 +BASH_MD5 :=3D a27b3ee9be83bd3ba448c0ff52b28447 BASH :=3D bash-$(BASH_VERSION) BASH_SUFFIX :=3D tar.gz BASH_URL :=3D $(call ptx/mirror, GNU, bash/$(BASH).$(BASH_SUFFIX)) @@ -37,28 +37,45 @@ BASH_AUTOCONF :=3D \ $(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-builti= ns \ + --$(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-de= fault \ + --$(call ptx/endis, PTXCONF_BASH_GLOB_ASCIIRANGE_DEFLT)-glob-asciir= anges-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-strin= gs \ + --$(call ptx/endis, PTXCONF_BASH_GPROF)-profiling \ + --$(call ptx/endis, PTXCONF_BASH_STATIC)-static-link + +ifdef PTXCONF_BASH_CURSES +BASH_AUTOCONF +=3D --with-curses +endif ifdef PTXCONF_BASH_JOBS BASH_ENV +=3D bash_cv_job_control_missing=3Dpresent --_000_87EB530CFD0AAB46BD93A302F9EF57EE2A84F672kpladc0011konze_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

commit cffc8f58066f0a96dbc9805fe6b0a8ca98255355

Author: Carsten Schlote <schlote@vaha= nus.net>

Da= te:   Wed Feb 25 11:05:06 2015 +0100

 

    bash: Updated bash to release = 4.3.30

 &= nbsp; 

&= nbsp;   systemd/kernel-install seems to use modern bash feat= ures 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.

   

<= span lang=3DEN-US>    Config fragment was updated with = actual configure arguments, so that bash

    should be configurable simili= ar as for 3.2 version.

   

    Signed-off-by: Carsten Schlote <s= chlote@vahanus.net>

 

diff --git a/rules/bash.in b/rules/bash.in

index 8295ad5..11d5090 100644

--- a/rules/bash.in

+++ b/rules/bash.in

@@ -76,12 +76,5= 4 @@ config BASH_BRACE

          to pathname= expansion, but the filenames generated

        &= nbsp; need not exist.

+co= nfig BASH_CASEMODATTR

+       bool

+#      defa= ult y

+ &= nbsp;     prompt "include case-modifying variable = attributes"

+       depends on BASH<= /p>

+

+config BASH_CASEMODEXP

+     &n= bsp; bool

+#&n= bsp;     default y

+       prompt "= ;include case-modifying word expansions"

+       depen= ds on BASH

+

+config BASH_CM= DTIMING

+ = ;      bool

+#      default y

+   &nbs= p;   prompt "enable the time reserved word and command timin= g"

+ = ;      depends on BASH

+

config BASH_CONDITIONAL

       = bool

 &n= bsp;      default y

        = prompt "Enable the conditional command"

      &nb= sp; depends on BASH

+confi= g BASH_CONDITIONAL_REGEX

+       bool

=

+#      de= fault y

+ = ;      prompt "enable extended regular expres= sion matching in conditional commands"

+       depen= ds on BASH && BASH_CONDITIONAL

+

+config BASH_COPROCESSES

+       bool

+   &nb= sp;   default y

+       prompt "enable copro= cess support and the coproc reserved word"

+       dep= ends on BASH

+=

+config BASH_= DEBUGGER

+&nbs= p;      bool

+#      default y

+   &nb= sp;   prompt "enable support for bash debugger"

+   &n= bsp;   depends on BASH

= +

+config BASH_DIREXPDEFLT

+       bool

+#    =   default y

+       prompt "enable the direxpand = shell option by default"

+       depends on BASH<= /o:p>

+=

config BASH_DIRSTACK

    = ;    bool

        prompt "Enable b= uiltins pushd/popd/dirs"

@@ -94,15 +136,40 @@ config BASH_DIRSTACK=

     &= nbsp;     added to the list with the pushd command;

   = ;        the popd command removes entrie= s from the list.

+config B= ASH_DISABLED_BUILDINS

+       bool

+#      defa= ult y

+ &= nbsp;     prompt "allow disabled builtins to still= be invoked"

+       depends on BASH=

+

+config BASH_DPARAN_ARITH=

+     =   bool

+&= nbsp;      default y

+       promp= t "include ((...)) command"

+       depends on BA= SH

+

config BASH_EXTPATTERN=

  &= nbsp;     bool

#      default y<= /span>

    &= nbsp;   prompt "Include ksh-style extended pattern matching&= quot;

 &n= bsp;      depends on BASH

+config BASH_EXTPATTERN_DEFLT

+     &nb= sp; bool

+#&nb= sp;     default y

+       prompt "= force extended pattern matching to be enabled by default"

+    &= nbsp;  depends on BASH

+

+config BASH_GLOB_ASCIIRANGE_DEFLT

+       bool

+#   &nb= sp;  default y

+       prompt "force bracket rang= e expressions in pattern matching to use the C locale by default"=

+   = ;    depends on BASH

+

config BASH_HELP

        bool

    &nb= sp;   prompt "Include the help builtin"

+    &nbs= p;  depends on BASH

        help

     =      This builtin supports minimal help features inside= bash

@@ -110,6 +177,7 @@ = config BASH_CMDHISTORY

        bool<= /p>

     &n= bsp;  prompt "Turn on command history"

=

      = ;  default y

+       depends on BASH=

     &= nbsp;  help

          This enables comm= and history features. The shell

<= span lang=3DEN-US>          bu= ffers commands in a ringbuffer, which can be listed,

<= p class=3DMsoNormal>@@ -120,10 +188,16 @@ config BASH_JO= BS

  = ;      bool

        prompt &q= uot;Enable job control features"

        default = y

+  = ;     depends on BASH

        help=

  &= nbsp;       This enables support for backgrou= nd jobs in bash.

          You can list the = actual managed jobs by the "jobs" command.

<= p class=3DMsoNormal>

+config BASH_MULTIBYTE

+       b= ool

+ &nb= sp;     prompt "enable multibyte characters if OS = supports them"

+       default y

=

+

config BASH_PROCSUBST

      &n= bsp; bool

&nbs= p;       prompt "Enable process substitu= tion"

@@ = -179,6 +253,14 @@ config BASH_SELECT

        &nbs= p; Include the select builtin, which allows the generation of

    &nb= sp;     simple menus.

+config BASH_SEP_HELPFILES

+       bool

+  &nbs= p;    prompt "use external files for help builtin docum= entation"

+

+config BAS= H_SINGLE_HELPLINE

+       bool

+       prom= pt "store help documentation as a single string to ease translation&qu= ot;

+

endif

 config BASH_GPROF=

diff --git a/rules/bash.make b/= rules/bash.make

index 18d59ea..238eb75 100644

<= span lang=3DEN-US>--- a/rules/bash.make

+++ b/rules/bash.make

@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_BASH= ) +=3D bash

#=

# Paths and = names

#<= /o:p>

-BASH_VERSION =   :=3D 3.2.48

-BASH_MD5       :=3D 338dcf975a93640bb3e= aa843ca42e3f8

= +BASH_VERSION   :=3D 4.3.30

+BASH_MD5       :=3D = a27b3ee9be83bd3ba448c0ff52b28447

= BASH        &nb= sp;  :=3D bash-$(BASH_VERSION)

BASH_SUFFIX    :=3D tar.gz=

BASH_URL  &nb= sp;    :=3D $(call ptx/mirror, GNU, bash/$(BASH).$(BASH_SUFF= IX))

@@ -37,28= +37,45 @@ BASH_AUTOCONF       :=3D \

   &nb= sp;    $(CROSS_AUTOCONF_ROOT) \

       = $(GLOBAL_LARGE_FILE_OPTION) \

        --without-bash-= malloc \

-&nbs= p;      --disable-net-redirections \

    &nb= sp;   --$(call ptx/endis, PTXCONF_BASH_SHLIKE)-minimal-config \

  &nb= sp;     --$(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 \

      &nbs= p; --$(call ptx/endis, PTXCONF_BASH_BRACE)-brace-expansion \

+    &nb= sp;  --$(call ptx/endis, PTXCONF_BASH_CASEMODATTR)-casemod-attributes = \

+  = ;     --$(call ptx/endis, PTXCONF_BASH_CASEMODEXP)-case= mod-expansions \

+       --$(call ptx/endis, PTXCONF_BASH_C= MDTIMING)-command-timing \

        --$(call ptx/endis,= PTXCONF_BASH_CONDITIONAL)-cond-command \

+       --$(call = ptx/endis, PTXCONF_BASH_CONDITIONAL_REGEX)-cond-regexp \<= /p>

+     &= nbsp; --$(call ptx/endis, PTXCONF_BASH_COPROCESSES)-coprocesses \

+   &nbs= p;   --$(call ptx/endis, PTXCONF_BASH_DEBUGGER)-debugger \

+   &= nbsp;   --$(call ptx/endis, PTXCONF_BASH_DIREXPDEFLT)-direxpand-d= efault \

 = ;       --$(call ptx/endis, PTXCONF_BASH_DIRS= TACK)-directory-stack \

+       --$(call ptx/endis, PTXCONF= _BASH_DISABLED_BUILDINS)-disabled-builtins \

+       --$(c= all ptx/endis, PTXCONF_BASH_DPARAN_ARITH)-dparen-arithmetic \

    &nb= sp;   --$(call ptx/endis, PTXCONF_BASH_EXTPATTERN)-extended-glob = \

+  = ;     --$(call ptx/endis, PTXCONF_BASH_EXTPATTERN_DEFLT= )-extended-glob-default \

+       --$(call ptx/endis, PTXCO= NF_BASH_GLOB_ASCIIRANGE_DEFLT)-glob-asciiranges-default \=

     &= nbsp;  --$(call ptx/endis, PTXCONF_BASH_HELP)-help-builtin \

    = ;    --$(call ptx/endis, PTXCONF_BASH_CMDHISTORY)-history \<= o:p>

  &n= bsp;     --$(call ptx/endis, PTXCONF_BASH_JOBS)-job-con= trol \

+ =       --$(call ptx/endis, PTXCONF_BASH_MULTIBYTE)-= multibyte \

+&= nbsp;      --disable-net-redirections \=

    =     --$(call ptx/endis, PTXCONF_BASH_PROCSUBST)-process-subs= titution \

&nb= sp;       --$(call ptx/endis, PTXCONF_BASH_CO= MPLETION)-progcomp \

        --$(call ptx/endis, PTX= CONF_BASH_ESC)-prompt-string-decoding \

        --$(ca= ll ptx/endis, PTXCONF_BASH_EDIT)-readline \

        = --$(call ptx/endis, PTXCONF_BASH_RESTRICTED)-restricted \=

     &= nbsp;  --$(call ptx/endis, PTXCONF_BASH_SELECT)-select \

-    &n= bsp;  --$(call ptx/endis, PTXCONF_BASH_GPROF)-profiling \

-    &= nbsp;  --$(call ptx/endis, PTXCONF_BASH_STATIC)-static-link \

-   &nb= sp;   --$(call ptx/endis, PTXCONF_BASH_CURSES)-curses<= /span>

+    =    --$(call ptx/endis, PTXCONF_BASH_SEP_HELPFILES)-separate-helpf= iles \

+ =       --$(call ptx/endis, PTXCONF_BASH_SINGLE_HELP= LINE)-single-help-strings \

+       --$(call ptx/endis, PTX= CONF_BASH_GPROF)-profiling \

+       --$(call ptx/endis, PT= XCONF_BASH_STATIC)-static-link

+

+ifdef PTXCONF_BASH_CURSES

<= span lang=3DEN-US>+BASH_AUTOCONF +=3D --with-curses

+endif

 ifdef PTXCONF_BASH_JOBS

BASH_ENV     &nbs= p; +=3D bash_cv_job_control_missing=3Dpresent

 

= --_000_87EB530CFD0AAB46BD93A302F9EF57EE2A84F672kpladc0011konze_-- --===============1921291454== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline -- ptxdist mailing list ptxdist@pengutronix.de --===============1921291454==--