diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/fix-aptitude-completion-for-0.7.5-807906.patch | 18 | ||||
| -rw-r--r-- | debian/patches/fix-segfault-in-is_cond_binary_op.patch | 18 | ||||
| -rw-r--r-- | debian/patches/series | 3 | ||||
| -rw-r--r-- | debian/patches/update-apt-completion-808317.patch | 22 |
4 files changed, 19 insertions, 42 deletions
diff --git a/debian/patches/fix-aptitude-completion-for-0.7.5-807906.patch b/debian/patches/fix-aptitude-completion-for-0.7.5-807906.patch deleted file mode 100644 index 6fcdd1edb..000000000 --- a/debian/patches/fix-aptitude-completion-for-0.7.5-807906.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Also parse --help output of aptitude 0.7.5 and later -Author: Axel Beckert <abe@debian.org> -Bug-Debian: https://bugs.debian.org/807906 -Forwarded: http://www.zsh.org/mla/workers/2015/msg03350.html - -Index: zsh/Completion/Debian/Command/_aptitude -=================================================================== ---- zsh.orig/Completion/Debian/Command/_aptitude 2015-09-08 23:39:06.026975805 +0200 -+++ zsh/Completion/Debian/Command/_aptitude 2015-12-26 19:26:14.681265798 +0100 -@@ -80,7 +80,7 @@ - - case $state in - cmds) -- cmds=( ${${(M)${(f)"$(LC_ALL=C _call_program commands aptitude -h 2>/dev/null)"}:#* - *}/(#b) (*[^ ]) #- (*)/$match[1]:$match[2]:l}) -+ cmds=( ${${(M)${(f)"$(LC_ALL=C _call_program commands aptitude -h 2>/dev/null)"}:# [^- ][^ ]## *}/(#b) ([^ ]##) ##(- )#([^- ]*)/$match[1]:$match[3]:l}) - - _describe -t commands 'aptitude command' cmds && ret=0 - ;; diff --git a/debian/patches/fix-segfault-in-is_cond_binary_op.patch b/debian/patches/fix-segfault-in-is_cond_binary_op.patch new file mode 100644 index 000000000..f03362f5f --- /dev/null +++ b/debian/patches/fix-segfault-in-is_cond_binary_op.patch @@ -0,0 +1,18 @@ +Description: Fix segfault in is_cond_binary_op when compiling with -fPIE + The issue possibly also pops up under other circumstances. +Author: Bart Schaefer <schaefer@brasslantern.com> +Origin: http://www.zsh.org/mla/workers/2016/msg00394.html + +Index: zsh/Src/text.c +=================================================================== +--- zsh.orig/Src/text.c 2016-01-24 17:19:53.947656591 +0100 ++++ zsh/Src/text.c 2016-02-01 00:15:09.098327625 +0100 +@@ -47,7 +47,7 @@ + */ + static const char *cond_binary_ops[] = { + "=", "!=", "<", ">", "-nt", "-ot", "-ef", "-eq", +- "-ne", "-lt", "-gt", "-le", "-ge", "=~" ++ "-ne", "-lt", "-gt", "-le", "-ge", "=~", NULL + }; + + static char *tptr, *tbuf, *tlim, *tpending; diff --git a/debian/patches/series b/debian/patches/series index 7fa517010..d0f0c477b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ further-mitigate-test-suite-hangs.patch -update-apt-completion-808317.patch -fix-aptitude-completion-for-0.7.5-807906.patch +fix-segfault-in-is_cond_binary_op.patch diff --git a/debian/patches/update-apt-completion-808317.patch b/debian/patches/update-apt-completion-808317.patch deleted file mode 100644 index a743a0c70..000000000 --- a/debian/patches/update-apt-completion-808317.patch +++ /dev/null @@ -1,22 +0,0 @@ -Description: Add missing apt purge and autoremove subcommands -Author: Felipe Sateler <fsateler@debian.org> -Bug-Debian: https://bugs.debian.org/808317 -Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=808317;att=1;filename=_apt.diff;msg=5 -Forwarded: http://www.zsh.org/mla/workers/2015/msg03348.html - ---- a/Completion/Debian/Command/_apt 2015-12-03 20:44:53.000000000 -0300 -+++ b/Completion/Debian/Command/_apt 2015-12-18 12:36:49.326848831 -0300 -@@ -407,10 +407,12 @@ - /$'install\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \ - /$'[^\0/]#/'/ /$'[^\0/]#\0'/ ':release name::_apt_releases' \) \| \ - /$'remove\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \ -+ /$'purge\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \ - /$'upgrade\0'/ \| \ -+ /$'autoremove\0'/ \| \ - /$'full-upgrade\0'/ \| \ - /$'edit-sources\0'/ \| \ -- /"[]"/ ':argument-1::compadd "$expl_action[@]" list search show update install remove upgrade full-upgrade edit-sources' -+ /"[]"/ ':argument-1::compadd "$expl_action[@]" list search show update install remove upgrade full-upgrade edit-sources autoremove purge' - - _apt-cmd () { - local expl_action expl_packages |