From ef0efdfcead5911cf548f4791caba13a9014dfaf Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Fri, 11 Mar 2016 12:10:39 +0100
Subject: [PATCH] vbox: update to 4.3.22

Issue #2090
---
 repos/ports/ports/virtualbox.hash             |  2 +-
 repos/ports/ports/virtualbox.port             |  8 +--
 .../src/virtualbox/patches/vbox_main.patch    | 52 ++++++++++++++-----
 repos/ports/src/virtualbox/unimpl.cc          |  2 +-
 4 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/repos/ports/ports/virtualbox.hash b/repos/ports/ports/virtualbox.hash
index d6f057314..2d5f49bf4 100644
--- a/repos/ports/ports/virtualbox.hash
+++ b/repos/ports/ports/virtualbox.hash
@@ -1 +1 @@
-fecdae2a67e96fa272b45ce6d40cdb15bda76e1d
+111ef181df255403ea50d0f6a6a085a270d90372
diff --git a/repos/ports/ports/virtualbox.port b/repos/ports/ports/virtualbox.port
index 0adfe6e9d..d111e34c2 100644
--- a/repos/ports/ports/virtualbox.port
+++ b/repos/ports/ports/virtualbox.port
@@ -1,17 +1,17 @@
 LICENSE         := GPLv2
-VERSION         := 4.3.20
+VERSION         := 4.3.22
 DOWNLOADS       := virtualbox.archive virtualbox_sdk.archive
 
 VIRTUALBOX_TBZ2    := VirtualBox-$(VERSION).tar.bz2
-VIRTUALBOX_SDK_ZIP := VirtualBoxSDK-$(VERSION)-96996.zip
+VIRTUALBOX_SDK_ZIP := VirtualBoxSDK-$(VERSION)-98236.zip
 
 URL(virtualbox) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VIRTUALBOX_TBZ2)
 DIR(virtualbox) := src/app/virtualbox
-SHA(virtualbox) := 42e725cda23955303b8bd4b9e2840767c7d943c5
+SHA(virtualbox) := 87b6109f20cc76bb3f419187ee76d6ad0b16a53b
 
 URL(virtualbox_sdk) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VIRTUALBOX_SDK_ZIP)
 DIR(virtualbox_sdk) := src/app/virtualbox_sdk
-SHA(virtualbox_sdk) := 2c61edee345577570f0599e383e43957b2fca5fc
+SHA(virtualbox_sdk) := 7ce1f21cc93253061690663b9540fab1c9f59ae7
 
 PATCHES_DIR       := src/virtualbox/patches
 PATCHES_DIR_VBOX4 := src/virtualbox/patches
diff --git a/repos/ports/src/virtualbox/patches/vbox_main.patch b/repos/ports/src/virtualbox/patches/vbox_main.patch
index 9c3a84906..a19e2d6a3 100644
--- a/repos/ports/src/virtualbox/patches/vbox_main.patch
+++ b/repos/ports/src/virtualbox/patches/vbox_main.patch
@@ -654,6 +654,42 @@ index 69e3109..3c534df 100644
  /**
   * Parses one key value pair.
   *
+@@ -4566,6 +4620,8 @@
+     return rc;
+ }
+ 
++#endif /* #if 0 */
++
+ /**
+  * Removes the key interfaces from all disk attachments, useful when
+  * changing the key store or dropping it.
+@@ -4650,6 +4706,8 @@
+     return hrc;
+ }
+ 
++#if 0
++
+ /**
+  * Configures the encryption support for the disk identified by the gien UUID with
+  * the given key.
+@@ -5344,6 +5402,8 @@
+     fireVRDEServerInfoChangedEvent(mEventSource);
+ }
+ 
++#endif /* #if 0 */
++
+ HRESULT Console::i_sendACPIMonitorHotPlugEvent()
+ {
+     LogFlowThisFuncEnter();
+@@ -5385,6 +5445,8 @@
+     return rc;
+ }
+ 
++#if 0
++
+ HRESULT Console::onVideoCaptureChange()
+ {
+     AutoCaller autoCaller(this);
 @@ -6490,6 +6544,8 @@ void Console::onMouseCapabilityChange(BOOL supportsAbsolute, BOOL supportsRelati
      fireMouseCapabilityChangedEvent(mEventSource, supportsAbsolute, supportsRelative, supportsMT, needsHostCursor);
  }
@@ -907,15 +943,6 @@ index 69e3109..3c534df 100644
  /**
   * Thread for powering down the Console.
   *
-@@ -10367,8 +10467,6 @@ Console::i_pdmIfSecKey_KeyRelease(PPDMISECKEY pInterface, const char *pszId)
- }
- 
- 
--
--
- /**
-  * The Main status driver instance data.
-  */
 @@ -10461,9 +10559,11 @@ DECLCALLBACK(int) Console::drvStatus_MediumEjected(PPDMIMEDIANOTIFY pInterface,
                      alock.release();
  
@@ -1116,19 +1143,16 @@ diff --git a/src/app/virtualbox/src/VBox/Main/src-client/DisplayImpl.cpp b/src/a
 index fed0ac3..bc3c334 100644
 --- a/src/app/virtualbox/src/VBox/Main/src-client/DisplayImpl.cpp
 +++ b/src/app/virtualbox/src/VBox/Main/src-client/DisplayImpl.cpp
-@@ -16,9 +16,12 @@
-  */
- 
+@@ -16,7 +16,9 @@
  #include "DisplayImpl.h"
-+#include "MachineImpl.h"
  #include "DisplayUtils.h"
  #include "ConsoleImpl.h"
 +#if 0
  #include "ConsoleVRDPServer.h"
 +#endif
+ #include "GuestImpl.h"
  #include "VMMDev.h"
  
- #include "AutoCaller.h"
 @@ -1067,7 +1070,9 @@ void Display::handleResizeCompletedEMT(BOOL fResizeContext)
           * Must be done before calling NotifyUpdate below.
           */
diff --git a/repos/ports/src/virtualbox/unimpl.cc b/repos/ports/src/virtualbox/unimpl.cc
index 741323781..3c7b797a3 100644
--- a/repos/ports/src/virtualbox/unimpl.cc
+++ b/repos/ports/src/virtualbox/unimpl.cc
@@ -178,7 +178,7 @@ DUMMY(RTStrCatP)
 DUMMY(RTStrStr)
 
 DUMMY(RTTcpClientCloseEx)
-DUMMY(RTTcpClientConnect)
+DUMMY(RTTcpClientConnectEx)
 DUMMY(RTTcpFlush)
 DUMMY(RTTcpGetLocalAddress)
 DUMMY(RTTcpGetPeerAddress)