aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-02-07 19:00:58 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-02-07 19:04:45 +0000
commit6c1881db229de5cdc49bc974b7b99badc3e187aa (patch)
tree2b38e7c5c6adc21cd8067dfd9eea665484ec9ae3
parent8756c780bda76051ece619cab28acf83c63a920f (diff)
downloadaports-6c1881db229de5cdc49bc974b7b99badc3e187aa.tar.gz
aports-6c1881db229de5cdc49bc974b7b99badc3e187aa.tar.bz2
aports-6c1881db229de5cdc49bc974b7b99badc3e187aa.tar.xz
main/bash: fix jobs again
previous fix didnt solve the problem for 32 bit architectures. We fix it by capping childmax to 8192. ref #8447
-rw-r--r--main/bash/APKBUILD4
-rw-r--r--main/bash/fix-jobs.patch29
2 files changed, 23 insertions, 10 deletions
diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index 8ca5282416..160b1ab68a 100644
--- a/main/bash/APKBUILD
+++ b/main/bash/APKBUILD
@@ -6,7 +6,7 @@ pkgver=4.4.19
_patchlevel=${pkgver##*.}
_myver=${pkgver%.*}
_patchbase=${_myver/./}
-pkgrel=0
+pkgrel=1
pkgdesc="The GNU Bourne Again shell"
url="https://www.gnu.org/software/bash/bash.html"
arch="all"
@@ -98,7 +98,7 @@ dev() {
sha512sums="73de3b425faaac55e45456b0f6f6d8077b5dfa7bb76e0d1894a19361b4a2b6bd4fbbe182117ddbfe9b07b4d898fba03537c261badc9533dd3c0da891764c7f29 bash-4.4.tar.gz
9d8845491d0fe335bdd8e9a2bd98bda54bfed2ae3c35b2196c6d5a38bdf96c4d97572ba7d6b19ab605ef4e8f001f64cf3312f87dedebb9e37a95ad2c44e33cdb bash-noinfo.patch
-0e1a1d0f9d1ec90188beb99e5c6c5c92a2baeb26f9d4f147b4c9e0a2b697d2d13ff3210985b8ebf849f916af1cc124f655bd026b28f37d5abd51be7b9672da9a fix-jobs.patch
+79473c41e620d78d25139b56c37d18adac5c03dc28939f218729dfcd3558d8cbac5e83db814ffd27aa833cd3e55f81aad26aaf62af3688c927d8ac2a4172eaa4 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
index c01db4e19f..ddb9d4659a 100644
--- a/main/bash/fix-jobs.patch
+++ b/main/bash/fix-jobs.patch
@@ -1,13 +1,26 @@
diff --git a/jobs.c b/jobs.c
-index fc96603..d203db2 100644
+index cef3c79..bf99266 100644
--- a/jobs.c
+++ b/jobs.c
-@@ -765,7 +765,7 @@ bgp_resize ()
- else
- nsize = bgpids.nalloc;
+@@ -4166,10 +4166,8 @@ initialize_job_control (force)
+ if (js.c_childmax < 0)
+ js.c_childmax = DEFAULT_CHILD_MAX;
-- while (nsize < js.c_childmax)
-+ while (nsize < (ps_index_t)js.c_childmax)
- nsize *= 2;
+-#if 0
+ if (js.c_childmax > MAX_CHILD_MAX)
+ js.c_childmax = MAX_CHILD_MAX;
+-#endif
- if (bgpids.nalloc < js.c_childmax)
+ return job_control;
+ }
+@@ -4547,10 +4545,8 @@ mark_dead_jobs_as_notified (force)
+ if (js.c_childmax < 0)
+ js.c_childmax = DEFAULT_CHILD_MAX;
+
+-#if 0
+ if (js.c_childmax > MAX_CHILD_MAX)
+ js.c_childmax = MAX_CHILD_MAX;
+-#endif
+
+ /* Don't do anything if the number of dead processes is less than CHILD_MAX
+ and we're not forcing a cleanup. */