Tue Nov 26 10:17:55 2019 UTC ()
pcre2: update to 10.34.

Version 10.34 21-November-2019
------------------------------

Another release with a few enhancements as well as bugfixes and tidies. The
main new features are:

1. There is now some support for matching in invalid UTF strings.

2. Non-atomic positive lookarounds are implemented in the pcre2_match()
interpreter, but not in JIT.

3. Added two new functions: pcre2_get_match_data_size() and
pcre2_maketables_free().

4. Upgraded to Unicode 12.1.0.


(wiz)
diff -r1.14 -r1.15 pkgsrc/devel/pcre2/Makefile
diff -r1.8 -r1.9 pkgsrc/devel/pcre2/PLIST
diff -r1.10 -r1.11 pkgsrc/devel/pcre2/distinfo
diff -r0 -r1.1 pkgsrc/devel/pcre2/patches/patch-src_sljit_sljitProtExecAllocator.c
diff -r0 -r1.1 pkgsrc/devel/pcre2/patches/patch-src_sljit_sljitProtExecAllocator.c.orig
cvs diff -r1.14 -r1.15 pkgsrc/devel/pcre2/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/pcre2/Makefile 2019/09/17 10:56:03 1.14
+++ pkgsrc/devel/pcre2/Makefile 2019/11/26 10:17:55 1.15
@@ -1,38 +1,39 @@ @@ -1,38 +1,39 @@
1# $NetBSD: Makefile,v 1.14 2019/09/17 10:56:03 nros Exp $ 1# $NetBSD: Makefile,v 1.15 2019/11/26 10:17:55 wiz Exp $
2 2
3DISTNAME= pcre2-10.33 3DISTNAME= pcre2-10.34
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= ftp://ftp.pcre.org/pub/pcre/ 5MASTER_SITES= ftp://ftp.pcre.org/pub/pcre/
6MASTER_SITES+= https://ftp.pcre.org/pub/pcre/ 6MASTER_SITES+= https://ftp.pcre.org/pub/pcre/
7MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=pcre/} 7MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=pcre/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.pcre.org/ 11HOMEPAGE= http://www.pcre.org/
12COMMENT= Perl Compatible Regular Expressions library (major version 2) 12COMMENT= Perl Compatible Regular Expressions library (major version 2)
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
15USE_LANGUAGES= c 15USE_LANGUAGES= c
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18 18
19PKGCONFIG_OVERRIDE+= libpcre2-16.pc.in 19PKGCONFIG_OVERRIDE+= libpcre2-16.pc.in
20PKGCONFIG_OVERRIDE+= libpcre2-posix.pc.in 20PKGCONFIG_OVERRIDE+= libpcre2-posix.pc.in
21PKGCONFIG_OVERRIDE+= libpcre2-8.pc.in 21PKGCONFIG_OVERRIDE+= libpcre2-8.pc.in
22PKGCONFIG_OVERRIDE+= libpcre2-32.pc.in 22PKGCONFIG_OVERRIDE+= libpcre2-32.pc.in
23 23
24CONFIGURE_ARGS+= --enable-pcre2-16 24CONFIGURE_ARGS+= --enable-pcre2-16
25CONFIGURE_ARGS+= --enable-pcre2-32 25CONFIGURE_ARGS+= --enable-pcre2-32
26CONFIGURE_ARGS+= --enable-pcre2grep-libz 26CONFIGURE_ARGS+= --enable-pcre2grep-libz
27CONFIGURE_ARGS+= --enable-pcre2grep-libbz2 27CONFIGURE_ARGS+= --enable-pcre2grep-libbz2
28 28# To avoid having to
29# On NetBSD, needs: 
30# sysctl -w security.pax.mprotect.enabled=0 29# sysctl -w security.pax.mprotect.enabled=0
31# because of its JIT. 30# because of its JIT on NetBSD.
 31CONFIGURE_ARGS.NetBSD+= --enable-jit-sealloc
 32
32TEST_TARGET= check 33TEST_TARGET= check
33 34
34.include "options.mk" 35.include "options.mk"
35 36
36.include "../../archivers/bzip2/buildlink3.mk" 37.include "../../archivers/bzip2/buildlink3.mk"
37.include "../../devel/zlib/buildlink3.mk" 38.include "../../devel/zlib/buildlink3.mk"
38.include "../../mk/bsd.pkg.mk" 39.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/devel/pcre2/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/pcre2/PLIST 2019/04/27 18:33:12 1.8
+++ pkgsrc/devel/pcre2/PLIST 2019/11/26 10:17:55 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.8 2019/04/27 18:33:12 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.9 2019/11/26 10:17:55 wiz Exp $
2bin/pcre2-config 2bin/pcre2-config
3bin/pcre2grep 3bin/pcre2grep
4bin/pcre2test 4bin/pcre2test
5include/pcre2.h 5include/pcre2.h
6include/pcre2posix.h 6include/pcre2posix.h
7lib/libpcre2-16.la 7lib/libpcre2-16.la
8lib/libpcre2-32.la 8lib/libpcre2-32.la
9lib/libpcre2-8.la 9lib/libpcre2-8.la
10lib/libpcre2-posix.la 10lib/libpcre2-posix.la
11lib/pkgconfig/libpcre2-16.pc 11lib/pkgconfig/libpcre2-16.pc
12lib/pkgconfig/libpcre2-32.pc 12lib/pkgconfig/libpcre2-32.pc
13lib/pkgconfig/libpcre2-8.pc 13lib/pkgconfig/libpcre2-8.pc
14lib/pkgconfig/libpcre2-posix.pc 14lib/pkgconfig/libpcre2-posix.pc
@@ -25,36 +25,38 @@ man/man3/pcre2_compile_context_copy.3 @@ -25,36 +25,38 @@ man/man3/pcre2_compile_context_copy.3
25man/man3/pcre2_compile_context_create.3 25man/man3/pcre2_compile_context_create.3
26man/man3/pcre2_compile_context_free.3 26man/man3/pcre2_compile_context_free.3
27man/man3/pcre2_config.3 27man/man3/pcre2_config.3
28man/man3/pcre2_convert_context_copy.3 28man/man3/pcre2_convert_context_copy.3
29man/man3/pcre2_convert_context_create.3 29man/man3/pcre2_convert_context_create.3
30man/man3/pcre2_convert_context_free.3 30man/man3/pcre2_convert_context_free.3
31man/man3/pcre2_converted_pattern_free.3 31man/man3/pcre2_converted_pattern_free.3
32man/man3/pcre2_dfa_match.3 32man/man3/pcre2_dfa_match.3
33man/man3/pcre2_general_context_copy.3 33man/man3/pcre2_general_context_copy.3
34man/man3/pcre2_general_context_create.3 34man/man3/pcre2_general_context_create.3
35man/man3/pcre2_general_context_free.3 35man/man3/pcre2_general_context_free.3
36man/man3/pcre2_get_error_message.3 36man/man3/pcre2_get_error_message.3
37man/man3/pcre2_get_mark.3 37man/man3/pcre2_get_mark.3
 38man/man3/pcre2_get_match_data_size.3
38man/man3/pcre2_get_ovector_count.3 39man/man3/pcre2_get_ovector_count.3
39man/man3/pcre2_get_ovector_pointer.3 40man/man3/pcre2_get_ovector_pointer.3
40man/man3/pcre2_get_startchar.3 41man/man3/pcre2_get_startchar.3
41man/man3/pcre2_jit_compile.3 42man/man3/pcre2_jit_compile.3
42man/man3/pcre2_jit_free_unused_memory.3 43man/man3/pcre2_jit_free_unused_memory.3
43man/man3/pcre2_jit_match.3 44man/man3/pcre2_jit_match.3
44man/man3/pcre2_jit_stack_assign.3 45man/man3/pcre2_jit_stack_assign.3
45man/man3/pcre2_jit_stack_create.3 46man/man3/pcre2_jit_stack_create.3
46man/man3/pcre2_jit_stack_free.3 47man/man3/pcre2_jit_stack_free.3
47man/man3/pcre2_maketables.3 48man/man3/pcre2_maketables.3
 49man/man3/pcre2_maketables_free.3
48man/man3/pcre2_match.3 50man/man3/pcre2_match.3
49man/man3/pcre2_match_context_copy.3 51man/man3/pcre2_match_context_copy.3
50man/man3/pcre2_match_context_create.3 52man/man3/pcre2_match_context_create.3
51man/man3/pcre2_match_context_free.3 53man/man3/pcre2_match_context_free.3
52man/man3/pcre2_match_data_create.3 54man/man3/pcre2_match_data_create.3
53man/man3/pcre2_match_data_create_from_pattern.3 55man/man3/pcre2_match_data_create_from_pattern.3
54man/man3/pcre2_match_data_free.3 56man/man3/pcre2_match_data_free.3
55man/man3/pcre2_pattern_convert.3 57man/man3/pcre2_pattern_convert.3
56man/man3/pcre2_pattern_info.3 58man/man3/pcre2_pattern_info.3
57man/man3/pcre2_serialize_decode.3 59man/man3/pcre2_serialize_decode.3
58man/man3/pcre2_serialize_encode.3 60man/man3/pcre2_serialize_encode.3
59man/man3/pcre2_serialize_free.3 61man/man3/pcre2_serialize_free.3
60man/man3/pcre2_serialize_get_number_of_codes.3 62man/man3/pcre2_serialize_get_number_of_codes.3
@@ -124,36 +126,38 @@ share/doc/pcre2/html/pcre2_compile_conte @@ -124,36 +126,38 @@ share/doc/pcre2/html/pcre2_compile_conte
124share/doc/pcre2/html/pcre2_compile_context_create.html 126share/doc/pcre2/html/pcre2_compile_context_create.html
125share/doc/pcre2/html/pcre2_compile_context_free.html 127share/doc/pcre2/html/pcre2_compile_context_free.html
126share/doc/pcre2/html/pcre2_config.html 128share/doc/pcre2/html/pcre2_config.html
127share/doc/pcre2/html/pcre2_convert_context_copy.html 129share/doc/pcre2/html/pcre2_convert_context_copy.html
128share/doc/pcre2/html/pcre2_convert_context_create.html 130share/doc/pcre2/html/pcre2_convert_context_create.html
129share/doc/pcre2/html/pcre2_convert_context_free.html 131share/doc/pcre2/html/pcre2_convert_context_free.html
130share/doc/pcre2/html/pcre2_converted_pattern_free.html 132share/doc/pcre2/html/pcre2_converted_pattern_free.html
131share/doc/pcre2/html/pcre2_dfa_match.html 133share/doc/pcre2/html/pcre2_dfa_match.html
132share/doc/pcre2/html/pcre2_general_context_copy.html 134share/doc/pcre2/html/pcre2_general_context_copy.html
133share/doc/pcre2/html/pcre2_general_context_create.html 135share/doc/pcre2/html/pcre2_general_context_create.html
134share/doc/pcre2/html/pcre2_general_context_free.html 136share/doc/pcre2/html/pcre2_general_context_free.html
135share/doc/pcre2/html/pcre2_get_error_message.html 137share/doc/pcre2/html/pcre2_get_error_message.html
136share/doc/pcre2/html/pcre2_get_mark.html 138share/doc/pcre2/html/pcre2_get_mark.html
 139share/doc/pcre2/html/pcre2_get_match_data_size.html
137share/doc/pcre2/html/pcre2_get_ovector_count.html 140share/doc/pcre2/html/pcre2_get_ovector_count.html
138share/doc/pcre2/html/pcre2_get_ovector_pointer.html 141share/doc/pcre2/html/pcre2_get_ovector_pointer.html
139share/doc/pcre2/html/pcre2_get_startchar.html 142share/doc/pcre2/html/pcre2_get_startchar.html
140share/doc/pcre2/html/pcre2_jit_compile.html 143share/doc/pcre2/html/pcre2_jit_compile.html
141share/doc/pcre2/html/pcre2_jit_free_unused_memory.html 144share/doc/pcre2/html/pcre2_jit_free_unused_memory.html
142share/doc/pcre2/html/pcre2_jit_match.html 145share/doc/pcre2/html/pcre2_jit_match.html
143share/doc/pcre2/html/pcre2_jit_stack_assign.html 146share/doc/pcre2/html/pcre2_jit_stack_assign.html
144share/doc/pcre2/html/pcre2_jit_stack_create.html 147share/doc/pcre2/html/pcre2_jit_stack_create.html
145share/doc/pcre2/html/pcre2_jit_stack_free.html 148share/doc/pcre2/html/pcre2_jit_stack_free.html
146share/doc/pcre2/html/pcre2_maketables.html 149share/doc/pcre2/html/pcre2_maketables.html
 150share/doc/pcre2/html/pcre2_maketables_free.html
147share/doc/pcre2/html/pcre2_match.html 151share/doc/pcre2/html/pcre2_match.html
148share/doc/pcre2/html/pcre2_match_context_copy.html 152share/doc/pcre2/html/pcre2_match_context_copy.html
149share/doc/pcre2/html/pcre2_match_context_create.html 153share/doc/pcre2/html/pcre2_match_context_create.html
150share/doc/pcre2/html/pcre2_match_context_free.html 154share/doc/pcre2/html/pcre2_match_context_free.html
151share/doc/pcre2/html/pcre2_match_data_create.html 155share/doc/pcre2/html/pcre2_match_data_create.html
152share/doc/pcre2/html/pcre2_match_data_create_from_pattern.html 156share/doc/pcre2/html/pcre2_match_data_create_from_pattern.html
153share/doc/pcre2/html/pcre2_match_data_free.html 157share/doc/pcre2/html/pcre2_match_data_free.html
154share/doc/pcre2/html/pcre2_pattern_convert.html 158share/doc/pcre2/html/pcre2_pattern_convert.html
155share/doc/pcre2/html/pcre2_pattern_info.html 159share/doc/pcre2/html/pcre2_pattern_info.html
156share/doc/pcre2/html/pcre2_serialize_decode.html 160share/doc/pcre2/html/pcre2_serialize_decode.html
157share/doc/pcre2/html/pcre2_serialize_encode.html 161share/doc/pcre2/html/pcre2_serialize_encode.html
158share/doc/pcre2/html/pcre2_serialize_free.html 162share/doc/pcre2/html/pcre2_serialize_free.html
159share/doc/pcre2/html/pcre2_serialize_get_number_of_codes.html 163share/doc/pcre2/html/pcre2_serialize_get_number_of_codes.html
cvs diff -r1.10 -r1.11 pkgsrc/devel/pcre2/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/pcre2/distinfo 2019/04/27 18:33:12 1.10
+++ pkgsrc/devel/pcre2/distinfo 2019/11/26 10:17:55 1.11
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.10 2019/04/27 18:33:12 wiz Exp $ 1$NetBSD: distinfo,v 1.11 2019/11/26 10:17:55 wiz Exp $
2 2
3SHA1 (pcre2-10.33.tar.bz2) = 2cc3ed45936f5684b3189c132a68952c42cf65d0 3SHA1 (pcre2-10.34.tar.bz2) = ffd8da87b958c44dd9b927e7b39934e2af5fef8b
4RMD160 (pcre2-10.33.tar.bz2) = 5ef46f9e0f5a4d2ee710d4ec0616a83f00b680eb 4RMD160 (pcre2-10.34.tar.bz2) = bf224aeb1d9d1c8a4f28ff4c6b4148d2b3c6c1c6
5SHA512 (pcre2-10.33.tar.bz2) = c6aa52cdbb0c906b02e9a9f255697a1b9b99d9c7dccdaa484ffdb04fe3582d232ba3cb3c421d6df589a387b415dedb0817f58ec5391488b25b4e7bd9da6bab8f 5SHA512 (pcre2-10.34.tar.bz2) = 77ad75f8b0b8bbfc2f57932596151bca25b06bd621e0f047e476f38cd127f43e2052460b95c281a7e874aad2b7fd86c8f3413f4a323abb74b9440a42d0ee9524
6Size (pcre2-10.33.tar.bz2) = 1690739 bytes 6Size (pcre2-10.34.tar.bz2) = 1714731 bytes
 7SHA1 (patch-src_sljit_sljitProtExecAllocator.c) = 91d334417791d4e8628a01a2dee763830b0bd6d7
File Added: pkgsrc/devel/pcre2/patches/Attic/patch-src_sljit_sljitProtExecAllocator.c
$NetBSD: patch-src_sljit_sljitProtExecAllocator.c,v 1.1 2019/11/26 10:17:55 wiz Exp $

NetBSD does not have secure_getenv.

--- src/sljit/sljitProtExecAllocator.c.orig	2017-02-15 17:24:58.000000000 +0000
+++ src/sljit/sljitProtExecAllocator.c
@@ -97,7 +97,9 @@ struct chunk_header {
 #endif
 
 int mkostemp(char *template, int flags);
+#if HAVE_SECURE_GETENV
 char *secure_getenv(const char *name);
+#endif
 
 static SLJIT_INLINE int create_tempfile(void)
 {
@@ -124,7 +126,11 @@ static SLJIT_INLINE int create_tempfile(
 	tmp_name_len = 4;
 #endif
 
+#if HAVE_SECURE_GETENV
 	dir = secure_getenv("TMPDIR");
+#else
+	dir = getenv("TMPDIR");
+#endif
 	if (dir) {
 		len = strlen(dir);
 		if (len > 0 && len < sizeof(tmp_name)) {
File Added: pkgsrc/devel/pcre2/patches/Attic/patch-src_sljit_sljitProtExecAllocator.c.orig