22295693 update pcre to version 8.38 s11u3-sru
authorApril Chin <april.chin@oracle.com>
Tue, 05 Jan 2016 16:59:20 -0800
branchs11u3-sru
changeset 5230 03a3a267d872
parent 5208 0606ba1c1cc6
child 5237 c85859d16ccb
22295693 update pcre to version 8.38 22264376 problem in LIBRARY/PCRE
components/pcre/Makefile
components/pcre/patches/04-CVE-2015-3210.patch
components/pcre/patches/05-CVE-2015-3217.patch
components/pcre/patches/06-CVE-2015-5073.patch
components/pcre/pcre.license
components/pcre/pcre.p5m
--- a/components/pcre/Makefile	Thu Dec 17 09:15:10 2015 -0800
+++ b/components/pcre/Makefile	Tue Jan 05 16:59:20 2016 -0800
@@ -25,16 +25,16 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		pcre
-COMPONENT_VERSION=	8.37
+COMPONENT_VERSION=	8.38
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:19d490a714274a8c4c9d131f651489b8647cdb40a159e9fb7ce17ba99ef992ab
+    sha256:9883e419c336c63b0cb5202b09537c140966d585e4d0da66147dc513da13e629
 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=			23018
+TPNO=			25877
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
--- a/components/pcre/patches/04-CVE-2015-3210.patch	Thu Dec 17 09:15:10 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,456 +0,0 @@
-Patch from upstream:
-http://vcs.pcre.org/pcre?view=revision&revision=1558
-to fix CVE-2015-3210 in this upstream bug:
-https://bugs.exim.org/show_bug.cgi?id=1636
-
-Must also include the other commits to pcre_compile.c since 8.37;
-otherwise, a test case fails.
-http://vcs.pcre.org/pcre?view=revision&revision=1555
-http://vcs.pcre.org/pcre?view=revision&revision=1556
-http://vcs.pcre.org/pcre?view=revision&revision=1557
-
-This patch may be removed when pcre is upgraded from version 8.37
-
---- pcre-8.37-orig/ChangeLog	2015-04-28 04:37:57.000000000 -0700
-+++ pcre-8.37/ChangeLog	2015-06-18 14:04:00.765607692 -0700
[email protected]@ -1,6 +1,29 @@
- ChangeLog for PCRE
- ------------------
- 
-+Changes since Version 8.37
-+------------------------
-+
-+1.  If a group that contained a recursive back reference also contained a
-+    forward reference subroutine call followed by a non-forward-reference
-+    subroutine call, for example /.((?2)(?R)\1)()/, pcre2_compile() failed to
-+    compile correct code, leading to undefined behaviour or an internally
-+    detected error. This bug was discovered by the LLVM fuzzer.
-+    
-+2.  Quantification of certain items (e.g. atomic back references) could cause
-+    incorrect code to be compiled when recursive forward references were
-+    involved. For example, in this pattern: /(?1)()((((((\1++))\x85)+)|))/.
-+    This bug was discovered by the LLVM fuzzer.
-+    
-+3.  A repeated conditional group whose condition was a reference by name caused
-+    a buffer overflow if there was more than one group with the given name.
-+    This bug was discovered by the LLVM fuzzer.
-+    
-+4.  A recursive back reference by name within a group that had the same name as
-+    another group caused a buffer overflow. For example:
-+    /(?J)(?'d'(?'d'\g{d}))/. This bug was discovered by the LLVM fuzzer.
-+ 
-+
- Version 8.37 28-April-2015
- --------------------------
- 
---- pcre-8.37-orig/pcre_compile.c	2015-04-13 08:54:01.000000000 -0700
-+++ pcre-8.37/pcre_compile.c	2015-06-18 13:50:47.045221926 -0700
[email protected]@ -3985,11 +3985,12 @@ have their offsets adjusted. That one of
- is called, the partially compiled regex must be temporarily terminated with
- OP_END.
- 
--This function has been extended with the possibility of forward references for
--recursions and subroutine calls. It must also check the list of such references
--for the group we are dealing with. If it finds that one of the recursions in
--the current group is on this list, it adjusts the offset in the list, not the
--value in the reference (which is a group number).
-+This function has been extended to cope with forward references for recursions
-+and subroutine calls. It must check the list of such references for the
-+group we are dealing with. If it finds that one of the recursions in the
-+current group is on this list, it does not adjust the value in the reference
-+(which is a group number). After the group has been scanned, all the offsets in
-+the forward reference list for the group are adjusted.
- 
- Arguments:
-   group      points to the start of the group
[email protected]@ -4005,29 +4006,21 @@ static void
- adjust_recurse(pcre_uchar *group, int adjust, BOOL utf, compile_data *cd,
-   size_t save_hwm_offset)
- {
-+int offset;
-+pcre_uchar *hc;
- pcre_uchar *ptr = group;
- 
- while ((ptr = (pcre_uchar *)find_recurse(ptr, utf)) != NULL)
-   {
--  int offset;
--  pcre_uchar *hc;
--
--  /* See if this recursion is on the forward reference list. If so, adjust the
--  reference. */
--
-   for (hc = (pcre_uchar *)cd->start_workspace + save_hwm_offset; hc < cd->hwm;
-        hc += LINK_SIZE)
-     {
-     offset = (int)GET(hc, 0);
--    if (cd->start_code + offset == ptr + 1)
--      {
--      PUT(hc, 0, offset + adjust);
--      break;
--      }
-+    if (cd->start_code + offset == ptr + 1) break;
-     }
- 
--  /* Otherwise, adjust the recursion offset if it's after the start of this
--  group. */
-+  /* If we have not found this recursion on the forward reference list, adjust
-+  the recursion's offset if it's after the start of this group. */
- 
-   if (hc >= cd->hwm)
-     {
[email protected]@ -4037,6 +4030,15 @@ while ((ptr = (pcre_uchar *)find_recurse
- 
-   ptr += 1 + LINK_SIZE;
-   }
-+
-+/* Now adjust all forward reference offsets for the group. */
-+
-+for (hc = (pcre_uchar *)cd->start_workspace + save_hwm_offset; hc < cd->hwm;
-+     hc += LINK_SIZE)
-+  {
-+  offset = (int)GET(hc, 0);
-+  PUT(hc, 0, offset + adjust);
-+  }
- }
- 
- 
[email protected]@ -4465,7 +4467,7 @@ const pcre_uchar *tempptr;
- const pcre_uchar *nestptr = NULL;
- pcre_uchar *previous = NULL;
- pcre_uchar *previous_callout = NULL;
--size_t save_hwm_offset = 0;
-+size_t item_hwm_offset = 0;
- pcre_uint8 classbits[32];
- 
- /* We can fish out the UTF-8 setting once and for all into a BOOL, but we
[email protected]@ -4767,6 +4769,7 @@ for (;; ptr++)
-     zeroreqchar = reqchar;
-     zeroreqcharflags = reqcharflags;
-     previous = code;
-+    item_hwm_offset = cd->hwm - cd->start_workspace;
-     *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;
-     break;
- 
[email protected]@ -4818,6 +4821,7 @@ for (;; ptr++)
-     /* Handle a real character class. */
- 
-     previous = code;
-+    item_hwm_offset = cd->hwm - cd->start_workspace;
- 
-     /* PCRE supports POSIX class stuff inside a class. Perl gives an error if
-     they are encountered at the top level, so we'll do that too. */
[email protected]@ -5930,7 +5934,7 @@ for (;; ptr++)
-       {
-       register int i;
-       int len = (int)(code - previous);
--      size_t base_hwm_offset = save_hwm_offset;
-+      size_t base_hwm_offset = item_hwm_offset;
-       pcre_uchar *bralink = NULL;
-       pcre_uchar *brazeroptr = NULL;
- 
[email protected]@ -5985,7 +5989,7 @@ for (;; ptr++)
-         if (repeat_max <= 1)    /* Covers 0, 1, and unlimited */
-           {
-           *code = OP_END;
--          adjust_recurse(previous, 1, utf, cd, save_hwm_offset);
-+          adjust_recurse(previous, 1, utf, cd, item_hwm_offset);
-           memmove(previous + 1, previous, IN_UCHARS(len));
-           code++;
-           if (repeat_max == 0)
[email protected]@ -6009,7 +6013,7 @@ for (;; ptr++)
-           {
-           int offset;
-           *code = OP_END;
--          adjust_recurse(previous, 2 + LINK_SIZE, utf, cd, save_hwm_offset);
-+          adjust_recurse(previous, 2 + LINK_SIZE, utf, cd, item_hwm_offset);
-           memmove(previous + 2 + LINK_SIZE, previous, IN_UCHARS(len));
-           code += 2 + LINK_SIZE;
-           *previous++ = OP_BRAZERO + repeat_type;
[email protected]@ -6267,7 +6271,7 @@ for (;; ptr++)
-               {
-               int nlen = (int)(code - bracode);
-               *code = OP_END;
--              adjust_recurse(bracode, 1 + LINK_SIZE, utf, cd, save_hwm_offset);
-+              adjust_recurse(bracode, 1 + LINK_SIZE, utf, cd, item_hwm_offset);
-               memmove(bracode + 1 + LINK_SIZE, bracode, IN_UCHARS(nlen));
-               code += 1 + LINK_SIZE;
-               nlen += 1 + LINK_SIZE;
[email protected]@ -6401,7 +6405,7 @@ for (;; ptr++)
-         else
-           {
-           *code = OP_END;
--          adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, save_hwm_offset);
-+          adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, item_hwm_offset);
-           memmove(tempcode + 1 + LINK_SIZE, tempcode, IN_UCHARS(len));
-           code += 1 + LINK_SIZE;
-           len += 1 + LINK_SIZE;
[email protected]@ -6450,7 +6454,7 @@ for (;; ptr++)
- 
-         default:
-         *code = OP_END;
--        adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, save_hwm_offset);
-+        adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, item_hwm_offset);
-         memmove(tempcode + 1 + LINK_SIZE, tempcode, IN_UCHARS(len));
-         code += 1 + LINK_SIZE;
-         len += 1 + LINK_SIZE;
[email protected]@ -6623,7 +6627,7 @@ for (;; ptr++)
-     newoptions = options;
-     skipbytes = 0;
-     bravalue = OP_CBRA;
--    save_hwm_offset = cd->hwm - cd->start_workspace;
-+    item_hwm_offset = cd->hwm - cd->start_workspace;
-     reset_bracount = FALSE;
- 
-     /* Deal with the extended parentheses; all are introduced by '?', and the
[email protected]@ -6769,7 +6773,7 @@ for (;; ptr++)
-             ptr++;
-             }
-           namelen = (int)(ptr - name);
--          if (lengthptr != NULL) *lengthptr += IMM2_SIZE;
-+          if (lengthptr != NULL) skipbytes += IMM2_SIZE;
-           }
- 
-         /* Check the terminator */
[email protected]@ -7173,14 +7177,26 @@ for (;; ptr++)
-           number. If the name is not found, set the value to 0 for a forward
-           reference. */
- 
-+          recno = 0;
-           ng = cd->named_groups;
-           for (i = 0; i < cd->names_found; i++, ng++)
-             {
-             if (namelen == ng->length &&
-                 STRNCMP_UC_UC(name, ng->name, namelen) == 0)
--              break;
-+              {
-+              open_capitem *oc;
-+              recno = ng->number;
-+              if (is_recurse) break;
-+              for (oc = cd->open_caps; oc != NULL; oc = oc->next)         
-+                {          
-+                if (oc->number == recno)                                     
-+                  {               
-+                  oc->flag = TRUE;                                      
-+                  break;
-+                  }                                                         
-+                }                          
-+              }    
-             }
--          recno = (i < cd->names_found)? ng->number : 0;
- 
-           /* Count named back references. */
- 
[email protected]@ -7247,6 +7263,7 @@ for (;; ptr++)
-             {
-             if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
-             previous = code;
-+            item_hwm_offset = cd->hwm - cd->start_workspace;
-             *code++ = ((options & PCRE_CASELESS) != 0)? OP_DNREFI : OP_DNREF;
-             PUT2INC(code, 0, index);
-             PUT2INC(code, 0, count);
[email protected]@ -7360,6 +7377,7 @@ for (;; ptr++)
-           HANDLE_RECURSION:
- 
-           previous = code;
-+          item_hwm_offset = cd->hwm - cd->start_workspace;
-           called = cd->start_code;
- 
-           /* When we are actually compiling, find the bracket that is being
[email protected]@ -7561,7 +7579,11 @@ for (;; ptr++)
-       previous = NULL;
-       cd->iscondassert = FALSE;
-       }
--    else previous = code;
-+    else 
-+      {
-+      previous = code;
-+      item_hwm_offset = cd->hwm - cd->start_workspace;
-+      }
- 
-     *code = bravalue;
-     tempcode = code;
[email protected]@ -7809,7 +7831,7 @@ for (;; ptr++)
-         const pcre_uchar *p;
-         pcre_uint32 cf;
- 
--        save_hwm_offset = cd->hwm - cd->start_workspace;   /* Normally this is set when '(' is read */
-+        item_hwm_offset = cd->hwm - cd->start_workspace;   /* Normally this is set when '(' is read */
-         terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?
-           CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;
- 
[email protected]@ -7877,6 +7899,7 @@ for (;; ptr++)
-         HANDLE_REFERENCE:
-         if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
-         previous = code;
-+        item_hwm_offset = cd->hwm - cd->start_workspace;
-         *code++ = ((options & PCRE_CASELESS) != 0)? OP_REFI : OP_REF;
-         PUT2INC(code, 0, recno);
-         cd->backref_map |= (recno < 32)? (1 << recno) : 1;
[email protected]@ -7906,6 +7929,7 @@ for (;; ptr++)
-         if (!get_ucp(&ptr, &negated, &ptype, &pdata, errorcodeptr))
-           goto FAILED;
-         previous = code;
-+        item_hwm_offset = cd->hwm - cd->start_workspace;
-         *code++ = ((escape == ESC_p) != negated)? OP_PROP : OP_NOTPROP;
-         *code++ = ptype;
-         *code++ = pdata;
[email protected]@ -7946,6 +7970,7 @@ for (;; ptr++)
- 
-           {
-           previous = (escape > ESC_b && escape < ESC_Z)? code : NULL;
-+          item_hwm_offset = cd->hwm - cd->start_workspace;
-           *code++ = (!utf && escape == ESC_C)? OP_ALLANY : escape;
-           }
-         }
[email protected]@ -7989,6 +8014,7 @@ for (;; ptr++)
- 
-     ONE_CHAR:
-     previous = code;
-+    item_hwm_offset = cd->hwm - cd->start_workspace;
- 
-     /* For caseless UTF-8 mode when UCP support is available, check whether
-     this character has more than one other case. If so, generate a special
---- pcre-8.37-orig/testdata/testinput11	2015-03-02 09:08:42.000000000 -0800
-+++ pcre-8.37/testdata/testinput11	2015-06-18 14:07:11.883240591 -0700
[email protected]@ -136,4 +136,6 @@ is required for these tests. --/
- 
- /((?+1)(\1))/B
- 
-+/.((?2)(?R)\1)()/B
-+
- /-- End of testinput11 --/
---- pcre-8.37-orig/testdata/testinput2	2015-04-13 02:36:15.000000000 -0700
-+++ pcre-8.37/testdata/testinput2	2015-06-18 14:13:30.706283638 -0700
[email protected]@ -4152,4 +4152,20 @@ backtracking verbs. --/
- 
- /((?2){73}(?2))((?1))/
- 
-+/.((?2)(?R)\1)()/BZ
-+
-+/(?1)()((((((\1++))\x85)+)|))/
-+
-+/(\9*+(?2);\3++()2|)++{/
-+
-+/\V\x85\9*+((?2)\3++()2)*:2/
-+
-+/(((?(R)){0,2}) (?''((?'R')((?'R')))))/J
-+
-+/(((?(X)){0,2}) (?''((?'X')((?'X')))))/J
-+
-+/(((?(R)){0,2}) (?''((?'X')((?'R')))))/
-+
-+"(?J)(?'d'(?'d'\g{d}))"
-+
- /-- End of testinput2 --/
---- pcre-8.37-orig/testdata/testoutput11-16	2015-03-02 09:09:21.000000000 -0800
-+++ pcre-8.37/testdata/testoutput11-16	2015-06-18 14:09:10.358550764 -0700
[email protected]@ -748,4 +748,21 @@ Memory allocation (code space): 14
-  22     End
- ------------------------------------------------------------------
- 
-+/.((?2)(?R)\1)()/B
-+------------------------------------------------------------------
-+  0  23 Bra
-+  2     Any
-+  3  13 Once
-+  5   9 CBra 1
-+  8  18 Recurse
-+ 10   0 Recurse
-+ 12     \1
-+ 14   9 Ket
-+ 16  13 Ket
-+ 18   3 CBra 2
-+ 21   3 Ket
-+ 23  23 Ket
-+ 25     End
-+------------------------------------------------------------------
-+
- /-- End of testinput11 --/
---- pcre-8.37-orig/testdata/testoutput11-32	2015-03-02 09:09:30.000000000 -0800
-+++ pcre-8.37/testdata/testoutput11-32	2015-06-18 14:10:09.893600910 -0700
[email protected]@ -748,4 +748,21 @@ Memory allocation (code space): 28
-  22     End
- ------------------------------------------------------------------
- 
-+/.((?2)(?R)\1)()/B
-+------------------------------------------------------------------
-+  0  23 Bra
-+  2     Any
-+  3  13 Once
-+  5   9 CBra 1
-+  8  18 Recurse
-+ 10   0 Recurse
-+ 12     \1
-+ 14   9 Ket
-+ 16  13 Ket
-+ 18   3 CBra 2
-+ 21   3 Ket
-+ 23  23 Ket
-+ 25     End
-+------------------------------------------------------------------
-+
- /-- End of testinput11 --/
---- pcre-8.37-orig/testdata/testoutput11-8	2015-03-02 09:09:13.000000000 -0800
-+++ pcre-8.37/testdata/testoutput11-8	2015-06-18 14:11:19.765400848 -0700
[email protected]@ -748,4 +748,21 @@ Memory allocation (code space): 10
-  34     End
- ------------------------------------------------------------------
- 
-+/.((?2)(?R)\1)()/B
-+------------------------------------------------------------------
-+  0  35 Bra
-+  3     Any
-+  4  20 Once
-+  7  14 CBra 1
-+ 12  27 Recurse
-+ 15   0 Recurse
-+ 18     \1
-+ 21  14 Ket
-+ 24  20 Ket
-+ 27   5 CBra 2
-+ 32   5 Ket
-+ 35  35 Ket
-+ 38     End
-+------------------------------------------------------------------
-+
- /-- End of testinput11 --/
---- pcre-8.37-orig/testdata/testoutput2	2015-04-13 02:36:27.000000000 -0700
-+++ pcre-8.37/testdata/testoutput2	2015-06-18 14:15:05.747984099 -0700
[email protected]@ -14423,4 +14423,37 @@ Failed: lookbehind assertion is not fixe
- 
- /((?2){73}(?2))((?1))/
- 
-+/.((?2)(?R)\1)()/BZ
-+------------------------------------------------------------------
-+        Bra
-+        Any
-+        Once
-+        CBra 1
-+        Recurse
-+        Recurse
-+        \1
-+        Ket
-+        Ket
-+        CBra 2
-+        Ket
-+        Ket
-+        End
-+------------------------------------------------------------------
-+
-+/(?1)()((((((\1++))\x85)+)|))/
-+
-+/(\9*+(?2);\3++()2|)++{/
-+Failed: reference to non-existent subpattern at offset 22
-+
-+/\V\x85\9*+((?2)\3++()2)*:2/
-+Failed: reference to non-existent subpattern at offset 26
-+
-+/(((?(R)){0,2}) (?''((?'R')((?'R')))))/J
-+
-+/(((?(X)){0,2}) (?''((?'X')((?'X')))))/J
-+
-+/(((?(R)){0,2}) (?''((?'X')((?'R')))))/
-+
-+"(?J)(?'d'(?'d'\g{d}))"
-+
- /-- End of testinput2 --/
--- a/components/pcre/patches/05-CVE-2015-3217.patch	Thu Dec 17 09:15:10 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-Patch from upstream:
-http://vcs.pcre.org/pcre?view=revision&revision=1566
-to fix CVE-2015-3217 for this upstream bug
-https://bugs.exim.org/show_bug.cgi?id=1638
-
-This patch may be removed when pcre is upgraded from version 8.37
-
---- pcre-8.37-orig/ChangeLog	2015-06-18 14:42:05.162869794 -0700
-+++ pcre-8.37/ChangeLog	2015-06-18 14:42:49.750142570 -0700
[email protected]@ -23,6 +23,10 @@ Changes since Version 8.37
-     another group caused a buffer overflow. For example:
-     /(?J)(?'d'(?'d'\g{d}))/. This bug was discovered by the LLVM fuzzer.
-  
-+5.  If a non-capturing group containing a conditional group that could match
-+    an empty string was repeated, it was not identified as matching an empty
-+    string itself. For example: /^(?:(?(1)x|)+)+$()/.
-+
- 
- Version 8.37 28-April-2015
- --------------------------
---- pcre-8.37-orig/pcre_compile.c	2015-06-18 14:43:18.613383953 -0700
-+++ pcre-8.37/pcre_compile.c	2015-06-18 14:44:14.866515479 -0700
[email protected]@ -2487,7 +2487,7 @@ for (code = first_significant_code(code 
-   if (c == OP_BRA  || c == OP_BRAPOS ||
-       c == OP_CBRA || c == OP_CBRAPOS ||
-       c == OP_ONCE || c == OP_ONCE_NC ||
--      c == OP_COND)
-+      c == OP_COND || c == OP_SCOND)
-     {
-     BOOL empty_branch;
-     if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
---- pcre-8.37-orig/testdata/testinput2	2015-06-18 14:45:30.453719449 -0700
-+++ pcre-8.37/testdata/testinput2	2015-06-18 14:46:14.175672070 -0700
[email protected]@ -4168,4 +4168,6 @@ backtracking verbs. --/
- 
- "(?J)(?'d'(?'d'\g{d}))"
- 
-+/^(?:(?(1)x|)+)+$()/BZ
-+
- /-- End of testinput2 --/
---- pcre-8.37-orig/testdata/testoutput2	2015-06-18 14:45:38.047882931 -0700
-+++ pcre-8.37/testdata/testoutput2	2015-06-18 14:47:02.815368178 -0700
[email protected]@ -14456,4 +14456,22 @@ Failed: reference to non-existent subpat
- 
- "(?J)(?'d'(?'d'\g{d}))"
- 
-+/^(?:(?(1)x|)+)+$()/BZ
-+------------------------------------------------------------------
-+        Bra
-+        ^
-+        SBra
-+        SCond
-+      1 Cond ref
-+        x
-+        Alt
-+        KetRmax
-+        KetRmax
-+        $
-+        CBra 1
-+        Ket
-+        Ket
-+        End
-+------------------------------------------------------------------
-+
- /-- End of testinput2 --/
--- a/components/pcre/patches/06-CVE-2015-5073.patch	Thu Dec 17 09:15:10 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-Patch from upstream:
-http://vcs.pcre.org/pcre?view=revision&revision=1571
-to fix CVE-2015-5073 for this upstream bug
-https://bugs.exim.org/show_bug.cgi?id=1651
-
-This patch may be removed when pcre is upgraded from version 8.37
-
---- pcre-8.37-orig/ChangeLog	2015-06-29 09:12:15.694261234 -0700
-+++ pcre-8.37/ChangeLog	2015-06-29 09:29:45.739958088 -0700
[email protected]@ -27,6 +27,10 @@ Changes since Version 8.37
-     an empty string was repeated, it was not identified as matching an empty
-     string itself. For example: /^(?:(?(1)x|)+)+$()/.
- 
-+6.  A pattern with an unmatched closing parenthesis that contained a backward 
-+    assertion which itself contained a forward reference caused buffer 
-+    overflow. And example pattern is: /(?=di(?<=(?1))|(?=(.))))/.
-+
- 
- Version 8.37 28-April-2015
- --------------------------
---- pcre-8.37-orig/pcre_compile.c	2015-06-29 09:12:15.695805136 -0700
-+++ pcre-8.37/pcre_compile.c	2015-06-29 09:17:13.527304409 -0700
[email protected]@ -9406,7 +9406,7 @@ OP_RECURSE that are not fixed length get
- exceptional ones forgo this. We scan the pattern to check that they are fixed
- length, and set their lengths. */
- 
--if (cd->check_lookbehind)
-+if (errorcode == 0 && cd->check_lookbehind)
-   {
-   pcre_uchar *cc = (pcre_uchar *)codestart;
- 
---- pcre-8.37-orig/testdata/testinput2	2015-06-29 09:12:15.696414562 -0700
-+++ pcre-8.37/testdata/testinput2	2015-06-29 09:24:55.146760633 -0700
[email protected]@ -4170,4 +4170,6 @@ backtracking verbs. --/
- 
- /^(?:(?(1)x|)+)+$()/BZ
- 
-+/(?=di(?<=(?1))|(?=(.))))/
-+
- /-- End of testinput2 --/
---- pcre-8.37-orig/testdata/testoutput2	2015-06-29 09:12:15.698016242 -0700
-+++ pcre-8.37/testdata/testoutput2	2015-06-29 09:26:11.171270088 -0700
[email protected]@ -14474,4 +14474,7 @@ Failed: reference to non-existent subpat
-         End
- ------------------------------------------------------------------
- 
-+/(?=di(?<=(?1))|(?=(.))))/
-+Failed: unmatched parentheses at offset 23
-+
- /-- End of testinput2 --/
--- a/components/pcre/pcre.license	Thu Dec 17 09:15:10 2015 -0800
+++ b/components/pcre/pcre.license	Tue Jan 05 16:59:20 2016 -0800
@@ -6,7 +6,8 @@
 
 Release 8 of PCRE is distributed under the terms of the "BSD" licence, as
 specified below. The documentation for PCRE, supplied in the "doc"
-directory, is distributed under the same terms as the software itself.
+directory, is distributed under the same terms as the software itself. The data
+in the testdata directory is not copyrighted and is in the public domain.
 
 The basic library functions are written in C and are freestanding. Also
 included in the distribution is a set of C++ wrapper functions, and a
--- a/components/pcre/pcre.p5m	Thu Dec 17 09:15:10 2015 -0800
+++ b/components/pcre/pcre.p5m	Tue Jan 05 16:59:20 2016 -0800
@@ -34,13 +34,10 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2012/081
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 file path=usr/bin/$(MACH64)/pcre-config
-file path=usr/bin/$(MACH64)/pcregrep
-file path=usr/bin/$(MACH64)/pcretest
 file path=usr/bin/pcre-config
-file path=usr/bin/pcregrep
-file path=usr/bin/pcretest
+file usr/bin/$(MACH64)/pcregrep path=usr/bin/pcregrep
+file usr/bin/$(MACH64)/pcretest path=usr/bin/pcretest
 file path=usr/include/pcre/pcre.h
 file pcre_internal.h path=usr/include/pcre/pcre_internal.h
 file path=usr/include/pcre/pcre_scanner.h