Imported Upstream version 4.0.8-dfsgupstream/4.0.8-dfsg

3 files changed, 30 insertions, 7 deletions

diff --git a/src/VBox/Additions/linux/Makefile.kmk b/src/VBox/Additions/linux/Makefile.kmk
index e4a737e50..6c51aa7e4 100644
--- a/src/VBox/Additions/linux/Makefile.kmk
+++ b/src/VBox/Additions/linux/Makefile.kmk
@@ -318,7 +318,8 @@ lnx_add_inst-noexec_SOURCES = \
 	$(VBOX_REL_X11_ADD_INST)50-vboxmouse.conf \
 	$(VBOX_REL_LNX_ADD_INST)70-xorg-vboxmouse.rules \
 	$(VBOX_REL_LNX_ADD_INST)90-vboxguest.fdi \
-	selinux-fedora/vbox_x11.pp
+	selinux-fedora/vbox_x11.pp \
+	selinux-fedora/vbox_accel.pp
 
 INSTALLS += lnx_add_inst-license
 lnx_add_inst-license_INST = $(subst $(PATH_TARGET),obj,$(VBOX_LNX_ADD_INST_OUT_DIR))/
diff --git a/src/VBox/Additions/linux/installer/vboxadd-x11.sh b/src/VBox/Additions/linux/installer/vboxadd-x11.sh
index 90ec958df..55e6ec640 100755
--- a/src/VBox/Additions/linux/installer/vboxadd-x11.sh
+++ b/src/VBox/Additions/linux/installer/vboxadd-x11.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Linux Additions X11 setup init script ($Revision: 71289 $)
+# Linux Additions X11 setup init script ($Revision: 71770 $)
 #
 
 #
@@ -514,12 +514,16 @@ EOF
     fi
 
     begin "Installing graphics libraries and desktop services components"
-    # Install selinux policy for Fedora 7 and 8 to allow the X server to
-    # open device files
     case "$redhat_release" in
+        # Install selinux policy for Fedora 7 and 8 to allow the X server to
+        # open device files
         Fedora\ release\ 7* | Fedora\ release\ 8* )
             semodule -i "$share_dir/vbox_x11.pp" > /dev/null 2>&1
             ;;
+        # Similar for the accelerated graphics check on Fedora 15
+        Fedora\ release\ 15* )
+            semodule -i "$share_dir/vbox_accel.pp" > /dev/null 2>&1
+            ;;
     esac
 
     # Install selinux policy for Fedora 8 to allow the X server to
diff --git a/src/VBox/Additions/linux/installer/vboxadd.sh b/src/VBox/Additions/linux/installer/vboxadd.sh
index 807248155..4f02c64c9 100755
--- a/src/VBox/Additions/linux/installer/vboxadd.sh
+++ b/src/VBox/Additions/linux/installer/vboxadd.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Linux Additions kernel module init script ($Revision: 70087 $)
+# Linux Additions kernel module init script ($Revision: 71770 $)
 #
 
 #
@@ -168,6 +168,12 @@ userdev=/dev/vboxuser
 owner=vboxadd
 group=1
 
+test_for_gcc_and_make()
+{
+    which make > /dev/null 2>&1 || printf "\nThe make utility was not found. If the following module compilation fails then\nthis could be the reason and you should try installing it.\n"
+    which gcc > /dev/null 2>&1 || printf "\nThe gcc utility was not found. If the following module compilation fails then\nthis could be the reason and you should try installing it.\n"
+}
+
 test_sane_kernel_dir()
 {
     KERN_VER=`uname -r`
@@ -364,6 +370,7 @@ setup_modules()
         return 0
     fi
 
+    test_for_gcc_and_make
     test_sane_kernel_dir
 
     if ! sh /usr/share/$PACKAGE/test/build_in_tmp \
@@ -455,9 +462,20 @@ extra_setup()
 
     # Put mount.vboxsf in the right place
     ln -sf "$lib_path/$PACKAGE/mount.vboxsf" /sbin
-    # At least Fedora 11 and Fedora 12 demand on the correct security context when
-    # executing this command from service scripts. Shouldn't hurt for other distributions.
+    # At least Fedora 11 and Fedora 12 require the correct security context when
+    # executing this command from service scripts. Shouldn't hurt for other
+    # distributions.
     chcon -u system_u -t mount_exec_t "$lib_path/$PACKAGE/mount.vboxsf" > /dev/null 2>&1
+    # And at least Fedora 15 needs this for the acceleration support check to
+    # work
+    redhat_release=`cat /etc/redhat-release 2> /dev/null`
+    case "$redhat_release" in Fedora\ release\ 15* )
+        for i in "$lib_path"/*.so
+        do
+            restorecon "$i" >/dev/null
+        done
+        ;;
+    esac
 
     succ_msg
 }