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

Accepting request 649962 from home:ojkastl_buildservice:Branch_Virtualization_vagrant

Browse Source 
update to 2.1.3; removed patch 0007-Support-system-installed-plugins.patch; removed patch 0027-now-use-rubygem-net-ssh-5.0.x.patch

OBS-URL: https://build.opensuse.org/request/show/649962
OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=19
This commit is contained in:
Johannes Kastl 2018-11-17 20:30:13 +00:00 committed by Git OBS Bridge
parent efff136526
commit 37a0d38144
13 changed files with 112 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0002-bin-vagrant-silence-warning-about-installer.patch
View File

@ -1,4 +1,4 @@
From 246fe8ff4bb69cfffa7e44e4e571f2febc5e7719 Mon Sep 17 00:00:00 2001
From e82ee38f51f683905b245b4b53535196f9f4531e 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
@ -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 19df75033..6667ab152 100755
index 7372a726d..0e3a16c0f 100755
--- a/bin/vagrant
+++ b/bin/vagrant
@@ -117,22 +117,6 @@ begin
@@ -143,22 +143,6 @@ begin
logger.debug("Creating Vagrant environment")
env = Vagrant::Environment.new(opts)
@ -36,5 +36,5 @@ index 19df75033..6667ab152 100755
# Execute the CLI interface, and exit with the proper error code
exit_status = env.cli(argv)
--
2.13.0
2.19.1

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

@ -1,4 +1,4 @@
From 7ceb61fdbfc9e62e199e4f306474ba5b65f080c9 Mon Sep 17 00:00:00 2001
From a6511a0da32e634ae9aefaa6ba654ec5e7673a2f 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
@ -10,7 +10,7 @@ Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
---
lib/vagrant/box.rb | 3 ++-
lib/vagrant/util.rb | 2 ++
lib/vagrant/util/tempfile.rb | 39 +++++++++++++++++++++++++++++++++++++++
lib/vagrant/util/tempfile.rb | 39 ++++++++++++++++++++++++++++++++++++
3 files changed, 43 insertions(+), 1 deletion(-)
create mode 100644 lib/vagrant/util/tempfile.rb
@ -36,10 +36,10 @@ index cd839ee91..65eee8828 100644
url = @metadata_url
diff --git a/lib/vagrant/util.rb b/lib/vagrant/util.rb
index 313e1bd19..6e6f669f4 100644
index 32babe50d..217469e85 100644
--- a/lib/vagrant/util.rb
+++ b/lib/vagrant/util.rb
@@ -13,6 +13,8 @@ module Vagrant
@@ -15,6 +15,8 @@ module Vagrant
autoload :SafeExec, 'vagrant/util/safe_exec'
autoload :SilenceWarnings, 'vagrant/util/silence_warnings'
autoload :StackedProcRunner, 'vagrant/util/stacked_proc_runner'
@ -94,5 +94,5 @@ index 000000000..0cbbb53ac
+ FileUtils.rm_rf(Vagrant::Util::Tempfile.private_tmpdir)
+end
--
2.13.0
2.19.1

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

@ -1,4 +1,4 @@
From 68b48e8ac3316ea157e28a3b02b38f3334a7d985 Mon Sep 17 00:00:00 2001
From 861a607ac0ebfdd82f2c32a1c31c8c93b62b1efe 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
@ -26,5 +26,5 @@ index 60dc5dde4..657636eaf 100644
# Do nothing, because it probably means the machine shut down
# and SSH connection was lost.
--
2.13.0
2.19.1

98
0007-Support-system-installed-plugins.patch
View File

@ -1,98 +0,0 @@
From 176ae85a2d5ac3f7ce0c3b9436eec8c8285275b7 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@debian.org>
Date: Wed, 27 May 2015 09:36:17 -0300
Subject: [PATCH] Support system-installed plugins
Plugins must be installed as regular Ruby libraries, and they must
contain /usr/share/vagrant-plugins/plugins.d/$PLUGINNAME.json with the
following content:
{
"${PLUGINNAME}": {
"ruby_version":"$(ruby -e 'puts RUBY_VERSION')",
"vagrant_version":"$(cat /usr/share/vagrant/version.txt)",
"gem_version":"",
"require":"",
"sources":[]
}
}
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
---
lib/vagrant/plugin/manager.rb | 4 ++--
lib/vagrant/plugin/state_file.rb | 22 +++++++++++++++++++++-
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/lib/vagrant/plugin/manager.rb b/lib/vagrant/plugin/manager.rb
index 64891bd37..0ff370d3f 100644
--- a/lib/vagrant/plugin/manager.rb
+++ b/lib/vagrant/plugin/manager.rb
@@ -18,7 +18,7 @@ module Vagrant
# Returns the path to the [StateFile] for system plugins.
def self.system_plugins_file
- dir = Vagrant.installer_embedded_dir
+ dir = '/usr/share/vagrant-plugins'
return nil if !dir
Pathname.new(dir).join("plugins.json")
end
@@ -33,7 +33,7 @@ module Vagrant
system_path = self.class.system_plugins_file
@system_file = nil
- @system_file = StateFile.new(system_path) if system_path && system_path.file?
+ @system_file = StateFile.new(system_path, true) if system_path && system_path.file?
end
# Installs another plugin into our gem directory.
diff --git a/lib/vagrant/plugin/state_file.rb b/lib/vagrant/plugin/state_file.rb
index 85db50b92..9e12591e3 100644
--- a/lib/vagrant/plugin/state_file.rb
+++ b/lib/vagrant/plugin/state_file.rb
@@ -7,8 +7,9 @@ module Vagrant
# This is a helper to deal with the plugin state file that Vagrant
# uses to track what plugins are installed and activated and such.
class StateFile
- def initialize(path)
+ def initialize(path, system = false)
@path = path
+ @system = system
@data = {}
if @path.exist?
@@ -24,6 +25,21 @@ module Vagrant
@data["version"] ||= "1"
@data["installed"] ||= {}
+ load_extra_plugins
+ end
+
+ def load_extra_plugins
+ extra_plugins = Dir.glob(@path.dirname.join('plugins.d', '*.json'))
+ extra_plugins.each do |filename|
+ json = File.read(filename)
+ begin
+ plugin_data = JSON.parse(json)
+ @data["installed"].merge!(plugin_data)
+ rescue JSON::ParserError => e
+ raise Vagrant::Errors::PluginStateFileParseError,
+ path: filename, message: e.message
+ end
+ end
end
# Add a plugin that is installed to the state file.
@@ -102,6 +118,10 @@ module Vagrant
f.close
FileUtils.mv(f.path, @path)
end
+ rescue Errno::EACCES
+ # Ignore permission denied against system-installed plugins; regular
+ # users are not supposed to write there.
+ raise unless @system
end
protected
--
2.18.0

10
0009-plugins-don-t-abuse-require_relative.patch
View File

@ -1,4 +1,4 @@
From 9a3b6124412483cd2fa3779fade3387e96917caf Mon Sep 17 00:00:00 2001
From ad2b9cb36e1a8078be140ca6d2f852a91e97fd1c 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
@ -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 99d6681de..3b582b159 100644
index 35ffba2d2..c09c59518 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 99d6681de..3b582b159 100644
module VagrantPlugins
module GuestDebian
diff --git a/plugins/guests/freebsd/cap/configure_networks.rb b/plugins/guests/freebsd/cap/configure_networks.rb
index 8e5627b5e..f9e761ee7 100644
index 36b11d1ed..866f8503a 100644
--- a/plugins/guests/freebsd/cap/configure_networks.rb
+++ b/plugins/guests/freebsd/cap/configure_networks.rb
@@ -1,6 +1,6 @@
@ -106,7 +106,7 @@ index 96458622f..ed371765e 100644
module VagrantPlugins
module GuestNixos
diff --git a/plugins/guests/openbsd/cap/configure_networks.rb b/plugins/guests/openbsd/cap/configure_networks.rb
index 30c4be060..64989d103 100644
index fefc05b9e..a3bfcaf48 100644
--- a/plugins/guests/openbsd/cap/configure_networks.rb
+++ b/plugins/guests/openbsd/cap/configure_networks.rb
@@ -1,6 +1,6 @@
@ -154,5 +154,5 @@ index 2dd140230..e6dd96f08 100644
module VagrantPlugins
module GuestSUSE
--
2.13.0
2.19.1

28
0023-vbox-fix-package.patch
View File

@ -1,15 +1,28 @@
diff -ur vagrant-1.9.7.orig/plugins/providers/virtualbox/action/package.rb vagrant-1.9.7/plugins/providers/virtualbox/action/package.rb
--- vagrant-1.9.7.orig/plugins/providers/virtualbox/action/package.rb 2017-08-16 11:52:01.270242802 +0300
+++ vagrant-1.9.7/plugins/providers/virtualbox/action/package.rb 2017-08-16 11:53:08.929783075 +0300
From eab1acdf88acbe7b817993a2d6f3b50dfb01f599 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
robert.munteanu@gmail.com on Sun Aug 13 19:07:06 UTC 2017
---
plugins/providers/virtualbox/action/package.rb | 2 +-
plugins/providers/virtualbox/action/package_setup_folders.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugins/providers/virtualbox/action/package.rb b/plugins/providers/virtualbox/action/package.rb
index fb5ebdabf..c03c1c373 100644
--- a/plugins/providers/virtualbox/action/package.rb
+++ b/plugins/providers/virtualbox/action/package.rb
@@ -1,4 +1,4 @@
-require_relative "../../../../lib/vagrant/action/general/package"
+require "vagrant/action/general/package"
module VagrantPlugins
module ProviderVirtualBox
diff -ur vagrant-1.9.7.orig/plugins/providers/virtualbox/action/package_setup_folders.rb vagrant-1.9.7/plugins/providers/virtualbox/action/package_setup_folders.rb
--- vagrant-1.9.7.orig/plugins/providers/virtualbox/action/package_setup_folders.rb 2017-08-16 11:52:01.270242802 +0300
+++ vagrant-1.9.7/plugins/providers/virtualbox/action/package_setup_folders.rb 2017-08-16 11:52:51.353902487 +0300
diff --git a/plugins/providers/virtualbox/action/package_setup_folders.rb b/plugins/providers/virtualbox/action/package_setup_folders.rb
index a0baf516f..867fe2bf8 100644
--- a/plugins/providers/virtualbox/action/package_setup_folders.rb
+++ b/plugins/providers/virtualbox/action/package_setup_folders.rb
@@ -1,6 +1,6 @@
require "fileutils"
@ -18,3 +31,6 @@ diff -ur vagrant-1.9.7.orig/plugins/providers/virtualbox/action/package_setup_fo
module VagrantPlugins
module ProviderVirtualBox
--
2.19.1

6
0024-do-not-depend-on-wdm.patch
View File

@ -1,4 +1,4 @@
From 1bc55fc60cf48b0d9b01a7a7a24ba92e6fc910c1 Mon Sep 17 00:00:00 2001
From af30c5d59173331fdd70ffc22f0041909cf23a46 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
@ -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 edc12f032..5f60fd0d8 100644
index d67d1e83c..b12d85c51 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
@ -21,5 +21,5 @@ index edc12f032..5f60fd0d8 100644
s.add_dependency "winrm-fs", "~> 1.0"
s.add_dependency "winrm-elevated", "~> 1.1"
--
2.18.0
2.19.1

25
0025-do-not-abuse-relative-paths-in-docker-plugin.patch
View File

@ -1,12 +1,25 @@
Index: vagrant-1.9.7/plugins/providers/docker/config.rb
===================================================================
--- vagrant-1.9.7.orig/plugins/providers/docker/config.rb
+++ vagrant-1.9.7/plugins/providers/docker/config.rb
From 39d59563b050f737130831cc4f9bcd7d26fd00bd 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
---
plugins/providers/docker/config.rb | 2 +-
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
--- a/plugins/providers/docker/config.rb
+++ b/plugins/providers/docker/config.rb
@@ -1,6 +1,6 @@
require "pathname"
-require_relative "../../../lib/vagrant/util/platform"
+require "vagrant/util/platform"
module VagrantPlugins
module DockerProvider
--
2.19.1

26
0027-now-use-rubygem-net-ssh-5.0.x.patch
View File

@ -1,26 +0,0 @@
From 54648b91f9531b6fd0a9639c0ec5d8331c79907c Mon Sep 17 00:00:00 2001
From: Johannes Kastl <kastl@b1-systems.de>
Date: Sun, 1 Jul 2018 15:21:34 +0200
Subject: [PATCH] now use rubygem net-ssh 5.0.x
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
---
vagrant.gemspec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vagrant.gemspec b/vagrant.gemspec
index 4096fd684..f3a8d7d76 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
s.add_dependency "listen", "~> 3.1.5"
s.add_dependency "hashicorp-checkpoint", "~> 0.1.5"
s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
- s.add_dependency "net-ssh", "~> 4.2.0"
+ s.add_dependency "net-ssh", "~> 5.0.0"
s.add_dependency "net-sftp", "~> 2.1"
s.add_dependency "net-scp", "~> 1.2.0"
s.add_dependency "rb-kqueue", "~> 0.2.0"
--
2.18.0

3
vagrant-2.1.2.tar.gz
View File

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

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

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

48
vagrant.changes
View File

@ -1,3 +1,51 @@
-------------------------------------------------------------------
Fri Nov 16 20:39:55 UTC 2018 - Johannes Kastl <kastl@b1-systems.de>
- update to 2.1.3
FEATURES:
- core: Support for project specific plugins [GH-10037]
IMPROVEMENTS:
- command\/reload: Add `--force` flag to reload command [GH-10123]
- communicator/winrm: Display warning if vagrant-winrm plugin is detected [GH-10076]
- contrib/bash: Replace -VAGRANTSLASH - with literal slash in completion [GH-9987]
- core: Show installed version of Vagrant when displaying version check [GH-9968]
- core: Retain information of original box backing active guest [GH-10083]
- core: Only write box info if provider supports box objects [GH-10126]
- core: Update net-ssh dependency constraint to ~> 5.0.0 [GH-10066]
- core/triggers: Catch and allow for non-standard exit codes with triggers `run` options [GH-10005]
- core/triggers: Allow for spaces in `path` for trigger run option [GH-10118]
- guest/debian: Isolate network interface configuration to individual files for systemd [GH-9889]
- guest/redhat: Use libnfs-utils package if available [GH-9878]
- provider/docker: Support Docker volume consistency for synced folders [GH-9811]
- provider/hyperv: Disable synced folders on non-DrvFs file systems by default [GH-10001]
- util/downloader: Support custom suffix on user agent string [GH-9966]
- util/downloader: Prevent false positive matches on Location header [GH-10041]
- util/subprocess: Force system library paths for executables external to AppImage [GH-10078]
BUG FIXES:
- core: Disable Vagrantfile loading with plugin commands [GH-10030]
- core: Ensure the SecureRandom library is loaded for the trigger class [GH-10063]
- core/triggers: Allow trigger run args option to be a single string [GH-10116]
- util/powershell: Properly `join` commands from passed in array [GH-10115]
- guest/solaris: Add back guest detection check for Solaris derived guests [GH-10081]
- guest/windows: Be more explicit when invoking cmd.exe with mount_volume script [GH-9976]
- host/linux: Fix sudo usage in NFS capability when modifying exports file [GH-10084]
- host/windows: Remove localization dependency from SMB list generation [GH-10043]
- provider/docker: Convert windows paths for volume mounts on docker driver [GH-10100]
- provider/hyperv: Fix checkpoint configuration and properly disable automatic checkpoints by default [GH-9999]
- provider/hyperv: Remove localization dependency from access check [GH-10000]
- provider/hyperv: Enable ExposeVirtualizationExtensions only when available [GH-10079]
- provider/virtualbox: Skip link-local when fixing IPv6 route [GH-9639, GH-10077]
- push/ftp: Custom error when attempting to push too many files [GH-9952]
- util/downloader: Prevent errors when Location header contains relative path [GH-10017]
- util/guest_inspection: Prevent nmcli check from hanging when pty is enabled [GH-9926]
- util/platform: Always force string type conversion on path [GH-9998]
- removed patch 0007-Support-system-installed-plugins.patch that has been included upstream
- removed patch 0027-now-use-rubygem-net-ssh-5.0.x.patch that is no longer necessary
-------------------------------------------------------------------
Fri Nov 9 20:24:19 UTC 2018 - Johannes Kastl <kastl@b1-systems.de>

6
vagrant.spec
View File

@ -25,7 +25,7 @@
%global vim_data_dir %{_datadir}/vim/site/plugin/
Name: vagrant
Version: 2.1.2
Version: 2.1.3
Release: 0
Summary: Tool for building and distributing virtualized development environments
License: MIT
@ -42,7 +42,6 @@ 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
Patch7: 0007-Support-system-installed-plugins.patch
Patch9: 0009-plugins-don-t-abuse-require_relative.patch
#
#
@ -50,7 +49,6 @@ 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
Patch27: 0027-now-use-rubygem-net-ssh-5.0.x.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# force only one ruby version
@ -188,7 +186,6 @@ Optional dependency offering bash completion for vagrant
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch7 -p1
%patch9 -p1
#
#
@ -196,7 +193,6 @@ Optional dependency offering bash completion for vagrant
%patch23 -p1
%patch24 -p1
%patch25 -p1
%patch27 -p1
cp %{SOURCE98} .