From a024bbcf3e9c1968b8fb84cc001e8ca40fb9ab9dc7fe891b6239be4837e5d364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Tue, 3 Aug 2021 14:19:08 +0000 Subject: [PATCH] Accepting request 910011 from home:dancermak:branches:Virtualization:vagrant New upstream release 2.2.18 OBS-URL: https://build.opensuse.org/request/show/910011 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=60 --- ...rant-silence-warning-about-installer.patch | 6 +- 0002-Use-a-private-temporary-dir.patch | 10 +-- ...s-don-t-abuse-require_relative.patch.patch | 6 +- ...-boo-1044087-added-by-robert.muntean.patch | 4 +- 0005-do-not-depend-on-wdm.patch | 12 ++-- ...ative-paths-in-docker-plugin-to-make.patch | 4 +- ...on-t-abuse-relative-paths-in-plugins.patch | 4 +- 0008-Skip-failing-tests.patch | 4 +- 0009-Disable-Subprocess-unit-test.patch | 4 +- ...h => 0010-Bump-listen-version-to-3.6.patch | 13 ++-- ...hell.executable-method-in-more-tests.patch | 45 ------------- ...weroff-in-the-background-instead-of-.patch | 62 ------------------ 0013-Include-rexml-dependency.patch | 25 -------- ...straints-on-childprocess-and-net-scp.patch | 35 ----------- ...emove-no-longer-required-gem-webmock.patch | 41 ------------ vagrant-2.2.16.tar.gz | 3 - vagrant-2.2.18.tar.gz | 3 + vagrant.changes | 63 +++++++++++++++++++ vagrant.spec | 61 ++++++++---------- 19 files changed, 124 insertions(+), 281 deletions(-) rename 0010-Bump-listen-version-to-3.5.patch => 0010-Bump-listen-version-to-3.6.patch (62%) delete mode 100644 0011-Mock-the-PowerShell.executable-method-in-more-tests.patch delete mode 100644 0012-Use-systemctl-poweroff-in-the-background-instead-of-.patch delete mode 100644 0013-Include-rexml-dependency.patch delete mode 100644 0014-Bump-constraints-on-childprocess-and-net-scp.patch delete mode 100644 0015-Remove-no-longer-required-gem-webmock.patch delete mode 100644 vagrant-2.2.16.tar.gz create mode 100644 vagrant-2.2.18.tar.gz diff --git a/0001-bin-vagrant-silence-warning-about-installer.patch b/0001-bin-vagrant-silence-warning-about-installer.patch index 8bfb364..c13193b 100644 --- a/0001-bin-vagrant-silence-warning-about-installer.patch +++ b/0001-bin-vagrant-silence-warning-about-installer.patch @@ -1,7 +1,7 @@ -From 6c2fcc93f7016ca2d816467327a33eb347cc1498 Mon Sep 17 00:00:00 2001 +From 0ccff6b537b98ea368eaebb21f3ac739256e1eac Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Sat, 11 Oct 2014 16:54:58 -0300 -Subject: [PATCH 01/15] bin/vagrant: silence warning about installer +Subject: [PATCH 01/10] bin/vagrant: silence warning about installer Signed-off-by: Johannes Kastl --- @@ -9,7 +9,7 @@ Signed-off-by: Johannes Kastl 1 file changed, 16 deletions(-) diff --git a/bin/vagrant b/bin/vagrant -index c019f30ff..6d2d21523 100755 +index b539d3479..77c83d7c0 100755 --- a/bin/vagrant +++ b/bin/vagrant @@ -193,22 +193,6 @@ begin diff --git a/0002-Use-a-private-temporary-dir.patch b/0002-Use-a-private-temporary-dir.patch index a7125db..1393cb6 100644 --- a/0002-Use-a-private-temporary-dir.patch +++ b/0002-Use-a-private-temporary-dir.patch @@ -1,7 +1,7 @@ -From 14c959018fc2e7d9fe6d5d396971a115efbdc71e Mon Sep 17 00:00:00 2001 +From 61b69d39695fe17aad4ac750e7b15fde4d52d24a Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Wed, 22 Oct 2014 09:40:14 -0200 -Subject: [PATCH 02/15] Use a private temporary dir +Subject: [PATCH 02/10] Use a private temporary dir Without this vagrant will clutter $TMPDIR with dozens of even hundreds of temporary files (~4 per vagrant invocation). @@ -36,12 +36,12 @@ index 41b63b292..b2d4c6a05 100644 url = @metadata_url diff --git a/lib/vagrant/util.rb b/lib/vagrant/util.rb -index b7f297169..95e7850a3 100644 +index c135dacc2..2d14897a1 100644 --- a/lib/vagrant/util.rb +++ b/lib/vagrant/util.rb -@@ -17,6 +17,8 @@ module Vagrant - autoload :SafeExec, 'vagrant/util/safe_exec' +@@ -46,6 +46,8 @@ module Vagrant autoload :SilenceWarnings, 'vagrant/util/silence_warnings' + autoload :SSH, 'vagrant/util/ssh' autoload :StackedProcRunner, 'vagrant/util/stacked_proc_runner' + autoload :Tempfile, 'vagrant/util/tempfile' + autoload :TemplateRenderer, 'vagrant/util/template_renderer' diff --git a/0003-plugins-don-t-abuse-require_relative.patch.patch b/0003-plugins-don-t-abuse-require_relative.patch.patch index 220ef37..759d738 100644 --- a/0003-plugins-don-t-abuse-require_relative.patch.patch +++ b/0003-plugins-don-t-abuse-require_relative.patch.patch @@ -1,7 +1,7 @@ -From 5d0d5df6dcb54c5b423cbfa60c7e5eaccce380c9 Mon Sep 17 00:00:00 2001 +From 188198d9cd7dad997a02e26f06cdb8e1fcf49483 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Wed, 17 May 2017 09:09:57 +0200 -Subject: [PATCH 03/15] plugins-don-t-abuse-require_relative.patch +Subject: [PATCH 03/10] plugins-don-t-abuse-require_relative.patch Signed-off-by: Johannes Kastl --- @@ -32,7 +32,7 @@ index 79f14213a..d8966b171 100644 module VagrantPlugins module GuestArch diff --git a/plugins/guests/debian/cap/configure_networks.rb b/plugins/guests/debian/cap/configure_networks.rb -index dfec32ccb..6b56e280a 100644 +index bb1ff69f9..1e29d57ab 100644 --- a/plugins/guests/debian/cap/configure_networks.rb +++ b/plugins/guests/debian/cap/configure_networks.rb @@ -1,6 +1,6 @@ diff --git a/0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch b/0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch index 45bd631..415bf90 100644 --- a/0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch +++ b/0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch @@ -1,7 +1,7 @@ -From 47cf5abe6ea46220b2d260e3e0fd07b42efa42ae Mon Sep 17 00:00:00 2001 +From 32c0b41a97016db1c19861a5efa28c3a181de8e7 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Fri, 16 Nov 2018 21:12:43 +0100 -Subject: [PATCH 04/15] fix vbox package boo#1044087, added by +Subject: [PATCH 04/10] fix vbox package boo#1044087, added by robert.munteanu@gmail.com on Sun Aug 13 19:07:06 UTC 2017 Signed-off-by: Johannes Kastl diff --git a/0005-do-not-depend-on-wdm.patch b/0005-do-not-depend-on-wdm.patch index 49743e6..5c15237 100644 --- a/0005-do-not-depend-on-wdm.patch +++ b/0005-do-not-depend-on-wdm.patch @@ -1,7 +1,7 @@ -From c596dcd5e7bb3ab6bbdcbc9d21b640d828aa0925 Mon Sep 17 00:00:00 2001 +From 9d896403984a8673e10f3da47052e4250e9ba98b Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Mon, 4 Jun 2018 09:18:23 +0200 -Subject: [PATCH 05/15] do not depend on wdm +Subject: [PATCH 05/10] do not depend on wdm Signed-off-by: Johannes Kastl --- @@ -9,13 +9,13 @@ Signed-off-by: Johannes Kastl 1 file changed, 1 deletion(-) diff --git a/vagrant.gemspec b/vagrant.gemspec -index 99ed2083c..4a4a25e6d 100644 +index e8cee0b5e..cfe589cca 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec -@@ -30,7 +30,6 @@ Gem::Specification.new do |s| - s.add_dependency "rb-kqueue", "~> 0.2.0" +@@ -31,7 +31,6 @@ Gem::Specification.new do |s| + s.add_dependency "rexml", "~> 3.2" s.add_dependency "rubyzip", "~> 2.0" - s.add_dependency "vagrant_cloud", "~> 3.0.4" + s.add_dependency "vagrant_cloud", "~> 3.0.5" - s.add_dependency "wdm", "~> 0.1.0" s.add_dependency "winrm", ">= 2.3.4", "< 3.0" s.add_dependency "winrm-elevated", ">= 1.2.1", "< 2.0" diff --git a/0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch b/0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch index a50a6fc..be0cf7e 100644 --- a/0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch +++ b/0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch @@ -1,7 +1,7 @@ -From 9e4f4f017e58d7488de879037ee1564087c34008 Mon Sep 17 00:00:00 2001 +From 3c8410ce11d70935e678b11d58f3644d2dff8c52 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Fri, 16 Nov 2018 21:14:46 +0100 -Subject: [PATCH 06/15] do not abuse relative paths in docker plugin to make +Subject: [PATCH 06/10] do not abuse relative paths in docker plugin to make docker work, added by tmkn@tmkn.uk on Thu Oct 26 19:42:46 UTC 2017 Signed-off-by: Johannes Kastl diff --git a/0007-Don-t-abuse-relative-paths-in-plugins.patch b/0007-Don-t-abuse-relative-paths-in-plugins.patch index 499039d..decf51b 100644 --- a/0007-Don-t-abuse-relative-paths-in-plugins.patch +++ b/0007-Don-t-abuse-relative-paths-in-plugins.patch @@ -1,7 +1,7 @@ -From 79214e9936e35d2de125fe8d7c6fbbc424b4c054 Mon Sep 17 00:00:00 2001 +From 84dd04ae65f330dbee401f38eeb9577daeee2f9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Fri, 11 Jan 2019 12:32:28 +0100 -Subject: [PATCH 07/15] Don't abuse relative paths in plugins +Subject: [PATCH 07/10] Don't abuse relative paths in plugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/0008-Skip-failing-tests.patch b/0008-Skip-failing-tests.patch index 32e1600..29a369b 100644 --- a/0008-Skip-failing-tests.patch +++ b/0008-Skip-failing-tests.patch @@ -1,7 +1,7 @@ -From 39c3d177a8392eaed94be7a694f2f0c5df1e4ca0 Mon Sep 17 00:00:00 2001 +From c1a1d7395170fc60872658649166de546d396190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Mon, 1 Apr 2019 17:28:31 +0200 -Subject: [PATCH 08/15] Skip failing tests +Subject: [PATCH 08/10] Skip failing tests --- test/unit/bin/vagrant_test.rb | 4 ++-- diff --git a/0009-Disable-Subprocess-unit-test.patch b/0009-Disable-Subprocess-unit-test.patch index 5035456..ffe0aea 100644 --- a/0009-Disable-Subprocess-unit-test.patch +++ b/0009-Disable-Subprocess-unit-test.patch @@ -1,7 +1,7 @@ -From b9aba06ec4fb6c88f5109d1f79ed8820058c6077 Mon Sep 17 00:00:00 2001 +From 745cb8db9f953598df00fb6b362042c61e0909b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 28 Aug 2019 13:39:58 +0200 -Subject: [PATCH 09/15] Disable Subprocess unit test +Subject: [PATCH 09/10] 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 diff --git a/0010-Bump-listen-version-to-3.5.patch b/0010-Bump-listen-version-to-3.6.patch similarity index 62% rename from 0010-Bump-listen-version-to-3.5.patch rename to 0010-Bump-listen-version-to-3.6.patch index c923f1e..aa301e1 100644 --- a/0010-Bump-listen-version-to-3.5.patch +++ b/0010-Bump-listen-version-to-3.6.patch @@ -1,23 +1,22 @@ -From 8fb45fd30524c9286a027c44e12351ddaefecade Mon Sep 17 00:00:00 2001 +From 8678ead4d72de6b79111adabc90aa3877d8777fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= -Date: Tue, 27 Apr 2021 10:27:11 +0200 -Subject: [PATCH 10/15] Bump listen version to ~> 3.5 +Date: Mon, 2 Aug 2021 13:44:45 +0200 +Subject: [PATCH 10/10] Bump listen version to ~> 3.6 -(cherry picked from commit 016911965d5f995a5d0a168069de7ded7b380ecb) --- vagrant.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vagrant.gemspec b/vagrant.gemspec -index 4a4a25e6d..8fef4319c 100644 +index cfe589cca..eede54bf8 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.add_dependency "erubi" s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" s.add_dependency "i18n", "~> 1.8" -- s.add_dependency "listen", "~> 3.4" -+ s.add_dependency "listen", "~> 3.5" +- s.add_dependency "listen", "~> 3.5" ++ s.add_dependency "listen", "~> 3.6" s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" s.add_dependency "mime-types", "~> 3.3" s.add_dependency "net-ssh", ">= 6.1.0", "< 6.2" diff --git a/0011-Mock-the-PowerShell.executable-method-in-more-tests.patch b/0011-Mock-the-PowerShell.executable-method-in-more-tests.patch deleted file mode 100644 index 9795226..0000000 --- a/0011-Mock-the-PowerShell.executable-method-in-more-tests.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 2e76a77511d8c4f4ee1ea8cd2ee8ee5612316a07 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= -Date: Fri, 30 Apr 2021 09:37:20 +0200 -Subject: [PATCH 11/15] Mock the PowerShell.executable method in more tests - -On *nix systems we might not have powershell installed and then finding -powershell.exe or pwsh.exe fails in some tests. If we instead mock -self.executable to return "powershell", then the tests pass and don't cause any -side effects. ---- - test/unit/vagrant/util/powershell_test.rb | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/test/unit/vagrant/util/powershell_test.rb b/test/unit/vagrant/util/powershell_test.rb -index 0b1123c0f..c073d8f26 100644 ---- a/test/unit/vagrant/util/powershell_test.rb -+++ b/test/unit/vagrant/util/powershell_test.rb -@@ -114,6 +114,8 @@ describe Vagrant::Util::PowerShell do - describe ".execute" do - before do - allow(described_class).to receive(:validate_install!) -+ allow(described_class).to receive(:executable) -+ .and_return("powershell") - allow(Vagrant::Util::Subprocess).to receive(:execute) - end - -@@ -159,6 +161,7 @@ describe Vagrant::Util::PowerShell do - before do - allow(described_class).to receive(:validate_install!) - allow(Vagrant::Util::Subprocess).to receive(:execute).and_return(result) -+ allow(described_class).to receive(:executable).and_return("powershell") - end - - it "should validate installation before use" do -@@ -223,6 +226,7 @@ describe Vagrant::Util::PowerShell do - before do - allow(described_class).to receive(:validate_install!) - allow(Vagrant::Util::Subprocess).to receive(:execute).and_return(result) -+ allow(described_class).to receive(:executable).and_return("powershell") - end - - it "should validate installation before use" do --- -2.31.1 - diff --git a/0012-Use-systemctl-poweroff-in-the-background-instead-of-.patch b/0012-Use-systemctl-poweroff-in-the-background-instead-of-.patch deleted file mode 100644 index b9dac90..0000000 --- a/0012-Use-systemctl-poweroff-in-the-background-instead-of-.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 60f35e059f92cb47a65a03066d34c2492160835e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= -Date: Thu, 1 Jul 2021 09:31:50 +0200 -Subject: [PATCH 12/15] Use systemctl poweroff in the background instead of - shutdown - -We have started seeing occasional shutdown failures on openSUSE Tumbleweed with -Virtualbox inside a qemu virtual machine, where `shutdown -h now` would return -nil. While the machine is successfully turned off, the command fails and vagrant -reports an error. -This commit changes the shutdown command to launch in the background which -also triggers a shutdown, but always succeeds. - -(cherry picked from commit 8ce38a639bfb21a8ac2e2c4d53812decf2c9ccaa) ---- - plugins/guests/suse/cap/halt.rb | 2 +- - test/unit/plugins/guests/suse/cap/halt_test.rb | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/plugins/guests/suse/cap/halt.rb b/plugins/guests/suse/cap/halt.rb -index 7a1375e39..3c996f092 100644 ---- a/plugins/guests/suse/cap/halt.rb -+++ b/plugins/guests/suse/cap/halt.rb -@@ -4,7 +4,7 @@ module VagrantPlugins - class Halt - def self.halt(machine) - begin -- machine.communicate.sudo("/sbin/shutdown -h now") -+ machine.communicate.sudo("/usr/bin/systemctl poweroff &") - rescue IOError, Vagrant::Errors::SSHDisconnected - # Do nothing, because it probably means the machine shut down - # and SSH connection was lost. -diff --git a/test/unit/plugins/guests/suse/cap/halt_test.rb b/test/unit/plugins/guests/suse/cap/halt_test.rb -index 7b998aad1..af8f575df 100644 ---- a/test/unit/plugins/guests/suse/cap/halt_test.rb -+++ b/test/unit/plugins/guests/suse/cap/halt_test.rb -@@ -22,19 +22,19 @@ describe "VagrantPlugins::GuestSUSE::Cap::Halt" do - let(:cap) { caps.get(:halt) } - - it "runs the shutdown command" do -- comm.expect_command("/sbin/shutdown -h now") -+ comm.expect_command("/usr/bin/systemctl poweroff &") - cap.halt(machine) - end - - it "does not raise an IOError" do -- comm.stub_command("shutdown -h now", raise: IOError) -+ comm.stub_command("/usr/bin/systemctl poweroff &", raise: IOError) - expect { - cap.halt(machine) - }.to_not raise_error - end - - it "ignores a Vagrant::Errors::SSHDisconnected" do -- comm.stub_command("shutdown -h now", raise: Vagrant::Errors::SSHDisconnected) -+ comm.stub_command("/usr/bin/systemctl poweroff &", raise: Vagrant::Errors::SSHDisconnected) - expect { - cap.halt(machine) - }.to_not raise_error --- -2.31.1 - diff --git a/0013-Include-rexml-dependency.patch b/0013-Include-rexml-dependency.patch deleted file mode 100644 index 9bdc70a..0000000 --- a/0013-Include-rexml-dependency.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fafa4d61f3581cdbdc7879cfd70f7dbbdc75f668 Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Fri, 2 Jul 2021 14:38:25 -0700 -Subject: [PATCH 13/15] Include rexml dependency - -(cherry picked from commit cd7226c7bbf52fca6d57b7c7424f084bb2db29c7) ---- - vagrant.gemspec | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/vagrant.gemspec b/vagrant.gemspec -index 8fef4319c..f35fc6d1d 100644 ---- a/vagrant.gemspec -+++ b/vagrant.gemspec -@@ -28,6 +28,7 @@ Gem::Specification.new do |s| - s.add_dependency "net-sftp", "~> 3.0" - s.add_dependency "net-scp", "~> 1.2.0" - s.add_dependency "rb-kqueue", "~> 0.2.0" -+ s.add_dependency "rexml", "~> 3.2" - s.add_dependency "rubyzip", "~> 2.0" - s.add_dependency "vagrant_cloud", "~> 3.0.4" - s.add_dependency "winrm", ">= 2.3.4", "< 3.0" --- -2.31.1 - diff --git a/0014-Bump-constraints-on-childprocess-and-net-scp.patch b/0014-Bump-constraints-on-childprocess-and-net-scp.patch deleted file mode 100644 index d09eac8..0000000 --- a/0014-Bump-constraints-on-childprocess-and-net-scp.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e1c907b800488d192cbcf4cbe88ca396c2b4a5ae Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Fri, 2 Jul 2021 14:45:32 -0700 -Subject: [PATCH 14/15] Bump constraints on childprocess and net-scp - -(cherry picked from commit 24a00ee3b3472946d4c9235ff55f1d9416ab4577) ---- - vagrant.gemspec | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/vagrant.gemspec b/vagrant.gemspec -index f35fc6d1d..84572ce7c 100644 ---- a/vagrant.gemspec -+++ b/vagrant.gemspec -@@ -16,7 +16,7 @@ Gem::Specification.new do |s| - s.required_rubygems_version = ">= 1.3.6" - - s.add_dependency "bcrypt_pbkdf", "~> 1.1" -- s.add_dependency "childprocess", "~> 4.0.0" -+ s.add_dependency "childprocess", "~> 4.1.0" - s.add_dependency "ed25519", "~> 1.2.4" - s.add_dependency "erubi" - s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" -@@ -26,7 +26,7 @@ Gem::Specification.new do |s| - s.add_dependency "mime-types", "~> 3.3" - s.add_dependency "net-ssh", ">= 6.1.0", "< 6.2" - s.add_dependency "net-sftp", "~> 3.0" -- s.add_dependency "net-scp", "~> 1.2.0" -+ s.add_dependency "net-scp", "~> 3.0.0" - s.add_dependency "rb-kqueue", "~> 0.2.0" - s.add_dependency "rexml", "~> 3.2" - s.add_dependency "rubyzip", "~> 2.0" --- -2.31.1 - diff --git a/0015-Remove-no-longer-required-gem-webmock.patch b/0015-Remove-no-longer-required-gem-webmock.patch deleted file mode 100644 index 9403610..0000000 --- a/0015-Remove-no-longer-required-gem-webmock.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ab9ea6f40c5de266009adfe9a580b5cf5e27e9f4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= -Date: Tue, 6 Jul 2021 16:22:24 +0200 -Subject: [PATCH 15/15] Remove no longer required gem webmock - -This gem was added a long time ago and probably used to test the functionality -that is now provided by the vagrant_cloud gem - -(cherry picked from commit db3859912408868a6a4597fd33c02a661a9e36a9) ---- - test/unit/base.rb | 1 - - vagrant.gemspec | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/test/unit/base.rb b/test/unit/base.rb -index 513ecdc6f..cd53144fb 100644 ---- a/test/unit/base.rb -+++ b/test/unit/base.rb -@@ -3,7 +3,6 @@ require "rubygems" - - # Gems - require "checkpoint" --require "webmock/rspec" - require "rspec/its" - - # Require Vagrant itself so we can reference the proper -diff --git a/vagrant.gemspec b/vagrant.gemspec -index 84572ce7c..090e5d71b 100644 ---- a/vagrant.gemspec -+++ b/vagrant.gemspec -@@ -40,7 +40,6 @@ Gem::Specification.new do |s| - s.add_development_dependency "rake", "~> 13.0" - s.add_development_dependency "rspec", "~> 3.5.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" - - # The following block of code determines the files that should be included --- -2.31.1 - diff --git a/vagrant-2.2.16.tar.gz b/vagrant-2.2.16.tar.gz deleted file mode 100644 index 5469c22..0000000 --- a/vagrant-2.2.16.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab3c60bb12b2da916fd073192849f2b5d3f224f95febf3538212247c4cde28d6 -size 1585826 diff --git a/vagrant-2.2.18.tar.gz b/vagrant-2.2.18.tar.gz new file mode 100644 index 0000000..c81b9e8 --- /dev/null +++ b/vagrant-2.2.18.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3508b0906b832d7317c8d36220798ec274b721e7ef63d0cf991c68f19d9dae90 +size 1620261 diff --git a/vagrant.changes b/vagrant.changes index 176fa5c..45e13fa 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,3 +1,66 @@ +------------------------------------------------------------------- +Tue Aug 3 08:58:34 UTC 2021 - Dan Čermák + +- Switch to Ruby 3.0 on Tumbleweed +- New upstream release 2.2.18 + + Rebase patches: + * 0001-bin-vagrant-silence-warning-about-installer.patch + * 0002-Use-a-private-temporary-dir.patch + * 0003-plugins-don-t-abuse-require_relative.patch.patch + * 0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch + * 0005-do-not-depend-on-wdm.patch + * 0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch + * 0007-Don-t-abuse-relative-paths-in-plugins.patch + * 0008-Skip-failing-tests.patch + * 0009-Disable-Subprocess-unit-test.patch + + Removed patch: + * 0010-Bump-listen-version-to-3.5.patch + * 0011-Mock-the-PowerShell.executable-method-in-more-tests.patch + * 0012-Use-systemctl-poweroff-in-the-background-instead-of-.patch + * 0013-Include-rexml-dependency.patch + * 0014-Bump-constraints-on-childprocess-and-net-scp.patch + * 0015-Remove-no-longer-required-gem-webmock.patch + + Added patch: + * 0010-Bump-listen-version-to-3.6.patch + +## 2.2.18 (July 27, 2021) + +BUG FIXES: + +- core: Fix of plugin manager kwargs [GH-12452] +- providers/docker: Pass in docker command opts as a map [GH-12449] +- providers/hyperv: Fix network address detection [GH-12472] + +## 2.2.17 (July 7, 2021) + +FEATURES: + +- guest/rocky: Add guest support for Rocky Linux [GH-12440] + +IMPROVEMENTS: + +- command/package: Add --info flag to package command [GH-12304] +- guest/debian: Retry network setup on debain [GH-12421] +- guest/suse: Use systemctl poweroff in the background instead of shutdown [GH-12439] +- guest/windows: Get powershell path in %WINDIR%/System32 [GH-12436] +- host/windows: Check Domain and Application Directory contexts for credentials when validating SMB creds [GH-12428] +- providers/hyper-v: Fix IP detection when multiple devices are attached [GH-12232] +- provisioner/ansible: Detects new versions of ansible-4.0.0+ [GH-12391] +- provisioner/ansible: Strip whitespace from ansible version [GH-12420] +- provisioner/salt: Always use upstream Salt bootstrap script on Windows [GH-12127] +- provisioner/salt: Use more conservative TLS settings to work on older .NET versions [GH-12413] +- provisioner/shell: Buffer output to display full lines [GH-12437] +- vagrant: Updates to support Ruby 3.0 [GH-12427] + +BUG FIXES: + +- command/cloud: Fix authentication middleware to prevent breaking local paths [GH-12419] +- communicator/ssh: Fix net-ssh patches for RSA signatures [GH-12415] +- core: Add box directly with authed urls [GH-12278] + ------------------------------------------------------------------- Tue Jul 6 14:40:32 UTC 2021 - Dan Čermák diff --git a/vagrant.spec b/vagrant.spec index 23910ed..ba86ef9 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -26,7 +26,7 @@ Name: vagrant -Version: 2.2.16 +Version: 2.2.18 Release: 0 Summary: Tool for building and distributing virtualized development environments License: MIT @@ -57,31 +57,21 @@ Patch6: 0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch Patch7: 0007-Don-t-abuse-relative-paths-in-plugins.patch Patch8: 0008-Skip-failing-tests.patch Patch9: 0009-Disable-Subprocess-unit-test.patch -# https://github.com/hashicorp/vagrant/pull/12329 -# merged -> drop on next upstream release -Patch10: 0010-Bump-listen-version-to-3.5.patch -# https://github.com/hashicorp/vagrant/pull/12339 -# merged -> drop on next upstream release -Patch11: 0011-Mock-the-PowerShell.executable-method-in-more-tests.patch -# https://github.com/hashicorp/vagrant/pull/12439 -# merged -> drop on next upstream release -Patch12: 0012-Use-systemctl-poweroff-in-the-background-instead-of-.patch -# adds an explicit require of rubygem(rexml) -# already in main, drop on next upstream release -Patch13: 0013-Include-rexml-dependency.patch -# bumps the versions of childprocess & net-scp -# already in main, drop on next upstream release -Patch14: 0014-Bump-constraints-on-childprocess-and-net-scp.patch -# https://github.com/hashicorp/vagrant/pull/12442 -Patch15: 0015-Remove-no-longer-required-gem-webmock.patch +Patch10: 0010-Bump-listen-version-to-3.6.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # force only one ruby version # CAUTION: if you change this, then you *must* also change the sed calls which # fix these values in macros.vagrant +%if 0%{?suse_version} > 1500 +%global rb_build_versions ruby30 +%global rb_build_abi ruby:3.0.0 +%global rb_ruby_suffix ruby3.0 +%else %global rb_build_versions %rb_default_ruby %global rb_build_abi %rb_default_ruby_abi %global rb_ruby_suffix %rb_default_ruby_suffix +%endif # we use the rpm macros in this spec # need to load them *after* defining the rb_* macros @@ -94,16 +84,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # Build dependencies #=============================================================================== -# s.required_ruby_version = "~> 2.5", "< 2.8" -BuildRequires: %{ruby:2 < 2.8} +# s.required_ruby_version = ">= 2.5", "< 3.1" +%if 0%{?suse_version} > 1500 +BuildRequires: %{ruby:3 < 3.1} +%else BuildRequires: %{ruby:2 >= 2.5} +%endif # # # BuildRequires: %{rubygem bundler} # s.add_dependency "bcrypt_pbkdf", "~> 1.1" BuildRequires: %{rubygem bcrypt_pbkdf:1 >= 1.1 } -# PATCHED # s.add_dependency "childprocess", "~> 4.1.0" BuildRequires: %{rubygem childprocess:4.1 } # s.add_dependency "ed25519", "~> 1.2.4" @@ -113,8 +105,8 @@ BuildRequires: %{rubygem erubi } # s.add_dependency "i18n", "~> 1.8" BuildRequires: %{rubygem i18n:1 >= 1.8 } # PATCHED -# s.add_dependency "listen", "~> 3.5" -BuildRequires: %{rubygem listen:3 >= 3.5 } +# s.add_dependency "listen", "~> 3.6" +BuildRequires: %{rubygem listen:3 >= 3.6 } # s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" BuildRequires: %{rubygem hashicorp-checkpoint:0.1 >= 0.1.5 } # s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" @@ -126,7 +118,6 @@ BuildRequires: %{rubygem mime-types:3 >= 3.3 } BuildRequires: %{rubygem net-ssh:6.1 >= 6.1.0 } # s.add_dependency "net-sftp", "~> 3.0" BuildRequires: %{rubygem net-sftp:3 } -# PATCHED # s.add_dependency "net-scp", "~> 3.0.0" BuildRequires: %{rubygem net-scp:3.0 } # s.add_dependency "rb-kqueue", "~> 0.2.0" @@ -143,21 +134,21 @@ BuildRequires: %{rubygem winrm:2 >= 2.3.4 } BuildRequires: %{rubygem winrm-fs:1 >= 1.3.4 } # s.add_dependency "winrm-elevated", ">= 1.2.1", "< 2.0" BuildRequires: %{rubygem winrm-elevated:1 >= 1.2.1 } -# s.add_dependency "vagrant_cloud", "~> 3.0.4" -BuildRequires: %{rubygem vagrant_cloud:3.0 >= 3.0.4 } +# s.add_dependency "vagrant_cloud", "~> 3.0.5" +BuildRequires: %{rubygem vagrant_cloud:3.0 >= 3.0.5 } # devel dependencies: # s.add_development_dependency "rake", "~> 13.0" BuildRequires: %{rubygem rake:13 } -# s.add_development_dependency "rspec", "~> 3.5.0" -BuildRequires: %{rubygem rspec:3.5 } +# s.add_development_dependency "rspec", "~> 3.10.0" +BuildRequires: %{rubygem rspec:3.10 } # s.add_development_dependency "rspec-its", "~> 1.3.0" BuildRequires: %{rubygem rspec-its:1.3 } # s.add_development_dependency "fake_ftp", "~> 0.1.1" BuildRequires: %{rubygem fake_ftp:0.1 >= 0.1.1 } +# s.add_development_dependency "webrick", "~> 1.7.0" +BuildRequires: %{rubygem webrick:1.7 } -# Prevent have choice for rubygem(ruby:2.7.0:listen:3) >= 3.1 -BuildRequires: %{rubygem listen:3.5} # Prevent have choice for rubygem(ruby:2.6.0:mime-types) >= 2 BuildRequires: %{rubygem mime-types:3 } # Prevent have choice for rubygem(ruby:2.6.0:builder) >= 2.1.2 @@ -192,7 +183,6 @@ BuildRequires: fdupes # s.add_dependency "bcrypt_pbkdf", "~> 1.1" Requires: %{rubygem bcrypt_pbkdf:1 >= 1.1 } -# PATCHED # s.add_dependency "childprocess", "~> 4.1.0" Requires: %{rubygem childprocess:4.1} # s.add_dependency "ed25519", "~> 1.2.4" @@ -202,8 +192,8 @@ Requires: %{rubygem erubi} # s.add_dependency "i18n", "~> 1.8" Requires: %{rubygem i18n:1 >= 1.8} # PATCHED -# s.add_dependency "listen", "~> 3.5" -Requires: %{rubygem listen:3 >= 3.5} +# s.add_dependency "listen", "~> 3.6" +Requires: %{rubygem listen:3 >= 3.6} # s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" Requires: %{rubygem hashicorp-checkpoint:0.1 >= 0.1.5} # s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" @@ -215,7 +205,6 @@ Requires: %{rubygem mime-types:3 >= 3.3} Requires: %{rubygem net-ssh:6.1 >= 6.1.0 } # s.add_dependency "net-sftp", "~> 3.0" Requires: %{rubygem net-sftp:3 } -# PATCHED # s.add_dependency "net-scp", "~> 3.0.0" Requires: %{rubygem net-scp:3.0 } # s.add_dependency "rb-kqueue", "~> 0.2.0" @@ -232,8 +221,8 @@ Requires: %{rubygem winrm:2 >= 2.3.4} Requires: %{rubygem winrm-fs:1 >= 1.3.4} # s.add_dependency "winrm-elevated", ">= 1.2.1", "< 2.0" Requires: %{rubygem winrm-elevated:1 >= 1.2.1} -# s.add_dependency "vagrant_cloud", "~> 3.0.4" -Requires: %{rubygem vagrant_cloud:3.0 >= 3.0.4} +# s.add_dependency "vagrant_cloud", "~> 3.0.5" +Requires: %{rubygem vagrant_cloud:3.0 >= 3.0.5} Requires: bsdtar