system/virtualbox-ose-addons: Updated for version 3.2.6.

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

5 files changed, 63 insertions, 42 deletions

diff --git a/system/virtualbox-ose-addons/LocalConfig.kmk b/system/virtualbox-ose-addons/LocalConfig.kmk
index 8b2ca50d4a881..2051b447551de 100644
--- a/system/virtualbox-ose-addons/LocalConfig.kmk
+++ b/system/virtualbox-ose-addons/LocalConfig.kmk
@@ -6,3 +6,5 @@ VBOX_ONLY_ADDITIONS  := 1
 KBUILD_MSG_STYLE     := brief
 
 VBOX_OSE             := 1
+
+VBOX_WITH_PAM        =
diff --git a/system/virtualbox-ose-addons/doinst.sh b/system/virtualbox-ose-addons/doinst.sh
index 9b1e606f30b56..58fdc15a9ad30 100644
--- a/system/virtualbox-ose-addons/doinst.sh
+++ b/system/virtualbox-ose-addons/doinst.sh
@@ -11,15 +11,19 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-# Prepare the new configuration files
-for file in etc/rc.d/rc.vboxadd.new etc/rc.d/rc.vboxadd-service.new; do
-  if [ -e $(dirname $file)/$(basename $file .new) -a -x $(dirname $file)/$(basename $file .new) ]; then
-    chmod 0755 $file
-  else
-    chmod 0644 $file
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
   fi
-  config $file
-done
+  config $NEW
+}
+
+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
diff --git a/system/virtualbox-ose-addons/rc.vboxadd.diff b/system/virtualbox-ose-addons/rc.vboxadd.diff
index 4f5c8fe72eb42..189123c454fe6 100644
--- a/system/virtualbox-ose-addons/rc.vboxadd.diff
+++ b/system/virtualbox-ose-addons/rc.vboxadd.diff
@@ -1,6 +1,6 @@
---- vboxadd.sh.orig	2010-03-25 20:54:37.000000000 +0100
-+++ vboxadd.sh	2010-03-27 18:17:26.464988367 +0100
-@@ -310,142 +310,13 @@
+--- tmp/vboxadd.sh	2010-06-25 16:24:10.000000000 +0200
++++ mnt/progs/slack/test/VirtualBox-3.2.6_OSE/src/VBox/Additions/linux/installer/vboxadd.sh	2010-07-07 15:59:28.710046357 +0200
+@@ -307,152 +307,13 @@
  # setup_script
  setup()
  {
@@ -10,9 +10,9 @@
 -        find /lib/modules/`uname -r` -name "vboxvideo\.*" 2>/dev/null|xargs rm -f 2>/dev/null
 -        succ_msg
 -    fi
--    if find /lib/modules/`uname -r` -name "vboxvfs\.*" 2>/dev/null|grep -q vboxvfs; then
--        begin "Removing old VirtualBox vboxvfs kernel module"
--        find /lib/modules/`uname -r` -name "vboxvfs\.*" 2>/dev/null|xargs rm -f 2>/dev/null
+-    if find /lib/modules/`uname -r` -name "vboxsf\.*" 2>/dev/null|grep -q vboxsf; then
+-        begin "Removing old VirtualBox vboxsf kernel module"
+-        find /lib/modules/`uname -r` -name "vboxsf\.*" 2>/dev/null|xargs rm -f 2>/dev/null
 -        succ_msg
 -    fi
 -    if find /lib/modules/`uname -r` -name "vboxguest\.*" 2>/dev/null|grep -q vboxguest; then
@@ -23,24 +23,31 @@
 -    begin "Building the VirtualBox Guest Additions kernel modules"
 -    if ! sh /usr/share/$PACKAGE/test/build_in_tmp \
 -        --no-dkms --no-print-directory > $LOG 2>&1; then
--        fail "`printf "Your system does not seem to be set up to build kernel modules.\nLook at $LOG to find out what went wrong"`"
--    fi
--    echo
--    if ! sh /usr/share/$PACKAGE/test_drm/build_in_tmp \
--        --no-dkms --no-print-directory >> $LOG 2>&1; then
--        printf "\nYour guest system does not seem to have sufficient OpenGL support to enable\naccelerated 3D effects (this requires Linux 2.6.27 or later in the guest\nsystem).  This Guest Additions feature will be disabled.\n\n"
+-        fail_msg
+-        printf "Your system does not seem to be set up to build kernel modules.\nLook at $LOG to find out what went wrong.  Once you have corrected it, you can\nrun\n\n  /etc/init.d/vboxadd setup\n\nto build them."
+-        BUILDVBOXGUEST=""
+-        BUILDVBOXSF=""
 -        BUILDVBOXVIDEO=""
+-    else
+-        if ! sh /usr/share/$PACKAGE/test_drm/build_in_tmp \
+-            --no-dkms --no-print-directory >> $LOG 2>&1; then
+-            printf "\nYour guest system does not seem to have sufficient OpenGL support to enable\naccelerated 3D effects (this requires Linux 2.6.27 or later in the guest\nsystem).  This Guest Additions feature will be disabled.\n\n"
+-            BUILDVBOXVIDEO=""
+-        fi
 -    fi
--    begin "Building the main Guest Additions module"
--    if ! $BUILDVBOXGUEST \
--        --save-module-symvers /tmp/vboxguest-Module.symvers \
--        --no-print-directory install >> $LOG 2>&1; then
--        fail "Look at $LOG to find out what went wrong"
+-    echo
+-    if [ -n "$BUILDVBOXGUEST" ]; then
+-        begin "Building the main Guest Additions module"
+-        if ! $BUILDVBOXGUEST \
+-            --save-module-symvers /tmp/vboxguest-Module.symvers \
+-            --no-print-directory install >> $LOG 2>&1; then
+-            fail "Look at $LOG to find out what went wrong"
+-        fi
+-        succ_msg
 -    fi
--    succ_msg
--    if [ -n "$BUILDVBOXVFS" ]; then
+-    if [ -n "$BUILDVBOXSF" ]; then
 -        begin "Building the shared folder support module"
--        if ! $BUILDVBOXVFS \
+-        if ! $BUILDVBOXSF \
 -            --use-module-symvers /tmp/vboxguest-Module.symvers \
 -            --no-print-directory install >> $LOG 2>&1; then
 -            fail "Look at $LOG to find out what went wrong"
@@ -99,10 +106,12 @@
 -    chcon -u system_u -t mount_exec_t "$lib_path/$PACKAGE/mount.vboxsf" > /dev/null 2>&1
 -
 -    succ_msg
--    if running_vboxguest || running_vboxadd; then
--        printf "You should restart your guest to make sure the new modules are actually used\n\n"
--    else
--        start
+-    if [ -n "$BUILDVBOXGUEST" ]; then
+-        if running_vboxguest || running_vboxadd; then
+-            printf "You should restart your guest to make sure the new modules are actually used\n\n"
+-        else
+-            start
+-        fi
 -    fi
 +    echo "Not implemented! Please use the virtualbox-kernel-addons.SlackBuild available at SlackBuilds.org instead."
  }
@@ -114,7 +123,7 @@
 -    DKMS=`which dkms 2>/dev/null`
 -    if [ -n "$DKMS" ]; then
 -      echo "Attempt to remove old DKMS modules..."
--      for mod in vboxadd vboxguest vboxvfs vboxvideo; do
+-      for mod in vboxadd vboxguest vboxvfs vboxsf vboxvideo; do
 -        $DKMS status -m $mod | while read line; do
 -          if echo "$line" | grep -q added > /dev/null ||
 -             echo "$line" | grep -q built > /dev/null ||
@@ -132,11 +141,12 @@
 -    find /lib/modules -name vboxadd\* | xargs rm 2>/dev/null
 -    find /lib/modules -name vboxguest\* | xargs rm 2>/dev/null
 -    find /lib/modules -name vboxvfs\* | xargs rm 2>/dev/null
+-    find /lib/modules -name vboxsf\* | xargs rm 2>/dev/null
 -    find /lib/modules -name vboxvideo\* | xargs rm 2>/dev/null
 -    depmod
 -
 -    # Remove old module sources
--    rm -rf /usr/src/vboxadd-* /usr/src/vboxguest-* /usr/src/vboxvfs-* /usr/src/vboxvideo-*
+-    rm -rf /usr/src/vboxadd-* /usr/src/vboxguest-* /usr/src/vboxvfs-* /usr/src/vboxsf-* /usr/src/vboxvideo-*
 -
 -    # Remove other files
 -    rm /sbin/mount.vboxsf 2>/dev/null
diff --git a/system/virtualbox-ose-addons/virtualbox-ose-addons.SlackBuild b/system/virtualbox-ose-addons/virtualbox-ose-addons.SlackBuild
index a654413d57ce8..76e16d1aff909 100644
--- a/system/virtualbox-ose-addons/virtualbox-ose-addons.SlackBuild
+++ b/system/virtualbox-ose-addons/virtualbox-ose-addons.SlackBuild
@@ -24,11 +24,18 @@
 
 PRGNAM=virtualbox-ose-addons
 SRCNAM=VirtualBox
-VERSION=3.1.6
-ARCH=${ARCH:-i486}
+VERSION=3.2.6
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -106,8 +113,6 @@ cp -f src/VBox/Additions/x11/Installer/vboxclient.desktop \
   $PKG/etc/xdg/autostart/
 cp -f src/VBox/Additions/x11/Installer/vboxclient.desktop \
   $PKG/usr/share/autostart/
-install -m 755 src/VBox/Additions/x11/Installer/VBoxRandR.sh \
-  $PKG/usr/bin/VBoxRandR
 install -m 755 src/VBox/Additions/x11/Installer/98vboxadd-xclient \
   $PKG/usr/bin/VBoxClient-all
 install -m 644 src/VBox/Additions/linux/installer/90-vboxguest.fdi \
@@ -120,7 +125,7 @@ echo "KERNEL==\"vboxuser\", NAME=\"vboxuser\", OWNER=\"vboxadd\", MODE=\"0666\""
 
 cd out/linux.$TARGET/release/bin/additions
   cp -rf src/vboxguest $PKG/usr/src/vboxguest-$VERSION
-  cp -rf src/vboxvfs $PKG/usr/src/vboxvfs-$VERSION
+  cp -rf src/vboxsf $PKG/usr/src/vboxsf-$VERSION
   cp -rf src/vboxvideo $PKG/usr/src/vboxvideo-$VERSION
   install -m 755 VBoxControl $PKG/usr/bin/
   install -m 755 VBoxClient $PKG/usr/bin/
diff --git a/system/virtualbox-ose-addons/virtualbox-ose-addons.info b/system/virtualbox-ose-addons/virtualbox-ose-addons.info
index de184da0e334c..b79d625f7b035 100644
--- a/system/virtualbox-ose-addons/virtualbox-ose-addons.info
+++ b/system/virtualbox-ose-addons/virtualbox-ose-addons.info
@@ -1,8 +1,8 @@
 PRGNAM="virtualbox-ose-addons"
-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"
-MD5SUM="6cb3c8161ad878c2a2732137c1621dc4"
+DOWNLOAD="http://213.239.192.22/download/3.2.6/VirtualBox-3.2.6-OSE.tar.bz2"
+MD5SUM="65b822ab3c08ff882d9621101996dc14"
 DOWNLOAD_x86_64="UNTESTED"
 MD5SUM_x86_64=""
 MAINTAINER="Heinz Wiesinger"