aboutsummaryrefslogtreecommitdiffstats
path: root/main/bash
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2017-12-07 22:11:39 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2017-12-07 22:18:05 +0000
commitffcbff626c698a477a8d1217e4bade0059a84fc1 (patch)
treecc8e53d5b460f0c3400bcf82599fdd6d9a752a82 /main/bash
parente47862489aabf8f1b2e8a5214ee0397ddd5d502a (diff)
downloadaports-ffcbff626c698a477a8d1217e4bade0059a84fc1.tar.bz2
aports-ffcbff626c698a477a8d1217e4bade0059a84fc1.tar.xz
main/bash: fix overflow in jobs
fixes #8236
Diffstat (limited to 'main/bash')
-rw-r--r--main/bash/APKBUILD4
-rw-r--r--main/bash/fix-jobs.patch13
2 files changed, 16 insertions, 1 deletions
diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index eabf3d4760..2ea7567753 100644
--- a/main/bash/APKBUILD
+++ b/main/bash/APKBUILD
@@ -6,7 +6,7 @@ pkgver=4.4.12
_patchlevel=${pkgver##*.}
_myver=${pkgver%.*}
_patchbase=${_myver/./}
-pkgrel=4
+pkgrel=5
pkgdesc="The GNU Bourne Again shell"
url="https://www.gnu.org/software/bash/bash.html"
arch="all"
@@ -19,6 +19,7 @@ subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc"
options="!checkroot"
source="http://ftp.gnu.org/gnu/bash/bash-${_myver}.tar.gz
bash-noinfo.patch
+ fix-jobs.patch
"
# generate url's to patches. note: no forks allowed!
_i=1
@@ -97,6 +98,7 @@ dev() {
sha512sums="73de3b425faaac55e45456b0f6f6d8077b5dfa7bb76e0d1894a19361b4a2b6bd4fbbe182117ddbfe9b07b4d898fba03537c261badc9533dd3c0da891764c7f29 bash-4.4.tar.gz
9d8845491d0fe335bdd8e9a2bd98bda54bfed2ae3c35b2196c6d5a38bdf96c4d97572ba7d6b19ab605ef4e8f001f64cf3312f87dedebb9e37a95ad2c44e33cdb bash-noinfo.patch
+0e1a1d0f9d1ec90188beb99e5c6c5c92a2baeb26f9d4f147b4c9e0a2b697d2d13ff3210985b8ebf849f916af1cc124f655bd026b28f37d5abd51be7b9672da9a fix-jobs.patch
fa7a1b277eb3bad6ae7d2c7a2887cbf2c0eb75b7fee8ed03ec1e9d45879a2fb4b8c7cb16d6b029987493b01a461214bd9a24454a6837e7cfe180b1bc56f61caa bash44-001
526f986057810f89080e283ff95b3a8fd24d37e4ad2f18c39f36d3a2d57956a6441d16220082157735e3c5ccf770d5016e761aa5f309129898e39277d576e6b5 bash44-002
e61db89bdd1a7ae15013fe258046a343c9ea41e5a1c6d2c810947500a617fce7536b8d51194e14bb42499fe0de6d70cc9b2c81da0afdcb5a2278459f4f76d748 bash44-003
diff --git a/main/bash/fix-jobs.patch b/main/bash/fix-jobs.patch
new file mode 100644
index 0000000000..c01db4e19f
--- /dev/null
+++ b/main/bash/fix-jobs.patch
@@ -0,0 +1,13 @@
+diff --git a/jobs.c b/jobs.c
+index fc96603..d203db2 100644
+--- a/jobs.c
++++ b/jobs.c
+@@ -765,7 +765,7 @@ bgp_resize ()
+ else
+ nsize = bgpids.nalloc;
+
+- while (nsize < js.c_childmax)
++ while (nsize < (ps_index_t)js.c_childmax)
+ nsize *= 2;
+
+ if (bgpids.nalloc < js.c_childmax)