rpms/pcre
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Set re_nsub in regcomp() properly

Browse Source
This commit is contained in:
Petr Písař 2012-09-03 18:13:45 +02:00
parent 6edcc760b4
commit ae4fe51404
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pcre-8.31-re_nsub.patch Normal file
View File

@ -0,0 +1,32 @@
Set re_nsub in regcomp() properly
Port from upstream commit:
r1024 | ph10 | 2012-08-29 13:08:24 +0200 (St, 29 srp 2012) | 2 lines
Fix re_nsub bug in the POSIX wrapper.
https://bugzilla.redhat.com/show_bug.cgi?id=853990
http://bugs.exim.org/show_bug.cgi?id=1287
Index: pcreposix.c
===================================================================
--- pcreposix.c (revision 1023)
+++ pcreposix.c (revision 1024)
@@ -259,6 +259,7 @@
int erroffset;
int errorcode;
int options = 0;
+int re_nsub = 0;
if ((cflags & REG_ICASE) != 0) options |= PCRE_CASELESS;
if ((cflags & REG_NEWLINE) != 0) options |= PCRE_MULTILINE;
@@ -282,7 +283,8 @@
}
(void)pcre_fullinfo((const pcre *)preg->re_pcre, NULL, PCRE_INFO_CAPTURECOUNT,
- &(preg->re_nsub));
+ &re_nsub);
+preg->re_nsub = (size_t)re_nsub;
return 0;
}

8
pcre.spec
View File

@ -2,7 +2,7 @@
#%%global rcversion RC1
Name: pcre
Version: 8.31
Release: %{?rcversion:0.}1%{?rcversion:.%rcversion}%{?dist}.1
Release: %{?rcversion:0.}2%{?rcversion:.%rcversion}%{?dist}
%global myversion %{version}%{?rcversion:-%rcversion}
Summary: Perl-compatible regular expression library
Group: System Environment/Libraries
@ -13,6 +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.30-refused_spelling_terminated.patch
# Set re_nsub in regcomp() properly, bug #853990
Patch2: pcre-8.31-re_nsub.patch
BuildRequires: readline-devel
# New libtool to get rid of rpath
BuildRequires: autoconf, automake, libtool
@ -52,6 +54,7 @@ Utilities demonstrating PCRE capabilities like pcregrep or pcretest.
# Get rid of rpath
%patch0 -p1 -b .multilib
%patch1 -p1 -b .terminated_typos
%patch2 -p0 -b .re_nsub
# Because of rpath patch
libtoolize --copy --force && autoreconf
# One contributor's name is non-UTF-8
@ -115,6 +118,9 @@ make check
%{_mandir}/man1/pcretest.*
%changelog
* Mon Sep 03 2012 Petr Pisar <ppisar@redhat.com> - 8.31-2
- Set re_nsub in regcomp() properly (bug #853990)
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.31-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild