Title: [231299] trunk/Source/WebKit
Revision
231299
Author
[email protected]
Date
2018-05-03 01:50:09 -0700 (Thu, 03 May 2018)

Log Message

REGRESSION (r231014): Entitlements are not applied to XPC services on macOS
https://bugs.webkit.org/show_bug.cgi?id=185241

Reviewed by Dan Bernstein.

* Configurations/BaseXPCService.xcconfig:
* Configurations/WebContentService.Development.xcconfig:
* Configurations/WebContentService.xcconfig:

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (231298 => 231299)


--- trunk/Source/WebKit/ChangeLog	2018-05-03 08:45:32 UTC (rev 231298)
+++ trunk/Source/WebKit/ChangeLog	2018-05-03 08:50:09 UTC (rev 231299)
@@ -1,3 +1,14 @@
+2018-05-03  Tim Horton  <[email protected]>
+
+        REGRESSION (r231014): Entitlements are not applied to XPC services on macOS
+        https://bugs.webkit.org/show_bug.cgi?id=185241
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/BaseXPCService.xcconfig:
+        * Configurations/WebContentService.Development.xcconfig:
+        * Configurations/WebContentService.xcconfig:
+
 2018-05-03  Carlos Garcia Campos  <[email protected]>
 
         REGRESSION(r222772): [GTK][WPE] WebProcess from WebKitGtk+ 2.19.9x SIGSEVs in WebKit::WebProcess::ensureNetworkProcessConnection() at Source/WebKit/WebProcess/WebProcess.cpp:1127

Modified: trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig (231298 => 231299)


--- trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig	2018-05-03 08:45:32 UTC (rev 231298)
+++ trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig	2018-05-03 08:50:09 UTC (rev 231299)
@@ -53,8 +53,8 @@
 WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK_SHALLOW_BUNDLE_NO = ../../../../../..;
 WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK_SHALLOW_BUNDLE_YES = ../..;
 
-CODE_SIGN_ENTITLEMENTS = $(CODE_SIGN_ENTITLEMENTS_$(WK_COCOA_TOUCH));
-CODE_SIGN_ENTITLEMENTS_cocoatouch = $(CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_$(SKIP_INSTALL));
+CODE_SIGN_ENTITLEMENTS = $(CODE_SIGN_ENTITLEMENTS_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
+CODE_SIGN_ENTITLEMENTS_COCOA_TOUCH_YES = $(CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_$(SKIP_INSTALL));
 
 CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_ = $(CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_NO);
 CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_NO = $(CODE_SIGN_ENTITLEMENTS_IOS_MANUAL_SANDBOXING_$(WK_MANUAL_SANDBOXING_ENABLED));

Modified: trunk/Source/WebKit/Configurations/WebContentService.Development.xcconfig (231298 => 231299)


--- trunk/Source/WebKit/Configurations/WebContentService.Development.xcconfig	2018-05-03 08:45:32 UTC (rev 231298)
+++ trunk/Source/WebKit/Configurations/WebContentService.Development.xcconfig	2018-05-03 08:50:09 UTC (rev 231299)
@@ -26,6 +26,6 @@
 SKIP_INSTALL = YES;
 SKIP_INSTALL[sdk=macosx*] = $(WK_RELOCATABLE_FRAMEWORKS);
 
-CODE_SIGN_ENTITLEMENTS_macosx = Configurations/WebContent.Development.entitlements;
+CODE_SIGN_ENTITLEMENTS_COCOA_TOUCH_NO = Configurations/WebContent.Development.entitlements;
 
 WK_XPC_SERVICE_VARIANT = Development;

Modified: trunk/Source/WebKit/Configurations/WebContentService.xcconfig (231298 => 231299)


--- trunk/Source/WebKit/Configurations/WebContentService.xcconfig	2018-05-03 08:45:32 UTC (rev 231298)
+++ trunk/Source/WebKit/Configurations/WebContentService.xcconfig	2018-05-03 08:50:09 UTC (rev 231299)
@@ -32,7 +32,7 @@
 WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_appletvsimulator = WebContent-iOS;
 WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_iphoneminimalsimulator = WebContent-iOS-minimalsimulator;
 
-CODE_SIGN_ENTITLEMENTS_macosx = $(CODE_SIGN_ENTITLEMENTS_OSX_WITH_XPC_DOMAIN_EXTENSION_$(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT));
+CODE_SIGN_ENTITLEMENTS_COCOA_TOUCH_NO = $(CODE_SIGN_ENTITLEMENTS_OSX_WITH_XPC_DOMAIN_EXTENSION_$(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT));
 CODE_SIGN_ENTITLEMENTS_OSX_WITH_XPC_DOMAIN_EXTENSION_YES = Configurations/WebContent-OSX.entitlements;
 OTHER_CODE_SIGN_FLAGS = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS);
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to