[rpms/glib2] cve-2026-58016-f44: Update to 2.80.2

[Michael Catanzaro <mcatanzaro@redhat.com>]

A new commit has been pushed.

Repo   : rpms/glib2
Branch : cve-2026-58016-f44
Commit : a5e54ed3f875c177ec5cedf2f0d9e1c458d4cd00
Author : Michael Catanzaro <mcatanzaro@redhat.com>
Date   : 2024-05-08T20:55:18-05:00
Stats  : +2/-145 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/glib2/c/a5e54ed3f875c177ec5cedf2f0d9e1c458d4cd00?branch=cve-2026-58016-f44

Log:
Update to 2.80.2

---
diff --git a/gdbusconnection-signal-order-test.patch b/gdbusconnection-signal-order-test.patch
deleted file mode 100644
index c30549c..0000000
--- a/gdbusconnection-signal-order-test.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From bfda6e1b163667b9d314233e47119c0434a4c35f Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Tue, 7 May 2024 15:31:47 -0400
-Subject: [PATCH] gdbusconnection: Fix test signal subscription ordering
-
-The test case assumes signals will dispatched in a different order than
-they're subscribed. In fact, signals can be dispatched in any order,
-and are often dispatched in order.
-
-This commit reorders the subscriptions so they're in order, which is
-more logical, and also changes the code to only exit the event loops
-when there are no pending handlers ready to dispatch.
----
- gio/tests/gdbus-connection.c | 29 +++++++++++++++++------------
- 1 file changed, 17 insertions(+), 12 deletions(-)
-
-diff --git a/gio/tests/gdbus-connection.c b/gio/tests/gdbus-connection.c
-index 95d2b846b..fc8816716 100644
---- a/gio/tests/gdbus-connection.c
-+++ b/gio/tests/gdbus-connection.c
-@@ -536,7 +536,12 @@ test_connection_signal_handler (GDBusConnection  *connection,
-            interface_name,
-            signal_name);*/
- 
--  g_main_loop_quit (loop);
-+  /* We defer quitting to a G_PRIORITY_DEFAULT_IDLE function so other queued signal
-+   * callbacks have a chance to run first. They get dispatched with a higher priority
-+   * of G_PIORITY_DEFAULT, so as long as the queue is non-empty g_main_loop_quit won't
-+   * run
-+   */
-+  g_idle_add_once ((GSourceOnceFunc) g_main_loop_quit, loop);
- }
- 
- static void
-@@ -627,7 +632,7 @@ test_connection_signals (void)
-                                            "org.gtk.GDBus.ExampleInterface",  /* interface */
-                                            "FooArg0",  /* member */
-                                            "/org/gtk/GDBus/ExampleInterface",  /* path */
--                                           "some-arg0",
-+                                           NULL,
-                                            G_DBUS_SIGNAL_FLAGS_NONE,
-                                            test_connection_signal_handler,
-                                            &count_s4,
-@@ -637,7 +642,7 @@ test_connection_signals (void)
-                                            "org.gtk.GDBus.ExampleInterface",  /* interface */
-                                            "FooArg0",  /* member */
-                                            "/org/gtk/GDBus/ExampleInterface",  /* path */
--                                           NULL,
-+                                           "some-arg0",
-                                            G_DBUS_SIGNAL_FLAGS_NONE,
-                                            test_connection_signal_handler,
-                                            &count_s5,
-@@ -741,8 +746,8 @@ test_connection_signals (void)
-   g_assert_cmpint (count_s2, ==, 2);
- 
-   /* Emit another signal on c2 with and without arg0 set, to check matching on that.
--   * Matching should fail on s4 when the signal is not emitted with an arg0. It
--   * should succeed on s5 both times, as that doesn’t require an arg0 match. */
-+   * Matching should fail on s5 when the signal is not emitted with an arg0. It
-+   * should succeed on s4 both times, as that doesn’t require an arg0 match. */
-   ret = g_dbus_connection_emit_signal (c2,
-                                        NULL, /* destination bus name */
-                                        "/org/gtk/GDBus/ExampleInterface",
-@@ -753,9 +758,9 @@ test_connection_signals (void)
-   g_assert_no_error (error);
-   g_assert_true (ret);
- 
--  while (count_s5 < 1)
-+  while (count_s4 < 1)
-     g_main_loop_run (loop);
--  g_assert_cmpint (count_s5, ==, 1);
-+  g_assert_cmpint (count_s4, ==, 1);
- 
-   ret = g_dbus_connection_emit_signal (c2,
-                                        NULL, /* destination bus name */
-@@ -767,10 +772,10 @@ test_connection_signals (void)
-   g_assert_no_error (error);
-   g_assert_true (ret);
- 
--  while (count_s4 < 1)
-+  while (count_s5 < 1)
-     g_main_loop_run (loop);
--  g_assert_cmpint (count_s4, ==, 1);
--  g_assert_cmpint (count_s5, ==, 2);
-+  g_assert_cmpint (count_s4, ==, 2);
-+  g_assert_cmpint (count_s5, ==, 1);
- 
-   /*
-    * Also to check the total amount of NameOwnerChanged signals - use a 5 second ceiling
-@@ -784,8 +789,8 @@ test_connection_signals (void)
-   g_assert_cmpint (count_s1, ==, 1);
-   g_assert_cmpint (count_s2, ==, 2);
-   g_assert_cmpint (count_name_owner_changed, ==, 2);
--  g_assert_cmpint (count_s4, ==, 1);
--  g_assert_cmpint (count_s5, ==, 2);
-+  g_assert_cmpint (count_s4, ==, 2);
-+  g_assert_cmpint (count_s5, ==, 1);
- 
-   g_dbus_connection_signal_unsubscribe (c1, s1);
-   g_dbus_connection_signal_unsubscribe (c1, s2);
--- 
-2.44.0
-

diff --git a/glib2.spec b/glib2.spec
index a53b332..d00920f 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -1,5 +1,5 @@
 Name:           glib2
-Version:        2.80.1
+Version:        2.80.2
 Release:        %autorelease
 Summary:        A library of handy utility functions
 
@@ -15,12 +15,6 @@ Patch:          gnutls-hmac.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=2192204
 Patch:          default-terminal.patch
 
-# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4049
-Patch:          gvariant-spec-installation.patch
-
-# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4044
-Patch:          gdbusconnection-signal-order-test.patch
-
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  gettext

diff --git a/gvariant-spec-installation.patch b/gvariant-spec-installation.patch
deleted file mode 100644
index 96d4318..0000000
--- a/gvariant-spec-installation.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From cd45ba8638479d95dae43df018ec0ee81803ba63 Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@redhat.com>
-Date: Tue, 7 May 2024 14:19:54 -0500
-Subject: [PATCH] Correct installation directory of GVariant specification
-
-548ec9f186d373c4e55528a04d78450f6f2fceef accidentally moved the GVariant
-spec to the toplevel /usr/share/doc directory, which is surely not
-right. Let's move it back into the glib-2.0 subdirectory.
-
-It's debatable whether this is the best place to install the GVariant
-specification, since it's not part of the gi-docgen docs, but surely
-it's much better than not putting it in any subdirectory.
-
-Fixes #3351
----
- docs/reference/glib/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/docs/reference/glib/meson.build b/docs/reference/glib/meson.build
-index e5e6726e26..47c5ecf3a8 100644
---- a/docs/reference/glib/meson.build
-+++ b/docs/reference/glib/meson.build
-@@ -23,7 +23,7 @@ if get_option('documentation')
-   rst2html5 = find_program('rst2html5', 'rst2html5.py', required: false)
- 
-   if rst2html5.found()
--    spec_path = docs_dir
-+    spec_path = docs_dir / 'glib-2.0'
- 
-     figures = files(
-       'gvariant-byte-boundaries.svg',
--- 
-GitLab
-

diff --git a/sources b/sources
index 89fba75..2395cac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glib-2.80.1.tar.xz) = 1bdb8ab4002ad77c37cc9f86dbd0e80eba1d8c43830cd69ec289dae6b85b8b7d8bd783cbfdfe129334f75f28f6ffadbf9564234746b53db6c881f2a8684de9c2
+SHA512 (glib-2.80.2.tar.xz) = 9b00d6741523ba5bc60c83da9fbbc1a13bd61307612471acd7faaf57cbcb480941fd61dfff94b2712bd78094beff3af1ceffe4985db0ff97ffe948cc67b821aa