4 files changed, 51 insertions, 28 deletions
diff --git a/system/virtualbox-addons/doinst.sh b/system/virtualbox-addons/doinst.sh
index 9af312d442182..97afad9c3ee49 100644
--- a/system/virtualbox-addons/doinst.sh
+++ b/system/virtualbox-addons/doinst.sh
@@ -24,7 +24,12 @@ preserve_perms() {
 
 # Fix starting of kde within virtualbox
 BLACKLIST="usr/share/apps/kconf_update/kwin_blacklist.upd"
-VBOX_TEST=$(grep -c "Blacklist-virtualbox" $BLACKLIST)
+
+if [ -f "$BLACKLIST" ]; then
+  VBOX_TEST=$(grep -c "Blacklist-virtualbox" $BLACKLIST)
+else
+  VBOX_TEST="0"
+fi
 
 if [ "$VBOX_TEST" = "0" ]; then
 cat << EOF >> $BLACKLIST
@@ -38,8 +43,3 @@ fi
 preserve_perms etc/rc.d/rc.vboxadd.new
 preserve_perms etc/rc.d/rc.vboxadd-service.new
 
-# remove existing fdi cache to recognize newly installed fdi files
-# and restart hal to regenerate the cache
-rm -f var/cache/hald/fdi-cache
-chroot . /etc/rc.d/rc.hald restart
-
diff --git a/system/virtualbox-addons/rc.vboxadd.diff b/system/virtualbox-addons/rc.vboxadd.diff
index 0820ad86fbf52..ca6cafd5becda 100644
--- a/system/virtualbox-addons/rc.vboxadd.diff
+++ b/system/virtualbox-addons/rc.vboxadd.diff
@@ -1,20 +1,25 @@
---- vboxadd.sh	2012-04-26 18:56:57.000000000 +0200
-+++ vboxadd.sh	2012-05-06 11:55:44.161897154 +0200
-@@ -28,10 +28,6 @@
- # Description:    VirtualBox Linux Additions kernel modules
- ### END INIT INFO
- 
--. /var/lib/VBoxGuestAdditions/config
--export BUILD_TYPE
--export USERNAME
--
- PATH=$PATH:/bin:/sbin:/usr/sbin
- PACKAGE=VBoxGuestAdditions
- BUILDVBOXGUEST=`/bin/ls /usr/src/vboxguest*/vboxguest/build_in_tmp 2>/dev/null|cut -d' ' -f1`
-@@ -500,31 +496,13 @@
+--- vboxadd.sh.orig	2012-03-13 15:52:25.000000000 +0100
++++ vboxadd.sh	2012-09-18 22:09:48.886085813 +0200
+@@ -480,60 +480,13 @@
  # setup_script
  setup()
  {
+-    if test -r $config; then
+-      . $config
+-    else
+-      fail "Configuration file $config not found"
+-    fi
+-    test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
+-      fail "Configuration file $config not complete"
+-    export BUILD_TYPE
+-    export USERNAME
+-
+-    MODULE_SRC="$INSTALL_DIR/src/vboxguest-$INSTALL_VER"
+-    BUILDINTMP="$MODULE_SRC/build_in_tmp"
+-    DODKMS="$MODULE_SRC/do_dkms"
+-    chcon -t bin_t "$BUILDINTMP" > /dev/null 2>&1
+-    chcon -t bin_t "$DODKMS"     > /dev/null 2>&1
+-
 -    setup_modules
 -    mod_succ="$?"
 -    extra_setup
@@ -31,12 +36,25 @@
  # cleanup_script
  cleanup()
  {
+-    if test -r $config; then
+-      . $config
+-      test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
+-        fail "Configuration file $config not complete"
+-      DODKMS="$INSTALL_DIR/src/vboxguest-$INSTALL_VER/do_dkms"
+-    elif test -x ./do_dkms; then  # Executing as part of the installer...
+-      DODKMS=./do_dkms
+-    else
+-      fail "Configuration file $config not found"
+-    fi
+-
 -    # Delete old versions of VBox modules.
 -    cleanup_modules
 -    depmod
 -
 -    # Remove old module sources
--    rm -rf /usr/src/vboxadd-* /usr/src/vboxguest-* /usr/src/vboxvfs-* /usr/src/vboxsf-* /usr/src/vboxvideo-*
+-    for i in $OLDMODULES; do
+-      rm -rf /usr/src/$i-*
+-    done
 -
 -    # Remove other files
 -    rm /sbin/mount.vboxsf 2>/dev/null
diff --git a/system/virtualbox-addons/virtualbox-addons.SlackBuild b/system/virtualbox-addons/virtualbox-addons.SlackBuild
index 900ccddc55c61..45db64a172810 100644
--- a/system/virtualbox-addons/virtualbox-addons.SlackBuild
+++ b/system/virtualbox-addons/virtualbox-addons.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=virtualbox-addons
 SRCNAM=VirtualBox
-VERSION=4.1.14
+VERSION=4.2.0
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -78,6 +78,13 @@ cd $SRCNAM-${VERSION}
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+# We don't want an init-script building kernel modules.
+# Use virtualbox-kernel-addons.SlackBuild for this.
+patch -d src/VBox/Additions/linux/installer/ -i $CWD/rc.vboxadd.diff
+
+# Add a sleep when stopping the vboxadd service
+patch -d src/VBox/Additions/linux/installer/ -i $CWD/vboxadd-service-stop-fix.diff
+
 # We set the environment variables manually to avoid dependency on acpica
 export BUILD_PLATFORM="linux"
 export BUILD_PLATFORM_ARCH="$TARGET"
@@ -102,8 +109,6 @@ mkdir -p $PKG/lib/udev/rules.d $PKG/sbin \
   $PKG/usr/{src,bin,sbin,share/autostart} \
   $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,input}
 
-patch -d src/VBox/Additions/linux/installer/ -i $CWD/rc.vboxadd.diff
-patch -d src/VBox/Additions/linux/installer/ -i $CWD/vboxadd-service-stop-fix.diff
 cp -f src/VBox/Additions/linux/installer/vboxadd.sh \
   $PKG/etc/rc.d/rc.vboxadd.new
 cp -f src/VBox/Additions/linux/installer/vboxadd-service.sh \
diff --git a/system/virtualbox-addons/virtualbox-addons.info b/system/virtualbox-addons/virtualbox-addons.info
index d90b3939ef239..b64ecfecf9262 100644
--- a/system/virtualbox-addons/virtualbox-addons.info
+++ b/system/virtualbox-addons/virtualbox-addons.info
@@ -1,10 +1,10 @@
 PRGNAM="virtualbox-addons"
-VERSION="4.1.14"
+VERSION="4.2.0"
 HOMEPAGE="http://www.virtualbox.org"
-DOWNLOAD="http://download.virtualbox.org/virtualbox/4.1.14/VirtualBox-4.1.14.tar.bz2"
-MD5SUM="f8baa04e6d589bc6b1fb4e7079fbe414"
+DOWNLOAD="http://download.virtualbox.org/virtualbox/4.2.0/VirtualBox-4.2.0.tar.bz2"
+MD5SUM="691b4134983ce7d89b9fb683305cb647"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES=""
 MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"