|
|
@@ -1,5 +1,5 @@
|
|
|
Name: pcre
|
|
|
-Version: 8.36
|
|
|
+Version: 8.38
|
|
|
Release: 1%{?_dist_release}
|
|
|
Summary: Perl-compatible regular expression library
|
|
|
Summary(ja): Perl 互換の正規表現ライブラリ
|
|
|
@@ -13,12 +13,11 @@ Source0: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version
|
|
|
Patch0: pcre-8.21-multilib.patch
|
|
|
# Refused by upstream, bug #675477
|
|
|
Patch1: pcre-8.32-refused_spelling_terminated.patch
|
|
|
-# Reset non-matched groups within capturing group up to forced match,
|
|
|
-# bug #1161587, in upstream after 8.36
|
|
|
-Patch2: pcre-8.36-Fix-bug-when-there-are-unset-groups-prior-to-ACCEPT-.patch
|
|
|
-# Fix unused memory usage on zero-repeat assertion condition, bug #1165626,
|
|
|
-# CVE-2014-8964, in upstream after 8.36
|
|
|
-Patch3: pcre-8.36-Fix-zero-repeat-assertion-condition-bug.patch
|
|
|
+
|
|
|
+# to fix CVE-2016-3191
|
|
|
+Patch1000: CVE-2016-3191.patch
|
|
|
+# to fix CVE-2016-1283
|
|
|
+Patch1001: CVE-2016-1283.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: zlib-devel
|
|
|
@@ -54,8 +53,8 @@ Development files (Headers, libraries for static linking, etc) for %{name}.
|
|
|
# Get rid of rpath
|
|
|
%patch0 -p1 -b .multilib
|
|
|
%patch1 -p1 -b .terminated_typos
|
|
|
-%patch2 -p1 -b .reset_groups
|
|
|
-%patch3 -p1 -b .zero_repeat_assertion
|
|
|
+%patch1000 -p0 -b .CVE-2016-3191
|
|
|
+%patch1001 -p0 -b .CVE-2016-1283
|
|
|
# Because of rpath patch
|
|
|
libtoolize --copy --force && autoreconf -vif
|
|
|
# One contributor's name is non-UTF-8
|
|
|
@@ -122,7 +121,12 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%{_mandir}/man3/*
|
|
|
|
|
|
%changelog
|
|
|
-* Thu Apr 5 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 8.36-1
|
|
|
+* Wed Mar 23 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.38-1
|
|
|
+- new upstream release.
|
|
|
+- removed Patch2,Patch3 (no longer needed).
|
|
|
+- added Patch1000 to fix CVE-2016-1283.
|
|
|
+
|
|
|
+* Sun Apr 5 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 8.36-1
|
|
|
- new upstream release
|
|
|
- added patches including security fix from Fedora (CVE-2014-8964)
|
|
|
* Thu Nov 20 2014 Petr Pisar <ppisar@redhat.com> - 8.36-3
|
tomop