[pcre] 8.33-RC1 bump

[Petr Pisar]

commit fc76cf56dbc60064ec404a5f42cabe997b0a36ec
Author: Petr Písař <ppisar at redhat.com>
Date:   Tue May 7 15:28:36 2013 +0200

    8.33-RC1 bump

 .gitignore                                         |    1 +
 ...-search-in-JIT-when-link-size-is-3-or-gre.patch |   50 ---------
 ...fer-over-read-issues-in-16-and-32-bit-mod.patch |  107 --------------------
 ...ing-PCRE_INFO_MATCHLIMIT-and-PCRE_INFO_RE.patch |   35 +++++++
 pcre.spec                                          |   18 ++--
 sources                                            |    2 +-
 6 files changed, 46 insertions(+), 167 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9d7e1ba..37a5065 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ pcre-8.10.tar.bz2
 /pcre-8.31.tar.bz2
 /pcre-8.32-RC1.tar.bz2
 /pcre-8.32.tar.bz2
+/pcre-8.33-RC1.tar.bz2
diff --git a/pcre-8.33-RC1-Fix-retrieving-PCRE_INFO_MATCHLIMIT-and-PCRE_INFO_RE.patch b/pcre-8.33-RC1-Fix-retrieving-PCRE_INFO_MATCHLIMIT-and-PCRE_INFO_RE.patch
new file mode 100644
index 0000000..fcb9501
--- /dev/null
+++ b/pcre-8.33-RC1-Fix-retrieving-PCRE_INFO_MATCHLIMIT-and-PCRE_INFO_RE.patch
@@ -0,0 +1,35 @@
+From a1439f72862fadeb63133e4474e4fba36bc134b2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Thu, 2 May 2013 17:11:58 +0200
+Subject: [PATCH] Fix retrieving PCRE_INFO_MATCHLIMIT and
+ PCRE_INFO_RECURSIONLIMIT
+
+Tests exhibiting pcre_fullinfo() failed on 64-bit PowerPC because
+there was mismatch on destination variable size in
+PCRE_INFO_MATCHLIMIT and PCRE_INFO_RECURSIONLIMIT cases.
+---
+ pcre_fullinfo.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pcre_fullinfo.c b/pcre_fullinfo.c
+index 36dfb0e..c4eb5c0 100644
+--- a/pcre_fullinfo.c
++++ b/pcre_fullinfo.c
+@@ -224,12 +224,12 @@ switch (what)
+ 
+   case PCRE_INFO_MATCHLIMIT:
+   if ((re->flags & PCRE_MLSET) == 0) return PCRE_ERROR_UNSET;
+-  *((unsigned long int *)where) = re->limit_match;
++  *((pcre_uint32 *)where) = re->limit_match;
+   break;
+ 
+   case PCRE_INFO_RECURSIONLIMIT:
+   if ((re->flags & PCRE_RLSET) == 0) return PCRE_ERROR_UNSET;
+-  *((unsigned long int *)where) = re->limit_recursion;
++  *((pcre_uint32 *)where) = re->limit_recursion;
+   break;
+ 
+   default: return PCRE_ERROR_BADOPTION;
+-- 
+1.8.1.4
+
diff --git a/pcre.spec b/pcre.spec
index 89a56ca..a732a60 100644
--- a/pcre.spec
+++ b/pcre.spec
@@ -1,8 +1,8 @@
 # This is stable release:
-#%%global rcversion RC1
+%global rcversion RC1
 Name: pcre
-Version: 8.32
-Release: %{?rcversion:0.}4%{?rcversion:.%rcversion}%{?dist}
+Version: 8.33
+Release: %{?rcversion:0.}1%{?rcversion:.%rcversion}%{?dist}
 %global myversion %{version}%{?rcversion:-%rcversion}
 Summary: Perl-compatible regular expression library
 Group: System Environment/Libraries
@@ -13,10 +13,8 @@ Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/%{name}/%{?rcversion:Te
 Patch0: pcre-8.21-multilib.patch
 # Refused by upstream, bug #675477
 Patch1: pcre-8.32-refused_spelling_terminated.patch
-# In upstream after 8.32
-Patch2: pcre-8.32-Fix-forward-search-in-JIT-when-link-size-is-3-or-gre.patch
-# In upstream after 8.32
-Patch3: pcre-8.32-Fix-two-buffer-over-read-issues-in-16-and-32-bit-mod.patch
+# Fix big-endian issues, accepted by upstream after 8.33-RC1
+Patch2: pcre-8.33-RC1-Fix-retrieving-PCRE_INFO_MATCHLIMIT-and-PCRE_INFO_RE.patch
 BuildRequires: readline-devel
 # New libtool to get rid of rpath
 BuildRequires: autoconf, automake, libtool
@@ -58,8 +56,7 @@ Utilities demonstrating PCRE capabilities like pcregrep or pcretest.
 # Get rid of rpath
 %patch0 -p1 -b .multilib
 %patch1 -p1 -b .terminated_typos
-%patch2 -p1 -b .forward_jit
-%patch3 -p1 -b .buffer_over_read
+%patch2 -p1 -b .fullinfo
 # Because of rpath patch
 libtoolize --copy --force && autoreconf -vif
 # One contributor's name is non-UTF-8
@@ -123,6 +120,9 @@ make check
 %{_mandir}/man1/pcretest.*
 
 %changelog
+* Thu May 02 2013 Petr Pisar <ppisar at redhat.com> - 8.33-0.1.RC1
+- 8.33-RC1 bump
+
 * Mon Jan 28 2013 Petr Pisar <ppisar at redhat.com> - 8.32-4
 - Fix forward search in JIT when link size is 3 or greater
 - Fix buffer over-read in UTF-16 and UTF-32 modes with JIT
diff --git a/sources b/sources
index 41e8190..9f62107 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-62f02a76bb57a40bc66681760ed511d5  pcre-8.32.tar.bz2
+fbfca8ce7f1f7aebba2d7c16aad795c9  pcre-8.33-RC1.tar.bz2