mirror of
https://git.yoctoproject.org/poky
synced 2026-05-07 16:59:22 +00:00
libpcre2: upgrade 10.42 -> 10.43
License-Update: copyright years (From OE-Core rev: 6a0cb6e129d5602808f34fd2a9460fc05d9520d6) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
00013601aa
commit
e3b7060e0d
@@ -0,0 +1,54 @@
|
||||
From cce3ae98a2c1966719daabff5a4ec6cf94a846f6 Mon Sep 17 00:00:00 2001
|
||||
From: Philip Withnall <pwithnall@gnome.org>
|
||||
Date: Mon, 26 Feb 2024 16:55:44 +0000
|
||||
Subject: [PATCH] tests: Remove variable-length lookbehind tests for GRegex
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
PCRE2 10.43 has now introduced support for variable-length lookbehind,
|
||||
so these tests now fail if GLib is built against PCRE2 10.43 or higher.
|
||||
|
||||
See
|
||||
https://github.com/PCRE2Project/pcre2/blob/e8db6fa7137f4c6f66cb87e0a3c9467252ec1ef7/ChangeLog#L94.
|
||||
|
||||
Rather than making the tests conditional on the version of PCRE2 in use,
|
||||
just remove them. They are mostly testing the PCRE2 code rather than
|
||||
any code in GLib, so don’t have much value.
|
||||
|
||||
This should fix CI runs on msys2-mingw32, which updated to PCRE2 10.43 2
|
||||
days ago.
|
||||
|
||||
Signed-off-by: Philip Withnall <pwithnall@gnome.org>
|
||||
|
||||
Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/cce3ae98a2c1966719daabff5a4ec6cf94a846f6]
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
---
|
||||
glib/tests/regex.c | 10 ----------
|
||||
1 file changed, 10 deletions(-)
|
||||
|
||||
diff --git a/glib/tests/regex.c b/glib/tests/regex.c
|
||||
index 1082526292..d7a698ec67 100644
|
||||
--- a/glib/tests/regex.c
|
||||
+++ b/glib/tests/regex.c
|
||||
@@ -1885,16 +1885,6 @@ test_lookbehind (void)
|
||||
g_match_info_free (match);
|
||||
g_regex_unref (regex);
|
||||
|
||||
- regex = g_regex_new ("(?<!dogs?|cats?) x", G_REGEX_OPTIMIZE, G_REGEX_MATCH_DEFAULT, &error);
|
||||
- g_assert (regex == NULL);
|
||||
- g_assert_error (error, G_REGEX_ERROR, G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND);
|
||||
- g_clear_error (&error);
|
||||
-
|
||||
- regex = g_regex_new ("(?<=ab(c|de)) foo", G_REGEX_OPTIMIZE, G_REGEX_MATCH_DEFAULT, &error);
|
||||
- g_assert (regex == NULL);
|
||||
- g_assert_error (error, G_REGEX_ERROR, G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND);
|
||||
- g_clear_error (&error);
|
||||
-
|
||||
regex = g_regex_new ("(?<=abc|abde)foo", G_REGEX_OPTIMIZE, G_REGEX_MATCH_DEFAULT, &error);
|
||||
g_assert (regex);
|
||||
g_assert_no_error (error);
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
@@ -16,6 +16,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
|
||||
file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \
|
||||
file://0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch \
|
||||
file://memory-monitor.patch \
|
||||
file://fix-regex.patch \
|
||||
"
|
||||
SRC_URI:append:class-native = " file://relocate-modules.patch \
|
||||
file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \
|
||||
|
||||
+2
-2
@@ -8,14 +8,14 @@ SUMMARY = "Perl Compatible Regular Expressions version 2"
|
||||
HOMEPAGE = "http://www.pcre.org"
|
||||
SECTION = "devel"
|
||||
LICENSE = "BSD-3-Clause"
|
||||
LIC_FILES_CHKSUM = "file://LICENCE;md5=41bfb977e4933c506588724ce69bf5d2"
|
||||
LIC_FILES_CHKSUM = "file://LICENCE;md5=321a5eb46acae6b6c1ff2c7a866d836a"
|
||||
|
||||
SRC_URI = "${GITHUB_BASE_URI}/download/pcre2-${PV}/pcre2-${PV}.tar.bz2"
|
||||
|
||||
GITHUB_BASE_URI = "https://github.com/PhilipHazel/pcre2/releases"
|
||||
UPSTREAM_CHECK_REGEX = "releases/tag/pcre2-(?P<pver>\d+(\.\d+)+)$"
|
||||
|
||||
SRC_URI[sha256sum] = "8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840"
|
||||
SRC_URI[sha256sum] = "e2a53984ff0b07dfdb5ae4486bbb9b21cca8e7df2434096cc9bf1b728c350bcb"
|
||||
|
||||
CVE_PRODUCT = "pcre2"
|
||||
|
||||
Reference in New Issue
Block a user