diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2016-12-04 03:41:10 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2016-12-04 04:30:47 +0100 |
| commit | 2aedc4b88fd0e87b89583983951b04b96f48efd3 (patch) | |
| tree | add2a848a05396dee9ab421d3719f0cb3d650422 | |
| parent | 6783a1730fed9dfb044194f96aed9618b7d76f25 (diff) | |
| download | zsh-2aedc4b88fd0e87b89583983951b04b96f48efd3.tar.gz zsh-2aedc4b88fd0e87b89583983951b04b96f48efd3.zip | |
Remove cherry-picked fix-segfault-in-is_cond_binary_op.patch
... in preparation of merging a new upstream release.
| -rw-r--r-- | debian/patches/fix-segfault-in-is_cond_binary_op.patch | 18 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 19 deletions
diff --git a/debian/patches/fix-segfault-in-is_cond_binary_op.patch b/debian/patches/fix-segfault-in-is_cond_binary_op.patch deleted file mode 100644 index f03362f5f..000000000 --- a/debian/patches/fix-segfault-in-is_cond_binary_op.patch +++ /dev/null @@ -1,18 +0,0 @@ -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 d0f0c477b..857f0f26d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ further-mitigate-test-suite-hangs.patch -fix-segfault-in-is_cond_binary_op.patch |