13 files changed, 119 insertions, 55 deletions
diff --git a/system/virtualbox-ose/slack-desc b/system/virtualbox-ose/slack-desc
deleted file mode 100644
index db75c4e725098..0000000000000
--- a/system/virtualbox-ose/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-              |-----handy-ruler-------------------------------------------------------|
-virtualbox-ose: virtualbox-ose (x86 Virtualizer)
-virtualbox-ose:
-virtualbox-ose: VirtualBox Open Source Edition (OSE) is a general-purpose full
-virtualbox-ose: virtualizer for x86 hardware.
-virtualbox-ose:
-virtualbox-ose: Homepage: http://www.virtualbox.org
-virtualbox-ose:
-virtualbox-ose:
-virtualbox-ose:
-virtualbox-ose:
-virtualbox-ose:
diff --git a/system/virtualbox-ose/virtualbox-ose.info b/system/virtualbox-ose/virtualbox-ose.info
deleted file mode 100644
index 90e6e279b9fff..0000000000000
--- a/system/virtualbox-ose/virtualbox-ose.info
+++ /dev/null
@@ -1,16 +0,0 @@
-PRGNAM="virtualbox-ose"
-VERSION="3.2.10"
-HOMEPAGE="http://www.virtualbox.org"
-DOWNLOAD="http://download.virtualbox.org/virtualbox/3.2.10/VirtualBox-3.2.10-OSE.tar.bz2 \
-          http://download.virtualbox.org/virtualbox/3.2.10/VBoxGuestAdditions_3.2.10.iso \
-          http://download.virtualbox.org/virtualbox/3.2.10/UserManual.pdf \
-          http://download.virtualbox.org/virtualbox/3.2.10/SDKRef.pdf"
-MD5SUM="5aad764cd4e886f9d80d7bde42163c7a \
-    4fde0f279854334b84c01972fbed2874 \
-    370bb3e893acffa584536c8f9e966c79 \
-    cde5db6f23580a575791374b5e58d098"
-DOWNLOAD_x86_64="UNTESTED"
-MD5SUM_x86_64=""
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
-APPROVED="rworkman"
diff --git a/system/virtualbox-ose/LocalConfig.kmk b/system/virtualbox/LocalConfig.kmk
index ab31757f4eaaa..acf37c059e220 100644
--- a/system/virtualbox-ose/LocalConfig.kmk
+++ b/system/virtualbox/LocalConfig.kmk
@@ -18,7 +18,20 @@ VBOX_WITH_RUNPATH          := $(VBOX_PATH_APP_PRIVATE_ARCH)
 VBOX_PATH_APP_PRIVATE      := /usr/share/virtualbox
 VBOX_PATH_APP_DOCS          = $(VBOX_PATH_PACKAGE_DOCS)
 
+# Build with VNC server support
 VBOX_WITH_VNC           = 1
 
-# disable showing registration window on startup
+# Disable showing registration window on startup
 VBOX_WITH_REGISTRATION  =
+
+# gcc 4.5 fix
+VBOX_WITH_WARNINGS_AS_ERRORS :=
+
+# Do not require pam
+VBOX_WITH_PAM :=
+
+# Correct path to java
+VBOX_JAVA_HOME := /usr/LIBDIR/java
+
+# Do not build docs from source. Depends on texlive...
+VBOX_WITHOUT_DOCS := 1
diff --git a/system/virtualbox-ose/README b/system/virtualbox/README
index fdb6f39af891c..4fa5f09819db9 100644
--- a/system/virtualbox-ose/README
+++ b/system/virtualbox/README
@@ -16,7 +16,7 @@ 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.
+VirtualBox requires acpica, and the virtualbox-kernel package is needed at
+runtime. See README.SLACKWARE for some setup notes.
 
 NOTE: This will not build on a stock x86_64 system.
diff --git a/system/virtualbox-ose/README.SLACKWARE b/system/virtualbox/README.SLACKWARE
index 9068a0bd374c3..9068a0bd374c3 100644
--- a/system/virtualbox-ose/README.SLACKWARE
+++ b/system/virtualbox/README.SLACKWARE
diff --git a/system/virtualbox-ose/doinst.sh b/system/virtualbox/doinst.sh
index 33be91fa1458b..a5d2e8eae609a 100644
--- a/system/virtualbox-ose/doinst.sh
+++ b/system/virtualbox/doinst.sh
@@ -26,6 +26,16 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
 # Prepare the new configuration files
 config etc/vbox/vbox.cfg.new
 config etc/default/virtualbox.new
diff --git a/system/virtualbox/slack-desc b/system/virtualbox/slack-desc
new file mode 100644
index 0000000000000..bc28f01128f05
--- /dev/null
+++ b/system/virtualbox/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+          |-----handy-ruler-------------------------------------------------------|
+virtualbox: virtualbox (x86 Virtualizer)
+virtualbox:
+virtualbox: VirtualBox is a powerful PC virtualization solution allowingyou to run
+virtualbox: a wide range of PC operating systems on your Linux system. This
+virtualbox: includes Windows, Linux, FreeBSD, DOS, OpenBSD and others. VirtualBox
+virtualbox: comes with a broad feature set and excellent performance, making it
+virtualbox: the premier virtualization software solution on the market.
+virtualbox:
+virtualbox: Homepage: http://www.virtualbox.org
+virtualbox:
+virtualbox:
diff --git a/system/virtualbox-ose/vbox.cfg b/system/virtualbox/vbox.cfg
index f54062227355f..f54062227355f 100644
--- a/system/virtualbox-ose/vbox.cfg
+++ b/system/virtualbox/vbox.cfg
diff --git a/system/virtualbox-ose/vboxdrv.sh-setup.diff b/system/virtualbox/vboxdrv.sh-setup.diff
index 56f0e61b35ec5..56f0e61b35ec5 100644
--- a/system/virtualbox-ose/vboxdrv.sh-setup.diff
+++ b/system/virtualbox/vboxdrv.sh-setup.diff
diff --git a/system/virtualbox/virtualbox-4-makeself-check.patch b/system/virtualbox/virtualbox-4-makeself-check.patch
new file mode 100644
index 0000000000000..e1fcb8c2f471c
--- /dev/null
+++ b/system/virtualbox/virtualbox-4-makeself-check.patch
@@ -0,0 +1,10 @@
+--- VirtualBox-4.0.0_OSE/configure
++++ VirtualBox-4.0.0_OSE/configure
+@@ -2527,7 +2527,6 @@
+   check_compiler_h
+   [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
+   # tools/common/makeself*
+-  [ $OSE -ge 1 ] && check_makeself
+ fi
+ 
+ [ -n "$SETUP_WINE" ] && setup_wine
diff --git a/system/virtualbox-ose/virtualbox-ose.SlackBuild b/system/virtualbox/virtualbox.SlackBuild
index 3da203a768115..1d09bbdcc8e5d 100644
--- a/system/virtualbox-ose/virtualbox-ose.SlackBuild
+++ b/system/virtualbox/virtualbox.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for virtualbox-ose
 
-# Copyright 2008-2010 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2011 Heinz Wiesinger, Amsterdam, The Netherlands
 # Copyright 2008 Mauro Giachero <mauro.giachero@gmail.com>
 # All rights reserved.
 #
@@ -23,9 +23,9 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=virtualbox-ose
+PRGNAM=virtualbox
 SRCNAM=VirtualBox
-VERSION=3.2.10
+VERSION=4.0.4
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -95,13 +95,13 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-${VERSION}_OSE
-tar xvf $CWD/$SRCNAM-${VERSION}-OSE.tar.bz2
+tar xvf $CWD/$SRCNAM-${VERSION}.tar.bz2
 cd $SRCNAM-${VERSION}_OSE
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 GROUP="vboxusers"
-MODE="750"
+MODE="755"
 mkdir -p $PKG/lib/udev/rules.d
 echo 'KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660"' \
   > $PKG/lib/udev/rules.d/60-vboxdrv.rules
@@ -113,21 +113,23 @@ patch -d src/VBox/Installer/linux -i $CWD/vboxdrv.sh-setup.diff
 # Support for the qt4-frontend
 if [ "${QT4:-yes}" = "yes" ]; then
   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
   guiapp="VirtualBox"
 else
   qtgui+=" --disable-qt4"
   guiapp=""
 fi
 
+# Do not require makeself. We don't plan on building an automatic installer
+# Patch taken from gentoo
+patch -p1 -i $CWD/virtualbox-4-makeself-check.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --ose \
   --disable-kmods \
   --disable-pulse \
+  --enable-vde \
   $web_service \
   $harden \
   $qtgui
@@ -141,13 +143,14 @@ kmk -j ${JOBS} LOCALCFG=./LocalConfig.kmk
 
 mkdir -p $PKG/usr/{lib$LIBDIRSUFFIX,share,include}/virtualbox \
   $PKG/usr/{bin,src} \
-  $PKG/usr/share/pixmaps \
+  $PKG/usr/share/{pixmaps,mime/packages} \
   $PKG/etc/{default,rc.d,vbox}
 
 cp -f src/VBox/Installer/linux/vboxdrv.sh.in $PKG/etc/rc.d/rc.vboxdrv.new
 sed -i "s/%PACKAGE%/virtualbox/g" $PKG/etc/rc.d/rc.vboxdrv.new
 sed -i "s/%NOLSB%/yes/" $PKG/etc/rc.d/rc.vboxdrv.new
 sed -i "s/%DEBIAN%/no/" $PKG/etc/rc.d/rc.vboxdrv.new
+sed -i "s/%GROUP%/vboxusers/" $PKG/etc/rc.d/rc.vboxdrv.new
 sed -i "s/\[ -z \"\$DEBIAN\"/#\[ -z \"\$DEBIAN\"/" $PKG/etc/rc.d/rc.vboxdrv.new
 
 cp -f $CWD/vbox.cfg $PKG/etc/vbox/vbox.cfg.new
@@ -155,26 +158,54 @@ sed -i "s|LIBDIR|lib$LIBDIRSUFFIX|" $PKG/etc/vbox/vbox.cfg.new
 cp -f $CWD/virtualbox.default $PKG/etc/default/virtualbox.new
 
 cd out/linux.$BUILDDIR/release/bin/
-  rm -f vboxdrv.ko virtualbox.desktop
-  mv VBox.png $PKG/usr/share/pixmaps/
+  rm -f vboxdrv.ko
   mv src $PKG/usr/src/virtualbox-kernel-$VERSION
+
+  if [ "${QT4:-yes}" = "yes" ]; then
+    mv virtualbox.desktop $PKG/usr/share/applications/
+    sed -i "s|\$VBOX_DOC_PATH|/usr/share/virtualbox|" \
+      $PKG/usr/share/applications/virtualbox.desktop
+  fi
+  mv VBox.png $PKG/usr/share/pixmaps/
+
+  cd icons
+    for i in *; do
+      install -d $PKG/usr/share/icons/hicolor/$i/mimetypes
+      mv $i/* $PKG/usr/share/icons/hicolor/$i/mimetypes
+    done
+  cd -
+  rm -rf icons
+
+  mv virtualbox.xml $PKG/usr/share/mime/packages
+
+  export VBOX_INSTALL_PATH=/usr/lib$LIBDIRSUFFIX/virtualbox
+  cd sdk/installer
+    python ./vboxapisetup.py install --prefix "/usr" --root $PKG
+  cd -
+  rm -rf sdk/installer
+
   mv sdk $PKG/usr/share/virtualbox/
   if [ "${QT4:-yes}" = "yes" ]; then
     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 VBoxCreateUSBNode.sh $PKG/usr/share/virtualbox/
   install -m $MODE -g $GROUP VBoxTunctl $PKG/usr/bin/
-  rm -f VoxSysInfo.sh VBoxTunctl
+  rm -f VBoxSysInfo.sh VBoxCreateUSBNode.sh VBoxTunctl
   mv * $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/
   chown -R root:$GROUP $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/
   chmod -R $MODE $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/
   mv $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/VBox.sh $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/VBox
-cd -
+cd $TMP/$SRCNAM-${VERSION}_OSE
 
-for i in VBoxManage VBoxSDL VBoxHeadless VBoxVRDP $guiapp $vboxwebsrv; do
-  ln -s /usr/lib$LIBDIRSUFFIX/virtualbox/VBox $PKG/usr/bin/$i ;
+for i in VBoxManage vboxmanage VBoxSDL vboxsdl VBoxHeadless vboxheadless VBoxVRDP $guiapp $vboxwebsrv; do
+  ln -s /usr/lib$LIBDIRSUFFIX/virtualbox/VBox $PKG/usr/bin/$i
 done
 
+if [ "$guiapp" = "VirtualBox" ]; then
+  ln -s /usr/lib$LIBDIRSUFFIX/virtualbox/VBox $PKG/usr/bin/virtualbox
+fi
+
 if [ "$vboxwebsrv" = "vboxwebsrv" ]; then
   mkdir -p $PKG/var/{lib,log}/vboxweb
   chown vboxweb:vboxusers $PKG/var/{lib,log}/vboxweb
@@ -186,8 +217,8 @@ if [ "$vboxwebsrv" = "vboxwebsrv" ]; then
 fi
 
 if [ "$harden" = "--enable-hardening" ]; then
-  for i in VBoxSDL VBoxHeadless $guiapp; do
-    chmod 4${MODE} $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/$i
+  for i in VBoxSDL VBoxHeadless $guiapp VBoxNetDHCP VBoxNetAdpCtl; do
+    chmod 4711 $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/$i
   done
 fi
 
diff --git a/system/virtualbox-ose/virtualbox.default b/system/virtualbox/virtualbox.default
index bcc3c08e162b6..bcc3c08e162b6 100644
--- a/system/virtualbox-ose/virtualbox.default
+++ b/system/virtualbox/virtualbox.default
diff --git a/system/virtualbox/virtualbox.info b/system/virtualbox/virtualbox.info
new file mode 100644
index 0000000000000..a3124045f11cc
--- /dev/null
+++ b/system/virtualbox/virtualbox.info
@@ -0,0 +1,16 @@
+PRGNAM="virtualbox"
+VERSION="4.0.4"
+HOMEPAGE="http://www.virtualbox.org"
+DOWNLOAD="http://download.virtualbox.org/virtualbox/4.0.4/VirtualBox-4.0.4.tar.bz2 \
+          http://download.virtualbox.org/virtualbox/4.0.4/VBoxGuestAdditions_4.0.4.iso \
+          http://download.virtualbox.org/virtualbox/4.0.4/UserManual.pdf \
+          http://download.virtualbox.org/virtualbox/4.0.4/SDKRef.pdf"
+MD5SUM="b4770ca14d1a8cbad9b3eb0e0028ff4b \
+        88604a0e94bf1b8c0d0f18fe4314cfdf \
+        bf8007eea0042f745b3c252bbe7586c2 \
+        3248ffc8e3193cb86474fcb530be4efd"
+DOWNLOAD_x86_64="UNTESTED"
+MD5SUM_x86_64=""
+MAINTAINER="Heinz Wiesinger"
+EMAIL="pprkut@liwjatan.at"
+APPROVED="rworkman"