From 7b973a455d2ee6734419dd2b3d1698d284742ebf Mon Sep 17 00:00:00 2001
From: Heinz Wiesinger <pprkut@liwjatan.at>
Date: Tue, 2 Apr 2013 00:11:57 -0500
Subject: system/virtualbox: Updated for version 4.2.10.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 system/virtualbox/vboxdrv.sh-setup.diff | 26 +++++++++++++++++---------
 system/virtualbox/virtualbox.SlackBuild |  6 +++---
 system/virtualbox/virtualbox.info       | 18 +++++++++---------
 3 files changed, 29 insertions(+), 21 deletions(-)

(limited to 'system/virtualbox')

diff --git a/system/virtualbox/vboxdrv.sh-setup.diff b/system/virtualbox/vboxdrv.sh-setup.diff
index 58f1963e0d..da6633acc3 100644
--- a/system/virtualbox/vboxdrv.sh-setup.diff
+++ b/system/virtualbox/vboxdrv.sh-setup.diff
@@ -1,5 +1,5 @@
---- vboxdrv.sh.in.orig	2012-03-13 15:51:56.000000000 +0100
-+++ vboxdrv.sh.in	2012-09-15 13:15:32.215798169 +0200
+--- vboxdrv.sh.in.orig	2012-12-19 19:27:12.000000000 +0100
++++ vboxdrv.sh.in	2013-01-06 12:33:27.291744988 +0100
 @@ -46,17 +46,13 @@
  
  if [ -n "$INSTALL_DIR" ]; then
@@ -19,14 +19,17 @@
  
  if [ -n "$NOLSB" ]; then
      if [ -f /etc/redhat-release ]; then
-@@ -297,62 +293,7 @@
+@@ -297,70 +293,7 @@
  # setup_script
  setup()
  {
 -    stop
--    begin_msg "Uninstalling old VirtualBox DKMS kernel modules"
--    $DODKMS uninstall vboxhost vboxdrv vboxnetflt vboxnetadp > $LOG
--    succ_msg
+-    DKMS=`which dkms 2>/dev/null`
+-    if [ -n "$DKMS" ]; then
+-      begin_msg "Uninstalling old VirtualBox DKMS kernel modules"
+-      $DODKMS uninstall vboxhost vboxdrv vboxnetflt vboxnetadp > $LOG
+-      succ_msg
+-    fi
 -    if find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|grep -q vboxpci; then
 -        begin_msg "Removing old VirtualBox pci kernel module"
 -        find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|xargs rm -f 2>/dev/null
@@ -47,9 +50,14 @@
 -        find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null
 -        succ_msg
 -    fi
--    begin_msg "Trying to register the VirtualBox kernel modules using DKMS"
--    if ! $DODKMS install vboxhost $VERSION >> $LOG; then
--      fail_msg "Failed, trying without DKMS"
+-    if [ -n "$DKMS" ]; then
+-      begin_msg "Trying to register the VirtualBox kernel modules using DKMS"
+-      if ! $DODKMS install vboxhost $VERSION >> $LOG; then
+-        fail_msg "Failed, trying without DKMS"
+-        DKMS=""
+-      fi
+-    fi
+-    if [ -z "$DKMS" ]; then
 -      begin_msg "Recompiling VirtualBox kernel modules"
 -      if ! $BUILDINTMP \
 -          --save-module-symvers /tmp/vboxdrv-Module.symvers \
diff --git a/system/virtualbox/virtualbox.SlackBuild b/system/virtualbox/virtualbox.SlackBuild
index 4dcaffc206..5679ffffd8 100644
--- a/system/virtualbox/virtualbox.SlackBuild
+++ b/system/virtualbox/virtualbox.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for virtualbox-ose
 
-# Copyright 2008-2012 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2013 Heinz Wiesinger, Amsterdam, The Netherlands
 # Copyright 2008 Mauro Giachero <mauro.giachero@gmail.com>
 # All rights reserved.
 #
@@ -25,8 +25,8 @@
 
 PRGNAM=virtualbox
 SRCNAM=VirtualBox
-VERSION=4.2.0
-BUILD=${BUILD:-2}
+VERSION=4.2.10
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/system/virtualbox/virtualbox.info b/system/virtualbox/virtualbox.info
index 5b54b2bebe..48bfb7a546 100644
--- a/system/virtualbox/virtualbox.info
+++ b/system/virtualbox/virtualbox.info
@@ -1,14 +1,14 @@
 PRGNAM="virtualbox"
-VERSION="4.2.0"
+VERSION="4.2.10"
 HOMEPAGE="http://www.virtualbox.org"
-DOWNLOAD="http://download.virtualbox.org/virtualbox/4.2.0/VirtualBox-4.2.0.tar.bz2 \
-          http://download.virtualbox.org/virtualbox/4.2.0/VBoxGuestAdditions_4.2.0.iso \
-          http://download.virtualbox.org/virtualbox/4.2.0/UserManual.pdf \
-          http://download.virtualbox.org/virtualbox/4.2.0/SDKRef.pdf"
-MD5SUM="691b4134983ce7d89b9fb683305cb647 \
-        ee74e968bab97466c3b463a0b4d665f5 \
-        261f6bd46bdeb05039396b6dbec76341 \
-        53654a262d301c1cbb9b98be1045e461"
+DOWNLOAD="http://download.virtualbox.org/virtualbox/4.2.10/VirtualBox-4.2.10.tar.bz2 \
+          http://download.virtualbox.org/virtualbox/4.2.10/VBoxGuestAdditions_4.2.10.iso \
+          http://download.virtualbox.org/virtualbox/4.2.10/UserManual.pdf \
+          http://download.virtualbox.org/virtualbox/4.2.10/SDKRef.pdf"
+MD5SUM="99349df34caacdecbb7cf3908631c3f3 \
+        e49046cd56398f9f9b8410154f1a0393 \
+        d9e0ce6950fe1e036634bffba3f721b6 \
+        2219d3f4ff1f444f60e9715300719198"
 DOWNLOAD_x86_64="UNTESTED"
 MD5SUM_x86_64=""
 REQUIRES="acpica virtualbox-kernel"
-- 
cgit v1.2.3