Date: Tuesday, August 8, 2017 @ 15:01:06 Author: pierre Revision: 301776
upgpkg: zsh 5.4-1 Modified: zsh/trunk/PKGBUILD Deleted: zsh/trunk/40285.patch -------------+ 40285.patch | 66 ---------------------------------------------------------- PKGBUILD | 15 +++++-------- 2 files changed, 6 insertions(+), 75 deletions(-) Deleted: 40285.patch =================================================================== --- 40285.patch 2017-08-08 14:21:03 UTC (rev 301775) +++ 40285.patch 2017-08-08 15:01:06 UTC (rev 301776) @@ -1,66 +0,0 @@ -From 48cadf48ff9c61ce09e826ad9a58e250e999a262 Mon Sep 17 00:00:00 2001 -From: Peter Stephenson <p...@zsh.org> -Date: Fri, 6 Jan 2017 17:42:13 +0000 -Subject: [PATCH] 40285: Be more careful with pattern allocation in history - isearch. - -If there are ZLE hooks to be called, they may use patterns, in -which case it's not safe to allocate the isearch pattern in the -static buffer. ---- - Src/Zle/zle_hist.c | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/Src/Zle/zle_hist.c b/Src/Zle/zle_hist.c -index abd6e17..434735d 100644 ---- a/Src/Zle/zle_hist.c -+++ b/Src/Zle/zle_hist.c -@@ -1220,13 +1220,12 @@ doisearch(char **args, int dir, int pattern) - char *patbuf = ztrdup(sbuf); - char *patstring; - /* -- * Use static pattern buffer since we don't need -- * to maintain it and won't call other pattern functions -- * meanwhile. -+ * Do not use static pattern buffer (PAT_STATIC) since we call zle hooks, -+ * which might call other pattern functions. Use PAT_ZDUP instead. - * Use PAT_NOANCH because we don't need the match - * anchored to the end, even if it is at the start. - */ -- int patflags = PAT_STATIC|PAT_NOANCH; -+ int patflags = PAT_ZDUP|PAT_NOANCH; - if (sbuf[0] == '^') { - /* - * We'll handle the anchor later when -@@ -1521,6 +1520,7 @@ doisearch(char **args, int dir, int pattern) - if (only_one || !top_spot || old_sbptr != sbptr) - break; - } -+ freepatprog(patprog); - patprog = NULL; - nosearch = 1; - skip_pos = 0; -@@ -1632,6 +1632,7 @@ doisearch(char **args, int dir, int pattern) - } - strcpy(sbuf + sbptr, paste); - sbptr += pastelen; -+ freepatprog(patprog); - patprog = NULL; - free(paste); - } else if (cmd == Th(z_acceptsearch)) { -@@ -1682,6 +1683,7 @@ doisearch(char **args, int dir, int pattern) - * always valid at this point. - */ - sbptr += zlecharasstring(LASTFULLCHAR, sbuf + sbptr); -+ freepatprog(patprog); - patprog = NULL; - } - if (feep) -@@ -1702,6 +1704,7 @@ doisearch(char **args, int dir, int pattern) - zsfree(okeymap); - if (matchlist) - freematchlist(matchlist); -+ freepatprog(patprog); - isearch_active = 0; - /* - * Don't allow unused characters provided as a string to the Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-08-08 14:21:03 UTC (rev 301775) +++ PKGBUILD 2017-08-08 15:01:06 UTC (rev 301776) @@ -3,26 +3,23 @@ pkgbase=zsh pkgname=('zsh' 'zsh-doc') -pkgver=5.3.1 -pkgrel=2 +pkgver=5.4 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.zsh.org/' license=('custom') makedepends=('pcre' 'libcap' 'gdbm') source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.xz"{,.asc} - 'zprofile' - '40285.patch') -md5sums=('67d3e5ed99de68340c16aef613b0ecf7' + 'zprofile') +md5sums=('5051c31f20173d88ce307f514f23a409' 'SKIP' - '6b908409528e77e00a26b7283f1f425d' + '43bc3e821d9d486587bc8507640a0475' 'SKIP' - '24a9335edf77252a7b5f52e079f7aef7' - 'fed5d393aa5b6ea51e873fa0605796ac') + '24a9335edf77252a7b5f52e079f7aef7') validpgpkeys=('F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3') prepare() { cd "${srcdir}/${pkgbase}-${pkgver}" - patch -p1 -i "${srcdir}/40285.patch" # Set correct keymap path sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys