Changeset 83033 in vbox for trunk/include/VBox

Timestamp:

Feb 10, 2020 1:40:54 PM (5 years ago)

Author:

vboxsync

Message:

/Config.kmk,/Makefile.kmk,Installer/darwin,FE/QT,SUPHard: Eliminated the symlinks under Resources/VirtualBoxVM.app to avoid confusing codesign and notarization. bugref:9466
Note! Best to do a clean build on mac (or at a minimum rm -Rf out/darwin.amd64/*/dist/VirtualBox.app/Contents/Frameworks/ out/darwin.amd64/*/dist/VirtualBox.app/Contents/plugins/).

• SUPHard: Added new location SUPSECMAIN_FLAGS_LOC_OSX_HLP_APP (darwin only) for indicating a helper application and that hardened dylib and the rest of VirtualBox isn't in the executable directory.
• SUPHard: Added a corresponding internal path ID kSupID_AppMacHelper (darwin only) for finding VirtualBoxVM for verification now that it is no longer in the main app binary directory.
• /Config.kmk: Run install_name_tool after linking Qt binaries on darwin fix the Qt import paths (@executable_path/../Frameworks/ doesn't work for VirtualBoxVM any more).
• /Makefile.kmk: Run install_name_tool during installation of Qt frameworks and plugins to use @rpath in non-hardened builds and the absolute paths in hardened ones (latter done by Installer/darwin/Makefile.kmk previously).
• FE/Qt,Installer/darwin: Adjustments and path hacks.

File:

• trunk/include/VBox/sup.h (modified) (2 diffs)

trunk/include/VBox/sup.h

@@ -1184 +1184 @@
 /** The hardened DLL has a "TrustedError" function (see FNSUPTRUSTEDERROR). */
 #define SUPSECMAIN_FLAGS_TRUSTED_ERROR      RT_BIT_32(1)
-/** Hack for making VirtualBoxVM use VirtualBox.dylib on Mac OS X. */
+/** Hack for making VirtualBoxVM use VirtualBox.dylib on Mac OS X.
+ * @note Not used since 6.0  */
 #define SUPSECMAIN_FLAGS_OSX_VM_APP         RT_BIT_32(2)
 /** Program binary location mask. */
-#define SUPSECMAIN_FLAGS_LOC_MASK           UINT32_C(0x00000010)
+#define SUPSECMAIN_FLAGS_LOC_MASK           UINT32_C(0x00000030)
 /** Default binary location is the application binary directory.  Does
  * not need to be given explicitly (it's 0).  */
@@ -1194 +1195 @@
  * default application binary directory. */
 #define SUPSECMAIN_FLAGS_LOC_TESTCASE       UINT32_C(0x00000010)
-/** The first process. */
-#define SUPSECMAIN_FLAGS_FIRST_PROCESS      UINT32_C(0x00000020)
+/** The binary is located in a nested application bundle under Resources/ in the
+ * main Mac OS X application (think Resources/VirtualBoxVM.app).  */
+#define SUPSECMAIN_FLAGS_LOC_OSX_HLP_APP    UINT32_C(0x00000020)
+/** The first process.
+ * @internal  */
+#define SUPSECMAIN_FLAGS_FIRST_PROCESS      UINT32_C(0x00000100)
 /** @} */