4 files changed, 34 insertions, 9 deletions
diff --git a/community/virtualbox/LocalConfig.kmk b/community/virtualbox/LocalConfig.kmk
index d0e939ad4..e5cbcebcd 100644
--- a/community/virtualbox/LocalConfig.kmk
+++ b/community/virtualbox/LocalConfig.kmk
@@ -14,6 +14,6 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_WITH_VNC := 1
 VBOX_BLD_PYTHON = python2
-VBOX_JAVA_HOME = /opt/java
+VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk
 VBOX_GCC_WERR =
 VBOX_GCC_WARN =
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index 59a8e93c9..1cdf18903 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 52263 2011-07-22 18:30:40Z ibiru $
+# $Id: PKGBUILD 53171 2011-07-31 11:38:59Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
 pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk')
 pkgver=4.1.0
-pkgrel=2
+pkgrel=2.1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
 makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst'
-'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk' 'gsoap' 'vde2'
+'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2'
 'xorg-server-devel' 'xf86driproto' 'libxcomposite')
 [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
 source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
         UserManual-$pkgver.pdf::http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf
         virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch
         10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh
-        change_default_driver_dir.patch)
+        change_default_driver_dir.patch
+        fix-kernel-panic.patch)
 _kernver=2.6.39-ARCH
 
 build() {
@@ -25,6 +26,7 @@ build() {
     patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch"
     patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
     patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
+    patch -Np0 -i "$srcdir/fix-kernel-panic.patch"
 
     cp "$srcdir/LocalConfig.kmk" .
 
@@ -200,6 +202,7 @@ md5sums=('02556a6b4877cfdfbaa3ce0a0c0dcf31'
          '5f85710e0b8606de967716ded7b2d351'
          'ed1341881437455d9735875ddf455fbe'
          '4cf75d9c091199a47a7a1bc2f4e347d9'
-         'c1a07f044c476a190af8486fe78bee0f'
-         '838c4c4ebe11b34ae2168df5cd06f694'
-         '97e193f050574dd272a38e5ee5ebe62b')
+         '78ffa67ff131680f1d2b6f06d4325c5b'
+         'b3de603560b2fb2c33e704e4e8ab3de8'
+         '97e193f050574dd272a38e5ee5ebe62b'
+         '19b05b85a8a46af5a429b2ab618638cd')
diff --git a/community/virtualbox/fix-kernel-panic.patch b/community/virtualbox/fix-kernel-panic.patch
new file mode 100644
index 000000000..237715db2
--- /dev/null
+++ b/community/virtualbox/fix-kernel-panic.patch
@@ -0,0 +1,22 @@
+Index: src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c
+===================================================================
+--- src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c	(revision 73165)
++++ src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c	(revision 73166)
+@@ -32,6 +32,7 @@
+ #include "internal/iprt.h"
+ 
+ #include <iprt/mp.h>
++#include <iprt/asm-amd64-x86.h>
+ #include <iprt/err.h>
+ #include <iprt/cpuset.h>
+ #include <iprt/thread.h>
+@@ -82,7 +83,8 @@
+     NOREF(pvUser1);
+ 
+     AssertRelease(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
+-    AssertRelease(idCpu == RTMpCpuId());   /* ASSUMES iCpu == RTCPUID */
++    AssertReleaseMsg(idCpu == RTMpCpuId(),  /* ASSUMES iCpu == RTCPUID */
++                     ("idCpu=%u RTMpCpuId=%d ApicId=%d\n", idCpu, RTMpCpuId(), ASMGetApicId() ));
+ 
+     switch (ulNativeEvent)
+     {
+\ No newline at end of file
diff --git a/community/virtualbox/vboxdrv.sh b/community/virtualbox/vboxdrv.sh
index 5eb7ecb89..845f6c769 100755
--- a/community/virtualbox/vboxdrv.sh
+++ b/community/virtualbox/vboxdrv.sh
@@ -21,7 +21,7 @@ fi
 case "$1" in
   setup)
     stat_busy "Unloading VirtualBox kernel modules"
-    for module in vbox{netflt,netadp,drv}; do
+    for module in vbox{netflt,netadp,drv,pci}; do
       if grep -q "^${module}" /proc/modules; then
         MODLIST+=($module)
         modprobe -r $module