diff --git a/packages/gawk/build.sh b/packages/gawk/build.sh index 979d36706..cb81061b5 100644 --- a/packages/gawk/build.sh +++ b/packages/gawk/build.sh @@ -1,9 +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.2.0 +TERMUX_PKG_VERSION=4.2.1 +TERMUX_PKG_SHA256=d1119785e746d46a8209d28b2de404a57f983aa48670f4e225531d3bdc175551 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gawk/gawk-${TERMUX_PKG_VERSION}.tar.xz -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 a13a67d2f..7cf8b4a6d 100644 --- a/packages/gawk/io.c.patch +++ b/packages/gawk/io.c.patch @@ -1,16 +1,25 @@ -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 @@ +diff -u -r ../gawk-4.2.1/io.c ./io.c +--- ../gawk-4.2.1/io.c 2018-02-19 17:55:00.000000000 +0000 ++++ ./io.c 2018-02-27 11:12:19.067766916 +0000 +@@ -2025,7 +2025,7 @@ - set_sigpipe_to_default(); + set_sigpipe_to_default(); + +- execl("/bin/sh", "sh", "-c", command, NULL); ++ execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", command, NULL); + _exit(errno == ENOENT ? 127 : 126); -- execl("/bin/sh", "sh", "-c", str, NULL); -+ execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", str, NULL); - _exit(errno == ENOENT ? 127 : 126); + case -1: +@@ -2077,7 +2077,7 @@ + + signal(SIGPIPE, SIG_DFL); + +- execl("/bin/sh", "sh", "-c", command, NULL); ++ execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", command, NULL); + _exit(errno == ENOENT ? 127 : 126); - case -1: -@@ -2252,7 +2252,7 @@ + case -1: +@@ -2364,7 +2364,7 @@ /* stderr does NOT get dup'ed onto child's stdout */ #ifdef __EMX__ @@ -19,7 +28,7 @@ diff -u -r ../gawk-4.2.0/io.c ./io.c #else /* __MINGW32__ */ pid = spawnl(P_NOWAIT, getenv("ComSpec"), "cmd.exe", "/c", qcmd = quote_cmd(str), NULL); -@@ -2310,7 +2310,7 @@ +@@ -2422,7 +2422,7 @@ fatal(_("close of pipe failed (%s)"), strerror(errno)); /* stderr does NOT get dup'ed onto child's stdout */ set_sigpipe_to_default(); @@ -28,7 +37,7 @@ diff -u -r ../gawk-4.2.0/io.c ./io.c _exit(errno == ENOENT ? 127 : 126); } #endif /* NOT __EMX__, NOT __MINGW32__ */ -@@ -2522,7 +2522,7 @@ +@@ -2634,7 +2634,7 @@ os_close_on_exec(save_stdout, cmd, "pipe", "from"); /* saved stdout of the parent process */ #ifdef __EMX__ @@ -37,7 +46,7 @@ diff -u -r ../gawk-4.2.0/io.c ./io.c #else /* __MINGW32__ */ pid = spawnl(P_NOWAIT, getenv("ComSpec"), "cmd.exe", "/c", qcmd = quote_cmd(cmd), NULL); -@@ -2547,7 +2547,7 @@ +@@ -2659,7 +2659,7 @@ if (close(p[0]) == -1 || close(p[1]) == -1) fatal(_("close of pipe failed (%s)"), strerror(errno)); set_sigpipe_to_default();