Accepting request 738532 from GNOME:Factory

(forwarded request 738193 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/738532
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gvfs?expand=0&rev=160

gvfs-1.40.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bdefe8fec6a1097f0c126fa2a4533667c98a86e237ac640518000e16b363971e
-size 1204824

gvfs-1.42.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d06071b4a1d83671f76d0e3c32b66631671669d330fe21702f60a8611c37730
+size 1204916

gvfs-nds.patch

@@ -1,7 +1,7 @@
-Index: b/daemon/gvfsbackendnds.c
+Index: gvfs-1.42.1/daemon/gvfsbackendnds.c
 ===================================================================
 --- /dev/null
-+++ b/daemon/gvfsbackendnds.c
++++ gvfs-1.42.1/daemon/gvfsbackendnds.c
 @@ -0,0 +1,747 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode; nil; -*- */
 +/* GIO - GLib Input, Output and Streaming Library
@@ -751,10 +751,10 @@ Index: b/daemon/gvfsbackendnds.c
 +  g_set_application_name (_("Displaying Embedded Objects"));
 +}
 
-Index: b/daemon/gvfsbackendnds.h
+Index: gvfs-1.42.1/daemon/gvfsbackendnds.h
 ===================================================================
 --- /dev/null
-+++ b/daemon/gvfsbackendncs.h
++++ gvfs-1.42.1/daemon/gvfsbackendnds.h
 @@ -0,0 +1,53 @@
 +/* GIO - GLib Input, Output and Streaming Library
 + *
@@ -810,24 +810,24 @@ Index: b/daemon/gvfsbackendnds.h
 +
 +#endif /* __G_VFS_BACKEND_NDS_H__ */
 
-Index: b/meson_options.txt
+Index: gvfs-1.42.1/meson_options.txt
 ===================================================================
---- a/meson_options.txt
+--- gvfs-1.42.1.orig/meson_options.txt
-+++ b/meson_options.txt
++++ gvfs-1.42.1/meson_options.txt
-@@ -15,6 +15,7 @@ option('google', type: 'boolean', value:
+@@ -12,6 +12,7 @@ option('google', type: 'boolean', value:
  option('gphoto2', type: 'boolean', value: true, description: 'build with gphoto2 backend and volume monitor')
  option('http', type: 'boolean', value: true, description: 'build with http/dav backends')
  option('mtp', type: 'boolean', value: true, description: 'build with mtp backend and volume monitor')
 +option('nds', type: 'boolean', value: true, description: 'build with nds backend')
  option('nfs', type: 'boolean', value: true, description: 'build with nfs backend')
+ option('sftp', type: 'boolean', value: true, description: 'build with sftp backend')
  option('smb', type: 'boolean', value: true, description: 'build with smb backends')
- option('udisks2', type: 'boolean', value: true, description: 'build with udisks2 volume monitor')
 
-Index: b/meson.build
+Index: gvfs-1.42.1/meson.build
 ===================================================================
---- a/meson.build
+--- gvfs-1.42.1.orig/meson.build
-+++ b/meson.build
++++ gvfs-1.42.1/meson.build
-@@ -465,6 +465,12 @@ config_h.set('HAVE_LIBMTP', enable_mtp)
+@@ -449,6 +449,12 @@ config_h.set('HAVE_LIBMTP', enable_mtp)
  # *** AFP backend ***
  enable_afp = get_option('afp')
  
@@ -841,11 +841,11 @@ Index: b/meson.build
  enable_nfs = get_option('nfs')
  if enable_nfs
 
-Index: b/daemon/meson.build
+Index: gvfs-1.42.1/daemon/meson.build
 ===================================================================
---- a/daemon/meson.build
+--- gvfs-1.42.1.orig/daemon/meson.build
-+++ b/daemon/meson.build
++++ gvfs-1.42.1/daemon/meson.build
-@@ -562,6 +562,22 @@ if enable_afp
+@@ -530,6 +530,22 @@ if enable_afp
    mounts += ['afp-browse']
  endif
  
@@ -866,4 +866,5 @@ Index: b/daemon/meson.build
 +endif
 +
  if enable_nfs
-   sources = files('gvfsbackendnfs.c')
+   cflags = [
+     '-DBACKEND_HEADER=gvfsbackendnfs.h',

gvfs-nvvfs.patch

@@ -1,11 +1,11 @@
-Index: b/daemon/gvfsbackendnvvfs.c
+Index: gvfs-1.42.1/daemon/gvfsbackendnvvfs.c
 ===================================================================
 --- /dev/null
-+++ b/daemon/gvfsbackendnvvfs.c
++++ gvfs-1.42.1/daemon/gvfsbackendnvvfs.c
 @@ -0,0 +1,591 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 +/* GIO - GLib Input, Output and Streaming Library
-+ * 
++ *
 + * Copyright (C) 2006-2007 Red Hat, Inc.
 + *
 + * This library is free software; you can redistribute it and/or
@@ -85,11 +85,11 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +  GVolumeMonitor *volume_monitor;
 +
 +  GVfsMonitor *root_monitor;
-+  
++
 +  GList *files;
-+  
++
 +  guint recompute_idle_tag;
-+  
++
 +  GMountSpec *mount_spec;
 +};
 +
@@ -104,7 +104,7 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +    g_object_unref (file->icon);
 +  if (file->root)
 +    g_object_unref (file->root);
-+  
++
 +  g_slice_free (NovellNautilus, file);
 +}
 +
@@ -118,7 +118,7 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +
 +  if (!g_icon_equal (a->icon, b->icon))
 +    return FALSE;
-+      
++
 +  if ((a->root != NULL && b->root != NULL &&
 +       !g_file_equal (a->root, b->root)) ||
 +      (a->root != NULL && b->root == NULL) ||
@@ -152,7 +152,7 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +      g_signal_handlers_disconnect_by_func(backend->volume_monitor, object_changed, backend);
 +      g_object_unref (backend->volume_monitor);
 +    }
-+  
++
 +  g_mount_spec_unref (backend->mount_spec);
 +
 +  if (backend->recompute_idle_tag)
@@ -162,7 +162,7 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +    }
 +
 +  g_object_unref (backend->root_monitor);
-+  
++
 +  if (G_OBJECT_CLASS (g_vfs_backend_nvvfs_parent_class)->finalize)
 +    (*G_OBJECT_CLASS (g_vfs_backend_nvvfs_parent_class)->finalize) (object);
 +}
@@ -172,7 +172,7 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +{
 +  GVfsBackend *backend = G_VFS_BACKEND (nvvfs_backend);
 +  GMountSpec *mount_spec;
-+ 
++
 +  g_vfs_backend_set_display_name (backend, _("Nvvfs"));
 +  g_vfs_backend_set_icon_name (backend, "gnome-fs-client");
 +  g_vfs_backend_set_user_visible (backend, FALSE);
@@ -190,10 +190,10 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +  while (files != NULL)
 +    {
 +      file = files->data;
-+      
++
 +      if (file->filename == NULL)
 +        return FALSE;
-+      
++
 +      if (strcmp (file->filename, filename) == 0)
 +        return TRUE;
 +
@@ -229,7 +229,7 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +
 +  old_files = backend->files;
 +  backend->files = files;
-+  
++
 +  /* Generate change events */
 +  oldl = old_files;
 +  newl = files;
@@ -253,7 +253,7 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +          old = oldl->data;
 +          cmp = strcmp (old->filename, new->filename);
 +        }
-+      
++
 +      if (cmp == 0)
 +        {
 +          if (!nvvfs_file_equal (old, new))
@@ -265,7 +265,7 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +                                        NULL);
 +              g_free (filename);
 +            }
-+          
++
 +          oldl = oldl->next;
 +          newl = newl->next;
 +        }
@@ -290,7 +290,7 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +          newl = newl->next;
 +        }
 +    }
-+  
++
 +  g_list_foreach (old_files, (GFunc)nvvfs_file_free, NULL);
 +}
 +
@@ -315,11 +315,11 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +  volume_monitor = backend->volume_monitor;
 +
 +  files = NULL;
-+  
++
 +
 +// Im building the path for Novell Client mounts
 +  user_name = g_get_user_name();
-+  path_ncl = g_strconcat(nclmnt_path,user_name,NULL);  
++  path_ncl = g_strconcat(nclmnt_path,user_name,NULL);
 +
 +  file = g_slice_new0 (NovellNautilus);
 +  file->filename = g_strdup ("root.link");
@@ -327,7 +327,7 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +  file->icon = g_themed_icon_new("ncl-logo");
 +  file->root = g_file_new_for_path (path_ncl);
 +  file->prio = 0;
-+  
++
 +  files = g_list_prepend (files, file);
 +
 +  file = g_slice_new0 (NovellNautilus);
@@ -352,7 +352,7 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +  backend->recompute_idle_tag = 0;
 +
 +  recompute_files (backend);
-+  
++
 +  return FALSE;
 +}
 +
@@ -361,7 +361,7 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +                gpointer object,
 +                GVfsBackendNvvfs *backend)
 +{
-+  if (backend->recompute_idle_tag == 0) 
++  if (backend->recompute_idle_tag == 0)
 +    backend->recompute_idle_tag =
 +      g_idle_add ((GSourceFunc)recompute_files_in_idle,
 +                  backend);
@@ -401,7 +401,7 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +                           NULL, 0);
 +
 +  nvvfs_backend->root_monitor = g_vfs_monitor_new (backend);
-+  
++
 +  recompute_files (nvvfs_backend);
 +
 +  g_vfs_job_succeeded (G_VFS_JOB (job));
@@ -425,10 +425,10 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +
 +  if (*filename == 0)
 +    return &root;
-+  
++
 +  if (strchr (filename, '/') != NULL)
 +    goto out;
-+  
++
 +  for (l = backend->files; l != NULL; l = l->next)
 +    {
 +      file = l->data;
@@ -471,7 +471,7 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +                     GFileInfo *info)
 +{
 +  char *uri;
-+  
++
 +  g_file_info_set_name (info, file->filename);
 +  g_file_info_set_display_name (info, file->display_name);
 +
@@ -513,7 +513,7 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +
 +  file = lookup (G_VFS_BACKEND_NVVFS (backend),
 +                 G_VFS_JOB (job), filename);
-+  
++
 +  if (file != &root)
 +    {
 +      if (file != NULL)
@@ -524,21 +524,21 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +    }
 +
 +  g_vfs_job_succeeded (G_VFS_JOB (job));
-+  
++
 +  /* Enumerate root */
 +  for (l = G_VFS_BACKEND_NVVFS (backend)->files; l != NULL; l = l->next)
 +    {
 +      file = l->data;
-+      
++
 +      info = g_file_info_new ();
-+      
++
 +      file_info_from_file (file, info);
 +      g_vfs_job_enumerate_add_info (job, info);
 +      g_object_unref (info);
 +    }
 +
 +  g_vfs_job_enumerate_done (job);
-+  
++
 +  return TRUE;
 +}
 +
@@ -558,7 +558,7 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +  if (file == &root)
 +    {
 +      GIcon *icon;
-+      
++
 +      g_file_info_set_name (info, "/");
 +      g_file_info_set_file_type (info, G_FILE_TYPE_DIRECTORY);
 +      g_file_info_set_display_name (info, _("Nvvfs"));
@@ -577,7 +577,7 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +      file_info_from_file (file, info);
 +      g_vfs_job_succeeded (G_VFS_JOB (job));
 +    }
-+  
++
 +  return TRUE;
 +}
 +
@@ -586,7 +586,7 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +{
 +  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 +  GVfsBackendClass *backend_class = G_VFS_BACKEND_CLASS (klass);
-+  
++
 +  gobject_class->finalize = g_vfs_backend_nvvfs_finalize;
 +
 +  backend_class->try_mount = try_mount;
@@ -595,13 +595,13 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +  backend_class->try_enumerate = try_enumerate;
 +}
 
-Index: b/daemon/gvfsbackendnvvfs.h
+Index: gvfs-1.42.1/daemon/gvfsbackendnvvfs.h
 ===================================================================
 --- /dev/null
-+++ b/daemon/gvfsbackendnvvfs.h
++++ gvfs-1.42.1/daemon/gvfsbackendnvvfs.h
 @@ -0,0 +1,50 @@
 +/* GIO - GLib Input, Output and Streaming Library
-+ * 
++ *
 + * Copyright (C) 2006-2007 Red Hat, Inc.
 + *
 + * This library is free software; you can redistribute it and/or
@@ -651,38 +651,39 @@ Index: b/daemon/gvfsbackendnvvfs.h
 +
 +#endif /* __G_VFS_BACKEND_NVVFS_H__ */
 
-Index: b/meson_options.txt
+Index: gvfs-1.42.1/meson_options.txt
 ===================================================================
---- a/meson_options.txt
+--- gvfs-1.42.1.orig/meson_options.txt
-+++ b/meson_options.txt
++++ gvfs-1.42.1/meson_options.txt
-@@ -17,6 +17,7 @@ option('http', type: 'boolean', value: t
+@@ -14,6 +14,7 @@ option('http', type: 'boolean', value: t
  option('mtp', type: 'boolean', value: true, description: 'build with mtp backend and volume monitor')
  option('nds', type: 'boolean', value: true, description: 'build with nds backend')
  option('nfs', type: 'boolean', value: true, description: 'build with nfs backend')
 +option('nvvfs', type: 'boolean', value: true, description: 'build with nvvfs backend')
+ option('sftp', type: 'boolean', value: true, description: 'build with sftp backend')
  option('smb', type: 'boolean', value: true, description: 'build with smb backends')
  option('udisks2', type: 'boolean', value: true, description: 'build with udisks2 volume monitor')
- 
+
-Index: b/meson.build
+Index: gvfs-1.42.1/meson.build
 ===================================================================
---- a/meson.build
+--- gvfs-1.42.1.orig/meson.build
-+++ b/meson.build
++++ gvfs-1.42.1/meson.build
-@@ -477,6 +477,9 @@ if enable_nfs
+@@ -461,6 +461,9 @@ if enable_nfs
    libnfs_dep = dependency('libnfs', version: '>= 1.9.8')
  endif
  
 +# *** NVVFS backend ***
 +enable_nvvfs = get_option('nvvfs')
 +
- # *** Enable development utils ***
+ # *** SFTP backend ***
- enable_devel_utils = get_option('devel_utils')
+ enable_sftp = get_option('sftp')
- enable_installed_tests = get_option('installed_tests')
+ if enable_sftp
- 
+
-Index: b/daemon/meson.build
+Index: gvfs-1.42.1/daemon/meson.build
 ===================================================================
---- a/daemon/meson.build
+--- gvfs-1.42.1.orig/daemon/meson.build
-+++ b/daemon/meson.build
++++ gvfs-1.42.1/daemon/meson.build
-@@ -594,6 +594,22 @@ if enable_nfs
+@@ -558,6 +558,22 @@ if enable_nfs
    mounts += ['nfs']
  endif
  
@@ -703,5 +704,5 @@ Index: b/daemon/meson.build
 +endif
 +
  foreach program: programs
-   executable(
+   options = program[1]
-     program[0],
+   kwargs = {

gvfs.changes

@@ -1,3 +1,71 @@
+-------------------------------------------------------------------
+Mon Oct 14 07:17:45 UTC 2019 - QK ZHU <qkzhu@suse.com>
+
+- Rebase SLE patches for version 1.42.1:
+  + gvfs-nds.patch
+  + gvfs-nvvfs.patch
+
+-------------------------------------------------------------------
+Mon Oct  7 07:47:29 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 1.42.1:
+  + dav: Fix mounting when 403 is returned for the parent folder.
+  + Revert "sftp: Always use port 22 if not specified".
+  + Updated translations.
+
+-------------------------------------------------------------------
+Sun Sep 15 19:24:28 UTC 2019 - Michael Gorse <mgorse@suse.com>
+
+- Fix Requires on -fuse package: now needs fuse3, not fuse. 
+
+-------------------------------------------------------------------
+Tue Sep 10 17:40:44 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 1.42.0:
+  + Updated translations.
+
+-------------------------------------------------------------------
+Fri Aug 30 19:56:41 CDT 2019 - mgorse@suse.com
+
+- Update to version 1.41.91:
+  + fuse: Remove max_write limit.
+  + Several smaller bugfixes.
+  + Updated translations.
+- Changes from version 1.41.90:
+  + udisks2: Change display name for crypto_unknown devices.
+  + google: Disable deletion of non-empty directories.
+  + google: Fix crashes when deleting if the file isn't found.
+  + google: Fix issue with stale entries remaining after rename
+    operation.
+  + build: Define gvfs_rpath for libgvfsdaemon.so.
+  + proxy: Don't leak a GVfsDBusDaemon.
+  + Updated translations.
+- Changes from version 1.41.4:
+  + google: Do not enumerate volatile entries if title matches id.
+  + build: Add dependency on gsettings-desktop-schemas.
+  + daemon/udisks2: Handle lockdown option to disable writing.
+  + fuse: Define RENAME_* macros when they are not defined.
+  + google: Check ownership in is_owner() without additional HTTP
+    request.
+  + Several smaller bugfixes.
+  + Updated translations.
+- Changes from version 1.41.3:
+  + Updated translations.
+- Changes from version 1.41.2:
+  + build: Several meson improvements.
+  + build: Bump required meson version to 0.50.0.
+  + google: Support deleting shared Google Drive files.
+  + admin: Prevent core dumps when daemon is manually started.
+  + Several smaller bugfixes.
+  + Updated translations.
+- Changes from version 1.41.1:
+  + fuse: Adapt gvfsd-fuse to use fuse 3.x.
+  + daemon: Unify some translatable strings.
+  + Updated translations.
+- Specify meson version requirement.
+- Require fuse >= 3.0.0.
+- Require gsettings-desktop-schemas: new dependency.
+
 -------------------------------------------------------------------
 Wed Jul 17 10:07:09 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
 

gvfs.spec

@@ -18,13 +18,13 @@
 
 %bcond_without  cdda
 Name:           gvfs
-Version:        1.40.2
+Version:        1.42.1
 Release:        0
 Summary:        Virtual File System functionality for GLib
 License:        LGPL-2.0-or-later AND GPL-3.0-only
 Group:          Development/Libraries/C and C++
 URL:            https://wiki.gnome.org/Projects/gvfs
-Source0:        https://download.gnome.org/sources/gvfs/1.40/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/gvfs/1.42/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
 
 ### NOTE: Please, keep SLE-only patches at bottom (starting on 1000).
@@ -35,7 +35,7 @@ Patch1001:      gvfs-nvvfs.patch
 
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  libgcrypt-devel >= 1.2.2
-BuildRequires:  meson
+BuildRequires:  meson >= 0.50.0
 BuildRequires:  openssh
 BuildRequires:  pkgconfig
 BuildRequires:  translation-update-upstream
@@ -43,13 +43,14 @@ BuildRequires:  xsltproc
 BuildRequires:  pkgconfig(avahi-client) >= 0.6
 BuildRequires:  pkgconfig(avahi-glib) >= 0.6
 BuildRequires:  pkgconfig(dbus-1)
-BuildRequires:  pkgconfig(fuse) >= 2.8.0
+BuildRequires:  pkgconfig(fuse3) >= 3.0.0
 BuildRequires:  pkgconfig(gcr-base-3)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.57.2
 BuildRequires:  pkgconfig(goa-1.0) >= 3.17.1
 BuildRequires:  pkgconfig(gobject-2.0)
+BuildRequires:  pkgconfig(gsettings-desktop-schemas) >= 3.33.0
 BuildRequires:  pkgconfig(gudev-1.0) >= 147
 BuildRequires:  pkgconfig(libarchive)
 BuildRequires:  pkgconfig(libbluray)
@@ -128,7 +129,7 @@ Summary:        VFS functionality for GLib
 License:        LGPL-2.0-or-later
 Group:          System/Filesystems
 Requires:       %{name} = %{version}
-Requires:       fuse
+Requires:       fuse3
 
 %description fuse
 gvfs GNOME's userspace virtual filesystem designed to work with the