Here is an update for devel/pcre2 10.35, released May 9, 2020.
Changelog:
https://vcs.pcre.org/pcre2/code/trunk/ChangeLog?revision=1254&view=markup
This diff does the following:
- Resyncs upstream library major/minor numbers with
${WRKSRC}/src/pcre2.h.generic instead of shared_libs.log
- patch-RunGrepTest reapplied with new /g suffix
- Minor bumps for the pcre2 libraries because of changelog items 5 and 11.
These add PCRE2_SUBSTITUTE_LITERAL and PCRE2_SUBSTITUTE_REPLACEMENT_ONLY
as new values for the `options' argument of pcre2_substitute(...uint32_t
options,...). pcre2.h exports these new values.
- No versioning bumps due to item 15 because it can be considered a
bugfix. set_start_bits() now limits depth of recursion to 1000, adds
depthptr to the argument list and adds a new error return code
(SSB_TOODEEP). (Sequence is pcre2_compile() --> pcre2_study.c:1672
study() --> set_start_bits()). study() and set_start_bits() are both
private helpers while pcre2_compile() is part of the API.
https://vcs.pcre.org/pcre2/code/tags/pcre2-10.35/ChangeLog?r1=1211&r2=1212
https://vcs.pcre.org/pcre2/code/tags/pcre2-10.35/src/pcre2_study.c?r1=1180&r2=1213
Unit tests pass. wget and fish work in my testing. Feedback and tests
are welcome.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/pcre2/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile 13 Feb 2020 11:05:11 -0000 1.12
+++ Makefile 26 May 2020 10:55:43 -0000
@@ -2,11 +2,11 @@
COMMENT = perl-compatible regular expression library, version 2
-DISTNAME = pcre2-10.34
+DISTNAME = pcre2-10.35
-SHARED_LIBS += pcre2-16 0.4 # 9.0
-SHARED_LIBS += pcre2-32 0.4 # 9.0
-SHARED_LIBS += pcre2-8 0.5 # 9.0
+SHARED_LIBS += pcre2-16 0.5 # 10.35
+SHARED_LIBS += pcre2-32 0.5 # 10.35
+SHARED_LIBS += pcre2-8 0.6 # 10.35
SHARED_LIBS += pcre2-posix 0.3 # 2.3
CATEGORIES = devel
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/pcre2/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo 13 Feb 2020 11:05:11 -0000 1.6
+++ distinfo 26 May 2020 10:55:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (pcre2-10.34.tar.gz) = 2mq6e6JQnpGOQfT3RKWfpBokJcWaKYojLn/oVpHgA3k=
-SIZE (pcre2-10.34.tar.gz) = 2271533
+SHA256 (pcre2-10.35.tar.gz) = j9zvjI9M1zUWndAiX9AQSHlwwbyt1J6bkOJsclCjPck=
+SIZE (pcre2-10.35.tar.gz) = 2299082
Index: patches/patch-RunGrepTest
===================================================================
RCS file: /cvs/ports/devel/pcre2/patches/patch-RunGrepTest,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-RunGrepTest
--- patches/patch-RunGrepTest 13 Feb 2020 11:05:11 -0000 1.3
+++ patches/patch-RunGrepTest 26 May 2020 10:55:43 -0000
@@ -12,8 +12,8 @@ Index: RunGrepTest
- Linux)
+ OpenBSD)
printf 'abc\0def' >testNinputgrep
-- $valgrind $vjs $pcre2grep -na --newline=nul "^(abc|def)" testNinputgrep |
sed 's/\x00/ZERO/' >>testtrygrep
-+ $valgrind $vjs $pcre2grep -na --newline=nul "^(abc|def)" testNinputgrep |
gsed 's/\x00/ZERO/' >>testtrygrep
+- $valgrind $vjs $pcre2grep -na --newline=nul "^(abc|def)" testNinputgrep |
sed 's/\x00/ZERO/g' >>testtrygrep
++ $valgrind $vjs $pcre2grep -na --newline=nul "^(abc|def)" testNinputgrep |
gsed 's/\x00/ZERO/g' >>testtrygrep
echo "" >>testtrygrep
;;
*)
