Hello community, here is the log from the commit of package vagrant for openSUSE:Leap:15.2 checked in at 2020-02-21 13:53:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/vagrant (Old) and /work/SRC/openSUSE:Leap:15.2/.vagrant.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vagrant" Fri Feb 21 13:53:52 2020 rev:5 rq:776270 version:2.2.7 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/vagrant/vagrant.changes 2020-01-15 16:27:27.240720682 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.vagrant.new.26092/vagrant.changes 2020-02-21 13:53:53.562034579 +0100 @@ -1,0 +2,450 @@ +Tue Feb 11 08:45:33 UTC 2020 - Dan Čermák <[email protected]> + +- Add vagrant-rpmlintrc to sources + +------------------------------------------------------------------- +Mon Feb 10 15:13:14 UTC 2020 - Dan Čermák <[email protected]> + +- Bump the version of net-ssh + + Rebased patches: + * 0001-bin-vagrant-silence-warning-about-installer.patch + * 0002-Use-a-private-temporary-dir.patch + * 0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch + * 0004-plugins-don-t-abuse-require_relative.patch.patch + * 0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch + * 0006-do-not-depend-on-wdm.patch + * 0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch + * 0008-Don-t-abuse-relative-paths-in-plugins.patch + * 0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch + * 0010-Skip-failing-tests.patch + * 0011-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch + * 0012-Disable-Subprocess-unit-test.patch + + Added patch: + * 0013-Update-some-outdated-gem-versions.patch + +------------------------------------------------------------------- +Tue Jan 28 10:46:16 UTC 2020 - Dan Čermák <[email protected]> + +- New upstream release 2.2.7 + + IMPROVEMENTS: + + - guest/opensuse: Check for basename hostname prior to setting hostname [GH-11170] + - host/linux: Check for modinfo in /sbin if it's not on PATH [GH-11178] + - core: Show guest name in hostname error message [GH-11175] + - provisioners/shell: Linux guests now support `reboot` option [GH-11194] + - darwin/nfs: Put each NFS export on its own line [GH-11216] + - contrib/bash: Add more completion flags to up command [GH-11223] + - provider/virtualbox: Add VirtualBox provider support for version 6.1.x [GH-11250] + - box/outdated: Allow to force check for box updates and ignore cached check [GH-11231] + - guest/alpine: Update apk cache when installing rsync [GH-11220] + - provider/virtualbox: Improve error message when machine folder is inaccessible [GH-11239] + - provisioner/ansible_local: Add pip install method for arch guests [GH-11265] + - communicators/winssh: Use Windows shell for `vagrant ssh -c` [GH-11258] + + BUG FIXES: + + - command/snapshot/save: Fix regression that prevented snapshot of all guests in environment [GH-11152] + - core: Update UI to properly retain newlines when adding prefix [GH-11126] + - core: Check if box update is available locally [GH-11188] + - core: Ensure Vagrant::Errors are loaded in file_checksum util [GH-11183] + - cloud/publish: Improve argument handling for missing arguments to command [GH-11184] + - core: Get latest version for current provider during outdated check [GH-11192] + - linux/nfs: avoid adding extra newlines to /etc/exports [GH-11201] + - guest/darwin: Fix VMware synced folders on APFS [GH-11267] + - guest/redhat: Ensure `nfs-server` is restarted when installing nfs client [GH-11212] + - core: Do not validate checksums if options are empty string [GH-11211] + - provider/docker: Enhance docker build method to match against buildkit output [GH-11205] + - provisioner/ansible_local: Don't prompt for input when installing Ansible on Ubuntu and Debian [GH-11191] + - provisioner/ansible_local: Ensure all guest caps accept all passed in arguments [GH-11265] + - host/windows: Fix regression that prevented port collisions from being detected [GH-11244] + - core/provisioner: Set top level provisioner name if set in a provisioner config [GH-11295] + + Rebased patches: + * 0001-bin-vagrant-silence-warning-about-installer.patch + * 0002-Use-a-private-temporary-dir.patch + * 0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch + * 0004-plugins-don-t-abuse-require_relative.patch.patch + * 0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch + * 0006-do-not-depend-on-wdm.patch + * 0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch + * 0008-Don-t-abuse-relative-paths-in-plugins.patch + * 0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch + * 0010-Skip-failing-tests.patch + + Dropped patches: + * 0011-Bump-rspec-its-dependency.patch + (upstreamed) + * 0012-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch + (rebased as 0011-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch) + * 0013-Catch-NetworkNoInterfaces-error-in-docker-prepare_ne.patch + (upstreamed) + * 0014-Bump-rubyzip-version-to-fix-CVE-2019-16892.patch + (upstreamed) + * 0015-ARM-only-Disable-Subprocess-unit-test.patch + (rebased as 0012-Disable-Subprocess-unit-test.patch) + * 0016-Ensure-nfsd-call-is-mocked-up-in-BSD-NFS-test.patch + (upstreamed) + + Added patches: + * 0011-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch + * 0012-Disable-Subprocess-unit-test.patch + +------------------------------------------------------------------- +Thu Dec 19 11:22:33 UTC 2019 - Dan Čermák <[email protected]> + +- Add fix for failing unit test + + Added patch from upstream (https://github.com/hashicorp/vagrant/pull/11155): + - 0016-Ensure-nfsd-call-is-mocked-up-in-BSD-NFS-test.patch + + Rebased patches: + + - 0001-bin-vagrant-silence-warning-about-installer.patch + - 0002-Use-a-private-temporary-dir.patch + - 0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch + - 0004-plugins-don-t-abuse-require_relative.patch.patch + - 0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch + - 0006-do-not-depend-on-wdm.patch + - 0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch + - 0008-Don-t-abuse-relative-paths-in-plugins.patch + - 0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch + - 0010-Skip-failing-tests.patch + - 0011-Bump-rspec-its-dependency.patch + - 0012-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch + - 0013-Catch-NetworkNoInterfaces-error-in-docker-prepare_ne.patch + - 0015-ARM-only-Disable-Subprocess-unit-test.patch + +------------------------------------------------------------------- +Wed Nov 13 10:18:47 UTC 2019 - Dan Čermák <[email protected]> + +- Add rubyzip to as Requires: and bump its version to 1.3 + + This is required to address CVE-2019-16892 + + Rebased patches: + + - 0001-bin-vagrant-silence-warning-about-installer.patch + - 0002-Use-a-private-temporary-dir.patch + - 0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch + - 0004-plugins-don-t-abuse-require_relative.patch.patch + - 0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch + - 0006-do-not-depend-on-wdm.patch + - 0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch + - 0008-Don-t-abuse-relative-paths-in-plugins.patch + - 0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch + - 0010-Skip-failing-tests.patch + - 0011-Bump-rspec-its-dependency.patch + - 0012-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch + - 0013-Catch-NetworkNoInterfaces-error-in-docker-prepare_ne.patch + + Removed: + - 0014-ARM-only-Disable-Subprocess-unit-test.patch + + Added: + - 0014-Bump-rubyzip-version-to-fix-CVE-2019-16892.patch + - 0015-ARM-only-Disable-Subprocess-unit-test.patch + +------------------------------------------------------------------- +Tue Oct 22 08:30:24 UTC 2019 - Dan Čermák <[email protected]> + +- Rebased patches: + + - 0001-bin-vagrant-silence-warning-about-installer.patch + - 0002-Use-a-private-temporary-dir.patch + - 0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch + - 0004-plugins-don-t-abuse-require_relative.patch.patch + - 0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch + - 0006-do-not-depend-on-wdm.patch + - 0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch + - 0008-Don-t-abuse-relative-paths-in-plugins.patch + - 0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch + - 0010-Skip-failing-tests.patch + - 0011-Bump-rspec-its-dependency.patch + - 0012-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch + + Dropped (integrated upstream or made obsolete by upstream fixes): + - 0013-Only-return-interfaces-where-addr-is-not-nil.patch + - 0014-Skip-docker-networking-test.patch + + Removed: + - 0015-ARM-only-Disable-Subprocess-unit-test.patch + + Added: + - 0013-Catch-NetworkNoInterfaces-error-in-docker-prepare_ne.patch + - 0014-ARM-only-Disable-Subprocess-unit-test.patch + + This update fixes boo#1150592 + +------------------------------------------------------------------- +Fri Oct 18 06:31:22 UTC 2019 - Johannes Kastl <[email protected]> + +- update to 2.2.6 + - dropped patch 0013-Only-return-interfaces-where-addr-is-not-nil.patch that has been included upstream + - set vagrant_cloud dependency to >= 2.0.3 + + FEATURES: + core/provisioners: Introduce new Provisioner options: before and after [GH-11043] + guest/alpine: Integrate the vagrant-alpine plugin into Vagrant core [GH-10975] + + IMPROVEMENTS: + command/box/prune: Allow prompt skip while preserving actively in use boxes [GH-10908] + command/cloud: Support providing checksum information with boxes [GH-11101] + dev: Fixed Vagrantfile for Vagrant development [GH-11012] + guest/alt: Improve handling for using network tools when setting hostname [GH-11000] + guest/suse: Add ipv6 network config templates for SUSE based distributions [GH-11013] ++++ 253 more lines (skipped) ++++ between /work/SRC/openSUSE:Leap:15.2/vagrant/vagrant.changes ++++ and /work/SRC/openSUSE:Leap:15.2/.vagrant.new.26092/vagrant.changes Old: ---- 0002-bin-vagrant-silence-warning-about-installer.patch 0003-Use-a-private-temporary-dir.patch 0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch 0009-plugins-don-t-abuse-require_relative.patch 0023-vbox-fix-package.patch 0024-do-not-depend-on-wdm.patch 0025-do-not-abuse-relative-paths-in-docker-plugin.patch vagrant-2.2.0.tar.gz New: ---- 0001-bin-vagrant-silence-warning-about-installer.patch 0002-Use-a-private-temporary-dir.patch 0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch 0004-plugins-don-t-abuse-require_relative.patch.patch 0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch 0006-do-not-depend-on-wdm.patch 0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch 0008-Don-t-abuse-relative-paths-in-plugins.patch 0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch 0010-Skip-failing-tests.patch 0011-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch 0012-Disable-Subprocess-unit-test.patch 0013-Update-some-outdated-gem-versions.patch binstub macros.vagrant vagrant-2.2.7.tar.gz vagrant_post.rb vagrant_transfiletriggerin.rb vagrant_transfiletriggerun.rb ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vagrant.spec ++++++ ++++ 616 lines (skipped) ++++ between /work/SRC/openSUSE:Leap:15.2/vagrant/vagrant.spec ++++ and /work/SRC/openSUSE:Leap:15.2/.vagrant.new.26092/vagrant.spec ++++++ 0002-bin-vagrant-silence-warning-about-installer.patch -> 0001-bin-vagrant-silence-warning-about-installer.patch ++++++ --- /work/SRC/openSUSE:Leap:15.2/vagrant/0002-bin-vagrant-silence-warning-about-installer.patch 2020-01-15 16:27:26.876720477 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.vagrant.new.26092/0001-bin-vagrant-silence-warning-about-installer.patch 2020-02-21 13:53:53.178033802 +0100 @@ -1,7 +1,7 @@ -From 46e37dd1c263e62e28336bea5c634a41a3d77c5b Mon Sep 17 00:00:00 2001 +From 2aceecad34427d322bb011e5964a3c7d5818c3ae Mon Sep 17 00:00:00 2001 From: Antonio Terceiro <[email protected]> Date: Sat, 11 Oct 2014 16:54:58 -0300 -Subject: [PATCH] bin/vagrant: silence warning about installer +Subject: [PATCH 01/13] bin/vagrant: silence warning about installer Signed-off-by: Johannes Kastl <[email protected]> --- @@ -9,10 +9,10 @@ 1 file changed, 16 deletions(-) diff --git a/bin/vagrant b/bin/vagrant -index 7372a726d..0e3a16c0f 100755 +index 0e6abdcef..9b9233397 100755 --- a/bin/vagrant +++ b/bin/vagrant -@@ -143,22 +143,6 @@ begin +@@ -144,22 +144,6 @@ begin logger.debug("Creating Vagrant environment") env = Vagrant::Environment.new(opts) @@ -32,9 +32,9 @@ - env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false) - end - - begin - # Execute the CLI interface, and exit with the proper error code - exit_status = env.cli(argv) + # Acceptable experimental flag values include: + # + # Unset - Disables experimental features -- -2.19.1 +2.25.0 ++++++ 0003-Use-a-private-temporary-dir.patch -> 0002-Use-a-private-temporary-dir.patch ++++++ --- /work/SRC/openSUSE:Leap:15.2/vagrant/0003-Use-a-private-temporary-dir.patch 2020-01-15 16:27:26.896720489 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.vagrant.new.26092/0002-Use-a-private-temporary-dir.patch 2020-02-21 13:53:53.214033875 +0100 @@ -1,7 +1,7 @@ -From 6781106e4820060910c2203b3b3c895773af2018 Mon Sep 17 00:00:00 2001 +From 3f9506dee9cfe960b593ba9d28786fe3b5164643 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro <[email protected]> Date: Wed, 22 Oct 2014 09:40:14 -0200 -Subject: [PATCH] Use a private temporary dir +Subject: [PATCH 02/13] Use a private temporary dir Without this vagrant will clutter $TMPDIR with dozens of even hundreds of temporary files (~4 per vagrant invocation). @@ -15,7 +15,7 @@ create mode 100644 lib/vagrant/util/tempfile.rb diff --git a/lib/vagrant/box.rb b/lib/vagrant/box.rb -index cd839ee91..65eee8828 100644 +index 2f12775f5..af35043ee 100644 --- a/lib/vagrant/box.rb +++ b/lib/vagrant/box.rb @@ -9,6 +9,7 @@ require "vagrant/util/downloader" @@ -26,7 +26,7 @@ module Vagrant # Represents a "box," which is a package Vagrant environment that is used -@@ -118,7 +119,7 @@ module Vagrant +@@ -121,7 +122,7 @@ module Vagrant # @param [Hash] download_options Options to pass to the downloader. # @return [BoxMetadata] def load_metadata(**download_options) @@ -94,5 +94,5 @@ + FileUtils.rm_rf(Vagrant::Util::Tempfile.private_tmpdir) +end -- -2.19.1 +2.25.0 ++++++ 0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch -> 0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch ++++++ --- /work/SRC/openSUSE:Leap:15.2/vagrant/0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch 2020-01-15 16:27:26.912720498 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.vagrant.new.26092/0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch 2020-02-21 13:53:53.238033924 +0100 @@ -1,7 +1,8 @@ -From f09ec3d92fd9638e8c7c72eaf522ec1afb42037b Mon Sep 17 00:00:00 2001 +From 86b44992811600404c8d967a6e74910396ff874e Mon Sep 17 00:00:00 2001 From: Antonio Terceiro <[email protected]> Date: Tue, 3 Feb 2015 10:35:17 -0200 -Subject: [PATCH] linux/cap/halt: don't wait for `shutdown -h now` to finish +Subject: [PATCH 03/13] linux/cap/halt: don't wait for `shutdown -h now` to + finish When running a Debian 8 lxc guest (with the vagrant-lxc plugin), which has systemd as init system, `vagrant halt` will hang waiting for @@ -26,5 +27,5 @@ # Do nothing, because it probably means the machine shut down # and SSH connection was lost. -- -2.19.1 +2.25.0 ++++++ 0004-plugins-don-t-abuse-require_relative.patch.patch ++++++ >From e589e6be6b7697717fcae15428e443b9be0fd629 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <[email protected]> Date: Wed, 17 May 2017 09:09:57 +0200 Subject: [PATCH 04/13] plugins-don-t-abuse-require_relative.patch Signed-off-by: Johannes Kastl <[email protected]> --- plugins/guests/arch/cap/configure_networks.rb | 2 +- plugins/guests/debian/cap/configure_networks.rb | 2 +- plugins/guests/freebsd/cap/configure_networks.rb | 2 +- plugins/guests/funtoo/cap/configure_networks.rb | 2 +- plugins/guests/gentoo/cap/configure_networks.rb | 2 +- plugins/guests/netbsd/cap/configure_networks.rb | 2 +- plugins/guests/nixos/cap/configure_networks.rb | 2 +- plugins/guests/openbsd/cap/configure_networks.rb | 2 +- plugins/guests/redhat/cap/configure_networks.rb | 2 +- plugins/guests/slackware/cap/configure_networks.rb | 2 +- plugins/guests/suse/cap/configure_networks.rb | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/plugins/guests/arch/cap/configure_networks.rb b/plugins/guests/arch/cap/configure_networks.rb index 0ef71d55f..df0bd0f8f 100644 --- a/plugins/guests/arch/cap/configure_networks.rb +++ b/plugins/guests/arch/cap/configure_networks.rb @@ -2,7 +2,7 @@ require "ipaddr" require "socket" require "tempfile" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" module VagrantPlugins module GuestArch diff --git a/plugins/guests/debian/cap/configure_networks.rb b/plugins/guests/debian/cap/configure_networks.rb index 23b7bbcdf..07aa91289 100644 --- a/plugins/guests/debian/cap/configure_networks.rb +++ b/plugins/guests/debian/cap/configure_networks.rb @@ -1,6 +1,6 @@ require "tempfile" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" module VagrantPlugins module GuestDebian diff --git a/plugins/guests/freebsd/cap/configure_networks.rb b/plugins/guests/freebsd/cap/configure_networks.rb index 5020eebe8..1778f94c4 100644 --- a/plugins/guests/freebsd/cap/configure_networks.rb +++ b/plugins/guests/freebsd/cap/configure_networks.rb @@ -1,6 +1,6 @@ require "tempfile" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" module VagrantPlugins module GuestFreeBSD diff --git a/plugins/guests/funtoo/cap/configure_networks.rb b/plugins/guests/funtoo/cap/configure_networks.rb index 6e20dc237..1b41340c1 100644 --- a/plugins/guests/funtoo/cap/configure_networks.rb +++ b/plugins/guests/funtoo/cap/configure_networks.rb @@ -1,6 +1,6 @@ require "tempfile" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" module VagrantPlugins module GuestFuntoo diff --git a/plugins/guests/gentoo/cap/configure_networks.rb b/plugins/guests/gentoo/cap/configure_networks.rb index f7464432c..002271b71 100644 --- a/plugins/guests/gentoo/cap/configure_networks.rb +++ b/plugins/guests/gentoo/cap/configure_networks.rb @@ -1,7 +1,7 @@ require "tempfile" require "ipaddr" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" module VagrantPlugins module GuestGentoo diff --git a/plugins/guests/netbsd/cap/configure_networks.rb b/plugins/guests/netbsd/cap/configure_networks.rb index d53b6c6e4..922edfdab 100644 --- a/plugins/guests/netbsd/cap/configure_networks.rb +++ b/plugins/guests/netbsd/cap/configure_networks.rb @@ -1,6 +1,6 @@ require "tempfile" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" module VagrantPlugins module GuestNetBSD diff --git a/plugins/guests/nixos/cap/configure_networks.rb b/plugins/guests/nixos/cap/configure_networks.rb index 96458622f..ed371765e 100644 --- a/plugins/guests/nixos/cap/configure_networks.rb +++ b/plugins/guests/nixos/cap/configure_networks.rb @@ -1,7 +1,7 @@ require "ipaddr" require "tempfile" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" module VagrantPlugins module GuestNixos diff --git a/plugins/guests/openbsd/cap/configure_networks.rb b/plugins/guests/openbsd/cap/configure_networks.rb index fefc05b9e..a3bfcaf48 100644 --- a/plugins/guests/openbsd/cap/configure_networks.rb +++ b/plugins/guests/openbsd/cap/configure_networks.rb @@ -1,6 +1,6 @@ require "tempfile" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" module VagrantPlugins module GuestOpenBSD diff --git a/plugins/guests/redhat/cap/configure_networks.rb b/plugins/guests/redhat/cap/configure_networks.rb index c618c8e53..31ba4f315 100644 --- a/plugins/guests/redhat/cap/configure_networks.rb +++ b/plugins/guests/redhat/cap/configure_networks.rb @@ -1,6 +1,6 @@ require "tempfile" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" module VagrantPlugins module GuestRedHat diff --git a/plugins/guests/slackware/cap/configure_networks.rb b/plugins/guests/slackware/cap/configure_networks.rb index b11b93e98..0f180275f 100644 --- a/plugins/guests/slackware/cap/configure_networks.rb +++ b/plugins/guests/slackware/cap/configure_networks.rb @@ -1,6 +1,6 @@ require "tempfile" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" module VagrantPlugins module GuestSlackware diff --git a/plugins/guests/suse/cap/configure_networks.rb b/plugins/guests/suse/cap/configure_networks.rb index 2dd140230..e6dd96f08 100644 --- a/plugins/guests/suse/cap/configure_networks.rb +++ b/plugins/guests/suse/cap/configure_networks.rb @@ -1,6 +1,6 @@ require "tempfile" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" module VagrantPlugins module GuestSUSE -- 2.25.0 ++++++ 0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch ++++++ >From d6b0b98c0eabc78da7c97839630235fa9ed32075 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <[email protected]> Date: Fri, 16 Nov 2018 21:12:43 +0100 Subject: [PATCH 05/13] fix vbox package boo#1044087, added by [email protected] on Sun Aug 13 19:07:06 UTC 2017 Signed-off-by: Johannes Kastl <[email protected]> --- plugins/providers/virtualbox/action/package.rb | 2 +- plugins/providers/virtualbox/action/package_setup_folders.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/providers/virtualbox/action/package.rb b/plugins/providers/virtualbox/action/package.rb index fb5ebdabf..c03c1c373 100644 --- a/plugins/providers/virtualbox/action/package.rb +++ b/plugins/providers/virtualbox/action/package.rb @@ -1,4 +1,4 @@ -require_relative "../../../../lib/vagrant/action/general/package" +require "vagrant/action/general/package" module VagrantPlugins module ProviderVirtualBox diff --git a/plugins/providers/virtualbox/action/package_setup_folders.rb b/plugins/providers/virtualbox/action/package_setup_folders.rb index a0baf516f..867fe2bf8 100644 --- a/plugins/providers/virtualbox/action/package_setup_folders.rb +++ b/plugins/providers/virtualbox/action/package_setup_folders.rb @@ -1,6 +1,6 @@ require "fileutils" -require_relative "../../../../lib/vagrant/action/general/package_setup_folders" +require "vagrant/action/general/package" module VagrantPlugins module ProviderVirtualBox -- 2.25.0 ++++++ 0024-do-not-depend-on-wdm.patch -> 0006-do-not-depend-on-wdm.patch ++++++ --- /work/SRC/openSUSE:Leap:15.2/vagrant/0024-do-not-depend-on-wdm.patch 2020-01-15 16:27:26.972720531 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.vagrant.new.26092/0006-do-not-depend-on-wdm.patch 2020-02-21 13:53:53.294034037 +0100 @@ -1,7 +1,7 @@ -From 6a01e4089e3c8c3115755c7431cb5d9d493d6671 Mon Sep 17 00:00:00 2001 +From 486c955ffe349c52ab5a4cfd831b09df83de88bf Mon Sep 17 00:00:00 2001 From: Johannes Kastl <[email protected]> Date: Mon, 4 Jun 2018 09:18:23 +0200 -Subject: [PATCH] do not depend on wdm +Subject: [PATCH 06/13] do not depend on wdm Signed-off-by: Johannes Kastl <[email protected]> --- @@ -9,17 +9,17 @@ 1 file changed, 1 deletion(-) diff --git a/vagrant.gemspec b/vagrant.gemspec -index 11627738e..a45be9eba 100644 +index baae3f486..fb2925da5 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec -@@ -28,7 +28,6 @@ Gem::Specification.new do |s| +@@ -29,7 +29,6 @@ Gem::Specification.new do |s| s.add_dependency "rb-kqueue", "~> 0.2.0" s.add_dependency "rest-client", ">= 1.6.0", "< 3.0" - s.add_dependency "rubyzip", "~> 1.2.2" + s.add_dependency "rubyzip", "~> 1.3" - s.add_dependency "wdm", "~> 0.1.0" s.add_dependency "winrm", "~> 2.1" s.add_dependency "winrm-fs", "~> 1.0" s.add_dependency "winrm-elevated", "~> 1.1" -- -2.19.1 +2.25.0 ++++++ 0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch ++++++ >From e4c16b7f40c37f08f431f84ac8f6994e5dfbd771 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <[email protected]> Date: Fri, 16 Nov 2018 21:14:46 +0100 Subject: [PATCH 07/13] do not abuse relative paths in docker plugin to make docker work, added by [email protected] on Thu Oct 26 19:42:46 UTC 2017 Signed-off-by: Johannes Kastl <[email protected]> --- plugins/providers/docker/config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/providers/docker/config.rb b/plugins/providers/docker/config.rb index 07c4e5333..e8142df8b 100644 --- a/plugins/providers/docker/config.rb +++ b/plugins/providers/docker/config.rb @@ -1,6 +1,6 @@ require "pathname" -require_relative "../../../lib/vagrant/util/platform" +require "vagrant/util/platform" module VagrantPlugins module DockerProvider -- 2.25.0 ++++++ 0008-Don-t-abuse-relative-paths-in-plugins.patch ++++++ >From 977541aad0f8711d080938c491f3567819c02ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Fri, 11 Jan 2019 12:32:28 +0100 Subject: [PATCH 08/13] Don't abuse relative paths in plugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Dan Čermák <[email protected]> --- plugins/guests/alt/cap/configure_networks.rb | 2 +- plugins/guests/coreos/cap/configure_networks.rb | 2 +- plugins/guests/nixos/cap/change_host_name.rb | 2 +- plugins/provisioners/chef/provisioner/base.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/guests/alt/cap/configure_networks.rb b/plugins/guests/alt/cap/configure_networks.rb index e9f64a940..9236c1b2b 100644 --- a/plugins/guests/alt/cap/configure_networks.rb +++ b/plugins/guests/alt/cap/configure_networks.rb @@ -1,6 +1,6 @@ require "tempfile" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" module VagrantPlugins module GuestALT diff --git a/plugins/guests/coreos/cap/configure_networks.rb b/plugins/guests/coreos/cap/configure_networks.rb index a954b45bd..2e490f5e2 100644 --- a/plugins/guests/coreos/cap/configure_networks.rb +++ b/plugins/guests/coreos/cap/configure_networks.rb @@ -1,6 +1,6 @@ require "tempfile" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" module VagrantPlugins module GuestCoreOS diff --git a/plugins/guests/nixos/cap/change_host_name.rb b/plugins/guests/nixos/cap/change_host_name.rb index 340eddeab..bacae1f0d 100644 --- a/plugins/guests/nixos/cap/change_host_name.rb +++ b/plugins/guests/nixos/cap/change_host_name.rb @@ -1,6 +1,6 @@ require "tempfile" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" module VagrantPlugins module GuestNixos diff --git a/plugins/provisioners/chef/provisioner/base.rb b/plugins/provisioners/chef/provisioner/base.rb index 7bc8ceca0..e938305e7 100644 --- a/plugins/provisioners/chef/provisioner/base.rb +++ b/plugins/provisioners/chef/provisioner/base.rb @@ -1,7 +1,7 @@ require "tempfile" require_relative "../../../../lib/vagrant/util/presence" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" require_relative "../installer" -- 2.25.0 ++++++ 0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch ++++++ >From c388ca93ac0254cb2e635558e90e57a9cd93cb69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Thu, 14 Mar 2019 00:25:05 +0100 Subject: [PATCH 09/13] Fix unit tests for GuestLinux::Cap::Halt This test fails since we patch `shutdown -h now` to be `shutdown -h now &` instead. --- test/unit/plugins/guests/linux/cap/halt_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unit/plugins/guests/linux/cap/halt_test.rb b/test/unit/plugins/guests/linux/cap/halt_test.rb index 81f682aa1..70d2603b9 100644 --- a/test/unit/plugins/guests/linux/cap/halt_test.rb +++ b/test/unit/plugins/guests/linux/cap/halt_test.rb @@ -22,19 +22,19 @@ describe "VagrantPlugins::GuestLinux::Cap::Halt" do let(:cap) { caps.get(:halt) } it "runs the shutdown command" do - comm.expect_command("shutdown -h now") + comm.expect_command("shutdown -h now &") cap.halt(machine) end it "does not raise an IOError" do - comm.stub_command("shutdown -h now", raise: IOError) + comm.stub_command("shutdown -h now &", raise: IOError) expect { cap.halt(machine) }.to_not raise_error end it "does not raise a SSHDisconnected" do - comm.stub_command("shutdown -h now", raise: Vagrant::Errors::SSHDisconnected) + comm.stub_command("shutdown -h now &", raise: Vagrant::Errors::SSHDisconnected) expect { cap.halt(machine) }.to_not raise_error -- 2.25.0 ++++++ 0010-Skip-failing-tests.patch ++++++ >From af5720555a656230e30333d592c84de50737a2bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Mon, 1 Apr 2019 17:28:31 +0200 Subject: [PATCH 10/13] Skip failing tests --- test/unit/bin/vagrant_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/bin/vagrant_test.rb b/test/unit/bin/vagrant_test.rb index 08edcb20e..a6bef731d 100644 --- a/test/unit/bin/vagrant_test.rb +++ b/test/unit/bin/vagrant_test.rb @@ -104,7 +104,7 @@ describe "vagrant bin" do context "when vagrant is not very quiet" do before { expect(Vagrant).to receive(:very_quiet?).and_return(false) } - it "should output a warning" do + xit "should output a warning" do expect(env.ui).to receive(:warn).with(/#{warning}/, any_args) end end @@ -112,7 +112,7 @@ describe "vagrant bin" do context "when vagrant is very quiet" do before { expect(Vagrant).to receive(:very_quiet?).and_return(true) } - it "should not output a warning" do + xit "should not output a warning" do expect(env.ui).not_to receive(:warn).with(/#{warning}/, any_args) end end -- 2.25.0 ++++++ 0011-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch ++++++ >From d8a6e1573ee0b845b851c760ceced71f250e9576 Mon Sep 17 00:00:00 2001 From: Pavel Valena <[email protected]> Date: Mon, 1 Jul 2019 17:44:54 +0200 Subject: [PATCH 11/13] Do not list / load dependencies if `vagrant` spec is not loaded in `vagrant_internal_specs` as this fails, due to `find` returning `nil`. --- lib/vagrant/bundler.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb index 7ba48435f..c0fabdcea 100644 --- a/lib/vagrant/bundler.rb +++ b/lib/vagrant/bundler.rb @@ -421,8 +421,9 @@ module Vagrant def vagrant_internal_specs # activate any dependencies up front so we can always # pin them when resolving - Gem::Specification.find { |s| s.name == "vagrant" && s.activated? }. - runtime_dependencies.each { |d| gem d.name, *d.requirement.as_list } + if (vs = Gem::Specification.find { |s| s.name == "vagrant" && s.activated? }) + vs.runtime_dependencies.each { |d| gem d.name, *d.requirement.as_list } + end # discover all the gems we have available list = {} directories = [Gem::Specification.default_specifications_dir] -- 2.25.0 ++++++ 0012-Disable-Subprocess-unit-test.patch ++++++ >From 5625949476713ea00facfc87f8ce4c42e751f216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Wed, 28 Aug 2019 13:39:58 +0200 Subject: [PATCH 12/13] Disable Subprocess unit test This unit test is *very* flaky on OBS' workers and causes random build failures. These are probably caused by worker being under high load and then scheduling oddly. --- test/unit/vagrant/util/subprocess_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/vagrant/util/subprocess_test.rb b/test/unit/vagrant/util/subprocess_test.rb index 81da0e635..a2a2270a0 100644 --- a/test/unit/vagrant/util/subprocess_test.rb +++ b/test/unit/vagrant/util/subprocess_test.rb @@ -116,7 +116,7 @@ describe Vagrant::Util::Subprocess do end end context "when subprocess is running" do - it "should return true" do + xit "should return true" do sp = described_class.new("sleep", "5") thread = Thread.new{ sp.execute } sleep(0.3) @@ -145,7 +145,7 @@ describe Vagrant::Util::Subprocess do context "when subprocess is running" do let(:sp){ described_class.new("sleep", "1") } - it "should return true" do + xit "should return true" do thread = Thread.new{ sp.execute } sleep(0.1) expect(sp.stop).to be(true) -- 2.25.0 ++++++ 0013-Update-some-outdated-gem-versions.patch ++++++ >From 17560717a1b35890cd7389c0499e842f1cd1cbfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Mon, 10 Feb 2020 16:03:15 +0100 Subject: [PATCH 13/13] Update some outdated gem versions --- vagrant.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vagrant.gemspec b/vagrant.gemspec index fb2925da5..9efede79d 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -23,7 +23,7 @@ Gem::Specification.new do |s| s.add_dependency "listen", "~> 3.1.5" s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" - s.add_dependency "net-ssh", "~> 5.1.0" + s.add_dependency "net-ssh", "~> 5.2.0" s.add_dependency "net-sftp", "~> 2.1" s.add_dependency "net-scp", "~> 1.2.0" s.add_dependency "rb-kqueue", "~> 0.2.0" -- 2.25.0 ++++++ README.SUSE ++++++ --- /var/tmp/diff_new_pack.GvtmX2/_old 2020-02-21 13:53:54.550036579 +0100 +++ /var/tmp/diff_new_pack.GvtmX2/_new 2020-02-21 13:53:54.550036579 +0100 @@ -1,20 +1,59 @@ Packaging Vagrant plugins ------------------------- -This convention is based on the Debian vagrant package by Antonio Terceiro. +This convention is based on the Fedora vagrant package. -Vagrant plugins must be packaged as regular Ruby libraries, with one extra -detail: they must contain a file at -/usr/share/vagrant-plugins/plugins.d/$PLUGINNAME.json with the following -content: - -{ - "${PLUGINNAME}": { - "ruby_version":"$(ruby -e 'puts RUBY_VERSION')", - "vagrant_version":"$(cat /usr/share/vagrant/version.txt)", - "gem_version":"", - "require":"", - "sources":[] - } -} +Vagrant plugins are ordinary rubygems, but they should not be packaged as +these. First off all, we don't need to build the plugin with a ruby version +other then the ruby version with which vagrant was built. Furthermore, vagrant +will _only_ recognize gems inside its own directory structure as plugins and not +arbitrary rubygems. +An example specfile for a vagrant plugin looks like this: +``` spec +%global rb_build_versions %vagrant_rb_build_versions +%global rb_build_abi %vagrant_rb_build_abi +%global rb_default_ruby_suffix %vagrant_rb_default_ruby_suffix + +Name: vagrant-MYPLUGIN +Version: $VERSION +Release: 0 +%define mod_name %{name} +%define mod_full_name %{mod_name}-%{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: %{rubygem gem2rpm} +BuildRequires: %{ruby} +BuildRequires: ruby-macros >= 5 + +BuildRequires: vagrant +BuildArch: noarch +Url: $URL +Source: $SRC +Source1: gem2rpm.yml +Summary: Vagrant provider for libvirt +License: MIT +Group: Development/Languages/Ruby + +%description +$DESCRIPTION + +%global vagrant_plugin_name %{name} + +%prep +%gem_unpack + +%build +%gem_build + +%install +%vagrant_plugin_install -n %{mod_full_name}/%{vagrant_plugin_name}-%{version}.gem + +%files +%{vagrant_plugin_instdir} +%{vagrant_plugin_cache} +%{vagrant_plugin_spec} + + +%changelog + +``` ++++++ binstub ++++++ #!/bin/bash # # This is a wrapper to properly execute Vagrant within the embedded # Vagrant installation directory. This sets up proper environment variables # so that everything loads and compiles to proper directories. # Load defaults, especially VAGRANT_PREFERRED_PROVIDERS if [ -r /etc/default/vagrant ]; then source /etc/default/vagrant fi # Export gem paths so that we use the isolated gems. export GEM_PATH="@ruby_vagrant_gem_path@" # Export GEM_HOME based on VAGRANT_HOME # # This needs to be set because Bundler includes gem paths # from RubyGems' Gem.paths. VAGRANT_HOME=${VAGRANT_HOME:-~/.vagrant.d} export GEM_HOME="$VAGRANT_HOME/gems" # SSL certs # export SSL_CERT_FILE="${SSL_CERT_FILE:-/etc/pki/tls/cert.pem}" # Export an enviroment variable to say we're in a Vagrant # installer created environment. export VAGRANT_INSTALLER_ENV=1 # This is currently used only in Vagrant::Plugin::Manager.system_plugins_file # to locate plugins configuration file. export VAGRANT_INSTALLER_EMBEDDED_DIR="@vagrant_embedded_dir@" export VAGRANT_INSTALLER_VERSION="2" # Determine the OS that we're on, which is used in some later checks. # It is very important we do this _before_ setting the PATH below # because uname dependencies can conflict on some platforms. OS=$(uname -s 2>/dev/null) # Export the OS as an environment variable that Vagrant can access # so that it can behave better. export VAGRANT_DETECTED_OS="${OS}" # Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit export VAGRANT_EXECUTABLE="${VAGRANT_INSTALLER_EMBEDDED_DIR}/gems/bin/vagrant" # Set providers' preferred order(priority) if not already set if [ -z ${VAGRANT_PREFERRED_PROVIDERS+empty} ]; then VAGRANT_PREFERRED_PROVIDERS=libvirt,docker fi export VAGRANT_PREFERRED_PROVIDERS # Don't allow symlink in shared folders by default, the user can override it if # they really want to (this is a security risk) if [ -z "$VAGRANT_DISABLE_VBOXSYMLINKCREATE" ]; then VAGRANT_DISABLE_VBOXSYMLINKCREATE=1 fi export VAGRANT_DISABLE_VBOXSYMLINKCREATE # Call the actual Vagrant bin with our arguments exec ruby "${VAGRANT_EXECUTABLE}" "$@" ++++++ macros.vagrant ++++++ # stolen from Fedora's package %vagrant_embedded_dir %{_datadir}/%{name} %vagrant_dir %{vagrant_embedded_dir}/gems/gems/%{name}-%{version} # Common locations for Vagrant plugin gems %vagrant_plugin_dir %{vagrant_embedded_dir}/gems %vagrant_plugin_instdir %{vagrant_plugin_dir}/gems/%{vagrant_plugin_name}-%{version} %vagrant_plugin_libdir %{vagrant_plugin_instdir}/lib %vagrant_plugin_cache %{vagrant_plugin_dir}/cache/%{vagrant_plugin_name}-%{version}.gem %vagrant_plugin_spec %{vagrant_plugin_dir}/specifications/%{vagrant_plugin_name}-%{version}.gemspec %vagrant_plugin_docdir %{vagrant_plugin_dir}/doc/%{vagrant_plugin_name}-%{version} %vagrant_plugin_conf %{vagrant_embedded_dir}/plugins.json # Install gem into appropriate directory. # -n<vagrant_plugin_file> Overrides gem file name for installation. # -d<install_dir> Set installation directory. %vagrant_plugin_install(d:n:) \ if [ "%{expand:%rb_build_versions}" != "%vagrant_rb_build_versions" ]; then \ echo "Vagrant ruby version does not match %{vagrant_plugin_name}'s ruby version" \ exit 1 \ fi \ mkdir -p %{-d*}%{!?-d:%{buildroot}%{vagrant_plugin_dir}} \ \ CONFIGURE_ARGS="--with-cflags='%{optflags}' $CONFIGURE_ARGS" \\\ gem install \\\ -V \\\ --local \\\ --no-user-install \\\ --install-dir %{-d*}%{!?-d:%{buildroot}%{vagrant_plugin_dir}} \\\ --bindir %{buildroot}%{_bindir} \\\ --ignore-dependencies \\\ --force \\\ --document=rdoc,ri \\\ --backtrace \\\ %{-n*}%{!?-n:%{vagrant_plugin_name}-%{version}/%{vagrant_plugin_name}-%{version}.gem} \ %{nil} %vagrant_rb_build_versions %{rb_build_versions} %vagrant_rb_build_abi %{rb_build_abi} %vagrant_rb_default_ruby_suffix %{rb_default_ruby_suffix} ++++++ vagrant-2.2.0.tar.gz -> vagrant-2.2.7.tar.gz ++++++ ++++ 27792 lines of diff (skipped) ++++++ vagrant_post.rb ++++++ #!/usr/bin/ruby begin $LOAD_PATH.unshift "%{vagrant_dir}/lib" begin require "vagrant/plugin/manager" rescue LoadError => e raise end; unless File.exist?("%{vagrant_plugin_conf}") Vagrant::Plugin::StateFile.new(Pathname.new(File.expand_path "%{vagrant_plugin_conf}")).save! # File.symlink "%{vagrant_plugin_conf}", "%{vagrant_plugin_conf_link}" end rescue => e puts "Vagrant plugin.json is not properly initialized: #{e}" end ++++++ vagrant_transfiletriggerin.rb ++++++ #!/usr/bin/ruby begin $LOAD_PATH.unshift "%{vagrant_dir}/lib" begin require "vagrant/plugin/manager" rescue LoadError => e raise end $stdin.each_line do |gemspec_file| next if gemspec_file =~ /\/%{name}-%{version}.gemspec$/ spec = Gem::Specification.load(gemspec_file.strip) Vagrant::Plugin::StateFile.new(Pathname.new(File.expand_path "%{vagrant_plugin_conf}")).add_plugin spec.name end rescue => e puts "Vagrant plugin register error: #{e}" end ++++++ vagrant_transfiletriggerun.rb ++++++ #!/usr/bin/ruby begin $LOAD_PATH.unshift "%{vagrant_dir}/lib" begin require "vagrant/plugin/manager" rescue LoadError => e raise end $stdin.each_line do |gemspec_file| next if gemspec_file =~ /\/%{name}-%{version}.gemspec$/ spec = Gem::Specification.load(gemspec_file.strip) Vagrant::Plugin::StateFile.new(Pathname.new(File.expand_path "%{vagrant_plugin_conf}")).remove_plugin spec.name end rescue => e puts "Vagrant plugin un-register error: #{e}" end
