Attachment 339396 Details for Bug 184960 – Patch

[patch] Patch

bug-184960-20180503004823.patch (text/plain), 2.82 KB, created by Wenson Hsieh on 2018-05-03 00:48:24 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2018-05-03 00:48:24 PDT

Size: 2.82 KB

patch

obsolete

>Subversion Revision: 231220
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 5854d6db9669d574ed21d9d1612cd72dc51e2587..a6bd67211546eb2374c29da69b9662716b2f3163 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-05-03  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        Entitlements aren't applying on macOS after r231014
>+        https://bugs.webkit.org/show_bug.cgi?id=184960
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        CODE_SIGN_ENTITLEMENTS_macosx is set to Configurations/WebContent.Development.entitlements, but this revision
>+        changed the value of CODE_SIGN_ENTITLEMENTS from `$(CODE_SIGN_ENTITLEMENTS_$(WK_PLATFORM_NAME))` to be
>+        `$(CODE_SIGN_ENTITLEMENTS_$(WK_COCOA_TOUCH))`, so CODE_SIGN_ENTITLEMENTS_macosx is effectively being ignored.
>+
>+        To fix this, revert to using `$(CODE_SIGN_ENTITLEMENTS_$(WK_PLATFORM_NAME))`.
>+
>+        * Configurations/BaseXPCService.xcconfig:
>+
> 2018-05-01  Jer Noble  <jer.noble@apple.com>
> 
>         Production build error in Migrate Header phase when WK_ALTERNATE_FRAMEWORKS_DIR is set to non-empty value
>diff --git a/Source/WebKit/Configurations/BaseXPCService.xcconfig b/Source/WebKit/Configurations/BaseXPCService.xcconfig
>index 43a2a45df5e35d0d30d41a60a94334f2632adc86..0f3ad3c63577a9cc6a459b8bf3bb9635059d9041 100644
>--- a/Source/WebKit/Configurations/BaseXPCService.xcconfig
>+++ b/Source/WebKit/Configurations/BaseXPCService.xcconfig
>@@ -53,8 +53,14 @@ 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_PLATFORM_NAME));
>+CODE_SIGN_ENTITLEMENTS_iphoneos = $(CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_$(SKIP_INSTALL));
>+CODE_SIGN_ENTITLEMENTS_iphonesimulator = $(CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_$(SKIP_INSTALL));
>+CODE_SIGN_ENTITLEMENTS_watchos = $(CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_$(SKIP_INSTALL));
>+CODE_SIGN_ENTITLEMENTS_watchsimulator = $(CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_$(SKIP_INSTALL));
>+CODE_SIGN_ENTITLEMENTS_appletvos = $(CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_$(SKIP_INSTALL));
>+CODE_SIGN_ENTITLEMENTS_appletvsimulator = $(CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_$(SKIP_INSTALL));
>+CODE_SIGN_ENTITLEMENTS_iphoneminimalsimulator = $(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));

Actions: View | Formatted Diff | Diff

Attachments on bug 184960: 338711 | 338735 | 338769 | 339396