From 522ec40082e511a2aa55df02153722f3e7235f3f Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 20 Oct 2017 21:12:01 +0200
Subject: [PATCH] gawk: Update from 4.1.4 to 4.2.0

---
 packages/gawk/build.sh   |  5 ++---
 packages/gawk/io.c.patch | 36 +++++++++++++++++++++++++++---------
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/packages/gawk/build.sh b/packages/gawk/build.sh
index adfb8a61..979d3670 100644
--- a/packages/gawk/build.sh
+++ b/packages/gawk/build.sh
@@ -1,10 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gawk/
 TERMUX_PKG_DESCRIPTION="Programming language designed for text processing"
 TERMUX_PKG_DEPENDS="libandroid-support, libmpfr, libgmp, readline"
-TERMUX_PKG_VERSION=4.1.4
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION=4.2.0
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gawk/gawk-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=53e184e2d0f90def9207860531802456322be091c7b48f23fdc79cda65adc266
+TERMUX_PKG_SHA256=d4f3cd31c001fd0ed52832d4fbfbdfeaa38ad541c182f80ff8fdf87324a6a9f2
 TERMUX_PKG_RM_AFTER_INSTALL="bin/gawk-* bin/igawk share/man/man1/igawk.1"
 
 termux_step_pre_configure () {
diff --git a/packages/gawk/io.c.patch b/packages/gawk/io.c.patch
index 51604a3d..a13a67d2 100644
--- a/packages/gawk/io.c.patch
+++ b/packages/gawk/io.c.patch
@@ -1,28 +1,46 @@
-diff -u -r ../gawk-4.1.4/io.c ./io.c
---- ../gawk-4.1.4/io.c	2016-08-24 15:31:55.000000000 -0400
-+++ ./io.c	2016-11-23 18:27:30.481573610 -0500
-@@ -1976,7 +1976,7 @@
+diff -u -r ../gawk-4.2.0/io.c ./io.c
+--- ../gawk-4.2.0/io.c	2017-09-28 20:41:20.000000000 +0200
++++ ./io.c	2017-10-20 12:05:39.159861304 +0200
+@@ -2134,7 +2134,7 @@
  
- 			signal(SIGPIPE, SIG_DFL);
+ 			set_sigpipe_to_default();
  
 -			execl("/bin/sh", "sh", "-c", str, NULL);
 +			execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", str, NULL);
  			_exit(errno == ENOENT ? 127 : 126);
  
  		case -1:
-@@ -2152,7 +2152,7 @@
+@@ -2252,7 +2252,7 @@
+ 
+ 	/* stderr does NOT get dup'ed onto child's stdout */
+ #ifdef __EMX__
+-	pid = spawnl(P_NOWAIT, "/bin/sh", "sh", "-c", str, NULL);
++	pid = spawnl(P_NOWAIT, "@TERMUX_PREFIX@/bin/sh", "sh", "-c", str, NULL);
+ #else  /* __MINGW32__ */
+ 	pid = spawnl(P_NOWAIT, getenv("ComSpec"), "cmd.exe", "/c",
+ 		     qcmd = quote_cmd(str), NULL);
+@@ -2310,7 +2310,7 @@
  			fatal(_("close of pipe failed (%s)"), strerror(errno));
  		/* stderr does NOT get dup'ed onto child's stdout */
- 		signal(SIGPIPE, SIG_DFL);
+ 		set_sigpipe_to_default();
 -		execl("/bin/sh", "sh", "-c", str, NULL);
 +		execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", str, NULL);
  		_exit(errno == ENOENT ? 127 : 126);
  	}
  #endif /* NOT __EMX__, NOT __MINGW32__ */
-@@ -2346,7 +2346,7 @@
+@@ -2522,7 +2522,7 @@
+ 	os_close_on_exec(save_stdout, cmd, "pipe", "from"); /* saved stdout of the parent process */
+ 
+ #ifdef __EMX__
+-	pid = spawnl(P_NOWAIT, "/bin/sh", "sh", "-c", cmd, NULL);
++	pid = spawnl(P_NOWAIT, "@TERMUX_PREFIX@/bin/sh", "sh", "-c", cmd, NULL);
+ #else  /* __MINGW32__ */
+ 	pid = spawnl(P_NOWAIT, getenv("ComSpec"), "cmd.exe", "/c",
+ 		     qcmd = quote_cmd(cmd), NULL);
+@@ -2547,7 +2547,7 @@
  		if (close(p[0]) == -1 || close(p[1]) == -1)
  			fatal(_("close of pipe failed (%s)"), strerror(errno));
- 		signal(SIGPIPE, SIG_DFL);
+ 		set_sigpipe_to_default();
 -		execl("/bin/sh", "sh", "-c", cmd, NULL);
 +		execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", cmd, NULL);
  		_exit(errno == ENOENT ? 127 : 126);
-- 
2.11.0