bump(dev-libs/libpcre): sync with upstream

This commit is contained in:
David Michael 2017-01-18 13:52:46 -08:00
parent ecb10fed03
commit 8033ded09d
11 changed files with 17 additions and 1583 deletions

View File

@ -1,246 +0,0 @@
# ChangeLog for dev-libs/libpcre
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# (auto-generated from git log)
*libpcre-8.37-r2 (09 Aug 2015)
*libpcre-8.37-r1 (09 Aug 2015)
*libpcre-8.37 (09 Aug 2015)
*libpcre-8.36 (09 Aug 2015)
*libpcre-8.35 (09 Aug 2015)
*libpcre-7.9-r1 (09 Aug 2015)
09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org>
+files/libpcre-7.9-pkg-config.patch,
+files/libpcre-8.37-CVE-2015-3210.patch,
+files/libpcre-8.37-CVE-2015-5073.patch, +libpcre-7.9-r1.ebuild,
+libpcre-8.35.ebuild, +libpcre-8.36.ebuild, +libpcre-8.37.ebuild,
+libpcre-8.37-r1.ebuild, +libpcre-8.37-r2.ebuild, +metadata.xml:
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
the bikeshed
24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
Use https by default
Convert all URLs for sites supporting encrypted connections from http to
https
Signed-off-by: Justin Lecher <jlec@gentoo.org>
24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
Revert DOCTYPE SYSTEM https changes in metadata.xml
repoman does not yet accept the https version.
This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
Bug: https://bugs.gentoo.org/552720
25 Aug 2015; Mike Frysinger <vapier@gentoo.org> metadata.xml:
rewrite metadata.xml #558720
*libpcre-8.38 (24 Nov 2015)
24 Nov 2015; Lars Wendler <polynomial-c@gentoo.org> +libpcre-8.38.ebuild:
Bump to version 8.38
Package-Manager: portage-2.2.25
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
24 Nov 2015; Lars Wendler <polynomial-c@gentoo.org> -libpcre-8.37.ebuild,
-libpcre-8.37-r1.ebuild:
Removed old.
Package-Manager: portage-2.2.25
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
26 Nov 2015; Agostino Sarubbo <ago@gentoo.org> libpcre-8.38.ebuild:
amd64 stable wrt bug #553300
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"
29 Nov 2015; Jeroen Roovers <jer@gentoo.org> libpcre-8.38.ebuild:
Stable for PPC64 (bug #553300).
Package-Manager: portage-2.2.26
RepoMan-Options: --ignore-arches
30 Nov 2015; Jeroen Roovers <jer@gentoo.org> libpcre-8.38.ebuild:
Stable for HPPA (bug #553300).
Package-Manager: portage-2.2.26
RepoMan-Options: --ignore-arches
05 Dec 2015; Markus Meier <maekke@gentoo.org> libpcre-8.38.ebuild:
arm stable, bug #553300
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="arm"
06 Dec 2015; Matt Turner <mattst88@gentoo.org> libpcre-8.38.ebuild:
alpha stable, bug 553300.
07 Dec 2015; Agostino Sarubbo <ago@gentoo.org> libpcre-8.38.ebuild:
ppc stable wrt bug #553300
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
25 Dec 2015; Agostino Sarubbo <ago@gentoo.org> libpcre-8.38.ebuild:
x86 stable wrt bug #553300
Package-Manager: portage-2.2.24
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
27 Dec 2015; Mikle Kolyada <zlogene@gentoo.org> libpcre-8.38.ebuild:
sparc stable wrt bug #553300
Package-Manager: portage-2.2.24
11 Jan 2016; Agostino Sarubbo <ago@gentoo.org> libpcre-8.38.ebuild:
ia64 stable wrt bug #553300
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
11 Jan 2016; Mike Frysinger <vapier@gentoo.org> libpcre-8.38.ebuild:
mark 8.38 arm64/m68k/s390/sh stable
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Replace all herds with appropriate projects (GLEP 67)
Replace all uses of herd with appropriate project maintainers, or no
maintainers in case of herds requested to be disbanded.
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Set appropriate maintainer types in metadata.xml (GLEP 67)
10 Feb 2016; Mike Frysinger <vapier@gentoo.org> libpcre-7.9-r1.ebuild,
libpcre-8.35.ebuild, libpcre-8.36.ebuild, libpcre-8.37-r2.ebuild,
libpcre-8.38.ebuild:
drop findutils dep #278370
The forced upgrade has been moved to @system now.
30 Mar 2016; Mike Frysinger <vapier@gentoo.org> libpcre-8.35.ebuild,
libpcre-8.36.ebuild, libpcre-8.37-r2.ebuild, libpcre-8.38.ebuild:
toolchain-funcs.eclass: gen_usr_ldscript: integrate multilib_is_native_abi
support #479448
Many ebuilds have started checking multilib_is_native_abi to see if they
should call gen_usr_ldscript. Since that logic always makes sense, add
it directly to the gen_usr_ldscript function.
30 Mar 2016; Mike Frysinger <vapier@gentoo.org>
-files/libpcre-8.37-CVE-2015-3210.patch,
-files/libpcre-8.37-CVE-2015-5073.patch, -libpcre-8.35.ebuild,
-libpcre-8.36.ebuild, -libpcre-8.37-r2.ebuild:
drop old 8.3[567] versions
*libpcre-8.38-r1 (02 Apr 2016)
02 Apr 2016; Mike Frysinger <vapier@gentoo.org>
+files/libpcre-8.38-CVE-2016-1283.patch,
+files/libpcre-8.38-ZDI-CAN-3542.patch, +libpcre-8.38-r1.ebuild:
add upstream fixes #570694 #575546
*libpcre-8.39 (14 Jun 2016)
14 Jun 2016; Lars Wendler <polynomial-c@gentoo.org> +libpcre-8.39.ebuild:
Bump to version 8.39
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
14 Jun 2016; Lars Wendler <polynomial-c@gentoo.org>
-files/libpcre-7.9-pkg-config.patch, -libpcre-7.9-r1.ebuild:
Removed old.
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
20 Jun 2016; Tobias Klausmann <klausman@gentoo.org> libpcre-8.38-r1.ebuild:
8.38-r1: add alpha keyword
Gentoo-Bug: 575546
Package-Manager: portage-2.3.0_rc1
21 Jun 2016; Jeroen Roovers <jer@gentoo.org> libpcre-8.38-r1.ebuild:
Stable for HPPA PPC64 (bug #575546).
Package-Manager: portage-2.3.0_rc1
RepoMan-Options: --ignore-arches
26 Jun 2016; Markus Meier <maekke@gentoo.org> libpcre-8.38-r1.ebuild:
arm stable, bug #575546
Package-Manager: portage-2.3.0_rc1
RepoMan-Options: --include-arches="arm"
27 Jun 2016; Agostino Sarubbo <ago@gentoo.org> libpcre-8.38-r1.ebuild:
amd64 stable wrt bug #575546
Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
27 Jun 2016; Agostino Sarubbo <ago@gentoo.org> libpcre-8.38-r1.ebuild:
x86 stable wrt bug #575546
Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
08 Jul 2016; Agostino Sarubbo <ago@gentoo.org> libpcre-8.38-r1.ebuild:
ppc stable wrt bug #575546
Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
08 Jul 2016; Agostino Sarubbo <ago@gentoo.org> libpcre-8.38-r1.ebuild:
sparc stable wrt bug #575546
Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
08 Jul 2016; Agostino Sarubbo <ago@gentoo.org> libpcre-8.38-r1.ebuild:
ia64 stable wrt bug #575546
Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>

File diff suppressed because it is too large Load Diff

View File

@ -1,10 +1,7 @@
AUX libpcre-8.38-CVE-2016-1283.patch 1714 SHA256 a4b1a1d4176b7271403ce9a8b9e96404671b7a6d82b2a5e1c4778172c36e6b69 SHA512 353f4573c06a95247ba4b506be0308c6781ee41bdc0f8e2040d974d258d51dee5e19861925e70584eb6319f9da8593000c1c8fc670ae60a8d76c41ee57f2da2b WHIRLPOOL 29935cf10b15cad22699ffbe4dd34314de4185cf49789dfc56537bcc9203b91e5ca2731b1089d6d138a029fb3ad9ccdf167d2e1da9341a23a900c7f9f6dab73f
AUX libpcre-8.38-ZDI-CAN-3542.patch 8318 SHA256 5dc56e334771467747427f5e4f46af61a193a54a5e367d9d4f0dc1b8888fd4b3 SHA512 6ef0ba6ceca2805894c27e906388f000fae06ef67ed7be1f01809f64f2cc7b7adfd6747e005033aa260f229479fcbb64055ec151d3dee10edd0a400cece97914 WHIRLPOOL cee8fb91e4854e019ebcbabd7d4dc3c87a4a796574dc167890b702d0b36ede2518d1fcdfb104eb6139b463e8d766c4c27b5866ea70c66d3408a9ef80f5100843
DIST pcre-8.38.tar.bz2 1562265 SHA256 b9e02d36e23024d6c02a2e5b25204b3a4fa6ade43e0a5f869f254f49535079df SHA512 ad3412ceee8f992787a3e7cbe0155ffba67affd4b2dfece6c4501dc8d2012f52dcc1ee1f56759362e04bbbd10ea9370b3e46f238e2f75005cb69f6c8439e52c0 WHIRLPOOL 68533f741a3faa618f4d7341bfa59aaac295ac6af6085772e4c169ad73fae38e98cace2ce2af2899a619bb05dce79859dcd175a158a73729082f7cf52107d1df
DIST pcre-8.39.tar.bz2 1560758 SHA256 b858099f82483031ee02092711689e7245586ada49e534a06e678b8ea9549e8b SHA512 8b0f14ae5947c4b2d74876a795b04e532fd71c2479a64dbe0ed817e7c7894ea3cae533413de8c17322d305cb7f4e275d72b43e4e828eaca77dc4bcaf04529cf6 WHIRLPOOL 00e8e7fb3dc60cbbd2ee185e269696058b568a0f269749386bad44cb474f723c9ed3dfd2af91ddce0b5047aab459864f07e05940af17d3d51d2f1b068415b1ed
EBUILD libpcre-8.38-r1.ebuild 2877 SHA256 b613afa5c0226d80a430d547c7f099e3359a8808a68a3d9321bb3cb19f9da629 SHA512 fb3eed9e159ca3b6779d499381f88eba60d12610b560fbc77800bd3c3c6bd08c4154e24be9963a0c5ee38f5cf2ae6325aaef36b5d5273053c18738316aeba939 WHIRLPOOL 9f5c4fc185be2b287f8724e8cc8156797979601e86cebe6fb749a0cc0354461db4b20ce8a81d545d3cab2b0779162f47ae18ca0281189be511fb472ea7664b73
EBUILD libpcre-8.38.ebuild 2764 SHA256 530981f347fac64af185ee1d0ac30bfab2b63a65555503e3a2a70b2a1696467d SHA512 d1372fd1df017a9371fd08c15bf8fe6acc28e6e5ff9ffcf1605ed1a4fa07204a1d33e9ee46d1eb4b40e98079132fd280582101a5938bdbd26fb535105aa891a8 WHIRLPOOL 61daaf93e4d61b6fe06e1dab51224f33ed815fe96591ac7119ea61c20c3555beb0f8754420889432f8cf83e1c3ed66cbd8a45685d1a17581e000dad964db16ac
EBUILD libpcre-8.39.ebuild 2817 SHA256 184be06d035cd47b30ba9210fb15134fddf8c87020767c25b07491caafa3e4f8 SHA512 73aa42fc4e66a3a6956c8094dbb47a37b4b1bad83d3a7e3df8f3cb33412102fc85c3c77813a92d1878fe0652a09b66ebdbe40aa76b713dbcf6bd6c6641e9467a WHIRLPOOL 2bff4fa314847208aa93cbe9a77c8e2f7b74158cc1f1fe62ab0079145056087e67653a1870aad5e36ec53eb875dac8a2ce7ade8b0b056ec0b1fab037b978f969
MISC ChangeLog 8367 SHA256 5132cb1f50c9c3c1752f3d6f21113d49c754f07782cc6eae47d99622b452c210 SHA512 52f4278c83f1d8b6f7491f808a4d0fbc02538a4aad487f7df25ba485e78cfe48d834c0a7e3388d0a2e92af463c2f0a74ad279abd1631ce7fbe0e166692e92f5b WHIRLPOOL 5a4d432ce378e56c2e52dd6b3f0b2cb2e39117624128d50e0eb1aa8503127db9ffdbb0be5de53c7e470266559ae25763e3ec61033cac5db53edc414575e7aea4
DIST pcre-8.40.tar.bz2 1560119 SHA256 00e27a29ead4267e3de8111fcaa59b132d0533cdfdbdddf4b0604279acbcf4f4 SHA512 b4c27eafbdf33bd7a1384655b1936f4be3bc6745c072347eb26e988896c52664bd85ac42444da1be78b6e20f45b6c7e5921f5f20f5b0741b5bd3d9844e5bd4e2 WHIRLPOOL 6711688972b3db4b98902d548b84e8b03b61c3a12d24a4e42fc49ddc5e2b4be51f98f91873166e550866e88b6cd55092ea27704a3b7e71d58a2af21148ad3340
EBUILD libpcre-8.39.ebuild 2804 SHA256 8397835b0303e77a5962d4a784d0d7ad79b7d17f77efff3c70988d18d3c9c8e4 SHA512 6aa289609ca02802f1d6ab8fa4d3344e352789775fa30d3c50b53a4e1145e1d033230d2daad195873d4d2b1d2bcefce6f569f71fc4baf90adc7f2802e67861f9 WHIRLPOOL 12941ae26442a87c52c01816626b01cfb7a80519a9e9263117ae209e8a47afc05d02cb4575ca91a298a2765c4133b50650cd1b1b97bcdfa082d6d84d1d7a9a7f
EBUILD libpcre-8.40.ebuild 2817 SHA256 6f1946adb6214b71649118fc1f6fb4f3c54f32dfebead324fac63c65da39dbf5 SHA512 8c25d21862600348295300cc421e14087f5fd18758af8d9910112826d0ce07820dff412460b44e5a8c52f51fb911f8bef3bf88f3023b2676a48e10260964bac7 WHIRLPOOL 70f1293c70f7365a42bc54899cdd5cba2d6ced27bab68d211f3945ad35c4fe63ee7921e9256f5c921a7024b60c4df9f6ad0e08a115ef99102d522e23737e3427
MISC ChangeLog 9358 SHA256 6d71cdef5ca28f5d0c3af958daa73122d374a64088bf960961f9eec235572595 SHA512 ad1c6ff26e6198bda9f8c5d31d03a5337b0bd7c620f564b31b98117982d12677426ec4d703325028c44ea371dc15c3b2530d0c91ccd9e8b40b5710761a2e7ef0 WHIRLPOOL c8f1726ad29d83ee380eeeaae0a385a7de8db1e99751357bbf59dcf0af751e4f6ddb8f88d836dda0d0d6e132ef4db126fa3e64610491ceadce550b3017b2ee5d
MISC ChangeLog-2015 35335 SHA256 dfdfc43bcff86898d74db532baf46e6d88c70a3e62e82ceab69c285934f802b5 SHA512 94411b185f75967d240777124272d04b13f3cb3e43de6f751baa9944e07086f9fa2972e4854514fb39f85d69422a07fd1ee1cc7fc587dacf54b777bdf68439ea WHIRLPOOL ec71b8c06e85b5ec0a4040def4447e6aa2589bbaf9bd4b5d7479a2b968357a2b5c4a30e7c2739bd1b4607e074cdc9d15e0f730ed1a69cb936d514056d53578e0
MISC metadata.xml 1112 SHA256 fa2a7f9e7f1ee1c432907cbc5cc0dd23f9636b5f4c51836dbcdbf24f72975c2a SHA512 eb7e2db9932c108442e69bd3ddf04d8d753dede44f7453b1fa33730ec9cda89e618f4444a0adf3f9e7d09baf8c97ff19831906ad7148a26674269f1efd427e6b WHIRLPOOL 7b675f34fbd1f58f42d7ad5c4e39e1d80922474624047165b30d85ecdbbffd1246d68b0dad4d7553c0d2fc900249e3425fc04f9b3821f189b30ebb2d2615dbad

View File

@ -1,42 +0,0 @@
From b7537308b7c758f33c347cb0bec62754c43c271f Mon Sep 17 00:00:00 2001
From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
Date: Sat, 27 Feb 2016 17:38:11 +0000
Subject: [PATCH] Yet another duplicate name bugfix by overestimating the
memory needed (i.e. another hack - PCRE2 has this "properly" fixed).
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1636 2f5784b3-3f2a-0410-8824-cb99058d5e15
---
ChangeLog | 7 +++++++
pcre_compile.c | 7 ++++++-
testdata/testinput2 | 2 ++
testdata/testoutput2 | 2 ++
4 files changed, 17 insertions(+), 1 deletion(-)
14. And yet another buffer overflow bug involving duplicate named groups, this
time nested, with a nested back reference. Yet again, I have just allowed
for more memory, because anything more needs all the refactoring that has
been done for PCRE2. An example pattern that provoked this bug is:
/((?J)(?'R'(?'R'(?'R'(?'R'(?'R'(?|(\k'R'))))))))/ and the bug was
registered as CVE-2016-1283.
diff --git a/pcre_compile.c b/pcre_compile.c
index 5019854..4ffea0c 100644
--- a/pcre_compile.c
+++ b/pcre_compile.c
@@ -7311,7 +7311,12 @@ for (;; ptr++)
so far in order to get the number. If the name is not found, leave
the value of recno as 0 for a forward reference. */
- else
+ /* This patch (removing "else") fixes a problem when a reference is
+ to multiple identically named nested groups from within the nest.
+ Once again, it is not the "proper" fix, and it results in an
+ over-allocation of memory. */
+
+ /* else */
{
ng = cd->named_groups;
for (i = 0; i < cd->names_found; i++, ng++)
--
2.7.4

View File

@ -1,172 +0,0 @@
From 943a5105b9fe2842851003f692c7077a6cdbeefe Mon Sep 17 00:00:00 2001
From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
Date: Wed, 10 Feb 2016 19:13:17 +0000
Subject: [PATCH] Fix workspace overflow for (*ACCEPT) with deeply nested
parentheses.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1631 2f5784b3-3f2a-0410-8824-cb99058d5e15
---
ChangeLog | 32 ++++++++++++++++++--------------
pcre_compile.c | 23 +++++++++++++++++++----
pcre_internal.h | 4 ++--
pcreposix.c | 5 +++--
testdata/testinput11 | 2 ++
testdata/testoutput11-16 | 3 +++
testdata/testoutput11-32 | 3 +++
testdata/testoutput11-8 | 3 +++
8 files changed, 53 insertions(+), 22 deletions(-)
13. A pattern that included (*ACCEPT) in the middle of a sufficiently deeply
nested set of parentheses of sufficient size caused an overflow of the
compiling workspace (which was diagnosed, but of course is not desirable).
diff --git a/pcre_compile.c b/pcre_compile.c
index b9a239e..5019854 100644
--- a/pcre_compile.c
+++ b/pcre_compile.c
@@ -6,7 +6,7 @@
and semantics are as close as possible to those of the Perl 5 language.
Written by Philip Hazel
- Copyright (c) 1997-2014 University of Cambridge
+ Copyright (c) 1997-2016 University of Cambridge
-----------------------------------------------------------------------------
Redistribution and use in source and binary forms, with or without
@@ -560,6 +560,7 @@ static const char error_texts[] =
/* 85 */
"parentheses are too deeply nested (stack check)\0"
"digits missing in \\x{} or \\o{}\0"
+ "regular expression is too complicated\0"
;
/* Table to identify digits and hex digits. This is used when compiling
@@ -4591,7 +4592,8 @@ for (;; ptr++)
if (code > cd->start_workspace + cd->workspace_size -
WORK_SIZE_SAFETY_MARGIN) /* Check for overrun */
{
- *errorcodeptr = ERR52;
+ *errorcodeptr = (code >= cd->start_workspace + cd->workspace_size)?
+ ERR52 : ERR87;
goto FAILED;
}
@@ -6626,8 +6628,21 @@ for (;; ptr++)
cd->had_accept = TRUE;
for (oc = cd->open_caps; oc != NULL; oc = oc->next)
{
- *code++ = OP_CLOSE;
- PUT2INC(code, 0, oc->number);
+ if (lengthptr != NULL)
+ {
+#ifdef COMPILE_PCRE8
+ *lengthptr += 1 + IMM2_SIZE;
+#elif defined COMPILE_PCRE16
+ *lengthptr += 2 + IMM2_SIZE;
+#elif defined COMPILE_PCRE32
+ *lengthptr += 4 + IMM2_SIZE;
+#endif
+ }
+ else
+ {
+ *code++ = OP_CLOSE;
+ PUT2INC(code, 0, oc->number);
+ }
}
setverb = *code++ =
(cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;
diff --git a/pcre_internal.h b/pcre_internal.h
index f7a5ee7..dbfe80e 100644
--- a/pcre_internal.h
+++ b/pcre_internal.h
@@ -7,7 +7,7 @@
and semantics are as close as possible to those of the Perl 5 language.
Written by Philip Hazel
- Copyright (c) 1997-2014 University of Cambridge
+ Copyright (c) 1997-2016 University of Cambridge
-----------------------------------------------------------------------------
Redistribution and use in source and binary forms, with or without
@@ -2289,7 +2289,7 @@ enum { ERR0, ERR1, ERR2, ERR3, ERR4, ERR5, ERR6, ERR7, ERR8, ERR9,
ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69,
ERR70, ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERR78, ERR79,
- ERR80, ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERRCOUNT };
+ ERR80, ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERR87, ERRCOUNT };
/* JIT compiling modes. The function list is indexed by them. */
diff --git a/pcreposix.c b/pcreposix.c
index dcc13ef..55b6ddc 100644
--- a/pcreposix.c
+++ b/pcreposix.c
@@ -6,7 +6,7 @@
and semantics are as close as possible to those of the Perl 5 language.
Written by Philip Hazel
- Copyright (c) 1997-2014 University of Cambridge
+ Copyright (c) 1997-2016 University of Cambridge
-----------------------------------------------------------------------------
Redistribution and use in source and binary forms, with or without
@@ -173,7 +173,8 @@ static const int eint[] = {
REG_BADPAT, /* group name must start with a non-digit */
/* 85 */
REG_BADPAT, /* parentheses too deeply nested (stack check) */
- REG_BADPAT /* missing digits in \x{} or \o{} */
+ REG_BADPAT, /* missing digits in \x{} or \o{} */
+ REG_BADPAT /* pattern too complicated */
};
/* Table of texts corresponding to POSIX error codes */
diff --git a/testdata/testinput11 b/testdata/testinput11
index ac9d228..6f0989a 100644
--- a/testdata/testinput11
+++ b/testdata/testinput11
@@ -138,4 +138,6 @@ is required for these tests. --/
/.((?2)(?R)\1)()/B
+/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/
+
/-- End of testinput11 --/
diff --git a/testdata/testoutput11-16 b/testdata/testoutput11-16
index 280692e..3c485da 100644
--- a/testdata/testoutput11-16
+++ b/testdata/testoutput11-16
@@ -765,4 +765,7 @@ Memory allocation (code space): 14
25 End
------------------------------------------------------------------
+/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/
+Failed: regular expression is too complicated at offset 490
+
/-- End of testinput11 --/
diff --git a/testdata/testoutput11-32 b/testdata/testoutput11-32
index cdbda74..e19518d 100644
--- a/testdata/testoutput11-32
+++ b/testdata/testoutput11-32
@@ -765,4 +765,7 @@ Memory allocation (code space): 28
25 End
------------------------------------------------------------------
+/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/
+Failed: missing ) at offset 509
+
/-- End of testinput11 --/
diff --git a/testdata/testoutput11-8 b/testdata/testoutput11-8
index cb37896..5a4fbb2 100644
--- a/testdata/testoutput11-8
+++ b/testdata/testoutput11-8
@@ -765,4 +765,7 @@ Memory allocation (code space): 10
38 End
------------------------------------------------------------------
+/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/
+Failed: missing ) at offset 509
+
/-- End of testinput11 --/
--
2.7.4

View File

@ -1,93 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal
DESCRIPTION="Perl-compatible regular expression library"
HOMEPAGE="http://www.pcre.org/"
MY_P="pcre-${PV/_rc/-RC}"
if [[ ${PV} != *_rc* ]] ; then
# Only the final releases are available here.
SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
else
SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
fi
LICENSE="BSD"
SLOT="3"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
REQUIRED_USE="readline? ( !libedit )
libedit? ( !readline )"
RDEPEND="bzip2? ( app-arch/bzip2 )
zlib? ( sys-libs/zlib )
libedit? ( dev-libs/libedit )
readline? ( sys-libs/readline:0= )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
RDEPEND="${RDEPEND}
abi_x86_32? (
!<=app-emulation/emul-linux-x86-baselibs-20131008-r2
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
)"
S=${WORKDIR}/${MY_P}
MULTILIB_CHOST_TOOLS=(
/usr/bin/pcre-config
)
src_prepare() {
epatch "${FILESDIR}"/${P}-ZDI-CAN-3542.patch #575546
epatch "${FILESDIR}"/${P}-CVE-2016-1283.patch #570694
sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
elibtoolize
}
multilib_src_configure() {
ECONF_SOURCE="${S}" econf \
--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) \
$(multilib_native_use_enable bzip2 pcregrep-libbz2) \
$(use_enable cxx cpp) \
$(use_enable jit) $(use_enable jit pcregrep-jit) \
$(use_enable pcre16) \
$(use_enable pcre32) \
$(multilib_native_use_enable libedit pcretest-libedit) \
$(multilib_native_use_enable readline pcretest-libreadline) \
$(use_enable static-libs static) \
$(use_enable unicode utf) $(use_enable unicode unicode-properties) \
$(multilib_native_use_enable zlib pcregrep-libz) \
--enable-pcre8 \
--enable-shared \
--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
--docdir="${EPREFIX}"/usr/share/doc/${PF}
}
multilib_src_compile() {
emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
}
multilib_src_install() {
emake \
DESTDIR="${D}" \
$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
install
gen_usr_ldscript -a pcre
}
multilib_src_install_all() {
prune_libtool_files
}
pkg_preinst() {
preserve_old_lib /$(get_libdir)/libpcre.so.0
}
pkg_postinst() {
preserve_old_lib_notify /$(get_libdir)/libpcre.so.0
}

View File

@ -1,4 +1,4 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -19,7 +19,7 @@ fi
LICENSE="BSD"
SLOT="3"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
REQUIRED_USE="readline? ( !libedit )
libedit? ( !readline )"

View File

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -19,7 +19,7 @@ fi
LICENSE="BSD"
SLOT="3"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
REQUIRED_USE="readline? ( !libedit )
libedit? ( !readline )"
@ -42,7 +42,11 @@ MULTILIB_CHOST_TOOLS=(
/usr/bin/pcre-config
)
#PATCHES=(
#)
src_prepare() {
#epatch "${PATCHES[@]}"
sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
elibtoolize
}

View File

@ -1,14 +0,0 @@
DEFINED_PHASES=compile configure install postinst preinst prepare test
DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) virtual/pkgconfig
DESCRIPTION=Perl-compatible regular expression library
EAPI=5
HOMEPAGE=http://www.pcre.org/
IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
SLOT=3
SRC_URI=mirror://sourceforge/pcre/pcre-8.38.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.38.tar.bz2
_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
_md5_=7175720c6415650aed75abe863d0aeed

View File

@ -4,11 +4,11 @@ DESCRIPTION=Perl-compatible regular expression library
EAPI=5
HOMEPAGE=http://www.pcre.org/
IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
SLOT=3
SRC_URI=mirror://sourceforge/pcre/pcre-8.39.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.39.tar.bz2
_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
_md5_=8b917f2995ad1bda39b880bc326c1ff6
_md5_=8cea658ecb3a8ab68b6c60e71332af64

View File

@ -4,11 +4,11 @@ DESCRIPTION=Perl-compatible regular expression library
EAPI=5
HOMEPAGE=http://www.pcre.org/
IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
SLOT=3
SRC_URI=mirror://sourceforge/pcre/pcre-8.38.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.38.tar.bz2
SRC_URI=mirror://sourceforge/pcre/pcre-8.40.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.40.tar.bz2
_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
_md5_=d990004a40d36c82a3ac18322491ab6d
_md5_=e24078c3bf31eeccaf5083daab081345