[Pkg-zsh-commits] [zsh] 02/05: Remove cherry-picked fix-segfault-in-is_cond_binary_op.patch

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch debian
in repository zsh.

commit 2aedc4b88fd0e87b89583983951b04b96f48efd3
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sun Dec 4 03:41:10 2016 +0100

    Remove cherry-picked fix-segfault-in-is_cond_binary_op.patch
    
    ... in preparation of merging a new upstream release.
---
 debian/patches/fix-segfault-in-is_cond_binary_op.patch | 18 ------------------
 debian/patches/series                                  |  1 -
 2 files changed, 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 f03362f..0000000
--- 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 at 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 d0f0c47..857f0f2 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git