开源软件构建与测试

_service:extract_file:pcre2.spec Deleted

@@ -1,164 +0,0 @@
-Name: pcre2
-Version: 10.39
-Release: 2
-Summary: Perl Compatible Regular Expressions
-License: BSD
-URL: http://www.pcre.org/
-Source0: https://ftp.pcre.org/pub/pcre/%{name}-%{version}.tar.bz2
-
-# Do no set RPATH if libdir is not /usr/lib
-Patch0: backport-pcre2-10.10-Fix-multilib.patch
-Patch1: backport-CVE-2022-1586-1.patch
-Patch2: backport-CVE-2022-1586-2.patch
-Patch3: backport-CVE-2022-1587.patch
-
-BuildRequires: autoconf libtool automake coreutils gcc make readline-devel
-Obsoletes: pcre2-utf16 pcre2-utf32 pcre2-tools
-Provides: pcre2-utf16 pcre2-utf32 pcre2-tools
-Provides: bundled(sljit)
-
-%description
-PCRE2 is a re-working of the original PCRE1 library to provide an entirely new
-API. Since its initial release in 2015, there has been further development of
-the code and it now differs from PCRE1 in more than just the API.
-PCRE2 is written in C, and it has its own API. There are three sets of
-functions, one for the 8-bit library, which processes strings of bytes, one for
-the 16-bit library, which processes strings of 16-bit values, and one for the
-32-bit library, which processes strings of 32-bit values. Unlike PCRE1, there
-are no C++ wrappers.
-
-The distribution does contain a set of C wrapper functions for the 8-bit
-library that are based on the POSIX regular expression API (see the pcre2posix
-man page). These are built into a library called libpcre2-posix. Note that this
-just provides a POSIX calling interface to PCRE2; the regular expressions
-themselves still follow Perl syntax and semantics. The POSIX API is restricted,
-and does not give full access to all of PCRE2's facilities.
-
-%package devel
-Summary: Development files for %{name}
-Requires: %{name} = %{version}-%{release}
-Obsoletes: pcre2-static
-Provides: pcre2-static
-
-%description devel
-%{summary}.
-
-%package help
-Summary: Man pages for %{name}
-BuildArch: noarch
-
-%description help
-%{summary}.
-
-%prep
-%autosetup -n %{name}-%{version} -p1
-
-autoreconf -vif
-
-%build
-%configure \
-%ifarch riscv64
- --disable-jit \
-%else
- --enable-jit \
-%endif
- --enable-pcre2grep-jit \
- --disable-bsr-anycrlf \
- --disable-coverage \
- --disable-ebcdic \
- --disable-fuzz-support \
- --disable-jit-sealloc \
- --disable-never-backslash-C \
- --enable-newline-is-lf \
- --enable-pcre2-8 \
- --enable-pcre2-16 \
- --enable-pcre2-32 \
- --enable-pcre2grep-callout \
- --enable-pcre2grep-jit \
- --disable-pcre2grep-libbz2 \
- --disable-pcre2grep-libz \
- --disable-pcre2test-libedit \
- --enable-pcre2test-libreadline \
- --disable-rebuild-chartables \
- --enable-shared \
- --enable-static \
- --enable-unicode \
- --disable-valgrind \
- --disable-silent-rules
-
-%make_build
-
-%install
-%make_install
-
-#Unpacked files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-
-%check
-make check
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root)
-%license %{_pkgdocdir}/{COPYING,LICENCE}
-%doc AUTHORS ChangeLog NEWS HACKING README
-%{_libdir}/libpcre2-8.so.*
-%{_libdir}/libpcre2-posix.so.*
-%{_libdir}/libpcre2-16.so.*
-%{_libdir}/libpcre2-32.so.*
-%{_bindir}/pcre2grep
-%{_bindir}/pcre2test
-
-%files devel
-%{_includedir}/*.h
-%{_libdir}/*.so
-%{_libdir}/*.a
-%{_libdir}/pkgconfig/*
-%{_bindir}/pcre2-config
-%doc ./src/pcre2demo.c
-
-%files help
-%{_mandir}/man1/*
-%{_mandir}/man3/*
-%{_pkgdocdir}/*.txt
-%{_pkgdocdir}/html/
-
-%changelog
-* Sat May 28 2022 yangmingtai <yangmingtai@huawei.com> - 10.39-2
-- DESC:fix CVE-2022-1586 and CVE-2022-1587
-
-* Tue Feb 8 2022 yangzhuangzhuang <yangzhuangzhuang1@h-partners.com> - 10.39-1
-- Type:requirement
-- ID:NA
-- SUG:NA
-- DESC:update to 10.39
-
-* Thu Jan 21 2021 yixiangzhike <zhangxingliang3@huawei.com> - 10.36-1
-- Type:requirement
-- ID:NA
-- SUG:NA
-- DESC:update to 10.36
-
-* Fri Jul 24 2020 zhangxingliang <zhangxingliang3@huawei.com> - 10.35-1
-- Type:update
-- ID:NA
-- SUG:NA
-- DESC:update to 10.35
-
-* Tue Jun 2 2020 whoisxxx <zhangxuzhou4@huawei.com> - 10.33-4
-- DESC: Disable jit for RISC-V
-
-* Tue Apr 7 2020 openEuler Buildteam <buildteam@openeuler.org> - 10.33-3
-- Type:cves
-- ID:CVE-2019-20454
-- SUG:NA
-- DESC:fix CVE-2019-20454
-
-* Mon Feb 3 2020 openEuler Buildteam <buildteam@openeuler.org> - 10.33-2
-- Fix stack buffer overflow
-
-* Sat Sep 14 2019 openEuler Buildteam <buildteam@openeuler.org> - 10.33-1
-- Package init

_service:tar_scm:pcre2.spec Added

@@ -0,0 +1,185 @@
+Name: pcre2
+Version: 10.40
+Release: 2
+Summary: Perl Compatible Regular Expressions
+License: BSD
+URL: http://www.pcre.org/
+Source0: https://github.com/PCRE2Project/pcre2/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
+
+# Do no set RPATH if libdir is not /usr/lib
+Patch6000: backport-pcre2-10.10-Fix-multilib.patch
+Patch6010: backport-doc-avoid-nonexistent-PCRE2_ERROR_MEMORY-error-107.patch
+Patch6011: backport-Update-HTML-docs.patch
+Patch6012: backport-Fixed-race-condition-that-occurs-when-initializing-t.patch
+Patch6013: backport-Change-length-variables-in-pcre2grep-from-int-to-siz.patch
+Patch6014: backport-Add-an-ifdef-to-avoid-the-need-even-to-link-with-pcr.patch
+Patch6015: backport-Fixed-an-issue-in-the-backtracking-optimization-of-c.patch
+
+BuildRequires: autoconf libtool automake coreutils gcc make readline-devel
+Obsoletes: pcre2-utf16 pcre2-utf32 pcre2-tools
+Provides: pcre2-utf16 pcre2-utf32 pcre2-tools
+Provides: bundled(sljit)
+
+%description
+PCRE2 is a re-working of the original PCRE1 library to provide an entirely new
+API. Since its initial release in 2015, there has been further development of
+the code and it now differs from PCRE1 in more than just the API.
+PCRE2 is written in C, and it has its own API. There are three sets of
+functions, one for the 8-bit library, which processes strings of bytes, one for
+the 16-bit library, which processes strings of 16-bit values, and one for the
+32-bit library, which processes strings of 32-bit values. Unlike PCRE1, there
+are no C++ wrappers.
+
+The distribution does contain a set of C wrapper functions for the 8-bit
+library that are based on the POSIX regular expression API (see the pcre2posix
+man page). These are built into a library called libpcre2-posix. Note that this
+just provides a POSIX calling interface to PCRE2; the regular expressions
+themselves still follow Perl syntax and semantics. The POSIX API is restricted,
+and does not give full access to all of PCRE2's facilities.
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name} = %{version}-%{release}
+Obsoletes: pcre2-static
+Provides: pcre2-static
+
+%description devel
+%{summary}.
+
+%package help
+Summary: Man pages for %{name}
+BuildArch: noarch
+
+%description help
+%{summary}.
+
+%prep
+%autosetup -n %{name}-%{version} -p1
+
+autoreconf -vif
+
+%build
+%configure \
+%ifarch riscv64 sw_64 loongarch64
+ --disable-jit \
+%else
+ --enable-jit \
+%endif
+ --enable-pcre2grep-jit \
+ --disable-bsr-anycrlf \
+ --disable-coverage \
+ --disable-ebcdic \
+ --disable-fuzz-support \
+ --disable-jit-sealloc \
+ --disable-never-backslash-C \
+ --enable-newline-is-lf \
+ --enable-pcre2-8 \
+ --enable-pcre2-16 \
+ --enable-pcre2-32 \
+ --enable-pcre2grep-callout \
+ --enable-pcre2grep-jit \
+ --disable-pcre2grep-libbz2 \
+ --disable-pcre2grep-libz \
+ --disable-pcre2test-libedit \
+ --enable-pcre2test-libreadline \
+ --disable-rebuild-chartables \
+ --enable-shared \
+ --enable-static \
+ --enable-unicode \
+ --disable-valgrind \
+ --disable-silent-rules
+
+%make_build
+
+%install
+%make_install
+
+#Unpacked files
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%check
+make check
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root)
+%license %{_pkgdocdir}/{COPYING,LICENCE}
+%doc AUTHORS ChangeLog NEWS HACKING README
+%{_libdir}/libpcre2-8.so.*
+%{_libdir}/libpcre2-posix.so.*
+%{_libdir}/libpcre2-16.so.*
+%{_libdir}/libpcre2-32.so.*
+%{_bindir}/pcre2grep
+%{_bindir}/pcre2test
+
+%files devel
+%{_includedir}/*.h
+%{_libdir}/*.so
+%{_libdir}/*.a
+%{_libdir}/pkgconfig/*
+%{_bindir}/pcre2-config
+%doc ./src/pcre2demo.c
+
+%files help
+%{_mandir}/man1/*
+%{_mandir}/man3/*
+%{_pkgdocdir}/*.txt
+%{_pkgdocdir}/html/
+
+%changelog
+* Sat Nov 26 2022 huyubiao <huyubiao@huawei.com> - 10.40-2
+- Update the Source0 URL.
+
+* Fri Nov 18 2022 dillon chen <dillon.chen@gmail.com> - 10.40-1
+- update to 10.40
+
+* Mon Nov 14 2022 zhaozhen <zhaozhen@loongson.cn> - 10.39-5
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:fix build error for loongarch64
+
+* Thu Nov 3 2022 wuzx<wuzx1226@qq.com> - 10.39-4
+- Add sw64 architecture
+
+* Tue Oct 18 2022 yangmingtai <yangmingtai@huawei.com> - 10.39-3
+- DESC:sync community patchs
+
+* Sat May 28 2022 yangmingtai <yangmingtai@huawei.com> - 10.39-2
+- DESC:fix CVE-2022-1586 and CVE-2022-1587
+
+* Tue Feb 8 2022 yangzhuangzhuang <yangzhuangzhuang1@h-partners.com> - 10.39-1
+- Type:requirement
+- ID:NA
+- SUG:NA
+- DESC:update to 10.39
+
+* Thu Jan 21 2021 yixiangzhike <zhangxingliang3@huawei.com> - 10.36-1
+- Type:requirement
+- ID:NA
+- SUG:NA
+- DESC:update to 10.36
+
+* Fri Jul 24 2020 zhangxingliang <zhangxingliang3@huawei.com> - 10.35-1
+- Type:update
+- ID:NA
+- SUG:NA
+- DESC:update to 10.35
+
+* Tue Jun 2 2020 whoisxxx <zhangxuzhou4@huawei.com> - 10.33-4
+- DESC: Disable jit for RISC-V
+
+* Tue Apr 7 2020 openEuler Buildteam <buildteam@openeuler.org> - 10.33-3
+- Type:cves
+- ID:CVE-2019-20454
+- SUG:NA
+- DESC:fix CVE-2019-20454
+
+* Mon Feb 3 2020 openEuler Buildteam <buildteam@openeuler.org> - 10.33-2
+- Fix stack buffer overflow
+
+* Sat Sep 14 2019 openEuler Buildteam <buildteam@openeuler.org> - 10.33-1
+- Package init

_service:extract_file:backport-CVE-2022-1586-1.patch Deleted

@@ -1,53 +0,0 @@
-From 50a51cb7e67268e6ad417eb07c9de9bfea5cc55a Mon Sep 17 00:00:00 2001
-From: Zoltan Herczeg <hzmester@freemail.hu>
-Date: Wed, 23 Mar 2022 07:53:25 +0000
-Subject: PATCH Fixed a unicode properrty matching issue in JIT
-
----
- ChangeLog | 3 +++
- src/pcre2_jit_compile.c | 2 +-
- src/pcre2_jit_test.c | 1 +
- 3 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index d27542d..cd3da65 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -63,6 +63,9 @@ Version 10.39 29-October-2021
- 
- Reformat slightly to make it C89 compatible again.
- 
-+23. Fixed a unicode properrty matching issue in JIT. The character was not
-+fully read in caseless matching.
-+
- 
- Version 10.38 01-October-2021
- -----------------------------
-diff --git a/src/pcre2_jit_compile.c b/src/pcre2_jit_compile.c
-index db2ce65..5baca9b 100644
---- a/src/pcre2_jit_compile.c
-+++ b/src/pcre2_jit_compile.c
-@@ -7473,7 +7473,7 @@ while (*cc != XCL_END)
- {
- SLJIT_ASSERT(*cc == XCL_PROP || *cc == XCL_NOTPROP);
- cc++;
-- if (*cc == PT_CLIST)
-+ if (*cc == PT_CLIST && *cc == XCL_PROP)
- {
- other_cases = PRIV(ucd_caseless_sets) + cc1;
- while (*other_cases != NOTACHAR)
-diff --git a/src/pcre2_jit_test.c b/src/pcre2_jit_test.c
-index 8dee16e..bf94c6d 100644
---- a/src/pcre2_jit_test.c
-+++ b/src/pcre2_jit_test.c
-@@ -412,6 +412,7 @@ static struct regression_test_case regression_test_cases = {
- 	{ MUP, A, 0, 0 | F_PROPERTY, "\\P{L&}{2}^\xc2\x85-\xc2\x89\\p{Ll}\\p{Lu}{2}", "\xc3\xa9\xe6\x92\xad.a\xe6\x92\xad|\xc2\x8a#" },
- 	{ PCRE2_UCP, 0, 0, 0 | F_PROPERTY, "a-b\\s{2,5}^a", "AB baaa" },
- 	{ MUP, 0, 0, 0 | F_NOMATCH, "^\\p{Hangul}\\p{Z}", " " },
-+	{ CMUP, 0, 0, 0, "^S\\B", "\xe2\x80\x8a" },
- 
- 	/* Possible empty brackets. */
- 	{ MU, A, 0, 0, "(?:|ab||bc|a)+d", "abcxabcabd" },
--- 
-2.27.0
-

_service:extract_file:backport-CVE-2022-1586-2.patch Deleted

_service:extract_file:backport-CVE-2022-1587.patch Deleted

@@ -1,656 +0,0 @@
-From 03654e751e7f0700693526b67dfcadda6b42c9d0 Mon Sep 17 00:00:00 2001
-From: Zoltan Herczeg <hzmester@freemail.hu>
-Date: Sat, 26 Mar 2022 07:55:50 +0000
-Subject: PATCH Fixed an issue affecting recursions in JIT
-
----
- ChangeLog | 3 +
- src/pcre2_jit_compile.c | 290 ++++++++++++++++++++++++++--------------
- src/pcre2_jit_test.c | 1 +
- 3 files changed, 194 insertions(+), 100 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index cd3da65..4e8815d 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -66,6 +66,9 @@ Version 10.39 29-October-2021
- 23. Fixed a unicode properrty matching issue in JIT. The character was not
- fully read in caseless matching.
- 
-+24. Fixed an issue affecting recursions in JIT caused by duplicated data
-+transfers.
-+
- 
- Version 10.38 01-October-2021
- -----------------------------
-diff --git a/src/pcre2_jit_compile.c b/src/pcre2_jit_compile.c
-index 5baca9b..08df1cf 100644
---- a/src/pcre2_jit_compile.c
-+++ b/src/pcre2_jit_compile.c
-@@ -413,6 +413,9 @@ typedef struct compiler_common {
- /* Locals used by fast fail optimization. */
- sljit_s32 early_fail_start_ptr;
- sljit_s32 early_fail_end_ptr;
-+ /* Variables used by recursive call generator. */
-+ sljit_s32 recurse_bitset_size;
-+ uint8_t *recurse_bitset;
- 
- /* Flipped and lower case tables. */
- const sljit_u8 *fcc;
-@@ -2315,19 +2318,39 @@ for (i = 0; i < RECURSE_TMP_REG_COUNT; i++)
- 
- #undef RECURSE_TMP_REG_COUNT
- 
-+static BOOL recurse_check_bit(compiler_common *common, sljit_sw bit_index)
-+{
-+uint8_t *byte;
-+uint8_t mask;
-+
-+SLJIT_ASSERT((bit_index & (sizeof(sljit_sw) - 1)) == 0);
-+
-+bit_index >>= SLJIT_WORD_SHIFT;
-+
-+mask = 1 << (bit_index & 0x7);
-+byte = common->recurse_bitset + (bit_index >> 3);
-+
-+if (*byte & mask)
-+ return FALSE;
-+
-+*byte |= mask;
-+return TRUE;
-+}
-+
- static int get_recurse_data_length(compiler_common *common, PCRE2_SPTR cc, PCRE2_SPTR ccend,
- BOOL *needs_control_head, BOOL *has_quit, BOOL *has_accept)
- {
- int length = 1;
--int size;
-+int size, offset;
- PCRE2_SPTR alternative;
- BOOL quit_found = FALSE;
- BOOL accept_found = FALSE;
- BOOL setsom_found = FALSE;
- BOOL setmark_found = FALSE;
--BOOL capture_last_found = FALSE;
- BOOL control_head_found = FALSE;
- 
-+memset(common->recurse_bitset, 0, common->recurse_bitset_size);
-+
- #if defined DEBUG_FORCE_CONTROL_HEAD && DEBUG_FORCE_CONTROL_HEAD
- SLJIT_ASSERT(common->control_head_ptr != 0);
- control_head_found = TRUE;
-@@ -2350,15 +2373,17 @@ while (cc < ccend)
- setsom_found = TRUE;
- if (common->mark_ptr != 0)
- setmark_found = TRUE;
-- if (common->capture_last_ptr != 0)
-- capture_last_found = TRUE;
-+ if (common->capture_last_ptr != 0 && recurse_check_bit(common, common->capture_last_ptr))
-+ length++;
- cc += 1 + LINK_SIZE;
- break;
- 
- case OP_KET:
-- if (PRIVATE_DATA(cc) != 0)
-+ offset = PRIVATE_DATA(cc);
-+ if (offset != 0)
- {
-- length++;
-+ if (recurse_check_bit(common, offset))
-+ length++;
- SLJIT_ASSERT(PRIVATE_DATA(cc + 1) != 0);
- cc += PRIVATE_DATA(cc + 1);
- }
-@@ -2377,39 +2402,55 @@ while (cc < ccend)
- case OP_SBRA:
- case OP_SBRAPOS:
- case OP_SCOND:
-- length++;
- SLJIT_ASSERT(PRIVATE_DATA(cc) != 0);
-+ if (recurse_check_bit(common, PRIVATE_DATA(cc)))
-+ length++;
- cc += 1 + LINK_SIZE;
- break;
- 
- case OP_CBRA:
- case OP_SCBRA:
-- length += 2;
-- if (common->capture_last_ptr != 0)
-- capture_last_found = TRUE;
-- if (common->optimized_cbracketGET2(cc, 1 + LINK_SIZE) == 0)
-+ offset = GET2(cc, 1 + LINK_SIZE);
-+ if (recurse_check_bit(common, OVECTOR(offset << 1)))
-+ {
-+ SLJIT_ASSERT(recurse_check_bit(common, OVECTOR((offset << 1) + 1)));
-+ length += 2;
-+ }
-+ if (common->optimized_cbracketoffset == 0 && recurse_check_bit(common, OVECTOR_PRIV(offset)))
-+ length++;
-+ if (common->capture_last_ptr != 0 && recurse_check_bit(common, common->capture_last_ptr))
- length++;
- cc += 1 + LINK_SIZE + IMM2_SIZE;
- break;
- 
- case OP_CBRAPOS:
- case OP_SCBRAPOS:
-- length += 2 + 2;
-- if (common->capture_last_ptr != 0)
-- capture_last_found = TRUE;
-+ offset = GET2(cc, 1 + LINK_SIZE);
-+ if (recurse_check_bit(common, OVECTOR(offset << 1)))
-+ {
-+ SLJIT_ASSERT(recurse_check_bit(common, OVECTOR((offset << 1) + 1)));
-+ length += 2;
-+ }
-+ if (recurse_check_bit(common, OVECTOR_PRIV(offset)))
-+ length++;
-+ if (recurse_check_bit(common, PRIVATE_DATA(cc)))
-+ length++;
-+ if (common->capture_last_ptr != 0 && recurse_check_bit(common, common->capture_last_ptr))
-+ length++;
- cc += 1 + LINK_SIZE + IMM2_SIZE;
- break;
- 
- case OP_COND:
- /* Might be a hidden SCOND. */
- alternative = cc + GET(cc, 1);
-- if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)
-+ if ((*alternative == OP_KETRMAX || *alternative == OP_KETRMIN) && recurse_check_bit(common, PRIVATE_DATA(cc)))
- length++;
- cc += 1 + LINK_SIZE;
- break;
- 
- CASE_ITERATOR_PRIVATE_DATA_1
-- if (PRIVATE_DATA(cc) != 0)
-+ offset = PRIVATE_DATA(cc);
-+ if (offset != 0 && recurse_check_bit(common, offset))
- length++;
- cc += 2;
- #ifdef SUPPORT_UNICODE
-@@ -2418,8 +2459,12 @@ while (cc < ccend)
- break;
- 
- CASE_ITERATOR_PRIVATE_DATA_2A
-- if (PRIVATE_DATA(cc) != 0)
-+ offset = PRIVATE_DATA(cc);
-+ if (offset != 0 && recurse_check_bit(common, offset))
-+ {
-+ SLJIT_ASSERT(recurse_check_bit(common, offset + sizeof(sljit_sw)));
- length += 2;
-+ }
- cc += 2;
- #ifdef SUPPORT_UNICODE
- if (common->utf && HAS_EXTRALEN(cc-1)) cc += GET_EXTRALEN(cc-1);
-@@ -2427,8 +2472,12 @@ while (cc < ccend)
- break;
- 
- CASE_ITERATOR_PRIVATE_DATA_2B
-- if (PRIVATE_DATA(cc) != 0)
-+ offset = PRIVATE_DATA(cc);
-+ if (offset != 0 && recurse_check_bit(common, offset))
-+ {
-+ SLJIT_ASSERT(recurse_check_bit(common, offset + sizeof(sljit_sw)));
- length += 2;
-+ }
- cc += 2 + IMM2_SIZE;
- #ifdef SUPPORT_UNICODE
- if (common->utf && HAS_EXTRALEN(cc-1)) cc += GET_EXTRALEN(cc-1);
-@@ -2436,20 +2485,29 @@ while (cc < ccend)
- break;

_service:extract_file:backport-pcre2-10.10-Fix-multilib.patch Deleted

_service:tar_scm:backport-Add-an-ifdef-to-avoid-the-need-even-to-link-with-pcr.patch Added

@@ -0,0 +1,57 @@
+From 4804b00e8f50e446be43ee51863c8cdd3c743bea Mon Sep 17 00:00:00 2001
+From: Philip Hazel <Philip.Hazel@gmail.com>
+Date: Thu, 30 Jun 2022 17:37:51 +0100
+Subject: PATCH Add an #ifdef to avoid the need even to link with
+ pcre2_jit_compile.o when JIT is not supported
+
+Conflict:delete changelog
+Reference:https://github.com/PCRE2Project/pcre2/commit/4804b00e8f50e446be43ee51863c8cdd3c743bea
+---
+ src/pcre2_compile.c | 2 ++
+ src/pcre2test.c | 4 ++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/pcre2_compile.c b/src/pcre2_compile.c
+index 383159b..b906dc0 100644
+--- a/src/pcre2_compile.c
++++ b/src/pcre2_compile.c
+@@ -1264,8 +1264,10 @@ PCRE2_SIZE* ref_count;
+ 
+ if (code != NULL)
+ {
++#ifdef SUPPORT_JIT 
+ if (code->executable_jit != NULL)
+ PRIV(jit_free)(code->executable_jit, &code->memctl);
++#endif
+ 
+ if ((code->flags & PCRE2_DEREF_TABLES) != 0)
+ {
+diff --git a/src/pcre2test.c b/src/pcre2test.c
+index 84987d7..11ec3ca 100644
+--- a/src/pcre2test.c
++++ b/src/pcre2test.c
+@@ -4737,19 +4737,19 @@ if ((pat_patctl.control & CTL_INFO) != 0)
+ 
+ if (pat_patctl.jit != 0 && (pat_patctl.control & CTL_JITVERIFY) != 0)
+ {
++#ifdef SUPPORT_JIT
+ if (FLD(compiled_code, executable_jit) != NULL)
+ fprintf(outfile, "JIT compilation was successful\n");
+ else
+ {
+-#ifdef SUPPORT_JIT
+ fprintf(outfile, "JIT compilation was not successful");
+ if (jitrc != 0 && !print_error_message(jitrc, " (", ")"))
+ return PR_ABEND;
+ fprintf(outfile, "\n");
++ }
+ #else
+ fprintf(outfile, "JIT support is not available in this version of PCRE2\n");
+ #endif
+- }
+ }
+ }
+ 
+-- 
+2.27.0
+

_service:tar_scm:backport-Change-length-variables-in-pcre2grep-from-int-to-siz.patch Added

@@ -0,0 +1,110 @@
+From 7549fdca744378b9e6597c2882a490308573368b Mon Sep 17 00:00:00 2001
+From: Philip Hazel <Philip.Hazel@gmail.com>
+Date: Thu, 30 Jun 2022 17:06:32 +0100
+Subject: PATCH Change length variables in pcre2grep from int to size_t
+
+Conflict:delete Changelog
+Reference:https://github.com/PCRE2Project/pcre2/commit/7549fdca744378b9e6597c2882a490308573368b
+---
+ src/pcre2grep.c | 28 +++++++++++++++-------------
+ 1 file changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/src/pcre2grep.c b/src/pcre2grep.c
+index 519346b..1484d67 100644
+--- a/src/pcre2grep.c
++++ b/src/pcre2grep.c
+@@ -232,15 +232,16 @@ static int after_context = 0;
+ static int before_context = 0;
+ static int binary_files = BIN_BINARY;
+ static int both_context = 0;
+-static int bufthird = PCRE2GREP_BUFSIZE;
+-static int max_bufthird = PCRE2GREP_MAX_BUFSIZE;
+-static int bufsize = 3*PCRE2GREP_BUFSIZE;
+ static int endlinetype;
+ 
+ static int count_limit = -1; /* Not long, so that it works with OP_NUMBER */
+ static unsigned long int counts_printed = 0;
+ static unsigned long int total_count = 0;
+ 
++static PCRE2_SIZE bufthird = PCRE2GREP_BUFSIZE;
++static PCRE2_SIZE max_bufthird = PCRE2GREP_MAX_BUFSIZE;
++static PCRE2_SIZE bufsize = 3*PCRE2GREP_BUFSIZE;
++
+ #ifdef WIN32
+ static int dee_action = dee_SKIP;
+ #else
+@@ -433,8 +434,8 @@ static option_item optionlist = {
+ { OP_NODATA, 'a', NULL, "text", "treat binary files as text" },
+ { OP_NUMBER, 'B', &before_context, "before-context=number", "set number of prior context lines" },
+ { OP_BINFILES, N_BINARY_FILES, NULL, "binary-files=word", "set treatment of binary files" },
+- { OP_NUMBER, N_BUFSIZE,&bufthird, "buffer-size=number", "set processing buffer starting size" },
+- { OP_NUMBER, N_MAX_BUFSIZE,&max_bufthird, "max-buffer-size=number", "set processing buffer maximum size" },
++ { OP_SIZE, N_BUFSIZE,&bufthird, "buffer-size=number", "set processing buffer starting size" },
++ { OP_SIZE, N_MAX_BUFSIZE,&max_bufthird, "max-buffer-size=number", "set processing buffer maximum size" },
+ { OP_OP_STRING, N_COLOUR, &colour_option, "color=option", "matched text color option" },
+ { OP_OP_STRING, N_COLOUR, &colour_option, "colour=option", "matched text colour option" },
+ { OP_NUMBER, 'C', &both_context, "context=number", "set number of context lines, before & after" },
+@@ -1419,10 +1420,10 @@ Returns: the number of characters read, zero at end of file
+ */
+ 
+ static PCRE2_SIZE
+-read_one_line(char *buffer, int length, FILE *f)
++read_one_line(char *buffer, PCRE2_SIZE length, FILE *f)
+ {
+ int c;
+-int yield = 0;
++PCRE2_SIZE yield = 0;
+ while ((c = fgetc(f)) != EOF)
+ {
+ bufferyield++ = c;
+@@ -2468,8 +2469,8 @@ return result != 0;
+ * Read a portion of the file into buffer *
+ *************************************************/
+ 
+-static int
+-fill_buffer(void *handle, int frtype, char *buffer, int length,
++static PCRE2_SIZE
++fill_buffer(void *handle, int frtype, char *buffer, PCRE2_SIZE length,
+ BOOL input_line_buffered)
+ {
+ (void)frtype; /* Avoid warning when not used */
+@@ -2631,7 +2632,7 @@ while (ptr < endptr)
+ if (bufthird < max_bufthird)
+ {
+ char *new_buffer;
+- int new_bufthird = 2*bufthird;
++ PCRE2_SIZE new_bufthird = 2*bufthird;
+ 
+ if (new_bufthird > max_bufthird) new_bufthird = max_bufthird;
+ new_buffer = (char *)malloc(3*new_bufthird);
+@@ -2640,7 +2641,8 @@ while (ptr < endptr)
+ {
+ fprintf(stderr,
+ "pcre2grep: line %lu%s%s is too long for the internal buffer\n"
+- "pcre2grep: not enough memory to increase the buffer size to %d\n",
++ "pcre2grep: not enough memory to increase the buffer size to %"
++ SIZ_FORM "\n",
+ linenumber,
+ (filename == NULL)? "" : " of file ",
+ (filename == NULL)? "" : filename,
+@@ -2670,7 +2672,7 @@ while (ptr < endptr)
+ {
+ fprintf(stderr,
+ "pcre2grep: line %lu%s%s is too long for the internal buffer\n"
+- "pcre2grep: the maximum buffer size is %d\n"
++ "pcre2grep: the maximum buffer size is %" SIZ_FORM "\n"
+ "pcre2grep: use the --max-buffer-size option to change it\n",
+ linenumber,
+ (filename == NULL)? "" : " of file ",
+@@ -3153,7 +3155,7 @@ while (ptr < endptr)
+ 
+ if (input_line_buffered && bufflength < (PCRE2_SIZE)bufsize)
+ {
+- int add = read_one_line(ptr, bufsize - (int)(ptr - main_buffer), in);
++ PCRE2_SIZE add = read_one_line(ptr, bufsize - (ptr - main_buffer), in);
+ bufflength += add;
+ endptr += add;
+ }
+-- 
+2.27.0
+

_service:tar_scm:backport-Fixed-an-issue-in-the-backtracking-optimization-of-c.patch Added

@@ -0,0 +1,62 @@
+From 4851890ede31313655e19180f4959ed348fee580 Mon Sep 17 00:00:00 2001
+From: Zoltan Herczeg <zherczeg.u-szeged@partner.samsung.com>
+Date: Thu, 14 Jul 2022 05:25:39 +0200
+Subject: PATCH Fixed an issue in the backtracking optimization of character
+ repeats in JIT (#135)
+
+Conflict:adjust changelog
+Reference:https://github.com/PCRE2Project/pcre2/commit/4851890ede31313655e19180f4959ed348fee580
+---
+ src/pcre2_jit_compile.c | 20 ++++++++++----------
+ src/pcre2_jit_test.c | 1 +
+ 2 files changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/src/pcre2_jit_compile.c b/src/pcre2_jit_compile.c
+index 8f6c090..75ba610 100644
+--- a/src/pcre2_jit_compile.c
++++ b/src/pcre2_jit_compile.c
+@@ -11357,19 +11357,19 @@ if (exact > 1)
+ }
+ }
+ else if (exact == 1)
+- {
+ compile_char1_matchingpath(common, type, cc, &backtrack->topbacktracks, TRUE);
+ 
+- if (early_fail_type == type_fail_range)
+- {
+- OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), early_fail_ptr);
+- OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), early_fail_ptr + (int)sizeof(sljit_sw));
+- OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, TMP2, 0);
+- OP2(SLJIT_SUB, TMP2, 0, STR_PTR, 0, TMP2, 0);
+- add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_LESS_EQUAL, TMP2, 0, TMP1, 0));
++if (early_fail_type == type_fail_range)
++ {
++ /* Range end first, followed by range start. */
++ OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), early_fail_ptr);
++ OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), early_fail_ptr + (int)sizeof(sljit_sw));
++ OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, TMP2, 0);
++ OP2(SLJIT_SUB, TMP2, 0, STR_PTR, 0, TMP2, 0);
++ add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_LESS_EQUAL, TMP2, 0, TMP1, 0));
+ 
+- OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr + (int)sizeof(sljit_sw), STR_PTR, 0);
+- }
++ OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, STR_PTR, 0);
++ OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr + (int)sizeof(sljit_sw), STR_PTR, 0);
+ }
+ 
+ switch(opcode)
+diff --git a/src/pcre2_jit_test.c b/src/pcre2_jit_test.c
+index f7b9f6d..e1f0bbc 100644
+--- a/src/pcre2_jit_test.c
++++ b/src/pcre2_jit_test.c
+@@ -354,6 +354,7 @@ static struct regression_test_case regression_test_cases = {
+ 	{ 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" },
++	{ M, PCRE2_NEWLINE_CRLF, 0, 0, "\\n?.+#", "\n,\n,#" },
+ 
+ 	/* Bracket repeats with limit. */
+ 	{ MU, A, 0, 0, "(?:(ab){2}){5}M", "abababababababababababM" },
+-- 
+2.27.0
+

_service:tar_scm:backport-Fixed-race-condition-that-occurs-when-initializing-t.patch Added

@@ -0,0 +1,56 @@
+From 45af1203bdb5d1ccccc27526ce38c36f49196ccc Mon Sep 17 00:00:00 2001
+From: larinsv <97248465+larinsv@users.noreply.github.com>
+Date: Wed, 18 May 2022 13:16:00 +0300
+Subject: PATCH Fixed race condition that occurs when initializing the
+ executable_allocator_is_working variable in the pcre2_jit_compile function
+ (#91)
+
+Conflict:NA
+Reference:https://github.com/PCRE2Project/pcre2/commit/45af1203bdb5d1ccccc27526ce38c36f49196ccc
+---
+ src/pcre2_jit_compile.c | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/src/pcre2_jit_compile.c b/src/pcre2_jit_compile.c
+index b6b1313..e638c24 100644
+--- a/src/pcre2_jit_compile.c
++++ b/src/pcre2_jit_compile.c
+@@ -14384,7 +14384,7 @@ pcre2_jit_compile(pcre2_code *code, uint32_t options)
+ pcre2_real_code *re = (pcre2_real_code *)code;
+ #ifdef SUPPORT_JIT
+ executable_functions *functions;
+-static int executable_allocator_is_working = 0;
++static int executable_allocator_is_working = -1;
+ #endif
+ 
+ if (code == NULL)
+@@ -14447,23 +14447,21 @@ return PCRE2_ERROR_JIT_BADOPTION;
+ 
+ if ((re->flags & PCRE2_NOJIT) != 0) return 0;
+ 
+-if (executable_allocator_is_working == 0)
++if (executable_allocator_is_working == -1)
+ {
+ /* Checks whether the executable allocator is working. This check
+ might run multiple times in multi-threaded environments, but the
+ result should not be affected by it. */
+ void *ptr = SLJIT_MALLOC_EXEC(32, NULL);
+-
+- executable_allocator_is_working = -1;
+-
+ if (ptr != NULL)
+ {
+ SLJIT_FREE_EXEC(((sljit_u8*)(ptr)) + SLJIT_EXEC_OFFSET(ptr), NULL);
+ executable_allocator_is_working = 1;
+ }
++ else executable_allocator_is_working = 0;
+ }
+ 
+-if (executable_allocator_is_working < 0)
++if (!executable_allocator_is_working)
+ return PCRE2_ERROR_NOMEMORY;
+ 
+ if ((re->overall_options & PCRE2_MATCH_INVALID_UTF) != 0)
+-- 
+2.27.0
+

_service:tar_scm:backport-Update-HTML-docs.patch Added

@@ -0,0 +1,55 @@
+From b52d055d1b8feb6e56804c2062de65d50a5601e2 Mon Sep 17 00:00:00 2001
+From: Philip Hazel <Philip.Hazel@gmail.com>
+Date: Fri, 22 Apr 2022 18:02:14 +0100
+Subject: PATCH Update HTML docs
+
+Conflict:NA
+Reference:https://github.com/PCRE2Project/pcre2/commit/b52d055d1b8feb6e56804c2062de65d50a5601e2
+---
+ doc/html/pcre2_serialize_decode.html | 2 +-
+ doc/html/pcre2serialize.html | 2 +-
+ doc/pcre2.txt | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/doc/html/pcre2_serialize_decode.html b/doc/html/pcre2_serialize_decode.html
+index cff6e6c..618ffa9 100644
+--- a/doc/html/pcre2_serialize_decode.html
++++ b/doc/html/pcre2_serialize_decode.html
+@@ -48,7 +48,7 @@ the following negative error codes:
+ PCRE2_ERROR_BADDATA number_of_codes is zero or less
+ PCRE2_ERROR_BADMAGIC mismatch of id bytes in bytes
+ PCRE2_ERROR_BADMODE mismatch of variable unit size or PCRE version
+- PCRE2_ERROR_MEMORY memory allocation failed
++ PCRE2_ERROR_NOMEMORY memory allocation failed
+ PCRE2_ERROR_NULL codes or bytes is NULL
+ </pre>
+ PCRE2_ERROR_BADMAGIC may mean that the data is corrupt, or that it was compiled
+diff --git a/doc/html/pcre2serialize.html b/doc/html/pcre2serialize.html
+index df4098e..a492305 100644
+--- a/doc/html/pcre2serialize.html
++++ b/doc/html/pcre2serialize.html
+@@ -94,7 +94,7 @@ of serialized patterns, or one of the following negative error codes:
+ <pre>
+ PCRE2_ERROR_BADDATA the number of patterns is zero or less
+ PCRE2_ERROR_BADMAGIC mismatch of id bytes in one of the patterns
+- PCRE2_ERROR_MEMORY memory allocation failed
++ PCRE2_ERROR_NOMEMORY memory allocation failed
+ PCRE2_ERROR_MIXEDTABLES the patterns do not all use the same tables
+ PCRE2_ERROR_NULL the 1st, 3rd, or 4th argument is NULL
+ </pre>
+diff --git a/doc/pcre2.txt b/doc/pcre2.txt
+index c318432..c70fb9b 100644
+--- a/doc/pcre2.txt
++++ b/doc/pcre2.txt
+@@ -10436,7 +10436,7 @@ SAVING COMPILED PATTERNS
+ 
+ PCRE2_ERROR_BADDATA the number of patterns is zero or less
+ PCRE2_ERROR_BADMAGIC mismatch of id bytes in one of the patterns
+- PCRE2_ERROR_MEMORY memory allocation failed
++ PCRE2_ERROR_NOMEMORY memory allocation failed
+ PCRE2_ERROR_MIXEDTABLES the patterns do not all use the same tables
+ PCRE2_ERROR_NULL the 1st, 3rd, or 4th argument is NULL
+ 
+-- 
+2.27.0
+

_service:tar_scm:backport-doc-avoid-nonexistent-PCRE2_ERROR_MEMORY-error-107.patch Added

@@ -0,0 +1,43 @@
+From a4ac97fea8a2d802985d1f5b298ede2cb07cc8cd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= <carenas@gmail.com>
+Date: Fri, 22 Apr 2022 09:59:44 -0700
+Subject: PATCH doc: avoid nonexistent PCRE2_ERROR_MEMORY error (#107)
+
+5438fc8a (Add serialization functions and tests with updated pcre2test.
+Fix PCRE2_INFO_SIZE issues., 2015-01-23) introduced the typo.
+
+Reported-by: @sjshuck
+Fixes: #106
+
+Conflict:NA
+Reference:https://github.com/PCRE2Project/pcre2/commit/a4ac97fea8a2d802985d1f5b298ede2cb07cc8cd
+
+diff --git a/doc/pcre2_serialize_decode.3 b/doc/pcre2_serialize_decode.3
+index b67a112..611113f 100644
+--- a/doc/pcre2_serialize_decode.3
++++ b/doc/pcre2_serialize_decode.3
+@@ -36,7 +36,7 @@ the following negative error codes:
+ PCRE2_ERROR_BADDATA \fInumber_of_codes\fP is zero or less
+ PCRE2_ERROR_BADMAGIC mismatch of id bytes in \fIbytes\fP
+ PCRE2_ERROR_BADMODE mismatch of variable unit size or PCRE version
+- PCRE2_ERROR_MEMORY memory allocation failed
++ PCRE2_ERROR_NOMEMORY memory allocation failed
+ PCRE2_ERROR_NULL \fIcodes\fP or \fIbytes\fP is NULL
+ .sp
+ PCRE2_ERROR_BADMAGIC may mean that the data is corrupt, or that it was compiled
+diff --git a/doc/pcre2serialize.3 b/doc/pcre2serialize.3
+index 987bc3a..a94f13b 100644
+--- a/doc/pcre2serialize.3
++++ b/doc/pcre2serialize.3
+@@ -81,7 +81,7 @@ of serialized patterns, or one of the following negative error codes:
+ .sp
+ PCRE2_ERROR_BADDATA the number of patterns is zero or less
+ PCRE2_ERROR_BADMAGIC mismatch of id bytes in one of the patterns
+- PCRE2_ERROR_MEMORY memory allocation failed
++ PCRE2_ERROR_NOMEMORY memory allocation failed
+ PCRE2_ERROR_MIXEDTABLES the patterns do not all use the same tables
+ PCRE2_ERROR_NULL the 1st, 3rd, or 4th argument is NULL
+ .sp
+-- 
+2.27.0
+

_service:tar_scm:backport-pcre2-10.10-Fix-multilib.patch Added

_service Changed

_service:extract_file:pcre2-10.39.tar.bz2 Deleted

_service:extract_file:pcre2.yaml Deleted

_service:tar_scm:pcre2-1653875128.4758fdd.tar -> _service:tar_scm:pcre2-10.40.tar.bz2 Changed

_service:tar_scm:pcre2.yaml Added

Changes of Revision 2