From 06740ba8c138513755046b36c403c167c06e220c Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Tue, 4 May 2021 08:32:17 +0200 Subject: [PATCH 1/4] bash: update to 5.1p4 - fixed SRCURLs - update - bash-completion outsourced --- bash.be0 | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/bash.be0 b/bash.be0 index 8cca3623f..9ec5baf74 100755 --- a/bash.be0 +++ b/bash.be0 @@ -1,22 +1,28 @@ #!/bin/env beesh -# BEE_VERSION bash-4.3_p46-0 +# BEE_VERSION bash-5.1_p4-0 -SRCURL[0]="https://ftp.gnu.org/gnu/bash/bash-${PKGVERSION}.tar.gz" +# SRCURL[0]="https://ftp.gnu.org/gnu/bash/bash-${PKGVERSION}.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/bb91a17fd6c9032c26d0b2b78b50aff5/bash-5.1.tar.gz" -PATCHURL=() +# p="${PKGEXTRAVERSION#p}" +# pv="${PKGVERSION//./}" +# for i in $(seq --format="%03.0f" 1 $p) ; do +# PATCHURL+=("https://ftp.gnu.org/gnu/bash/bash-${PKGVERSION}-patches/bash${pv}-$i") +# done -p="${PKGEXTRAVERSION#p}" -pv="${PKGVERSION//./}" +PATCHURL[0]="https://beehive.molgen.mpg.de/57641ddbf92fca25df92a443e36f285a/bash51-001" +PATCHURL[1]="https://beehive.molgen.mpg.de/aed44842ed1a05fcfc3ef146991fdaef/bash51-002" +PATCHURL[2]="https://beehive.molgen.mpg.de/bf96455600a86420d69f5166575192dd/bash51-003" +PATCHURL[3]="https://beehive.molgen.mpg.de/d2c524dba0eea5dc5f00849cc84376a0/bash51-004" -for i in $(seq --format="%03.0f" 1 $p) ; do - PATCHURL+=("https://ftp.gnu.org/gnu/bash/bash-${PKGVERSION}-patches/bash${pv}-$i") -done mee_configure() { bee_configure \ + --enable-progcomp=no \ --without-bash-malloc \ - --with-installed-readline + --with-installed-readline \ + --disable-nls } mee_install_post() { From 334c9fcedfeae244ba3710308811c1dfd44d5d9a Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Tue, 4 May 2021 10:20:54 +0200 Subject: [PATCH 2/4] bash: reenable completion progs - bash-completion failed, fix that --- bash.be0 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bash.be0 b/bash.be0 index 9ec5baf74..328f91e88 100755 --- a/bash.be0 +++ b/bash.be0 @@ -1,6 +1,6 @@ #!/bin/env beesh -# BEE_VERSION bash-5.1_p4-0 +# BEE_VERSION bash-5.1_p4-1 # SRCURL[0]="https://ftp.gnu.org/gnu/bash/bash-${PKGVERSION}.tar.gz" SRCURL[0]="https://beehive.molgen.mpg.de/bb91a17fd6c9032c26d0b2b78b50aff5/bash-5.1.tar.gz" @@ -19,7 +19,6 @@ PATCHURL[3]="https://beehive.molgen.mpg.de/d2c524dba0eea5dc5f00849cc84376a0/bash mee_configure() { bee_configure \ - --enable-progcomp=no \ --without-bash-malloc \ --with-installed-readline \ --disable-nls From 576082c67d8cf080330572623cac807d0399f84f Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Tue, 4 May 2021 15:29:01 +0200 Subject: [PATCH 3/4] bash: make bash 5.1 static - build static to remove dependecies to: linux-vdso.so.1 libncursesw.so.5 libdl.so.2 libc.so.6 --- bash.be0 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bash.be0 b/bash.be0 index 328f91e88..2ee94a77e 100755 --- a/bash.be0 +++ b/bash.be0 @@ -1,6 +1,6 @@ #!/bin/env beesh -# BEE_VERSION bash-5.1_p4-1 +# BEE_VERSION bash-5.1_p4-2 # SRCURL[0]="https://ftp.gnu.org/gnu/bash/bash-${PKGVERSION}.tar.gz" SRCURL[0]="https://beehive.molgen.mpg.de/bb91a17fd6c9032c26d0b2b78b50aff5/bash-5.1.tar.gz" @@ -21,7 +21,8 @@ mee_configure() { bee_configure \ --without-bash-malloc \ --with-installed-readline \ - --disable-nls + --disable-nls \ + --enable-static-link } mee_install_post() { From 4d9801d7897925ebf08cb2c757da19357ecd30a0 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Thu, 6 May 2021 13:21:25 +0200 Subject: [PATCH 4/4] bash: make bash 5.1 ncurses static - build static to remove dependecies to: libncursesw.so.5 --- bash.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bash.be0 b/bash.be0 index 2ee94a77e..e51dea596 100755 --- a/bash.be0 +++ b/bash.be0 @@ -1,6 +1,6 @@ #!/bin/env beesh -# BEE_VERSION bash-5.1_p4-2 +# BEE_VERSION bash-5.1_p4-3 # SRCURL[0]="https://ftp.gnu.org/gnu/bash/bash-${PKGVERSION}.tar.gz" SRCURL[0]="https://beehive.molgen.mpg.de/bb91a17fd6c9032c26d0b2b78b50aff5/bash-5.1.tar.gz" @@ -22,7 +22,7 @@ mee_configure() { --without-bash-malloc \ --with-installed-readline \ --disable-nls \ - --enable-static-link + LIBS=-l:libncursesw.a } mee_install_post() {