From f6b4f08f5915899fd03e7ad1c69cad49666ce2ee1ba93fdb9c02d84191145921 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Wed, 30 Oct 2019 19:53:18 +0000 Subject: [PATCH] Accepting request 742602 from home:dancermak:branches:Virtualization:vagrant Rebase patches for v2.2.6 OBS-URL: https://build.opensuse.org/request/show/742602 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=36 --- ...rant-silence-warning-about-installer.patch | 6 +-- 0002-Use-a-private-temporary-dir.patch | 6 +-- ...on-t-wait-for-shutdown-h-now-to-fini.patch | 6 +-- ...s-don-t-abuse-require_relative.patch.patch | 6 +-- ...-boo-1044087-added-by-robert.muntean.patch | 6 +-- 0006-do-not-depend-on-wdm.patch | 8 ++-- ...ative-paths-in-docker-plugin-to-make.patch | 6 +-- ...on-t-abuse-relative-paths-in-plugins.patch | 6 +-- ...x-unit-tests-for-GuestLinux-Cap-Halt.patch | 6 +-- 0010-Skip-failing-tests.patch | 6 +-- 0011-Bump-rspec-its-dependency.patch | 8 ++-- ...-dependencies-if-vagrant-spec-is-not.patch | 6 +-- ...nterfaces-error-in-docker-prepare_ne.patch | 47 +++++++++++++++++++ ...urn-interfaces-where-addr-is-not-nil.patch | 27 ----------- ...RM-only-Disable-Subprocess-unit-test.patch | 6 +-- 0014-Skip-docker-networking-test.patch | 25 ---------- vagrant.changes | 31 ++++++++++++ vagrant.spec | 20 ++++---- 18 files changed, 129 insertions(+), 103 deletions(-) create mode 100644 0013-Catch-NetworkNoInterfaces-error-in-docker-prepare_ne.patch delete mode 100644 0013-Only-return-interfaces-where-addr-is-not-nil.patch rename 0015-ARM-only-Disable-Subprocess-unit-test.patch => 0014-ARM-only-Disable-Subprocess-unit-test.patch (90%) delete mode 100644 0014-Skip-docker-networking-test.patch diff --git a/0001-bin-vagrant-silence-warning-about-installer.patch b/0001-bin-vagrant-silence-warning-about-installer.patch index 8148f1d..cbcce52 100644 --- a/0001-bin-vagrant-silence-warning-about-installer.patch +++ b/0001-bin-vagrant-silence-warning-about-installer.patch @@ -1,7 +1,7 @@ -From 82737fbe42f96385ed56b9a57044ddb78b96a681 Mon Sep 17 00:00:00 2001 +From e1a0054ceecffce9b3ef389d5b4b9bf85f309351 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/14] bin/vagrant: silence warning about installer Signed-off-by: Johannes Kastl --- @@ -36,5 +36,5 @@ index 0e6abdcef..9b9233397 100755 # # Unset - Disables experimental features -- -2.22.1 +2.23.0 diff --git a/0002-Use-a-private-temporary-dir.patch b/0002-Use-a-private-temporary-dir.patch index 8516b46..053fa64 100644 --- a/0002-Use-a-private-temporary-dir.patch +++ b/0002-Use-a-private-temporary-dir.patch @@ -1,7 +1,7 @@ -From e9ed3c9a50bffb33ff5070ae6a34b50543d299d2 Mon Sep 17 00:00:00 2001 +From 2e3ac8696235e4239977c10e78474de1b1cbccd8 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/14] Use a private temporary dir Without this vagrant will clutter $TMPDIR with dozens of even hundreds of temporary files (~4 per vagrant invocation). @@ -94,5 +94,5 @@ index 000000000..0cbbb53ac + FileUtils.rm_rf(Vagrant::Util::Tempfile.private_tmpdir) +end -- -2.22.1 +2.23.0 diff --git a/0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch b/0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch index a4d7b06..0abb6aa 100644 --- a/0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch +++ b/0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch @@ -1,7 +1,7 @@ -From 1ea744cf22640883f1b280aa98d02a163a328f2c Mon Sep 17 00:00:00 2001 +From 5323b2746d765bee3fd9aa739bf3d0e120eb1874 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Tue, 3 Feb 2015 10:35:17 -0200 -Subject: [PATCH 03/15] linux/cap/halt: don't wait for `shutdown -h now` to +Subject: [PATCH 03/14] 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 @@ -27,5 +27,5 @@ index 60dc5dde4..657636eaf 100644 # Do nothing, because it probably means the machine shut down # and SSH connection was lost. -- -2.22.1 +2.23.0 diff --git a/0004-plugins-don-t-abuse-require_relative.patch.patch b/0004-plugins-don-t-abuse-require_relative.patch.patch index 5288811..c2d41db 100644 --- a/0004-plugins-don-t-abuse-require_relative.patch.patch +++ b/0004-plugins-don-t-abuse-require_relative.patch.patch @@ -1,7 +1,7 @@ -From f840574ea47230fbdc77d510898050bf0eaae7ac Mon Sep 17 00:00:00 2001 +From 399ed85dc12e70156c6fa40a49e35110ad6fcff4 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Wed, 17 May 2017 09:09:57 +0200 -Subject: [PATCH 04/15] plugins-don-t-abuse-require_relative.patch +Subject: [PATCH 04/14] 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.22.1 +2.23.0 diff --git a/0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch b/0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch index 54733d0..d53906f 100644 --- a/0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch +++ b/0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch @@ -1,7 +1,7 @@ -From 63f9c59d213cea81ce5a509d2d1ecadd7a48dc64 Mon Sep 17 00:00:00 2001 +From ccaab429a383ff048400a866f3aa77409ae4976d Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Fri, 16 Nov 2018 21:12:43 +0100 -Subject: [PATCH 05/15] fix vbox package boo#1044087, added by +Subject: [PATCH 05/14] 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.22.1 +2.23.0 diff --git a/0006-do-not-depend-on-wdm.patch b/0006-do-not-depend-on-wdm.patch index 48d5bfc..90b3283 100644 --- a/0006-do-not-depend-on-wdm.patch +++ b/0006-do-not-depend-on-wdm.patch @@ -1,7 +1,7 @@ -From 9d85efab05e3b73ae23e24b67372cbffe033349c Mon Sep 17 00:00:00 2001 +From 98c990b8b57849464a4e1773689635a2328da89e Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Mon, 4 Jun 2018 09:18:23 +0200 -Subject: [PATCH 06/15] do not depend on wdm +Subject: [PATCH 06/14] do not depend on wdm Signed-off-by: Johannes Kastl --- @@ -9,7 +9,7 @@ Signed-off-by: Johannes Kastl 1 file changed, 1 deletion(-) diff --git a/vagrant.gemspec b/vagrant.gemspec -index 885c0d359..d3584c610 100644 +index 2ca4a6972..c7a2d436c 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -30,7 +30,6 @@ Gem::Specification.new do |s| @@ -21,5 +21,5 @@ index 885c0d359..d3584c610 100644 s.add_dependency "winrm-fs", "~> 1.0" s.add_dependency "winrm-elevated", "~> 1.1" -- -2.22.1 +2.23.0 diff --git a/0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch b/0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch index abf71b6..2e8da3c 100644 --- a/0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch +++ b/0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch @@ -1,7 +1,7 @@ -From 70837c27d8d2be474ed2dd7239fd39beae4d8250 Mon Sep 17 00:00:00 2001 +From 63325a25be5349141e628f4d8738cd66cf2eff69 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Fri, 16 Nov 2018 21:14:46 +0100 -Subject: [PATCH 07/15] do not abuse relative paths in docker plugin to make +Subject: [PATCH 07/14] 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.22.1 +2.23.0 diff --git a/0008-Don-t-abuse-relative-paths-in-plugins.patch b/0008-Don-t-abuse-relative-paths-in-plugins.patch index 7a66c38..6699f02 100644 --- a/0008-Don-t-abuse-relative-paths-in-plugins.patch +++ b/0008-Don-t-abuse-relative-paths-in-plugins.patch @@ -1,7 +1,7 @@ -From 461907e06abd3f2f4ca426edae7a8f90cc9fcd8e Mon Sep 17 00:00:00 2001 +From 6cabd408fd06b60b0b0c74c93da9fea05e8b0339 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 08/15] Don't abuse relative paths in plugins +Subject: [PATCH 08/14] 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.22.1 +2.23.0 diff --git a/0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch b/0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch index aa255d3..d738968 100644 --- a/0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch +++ b/0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch @@ -1,7 +1,7 @@ -From bd5d63abbba0294bea738ddb497b59703ce67fea Mon Sep 17 00:00:00 2001 +From e1eaa4583e58d802f0c2339c959b5becb6a2c49f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Thu, 14 Mar 2019 00:25:05 +0100 -Subject: [PATCH 09/15] Fix unit tests for GuestLinux::Cap::Halt +Subject: [PATCH 09/14] 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 @@ index 81f682aa1..70d2603b9 100644 cap.halt(machine) }.to_not raise_error -- -2.22.1 +2.23.0 diff --git a/0010-Skip-failing-tests.patch b/0010-Skip-failing-tests.patch index ecd09cb..cf697cf 100644 --- a/0010-Skip-failing-tests.patch +++ b/0010-Skip-failing-tests.patch @@ -1,7 +1,7 @@ -From 651b60680822c89c6892163497a864b47aadaccf Mon Sep 17 00:00:00 2001 +From 85808a200ea1a95f00edc2af816ae3f124dc1962 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 10/15] Skip failing tests +Subject: [PATCH 10/14] Skip failing tests --- test/unit/bin/vagrant_test.rb | 4 ++-- @@ -30,5 +30,5 @@ index 08edcb20e..a6bef731d 100644 end end -- -2.22.1 +2.23.0 diff --git a/0011-Bump-rspec-its-dependency.patch b/0011-Bump-rspec-its-dependency.patch index 8e155b8..78fc7ea 100644 --- a/0011-Bump-rspec-its-dependency.patch +++ b/0011-Bump-rspec-its-dependency.patch @@ -1,14 +1,14 @@ -From cb44bcc57e743c6fb5cd983de616681ba0b528f4 Mon Sep 17 00:00:00 2001 +From 79bdf20d3c293293730548f20e329f3c726f5091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 17 Jul 2019 10:59:07 +0200 -Subject: [PATCH 11/15] Bump rspec-its dependency +Subject: [PATCH 11/14] 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 +index c7a2d436c..04561f9c9 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -45,7 +45,7 @@ Gem::Specification.new do |s| @@ -21,5 +21,5 @@ index d3584c610..029994a91 100644 s.add_development_dependency "fake_ftp", "~> 0.1.1" -- -2.22.1 +2.23.0 diff --git a/0012-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch b/0012-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch index 365d889..57406b7 100644 --- a/0012-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch +++ b/0012-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch @@ -1,7 +1,7 @@ -From 2a34db55059236e16d62a85c9dbceed7b5ce28b2 Mon Sep 17 00:00:00 2001 +From 7784ec13f12752f5b73ddec371cb73b6dd97615a Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Mon, 1 Jul 2019 17:44:54 +0200 -Subject: [PATCH 12/15] Do not list / load dependencies if `vagrant` spec is +Subject: [PATCH 12/14] Do not list / load dependencies if `vagrant` spec is not loaded in `vagrant_internal_specs` as this fails, due to `find` returning `nil`. @@ -26,5 +26,5 @@ index 7ba48435f..c0fabdcea 100644 list = {} directories = [Gem::Specification.default_specifications_dir] -- -2.22.1 +2.23.0 diff --git a/0013-Catch-NetworkNoInterfaces-error-in-docker-prepare_ne.patch b/0013-Catch-NetworkNoInterfaces-error-in-docker-prepare_ne.patch new file mode 100644 index 0000000..a82d3bc --- /dev/null +++ b/0013-Catch-NetworkNoInterfaces-error-in-docker-prepare_ne.patch @@ -0,0 +1,47 @@ +From bc275fb74fbb6948246427549f04f0a4323a1747 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= +Date: Thu, 24 Oct 2019 12:29:43 +0200 +Subject: [PATCH 13/14] Catch NetworkNoInterfaces error in docker + prepare_networks_test + +The test "generates a network name and configuration" calls at the end +`process_public_network()`, which can return an empty list if the currently +executing machine has no usable network interfaces (this is typically the case +for workers that build rpm packages in OBS or Koji). This results in an +exception of type Errors::NetworkNoInterfaces to be thrown and causing this test +to fail. + +This commit wraps this call in a rescue block to supress this failure. +--- + .../providers/docker/action/prepare_networks_test.rb | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +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 524db9533..3461c3e05 100644 +--- a/test/unit/plugins/providers/docker/action/prepare_networks_test.rb ++++ b/test/unit/plugins/providers/docker/action/prepare_networks_test.rb +@@ -1,5 +1,6 @@ + require_relative "../../../../base" + require_relative "../../../../../../plugins/providers/docker/action/prepare_networks" ++require_relative "../../../../../../plugins/providers/docker/errors" + + describe VagrantPlugins::DockerProvider::Action::PrepareNetworks do + include_context "unit" +@@ -343,8 +344,12 @@ describe VagrantPlugins::DockerProvider::Action::PrepareNetworks do + allow(driver).to receive(:network_containing_address). + with("10.1.10.2").and_return("vagrant_network_public") + +- network_name, network_options = subject.process_public_network(options, {}, env) +- expect(network_name).to eq("vagrant_network_public") ++ begin ++ network_name, network_options = subject.process_public_network(options, {}, env) ++ expect(network_name).to eq("vagrant_network_public") ++ rescue VagrantPlugins::DockerProvider::Errors::NetworkNoInterfaces ++ # we are running inside a VM without valid network interfaces ++ end + end + end + +-- +2.23.0 + diff --git a/0013-Only-return-interfaces-where-addr-is-not-nil.patch b/0013-Only-return-interfaces-where-addr-is-not-nil.patch deleted file mode 100644 index 91b3866..0000000 --- a/0013-Only-return-interfaces-where-addr-is-not-nil.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 991218e9c3b632d15a1246961df825cb615d900e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= -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] 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 - diff --git a/0015-ARM-only-Disable-Subprocess-unit-test.patch b/0014-ARM-only-Disable-Subprocess-unit-test.patch similarity index 90% rename from 0015-ARM-only-Disable-Subprocess-unit-test.patch rename to 0014-ARM-only-Disable-Subprocess-unit-test.patch index c7a0804..fdfc347 100644 --- a/0015-ARM-only-Disable-Subprocess-unit-test.patch +++ b/0014-ARM-only-Disable-Subprocess-unit-test.patch @@ -1,7 +1,7 @@ -From 5ef42f64f34af7eb97f22dafdf73126fcdb2c90e Mon Sep 17 00:00:00 2001 +From 751a501fa2952f78d60085272dafc96a97d95cc0 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 15/15] [ARM only] Disable Subprocess unit test +Subject: [PATCH 14/14] [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 @@ -33,5 +33,5 @@ index 81da0e635..a2a2270a0 100644 sleep(0.1) expect(sp.stop).to be(true) -- -2.22.1 +2.23.0 diff --git a/0014-Skip-docker-networking-test.patch b/0014-Skip-docker-networking-test.patch deleted file mode 100644 index 3567d6a..0000000 --- a/0014-Skip-docker-networking-test.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8a4f2903dc708053d8677499ed13bf686cb1bcf2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= -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 - diff --git a/vagrant.changes b/vagrant.changes index 9233f25..33fa0cd 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Tue Oct 22 08:30:24 UTC 2019 - Dan Čermák + +- Rebased patches: + + - 0001-bin-vagrant-silence-warning-about-installer.patch + - 0002-Use-a-private-temporary-dir.patch + - 0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch + - 0004-plugins-don-t-abuse-require_relative.patch.patch + - 0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch + - 0006-do-not-depend-on-wdm.patch + - 0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch + - 0008-Don-t-abuse-relative-paths-in-plugins.patch + - 0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch + - 0010-Skip-failing-tests.patch + - 0011-Bump-rspec-its-dependency.patch + - 0012-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch + + Dropped (integrated upstream or made obsolete by upstream fixes): + - 0013-Only-return-interfaces-where-addr-is-not-nil.patch + - 0014-Skip-docker-networking-test.patch + + Removed: + - 0015-ARM-only-Disable-Subprocess-unit-test.patch + + Added: + - 0013-Catch-NetworkNoInterfaces-error-in-docker-prepare_ne.patch + - 0014-ARM-only-Disable-Subprocess-unit-test.patch + + This update fixes boo#1150592 + ------------------------------------------------------------------- Fri Oct 18 06:31:22 UTC 2019 - Johannes Kastl diff --git a/vagrant.spec b/vagrant.spec index 875c3ea..96e3d0b 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -31,7 +31,7 @@ Release: 0 Summary: Tool for building and distributing virtualized development environments License: MIT Group: Development/Languages/Ruby -Url: https://github.com/hashicorp/vagrant +URL: https://github.com/hashicorp/vagrant Source0: %{URL}/archive/v%{version}/%{name}-%{version}.tar.gz Source11: vagrant.1 Source93: vagrant_transfiletriggerin.rb @@ -62,8 +62,8 @@ Patch10: 0010-Skip-failing-tests.patch 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 -Patch14: 0014-Skip-docker-networking-test.patch -Patch15: 0015-ARM-only-Disable-Subprocess-unit-test.patch +Patch13: 0013-Catch-NetworkNoInterfaces-error-in-docker-prepare_ne.patch +Patch14: 0014-ARM-only-Disable-Subprocess-unit-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -83,9 +83,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # Build dependencies #=============================================================================== -# s.required_ruby_version = "~> 2.2", "< 2.7" +# s.required_ruby_version = "~> 2.4", "< 2.7" BuildRequires: %{ruby < 2.7} -BuildRequires: %{ruby:2 >= 2.2} +BuildRequires: %{ruby:2 >= 2.4} # # # @@ -210,8 +210,8 @@ Requires: %{rubygem winrm:2 >= 2.1} Requires: %{rubygem winrm-fs:1} # s.add_dependency "winrm-elevated", "~> 1.1" Requires: %{rubygem winrm-elevated:1 >= 1.1} -# s.add_dependency "vagrant_cloud", "~> 2.0.2" -Requires: %{rubygem vagrant_cloud:2.0 >= 2.0.2} +# s.add_dependency "vagrant_cloud", "~> 2.0.3" +Requires: %{rubygem vagrant_cloud:2.0 >= 2.0.3} # s.add_dependency "ruby_dep", "<= 1.3.1" Requires: %{rubygem ruby_dep <= 1.3.1 } @@ -286,10 +286,10 @@ Optional dependency offering bash completion for vagrant %patch10 -p 1 %patch11 -p 1 %patch12 -p 1 -%patch14 -p 1 +%patch13 -p 1 # disable the subprocess test only on ARM -%ifarch %{arm} -%patch15 -p 1 +%ifarch %{arm} aarch64 +%patch14 -p 1 %endif cp %{SOURCE98} .