From 16b92635f45a5eaf934075d5d78601bcd2bc88c4 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 29 2020 07:11:30 +0000 Subject: import gvfs-1.36.2-4.el7 --- diff --git a/SOURCES/udisks2-Fix-crashes-caused-by-missing-source-tag.patch b/SOURCES/udisks2-Fix-crashes-caused-by-missing-source-tag.patch new file mode 100644 index 0000000..07c0c97 --- /dev/null +++ b/SOURCES/udisks2-Fix-crashes-caused-by-missing-source-tag.patch @@ -0,0 +1,29 @@ +From 38831e4ea149a0b4731d123c63d8b493d30ad0be Mon Sep 17 00:00:00 2001 +From: Ondrej Holy +Date: Sat, 26 May 2018 08:16:02 +0200 +Subject: [PATCH] udisks2: Fix crashes caused by missing source tag + +GAsyncReadyCallback is never called from g_drive_stop, because +source_tag is not set, but checked. This obviously causes issues +for client applications. Add missing source_tag. + +Closes: https://gitlab.gnome.org/GNOME/gvfs/issues/1 +--- + monitor/udisks2/gvfsudisks2drive.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/monitor/udisks2/gvfsudisks2drive.c b/monitor/udisks2/gvfsudisks2drive.c +index 52e9b75e..87656688 100644 +--- a/monitor/udisks2/gvfsudisks2drive.c ++++ b/monitor/udisks2/gvfsudisks2drive.c +@@ -915,6 +915,7 @@ gvfs_udisks2_drive_stop (GDrive *_drive, + GTask *task; + + task = g_task_new (drive, cancellable, callback, user_data); ++ g_task_set_source_tag (task, gvfs_udisks2_drive_stop); + + /* This information is needed in GVfsDdisks2Volume when apps have + * open files on the device ... we need to know if the button should +-- +2.23.0 + diff --git a/SPECS/gvfs.spec b/SPECS/gvfs.spec index e525e88..bedc867 100644 --- a/SPECS/gvfs.spec +++ b/SPECS/gvfs.spec @@ -24,7 +24,7 @@ Name: gvfs Version: 1.36.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Backends for the gio framework in GLib License: GPLv3 and LGPLv2+ and BSD and MPLv2.0 @@ -43,6 +43,9 @@ Patch2: admin-Prevent-access-if-any-authentication-agent-isn.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1619719 Patch3: smbbrowse-Force-NT1-protocol-version-for-workgroup-s.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1758237 +Patch4: udisks2-Fix-crashes-caused-by-missing-source-tag.patch + BuildRequires: pkgconfig BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} BuildRequires: pkgconfig(dbus-glib-1) @@ -229,6 +232,7 @@ the functionality of the installed gvfs package. %patch1 -p1 -b .daemon-Prevent-spawning-new-daemons-if-outgoing-oper %patch2 -p1 -b .admin-Prevent-access-if-any-authentication-agent-isn %patch3 -p1 -b .smbbrowse-Force-NT1-protocol-version-for-workgroup-s +%patch4 -p1 -b .udisks2-Fix-crashes-caused-by-missing-source-tag # Needed for gvfs-0.2.1-archive-integration.patch autoreconf -fi @@ -445,6 +449,9 @@ killall -USR1 gvfsd >&/dev/null || : %{_datadir}/installed-tests %changelog +* Wed Apr 22 2020 Ondrej Holy - 1.36.2-4 +- Fix udisks2 volume monitor crashes when stopping drive (rhbz#1758237) + * Fri Feb 15 2019 Ondrej Holy - 1.36.2-3 - Force NT1 protocol version for workgroup support (#1619719)