[rpms/glib2] cve-2026-58016-f44: Updated to 2.85.2

[Barry Dunn <badunn@redhat.com>]

A new commit has been pushed.

Repo   : rpms/glib2
Branch : cve-2026-58016-f44
Commit : f7a93066817721e613ba26d2b9b94bb6b95d59c4
Author : Barry Dunn <badunn@redhat.com>
Date   : 2025-07-23T12:13:40-04:00
Stats  : +151/-2 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/glib2/c/f7a93066817721e613ba26d2b9b94bb6b95d59c4?branch=cve-2026-58016-f44

Log:
Updated to 2.85.2

---
diff --git a/4709.patch b/4709.patch
new file mode 100644
index 0000000..9ef6dca
--- /dev/null
+++ b/4709.patch
@@ -0,0 +1,63 @@
+From ee5e750be32d71f80c60deeaa20795770ddec3b7 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@gnome.org>
+Date: Tue, 22 Jul 2025 13:33:24 +0100
+Subject: [PATCH] tests: Connect to GMemoryMonitor signals earlier
+
+It might be possible for the `low-memory-warning` signal to be emitted
+(by the GLib worker thread) before the test has connected to it, which
+could cause the tests to loop forever.
+
+Potentially fixes
+https://gitlab.gnome.org/pwithnall/glib/-/jobs/5322491, though I have
+not been able to reproduce the race locally.
+
+Signed-off-by: Philip Withnall <pwithnall@gnome.org>
+---
+ gio/tests/memory-monitor-poll.c | 5 ++---
+ gio/tests/memory-monitor-psi.c  | 5 ++---
+ 2 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/gio/tests/memory-monitor-poll.c b/gio/tests/memory-monitor-poll.c
+index ac707d9b05..d6ef6db9ad 100644
+--- a/gio/tests/memory-monitor-poll.c
++++ b/gio/tests/memory-monitor-poll.c
+@@ -65,11 +65,10 @@ test_event (const void *data)
+                           "poll-interval-ms", 50,
+                           "mem-free-ratio", test_data->simulated_mem_free_ratio,
+                           NULL);
+-  g_initable_init (G_INITABLE (monitor), NULL, &local_error);
+-  g_assert_no_error (local_error);
+-
+   warning_id = g_signal_connect (monitor, "low-memory-warning",
+                                  G_CALLBACK (memory_monitor_signal_cb), &warning_level);
++  g_initable_init (G_INITABLE (monitor), NULL, &local_error);
++  g_assert_no_error (local_error);
+ 
+   while (warning_level == -1)
+     g_main_context_iteration (NULL, TRUE);
+diff --git a/gio/tests/memory-monitor-psi.c b/gio/tests/memory-monitor-psi.c
+index 35d6a246cc..4f149d8ef1 100644
+--- a/gio/tests/memory-monitor-psi.c
++++ b/gio/tests/memory-monitor-psi.c
+@@ -84,6 +84,8 @@ test_receive_signals (SetupData *setup, gconstpointer data)
+   monitor = g_object_new (G_TYPE_MEMORY_MONITOR_PSI,
+                           "proc-path", setup->mock_proc_path,
+                           NULL);
++  warning_id = g_signal_connect (monitor, "low-memory-warning",
++                                 G_CALLBACK (memory_monitor_psi_signal_cb), &warning_level);
+   g_initable_init (G_INITABLE (monitor), NULL, &local_error);
+   g_assert_no_error (local_error);
+ 
+@@ -93,9 +95,6 @@ test_receive_signals (SetupData *setup, gconstpointer data)
+                        &local_error);
+   g_assert_no_error (local_error);
+ 
+-  warning_id = g_signal_connect (monitor, "low-memory-warning",
+-                                 G_CALLBACK (memory_monitor_psi_signal_cb), &warning_level);
+-
+   while (warning_level == -1)
+     g_main_context_iteration (NULL, TRUE);
+ 
+-- 
+GitLab
+

diff --git a/4713.patch b/4713.patch
new file mode 100644
index 0000000..cdb6b29
--- /dev/null
+++ b/4713.patch
@@ -0,0 +1,83 @@
+From e9b0fe2879bbc31346e628a30c30dc4e8b0e44d1 Mon Sep 17 00:00:00 2001
+From: Kate Hsuan <hpa@redhat.com>
+Date: Wed, 23 Jul 2025 19:14:01 +0800
+Subject: [PATCH 1/2] gio: gmemorymonitorpoll: Fix unit test error since the
+ callback returns earlier
+
+The value overriding has to be set before testing the value and returning
+the callback. Otherwise, the callback can't emit a signal to the test
+program.
+---
+ gio/gmemorymonitorpoll.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/gio/gmemorymonitorpoll.c b/gio/gmemorymonitorpoll.c
+index d5d4e75f5a..55ca54613c 100644
+--- a/gio/gmemorymonitorpoll.c
++++ b/gio/gmemorymonitorpoll.c
+@@ -150,16 +150,16 @@ g_memory_monitor_mem_ratio_cb (gpointer data)
+ 
+   mem_ratio = g_memory_monitor_base_query_mem_ratio ();
+ 
++  /* free ratio override */
++  if (monitor->mem_free_ratio >= 0.0)
++    mem_ratio = monitor->mem_free_ratio;
++
+   if (mem_ratio < 0.0)
+     return G_SOURCE_REMOVE;
+ 
+   if (mem_ratio > 0.5)
+     return G_SOURCE_CONTINUE;
+ 
+-  /* free ratio override */
+-  if (monitor->mem_free_ratio >= 0.0)
+-    mem_ratio = monitor->mem_free_ratio;
+-
+   g_debug ("memory free ratio %f", mem_ratio);
+ 
+   if (mem_ratio < 0.2)
+-- 
+GitLab
+
+
+From 7e7c452d4aa60a59fa7779e9aa8d5aa8c9d6be26 Mon Sep 17 00:00:00 2001
+From: Kate Hsuan <hpa@redhat.com>
+Date: Wed, 23 Jul 2025 19:22:25 +0800
+Subject: [PATCH 2/2] gio: gmemorymonitorpsi: Fix test error since memory free
+ ratio test can be skipped when performing the test
+
+The memory free ratio test can be skipped when we run the test. If
+proc_override is TRUE and proc path is overridden, the memory free
+ratio test can be skipped.
+---
+ gio/gmemorymonitorpsi.c | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/gio/gmemorymonitorpsi.c b/gio/gmemorymonitorpsi.c
+index b21f504eac..3bddbe21f5 100644
+--- a/gio/gmemorymonitorpsi.c
++++ b/gio/gmemorymonitorpsi.c
+@@ -178,11 +178,15 @@ g_memory_monitor_low_trigger_cb (GMemoryMonitorPsi            *monitor,
+ 
+   mem_ratio = g_memory_monitor_base_query_mem_ratio ();
+ 
+-  /* if mem free ratio > 0.5, don't signal */
+-  if (mem_ratio < 0.0)
+-    return G_SOURCE_REMOVE;
+-  else if (mem_ratio > 0.5)
+-    return G_SOURCE_CONTINUE;
++  /* if the test is running, skip memory ratio test */
++  if (!monitor->proc_override)
++    {
++      /* if mem free ratio > 0.5, don't signal */
++      if (mem_ratio < 0.0)
++        return G_SOURCE_REMOVE;
++      if (mem_ratio > 0.5)
++        return G_SOURCE_CONTINUE;
++    }
+ 
+   g_memory_monitor_base_send_event_to_user (G_MEMORY_MONITOR_BASE (monitor), level_type);
+ 
+-- 
+GitLab
+

diff --git a/glib2.spec b/glib2.spec
index e9c33ae..6f03924 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -1,5 +1,5 @@
 Name:           glib2
-Version:        2.85.1
+Version:        2.85.2
 Release:        %autorelease
 Summary:        A library of handy utility functions
 
@@ -15,6 +15,9 @@ Patch:          gnutls-hmac.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=2192204
 Patch:          default-terminal.patch
 
+Patch:          4713.patch
+Patch:          4709.patch
+
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  gettext

diff --git a/sources b/sources
index 001e6b0..fe07654 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glib-2.85.1.tar.xz) = 6a9364ffef6ff972c6da5bf8bd8a313ef407f436cc515180fd04087764857b7552d58fd6232c05020f20bf1c72ab890a2faa8ecdc4564cd001530d69908788d6
+SHA512 (glib-2.85.2.tar.xz) = 4c89193566cf8ca563c9cb4e245b7425a39c1a375198c8e0953852d021b6909a1549b7eaa479b5be1294b8792eeade699194863530ec5f0ca3cdb3e2dca47322