From 867db377a5d066a0c7884a228d3614884ecf26ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 29 Feb 2016 14:49:42 +0100 Subject: [PATCH] Fix a typo in pcre2_study() --- pcre2-10.21-Fix-typo-in-pcre2_study.patch | 28 +++++++++++++++++++++++ pcre2.spec | 8 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 pcre2-10.21-Fix-typo-in-pcre2_study.patch diff --git a/pcre2-10.21-Fix-typo-in-pcre2_study.patch b/pcre2-10.21-Fix-typo-in-pcre2_study.patch new file mode 100644 index 0000000..eb5dc02 --- /dev/null +++ b/pcre2-10.21-Fix-typo-in-pcre2_study.patch @@ -0,0 +1,28 @@ +From f6cb85bcdb508b0aaf8bc6d99b1d23afd7f3a6a9 Mon Sep 17 00:00:00 2001 +From: ph10 +Date: Sun, 28 Feb 2016 14:56:50 +0000 +Subject: [PATCH] Fix typo in pcre2_study(). +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@500 6239d852-aaf2-0410-a92c-79f79f948069 + +Petr Písař: Ported to 10.21. + +diff --git a/src/pcre2_study.c b/src/pcre2_study.c +index 18932ad..db08266 100644 +--- a/src/pcre2_study.c ++++ b/src/pcre2_study.c +@@ -1452,7 +1452,7 @@ do + for (c = 0; c < 16; c++) re->start_bitmap[c] |= classmap[c]; + for (c = 128; c < 256; c++) + { +- if ((classmap[c/8] && (1 << (c&7))) != 0) ++ if ((classmap[c/8] & (1 << (c&7))) != 0) + { + int d = (c >> 6) | 0xc0; /* Set bit for this starter */ + re->start_bitmap[d/8] |= (1 << (d&7)); /* and then skip on to the */ +-- +2.5.0 + diff --git a/pcre2.spec b/pcre2.spec index 82b63a0..ea99133 100644 --- a/pcre2.spec +++ b/pcre2.spec @@ -2,7 +2,7 @@ #%%global rcversion RC1 Name: pcre2 Version: 10.21 -Release: %{?rcversion:0.}2%{?rcversion:.%rcversion}%{?dist} +Release: %{?rcversion:0.}3%{?rcversion:.%rcversion}%{?dist} %global myversion %{version}%{?rcversion:-%rcversion} Summary: Perl-compatible regular expression library Group: System Environment/Libraries @@ -28,6 +28,8 @@ Patch2: pcre2-10.21-Fix-pcre2test-loop-when-a-callout-is-in-an-initial-l.pat # Fix workspace overflow for (*ACCEPT) with deeply nested parentheses, # upstream bug #1791, fixed in upstream after 10.21 Patch3: pcre2-10.21-Fix-workspace-overflow-for-deep-nested-parentheses-w.patch +# Fix a typo in pcre2_study(), fixed in upstream after 10.21 +Patch4: pcre2-10.21-Fix-typo-in-pcre2_study.patch # New libtool to get rid of RPATH and to use distribution autotools BuildRequires: autoconf @@ -91,6 +93,7 @@ Utilities demonstrating PCRE2 capabilities like pcre2grep or pcre2test. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # Because of multilib patch libtoolize --copy --force autoreconf -vif @@ -170,6 +173,9 @@ make %{?_smp_mflags} check VERBOSE=yes %{_mandir}/man1/pcre2test.* %changelog +* Mon Feb 29 2016 Petr Pisar - 10.21-3 +- Fix a typo in pcre2_study() + * Thu Feb 11 2016 Petr Pisar - 10.21-2 - Report unmatched closing parantheses properly - Fix pcre2test for expressions with a callout inside a look-behind assertion