Attachment 251694 Details for Bug 251642 – Patch for pcre2 v10

[patch] Patch for pcre2 v10

pcre-1044v4.patch (text/plain), 8.32 KB, created by Daniel Engberg on 2024-06-25 16:23:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2024-06-25 16:23:13 UTC

Size: 8.32 KB

patch

obsolete

>diff --git a/devel/pcre2/Makefile b/devel/pcre2/Makefile
>index 1574bcd791b4..b733f470e019 100644
>--- a/devel/pcre2/Makefile
>+++ b/devel/pcre2/Makefile
>@@ -1,8 +1,18 @@
> PORTNAME=	pcre2
>-DISTVERSION=	10.43
>+DISTVERSION=	10.44
> CATEGORIES=	devel
> MASTER_SITES=	https://github.com/PCRE2Project/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/
> 
>+PATCH_SITES=	https://github.com/PCRE2Project/pcre2/commit/
>+PATCHFILES=	fba4a6a5e8a7895db7e0efcbcdb7087a04a00322.patch:-p1 \
>+		57906628d7babd27c01eb1c085d3e0cdd512189a.patch:-p1 \
>+		bb8e7e0c728ca10fa21fbc306a7f2ae4205e8618.patch:-p1 \
>+		a80920509e49865405477244c294fb3d8864375e.patch:-p1 \
>+		3b90149f3c9aca9fe8c2aa623a18e18c089dc449.patch:-p1 \
>+		c63d7c992ef1bbf64ef93e0e8e551ed29fd988e7.patch:-p1 \
>+		7e141969b538917c9f4a85839031d066eec67ad2.patch:-p1 \
>+		9a51f31da1c2d45e1f31d6a0d6b2f62975fed373.patch:-p1
>+
> MAINTAINER=	krion@FreeBSD.org
> COMMENT=	Perl Compatible Regular Expressions library, version 2
> WWW=		https://www.pcre.org/
>@@ -10,41 +20,44 @@ 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
>-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
>-CONFIGURE_ARGS=			--enable-pcre2-16 \
>-				--enable-pcre2-32
>-INSTALL_TARGET=			install-strip
>+PORTDOCS=	*
>+
>+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
>-.endif
>-
>-.if ${PORT_OPTIONS:MDOCS}
>-PORTDOCS=	*
>+CMAKE_OFF+=	PCRE2_SUPPORT_JIT
> .endif
> 
> # Optional knobs that accept positive integer parameters (see pcrebuild(3)):
>@@ -53,33 +66,31 @@ 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}
>+CMAKE_ARGS+=	-DPCRE2_PARENS_NEST_LIMIT:STRING=${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
>-.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
>+post-patch:
>+# Clean testdata dir from .orig patches after backports
>+	${RM} ${PATCH_WRKSRC}/testdata/*.orig
> 
> .include <bsd.port.mk>
>diff --git a/devel/pcre2/distinfo b/devel/pcre2/distinfo
>index ce230c0d39cd..fe6a0db67785 100644
>--- a/devel/pcre2/distinfo
>+++ b/devel/pcre2/distinfo
>@@ -1,3 +1,19 @@
>-TIMESTAMP = 1708425567
>-SHA256 (pcre2-10.43.tar.bz2) = e2a53984ff0b07dfdb5ae4486bbb9b21cca8e7df2434096cc9bf1b728c350bcb
>-SIZE (pcre2-10.43.tar.bz2) = 1905255
>+TIMESTAMP = 1719270069
>+SHA256 (pcre2-10.44.tar.bz2) = d34f02e113cf7193a1ebf2770d3ac527088d485d4e047ed10e5d217c6ef5de96
>+SIZE (pcre2-10.44.tar.bz2) = 1928086
>+SHA256 (fba4a6a5e8a7895db7e0efcbcdb7087a04a00322.patch) = e31e16744f7e0e9294ba0d91dc1722085e61f995c34d79ac1580de69edf861bd
>+SIZE (fba4a6a5e8a7895db7e0efcbcdb7087a04a00322.patch) = 1141
>+SHA256 (57906628d7babd27c01eb1c085d3e0cdd512189a.patch) = 0c1b3167204a540b0ca3ef5c1728c56a518a819eb2ef9f2a948582cea0b07e97
>+SIZE (57906628d7babd27c01eb1c085d3e0cdd512189a.patch) = 206118
>+SHA256 (bb8e7e0c728ca10fa21fbc306a7f2ae4205e8618.patch) = 1f6b9d4a3ab7cbe9fe711a3cd065d3a166abcafa3e23a03c25de33bbf19544be
>+SIZE (bb8e7e0c728ca10fa21fbc306a7f2ae4205e8618.patch) = 1895
>+SHA256 (a80920509e49865405477244c294fb3d8864375e.patch) = 1fc49564879d3ca3ddf5eb2d925317e137d1c023b15d6e80a20c3202f3db71ad
>+SIZE (a80920509e49865405477244c294fb3d8864375e.patch) = 845
>+SHA256 (3b90149f3c9aca9fe8c2aa623a18e18c089dc449.patch) = b39c3439907bbe636d60908706bc09c47a9f2a560166454b6f8edd327c377a9d
>+SIZE (3b90149f3c9aca9fe8c2aa623a18e18c089dc449.patch) = 3014
>+SHA256 (c63d7c992ef1bbf64ef93e0e8e551ed29fd988e7.patch) = 3b89eea90a60631d43834ee2d157e4b0ec134df379727940533819440033314b
>+SIZE (c63d7c992ef1bbf64ef93e0e8e551ed29fd988e7.patch) = 15264
>+SHA256 (7e141969b538917c9f4a85839031d066eec67ad2.patch) = 2901927e7981cfba08a0470ca7acf3d4d4fa7e0311459b8ec8879b710f15920e
>+SIZE (7e141969b538917c9f4a85839031d066eec67ad2.patch) = 2030
>+SHA256 (9a51f31da1c2d45e1f31d6a0d6b2f62975fed373.patch) = ce64bcf66021f75ed784aef2d7f5289c73ed4c6de54525049884ee498327ecb3
>+SIZE (9a51f31da1c2d45e1f31d6a0d6b2f62975fed373.patch) = 987
>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 56a7cd258cd1..e64ae995c425 100644
>--- a/devel/pcre2/pkg-plist
>+++ b/devel/pcre2/pkg-plist
>@@ -1,21 +1,22 @@
> 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.12.0
>-lib/libpcre2-32.a
>+lib/libpcre2-16.so.0.13.0
>+%%STATIC%%lib/libpcre2-32.a
> lib/libpcre2-32.so
> lib/libpcre2-32.so.0
>-lib/libpcre2-32.so.0.12.0
>-lib/libpcre2-8.a
>+lib/libpcre2-32.so.0.13.0
>+%%STATIC%%lib/libpcre2-8.a
> lib/libpcre2-8.so
> lib/libpcre2-8.so.0
>-lib/libpcre2-8.so.0.12.0
>-lib/libpcre2-posix.a
>+lib/libpcre2-8.so.0.13.0
>+%%STATIC%%lib/libpcre2-posix.a
> lib/libpcre2-posix.so
> lib/libpcre2-posix.so.3
> lib/libpcre2-posix.so.3.0.5
>@@ -82,6 +83,7 @@ share/man/man3/pcre2_set_glob_escape.3.gz
> share/man/man3/pcre2_set_glob_separator.3.gz
> share/man/man3/pcre2_set_heap_limit.3.gz
> share/man/man3/pcre2_set_match_limit.3.gz
>+share/man/man3/pcre2_set_max_pattern_compiled_length.3.gz
> share/man/man3/pcre2_set_max_pattern_length.3.gz
> share/man/man3/pcre2_set_max_varlookbehind.3.gz
> share/man/man3/pcre2_set_newline.3.gz

Actions: View | Diff

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