cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update pcre2 to 10.31

Browse Source 
PR:		229703
Approved by:	maintainer (feld)
This commit is contained in:
Adam Weinberger 2018-08-15 19:09:00 +00:00
parent 9cae087b79
commit 7ae54937ad
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=477253
4 changed files with 23 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/pcre2/Makefile
View File

@ -2,8 +2,7 @@
# $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/ \

5
devel/pcre2/distinfo
View File

@ -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

27
devel/pcre2/files/patch-CVE-2016-3191
View File

@ -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;

25
devel/pcre2/pkg-plist
View File

@ -6,19 +6,19 @@ 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
@ -28,12 +28,18 @@ 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
@ -57,6 +63,7 @@ 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
@ -65,8 +72,14 @@ 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
@ -88,6 +101,7 @@ 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
@ -98,6 +112,5 @@ 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