sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

zsh: Update from 5.5.1 to 5.6

Browse Source
This commit is contained in:
Fredrik Fornwall 2018-09-04 23:43:25 +02:00
parent 8d375adbaa
commit e2c5d2eddb
2 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
packages/zsh/Src-exec.c.patch
View File

@ -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;

5
packages/zsh/build.sh
View File

@ -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}"