Changeset 57231 in vbox for trunk/src/VBox/Installer

Timestamp:

Aug 7, 2015 1:36:22 AM (9 years ago)

Author:

vboxsync

Message:

Installer/darwin: Fix set-uid bits on 10.11 beta 6. Also make sure VBoxNetAdpCtl is alwyas given a set-uid bit, even if hardening is disabled.

Location:

trunk/src/VBox/Installer/darwin

Files:

• Makefile.kmk (modified) (2 diffs)
• VirtualBox/postflight (modified) (2 diffs)

trunk/src/VBox/Installer/darwin/Makefile.kmk

@@ -746 +746 @@
         @# Set the correct owner and set the set-user-ID-on-execution bit on the relevant executables.
         sudo chown -R root:admin $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root
+        sudo chmod u+s $(VBOX_PATH_VBOX_APP_TMP)/Contents/MacOS/VBoxNetAdpCtl
 ifdef VBOX_WITH_HARDENING
         sudo chmod u+s \
-                $(foreach bin,VBoxHeadless VirtualBox VirtualBoxVM VBoxNetAdpCtl VBoxNetDHCP VBoxNetNAT,\
+                $(foreach bin,VBoxHeadless VirtualBox VirtualBoxVM VBoxNetDHCP VBoxNetNAT,\
                         $(VBOX_PATH_VBOX_APP_TMP)/Contents/MacOS/$(bin))
 endif
@@ -764 +765 @@
         @# Copy the resources.
         $(INSTALL) -m 0755 $(VBOX_PATH_DI_SRC)/VirtualBox/preflight                         $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/
+ifdef VBOX_WITH_HARDENING
         $(INSTALL) -m 0755 $(VBOX_PATH_DI_SRC)/VirtualBox/postflight                        $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/
+else
+        $(SED) -s '/WITH_HARDENING/d' -o $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/postflight $(VBOX_PATH_DI_SRC)/VirtualBox/postflight
+        $(CHMOD) 0755 $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/postflight
+endif
         @# Build the package.
         $(VBOX_PKGBUILD) \

trunk/src/VBox/Installer/darwin/VirtualBox/postflight

@@ -24 +24 @@
 # Install the Python bindings
 #
-
 VBOX_INSTALL_PATH=/Applications/VirtualBox.app/Contents/MacOS
 PYTHON="python python2.3 python2.5 python2.6 python2.7"
@@ -83 +82 @@
 
 #
+# Workaround for 10.11 beta 6 in which the set-uid bit isn't set by the installer.
+#
+SET_UID_BINARIES="VBoxNetAdpCtl"
+SET_UID_BINARIES="${SET_UID_BINARIES} VBoxHeadless VirtualBox VirtualBoxVM VBoxNetDHCP VBoxNetNAT" # WITH_HARDENING
+for bin in ${SET_UID_BINARIES}; do
+    chmod u+s "/Applications/VirtualBox.app/Contents/MacOS/${bin}"
+done
+
+#
 # Correct the ownership of the directories in case there
 # was an existing installation.