From 69099a8a3d384964a35f1bee4307ccf22fbb376d79a1de541cd705999504b087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Thu, 3 Nov 2022 11:06:13 +0000 Subject: [PATCH] Accepting request 1033031 from home:dancermak:branches:Virtualization:vagrant New upstream release 2.3.2 OBS-URL: https://build.opensuse.org/request/show/1033031 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=68 --- ...rant-silence-warning-about-installer.patch | 41 +++----- 0002-Use-a-private-temporary-dir.patch | 14 +-- ...s-don-t-abuse-require_relative.patch.patch | 6 +- ...-boo-1044087-added-by-robert.muntean.patch | 6 +- 0005-do-not-depend-on-wdm.patch | 12 +-- ...ative-paths-in-docker-plugin-to-make.patch | 6 +- ...on-t-abuse-relative-paths-in-plugins.patch | 6 +- 0008-Skip-failing-tests.patch | 6 +- 0009-Disable-Subprocess-unit-test.patch | 6 +- 0010-Add-support-for-Ruby-3.1.patch | 37 -------- 0010-Remove-dependency-on-grpc-tools.patch | 28 ++++++ 0011-Bump-net-ssh-to-7.0.patch | 30 ++++++ 0011-Bump-version-of-ed25519-to-1.3.0.patch | 26 ----- 0012-Bump-rspec-dependency-to-3.11.0.patch | 26 ----- 0012-Relax-rspec-dependency-to-3.11.patch | 27 ++++++ ...ast-argument-as-kwargs-in-unit-tests.patch | 76 --------------- vagrant-2.2.19.tar.gz | 3 - vagrant-2.3.2.tar.gz | 3 + vagrant.changes | 95 +++++++++++++++++++ vagrant.spec | 70 ++++++++------ 20 files changed, 269 insertions(+), 255 deletions(-) delete mode 100644 0010-Add-support-for-Ruby-3.1.patch create mode 100644 0010-Remove-dependency-on-grpc-tools.patch create mode 100644 0011-Bump-net-ssh-to-7.0.patch delete mode 100644 0011-Bump-version-of-ed25519-to-1.3.0.patch delete mode 100644 0012-Bump-rspec-dependency-to-3.11.0.patch create mode 100644 0012-Relax-rspec-dependency-to-3.11.patch delete mode 100644 0013-Stop-using-the-last-argument-as-kwargs-in-unit-tests.patch delete mode 100644 vagrant-2.2.19.tar.gz create mode 100644 vagrant-2.3.2.tar.gz diff --git a/0001-bin-vagrant-silence-warning-about-installer.patch b/0001-bin-vagrant-silence-warning-about-installer.patch index 634819d..e4acc9f 100644 --- a/0001-bin-vagrant-silence-warning-about-installer.patch +++ b/0001-bin-vagrant-silence-warning-about-installer.patch @@ -1,40 +1,29 @@ -From 33ec34c4946a10f38747b827ccd0500cc3685af4 Mon Sep 17 00:00:00 2001 +From a9484fd519adf67284315f1b7367a0d9215637b5 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Sat, 11 Oct 2014 16:54:58 -0300 -Subject: [PATCH 01/13] bin/vagrant: silence warning about installer +Subject: [PATCH 01/12] bin/vagrant: silence warning about installer Signed-off-by: Johannes Kastl --- - bin/vagrant | 16 ---------------- - 1 file changed, 16 deletions(-) + bin/vagrant | 5 ----- + 1 file changed, 5 deletions(-) diff --git a/bin/vagrant b/bin/vagrant -index b539d3479..77c83d7c0 100755 +index 7ca30b391..d3f4ea61a 100755 --- a/bin/vagrant +++ b/bin/vagrant -@@ -193,22 +193,6 @@ begin - logger.debug("Creating Vagrant environment") - env = Vagrant::Environment.new(opts) +@@ -221,11 +221,6 @@ begin + end + end -- # If we are running with the Windows Subsystem for Linux do -- # some extra setup to allow access to Vagrant managed machines -- # outside the subsystem -- if Vagrant::Util::Platform.wsl? -- recreate_env = Vagrant::Util::Platform.wsl_init(env, logger) -- if recreate_env -- logger.info("Re-creating Vagrant environment due to WSL modifications.") -- env = Vagrant::Environment.new(opts) +- if !Vagrant.in_installer? && !Vagrant.very_quiet? +- # If we're not in the installer, warn. +- env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false) - end -- end - -- if !Vagrant.in_installer? && !Vagrant.very_quiet? -- # If we're not in the installer, warn. -- env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false) -- end -- - # Acceptable experimental flag values include: - # - # Unset - Disables experimental features + # Acceptable experimental flag values include: + # + # Unset - Disables experimental features -- -2.35.1 +2.38.1 diff --git a/0002-Use-a-private-temporary-dir.patch b/0002-Use-a-private-temporary-dir.patch index aa6f661..8eb80e3 100644 --- a/0002-Use-a-private-temporary-dir.patch +++ b/0002-Use-a-private-temporary-dir.patch @@ -1,7 +1,7 @@ -From df5d75cdb6c3f415e53bd494d3db5e4c809d8230 Mon Sep 17 00:00:00 2001 +From 2e7fbb949344d7918f2b80ad35c3e95018f07ba0 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Wed, 22 Oct 2014 09:40:14 -0200 -Subject: [PATCH 02/13] Use a private temporary dir +Subject: [PATCH 02/12] 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 @@ Signed-off-by: Johannes Kastl create mode 100644 lib/vagrant/util/tempfile.rb diff --git a/lib/vagrant/box.rb b/lib/vagrant/box.rb -index 41b63b292..b2d4c6a05 100644 +index 90dc69d38..4ee79b988 100644 --- a/lib/vagrant/box.rb +++ b/lib/vagrant/box.rb @@ -9,6 +9,7 @@ require "vagrant/util/downloader" @@ -26,7 +26,7 @@ index 41b63b292..b2d4c6a05 100644 module Vagrant # Represents a "box," which is a package Vagrant environment that is used -@@ -124,7 +125,7 @@ module Vagrant +@@ -142,7 +143,7 @@ module Vagrant # @param [Hash] download_options Options to pass to the downloader. # @return [BoxMetadata] def load_metadata(download_options={}) @@ -36,10 +36,10 @@ index 41b63b292..b2d4c6a05 100644 url = @metadata_url diff --git a/lib/vagrant/util.rb b/lib/vagrant/util.rb -index c135dacc2..2d14897a1 100644 +index 4b3e0ff09..cacead1bc 100644 --- a/lib/vagrant/util.rb +++ b/lib/vagrant/util.rb -@@ -46,6 +46,8 @@ module Vagrant +@@ -53,6 +53,8 @@ module Vagrant autoload :SilenceWarnings, 'vagrant/util/silence_warnings' autoload :SSH, 'vagrant/util/ssh' autoload :StackedProcRunner, 'vagrant/util/stacked_proc_runner' @@ -94,5 +94,5 @@ index 000000000..0cbbb53ac + FileUtils.rm_rf(Vagrant::Util::Tempfile.private_tmpdir) +end -- -2.35.1 +2.38.1 diff --git a/0003-plugins-don-t-abuse-require_relative.patch.patch b/0003-plugins-don-t-abuse-require_relative.patch.patch index bff53b6..b4412e3 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 e8835db89852f1221ed9eeff67816a079ed6762b Mon Sep 17 00:00:00 2001 +From ff4daa7b6d1912cd51ad78a05655af8def3da3ba Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Wed, 17 May 2017 09:09:57 +0200 -Subject: [PATCH 03/13] plugins-don-t-abuse-require_relative.patch +Subject: [PATCH 03/12] plugins-don-t-abuse-require_relative.patch Signed-off-by: Johannes Kastl --- @@ -154,5 +154,5 @@ index 2dd140230..e6dd96f08 100644 module VagrantPlugins module GuestSUSE -- -2.35.1 +2.38.1 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 38c0290..3777033 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 d124f36515e112737baecea699a3aa09615702d7 Mon Sep 17 00:00:00 2001 +From b182dd0e2ce6e4964437674d148a4db84082369a Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Fri, 16 Nov 2018 21:12:43 +0100 -Subject: [PATCH 04/13] fix vbox package boo#1044087, added by +Subject: [PATCH 04/12] 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 @@ -33,5 +33,5 @@ index a0baf516f..867fe2bf8 100644 module VagrantPlugins module ProviderVirtualBox -- -2.35.1 +2.38.1 diff --git a/0005-do-not-depend-on-wdm.patch b/0005-do-not-depend-on-wdm.patch index 7159bff..67820e1 100644 --- a/0005-do-not-depend-on-wdm.patch +++ b/0005-do-not-depend-on-wdm.patch @@ -1,7 +1,7 @@ -From 4a7f3ff284ac2a3dd1e6261221f787ac4e7075d7 Mon Sep 17 00:00:00 2001 +From c615ae4db1298cdf9e6b8af4280dcb4536cedbe7 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Mon, 4 Jun 2018 09:18:23 +0200 -Subject: [PATCH 05/13] do not depend on wdm +Subject: [PATCH 05/12] do not depend on wdm Signed-off-by: Johannes Kastl --- @@ -9,11 +9,11 @@ Signed-off-by: Johannes Kastl 1 file changed, 1 deletion(-) diff --git a/vagrant.gemspec b/vagrant.gemspec -index 992b48f2f..2bef1036a 100644 +index 68884f35b..410484dc1 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec -@@ -31,7 +31,6 @@ Gem::Specification.new do |s| - s.add_dependency "rexml", "~> 3.2" +@@ -35,7 +35,6 @@ Gem::Specification.new do |s| + s.add_dependency "rgl", "~> 0.5.7" s.add_dependency "rubyzip", "~> 2.0" s.add_dependency "vagrant_cloud", "~> 3.0.5" - s.add_dependency "wdm", "~> 0.1.0" @@ -21,5 +21,5 @@ index 992b48f2f..2bef1036a 100644 s.add_dependency "winrm-elevated", ">= 1.2.1", "< 2.0" s.add_dependency "winrm-fs", ">= 1.3.4", "< 2.0" -- -2.35.1 +2.38.1 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 522877d..31833b5 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 99447e851f41f413d1e525ef51e946b003e1a080 Mon Sep 17 00:00:00 2001 +From 22209200b5126a357e399ab62529954c7ff8242c Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Fri, 16 Nov 2018 21:14:46 +0100 -Subject: [PATCH 06/13] do not abuse relative paths in docker plugin to make +Subject: [PATCH 06/12] 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 @@ -22,5 +22,5 @@ index 07c4e5333..e8142df8b 100644 module VagrantPlugins module DockerProvider -- -2.35.1 +2.38.1 diff --git a/0007-Don-t-abuse-relative-paths-in-plugins.patch b/0007-Don-t-abuse-relative-paths-in-plugins.patch index f62c33b..158ca7a 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 3dc208ffbe52efb9c77e8541824b2b33a9252eaf Mon Sep 17 00:00:00 2001 +From e68cfa0f5f2653b85f5a92c72544d64a349ac84e 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/13] Don't abuse relative paths in plugins +Subject: [PATCH 07/12] Don't abuse relative paths in plugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -65,5 +65,5 @@ index 7bc8ceca0..e938305e7 100644 require_relative "../installer" -- -2.35.1 +2.38.1 diff --git a/0008-Skip-failing-tests.patch b/0008-Skip-failing-tests.patch index 2beb94a..2deeff2 100644 --- a/0008-Skip-failing-tests.patch +++ b/0008-Skip-failing-tests.patch @@ -1,7 +1,7 @@ -From f6b2e0cebf27725b82b29085451df2308989b1c7 Mon Sep 17 00:00:00 2001 +From b60042a2b9d0c94be207ad852d0b58bb2f8f002c 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/13] Skip failing tests +Subject: [PATCH 08/12] Skip failing tests --- test/unit/bin/vagrant_test.rb | 4 ++-- @@ -30,5 +30,5 @@ index dbbd52112..4481e4c09 100644 end end -- -2.35.1 +2.38.1 diff --git a/0009-Disable-Subprocess-unit-test.patch b/0009-Disable-Subprocess-unit-test.patch index db236a9..201c215 100644 --- a/0009-Disable-Subprocess-unit-test.patch +++ b/0009-Disable-Subprocess-unit-test.patch @@ -1,7 +1,7 @@ -From cc9cc287131b8a0b4419d2a7c2a0f7f3fd7b5b26 Mon Sep 17 00:00:00 2001 +From 12e2bb8f59b42b93a09c5e44aa1ce183512f727d 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/13] Disable Subprocess unit test +Subject: [PATCH 09/12] 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 @@ -33,5 +33,5 @@ index 0ff5835c8..757d8ef8a 100644 thread = Thread.new{ sp.execute } sleep(0.1) -- -2.35.1 +2.38.1 diff --git a/0010-Add-support-for-Ruby-3.1.patch b/0010-Add-support-for-Ruby-3.1.patch deleted file mode 100644 index c011ce2..0000000 --- a/0010-Add-support-for-Ruby-3.1.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 214e118384d0456db19faa0fa63bff571d0229c3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= -Date: Mon, 3 Jan 2022 12:08:09 +0100 -Subject: [PATCH 10/13] Add support for Ruby 3.1 - -The biggest change comming with Ruby 3.1 is that net/ftp is no longer bundled -with Ruby but distributed as a separate gem. - -(cherry picked from commit a1a002831e8e9b40f8c2ba42187ace707b0cc91c) ---- - vagrant.gemspec | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/vagrant.gemspec b/vagrant.gemspec -index 2bef1036a..ccf76011a 100644 ---- a/vagrant.gemspec -+++ b/vagrant.gemspec -@@ -12,7 +12,7 @@ Gem::Specification.new do |s| - s.summary = "Build and distribute virtualized development environments." - s.description = "Vagrant is a tool for building and distributing virtualized development environments." - -- s.required_ruby_version = ">= 2.6", "< 3.1" -+ s.required_ruby_version = ">= 2.6", "< 3.2" - s.required_rubygems_version = ">= 1.3.6" - - s.add_dependency "bcrypt_pbkdf", "~> 1.1" -@@ -24,6 +24,7 @@ Gem::Specification.new do |s| - 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-ftp", "~> 0.1" - s.add_dependency "net-ssh", ">= 6.1.0", "< 6.2" - s.add_dependency "net-sftp", "~> 3.0" - s.add_dependency "net-scp", "~> 3.0.0" --- -2.35.1 - diff --git a/0010-Remove-dependency-on-grpc-tools.patch b/0010-Remove-dependency-on-grpc-tools.patch new file mode 100644 index 0000000..42dbdae --- /dev/null +++ b/0010-Remove-dependency-on-grpc-tools.patch @@ -0,0 +1,28 @@ +From 5bdda0d6b8ca0c39e03e9b4df4950d6704b35089 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= +Date: Tue, 23 Aug 2022 16:19:11 +0200 +Subject: [PATCH 10/12] Remove dependency on grpc-tools + +This package is only needed to build the go plugins, which we do not use at the +moment. +--- + vagrant.gemspec | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/vagrant.gemspec b/vagrant.gemspec +index 410484dc1..c8a25cd0b 100644 +--- a/vagrant.gemspec ++++ b/vagrant.gemspec +@@ -39,9 +39,6 @@ Gem::Specification.new do |s| + s.add_dependency "winrm-elevated", ">= 1.2.1", "< 2.0" + s.add_dependency "winrm-fs", ">= 1.3.4", "< 2.0" + +- # Needed for go generate to use grpc_tools_ruby_protoc +- s.add_development_dependency "grpc-tools", "~> 1.41" +- + # required to include https://github.com/ruby/ipaddr/issues/35 + s.add_dependency "ipaddr", ">= 1.2.4" + +-- +2.38.1 + diff --git a/0011-Bump-net-ssh-to-7.0.patch b/0011-Bump-net-ssh-to-7.0.patch new file mode 100644 index 0000000..5e2ffab --- /dev/null +++ b/0011-Bump-net-ssh-to-7.0.patch @@ -0,0 +1,30 @@ +From 4cd4f37c6a3bc15af4bdb5906e49f0e9839f6305 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= +Date: Tue, 1 Nov 2022 14:23:32 +0100 +Subject: [PATCH 11/12] Bump net-ssh to ~> 7.0 + +This also requires a bump of net-scp and net-sftp +--- + vagrant.gemspec | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/vagrant.gemspec b/vagrant.gemspec +index c8a25cd0b..8fde90bad 100644 +--- a/vagrant.gemspec ++++ b/vagrant.gemspec +@@ -27,9 +27,9 @@ Gem::Specification.new do |s| + s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" + s.add_dependency "mime-types", "~> 3.3" + s.add_dependency "net-ftp", "~> 0.1" +- s.add_dependency "net-ssh", ">= 6.1.0", "< 6.2" +- s.add_dependency "net-sftp", "~> 3.0" +- s.add_dependency "net-scp", "~> 3.0.0" ++ s.add_dependency "net-ssh", "~> 7.0" ++ s.add_dependency "net-sftp", "~> 4.0" ++ s.add_dependency "net-scp", "~> 4.0" + s.add_dependency "rb-kqueue", "~> 0.2.0" + s.add_dependency "rexml", "~> 3.2" + s.add_dependency "rgl", "~> 0.5.7" +-- +2.38.1 + diff --git a/0011-Bump-version-of-ed25519-to-1.3.0.patch b/0011-Bump-version-of-ed25519-to-1.3.0.patch deleted file mode 100644 index 550ac1a..0000000 --- a/0011-Bump-version-of-ed25519-to-1.3.0.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 32b8ea83078edc4a86cbba573142dc95b16ebd40 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= -Date: Tue, 1 Feb 2022 11:31:44 +0100 -Subject: [PATCH 11/13] Bump version of ed25519 to ~> 1.3.0 - -(cherry picked from commit 2a974101f42dbc525450e240f02db2a3edc62ac1) ---- - vagrant.gemspec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vagrant.gemspec b/vagrant.gemspec -index ccf76011a..ea38685bf 100644 ---- a/vagrant.gemspec -+++ b/vagrant.gemspec -@@ -17,7 +17,7 @@ Gem::Specification.new do |s| - - s.add_dependency "bcrypt_pbkdf", "~> 1.1" - s.add_dependency "childprocess", "~> 4.1.0" -- s.add_dependency "ed25519", "~> 1.2.4" -+ s.add_dependency "ed25519", "~> 1.3.0" - s.add_dependency "erubi" - s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" - s.add_dependency "i18n", "~> 1.8" --- -2.35.1 - diff --git a/0012-Bump-rspec-dependency-to-3.11.0.patch b/0012-Bump-rspec-dependency-to-3.11.0.patch deleted file mode 100644 index 13b3462..0000000 --- a/0012-Bump-rspec-dependency-to-3.11.0.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 28264928d405319ddc28c300cb9b32101eb5fa4c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= -Date: Mon, 28 Feb 2022 10:51:50 +0100 -Subject: [PATCH 12/13] Bump rspec dependency to ~> 3.11.0 - -(cherry picked from commit 45a225416d2e611ddad34635104b9e22badd17e7) ---- - vagrant.gemspec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vagrant.gemspec b/vagrant.gemspec -index ea38685bf..8622c2dbf 100644 ---- a/vagrant.gemspec -+++ b/vagrant.gemspec -@@ -39,7 +39,7 @@ Gem::Specification.new do |s| - # Constraint rake to properly handle deprecated method usage - # from within rspec - s.add_development_dependency "rake", "~> 13.0" -- s.add_development_dependency "rspec", "~> 3.10.0" -+ s.add_development_dependency "rspec", "~> 3.11.0" - s.add_development_dependency "rspec-its", "~> 1.3.0" - s.add_development_dependency "fake_ftp", "~> 0.1.1" - s.add_development_dependency "webrick", "~> 1.7.0" --- -2.35.1 - diff --git a/0012-Relax-rspec-dependency-to-3.11.patch b/0012-Relax-rspec-dependency-to-3.11.patch new file mode 100644 index 0000000..6c8c9a0 --- /dev/null +++ b/0012-Relax-rspec-dependency-to-3.11.patch @@ -0,0 +1,27 @@ +From 2a230250e61dd40735a338f5264a3c357f5c1156 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= +Date: Tue, 1 Nov 2022 15:53:19 +0100 +Subject: [PATCH 12/12] Relax rspec dependency to ~> 3.11 + +No need to be so overly strict, this is a test dependency, so failures will +surface immediately. +--- + vagrant.gemspec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vagrant.gemspec b/vagrant.gemspec +index 8fde90bad..4f2cb20ab 100644 +--- a/vagrant.gemspec ++++ b/vagrant.gemspec +@@ -45,7 +45,7 @@ Gem::Specification.new do |s| + # Constraint rake to properly handle deprecated method usage + # from within rspec + s.add_development_dependency "rake", "~> 13.0" +- s.add_development_dependency "rspec", "~> 3.11.0" ++ s.add_development_dependency "rspec", "~> 3.11" + s.add_development_dependency "rspec-its", "~> 1.3.0" + s.add_development_dependency "fake_ftp", "~> 0.3.0" + s.add_development_dependency "webrick", "~> 1.7.0" +-- +2.38.1 + diff --git a/0013-Stop-using-the-last-argument-as-kwargs-in-unit-tests.patch b/0013-Stop-using-the-last-argument-as-kwargs-in-unit-tests.patch deleted file mode 100644 index 71f821e..0000000 --- a/0013-Stop-using-the-last-argument-as-kwargs-in-unit-tests.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 729306f83a0cc2926752bc09fb0194e0b2e1d455 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= -Date: Mon, 28 Feb 2022 10:46:17 +0100 -Subject: [PATCH 13/13] Stop using the last argument as kwargs in unit tests - -A few unit tests started failing with Ruby 3.0, because they were relying on -keyword arguments being converted into hashes automatically. This behavior was -deprecated in Ruby 2.7 and results in errors in Ruby 3.0 onward. - -For further details: -https://rubyreferences.github.io/rubychanges/3.0.html#keyword-arguments-are-now-fully-separated-from-positional-arguments - -(cherry picked from commit 2b1c25d247aba492e582a01cff8ecdd33d4d165b) ---- - test/unit/plugins/commands/package/command_test.rb | 4 ++-- - .../plugins/providers/hyperv/action/read_guest_ip_test.rb | 2 +- - test/unit/vagrant/ui_test.rb | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/test/unit/plugins/commands/package/command_test.rb b/test/unit/plugins/commands/package/command_test.rb -index 7b289bd1e..d0f81393b 100644 ---- a/test/unit/plugins/commands/package/command_test.rb -+++ b/test/unit/plugins/commands/package/command_test.rb -@@ -64,7 +64,7 @@ describe VagrantPlugins::CommandPackage::Command do - - it "packages default machine inside specified folder" do - expect(package_command).to receive(:package_vm).with( -- a_machine_named('default'), :output => "package-output-folder/default" -+ a_machine_named('default'), { output: "package-output-folder/default" } - ) - package_command.execute - end -@@ -96,7 +96,7 @@ describe VagrantPlugins::CommandPackage::Command do - let(:argv){ ['--base', 'machine-id'] } - - it "packages vm defined within virtualbox" do -- expect(package_command).to receive(:package_base).with(:base => 'machine-id') -+ expect(package_command).to receive(:package_base).with({ base: 'machine-id' }) - package_command.execute - end - -diff --git a/test/unit/plugins/providers/hyperv/action/read_guest_ip_test.rb b/test/unit/plugins/providers/hyperv/action/read_guest_ip_test.rb -index 5642c6271..ecce003a6 100644 ---- a/test/unit/plugins/providers/hyperv/action/read_guest_ip_test.rb -+++ b/test/unit/plugins/providers/hyperv/action/read_guest_ip_test.rb -@@ -31,7 +31,7 @@ describe VagrantPlugins::HyperV::Action::ReadGuestIP do - end - - it "should set the host information into the env" do -- expect(env).to receive(:[]=).with(:machine_ssh_info, host: "ADDRESS") -+ expect(env).to receive(:[]=).with(:machine_ssh_info, { host: "ADDRESS" }) - expect(driver).to receive(:read_guest_ip).and_return("ip" => "ADDRESS") - subject.call(env) - end -diff --git a/test/unit/vagrant/ui_test.rb b/test/unit/vagrant/ui_test.rb -index e484b8154..120b1dda2 100644 ---- a/test/unit/vagrant/ui_test.rb -+++ b/test/unit/vagrant/ui_test.rb -@@ -379,12 +379,12 @@ describe Vagrant::UI::Prefixed do - - describe "#machine" do - it "sets the target option" do -- expect(ui).to receive(:machine).with(:foo, target: prefix) -+ expect(ui).to receive(:machine).with(:foo, { target: prefix }) - subject.machine(:foo) - end - - it "preserves existing options" do -- expect(ui).to receive(:machine).with(:foo, :bar, foo: :bar, target: prefix) -+ expect(ui).to receive(:machine).with(:foo, :bar, { foo: :bar, target: prefix }) - subject.machine(:foo, :bar, foo: :bar) - end - end --- -2.35.1 - diff --git a/vagrant-2.2.19.tar.gz b/vagrant-2.2.19.tar.gz deleted file mode 100644 index 9ff9951..0000000 --- a/vagrant-2.2.19.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f0e6b1d466e26dead682c4d4843e8f64a012eba4be91506ae6c6d34d3d9c8f9 -size 1838272 diff --git a/vagrant-2.3.2.tar.gz b/vagrant-2.3.2.tar.gz new file mode 100644 index 0000000..68c4d1f --- /dev/null +++ b/vagrant-2.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76d3737e273fa73501f7c12a4814f6a63851b8119118575cc77e9911ce3acb06 +size 3236830 diff --git a/vagrant.changes b/vagrant.changes index ad57e65..4e88406 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,3 +1,98 @@ +------------------------------------------------------------------- +Tue Nov 1 13:29:55 UTC 2022 - Dan Čermák + +- New upstream release 2.3.2 + + 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 patches: + * 0010-Add-support-for-Ruby-3.1.patch + * 0011-Remove-dependency-on-grpc-tools.patch (rebased as 0010-Remove-dependency-on-grpc-tools.patch) + + Added patches: + * 0010-Remove-dependency-on-grpc-tools.patch + * 0011-Bump-net-ssh-to-7.0.patch + * 0012-Relax-rspec-dependency-to-3.11.patch + +## 2.3.2 (October 18, 2022) + +FEATURES: + +- provider/virtualbox: Add support for VirtualBox 7.0 [GH-12947] + +## 2.3.1 (September 29, 2022) + +IMPROVEMENTS: + +- core: Raise error if required metadata.json box fields are not present [GH-12895] +- core: Provider helpful error when box version format is invalid [GH-12911] + +BUG FIXES: + +- Fix flakiness when bringing up a machine that forwards ssh [GH-12909] +- communicator/ssh: Fix `private_key_path` behavior when `keys_only` is disabled [GH-12885] +- synced_folder/nfs: Update exports file creation [GH-12910] +- util/downloader: Fix user agent [GH-12925] + +VAGRANT-GO: + +- Support secret interactive input [GH-12876] +- Support terminal coloring [GH-12888] +- Validate if requested provider is usable and append/prepend information to errors [GH-12898] +- Raise error if required metadata.json box fields are not present [GH-12919] + +------------------------------------------------------------------- +Fri Sep 23 16:07:13 UTC 2022 - Dan Čermák + +- New upstream release 2.3.0 + + 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 + * 0010-Add-support-for-Ruby-3.1.patch + + Removed patches: + * 0011-Bump-version-of-ed25519-to-1.3.0.patch + * 0012-Bump-rspec-dependency-to-3.11.0.patch + * 0013-Stop-using-the-last-argument-as-kwargs-in-unit-tests.patch + + Added patches: + * 0011-Remove-dependency-on-grpc-tools.patch + +## 2.3.0 (August 5, 2022) + +FEATURES: + +- core: Introduce vagrant-go [GH-12819] + +IMPROVEMENTS: + +- core: Set rsa-sha2 in kex algorithm set to enable in key exchange [GH-12584] +- core/bundler: Improve Gem spec selection when resolving [GH-12567] +- push/heroku: Display output from push [GH-12646] + +BUG FIXES: + +- host/darwin: Fix `NameError` for version capability [GH-12581] +- push/ftp: Fix `VAGRANT_CWD` handling [GH-12645] +- guests/redhat: Fix NFS shares on Rocky 9 guests [GH-12813] + ------------------------------------------------------------------- Thu Sep 22 12:01:34 UTC 2022 - Dan Čermák diff --git a/vagrant.spec b/vagrant.spec index 2fd0571..e23bf06 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -26,7 +26,7 @@ Name: vagrant -Version: 2.2.19 +Version: 2.3.2 Release: 0 Summary: Tool for building and distributing virtualized development environments License: MIT @@ -57,11 +57,9 @@ 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 -Patch10: 0010-Add-support-for-Ruby-3.1.patch -Patch11: 0011-Bump-version-of-ed25519-to-1.3.0.patch -Patch12: 0012-Bump-rspec-dependency-to-3.11.0.patch -Patch13: 0013-Stop-using-the-last-argument-as-kwargs-in-unit-tests.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch10: 0010-Remove-dependency-on-grpc-tools.patch +Patch11: 0011-Bump-net-ssh-to-7.0.patch +Patch12: 0012-Relax-rspec-dependency-to-3.11.patch # force only one ruby version # CAUTION: if you change this, then you *must* also change the sed calls which @@ -95,14 +93,16 @@ BuildRequires: %{rubygem bundler} BuildRequires: %{rubygem bcrypt_pbkdf:1 >= 1.1 } # s.add_dependency "childprocess", "~> 4.1.0" BuildRequires: %{rubygem childprocess:4.1 } -# PATCHED # s.add_dependency "ed25519", "~> 1.3.0" BuildRequires: %{rubygem ed25519:1.3 >= 1.3.0 } # s.add_dependency "erubi" BuildRequires: %{rubygem erubi } +# s.add_dependency 'googleapis-common-protos-types', '~> 1.3' +BuildRequires: %{rubygem googleapis-common-protos-types:1 >= 1.3} +# s.add_dependency "grpc" +BuildRequires: %{rubygem grpc} # s.add_dependency "i18n", "~> 1.8" BuildRequires: %{rubygem i18n:1 >= 1.8 } -# PATCHED # s.add_dependency "listen", "~> 3.6" BuildRequires: %{rubygem listen:3 >= 3.6 } # s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" @@ -112,19 +112,23 @@ BuildRequires: %{rubygem log4r:1.1 >= 1.1.9 } BuildConflicts: %{rubygem log4r:1.1 >= 1.1.11 } # s.add_dependency "mime-types", "~> 3.3" BuildRequires: %{rubygem mime-types:3 >= 3.3 } -# PATCHED # s.add_dependency "net-ftp", "~> 0.1" BuildRequires: %{rubygem net-ftp:0 >= 0.1 } -# s.add_dependency "net-ssh", ">= 6.1.0", "< 6.2" -BuildRequires: %{rubygem net-ssh:6.1 >= 6.1.0 } -# s.add_dependency "net-sftp", "~> 3.0" -BuildRequires: %{rubygem net-sftp:3 } -# s.add_dependency "net-scp", "~> 3.0.0" -BuildRequires: %{rubygem net-scp:3.0 } +# PATCHED +# s.add_dependency "net-ssh", "~> 7.0" +BuildRequires: %{rubygem net-ssh:7 } +# PATCHED +# s.add_dependency "net-sftp", "~> 4.0" +BuildRequires: %{rubygem net-sftp:4 } +# PATCHED +# s.add_dependency "net-scp", "~> 4.0" +BuildRequires: %{rubygem net-scp:4 } # s.add_dependency "rb-kqueue", "~> 0.2.0" BuildRequires: %{rubygem rb-kqueue:0.2 } # s.add_dependency "rexml", "~> 3.2" BuildRequires: %{rubygem rexml:3 >= 3.2 } +# s.add_dependency "rgl", "~> 0.5.7" +BuildRequires: %{rubygem rgl:0.5 >= 0.5.7} # s.add_dependency "rubyzip", "~> 2.0" BuildRequires: %{rubygem rubyzip:2} # Intentionally removed, wdm only works on Windows @@ -138,16 +142,20 @@ BuildRequires: %{rubygem winrm-elevated:1 >= 1.2.1 } # s.add_dependency "vagrant_cloud", "~> 3.0.5" BuildRequires: %{rubygem vagrant_cloud:3.0 >= 3.0.5 } +# PATCHED -> removed +# s.add_development_dependency "grpc-tools", "~> 1.41.1" +# BuildRequires: %%{rubygem grpc-tools:1.41 >= 1.41.1} + # devel dependencies: # s.add_development_dependency "rake", "~> 13.0" BuildRequires: %{rubygem rake:13 } # PATCHED -# s.add_development_dependency "rspec", "~> 3.11.0" -BuildRequires: %{rubygem rspec:3.11 } +# s.add_development_dependency "rspec", "~> 3.11" +BuildRequires: %{rubygem rspec:3 >= 3.11 } # 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 "fake_ftp", "~> 0.3.0" +BuildRequires: %{rubygem fake_ftp:0.3 >= 0.3.0 } # s.add_development_dependency "webrick", "~> 1.7.0" BuildRequires: %{rubygem webrick:1.7 } @@ -183,14 +191,12 @@ BuildRequires: fdupes Requires: %{rubygem bcrypt_pbkdf:1 >= 1.1 } # s.add_dependency "childprocess", "~> 4.1.0" Requires: %{rubygem childprocess:4.1} -# PATCHED # s.add_dependency "ed25519", "~> 1.3.0" Requires: %{rubygem ed25519:1.3 >= 1.3.0} # s.add_dependency "erubi" Requires: %{rubygem erubi} # s.add_dependency "i18n", "~> 1.8" Requires: %{rubygem i18n:1 >= 1.8} -# PATCHED # s.add_dependency "listen", "~> 3.6" Requires: %{rubygem listen:3 >= 3.6} # s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" @@ -200,15 +206,17 @@ Requires: %{rubygem log4r:1.1 >= 1.1.9 } Requires: %{rubygem log4r:1.1 < 1.1.11 } # s.add_dependency "mime-types", "~> 3.3" Requires: %{rubygem mime-types:3 >= 3.3} -# PATCHED # s.add_dependency "net-ftp", "~> 0.1" BuildRequires: %{rubygem net-ftp:0 >= 0.1 } -# s.add_dependency "net-ssh", ">= 6.1.0", "< 6.2" -Requires: %{rubygem net-ssh:6.1 >= 6.1.0 } -# s.add_dependency "net-sftp", "~> 3.0" -Requires: %{rubygem net-sftp:3 } -# s.add_dependency "net-scp", "~> 3.0.0" -Requires: %{rubygem net-scp:3.0 } +# PATCHED +# s.add_dependency "net-ssh", "~> 7.0" +Requires: %{rubygem net-ssh:7 } +# PATCHED +# s.add_dependency "net-sftp", "~> 4.0" +Requires: %{rubygem net-sftp:4 } +# PATCHED +# s.add_dependency "net-scp", "~> 4.0" +Requires: %{rubygem net-scp:4 } # s.add_dependency "rb-kqueue", "~> 0.2.0" Requires: %{rubygem rb-kqueue:0.2} # s.add_dependency "rexml", "~> 3.2" @@ -376,8 +384,10 @@ rm -f %{buildroot}%{_bindir}/vagrant.orig.%{rb_ruby_suffix} rm -f %{buildroot}%{vagrant_plugin_dir}/bin/vagrant.orig.%{rb_ruby_suffix} rm -f %{buildroot}%{vagrant_dir}/lib/vagrant/util.rb.orig -# remove build script from vagrant -rm -f %{buildroot}%{vagrant_dir}/.runner.sh +# remove build scripts & nix stuff & go stuff +rm -rf %{buildroot}%{vagrant_dir}/{.runner.sh,Dockerfile,Makefile,go.mod,go.sum,shell.nix,nix,gen.go,flake.lock,flake.nix,vagrant-config.hcl} +# we use our own binstub +rm -rf %{buildroot}%{vagrant_dir}/binstubs/ %fdupes %{buildroot}%{dirname:%vagrant_plugin_dir}