From b5bb1445fbd8997d6c6bde19dd3cd279e49afe5a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 5 May 2018 19:25:50 +0200
Subject: [PATCH] dash: add upstream fix for child waiting issue.

Fixes #14123.
---
 srcpkgs/dash/patches/noblock-sigchld.diff | 16 ++++++++++++++++
 srcpkgs/dash/template                     |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/dash/patches/noblock-sigchld.diff

diff --git a/srcpkgs/dash/patches/noblock-sigchld.diff b/srcpkgs/dash/patches/noblock-sigchld.diff
new file mode 100644
index 00000000000..afc54dbd325
--- /dev/null
+++ b/srcpkgs/dash/patches/noblock-sigchld.diff
@@ -0,0 +1,16 @@
+Subject: Re: Regression in dash 0.5.10 related to subshells
+Message-ID: <20180505160243.t5rujv3eifiust5a@gondor.apana.org.au>
+
+--- src/jobs.c
++++ src/jobs.c
+@@ -975,8 +975,8 @@ waitforjob(struct job *jp)
+ 	int st;
+ 
+ 	TRACE(("waitforjob(%%%d) called\n", jp ? jobno(jp) : 0));
+-	while ((jp && jp->state == JOBRUNNING) || gotsigchld)
+-		dowait(DOWAIT_BLOCK, jp);
++	while (jp ? jp->state == JOBRUNNING : gotsigchld)
++		dowait(jp ? DOWAIT_BLOCK : DOWAIT_NORMAL, jp);
+ 	if (!jp)
+ 		return exitstatus;
+ 	st = getstatus(jp);
diff --git a/srcpkgs/dash/template b/srcpkgs/dash/template
index 9da38876586..574a012c5e7 100644
--- a/srcpkgs/dash/template
+++ b/srcpkgs/dash/template
@@ -1,7 +1,7 @@
 # Template file for 'dash'
 pkgname=dash
 version=0.5.10
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="bison"
 register_shell="/bin/sh /bin/dash"