virtualbox+guest: Update to new upstream v4.2.12.

All patch files dropped because they're fixed in this release. For a full list
of fixes that come with this maintenance release, please refer to:

https://www.virtualbox.org/wiki/Changelog

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

4 files changed, 6 insertions, 101 deletions

diff --git a/pkgs/applications/virtualization/virtualbox/build_fix_3.9.0.patch b/pkgs/applications/virtualization/virtualbox/build_fix_3.9.0.patch
deleted file mode 100644
index 2c3cdebacde8..000000000000
--- a/pkgs/applications/virtualization/virtualbox/build_fix_3.9.0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit d725168153e3dc5a383b12e0bf9af9b6244ad3eb
-Author: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
-Date:   Thu Feb 28 13:46:12 2013 +0000
-
-    Linux 3.9.0 rc0 compile fix
-
-    git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@44867 cfe28804-0f27-0410-a406-dd0f0b0b656f
-
-diff --git a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-index ec9b502..7a208d1 100644
---- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-+++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-@@ -90,6 +90,9 @@
- #include <linux/slab.h>
- #include <linux/time.h>
- #include <linux/sched.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
-+# include <linux/sched/rt.h>
-+#endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 7)
- # include <linux/jiffies.h>
- #endif
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index d385d431fa39..3dd020dfa105 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -11,8 +11,8 @@ with stdenv.lib;
 
 let
 
-  version = "4.2.8";
-  extpackRevision = "83876";
+  version = "4.2.12";
+  extpackRevision = "84980";
 
   forEachModule = action: ''
     for mod in \
@@ -35,7 +35,7 @@ let
     name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}"
          + ".vbox-extpack";
     # Has to be base16 because it's used as an input to VBoxExtPackHelperApp!
-    sha256 = "fa579416f382b58c4e93d3740d076ceba728e28d987e51aced5865a46cb9111c";
+    sha256 = "ad15a92e49095c2115bd1793b3b957d3eaf44af0f5d24bb53d6b4fc81c3e2fc4";
     url = "https://www.virtualbox.org/wiki/Downloads";
   };
 
@@ -44,7 +44,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "f336af12244db74e6564dc22e438bbcba70f994aaf0d117fdf70caca9fab1b78";
+    sha256 = "eb65ecac94f63d6292a967d39cb5e28326404c10d0e8c2c50399eedb59c17ee6";
   };
 
   buildInputs =
@@ -54,11 +54,6 @@ in stdenv.mkDerivation {
     ++ optional javaBindings jdk
     ++ optional pythonBindings python;
 
-  patches = [
-    ./strict_types.patch
-    ./build_fix_3.9.0.patch
-  ];
-
   prePatch = ''
     set -x
     MODULES_BUILD_DIR=`echo ${kernelDev}/lib/modules/*/build`
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 20ef5c66997b..f3d7c18a2c69 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -2,14 +2,14 @@
 , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor
 , dbus }:
 
-let version = "4.2.8"; in
+let version = "4.2.12"; in
 
 stdenv.mkDerivation {
   name = "VirtualBox-GuestAdditions-${version}-${kernelDev.version}";
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "04a5402d8dcdefc83ffb2785351ddc57758781a3759137974469189392ae4ad5";
+    sha256 = "aed4730b643aca8daa0829e1122b7c8d592b9f6cea902a98e390c4d22373dfb8";
   };
 
   KERN_DIR = "${kernelDev}/lib/modules/*/build";
diff --git a/pkgs/applications/virtualization/virtualbox/strict_types.patch b/pkgs/applications/virtualization/virtualbox/strict_types.patch
deleted file mode 100644
index 18ccc77f9b16..000000000000
--- a/pkgs/applications/virtualization/virtualbox/strict_types.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-index 9cc124c..d86da0c 100644
---- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-+++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-@@ -253,7 +253,11 @@ static struct platform_device gPlatformDevice =
- DECLINLINE(RTUID) vboxdrvLinuxUid(void)
- {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
-+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
-+    return from_kuid(current_user_ns(), current_uid());
-+# else
-     return current->cred->uid;
-+# endif
- #else
-     return current->uid;
- #endif
-@@ -262,7 +266,11 @@ DECLINLINE(RTUID) vboxdrvLinuxUid(void)
- DECLINLINE(RTGID) vboxdrvLinuxGid(void)
- {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
-+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
-+    return from_kgid(current_user_ns(), current_gid());
-+# else
-     return current->cred->gid;
-+# endif
- #else
-     return current->gid;
- #endif
-@@ -271,7 +279,11 @@ DECLINLINE(RTGID) vboxdrvLinuxGid(void)
- DECLINLINE(RTUID) vboxdrvLinuxEuid(void)
- {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
-+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
-+    return from_kuid(current_user_ns(), current_euid());
-+# else
-     return current->cred->euid;
-+# endif
- #else
-     return current->euid;
- #endif
-diff --git a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
-index 575f739..8909e79 100644
---- a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
-+++ b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
-@@ -429,7 +429,11 @@ int vboxPciOsDevDetachHostDriver(PVBOXRAWPCIINS pIns)
-         if (!pNewCreds)
-                 goto done;
- 
-+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
-+        pNewCreds->fsuid = GLOBAL_ROOT_UID;;
-+# else
-         pNewCreds->fsuid = 0;
-+# endif
-         pOldCreds = override_creds(pNewCreds);
- #endif
- 
-@@ -539,7 +543,11 @@ int vboxPciOsDevReattachHostDriver(PVBOXRAWPCIINS pIns)
-         if (!pNewCreds)
-             goto done;
- 
-+# ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
-+        pNewCreds->fsuid = GLOBAL_ROOT_UID;;
-+# else
-         pNewCreds->fsuid = 0;
-+# endif
-         pOldCreds = override_creds(pNewCreds);
- #endif
-         RTStrPrintf(szFileBuf, cMaxBuf,