From 7c6c677eb10a609da14f043c9b3e59002509dceab77327dfd7f5b68fd0a613ef Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 23 Oct 2017 14:52:32 +0000 Subject: [PATCH] Accepting request 535821 from Virtualization 1 OBS-URL: https://build.opensuse.org/request/show/535821 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=5 --- 0010-virtualbox-5.2-support.patch | 58 +++++++++++++++++++++++++++++++ vagrant.changes | 6 ++++ vagrant.spec | 2 ++ 3 files changed, 66 insertions(+) create mode 100644 0010-virtualbox-5.2-support.patch diff --git a/0010-virtualbox-5.2-support.patch b/0010-virtualbox-5.2-support.patch new file mode 100644 index 0000000..da0c310 --- /dev/null +++ b/0010-virtualbox-5.2-support.patch @@ -0,0 +1,58 @@ +From 7d73af5637de41f1e53b8f1ef2ea9baf76842dfb Mon Sep 17 00:00:00 2001 +From: Jehiah Czebotar +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 +--- a/plugins/providers/virtualbox/driver/meta.rb ++++ b/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 ++++ b/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 +--- a/plugins/providers/virtualbox/plugin.rb ++++ b/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 diff --git a/vagrant.changes b/vagrant.changes index 4e125ef..7d7691f 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Oct 22 19:00:05 UTC 2017 - robert.munteanu@gmail.com + +- Added upstream patch 0010-virtualbox-5.2-support.patch to allow + running with upcoming Virtualbox 5.2 + ------------------------------------------------------------------- Thu Sep 28 13:38:17 UTC 2017 - dimstar@opensuse.org diff --git a/vagrant.spec b/vagrant.spec index 7a40ef4..14b7c14 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -43,6 +43,7 @@ Patch4: 0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch Patch6: 0006-Relax-dependency-resolution.patch Patch8: 0008-Read-data-from-usr-share-vagrant.patch Patch9: 0009-plugins-don-t-abuse-require_relative.patch +Patch10: 0010-virtualbox-5.2-support.patch # # # try building with ruby2.4 @@ -162,6 +163,7 @@ Optional dependency offering bash completion for vagrant %patch6 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 # # #