Hello community, here is the log from the commit of package gvfs for openSUSE:Leap:15.2 checked in at 2020-01-30 14:50:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/gvfs (Old) and /work/SRC/openSUSE:Leap:15.2/.gvfs.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gvfs" Thu Jan 30 14:50:22 2020 rev:65 rq:761559 version:1.42.2 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/gvfs/gvfs.changes 2020-01-15 15:10:24.898072671 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.gvfs.new.26092/gvfs.changes 2020-01-30 14:51:29.246937152 +0100 @@ -1,0 +2,118 @@ +Fri Dec 27 10:02:01 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org> + +- BuildRequire pkgconfig(systemd): meson.build tries to inspect + systemd.pc to find the right unit-directories. + +------------------------------------------------------------------- +Fri Nov 22 10:57:07 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com> + +- Update to version 1.42.2: + + gdbus: Add workaround for deadlocks when cancelling jobs. + +------------------------------------------------------------------- +Tue Nov 19 08:05:54 UTC 2019 - QK ZHU <qkzhu@suse.com> + +- Drop fixed upstream patches by version 1.40.2: + + gvfs-CVE-2019-12447.patch. + + gvfs-CVE-2019-12448.patch. + + gvfs-CVE-2019-12449.patch. + + gvfs-CVE-2019-12795.patch. + +------------------------------------------------------------------- +Mon Oct 21 07:45:59 UTC 2019 - QK ZHU <qkzhu@suse.com> + +- Rebase SLE patches gvfs-nds.patch and gvfs-nvvfs.patch for version + 1.42.1: + + Add daemon/nds.mount.in. + + Add daemon/nvvfs.mount.in. + + meson porting fixes. + +------------------------------------------------------------------- +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> + +- Update to version 1.40.2: + + daemon: + - Only accept EXTERNAL authentication (CVE-2019-12795). + - Check that the connecting client is the same user + (CVE-2019-12795). + + admin: + - Ensure correct ownership when moving to file:// uri + (CVE-2019-12449). + - Use fsuid to ensure correct file ownership (CVE-2019-12447). + - Allow changing file owner (CVE-2019-12447). + - Add query_info_on_read/write functionality (CVE-2019-12448). + + afc: Remove assumptions about length of device UUID to support + new devices. + + gmountsource: Fix deadlocks in synchronous API. + + afp: Fix afp backend crash when no username supplied. + + Updated translations. + +------------------------------------------------------------------- @@ -30 +148 @@ -Fri May 17 17:47:57 UTC 2019 - mgorse@suse.com +Fri May 17 09:26:43 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org> @@ -35,0 +154,83 @@ +Tue Apr 9 09:07:24 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com> + +- Update to version 1.40.1: + + Revert "sftp: Always use port 22 if not specified". + + Updated translations. + +------------------------------------------------------------------- +Tue Mar 12 01:40:00 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com> + +- Update to version 1.40.0: + + Stable release version bump. + +------------------------------------------------------------------- +Tue Mar 12 01:39:22 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com> + +- Update to version 1.39.92: + + client: Fix mount info cache invalidation. + + Several smaller bugfixes. + + Updated translations. + +------------------------------------------------------------------- +Tue Mar 12 01:39:19 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 1.39.91: + + smb: Do not show password prompt when using winbind ccache. + + Several smaller bugfixes. + + Updated translations. + +------------------------------------------------------------------- +Tue Mar 12 01:39:09 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 1.39.90: + + sftp: Always use port 22 if not specified. + + mtp: Don't retry reading an event after failure. + + admin: Prevent access if any authentication agent isn't + available. + + build: Several meson improvements. + + Several smaller bugfixes. + + Updated translations. +- Drop gvfs-CVE-2019-3827.patch: Fixed upstream. + +------------------------------------------------------------------- +Tue Mar 12 01:39:04 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 1.39.4: + + keyring: Prefer the most recent item. + + afp: Try to find credentials even if user is not specified. + + dav: Try authenticate again even if 403 was returned. + + Several smaller bugfixes. + + Updated translations. + +------------------------------------------------------------------- +Tue Mar 12 01:39:03 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 1.39.3: + + udisks2: + - Improve handling of mounts which doesn't point into fs root. + - Restore support of comment=x-gvfs-* option. + + daemon: Prevent spawning new daemons if outgoing operation + exists. + + common: Prevent crashes on invalid autorun file. + + Several smaller bugfixes. + + Updated translations. +- Changes from version 1.39.1: + + google: + - Rework cache for better performance. + - Add support for files with multiple parents. + + udisks2: Add a new volume class `loop`. + +------------------------------------------------------------------- +Mon Mar 11 15:19:51 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com> + +- Update to version 1.38.2: + + mtp: Don't retry reading an event after failure. + + admin: Prevent access if any authentication agent isn't ++++ 212 more lines (skipped) ++++ between /work/SRC/openSUSE:Leap:15.2/gvfs/gvfs.changes ++++ and /work/SRC/openSUSE:Leap:15.2/.gvfs.new.26092/gvfs.changes Old: ---- gvfs-1.34.2.1.tar.xz gvfs-CVE-2019-12447.patch gvfs-CVE-2019-12448.patch gvfs-CVE-2019-12449.patch gvfs-CVE-2019-12795.patch gvfs-CVE-2019-3827.patch gvfs-smb-Use-O_RDWR-to-fix-fstat-when-writing.patch New: ---- gvfs-1.42.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gvfs.spec ++++++ --- /var/tmp/diff_new_pack.SINwb4/_old 2020-01-30 14:51:29.710937399 +0100 +++ /var/tmp/diff_new_pack.SINwb4/_new 2020-01-30 14:51:29.710937399 +0100 @@ -1,7 +1,7 @@ # # spec file for package gvfs # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,84 +12,71 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define with_udisks2 1 -%define with_cdda 1 +%bcond_without cdda Name: gvfs -Version: 1.34.2.1 +Version: 1.42.2 Release: 0 Summary: Virtual File System functionality for GLib -License: LGPL-2.0+ AND GPL-3.0 +License: LGPL-2.0-or-later AND GPL-3.0-only Group: Development/Libraries/C and C++ -URL: http://www.gnome.org -Source0: http://download.gnome.org/sources/gvfs/1.34/%{name}-%{version}.tar.xz +URL: https://wiki.gnome.org/Projects/gvfs +Source0: https://download.gnome.org/sources/gvfs/1.42/%{name}-%{version}.tar.xz Source99: baselibs.conf -# PATCH-FIX-UPSTREAM gvfs-smb-Use-O_RDWR-to-fix-fstat-when-writing.patch bgo#795805 boo#1096476 fezhang@suse.com -- Fix failures copying files on smb mounts -Patch1: gvfs-smb-Use-O_RDWR-to-fix-fstat-when-writing.patch -# PATCH-FIX-UPSTREAM gvfs-CVE-2019-3827.patch glgo#GNOME/gvfs#355 bsc#1125084 CVE-2019-3827 qkzhu@suse.com -- Prevent access if any authentication agent isn't available -Patch2: gvfs-CVE-2019-3827.patch -# PATCH-FEATURE-SLE gvfs-nvvfs.patch ksamrat@novell.com -- Provides gvfs backend for novell nautilus plugin -Patch5: gvfs-nvvfs.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 -Patch6: gvfs-nds.patch -# PATCH-FIX-UPSTREAM gvfs-CVE-2019-12449.patch boo#1136992 CVE-2019-12449 qzheng@suse.com -- Ensure correct ownership when moving to file:// uri -Patch7: gvfs-CVE-2019-12449.patch -# PATCH-FIX-UPSTREAM gvfs-CVE-2019-12448.patch boo#1136981 CVE-2019-12448 qzheng@suse.com -- Add query_info_on_read/write functionality -Patch8: gvfs-CVE-2019-12448.patch -Patch9: gvfs-CVE-2019-12447.patch -Patch10: gvfs-CVE-2019-12795.patch +Patch1000: gvfs-nds.patch +# PATCH-FEATURE-SLE gvfs-nvvfs.patch ksamrat@novell.com -- Provides gvfs backend for novell nautilus plugin +Patch1001: gvfs-nvvfs.patch + BuildRequires: docbook-xsl-stylesheets -BuildRequires: fuse-devel -BuildRequires: intltool -BuildRequires: libarchive-devel -BuildRequires: libavahi-glib-devel -BuildRequires: libgcrypt-devel -BuildRequires: libgphoto2-devel -BuildRequires: libimobiledevice-devel >= 1.2 -BuildRequires: libsoup-devel >= 2.34.0 -BuildRequires: libtool +BuildRequires: libgcrypt-devel >= 1.2.2 +BuildRequires: meson >= 0.50.0 +BuildRequires: openssh BuildRequires: pkgconfig +BuildRequires: translation-update-upstream BuildRequires: xsltproc +BuildRequires: pkgconfig(avahi-client) >= 0.6 +BuildRequires: pkgconfig(avahi-glib) >= 0.6 +BuildRequires: pkgconfig(dbus-1) +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.51.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) BuildRequires: pkgconfig(libcap) BuildRequires: pkgconfig(libgdata) >= 0.17.3 -BuildRequires: pkgconfig(libmtp) >= 1.1.5 +BuildRequires: pkgconfig(libgphoto2) >= 2.4.0 +BuildRequires: pkgconfig(libimobiledevice-1.0) >= 1.2 +BuildRequires: pkgconfig(libmtp) >= 1.1.12 BuildRequires: pkgconfig(libnfs) >= 1.9.8 BuildRequires: pkgconfig(libsecret-unstable) +BuildRequires: pkgconfig(libsoup-2.4) >= 2.42.0 BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libusb-1.0) >= 1.0.21 -BuildRequires: pkgconfig(polkit-gobject-1) +BuildRequires: pkgconfig(polkit-gobject-1) >= 0.114 BuildRequires: pkgconfig(smbclient) +BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(udisks2) >= 1.97 Recommends: %{name}-lang Recommends: gvfs-backends Recommends: gvfs-common Recommends: gvfs-fuse -%glib2_gio_module_requires +%{glib2_gio_module_requires} %{?systemd_requires} -%if !0%{?is_opensuse} -# needed for patches 5 and 6 -BuildRequires: autoconf -%endif -%if %{with_cdda} +%if %{with cdda} BuildRequires: pkgconfig(libcdio_paranoia) >= 0.78.2 %endif -%if !%{with_udisks2} -BuildRequires: libgdu-devel -%endif -BuildRequires: translation-update-upstream -%if %{with_udisks2} -BuildRequires: pkgconfig(udisks2) >= 1.97 -%endif %if !0%{?is_opensuse} # The library gvfscommon was converted to a private library and is not used outside of gvfs Obsoletes: libgvfscommon0 <= %{version} @@ -103,36 +90,36 @@ not using GIO to access the GVfs filesystems. %package backend-afc +%define mobile_device_package %(rpm -q --qf "%%{name}" -f $(readlink -f %{_libdir}/libimobiledevice.so)) Summary: VFS functionality for GLib -- iPod / iPhone Support License: LGPL-2.0-or-later Group: Development/Libraries/C and C++ Requires: %{name} = %{version} -Supplements: packageand(%{name}:%(rpm -q --qf "%%{name}" -f $(readlink -f %{_libdir}/llibimobiledevice.so))) +Supplements: packageand(gvfs:%{mobile_device_package}) %description backend-afc This package provides a gvfs backend that supports iPod / iPhone devices. %package backend-samba +%define smb_client_package %(rpm -q --qf "%%{name}" -f $(readlink -f %{_libdir}/libsmbclient.so)) Summary: VFS functionality for GLib -- Samba Support License: LGPL-2.0-or-later Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: %{name}-backends = %{version} -Supplements: packageand(%{name}:%(rpm -q --qf "%%{name}" -f $(readlink -f %{_libdir}/libsmbclient.so))) -%glib2_gsettings_schema_requires +Supplements: packageand(gvfs:%{smb_client_package}) %description backend-samba This package provides a gvfs backend that supports Samba. %package backends Summary: VFS functionality for GLib -License: LGPL-2.0+ AND GPL-3.0 +License: LGPL-2.0-or-later AND GPL-3.0-only Group: Development/Libraries/C and C++ Requires: %{name} = %{version} -%glib2_gsettings_schema_requires -%if %{with_udisks2} +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: permissions Recommends: udisks2 -%endif %description backends VFS functionality for GLib. @@ -143,7 +130,7 @@ 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 @@ -173,44 +160,34 @@ %prep %setup -q -translation-update-upstream -%patch1 -p1 -%patch2 -p1 +translation-update-upstream po %{name} + %if !0%{?is_opensuse} -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 +%patch1000 -p1 +%patch1001 -p1 %endif %build -%if !0%{?is_opensuse} -# needed for patches 5 and 6 -autoreconf -%endif -%configure \ +%meson \ --libexecdir=%{_libexecdir}/%{name} \ -%if %{with_udisks2} - --enable-udisks2 \ - --disable-gdu \ -%else - --disable-udisks2 \ - --enable-gdu \ -%endif - --disable-static -make %{?_smp_mflags} + -Dudisks2=true \ + %{!?with_cdda: -Dcdda=false} \ + -Dman=true \ + %{nil} +%meson_build %install -%make_install +%meson_install # drop polkit rules files (for wheel group) - boo#1125433 rm %{buildroot}%{_datadir}/polkit-1/rules.d/org.gtk.vfs.file-operations.rules -find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print +find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name} +# Rename daemon/trashlib/COPYING +mv daemon/trashlib/COPYING daemon/trashlib/COPYING.trashlib + %post -%glib2_gio_module_post +%{glib2_gio_module_post} %post fuse %tmpfiles_create %{_libexecdir}/tmpfiles.d/gvfsd-fuse-tmpfiles.conf @@ -222,12 +199,11 @@ %verify_permissions -e %{_libexecdir}/%{name}/gvfsd-nfs %postun -%glib2_gio_module_postun +%{glib2_gio_module_postun} %files -%defattr(-, root, root) -%doc AUTHORS NEWS README -%{_bindir}/gvfs-* +%license COPYING daemon/trashlib/COPYING.trashlib +%doc NEWS README.md %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/mounts %dir %{_datadir}/%{name}/remote-volume-monitors @@ -240,7 +216,6 @@ %{_datadir}/dbus-1/services/org.gtk.vfs.Daemon.service %{_libexecdir}/%{name}/gvfsd-metadata %{_datadir}/dbus-1/services/org.gtk.vfs.Metadata.service -%{_mandir}/man1/gvfs-*.1%{?ext_man} %{_mandir}/man1/gvfsd.1%{?ext_man} %{_mandir}/man1/gvfsd-metadata.1%{?ext_man} %{_mandir}/man7/gvfs.7%{?ext_man} @@ -248,14 +223,12 @@ %{_userunitdir}/gvfs-metadata.service %files fuse -%defattr(-, root, root) %{_libexecdir}/%{name}/gvfsd-fuse %dir %{_libexecdir}/tmpfiles.d %{_libexecdir}/tmpfiles.d/gvfsd-fuse-tmpfiles.conf %{_mandir}/man1/gvfsd-fuse.1%{?ext_man} %files backend-afc -%defattr(-, root, root) %{_libexecdir}/%{name}/gvfs-afc-volume-monitor %{_datadir}/dbus-1/services/org.gtk.vfs.AfcVolumeMonitor.service %{_userunitdir}/gvfs-afc-volume-monitor.service @@ -264,7 +237,6 @@ %{_datadir}/%{name}/mounts/afc.mount %files backend-samba -%defattr(-, root, root) %{_libexecdir}/%{name}/gvfsd-smb %{_datadir}/%{name}/mounts/smb.mount %{_libexecdir}/%{name}/gvfsd-smb-browse @@ -275,18 +247,11 @@ %{_datadir}/GConf/gsettings/gvfs-smb.convert %files backends -%defattr(-, root, root) -%if %{with_udisks2} %doc monitor/udisks2/what-is-shown.txt %{_datadir}/dbus-1/services/org.gtk.vfs.UDisks2VolumeMonitor.service %{_datadir}/%{name}/remote-volume-monitors/udisks2.monitor %{_libexecdir}/%{name}/gvfs-udisks2-volume-monitor %{_userunitdir}/gvfs-udisks2-volume-monitor.service -%else -%{_libexecdir}/%{name}/gvfs-gdu-volume-monitor -%{_datadir}/dbus-1/services/org.gtk.Private.GduVolumeMonitor.service -%{_datadir}/%{name}/remote-volume-monitors/gdu.monitor -%endif %{_libexecdir}/%{name}/gvfs-gphoto2-volume-monitor %{_userunitdir}/gvfs-gphoto2-volume-monitor.service %{_datadir}/dbus-1/services/org.gtk.vfs.GPhoto2VolumeMonitor.service @@ -302,7 +267,7 @@ %{_datadir}/%{name}/mounts/archive.mount %{_libexecdir}/%{name}/gvfsd-burn %{_datadir}/%{name}/mounts/burn.mount -%if %{with_cdda} +%if %{with cdda} %{_libexecdir}/%{name}/gvfsd-cdda %{_datadir}/%{name}/mounts/cdda.mount %endif @@ -316,6 +281,7 @@ %{_libexecdir}/%{name}/gvfsd-ftp %{_datadir}/%{name}/mounts/ftp.mount %{_datadir}/%{name}/mounts/ftps.mount +%{_datadir}/%{name}/mounts/ftpis.mount %{_libexecdir}/%{name}/gvfsd-google %{_datadir}/%{name}/mounts/google.mount %{_libexecdir}/%{name}/gvfsd-gphoto2 @@ -336,17 +302,16 @@ %{_datadir}/%{name}/mounts/mtp.mount %if !0%{?is_opensuse} %{_libexecdir}/%{name}/gvfsd-nds +%{_libexecdir}/%{name}/gvfsd-nvvfs %{_datadir}/%{name}/mounts/nds.mount +%{_datadir}/%{name}/mounts/nvvfs.mount %endif %{_libexecdir}/%{name}/gvfsd-network %{_datadir}/%{name}/mounts/network.mount -# allow priv ports for mounting nfs . Otherwise the nfs-service requires insecure (boo#1065864) +# allow priv ports for mounting nfs. Otherwise the nfs-service requires insecure (boo#1065864) %verify(not mode caps) %caps(cap_net_bind_service=+ep) %{_libexecdir}/%{name}/gvfsd-nfs +%{_libexecdir}/%{name}/gvfsd-nfs %{_datadir}/%{name}/mounts/nfs.mount -%if !0%{?is_opensuse} -%{_libexecdir}/%{name}/gvfsd-nvvfs -%{_datadir}/%{name}/mounts/nvvfs.mount -%endif %{_libexecdir}/%{name}/gvfsd-recent %{_datadir}/%{name}/mounts/recent.mount %{_libexecdir}/%{name}/gvfsd-sftp @@ -363,7 +328,7 @@ %{_datadir}/GConf/gsettings/gvfs-dns-sd.convert %files devel -%defattr(-, root, root) +%doc CONTRIBUTING.md NEWS.pre-1-2 %{_includedir}/gvfs-client %files lang -f %{name}.lang ++++++ gvfs-1.34.2.1.tar.xz -> gvfs-1.42.2.tar.xz ++++++ ++++ 262826 lines of diff (skipped) ++++++ gvfs-nds.patch ++++++ --- /var/tmp/diff_new_pack.SINwb4/_old 2020-01-30 14:51:30.338937733 +0100 +++ /var/tmp/diff_new_pack.SINwb4/_new 2020-01-30 14:51:30.338937733 +0100 @@ -1,9 +1,10 @@ -Index: gvfs-1.34.0/daemon/gvfsbackendnds.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gvfs-1.34.0/daemon/gvfsbackendnds.c 2017-09-15 10:53:24.564258329 +0200 +diff --git a/daemon/gvfsbackendnds.c b/daemon/gvfsbackendnds.c +new file mode 100644 +index 0000000..960d457 +--- /dev/null ++++ b/daemon/gvfsbackendnds.c @@ -0,0 +1,747 @@ -+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ ++/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode; nil; -*- */ +/* GIO - GLib Input, Output and Streaming Library + * + * Copyright (C) 2006-2007 Red Hat, Inc. @@ -750,10 +751,11 @@ +{ + g_set_application_name (_("Displaying Embedded Objects")); +} -Index: gvfs-1.34.0/daemon/gvfsbackendnds.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gvfs-1.34.0/daemon/gvfsbackendnds.h 2017-09-15 10:53:56.159989373 +0200 +diff --git a/daemon/gvfsbackendnds.h b/daemon/gvfsbackendnds.h +new file mode 100644 +index 0000000..0b48ad6 +--- /dev/null ++++ b/daemon/gvfsbackendnds.h @@ -0,0 +1,53 @@ +/* GIO - GLib Input, Output and Streaming Library + * @@ -808,48 +810,78 @@ +G_END_DECLS + +#endif /* __G_VFS_BACKEND_NDS_H__ */ -Index: gvfs-1.34.0/daemon/Makefile.am -=================================================================== ---- gvfs-1.34.0.orig/daemon/Makefile.am 2017-09-15 10:15:10.715090208 +0200 -+++ gvfs-1.34.0/daemon/Makefile.am 2017-09-15 10:15:46.554940823 +0200 -@@ -144,6 +144,10 @@ - mount_DATA += nvvfs.mount - libexec_PROGRAMS += gvfsd-nvvfs +diff --git a/daemon/meson.build b/daemon/meson.build +index dffeef3..dabdcb2 100644 +--- a/daemon/meson.build ++++ b/daemon/meson.build +@@ -530,6 +530,22 @@ if enable_afp + mounts += ['afp-browse'] + endif -+mount_in_files += nds.mount.in -+mount_DATA += nds.mount -+libexec_PROGRAMS += gvfsd-nds -+ - EXTRA_DIST = \ - $(service_in_files) \ - $(systemd_user_in_files) \ -@@ -528,6 +532,19 @@ - - gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS) - -+gvfsd_nds_SOURCES = \ -+ gvfsbackendnds.c gvfsbackendnds.h \ -+ daemon-main.c daemon-main.h \ -+ daemon-main-generic.c -+ -+gvfsd_nds_CPPFLAGS = $(flags) \ -+ -DBACKEND_HEADER=gvfsbackendnds.h \ -+ -DDEFAULT_BACKEND_TYPE=nds \ -+ -DMAX_JOB_THREADS=1 \ -+ -DBACKEND_TYPES='"nds", G_VFS_TYPE_BACKEND_NDS,' -+ -+gvfsd_nds_LDADD = $(libraries) -ldl -+ - gvfsd_nvvfs_SOURCES = \ - gvfsbackendnvvfs.c gvfsbackendnvvfs.h \ - daemon-main.c daemon-main.h \ -Index: gvfs-1.34.0/daemon/nds.mount.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gvfs-1.34.0/daemon/nds.mount.in 2017-09-15 10:15:46.554940823 +0200 ++if enable_nds ++ sources = daemon_main_sources + files('gvfsbackendnds.c') ++ ++ deps = [libdl_dep] ++ ++ cflags = [ ++ '-DBACKEND_HEADER=gvfsbackendnds.h', ++ '-DDEFAULT_BACKEND_TYPE=nds', ++ '-DBACKEND_TYPES="nds", G_VFS_TYPE_BACKEND_NDS,', ++ '-DMAX_JOB_THREADS=1', ++ ] ++ ++ programs += [['gvfsd-nds', {'sources': sources, 'dependencies': deps, 'c_args': cflags}]] ++ mounts += ['nds'] ++endif ++ + if enable_nfs + cflags = [ + '-DBACKEND_HEADER=gvfsbackendnfs.h', +diff --git a/daemon/nds.mount.in b/daemon/nds.mount.in +new file mode 100644 +index 0000000..1068344 +--- /dev/null ++++ b/daemon/nds.mount.in @@ -0,0 +1,5 @@ +[Mount] +Type=nds +Exec=@libexecdir@/gvfsd-nds +AutoMount=false +Scheme=nds +diff --git a/meson.build b/meson.build +index 080637b..6525b79 100644 +--- a/meson.build ++++ b/meson.build +@@ -449,6 +449,12 @@ config_h.set('HAVE_LIBMTP', enable_mtp) + # *** AFP backend *** + enable_afp = get_option('afp') + ++# *** NDS backend *** ++enable_nds = get_option('nds') ++if enable_nds ++ libdl_dep = cc.find_library('dl') ++endif ++ + # *** NFS backend *** + enable_nfs = get_option('nfs') + if enable_nfs +@@ -507,6 +513,7 @@ output += ' google: ' + enable_google.to_string() + '\n' + output += ' gphoto2: ' + enable_gphoto2.to_string() + '\n' + output += ' http: ' + enable_http.to_string() + '\n' + output += ' mtp: ' + enable_mtp.to_string() + '\n' ++output += ' nds: ' + enable_nds.to_string() + '\n' + output += ' nfs: ' + enable_nfs.to_string() + '\n' + output += ' sftp: ' + enable_sftp.to_string() + '\n' + output += ' smb: ' + enable_samba.to_string() + '\n' +diff --git a/meson_options.txt b/meson_options.txt +index 32f10d4..dced004 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -12,6 +12,7 @@ option('google', type: 'boolean', value: true, description: 'build with google b + 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') ++++++ gvfs-nvvfs.patch ++++++ --- /var/tmp/diff_new_pack.SINwb4/_old 2020-01-30 14:51:30.346937737 +0100 +++ /var/tmp/diff_new_pack.SINwb4/_new 2020-01-30 14:51:30.350937739 +0100 @@ -1,11 +1,12 @@ -Index: gvfs-1.15.1/daemon/gvfsbackendnvvfs.c -=================================================================== +diff --git a/daemon/gvfsbackendnvvfs.c b/daemon/gvfsbackendnvvfs.c +new file mode 100644 +index 0000000..2e5abdc --- /dev/null -+++ gvfs-1.15.1/daemon/gvfsbackendnvvfs.c ++++ b/daemon/gvfsbackendnvvfs.c @@ -0,0 +1,591 @@ -+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* -*- 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 +86,11 @@ + GVolumeMonitor *volume_monitor; + + GVfsMonitor *root_monitor; -+ ++ + GList *files; -+ ++ + guint recompute_idle_tag; -+ ++ + GMountSpec *mount_spec; +}; + @@ -104,7 +105,7 @@ + g_object_unref (file->icon); + if (file->root) + g_object_unref (file->root); -+ ++ + g_slice_free (NovellNautilus, file); +} + @@ -118,7 +119,7 @@ + + 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 +153,7 @@ + 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 +163,7 @@ + } + + 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 +173,7 @@ +{ + 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 +191,10 @@ + while (files != NULL) + { + file = files->data; -+ ++ + if (file->filename == NULL) + return FALSE; -+ ++ + if (strcmp (file->filename, filename) == 0) + return TRUE; + @@ -229,7 +230,7 @@ + + old_files = backend->files; + backend->files = files; -+ ++ + /* Generate change events */ + oldl = old_files; + newl = files; @@ -253,7 +254,7 @@ + old = oldl->data; + cmp = strcmp (old->filename, new->filename); + } -+ ++ + if (cmp == 0) + { + if (!nvvfs_file_equal (old, new)) @@ -265,7 +266,7 @@ + NULL); + g_free (filename); + } -+ ++ + oldl = oldl->next; + newl = newl->next; + } @@ -290,7 +291,7 @@ + newl = newl->next; + } + } -+ ++ + g_list_foreach (old_files, (GFunc)nvvfs_file_free, NULL); +} + @@ -315,11 +316,11 @@ + 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 +328,7 @@ + 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 +353,7 @@ + backend->recompute_idle_tag = 0; + + recompute_files (backend); -+ ++ + return FALSE; +} + @@ -361,7 +362,7 @@ + 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 +402,7 @@ + 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 +426,10 @@ + + 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 +472,7 @@ + GFileInfo *info) +{ + char *uri; -+ ++ + g_file_info_set_name (info, file->filename); + g_file_info_set_display_name (info, file->display_name); + @@ -513,7 +514,7 @@ + + file = lookup (G_VFS_BACKEND_NVVFS (backend), + G_VFS_JOB (job), filename); -+ ++ + if (file != &root) + { + if (file != NULL) @@ -524,21 +525,21 @@ + } + + 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 +559,7 @@ + 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 +578,7 @@ + file_info_from_file (file, info); + g_vfs_job_succeeded (G_VFS_JOB (job)); + } -+ ++ + return TRUE; +} + @@ -586,7 +587,7 @@ +{ + 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; @@ -594,13 +595,14 @@ + backend_class->try_query_info = try_query_info; + backend_class->try_enumerate = try_enumerate; +} -Index: gvfs-1.15.1/daemon/gvfsbackendnvvfs.h -=================================================================== +diff --git a/daemon/gvfsbackendnvvfs.h b/daemon/gvfsbackendnvvfs.h +new file mode 100644 +index 0000000..eebf062 --- /dev/null -+++ gvfs-1.15.1/daemon/gvfsbackendnvvfs.h ++++ b/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 @@ -649,49 +651,73 @@ +G_END_DECLS + +#endif /* __G_VFS_BACKEND_NVVFS_H__ */ -Index: gvfs-1.15.1/daemon/Makefile.am -=================================================================== ---- gvfs-1.15.1.orig/daemon/Makefile.am -+++ gvfs-1.15.1/daemon/Makefile.am -@@ -139,6 +139,10 @@ endif - - noinst_DATA = $(mount_DATA:.mount=.localmount) - -+mount_in_files += nvvfs.mount.in -+mount_DATA += nvvfs.mount -+libexec_PROGRAMS += gvfsd-nvvfs -+ - EXTRA_DIST = \ - $(service_in_files) \ - $(systemd_user_in_files) \ -@@ -521,6 +525,20 @@ gvfsd_http_CPPFLAGS = \ +diff --git a/daemon/meson.build b/daemon/meson.build +index dabdcb2..81e219a 100644 +--- a/daemon/meson.build ++++ b/daemon/meson.build +@@ -558,6 +558,20 @@ if enable_nfs + mounts += ['nfs'] + endif - gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS) - -+gvfsd_nvvfs_SOURCES = \ -+ gvfsbackendnvvfs.c gvfsbackendnvvfs.h \ -+ daemon-main.c daemon-main.h \ -+ daemon-main-generic.c -+ -+gvfsd_nvvfs_CPPFLAGS = $(flags) \ -+ -DBACKEND_HEADER=gvfsbackendnvvfs.h \ -+ -DDEFAULT_BACKEND_TYPE=nvvfs \ -+ -DMAX_JOB_THREADS=1 \ -+ -DBACKEND_TYPES='"nvvfs", G_VFS_TYPE_BACKEND_NVVFS,' -+ -+gvfsd_nvvfs_LDADD = $(libraries) -+ -+ - gvfsd_dav_SOURCES = \ - gvfshttpinputstream.c gvfshttpinputstream.h \ - gvfsbackendhttp.c gvfsbackendhttp.h \ -Index: gvfs-1.15.1/daemon/nvvfs.mount.in -=================================================================== ++if enable_nvvfs ++ sources = daemon_main_sources + files('gvfsbackendnvvfs.c') ++ ++ cflags = [ ++ '-DBACKEND_HEADER=gvfsbackendnvvfs.h', ++ '-DDEFAULT_BACKEND_TYPE=nvvfs', ++ '-DBACKEND_TYPES="nvvfs", G_VFS_TYPE_BACKEND_NVVFS,', ++ '-DMA_JOB_THREADS=1', ++ ] ++ ++ programs += [['gvfsd-nvvfs', {'sources': sources, 'dependencies': [gio_unix_dep], 'c_args': cflags}]] ++ mounts += ['nvvfs'] ++endif ++ + foreach program: programs + options = program[1] + kwargs = { +diff --git a/daemon/nvvfs.mount.in b/daemon/nvvfs.mount.in +new file mode 100644 +index 0000000..c5d6f8e --- /dev/null -+++ gvfs-1.15.1/daemon/nvvfs.mount.in ++++ b/daemon/nvvfs.mount.in @@ -0,0 +1,5 @@ +[Mount] +Type=nvvfs +Exec=@libexecdir@/gvfsd-nvvfs +AutoMount=false +Scheme=nvvfs +diff --git a/meson.build b/meson.build +index 6525b79..016d4c7 100644 +--- a/meson.build ++++ b/meson.build +@@ -461,6 +461,9 @@ if enable_nfs + libnfs_dep = dependency('libnfs', version: '>= 1.9.8') + endif + ++# *** NVVFS backend *** ++enable_nvvfs = get_option('nvvfs') ++ + # *** SFTP backend *** + enable_sftp = get_option('sftp') + if enable_sftp +@@ -514,6 +517,7 @@ output += ' gphoto2: ' + enable_gphoto2.to_string() + '\n' + output += ' http: ' + enable_http.to_string() + '\n' + output += ' mtp: ' + enable_mtp.to_string() + '\n' + output += ' nds: ' + enable_nds.to_string() + '\n' ++output += ' nvvfs: ' + enable_nvvfs.to_string() + '\n' + output += ' nfs: ' + enable_nfs.to_string() + '\n' + output += ' sftp: ' + enable_sftp.to_string() + '\n' + output += ' smb: ' + enable_samba.to_string() + '\n' +diff --git a/meson_options.txt b/meson_options.txt +index dced004..e7a9398 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -14,6 +14,7 @@ option('http', type: 'boolean', value: true, description: 'build with http/dav b + 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')