gentoo resync : 25.10.2021

3 files changed, 148 insertions, 0 deletions

diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 86e5ab0c020a..c12749acb7d5 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,7 +1,9 @@
 AUX libpcre2-10.37-jit_fixes.patch 3022 BLAKE2B 7e3091cc46d60ec3c72981f1980f7ebcfaeecc1c777188bed0edbaa64205752fcd69164ebf5de670f857f4837a76593c1930cdfe7997b49b38dc1501d7e5cbec SHA512 b691357b43032be0e97234a7fb27b4bdb684028acd4e2bc3da9a997ba823e8ffc9eca1d32fb5c3bc5700b7504ad16f83aa0f6e486c869e529cdbfa597024ad70
+AUX libpcre2-10.38-fix-fix-incorrect-detection-of-alternatives-in-first-character-search.patch 1501 BLAKE2B cfddc2a8f4ae40e01d18c4f8e19b2810461b49e587dc2483fdc9b712ff4f7dd907b1690663180e480ff794bc9404ce4acbe22585c15a9f5852d116ab629f47e2 SHA512 1b6738f97425b4c397c85a6e254d5c37e17d7327afd8d62e11c565667bfb874a6ddceca8cab01bcc21a397a040b4e7fbaca3ef890569c4a9a207510425207edd
 DIST libpcre2-10.36-patchset-01.tar.xz 1364 BLAKE2B bfef3c876a092e06972107b44794c23b758a030181f3040c8b722db166789eac794783169b468fc71334fd660bc2f1c31422a8cb8e5bdc18a69b72654b1b59b2 SHA512 04324d1efa6d155fa3ffbc328638e4674bea305fef7f57d4369ab4a6399a0f489b4c0ecfb49643feff310d91872e1673e965c48a5c60f1bf54a319f0d275c306
 DIST pcre2-10.37.tar.bz2 1729384 BLAKE2B b4e56041010d7f44e84a63a17b35e87329d258107d8b27ccead10f51e7deacc93cbee64a22c71b9f0b8f244920b3a22fa4d9b786ec441a428e0ad0bb8535773e SHA512 69f4bf4736b986e0fc855eedb292efe72a0df2e803bc0e61a6cf47775eed433bb1b2f28d7e641591ef4603d47beb543a64ed0eef9538d00f0746bc3435c143ec
 DIST pcre2-10.38.tar.bz2 1729078 BLAKE2B 9438ff2422afaa83d5a4b2e64d5897068c35add28d66956431f9937191416d6df4903ecf35af72c788480d7def08e0ce17922e9b036698ce1bbe6cacbb799df2 SHA512 3634cb2db6ccba9720c1b69890bcd9eb7057f6a6cb6981f12b3f2d6b2bb4e75e4e5014f566045f9ba1b79edf01fa5c4d81eb333727b9462e843dfb70f3a58f95
 EBUILD libpcre2-10.37-r2.ebuild 2639 BLAKE2B 34947702bc9bf6cef80e0fc6bff9d58a5776197a6d3509d51f092b5fd7b191508a0c0763848c0bcb7950cb6c8efb1e55cda7c083e8012350c897470badf70537 SHA512 12311f8b31c8f2f39fd67334ac74fefb88e7da6fd7c2bc64b1689701cec30f54e293356a312ef51b9fc02a6d18254dbf5c095db6d2127bc745f848783d88da91
+EBUILD libpcre2-10.38-r1.ebuild 2787 BLAKE2B e6c05981bdd8a95835372e56794bd68f673d6ceb5f994d4e353804b87251028df426468e4cfe02eaaa9cce10800ac88cc37e31b9f5608337e572c72cc889f2f7 SHA512 bcadb60b53eef11f19202ed38b881c8e1f5f1647b4313c1a768e8d48769ed4fe17526bad0b32a9a633852505ee95f3461ba73eb6a05cbad5446ee0a8ba74ede5
 EBUILD libpcre2-10.38.ebuild 2679 BLAKE2B 0c7717f0ff0bcd5d4d0275b18bad23127de544c72672f71e6c2569f23b3b7b2fb4d4eb3e2bce58d6e3bc2dc68f5dd703588707c3c1c572bdd7a857122ca989ff SHA512 1fdcfebcf4c6dfdfc144994d17a91e0962a9acac95d81bd0f91de81bcd39a2fab42be985c2932283685373650463e7f63ac6e73afc7952e6a793acc099b2dd57
 MISC metadata.xml 1236 BLAKE2B 4a7361d870b4cbbdf16cec3dabd66e5f161b5c9dc17c4db1972e99ed739f2f17dbbdea2b9828991137e7cf8db93c87ceb4b2b8b617174979d0a6d6d827e0537b SHA512 57d2fd0a8b3d98dd2d1d40cf4934bf1202c812b9c2a44802a6ca2960e174dc71471ef9fb5f1baed48432ca956a6572f4313fbec5e83f4557f9634e78f2f2a465
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 000000000000..936bd057a0e9
--- /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<size>\\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 000000000000..1b287f08fb0e
--- /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
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-pcre2-8
+		--enable-shared
+		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
+		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
+		$(multilib_native_use_enable libedit pcre2test-libedit)
+		$(multilib_native_use_enable readline pcre2test-libreadline)
+		$(multilib_native_use_enable zlib pcre2grep-libz)
+		$(use_enable jit)
+		$(use_enable jit pcre2grep-jit)
+		$(use_enable pcre16 pcre2-16)
+		$(use_enable pcre32 pcre2-32)
+		$(use_enable static-libs static)
+		$(use_enable unicode)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
+		install
+	multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+}