25212050 Update pcre to version 8.39 s11u3-sru
authorRich Burridge <rich.burridge@oracle.com>
Fri, 06 Jan 2017 14:53:24 -0800
branchs11u3-sru
changeset 7543 c28bd8192b99
parent 7538 1668450ff96c
child 7555 887e36ad4b59
25212050 Update pcre to version 8.39 25211003 problem in LIBRARY/PCRE
components/pcre/Makefile
components/pcre/patches/04-pcre_compile.c.patch
components/pcre/pcre.p5m
--- a/components/pcre/Makefile	Thu Dec 08 17:02:09 2016 +0100
+++ b/components/pcre/Makefile	Fri Jan 06 14:53:24 2017 -0800
@@ -19,22 +19,22 @@
 # CDDL HEADER END
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		pcre
-COMPONENT_VERSION=	8.38
+COMPONENT_VERSION=	8.39
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:9883e419c336c63b0cb5202b09537c140966d585e4d0da66147dc513da13e629
+    sha256:ccdf7e788769838f8285b3ee672ed573358202305ee361cfec7a4a4fb005bbc7
 COMPONENT_ARCHIVE_URL=	http://sourceforge.net/projects/pcre/files/pcre/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL=  http://pcre.org/
 COMPONENT_BUGDB=	library/pcre
 
-TPNO=			25877
+TPNO=			32943
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
--- a/components/pcre/patches/04-pcre_compile.c.patch	Thu Dec 08 17:02:09 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-This patch fixes CVE-2016-1283, filed upstream as:
-
-  https://bugs.exim.org/show_bug.cgi?id=1767
-
-See also:
-
-  http://www.cvedetails.com/cve-details.php?t=1&cve_id=cve-2016-1283
-
-This problem has already been fixed upstream in the svn code repository at:
-
-  svn://vcs.exim.org/pcre/code/trunk
-
---- pcre-8.38/pcre_compile.c.orig	2016-03-02 10:28:48.735223798 -0800
-+++ pcre-8.38/pcre_compile.c	2016-03-02 10:30:50.856995461 -0800
[email protected]@ -7274,7 +7274,12 @@
-           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++)
--- a/components/pcre/pcre.p5m	Thu Dec 08 17:02:09 2016 +0100
+++ b/components/pcre/pcre.p5m	Fri Jan 06 14:53:24 2017 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -124,6 +124,7 @@
 file path=usr/share/doc/pcre/html/pcreprecompile.html
 file path=usr/share/doc/pcre/html/pcresample.html
 file path=usr/share/doc/pcre/html/pcrestack.html
+file path=usr/share/doc/pcre/html/pcresyntax.html
 file path=usr/share/doc/pcre/html/pcretest.html
 file path=usr/share/doc/pcre/html/pcreunicode.html
 file path=usr/share/man/man1/pcre-config.1