system/virtualbox-ose: Updated for version 2.1.4

4 files changed, 43 insertions, 63 deletions

diff --git a/system/virtualbox-ose/README b/system/virtualbox-ose/README
index 1952e95230ac5..184f4ebd2038b 100644
--- a/system/virtualbox-ose/README
+++ b/system/virtualbox-ose/README
@@ -2,20 +2,13 @@ VirtualBox Open Source Edition (OSE) is a general-purpose full
 virtualizer for x86 hardware.
 
 You'll probably want to add the following lines to your rc.local:
-
 	# Start vboxdrv
 	if [ -x /etc/rc.d/rc.vboxdrv ]; then
 	  /etc/rc.d/rc.vboxdrv start
 	fi
 
-	# Start vboxnet
-	if [ -x /etc/rc.d/rc.vboxnet ]; then
-	  /etc/rc.d/rc.vboxnet start
-	fi
-
-This will load the support kernel module and will setup the network
-configuration for VirtualBox. You should add similar "stop" lines to
-your rc.local_shutdown.
+This will load the support kernel module for VirtualBox. You should add
+similar "stop" lines to your rc.local_shutdown.
 
 By default you have to create a vboxusers group, for example with
 	groupadd -g 215 vboxusers
@@ -33,16 +26,17 @@ If the VirtualBox Additions ISO is available in the same directory
 as the build script, it will be included in the package and placed
 under /usr/share/virtualbox/. Same goes for the UserManual
 They can be downloaded from:
-	http://download.virtualbox.org/virtualbox/2.0.6/VBoxGuestAdditions_2.0.6.iso
-	http://download.virtualbox.org/virtualbox/2.0.6/UserManual.pdf
-
-Since 2.0.0 there is a Qt4 GUI, which at this point of time is still a little
-bit buggy and therefore disabled by default. To enable it pass QT4=yes
-to the script. The Qt3 GUI is enabled by default, though that might
-change with the next version as it is no longer maintained and likely
-to be removed sometime soon. To disable it, pass QT3=no to the script.
-
-If you want pulseaudio support, you have to pass PULSE=yes to the
-build script. Additionally VirtualBox requires acpica and dev86. The
-virtualbox-kernel package is required at runtime. All dependencies
-are available from SlackBuilds.org
+	http://download.virtualbox.org/virtualbox/2.1.4/VBoxGuestAdditions_2.1.4.iso
+	http://download.virtualbox.org/virtualbox/2.1.4/UserManual.pdf
+
+Since 2.0.0 there is a Qt4 GUI, which is enabled by default. To disable it pass
+QT4=no to the script. An older, no longer maintained Qt3 GUI is also available
+but disabled by default (no new features have been added to this since 2.0).
+To enable it, pass QT3=yes to the script.
+Beware: the Qt3 GUI has already been removed from svn trunk, and 2.2.0 will
+only have a Qt4 GUI available.
+
+For pulseaudio support, pass PULSE=yes to the build script. This requires
+pulseaudio to be installed.
+
+This requires acpica, and the virtualbox-kernel package is needed at runtime.
diff --git a/system/virtualbox-ose/doinst.sh b/system/virtualbox-ose/doinst.sh
index 478e3d3460a32..965ee68a045a9 100644
--- a/system/virtualbox-ose/doinst.sh
+++ b/system/virtualbox-ose/doinst.sh
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
@@ -19,7 +17,7 @@ fi
 
 # Prepare the new configuration files
 config etc/vbox/vbox.cfg.new
-for file in etc/rc.d/rc.vboxdrv.new etc/rc.d/rc.vboxnet.new ; do
+for file in etc/rc.d/rc.vboxdrv.new ; do
   if [ -e $(dirname $file)/$(basename $file .new) -a -x $(dirname $file)/$(basename $file .new) ]; then
     chmod 0755 $file
   else
diff --git a/system/virtualbox-ose/virtualbox-ose.SlackBuild b/system/virtualbox-ose/virtualbox-ose.SlackBuild
index 90b1faef359f0..5251b92707f3f 100644
--- a/system/virtualbox-ose/virtualbox-ose.SlackBuild
+++ b/system/virtualbox-ose/virtualbox-ose.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for virtualbox-ose
 
-# Copyright 2008 Heinz Wiesinger <pprkut@liwjatan.at>
+# Copyright 2008-2009 Heinz Wiesinger <pprkut@liwjatan.at>
 # Copyright 2008 Mauro Giachero <mauro.giachero@gmail.com>
 # All rights reserved.
 #
@@ -25,9 +25,9 @@
 
 PRGNAM=virtualbox-ose
 SRCNAM=VirtualBox
-VERSION=2.0.6
+VERSION=2.1.4
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -55,14 +55,13 @@ VBOXUSERS=${VBOXUSERS:-yes}
 if [ "$VBOXUSERS" = "yes" ]; then
   # Check for vboxusers group here
   if ! grep ^vboxusers: /etc/group 2>&1 > /dev/null; then
-    echo "  Must have a vboxusers group to run this script."
+    echo "  You must have a vboxusers group to run this script."
     echo "    # groupadd -g 215 vboxusers"
-    echo "  Or something similar."
     exit 1
   fi
 fi
 
-# Enable Hardeing - Defaulting to yes as requested by upstream
+# Enable Hardening - Defaulting to yes as requested by upstream
 if [ "${HARDENING:-yes}" = "yes" ]; then
   harden="--enable-hardening"
   VBOXUSERS="yes"
@@ -83,63 +82,60 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-${VERSION}-OSE.tar.bz2
-cd $SRCNAM-$VERSION
-patch -d src/VBox/Installer/linux -i $CWD/VBox.diff
+rm -rf $SRCNAM-${VERSION}_OSE
+tar xvf $CWD/$SRCNAM-${VERSION}-3-OSE.tar.bz2
+cd $SRCNAM-${VERSION}_OSE
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+patch -d src/VBox/Installer/linux -i $CWD/VBox.diff
+
 # The Innotek init script tries to set the device nodes' permissions.
 # This is problematic with VBOXUSERS=no, but you probably still want
 # this for security reasons when using the vboxusers-group
 if [ "$VBOXUSERS" = "yes" ]; then
   GROUP="vboxusers"
   MODE="750"
-  mkdir -p $PKG/etc/udev/rules.d
+  mkdir -p $PKG/lib/udev/rules.d
   echo 'KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660"' \
-    > $PKG/etc/udev/rules.d/60-vboxdrv.rules
+    > $PKG/lib/udev/rules.d/60-vboxdrv.rules
 else
   patch -d src/VBox/Installer/linux -i $CWD/vboxdrv.sh.in.diff
   GROUP="root"
   MODE="755"
-  mkdir -p $PKG/etc/udev/rules.d
+  mkdir -p $PKG/lib/udev/rules.d
   echo 'KERNEL=="vboxdrv", NAME="vboxdrv", MODE="0666"' \
-    > $PKG/etc/udev/rules.d/60-vboxdrv.rules
+    > $PKG/lib/udev/rules.d/60-vboxdrv.rules
 fi
 
 # Support for the qt3-frontend
-if [ "${QT3:-yes}" = "yes" ]; then
+if [ "${QT3:-no}" = "no" ]; then
+  qtgui+=" --disable-qt3"
+else
   qtgui+=" --with-qt-dir=/usr/lib/qt"
   GUI+=" VirtualBox3"
   mkdir -p $PKG/usr/share/applications
   cp -f $CWD/VirtualBox3.desktop $PKG/usr/share/applications/
   sed -i "s|\$VBOX_DOC_PATH|/usr/share/virtualbox|" \
     $PKG/usr/share/applications/VirtualBox3.desktop
-else
-  qtgui+=" --disable-qt3"
 fi
 
 # Support for the qt4-frontend
-if [ "${QT4:-no}" = "no" ]; then
-  qtgui+=" --disable-qt4"
-else
+if [ "${QT4:-yes}" = "yes" ]; then
   GUI+=" VirtualBox"
   mkdir -p $PKG/usr/share/applications
   cp -f src/VBox/Installer/linux/VirtualBox.desktop $PKG/usr/share/applications/
   sed -i "s|\$VBOX_DOC_PATH|/usr/share/virtualbox|" \
     $PKG/usr/share/applications/VirtualBox.desktop
+else
+  qtgui+=" --disable-qt4"
 fi
 
-cd src/VBox/Frontends/VirtualBox
-  sed -i "s/VirtualBox3_QT_TRANSLATIONS/VirtualBox_QT_TRANSLATIONS/" \
-    Makefile.kmk
-cd -
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --ose \
+  --disable-kmods \
   $harden \
   $qtgui \
   $do_pulse
@@ -153,15 +149,13 @@ mkdir -p $PKG/usr/{lib,share}/virtualbox \
   $PKG/usr/share/pixmaps \
   $PKG/etc/{rc.d,vbox}
 
-cp -f src/VBox/Installer/linux/vboxnet.sh.in $PKG/etc/rc.d/rc.vboxnet.new
 cp -f src/VBox/Installer/linux/vboxdrv.sh.in $PKG/etc/rc.d/rc.vboxdrv.new
 cp -f $CWD/vbox.cfg $PKG/etc/vbox/vbox.cfg.new
-install -m $MODE -g $GROUP src/VBox/Installer/linux/VBoxAddIF.sh $PKG/usr/lib/virtualbox/VBoxTap
 
 cd out/linux.x86/release/bin/
-  rm -f vboxdrv.ko
+  rm -f vboxdrv.ko VirtualBox.desktop
   mv VBox.png $PKG/usr/share/pixmaps/
-  mv src $PKG/usr/src/vboxdrv-$VERSION
+  mv src $PKG/usr/src/virtualbox-kernel-$VERSION
   mv sdk nls* *.tar.gz $PKG/usr/share/virtualbox/
   install -m $MODE -g $GROUP VBoxSysInfo.sh $PKG/usr/share/virtualbox/
   install -m $MODE -g $GROUP VBoxTunctl $PKG/usr/bin/
@@ -176,12 +170,6 @@ for i in $GUI VBoxManage VBoxSDL VBoxHeadless VBoxVRDP; do
   ln -s /usr/lib/virtualbox/VBox $PKG/usr/bin/$i ;
 done
 
-for i in VBoxAddIF VBoxDeleteIF; do
-  ln -s /usr/lib/virtualbox/VBoxTap $PKG/usr/bin/$i
-done
-
-ln -s /usr/lib/virtualbox/vditool $PKG/usr/bin/vditool
-
 if [ "$harden" = "--enable-hardening" ]; then
   for i in $GUI VBoxSDL VBoxHeadless; do
     chmod 4${MODE} $PKG/usr/lib/virtualbox/$i
diff --git a/system/virtualbox-ose/virtualbox-ose.info b/system/virtualbox-ose/virtualbox-ose.info
index b2cfe916b64e6..323fa24c7d40e 100644
--- a/system/virtualbox-ose/virtualbox-ose.info
+++ b/system/virtualbox-ose/virtualbox-ose.info
@@ -1,8 +1,8 @@
 PRGNAM="virtualbox-ose"
-VERSION="2.0.6"
+VERSION="2.1.4"
 HOMEPAGE="http://www.virtualbox.org"
-DOWNLOAD="http://download.virtualbox.org/virtualbox/2.0.6/VirtualBox-2.0.6-OSE.tar.bz2"
-MD5SUM="455253532b5128bb5c2ff4c76b9751a7"
+DOWNLOAD="http://download.virtualbox.org/virtualbox/2.1.4/VirtualBox-2.1.4-3-OSE.tar.bz2"
+MD5SUM="54548336d61b33e2a01b210b314927cd"
 MAINTAINER="ppr:kut"
 EMAIL="pprkut@liwjatan.at"
 APPROVED="dsomero"