diff --git a/backport-correctly-use-3-parameters-for-clise-range.patch b/backport-correctly-use-3-parameters-for-clise-range.patch deleted file mode 100644 index d9f366c275465eb8e341b3762e83b04cd1b856b6..0000000000000000000000000000000000000000 --- a/backport-correctly-use-3-parameters-for-clise-range.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b71117d89434db83d34bc1b981ca03d4be299576 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 8 Jul 2021 17:26:43 -0700 -Subject: [PATCH] correctly use 3 parameters for close_range - -libc implementation has 3 parameter e.g. -https://www.freebsd.org/cgi/man.cgi?query=close_range&sektion=2&format=html - -Signed-off-by: Khem Raj ---- - glib/gspawn.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glib/gspawn.c b/glib/gspawn.c -index 899647c2f..3073a10a4 100644 ---- a/glib/gspawn.c -+++ b/glib/gspawn.c -@@ -1520,7 +1520,7 @@ safe_closefrom (int lowfd) - * - * Handle ENOSYS in case it’s supported in libc but not the kernel; if so, - * fall back to safe_fdwalk(). */ -- if (close_range (lowfd, G_MAXUINT) != 0 && errno == ENOSYS) -+ if (close_range (lowfd, G_MAXUINT, 0) != 0 && errno == ENOSYS) - #endif /* HAVE_CLOSE_RANGE */ - (void) safe_fdwalk (close_func, GINT_TO_POINTER (lowfd)); - #endif --- -GitLab diff --git a/backport-fix-a-memory-leak.patch b/backport-fix-a-memory-leak.patch deleted file mode 100644 index e303568f5c2b06d0bf5c0a448d459305c2ca15d1..0000000000000000000000000000000000000000 --- a/backport-fix-a-memory-leak.patch +++ /dev/null @@ -1,27 +0,0 @@ -From df500c68a4d0741d1d6cf8ec3f8039a0d1f4b174 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= -Date: Tue, 1 Jun 2021 17:43:45 +0200 -Subject: [PATCH] inotify: Fix a memory leak - -Fixes: #2311 -Conflict:NA -Reference:https://github.com/GNOME/glib/commit/df500c68a4d0741d1d6cf8ec3f8039a0d1f4b174 ---- - gio/inotify/inotify-path.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gio/inotify/inotify-path.c b/gio/inotify/inotify-path.c -index f0528f4..e1129cd 100644 ---- a/gio/inotify/inotify-path.c -+++ b/gio/inotify/inotify-path.c -@@ -208,6 +208,7 @@ ip_watched_file_free (ip_watched_file_t *file) - g_assert (file->subs == NULL); - g_free (file->filename); - g_free (file->path); -+ g_free (file); - } - - static void --- -2.27.0 - diff --git a/backport-gdbusauth-fix-error-leak.patch b/backport-gdbusauth-fix-error-leak.patch deleted file mode 100644 index 709b71e1bc3783f365bc016a8b015d56f11c35b2..0000000000000000000000000000000000000000 --- a/backport-gdbusauth-fix-error-leak.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2b29495bcb59ba00bec808c509112dae6e019fd7 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Wed, 31 Mar 2021 14:12:39 -0500 -Subject: [PATCH] gdbusauth: fix error leak - -local_error is leaked in the G_IO_ERROR_NOT_SUPPORTED case. Found by -Coverity. - -Conflict:NA -Reference:https://github.com/GNOME/glib/commit/2b29495bcb59ba00bec808c509112dae6e019fd7 - ---- - gio/gdbusauth.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c -index c430f0cf03..534dca2d19 100644 ---- a/gio/gdbusauth.c -+++ b/gio/gdbusauth.c -@@ -1007,6 +1007,7 @@ _g_dbus_auth_run_server (GDBusAuth *auth, - g_propagate_error (error, local_error); - goto out; - } -+ g_clear_error (&local_error); - } - else - { diff --git a/backport-gdbusobjectmanagerservice-fix-leak-in-error-path.patch b/backport-gdbusobjectmanagerservice-fix-leak-in-error-path.patch deleted file mode 100644 index 79cf015c01479a7944d18693ff34ac82d2689ea0..0000000000000000000000000000000000000000 --- a/backport-gdbusobjectmanagerservice-fix-leak-in-error-path.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 719484a5754cca036d123ae4c2ae3d150bacef32 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Wed, 31 Mar 2021 14:23:13 -0500 -Subject: [PATCH] gdbusobjectmanagerservice: fix leak in error path - -If the third g_return_val_if_fail() is hit, then we leak -orig_object_path. There is no reason we need to strdup it here. - -Found by Coverity. - -Conflict:NA -Reference:https://github.com/GNOME/glib/commit/719484a5754cca036d123ae4c2ae3d150bacef32 ---- - gio/gdbusobjectmanagerserver.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/gio/gdbusobjectmanagerserver.c b/gio/gdbusobjectmanagerserver.c -index 39f4ed5006..0a0cea84ab 100644 ---- a/gio/gdbusobjectmanagerserver.c -+++ b/gio/gdbusobjectmanagerserver.c -@@ -565,12 +565,12 @@ void - g_dbus_object_manager_server_export_uniquely (GDBusObjectManagerServer *manager, - GDBusObjectSkeleton *object) - { -- gchar *orig_object_path; -+ const gchar *orig_object_path; - gchar *object_path; - guint count; - gboolean modified; - -- orig_object_path = g_strdup (g_dbus_object_get_object_path (G_DBUS_OBJECT (object))); -+ orig_object_path = g_dbus_object_get_object_path (G_DBUS_OBJECT (object)); - - g_return_if_fail (G_IS_DBUS_OBJECT_MANAGER_SERVER (manager)); - g_return_if_fail (G_IS_DBUS_OBJECT (object)); -@@ -602,7 +602,6 @@ g_dbus_object_manager_server_export_uniquely (GDBusObjectManagerServer *manager, - g_dbus_object_skeleton_set_object_path (G_DBUS_OBJECT_SKELETON (object), object_path); - - g_free (object_path); -- g_free (orig_object_path); - - } - diff --git a/backport-gfileenumerator-fix-leak-in-error-path.patch b/backport-gfileenumerator-fix-leak-in-error-path.patch deleted file mode 100644 index ddfe7fcaf76bc7c794f4600c130a158d20a45a99..0000000000000000000000000000000000000000 --- a/backport-gfileenumerator-fix-leak-in-error-path.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8bfc2998135ee9c4460520febb3af720c61438a5 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Thu, 1 Apr 2021 14:13:19 -0500 -Subject: [PATCH] gfileenumerator: fix leak in error path - -Found by Coverity. - -Conflict:NA -Reference:https://github.com/GNOME/glib/commit/8bfc2998135ee9c4460520febb3af720c61438a5 ---- - gio/gfileenumerator.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/gio/gfileenumerator.c b/gio/gfileenumerator.c -index ac2e4eb980..1f9bc24ebe 100644 ---- a/gio/gfileenumerator.c -+++ b/gio/gfileenumerator.c -@@ -787,7 +787,10 @@ next_files_thread (GTask *task, - } - - if (error) -- g_task_return_error (task, error); -+ { -+ g_list_free_full (files, g_object_unref); -+ g_task_return_error (task, error); -+ } - else - g_task_return_pointer (task, files, (GDestroyNotify)next_async_op_free); - } diff --git a/glib-2.68.1.tar.xz b/glib-2.72.0.tar.xz similarity index 40% rename from glib-2.68.1.tar.xz rename to glib-2.72.0.tar.xz index d1389734f1a9acffe1d7275783f2535e24d869dc..d8980fe388f3efa0ea22c6125eaf2a637740dfa9 100644 Binary files a/glib-2.68.1.tar.xz and b/glib-2.72.0.tar.xz differ diff --git a/glib2.spec b/glib2.spec index b3f8c6214717c76418af8d697b695aa501e1541d..e6e7dea61aef362e57ae5a8cbc3a35eeac2d90fd 100644 --- a/glib2.spec +++ b/glib2.spec @@ -1,16 +1,10 @@ Name: glib2 -Version: 2.68.1 -Release: 11 +Version: 2.72.0 +Release: 1 Summary: The core library that forms the basis for projects such as GTK+ and GNOME License: LGPLv2+ URL: http://www.gtk.org -Source0: http://download.gnome.org/sources/glib/2.68/glib-%{version}.tar.xz - -Patch6000: backport-correctly-use-3-parameters-for-clise-range.patch -Patch6001: backport-fix-a-memory-leak.patch -Patch6002: backport-gfileenumerator-fix-leak-in-error-path.patch -Patch6003: backport-gdbusobjectmanagerservice-fix-leak-in-error-path.patch -Patch6004: backport-gdbusauth-fix-error-leak.patch +Source0: https://download.gnome.org/sources/glib/2.71/glib-%{version}.tar.xz BuildRequires: chrpath gcc gcc-c++ gettext perl-interpreter BUildRequires: glibc-devel libattr-devel libselinux-devel meson @@ -24,13 +18,23 @@ BuildRequires: pkgconfig(sysprof-capture-4) %endif %endif -Provides: %{name}-fam = %{version}-%{release} -Obsoletes: %{name}-fam < %{version}-%{release} +%if 0%{?__isa_bits} == 64 +Requires: libgnutls.so.30()(64bit) +%else +Requires: libgnutls.so.30 +%endif -Recommends: shared-mime-info +Provides: %{name}-fam = %{version}-%{release} +Obsoletes: %{name}-fam < %{version}-%{release} +Recommends: shared-mime-info Conflicts: gcr < 3.28.1 +Provides: bundled(gnulib) +Provides: bundled(gvdb) +Provides: bundled(libcharset) +Provides: bundled(xdgmime) + %description GLib is a bundle of three (formerly five) low-level system libraries written in C and developed mainly by GNOME. GLib's code was separated @@ -65,7 +69,8 @@ help document for the glib2 package. %autosetup -n glib-%{version} -p1 %build -rm glib/pcre/*.[ch] +rm -rf glib/pcre/*.[ch] + %meson --default-library=both -Ddtrace=true \ %ifnarch i686 %if %{?openEuler:1}0 @@ -76,10 +81,10 @@ rm glib/pcre/*.[ch] -Dsysprof=disabled -Dman=false -Dgtk_doc=false \ %endif -Dsystemtap=true -Dinstalled_tests=true \ + -Dgnutls=true \ -Dglib_debug=disabled %meson_build - find . -name *.dtrace-temp.c -exec rm -f {} \; %check @@ -87,14 +92,16 @@ find . -name *.dtrace-temp.c -exec rm -f {} \; %install %meson_install +%global py_reproducible_pyc_path %{buildroot}%{_datadir} touch -r gio/gdbus-2.0/codegen/config.py.in %{buildroot}%{_datadir}/glib-2.0/codegen/*.py chrpath --delete %{buildroot}%{_libdir}/*.so export PYTHONHASHSEED=0 %py_byte_compile %{__python3} %{buildroot}%{_datadir} -mv %{buildroot}%{_bindir}/gio-querymodules %{buildroot}%{_bindir}/gio-querymodules-%{__isa_bits} -mkdir -p %{buildroot}%{_libdir}/gio/modules/ +mv %{buildroot}%{_bindir}/gio-querymodules %{buildroot}%{_bindir}/gio-querymodules-%{__isa_bits} +sed -i -e "/^gio_querymodules=/s/gio-querymodules/gio-querymodules-%{__isa_bits}/" %{buildroot}%{_libdir}/pkgconfig/gio-2.0.pc +mkdir -p %{buildroot}%{_libdir}/gio/modules touch %{buildroot}%{_libdir}/gio/modules/giomodule.cache # remove pycache @@ -178,6 +185,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %endif %changelog +* Mon Apr 11 2022 lin zhang - 2.72.0-1 +- Update to 2.72.0 + * Wed Apr 6 2022 hanhui - 2.68.1-11 - DESC:fix gfileenumerator/gdbusobjectmanagerservice/gdbusauth of memory leak