Attachment 339397 Details for Bug 185241 – Patch

[patch] Patch

bug-185241-20180503010106.patch (text/plain), 3.67 KB, created by Tim Horton on 2018-05-03 01:01:07 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Horton

Created: 2018-05-03 01:01:07 PDT

Size: 3.67 KB

patch

obsolete

>Subversion Revision: 231297
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 8ceb285f22ecfbe0378c06fbcad9664e4df9c65b..3f389063c0350639140270c0cf1c370dadd6618d 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-05-03  Tim Horton  <timothy_horton@apple.com>
>+
>+        REGRESSION (r231014): Entitlements are not applied to XPC services on macOS
>+        https://bugs.webkit.org/show_bug.cgi?id=185241
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/BaseXPCService.xcconfig:
>+        * Configurations/WebContentService.Development.xcconfig:
>+        * Configurations/WebContentService.xcconfig:
>+
> 2018-05-02  Nan Wang  <n_wang@apple.com>
> 
>         AX: Missing kAXSWebAccessibilityEventsEnabledNotification causes a crash
>diff --git a/Source/WebKit/Configurations/BaseXPCService.xcconfig b/Source/WebKit/Configurations/BaseXPCService.xcconfig
>index 43a2a45df5e35d0d30d41a60a94334f2632adc86..36b93cc56d471a5a255ca971efc3b295e0ad1204 100644
>--- a/Source/WebKit/Configurations/BaseXPCService.xcconfig
>+++ b/Source/WebKit/Configurations/BaseXPCService.xcconfig
>@@ -53,8 +53,8 @@ WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK = $(WK_PATH_FROM_SERVICE_EXECUTABLE
> 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_$(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));
>diff --git a/Source/WebKit/Configurations/WebContentService.Development.xcconfig b/Source/WebKit/Configurations/WebContentService.Development.xcconfig
>index 8a22b6350b49f02a8610e3c478666aa8e8697692..49d7e1638fb5544ceae9089f73885a3fa128967c 100644
>--- a/Source/WebKit/Configurations/WebContentService.Development.xcconfig
>+++ b/Source/WebKit/Configurations/WebContentService.Development.xcconfig
>@@ -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;
>diff --git a/Source/WebKit/Configurations/WebContentService.xcconfig b/Source/WebKit/Configurations/WebContentService.xcconfig
>index d71d9d7927f8a463b84ab0b9c884c6d245ec25a4..294d419702947ea8495fdeaef0958356e9f92cd1 100644
>--- a/Source/WebKit/Configurations/WebContentService.xcconfig
>+++ b/Source/WebKit/Configurations/WebContentService.xcconfig
>@@ -32,7 +32,7 @@ WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_appletvos = WebContent-iOS;
> 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);
>

Actions: View | Formatted Diff | Diff

Attachments on bug 185241: 339397 | 339398