Hello community,
here is the log from the commit of package vagrant-sshfs for openSUSE:Factory
checked in at 2020-03-17 13:09:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vagrant-sshfs (Old)
and /work/SRC/openSUSE:Factory/.vagrant-sshfs.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vagrant-sshfs"
Tue Mar 17 13:09:22 2020 rev:6 rq:785609 version:1.3.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/vagrant-sshfs/vagrant-sshfs.changes
2020-02-14 16:36:20.835551391 +0100
+++ /work/SRC/openSUSE:Factory/.vagrant-sshfs.new.3160/vagrant-sshfs.changes
2020-03-17 13:09:27.745767505 +0100
@@ -1,0 +2,12 @@
+Mon Mar 16 12:01:33 UTC 2020 - Dan Čermák <dcer...@suse.com>
+
+- New upstream release 1.3.4
+
+ * guest: redhat: use yum to install epel-release
+ * guest: redhat: pull fuse-sshfs from PowerTools repo on el8
+ * guest: redhat: handle missing el8 version detection in vagrant
+ * Update vagrant in Gemfile
+ * RELEASE: update some release instructions
+ * version: bump to 1.3.4
+
+-------------------------------------------------------------------
Old:
----
vagrant-sshfs-1.3.3.tar.gz
vagrant-sshfs-1.3.3.tar.gz.asc
New:
----
vagrant-sshfs-1.3.4.tar.gz
vagrant-sshfs-1.3.4.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vagrant-sshfs.spec ++++++
--- /var/tmp/diff_new_pack.GryPdl/_old 2020-03-17 13:09:28.237767882 +0100
+++ /var/tmp/diff_new_pack.GryPdl/_new 2020-03-17 13:09:28.237767882 +0100
@@ -22,7 +22,7 @@
%define mod_name %{vagrant_plugin_name}
%define mod_full_name %{vagrant_plugin_name}-%{version}
Name: %{vagrant_plugin_name}
-Version: 1.3.3
+Version: 1.3.4
Release: 0
Summary: SSHFS synced folder implementation for Vagrant
License: GPL-2.0-only
++++++ vagrant-sshfs-1.3.3.tar.gz -> vagrant-sshfs-1.3.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Gemfile new/Gemfile
--- old/Gemfile 2020-01-05 06:21:02.000000000 +0100
+++ new/Gemfile 2020-03-15 23:33:38.000000000 +0100
@@ -6,7 +6,7 @@
# 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.6'
+ gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git";, :ref =>
'v2.2.7'
end
group :plugins do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/RELEASE.txt new/RELEASE.txt
--- old/RELEASE.txt 2020-01-05 06:21:02.000000000 +0100
+++ new/RELEASE.txt 2020-03-15 23:33:38.000000000 +0100
@@ -1,5 +1,8 @@
# point local system to git for vagrant-sshfs
+ - cd /usr/share/vagrant/gems/gems
+ - sudo mv vagrant-sshfs-1.3.3 vsshfs133
+ - sudo ln -s /var/b/shared/code/github.com/dustymabe/vagrant-sshfs
./vagrant-sshfs-1.3.3
# Run misc tests
cd /var/b/shared/code/github.com/dustymabe/vagrant-sshfs/test/misc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/vagrant-sshfs/cap/guest/redhat/sshfs_client.rb
new/lib/vagrant-sshfs/cap/guest/redhat/sshfs_client.rb
--- old/lib/vagrant-sshfs/cap/guest/redhat/sshfs_client.rb 2020-01-05
06:21:02.000000000 +0100
+++ new/lib/vagrant-sshfs/cap/guest/redhat/sshfs_client.rb 2020-03-15
23:33:38.000000000 +0100
@@ -3,13 +3,27 @@
module Cap
class SSHFSClient
def self.sshfs_install(machine)
- # Install epel rpm if not installed
- if !epel_installed(machine)
- epel_install(machine)
+
+ rhel_version = machine.guest.capability("flavor")
+
+ # Handle the case where Vagrant doesn't yet know how to
+ # detect and return :rhel_8
https://github.com/hashicorp/vagrant/pull/11453
+ if Gem::Version.new(Vagrant::VERSION) < Gem::Version.new('2.2.8')
+ rhel_version = vagrant_lt_228_flavor_compat(machine)
end
- # Install sshfs (comes from epel repos)
- machine.communicate.sudo("yum -y install fuse-sshfs")
+ case rhel_version
+ when :rhel_8
+ # 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")
+ when :rhel_7, :rhel # rhel7 and rhel6
+ # Install fuse-sshfs from epel
+ if !epel_installed(machine)
+ epel_install(machine)
+ end
+ machine.communicate.sudo("yum -y install fuse-sshfs")
+ end
end
def self.sshfs_installed(machine)
@@ -23,11 +37,23 @@
end
def self.epel_install(machine)
- case machine.guest.capability("flavor")
- when :rhel_7
- machine.communicate.sudo("rpm -ivh
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm";)
- when :rhel # rhel6
- machine.communicate.sudo("rpm -ivh
https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm";)
+ machine.communicate.sudo("yum -y install epel-release")
+ end
+
+ def self.vagrant_lt_228_flavor_compat(machine)
+ # This is a compatibility function to handle RHEL8 for
+ # vagrant versions that didn't include:
+ # https://github.com/hashicorp/vagrant/pull/11453
+ output = ""
+ machine.communicate.sudo("cat /etc/redhat-release") do |_, data|
+ output = data
+ end
+ if output =~ /(CentOS|Red Hat
Enterprise|Scientific|Cloud|Virtuozzo)\s*Linux( .+)? release 8/i
+ return :rhel_8
+ elsif output =~ /(CentOS|Red Hat
Enterprise|Scientific|Cloud|Virtuozzo)\s*Linux( .+)? release 7/i
+ return :rhel_7
+ else
+ return :rhel
end
end
end
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-01-05 06:21:02.000000000 +0100
+++ new/lib/vagrant-sshfs/version.rb 2020-03-15 23:33:38.000000000 +0100
@@ -1,5 +1,5 @@
module VagrantPlugins
module SyncedFolderSSHFS
- VERSION = "1.3.3"
+ VERSION = "1.3.4"
end
end
