From edf087f38d0d7a00e532a81e9b5f88f30777d21b Mon Sep 17 00:00:00 2001 From: litenglong Date: Thu, 24 Oct 2024 16:50:54 +0800 Subject: [PATCH] fix filesystem type ext err --- gio-fix-filesystem-type-ext-err.patch | 25 +++++++++++++++++++++++++ glib2.spec | 6 +++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gio-fix-filesystem-type-ext-err.patch diff --git a/gio-fix-filesystem-type-ext-err.patch b/gio-fix-filesystem-type-ext-err.patch new file mode 100644 index 0000000..df232a8 --- /dev/null +++ b/gio-fix-filesystem-type-ext-err.patch @@ -0,0 +1,25 @@ +From 901711c799f67a62739edf07312aa12aecd6e334 Mon Sep 17 00:00:00 2001 +From: litenglong +Date: Wed, 23 Oct 2024 15:44:27 +0800 +Subject: [PATCH] gio fix filesystem type ext err + +--- + gio/glocalfile.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gio/glocalfile.c b/gio/glocalfile.c +index dbb5690..9e01547 100644 +--- a/gio/glocalfile.c ++++ b/gio/glocalfile.c +@@ -637,7 +637,7 @@ get_fs_type (long f_type) + case 0xEF51: + return "ext2"; + case 0xEF53: +- return "ext3/ext4"; ++ return "ext2/ext3/ext4"; + case 0xF2F52010: + return "f2fs"; + case 0x65735546: +-- +2.25.1 + diff --git a/glib2.spec b/glib2.spec index e2160d7..a6385b6 100644 --- a/glib2.spec +++ b/glib2.spec @@ -1,6 +1,6 @@ Name: glib2 Version: 2.78.3 -Release: 2 +Release: 3 Summary: The core library that forms the basis for projects such as GTK+ and GNOME License: LGPLv2+ URL: https://www.gtk.org @@ -9,6 +9,7 @@ Source0: https://download.gnome.org/sources/glib/2.78/glib-%{version}.tar Patch1: gspawn-eperm.patch Patch2: backport-gmessages-fix-dropping-irrelevant-log-domains.patch Patch3: backport-gutils-Fix-an-unlikely-minor-leak-in-g_build_user_data_dir.patch +Patch4: gio-fix-filesystem-type-ext-err.patch Patch6001: backport-CVE-2024-34397.patch @@ -197,6 +198,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %endif %changelog +* Thr Oct 24 2024 litenglong - 2.78.3-3 +- fix filesystem type ext err + * Tue Jun 18 2024 hanhuihui - 2.78.3-2 - fix CVE-2024-34397 -- Gitee