From e2c5d2eddb8e6b81682cf6917edaaf6381a92e1f Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 4 Sep 2018 23:43:25 +0200
Subject: [PATCH] zsh: Update from 5.5.1 to 5.6

---
 packages/zsh/Src-exec.c.patch | 41 ++++++++++++++---------------------
 packages/zsh/build.sh         |  5 ++---
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/packages/zsh/Src-exec.c.patch b/packages/zsh/Src-exec.c.patch
index 65adf014f..62b2e9cf3 100644
--- a/packages/zsh/Src-exec.c.patch
+++ b/packages/zsh/Src-exec.c.patch
@@ -1,16 +1,7 @@
-diff -u -r ../zsh-5.3/Src/exec.c ./Src/exec.c
---- ../zsh-5.3/Src/exec.c	2016-12-06 20:21:39.000000000 +0100
-+++ ./Src/exec.c	2017-07-21 00:51:47.226997418 +0200
-@@ -518,7 +518,7 @@
- 		    } else if (eno == ENOEXEC) {
- 			argv[-1] = "sh";
- 			winch_unblock();
--			execve("/bin/sh", argv - 1, newenvp);
-+			execve("@TERMUX_PREFIX@/bin/sh", argv - 1, newenvp);
- 		    }
- 		} else if (eno == ENOEXEC) {
- 		    for (t0 = 0; t0 != ct; t0++)
-@@ -527,7 +527,7 @@
+diff -u -r ../zsh-5.6/Src/exec.c ./Src/exec.c
+--- ../zsh-5.6/Src/exec.c	2018-09-03 14:58:01.000000000 +0000
++++ ./Src/exec.c	2018-09-04 21:31:29.499488209 +0000
+@@ -553,7 +553,7 @@
  		    if (t0 == ct) {
  			argv[-1] = "sh";
  			winch_unblock();
@@ -19,18 +10,18 @@ diff -u -r ../zsh-5.3/Src/exec.c ./Src/exec.c
  		    }
  		}
  	    } else
-@@ -3295,9 +3295,12 @@
- 	    holdintr();
+@@ -2739,9 +2739,12 @@
+     sigtrapped[SIGEXIT] = 0;
  #ifdef HAVE_NICE
- 	/* Check if we should run background jobs at a lower priority. */
--	if ((how & Z_ASYNC) && isset(BGNICE))
--	    if (nice(5) < 0)
-+	if ((how & Z_ASYNC) && isset(BGNICE)) {
-+	    errno = 0;
-+	    nice(5);
-+	    if (errno != 0)
- 		zwarn("nice(5) failed: %e", errno);
-+	}
+     /* Check if we should run background jobs at a lower priority. */
+-    if ((how & Z_ASYNC) && isset(BGNICE))
+-	if (nice(5) < 0)
++    if ((how & Z_ASYNC) && isset(BGNICE)) {
++	errno = 0;
++	nice(5);
++	if (errno != 0)
+ 	    zwarn("nice(5) failed: %e", errno);
++    }
  #endif /* HAVE_NICE */
  
-     } else if (is_cursh) {
+     return 0;
diff --git a/packages/zsh/build.sh b/packages/zsh/build.sh
index 337629dda..5baffa496 100644
--- a/packages/zsh/build.sh
+++ b/packages/zsh/build.sh
@@ -1,8 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://www.zsh.org
 TERMUX_PKG_DESCRIPTION="Shell with lots of features"
-TERMUX_PKG_VERSION=5.5.1
-TERMUX_PKG_REVISION=3
-TERMUX_PKG_SHA256=35dd75e44a3bbc9d5eefe77a9f5504a19eeeac1ca91a36ca15cff65844b92f7a
+TERMUX_PKG_VERSION=5.6
+TERMUX_PKG_SHA256=746b1fcb11e8d129d1454f9ca551448c8145b6bcb157116c12407c518880e6d6
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/zsh-${TERMUX_PKG_VERSION}.tar.xz
 # Remove hard link to bin/zsh as Android does not support hard links:
 TERMUX_PKG_RM_AFTER_INSTALL="bin/zsh-${TERMUX_PKG_VERSION}"