Drop all but two patches for 5.4.1, add changelog entry for 5.4.1-1

10 files changed, 8 insertions, 336 deletions

diff --git a/debian/changelog b/debian/changelog
index 93febbc47..fc1ccef73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+zsh (5.4.1-1) UNRELEASED; urgency=low
+
+  * [e3b67a81] Import new upstream release 5.4.1
+    + Drop all patches except further-mitigate-test-suite-hangs.patch and
+      update-debian-sections.patch (applied upstream; were cherry-picked)
+
+ -- Axel Beckert <abe@debian.org>  Thu, 10 Aug 2017 18:07:34 +0200
+
 zsh (5.3.1-5) unstable; urgency=medium
 
   * [aa55c6bb] Patch configure.ac to add support for yodl 4 to yodl
diff --git a/debian/patches/add_yodl_4_support_to_yodl_version_check.patch b/debian/patches/add_yodl_4_support_to_yodl_version_check.patch
deleted file mode 100644
index 0a3beca7f..000000000
--- a/debian/patches/add_yodl_4_support_to_yodl_version_check.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Add support for yodl 4 to yodl version check
-Author: Axel Beckert <abe@debian.org>
-Bugs-Debian: https://bugs.debian.org/865492
-Forwarded: https://www.zsh.org/cgi-bin/mla/redirect?WORKERNUMBER=41342
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -628,6 +628,7 @@
-     case `yodl --version` in
-       *"version 2."*) YODL_OPTIONS='-k' ;;
-       *"version 3."*) YODL_OPTIONS='-k -L' ;;
-+      *"version 4."*) YODL_OPTIONS='-k -L' ;;
-     esac
- fi
- AC_SUBST(YODL_OPTIONS)
diff --git a/debian/patches/cherry-pick_2e76fb80_turn_off_POSIX_IDENTIFIERS_option_in_completion.patch b/debian/patches/cherry-pick_2e76fb80_turn_off_POSIX_IDENTIFIERS_option_in_completion.patch
deleted file mode 100644
index 87a28a13e..000000000
--- a/debian/patches/cherry-pick_2e76fb80_turn_off_POSIX_IDENTIFIERS_option_in_completion.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: turn off POSIX_IDENTIFIERS option in completion
-Origin: 2e76fb80b4c228944b57b8f669e75456a23f147d
-Author: Peter Stephenson <pws@zsh.org>
-Reviewed-By: Axel Beckert <abe@debian.org>
-
---- a/Completion/compinit
-+++ b/Completion/compinit
-@@ -153,6 +153,7 @@
-     NO_markdirs
-     NO_octalzeroes
-     NO_posixbuiltins
-+    NO_posixidentifiers
-     NO_shwordsplit
-     NO_shglob
-     NO_warncreateglobal
diff --git a/debian/patches/cherry-pick_48cadf48_be_more_careful_with_pattern_allocation_in_history_isearch.patch b/debian/patches/cherry-pick_48cadf48_be_more_careful_with_pattern_allocation_in_history_isearch.patch
deleted file mode 100644
index f15f702f7..000000000
--- a/debian/patches/cherry-pick_48cadf48_be_more_careful_with_pattern_allocation_in_history_isearch.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: 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.
-Origin: 48cadf48ff9c61ce09e826ad9a58e250e999a262
-Author: Peter Stephenson <pws@zsh.org>
-Reviewed-By: Daniel Shahaf <d.s@daniel.shahaf.name>
-
---- a/Src/Zle/zle_hist.c
-+++ b/Src/Zle/zle_hist.c
-@@ -1220,13 +1220,12 @@
- 		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 @@
- 		    if (only_one || !top_spot || old_sbptr != sbptr)
- 			break;
- 		}
-+		freepatprog(patprog);
- 		patprog = NULL;
- 		nosearch = 1;
- 		skip_pos = 0;
-@@ -1632,6 +1632,7 @@
- 	    }
- 	    strcpy(sbuf + sbptr, paste);
- 	    sbptr += pastelen;
-+	    freepatprog(patprog);
- 	    patprog = NULL;
- 	    free(paste);
- 	} else if (cmd == Th(z_acceptsearch)) {
-@@ -1682,6 +1683,7 @@
- 	     * always valid at this point.
- 	     */
- 	    sbptr += zlecharasstring(LASTFULLCHAR, sbuf + sbptr);
-+	    freepatprog(patprog);
- 	    patprog = NULL;
- 	}
- 	if (feep)
-@@ -1702,6 +1704,7 @@
-     zsfree(okeymap);
-     if (matchlist)
- 	freematchlist(matchlist);
-+    freepatprog(patprog);
-     isearch_active = 0;
-     /*
-      * Don't allow unused characters provided as a string to the
diff --git a/debian/patches/cherry-pick_8d4c9854_zero_new_space_allocated_in_prompt_buffer.patch b/debian/patches/cherry-pick_8d4c9854_zero_new_space_allocated_in_prompt_buffer.patch
deleted file mode 100644
index acfcc2bec..000000000
--- a/debian/patches/cherry-pick_8d4c9854_zero_new_space_allocated_in_prompt_buffer.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: zero new space allocated in prompt buffer
-Origin: 8d4c98540de9bcdba8565facc91fbc45855d27e2
-Author: Paulo Andrade <pandrade@redhat.com>
-Reviewed-By: Daniel Shahaf <d.s@daniel.shahaf.name>
-
---- a/Src/prompt.c
-+++ b/Src/prompt.c
-@@ -920,6 +920,7 @@
- 	if(need & 255)
- 	    need = (need | 255) + 1;
- 	bv->buf = realloc(bv->buf, bv->bufspc += need);
-+	memset(bv->buf + bv->bufspc - need, 0, need);
- 	bv->bp = bv->buf + bo;
- 	if(bo1 != -1)
- 	    bv->bp1 = bv->buf + bo1;
diff --git a/debian/patches/cherry-pick_ebd7fdd9_fix_setting_of_parameter_values_in_compvalues.patch b/debian/patches/cherry-pick_ebd7fdd9_fix_setting_of_parameter_values_in_compvalues.patch
deleted file mode 100644
index 3ab071006..000000000
--- a/debian/patches/cherry-pick_ebd7fdd9_fix_setting_of_parameter_values_in_compvalues.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix setting of parameter values in compvalues
-Origin: ebd7fdd9326cf36feda3b0ca906d7b9b8bf79cb5
-Author: Peter Stephenson <p.w.stephenson@ntlworld.com>
-Reviewed-By: Daniel Shahaf <d.s@daniel.shahaf.name>
-
---- a/Src/Zle/computil.c
-+++ b/Src/Zle/computil.c
-@@ -3546,8 +3546,8 @@
- 	    Cvval val = cv_get_val(cv_laststate.d, args[1]);
- 
- 	    if (val && val->arg) {
--		setsparam(args[2], val->arg->descr);
--		setsparam(args[3], val->arg->action);
-+		setsparam(args[2], ztrdup(val->arg->descr));
-+		setsparam(args[3], ztrdup(val->arg->action));
- 
- 		if (args[4])
- 		    setsparam(args[4], ztrdup(val->name));
diff --git a/debian/patches/remove-SH_USE_BSD_ECHO-autoconf-test-to-make-build-more-reproducible.patch b/debian/patches/remove-SH_USE_BSD_ECHO-autoconf-test-to-make-build-more-reproducible.patch
deleted file mode 100644
index f7b97e99d..000000000
--- a/debian/patches/remove-SH_USE_BSD_ECHO-autoconf-test-to-make-build-more-reproducible.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Remove SH_USE_BSD_ECHO autoconf test
- It is unused; doesn't make sense in "build on one box, install on many"
- context; and its presence causes the downstream packages that install
- config.h to be non-reproducible.
- .
- See https://bugs.debian.org/849288 for a discussion of this issue.
-Author: Daniel Shahaf <danielsh@apache.org>
-Origin: https://www.zsh.org/mla/workers/2016/msg02716.html
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -2309,21 +2309,6 @@
- if test x$zsh_cv_sys_fifo = xyes; then
-   AC_DEFINE(HAVE_FIFOS)
- fi
--dnl ---------------------
--dnl echo style of /bin/sh
--dnl ---------------------
--AC_CACHE_CHECK(if echo in /bin/sh interprets escape sequences,
--zsh_cv_prog_sh_echo_escape,
--[if test "`/bin/sh -c \"echo '\\n'\"`" = "\\n"; then
--  zsh_cv_prog_sh_echo_escape=no
--else
--  zsh_cv_prog_sh_echo_escape=yes
--fi])
--AH_TEMPLATE([SH_USE_BSD_ECHO],
--[Define to 1 if /bin/sh does not interpret \ escape sequences.])
--if test x$zsh_cv_prog_sh_echo_escape = xno; then
--  AC_DEFINE(SH_USE_BSD_ECHO)
--fi
- 
- dnl -----------
- dnl test for whether link() works
diff --git a/debian/patches/series b/debian/patches/series
index 291a424cb..cb6fdacc2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,2 @@
 further-mitigate-test-suite-hangs.patch
 update-debian-sections.patch
-remove-SH_USE_BSD_ECHO-autoconf-test-to-make-build-more-reproducible.patch
-update_bts_completion.patch
-swaks_completion.patch
-cherry-pick_8d4c9854_zero_new_space_allocated_in_prompt_buffer.patch
-cherry-pick_48cadf48_be_more_careful_with_pattern_allocation_in_history_isearch.patch
-cherry-pick_ebd7fdd9_fix_setting_of_parameter_values_in_compvalues.patch
-cherry-pick_2e76fb80_turn_off_POSIX_IDENTIFIERS_option_in_completion.patch
-add_yodl_4_support_to_yodl_version_check.patch
diff --git a/debian/patches/swaks_completion.patch b/debian/patches/swaks_completion.patch
deleted file mode 100644
index 5c1fcd650..000000000
--- a/debian/patches/swaks_completion.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-X-Seq: 40302
-Date: Sun, 8 Jan 2017 03:30:49 +0000
-From: Daniel Shahaf <d.s@daniel.shahaf.name>
-To: zsh-workers@zsh.org
-Subject: _swaks completion
-Message-ID: <20170108033049.GA27435@fujitsu.shahaf.local2>
-Origin: https://www.zsh.org/cgi-bin/mla/redirect?WORKERNUMBER=40302
-
-This doesn't include all options, only a few options that I've used so
-far, but I suppose it'd still be better to commit it than not to.
-
-diff --git a/Completion/Unix/Command/_swaks b/Completion/Unix/Command/_swaks
-new file mode 100644
-index 0000000..7361b08
---- /dev/null
-+++ b/Completion/Unix/Command/_swaks
-@@ -0,0 +1,40 @@
-+#compdef swaks
-+
-+_arguments \
-+  '(-s --server -p --port)'{-s+,--server=}'[target host[:port\]]:host[\:port]:_hosts' \
-+  '(-p --port)'{-p+,--port=}'[target port number]:port number:(25 465 587)' \
-+  '--copy-routing[derive target host:port from email address domain part]:email address domain part' \
-+  '(-t --to)'{-t+,--to=}':envelope recipient(s):_sequence _email_addresses -c' \
-+  '(-f --from)'{-f+,--from=}':envelope sender:_email_addresses -c' \
-+  '(--ehlo --lhlo -h --helo)'{-h+,--ehlo,--helo,--lhlo}':HELO string:_hosts' \
-+  '(-q --quit-after)'{-q+,--quit-after=}'[stop transaction early]:stop point:((
-+      CONNECT\:banner BANNER\:banner
-+      FIRST-HELO\:first\ HELO FIRST-EHLO\:first\ HELO
-+      XCLIENT\:XCLIENT
-+      TLS\:TLS\ negotiation
-+      HELO\:second\ HELO EHLO\:second\ HELO
-+      AUTH\:authentication
-+      MAIL\:MAIL\ FROM FROM\:MAIL\ FROM
-+      RCPT\:RCPT\ TO TO\:RCPT\ TO
-+      ))' \
-+  '--protocol=:protocol variant:((
-+      SMTP\:HELO\ 25
-+      SSMTP\:EHLO\ 465
-+      SSMTPA\:EHLO\ 465\ authenticated
-+      SMTPS\:HELO\ 465
-+      ESMTP\:EHLO\ 25
-+      ESMTPA\:EHLO\ 25\ authenticated
-+      ESMTPS\:EHLO\ STARTTLS\ 25
-+      ESMTPSA\:EHLO\ STARTTLS\ 25\ authenticated
-+      ))' \
-+  '-tls[TLS required]' \
-+  '(-tlsos --tls-optional-strict)'{-tlsos,--tls-optional-strict}'[TLS iff offered by target]' \
-+  '(-tlsc --tls-on-connect)'{-tlsc,--tls-on-connect}'[TLS on connect (port 465)]' \
-+  '(-tlsp --tls-protocol)'{-tlsp,--tls-protocol=}':TLS protocol:(sslv2 sslv3 tlsv1 tlsv1_1 tlsv1_2)' \
-+  '-tls-cipher:OpenSSL cipher string: ' \
-+  '--tls-verify[verify TLS certificates]' \
-+  '--tls-ca-path=:OpenSSL CAfile or CAdir:_files' \
-+  '--tls-get-peer-cert=-:file to write (omit for STDOUT)' \
-+  '(-d --data)'{-d+,--data=}'[specify DATA payload]:filename (or string with tokens):_files' \
-+  '*'{-ah,--add-header=}'[add headers]:<Header>\: Value' \
-+  '*'{-h,--header=}'[replace headers]:<Header>\: Value'
diff --git a/debian/patches/update_bts_completion.patch b/debian/patches/update_bts_completion.patch
deleted file mode 100644
index fe798dfaa..000000000
--- a/debian/patches/update_bts_completion.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-X-Seq: 40303
-From: Daniel Shahaf <d.s@daniel.shahaf.name>
-To: zsh-workers@zsh.org
-Subject: [PATCH] _bts: Add more subcommands.
-Date: Sun,  8 Jan 2017 03:47:24 +0000
-Message-Id: <1483847244-7913-1-git-send-email-danielsh@fujitsu.shahaf.local2>
-Origin:  https://www.zsh.org/cgi-bin/mla/redirect?WORKERNUMBER=40303
-
-Since 'done' is deprecated, stop offering it but do complete after it.
----
- Completion/Debian/Command/_bts | 64 ++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 58 insertions(+), 6 deletions(-)
-
-diff --git a/Completion/Debian/Command/_bts b/Completion/Debian/Command/_bts
-index f415989..70b95ef 100644
---- a/Completion/Debian/Command/_bts
-+++ b/Completion/Debian/Command/_bts
-@@ -22,16 +22,18 @@ compset -N '[,.]' && first=0
- [[ $first -eq 0 ]] || compset -n 2
- 
- if [[ CURRENT -eq 1 ]]; then
--  _wanted cmd expl 'bts command' compadd show bugs close reopen retitle \
-+  _wanted cmd expl 'bts command' compadd show bugs reopen retitle \
-       reassign merge unmerge tag tags severity forwarded notforwarded help \
-       clone submitter found notfound block unblock user usertag usertags \
-       package owner noowner reportspam cache cleancache claim unclaim \
--      subscribe unsubscribe fixed notfixed affects
-+      subscribe unsubscribe fixed notfixed affects spamreport status \
-+      select done archive unarchive summary forcemerge limit listcachedbugs \
-+      version
-   return
- fi
- 
- case "$words[1]" in
--  (close|unmerge|notforwarded|noowner|reportspam)
-+  (unmerge|notforwarded|noowner|reportspam|spamreport|archive|unarchive)
-     if [[ CURRENT -eq 2 ]]; then
-       _debbugs_bugnumber
-     else
-@@ -75,7 +77,10 @@ case "$words[1]" in
-      _wanted sep expl 'separator' compadd -S ' ' , .
-     fi
-   ;;
--  merge)
-+  (status)
-+    # TODO: some additional syntaxes aren't being completed.
-+  ;&
-+  (merge|forcemerge)
-     _debbugs_bugnumber
-     if [[ CURRENT -gt 2 ]]; then
-      _wanted sep expl 'separator' compadd -S ' ' , .
-@@ -208,8 +213,10 @@ case "$words[1]" in
-   ;;
-   (cleancache)
-      _alternative \
--       'package:package:_deb_packages avail' \
--       'email:email address:_email_addresses -c' \
-+       'source-packages:source package:_deb_packages -P "src:" source' \
-+       'package:binary package:_deb_packages avail' \
-+       'email:email address:_email_addresses -c -P "from:"' \
-+       'bugnum:bug number:_debbugs_bugnumber' \
-        'all:all:compadd ALL'
-   ;;
-   (claim|unclaim)
-@@ -232,6 +239,51 @@ case "$words[1]" in
-       _wanted package expl 'package' _deb_packages avail
-     fi
-   ;;
-+  (summary)
-+    case $CURRENT in
-+      (2) _debbugs_bugnumber;;
-+      (3) _message -e message-number 'message number';&
-+      (4) _wanted sep expl 'separator' compadd -S ' ' , .;;
-+    esac
-+  ;;
-+  (close|done)
-+    case $CURRENT in
-+      (2) _debbugs_bugnumber;;
-+      (3) _message -e version 'version';&
-+      (4) _wanted sep expl 'separator' compadd -S ' ' , .;;
-+    esac
-+  ;;
-+  (select)
-+    _values -S : -w "select field" \
-+      '*package[binary package]: :_deb_packages avail' \
-+      '*source[source package]: :_deb_packages source' \
-+      '*maintainer:email address of the maintainer:_email_addresses -c' \
-+      '*submitter:email address of the submitter:_email_addresses -c' \
-+      '*severity:severity:(wishlist minor normal important serious grave critical)' \
-+      '*tag[tags applied to the bug]:tags:' \
-+      '*owner:owner:_email_addresses -c' \
-+      '*correspondent:email address of a correspondent:_email_addresses -c' \
-+      '*affects:affected package:_deb_packages avail' \
-+      '*users:namespaces of usertags:_email_addresses -c' \
-+      '*archive:whether to search archived bugs:((0:no 1:yes both:both))'
-+      # undocumented: bugs
-+    _wanted sep expl 'separator' compadd -S ' ' , .
-+  ;;
-+  (limit)
-+    _values -S : -w "limit field" \
-+      '*submitter[email address of the submitter]:submitter:_email_addresses -c' \
-+      '*date[bug submission timestamp]:unix timestamp' \
-+      '*subject[subject of the bug]:bug subject:' \
-+      '*msgid[message-id of the initial bug report]:message-id:' \
-+      '*package[binary package]: :_deb_packages avail' \
-+      '*source[source package]: :_deb_packages source' \
-+      '*tag[tags applied to the bug]:tags:' \
-+      '*severity:severity:(wishlist minor normal important serious grave critical)' \
-+      '*owner:owner:_email_addresses -c' \
-+      '*affects:affected package:_deb_packages avail' \
-+      '*archive:whether to search archived bugs:((0:no 1:yes both:both))'
-+    _wanted sep expl 'separator' compadd -S ' ' , .
-+  ;;
-   help)
-   ;&
-   *) _wanted sep expl 'separator' compadd -S ' ' , .