ping Nam Nguyen writes:
> This is an update for devel/pcre2 10.37 released on May 26, 2021. > > Changelog: > https://vcs.pcre.org/pcre2/code/trunk/ChangeLog?view=markup&pathrev=1310 > > This diff: > - undoes RunGrepTest patch by jca@ now that it has been upstreamed (item > #1 changelog) > https://bugs.exim.org/show_bug.cgi?id=2681 > - major bump for pcre2-posix due to check_sym reporting removed symbols > > justification: > * item #8 changelog > * check_sym output: https://namtsui.com/public/pcre2.txt > * code compiled out for functions like regexec in pcre2posix.c (click on > text changed): > https://vcs.pcre.org/pcre2?view=revision&revision=1306 > * diffing ${WRKSRC}/src/pcre2.h between versions seemed fine > > I tested this with wget 1.21.1, which I will commit soon. I also tested > `man pcre2demo', a sample c program. > > There is an outstanding problem with RunGrepTest Test 132, but it seems > minor. > https://bugs.exim.org/show_bug.cgi?id=2680 > > Feedback is welcome. OK? Index: Makefile =================================================================== RCS file: /cvs/ports/devel/pcre2/Makefile,v retrieving revision 1.14 diff -u -p -u -p -r1.14 Makefile --- Makefile 20 Jan 2021 01:04:22 -0000 1.14 +++ Makefile 27 Jun 2021 10:39:28 -0000 @@ -2,12 +2,12 @@ COMMENT = perl-compatible regular expression library, version 2 -DISTNAME = pcre2-10.36 +DISTNAME = pcre2-10.37 -SHARED_LIBS += pcre2-16 0.5 # 10.36 -SHARED_LIBS += pcre2-32 0.5 # 10.36 -SHARED_LIBS += pcre2-8 0.6 # 10.36 -SHARED_LIBS += pcre2-posix 0.3 # 2.3 +SHARED_LIBS += pcre2-16 0.5 # 10.37 +SHARED_LIBS += pcre2-32 0.5 # 10.37 +SHARED_LIBS += pcre2-8 0.6 # 10.37 +SHARED_LIBS += pcre2-posix 1.0 # 2.3 CATEGORIES = devel @@ -37,10 +37,5 @@ CONFIGURE_ARGS = --enable-pcre2-16 \ CONFIGURE_ARGS += --disable-jit CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" - -# change expected test output to support RunGrepTest patch -post-extract: - sed -i 's/1:abcZERO2:defZERO/1:abc@2:def@/' \ - ${WRKSRC}/testdata/grepoutputN .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/devel/pcre2/distinfo,v retrieving revision 1.8 diff -u -p -u -p -r1.8 distinfo --- distinfo 20 Jan 2021 01:04:22 -0000 1.8 +++ distinfo 27 Jun 2021 10:39:28 -0000 @@ -1,2 +1,2 @@ -SHA256 (pcre2-10.36.tar.gz) = uV3blBT5GpZ6iH1pYXBZ+2crkU9W+j1hOBLB7o6KGjc= -SIZE (pcre2-10.36.tar.gz) = 2290719 +SHA256 (pcre2-10.37.tar.gz) = BOIUwMQKl7ilwrSuiKOqipPm8uRcazU03aw1HyZUhXc= +SIZE (pcre2-10.37.tar.gz) = 2299767 Index: patches/patch-RunGrepTest =================================================================== RCS file: patches/patch-RunGrepTest diff -N patches/patch-RunGrepTest --- patches/patch-RunGrepTest 20 Jan 2021 01:04:22 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,28 +0,0 @@ -$OpenBSD: patch-RunGrepTest,v 1.5 2021/01/20 01:04:22 namn Exp $ - -Our sed(1) doesn't cope with NUL bytes and \x00-style notation. -Use tr(1) instead. - -see: https://bugs.exim.org/show_bug.cgi?id=2681 - -Index: RunGrepTest ---- RunGrepTest.orig -+++ RunGrepTest -@@ -763,14 +763,9 @@ $valgrind $vjs $pcre2grep -n --newline=anycrlf "^(abc| - # doesn't. - - printf '%c--------------------------- Test N7 ------------------------------\r\n' - >>testtrygrep --Z=`printf '\0' | sed 's/\x00/Z/g'` --if [ "$Z" = "Z" ]; then -- printf 'abc\0def' >testNinputgrep -- $valgrind $vjs $pcre2grep -na --newline=nul "^(abc|def)" testNinputgrep | sed 's/\x00/ZERO/g' >>testtrygrep -- echo "" >>testtrygrep --else -- echo '1:abcZERO2:defZERO' >>testtrygrep --fi -+printf 'abc\0def' >testNinputgrep -+$valgrind $vjs $pcre2grep -na --newline=nul "^(abc|def)" testNinputgrep | tr '\000' '@' >>testtrygrep -+echo "" >>testtrygrep - - $cf $srcdir/testdata/grepoutputN testtrygrep - if [ $? != 0 ] ; then exit 1; fi
