From d4f7a02a8883a7e8764cbfc22db10c3f7054b5f7f1fce012a2f2372d3a1df9a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Thu, 9 Oct 2014 08:27:29 +0000
Subject: [PATCH 1/2] - Update to version 5.0.7   * Small bugfixes   * Includes
 a security fix to disallow evaluation of the     initial values of integer
 variables imported from the environment - Remove zsh-fix-pcre-n.patch, fixed
 upstream

OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=137
---
 zsh-5.0.6.tar.bz2 | 3 ---
 zsh-5.0.7.tar.bz2 | 3 +++
 zsh.changes       | 9 +++++++++
 zsh.spec          | 5 +----
 4 files changed, 13 insertions(+), 7 deletions(-)
 delete mode 100644 zsh-5.0.6.tar.bz2
 create mode 100644 zsh-5.0.7.tar.bz2

diff --git a/zsh-5.0.6.tar.bz2 b/zsh-5.0.6.tar.bz2
deleted file mode 100644
index b995cac..0000000
--- a/zsh-5.0.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:84ca509b141533a3b695e314fbce1200b86ff337ab7dd9e3414da05d86378845
-size 3174858
diff --git a/zsh-5.0.7.tar.bz2 b/zsh-5.0.7.tar.bz2
new file mode 100644
index 0000000..66fa410
--- /dev/null
+++ b/zsh-5.0.7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:544e27de81740286b916d1d77c9f48ad7c26ad7943ed96d278abee67cf6704b3
+size 3181030
diff --git a/zsh.changes b/zsh.changes
index 62a72ef..301ac08 100644
--- a/zsh.changes
+++ b/zsh.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Oct  9 08:24:20 UTC 2014 - idonmez@suse.com
+
+- Update to version 5.0.7
+  * Small bugfixes
+  * Includes a security fix to disallow evaluation of the
+    initial values of integer variables imported from the environment
+- Remove zsh-fix-pcre-n.patch, fixed upstream
+
 -------------------------------------------------------------------
 Sun Sep  7 20:05:41 UTC 2014 - idonmez@suse.com
 
diff --git a/zsh.spec b/zsh.spec
index 8245fec..387bbad 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -17,7 +17,7 @@
 
 
 Name:           zsh
-Version:        5.0.6
+Version:        5.0.7
 Release:        0
 Summary:        Shell with comprehensive completion
 License:        MIT
@@ -37,8 +37,6 @@ Source16:       dotzshrc.rh
 Source17:       zshprompt.pl
 %endif
 Patch1:         trim-unneeded-completions.patch
-# PATCH-FIX-UPSTREAM Fix pcre_match() -n options
-Patch2:         zsh-fix-pcre-n.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version}
 Requires(pre):  %{install_info_prereq}
@@ -97,7 +95,6 @@ This package contains the Zsh manual in html format.
 %if 0%{?suse_version}
 %patch1 -p1
 %endif
-%patch2 -p1
 
 # Remove executable bit
 chmod 0644 Etc/changelog2html.pl

From ae6f9666d7947997a38bbc4e3144adb90b74b9509d2af57f5be3f171b4e6b451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Thu, 9 Oct 2014 08:27:40 +0000
Subject: [PATCH 2/2] -

OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=138
---
 zsh-fix-pcre-n.patch | 36 ------------------------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 zsh-fix-pcre-n.patch

diff --git a/zsh-fix-pcre-n.patch b/zsh-fix-pcre-n.patch
deleted file mode 100644
index 681c888..0000000
--- a/zsh-fix-pcre-n.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 956829c18e8ade666083f1c69043a16a80f70b0d
-Author: Barton E. Schaefer <schaefer@zsh.org>
-Date:   Sun Sep 7 10:48:32 2014 -0700
-
-    33122: typo from 32891 caused incorrect matches for pcre_match -n
-
-diff --git a/Src/Modules/pcre.c b/Src/Modules/pcre.c
-index 040a33f..2393cd1 100644
---- a/Src/Modules/pcre.c
-+++ b/Src/Modules/pcre.c
-@@ -289,7 +289,7 @@ bin_pcre_match(char *nam, char **args, Options ops, UNUSED(int func))
- 	matched_portion = OPT_ARG(ops,c);
-     }
-     if(OPT_HASARG(ops,c='n')) { /* The offset position to start the search, in bytes. */
--	if ((offset_start = getposint(OPT_ARG(ops,c), nam) < 0))
-+	if ((offset_start = getposint(OPT_ARG(ops,c), nam)) < 0)
- 	    return 1;
-     }
-     /* For the entire match, 'Return' the offset byte positions instead of the matched string */
-diff --git a/Test/V07pcre.ztst b/Test/V07pcre.ztst
-index f5b05de..3a65331 100644
---- a/Test/V07pcre.ztst
-+++ b/Test/V07pcre.ztst
-@@ -108,3 +108,12 @@
- >1
- >0 xo→t →t
- >0 Xo→t →t
-+
-+  string="The following zip codes: 78884 90210 99513"
-+  pcre_compile -m "\d{5}"
-+  pcre_match -b -- $string && print "$MATCH; ZPCRE_OP: $ZPCRE_OP"
-+  pcre_match -b -n $ZPCRE_OP[(w)2] -- $string || print failed
-+  print "$MATCH; ZPCRE_OP: $ZPCRE_OP"
-+0:pcre_match -b and pcre_match -n
-+>78884; ZPCRE_OP: 25 30
-+>90210; ZPCRE_OP: 31 36