This commit is contained in:
parent
70f48f0ce6
commit
41e542d2c8
35
gvfs-bgo531516-fuse-cleanup-when-killed.patch
Normal file
35
gvfs-bgo531516-fuse-cleanup-when-killed.patch
Normal file
@ -0,0 +1,35 @@
|
||||
Index: client/gvfsfusedaemon.c
|
||||
===================================================================
|
||||
--- client/gvfsfusedaemon.c (revision 1774)
|
||||
+++ client/gvfsfusedaemon.c (working copy)
|
||||
@@ -2049,6 +2049,18 @@ dbus_filter_func (DBusConnection *connec
|
||||
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
|
||||
}
|
||||
|
||||
+static gboolean
|
||||
+shutdown_on_idle (void)
|
||||
+{
|
||||
+ fuse_exit (fuse_get_context ()->fuse);
|
||||
+ return FALSE;
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+shutdown_signal (gint signum)
|
||||
+{
|
||||
+ g_idle_add ((GSourceFunc) shutdown_on_idle, NULL);
|
||||
+}
|
||||
|
||||
static gpointer
|
||||
vfs_init (struct fuse_conn_info *conn)
|
||||
@@ -2102,6 +2114,11 @@ vfs_init (struct fuse_conn_info *conn)
|
||||
volume_monitor = g_object_new (g_type_from_name ("GDaemonVolumeMonitor"), NULL);
|
||||
|
||||
subthread_main_loop = g_main_loop_new (NULL, FALSE);
|
||||
+
|
||||
+ signal (SIGHUP, shutdown_signal);
|
||||
+ signal (SIGTERM, shutdown_signal);
|
||||
+ signal (SIGINT, shutdown_signal);
|
||||
+
|
||||
subthread = g_thread_create ((GThreadFunc) subthread_main, NULL, FALSE, NULL);
|
||||
|
||||
return NULL;
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu May 22 00:05:26 CEST 2008 - hpj@suse.de
|
||||
|
||||
- Add gvfs-bgo531516-fuse-cleanup-when-killed.patch, which fixes
|
||||
the remaining issues covered by BNC #368628.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 13 07:38:54 CEST 2008 - hpj@suse.de
|
||||
|
||||
|
@ -25,7 +25,7 @@ BuildRequires: extra-rpm-macros
|
||||
%endif
|
||||
Summary: VFS functionality for GLib
|
||||
Version: 0.2.3
|
||||
Release: 19
|
||||
Release: 23
|
||||
License: LGPL v2.0 or later
|
||||
Group: Development/Libraries/C and C++
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
@ -35,6 +35,8 @@ Patch0: gvfs-no-shebang.patch
|
||||
Patch1: gvfs-bnc368628-fuse-robustness.patch
|
||||
# PATCH-FIX-UPSTREAM gvfs-bnc382172-home-trash-monitoring.patch hpj@novell.com
|
||||
Patch2: gvfs-bnc382172-home-trash-monitoring.patch
|
||||
# PATCH-FIX-UPSTREAM gvfs-bgo531516-fuse-cleanup-when-killed.patch bgo531516 bnc368628 hpj@novell.com
|
||||
Patch3: gvfs-bgo531516-fuse-cleanup-when-killed.patch
|
||||
Url: http://www.gnome.org
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
AutoReqProv: on
|
||||
@ -123,6 +125,7 @@ Authors:
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p0
|
||||
|
||||
%build
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
@ -177,6 +180,9 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/*
|
||||
%files lang -f %{name}.lang
|
||||
|
||||
%changelog
|
||||
* Thu May 22 2008 hpj@suse.de
|
||||
- Add gvfs-bgo531516-fuse-cleanup-when-killed.patch, which fixes
|
||||
the remaining issues covered by BNC #368628.
|
||||
* Tue May 13 2008 hpj@suse.de
|
||||
- Add gvfs-bnc382172-home-trash-monitoring.patch, which fixes
|
||||
BNC #382172.
|
||||
|
Loading…
Reference in New Issue
Block a user