Index: head/devel/pcre2/Makefile =================================================================== --- head/devel/pcre2/Makefile (revision 477252) +++ head/devel/pcre2/Makefile (revision 477253) @@ -1,98 +1,97 @@ # Created by: Mark Felder # $FreeBSD$ PORTNAME= pcre2 -PORTVERSION= 10.21 -PORTREVISION= 1 +PORTVERSION= 10.31 CATEGORIES= devel MASTER_SITES= SF/pcre/${PORTNAME}/${PORTVERSION} \ ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \ ftp://ftp.fu-berlin.de/unix/misc/pcre/ \ ftp://ftp.tin.org/pub/libs/pcre/ MAINTAINER= feld@FreeBSD.org COMMENT= Perl Compatible Regular Expressions library, version 2 LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENCE USES= autoreconf libtool pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip CONFIGURE_ARGS= --enable-pcre2-16 --enable-pcre2-32 OPTIONS_DEFINE= DOCS STACK_RECURSION OPTIONS_DEFAULT= STACK_RECURSION OPTIONS_RADIO= CLI OPTIONS_RADIO_CLI= LIBEDIT READLINE STACK_RECURSION_DESC= Use the stack for recursion during matching LIBEDIT_CONFIGURE_ENABLE= pcre2test-libedit LIBEDIT_USES= libedit READLINE_USES= readline READLINE_CONFIGURE_ENABLE= pcre2test-libreadline .include .if ${ARCH} != "sparc64" && ${ARCH:Mmips64*} == "" CONFIGURE_ARGS+= --enable-jit .else CONFIGURE_ARGS+= --disable-jit .endif .if ${PORT_OPTIONS:MDOCS} PORTDOCS= * .endif # Using the heap rather than the stack for recursion is slower but less # prone to segfaults from stack exhaustion when matching certain patterns .if !${PORT_OPTIONS:MSTACK_RECURSION} CONFIGURE_ARGS+= --disable-stack-for-recursion .endif # Optional knobs that accept positive integer parameters (see pcrebuild(3)): # Allow the use of very large patterns (> 64K) with the 8- and 16-bit # libraries, at the expense of longer load times (possible values: # 2 (default), 3, and 4): .if defined(WITH_LINK_SIZE) CONFIGURE_ARGS+= --with-link-size=${WITH_LINK_SIZE} .endif # Control PCRE resource use by limiting the default number of times pcre_exec() # can call match() during a single operation (default: 10 million): .if defined(WITH_MATCH_LIMIT) CONFIGURE_ARGS+= --with-match-limit=${WITH_MATCH_LIMIT} .endif # Control PCRE resource use by limiting the default number of times pcre_exec() # can call match() recursively during a single operation (default: 10 million): .if defined(WITH_MATCH_LIMIT_RECURSION) CONFIGURE_ARGS+= --with-match-limit-recursion=${WITH_MATCH_LIMIT_RECURSION} .endif # Control PCRE resource use by limiting the nesting depth of parentheses in # patterns compiled with pcre_compile() (default: 250): .if defined(WITH_PARENS_NEST_LIMIT) CONFIGURE_ARGS+= --with-parens-nest-limit=${WITH_PARENS_NEST_LIMIT} .endif #prevent regression test coredumps from causing failures on the #package-building cluster: .ifndef(MAINTAINER_MODE) CORELIMIT?= /usr/bin/limits -Sc 0 .endif TESTLOGS?= RunGrepTest RunTest pcre_jit_test pcre_scanner_unittest \ pcre_stringpiece_unittest pcrecpp_unittest do-test: @cd ${WRKSRC} ; \ ${SETENV} ${MAKE_ENV} ${CORELIMIT} ${MAKE_CMD} ${MAKE_ARGS} check ; \ for _l in ${TESTLOGS} ; do if ${TEST} -f $${_l}.log ; then \ ${PRINTF} "\n\n$${_l}.log\n\n\n" ; ${CAT} $${_l}.log ; fi ; done .include Index: head/devel/pcre2/distinfo =================================================================== --- head/devel/pcre2/distinfo (revision 477252) +++ head/devel/pcre2/distinfo (revision 477253) @@ -1,2 +1,3 @@ -SHA256 (pcre2-10.21.tar.gz) = 1cfd43caffe07fe7f2cfafc74c8f0d87b38d80bbb63226a1193407476508e317 -SIZE (pcre2-10.21.tar.gz) = 1943713 +TIMESTAMP = 1531321198 +SHA256 (pcre2-10.31.tar.gz) = e11ebd99dd23a7bccc9127d95d9978101b5f3cf0a6e7d25a1b1ca165a97166c4 +SIZE (pcre2-10.31.tar.gz) = 2130574 Index: head/devel/pcre2/files/patch-CVE-2016-3191 =================================================================== --- head/devel/pcre2/files/patch-CVE-2016-3191 (revision 477252) +++ head/devel/pcre2/files/patch-CVE-2016-3191 (nonexistent) @@ -1,27 +0,0 @@ ---- src/pcre2_compile.c 2016/02/06 16:40:59 488 -+++ src/pcre2_compile.c 2016/02/10 18:24:02 489 -@@ -5901,10 +5901,22 @@ - goto FAILED; - } - cb->had_accept = TRUE; -+ -+ /* In the first pass, just accumulate the length required; -+ otherwise hitting (*ACCEPT) inside many nested parentheses can -+ cause workspace overflow. */ -+ - for (oc = cb->open_caps; oc != NULL; oc = oc->next) - { -- *code++ = OP_CLOSE; -- PUT2INC(code, 0, oc->number); -+ if (lengthptr != NULL) -+ { -+ *lengthptr += CU2BYTES(1) + IMM2_SIZE; -+ } -+ else -+ { -+ *code++ = OP_CLOSE; -+ PUT2INC(code, 0, oc->number); -+ } - } - setverb = *code++ = - (cb->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT; Property changes on: head/devel/pcre2/files/patch-CVE-2016-3191 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/pcre2/pkg-plist =================================================================== --- head/devel/pcre2/pkg-plist (revision 477252) +++ head/devel/pcre2/pkg-plist (revision 477253) @@ -1,103 +1,116 @@ bin/pcre2-config bin/pcre2grep bin/pcre2test include/pcre2.h include/pcre2posix.h lib/libpcre2-16.a lib/libpcre2-16.so lib/libpcre2-16.so.0 -lib/libpcre2-16.so.0.3.0 +lib/libpcre2-16.so.0.7.0 lib/libpcre2-32.a lib/libpcre2-32.so lib/libpcre2-32.so.0 -lib/libpcre2-32.so.0.3.0 +lib/libpcre2-32.so.0.7.0 lib/libpcre2-8.a lib/libpcre2-8.so lib/libpcre2-8.so.0 -lib/libpcre2-8.so.0.3.0 +lib/libpcre2-8.so.0.7.0 lib/libpcre2-posix.a lib/libpcre2-posix.so -lib/libpcre2-posix.so.0 -lib/libpcre2-posix.so.0.0.1 +lib/libpcre2-posix.so.2 +lib/libpcre2-posix.so.2.0.0 libdata/pkgconfig/libpcre2-16.pc libdata/pkgconfig/libpcre2-32.pc libdata/pkgconfig/libpcre2-8.pc libdata/pkgconfig/libpcre2-posix.pc man/man1/pcre2-config.1.gz man/man1/pcre2grep.1.gz man/man1/pcre2test.1.gz man/man3/pcre2.3.gz man/man3/pcre2_callout_enumerate.3.gz +man/man3/pcre2_code_copy.3.gz +man/man3/pcre2_code_copy_with_tables.3.gz man/man3/pcre2_code_free.3.gz man/man3/pcre2_compile.3.gz man/man3/pcre2_compile_context_copy.3.gz man/man3/pcre2_compile_context_create.3.gz man/man3/pcre2_compile_context_free.3.gz man/man3/pcre2_config.3.gz +man/man3/pcre2_convert_context_copy.3.gz +man/man3/pcre2_convert_context_create.3.gz +man/man3/pcre2_convert_context_free.3.gz +man/man3/pcre2_converted_pattern_free.3.gz man/man3/pcre2_dfa_match.3.gz man/man3/pcre2_general_context_copy.3.gz man/man3/pcre2_general_context_create.3.gz man/man3/pcre2_general_context_free.3.gz man/man3/pcre2_get_error_message.3.gz man/man3/pcre2_get_mark.3.gz man/man3/pcre2_get_ovector_count.3.gz man/man3/pcre2_get_ovector_pointer.3.gz man/man3/pcre2_get_startchar.3.gz man/man3/pcre2_jit_compile.3.gz man/man3/pcre2_jit_free_unused_memory.3.gz man/man3/pcre2_jit_match.3.gz man/man3/pcre2_jit_stack_assign.3.gz man/man3/pcre2_jit_stack_create.3.gz man/man3/pcre2_jit_stack_free.3.gz man/man3/pcre2_maketables.3.gz man/man3/pcre2_match.3.gz man/man3/pcre2_match_context_copy.3.gz man/man3/pcre2_match_context_create.3.gz man/man3/pcre2_match_context_free.3.gz man/man3/pcre2_match_data_create.3.gz man/man3/pcre2_match_data_create_from_pattern.3.gz man/man3/pcre2_match_data_free.3.gz +man/man3/pcre2_pattern_convert.3.gz man/man3/pcre2_pattern_info.3.gz man/man3/pcre2_serialize_decode.3.gz man/man3/pcre2_serialize_encode.3.gz man/man3/pcre2_serialize_free.3.gz man/man3/pcre2_serialize_get_number_of_codes.3.gz man/man3/pcre2_set_bsr.3.gz man/man3/pcre2_set_callout.3.gz man/man3/pcre2_set_character_tables.3.gz +man/man3/pcre2_set_compile_extra_options.3.gz man/man3/pcre2_set_compile_recursion_guard.3.gz +man/man3/pcre2_set_depth_limit.3.gz +man/man3/pcre2_set_glob_escape.3.gz +man/man3/pcre2_set_glob_separator.3.gz +man/man3/pcre2_set_heap_limit.3.gz man/man3/pcre2_set_match_limit.3.gz +man/man3/pcre2_set_max_pattern_length.3.gz man/man3/pcre2_set_newline.3.gz man/man3/pcre2_set_offset_limit.3.gz man/man3/pcre2_set_parens_nest_limit.3.gz man/man3/pcre2_set_recursion_limit.3.gz man/man3/pcre2_set_recursion_memory_management.3.gz man/man3/pcre2_substitute.3.gz man/man3/pcre2_substring_copy_byname.3.gz man/man3/pcre2_substring_copy_bynumber.3.gz man/man3/pcre2_substring_free.3.gz man/man3/pcre2_substring_get_byname.3.gz man/man3/pcre2_substring_get_bynumber.3.gz man/man3/pcre2_substring_length_byname.3.gz man/man3/pcre2_substring_length_bynumber.3.gz man/man3/pcre2_substring_list_free.3.gz man/man3/pcre2_substring_list_get.3.gz man/man3/pcre2_substring_nametable_scan.3.gz man/man3/pcre2_substring_number_from_name.3.gz man/man3/pcre2api.3.gz man/man3/pcre2build.3.gz man/man3/pcre2callout.3.gz man/man3/pcre2compat.3.gz +man/man3/pcre2convert.3.gz man/man3/pcre2demo.3.gz man/man3/pcre2jit.3.gz man/man3/pcre2limits.3.gz man/man3/pcre2matching.3.gz man/man3/pcre2partial.3.gz man/man3/pcre2pattern.3.gz man/man3/pcre2perform.3.gz man/man3/pcre2posix.3.gz man/man3/pcre2sample.3.gz man/man3/pcre2serialize.3.gz -man/man3/pcre2stack.3.gz man/man3/pcre2syntax.3.gz man/man3/pcre2unicode.3.gz