diff --git a/1539540.patch b/1539540.patch new file mode 100644 index 0000000..ed9f9bf --- /dev/null +++ b/1539540.patch @@ -0,0 +1,29 @@ +From 6626765a79f125cf0ec9cdaefa51ceef718d41e7 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Tue, 20 Dec 2022 17:10:41 -0600 +Subject: [PATCH] gthread-posix: need to #include + +a79c6af23eff5ee978db62e048828c9a992a1261 uses errno without the required +header. + + +(cherry picked from commit 03cb4261e00cf505790f4fd4e69f97b2ef4fcccd) +--- + glib/gthreadprivate.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/glib/gthreadprivate.h b/glib/gthreadprivate.h +index 6eaf422753..f34368a7c2 100644 +--- a/glib/gthreadprivate.h ++++ b/glib/gthreadprivate.h +@@ -41,6 +41,7 @@ struct _GRealThread + /* system thread implementation (gthread-posix.c, gthread-win32.c) */ + + #if defined(HAVE_FUTEX) || defined(HAVE_FUTEX_TIME64) ++#include + #include + #include + #include +-- +GitLab + diff --git a/glib-2.74.3.tar.xz b/glib-2.74.3.tar.xz deleted file mode 100644 index 1916c5c..0000000 --- a/glib-2.74.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9bc41ecd9690d9bc6a970cc7380119b828e5b6a4b16c393c638b3dc2b87cbcb -size 5181732 diff --git a/glib-2.74.4.tar.xz b/glib-2.74.4.tar.xz new file mode 100644 index 0000000..4991e01 --- /dev/null +++ b/glib-2.74.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e82da5ea129b4444227c7e4a9e598f7288d1994bf63f129c44b90cfd2432172 +size 5208484 diff --git a/glib2.changes b/glib2.changes index 9114127..763c7eb 100644 --- a/glib2.changes +++ b/glib2.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Dec 22 13:01:42 UTC 2022 - Bjørn Lie + +- Update to version 2.74.4: + + Fix missing input validation in `GDBusMenuModel`. + + Various GVariant security fixes when handling untrusted data. + + Bugs fixed: glgo#GNOME/GLib#861, glgo#GNOME/GLib#2121, + glgo#GNOME/GLib#2540, glgo#GNOME/GLib#2794, + glgo#GNOME/GLib#2797, glgo#GNOME/GLib#2835, + glgo#GNOME/GLib#2839, glgo#GNOME/GLib#2840, + glgo#GNOME/GLib#2841, glgo#GNOME/GLib#2852, + glgo#GNOME/GLib!3114, glgo#GNOME/GLib!3126, + glgo#GNOME/GLib!3134, glgo#GNOME/GLib!3138, + glgo#GNOME/GLib!3153, glgo#GNOME/GLib!3161, + glgo#GNOME/GLib!3164. + + Updated translations. +- Add 1539540.patch: gthread-posix: need to #include . + ------------------------------------------------------------------- Fri Dec 2 21:18:15 UTC 2022 - Bjørn Lie diff --git a/glib2.spec b/glib2.spec index 26e32a3..d78b760 100644 --- a/glib2.spec +++ b/glib2.spec @@ -30,7 +30,7 @@ %define libgthread libgthread-%{libver} %bcond_without systemtap Name: glib2%{psuffix} -Version: 2.74.3 +Version: 2.74.4 Release: 0 Summary: General-Purpose Utility Library License: LGPL-2.1-or-later @@ -58,6 +58,8 @@ Patch2: glib2-suppress-schema-deprecated-path-warning.patch Patch3: glib2-dbus-socket-path.patch # PATCH-FIX-OPENSUSE glib2-gdbus-codegen-version.patch olaf@aepfle.de -- Remove version string from files generated by gdbus-codegen Patch4: glib2-gdbus-codegen-version.patch +# PATCH-FIX-UPSTREAM 1539540.patch -- gthread-posix: need to #include +Patch5: https://gitlab.gnome.org/GNOME/glib/-/commit/1539540.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -261,6 +263,7 @@ the functionality of the installed glib2 package. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 cp -a %{SOURCE1} %{SOURCE2} %{SOURCE5} . cp -a %{SOURCE4} gnome_defaults.conf # replace /usr/bin/env shebangs