diff --git a/gvfs-1.50.0.tar.xz b/gvfs-1.50.0.tar.xz deleted file mode 100644 index e303fcf..0000000 --- a/gvfs-1.50.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cbc2f564d2e9f00c760673f42d6803bce3e081ab7ffb4456deffffba9339b4dd -size 1213456 diff --git a/gvfs-1.50.1.tar.xz b/gvfs-1.50.1.tar.xz new file mode 100644 index 0000000..16af336 --- /dev/null +++ b/gvfs-1.50.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74f6f4114f64249384ae834abfab6392318b7422ce532155d6b49bae1fdc4056 +size 1214536 diff --git a/gvfs-smb-ignore-EINVAL-kerberos-ccache.patch b/gvfs-smb-ignore-EINVAL-kerberos-ccache.patch deleted file mode 100644 index 6a8fd79..0000000 --- a/gvfs-smb-ignore-EINVAL-kerberos-ccache.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 747c7f6ea6c8b6a7ccd008bb47996ba7eb169bcc Mon Sep 17 00:00:00 2001 -From: Ondrej Holy -Date: Mon, 11 Apr 2022 10:54:04 +0200 -Subject: [PATCH] smb: Ignore EINVAL for kerberos/ccache login - -With samba 4.16.0, mount operation fails with the "Invalid Argument" error -when kerberos/ccache is misconfigured. Ignore this error, so user get a chance -to login using the password... - -Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/611 ---- - daemon/gvfsbackendsmb.c | 8 +++++++- - daemon/gvfsbackendsmbbrowse.c | 10 ++++++++-- - 2 files changed, 15 insertions(+), 3 deletions(-) - -diff --git a/daemon/gvfsbackendsmb.c b/daemon/gvfsbackendsmb.c -index 33d1a209..776b67bc 100644 ---- a/daemon/gvfsbackendsmb.c -+++ b/daemon/gvfsbackendsmb.c -@@ -513,7 +513,13 @@ do_mount (GVfsBackend *backend, - if (res == 0) - break; - -- if (op_backend->mount_cancelled || (errsv != EACCES && errsv != EPERM)) -+ if (errsv == EINVAL && op_backend->mount_try <= 1 && op_backend->user == NULL) -+ { -+ /* EINVAL is "expected" when kerberos/ccache is misconfigured, see: -+ * https://gitlab.gnome.org/GNOME/gvfs/-/issues/611 -+ */ -+ } -+ else if (op_backend->mount_cancelled || (errsv != EACCES && errsv != EPERM)) - { - g_debug ("do_mount - (errno != EPERM && errno != EACCES), cancelled = %d, breaking\n", op_backend->mount_cancelled); - break; -diff --git a/daemon/gvfsbackendsmbbrowse.c b/daemon/gvfsbackendsmbbrowse.c -index 57bae9db..7e8facfb 100644 ---- a/daemon/gvfsbackendsmbbrowse.c -+++ b/daemon/gvfsbackendsmbbrowse.c -@@ -967,8 +967,14 @@ do_mount (GVfsBackend *backend, - uri, op_backend->mount_try, dir, op_backend->mount_cancelled, - errsv, g_strerror (errsv)); - -- if (dir == NULL && -- (op_backend->mount_cancelled || (errsv != EPERM && errsv != EACCES))) -+ if (errsv == EINVAL && op_backend->mount_try == 0 && op_backend->user == NULL) -+ { -+ /* EINVAL is "expected" when kerberos is misconfigured, see: -+ * https://gitlab.gnome.org/GNOME/gvfs/-/issues/611 -+ */ -+ } -+ else if (dir == NULL && -+ (op_backend->mount_cancelled || (errsv != EPERM && errsv != EACCES))) - { - g_debug ("do_mount - (errno != EPERM && errno != EACCES), cancelled = %d, breaking\n", op_backend->mount_cancelled); - break; --- -2.35.3 - diff --git a/gvfs.changes b/gvfs.changes index 0f0368c..fa66e04 100644 --- a/gvfs.changes +++ b/gvfs.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Apr 25 08:54:10 UTC 2022 - Dominique Leuenberger + +- Update to version 1.50.1: + + dav: + - Drop user from URI as a workaround for Nextcloud bug. + - Port DNS-SD resolver to async API to fix hangs when mounting. + - Rewrite to libsoup async API to fix crashes. + - Do not lose userinfo when copying URIs. + + smb: Ignore EINVAL for kerberos/ccache login. +- Drop gvfs-smb-ignore-EINVAL-kerberos-ccache.patch: fixed + upstream. + ------------------------------------------------------------------- Thu Apr 21 15:34:47 UTC 2022 - Michael Gorse diff --git a/gvfs.spec b/gvfs.spec index 96749d1..2ba537e 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -18,7 +18,7 @@ %bcond_without cdda Name: gvfs -Version: 1.50.0 +Version: 1.50.1 Release: 0 Summary: Virtual File System functionality for GLib License: GPL-3.0-only AND LGPL-2.0-or-later @@ -26,8 +26,6 @@ Group: Development/Libraries/C and C++ URL: https://wiki.gnome.org/Projects/gvfs Source0: https://download.gnome.org/sources/gvfs/1.50/%{name}-%{version}.tar.xz Source99: baselibs.conf -# PATCH-FIX-UPSTREAM gvfs-smb-ignore-EINVAL-kerberos-ccache.patch boo#1198718 mgorse@suse.com -- ignore EINVAL for kerberos/ccache login. -Patch0: gvfs-smb-ignore-EINVAL-kerberos-ccache.patch ### NOTE: Please, keep SLE-only patches at bottom (starting on 1000). # PATCH-FEATURE-SLE gvfs-nds.patch ksamrat@novell.com -- Provides NDS browsing for nautilus @@ -160,7 +158,6 @@ gvfs plugins. %prep %setup -q -%patch0 -p1 %if 0%{?sle_version} %patch1000 -p1