Accepting request 889494 from Virtualization:vagrant
OBS-URL: https://build.opensuse.org/request/show/889494 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=33
This commit is contained in:
commit
d91e0b66e5
@ -1,7 +1,7 @@
|
||||
From 152901e1ae1a475a48e3ecb43d54c629cc8abf05 Mon Sep 17 00:00:00 2001
|
||||
From 6c2fcc93f7016ca2d816467327a33eb347cc1498 Mon Sep 17 00:00:00 2001
|
||||
From: Antonio Terceiro <terceiro@debian.org>
|
||||
Date: Sat, 11 Oct 2014 16:54:58 -0300
|
||||
Subject: [PATCH 01/10] bin/vagrant: silence warning about installer
|
||||
Subject: [PATCH 01/11] bin/vagrant: silence warning about installer
|
||||
|
||||
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
|
||||
---
|
||||
|
@ -1,7 +1,7 @@
|
||||
From ff54f5982a2b7365871d4ed1516de1ab7be4ff11 Mon Sep 17 00:00:00 2001
|
||||
From 14c959018fc2e7d9fe6d5d396971a115efbdc71e Mon Sep 17 00:00:00 2001
|
||||
From: Antonio Terceiro <terceiro@debian.org>
|
||||
Date: Wed, 22 Oct 2014 09:40:14 -0200
|
||||
Subject: [PATCH 02/10] Use a private temporary dir
|
||||
Subject: [PATCH 02/11] Use a private temporary dir
|
||||
|
||||
Without this vagrant will clutter $TMPDIR with dozens of even hundreds
|
||||
of temporary files (~4 per vagrant invocation).
|
||||
|
@ -1,7 +1,7 @@
|
||||
From d04bc870f70ca3a25c33992588b52d692caf270d Mon Sep 17 00:00:00 2001
|
||||
From 5d0d5df6dcb54c5b423cbfa60c7e5eaccce380c9 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 03/10] plugins-don-t-abuse-require_relative.patch
|
||||
Subject: [PATCH 03/11] plugins-don-t-abuse-require_relative.patch
|
||||
|
||||
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
|
||||
---
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 2c1eadfcf5df4f2f886cce3b3031ed6aa8315caa Mon Sep 17 00:00:00 2001
|
||||
From 47cf5abe6ea46220b2d260e3e0fd07b42efa42ae 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 04/10] fix vbox package boo#1044087, added by
|
||||
Subject: [PATCH 04/11] 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>
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 86f1ba8702737f24b357bb7114e8d97e36b86283 Mon Sep 17 00:00:00 2001
|
||||
From c596dcd5e7bb3ab6bbdcbc9d21b640d828aa0925 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 05/10] do not depend on wdm
|
||||
Subject: [PATCH 05/11] do not depend on wdm
|
||||
|
||||
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
|
||||
---
|
||||
@ -9,7 +9,7 @@ Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/vagrant.gemspec b/vagrant.gemspec
|
||||
index 1643681b4..9d71cdc52 100644
|
||||
index 99ed2083c..4a4a25e6d 100644
|
||||
--- a/vagrant.gemspec
|
||||
+++ b/vagrant.gemspec
|
||||
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
|
||||
|
@ -1,7 +1,7 @@
|
||||
From d8359d5055d692e703abcb5a5bf8a55ca16a00bb Mon Sep 17 00:00:00 2001
|
||||
From 9e4f4f017e58d7488de879037ee1564087c34008 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 06/10] do not abuse relative paths in docker plugin to make
|
||||
Subject: [PATCH 06/11] 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>
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 1ffd8eaeeac0148698d857a1d029a04ab37c44ac Mon Sep 17 00:00:00 2001
|
||||
From 79214e9936e35d2de125fe8d7c6fbbc424b4c054 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 07/10] Don't abuse relative paths in plugins
|
||||
Subject: [PATCH 07/11] Don't abuse relative paths in plugins
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 24b285416ab3d3f4c2e1d6524e39c75e6b1661d3 Mon Sep 17 00:00:00 2001
|
||||
From 39c3d177a8392eaed94be7a694f2f0c5df1e4ca0 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 08/10] Skip failing tests
|
||||
Subject: [PATCH 08/11] Skip failing tests
|
||||
|
||||
---
|
||||
test/unit/bin/vagrant_test.rb | 4 ++--
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 1030ddd86e1cda92484a6a17fa46295c8e508bbb Mon Sep 17 00:00:00 2001
|
||||
From b9aba06ec4fb6c88f5109d1f79ed8820058c6077 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 09/10] Disable Subprocess unit test
|
||||
Subject: [PATCH 09/11] 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
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 50ea02c2ab56693ed291589a302e85866b33ecde Mon Sep 17 00:00:00 2001
|
||||
From 8fb45fd30524c9286a027c44e12351ddaefecade Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
|
||||
Date: Tue, 27 Apr 2021 10:27:11 +0200
|
||||
Subject: [PATCH 10/10] Bump listen version to ~> 3.5
|
||||
Subject: [PATCH 10/11] Bump listen version to ~> 3.5
|
||||
|
||||
(cherry picked from commit 016911965d5f995a5d0a168069de7ded7b380ecb)
|
||||
---
|
||||
@ -9,7 +9,7 @@ Subject: [PATCH 10/10] Bump listen version to ~> 3.5
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/vagrant.gemspec b/vagrant.gemspec
|
||||
index 9d71cdc52..5322d5dd5 100644
|
||||
index 4a4a25e6d..8fef4319c 100644
|
||||
--- a/vagrant.gemspec
|
||||
+++ b/vagrant.gemspec
|
||||
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
|
||||
@ -20,7 +20,7 @@ index 9d71cdc52..5322d5dd5 100644
|
||||
+ s.add_dependency "listen", "~> 3.5"
|
||||
s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
|
||||
s.add_dependency "mime-types", "~> 3.3"
|
||||
s.add_dependency "net-ssh", ">= 6.1.0", "< 7"
|
||||
s.add_dependency "net-ssh", ">= 6.1.0", "< 6.2"
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
@ -0,0 +1,45 @@
|
||||
From 2e76a77511d8c4f4ee1ea8cd2ee8ee5612316a07 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
|
||||
Date: Fri, 30 Apr 2021 09:37:20 +0200
|
||||
Subject: [PATCH 11/11] Mock the PowerShell.executable method in more tests
|
||||
|
||||
On *nix systems we might not have powershell installed and then finding
|
||||
powershell.exe or pwsh.exe fails in some tests. If we instead mock
|
||||
self.executable to return "powershell", then the tests pass and don't cause any
|
||||
side effects.
|
||||
---
|
||||
test/unit/vagrant/util/powershell_test.rb | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/test/unit/vagrant/util/powershell_test.rb b/test/unit/vagrant/util/powershell_test.rb
|
||||
index 0b1123c0f..c073d8f26 100644
|
||||
--- a/test/unit/vagrant/util/powershell_test.rb
|
||||
+++ b/test/unit/vagrant/util/powershell_test.rb
|
||||
@@ -114,6 +114,8 @@ describe Vagrant::Util::PowerShell do
|
||||
describe ".execute" do
|
||||
before do
|
||||
allow(described_class).to receive(:validate_install!)
|
||||
+ allow(described_class).to receive(:executable)
|
||||
+ .and_return("powershell")
|
||||
allow(Vagrant::Util::Subprocess).to receive(:execute)
|
||||
end
|
||||
|
||||
@@ -159,6 +161,7 @@ describe Vagrant::Util::PowerShell do
|
||||
before do
|
||||
allow(described_class).to receive(:validate_install!)
|
||||
allow(Vagrant::Util::Subprocess).to receive(:execute).and_return(result)
|
||||
+ allow(described_class).to receive(:executable).and_return("powershell")
|
||||
end
|
||||
|
||||
it "should validate installation before use" do
|
||||
@@ -223,6 +226,7 @@ describe Vagrant::Util::PowerShell do
|
||||
before do
|
||||
allow(described_class).to receive(:validate_install!)
|
||||
allow(Vagrant::Util::Subprocess).to receive(:execute).and_return(result)
|
||||
+ allow(described_class).to receive(:executable).and_return("powershell")
|
||||
end
|
||||
|
||||
it "should validate installation before use" do
|
||||
--
|
||||
2.31.1
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:98c9c726d5cb7e46793b4505f3d907b2a0673e0f6e43997c218a0be5330cc83f
|
||||
size 1579254
|
3
vagrant-2.2.16.tar.gz
Normal file
3
vagrant-2.2.16.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ab3c60bb12b2da916fd073192849f2b5d3f224f95febf3538212247c4cde28d6
|
||||
size 1585826
|
@ -1,3 +1,38 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 30 06:08:48 UTC 2021 - Dan Čermák <dcermak@suse.com>
|
||||
|
||||
- New upstream release 2.2.16
|
||||
|
||||
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-Bump-listen-version-to-3.5.patch
|
||||
|
||||
Added patches:
|
||||
* 0011-Mock-the-PowerShell.executable-method-in-more-tests.patch
|
||||
|
||||
## 2.2.16 (April 29, 2021)
|
||||
|
||||
IMPROVEMENTS:
|
||||
|
||||
- guest/linux: Detect in process shutdown in reboot capability [GH-12302]
|
||||
- util/powershell: Support `pwsh` executable in new versions of powershell [GH-12335]
|
||||
|
||||
BUG FIXES:
|
||||
|
||||
- core: Add box directly with authed urls [GH-12278]
|
||||
- communicator/ssh: Properly handle authentication with RSA keys [GH-12298]
|
||||
- guest/fedora: Import guest detection module [GH-12275]
|
||||
- guest/linux: Fix SMB folder mount name capability call [GH-12281]
|
||||
- provider/docker: Properly handle updated buildkit build output [GH-12300]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 27 08:36:12 UTC 2021 - Dan Čermák <dcermak@suse.com>
|
||||
|
||||
|
12
vagrant.spec
12
vagrant.spec
@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
Name: vagrant
|
||||
Version: 2.2.15
|
||||
Version: 2.2.16
|
||||
Release: 0
|
||||
Summary: Tool for building and distributing virtualized development environments
|
||||
License: MIT
|
||||
@ -59,6 +59,8 @@ Patch8: 0008-Skip-failing-tests.patch
|
||||
Patch9: 0009-Disable-Subprocess-unit-test.patch
|
||||
# https://github.com/hashicorp/vagrant/pull/12329
|
||||
Patch10: 0010-Bump-listen-version-to-3.5.patch
|
||||
# https://github.com/hashicorp/vagrant/pull/12339
|
||||
Patch11: 0011-Mock-the-PowerShell.executable-method-in-more-tests.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -107,8 +109,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.1.0", "< 7"
|
||||
BuildRequires: %{rubygem net-ssh:6 >= 6.1.0 }
|
||||
# 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", "~> 1.2.0"
|
||||
@ -194,8 +196,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.1.0", "< 7"
|
||||
Requires: %{rubygem net-ssh:6 >= 6.1.0 }
|
||||
# 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", "~> 1.2.0"
|
||||
|
Loading…
Reference in New Issue
Block a user