Attachment 220468 Details for Bug 251642 – Patch for pcre2 v2

[patch] Patch for pcre2 v2

pcre1036-v2.patch (text/plain), 6.37 KB, created by Daniel Engberg on 2020-12-11 22:41:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2020-12-11 22:41:24 UTC

Size: 6.37 KB

patch

obsolete

>diff --git a/devel/pcre2/Makefile b/devel/pcre2/Makefile
>index 29f18275fca7..204995f5230f 100644
>--- a/devel/pcre2/Makefile
>+++ b/devel/pcre2/Makefile
>@@ -2,9 +2,12 @@
> # $FreeBSD$
> 
> PORTNAME=	pcre2
>-PORTVERSION=	10.36
>+DISTVERSION=	10.36
>+PORTREVISION=	1
> CATEGORIES=	devel
>-MASTER_SITES=	SF/pcre/${PORTNAME}/${PORTVERSION}
>+MASTER_SITES=	SF/pcre/${PORTNAME}/${DISTVERSION} \
>+		https://ftp.pcre.org/pub/pcre/ \
>+		ftp://ftp.pcre.org/pub/pcre/
> 
> MAINTAINER=	krion@FreeBSD.org
> COMMENT=	Perl Compatible Regular Expressions library, version 2
>@@ -12,54 +15,67 @@ COMMENT=	Perl Compatible Regular Expressions library, version 2
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENCE
> 
>-USES=		autoreconf libtool pkgconfig
>+USES=		cmake tar:bzip2
> 
>-GNU_CONFIGURE=	yes
>-USE_LDCONFIG=	yes
>-INSTALL_TARGET=	install-strip
>-CONFIGURE_ARGS=	--enable-pcre2-16 --enable-pcre2-32
>+TEST_TARGET=	test
>+
>+CMAKE_ON=	PCRE2_BUILD_PCRE2_16 PCRE2_BUILD_PCRE2_32
> 
>-OPTIONS_DEFINE=	DOCS
>+OPTIONS_DEFINE=	DOCS STATIC TEST
>+OPTIONS_SUB=	yes
> OPTIONS_RADIO=	CLI
> OPTIONS_RADIO_CLI=	LIBEDIT READLINE
> 
>-LIBEDIT_CONFIGURE_ENABLE=	pcre2test-libedit
>-LIBEDIT_USES=			libedit
>-
>-READLINE_USES=			readline
>-READLINE_CONFIGURE_ENABLE=	pcre2test-libreadline
>+LIBEDIT_USES=		libedit
>+LIBEDIT_CMAKE_BOOL=	PCRE2_SUPPORT_LIBEDIT
>+READLINE_USES=		readline
>+READLINE_CMAKE_BOOL=	PCRE2_SUPPORT_LIBREADLINE
>+STATIC_CMAKE_BOOL_OFF=	BUILD_SHARED_LIBS
>+TEST_CMAKE_BOOL=	PCRE2_BUILD_TESTS
> 
> .include <bsd.port.options.mk>
> 
> .if ${ARCH} != "sparc64" && ${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}
> PORTDOCS=	*
> .endif
> 
>+.if ! ${PORT_OPTIONS:MSTATIC}
>+USE_LDCONFIG=	yes
>+.endif
>+
> # Optional knobs that accept positive integer parameters (see pcrebuild(3)):
> 
> # Allow the use of very large patterns (> 64K) with the 8- and 16-bit
> # 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
>@@ -67,13 +83,15 @@ CONFIGURE_ARGS+=	--with-parens-nest-limit=${WITH_PARENS_NEST_LIMIT}
> .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
>+	@${CP} -Rp ${WRKSRC}/test-driver ${WRKDIR}/.build
>+	@${CP} -Rp ${WRKSRC}/testdata ${WRKDIR}/.build
>+	@${CP} -p ${WRKSRC}/RunGrepTest ${WRKDIR}/.build
>+	@${CP} -p ${WRKSRC}/RunTest ${WRKDIR}/.build
>+	@cd ${WRKDIR}/.build ; \
>+	${SETENV} ${MAKE_ENV} ${CORELIMIT} ${MAKE_CMD} ${MAKE_ARGS} \
>+	${TEST_TARGET} ; \
>+	${CAT} Testing/Temporary/LastTest.log
> 
> .include <bsd.port.mk>
>diff --git a/devel/pcre2/distinfo b/devel/pcre2/distinfo
>index 250da859ef7e..a431ec4fca8e 100644
>--- a/devel/pcre2/distinfo
>+++ b/devel/pcre2/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1607337860
>-SHA256 (pcre2-10.36.tar.gz) = b95ddb9414f91a967a887d69617059fb672b914f56fa3d613812c1ee8e8a1a37
>-SIZE (pcre2-10.36.tar.gz) = 2290719
>+TIMESTAMP = 1607244930
>+SHA256 (pcre2-10.36.tar.bz2) = a9ef39278113542968c7c73a31cfcb81aca1faa64690f400b907e8ab6b4a665c
>+SIZE (pcre2-10.36.tar.bz2) = 1722310
>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 0c22cf7c508b..a6c954ef52c9 100644
>--- a/devel/pcre2/pkg-plist
>+++ b/devel/pcre2/pkg-plist
>@@ -1,24 +1,25 @@
> bin/pcre2-config
>+%%TEST%%bin/pcre2_jit_test
> bin/pcre2grep
>-bin/pcre2test
>+%%TEST%%bin/pcre2test
> include/pcre2.h
> include/pcre2posix.h
>-lib/libpcre2-16.a
>-lib/libpcre2-16.so
>-lib/libpcre2-16.so.0
>-lib/libpcre2-16.so.0.10.1
>-lib/libpcre2-32.a
>-lib/libpcre2-32.so
>-lib/libpcre2-32.so.0
>-lib/libpcre2-32.so.0.10.1
>-lib/libpcre2-8.a
>-lib/libpcre2-8.so
>-lib/libpcre2-8.so.0
>-lib/libpcre2-8.so.0.10.1
>-lib/libpcre2-posix.a
>-lib/libpcre2-posix.so
>-lib/libpcre2-posix.so.2
>-lib/libpcre2-posix.so.2.0.3
>+%%STATIC%%lib/libpcre2-16.a
>+%%NO_STATIC%%lib/libpcre2-16.so
>+%%NO_STATIC%%lib/libpcre2-16.so.0
>+%%NO_STATIC%%lib/libpcre2-16.so.0.10.1
>+%%STATIC%%lib/libpcre2-32.a
>+%%NO_STATIC%%lib/libpcre2-32.so
>+%%NO_STATIC%%lib/libpcre2-32.so.0
>+%%NO_STATIC%%lib/libpcre2-32.so.0.10.1
>+%%STATIC%%lib/libpcre2-8.a
>+%%NO_STATIC%%lib/libpcre2-8.so
>+%%NO_STATIC%%lib/libpcre2-8.so.0
>+%%NO_STATIC%%lib/libpcre2-8.so.0.10.1
>+%%STATIC%%lib/libpcre2-posix.a
>+%%NO_STATIC%%lib/libpcre2-posix.so
>+%%NO_STATIC%%lib/libpcre2-posix.so.2
>+%%NO_STATIC%%lib/libpcre2-posix.so.2.0.3
> libdata/pkgconfig/libpcre2-16.pc
> libdata/pkgconfig/libpcre2-32.pc
> libdata/pkgconfig/libpcre2-8.pc

Actions: View | Diff

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