forked from pool/vagrant
Accepting request 664720 from home:dancermak:branches:Virtualization:vagrant
Bump vagrant version to 2.2.2 OBS-URL: https://build.opensuse.org/request/show/664720 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=25
This commit is contained in:
Git OBS Bridge
parent
0cfe6b2e74
commit
aaa1322dcd
68
0026-do-not-abuse-relative-paths-in-plugins.patch
Normal file
68
0026-do-not-abuse-relative-paths-in-plugins.patch
Normal file
@ -0,0 +1,68 @@
|
||||
From f3e8e9f37f4d6408a9e4a689e81e2ced67d21939 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
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Dan Čermák <dcermak@suse.com>
|
||||
---
|
||||
plugins/guests/alt/cap/configure_networks.rb | 2 +-
|
||||
plugins/guests/coreos/cap/configure_networks.rb | 2 +-
|
||||
plugins/guests/nixos/cap/change_host_name.rb | 2 +-
|
||||
plugins/provisioners/chef/provisioner/base.rb | 2 +-
|
||||
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
|
||||
--- a/plugins/guests/alt/cap/configure_networks.rb
|
||||
+++ b/plugins/guests/alt/cap/configure_networks.rb
|
||||
@@ -1,6 +1,6 @@
|
||||
require "tempfile"
|
||||
|
||||
-require_relative "../../../../lib/vagrant/util/template_renderer"
|
||||
+require "vagrant/util/template_renderer"
|
||||
|
||||
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
|
||||
--- a/plugins/guests/coreos/cap/configure_networks.rb
|
||||
+++ b/plugins/guests/coreos/cap/configure_networks.rb
|
||||
@@ -1,6 +1,6 @@
|
||||
require "tempfile"
|
||||
|
||||
-require_relative "../../../../lib/vagrant/util/template_renderer"
|
||||
+require "vagrant/util/template_renderer"
|
||||
|
||||
module VagrantPlugins
|
||||
module GuestCoreOS
|
||||
diff --git a/plugins/guests/nixos/cap/change_host_name.rb b/plugins/guests/nixos/cap/change_host_name.rb
|
||||
index 340eddeab..bacae1f0d 100644
|
||||
--- a/plugins/guests/nixos/cap/change_host_name.rb
|
||||
+++ b/plugins/guests/nixos/cap/change_host_name.rb
|
||||
@@ -1,6 +1,6 @@
|
||||
require "tempfile"
|
||||
|
||||
-require_relative "../../../../lib/vagrant/util/template_renderer"
|
||||
+require "vagrant/util/template_renderer"
|
||||
|
||||
module VagrantPlugins
|
||||
module GuestNixos
|
||||
diff --git a/plugins/provisioners/chef/provisioner/base.rb b/plugins/provisioners/chef/provisioner/base.rb
|
||||
index 607909a4e..d8d006f36 100644
|
||||
--- a/plugins/provisioners/chef/provisioner/base.rb
|
||||
+++ b/plugins/provisioners/chef/provisioner/base.rb
|
||||
@@ -1,7 +1,7 @@
|
||||
require "tempfile"
|
||||
|
||||
require_relative "../../../../lib/vagrant/util/presence"
|
||||
-require_relative "../../../../lib/vagrant/util/template_renderer"
|
||||
+require "vagrant/util/template_renderer"
|
||||
|
||||
require_relative "../installer"
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cb1476683f0e8479334be20b26c49d516a0e1c739b9f6f35a8c05f68e4a048f1
|
||||
size 1277421
|
||||
3
vagrant-2.2.2.tar.gz
Normal file
3
vagrant-2.2.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4f1233a753933025da8735df5c0c77762350094468df1692bb041e1991195e0b
|
||||
size 1223645
|
||||
@ -1,3 +1,58 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 11 15:29:14 UTC 2019 - Dan Čermák <dcermak@suse.com>
|
||||
|
||||
- Add 0026-do-not-abuse-relative-paths-in-plugins.patch:
|
||||
this further removes usage of relative paths in vagrant
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 4 10:57:14 UTC 2019 - Dan Čermák <dcermak@suse.com>
|
||||
|
||||
- update to 2.2.2
|
||||
BUG FIXES:
|
||||
- providers/virtualbox: Update default_nic_type implementation and add warning [GH-10450]
|
||||
|
||||
- update to 2.2.1
|
||||
FEATURES:
|
||||
|
||||
- core/plugins: Add reset! method to communicator [GH-10399]
|
||||
- providers/virtualbox: Add support for VirtualBox 6.0 [GH-10379]
|
||||
|
||||
IMPROVEMENTS:
|
||||
|
||||
- command/validate: Allow validation of config while ignoring provider [GH-10351]
|
||||
- communicators/ssh: Prevent overly verbose output waiting for connection [GH-10321]
|
||||
- communicators/ssh: Support ed25519 keys [GH-10365]
|
||||
- communicators/ssh: Add reset! implementation [GH-10399]
|
||||
- communicators/winrm: Add reset! implementation [GH-10399]
|
||||
- core: Limit number of automatic box update checks [GH-10359]
|
||||
- host/windows: Remove PATH check in WSL detection [GH-10313]
|
||||
- providers/hyperv: Disable automatic checkpoints before deletion [GH-10406]
|
||||
- providers/virtualbox: Add `automount` flag if specified with synced_folder [GH-10326]
|
||||
- providers/virtualbox: Refactor host only network settings [GH-7699]
|
||||
- providers/virtualbox: Support setting default NIC type for network adapters [GH-10383]
|
||||
- providers/virtualbox: Update ssh_port helper to handle multiple matches [GH-10409]
|
||||
- provisioners/shell: Add :reset option to allow communicator reset [GH-10399]
|
||||
- synced_folders/smb: Allow for 'default' smb_username in prompt if set [GH-10319]
|
||||
- util/network_ip: Simplify `network_address` helper [GH-7693]
|
||||
- util/platform: Prevent hard failure during hyper-v enabled check [GH-10332]
|
||||
|
||||
BUG FIXES:
|
||||
|
||||
- command/login: Only show deprecation warning when command is invoked [GH-10374]
|
||||
- core: Fallback to Vagrantfile defined box information [GH-10368]
|
||||
- core/bundler: Update source ordering to properly resolve with new RubyGems [GH-10364]
|
||||
- core/triggers: Only split inline script if host is non-Windows [GH-10405]
|
||||
- communicator/winrm: Prepend computer name to username when running elevated commands [GH-10387]
|
||||
- guest/debian: Fix halting issue when setting hostname by restarting networking on guest [GH-10301, GH-10330]
|
||||
- guest/linux: Fix vagrant user access to docker after install [GH-10399]
|
||||
- guest/windows: Add reboot capability to fix hostname race condition [GH-10347]
|
||||
- guest/windows: Allow for reading key paths with spaces [GH-10389]
|
||||
- host/windows: Fix powershell to properly handle paths with spaces [GH-10390]
|
||||
- providers/docker: Deterministic host VM synced folder location for Docker VM [GH-10311]
|
||||
- providers/hyperv: Fix network vlan configuration script [GH-10366]
|
||||
- providers/hyperv: Properly output error message on failed guest import [GH-10404]
|
||||
- providers/hyperv: Fix typo in network configuration detection script [GH-10410]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 16 21:36:50 UTC 2018 - Johannes Kastl <kastl@b1-systems.de>
|
||||
|
||||
|
||||
10
vagrant.spec
10
vagrant.spec
@ -25,7 +25,7 @@
|
||||
%global vim_data_dir %{_datadir}/vim/site/plugin/
|
||||
|
||||
Name: vagrant
|
||||
Version: 2.2.0
|
||||
Version: 2.2.2
|
||||
Release: 0
|
||||
Summary: Tool for building and distributing virtualized development environments
|
||||
License: MIT
|
||||
@ -49,6 +49,7 @@ Patch9: 0009-plugins-don-t-abuse-require_relative.patch
|
||||
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
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
# force only one ruby version
|
||||
@ -193,6 +194,7 @@ Optional dependency offering bash completion for vagrant
|
||||
%patch23 -p1
|
||||
%patch24 -p1
|
||||
%patch25 -p1
|
||||
%patch26 -p1
|
||||
|
||||
cp %{SOURCE98} .
|
||||
|
||||
@ -247,6 +249,12 @@ rm -f %{buildroot}%{gem_base}/gems/%{mod_full_name}/bin/vagrant.orig
|
||||
rm -f %{buildroot}%{_bindir}/vagrant.orig.%{rb_default_ruby_suffix}
|
||||
rm -f %{buildroot}%{gem_base}/gems/%{mod_full_name}/lib/vagrant/util.rb.orig
|
||||
|
||||
# SLE 12
|
||||
%if 0%{?suse_version} == 1315 && !0%{?is_opensuse}
|
||||
rm -f %{buildroot}%{gem_base}/gems/%{mod_full_name}/lib/vagrant/box.rb.orig
|
||||
rm -f %{buildroot}%{gem_base}/gems/%{mod_full_name}/%{name}.gemspec.orig
|
||||
%endif
|
||||
|
||||
# change shebang in /usr/lib64/ruby/gems/*/gems/vagrant-2.1.1/.runner.sh
|
||||
sed -i '1 s/^.*$/#!\/bin\/bash/' %{buildroot}%{gem_base}/gems/%{mod_full_name}/.runner.sh
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user