diff --git a/.gitignore b/.gitignore
index 1668489..7d60f6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/gvfs-1.30.4.tar.xz
+SOURCES/gvfs-1.36.2.tar.xz
diff --git a/.gvfs.metadata b/.gvfs.metadata
index 357a81f..1ed6813 100644
--- a/.gvfs.metadata
+++ b/.gvfs.metadata
@@ -1 +1 @@
-77a6f86b9fb83bcee308592e90af4f13983e794b SOURCES/gvfs-1.30.4.tar.xz
+fb5fe05f0661da8c88f5fa41014bcd526ad39993 SOURCES/gvfs-1.36.2.tar.xz
diff --git a/SOURCES/Add-missing-newline-characters-in-g_debug.patch b/SOURCES/Add-missing-newline-characters-in-g_debug.patch
deleted file mode 100644
index bacb3b8..0000000
--- a/SOURCES/Add-missing-newline-characters-in-g_debug.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
-
diff --git a/SOURCES/client-Propagate-error-from-create_mount_tracker_pro.patch b/SOURCES/client-Propagate-error-from-create_mount_tracker_pro.patch
deleted file mode 100644
index 7c8ef35..0000000
--- a/SOURCES/client-Propagate-error-from-create_mount_tracker_pro.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-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
-
diff --git a/SOURCES/handle-securid-password-prompt.patch b/SOURCES/handle-securid-password-prompt.patch
deleted file mode 100644
index 15f5cdf..0000000
--- a/SOURCES/handle-securid-password-prompt.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
-
diff --git a/SOURCES/network-Check-variable-before-dereferencing.patch b/SOURCES/network-Check-variable-before-dereferencing.patch
deleted file mode 100644
index c0c61b7..0000000
--- a/SOURCES/network-Check-variable-before-dereferencing.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
-
diff --git a/SOURCES/network-Do-not-spam-journal-by-useless-warnings.patch b/SOURCES/network-Do-not-spam-journal-by-useless-warnings.patch
deleted file mode 100644
index f7d398b..0000000
--- a/SOURCES/network-Do-not-spam-journal-by-useless-warnings.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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
-
diff --git a/SPECS/gvfs.spec b/SPECS/gvfs.spec
index 85fdfe1..dad76c9 100644
--- a/SPECS/gvfs.spec
+++ b/SPECS/gvfs.spec
@@ -1,50 +1,58 @@
%define with_nfs 0
-%global glib2_version 2.49.3
-%global libgdata_version 0.17.3
+%global avahi_version 0.6
+%global fuse_version 2.8.0
+%global gettext_version 0.19.4
+%global glib2_version 2.51.0
+%global goa_version 3.17.1
+%global gudev_version 147
+%global libarchive_version 3.0.22
+%global libcdio_paranoia_version 0.78.2
+%global libgcrypt_version 1.2.2
+%global libgdata_version 0.17.9
+%global libgphoto2_version 2.5.0
+%global libimobiledevice_version 1.2
+%global libmtp_version 1.1.12
+%global libnfs_version 1.9.8
+%global libplist_version 0.15
+%global libsmbclient_version 3.4.0
+%global libsoup_version 2.42.0
+%global libusb_version 1.0.21
+%global systemd_version 206
+%global talloc_version 1.3.0
+%global udisks2_version 1.97
Name: gvfs
-Version: 1.30.4
-Release: 5%{?dist}
+Version: 1.36.2
+Release: 1%{?dist}
Summary: Backends for the gio framework in GLib
License: GPLv3 and LGPLv2+ and BSD and MPLv2.0
URL: https://wiki.gnome.org/Projects/gvfs
-Source0: https://download.gnome.org/sources/gvfs/1.30/gvfs-%{version}.tar.xz
+Source0: https://download.gnome.org/sources/gvfs/1.36/gvfs-%{version}.tar.xz
# http://bugzilla.gnome.org/show_bug.cgi?id=567235
Patch0: gvfs-archive-integration.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1440256
-Patch1: handle-securid-password-prompt.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1465302
-Patch2: network-Do-not-spam-journal-by-useless-warnings.patch
-Patch3: Add-missing-newline-characters-in-g_debug.patch
-Patch4: network-Check-variable-before-dereferencing.patch
-Patch5: client-Propagate-error-from-create_mount_tracker_pro.patch
-
BuildRequires: pkgconfig
-BuildRequires: glib2-devel >= %{glib2_version}
-# for post-install update-gio-modules and overall functionality
-Requires: glib2%{?_isa} >= %{glib2_version}
-BuildRequires: dbus-glib-devel
-BuildRequires: gcr-devel
+BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
+BuildRequires: pkgconfig(dbus-glib-1)
+BuildRequires: pkgconfig(gcr-3)
BuildRequires: /usr/bin/ssh
-BuildRequires: libcdio-paranoia-devel
-BuildRequires: libgudev1-devel
-BuildRequires: libsoup-devel >= 2.34.0
-BuildRequires: pkgconfig(avahi-client) pkgconfig(avahi-glib)
-BuildRequires: libsecret-devel
-BuildRequires: gettext-devel
-BuildRequires: libudisks2-devel
-BuildRequires: libbluray-devel
-BuildRequires: systemd-devel >= 44
-BuildRequires: libxslt-devel
-BuildRequires: gtk3-devel
+BuildRequires: pkgconfig(libcdio_paranoia) >= %{libcdio_paranoia_version}
+BuildRequires: pkgconfig(gudev-1.0) >= %{gudev_version}
+BuildRequires: pkgconfig(libsoup-2.4) >= %{libsoup_version}
+BuildRequires: pkgconfig(avahi-client) >= %{avahi_version}
+BuildRequires: pkgconfig(avahi-glib) >= %{avahi_version}
+BuildRequires: pkgconfig(libsecret-1)
+BuildRequires: gettext-devel >= %{gettext_version}
+BuildRequires: pkgconfig(udisks2) >= %{udisks2_version}
+BuildRequires: pkgconfig(libbluray)
+BuildRequires: systemd-devel >= %{systemd_version}
+BuildRequires: pkgconfig(libxslt)
BuildRequires: docbook-style-xsl
-BuildRequires: polkit-devel
-BuildRequires: libcap-devel
+BuildRequires: pkgconfig(polkit-gobject-1)
+BuildRequires: pkgconfig(libcap)
# The patch touches Makefile.am files:
BuildRequires: automake autoconf
@@ -52,14 +60,14 @@ BuildRequires: libtool
Requires: %{name}-client%{?_isa} = %{version}-%{release}
Requires: glib2%{?_isa} >= %{glib2_version}
-Requires: udisks2
+Requires: udisks2 >= %{udisks2_version}
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
Obsoletes: gnome-mount <= 0.8
Obsoletes: gnome-mount-nautilus-properties <= 0.8
-Obsoletes: gvfs-obexftp < 1.16.3-3
+Obsoletes: gvfs-obexftp < 1.17.91-2
%description
The gvfs package provides backend implementations for the gio
@@ -88,8 +96,8 @@ required to develop applications using gvfs.
Summary: FUSE support for gvfs
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-client%{?_isa} = %{version}-%{release}
-BuildRequires: fuse-devel
-Requires: fuse
+BuildRequires: pkgconfig(fuse) >= %{fuse_version}
+Requires: fuse >= %{fuse_version}
%description fuse
This package provides support for applications not using gio
@@ -100,8 +108,8 @@ to access the gvfs filesystems.
Summary: Windows fileshare support for gvfs
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-client%{?_isa} = %{version}-%{release}
-BuildRequires: libsmbclient-devel >= 3.2.0-1.pre2.8
-BuildRequires: libtalloc-devel >= 1.3.0-0
+BuildRequires: libsmbclient-devel >= %{libsmbclient_version}
+BuildRequires: pkgconfig(talloc) >= %{talloc_version}
%description smb
This package provides support for reading and writing files on windows
@@ -112,7 +120,7 @@ shares (SMB) to applications using gvfs.
Summary: Archiving support for gvfs
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-client%{?_isa} = %{version}-%{release}
-BuildRequires: libarchive-devel >= 2.7.1-1
+BuildRequires: pkgconfig(libarchive) >= %{libarchive_version}
%description archive
This package provides support for accessing files inside Zip and Tar archives,
@@ -123,8 +131,8 @@ as well as ISO images, to applications using gvfs.
Summary: gphoto2 support for gvfs
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-client%{?_isa} = %{version}-%{release}
-BuildRequires: libgphoto2-devel
-BuildRequires: libusb-devel
+BuildRequires: pkgconfig(libgphoto2) >= %{libgphoto2_version}
+BuildRequires: libusb-devel >= %{libusb_version}
BuildRequires: libexif-devel
%description gphoto2
@@ -139,7 +147,8 @@ Summary: AFC support for gvfs
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-client%{?_isa} = %{version}-%{release}
Requires: usbmuxd
-BuildRequires: libimobiledevice-devel >= 0.9.7
+BuildRequires: pkgconfig(libimobiledevice-1.0) >= %{libimobiledevice_version}
+BuildRequires: pkgconfig(libplist) >= %{libplist_version}
%description afc
This package provides support for reading files on mobile devices
@@ -151,7 +160,7 @@ including phones and music players to applications using gvfs.
Summary: AFP support for gvfs
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-client%{?_isa} = %{version}-%{release}
-BuildRequires: libgcrypt-devel >= 1.2.2
+BuildRequires: libgcrypt-devel >= %{libgcrypt_version}
# this should ensure having this new subpackage installed on upgrade from older versions
Obsoletes: %{name} < 1.9.4-1
@@ -165,30 +174,32 @@ to applications using gvfs.
Summary: MTP support for gvfs
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-client%{?_isa} = %{version}-%{release}
-BuildRequires: libmtp-devel >= 1.1.0
+BuildRequires: pkgconfig(libmtp) >= %{libmtp_version}
%description mtp
This package provides support for reading and writing files on
MTP based devices (Media Transfer Protocol) to applications using gvfs.
+
%if 0%{?with_nfs}
%package nfs
Summary: NFS support for gvfs
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-client%{?_isa} = %{version}-%{release}
-BuildRequires: libnfs-devel >= 1.9.7
+BuildRequires: pkgconfig(libnfs) >= %{libnfs_version}
%description nfs
This package provides support for reading and writing files on
NFS network shares (Network File System) to applications using gvfs.
%endif
+
%package goa
Summary: GOA support for gvfs
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-client%{?_isa} = %{version}-%{release}
-BuildRequires: gnome-online-accounts-devel >= 3.7.1
-BuildRequires: libgdata-devel >= %{libgdata_version}
+BuildRequires: pkgconfig(goa-1.0) >= %{goa_version}
+BuildRequires: pkgconfig(libgdata) >= %{libgdata_version}
Requires: libgdata%{?_isa} >= %{libgdata_version}
%description goa
@@ -206,11 +217,6 @@ the functionality of the installed gvfs package.
%prep
%setup -q
%patch0 -p1 -b .archive-integration
-%patch1 -p1 -b .handle-securid-password-prompt
-%patch2 -p1 -b .network-Do-not-spam-journal-by-useless-warnings.patch
-%patch3 -p1 -b .Add-missing-newline-characters-in-g_debug
-%patch4 -p1 -b .network-check-variable-before-dereferencing
-%patch5 -p1 -b .client-Propagate-error-from-create_mount_tracker_pro
# Needed for gvfs-0.2.1-archive-integration.patch
autoreconf -fi
@@ -220,7 +226,6 @@ autoreconf -fi
%if ! 0%{?with_nfs}
--disable-nfs \
%endif
- --disable-hal \
--disable-gdu \
--enable-udisks2 \
--enable-keyring \
@@ -283,6 +288,9 @@ update-desktop-database >&/dev/null || :
killall -USR1 gvfsd >&/dev/null || :
%endif
+%post afp
+killall -USR1 gvfsd >&/dev/null || :
+
%files
%dir %{_datadir}/gvfs
@@ -338,9 +346,6 @@ killall -USR1 gvfsd >&/dev/null || :
%{!?_licensedir:%global license %%doc}
%license COPYING COPYING.GPL3
%doc AUTHORS NEWS README
-%dir %{_datadir}/bash-completion
-%dir %{_datadir}/bash-completion/completions
-%{_datadir}/bash-completion/completions/gvfs*
%dir %{_libdir}/gvfs
%{_libdir}/gvfs/libgvfscommon.so
%{_libdir}/gio/modules/libgioremote-volume-monitor.so
@@ -428,6 +433,10 @@ killall -USR1 gvfsd >&/dev/null || :
%{_datadir}/installed-tests
%changelog
+* Tue May 08 2018 Kalev Lember <klember@redhat.com> - 1.36.2-1
+- Update to 1.36.2
+- Resolves: #1569268
+
* Fri Nov 10 2017 Ondrej Holy <oholy@redhat.com> - 1.30.4-5
- Fix network backend crashes when creating proxy failed (#1465302)