SHA256
1
0
forked from pool/vagrant

Accepting request 852969 from home:dancermak:branches:Virtualization:vagrant

New upstream release 2.2.14

OBS-URL: https://build.opensuse.org/request/show/852969
OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=48
This commit is contained in:
Dan Čermák 2020-12-04 09:16:29 +00:00 committed by Git OBS Bridge
parent d876f6f01d
commit fc77a3fbcc
13 changed files with 136 additions and 65 deletions

View File

@ -1,7 +1,7 @@
From 0f5435df3ef882c3da9f098ec83cac1f394a7b4e Mon Sep 17 00:00:00 2001
From 3559bd65aa796772e31abbeb4bd92e0829ed5e99 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 1/9] bin/vagrant: silence warning about installer
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
---
@ -36,5 +36,5 @@ index ba7e40076..8272e839e 100755
#
# Unset - Disables experimental features
--
2.28.0
2.29.2

View File

@ -1,7 +1,7 @@
From 103a3765b331a69b615e47d0e1647e4e42fe9a6a Mon Sep 17 00:00:00 2001
From b2c6ef61dc339eae73640c357e6be6e1f8cf723a 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 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).
@ -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 0ee5d29f3..2da6f886f 100644
index 41b63b292..b2d4c6a05 100644
--- a/lib/vagrant/box.rb
+++ b/lib/vagrant/box.rb
@@ -9,6 +9,7 @@ require "vagrant/util/downloader"
@ -26,7 +26,7 @@ index 0ee5d29f3..2da6f886f 100644
module Vagrant
# Represents a "box," which is a package Vagrant environment that is used
@@ -122,7 +123,7 @@ module Vagrant
@@ -124,7 +125,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.28.0
2.29.2

View File

@ -1,7 +1,7 @@
From 4b3743997f569f268047917a41562831eb09bd1e Mon Sep 17 00:00:00 2001
From 402f323f982ea36af2db24ac62ec527ff6530515 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 3/9] plugins-don-t-abuse-require_relative.patch
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
---
@ -154,5 +154,5 @@ index 2dd140230..e6dd96f08 100644
module VagrantPlugins
module GuestSUSE
--
2.28.0
2.29.2

View File

@ -1,7 +1,7 @@
From d08f0985884ab4ef45ce9f8f37de1c033283eb2f Mon Sep 17 00:00:00 2001
From cb36ee51bb914627bda93641135721ee88b640a4 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 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 <kastl@b1-systems.de>
@ -33,5 +33,5 @@ index a0baf516f..867fe2bf8 100644
module VagrantPlugins
module ProviderVirtualBox
--
2.28.0
2.29.2

View File

@ -1,7 +1,7 @@
From 5dc228c3811d429e1d9640bbf4a7a21030b388de Mon Sep 17 00:00:00 2001
From b65df008243ff8016b0e5714da53b5fb221e5961 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 5/9] do not depend on wdm
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
---
@ -9,17 +9,17 @@ Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
1 file changed, 1 deletion(-)
diff --git a/vagrant.gemspec b/vagrant.gemspec
index 465b12805..dd4e48867 100644
index a452e2b7a..6a586fd7c 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -31,7 +31,6 @@ Gem::Specification.new do |s|
s.add_dependency "rest-client", ">= 1.6.0", "< 3.0"
@@ -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", "~> 2.0.3"
s.add_dependency "vagrant_cloud", "~> 3.0.2"
- 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.28.0
2.29.2

View File

@ -1,7 +1,7 @@
From ac94bb00341797429f61f6b63377523216217d7e Mon Sep 17 00:00:00 2001
From 4f32f38bb823405a3e3fcd54ebf878ad7c2ff78d 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 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 <kastl@b1-systems.de>
@ -22,5 +22,5 @@ index 07c4e5333..e8142df8b 100644
module VagrantPlugins
module DockerProvider
--
2.28.0
2.29.2

View File

@ -1,7 +1,7 @@
From e5f0f5ee48d7975cf0073a3998a8a11d9e97d797 Mon Sep 17 00:00:00 2001
From 555f29e1367c56ad4aa17447a5108a7f3be1b91d 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 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.28.0
2.29.2

View File

@ -1,7 +1,7 @@
From 4ae304867d0e714254cd4130a9a56eb1560da354 Mon Sep 17 00:00:00 2001
From 5f9ae130821abc783b793fc222c471cebadf1891 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 8/9] Skip failing tests
---
test/unit/bin/vagrant_test.rb | 4 ++--
@ -30,5 +30,5 @@ index bc11309aa..4d329151a 100644
end
end
--
2.28.0
2.29.2

View File

@ -1,7 +1,7 @@
From 5dc6903fbc40884c5811a71ad43700f7357f7836 Mon Sep 17 00:00:00 2001
From 5e3f0edc8a1bc1db2355c424684a3fcd7f654e19 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 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.28.0
2.29.2

View File

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

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

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

View File

@ -1,3 +1,84 @@
-------------------------------------------------------------------
Thu Dec 3 20:13:55 UTC 2020 - Dan Čermák <dcermak@suse.com>
- New upstream release 2.2.14
remove rsync build dependency
remove patch (fixed upstream):
* 0010-Add-check-for-etc-fstab.patch
rebased 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
## 2.2.14 (November 20, 2020)
IMPROVEMENTS:
- host/windows: Update filesystem type matching on WSL2 [GH-12056]
BUG FIXES:
- core: Track raw actions as they are applied to prevent multiple insertions [GH-12037]
- core/bundler: Update solution file resolution to support prerelease matching [GH-12054]
- guest/darwin: Mount vmware synced folders for big sur guests [GH-12053]
## 2.2.13 (November 06, 2020)
BUG FIXES:
- core/bundler: Adjust request sets properly with non-development prerelease [GH-12025]
## 2.2.12 (November 06, 2020)
BUG FIXES:
- core/bundler: Automatically enable prerelease dependency resolution [GH-12023]
NOTE: This is a fix release to resolve an immediate issue with Vagrant
plugin functionality
## 2.2.11 (November 05, 2020)
IMPROVEMENTS:
- command/cap: Add ability to specify target [GH-11965]
- command/cloud: Add --force flag to `version release` command [GH-11912]
- command/cloud: Updates to utilize the 3.0 version of vagrant_cloud [GH-11916]
- core: Switch from unmaintained gem erubis to erubi [GH-11893]
- core: Download Vagrant boxes using auth headers [GH-11835]
- core: Remove dependency on mime gem [GH-11857]
- core: Handle Errno::EALREADY exceptions on port check [GH-12008]
- core: Fix missing hook/trigger insertion into action stack [GH-12014]
- guest/linux: Make max reboot wait duration configurable [GH-12011]
- guest/windows: Make max reboot wait duration configurable [GH-12011]
- providers/virtualbox: Fix availability check of provider [GH-11936]
- tests: Add integration tests for Docker provider [GH-11907]
BUG FIXES:
- core/synced_folders: Don't persist synced folders to fstab if guest is not reachable [GH-11900]
- core: Don't try to recover machine without a uuid [GH-11863]
- config/disks: Transform provider specific config to common form [GH-11939]
- config/vm: Override synced-folder `:nfs` option [GH-11988]
- contrib/zsh: Remove newline from beginning of completion script [GH-11963]
- guests/arch: Install smbclient when setting up arch smb [GH-11923]
- guest/linux: Check for /etc/fstab before trying to modify [GH-11897]
- guest/linux: Create an /etc/fstab if does not exist [GH-11909]
- guest/linux: Persist SMB mounts [GH-11846]
- guest/debian: Set hostname in /etc/hosts as first step to changing hostname [GH-11885]
- guest/rhel: Check for existence of network files before trying to update them [GH-11877]
- guest/suse: Don't use hostnamectl to set hostname if not available on system [GH-11996]
- tests: Remove rsync dependency from tests [GH-11889]
-------------------------------------------------------------------
Wed Sep 9 12:47:45 UTC 2020 - Dan Čermák <dcermak@suse.com>

View File

@ -26,7 +26,7 @@
Name: vagrant
Version: 2.2.10
Version: 2.2.14
Release: 0
Summary: Tool for building and distributing virtualized development environments
License: MIT
@ -57,7 +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
Patch10: 0010-Add-check-for-etc-fstab.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -92,8 +91,8 @@ BuildRequires: %{rubygem bcrypt_pbkdf:1.0 }
BuildRequires: %{rubygem childprocess:4.0 }
# s.add_dependency "ed25519", "~> 1.2.4"
BuildRequires: %{rubygem ed25519:1.2 >= 1.2.4 }
# s.add_dependency "erubis", "~> 2.7.0"
BuildRequires: %{rubygem erubis:2.7 }
# s.add_dependency "erubi"
BuildRequires: %{rubygem erubi }
# s.add_dependency "i18n", "~> 1.8"
BuildRequires: %{rubygem i18n:1 >= 1.8 }
# s.add_dependency "listen", "~> 3.1"
@ -103,19 +102,16 @@ BuildRequires: %{rubygem hashicorp-checkpoint:0.1 >= 0.1.5 }
# s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
BuildRequires: %{rubygem log4r:1.1 >= 1.1.9 }
BuildConflicts: %{rubygem log4r:1.1 >= 1.1.11 }
# s.add_dependency "mime", "~> 0.4.4"
BuildRequires: %{rubygem mime:0.4 >= 0.4.4}
# s.add_dependency "net-ssh", "~> 6.0"
BuildRequires: %{rubygem net-ssh:6 }
# 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-sftp", "~> 3.0"
BuildRequires: %{rubygem net-sftp:3 }
# s.add_dependency "net-scp", "~> 1.2.0"
BuildRequires: %{rubygem net-scp:1.2 }
# s.add_dependency "rb-kqueue", "~> 0.2.0"
BuildRequires: %{rubygem rb-kqueue:0.2 }
# s.add_dependency "rest-client", ">= 1.6.0", "< 3.0"
BuildRequires: %{rubygem rest-client >= 1.6}
BuildConflicts: %{rubygem rest-client >= 3.0}
# s.add_dependency "rubyzip", "~> 2.0"
BuildRequires: %{rubygem rubyzip:2}
# Intentionally removed, wdm only works on Windows
@ -126,12 +122,12 @@ 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", "~> 2.0.3"
BuildRequires: %{rubygem vagrant_cloud:2.0 >= 2.0.3 }
# s.add_dependency "vagrant_cloud", "~> 3.0.2"
BuildRequires: %{rubygem vagrant_cloud:3.0 >= 3.0.2 }
# devel dependencies:
# s.add_development_dependency "rake", "~> 12.0.0"
BuildRequires: %{rubygem rake:12.0 }
# s.add_development_dependency "rake", "~> 12.3.3"
BuildRequires: %{rubygem rake:12.3 >= 12.3.3 }
# s.add_development_dependency "rspec", "~> 3.5.0"
BuildRequires: %{rubygem rspec:3.5 }
# s.add_development_dependency "rspec-its", "~> 1.3.0"
@ -169,7 +165,6 @@ BuildRequires: openssh
BuildRequires: curl
BuildRequires: bsdtar
BuildRequires: %{rubygem vagrant-spec}
BuildRequires: rsync
%endif
BuildRequires: fdupes
@ -186,8 +181,8 @@ Requires: %{rubygem bcrypt_pbkdf:1.0 }
Requires: %{rubygem childprocess:4.0}
# s.add_dependency "ed25519", "~> 1.2.4"
Requires: %{rubygem ed25519:1.2 >= 1.2.4}
# s.add_dependency "erubis", "~> 2.7.0"
Requires: %{rubygem erubis:2.7}
# s.add_dependency "erubi"
Requires: %{rubygem erubi}
# s.add_dependency "i18n", "~> 1.8"
Requires: %{rubygem i18n:1 >= 1.8}
# s.add_dependency "listen", "~> 3.1"
@ -197,19 +192,16 @@ Requires: %{rubygem hashicorp-checkpoint:0.1 >= 0.1.5}
# s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
Requires: %{rubygem log4r:1.1 >= 1.1.9 }
Requires: %{rubygem log4r:1.1 < 1.1.11 }
# s.add_dependency "mime", "~> 0.4.4"
Requires: %{rubygem mime:0.4 >= 0.4.4}
# s.add_dependency "net-ssh", "~> 6.0"
Requires: %{rubygem net-ssh:6}
# 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-sftp", "~> 3.0"
Requires: %{rubygem net-sftp:3 }
# s.add_dependency "net-scp", "~> 1.2.0"
Requires: %{rubygem net-scp:1.2 >= 1.2.0}
# s.add_dependency "rb-kqueue", "~> 0.2.0"
Requires: %{rubygem rb-kqueue:0.2}
# s.add_dependency "rest-client", ">= 1.6.0", "< 3.0"
Requires: %{rubygem rest-client >= 1.6}
Requires: %{rubygem rest-client < 3.0}
# s.add_dependency "rubyzip", "~> 2.0"
Requires: %{rubygem rubyzip:2}
# s.add_dependency "wdm", "~> 0.1.0"
@ -220,14 +212,12 @@ 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", "~> 2.0.3"
Requires: %{rubygem vagrant_cloud:2.0 >= 2.0.3}
# s.add_dependency "vagrant_cloud", "~> 3.0.2"
Requires: %{rubygem vagrant_cloud:3.0 >= 3.0.2}
# s.add_dependency "ruby_dep", "<= 1.3.1"
Requires: %{rubygem ruby_dep <= 1.3.1 }
# We don't require rubygem mime-types since it's pulled in transitively
#
Requires: bsdtar
Requires: curl
Requires: openssh