[rpms/glib2] cve-2026-58016-f44: Backport an upstream patch to fix GRegex on s390x

[rpms/glib2] cve-2026-58016-f44: Backport an upstream patch to fix GRegex on s390x

[Kalev Lember]

            A new commit has been pushed.

            Repo   : rpms/glib2
            Branch : cve-2026-58016-f44
            Commit : 7ebd5f85095f3a5016a06777d17865382f2bf2b3
            Author : Kalev Lember <klember@redhat.com>
            Date   : 2022-07-26T23:00:37+02:00
            Stats  : +35/-0 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/glib2/c/7ebd5f85095f3a5016a06777d17865382f2bf2b3?branch=cve-2026-58016-f44

            Log:
            Backport an upstream patch to fix GRegex on s390x

Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org> for fixing this!

https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2840

---
diff --git a/2840.patch b/2840.patch
new file mode 100644
index 0000000..c0ba83c
--- /dev/null
+++ b/2840.patch
@@ -0,0 +1,31 @@
+From 710ccee65c010e4548ded487cdc191658f6a1f35 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka@fedoraproject.org>
+Date: Tue, 26 Jul 2022 21:51:45 +0900
+Subject: [PATCH] gregex: use correct size for pcre2_pattern_info
+
+man pcre2_pattern_info says that the 3rd argument must
+point to uint32_t variable (except for some 2nd argument value),
+so correctly use it. Especially using wrong size can cause
+unexpected result on big endian.
+
+closes: #2699
+---
+ glib/gregex.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/glib/gregex.c b/glib/gregex.c
+index dd61dc4813..08c43ef4b5 100644
+--- a/glib/gregex.c
++++ b/glib/gregex.c
+@@ -1701,7 +1701,7 @@ regex_compile (const gchar *pattern,
+   PCRE2_SIZE erroffset;
+   gint errcode;
+   GRegexCompileFlags nonpcre_compile_options;
+-  unsigned long int pcre_compile_options;
++  uint32_t pcre_compile_options;
+ 
+   nonpcre_compile_options = compile_options & G_REGEX_COMPILE_NONPCRE_MASK;
+ 
+-- 
+GitLab
+

diff --git a/glib2.spec b/glib2.spec
index baa08d1..d3d3b0c 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -17,6 +17,10 @@ Patch0: gnutls-hmac.patch
 # Proposed upstream at https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1596
 Patch1: gdesktopappinfo.patch
 
+# Backported from upstream to fix GRegex on s390x
+# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2840
+Patch2: 2840.patch
+
 BuildRequires: gcc
 BuildRequires: gcc-c++
 BuildRequires: gettext