gvfs package update

Signed-off-by: guibuilder_pel7x64builder0 <guibuilder@powerel.org>

SOURCES/Add-missing-newline-characters-in-g_debug.patch

@@ -0,0 +1,30 @@
+From acb3269dd89c87d13c8e238ebb0c136e3824ac86 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Thu, 15 Dec 2016 15:12:05 +0100
+Subject: [PATCH] Add missing newline characters in g_debug
+
+Unfortunately, g_debug uses custom handler in GVfs which requires
+additional new line character. Commit a7b0a65 and commit 1d67090
+changed g_warning to g_debug, but forgot to add additional new line
+characters.
+---
+ daemon/gvfsbackendnetwork.c | 2 +-
+ daemon/mount.c              | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/daemon/gvfsbackendnetwork.c b/daemon/gvfsbackendnetwork.c
+index 95fee1d6..c6a103d1 100644
+--- a/daemon/gvfsbackendnetwork.c
++++ b/daemon/gvfsbackendnetwork.c
+@@ -358,7 +358,7 @@ recompute_files (GVfsBackendNetwork *backend)
+           else
+             {
+ 	      char *uri = g_file_get_uri (server_file);
+-              g_debug ("Couldn't create directory monitor on %s. Error: %s",
++              g_debug ("Couldn't create directory monitor on %s. Error: %s\n",
+ 	     		 uri, error->message);
+ 	      g_free (uri);
+               g_clear_error (&error);
+-- 
+2.15.0
+

SOURCES/client-Propagate-error-from-create_mount_tracker_pro.patch

@@ -0,0 +1,84 @@
+From 6a62f4a28cc1457f489329ec115828d48db6c511 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Wed, 25 Jan 2017 15:14:52 +0100
+Subject: [PATCH 2/2] client: Propagate error from create_mount_tracker_proxy
+
+Prevent GDaemonFile methods failures without error being set.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=777737
+---
+ client/gdaemonvfs.c | 19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/client/gdaemonvfs.c b/client/gdaemonvfs.c
+index 0cf11e6d..632538a1 100644
+--- a/client/gdaemonvfs.c
++++ b/client/gdaemonvfs.c
+@@ -41,6 +41,7 @@
+ #include <glib/gstdio.h>
+ #include <gvfsdbus.h>
+ #include "gvfsutils.h"
++#include "gvfsdaemondbus.h"
+ 
+ typedef struct  {
+   char *type;
+@@ -562,23 +563,23 @@ find_string (GPtrArray *array, const char *find_me)
+ }
+ 
+ static GVfsDBusMountTracker *
+-create_mount_tracker_proxy ()
++create_mount_tracker_proxy (GError **error)
+ {
+   GVfsDBusMountTracker *proxy;
+-  GError *error;
++  GError *local_error;
+ 
+-  error = NULL;
++  local_error = NULL;
+   proxy = gvfs_dbus_mount_tracker_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+                                                           G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS | G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+                                                           G_VFS_DBUS_DAEMON_NAME,
+                                                           G_VFS_DBUS_MOUNTTRACKER_PATH,
+                                                           NULL,
+-                                                          &error);
++                                                          &local_error);
+   if (proxy == NULL)
+     {
+       g_warning ("Error creating proxy: %s (%s, %d)\n",
+-                  error->message, g_quark_to_string (error->domain), error->code);
+-      g_error_free (error);
++                  local_error->message, g_quark_to_string (local_error->domain), local_error->code);
++      _g_propagate_error_stripped (error, local_error);
+     }
+   
+   return proxy;
+@@ -599,7 +600,7 @@ fill_mountable_info (GDaemonVfs *vfs)
+   gint32 default_port;
+   gboolean host_is_inet;
+   
+-  proxy = create_mount_tracker_proxy ();
++  proxy = create_mount_tracker_proxy (NULL);
+   if (proxy == NULL)
+     return;
+ 
+@@ -948,7 +949,7 @@ _g_daemon_vfs_get_mount_info_sync (GMountSpec *spec,
+   if (info != NULL)
+     return info;
+   
+-  proxy = create_mount_tracker_proxy ();
++  proxy = create_mount_tracker_proxy (error);
+   if (proxy == NULL)
+     return NULL;
+   
+@@ -980,7 +981,7 @@ _g_daemon_vfs_get_mount_info_by_fuse_sync (const char *fuse_path,
+   info = lookup_mount_info_by_fuse_path_in_cache (fuse_path);
+   if (!info)
+     {
+-      proxy = create_mount_tracker_proxy ();
++      proxy = create_mount_tracker_proxy (NULL);
+       if (proxy == NULL)
+         return NULL;
+ 
+-- 
+2.15.0
+

SOURCES/gvfs-archive-integration.patch

@@ -0,0 +1,50 @@
+diff -up gvfs-1.29.90/Makefile.am.archive-integration gvfs-1.29.90/Makefile.am
+--- gvfs-1.29.90/Makefile.am.archive-integration	2016-08-11 14:01:26.000000000 +0200
++++ gvfs-1.29.90/Makefile.am	2016-08-13 12:19:21.313402711 +0200
+@@ -1,5 +1,20 @@
+ NULL =
+ 
++desktop_in_files = mount-archive.desktop.in
++
++mount-archive.desktop.in: mount-archive.desktop.in.in
++	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
++
++desktopdir       = $(datadir)/applications
++if HAVE_ARCHIVE
++desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
++
++$(desktop_DATA): %.desktop: %.desktop.in
++	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
++else
++desktop_DATA     =
++endif
++
+ SUBDIRS = \
+ 	common \
+ 	metadata \
+@@ -24,6 +39,8 @@ EXTRA_DIST = \
+ 	gvfs.doap		\
+ 	README.commits		\
+ 	MAINTAINERS		\
++	mount-archive.desktop.in.in	\
++	$(desktop_in_files)	\
+ 	m4			\
+ 	gettext/its/polkit.loc	\
+ 	gettext/its/polkit.its	\
+diff -up gvfs-1.29.90/mount-archive.desktop.in.in.archive-integration gvfs-1.29.90/mount-archive.desktop.in.in
+--- gvfs-1.29.90/mount-archive.desktop.in.in.archive-integration	2016-08-13 12:19:21.313402711 +0200
++++ gvfs-1.29.90/mount-archive.desktop.in.in	2016-08-13 12:19:21.313402711 +0200
+@@ -0,0 +1,13 @@
++[Desktop Entry]
++Name=Archive Mounter
++Exec=@libexecdir@/gvfsd-archive file=%u
++X-Gnome-Vfs-System=gio
++MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/x-zip;application/zip;application/x-lzma-compressed-tar;application/x-xz-compressed-tar;
++Terminal=false
++StartupNotify=false
++Type=Application
++NoDisplay=true
++X-GNOME-Bugzilla-Bugzilla=GNOME
++X-GNOME-Bugzilla-Product=gvfs
++X-GNOME-Bugzilla-Component=archive-backend
++X-GNOME-Bugzilla-Version=@VERSION@

SOURCES/handle-securid-password-prompt.patch

@@ -0,0 +1,32 @@
+From b64149c3fc292c1763c3f0056d6a8081e2ce0810 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Mon, 10 Apr 2017 11:17:51 +0200
+Subject: [PATCH] sftp: Handle SecurID password prompt
+
+SFTP backend parses output from SSH client and expects several predefined
+password prompts. Unfortunately, SecurID (pam_securid.so) is not handled
+yet and the mount operation timeouts with the following error: "Timed out
+when logging in". Let's handle also SecurID prompt (i.e. "Enter PASSCODE").
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1440256
+---
+ daemon/gvfsbackendsftp.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c
+index 353f092e..22ad4db7 100644
+--- a/daemon/gvfsbackendsftp.c
++++ b/daemon/gvfsbackendsftp.c
+@@ -1100,7 +1100,8 @@ handle_login (GVfsBackend *backend,
+           g_str_has_suffix (buffer, "Password:")  ||
+           g_str_has_prefix (buffer, "Password for ") ||
+           g_str_has_prefix (buffer, "Enter Kerberos password") ||
+-          g_str_has_prefix (buffer, "Enter passphrase for key"))
++          g_str_has_prefix (buffer, "Enter passphrase for key") ||
++          g_str_has_prefix (buffer, "Enter PASSCODE"))
+         {
+           gboolean aborted = FALSE;
+           gsize bytes_written;
+-- 
+2.12.2
+

SOURCES/network-Check-variable-before-dereferencing.patch

@@ -0,0 +1,31 @@
+From d659151a1f8b74fc9fc82689d6710f876a6ba5db Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Wed, 25 Jan 2017 13:28:25 +0100
+Subject: [PATCH 1/2] network: Check variable before dereferencing
+
+It seems that the error variable may be NULL at this point in
+some cases as per the bug reports, but I don't really have any
+idea why. Let's check the error variable before dereferencing
+and see if it helps to reduce the number of bug reports...
+
+https://bugzilla.gnome.org/show_bug.cgi?id=777737
+---
+ daemon/gvfsbackendnetwork.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/daemon/gvfsbackendnetwork.c b/daemon/gvfsbackendnetwork.c
+index c6a103d1..ad9d68e8 100644
+--- a/daemon/gvfsbackendnetwork.c
++++ b/daemon/gvfsbackendnetwork.c
+@@ -359,7 +359,7 @@ recompute_files (GVfsBackendNetwork *backend)
+             {
+ 	      char *uri = g_file_get_uri (server_file);
+               g_debug ("Couldn't create directory monitor on %s. Error: %s\n",
+-	     		 uri, error->message);
++                       uri, error ? error->message : "");
+ 	      g_free (uri);
+               g_clear_error (&error);
+             }
+-- 
+2.15.0
+

SOURCES/network-Do-not-spam-journal-by-useless-warnings.patch

@@ -0,0 +1,40 @@
+From a7b0a65898ed10d109eaa10b34a9516c0c05f774 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Thu, 15 Dec 2016 11:18:00 +0100
+Subject: [PATCH] network: Do not spam journal by useless warnings
+
+The following warning is always printed from network backend
+if smb backend is installed and network backend is mounted:
+Couldn't create directory monitor on smb://[WORKGROUP]/.
+
+You can see it with two different error messages. The first is
+printed if we are not in samba environment, or the workgroup is
+misconfigured:
+Error: The specified location is not mounted
+
+The second is printed in other cases, because monitoring is not
+supported by smb backend:
+Error: Operation not supported by backend
+
+This isn't really useful and just spams the journal, let's use
+g_debug instead of g_warning.
+---
+ daemon/gvfsbackendnetwork.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/daemon/gvfsbackendnetwork.c b/daemon/gvfsbackendnetwork.c
+index fc6cca47..95fee1d6 100644
+--- a/daemon/gvfsbackendnetwork.c
++++ b/daemon/gvfsbackendnetwork.c
+@@ -358,7 +358,7 @@ recompute_files (GVfsBackendNetwork *backend)
+           else
+             {
+ 	      char *uri = g_file_get_uri (server_file);
+-              g_warning ("Couldn't create directory monitor on %s. Error: %s", 
++              g_debug ("Couldn't create directory monitor on %s. Error: %s",
+ 	     		 uri, error->message);
+ 	      g_free (uri);
+               g_clear_error (&error);
+-- 
+2.15.0
+