rpm/vagrant
SHA256
1
0
Fork 0
forked from pool/vagrant
Code Pull Requests Activity

Accepting request 731069 from Virtualization:vagrant

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/731069
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=16
This commit is contained in:
Yuchen Lin 2019-09-16 08:53:21 +00:00 committed by Git OBS Bridge
commit 4c1b296f4b
19 changed files with 324 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
0002-bin-vagrant-silence-warning-about-installer.patch → 0001-bin-vagrant-silence-warning-about-installer.patch
View File

@ -1,7 +1,7 @@
From 46e37dd1c263e62e28336bea5c634a41a3d77c5b Mon Sep 17 00:00:00 2001
From 82737fbe42f96385ed56b9a57044ddb78b96a681 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@debian.org>
Date: Sat, 11 Oct 2014 16:54:58 -0300
Subject: [PATCH] bin/vagrant: silence warning about installer
Subject: [PATCH 01/15] bin/vagrant: silence warning about installer
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
---
@ -9,10 +9,10 @@ Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
1 file changed, 16 deletions(-)
diff --git a/bin/vagrant b/bin/vagrant
index 7372a726d..0e3a16c0f 100755
index 0e6abdcef..9b9233397 100755
--- a/bin/vagrant
+++ b/bin/vagrant
@@ -143,22 +143,6 @@ begin
@@ -144,22 +144,6 @@ begin
logger.debug("Creating Vagrant environment")
env = Vagrant::Environment.new(opts)
@ -36,5 +36,5 @@ index 7372a726d..0e3a16c0f 100755
#
# Unset - Disables experimental features
--
2.19.1
2.22.1

10
0003-Use-a-private-temporary-dir.patch → 0002-Use-a-private-temporary-dir.patch
View File

@ -1,7 +1,7 @@
From 6781106e4820060910c2203b3b3c895773af2018 Mon Sep 17 00:00:00 2001
From e9ed3c9a50bffb33ff5070ae6a34b50543d299d2 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@debian.org>
Date: Wed, 22 Oct 2014 09:40:14 -0200
Subject: [PATCH] Use a private temporary dir
Subject: [PATCH 02/15] Use a private temporary dir
Without this vagrant will clutter $TMPDIR with dozens of even hundreds
of temporary files (~4 per vagrant invocation).
@ -15,7 +15,7 @@ Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
create mode 100644 lib/vagrant/util/tempfile.rb
diff --git a/lib/vagrant/box.rb b/lib/vagrant/box.rb
index cd839ee91..65eee8828 100644
index 2f12775f5..af35043ee 100644
--- a/lib/vagrant/box.rb
+++ b/lib/vagrant/box.rb
@@ -9,6 +9,7 @@ require "vagrant/util/downloader"
@ -26,7 +26,7 @@ index cd839ee91..65eee8828 100644
module Vagrant
# Represents a "box," which is a package Vagrant environment that is used
@@ -118,7 +119,7 @@ module Vagrant
@@ -121,7 +122,7 @@ module Vagrant
# @param [Hash] download_options Options to pass to the downloader.
# @return [BoxMetadata]
def load_metadata(**download_options)
@ -94,5 +94,5 @@ index 000000000..0cbbb53ac
+ FileUtils.rm_rf(Vagrant::Util::Tempfile.private_tmpdir)
+end
--
2.19.1
2.22.1

7
0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch → 0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch
View File

@ -1,7 +1,8 @@
From f09ec3d92fd9638e8c7c72eaf522ec1afb42037b Mon Sep 17 00:00:00 2001
From 1ea744cf22640883f1b280aa98d02a163a328f2c Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@softwarelivre.org>
Date: Tue, 3 Feb 2015 10:35:17 -0200
Subject: [PATCH] linux/cap/halt: don't wait for `shutdown -h now` to finish
Subject: [PATCH 03/15] linux/cap/halt: don't wait for `shutdown -h now` to
finish
When running a Debian 8 lxc guest (with the vagrant-lxc plugin), which
has systemd as init system, `vagrant halt` will hang waiting for
@ -26,5 +27,5 @@ index 60dc5dde4..657636eaf 100644
# Do nothing, because it probably means the machine shut down
# and SSH connection was lost.
--
2.19.1
2.22.1

12
0009-plugins-don-t-abuse-require_relative.patch → 0004-plugins-don-t-abuse-require_relative.patch.patch
View File

@ -1,7 +1,7 @@
From 5f3bf1a6b74550e83596ed7be18bdf53345f0c60 Mon Sep 17 00:00:00 2001
From f840574ea47230fbdc77d510898050bf0eaae7ac Mon Sep 17 00:00:00 2001
From: Johannes Kastl <kastl@b1-systems.de>
Date: Wed, 17 May 2017 09:09:57 +0200
Subject: [PATCH] plugins-don-t-abuse-require_relative.patch
Subject: [PATCH 04/15] plugins-don-t-abuse-require_relative.patch
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
---
@ -32,7 +32,7 @@ index 0ef71d55f..df0bd0f8f 100644
module VagrantPlugins
module GuestArch
diff --git a/plugins/guests/debian/cap/configure_networks.rb b/plugins/guests/debian/cap/configure_networks.rb
index 35ffba2d2..c09c59518 100644
index 23b7bbcdf..07aa91289 100644
--- a/plugins/guests/debian/cap/configure_networks.rb
+++ b/plugins/guests/debian/cap/configure_networks.rb
@@ -1,6 +1,6 @@
@ -44,7 +44,7 @@ index 35ffba2d2..c09c59518 100644
module VagrantPlugins
module GuestDebian
diff --git a/plugins/guests/freebsd/cap/configure_networks.rb b/plugins/guests/freebsd/cap/configure_networks.rb
index 36b11d1ed..866f8503a 100644
index 5020eebe8..1778f94c4 100644
--- a/plugins/guests/freebsd/cap/configure_networks.rb
+++ b/plugins/guests/freebsd/cap/configure_networks.rb
@@ -1,6 +1,6 @@
@ -118,7 +118,7 @@ index fefc05b9e..a3bfcaf48 100644
module VagrantPlugins
module GuestOpenBSD
diff --git a/plugins/guests/redhat/cap/configure_networks.rb b/plugins/guests/redhat/cap/configure_networks.rb
index 44fa5fa67..58ac7a31c 100644
index c618c8e53..31ba4f315 100644
--- a/plugins/guests/redhat/cap/configure_networks.rb
+++ b/plugins/guests/redhat/cap/configure_networks.rb
@@ -1,6 +1,6 @@
@ -154,5 +154,5 @@ index 2dd140230..e6dd96f08 100644
module VagrantPlugins
module GuestSUSE
--
2.19.1
2.22.1

6
0023-vbox-fix-package.patch → 0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch
View File

@ -1,7 +1,7 @@
From fdeaccf4af257c2117e66155e22c501d9310c853 Mon Sep 17 00:00:00 2001
From 63f9c59d213cea81ce5a509d2d1ecadd7a48dc64 Mon Sep 17 00:00:00 2001
From: Johannes Kastl <kastl@b1-systems.de>
Date: Fri, 16 Nov 2018 21:12:43 +0100
Subject: [PATCH] fix vbox package boo#1044087, added by
Subject: [PATCH 05/15] 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 <kastl@b1-systems.de>
@ -33,5 +33,5 @@ index a0baf516f..867fe2bf8 100644
module VagrantPlugins
module ProviderVirtualBox
--
2.19.1
2.22.1

10
0024-do-not-depend-on-wdm.patch → 0006-do-not-depend-on-wdm.patch
View File

@ -1,7 +1,7 @@
From 6a01e4089e3c8c3115755c7431cb5d9d493d6671 Mon Sep 17 00:00:00 2001
From 9d85efab05e3b73ae23e24b67372cbffe033349c Mon Sep 17 00:00:00 2001
From: Johannes Kastl <kastl@b1-systems.de>
Date: Mon, 4 Jun 2018 09:18:23 +0200
Subject: [PATCH] do not depend on wdm
Subject: [PATCH 06/15] do not depend on wdm
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
---
@ -9,10 +9,10 @@ Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
1 file changed, 1 deletion(-)
diff --git a/vagrant.gemspec b/vagrant.gemspec
index 11627738e..a45be9eba 100644
index 885c0d359..d3584c610 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
s.add_dependency "rb-kqueue", "~> 0.2.0"
s.add_dependency "rest-client", ">= 1.6.0", "< 3.0"
s.add_dependency "rubyzip", "~> 1.2.2"
@ -21,5 +21,5 @@ index 11627738e..a45be9eba 100644
s.add_dependency "winrm-fs", "~> 1.0"
s.add_dependency "winrm-elevated", "~> 1.1"
--
2.19.1
2.22.1

10
0025-do-not-abuse-relative-paths-in-docker-plugin.patch → 0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch
View File

@ -1,8 +1,8 @@
From c3b9fbbb7168003bdf09fa4e35652bbe308330d8 Mon Sep 17 00:00:00 2001
From 70837c27d8d2be474ed2dd7239fd39beae4d8250 Mon Sep 17 00:00:00 2001
From: Johannes Kastl <kastl@b1-systems.de>
Date: Fri, 16 Nov 2018 21:14:46 +0100
Subject: [PATCH] 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
Subject: [PATCH 07/15] 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 <kastl@b1-systems.de>
---
@ -10,7 +10,7 @@ Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/providers/docker/config.rb b/plugins/providers/docker/config.rb
index b3b6993c6..f9b147597 100644
index 07c4e5333..e8142df8b 100644
--- a/plugins/providers/docker/config.rb
+++ b/plugins/providers/docker/config.rb
@@ -1,6 +1,6 @@
@ -22,5 +22,5 @@ index b3b6993c6..f9b147597 100644
module VagrantPlugins
module DockerProvider
--
2.19.1
2.22.1

12
0026-do-not-abuse-relative-paths-in-plugins.patch → 0008-Don-t-abuse-relative-paths-in-plugins.patch
View File

@ -1,7 +1,7 @@
From f3e8e9f37f4d6408a9e4a689e81e2ced67d21939 Mon Sep 17 00:00:00 2001
From 461907e06abd3f2f4ca426edae7a8f90cc9fcd8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Fri, 11 Jan 2019 12:32:28 +0100
Subject: [PATCH] Don't abuse relative paths in plugins
Subject: [PATCH 08/15] Don't abuse relative paths in plugins
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@ -15,7 +15,7 @@ Signed-off-by: Dan Čermák <dcermak@suse.com>
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/plugins/guests/alt/cap/configure_networks.rb b/plugins/guests/alt/cap/configure_networks.rb
index 851849700..80071e817 100644
index e9f64a940..9236c1b2b 100644
--- a/plugins/guests/alt/cap/configure_networks.rb
+++ b/plugins/guests/alt/cap/configure_networks.rb
@@ -1,6 +1,6 @@
@ -27,7 +27,7 @@ index 851849700..80071e817 100644
module VagrantPlugins
module GuestALT
diff --git a/plugins/guests/coreos/cap/configure_networks.rb b/plugins/guests/coreos/cap/configure_networks.rb
index 827c8f075..e0c68359f 100644
index a954b45bd..2e490f5e2 100644
--- a/plugins/guests/coreos/cap/configure_networks.rb
+++ b/plugins/guests/coreos/cap/configure_networks.rb
@@ -1,6 +1,6 @@
@ -51,7 +51,7 @@ index 340eddeab..bacae1f0d 100644
module VagrantPlugins
module GuestNixos
diff --git a/plugins/provisioners/chef/provisioner/base.rb b/plugins/provisioners/chef/provisioner/base.rb
index 607909a4e..d8d006f36 100644
index 7bc8ceca0..e938305e7 100644
--- a/plugins/provisioners/chef/provisioner/base.rb
+++ b/plugins/provisioners/chef/provisioner/base.rb
@@ -1,7 +1,7 @@
@ -64,5 +64,5 @@ index 607909a4e..d8d006f36 100644
require_relative "../installer"
--
2.20.1
2.22.1

6
0027-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch → 0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch
View File

@ -1,7 +1,7 @@
From 3027f4bee2002a87bfdca76fd12d9c91f5896c79 Mon Sep 17 00:00:00 2001
From bd5d63abbba0294bea738ddb497b59703ce67fea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Thu, 14 Mar 2019 00:25:05 +0100
Subject: [PATCH] Fix unit tests for GuestLinux::Cap::Halt
Subject: [PATCH 09/15] Fix unit tests for GuestLinux::Cap::Halt
This test fails since we patch `shutdown -h now` to be `shutdown -h now &`
instead.
@ -37,5 +37,5 @@ index 81f682aa1..70d2603b9 100644
cap.halt(machine)
}.to_not raise_error
--
2.21.0
2.22.1

6
0028-Skip-failing-tests.patch → 0010-Skip-failing-tests.patch
View File

@ -1,7 +1,7 @@
From b1b718052a1531b61c51be01025e906b59c457f9 Mon Sep 17 00:00:00 2001
From 651b60680822c89c6892163497a864b47aadaccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Mon, 1 Apr 2019 17:28:31 +0200
Subject: [PATCH] Skip failing tests
Subject: [PATCH 10/15] Skip failing tests
---
test/unit/bin/vagrant_test.rb | 4 ++--
@ -30,5 +30,5 @@ index 08edcb20e..a6bef731d 100644
end
end
--
2.21.0
2.22.1

25
0011-Bump-rspec-its-dependency.patch Normal file
View File

@ -0,0 +1,25 @@
From cb44bcc57e743c6fb5cd983de616681ba0b528f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Wed, 17 Jul 2019 10:59:07 +0200
Subject: [PATCH 11/15] Bump rspec-its dependency
---
vagrant.gemspec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vagrant.gemspec b/vagrant.gemspec
index d3584c610..029994a91 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
# from within rspec
s.add_development_dependency "rake", "~> 12.0.0"
s.add_development_dependency "rspec", "~> 3.5.0"
- s.add_development_dependency "rspec-its", "~> 1.2.0"
+ s.add_development_dependency "rspec-its", "~> 1.3.0"
s.add_development_dependency "webmock", "~> 2.3.1"
s.add_development_dependency "fake_ftp", "~> 0.1.1"
--
2.22.1

30
0012-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch Normal file
View File

@ -0,0 +1,30 @@
From 2a34db55059236e16d62a85c9dbceed7b5ce28b2 Mon Sep 17 00:00:00 2001
From: Pavel Valena <pvalena@redhat.com>
Date: Mon, 1 Jul 2019 17:44:54 +0200
Subject: [PATCH 12/15] Do not list / load dependencies if `vagrant` spec is
not loaded
in `vagrant_internal_specs` as this fails, due to `find` returning `nil`.
---
lib/vagrant/bundler.rb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb
index 7ba48435f..c0fabdcea 100644
--- a/lib/vagrant/bundler.rb
+++ b/lib/vagrant/bundler.rb
@@ -421,8 +421,9 @@ module Vagrant
def vagrant_internal_specs
# activate any dependencies up front so we can always
# pin them when resolving
- Gem::Specification.find { |s| s.name == "vagrant" && s.activated? }.
- runtime_dependencies.each { |d| gem d.name, *d.requirement.as_list }
+ if (vs = Gem::Specification.find { |s| s.name == "vagrant" && s.activated? })
+ vs.runtime_dependencies.each { |d| gem d.name, *d.requirement.as_list }
+ end
# discover all the gems we have available
list = {}
directories = [Gem::Specification.default_specifications_dir]
--
2.22.1

27
0013-Only-return-interfaces-where-addr-is-not-nil.patch Normal file
View File

@ -0,0 +1,27 @@
From 991218e9c3b632d15a1246961df825cb615d900e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Fri, 26 Jul 2019 15:47:29 +0200
Subject: [PATCH 13/15] Only return interfaces where addr is not nil
tunnel interfaces on Linux have addr set to nil which makes the function
list_interfaces fail with a backtrace.
---
plugins/providers/docker/action/prepare_networks.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/providers/docker/action/prepare_networks.rb b/plugins/providers/docker/action/prepare_networks.rb
index 4d1904e85..34a357bee 100644
--- a/plugins/providers/docker/action/prepare_networks.rb
+++ b/plugins/providers/docker/action/prepare_networks.rb
@@ -34,7 +34,7 @@ module VagrantPlugins
# @return [Array<Socket::Ifaddr>] interface list
def list_interfaces
Socket.getifaddrs.find_all do |i|
- i.addr.ip? && !i.addr.ipv4_loopback? &&
+ !i.addr.nil? && i.addr.ip? && !i.addr.ipv4_loopback? &&
!i.addr.ipv6_loopback? && !i.addr.ipv6_linklocal?
end
end
--
2.22.1

25
0014-Skip-docker-networking-test.patch Normal file
View File

@ -0,0 +1,25 @@
From 8a4f2903dc708053d8677499ed13bf686cb1bcf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
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

37
0015-ARM-only-Disable-Subprocess-unit-test.patch Normal file
View File

@ -0,0 +1,37 @@
From 5ef42f64f34af7eb97f22dafdf73126fcdb2c90e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Wed, 28 Aug 2019 13:39:58 +0200
Subject: [PATCH 15/15] [ARM only] Disable Subprocess unit test
This unit test is *very* flaky on OBS' ARM workers and causes random build
failures. These are probably caused by worker being under high load and then
scheduling oddly.
---
test/unit/vagrant/util/subprocess_test.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/unit/vagrant/util/subprocess_test.rb b/test/unit/vagrant/util/subprocess_test.rb
index 81da0e635..a2a2270a0 100644
--- a/test/unit/vagrant/util/subprocess_test.rb
+++ b/test/unit/vagrant/util/subprocess_test.rb
@@ -116,7 +116,7 @@ describe Vagrant::Util::Subprocess do
end
end
context "when subprocess is running" do
- it "should return true" do
+ xit "should return true" do
sp = described_class.new("sleep", "5")
thread = Thread.new{ sp.execute }
sleep(0.3)
@@ -145,7 +145,7 @@ describe Vagrant::Util::Subprocess do
context "when subprocess is running" do
let(:sp){ described_class.new("sleep", "1") }
- it "should return true" do
+ xit "should return true" do
thread = Thread.new{ sp.execute }
sleep(0.1)
expect(sp.stop).to be(true)
--
2.22.1

3
vagrant-2.2.4.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4f8ce6ede5d47a2be1ce46a29d22d41d1f4ba9d99fe9496b2424f98ae4dab2d6
size 1244111

3
vagrant-2.2.5.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0a228f5185b24b72efcc5a3924f86fa9fabab6f7562c3c63c1d9d239aa72a7b1
size 1272879

85
vagrant.changes
View File

@ -1,3 +1,88 @@
-------------------------------------------------------------------
Wed Aug 28 11:58:06 UTC 2019 - Dan Čermák <dcermak@suse.com>
- Rebase vagrant patches:
drop:
- 0002-bin-vagrant-silence-warning-about-installer.patch
- 0003-Use-a-private-temporary-dir.patch
- 0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch
- 0009-plugins-don-t-abuse-require_relative.patch
- 0023-vbox-fix-package.patch
- 0024-do-not-depend-on-wdm.patch
- 0025-do-not-abuse-relative-paths-in-docker-plugin.patch
- 0026-do-not-abuse-relative-paths-in-plugins.patch
- 0027-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch
- 0028-Skip-failing-tests.patch
- 0029-Skip-docker-networking-test.patch
add:
- 0001-bin-vagrant-silence-warning-about-installer.patch
- 0002-Use-a-private-temporary-dir.patch
- 0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch
- 0004-plugins-don-t-abuse-require_relative.patch.patch
- 0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch
- 0006-do-not-depend-on-wdm.patch
- 0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch
- 0008-Don-t-abuse-relative-paths-in-plugins.patch
- 0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch
- 0010-Skip-failing-tests.patch
- 0011-Bump-rspec-its-dependency.patch
- 0012-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch
- 0013-Only-return-interfaces-where-addr-is-not-nil.patch
- 0014-Skip-docker-networking-test.patch
- 0015-ARM-only-Disable-Subprocess-unit-test.patch
-------------------------------------------------------------------
Mon Jul 1 09:06:56 UTC 2019 - Dan Čermák <dcermak@suse.com>
- Add 0029-Skip-docker-networking-test.patch:
skips a unit-test that fails on OBS
update to 2.2.5
FEATURES:
providers/docker: Private and Public networking support [GH-10702]
IMPROVEMENTS:
command/global-status: Provide machine-readable information [GH-10506]
command/snapshot: Separate snapshot names for guests when listing snapshots [GH-10828]
command/box/update: Ignore missing metadata files when updating all boxes [GH-10829]
core: Use consistent settings when unpacking boxes as root [GH-10707]
core: Write metadata.json file when packaging box [GH-10706]
core: Remove whitespace from id file on load [GH-10727]
core/bundler: Support resolution when installed within system [GH-10894]
guest/coreos: Update network configuration and hostname setting [GH-10752]
guest/freebsd: Add proper VirtualBox share folders support for FreeBSD guests [GH-10717]
guest/freebsd: Add unmount share folder for VirtualBox guests [GH-10761]
guest/freebsd: Simplify network interface listing when configuring networks [GH-10763]
providers/docker: Add usable? check to docker provider [GH-10890]
synced_folder/smb: Remove configuration information from synced folder data [GH-10811]
BUG FIXES:
command/box/update: Ensure the right version is picked when updating specific boxes [GH-10810]
command/cloud: Properly set variable from CLI argument parsing for username field [GH-10726]
command/rsync_auto: Use relative paths to machines folder path for file path Listener [GH-10902]
communicator/ssh: Remove net/sftp loading to prevent loading errors [GH-10745]
contrib/bash: Search for running_vm_list only in machines folder [GH-10841]
core/bundler: Properly parse multiple constants when installing plugins [GH-10896]
core/environment: Support plugin configuration within box Vagrantfiles [GH-10889]
core/triggers: Fix typo in UI output [GH-10748]
core/triggers: Properly exit with abort option [GH-10824]
core/triggers: Ensure guest names are string when filtering trigger configs [GH-10854]
core/triggers: Abort after all running processes have completed when parallel is enabled [GH-10891]
guest/void: Fix NFS capability detection [GH-10713]
guest/bsd: Properly set BSD options order for /etc/exports [GH-10909]
host/windows: Fix rubygems error when host has directory named c [GH-10803]
provider/virtualbox: Ensure non-existent machines do not attempt to list snapshots [GH-10784]
provider/docker: Properly set docker-compose config file with volume names [GH-10820]
provisioner/ansible: Fix pip installer hardcoded curl get_pip.py piped to python [GH-10625]
provisioner/chef: Update chef install check for guests [GH-10917]
synced_folders/rsync: Remove rsync__excludes from command if array is empty [GH-10901]
-------------------------------------------------------------------
Tue Apr 2 20:35:42 UTC 2019 - Dan Čermák <dcermak@suse.com>

64
vagrant.spec
View File

@ -26,7 +26,7 @@
Name: vagrant
Version: 2.2.4
Version: 2.2.5
Release: 0
Summary: Tool for building and distributing virtualized development environments
License: MIT
@ -44,19 +44,28 @@ Provides: rubygem-vagrant = %{version}
Obsoletes: rubygem-vagrant < %{version}
Recommends: vagrant-libvirt
#
Patch2: 0002-bin-vagrant-silence-warning-about-installer.patch
Patch3: 0003-Use-a-private-temporary-dir.patch
Patch4: 0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch
Patch9: 0009-plugins-don-t-abuse-require_relative.patch
# Patches are maintained in the opensuse_package branch in the
# https://github.com/dcermak/vagrant.git repository.
# On every new release of vagrant, rebase them on top of the latest tag.
#
#
# try building with ruby2.4
Patch23: 0023-vbox-fix-package.patch
Patch24: 0024-do-not-depend-on-wdm.patch
Patch25: 0025-do-not-abuse-relative-paths-in-docker-plugin.patch
Patch26: 0026-do-not-abuse-relative-paths-in-plugins.patch
Patch27: 0027-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch
Patch28: 0028-Skip-failing-tests.patch
Patch1: 0001-bin-vagrant-silence-warning-about-installer.patch
Patch2: 0002-Use-a-private-temporary-dir.patch
Patch3: 0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch
Patch4: 0004-plugins-don-t-abuse-require_relative.patch.patch
Patch5: 0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch
Patch6: 0006-do-not-depend-on-wdm.patch
Patch7: 0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch
Patch8: 0008-Don-t-abuse-relative-paths-in-plugins.patch
Patch9: 0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch
Patch10: 0010-Skip-failing-tests.patch
# https://github.com/hashicorp/vagrant/pull/10991
Patch11: 0011-Bump-rspec-its-dependency.patch
# https://github.com/hashicorp/vagrant/pull/10945
Patch12: 0012-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch
# https://github.com/hashicorp/vagrant/pull/10993
Patch13: 0013-Only-return-interfaces-where-addr-is-not-nil.patch
Patch14: 0014-Skip-docker-networking-test.patch
Patch15: 0015-ARM-only-Disable-Subprocess-unit-test.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -129,8 +138,9 @@ BuildRequires: %{rubygem vagrant_cloud:2.0 >= 2.0.2 }
BuildRequires: %{rubygem rake:12.0 }
# s.add_development_dependency "rspec", "~> 3.5.0"
BuildRequires: %{rubygem rspec:3.5 }
# s.add_development_dependency "rspec-its", "~> 1.2.0"
BuildRequires: %{rubygem rspec-its:1.2 }
# PATCHED
# s.add_development_dependency "rspec-its", "~> 1.3.0"
BuildRequires: %{rubygem rspec-its:1.3 }
# s.add_dependency "ruby_dep", "<= 1.3.1"
BuildRequires: %{rubygem ruby_dep <= 1.3.1 }
# s.add_development_dependency "webmock", "~> 2.3.1"
@ -146,8 +156,10 @@ BuildRequires: %{rubygem builder:3.2 }
BuildRequires: %{rubygem ffi >= 1.9 }
# Prevent have choice for rubygem(ruby:2.5.0:thor:0) >= 0.18
BuildRequires: %{rubygem thor:0.19}
# have choice for rubygem(ruby:2.5.0:addressable) >= 2.3.6
# Prevent have choice for rubygem(ruby:2.5.0:addressable) >= 2.3.6
BuildRequires: %{rubygem addressable >= 2.6}
# Prevent have choice for rubygem(ruby:2.5.0:public_suffix) >= 2.0.2
BuildRequires: %{rubygem public_suffix:4}
BuildRequires: ruby-macros >= 5
@ -263,7 +275,25 @@ BuildArch: noarch
Optional dependency offering bash completion for vagrant
%prep
%autosetup -p 1 -n %{mod_full_name}
%setup -q -n %{mod_full_name}
%patch1 -p 1
%patch2 -p 1
%patch3 -p 1
%patch4 -p 1
%patch5 -p 1
%patch6 -p 1
%patch7 -p 1
%patch8 -p 1
%patch9 -p 1
%patch10 -p 1
%patch11 -p 1
%patch12 -p 1
%patch13 -p 1
%patch14 -p 1
# disable the subprocess test only on ARM
%ifarch %{arm}
%patch15 -p 1
%endif
cp %{SOURCE98} .