diff --git a/RHEL-114855.patch b/RHEL-114857.patch similarity index 93% rename from RHEL-114855.patch rename to RHEL-114857.patch index a74423c..9997fdf 100644 --- a/RHEL-114855.patch +++ b/RHEL-114857.patch @@ -1,4 +1,4 @@ -From 2ab35fea012dfd55858aaf7663698be069a202c5 Mon Sep 17 00:00:00 2001 +From b94b44407a088e6e8278d9db8b59fb377e84bda4 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Mon, 3 Feb 2025 18:27:21 +0000 Subject: [PATCH] gdbusconnection: Prevent sending a serial of zero on overflow @@ -37,10 +37,10 @@ Fixes: #3592 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c -index 4c1d2e2..75f9b3b 100644 +index 1f6ca5745e..75371dca07 100644 --- a/gio/gdbusconnection.c +++ b/gio/gdbusconnection.c -@@ -1762,9 +1762,22 @@ g_dbus_connection_send_message_unlocked (GDBusConnection *connection, +@@ -1763,9 +1763,22 @@ g_dbus_connection_send_message_unlocked (GDBusConnection *connection, return FALSE; if (flags & G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL) @@ -66,5 +66,5 @@ index 4c1d2e2..75f9b3b 100644 switch (blob[0]) { -- -2.47.3 +GitLab diff --git a/glib2.spec b/glib2.spec index 8d9f936..6128df8 100644 --- a/glib2.spec +++ b/glib2.spec @@ -2,7 +2,7 @@ ## (rpmautospec version 0.6.5) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 7; + release_number = 10; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -10,7 +10,7 @@ Name: glib2 Version: 2.80.4 -Release: 4%{?dist}.%{autorelease -n} +Release: %autorelease Summary: A library of handy utility functions License: LGPL-2.1-or-later @@ -37,7 +37,9 @@ Patch: CVE-2024-52533.patch # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4588 # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4592 Patch: CVE-2025-4373.patch -Patch: RHEL-114855.patch + +# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4470 +Patch: RHEL-114857.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -48,6 +50,7 @@ BuildRequires: libattr-devel BuildRequires: libselinux-devel BuildRequires: meson BuildRequires: systemtap-sdt-devel +BuildRequires: systemtap-sdt-dtrace BuildRequires: pkgconfig(gi-docgen) BuildRequires: pkgconfig(libelf) BuildRequires: pkgconfig(libffi) @@ -301,12 +304,21 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %changelog ## START: Generated by rpmautospec -* Mon Sep 29 2025 RHEL Packaging Agent - 2.80.4-7 -- gdbusconnection: Prevent sending a serial of zero on overflow +* Tue Sep 16 2025 RHEL Packaging Agent - 2.80.4-10 +- Backport patch to prevent sending a serial of zero on overflow -* Thu Jul 10 2025 Michael Catanzaro - 2.80.4-6 +* Tue Sep 16 2025 Tomas Pelka - 2.80.4-9 +- Sync the content of main.fmf from rhel9 to rhel10 + +* Thu Jul 10 2025 Michael Catanzaro - 2.80.4-8 - Add patches for CVE-2024-52533 and CVE-2025-4373 +* Mon Mar 24 2025 Lumir Balhar - 2.80.4-7 +- Add new systemtap-sdt-dtrace to build deps + +* Fri Mar 21 2025 Michael Catanzaro - 2.80.4-6 +- Add patch to fix test failure with newer tzdata + * Wed Oct 30 2024 Tomas Pelka - 2.80.4-5 - metadata preparation for RHIVOS RHELMISC-7537