Hello community, here is the log from the commit of package vagrant for openSUSE:Factory checked in at 2019-09-16 10:53:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vagrant (Old) and /work/SRC/openSUSE:Factory/.vagrant.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vagrant" Mon Sep 16 10:53:21 2019 rev:16 rq:731069 version:2.2.5 Changes: -------- --- /work/SRC/openSUSE:Factory/vagrant/vagrant.changes 2019-04-30 13:06:47.021550909 +0200 +++ /work/SRC/openSUSE:Factory/.vagrant.new.7948/vagrant.changes 2019-09-16 10:53:26.215148650 +0200 @@ -1,0 +2,85 @@ +Wed Aug 28 11:58:06 UTC 2019 - Dan Čermák <[email protected]> + +- Rebase vagrant patches: + + drop: + - 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 + - 0026-do-not-abuse-relative-paths-in-plugins.patch + - 0027-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch + - 0028-Skip-failing-tests.patch + - 0029-Skip-docker-networking-test.patch + + add: + - 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-Only-return-interfaces-where-addr-is-not-nil.patch + - 0014-Skip-docker-networking-test.patch + - 0015-ARM-only-Disable-Subprocess-unit-test.patch + +------------------------------------------------------------------- +Mon Jul 1 09:06:56 UTC 2019 - Dan Čermák <[email protected]> + +- Add 0029-Skip-docker-networking-test.patch: + skips a unit-test that fails on OBS + + update to 2.2.5 + FEATURES: + + providers/docker: Private and Public networking support [GH-10702] + + IMPROVEMENTS: + + command/global-status: Provide machine-readable information [GH-10506] + command/snapshot: Separate snapshot names for guests when listing snapshots [GH-10828] + command/box/update: Ignore missing metadata files when updating all boxes [GH-10829] + core: Use consistent settings when unpacking boxes as root [GH-10707] + core: Write metadata.json file when packaging box [GH-10706] + core: Remove whitespace from id file on load [GH-10727] + core/bundler: Support resolution when installed within system [GH-10894] + guest/coreos: Update network configuration and hostname setting [GH-10752] + guest/freebsd: Add proper VirtualBox share folders support for FreeBSD guests [GH-10717] + guest/freebsd: Add unmount share folder for VirtualBox guests [GH-10761] + guest/freebsd: Simplify network interface listing when configuring networks [GH-10763] + providers/docker: Add usable? check to docker provider [GH-10890] + synced_folder/smb: Remove configuration information from synced folder data [GH-10811] + + BUG FIXES: + + command/box/update: Ensure the right version is picked when updating specific boxes [GH-10810] + command/cloud: Properly set variable from CLI argument parsing for username field [GH-10726] + command/rsync_auto: Use relative paths to machines folder path for file path Listener [GH-10902] + communicator/ssh: Remove net/sftp loading to prevent loading errors [GH-10745] + contrib/bash: Search for running_vm_list only in machines folder [GH-10841] + core/bundler: Properly parse multiple constants when installing plugins [GH-10896] + core/environment: Support plugin configuration within box Vagrantfiles [GH-10889] + core/triggers: Fix typo in UI output [GH-10748] + core/triggers: Properly exit with abort option [GH-10824] + core/triggers: Ensure guest names are string when filtering trigger configs [GH-10854] + core/triggers: Abort after all running processes have completed when parallel is enabled [GH-10891] + guest/void: Fix NFS capability detection [GH-10713] + guest/bsd: Properly set BSD options order for /etc/exports [GH-10909] + host/windows: Fix rubygems error when host has directory named c [GH-10803] + provider/virtualbox: Ensure non-existent machines do not attempt to list snapshots [GH-10784] + provider/docker: Properly set docker-compose config file with volume names [GH-10820] + provisioner/ansible: Fix pip installer hardcoded curl get_pip.py piped to python [GH-10625] + provisioner/chef: Update chef install check for guests [GH-10917] + synced_folders/rsync: Remove rsync__excludes from command if array is empty [GH-10901] + + +------------------------------------------------------------------- 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 0026-do-not-abuse-relative-paths-in-plugins.patch 0027-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch 0028-Skip-failing-tests.patch vagrant-2.2.4.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-Bump-rspec-its-dependency.patch 0012-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch 0013-Only-return-interfaces-where-addr-is-not-nil.patch 0014-Skip-docker-networking-test.patch 0015-ARM-only-Disable-Subprocess-unit-test.patch vagrant-2.2.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vagrant.spec ++++++ --- /var/tmp/diff_new_pack.Wtu3Mq/_old 2019-09-16 10:53:26.967148552 +0200 +++ /var/tmp/diff_new_pack.Wtu3Mq/_new 2019-09-16 10:53:26.971148552 +0200 @@ -26,7 +26,7 @@ Name: vagrant -Version: 2.2.4 +Version: 2.2.5 Release: 0 Summary: Tool for building and distributing virtualized development environments License: MIT @@ -44,19 +44,28 @@ Obsoletes: rubygem-vagrant < %{version} Recommends: vagrant-libvirt # -Patch2: 0002-bin-vagrant-silence-warning-about-installer.patch -Patch3: 0003-Use-a-private-temporary-dir.patch -Patch4: 0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch -Patch9: 0009-plugins-don-t-abuse-require_relative.patch +# Patches are maintained in the opensuse_package branch in the +# https://github.com/dcermak/vagrant.git repository. +# On every new release of vagrant, rebase them on top of the latest tag. # -# -# try building with ruby2.4 -Patch23: 0023-vbox-fix-package.patch -Patch24: 0024-do-not-depend-on-wdm.patch -Patch25: 0025-do-not-abuse-relative-paths-in-docker-plugin.patch -Patch26: 0026-do-not-abuse-relative-paths-in-plugins.patch -Patch27: 0027-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch -Patch28: 0028-Skip-failing-tests.patch +Patch1: 0001-bin-vagrant-silence-warning-about-installer.patch +Patch2: 0002-Use-a-private-temporary-dir.patch +Patch3: 0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch +Patch4: 0004-plugins-don-t-abuse-require_relative.patch.patch +Patch5: 0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch +Patch6: 0006-do-not-depend-on-wdm.patch +Patch7: 0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch +Patch8: 0008-Don-t-abuse-relative-paths-in-plugins.patch +Patch9: 0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch +Patch10: 0010-Skip-failing-tests.patch +# https://github.com/hashicorp/vagrant/pull/10991 +Patch11: 0011-Bump-rspec-its-dependency.patch +# https://github.com/hashicorp/vagrant/pull/10945 +Patch12: 0012-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch +# https://github.com/hashicorp/vagrant/pull/10993 +Patch13: 0013-Only-return-interfaces-where-addr-is-not-nil.patch +Patch14: 0014-Skip-docker-networking-test.patch +Patch15: 0015-ARM-only-Disable-Subprocess-unit-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -129,8 +138,9 @@ BuildRequires: %{rubygem rake:12.0 } # s.add_development_dependency "rspec", "~> 3.5.0" BuildRequires: %{rubygem rspec:3.5 } -# s.add_development_dependency "rspec-its", "~> 1.2.0" -BuildRequires: %{rubygem rspec-its:1.2 } +# PATCHED +# s.add_development_dependency "rspec-its", "~> 1.3.0" +BuildRequires: %{rubygem rspec-its:1.3 } # s.add_dependency "ruby_dep", "<= 1.3.1" BuildRequires: %{rubygem ruby_dep <= 1.3.1 } # s.add_development_dependency "webmock", "~> 2.3.1" @@ -146,8 +156,10 @@ BuildRequires: %{rubygem ffi >= 1.9 } # Prevent have choice for rubygem(ruby:2.5.0:thor:0) >= 0.18 BuildRequires: %{rubygem thor:0.19} -# have choice for rubygem(ruby:2.5.0:addressable) >= 2.3.6 +# Prevent have choice for rubygem(ruby:2.5.0:addressable) >= 2.3.6 BuildRequires: %{rubygem addressable >= 2.6} +# Prevent have choice for rubygem(ruby:2.5.0:public_suffix) >= 2.0.2 +BuildRequires: %{rubygem public_suffix:4} BuildRequires: ruby-macros >= 5 @@ -263,7 +275,25 @@ Optional dependency offering bash completion for vagrant %prep -%autosetup -p 1 -n %{mod_full_name} +%setup -q -n %{mod_full_name} +%patch1 -p 1 +%patch2 -p 1 +%patch3 -p 1 +%patch4 -p 1 +%patch5 -p 1 +%patch6 -p 1 +%patch7 -p 1 +%patch8 -p 1 +%patch9 -p 1 +%patch10 -p 1 +%patch11 -p 1 +%patch12 -p 1 +%patch13 -p 1 +%patch14 -p 1 +# disable the subprocess test only on ARM +%ifarch %{arm} +%patch15 -p 1 +%endif cp %{SOURCE98} . ++++++ 0002-bin-vagrant-silence-warning-about-installer.patch -> 0001-bin-vagrant-silence-warning-about-installer.patch ++++++ --- /work/SRC/openSUSE:Factory/vagrant/0002-bin-vagrant-silence-warning-about-installer.patch 2019-03-26 22:33:11.657694607 +0100 +++ /work/SRC/openSUSE:Factory/.vagrant.new.7948/0001-bin-vagrant-silence-warning-about-installer.patch 2019-09-16 10:53:22.951149073 +0200 @@ -1,7 +1,7 @@ -From 46e37dd1c263e62e28336bea5c634a41a3d77c5b Mon Sep 17 00:00:00 2001 +From 82737fbe42f96385ed56b9a57044ddb78b96a681 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/15] 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) @@ -36,5 +36,5 @@ # # Unset - Disables experimental features -- -2.19.1 +2.22.1 ++++++ 0003-Use-a-private-temporary-dir.patch -> 0002-Use-a-private-temporary-dir.patch ++++++ --- /work/SRC/openSUSE:Factory/vagrant/0003-Use-a-private-temporary-dir.patch 2018-11-27 10:43:57.060101637 +0100 +++ /work/SRC/openSUSE:Factory/.vagrant.new.7948/0002-Use-a-private-temporary-dir.patch 2019-09-16 10:53:22.995149067 +0200 @@ -1,7 +1,7 @@ -From 6781106e4820060910c2203b3b3c895773af2018 Mon Sep 17 00:00:00 2001 +From e9ed3c9a50bffb33ff5070ae6a34b50543d299d2 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/15] 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.22.1 ++++++ 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:Factory/vagrant/0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch 2018-11-27 10:44:00.904097694 +0100 +++ /work/SRC/openSUSE:Factory/.vagrant.new.7948/0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch 2019-09-16 10:53:23.079149056 +0200 @@ -1,7 +1,8 @@ -From f09ec3d92fd9638e8c7c72eaf522ec1afb42037b Mon Sep 17 00:00:00 2001 +From 1ea744cf22640883f1b280aa98d02a163a328f2c 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/15] 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.22.1 ++++++ 0004-plugins-don-t-abuse-require_relative.patch.patch ++++++ >From f840574ea47230fbdc77d510898050bf0eaae7ac Mon Sep 17 00:00:00 2001 From: Johannes Kastl <[email protected]> Date: Wed, 17 May 2017 09:09:57 +0200 Subject: [PATCH 04/15] 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.22.1 ++++++ 0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch ++++++ >From 63f9c59d213cea81ce5a509d2d1ecadd7a48dc64 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <[email protected]> Date: Fri, 16 Nov 2018 21:12:43 +0100 Subject: [PATCH 05/15] 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.22.1 ++++++ 0024-do-not-depend-on-wdm.patch -> 0006-do-not-depend-on-wdm.patch ++++++ --- /work/SRC/openSUSE:Factory/vagrant/0024-do-not-depend-on-wdm.patch 2018-11-27 10:44:08.056090357 +0100 +++ /work/SRC/openSUSE:Factory/.vagrant.new.7948/0006-do-not-depend-on-wdm.patch 2019-09-16 10:53:23.319149025 +0200 @@ -1,7 +1,7 @@ -From 6a01e4089e3c8c3115755c7431cb5d9d493d6671 Mon Sep 17 00:00:00 2001 +From 9d85efab05e3b73ae23e24b67372cbffe033349c 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/15] do not depend on wdm Signed-off-by: Johannes Kastl <[email protected]> --- @@ -9,10 +9,10 @@ 1 file changed, 1 deletion(-) diff --git a/vagrant.gemspec b/vagrant.gemspec -index 11627738e..a45be9eba 100644 +index 885c0d359..d3584c610 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec -@@ -28,7 +28,6 @@ Gem::Specification.new do |s| +@@ -30,7 +30,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" @@ -21,5 +21,5 @@ s.add_dependency "winrm-fs", "~> 1.0" s.add_dependency "winrm-elevated", "~> 1.1" -- -2.19.1 +2.22.1 ++++++ 0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch ++++++ >From 70837c27d8d2be474ed2dd7239fd39beae4d8250 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <[email protected]> Date: Fri, 16 Nov 2018 21:14:46 +0100 Subject: [PATCH 07/15] 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.22.1 ++++++ 0008-Don-t-abuse-relative-paths-in-plugins.patch ++++++ >From 461907e06abd3f2f4ca426edae7a8f90cc9fcd8e 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/15] 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.22.1 ++++++ 0027-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch -> 0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch ++++++ --- /work/SRC/openSUSE:Factory/vagrant/0027-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch 2019-04-30 13:06:46.369551344 +0200 +++ /work/SRC/openSUSE:Factory/.vagrant.new.7948/0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch 2019-09-16 10:53:23.407149013 +0200 @@ -1,7 +1,7 @@ -From 3027f4bee2002a87bfdca76fd12d9c91f5896c79 Mon Sep 17 00:00:00 2001 +From bd5d63abbba0294bea738ddb497b59703ce67fea 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] Fix unit tests for GuestLinux::Cap::Halt +Subject: [PATCH 09/15] Fix unit tests for GuestLinux::Cap::Halt This test fails since we patch `shutdown -h now` to be `shutdown -h now &` instead. @@ -37,5 +37,5 @@ cap.halt(machine) }.to_not raise_error -- -2.21.0 +2.22.1 ++++++ 0028-Skip-failing-tests.patch -> 0010-Skip-failing-tests.patch ++++++ --- /work/SRC/openSUSE:Factory/vagrant/0028-Skip-failing-tests.patch 2019-04-30 13:06:46.505551254 +0200 +++ /work/SRC/openSUSE:Factory/.vagrant.new.7948/0010-Skip-failing-tests.patch 2019-09-16 10:53:23.515148999 +0200 @@ -1,7 +1,7 @@ -From b1b718052a1531b61c51be01025e906b59c457f9 Mon Sep 17 00:00:00 2001 +From 651b60680822c89c6892163497a864b47aadaccf 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] Skip failing tests +Subject: [PATCH 10/15] Skip failing tests --- test/unit/bin/vagrant_test.rb | 4 ++-- @@ -30,5 +30,5 @@ end end -- -2.21.0 +2.22.1 ++++++ 0011-Bump-rspec-its-dependency.patch ++++++ >From cb44bcc57e743c6fb5cd983de616681ba0b528f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Wed, 17 Jul 2019 10:59:07 +0200 Subject: [PATCH 11/15] Bump rspec-its dependency --- vagrant.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vagrant.gemspec b/vagrant.gemspec index d3584c610..029994a91 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -45,7 +45,7 @@ Gem::Specification.new do |s| # from within rspec s.add_development_dependency "rake", "~> 12.0.0" s.add_development_dependency "rspec", "~> 3.5.0" - s.add_development_dependency "rspec-its", "~> 1.2.0" + s.add_development_dependency "rspec-its", "~> 1.3.0" s.add_development_dependency "webmock", "~> 2.3.1" s.add_development_dependency "fake_ftp", "~> 0.1.1" -- 2.22.1 ++++++ 0012-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch ++++++ >From 2a34db55059236e16d62a85c9dbceed7b5ce28b2 Mon Sep 17 00:00:00 2001 From: Pavel Valena <[email protected]> Date: Mon, 1 Jul 2019 17:44:54 +0200 Subject: [PATCH 12/15] 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.22.1 ++++++ 0013-Only-return-interfaces-where-addr-is-not-nil.patch ++++++ >From 991218e9c3b632d15a1246961df825cb615d900e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Fri, 26 Jul 2019 15:47:29 +0200 Subject: [PATCH 13/15] Only return interfaces where addr is not nil tunnel interfaces on Linux have addr set to nil which makes the function list_interfaces fail with a backtrace. --- plugins/providers/docker/action/prepare_networks.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/providers/docker/action/prepare_networks.rb b/plugins/providers/docker/action/prepare_networks.rb index 4d1904e85..34a357bee 100644 --- a/plugins/providers/docker/action/prepare_networks.rb +++ b/plugins/providers/docker/action/prepare_networks.rb @@ -34,7 +34,7 @@ module VagrantPlugins # @return [Array<Socket::Ifaddr>] interface list def list_interfaces Socket.getifaddrs.find_all do |i| - i.addr.ip? && !i.addr.ipv4_loopback? && + !i.addr.nil? && i.addr.ip? && !i.addr.ipv4_loopback? && !i.addr.ipv6_loopback? && !i.addr.ipv6_linklocal? end end -- 2.22.1 ++++++ 0014-Skip-docker-networking-test.patch ++++++ >From 8a4f2903dc708053d8677499ed13bf686cb1bcf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Mon, 1 Jul 2019 11:48:59 +0200 Subject: [PATCH 14/15] Skip docker networking test --- .../plugins/providers/docker/action/prepare_networks_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/plugins/providers/docker/action/prepare_networks_test.rb b/test/unit/plugins/providers/docker/action/prepare_networks_test.rb index 1a2ccb7eb..c518b018f 100644 --- a/test/unit/plugins/providers/docker/action/prepare_networks_test.rb +++ b/test/unit/plugins/providers/docker/action/prepare_networks_test.rb @@ -291,7 +291,7 @@ describe VagrantPlugins::DockerProvider::Action::PrepareNetworks do to raise_error(VagrantPlugins::DockerProvider::Errors::NetworkNoInterfaces) end - it "generates a network name and configuration" do + xit "generates a network name and configuration" do allow(machine.ui).to receive(:ask).and_return("1") allow(subject).to receive(:request_public_gateway).and_return("1234") allow(subject).to receive(:request_public_iprange).and_return("1234") -- 2.22.1 ++++++ 0015-ARM-only-Disable-Subprocess-unit-test.patch ++++++ >From 5ef42f64f34af7eb97f22dafdf73126fcdb2c90e 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 15/15] [ARM only] Disable Subprocess unit test This unit test is *very* flaky on OBS' ARM 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.22.1 ++++++ vagrant-2.2.4.tar.gz -> vagrant-2.2.5.tar.gz ++++++ ++++ 6762 lines of diff (skipped)
