core/bash: upgrade to 4.0.024

1 files changed, 69 insertions, 54 deletions

diff --git a/core/bash/APKBUILD b/core/bash/APKBUILD
index 2911ec0a..baaa438d 100644
--- a/core/bash/APKBUILD
+++ b/core/bash/APKBUILD
@@ -1,29 +1,59 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 
 pkgname=bash
-_patchlevel=039
-pkgver=3.2_p$_patchlevel
-pkgrel=3
+_myver=4.0
+_patchbase=40
+_patchlevel=024
+pkgver=${_myver}.${_patchlevel}
+pkgrel=0
 pkgdesc="The GNU Bourne Again shell"
 license='GPL'
 url="http://www.gnu.org/software/bash/bash.html"
-makedepends="readline-dev ncurses-dev"
-depends='readline ncurses uclibc'
-source="http://ftp.gnu.org/gnu/bash/bash-3.2.tar.gz
+makedepends="readline-dev ncurses-dev bison flex"
+depends=
+source="http://ftp.gnu.org/gnu/bash/bash-${_myver}.tar.gz
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-001
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-002
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-003
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-004
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-005
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-006
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-007
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-008
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-009
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-010
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-011
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-012
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-013
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-014
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-015
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-016
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-017
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-018
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-019
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-020
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-021
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-022
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-023
+	http://ftp.gnu.org/gnu/bash/bash-4.0-patches/bash40-024
 	bash-noinfo.patch
 	"
-for _i in $(seq 1 $_patchlevel); do
-	# seq -w unsupported by busybox
-	_p=$(printf "%0.3i" $_i)
-	source="$source http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-$_p"
-done
 
 subpackages="$pkgname-doc"
 
+# run 'abuild _gensrc >> APKBUILD' to generate the patch list
+_gensrc() {
+	for _i in $(seq 1 $_patchlevel); do
+		# seq -w unsupported by busybox
+		_p=$(printf "%0.3i" $_i)
+		echo -e "\thttp://ftp.gnu.org/gnu/bash/bash-${_myver}-patches/bash${_patchbase}-$_p"
+	done
+}
+
 build() {
 	local p
-	cd ${startdir}/src/${pkgname}-3.2
-	for p in ../bash32-??? ../*.patch; do
+	cd ${startdir}/src/${pkgname}-${_myver}
+	for p in ../bash${_patchbase}-??? ../*.patch; do
 		msg "applying patch ${p##*/}"
 		patch -p0 -i $p || return 1
 	done
@@ -41,44 +71,29 @@ build() {
 
 	rm -r "$pkgdir"/usr/share/locale
 }
-md5sums="00bfa16d58e034e3c2aa27f390390d30  bash-3.2.tar.gz
-80fec5f3d60a63756a4999c877e31a8e  bash-noinfo.patch
-d8e10c754f477e3f3a581af566b89301  bash32-001
-d38a5288b2f0ea6c9ac76b66cc74ef7d  bash32-002
-0b90d37911827d8cb95f3b4353cc225e  bash32-003
-8062f3a59631f58d78b180d83759b68a  bash32-004
-585b5943fadf0875ced243b245adde58  bash32-005
-1d5732e01ea938aeed42f3def131fa4d  bash32-006
-dcd0cc5d801607827f7c851e72b0eabc  bash32-007
-bb3c7dd11198c0ab93d0e960bebf6256  bash32-008
-434a6f29b0ca5f1ab784b2437ae8eaed  bash32-009
-2efff04dd246fcf63bd4b99f77c9a081  bash32-010
-1dd104342f6920dfaf5efb3131e922e0  bash32-011
-4f24b696ab78bdfae4f9cb7eb59b835d  bash32-012
-7c40addbf1187a26ae1c8373ed383442  bash32-013
-28e88c9f8679e99ac590d4a4a8227c56  bash32-014
-7c17d29675bd0d49470f162774385f80  bash32-015
-a1edaa98b4449fe2205fa75448b7b105  bash32-016
-889ed119bbf9d363660b9a0127f35efa  bash32-017
-a7d3f85fa687d2c1b5a134839f6d395d  bash32-018
-f0399da4007e46fc5820ce25d07425b9  bash32-019
-b76602281c3104d904fd064510fe0c21  bash32-020
-923374ae4403c92820f711e62e1d01a5  bash32-021
-c82d3bd14e373878b2a680dce18d1596  bash32-022
-987c949a77b4b0ffe4a2597141e77635  bash32-023
-5a2b976e761ab83f0fc7daae11451b86  bash32-024
-08668dc2825f65eced9cac6b09ce1b45  bash32-025
-f35b2b217f088ff009f956894550d41d  bash32-026
-b5ff2b9610c61290f773c4b02cc1a37d  bash32-027
-016f5b56c93404d32aea09385f0fc13e  bash32-028
-a81420626d4d88d0dce2ffac0ac56341  bash32-029
-11f91baf970c132949f9072ee93f2ea6  bash32-030
-f6bbc1e8ec0246740731c728ef476191  bash32-031
-8180ec936770579bce69f0816c2dd878  bash32-032
-3cec33c3711860c4c6b7614afeec7870  bash32-033
-7bc6c5b5f38b7027152f8db0458a2e14  bash32-034
-a2db61fe90e39371d0e6cd2285ec9208  bash32-035
-95c70c7ae9de5bd3659c86284be7fb76  bash32-036
-62b876a3d7cd192cc8db2476fbb6b7b9  bash32-037
-aca3afc341bd3e5a0d8a3b4ca40dbb3f  bash32-038
-e240c34f979b64bcb83c5f6567110bb1  bash32-039"
+md5sums="a90a1b5a6db4838483f05438e05e8eb9  bash-4.0.tar.gz
+bc7f4762443939bd7dccb42370f0d932  bash40-001
+c2a4a4786a83ed4ec366c6a8924369a2  bash40-002
+22e8a824eddba21a8fce10d7984c2aba  bash40-003
+ed7cbced8c7c964323265522369a37a2  bash40-004
+8ed86b7d31423d71ecf3148251d63512  bash40-005
+5f447338cb98ff156cabf1fd9879d5f3  bash40-006
+96e946cb66a4ca186cba1da44f1ee163  bash40-007
+d3eb7b6f00d525e032478c33f51d46a8  bash40-008
+340601c997ce569532417a7ae92248b8  bash40-009
+0bd5ab96d514ffb1afbb8c7984b15146  bash40-010
+32cb20f339a20e1e9fb37a5d18f18fca  bash40-011
+33fd9e93d30a17988c19554ef26d56e0  bash40-012
+a266b42df5e9ed7e8818a8b00d50e00b  bash40-013
+86cac78f191a32cd1404f11264eb9b2a  bash40-014
+bb41963d030bc61a20e8185367b337c5  bash40-015
+f75455048a086528971252fd979b8755  bash40-016
+34b2cd57271a452f4a26b39d77ff908f  bash40-017
+99318eed8dcc05e10a14ae27043f175d  bash40-018
+af3b9aaeadc71a5007bec2b98c751cde  bash40-019
+eb7c7ddeb7e8451eb59228dca3329696  bash40-020
+585d701b978ceb63967dc020db3a2234  bash40-021
+7a70f2608f90f6ac0c2051e5f1c6c414  bash40-022
+7a23aa41630dd4fe8d30108a200e2d96  bash40-023
+82ba5fc9eb780eb57d8b7628a17b7d74  bash40-024
+80fec5f3d60a63756a4999c877e31a8e  bash-noinfo.patch"