system/virtualbox-ose: Updated for version 3.2.6.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

5 files changed, 50 insertions, 9 deletions

diff --git a/system/virtualbox-ose/LocalConfig.kmk b/system/virtualbox-ose/LocalConfig.kmk
index 29377fc4a1..d5412c5205 100644
--- a/system/virtualbox-ose/LocalConfig.kmk
+++ b/system/virtualbox-ose/LocalConfig.kmk
@@ -17,3 +17,5 @@ VBOX_PATH_SHARED_LIBS      := $(VBOX_PATH_APP_PRIVATE_ARCH)
 VBOX_WITH_RUNPATH          := $(VBOX_PATH_APP_PRIVATE_ARCH)
 VBOX_PATH_APP_PRIVATE      := /usr/share/virtualbox
 VBOX_PATH_APP_DOCS          = $(VBOX_PATH_PACKAGE_DOCS)
+
+VBOX_WITH_VNC           = 1
diff --git a/system/virtualbox-ose/README b/system/virtualbox-ose/README
index 0d0abc2a74..fdb6f39af8 100644
--- a/system/virtualbox-ose/README
+++ b/system/virtualbox-ose/README
@@ -14,6 +14,8 @@ To compile virtualbox without the Qt4 GUI pass QT4=no to the script.
 To enable the webservice pass WEBSERVICE=yes to the script. This adds gsoap
 to the list of required dependencies.
 
+If you want to attach VirtualBox to a VDE network you will need vde2.
+
 This requires acpica, and the virtualbox-kernel package is needed at runtime.
 See README.SLACKWARE for some setup notes.
 
diff --git a/system/virtualbox-ose/patch-src-VBox-Devices-PC-vbox.dsl b/system/virtualbox-ose/patch-src-VBox-Devices-PC-vbox.dsl
new file mode 100644
index 0000000000..bfbd0a59de
--- /dev/null
+++ b/system/virtualbox-ose/patch-src-VBox-Devices-PC-vbox.dsl
@@ -0,0 +1,20 @@
+--- src/VBox/Devices/PC/vbox.dsl.orig	2010-03-25 15:56:03.000000000 -0400
++++ src/VBox/Devices/PC/vbox.dsl	2010-04-29 19:14:38.000000000 -0400
+@@ -1064,7 +1064,7 @@
+                              // (all of low memory space)
+                      ResourceProducer,        // bit 0 of general flags is 0
+                      PosDecode,               // positive Decode
+-                     MinFixed,                // Range is fixed
++                     MinNotFixed,             // Range is not fixed
+                      MaxFixed,                // Range is fixed
+                      Cacheable,
+                      ReadWrite,
+@@ -1073,7 +1073,7 @@
+ 
+                      0xffdfffff,              // Max = 4GB - 2MB
+                      0x00000000,              // Translation
+-                     0xdfdfffff,              // Range Length (calculated
++                     0x00000000,              // Range Length (calculated
+                                               // dynamically)
+                      ,                        // Optional field left blank
+                      ,                        // Optional field left blank
diff --git a/system/virtualbox-ose/virtualbox-ose.SlackBuild b/system/virtualbox-ose/virtualbox-ose.SlackBuild
index 7973951330..19fcc98cf0 100644
--- a/system/virtualbox-ose/virtualbox-ose.SlackBuild
+++ b/system/virtualbox-ose/virtualbox-ose.SlackBuild
@@ -25,7 +25,7 @@
 
 PRGNAM=virtualbox-ose
 SRCNAM=VirtualBox
-VERSION=3.1.6
+VERSION=3.2.6
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -110,6 +110,9 @@ else
   guiapp=""
 fi
 
+# Fix issues with newer acpica versions
+patch -p0 -i $CWD/patch-src-VBox-Devices-PC-vbox.dsl
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -148,7 +151,7 @@ cd out/linux.$BUILDDIR/release/bin/
   mv src $PKG/usr/src/virtualbox-kernel-$VERSION
   mv sdk $PKG/usr/share/virtualbox/
   if [ "${QT4:-yes}" = "yes" ]; then
-    mv nls* *.tar.gz $PKG/usr/share/virtualbox/
+    mv nls* *.tar.bz2 $PKG/usr/share/virtualbox/
   fi
   install -m $MODE -g $GROUP VBoxSysInfo.sh $PKG/usr/share/virtualbox/
   install -m $MODE -g $GROUP VBoxTunctl $PKG/usr/bin/
@@ -179,6 +182,20 @@ cp -f $CWD/VBoxGuestAdditions_$VERSION.iso \
 cp -f $CWD/UserManual.pdf \
   $PKG/usr/share/virtualbox/UserManual.pdf
 
+# install profile.d scripts for 3rd party apps
+mkdir -p $PKG/etc/profile.d/
+cat << EOF > $PKG/etc/profile.d/vbox.csh
+#!/bin/csh
+setenv VBOX_PROGRAM_PATH /usr/lib${LIBDIRSUFFIX}/virtualbox/
+setenv VBOX_SDK_PATH /usr/share/virtualbox/sdk/
+EOF
+cat << EOF > $PKG/etc/profile.d/vbox.sh
+#!/bin/sh
+export VBOX_PROGRAM_PATH=/usr/lib${LIBDIRSUFFIX}/virtualbox/
+export VBOX_SDK_PATH=/usr/share/virtualbox/sdk/
+EOF
+chmod 0755 $PKG/etc/profile.d/*
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -f COPYING COPYING.CDDL $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
diff --git a/system/virtualbox-ose/virtualbox-ose.info b/system/virtualbox-ose/virtualbox-ose.info
index 772b5c13e5..c392571f7b 100644
--- a/system/virtualbox-ose/virtualbox-ose.info
+++ b/system/virtualbox-ose/virtualbox-ose.info
@@ -1,12 +1,12 @@
 PRGNAM="virtualbox-ose"
-VERSION="3.1.6"
+VERSION="3.2.6"
 HOMEPAGE="http://www.virtualbox.org"
-DOWNLOAD="http://download.virtualbox.org/virtualbox/3.1.6/VirtualBox-3.1.6-OSE.tar.bz2 \
-          http://download.virtualbox.org/virtualbox/3.1.6/VBoxGuestAdditions_3.1.6.iso \
-          http://download.virtualbox.org/virtualbox/3.1.6/UserManual.pdf"
-MD5SUM="6cb3c8161ad878c2a2732137c1621dc4 \
-        f924e3a75c0d2d78f587b2ac89482074 \
-        8561a2b883fbede1e93b7dfb2238e7cc"
+DOWNLOAD="http://213.239.192.22/download/3.2.6/VirtualBox-3.2.6-OSE.tar.bz2 \
+          http://213.239.192.22/download/3.2.6/VBoxGuestAdditions_3.2.6.iso \
+          http://213.239.192.22/download/3.2.6/UserManual.pdf"
+MD5SUM="65b822ab3c08ff882d9621101996dc14 \
+        9542cf2fb93e1921a860930ac2a1d0de \
+        8891557360f816f7604d26aac7503489"
 DOWNLOAD_x86_64="UNTESTED"
 MD5SUM_x86_64=""
 MAINTAINER="Heinz Wiesinger"