[rpms/glib2] cve-2026-58016-f44: Revert a GKeyFile introspection ABI change

[rpms/glib2] cve-2026-58016-f44: Revert a GKeyFile introspection ABI change

[Kalev Lember]

A new commit has been pushed.

Repo   : rpms/glib2
Branch : cve-2026-58016-f44
Commit : 8a2874adbc7002faca0ce299b62732dc1cba5817
Author : Kalev Lember <klember@redhat.com>
Date   : 2017-07-21T19:00:31+02:00
Stats  : +60/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/glib2/c/8a2874adbc7002faca0ce299b62732dc1cba5817?branch=cve-2026-58016-f44

Log:
Revert a GKeyFile introspection ABI change

---
diff --git a/0001-Revert-GKeyFile-Add-array-length-annotations-to-to_d.patch b/0001-Revert-GKeyFile-Add-array-length-annotations-to-to_d.patch
new file mode 100644
index 0000000..6d826a9
--- /dev/null
+++ b/0001-Revert-GKeyFile-Add-array-length-annotations-to-to_d.patch
@@ -0,0 +1,52 @@
+From 039c40e6ec96020e568fb6c1e45dc48f3c4fa6de Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Fri, 21 Jul 2017 15:33:37 +0100
+Subject: [PATCH] =?UTF-8?q?Revert=20"GKeyFile=20=E2=80=93=20Add=20array=20?=
+ =?UTF-8?q?length=20annotations=20to=20to=5Fdata(),=20get=5Fkeys()=20and?=
+ =?UTF-8?q?=20get=5Fgroups()"?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit fd329f4853f180eb92746f39fc96fd5d91394009.
+
+The commit changed the Introspection ABI, and it requires a change in
+any application using an introspection-based language binding.
+---
+ glib/gkeyfile.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
+index 4ac7c087a..9831fbe6c 100644
+--- a/glib/gkeyfile.c
++++ b/glib/gkeyfile.c
+@@ -1489,7 +1489,7 @@ g_key_file_flush_parse_buffer (GKeyFile  *key_file,
+  * Note that this function never reports an error,
+  * so it is safe to pass %NULL as @error.
+  *
+- * Returns: (array length=length): a newly allocated string holding
++ * Returns: a newly allocated string holding
+  *   the contents of the #GKeyFile 
+  *
+  * Since: 2.6
+@@ -1559,7 +1559,7 @@ g_key_file_to_data (GKeyFile  *key_file,
+  * be found, %NULL is returned and @error is set to
+  * #G_KEY_FILE_ERROR_GROUP_NOT_FOUND.
+  *
+- * Returns: (array zero-terminated=1 length=length) (transfer full): a newly-allocated %NULL-terminated array of strings.
++ * Returns: (array zero-terminated=1) (transfer full): a newly-allocated %NULL-terminated array of strings.
+  *     Use g_strfreev() to free it.
+  *
+  * Since: 2.6
+@@ -1654,7 +1654,7 @@ g_key_file_get_start_group (GKeyFile *key_file)
+  * The array of returned groups will be %NULL-terminated, so 
+  * @length may optionally be %NULL.
+  *
+- * Returns: (array zero-terminated=1 length=length) (transfer full): a newly-allocated %NULL-terminated array of strings.
++ * Returns: (array zero-terminated=1) (transfer full): a newly-allocated %NULL-terminated array of strings.
+  *   Use g_strfreev() to free it.
+  * Since: 2.6
+  **/
+-- 
+2.13.0
+

diff --git a/glib2.spec b/glib2.spec
index 5c1e2c0..a5a2256 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -5,13 +5,16 @@
 
 Name: glib2
 Version: 2.53.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A library of handy utility functions
 
 License: LGPLv2+
 URL: http://www.gtk.org
 Source0: http://download.gnome.org/sources/glib/2.53/glib-%{version}.tar.xz
 
+# Backported from upstream
+Patch0: 0001-Revert-GKeyFile-Add-array-length-annotations-to-to_d.patch
+
 BuildRequires: chrpath
 BuildRequires: gettext
 BuildRequires: perl-generators
@@ -81,6 +84,7 @@ the functionality of the installed glib2 package.
 
 %prep
 %setup -q -n glib-%{version}
+%patch0 -p1
 
 %build
 # Bug 1324770: Also explicitly remove PCRE sources since we use --with-pcre=system
@@ -231,6 +235,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/installed-tests
 
 %changelog
+* Fri Jul 21 2017 Kalev Lember <klember@redhat.com> - 2.53.4-2
+- Revert a GKeyFile introspection ABI change
+
 * Tue Jul 18 2017 Kalev Lember <klember@redhat.com> - 2.53.4-1
 - Update to 2.53.4