From 11338ad3957db68dd6c9ace5c3cca0fa12343ccc Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 5 Aug 2016 11:22:59 +0200 Subject: [PATCH 1/5] bash-4.3_p30: Remove blank line at end of file --- bash-4.3_p30-0.bee | 1 - 1 file changed, 1 deletion(-) diff --git a/bash-4.3_p30-0.bee b/bash-4.3_p30-0.bee index 5ef31c038..d42861bc3 100755 --- a/bash-4.3_p30-0.bee +++ b/bash-4.3_p30-0.bee @@ -31,4 +31,3 @@ mee_configure() { mee_install_post() { ln -sv ${BINDIR}/bash ${D}${BINDIR}/sh } - From b531180c35cd6c0a2fdc4789826cc37437b9f7c3 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 5 Aug 2016 12:06:42 +0200 Subject: [PATCH 2/5] bash-4.3_p30: Securely download source and patches Use the secure HTTPS scheme to download the files. --- bash-4.3_p30-0.bee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bash-4.3_p30-0.bee b/bash-4.3_p30-0.bee index d42861bc3..3ad8f71e8 100755 --- a/bash-4.3_p30-0.bee +++ b/bash-4.3_p30-0.bee @@ -1,6 +1,6 @@ #!/bin/env beesh -SRCURL[0]="http://ftp.gnu.org/gnu/bash/bash-${PKGVERSION}.tar.gz" +SRCURL[0]="https://ftp.gnu.org/gnu/bash/bash-${PKGVERSION}.tar.gz" PATCHURL=() @@ -8,7 +8,7 @@ p="${PKGEXTRAVERSION#p}" pv="${PKGVERSION//./}" for i in $(seq --format="%03.0f" 1 $p) ; do - PATCHURL+=("http://ftp.gnu.org/gnu/bash/bash-${PKGVERSION}-patches/bash${pv}-$i") + PATCHURL+=("https://ftp.gnu.org/gnu/bash/bash-${PKGVERSION}-patches/bash${pv}-$i") done #RPREFIX="" From e007efbcb398cca2f08107c7ae9382cbce7139fd Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 5 Aug 2016 12:09:35 +0200 Subject: [PATCH 3/5] bash-4.3: Remove commented lines Commented out lines should be removed, now that we manage the files in a VCS, that means git. --- bash-4.3_p30-0.bee | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/bash-4.3_p30-0.bee b/bash-4.3_p30-0.bee index 3ad8f71e8..f9ae6b097 100755 --- a/bash-4.3_p30-0.bee +++ b/bash-4.3_p30-0.bee @@ -11,17 +11,6 @@ for i in $(seq --format="%03.0f" 1 $p) ; do PATCHURL+=("https://ftp.gnu.org/gnu/bash/bash-${PKGVERSION}-patches/bash${pv}-$i") done -#RPREFIX="" -#RBINDIR=${RPREFIX}/bin -#BINDIR=${RBINDIR} - -#mee_patch() { -# for p in ${bee_PATCHFILES[@]} ; do -# patch -N -p0 -i ${p} -# done -#} - - mee_configure() { bee_configure \ --without-bash-malloc \ From 3e66f3050f5a642bfea348027e90705e10cdc61c Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 5 Aug 2016 12:13:15 +0200 Subject: [PATCH 4/5] bash: Convert to versionless bee file --- bash-4.3_p30-0.bee => bash.be0 | 2 ++ 1 file changed, 2 insertions(+) rename bash-4.3_p30-0.bee => bash.be0 (93%) diff --git a/bash-4.3_p30-0.bee b/bash.be0 similarity index 93% rename from bash-4.3_p30-0.bee rename to bash.be0 index f9ae6b097..854ce57c1 100755 --- a/bash-4.3_p30-0.bee +++ b/bash.be0 @@ -1,5 +1,7 @@ #!/bin/env beesh +# BEE_VERSION bash-4.3_p30-0 + SRCURL[0]="https://ftp.gnu.org/gnu/bash/bash-${PKGVERSION}.tar.gz" PATCHURL=() From 14b59f875e7de342dc0b81161a14088913a5db12 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 5 Aug 2016 12:20:20 +0200 Subject: [PATCH 5/5] bash: Apply upstream patches 31 to 46 --- bash.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash.be0 b/bash.be0 index 854ce57c1..8cca3623f 100755 --- a/bash.be0 +++ b/bash.be0 @@ -1,6 +1,6 @@ #!/bin/env beesh -# BEE_VERSION bash-4.3_p30-0 +# BEE_VERSION bash-4.3_p46-0 SRCURL[0]="https://ftp.gnu.org/gnu/bash/bash-${PKGVERSION}.tar.gz"