From b0abe829ef481cdae1a3f23c01793e0c1698ec70 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Wed, 11 Mar 2009 13:21:26 +0000 Subject: [PATCH] Push patches (damn, make local/prep should check if all referenced patches are in cvs) --- gvfs-1.1.8-monitor-leaks.patch | 14 ++++++++++++++ gvfs-1.1.8-sftp-cpu-eating.patch | 20 ++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 gvfs-1.1.8-monitor-leaks.patch create mode 100644 gvfs-1.1.8-sftp-cpu-eating.patch diff --git a/gvfs-1.1.8-monitor-leaks.patch b/gvfs-1.1.8-monitor-leaks.patch new file mode 100644 index 0000000..100a13c --- /dev/null +++ b/gvfs-1.1.8-monitor-leaks.patch @@ -0,0 +1,14 @@ +Index: client/gdaemonfilemonitor.c +=================================================================== +--- client/gdaemonfilemonitor.c (revision 2316) ++++ client/gdaemonfilemonitor.c (revision 2317) +@@ -202,6 +202,9 @@ + G_VFS_DBUS_MONITOR_INTERFACE, + G_VFS_DBUS_MONITOR_OP_UNSUBSCRIBE); + ++ _g_dbus_message_append_args (message, DBUS_TYPE_OBJECT_PATH, ++ &daemon_monitor->object_path, 0); ++ + _g_vfs_daemon_call_async (message, + NULL, NULL, + NULL); diff --git a/gvfs-1.1.8-sftp-cpu-eating.patch b/gvfs-1.1.8-sftp-cpu-eating.patch new file mode 100644 index 0000000..e65b64f --- /dev/null +++ b/gvfs-1.1.8-sftp-cpu-eating.patch @@ -0,0 +1,20 @@ +Index: daemon/gvfsbackendsftp.c +=================================================================== +--- daemon/gvfsbackendsftp.c (revision 2315) ++++ daemon/gvfsbackendsftp.c (revision 2316) +@@ -560,6 +560,15 @@ + &bytes_read, NULL, error)) + return NULL; + ++ /* Make sure we handle ssh exiting early, e.g. if no further ++ authentication methods */ ++ if (bytes_read == 0) ++ { ++ g_set_error_literal (error, ++ G_IO_ERROR, G_IO_ERROR_FAILED, ++ _("ssh program unexpectedly exited")); ++ return NULL; ++ } + + len = GUINT32_FROM_BE (len); +