Hello community, here is the log from the commit of package vagrant-sshfs for openSUSE:Factory checked in at 2020-06-29 21:18:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vagrant-sshfs (Old) and /work/SRC/openSUSE:Factory/.vagrant-sshfs.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vagrant-sshfs" Mon Jun 29 21:18:44 2020 rev:10 rq:817739 version:1.3.5 Changes: -------- --- /work/SRC/openSUSE:Factory/vagrant-sshfs/vagrant-sshfs.changes 2020-05-14 23:25:53.725125134 +0200 +++ /work/SRC/openSUSE:Factory/.vagrant-sshfs.new.3060/vagrant-sshfs.changes 2020-06-29 21:19:17.697956585 +0200 @@ -1,0 +2,29 @@ +Mon Jun 29 08:48:30 UTC 2020 - Dan Čermák <[email protected]> + +- New upstream release 1.3.5 + + Dropped patches: + * 0001-Use-var-run-run-symlink-for-tests.patch (merged upstream) + * 0002-Use-opensuse-Tumbleweed.-uname-m-box-instead-of-Fedo.patch (rebased) + + Added patches: + * 0001-Use-opensuse-Tumbleweed.-uname-m-box-instead-of-Fedo.patch + + Changelog for 1.3.5: + + Adam Butler <[email protected]> (1): + eb6446f Add CentOS guest support for compatibility with Vagrant v2.2.8+ + + Dan Čermák <[email protected]> (1): + 99a62bb Use /var/run/ -> /run symlink for tests + + Dusty Mabe <[email protected]> (7): + 3bc01b5 guest: centos: add a few comments into sshfs_client.rb + 1a0f440 guest: centos: rename module with capital OS + f4408e3 guest: redhat: reset back to pre-EL8 modifications + 04235d9 guest: redhat: add best-effort support for RHEL8 + b1d92d9 Update vagrant in Gemfile to 2.2.9 + 596360a tests: update to use Fedora 32 vagrant box + fa27379 version: bump to 1.3.5 + +------------------------------------------------------------------- Old: ---- 0001-Use-var-run-run-symlink-for-tests.patch 0002-Use-opensuse-Tumbleweed.-uname-m-box-instead-of-Fedo.patch vagrant-sshfs-1.3.4.tar.gz vagrant-sshfs-1.3.4.tar.gz.asc New: ---- 0001-Use-opensuse-Tumbleweed.-uname-m-box-instead-of-Fedo.patch vagrant-sshfs-1.3.5.tar.gz vagrant-sshfs-1.3.5.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vagrant-sshfs.spec ++++++ --- /var/tmp/diff_new_pack.ss8iLg/_old 2020-06-29 21:19:18.813960038 +0200 +++ /var/tmp/diff_new_pack.ss8iLg/_new 2020-06-29 21:19:18.817960050 +0200 @@ -31,7 +31,7 @@ %define mod_name %{vagrant_plugin_name} %define mod_full_name %{vagrant_plugin_name}-%{version} Name: %{vagrant_plugin_name} -Version: 1.3.4 +Version: 1.3.5 Release: 0 Summary: SSHFS synced folder implementation for Vagrant License: GPL-2.0-only @@ -43,10 +43,8 @@ Source2: https://keybase.io/dustymabe/pgp_keys.asc#/%{name}.keyring # custom script to automate the test suite run Source3: testsuite.sh -# https://github.com/dustymabe/vagrant-sshfs/pull/109 -Patch0: 0001-Use-var-run-run-symlink-for-tests.patch # FIX-OPENSUSE use the Tumbleweed.$(uname -m) vagrant box instead of fedora/*-cloud-base -Patch1: 0002-Use-opensuse-Tumbleweed.-uname-m-box-instead-of-Fedo.patch +Patch0: 0001-Use-opensuse-Tumbleweed.-uname-m-box-instead-of-Fedo.patch BuildRequires: %{ruby} BuildRequires: ruby-macros >= 5 BuildRequires: vagrant >= 1.9.1 ++++++ 0002-Use-opensuse-Tumbleweed.-uname-m-box-instead-of-Fedo.patch -> 0001-Use-opensuse-Tumbleweed.-uname-m-box-instead-of-Fedo.patch ++++++ --- /work/SRC/openSUSE:Factory/vagrant-sshfs/0002-Use-opensuse-Tumbleweed.-uname-m-box-instead-of-Fedo.patch 2020-04-01 22:56:43.544566415 +0200 +++ /work/SRC/openSUSE:Factory/.vagrant-sshfs.new.3060/0001-Use-opensuse-Tumbleweed.-uname-m-box-instead-of-Fedo.patch 2020-06-29 21:19:17.149954889 +0200 @@ -1,26 +1,25 @@ -From 56f320784d5439fa30104c9b62e63135e693505f Mon Sep 17 00:00:00 2001 +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 2/2] Use opensuse/Tumbleweed.$(uname -m) box instead of - Fedora/31 +Subject: [PATCH] Use opensuse/Tumbleweed.$(uname -m) box instead of Fedora/32 --- test/misc/Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/misc/Vagrantfile b/test/misc/Vagrantfile -index b975ffa..9874f79 100644 +index ce390ea..9874f79 100644 --- a/test/misc/Vagrantfile +++ b/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/31-cloud-base' +- box = 'fedora/32-cloud-base' + box = "opensuse/Tumbleweed.#{(RUBY_PLATFORM.split '-')[0]}" config.vm.define host do | tmp | tmp.vm.hostname = host -- -2.26.0 +2.27.0 ++++++ vagrant-sshfs-1.3.4.tar.gz -> vagrant-sshfs-1.3.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gemfile new/Gemfile --- old/Gemfile 2020-03-15 23:33:38.000000000 +0100 +++ new/Gemfile 2020-06-29 07:34:19.000000000 +0200 @@ -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.7' + gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git";, :ref => 'v2.2.9' end group :plugins do 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 1970-01-01 01:00:00.000000000 +0100 +++ new/lib/vagrant-sshfs/cap/guest/centos/sshfs_client.rb 2020-06-29 07:34:19.000000000 +0200 @@ -0,0 +1,38 @@ +module VagrantPlugins + module GuestCentOS + module Cap + class SSHFSClient + def self.sshfs_install(machine) + + case machine.guest.capability("flavor") + when :centos_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 :centos_7, :centos # centos7 and centos6 + # 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) + machine.communicate.test("rpm -q fuse-sshfs") + end + + protected + + def self.epel_installed(machine) + machine.communicate.test("rpm -q epel-release") + end + + def self.epel_install(machine) + machine.communicate.sudo("yum -y install epel-release") + end + + end + end + end +end 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-03-15 23:33:38.000000000 +0100 +++ new/lib/vagrant-sshfs/cap/guest/redhat/sshfs_client.rb 2020-06-29 07:34:19.000000000 +0200 @@ -4,19 +4,16 @@ class SSHFSClient def self.sshfs_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 - - case rhel_version + case machine.guest.capability("flavor") 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") + # fuse-sshfs isn't in EPEL8 and how to get it from RHEL repos + # without having to have the system subscribed is unclear: + # https://github.com/dustymabe/vagrant-sshfs/issues/108#issuecomment-601061947 + # Using fuse-sshfs from EPEL7 works for now so let's just go with it. + # Do the install in such a way that the epel7 repo doesn't hang around + # on the system, which may have unintended consequences on RHEL8. + machine.communicate.sudo("rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7";) + machine.communicate.sudo("yum -y install fuse-sshfs --repofrompath=epel7,'http://download.fedoraproject.org/pub/epel/7/$basearch'") when :rhel_7, :rhel # rhel7 and rhel6 # Install fuse-sshfs from epel if !epel_installed(machine) @@ -37,23 +34,11 @@ end def self.epel_install(machine) - 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 + 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";) end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/vagrant-sshfs/plugin.rb new/lib/vagrant-sshfs/plugin.rb --- old/lib/vagrant-sshfs/plugin.rb 2020-03-15 23:33:38.000000000 +0100 +++ new/lib/vagrant-sshfs/plugin.rb 2020-06-29 07:34:19.000000000 +0200 @@ -97,6 +97,16 @@ VagrantPlugins::GuestRedHat::Cap::SSHFSClient end + guest_capability("centos", "sshfs_installed") do + require_relative "cap/guest/centos/sshfs_client" + VagrantPlugins::GuestCentOS::Cap::SSHFSClient + end + + guest_capability("centos", "sshfs_install") do + require_relative "cap/guest/centos/sshfs_client" + VagrantPlugins::GuestCentOS::Cap::SSHFSClient + end + guest_capability("fedora", "sshfs_installed") do require_relative "cap/guest/fedora/sshfs_client" VagrantPlugins::GuestFedora::Cap::SSHFSClient 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-03-15 23:33:38.000000000 +0100 +++ new/lib/vagrant-sshfs/version.rb 2020-06-29 07:34:19.000000000 +0200 @@ -1,5 +1,5 @@ module VagrantPlugins module SyncedFolderSSHFS - VERSION = "1.3.4" + VERSION = "1.3.5" end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/misc/Vagrantfile new/test/misc/Vagrantfile --- old/test/misc/Vagrantfile 2020-03-15 23:33:38.000000000 +0100 +++ new/test/misc/Vagrantfile 2020-06-29 07:34:19.000000000 +0200 @@ -8,7 +8,7 @@ # Test a forward mount to a location that is a symbolic link # https://github.com/dustymabe/vagrant-sshfs/issues/44 - config.vm.synced_folder "/etc/", "/sbin/forward_slave_mount_sym_link_test/", type: "sshfs" + config.vm.synced_folder "/etc/", "/var/run/forward_slave_mount_sym_link_test/", type: "sshfs" # Test a forward normal mount: # mounting a folder from a 3rd party host into guest @@ -22,7 +22,7 @@ config.vm.synced_folder "/tmp/reverse_mount_etc/", "/etc", type: "sshfs", reverse: true host = 'sshfs-tests' - box = 'fedora/31-cloud-base' + box = 'fedora/32-cloud-base' config.vm.define host do | tmp | tmp.vm.hostname = host diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/misc/dotests.sh new/test/misc/dotests.sh --- old/test/misc/dotests.sh 2020-03-15 23:33:38.000000000 +0100 +++ new/test/misc/dotests.sh 2020-06-29 07:34:19.000000000 +0200 @@ -8,7 +8,7 @@ # https://github.com/dustymabe/vagrant-sshfs/issues/44 echo -en "Testing slave forward mount with a symlink!\n\t" -vagrant ssh -- cat /usr/sbin/forward_slave_mount_sym_link_test/machine-id +vagrant ssh -- cat /run/forward_slave_mount_sym_link_test/machine-id echo -en "Testing normal forward mount!\n\t" vagrant ssh -- cat /tmp/forward_normal_mount_etc/machine-id
