Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vagrant-sshfs for openSUSE:Factory checked in at 2021-05-11 23:03:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vagrant-sshfs (Old) and /work/SRC/openSUSE:Factory/.vagrant-sshfs.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vagrant-sshfs" Tue May 11 23:03:33 2021 rev:13 rq:890523 version:1.3.6 Changes: -------- --- /work/SRC/openSUSE:Factory/vagrant-sshfs/vagrant-sshfs.changes 2020-09-14 12:34:32.413336329 +0200 +++ /work/SRC/openSUSE:Factory/.vagrant-sshfs.new.2988/vagrant-sshfs.changes 2021-05-11 23:03:44.073074230 +0200 @@ -1,0 +2,26 @@ +Wed May 5 05:38:32 UTC 2021 - Dan ??erm??k <[email protected]> + +New upstream release 1.3.6 + +Thanks to the following contributors for patches during this release: + +Dominique Leuenberger <[email protected]> (1): + cc2757e synced_folder: Add directory for SUSE/openSUSE to find sftp-server + +Dusty Mabe <[email protected]> (5): + b5652a5 guest: centos: use lowercase for powertools repo + c50fb6e More places where we can not pass file descriptors. + 4bef1db tests: update to use Fedora 34 vagrant box + dd02818 Gemfile: bump to latest versions of vagrant and vagrant-libvirt + 0f5c864 version: bump to 1.3.6 + +Ian2020 <[email protected]> (1): + 2615783 Fix #120: do not pass our file descriptors to spawned children + +Dropped patches: +- vagrant-sshfs-libexecdir.patch + +Rebased patches: +- 0001-Use-opensuse-Tumbleweed.-uname-m-box-instead-of-Fedo.patch + +------------------------------------------------------------------- Old: ---- vagrant-sshfs-1.3.5.tar.gz vagrant-sshfs-1.3.5.tar.gz.asc vagrant-sshfs-libexecdir.patch New: ---- vagrant-sshfs-1.3.6.tar.gz vagrant-sshfs-1.3.6.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vagrant-sshfs.spec ++++++ --- /var/tmp/diff_new_pack.9xnHZf/_old 2021-05-11 23:03:44.661071548 +0200 +++ /var/tmp/diff_new_pack.9xnHZf/_new 2021-05-11 23:03:44.661071548 +0200 @@ -1,7 +1,7 @@ # # spec file for package vagrant-sshfs # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,11 +24,10 @@ %define mod_name %{vagrant_plugin_name} %define mod_full_name %{vagrant_plugin_name}-%{version} Name: %{vagrant_plugin_name} -Version: 1.3.5 +Version: 1.3.6 Release: 0 Summary: SSHFS synced folder implementation for Vagrant License: GPL-2.0-only -Group: Development/Languages/Ruby URL: https://github.com/dustymabe/%{name} Source0: %{URL}/releases/download/v%{version}/%{mod_full_name}.tar.gz Source1: %{URL}/releases/download/v%{version}/%{mod_full_name}.tar.gz.asc @@ -38,8 +37,6 @@ Source3: testsuite.sh # FIX-OPENSUSE use the Tumbleweed.$(uname -m) vagrant box instead of fedora/*-cloud-base Patch0: 0001-Use-opensuse-Tumbleweed.-uname-m-box-instead-of-Fedo.patch -# PATCH-FIX-OPENSUSE vagrant-sshfs-libexecdir.patch -- Use /usr/libexecdir/ssh to find sftp-server -Patch1: vagrant-sshfs-libexecdir.patch BuildRequires: %{ruby} BuildRequires: ruby-macros >= 5 BuildRequires: vagrant >= 1.9.1 ++++++ 0001-Use-opensuse-Tumbleweed.-uname-m-box-instead-of-Fedo.patch ++++++ --- /var/tmp/diff_new_pack.9xnHZf/_old 2021-05-11 23:03:44.677071475 +0200 +++ /var/tmp/diff_new_pack.9xnHZf/_new 2021-05-11 23:03:44.677071475 +0200 @@ -1,7 +1,7 @@ From ce3bfd63c220437d4921eac3660e57de22698493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Wed, 1 Apr 2020 22:34:10 +0200 -Subject: [PATCH] Use opensuse/Tumbleweed.$(uname -m) box instead of Fedora/32 +Subject: [PATCH] Use opensuse/Tumbleweed.$(uname -m) box instead of Fedora/34 --- test/misc/Vagrantfile | 2 +- @@ -15,7 +15,7 @@ config.vm.synced_folder "/tmp/reverse_mount_etc/", "/etc", type: "sshfs", reverse: true host = 'sshfs-tests' -- box = 'fedora/32-cloud-base' +- box = 'fedora/34-cloud-base' + box = "opensuse/Tumbleweed.#{(RUBY_PLATFORM.split '-')[0]}" config.vm.define host do | tmp | ++++++ vagrant-sshfs-1.3.5.tar.gz -> vagrant-sshfs-1.3.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gemfile new/Gemfile --- old/Gemfile 2020-06-29 07:34:19.000000000 +0200 +++ new/Gemfile 2021-05-03 21:42:30.000000000 +0200 @@ -6,11 +6,11 @@ # We depend on Vagrant for development, but we don't add it as a # gem dependency because we expect to be installed within the # Vagrant environment itself using `vagrant plugin`. - gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git";, :ref => 'v2.2.9' + gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git";, :ref => 'v2.2.16' end group :plugins do # Add vagrant-libvirt plugin here, otherwise you won't be able to # use libvirt as a provider when you execute `bundle exec vagrant up` - gem "vagrant-libvirt" , '0.0.45' + gem "vagrant-libvirt" , '0.4.1' end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build.sh new/build.sh --- old/build.sh 2020-06-29 07:34:19.000000000 +0200 +++ new/build.sh 2021-05-03 21:42:30.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/bash -x set -ex -ctr=$(buildah from registry.fedoraproject.org/fedora:31) +ctr=$(buildah from registry.fedoraproject.org/fedora:33) rpms=( make gcc ruby ruby-devel redhat-rpm-config # for building gems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/vagrant-sshfs/cap/guest/centos/sshfs_client.rb new/lib/vagrant-sshfs/cap/guest/centos/sshfs_client.rb --- old/lib/vagrant-sshfs/cap/guest/centos/sshfs_client.rb 2020-06-29 07:34:19.000000000 +0200 +++ new/lib/vagrant-sshfs/cap/guest/centos/sshfs_client.rb 2021-05-03 21:42:30.000000000 +0200 @@ -6,9 +6,10 @@ case machine.guest.capability("flavor") when :centos_8 - # No need to install epel. fuse-sshfs comes from the PowerTools repo + # No need to install epel. fuse-sshfs comes from the powertools repo # https://bugzilla.redhat.com/show_bug.cgi?id=1758884 - machine.communicate.sudo("yum -y install --enablerepo=PowerTools fuse-sshfs") + # https://github.com/dustymabe/vagrant-sshfs/issues/123 + machine.communicate.sudo("yum -y install --enablerepo=powertools fuse-sshfs") when :centos_7, :centos # centos7 and centos6 # Install fuse-sshfs from epel if !epel_installed(machine) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/vagrant-sshfs/cap/guest/linux/sshfs_forward_mount.rb new/lib/vagrant-sshfs/cap/guest/linux/sshfs_forward_mount.rb --- old/lib/vagrant-sshfs/cap/guest/linux/sshfs_forward_mount.rb 2020-06-29 07:34:19.000000000 +0200 +++ new/lib/vagrant-sshfs/cap/guest/linux/sshfs_forward_mount.rb 2021-05-03 21:42:30.000000000 +0200 @@ -288,8 +288,8 @@ :thread_inherit => true, :startup_info => {:stdin => w1, :stdout => r2, :stderr => f2}) else - p1 = spawn(sftp_server_cmd, :out => w2, :in => r1, :err => f1, :pgroup => true) - p2 = spawn(ssh_cmd, :out => w1, :in => r2, :err => f2, :pgroup => true) + p1 = spawn(sftp_server_cmd, :out => w2, :in => r1, :err => f1, :pgroup => true, :close_others => true) + p2 = spawn(ssh_cmd, :out => w1, :in => r2, :err => f2, :pgroup => true, :close_others => true) # Detach from the processes so they will keep running Process.detach(p1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/vagrant-sshfs/cap/host/darwin/sshfs_reverse_mount.rb new/lib/vagrant-sshfs/cap/host/darwin/sshfs_reverse_mount.rb --- old/lib/vagrant-sshfs/cap/host/darwin/sshfs_reverse_mount.rb 2020-06-29 07:34:19.000000000 +0200 +++ new/lib/vagrant-sshfs/cap/host/darwin/sshfs_reverse_mount.rb 2021-05-03 21:42:30.000000000 +0200 @@ -120,7 +120,7 @@ :thread_inherit => true, :startup_info => {:stdin => w2, :stdout => r1, :stderr => f1}) else - p1 = spawn(sshfs_cmd, :out => f1, :err => f1, :pgroup => true) + p1 = spawn(sshfs_cmd, :out => f1, :err => f1, :pgroup => true, :close_others => true) Process.detach(p1) # Detach so process will keep running end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/vagrant-sshfs/cap/host/linux/sshfs_reverse_mount.rb new/lib/vagrant-sshfs/cap/host/linux/sshfs_reverse_mount.rb --- old/lib/vagrant-sshfs/cap/host/linux/sshfs_reverse_mount.rb 2020-06-29 07:34:19.000000000 +0200 +++ new/lib/vagrant-sshfs/cap/host/linux/sshfs_reverse_mount.rb 2021-05-03 21:42:30.000000000 +0200 @@ -117,7 +117,7 @@ :thread_inherit => true, :startup_info => {:stdin => w2, :stdout => r1, :stderr => f1}) else - p1 = spawn(sshfs_cmd, :out => f1, :err => f1, :pgroup => true) + p1 = spawn(sshfs_cmd, :out => f1, :err => f1, :pgroup => true, :close_others => true) Process.detach(p1) # Detach so process will keep running end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/vagrant-sshfs/synced_folder.rb new/lib/vagrant-sshfs/synced_folder.rb --- old/lib/vagrant-sshfs/synced_folder.rb 2020-06-29 07:34:19.000000000 +0200 +++ new/lib/vagrant-sshfs/synced_folder.rb 2021-05-03 21:42:30.000000000 +0200 @@ -110,6 +110,7 @@ ENV['PATH'] += ';C:\cygwin64\usr\sbin' end else + ENV['PATH'] += ':/usr/libexec/ssh' # Linux (openSUSE/SUSE Family) ENV['PATH'] += ':/usr/libexec/openssh' # Linux (Red Hat Family) ENV['PATH'] += ':/usr/lib/openssh' # Linux (Debian Family) ENV['PATH'] += ':/usr/lib/ssh' # Linux (Arch Linux Family) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/vagrant-sshfs/version.rb new/lib/vagrant-sshfs/version.rb --- old/lib/vagrant-sshfs/version.rb 2020-06-29 07:34:19.000000000 +0200 +++ new/lib/vagrant-sshfs/version.rb 2021-05-03 21:42:30.000000000 +0200 @@ -1,5 +1,5 @@ module VagrantPlugins module SyncedFolderSSHFS - VERSION = "1.3.5" + VERSION = "1.3.6" end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/misc/README.txt new/test/misc/README.txt --- old/test/misc/README.txt 2020-06-29 07:34:19.000000000 +0200 +++ new/test/misc/README.txt 2021-05-03 21:42:30.000000000 +0200 @@ -13,6 +13,11 @@ export THIRD_PARTY_HOST_USER='vagrant' export THIRD_PARTY_HOST_PASS='vagrant' +# Open an extra file descriptor to test it is not passed onto child processes +# https://github.com/dustymabe/vagrant-sshfs/issues/120 +tmpfile=$(mktemp) +exec {extra_fd}<> "$tmpfile" + # Next vagrant up - will do 4 mounts # - slave # - slave with sym link @@ -34,3 +39,9 @@ # We are printing out the machine-id under each mount. The first two should be the same, because they are from the same machine. The last two should be different. + +# Close our file descriptor. No other process should be using it +exec {extra_fd}>&- +if lsof -wn -d $extra_fd | grep "$tmpfile"; then + echo "Failure: there are processes running that hold an inherited file descriptor" +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/misc/Vagrantfile new/test/misc/Vagrantfile --- old/test/misc/Vagrantfile 2020-06-29 07:34:19.000000000 +0200 +++ new/test/misc/Vagrantfile 2021-05-03 21:42:30.000000000 +0200 @@ -22,7 +22,7 @@ config.vm.synced_folder "/tmp/reverse_mount_etc/", "/etc", type: "sshfs", reverse: true host = 'sshfs-tests' - box = 'fedora/32-cloud-base' + box = 'fedora/34-cloud-base' config.vm.define host do | tmp | tmp.vm.hostname = host
