Attachment 247370 Details for Bug 251642 – patch for pcre2 v5

[patch] patch for pcre2 v5

pcre2-wip2.patch (text/plain), 7.13 KB, created by Daniel Engberg on 2023-12-31 08:58:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2023-12-31 08:58:41 UTC

Size: 7.13 KB

patch

obsolete

>diff --git a/devel/pcre2/Makefile b/devel/pcre2/Makefile
>index e2226318f21f..acc49862e435 100644
>--- a/devel/pcre2/Makefile
>+++ b/devel/pcre2/Makefile
>@@ -1,7 +1,11 @@
> PORTNAME=	pcre2
>-PORTVERSION=	10.42
>+DISTVERSION=	10.43-RC1
> CATEGORIES=	devel
>-MASTER_SITES=	https://github.com/PCRE2Project/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/
>+MASTER_SITES=	https://github.com/PCRE2Project/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/
>+
>+PATCH_SITES=	https://github.com/PCRE2Project/${PORTNAME}/commit/
>+PATCHFILES=	8cfd1a1db021fff3575dc835bcafea54b38a00cb.patch:-p1 \
>+		fba4a6a5e8a7895db7e0efcbcdb7087a04a00322.patch:-p1
> 
> MAINTAINER=	krion@FreeBSD.org
> COMMENT=	Perl Compatible Regular Expressions library, version 2
>@@ -10,36 +14,43 @@ WWW=		https://www.pcre.org/
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENCE
> 
>-USES=		autoreconf cpe libtool pkgconfig tar:bz2
>+USES=		cmake:testing cpe pathfix pkgconfig tar:bz2
> CPE_VENDOR=	pcre
> 
> USE_LDCONFIG=	yes
> 
>-GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--enable-pcre2-16 \
>-		--enable-pcre2-32
>-INSTALL_TARGET=	install-strip
>+CMAKE_TESTING_ON=	PCRE2_BUILD_TESTS
>+CMAKE_OFF=		PCRE2_BUILD_TESTS
>+CMAKE_ON=		BUILD_SHARED_LIBS \
>+			PCRE2_BUILD_PCRE2_16 \
>+			PCRE2_BUILD_PCRE2_32
> 
>-OPTIONS_DEFINE=		DOCS LIBBZ2 LIBZ
>+OPTIONS_DEFINE=		DOCS LIBBZ2 LIBZ STATIC
> OPTIONS_RADIO=		CLI
> OPTIONS_RADIO_CLI=	LIBEDIT READLINE
>+OPTIONS_SUB=		yes
> 
> LIBBZ2_DESC=	Using pcre2grep with .bz2 files
> LIBZ_DESC=	Using pcre2grep with .gz files
> 
>-LIBBZ2_CONFIGURE_ON=	--enable-pcre2grep-libbz2
>-LIBEDIT_USES=			libedit
>-LIBEDIT_CONFIGURE_ENABLE=	pcre2test-libedit
>-LIBZ_CONFIGURE_ON=	--enable-pcre2grep-libz
>-READLINE_USES=			readline
>-READLINE_CONFIGURE_ENABLE=	pcre2test-libreadline
>+LIBBZ2_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_BZip2:BOOL=True
>+
>+LIBEDIT_USES=		libedit
>+LIBEDIT_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Editline:BOOL=True
>+
>+LIBZ_CMAKE_OFF=		-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB:BOOL=True
>+
>+READLINE_USES=		readline
>+READLINE_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Readline:BOOL=True
>+
>+STATIC_CMAKE_BOOL=	BUILD_STATIC_LIBS
> 
> .include <bsd.port.options.mk>
> 
> .if ${ARCH:Mmips64*} == "" && ${ARCH:Mriscv64*} == ""
>-CONFIGURE_ARGS+=	--enable-jit
>+CMAKE_ON+=	PCRE2_SUPPORT_JIT
> .else
>-CONFIGURE_ARGS+=	--disable-jit
>+CMAKE_OFF+=	PCRE2_SUPPORT_JIT
> .endif
> 
> .if ${PORT_OPTIONS:MDOCS}
>@@ -52,33 +63,27 @@ PORTDOCS=	*
> # 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}
>+CMAKE_ARGS=+=	-DPCRE2_LINK_SIZE:STRING=${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}
>+CMAKE_ARGS+=	-DPCRE2_MATCH_LIMIT:STRING=${WITH_MATCH_LIMIT}
>+.endif
>+
>+# This limit applies to all backtracks, whether or not they are nested. In
>+# some environments it is desirable to limit the nesting of backtracking (that
>+# is, the depth of tree that is searched) more strictly, in order to restrict
>+# the maximum amount of heap memory that is used (default: 10 million):
>+.if defined(WITH_MATCH_LIMIT_DEPTH)
>+CMAKE_ARGS+=	-DPCRE2_MATCH_LIMIT_DEPTH:STRING=${WITH_MATCH_LIMIT_DEPTH}
> .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
>+CMAKE_ARGS+=	-DPCRE2_PARENS_NEST_LIMIT:STRING=${WITH_PARENS_NEST_LIMIT}
> .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 <bsd.port.mk>
>diff --git a/devel/pcre2/distinfo b/devel/pcre2/distinfo
>index a8825175b928..6cb5dcb5e06c 100644
>--- a/devel/pcre2/distinfo
>+++ b/devel/pcre2/distinfo
>@@ -1,3 +1,7 @@
>-TIMESTAMP = 1672697328
>-SHA256 (pcre2-10.42.tar.bz2) = 8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840
>-SIZE (pcre2-10.42.tar.bz2) = 1799866
>+TIMESTAMP = 1703931782
>+SHA256 (pcre2-10.43-RC1.tar.bz2) = 1d9a325f72ebe70f11778551660373e0a292b6d7c1962c5d069adbef18b96674
>+SIZE (pcre2-10.43-RC1.tar.bz2) = 1901289
>+SHA256 (8cfd1a1db021fff3575dc835bcafea54b38a00cb.patch) = e0837a756a76fed7be41dd0a9af6058054e81ae7d5531131fca170fa218796e4
>+SIZE (8cfd1a1db021fff3575dc835bcafea54b38a00cb.patch) = 2296
>+SHA256 (fba4a6a5e8a7895db7e0efcbcdb7087a04a00322.patch) = e31e16744f7e0e9294ba0d91dc1722085e61f995c34d79ac1580de69edf861bd
>+SIZE (fba4a6a5e8a7895db7e0efcbcdb7087a04a00322.patch) = 1141
>diff --git a/devel/pcre2/files/patch-Makefile.am b/devel/pcre2/files/patch-Makefile.am
>deleted file mode 100644
>index 0aa4d5525f67..000000000000
>--- a/devel/pcre2/files/patch-Makefile.am
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Makefile.am.orig	2015-08-25 16:56:39 UTC
>-+++ Makefile.am
>-@@ -646,7 +646,7 @@ EXTRA_DIST += src/pcre2demo.c
>- 
>- # We have .pc files for pkg-config users.
>- 
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(libdir)data/pkgconfig
>- pkgconfig_DATA =
>- 
>- if WITH_PCRE2_8
>diff --git a/devel/pcre2/pkg-plist b/devel/pcre2/pkg-plist
>index 303b7d233d49..866d82e02f56 100644
>--- a/devel/pcre2/pkg-plist
>+++ b/devel/pcre2/pkg-plist
>@@ -1,24 +1,25 @@
> bin/pcre2-config
> bin/pcre2grep
>-bin/pcre2test
> include/pcre2.h
> include/pcre2posix.h
>-lib/libpcre2-16.a
>+lib/cmake/pcre2/pcre2-config-version.cmake
>+lib/cmake/pcre2/pcre2-config.cmake
>+%%STATIC%%lib/libpcre2-16.a
> lib/libpcre2-16.so
> lib/libpcre2-16.so.0
>-lib/libpcre2-16.so.0.11.2
>-lib/libpcre2-32.a
>+lib/libpcre2-16.so.0.12.0
>+%%STATIC%%lib/libpcre2-32.a
> lib/libpcre2-32.so
> lib/libpcre2-32.so.0
>-lib/libpcre2-32.so.0.11.2
>-lib/libpcre2-8.a
>+lib/libpcre2-32.so.0.12.0
>+%%STATIC%%lib/libpcre2-8.a
> lib/libpcre2-8.so
> lib/libpcre2-8.so.0
>-lib/libpcre2-8.so.0.11.2
>-lib/libpcre2-posix.a
>+lib/libpcre2-8.so.0.12.0
>+%%STATIC%%lib/libpcre2-posix.a
> lib/libpcre2-posix.so
> lib/libpcre2-posix.so.3
>-lib/libpcre2-posix.so.3.0.4
>+lib/libpcre2-posix.so.3.0.5
> libdata/pkgconfig/libpcre2-16.pc
> libdata/pkgconfig/libpcre2-32.pc
> libdata/pkgconfig/libpcre2-8.pc
>@@ -65,6 +66,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_get_match_data_heapframes_size.3.gz
> man/man3/pcre2_pattern_convert.3.gz
> man/man3/pcre2_pattern_info.3.gz
> man/man3/pcre2_serialize_decode.3.gz
>@@ -82,6 +84,7 @@ 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_max_varlookbehind.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

Actions: View | Diff

Attachments on bug 251642: 220313 | 220468 | 220611 | 247356 | 247370 | 248514 | 248623 | 251283 | 251657 | 251694