[gentoo-commits] repo/gentoo:master commit in: dev-libs/libpcre2/, dev-libs/libpcre2/files/
commit: 313df39d4a22d9a5c2be6fd6360753192f287a2c
Author: Sam James gentoo org>
AuthorDate: Tue Dec 6 17:21:36 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 6 17:21:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=313df39d
dev-libs/libpcre2: add 10.41
Signed-off-by: Sam James gentoo.org>
dev-libs/libpcre2/Manifest | 2 +
.../files/libpcre2-10.10-000-Fix-multilib.patch| 37 +
dev-libs/libpcre2/libpcre2-10.41.ebuild| 93 ++
3 files changed, 132 insertions(+)
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index a2a57687a418..228972439009 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,3 +1,5 @@
DIST libpcre2-10.36-patchset-01.tar.xz 1364 BLAKE2B
bfef3c876a092e06972107b44794c23b758a030181f3040c8b722db166789eac794783169b468fc71334fd660bc2f1c31422a8cb8e5bdc18a69b72654b1b59b2
SHA512
04324d1efa6d155fa3ffbc328638e4674bea305fef7f57d4369ab4a6399a0f489b4c0ecfb49643feff310d91872e1673e965c48a5c60f1bf54a319f0d275c306
DIST pcre2-10.40.tar.bz2 1765440 BLAKE2B
627a204585b92238eda81b4befc88757a81d75b0d9fa26ea6d51afcdd93f7e2d102a2245bf3c8e1f5f9ddf69a316c419c948b741a64442bb567480015543e49b
SHA512
00e7b48a6554b9127cb6fe24c5cacf72783416a9754ec88f62f73c52f46ed72c86c1869e62c91a31b2ff2cbafbbedabca44b3f1eb7670bc92f49d8401c7374e8
DIST pcre2-10.40.tar.bz2.sig 310 BLAKE2B
9609111a64b66893b12e36d1cbc77b64d6a0cc30b9288e52753785ddcab37cc3e169d0f117d94e4ad7d7ff897a6ba0a574c9a2e529c3c7e171f5a1bc6f64fe23
SHA512
faa4b47fdac1543cd323651f251b8abb94b31b5966b42d445b8cbb38c441df4742e3c3517c2bc6c0a4464e9fb5feab5d5beda1250a03d56bec2d8383be2f63ab
+DIST pcre2-10.41.tar.bz2 1799126 BLAKE2B
4335eae8e8a327c32092a1a9f8214fa86a2d016deb7450938c4ddc38214b72dfa8c6f9c85a03bb36b3686390d378d74fdd991563f92611c42a54915310604559
SHA512
328f331a56f152424f6021b37f8dcf660842c55d43ff39f1b49115f0d05ed651d0bbb66b43c0ed61d65022030615768b92ce5e6218a54e4e17152ec473cca68d
+DIST pcre2-10.41.tar.bz2.sig 310 BLAKE2B
4ee3f9327bf568e38d1c072a4be93cdab4209e7b0cc0d183b978553cd7413ba9f292318ddf815cf44bc24872f685ee4ff9bceddd7d0e915b7be67c43fd8bf8f7
SHA512
4127258f17011be7c82d9412728863a9121c5b780514ec836769ab64ccd4cd5349a84fc85b8fdc4abb2e6fe08f4610b2a3e926116e7f1451d90d9afaa888661c
diff --git a/dev-libs/libpcre2/files/libpcre2-10.10-000-Fix-multilib.patch
b/dev-libs/libpcre2/files/libpcre2-10.10-000-Fix-multilib.patch
new file mode 100644
index ..c216aa62d279
--- /dev/null
+++ b/dev-libs/libpcre2/files/libpcre2-10.10-000-Fix-multilib.patch
@@ -0,0 +1,37 @@
+From 8b6b10229201e5b148979a24e06c640dbbcfbad9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?=
+Date: Fri, 20 Feb 2015 14:34:26 +0100
+Subject: [PATCH] Fix multilib
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Do not set RPATH nor add explicit -L path to compiler.
+
+Signed-off-by: Petr Písař
+
+--- a/pcre2-config.in
b/pcre2-config.in
+@@ -28,19 +28,7 @@ if test $# -eq 0; then
+ fi
+
+ libR=
+-case `uname -s` in
+- *SunOS*)
+- libR=" -R@libdir@"
+- ;;
+- *BSD*)
+- libR=" -Wl,-R@libdir@"
+- ;;
+-esac
+-
+ libS=
+-if test @libdir@ != /usr/lib ; then
+- libS=-L@libdir@
+-fi
+
+ while test $# -gt 0; do
+ case "$1" in
+--
+2.1.0
+
diff --git a/dev-libs/libpcre2/libpcre2-10.41.ebuild
b/dev-libs/libpcre2/libpcre2-10.41.ebuild
new file mode 100644
index ..c8948edf597e
--- /dev/null
+++ b/dev-libs/libpcre2/libpcre2-10.41.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/philiphazel.asc
+inherit libtool multilib-minimal usr-ldscript verify-sig
+
+MY_P="pcre2-${PV/_rc/-RC}"
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="https://www.pcre.org/;
+if [[ ${PV} != *_rc* ]] ; then
+ # Only the final releases are available here.
+
SRC_URI="https://github.com/PCRE2Project/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2
+ https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2
+ verify-sig? (
https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2.sig
)"
+else
+ SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2;
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0/3" # libpcre2-posix.so version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib"
+REQUIRED_USE="?? ( libedit readline )"
+
+RDEPEND="
+ bzip2? ( app-arch/bzip2 )
+ libedit? ( dev-libs/libedit )
+ readline? ( sys-libs/readline:= )
+ zlib? (
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libpcre2/, dev-libs/libpcre2/files/
commit: 6006eabdf30e3e8a13cf407f290e4e309bb2d148
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun Oct 24 13:34:25 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun Oct 24 13:34:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6006eabd
dev-libs/libpcre2: fix incorrect detection of alternatives
...in first character search.
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann gentoo.org>
...of-alternatives-in-first-character-search.patch | 49 +++
dev-libs/libpcre2/libpcre2-10.38-r1.ebuild | 97 ++
2 files changed, 146 insertions(+)
diff --git
a/dev-libs/libpcre2/files/libpcre2-10.38-fix-fix-incorrect-detection-of-alternatives-in-first-character-search.patch
b/dev-libs/libpcre2/files/libpcre2-10.38-fix-fix-incorrect-detection-of-alternatives-in-first-character-search.patch
new file mode 100644
index 000..936bd057a0e
--- /dev/null
+++
b/dev-libs/libpcre2/files/libpcre2-10.38-fix-fix-incorrect-detection-of-alternatives-in-first-character-search.patch
@@ -0,0 +1,49 @@
+https://github.com/PhilipHazel/pcre2/pull/22
+
+--- a/src/pcre2_jit_compile.c
b/src/pcre2_jit_compile.c
+@@ -1251,10 +1251,13 @@ SLJIT_ASSERT(*cc == OP_ONCE || *cc == OP_BRA || *cc ==
OP_CBRA);
+ SLJIT_ASSERT(*cc != OP_CBRA || common->optimized_cbracket[GET2(cc, 1 +
LINK_SIZE)] != 0);
+ SLJIT_ASSERT(start < EARLY_FAIL_ENHANCE_MAX);
+
++next_alt = cc + GET(cc, 1);
++if (*next_alt == OP_ALT)
++ fast_forward_allowed = FALSE;
++
+ do
+ {
+ count = start;
+- next_alt = cc + GET(cc, 1);
+ cc += 1 + LINK_SIZE + ((*cc == OP_CBRA) ? IMM2_SIZE : 0);
+
+ while (TRUE)
+@@ -1512,7 +1515,7 @@ do
+ {
+ count++;
+
+-if (fast_forward_allowed && *next_alt == OP_KET)
++if (fast_forward_allowed)
+ {
+ common->fast_forward_bc_ptr = accelerated_start;
+ common->private_data_ptrs[(accelerated_start + 1) - common->start]
= ((*private_data_start) << 3) | type_skip;
+@@ -1562,8 +1565,8 @@ do
+ else if (result < count)
+ result = count;
+
+- fast_forward_allowed = FALSE;
+ cc = next_alt;
++ next_alt = cc + GET(cc, 1);
+ }
+ while (*cc == OP_ALT);
+
+--- a/src/pcre2_jit_test.c
b/src/pcre2_jit_test.c
+@@ -352,6 +352,7 @@ static struct regression_test_case regression_test_cases[]
= {
+ { MU, A, 0, 0, ".[ab]?.", "xx" },
+ { MU, A, 0, 0, "_[ab]+_*a", "_aa" },
+ { MU, A, 0, 0, "#(A+)#\\d+", "#A#A#0" },
++ { MU, A, 0, 0, "(?P\\d+)m|M", "4M" },
+
+ /* Bracket repeats with limit. */
+ { MU, A, 0, 0, "(?:(ab){2}){5}M", "abababababababababababM" },
+
diff --git a/dev-libs/libpcre2/libpcre2-10.38-r1.ebuild
b/dev-libs/libpcre2/libpcre2-10.38-r1.ebuild
new file mode 100644
index 000..1b287f08fb0
--- /dev/null
+++ b/dev-libs/libpcre2/libpcre2-10.38-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal usr-ldscript
+
+PATCH_SET="${PN}-10.36-patchset-01.tar.xz"
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="https://www.pcre.org/;
+MY_P="pcre2-${PV/_rc/-RC}"
+if [[ ${PV} != *_rc* ]] ; then
+ # Only the final releases are available here.
+ SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
+ https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2
+
https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2;
+else
+ SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2;
+fi
+
+if [[ -n "${PATCH_SET}" ]] ; then
+ SRC_URI+=" https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}
+ https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET};
+fi
+
+LICENSE="BSD"
+SLOT="0/3" # libpcre2-posix.so version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline +recursion-limit static-libs
unicode zlib"
+REQUIRED_USE="?? ( libedit readline )"
+
+BDEPEND="
+ virtual/pkgconfig
+ userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+"
+RDEPEND="
+ bzip2? ( app-arch/bzip2 )
+ libedit? ( dev-libs/libedit )
+ readline? ( sys-libs/readline:0= )
+ zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
"${FILESDIR}"/${P}-fix-fix-incorrect-detection-of-alternatives-in-first-character-search.patch
)
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/pcre2-config
+)
+
+src_prepare() {
+ if [[ -d "${WORKDIR}/patches" ]] ; then
+ rm "${WORKDIR}"/patches/pcre2-10.36-001-issue2698.patch || die
+ eapply "${WORKDIR}"/patches
+ fi
+
+ default
+
+ elibtoolize
+}
+
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libpcre2/, dev-libs/libpcre2/files/
commit: 646212efa126022d0001ab5c75bcb8562e3b84fe
Author: Lars Wendler gentoo org>
AuthorDate: Mon Jun 7 18:46:27 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon Jun 7 18:47:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=646212ef
dev-libs/libpcre2: Revbump to fix a JIT issue
Signed-off-by: Lars Wendler gentoo.org>
.../libpcre2/files/libpcre2-10.37-jit_fixes.patch | 80 ++
dev-libs/libpcre2/libpcre2-10.37-r2.ebuild | 98 ++
2 files changed, 178 insertions(+)
diff --git a/dev-libs/libpcre2/files/libpcre2-10.37-jit_fixes.patch
b/dev-libs/libpcre2/files/libpcre2-10.37-jit_fixes.patch
new file mode 100644
index 000..6ee5494f2bc
--- /dev/null
+++ b/dev-libs/libpcre2/files/libpcre2-10.37-jit_fixes.patch
@@ -0,0 +1,80 @@
+Index: pcre2/ChangeLog
+===
+--- pcre2/ChangeLog(revision 1314)
pcre2/ChangeLog(revision 1315)
+@@ -1,7 +1,14 @@
+ Change Log for PCRE2
+
+
++Version 10.38-RC1 xx-xxx-2021
++-
+
++1. Fix invalid single character repetition issues in JIT when the repetition
++is inside a capturing bracket and the bracket is preceeded by character
++literals.
++
++
+ Version 10.37 26-May-2021
+ -
+
+Index: pcre2/src/pcre2_jit_compile.c
+===
+--- pcre2/src/pcre2_jit_compile.c (revision 1314)
pcre2/src/pcre2_jit_compile.c (revision 1315)
+@@ -1236,15 +1236,16 @@
+
+ return: current number of iterators enhanced with fast fail
+ */
+-static int detect_early_fail(compiler_common *common, PCRE2_SPTR cc, int
*private_data_start, sljit_s32 depth, int start)
++static int detect_early_fail(compiler_common *common, PCRE2_SPTR cc, int
*private_data_start,
++ sljit_s32 depth, int start, BOOL fast_forward_allowed)
+ {
+ PCRE2_SPTR begin = cc;
+ PCRE2_SPTR next_alt;
+ PCRE2_SPTR end;
+ PCRE2_SPTR accelerated_start;
++BOOL prev_fast_forward_allowed;
+ int result = 0;
+ int count;
+-BOOL fast_forward_allowed = TRUE;
+
+ SLJIT_ASSERT(*cc == OP_ONCE || *cc == OP_BRA || *cc == OP_CBRA);
+ SLJIT_ASSERT(*cc != OP_CBRA || common->optimized_cbracket[GET2(cc, 1 +
LINK_SIZE)] != 0);
+@@ -1476,6 +1477,7 @@
+ case OP_CBRA:
+ end = cc + GET(cc, 1);
+
++ prev_fast_forward_allowed = fast_forward_allowed;
+ fast_forward_allowed = FALSE;
+ if (depth >= 4)
+ break;
+@@ -1484,7 +1486,7 @@
+ if (*end != OP_KET || (*cc == OP_CBRA &&
common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] == 0))
+ break;
+
+- count = detect_early_fail(common, cc, private_data_start, depth + 1,
count);
++ count = detect_early_fail(common, cc, private_data_start, depth + 1,
count, prev_fast_forward_allowed);
+
+ if (PRIVATE_DATA(cc) != 0)
+ common->private_data_ptrs[begin - common->start] = 1;
+@@ -13657,7 +13659,7 @@
+ private_data_size = common->cbra_ptr + (re->top_bracket + 1) *
sizeof(sljit_sw);
+
+ if ((re->overall_options & PCRE2_ANCHORED) == 0 && (re->overall_options &
PCRE2_NO_START_OPTIMIZE) == 0 && !common->has_skip_in_assert_back)
+- detect_early_fail(common, common->start, _data_size, 0, 0);
++ detect_early_fail(common, common->start, _data_size, 0, 0, TRUE);
+
+ set_private_data_ptrs(common, _data_size, ccend);
+
+Index: pcre2/src/pcre2_jit_test.c
+===
+--- pcre2/src/pcre2_jit_test.c (revision 1314)
pcre2/src/pcre2_jit_test.c (revision 1315)
+@@ -351,6 +351,7 @@
+ { MU, A, 0, 0, ".[ab]*a", "xxa" },
+ { MU, A, 0, 0, ".[ab]?.", "xx" },
+ { MU, A, 0, 0, "_[ab]+_*a", "_aa" },
++ { MU, A, 0, 0, "#(A+)#\\d+", "#A#A#0" },
+
+ /* Bracket repeats with limit. */
+ { MU, A, 0, 0, "(?:(ab){2}){5}M", "abababababababababababM" },
diff --git a/dev-libs/libpcre2/libpcre2-10.37-r2.ebuild
b/dev-libs/libpcre2/libpcre2-10.37-r2.ebuild
new file mode 100644
index 000..8f86138dfd5
--- /dev/null
+++ b/dev-libs/libpcre2/libpcre2-10.37-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal usr-ldscript
+
+PATCH_SET="${PN}-10.36-patchset-01.tar.xz"
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="https://www.pcre.org/;
+MY_P="pcre2-${PV/_rc/-RC}"
+if [[ ${PV} != *_rc* ]] ; then
+ # Only the final releases are available here.
+ SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
+ https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2;
+else
+ SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2;
+fi
+
+if [[ -n "${PATCH_SET}" ]] ; then
+ SRC_URI+=" https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}
+
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libpcre2/, dev-libs/libpcre2/files/
commit: fef0e0c22854d149001db13f0e8872c87a6bf68f
Author: Michael Haubenwallner gentoo org>
AuthorDate: Wed Jan 17 15:21:25 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Jun 20 09:09:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fef0e0c2
dev-libs/libpcre2: fix cygwin build
Closes: https://bugs.gentoo.org/633612
Package-Manager: Portage-2.3.13, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/8918
dev-libs/libpcre2/files/libpcre2-10.31-cygwin.patch | 16
dev-libs/libpcre2/libpcre2-10.31.ebuild | 4
2 files changed, 20 insertions(+)
diff --git a/dev-libs/libpcre2/files/libpcre2-10.31-cygwin.patch
b/dev-libs/libpcre2/files/libpcre2-10.31-cygwin.patch
new file mode 100644
index 000..3f3a33b366a
--- /dev/null
+++ b/dev-libs/libpcre2/files/libpcre2-10.31-cygwin.patch
@@ -0,0 +1,16 @@
+https://bugs.exim.org/show_bug.cgi?id=2152#c14
+https://vcs.pcre.org/pcre2?view=revision=939
+
+--- pcre2-10.31/src/pcre2grep.c
pcre2-10.31/src/pcre2grep.c
+@@ -64,8 +64,8 @@
+ #endif
+
+ /* Some cmake's define it still */
+-#if defined(__CYGWIN__) && !defined(WIN32)
+-#define WIN32
++#if defined(__CYGWIN__) && defined(WIN32)
++#undef WIN32
+ #endif
+
+ #ifdef WIN32
diff --git a/dev-libs/libpcre2/libpcre2-10.31.ebuild
b/dev-libs/libpcre2/libpcre2-10.31.ebuild
index b3366003de6..6cd15f0dac3 100644
--- a/dev-libs/libpcre2/libpcre2-10.31.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.31.ebuild
@@ -30,6 +30,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
+PATCHES=(
+ "${FILESDIR}"/${P}-cygwin.patch #633612
+)
+
S="${WORKDIR}/${MY_P}"
MULTILIB_CHOST_TOOLS=(
