Attachment 360809 Details for Bug 194128 – Patch

[patch] Patch

bug-194128-20190131170317.patch (text/plain), 7.19 KB, created by Alex Christensen on 2019-01-31 17:03:18 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-01-31 17:03:18 PST

Size: 7.19 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 240830)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2019-01-31  Alex Christensen  <achristensen@webkit.org>
>+
>+        Add Networkingd plist
>+        https://bugs.webkit.org/show_bug.cgi?id=194128
>+        <rdar://problem/47705244>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/NetworkService.xcconfig:
>+        * NetworkProcess/EntryPoint/mac/Daemon: Added.
>+        * NetworkProcess/EntryPoint/mac/Daemon/com.apple.WebKit.Networkingd.plist: Added.
>+        * WebKit.xcodeproj/project.pbxproj:
>+
> 2019-01-31  Jiewen Tan  <jiewen_tan@apple.com>
> 
>         Unreviewed, build fix after r240805
>Index: Source/WebKit/Configurations/NetworkService.xcconfig
>===================================================================
>--- Source/WebKit/Configurations/NetworkService.xcconfig	(revision 240285)
>+++ Source/WebKit/Configurations/NetworkService.xcconfig	(working copy)
>@@ -40,5 +40,7 @@ PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_NA
> INFOPLIST_FILE[sdk=iphone*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist;
> INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist;
> 
>+DAEMON_PLIST_DIRECTORY[sdk=iphone*] = /System/Library/LaunchDaemons;
>+
> OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
> OTHER_LDFLAGS[sdk=macosx*] = $(inherited) $(BUILT_PRODUCTS_DIR)/SecItemShim.dylib;
>Index: Source/WebKit/NetworkProcess/EntryPoint/mac/Daemon/com.apple.WebKit.Networkingd.plist
>===================================================================
>--- Source/WebKit/NetworkProcess/EntryPoint/mac/Daemon/com.apple.WebKit.Networkingd.plist	(nonexistent)
>+++ Source/WebKit/NetworkProcess/EntryPoint/mac/Daemon/com.apple.WebKit.Networkingd.plist	(working copy)
>@@ -0,0 +1,17 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
>+<plist version="1.0">
>+<dict>
>+	<key>Label</key>
>+	<string>com.apple.WebKit.Networkingd</string>
>+	<key>Program</key>
>+	<string>/System/Library/Frameworks/WebKit.framework/XPCServices/com.apple.WebKit.Networking.xpc/com.apple.WebKit.Networking</string>
>+	<key>MachServices</key>
>+	<dict>
>+		<key>com.apple.WebKit.Networkingd</key>
>+		<true/>
>+	</dict>
>+	<key>EnablePressuredExit</key>
>+	<true/>
>+</dict>
>+</plist>
>Index: Source/WebKit/NetworkProcess/EntryPoint/mac/Daemon/com.apple.WebKit.Networkingd.plist
>===================================================================
>--- Source/WebKit/NetworkProcess/EntryPoint/mac/Daemon/com.apple.WebKit.Networkingd.plist	(nonexistent)
>+++ Source/WebKit/NetworkProcess/EntryPoint/mac/Daemon/com.apple.WebKit.Networkingd.plist	(working copy)
>@@ -0,0 +1,17 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
>+<plist version="1.0">
>+<dict>
>+	<key>Label</key>
>+	<string>com.apple.WebKit.Networkingd</string>
>+	<key>Program</key>
>+	<string>/System/Library/Frameworks/WebKit.framework/XPCServices/com.apple.WebKit.Networking.xpc/com.apple.WebKit.Networking</string>
>+	<key>MachServices</key>
>+	<dict>
>+		<key>com.apple.WebKit.Networkingd</key>
>+		<true/>
>+	</dict>
>+	<key>EnablePressuredExit</key>
>+	<true/>
>+</dict>
>+</plist>
>Index: Source/WebKit/WebKit.xcodeproj/project.pbxproj
>===================================================================
>--- Source/WebKit/WebKit.xcodeproj/project.pbxproj	(revision 240285)
>+++ Source/WebKit/WebKit.xcodeproj/project.pbxproj	(working copy)
>@@ -3464,6 +3464,7 @@
> 		5CB2378D1DF0E0C200117AA3 /* _WKWebsitePoliciesInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKWebsitePoliciesInternal.h; sourceTree = "<group>"; };
> 		5CBC9B891C6524A500A8FDCF /* NetworkDataTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkDataTask.h; sourceTree = "<group>"; };
> 		5CBC9B8B1C65257300A8FDCF /* NetworkDataTaskCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkDataTaskCocoa.mm; sourceTree = "<group>"; };
>+		5CC4DF6B2203BD620094E28F /* com.apple.WebKit.Networkingd.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = com.apple.WebKit.Networkingd.plist; path = NetworkProcess/EntryPoint/mac/Daemon/com.apple.WebKit.Networkingd.plist; sourceTree = SOURCE_ROOT; };
> 		5CC5DB9121488E16006CB8A8 /* SharedBufferDataReference.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedBufferDataReference.h; sourceTree = "<group>"; };
> 		5CD286491E722F440094FDC8 /* _WKUserContentFilterPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKUserContentFilterPrivate.h; sourceTree = "<group>"; };
> 		5CD2864A1E722F440094FDC8 /* WKContentRuleList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentRuleList.h; sourceTree = "<group>"; };
>@@ -6839,6 +6840,14 @@
> 			path = Cocoa;
> 			sourceTree = "<group>";
> 		};
>+		5CC4DF6A2203BD480094E28F /* Daemon */ = {
>+			isa = PBXGroup;
>+			children = (
>+				5CC4DF6B2203BD620094E28F /* com.apple.WebKit.Networkingd.plist */,
>+			);
>+			path = Daemon;
>+			sourceTree = "<group>";
>+		};
> 		6BE969BF1E54D452008B7483 /* ResourceLoadStatistics */ = {
> 			isa = PBXGroup;
> 			children = (
>@@ -8009,6 +8018,7 @@
> 		BC82837C16B45DA500A278FE /* EntryPoint */ = {
> 			isa = PBXGroup;
> 			children = (
>+				5CC4DF6A2203BD480094E28F /* Daemon */,
> 				BC8283A116B4BD9100A278FE /* XPCService */,
> 			);
> 			path = EntryPoint;
>@@ -10073,6 +10083,7 @@
> 				BC8283AF16B4BF7700A278FE /* Resources */,
> 				41D0FC8020E43B4500076AE8 /* Unlock keychain */,
> 				41D0FC8120E43B7000076AE8 /* Process Network entitlements */,
>+				5CC4DF692203BBF00094E28F /* Copy Daemon plist */,
> 			);
> 			buildRules = (
> 			);
>@@ -10437,6 +10448,25 @@
> 			shellPath = /bin/sh;
> 			shellScript = "Scripts/process-network-sandbox-entitlements.sh\n";
> 		};
>+		5CC4DF692203BBF00094E28F /* Copy Daemon plist */ = {
>+			isa = PBXShellScriptBuildPhase;
>+			buildActionMask = 8;
>+			files = (
>+			);
>+			inputFileListPaths = (
>+			);
>+			inputPaths = (
>+				"$(SRCROOT)/NetworkProcess/EntryPoint/mac/Daemon/com.apple.WebKit.Networkingd.plist",
>+			);
>+			name = "Copy Daemon plist";
>+			outputFileListPaths = (
>+			);
>+			outputPaths = (
>+			);
>+			runOnlyForDeploymentPostprocessing = 1;
>+			shellPath = /bin/sh;
>+			shellScript = "if [ -z \"${DAEMON_PLIST_DIRECTORY}\" ]; then\n    echo \"Not copying com.apple.WebKit.Networkingd plist\"\n    exit 0;\nfi\n\nPLIST_OUTPUT_DIRECTORY_PATH=\"${DSTROOT}${DAEMON_PLIST_DIRECTORY}\"\nPLIST_OUTPUT_PATH=\"${PLIST_OUTPUT_DIRECTORY_PATH}/com.apple.WebKit.Networkingd.plist\"\n\necho \"Copying com.apple.WebKit.Networkingd plist\"\nmkdir -p \"${PLIST_OUTPUT_DIRECTORY_PATH}\"\nplutil -convert binary1 -o \"${PLIST_OUTPUT_PATH}\" \"${SCRIPT_INPUT_FILE_0}\"\n";
>+		};
> 		5DF408C5131DD46700130071 /* Check For Weak VTables and Externals */ = {
> 			isa = PBXShellScriptBuildPhase;
> 			buildActionMask = 2147483647;

Actions: View | Formatted Diff | Diff

Attachments on bug 194128: 360809 | 360914 | 361946