vagrant-sshfs 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6513280765fd1bba7182361d9f45354f46bf094d4880da5aa53f37f25fdaab3b
-  data.tar.gz: 8eda8064052fca6390542acf1ce1a63aa98e04f4c69e8c9a66ff197cc868efcc
+  metadata.gz: 67c5b84b4c824dd5ddedd3971d74d64cd565b0343333f3dfe3c314e2d1714c5a
+  data.tar.gz: f62e9fedb4e7944b87b5ce64b64df2c9b0e155dc72a8bf4d8a087da3f2319a11
 SHA512:
-  metadata.gz: b7541dfccd42e153b37da97bc8d84427ca0c87674b0d2333861d98fb946b4ca3847d9c51ac0bb511525207554b21c075a9e22bba3fd6699f03737d877abad24d
-  data.tar.gz: 2e494e523004ded8fcd6644bcdf951728a534110df6d898a2fd55350f7df64842ac089483783c2433d76c4478e30e9185fbde16fff7280a09675749f47da4385
+  metadata.gz: 789c76020230299d03c670b595b4726c2143168c8dd3da1410d64356e81db7a8bb9b85875499b5221e1ef269affba39a7dd00c231dd197fcda201ca2dffcd41c
+  data.tar.gz: 9437171f5eebd043e06f500d3d2007a4c61b0bcfbaee03069b15eef77f06e36d749e17954695e04af7375c1be57385fba0842bb585a5769ac32d2d774efd57a0

data/Gemfile

@@ -6,11 +6,11 @@ group :development do
   # 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

data/build.sh

@@ -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

data/lib/vagrant-sshfs/cap/guest/centos/sshfs_client.rb

@@ -6,9 +6,10 @@ module VagrantPlugins
 
           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)

data/lib/vagrant-sshfs/cap/guest/linux/sshfs_forward_mount.rb

@@ -288,8 +288,8 @@ module VagrantPlugins
                            :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)

data/lib/vagrant-sshfs/cap/host/darwin/sshfs_reverse_mount.rb

@@ -120,7 +120,7 @@ module VagrantPlugins
                            :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
 

data/lib/vagrant-sshfs/cap/host/linux/sshfs_reverse_mount.rb

@@ -117,7 +117,7 @@ module VagrantPlugins
                            :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
 

data/lib/vagrant-sshfs/synced_folder.rb

@@ -110,6 +110,7 @@ module VagrantPlugins
             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)

data/lib/vagrant-sshfs/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module SyncedFolderSSHFS
-    VERSION = "1.3.5"
+    VERSION = "1.3.6"
   end
 end

data/test/misc/README.txt

@@ -13,6 +13,11 @@ export THIRD_PARTY_HOST='192.168.121.73'
 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 @@ Testing reverse mount!
 # 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

data/test/misc/Vagrantfile

@@ -22,7 +22,7 @@ Vagrant.configure(2) do |config|
     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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-sshfs
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Dusty Mabe
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2021-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: win32-process
@@ -99,7 +99,7 @@ homepage: https://github.com/dustymabe/vagrant-sshfs
 licenses:
 - GPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -114,8 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: 'A Vagrant synced folder plugin that mounts folders via SSHFS.  This is the
   successor to Fabio Kreusch''s implementation: https://github.com/fabiokr/vagrant-sshfs'