diff --git a/.gitignore b/.gitignore index 6ca8bd2..55ad85c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/zsh-5.*.*.tar.bz2 /zsh-5.*.tar.xz +/zsh-5.*.tar.xz.asc diff --git a/0001-zsh-5.5.1-CVE-2018-0502-CVE-2018-13259.patch b/0001-zsh-5.5.1-CVE-2018-0502-CVE-2018-13259.patch deleted file mode 100644 index c2f588e..0000000 --- a/0001-zsh-5.5.1-CVE-2018-0502-CVE-2018-13259.patch +++ /dev/null @@ -1,134 +0,0 @@ -From ddb6c5b4c0ab9c6a7404112d367f0c7cc400ceec Mon Sep 17 00:00:00 2001 -From: Anthony Sottile -Date: Mon, 3 Sep 2018 14:39:25 +0000 -Subject: [PATCH] CVE-2018-0502, CVE-2018-13259: Fix two security issues in - shebang line parsing. - -See NEWS for more information. - -Patch by Anthony Sottile and Buck Evan. - -Upstream-commit: 1c4c7b6a4d17294df028322b70c53803a402233d -Signed-off-by: Kamil Dudka ---- - Src/exec.c | 36 ++++++++++++++++++++---------------- - Test/A05execution.ztst | 22 ++++++++++++++++++++++ - 3 files changed, 43 insertions(+), 17 deletions(-) - -diff --git a/Src/exec.c b/Src/exec.c -index 216057a..0908a1a 100644 ---- a/Src/exec.c -+++ b/Src/exec.c -@@ -453,7 +453,7 @@ execcursh(Estate state, int do_exec) - - /* execve after handling $_ and #! */ - --#define POUNDBANGLIMIT 64 -+#define POUNDBANGLIMIT 128 - - /**/ - static int -@@ -494,18 +494,20 @@ zexecve(char *pth, char **argv, char **newenvp) - if ((fd = open(pth, O_RDONLY|O_NOCTTY)) >= 0) { - argv0 = *argv; - *argv = pth; -- execvebuf[0] = '\0'; -+ memset(execvebuf, '\0', POUNDBANGLIMIT + 1); - ct = read(fd, execvebuf, POUNDBANGLIMIT); - close(fd); - if (ct >= 0) { -- if (execvebuf[0] == '#') { -- if (execvebuf[1] == '!') { -- for (t0 = 0; t0 != ct; t0++) -- if (execvebuf[t0] == '\n') -- break; -+ if (ct >= 2 && execvebuf[0] == '#' && execvebuf[1] == '!') { -+ for (t0 = 0; t0 != ct; t0++) -+ if (execvebuf[t0] == '\n') -+ break; -+ if (t0 == ct) -+ zerr("%s: bad interpreter: %s: %e", pth, -+ execvebuf + 2, eno); -+ else { - while (inblank(execvebuf[t0])) - execvebuf[t0--] = '\0'; -- execvebuf[POUNDBANGLIMIT] = '\0'; - for (ptr = execvebuf + 2; *ptr && *ptr == ' '; ptr++); - for (ptr2 = ptr; *ptr && *ptr != ' '; ptr++); - if (eno == ENOENT) { -@@ -514,10 +516,16 @@ zexecve(char *pth, char **argv, char **newenvp) - *ptr = '\0'; - if (*ptr2 != '/' && - (pprog = pathprog(ptr2, NULL))) { -- argv[-2] = ptr2; -- argv[-1] = ptr + 1; -- winch_unblock(); -- execve(pprog, argv - 2, newenvp); -+ if (ptr == execvebuf + t0 + 1) { -+ argv[-1] = ptr2; -+ winch_unblock(); -+ execve(pprog, argv - 1, newenvp); -+ } else { -+ argv[-2] = ptr2; -+ argv[-1] = ptr + 1; -+ winch_unblock(); -+ execve(pprog, argv - 2, newenvp); -+ } - } - zerr("%s: bad interpreter: %s: %e", pth, ptr2, - eno); -@@ -532,10 +540,6 @@ zexecve(char *pth, char **argv, char **newenvp) - winch_unblock(); - execve(ptr2, argv - 1, newenvp); - } -- } else if (eno == ENOEXEC) { -- argv[-1] = "sh"; -- winch_unblock(); -- execve("/bin/sh", argv - 1, newenvp); - } - } else if (eno == ENOEXEC) { - for (t0 = 0; t0 != ct; t0++) -diff --git a/Test/A05execution.ztst b/Test/A05execution.ztst -index 0804691..fb39d05 100644 ---- a/Test/A05execution.ztst -+++ b/Test/A05execution.ztst -@@ -12,7 +12,14 @@ - - print '#!/bin/sh\necho This is dir2' >dir2/tstcmd - -+ print -n '#!sh\necho This is slashless' >tstcmd-slashless -+ print -n '#!echo foo\necho This is arg' >tstcmd-arg -+ print '#!xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxnyyy' >tstcmd-interp-too-long -+ print '#!/bin/sh\necho should not execute; exit 1' >xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxn -+ - chmod 755 tstcmd dir1/tstcmd dir2/tstcmd -+ chmod 755 tstcmd-slashless tstcmd-arg tstcmd-interp-too-long -+ chmod 755 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxn - - %test - ./tstcmd -@@ -33,6 +40,21 @@ - 0:path (2) - >This is top - -+ PATH=/bin:${ZTST_testdir}/command.tmp/ tstcmd-slashless -+0:path (3) -+>This is slashless -+ -+ PATH=/bin:${ZTST_testdir}/command.tmp tstcmd-arg -+0:path (4) -+*>foo */command.tmp/tstcmd-arg -+ -+ path=(/bin ${ZTST_testdir}/command.tmp/) -+ tstcmd-interp-too-long 2>&1; echo "status $?" -+ path=($storepath) -+0:path (5) -+*>*tstcmd-interp-too-long: bad interpreter: x*xn: no such file or directory -+>status 127 -+ - functst() { print $# arguments:; print -l $*; } - functst "Eines Morgens" "als Gregor Samsa" - functst "" --- -2.17.1 - diff --git a/0004-zsh-5.4.2-CVE-2018-7548.patch b/0004-zsh-5.4.2-CVE-2018-7548.patch deleted file mode 100644 index 944b888..0000000 --- a/0004-zsh-5.4.2-CVE-2018-7548.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fc22af40437f4de42f7505ca93361391eab788e3 Mon Sep 17 00:00:00 2001 -From: Joey Pabalinas -Date: Tue, 23 Jan 2018 22:28:08 -0800 -Subject: [PATCH 1/2] 42313: avoid null-pointer deref when using ${(PA)...} on - an empty array result - -Upstream-commit: 110b13e1090bc31ac1352b28adc2d02b6d25a102 -Signed-off-by: Kamil Dudka ---- - Src/subst.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Src/subst.c b/Src/subst.c -index 5b1bf89..94b0207 100644 ---- a/Src/subst.c -+++ b/Src/subst.c -@@ -2340,7 +2340,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags, - val = aval[0]; - isarr = 0; - } -- s = dyncat(val, s); -+ s = val ? dyncat(val, s) : dupstring(s); - /* Now behave po-faced as if it was always like that... */ - subexp = 0; - /* --- -2.14.3 - diff --git a/0005-zsh-5.4.2-CVE-2018-7549.patch b/0005-zsh-5.4.2-CVE-2018-7549.patch deleted file mode 100644 index 6dfafe8..0000000 --- a/0005-zsh-5.4.2-CVE-2018-7549.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 016b8889a6c30279f6ee362e34262c204ef834c2 Mon Sep 17 00:00:00 2001 -From: Stephane Chazelas -Date: Fri, 22 Dec 2017 22:17:09 +0000 -Subject: [PATCH 2/2] Avoid crash copying empty hash table. - -Visible with typeset -p. - -Upstream-commit: c2cc8b0fbefc9868fa83537f5b6d90fc1ec438dd -Signed-off-by: Kamil Dudka ---- - Src/params.c | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/Src/params.c b/Src/params.c -index 9c7833f..d9da7f6 100644 ---- a/Src/params.c -+++ b/Src/params.c -@@ -549,10 +549,13 @@ scancopyparams(HashNode hn, UNUSED(int flags)) - HashTable - copyparamtable(HashTable ht, char *name) - { -- HashTable nht = newparamtable(ht->hsize, name); -- outtable = nht; -- scanhashtable(ht, 0, 0, 0, scancopyparams, 0); -- outtable = NULL; -+ HashTable nht = 0; -+ if (ht) { -+ nht = newparamtable(ht->hsize, name); -+ outtable = nht; -+ scanhashtable(ht, 0, 0, 0, scancopyparams, 0); -+ outtable = NULL; -+ } - return nht; - } - --- -2.14.3 - diff --git a/0006-zsh-5.4.2-CVE-2018-1071.patch b/0006-zsh-5.4.2-CVE-2018-1071.patch deleted file mode 100644 index e0d8df2..0000000 --- a/0006-zsh-5.4.2-CVE-2018-1071.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3f930a5b3c4e3d34724db6a985393f6a8408703d Mon Sep 17 00:00:00 2001 -From: Oliver Kiddle -Date: Sat, 24 Mar 2018 15:02:41 +0100 -Subject: [PATCH] 42518, CVE-2018-1071: check bounds when copying path in hashcmd() - -Upstream-commit: 679b71ec4d852037fe5f73d35bf557b0f406c8d4 -Signed-off-by: Kamil Dudka ---- - Src/exec.c | 2 +- - Src/utils.c | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Src/exec.c b/Src/exec.c -index f339dd6..1e82575 100644 ---- a/Src/exec.c -+++ b/Src/exec.c -@@ -917,7 +917,7 @@ hashcmd(char *arg0, char **pp) - for (; *pp; pp++) - if (**pp == '/') { - s = buf; -- strucpy(&s, *pp); -+ struncpy(&s, *pp, PATH_MAX); - *s++ = '/'; - if ((s - buf) + strlen(arg0) >= PATH_MAX) - continue; -diff --git a/Src/utils.c b/Src/utils.c -index 5055d69..271f55f 100644 ---- a/Src/utils.c -+++ b/Src/utils.c -@@ -2283,10 +2283,10 @@ struncpy(char **s, char *t, int n) - { - char *u = *s; - -- while (n--) -- *u++ = *t++; -+ while (n-- && (*u++ = *t++)); - *s = u; -- *u = '\0'; -+ if (n > 0) /* just one null-byte will do, unlike strncpy(3) */ -+ *u = '\0'; - } - - /* Return the number of elements in an array of pointers. * --- -2.14.3 - diff --git a/0007-zsh-5.4.2-CVE-2018-1083.patch b/0007-zsh-5.4.2-CVE-2018-1083.patch deleted file mode 100644 index 322d093..0000000 --- a/0007-zsh-5.4.2-CVE-2018-1083.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ca7c69f009bf0e13b2c7cbb02310f7c322ee12a0 Mon Sep 17 00:00:00 2001 -From: Oliver Kiddle -Date: Sat, 24 Mar 2018 15:04:39 +0100 -Subject: [PATCH] 42519, CVE-2018-1083: check bounds on PATH_MAX-sized - buffer used for file completion candidates - -Upstream-commit: 259ac472eac291c8c103c7a0d8a4eaf3c2942ed7 -Signed-off-by: Kamil Dudka ---- - Src/Zle/compctl.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/Src/Zle/compctl.c b/Src/Zle/compctl.c -index 5414b8f..29649ac 100644 ---- a/Src/Zle/compctl.c -+++ b/Src/Zle/compctl.c -@@ -2176,6 +2176,8 @@ gen_matches_files(int dirs, int execs, int all) - if (prpre && *prpre) { - pathpref = dupstring(prpre); - unmetafy(pathpref, &pathpreflen); -+ if (pathpreflen > PATH_MAX) -+ return; - /* system needs NULL termination, not provided by unmetafy */ - pathpref[pathpreflen] = '\0'; - } else { -@@ -2218,6 +2220,8 @@ gen_matches_files(int dirs, int execs, int all) - * the path buffer by appending the filename. */ - ums = dupstring(n); - unmetafy(ums, ¨en); -+ if (umlen + pathpreflen + 1 > PATH_MAX) -+ continue; - memcpy(q, ums, umlen); - q[umlen] = '\0'; - /* And do the stat. */ -@@ -2232,6 +2236,8 @@ gen_matches_files(int dirs, int execs, int all) - /* We have to test for a path suffix. */ - int o = strlen(p), tt; - -+ if (o + strlen(psuf) > PATH_MAX) -+ continue; - /* Append it to the path buffer. */ - strcpy(p + o, psuf); - --- -2.14.3 - diff --git a/0008-zsh-5.4.2-CVE-2018-1100.patch b/0008-zsh-5.4.2-CVE-2018-1100.patch deleted file mode 100644 index c835034..0000000 --- a/0008-zsh-5.4.2-CVE-2018-1100.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 33be20229d5be359c04b56e5548dd2c17b3aa0b5 Mon Sep 17 00:00:00 2001 -From: Oliver Kiddle -Date: Sat, 7 Apr 2018 18:28:38 +0200 -Subject: [PATCH] 42607, CVE-2018-1100: check bounds on buffer in mail checking - -Upstream-commit: 31f72205630687c1cef89347863aab355296a27f -Signed-off-by: Kamil Dudka ---- - Src/utils.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/Src/utils.c b/Src/utils.c -index 271f55f..fa1b5ed 100644 ---- a/Src/utils.c -+++ b/Src/utils.c -@@ -1653,7 +1653,7 @@ checkmailpath(char **s) - LinkList l; - DIR *lock = opendir(unmeta(*s)); - char buf[PATH_MAX * 2 + 1], **arr, **ap; -- int ct = 1; -+ int buflen, ct = 1; - - if (lock) { - char *fn; -@@ -1662,9 +1662,11 @@ checkmailpath(char **s) - l = newlinklist(); - while ((fn = zreaddir(lock, 1)) && !errflag) { - if (u) -- sprintf(buf, "%s/%s?%s", *s, fn, u); -+ buflen = snprintf(buf, sizeof(buf), "%s/%s?%s", *s, fn, u); - else -- sprintf(buf, "%s/%s", *s, fn); -+ buflen = snprintf(buf, sizeof(buf), "%s/%s", *s, fn); -+ if (buflen < 0 || buflen >= (int)sizeof(buf)) -+ continue; - addlinknode(l, dupstring(buf)); - ct++; - } --- -2.14.3 - diff --git a/dotzprofile b/dotzprofile new file mode 100644 index 0000000..9203f7e --- /dev/null +++ b/dotzprofile @@ -0,0 +1,12 @@ +# this file is installed as ~/.zprofile for newly created users + +# prepend ~/.local/bin and ~/bin to $PATH unless it is already there +if ! [[ "$PATH" =~ "$HOME/bin" ]] +then + PATH="$HOME/bin:$PATH" +fi +if ! [[ "$PATH" =~ "$HOME/.local/bin:" ]] +then + PATH="$HOME/.local/bin:$PATH" +fi +export PATH diff --git a/sources b/sources index 8b029ff..e248084 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (zsh-5.4.1.tar.xz) = c666c54b05e2707e3a3cf9a87a17863792f0c89ec14f5fdc85a3064f26249cfba42a2953bc76bb90205fb87a08c203a165a5240c9fd6c489c13d8cc82ee6e979 +SHA512 (zsh-5.9.2.tar.xz) = 40bb5eb2cf217e6bcff342fcc9314f082a5d8975abcb56897e86eba5839ddf0ec1ac3feed1e797d4c68cea22228197342916f14bb87309bbcc026a87622bc015 +SHA512 (zsh-5.9.2.tar.xz.asc) = 9657c8fef30124e4ea1b4ab41c80b471990c52c362e53f40c9bcca1be1b48af5d19437ecf6a645dbe9ea328d82cc43f9d88ad3835d23d76e482969017a956bf6 diff --git a/zlogout.rhs b/zlogout.rhs index 3e78094..600702c 100644 --- a/zlogout.rhs +++ b/zlogout.rhs @@ -4,4 +4,4 @@ # # -clear +command -v clear &> /dev/null && clear diff --git a/zprofile.rhs b/zprofile.rhs index 03d316f..5e21475 100644 --- a/zprofile.rhs +++ b/zprofile.rhs @@ -2,9 +2,6 @@ # /etc/zprofile and ~/.zprofile are run for login shells # -PATH="$PATH:$HOME/bin" -export PATH - _src_etc_profile() { # Make /etc/profile happier, and have possible ~/.zshenv options like diff --git a/zsh-5.4.1.tar.xz.asc b/zsh-5.4.1.tar.xz.asc deleted file mode 100644 index 7f2f33d..0000000 --- a/zsh-5.4.1.tar.xz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABCAAGBQJZif8QAAoJEKcdmp1L2yezOv4H/iO2qf0EZPBIb1Yq2qC1DRYI -6EaqaBkNTHCExURqSW66WzSZkuwv2brtPuzLjFkqmZrWsoW/w5xEKSfsuxfGpQ+c -PvLvXH7rxHGARazUYC1IMFO0WTXnS9Ucrs4k0b6xruKs88M/nD74C8syhaKaPx9/ -Gl/kXjBZWLQsIzJdUCVmo04Y2Xdob9XFwMsRA0tNTw0a5qoMJiMvKt866bwvVUrQ -i/YxcPsIuKBN9llTyjf/EpF2X+SdYw99/ZT0RV60srd949CIG9itAOy5NhC8HeTD -Ici7iOQcDdi0LO0qPeKmnN4Y7DCX2SYyCVAETMykQaIOcol9m/KBTo3CtBExw2I= -=h8ZF ------END PGP SIGNATURE----- diff --git a/zsh-keyring.asc b/zsh-keyring.asc new file mode 100644 index 0000000..da4b17f --- /dev/null +++ b/zsh-keyring.asc @@ -0,0 +1,269 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFwswugBCADdkzua9HwC8Ip5zh7Z0/nJGKbMyq+cobXArhHos40taeidn0+v +HRES5y6PHR+h56c9TpmJEp/bLCHP5pLvcSz/ETz7+Kk82pld63pOHejSxAQCu7Wv +1NwrTu6TyKlZsNG1oZBxx2LkEN6k8Wy+88DlQqZoXOXafmhF+Sms6gv9DXa029sv +B07EehAx02T+b02QwVVG/Pq9austmsTd9EcNcVNRDneD2LcdxCllbS5IamjVa+NW +oeKZVqbsO71uUolwBvshFSBLPsSY8EZdGApjazQcY0lgkaRA/QlMOisyq2mjV6FY +JXHrlI3WWWK2vROjb35AHiHEE/EVgb5RVpxxABEBAAG0E2RhbmEgPGRhbmFAZGFu +YS5pcz6JAU4EEwEIADgWIQR8p+yq8GIWuQ+JQUas+BRsroy7xAUCXCzC6AIbAwUL +CQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCs+BRsroy7xA5XB/93EQqzs0as07U+ +gmPDpvE7JwIY4TrcvAS7RHgJ4sE+arR5uTziHixiHBQQMedbfV51Jxgws6WL0Ko8 +7K8h9sN2UGnXIc1lWuQ2FDshrcpSHZvLxL4Z7WC3Rj/Dq3/nuZZyljWQNHxg4BlO +EJqe67F5kT2OI591oxB6L1E6F8sVsgxD7gBCPVl/8CsyZ7wkyW/gMRqrlYolJhpS +B5C1zKJzvULQJKXDCh9DUyi7cKFtPyYfYtRWfWhKGz5Dhtt9qvBlxJzZufZ9QNQt +oPhNGF34QaLWTCLRbtoVbNq2NlxalZ5Byhg/0pBcQc2w4C70jSxF3c+2oMEGQIbc +5GJFgLpZuQENBFwswugBCAD5rIYdlLWHOMw+stWTRNquu3SZr+v7RRzreV9fOKN+ +lUiqwicU2uCX39s/q+2wtF536r+IS/53DrMAW8sxf8eroK+MBnJYtP3U8BnB3mag +bTJXMjng2ZqZXvxzetXLyXR+38f+6WbJtV0ByDeFQQJYsFxOag3r6etxrzpwRFm0 +PL440fc0nxOxhxWWJcR0RKTMX87ymipi9mETYeZi7h9B3cDw8aIUz2O3s45TtNlA +NI1MNMU4sAsc5i+w0zJON9gT+rWDYFj6BiEqnRoSK2XDm+WaJa3FwgW1WnHPTe+E +RJFGT58DICU3ta6cCQPavZz/KALyj8GBJ+PydelIAv2rABEBAAGJATYEGAEIACAW +IQR8p+yq8GIWuQ+JQUas+BRsroy7xAUCXCzC6AIbDAAKCRCs+BRsroy7xOgxB/40 +sp9xFq8L/59yRTeXSskOsGk3aUlSnACofcRCGgDSXV5GwWJ/G0O8krhHOISJKuxc +vA0wLFq0WB/EafrKAPTSkrnxmq8noT3c8MpnFRSXHq3sOXkB4nqVEmUu/AAA0TbC +HcwhFQExvK7O+funxIGU5vqHFeQGJ0VcgC/KZUEMNtVV8aZGvn7JzSxEIwHVXGLu +5H7TnNWzLzkzIDVY9IJpTutsc6RMvv6BV8ooWBHSgzmh0MTqEjwNarHAMuffrAjE +zIO3qi0YCaxSDVf2jrWyYpB2QntplmUoubB9s/ngCqVb4A3B7JxPmJuL/0XMUThn +WZLWFpbLimyoUCfHoehZ +=dR/Y +-----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=KiyE +-----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +Qg719Q== +=+Fbc +-----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFZWC4cBCADgb7/oPoCs9SE+/jrzmDT7L+PbYLCygCExxp4mt3CsSzn5xefq +NGU+aBJnvyongcsYrW173GumDjXCG3GBtnmqs3dFeoqnEsSZFMYiQ4ctmWh48P+W +uQVQOWuh0CVS2OCFn37b5F9dy3oF6gJFdqbwOXJSgWMA/+StMGSkslTYFlG/JwZ1 +csk9jSwQw/yKDlTiFaqMwIwSXTK5fItSn3F0R+usgMhwRPu8gvK23tmEhnnwgmlR +xfEwJCLqGnvlW74dRkCjY349GAG1IN2felFfHn0ok/Lbx7coKRoEvHaCVbmtPSmX +Ps9axAV97wk37wS1dhEXcjxLb9GIZgptgo7DABEBAAG0LlBldGVyIFN0ZXBoZW5z +b24gPHAudy5zdGVwaGVuc29uQG50bHdvcmxkLmNvbT6JATcEEwEIACEFAlZWC4cC +GwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQpx2anUvbJ7NtaQf/RQ/RLvOG +iI4XJp/C9JIVHfHL7I801uT8V3y/d2+DehFasR9T+6B/Mf5y22NI31i5XBQuK0Wo +Zsi7F3bhNHyeVgO/p5JLBmxohByjL9f7B+k9Tt/DyWh66AVaCoam4ACR8TBOlNkD +p/8U0zzrxE9fQrjjK/PzhpVe97LKScEAu2Zc/qUFp4eTAnlqyosTqvU64+n1PrNC +CtZVYPnL17GCC4+S7yrh34Kllx+fkoHimTL/cUG+6+7sbmpUImpP+pgNEnL1IzBB +ajZRl1581McMGhIH1TBYrEVnIhononoOO7qr1eahUCEhVvanyVTnSeTTVR0VgK4s +joYLwDLM4XidgrkBDQRWVguHAQgA7JTI0botnBMfTAGff4Duoor5m0PuExQFCHcJ +/df5SyUUskycMlGR73+IbcT2D/zBIFDv5ZhCdOdmIW3CHICK+Ws7N5+KSzlzC+Vf +2LMmXuyJLhXeTqXI1ta6bIGjXeh5VA9Jd7B8dRQhCn1OrGbFhwtJSGejTmcWiLJW ++2GV9s44e9MlscMHvAk9QAvqrSUJoAkN3OCdgjcpDNVT8ek3NnjCD4xrBTxCcI1n +KsJeOgNHPkbou9+eHY80amkAkRn2ZSI9n25WjhKAp9QGDNL5wqHLjgHP6WiEwumN +DWPnPd+5FQHQXy1GHgH2BozfT1KZJ012T0Keuk/hnZJ/TVe4gwARAQABiQEfBBgB +CAAJBQJWVguHAhsMAAoJEKcdmp1L2yez1T0H/jitvgACci+5PQG1djYwioQIui4J +1nSg4HxW+4SCpSwlmH2LkKaF3WbjpPTRhYeMZ5zdOvGnjPUZCjGtWkWx0p+Jrpe/ +QIC3CNXerX9fpkr0K7+knqkb1RsjHU/YSsYTDDVJpL3BQOZzVocOjPa1YPTfTBU5 +tsQdA4RORi15LyAWcEAmR+X3qH2JM5pGP23hhOKnrFSSnfBP6ef1/jjRbfK5yItZ +5DOf6i3WS40zxB67dlBlHZwOQuYA3Sr01hEz4CeAkpV7lQ1gKelm1ZmcFQI6yqcR +PmVjIuxE1A/gTFe6LaAfCGA6/H1H6LLwWQ/rnUi/seMJ6aRkz/05dg7j5+E= +=wOVS +-----END PGP PUBLIC KEY BLOCK----- diff --git a/zsh-memcpy-sigsegv-bracketed-paste.patch b/zsh-memcpy-sigsegv-bracketed-paste.patch new file mode 100644 index 0000000..5310b19 --- /dev/null +++ b/zsh-memcpy-sigsegv-bracketed-paste.patch @@ -0,0 +1,83 @@ +From b258cb7816323050d7e485171c92ad3f1046799e Mon Sep 17 00:00:00 2001 +From: Mikael Magnusson +Date: Fri, 17 Jul 2026 22:53:21 +0200 +Subject: [PATCH] 54985: fix crash with bracketed-paste-magic and undo + +In particular, fc -P/-p didn't interact well with undo. Make sure we +store/restore histline across those calls. + +(cherry-picked from commit 7708d466dfab8dd29f9ae5de12c74af37bf99a4d) +--- + Src/Zle/zle_main.c | 8 ++++++++ + Src/hist.c | 7 ++++++- + Src/zsh.h | 3 ++- + 3 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c +index 44ee63d..817e605 100644 +--- a/Src/Zle/zle_main.c ++++ b/Src/Zle/zle_main.c +@@ -2168,6 +2168,14 @@ zle_main_entry(int cmd, va_list ap) + break; + } + ++ case ZLE_CMD_GET_HIST_LINE: ++ { ++ zlong *p = va_arg(ap, zlong *); ++ *p = histline; ++ ++ break; ++ } ++ + default: + #ifdef DEBUG + dputs("Bad command %d in zle_main_entry", cmd); +diff --git a/Src/hist.c b/Src/hist.c +index f58db23..85f329c 100644 +--- a/Src/hist.c ++++ b/Src/hist.c +@@ -226,6 +226,7 @@ static struct histsave { + HashTable histtab; + Histent hist_ring; + zlong curhist; ++ zlong histline; + zlong histlinect; + zlong histsiz; + zlong savehistsiz; +@@ -3846,6 +3847,10 @@ pushhiststack(char *hf, zlong hs, zlong shs, int level) + h->histsiz = histsiz; + h->savehistsiz = savehistsiz; + h->locallevel = level; ++ if (zleactive) ++ zleentry(ZLE_CMD_GET_HIST_LINE, &h->histline); ++ else ++ h->histline = 0; + + memset(&lasthist, 0, sizeof lasthist); + if (hf) { +@@ -3898,7 +3903,7 @@ pophiststack(void) + hist_ring = h->hist_ring; + curhist = h->curhist; + if (zleactive) +- zleentry(ZLE_CMD_SET_HIST_LINE, curhist); ++ zleentry(ZLE_CMD_SET_HIST_LINE, h->histline); + histlinect = h->histlinect; + histsiz = h->histsiz; + savehistsiz = h->savehistsiz; +diff --git a/Src/zsh.h b/Src/zsh.h +index 8fab0eb..32302ec 100644 +--- a/Src/zsh.h ++++ b/Src/zsh.h +@@ -3244,7 +3244,8 @@ enum { + ZLE_CMD_REFRESH, + ZLE_CMD_SET_KEYMAP, + ZLE_CMD_GET_KEY, +- ZLE_CMD_SET_HIST_LINE ++ ZLE_CMD_SET_HIST_LINE, ++ ZLE_CMD_GET_HIST_LINE, + }; + + /***************************************/ +-- +2.55.0 + diff --git a/zsh.spec b/zsh.spec index 2488cc0..8ceb62f 100644 --- a/zsh.spec +++ b/zsh.spec @@ -1,56 +1,43 @@ Summary: Powerful interactive shell Name: zsh -Version: 5.4.1 -Release: 4%{?dist} -License: MIT +Version: 5.9.2 +Release: 3%{?dist} +License: MIT-Modern-Variant AND ISC AND GPL-2.0-only URL: http://zsh.sourceforge.net/ -Source0: https://www.zsh.org/pub/%{name}-%{version}.tar.xz -Source1: zlogin.rhs -Source2: zlogout.rhs -Source3: zprofile.rhs -Source4: zshrc.rhs -Source5: zshenv.rhs -Source6: dotzshrc -# fix two security issues in shebang line parsing (CVE-2018-0502 CVE-2018-13259) -Patch1: 0001-zsh-5.5.1-CVE-2018-0502-CVE-2018-13259.patch +Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz +Source1: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz.asc +Source2: zsh-keyring.asc -# avoid NULL dereference when using ${(PA)...} on an empty array (CVE-2018-7548) -Patch4: 0004-zsh-5.4.2-CVE-2018-7548.patch +Source3: zlogin.rhs +Source4: zlogout.rhs +Source5: zprofile.rhs +Source6: zshrc.rhs +Source7: zshenv.rhs +Source8: dotzshrc +Source9: dotzprofile -# avoid crash when copying empty hash table (CVE-2018-7549) -Patch5: 0005-zsh-5.4.2-CVE-2018-7549.patch - -# fix stack-based buffer overflow in exec.c:hashcmd() (CVE-2018-1071) -Patch6: 0006-zsh-5.4.2-CVE-2018-1071.patch - -# fix stack-based buffer overflow in gen_matches_files() (CVE-2018-1083) -Patch7: 0007-zsh-5.4.2-CVE-2018-1083.patch - -# fix stack-based buffer overflow in utils.c:checkmailpath() (CVE-2018-1100) -Patch8: 0008-zsh-5.4.2-CVE-2018-1100.patch +# https://sourceforge.net/p/zsh/code/ci/7708d466dfab8dd29f9ae5de12c74af37bf99a4d/ +# fix crash with bracketed-paste-magic and undo (rhbz#2484692) +Patch: zsh-memcpy-sigsegv-bracketed-paste.patch BuildRequires: coreutils BuildRequires: gawk -BuildRequires: gdbm-devel +BuildRequires: gcc +BuildRequires: glibc-langpack-ja +BuildRequires: gpgverify +BuildRequires: groff +BuildRequires: hostname BuildRequires: libcap-devel +BuildRequires: make BuildRequires: ncurses-devel -BuildRequires: pcre-devel +BuildRequires: pcre2-devel BuildRequires: sed BuildRequires: texi2html BuildRequires: texinfo -Requires(post): info grep -Requires(preun): info +Requires(post): grep Requires(postun): coreutils grep -# the hostname package is not available on RHEL-6 -%if 12 < 0%{?fedora} || 6 < 0%{?rhel} -BuildRequires: hostname -%else -# /bin and /usr/bin are separate directories on RHEL-6 -%define _bindir /bin -%endif - Provides: /bin/zsh %description @@ -63,7 +50,7 @@ mechanism, and more. %package html Summary: Zsh shell manual in html format -BuildArch: noarch +BuildArch: noarch %description html The zsh shell is a command interpreter usable as an interactive login @@ -76,21 +63,18 @@ mechanism, and more. This package contains the Zsh manual in html format. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 # enable parallel build sed -e 's|^\.NOTPARALLEL|#.NOTPARALLEL|' -i 'Config/defs.mk.in' %build -# Compile with -fconserve-stack to prevent stack overflow while executing -# unbounded call recursion in a shell script. Without this compiler flag, -# the default stack allocation limit (8192 KiB) is exceeded before the default -# shell call nesting limit (1000) is reached. See #1441092 for details. -# Minimal example: zsh -c 'foo() { if true; then foo; fi }; foo' -export CFLAGS="$RPM_OPT_FLAGS -fconserve-stack" +# make build of run-time loadable modules work again (#1535422) +%undefine _strict_symbol_defs_build -# make loading of module's dependencies work again (#1277996) -export LIBLDFLAGS='-z lazy' +# avoid build failure in case we have working ypcat (#1687574) +export zsh_cv_sys_nis='no' %configure \ --enable-etcdir=%{_sysconfdir} \ @@ -102,10 +86,13 @@ export LIBLDFLAGS='-z lazy' make -C Src headers make -C Src -f Makemod zsh{path,xmod}s.h version.h -make %{?_smp_mflags} all html +%make_build all html %check -# Run the testsuite +# avoid unnecessary failure of the test-suite in case ${RPS1} is set +unset RPS1 + +# run the test-suite make check %install @@ -120,17 +107,18 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/zsh-%{version} rm -f $RPM_BUILD_ROOT%{_infodir}/dir mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir} -for i in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5}; do +for i in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}; do install -m 644 $i $RPM_BUILD_ROOT%{_sysconfdir}/"$(basename $i .rhs)" done mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel -install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.zshrc +install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.zshrc +install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.zprofile # This is just here to shut up rpmlint, and is very annoying. # Note that we can't chmod everything as then rpmlint will complain about # those without a she-bang line. -for i in checkmail harden run-help zcalc zkbd; do +for i in checkmail harden run-help test-repo-git-rebase-{apply,merge} zcalc zkbd; do sed -i -e 's!/usr/local/bin/zsh!%{_bindir}/zsh!' \ $RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/functions/$i chmod +x $RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/functions/$i @@ -148,22 +136,6 @@ if [ "$1" = 1 ]; then fi fi -if [ -f %{_infodir}/zsh.info.gz ]; then -# This is needed so that --excludedocs works. -/sbin/install-info %{_infodir}/zsh.info.gz %{_infodir}/dir \ - --entry="* zsh: (zsh). An enhanced bourne shell." -fi - - -%preun -if [ "$1" = 0 ] ; then - if [ -f %{_infodir}/zsh.info.gz ]; then - # This is needed so that --excludedocs works. - /sbin/install-info --delete %{_infodir}/zsh.info.gz %{_infodir}/dir \ - --entry="* zsh: (zsh). An enhanced bourne shell." - fi -fi - %postun if [ "$1" = 0 ] && [ -f %{_sysconfdir}/shells ] ; then sed -i '\!^%{_bindir}/%{name}$!d' %{_sysconfdir}/shells @@ -186,18 +158,180 @@ fi %doc Doc/*.html %changelog -* Tue Sep 04 2018 Kamil Dudka - 5.4.1-4 -- fix two security issues in shebang line parsing (CVE-2018-0502 CVE-2018-13259) +* Wed Jul 22 2026 Lukáš Zaoral - 5.9.2-3 +- fix crash with bracketed-paste-magic and undo (rhbz#2484692) -* Wed Apr 18 2018 Kamil Dudka - 5.4.1-3 -- fix stack-based buffer overflow in utils.c:checkmailpath() (CVE-2018-1100) -- fix stack-based buffer overflow in gen_matches_files() (CVE-2018-1083) -- fix stack-based buffer overflow in exec.c:hashcmd() (CVE-2018-1071) +* Fri Jul 17 2026 Fedora Release Engineering - 5.9.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild -* Tue Mar 06 2018 Kamil Dudka - 5.4.1-2 +* Mon Jul 13 2026 Lukáš Zaoral - 5.9.2-1 +- rebase to the latest upstream release (rhbz#2499540) + +* Thu Jun 04 2026 Lukáš Zaoral - 5.9.1-1 +- rebase to the latest upstream release (rhbz#2483668) + +* Tue Mar 24 2026 Lukáš Zaoral - 5.9-20 +- fix segfault in _IO_putc (rhbz#2449939) + +* Sat Jan 17 2026 Fedora Release Engineering - 5.9-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Mon Sep 29 2025 Christoph Erhardt - 5.9-18 +- Add completion support for dnf5 + +* Fri Jul 25 2025 Fedora Release Engineering - 5.9-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 5.9-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 5.9-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon May 13 2024 Lukáš Zaoral - 5.9-14 +- fix zlogout when ncurses is not installed (rhbz#2279741) + +* Sat Jan 27 2024 Fedora Release Engineering - 5.9-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jan 17 2024 Lukáš Zaoral - 5.9-12 +- fix segfault in deletefilelist (rhbz#2245462) + +* Fri Dec 8 2023 Florian Weimer - 5.9-11 +- Fix C compatibility issue in the configure script + +* Tue Nov 21 2023 Lukáš Zaoral - 5.9-10 +- fix FTBFS caused by texinfo 7.1 +- fix build of the PCRE module + +* Mon Aug 21 2023 Lukáš Zaoral - 5.9-9 +- port to PCRE 2 (rhbz#1938979) + +* Sat Jul 22 2023 Fedora Release Engineering - 5.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jul 13 2023 Lukáš Zaoral - 5.9-7 +- Make zsh/{tcp,zftp} compatible with full RELRO (rhbz#2212160) + +* Wed May 17 2023 David Cantrell - 5.9-6 +- Update the License tag to use SPDX identifiers + +* Sat Jan 21 2023 Fedora Release Engineering - 5.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jan 13 2023 Timm Bäder - 5.9-4 +- use 'int main()' in test C-codes in configure + +* Mon Jan 09 2023 Kamil Dudka - 5.9-3 +- do not use egrep in tests to make them pass again + +* Sat Jul 23 2022 Fedora Release Engineering - 5.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun May 15 2022 Kamil Dudka - 5.9-1 +- update to latest upstream release + +* Sun Feb 13 2022 Kamil Dudka - 5.8.1-1 +- update to latest upstream release (fixes CVE-2021-45444) + +* Sat Jan 22 2022 Fedora Release Engineering - 5.8-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Jan 04 2022 Kamil Dudka - 5.8-8 +- prepend ~/.local/bin and ~/bin to $PATH for newly created users (#1900809) + +* Thu Nov 25 2021 Debarshi Ray - 5.8-7 +- Overwrite PROMPT only if it's set to the built-in default (#2026749) + +* Fri Jul 23 2021 Fedora Release Engineering - 5.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Mar 25 2021 Kamil Dudka - 5.8-5 +- complete file arguments after rpmbuild -r/-b/-t + +* Thu Jan 28 2021 Fedora Release Engineering - 5.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 5.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 14 2020 Tom Stellard - 5.8-2 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + +* Mon Feb 24 2020 Kamil Dudka - 5.8-1 +- update to latest upstream release + +* Fri Jan 31 2020 Fedora Release Engineering - 5.7.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jul 26 2019 Kamil Dudka - 5.7.1-4 +- make failed searches of history in Zle robust (#1722703) + +* Tue Mar 12 2019 Kamil Dudka - 5.7.1-3 +- avoid build failure in case we have working ypcat (#1687574) + +* Fri Mar 8 2019 Tim Landscheidt - 5.7.1-2 +- Remove obsolete requirements for %%post/%%preun scriptlets + +* Mon Feb 04 2019 Kamil Dudka - 5.7.1-1 +- update to latest upstream release + +* Sun Feb 03 2019 Fedora Release Engineering - 5.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Jan 28 2019 Jason L Tibbitts III - 5.7-1 +- Update to latest upstream release. + +* Fri Nov 30 2018 Kamil Dudka - 5.6.2-3 +- return non-zero exit status on nested parse error (#1654989) + +* Mon Nov 12 2018 Kamil Dudka - 5.6.2-2 +- fix programming mistakes detected by static analysis + +* Fri Sep 14 2018 Kamil Dudka - 5.6.2-1 +- update to latest upstream release + +* Mon Sep 10 2018 Kamil Dudka - 5.6.1-1 +- update to latest upstream release + +* Tue Sep 04 2018 Kamil Dudka - 5.6-1 +- update to latest upstream release (fixes CVE-2018-0502 and CVE-2018-13259) + +* Sat Jul 14 2018 Fedora Release Engineering - 5.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Apr 17 2018 Kamil Dudka - 5.5.1-1 +- update to latest upstream release + +* Mon Apr 09 2018 Kamil Dudka - 5.5-1 +- update to latest upstream release, which fixes the following vulnerabilities: + CVE-2018-1100 - stack-based buffer overflow in utils.c:checkmailpath() + CVE-2018-1083 - stack-based buffer overflow in compctl.c:gen_matches_files() + CVE-2018-1071 - stack-based buffer overflow in exec.c:hashcmd() + +* Tue Mar 06 2018 Kamil Dudka - 5.4.2-7 - avoid crash when copying empty hash table (CVE-2018-7549) - avoid NULL dereference when using ${(PA)...} on an empty array (CVE-2018-7548) +* Mon Feb 19 2018 Kamil Dudka - 5.4.2-6 +- add explicit BR for the gcc compiler + +* Fri Feb 09 2018 Fedora Release Engineering - 5.4.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Jan 22 2018 Kamil Dudka - 5.4.2-4 +- make build of run-time loadable modules work again (#1535422) + +* Tue Jan 16 2018 Kamil Dudka - 5.4.2-3 +- rebuild against latest gdbm-devel (#1533176) + +* Wed Oct 04 2017 Kamil Dudka - 5.4.2-2 +- make the call depth limit configurable by $FUNCNEST (#1441092) + +* Mon Aug 28 2017 Kamil Dudka - 5.4.2-1 +- update to latest upstream release + * Wed Aug 09 2017 Kamil Dudka - 5.4.1-1 - update to latest upstream release diff --git a/zshprompt.pl b/zshprompt.pl deleted file mode 100644 index b9d5f0f..0000000 --- a/zshprompt.pl +++ /dev/null @@ -1,235 +0,0 @@ -#!/usr/bin/perl -w - -#requires Gtk-Perl - -use Gtk; -use strict; - -set_locale Gtk; -init Gtk; - -my $window = new Gtk::Window("toplevel"); -$window->signal_connect( "delete_event", \&CloseAppWindow ); -my $table = new Gtk::Table( 20, 6, 0 ); -$window->border_width( 5 ); -#$window->add( $button ); - - -my $prompt = new Gtk::Entry( 128); -my $log = new Gtk::Text(); -$log->set_usize(40,60); -$log->show(); -$prompt->show(); -#$prompt->set_editable (1); -$prompt->set_text(""); -$table->attach( $prompt,0,4,0,4,[ 'expand', 'shrink', 'fill' ], - 'shrink', - 0, 0 ); - -$table->set_row_spacings( 5 ); -$table->set_col_spacings( 5 ); - -my $currDir = new Gtk::Button( "Current Directory" ); -$currDir->show(); -$table->attach_defaults( $currDir,0,1,4,6 ); - -my $errorCode = new Gtk::Button( "Last Return Code" ); -$errorCode->show(); -$table->attach_defaults( $errorCode,1,2,4,6 ); - -my $currTime = new Gtk::Button( "Time" ); -$currTime->show(); -$table->attach_defaults( $currTime,2,3,4,6 ); - -my $hist = new Gtk::Button( "History Number" ); -$hist->show(); -$table->attach_defaults( $hist,3,4,4,6 ); - -my $host = new Gtk::Button( "Hostname" ); -$host->show(); -$table->attach_defaults( $host,0,1,6,8 ); - - - -my $backgroundBlue = new Gtk::Button( "Blue Background" ); -$backgroundBlue->show(); -$table->attach_defaults( $backgroundBlue,0,1,8,10 ); - -my $backgroundRed = new Gtk::Button( "Red Background" ); -$backgroundRed->show(); -$table->attach_defaults( $backgroundRed,1,2,8,10 ); - -my $backgroundGreen = new Gtk::Button( "Green Background" ); -$backgroundGreen->show(); -$table->attach_defaults( $backgroundGreen,2,3,8,10 ); - -my $backgroundYellow = new Gtk::Button( "Yellow Background" ); -$backgroundYellow->show(); -$table->attach_defaults( $backgroundYellow,3,4,8,10 ); - -my $backgroundBlack = new Gtk::Button( "Black Background" ); -$backgroundBlack->show(); -$table->attach_defaults( $backgroundBlack,5,6,8,10 ); - -my $backgroundWhite = new Gtk::Button( "White Background" ); -$backgroundWhite->show(); -$table->attach_defaults( $backgroundWhite,6,7,8,10 ); - -my $backgroundPink = new Gtk::Button( "Pink Background" ); -$backgroundPink->show(); -$table->attach_defaults( $backgroundPink,7,8,8,10 ); - - - - - -my $textBlue = new Gtk::Button( "Blue Text" ); -$textBlue->show(); -$table->attach_defaults( $textBlue,0,1,10,12 ); - -my $textRed = new Gtk::Button( "Red Text" ); -$textRed->show(); -$table->attach_defaults( $textRed,1,2,10,12 ); - -my $textGreen = new Gtk::Button( "Green Text" ); -$textGreen->show(); -$table->attach_defaults( $textGreen,2,3,10,12 ); - -my $textYellow = new Gtk::Button( "Yellow Text" ); -$textYellow->show(); -$table->attach_defaults( $textYellow,3,4,10,12 ); - -my $textBlack = new Gtk::Button( "Black Text" ); -$textBlack->show(); -$table->attach_defaults( $textBlack,5,6,10,12 ); - -my $textWhite = new Gtk::Button( "White Text" ); -$textWhite->show(); -$table->attach_defaults( $textWhite,6,7,10,12 ); - -my $textPink = new Gtk::Button( "Pink Text" ); -$textPink->show(); -$table->attach_defaults( $textPink,7,8,10,12 ); - - -my $textDefault = new Gtk::Button( "Default Text" ); -$textDefault->show(); -$table->attach_defaults( $textDefault,0,1,12,14 ); - -my $backgroundDefault = new Gtk::Button( "Default Background" ); -$backgroundDefault->show(); -$table->attach_defaults( $backgroundDefault,1,2,12,14 ); - - - -my $set = new Gtk::Button( "Save Settings" ); -$set->show(); -$table->attach_defaults( $set,0,1,16,18 ); - -my $xterm = new Gtk::Button( "Test saved settings" ); -$xterm->show(); -$table->attach_defaults( $xterm,1,2,16,18 ); - -$table->attach_defaults( $log,0,6,18,20 ); - - -$currDir->signal_connect( "clicked", \&insertButtonText, "%1/" ); -$errorCode->signal_connect( "clicked", \&insertButtonText, "%?" ); -$currTime->signal_connect( "clicked", \&insertButtonText, "%T" ); -$hist->signal_connect( "clicked", \&insertButtonText, "%!" ); -$host->signal_connect( "clicked", \&insertButtonText, "%m" ); - -$backgroundBlue->signal_connect( "clicked", \&insertButtonText, "%{\$bg[blue]%}" ); -$backgroundRed->signal_connect( "clicked", \&insertButtonText, "%{\$bg[red]%}" ); -$backgroundGreen->signal_connect( "clicked", \&insertButtonText, "%{\$bg[green]%}" ); -$backgroundYellow->signal_connect( "clicked", \&insertButtonText, "%{\$bg[yellow]%}" ); -$backgroundBlack->signal_connect( "clicked", \&insertButtonText, "%{\$bg[black]%}" ); -$backgroundWhite->signal_connect( "clicked", \&insertButtonText, "%{\$bg[white]%}" ); -$backgroundPink->signal_connect( "clicked", \&insertButtonText, "%{\$bg[magenta]%}" ); -$backgroundDefault->signal_connect( "clicked", \&insertButtonText, "%{\$bg[default]%}" ); - - - - -$textBlue->signal_connect( "clicked", \&insertButtonText, "%{\$fg[blue]%}" ); -$textRed->signal_connect( "clicked", \&insertButtonText, "%{\$fg[red]%}" ); -$textGreen->signal_connect( "clicked", \&insertButtonText, "%{\$fg[green]%}" ); -$textYellow->signal_connect( "clicked", \&insertButtonText, "%{\$fg[yellow]%}" ); -$textBlack->signal_connect( "clicked", \&insertButtonText, "%{\$fg[black]%}" ); -$textWhite->signal_connect( "clicked", \&insertButtonText, "%{\$fg[white]%}" ); -$textPink->signal_connect( "clicked", \&insertButtonText, "%{\$fg[magenta]%}" ); -$textDefault->signal_connect( "clicked", \&insertButtonText, "%{\$fg[default]%}" ); - - - - - -$set->signal_connect( "clicked", \&pushEnv ); -$xterm->signal_connect( "clicked", \&xterm ); - -sub xterm -{ -my $string="xterm -e zsh -li&"; -#$string.=$prompt->get_text(); - -#$string.="' zsh -li\"& "; - -system($string); -# $prompt->append_text( $string ); -$log->insert( "", "white", "black", "executing:\n $string\n"); -} - - -sub pushEnv -{ -chdir("~"); -use Env qw(PS1); -my $pNotSet=0; -open(PROMPT, "+<", ".prompt") or $pNotSet=1; - - -if($pNotSet) -{ - #$prompt->insert( "", "white", "black", "prompt is not set"); - open(ZSHRC, '>>','.zshrc') or die "cannot open zshrc"; - print ZSHRC ". ~/.prompt\n"; - close (ZSHRC); -} -close (PROMPT); -open(PROMPT, ">", ".prompt"); -print PROMPT "export PS1=\"",$prompt->get_text(),"\"\n"; - -#$prompt->insert( "", "white", "black", $PS1); - -close(PROMPT); -close(ZSHRC); -$prompt->grab_focus(); - -} -$prompt->can_default(1); -$prompt->grab_default(); -$table->show(); -$window->add( $table ); - - - - -$window->show(); -$prompt->grab_focus(); -main Gtk; - -exit( 0 ); - -sub CloseAppWindow -{ - Gtk->exit( 0 ); - return 0; -} - - -sub insertButtonText -{ - my ($widget, $txt) = @_; - $prompt->append_text( $txt ); -$prompt->grab_focus(); -} diff --git a/zshrc.rhs b/zshrc.rhs index 5b3b92a..82dc213 100644 --- a/zshrc.rhs +++ b/zshrc.rhs @@ -8,7 +8,7 @@ #setenv() { export $1=$2 } # csh compatibility # Set prompts -PROMPT='[%n@%m]%~%# ' # default prompt +[[ "$PROMPT" = "%m%# " ]] && PROMPT='[%n@%m]%~%# ' # default prompt #RPROMPT=' %~' # prompt for right side of screen # bindkey -v # vi key bindings