From 1b387f0c0779081e0baa196c6a214a32dd934b8912c29bb206dc3410642dce07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Thu, 1 Apr 2021 12:26:31 +0000 Subject: [PATCH] Accepting request 882535 from home:dancermak:branches:Virtualization:vagrant New upstream release 2.2.15 OBS-URL: https://build.opensuse.org/request/show/882535 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=54 --- ...rant-silence-warning-about-installer.patch | 10 ++-- 0002-Use-a-private-temporary-dir.patch | 10 ++-- ...s-don-t-abuse-require_relative.patch.patch | 6 +-- ...-boo-1044087-added-by-robert.muntean.patch | 6 +-- 0005-do-not-depend-on-wdm.patch | 10 ++-- ...ative-paths-in-docker-plugin-to-make.patch | 6 +-- ...on-t-abuse-relative-paths-in-plugins.patch | 6 +-- 0008-Skip-failing-tests.patch | 12 ++--- 0009-Disable-Subprocess-unit-test.patch | 6 +-- 0010-Update-rake-to-13.0.patch | 26 --------- ...sten-gem-version-and-remove-ruby_dep.patch | 42 --------------- 0012-Bump-bcrypt_pbkdf-version.patch | 30 ----------- vagrant-2.2.14.tar.gz | 3 -- vagrant-2.2.15.tar.gz | 3 ++ vagrant.changes | 53 +++++++++++++++++++ vagrant.spec | 29 ++++------ 16 files changed, 101 insertions(+), 157 deletions(-) delete mode 100644 0010-Update-rake-to-13.0.patch delete mode 100644 0011-Bump-listen-gem-version-and-remove-ruby_dep.patch delete mode 100644 0012-Bump-bcrypt_pbkdf-version.patch delete mode 100644 vagrant-2.2.14.tar.gz create mode 100644 vagrant-2.2.15.tar.gz diff --git a/0001-bin-vagrant-silence-warning-about-installer.patch b/0001-bin-vagrant-silence-warning-about-installer.patch index 469aeb8..b059791 100644 --- a/0001-bin-vagrant-silence-warning-about-installer.patch +++ b/0001-bin-vagrant-silence-warning-about-installer.patch @@ -1,7 +1,7 @@ -From 3559bd65aa796772e31abbeb4bd92e0829ed5e99 Mon Sep 17 00:00:00 2001 +From 152901e1ae1a475a48e3ecb43d54c629cc8abf05 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Sat, 11 Oct 2014 16:54:58 -0300 -Subject: [PATCH 01/12] bin/vagrant: silence warning about installer +Subject: [PATCH 1/9] bin/vagrant: silence warning about installer Signed-off-by: Johannes Kastl --- @@ -9,10 +9,10 @@ Signed-off-by: Johannes Kastl 1 file changed, 16 deletions(-) diff --git a/bin/vagrant b/bin/vagrant -index ba7e40076..8272e839e 100755 +index c019f30ff..6d2d21523 100755 --- a/bin/vagrant +++ b/bin/vagrant -@@ -167,22 +167,6 @@ begin +@@ -193,22 +193,6 @@ begin logger.debug("Creating Vagrant environment") env = Vagrant::Environment.new(opts) @@ -36,5 +36,5 @@ index ba7e40076..8272e839e 100755 # # Unset - Disables experimental features -- -2.30.1 +2.30.2 diff --git a/0002-Use-a-private-temporary-dir.patch b/0002-Use-a-private-temporary-dir.patch index 5ec1cf9..7c7afd0 100644 --- a/0002-Use-a-private-temporary-dir.patch +++ b/0002-Use-a-private-temporary-dir.patch @@ -1,7 +1,7 @@ -From b2c6ef61dc339eae73640c357e6be6e1f8cf723a Mon Sep 17 00:00:00 2001 +From ff54f5982a2b7365871d4ed1516de1ab7be4ff11 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Wed, 22 Oct 2014 09:40:14 -0200 -Subject: [PATCH 02/12] Use a private temporary dir +Subject: [PATCH 2/9] Use a private temporary dir Without this vagrant will clutter $TMPDIR with dozens of even hundreds of temporary files (~4 per vagrant invocation). @@ -36,10 +36,10 @@ index 41b63b292..b2d4c6a05 100644 url = @metadata_url diff --git a/lib/vagrant/util.rb b/lib/vagrant/util.rb -index f8be2baf0..5776a56dd 100644 +index b7f297169..95e7850a3 100644 --- a/lib/vagrant/util.rb +++ b/lib/vagrant/util.rb -@@ -16,6 +16,8 @@ module Vagrant +@@ -17,6 +17,8 @@ module Vagrant autoload :SafeExec, 'vagrant/util/safe_exec' autoload :SilenceWarnings, 'vagrant/util/silence_warnings' autoload :StackedProcRunner, 'vagrant/util/stacked_proc_runner' @@ -94,5 +94,5 @@ index 000000000..0cbbb53ac + FileUtils.rm_rf(Vagrant::Util::Tempfile.private_tmpdir) +end -- -2.30.1 +2.30.2 diff --git a/0003-plugins-don-t-abuse-require_relative.patch.patch b/0003-plugins-don-t-abuse-require_relative.patch.patch index 65116ab..0b0d3b9 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 402f323f982ea36af2db24ac62ec527ff6530515 Mon Sep 17 00:00:00 2001 +From d04bc870f70ca3a25c33992588b52d692caf270d Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Wed, 17 May 2017 09:09:57 +0200 -Subject: [PATCH 03/12] plugins-don-t-abuse-require_relative.patch +Subject: [PATCH 3/9] 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.30.1 +2.30.2 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 b111d4b..0bfb00e 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 cb36ee51bb914627bda93641135721ee88b640a4 Mon Sep 17 00:00:00 2001 +From 2c1eadfcf5df4f2f886cce3b3031ed6aa8315caa Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Fri, 16 Nov 2018 21:12:43 +0100 -Subject: [PATCH 04/12] fix vbox package boo#1044087, added by +Subject: [PATCH 4/9] 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.30.1 +2.30.2 diff --git a/0005-do-not-depend-on-wdm.patch b/0005-do-not-depend-on-wdm.patch index 4ef3060..6613693 100644 --- a/0005-do-not-depend-on-wdm.patch +++ b/0005-do-not-depend-on-wdm.patch @@ -1,7 +1,7 @@ -From b65df008243ff8016b0e5714da53b5fb221e5961 Mon Sep 17 00:00:00 2001 +From 86f1ba8702737f24b357bb7114e8d97e36b86283 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Mon, 4 Jun 2018 09:18:23 +0200 -Subject: [PATCH 05/12] do not depend on wdm +Subject: [PATCH 5/9] do not depend on wdm Signed-off-by: Johannes Kastl --- @@ -9,17 +9,17 @@ Signed-off-by: Johannes Kastl 1 file changed, 1 deletion(-) diff --git a/vagrant.gemspec b/vagrant.gemspec -index a452e2b7a..6a586fd7c 100644 +index 1643681b4..9d71cdc52 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -30,7 +30,6 @@ Gem::Specification.new do |s| s.add_dependency "rb-kqueue", "~> 0.2.0" s.add_dependency "rubyzip", "~> 2.0" - s.add_dependency "vagrant_cloud", "~> 3.0.2" + s.add_dependency "vagrant_cloud", "~> 3.0.4" - 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" s.add_dependency "winrm-fs", ">= 1.3.4", "< 2.0" -- -2.30.1 +2.30.2 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 4d770b1..e76da90 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 4f32f38bb823405a3e3fcd54ebf878ad7c2ff78d Mon Sep 17 00:00:00 2001 +From d8359d5055d692e703abcb5a5bf8a55ca16a00bb Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Fri, 16 Nov 2018 21:14:46 +0100 -Subject: [PATCH 06/12] do not abuse relative paths in docker plugin to make +Subject: [PATCH 6/9] 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.30.1 +2.30.2 diff --git a/0007-Don-t-abuse-relative-paths-in-plugins.patch b/0007-Don-t-abuse-relative-paths-in-plugins.patch index 049b868..78e30d6 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 555f29e1367c56ad4aa17447a5108a7f3be1b91d Mon Sep 17 00:00:00 2001 +From 1ffd8eaeeac0148698d857a1d029a04ab37c44ac 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/12] Don't abuse relative paths in plugins +Subject: [PATCH 7/9] Don't abuse relative paths in plugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -64,5 +64,5 @@ index 7bc8ceca0..e938305e7 100644 require_relative "../installer" -- -2.30.1 +2.30.2 diff --git a/0008-Skip-failing-tests.patch b/0008-Skip-failing-tests.patch index 8137f37..deac615 100644 --- a/0008-Skip-failing-tests.patch +++ b/0008-Skip-failing-tests.patch @@ -1,17 +1,17 @@ -From 5f9ae130821abc783b793fc222c471cebadf1891 Mon Sep 17 00:00:00 2001 +From 24b285416ab3d3f4c2e1d6524e39c75e6b1661d3 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/12] Skip failing tests +Subject: [PATCH 8/9] Skip failing tests --- test/unit/bin/vagrant_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/bin/vagrant_test.rb b/test/unit/bin/vagrant_test.rb -index bc11309aa..4d329151a 100644 +index dbbd52112..4481e4c09 100644 --- a/test/unit/bin/vagrant_test.rb +++ b/test/unit/bin/vagrant_test.rb -@@ -134,7 +134,7 @@ describe "vagrant bin" do +@@ -135,7 +135,7 @@ describe "vagrant bin" do context "when vagrant is not very quiet" do before { expect(Vagrant).to receive(:very_quiet?).and_return(false) } @@ -20,7 +20,7 @@ index bc11309aa..4d329151a 100644 expect(env.ui).to receive(:warn).with(/#{warning}/, any_args) end end -@@ -142,7 +142,7 @@ describe "vagrant bin" do +@@ -143,7 +143,7 @@ describe "vagrant bin" do context "when vagrant is very quiet" do before { expect(Vagrant).to receive(:very_quiet?).and_return(true) } @@ -30,5 +30,5 @@ index bc11309aa..4d329151a 100644 end end -- -2.30.1 +2.30.2 diff --git a/0009-Disable-Subprocess-unit-test.patch b/0009-Disable-Subprocess-unit-test.patch index 78ec582..a4ff4a8 100644 --- a/0009-Disable-Subprocess-unit-test.patch +++ b/0009-Disable-Subprocess-unit-test.patch @@ -1,7 +1,7 @@ -From 5e3f0edc8a1bc1db2355c424684a3fcd7f654e19 Mon Sep 17 00:00:00 2001 +From 1030ddd86e1cda92484a6a17fa46295c8e508bbb 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/12] Disable Subprocess unit test +Subject: [PATCH 9/9] 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.30.1 +2.30.2 diff --git a/0010-Update-rake-to-13.0.patch b/0010-Update-rake-to-13.0.patch deleted file mode 100644 index 5fefc43..0000000 --- a/0010-Update-rake-to-13.0.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 25b740d34eac7a430f248711ac6b97caadeecac1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= -Date: Fri, 4 Dec 2020 14:54:50 +0100 -Subject: [PATCH 10/12] Update rake to ~> 13.0 - -(cherry picked from commit 1916f69425f8a0f86e3d7249a25a116c5cf2a771) ---- - vagrant.gemspec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vagrant.gemspec b/vagrant.gemspec -index 6a586fd7c..3030a63e6 100644 ---- a/vagrant.gemspec -+++ b/vagrant.gemspec -@@ -42,7 +42,7 @@ Gem::Specification.new do |s| - - # Constraint rake to properly handle deprecated method usage - # from within rspec -- s.add_development_dependency "rake", "~> 12.3.3" -+ 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" --- -2.30.1 - diff --git a/0011-Bump-listen-gem-version-and-remove-ruby_dep.patch b/0011-Bump-listen-gem-version-and-remove-ruby_dep.patch deleted file mode 100644 index e19cf2b..0000000 --- a/0011-Bump-listen-gem-version-and-remove-ruby_dep.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 8fb7b9348ee4728f3f236032f75a54290ed87d84 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= -Date: Fri, 22 Jan 2021 12:36:25 +0100 -Subject: [PATCH 11/12] Bump listen gem version and remove ruby_dep - -listen no longer depends on ruby_dep and thus this pointlessly drags in another -dependency. - -(cherry picked from commit 97ebb9103f9b073f39bf7d4b06d8dbf966793752) ---- - vagrant.gemspec | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/vagrant.gemspec b/vagrant.gemspec -index 3030a63e6..edcdda02f 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.1" -+ s.add_dependency "listen", "~> 3.4" - s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" - s.add_dependency "mime-types", "~> 3.3" - s.add_dependency "net-ssh", ">= 6.2.0.rc1", "< 7" -@@ -34,12 +34,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" - -- # NOTE: The ruby_dep gem is an implicit dependency from the listen gem. Later versions -- # of the ruby_dep gem impose an aggressive constraint on the required ruby version (>= 2.2.5). -- # Explicit constraint is defined to provide required dependency to listen without imposing -- # tighter restrictions on valid ruby versions -- s.add_dependency "ruby_dep", "<= 1.3.1" -- - # Constraint rake to properly handle deprecated method usage - # from within rspec - s.add_development_dependency "rake", "~> 13.0" --- -2.30.1 - diff --git a/0012-Bump-bcrypt_pbkdf-version.patch b/0012-Bump-bcrypt_pbkdf-version.patch deleted file mode 100644 index 6a8bd64..0000000 --- a/0012-Bump-bcrypt_pbkdf-version.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b0bb600f7641078b6e748e67a9bd7c7a1accaa50 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= -Date: Mon, 1 Mar 2021 08:33:59 +0100 -Subject: [PATCH 12/12] Bump bcrypt_pbkdf version - -There were no functional changes between 1.0.0 and 1.1.0: -https://github.com/net-ssh/bcrypt_pbkdf-ruby/compare/b5d1a921fcec8daa368236f5b4c469e08200fd5c...v1.1.0 -so this update should be safe - -(cherry picked from commit d996166098a22ab0212d31592a6e97fb50ea8a5e) ---- - vagrant.gemspec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vagrant.gemspec b/vagrant.gemspec -index edcdda02f..7c554d4fb 100644 ---- a/vagrant.gemspec -+++ b/vagrant.gemspec -@@ -15,7 +15,7 @@ Gem::Specification.new do |s| - s.required_ruby_version = "~> 2.5", "< 2.8" - s.required_rubygems_version = ">= 1.3.6" - -- s.add_dependency "bcrypt_pbkdf", "~> 1.0.0" -+ s.add_dependency "bcrypt_pbkdf", "~> 1.1" - s.add_dependency "childprocess", "~> 4.0.0" - s.add_dependency "ed25519", "~> 1.2.4" - s.add_dependency "erubi" --- -2.30.1 - diff --git a/vagrant-2.2.14.tar.gz b/vagrant-2.2.14.tar.gz deleted file mode 100644 index 7dac335..0000000 --- a/vagrant-2.2.14.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bec6fb4458d3f65e0de81cf022f54b711b40e27fdcf23936d01e9150c932849b -size 2522944 diff --git a/vagrant-2.2.15.tar.gz b/vagrant-2.2.15.tar.gz new file mode 100644 index 0000000..c4406ef --- /dev/null +++ b/vagrant-2.2.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98c9c726d5cb7e46793b4505f3d907b2a0673e0f6e43997c218a0be5330cc83f +size 1579254 diff --git a/vagrant.changes b/vagrant.changes index 08ca8d3..5aaf150 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,3 +1,56 @@ +------------------------------------------------------------------- +Thu Apr 1 08:32:38 UTC 2021 - Dan Čermák + +- New upstream release 2.2.15 + + 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 + + Remove patches (merged upstream): + * 0010-Update-rake-to-13.0.patch + * 0011-Bump-listen-gem-version-and-remove-ruby_dep.patch + * 0012-Bump-bcrypt_pbkdf-version.patch + +## 2.2.15 (March 30, 2021) + +IMPROVEMENTS: + +- command/cloud: Remove access token URL parameter by default [GH-12234] +- command/cloud: Add VAGRANT_SERVER_ACCESS_TOKEN_BY_URL to revert access token behavior [GH-12252] +- core: Bump vagrant_cloud dependency to 3.0.3 [GH-12200] +- core: Bump listen gem version and remove ruby_dep [GH-12148] +- core: Bump vagrant_cloud dependency to 3.0.4 [GH-12242] +- core/bundler: Update resolution handling when outside of installer and bundler [GH-12225] +- core/plugin: Provide friendlier error messages on install fail when possible [GH-12225] +- guest/openwrt: Add support for OpenWrt guests [GH-11791] +- guest/freebsd: FreeBSD updated ansible to py37-ansible [GH-12201] +- provider/virtualbox: Get default dhcp ip from a matching host ip [GH-12211] +- util/downloader: Prevent redirect notification for default store [GH-12235] + +BUG FIXES: + +- command/cloud: Automatically disable direct uploads when file is too large [GH-12250] +- core: Make shell script for loop shell agnostic [GH-12205] +- core: Raise error if downloading box metadata fails [GH-12189] +- core: Apply download options to metadata requests [GH-12177] +- core: Don't try to find "" by prefix in the machine index [GH-12188] +- core: Don't count not created machines as declined when destroying [GH-12186] +- core: Bump bcrypt_pbkdf version [GH-12216] +- core: Remove all space from checksums [GH-12168] +- core/bundler: Do not include default gems as pinned constraints [GH-12253] +- core/synced_folders: Extract os friendly mount name for vbox shared folders [GH-12184] +- guest/alpine: Check if interface exists before shutting it down [GH-12181] +- guest/nixos: Fix network config for recent NixOS releases [GH-12152] +- guest/fedora: Detect fedora using os-releases id [GH-12230] + ------------------------------------------------------------------- Mon Mar 1 10:21:49 UTC 2021 - Dan Čermák diff --git a/vagrant.spec b/vagrant.spec index 5bcc492..c1b5562 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -26,7 +26,7 @@ Name: vagrant -Version: 2.2.14 +Version: 2.2.15 Release: 0 Summary: Tool for building and distributing virtualized development environments License: MIT @@ -57,12 +57,6 @@ 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/12097 -Patch10: 0010-Update-rake-to-13.0.patch -# https://github.com/hashicorp/vagrant/pull/12148 -Patch11: 0011-Bump-listen-gem-version-and-remove-ruby_dep.patch -# https://github.com/hashicorp/vagrant/pull/12216 -Patch12: 0012-Bump-bcrypt_pbkdf-version.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -91,7 +85,6 @@ BuildRequires: %{ruby:2 >= 2.5} # # BuildRequires: %{rubygem bundler} -# PATCHED # s.add_dependency "bcrypt_pbkdf", "~> 1.1" BuildRequires: %{rubygem bcrypt_pbkdf:1 >= 1.1 } # s.add_dependency "childprocess", "~> 4.0.0" @@ -102,7 +95,6 @@ BuildRequires: %{rubygem ed25519:1.2 >= 1.2.4 } BuildRequires: %{rubygem erubi } # s.add_dependency "i18n", "~> 1.8" BuildRequires: %{rubygem i18n:1 >= 1.8 } -# PATCHED # s.add_dependency "listen", "~> 3.4" BuildRequires: %{rubygem listen:3 >= 3.4 } # s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" @@ -112,8 +104,8 @@ 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 } -# s.add_dependency "net-ssh", ">= 6.2.0.rc1", "< 7" -BuildRequires: %{rubygem net-ssh:6 >= 6.2.0 } +# s.add_dependency "net-ssh", ">= 6.1.0", "< 7" +BuildRequires: %{rubygem net-ssh:6 >= 6.1.0 } # s.add_dependency "net-sftp", "~> 3.0" BuildRequires: %{rubygem net-sftp:3 } # s.add_dependency "net-scp", "~> 1.2.0" @@ -130,11 +122,10 @@ 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.2" -BuildRequires: %{rubygem vagrant_cloud:3.0 >= 3.0.2 } +# s.add_dependency "vagrant_cloud", "~> 3.0.4" +BuildRequires: %{rubygem vagrant_cloud:3.0 >= 3.0.4 } # devel dependencies: -# PATCHED # s.add_development_dependency "rake", "~> 13.0" BuildRequires: %{rubygem rake:13 } # s.add_development_dependency "rspec", "~> 3.5.0" @@ -180,7 +171,6 @@ BuildRequires: fdupes # Runtime dependencies #=============================================================================== -# PATCHED # s.add_dependency "bcrypt_pbkdf", "~> 1.1" Requires: %{rubygem bcrypt_pbkdf:1 >= 1.1 } # s.add_dependency "childprocess", "~> 4.0.0" @@ -191,7 +181,6 @@ Requires: %{rubygem ed25519:1.2 >= 1.2.4} Requires: %{rubygem erubi} # s.add_dependency "i18n", "~> 1.8" Requires: %{rubygem i18n:1 >= 1.8} -# PATCHED # s.add_dependency "listen", "~> 3.4" Requires: %{rubygem listen:3 >= 3.4} # s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" @@ -201,8 +190,8 @@ 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} -# s.add_dependency "net-ssh", ">= 6.2.0.rc1", "< 7" -Requires: %{rubygem net-ssh:6 >= 6.2.0 } +# s.add_dependency "net-ssh", ">= 6.1.0", "< 7" +Requires: %{rubygem net-ssh:6 >= 6.1.0 } # s.add_dependency "net-sftp", "~> 3.0" Requires: %{rubygem net-sftp:3 } # s.add_dependency "net-scp", "~> 1.2.0" @@ -219,8 +208,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.2" -Requires: %{rubygem vagrant_cloud:3.0 >= 3.0.2} +# s.add_dependency "vagrant_cloud", "~> 3.0.4" +Requires: %{rubygem vagrant_cloud:3.0 >= 3.0.4} Requires: bsdtar