# HG changeset patch # User April Chin # Date 1331590628 25200 # Node ID 38f3620b270025acb5b338d239bb8e46f68367cb # Parent ac400216a00b93e377b55a19e90b319269881e0a 6960343 Upgrade PCRE to 8.10 or higher PSARC/2012/081 Update pcre to v8.21 diff -r ac400216a00b -r 38f3620b2700 components/pcre/Makefile --- a/components/pcre/Makefile Mon Mar 12 12:36:50 2012 -0700 +++ b/components/pcre/Makefile Mon Mar 12 15:17:08 2012 -0700 @@ -19,16 +19,16 @@ # CDDL HEADER END # -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk COMPONENT_NAME= pcre -COMPONENT_VERSION= 7.8 +COMPONENT_VERSION= 8.21 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz -COMPONENT_ARCHIVE_HASH= sha1:229e6585ec816fbb7081a6b3d29daf1e048f362f +COMPONENT_ARCHIVE_HASH= sha1:dffb43eff9729c0999843a86ef97961b8c4f6ac8 COMPONENT_ARCHIVE_URL= http://sourceforge.net/projects/pcre/files/pcre/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE) COMPONENT_PROJECT_URL= http://pcre.org/ diff -r ac400216a00b -r 38f3620b2700 components/pcre/patches/Makefile.in.patch --- a/components/pcre/patches/Makefile.in.patch Mon Mar 12 12:36:50 2012 -0700 +++ b/components/pcre/patches/Makefile.in.patch Mon Mar 12 15:17:08 2012 -0700 @@ -1,6 +1,6 @@ ---- pcre-7.8.orig/Makefile.in 2008-09-05 09:40:07.000000000 -0700 -+++ pcre-7.8/Makefile.in 2008-12-08 14:58:06.739010878 -0800 -@@ -251,9 +251,9 @@ +--- pcre-8.21.orig/Makefile.in Thu Nov 3 15:31:39 2011 ++++ pcre-8.21/Makefile.in Thu Nov 3 15:33:57 2011 +@@ -275,9 +275,9 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ @@ -10,6 +10,6 @@ +EXTRA_LIBPCRECPP_LDFLAGS = @CXXFLAGS@ @LDFLAGS@ +EXTRA_LIBPCREPOSIX_LDFLAGS = @LDFLAGS@ +EXTRA_LIBPCRE_LDFLAGS = @LDFLAGS@ - F77 = @F77@ - FFLAGS = @FFLAGS@ + FGREP = @FGREP@ GREP = @GREP@ + INSTALL = @INSTALL@ diff -r ac400216a00b -r 38f3620b2700 components/pcre/patches/doc.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/pcre/patches/doc.patch Mon Mar 12 15:17:08 2012 -0700 @@ -0,0 +1,25 @@ +diff -ru pcre-8.21.orig/doc/pcrejit.3 pcre-8.21/doc/pcrejit.3 +--- pcre-8.21.orig/doc/pcrejit.3 Mon Dec 5 04:35:39 2011 ++++ pcre-8.21/doc/pcrejit.3 Mon Dec 19 14:20:39 2011 +@@ -33,6 +33,8 @@ + The Power PC support is designated as experimental because it has not been + fully tested. If --enable-jit is set on an unsupported platform, compilation + fails. ++.sp ++JIT support is not available on Solaris. + .P + A program that is linked with PCRE 8.20 or later can tell if JIT support is + available by calling \fBpcre_config()\fP with the PCRE_CONFIG_JIT option. The +diff -ru pcre-8.21.orig/doc/html/pcrejit.html pcre-8.21/doc/html/pcrejit.html +--- pcre-8.21.orig/doc/html/pcrejit.html Mon Dec 12 04:08:23 2011 ++++ pcre-8.21/doc/html/pcrejit.html Mon Dec 19 14:31:58 2011 +@@ -58,6 +58,9 @@ + fails. +

+

++JIT support is not available on Solaris. ++

++

+ A program that is linked with PCRE 8.20 or later can tell if JIT support is + available by calling pcre_config() with the PCRE_CONFIG_JIT option. The + result is 1 when JIT is available, and 0 otherwise. However, a simple program diff -r ac400216a00b -r 38f3620b2700 components/pcre/pcre.license --- a/components/pcre/pcre.license Mon Mar 12 12:36:50 2012 -0700 +++ b/components/pcre/pcre.license Mon Mar 12 15:17:08 2012 -0700 @@ -1,3 +1,7 @@ + +-------------- +- PCRE v8.21 - +-------------- PCRE LICENCE ------------ @@ -5,12 +9,14 @@ PCRE is a library of functions to support regular expressions whose syntax and semantics are as close as possible to those of the Perl 5 language. -Release 7 of PCRE is distributed under the terms of the "BSD" licence, as +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. The basic library functions are written in C and are freestanding. Also -included in the distribution is a set of C++ wrapper functions. +included in the distribution is a set of C++ wrapper functions, and a +just-in-time compiler that can be used to optimize pattern matching. These +are both optional features that can be omitted when the library is built. THE BASIC LIBRARY FUNCTIONS @@ -21,9 +27,31 @@ Email domain: cam.ac.uk University of Cambridge Computing Service, -Cambridge, England. Phone: +44 1223 334714. +Cambridge, England. + +Copyright (c) 1997-2011 University of Cambridge +All rights reserved. + + +PCRE JUST-IN-TIME COMPILATION SUPPORT +------------------------------------- + +Written by: Zoltan Herczeg +Email local part: hzmester +Emain domain: freemail.hu -Copyright (c) 1997-2006 University of Cambridge +Copyright(c) 2010-2011 Zoltan Herczeg +All rights reserved. + + +STACK-LESS JUST-IN-TIME COMPILER +-------------------------------- + +Written by: Zoltan Herczeg +Email local part: hzmester +Emain domain: freemail.hu + +Copyright(c) 2009-2011 Zoltan Herczeg All rights reserved. @@ -32,7 +60,7 @@ Contributed by: Google Inc. -Copyright (c) 2006, Google Inc. +Copyright (c) 2007-2011, Google Inc. All rights reserved. @@ -67,4 +95,3 @@ POSSIBILITY OF SUCH DAMAGE. End - diff -r ac400216a00b -r 38f3620b2700 components/pcre/pcre.p5m --- a/components/pcre/pcre.p5m Mon Mar 12 12:36:50 2012 -0700 +++ b/components/pcre/pcre.p5m Mon Mar 12 15:17:08 2012 -0700 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. # default mangler.man.stability uncommitted> @@ -31,7 +31,7 @@ set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) set name=org.opensolaris.consolidation value=$(CONSOLIDATION) set name=org.opensolaris.arc-caseid \ - value=PSARC/2007/164 + value=PSARC/2012/081 dir path=usr dir path=usr/bin @@ -50,6 +50,8 @@ dir path=usr/share/man/man1 dir path=usr/share/man/man3 +file path=usr/bin/$(MACH64)/pcregrep +file path=usr/bin/$(MACH64)/pcretest file path=usr/bin/$(MACH64)/pcre-config file path=usr/bin/pcre-config file path=usr/bin/pcregrep @@ -68,6 +70,7 @@ file path=usr/lib/$(MACH64)/llib-lpcre.ln file path=usr/lib/$(MACH64)/pkgconfig/libpcre.pc file path=usr/lib/$(MACH64)/pkgconfig/libpcrecpp.pc +file path=usr/lib/$(MACH64)/pkgconfig/libpcreposix.pc file path=usr/lib/libpcre.so.0.0.0 file path=usr/lib/libpcrecpp.so.0.0.0 file path=usr/lib/libpcreposix.so.0.0.0 @@ -75,8 +78,11 @@ file path=usr/lib/llib-lpcre.ln file path=usr/lib/pkgconfig/libpcre.pc file path=usr/lib/pkgconfig/libpcrecpp.pc +file path=usr/lib/pkgconfig/libpcreposix.pc file path=usr/share/doc/pcre/html/index.html +file path=usr/share/doc/pcre/html/pcre-config.html file path=usr/share/doc/pcre/html/pcre.html +file path=usr/share/doc/pcre/html/pcre_assign_jit_stack.html file path=usr/share/doc/pcre/html/pcre_compile.html file path=usr/share/doc/pcre/html/pcre_compile2.html file path=usr/share/doc/pcre/html/pcre_config.html @@ -84,6 +90,7 @@ file path=usr/share/doc/pcre/html/pcre_copy_substring.html file path=usr/share/doc/pcre/html/pcre_dfa_exec.html file path=usr/share/doc/pcre/html/pcre_exec.html +file path=usr/share/doc/pcre/html/pcre_free_study.html file path=usr/share/doc/pcre/html/pcre_free_substring.html file path=usr/share/doc/pcre/html/pcre_free_substring_list.html file path=usr/share/doc/pcre/html/pcre_fullinfo.html @@ -93,6 +100,8 @@ file path=usr/share/doc/pcre/html/pcre_get_substring.html file path=usr/share/doc/pcre/html/pcre_get_substring_list.html file path=usr/share/doc/pcre/html/pcre_info.html +file path=usr/share/doc/pcre/html/pcre_jit_stack_alloc.html +file path=usr/share/doc/pcre/html/pcre_jit_stack_free.html file path=usr/share/doc/pcre/html/pcre_maketables.html file path=usr/share/doc/pcre/html/pcre_refcount.html file path=usr/share/doc/pcre/html/pcre_study.html @@ -102,7 +111,10 @@ file path=usr/share/doc/pcre/html/pcrecallout.html file path=usr/share/doc/pcre/html/pcrecompat.html file path=usr/share/doc/pcre/html/pcrecpp.html +file path=usr/share/doc/pcre/html/pcredemo.html file path=usr/share/doc/pcre/html/pcregrep.html +file path=usr/share/doc/pcre/html/pcrejit.html +file path=usr/share/doc/pcre/html/pcrelimits.html file path=usr/share/doc/pcre/html/pcrematching.html file path=usr/share/doc/pcre/html/pcrepartial.html file path=usr/share/doc/pcre/html/pcrepattern.html @@ -112,10 +124,12 @@ 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/pcretest.html +file path=usr/share/doc/pcre/html/pcreunicode.html file path=usr/share/man/man1/pcre-config.1 file path=usr/share/man/man1/pcregrep.1 file path=usr/share/man/man1/pcretest.1 file path=usr/share/man/man3/pcre.3 +file path=usr/share/man/man3/pcre_assign_jit_stack.3 file path=usr/share/man/man3/pcre_compile.3 file path=usr/share/man/man3/pcre_compile2.3 file path=usr/share/man/man3/pcre_config.3 @@ -123,6 +137,7 @@ file path=usr/share/man/man3/pcre_copy_substring.3 file path=usr/share/man/man3/pcre_dfa_exec.3 file path=usr/share/man/man3/pcre_exec.3 +file path=usr/share/man/man3/pcre_free_study.3 file path=usr/share/man/man3/pcre_free_substring.3 file path=usr/share/man/man3/pcre_free_substring_list.3 file path=usr/share/man/man3/pcre_fullinfo.3 @@ -132,6 +147,8 @@ file path=usr/share/man/man3/pcre_get_substring.3 file path=usr/share/man/man3/pcre_get_substring_list.3 file path=usr/share/man/man3/pcre_info.3 +file path=usr/share/man/man3/pcre_jit_stack_alloc.3 +file path=usr/share/man/man3/pcre_jit_stack_free.3 file path=usr/share/man/man3/pcre_maketables.3 file path=usr/share/man/man3/pcre_refcount.3 file path=usr/share/man/man3/pcre_study.3 @@ -141,6 +158,8 @@ file path=usr/share/man/man3/pcrecallout.3 file path=usr/share/man/man3/pcrecompat.3 file path=usr/share/man/man3/pcrecpp.3 +file path=usr/share/man/man3/pcrejit.3 +file path=usr/share/man/man3/pcrelimits.3 file path=usr/share/man/man3/pcrematching.3 file path=usr/share/man/man3/pcrepartial.3 file path=usr/share/man/man3/pcrepattern.3 @@ -150,6 +169,7 @@ file path=usr/share/man/man3/pcresample.3 file path=usr/share/man/man3/pcrestack.3 file path=usr/share/man/man3/pcresyntax.3 +file path=usr/share/man/man3/pcreunicode.3 link path=usr/lib/$(MACH64)/libpcre.so target=libpcre.so.0.0.0 link path=usr/lib/$(MACH64)/libpcre.so.0 target=libpcre.so.0.0.0