Import upstream patch for vagrant to add support for virtualbox 5.2

PR:		223198
Submitted by:	me
Approved by:	joe@thrallingpenguin.com (maintainer)
Obtained from:	83310f8a56
This commit is contained in:
Guido Falsi 2017-10-24 07:04:47 +00:00
parent 6269b36b10
commit e14a77fdbe
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=452757
3 changed files with 60 additions and 0 deletions

View file

@ -3,6 +3,7 @@
PORTNAME= vagrant
PORTVERSION= 2.0.0
PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= sysutils rubygems devel

View file

@ -0,0 +1,58 @@
From 7d73af5637de41f1e53b8f1ef2ea9baf76842dfb Mon Sep 17 00:00:00 2001
From: Jehiah Czebotar <jehiah@gmail.com>
Date: Fri, 8 Sep 2017 15:00:17 -0400
Subject: [PATCH] Virtualbox 5.2 support
---
plugins/providers/virtualbox/driver/meta.rb | 1 +
plugins/providers/virtualbox/driver/version_5_2.rb | 16 ++++++++++++++++
plugins/providers/virtualbox/plugin.rb | 1 +
3 files changed, 18 insertions(+)
create mode 100644 plugins/providers/virtualbox/driver/version_5_2.rb
diff --git a/plugins/providers/virtualbox/driver/meta.rb b/plugins/providers/virtualbox/driver/meta.rb
index 0dd186d8c7..ec457a866a 100644
--- plugins/providers/virtualbox/driver/meta.rb
+++ plugins/providers/virtualbox/driver/meta.rb
@@ -62,6 +62,7 @@ def initialize(uuid=nil)
"4.3" => Version_4_3,
"5.0" => Version_5_0,
"5.1" => Version_5_1,
+ "5.2" => Version_5_2,
}
if @@version.start_with?("4.2.14")
diff --git a/plugins/providers/virtualbox/driver/version_5_2.rb b/plugins/providers/virtualbox/driver/version_5_2.rb
new file mode 100644
index 0000000000..cd6c0b6c5c
--- /dev/null
+++ plugins/providers/virtualbox/driver/version_5_2.rb
@@ -0,0 +1,16 @@
+require File.expand_path("../version_5_1", __FILE__)
+
+module VagrantPlugins
+ module ProviderVirtualBox
+ module Driver
+ # Driver for VirtualBox 5.2.x
+ class Version_5_2 < Version_5_1
+ def initialize(uuid)
+ super
+
+ @logger = Log4r::Logger.new("vagrant::provider::virtualbox_5_2")
+ end
+ end
+ end
+ end
+end
diff --git a/plugins/providers/virtualbox/plugin.rb b/plugins/providers/virtualbox/plugin.rb
index 399747a6a2..090bc50616 100644
--- plugins/providers/virtualbox/plugin.rb
+++ plugins/providers/virtualbox/plugin.rb
@@ -57,6 +57,7 @@ module Driver
autoload :Version_4_3, File.expand_path("../driver/version_4_3", __FILE__)
autoload :Version_5_0, File.expand_path("../driver/version_5_0", __FILE__)
autoload :Version_5_1, File.expand_path("../driver/version_5_1", __FILE__)
+ autoload :Version_5_2, File.expand_path("../driver/version_5_2", __FILE__)
end
module Model

View file

@ -695,6 +695,7 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/driver/version_4_3.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/driver/version_5_0.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/driver/version_5_1.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/driver/version_5_2.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/model/forwarded_port.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/plugin.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/provider.rb