Accepting request 289945 from home:posophe:branches:Base:System
update OBS-URL: https://build.opensuse.org/request/show/289945 OBS-URL: https://build.opensuse.org/package/show/Base:System/pcre?expand=0&rev=64
This commit is contained in:
Cristian Rodríguez
Git OBS Bridge
parent
cbe8d8f3c3
commit
c3645f617a
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a961c1c78befef263cc130756eeca7b674b4e73a81533293df44e4265236865b
|
||||
size 1522220
|
||||
Binary file not shown.
3
pcre-8.36.tar.bz2
Normal file
3
pcre-8.36.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ef833457de0c40e82f573e34528f43a751ff20257ad0e86d272ed5637eb845bb
|
||||
size 1533818
|
||||
BIN
pcre-8.36.tar.bz2.sig
Normal file
BIN
pcre-8.36.tar.bz2.sig
Normal file
Binary file not shown.
@ -1,170 +0,0 @@
|
||||
Index: configure.ac
|
||||
===================================================================
|
||||
--- configure.ac (Revision 1471)
|
||||
+++ configure.ac (Revision 1472)
|
||||
@@ -9,9 +9,9 @@
|
||||
dnl be defined as -RC2, for example. For real releases, it should be empty.
|
||||
|
||||
m4_define(pcre_major, [8])
|
||||
-m4_define(pcre_minor, [35])
|
||||
-m4_define(pcre_prerelease, [])
|
||||
-m4_define(pcre_date, [2014-04-04])
|
||||
+m4_define(pcre_minor, [36])
|
||||
+m4_define(pcre_prerelease, [-RC1])
|
||||
+m4_define(pcre_date, [2014-04-21])
|
||||
|
||||
# NOTE: The CMakeLists.txt file searches for the above variables in the first
|
||||
# 50 lines of this file. Please update that if the variables above are moved.
|
||||
Index: pcrecpp.cc
|
||||
===================================================================
|
||||
--- pcrecpp.cc (Revision 1471)
|
||||
+++ pcrecpp.cc (Revision 1472)
|
||||
@@ -511,7 +511,7 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
- pcre_extra extra = { 0, 0, 0, 0, 0, 0 };
|
||||
+ pcre_extra extra = { 0, 0, 0, 0, 0, 0, 0, 0 };
|
||||
if (options_.match_limit() > 0) {
|
||||
extra.flags |= PCRE_EXTRA_MATCH_LIMIT;
|
||||
extra.match_limit = options_.match_limit();
|
||||
@@ -660,6 +660,8 @@
|
||||
/***** Parsers for various types *****/
|
||||
|
||||
bool Arg::parse_null(const char* str, int n, void* dest) {
|
||||
+ (void)str;
|
||||
+ (void)n;
|
||||
// We fail if somebody asked us to store into a non-NULL void* pointer
|
||||
return (dest == NULL);
|
||||
}
|
||||
Index: ChangeLog
|
||||
===================================================================
|
||||
--- ChangeLog (Revision 1471)
|
||||
+++ ChangeLog (Revision 1472)
|
||||
@@ -1,6 +1,18 @@
|
||||
ChangeLog for PCRE
|
||||
------------------
|
||||
|
||||
+Version 8.36 xx-xxx-2014
|
||||
+------------------------
|
||||
+
|
||||
+1. Got rid of some compiler warnings in the C++ modules that were shown up by
|
||||
+ -Wmissing-field-initializers and -Wunused-parameter.
|
||||
+
|
||||
+2. The tests for quantifiers being too big (greater than 65535) were being
|
||||
+ applied after reading the number, and stupidly assuming that integer
|
||||
+ overflow would give a negative number. The tests are now applied as the
|
||||
+ numbers are read.
|
||||
+
|
||||
+
|
||||
Version 8.35 04-April-2014
|
||||
--------------------------
|
||||
|
||||
Index: pcre_stringpiece_unittest.cc
|
||||
===================================================================
|
||||
--- pcre_stringpiece_unittest.cc (Revision 1471)
|
||||
+++ pcre_stringpiece_unittest.cc (Revision 1472)
|
||||
@@ -142,6 +142,8 @@
|
||||
}
|
||||
|
||||
int main(int argc, char** argv) {
|
||||
+ (void)argc;
|
||||
+ (void)argv;
|
||||
CheckComparisonOperators();
|
||||
CheckSTLComparator();
|
||||
|
||||
Index: pcre_scanner_unittest.cc
|
||||
===================================================================
|
||||
--- pcre_scanner_unittest.cc (Revision 1471)
|
||||
+++ pcre_scanner_unittest.cc (Revision 1472)
|
||||
@@ -149,6 +149,8 @@
|
||||
// small stack size
|
||||
|
||||
int main(int argc, char** argv) {
|
||||
+ (void)argc;
|
||||
+ (void)argv;
|
||||
TestScanner();
|
||||
TestBigComment();
|
||||
|
||||
Index: testdata/testoutput2
|
||||
===================================================================
|
||||
--- testdata/testoutput2 (Revision 1471)
|
||||
+++ testdata/testoutput2 (Revision 1472)
|
||||
@@ -5821,13 +5821,13 @@
|
||||
No match
|
||||
|
||||
/a{11111111111111111111}/I
|
||||
-Failed: number too big in {} quantifier at offset 22
|
||||
+Failed: number too big in {} quantifier at offset 8
|
||||
|
||||
/(){64294967295}/I
|
||||
-Failed: number too big in {} quantifier at offset 14
|
||||
+Failed: number too big in {} quantifier at offset 9
|
||||
|
||||
/(){2,4294967295}/I
|
||||
-Failed: number too big in {} quantifier at offset 15
|
||||
+Failed: number too big in {} quantifier at offset 11
|
||||
|
||||
"(?i:a)(?i:b)(?i:c)(?i:d)(?i:e)(?i:f)(?i:g)(?i:h)(?i:i)(?i:j)(k)(?i:l)A\1B"I
|
||||
Capturing subpattern count = 1
|
||||
Index: pcre_compile.c
|
||||
===================================================================
|
||||
--- pcre_compile.c (Revision 1471)
|
||||
+++ pcre_compile.c (Revision 1472)
|
||||
@@ -1583,30 +1583,30 @@
|
||||
int min = 0;
|
||||
int max = -1;
|
||||
|
||||
-/* Read the minimum value and do a paranoid check: a negative value indicates
|
||||
-an integer overflow. */
|
||||
-
|
||||
-while (IS_DIGIT(*p)) min = min * 10 + (int)(*p++ - CHAR_0);
|
||||
-if (min < 0 || min > 65535)
|
||||
+while (IS_DIGIT(*p))
|
||||
{
|
||||
- *errorcodeptr = ERR5;
|
||||
- return p;
|
||||
- }
|
||||
+ min = min * 10 + (int)(*p++ - CHAR_0);
|
||||
+ if (min > 65535)
|
||||
+ {
|
||||
+ *errorcodeptr = ERR5;
|
||||
+ return p;
|
||||
+ }
|
||||
+ }
|
||||
|
||||
-/* Read the maximum value if there is one, and again do a paranoid on its size.
|
||||
-Also, max must not be less than min. */
|
||||
-
|
||||
if (*p == CHAR_RIGHT_CURLY_BRACKET) max = min; else
|
||||
{
|
||||
if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
|
||||
{
|
||||
max = 0;
|
||||
- while(IS_DIGIT(*p)) max = max * 10 + (int)(*p++ - CHAR_0);
|
||||
- if (max < 0 || max > 65535)
|
||||
+ while(IS_DIGIT(*p))
|
||||
{
|
||||
- *errorcodeptr = ERR5;
|
||||
- return p;
|
||||
- }
|
||||
+ max = max * 10 + (int)(*p++ - CHAR_0);
|
||||
+ if (max > 65535)
|
||||
+ {
|
||||
+ *errorcodeptr = ERR5;
|
||||
+ return p;
|
||||
+ }
|
||||
+ }
|
||||
if (max < min)
|
||||
{
|
||||
*errorcodeptr = ERR4;
|
||||
@@ -1615,9 +1615,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
-/* Fill in the required variables, and pass back the pointer to the terminating
|
||||
-'}'. */
|
||||
-
|
||||
*minp = min;
|
||||
*maxp = max;
|
||||
return p;
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 9 00:43:18 UTC 2015 - p.drouand@gmail.com
|
||||
|
||||
- Update to version 3.16
|
||||
* This is primarily a bug-fix release.
|
||||
* The Unicode data tables have been updated to Unicode 7.0.0.
|
||||
- Remove pcre-commit1472.patch; fixed on upstream release
|
||||
- Remove obsolete "Obsoletes" tag
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 2 07:30:08 UTC 2014 - jengelh@inai.de
|
||||
|
||||
|
||||
16
pcre.spec
16
pcre.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package pcre
|
||||
#
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: pcre
|
||||
Version: 8.35
|
||||
Version: 8.36
|
||||
Release: 0
|
||||
Summary: A library for Perl-compatible regular expressions
|
||||
License: BSD-3-Clause
|
||||
@ -32,18 +32,12 @@ Source4: baselibs.conf
|
||||
Patch0: pcre-8.32-visibility.patch
|
||||
#PATCH-FIX-OPENSUSE tchvatal@suse.cz upstream thinks it is good idea to use rpath, taken from RH
|
||||
Patch1: pcre-8.21-multilib.patch
|
||||
#PATCH-FIX-UPSTREAM http://bugs.exim.org/show_bug.cgi?id=1463
|
||||
Patch2: pcre-commit1472.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkg-config
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: pcre-64bit
|
||||
%endif
|
||||
|
||||
%description
|
||||
The PCRE library is a set of functions that implement regular
|
||||
@ -58,11 +52,6 @@ Requires: libpcre16-0 = %{version}
|
||||
Requires: libpcrecpp0 = %{version}
|
||||
Requires: libpcreposix0 = %{version}
|
||||
Requires: libstdc++-devel
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: pcre-devel-64bit
|
||||
%endif
|
||||
#
|
||||
|
||||
%description devel
|
||||
The PCRE library is a set of functions that implement regular
|
||||
@ -153,7 +142,6 @@ as Perl 5.
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2
|
||||
|
||||
%build
|
||||
# Available JIT archs see sljit/sljitConfig.h
|
||||
|
||||
Loading…
Reference in New Issue
Block a user