173937 2017-06-28 14:04:12 -0700 Update configure-xcode-for-ios-development for iOS 11 2017-08-24 16:18:20 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard ap commit-queue dbates ddkilzer lforschler webkit-bug-importer oldest_to_newest 1323666 0 jbedard 2017-06-28 14:04:12 -0700 Some headers have been moved, renamed or removed in iOS 11. Update configure-xcode-for-ios-development to handle the iOS 11 SDK. 1325428 1 webkit-bug-importer 2017-07-04 04:32:00 -0700 <rdar://problem/33122072> 1342104 2 319000 jbedard 2017-08-24 11:51:00 -0700 Created attachment 319000 Patch 1342136 3 319000 dbates 2017-08-24 12:52:06 -0700 Comment on attachment 319000 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=319000&action=review > Tools/Scripts/configure-xcode-for-ios-development:91 > + my $macSDKDirectory = sdkDirectory("macosx"); How does this work if a person has more than one Mac SDK installed? > Tools/Scripts/configure-xcode-for-ios-development:96 > + my $macSDKPah = File::Spec->canonpath(File::Spec->catfile($macSDKDirectory, $header)); macSDKPah => macSDKPath (Please fix throughout this patch.) > Tools/Scripts/configure-xcode-for-ios-development:107 > + system("/usr/bin/ditto", $macSDKPah, $iphonesimulatorSDKPath); Eww, duplicate code. We should factor out the code to call ditto, die and print success to a shared function. I don't think the combined success message in line 111 is worth duplicating code. 1342152 4 319000 jbedard 2017-08-24 14:08:01 -0700 Comment on attachment 319000 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=319000&action=review >> Tools/Scripts/configure-xcode-for-ios-development:91 >> + my $macSDKDirectory = sdkDirectory("macosx"); > > How does this work if a person has more than one Mac SDK installed? It will use whichever SDK is returned from `xcrun --sdk macosx --show-sdk-path`. Which seems like the correct approach. This is the same way we generally look for the current SDK in WebKit tools. 1342153 5 319016 jbedard 2017-08-24 14:11:35 -0700 Created attachment 319016 Patch 1342159 6 319000 dbates 2017-08-24 14:18:26 -0700 Comment on attachment 319000 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=319000&action=review >> Tools/Scripts/configure-xcode-for-ios-development:107 >> + system("/usr/bin/ditto", $macSDKPah, $iphonesimulatorSDKPath); > > Eww, duplicate code. We should factor out the code to call ditto, die and print success to a shared function. I don't think the combined success message in line 111 is worth duplicating code. Alternatively, we could making this function abstract: move @missingHeaders out of this function, have this function take a source SDK and destination SDK and call this function copyMissingHeadersFromSDKToSDK(). Then define a function called copyMissingHeadersToIPhoneOSSDKIfNeeded() and define a function called copyMissingHeadersToIOSSimulatorSDKIfNeeded() that turns around and calls copyMissingHeadersFromSDKToSDK("iphonesimulator", "iphoneos") and copyMissingHeadersFromSDKToSDK("macosx", "iphonesimulator"), respectively. Then this script would call copyMissingHeadersToIOSSimulatorSDKIfNeeded() first and then call copyMissingHeadersToIPhoneOSSDKIfNeeded(). The benefit of this approach is that we avoid duplication, unnecessary branches, and the names of the functions clearly describe their purpose. 1342160 7 319016 dbates 2017-08-24 14:21:47 -0700 Comment on attachment 319016 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=319016&action=review > Tools/Scripts/configure-xcode-for-ios-development:115 > + print "Successfully copied $macSDKPath to $iphonesimulatorSDKPath and $iphoneosSDKPath.\n"; You seem to have disregarded the last sentence of my remark in comment #3 without explanation.I don't think the combined success message here is worth much. Regardless, I suggest we take the approach I outlined in comment #4. 1342164 8 319016 jbedard 2017-08-24 14:31:32 -0700 Comment on attachment 319016 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=319016&action=review >> Tools/Scripts/configure-xcode-for-ios-development:115 >> + print "Successfully copied $macSDKPath to $iphonesimulatorSDKPath and $iphoneosSDKPath.\n"; > > You seem to have disregarded the last sentence of my remark in comment #3 without explanation.I don't think the combined success message here is worth much. Regardless, I suggest we take the approach I outlined in comment #4. I isolated the duplicated code and placed it in a function. I would be open to moving the print statements to the function as well, but I don't feel like the print statements are really duplicated code. As for the approach you suggest in comment #4, I think you may be suggesting some functions we don't need, but I like the general idea. I'll update this bug shortly. 1342168 9 319018 jbedard 2017-08-24 14:42:49 -0700 Created attachment 319018 Patch 1342196 10 319018 dbates 2017-08-24 15:22:35 -0700 Comment on attachment 319018 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=319018&action=review > Tools/ChangeLog:9 > + Xcode 9 has removed some headers required by WebKit builds for testing. If it is straightforward to do so it would be great to list the headers that were removed and what SDK they were removed from. We should also explain what we are doing to fix this issue: we are copying the missing headers from the active macOS SDK. > Tools/Scripts/configure-xcode-for-ios-development:71 > +copyMissingHeadersFromSDKToSDKIfNeeded("macosx", "iphonesimulator"); Out of curiosity what headers would actually be copied (i.e. what headers are missing from the iphonesimulator 11 SDK)? 1342197 11 jbedard 2017-08-24 15:29:25 -0700 (In reply to Daniel Bates from comment #10) > Comment on attachment 319018 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=319018&action=review > > > Tools/ChangeLog:9 > > + Xcode 9 has removed some headers required by WebKit builds for testing. > > If it is straightforward to do so it would be great to list the headers that > were removed and what SDK they were removed from. We should also explain > what we are doing to fix this issue: we are copying the missing headers from > the active macOS SDK. > > > Tools/Scripts/configure-xcode-for-ios-development:71 > > +copyMissingHeadersFromSDKToSDKIfNeeded("macosx", "iphonesimulator"); > > Out of curiosity what headers would actually be copied (i.e. what headers > are missing from the iphonesimulator 11 SDK)? I'll include this information in the changelog as well, the following headers were removed from the iOS 11 Simulator SDK: crt_externs.h mach_types.defs machine_types.def std_types.def objc-class.h objc-runtime.h Protocol.h history.h readline.h 1342202 12 319028 jbedard 2017-08-24 15:37:48 -0700 Created attachment 319028 Patch for landing 1342227 13 319028 commit-queue 2017-08-24 16:18:19 -0700 Comment on attachment 319028 Patch for landing Clearing flags on attachment: 319028 Committed r221168: <http://trac.webkit.org/changeset/221168> 1342228 14 commit-queue 2017-08-24 16:18:20 -0700 All reviewed patches have been landed. Closing bug. 319000 2017-08-24 11:51:00 -0700 2017-08-24 14:22:57 -0700 Patch bug-173937-20170824115100.patch text/plain 2847 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyMTE0NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE3LTA4LTI0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBVcGRhdGUgY29uZmlndXJlLXhjb2RlLWZvci1pb3MtZGV2ZWxvcG1lbnQg Zm9yIGlPUyAxMQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTczOTM3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMzAzODkyND4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBYY29kZSA5IGhhcyByZW1vdmVk IHNvbWUgaGVhZGVycyByZXF1aXJlZCBieSBXZWJLaXQgYnVpbGRzIGZvciB0ZXN0aW5nLgorCisg ICAgICAgICogU2NyaXB0cy9jb25maWd1cmUteGNvZGUtZm9yLWlvcy1kZXZlbG9wbWVudDoKKyAg ICAgICAgKGNvcHlNaXNzaW5nSGVhZGVyc1RvSVBob25lT1NTREtJZk5lZWRlZCk6IE1vdmUgc29t ZSByZXF1aXJlZCBjb2RlIGZyb20gTWFjT1MgU0RLCisgICAgICAgIHRvIGJlIHVzZWQgYnkgaU9T IFNpbXVsYXRvci4KKwogMjAxNy0wOC0yNCAgRG9uIE9sbXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQHNv bnkuY29tPgogCiAgICAgICAgIFtDTWFrZV0gVXNlIGZpbmRfcGFja2FnZSBmb3IgU1FMaXRlCklu ZGV4OiBUb29scy9TY3JpcHRzL2NvbmZpZ3VyZS14Y29kZS1mb3ItaW9zLWRldmVsb3BtZW50Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvY29uZmlndXJlLXhjb2RlLWZvci1pb3MtZGV2ZWxv cG1lbnQJKHJldmlzaW9uIDIyMTEzOCkKKysrIFRvb2xzL1NjcmlwdHMvY29uZmlndXJlLXhjb2Rl LWZvci1pb3MtZGV2ZWxvcG1lbnQJKHdvcmtpbmcgY29weSkKQEAgLTg4LDE3ICs4OCwyOSBAQCBz dWIgY29weU1pc3NpbmdIZWFkZXJzVG9JUGhvbmVPU1NES0lmTmVlCiAgICAgICAgIC91c3IvaW5j bHVkZS9zcWxpdGUzX3ByaXZhdGUuaAogICAgICk7CiAKKyAgICBteSAkbWFjU0RLRGlyZWN0b3J5 ID0gc2RrRGlyZWN0b3J5KCJtYWNvc3giKTsKICAgICBteSAkaXBob25lb3NTREtEaXJlY3Rvcnkg PSBzZGtEaXJlY3RvcnkoImlwaG9uZW9zIik7CiAgICAgbXkgJGlwaG9uZXNpbXVsYXRvclNES0Rp cmVjdG9yeSA9IHNka0RpcmVjdG9yeSgiaXBob25lc2ltdWxhdG9yIik7CiAKICAgICBmb3IgbXkg JGhlYWRlciAoQG1pc3NpbmdIZWFkZXJzKSB7CisgICAgICAgIG15ICRtYWNTREtQYWggPSBGaWxl OjpTcGVjLT5jYW5vbnBhdGgoRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkbWFjU0RLRGlyZWN0b3J5LCAk aGVhZGVyKSk7CiAgICAgICAgIG15ICRpcGhvbmVvc1NES1BhdGggPSBGaWxlOjpTcGVjLT5jYW5v bnBhdGgoRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkaXBob25lb3NTREtEaXJlY3RvcnksICRoZWFkZXIp KTsKICAgICAgICAgbmV4dCBpZiAoLWYgJGlwaG9uZW9zU0RLUGF0aCk7CisgICAgICAgIG5leHQg aWYgKCEtZiAkbWFjU0RLUGFoKTsKIAogICAgICAgICBteSAkaXBob25lc2ltdWxhdG9yU0RLUGF0 aCA9IEZpbGU6OlNwZWMtPmNhbm9ucGF0aChGaWxlOjpTcGVjLT5jYXRmaWxlKCRpcGhvbmVzaW11 bGF0b3JTREtEaXJlY3RvcnksICRoZWFkZXIpKTsKLSAgICAgICAgc3lzdGVtKCIvdXNyL2Jpbi9k aXR0byIsICRpcGhvbmVzaW11bGF0b3JTREtQYXRoLCAkaXBob25lb3NTREtQYXRoKTsKLSAgICAg ICAgZGllICJDb3VsZCBub3QgY29weSAkaXBob25lc2ltdWxhdG9yU0RLUGF0aCB0byAkaXBob25l b3NTREtQYXRoOiAkISIgaWYgZXhpdFN0YXR1cygkPyk7Ci0gICAgICAgIHByaW50ICJTdWNjZXNz ZnVsbHkgY29waWVkICRpcGhvbmVzaW11bGF0b3JTREtQYXRoIHRvICRpcGhvbmVvc1NES1BhdGgu XG4iOworICAgICAgICBpZiAoLWYgJGlwaG9uZXNpbXVsYXRvclNES1BhdGgpIHsKKyAgICAgICAg ICAgIHN5c3RlbSgiL3Vzci9iaW4vZGl0dG8iLCAkaXBob25lc2ltdWxhdG9yU0RLUGF0aCwgJGlw aG9uZW9zU0RLUGF0aCk7CisgICAgICAgICAgICBkaWUgIkNvdWxkIG5vdCBjb3B5ICRpcGhvbmVz aW11bGF0b3JTREtQYXRoIHRvICRpcGhvbmVvc1NES1BhdGg6ICQhIiBpZiBleGl0U3RhdHVzKCQ/ KTsKKyAgICAgICAgICAgIHByaW50ICJTdWNjZXNzZnVsbHkgY29waWVkICRpcGhvbmVzaW11bGF0 b3JTREtQYXRoIHRvICRpcGhvbmVvc1NES1BhdGguXG4iOworICAgICAgICB9IGVsc2UgeworICAg ICAgICAgICAgc3lzdGVtKCIvdXNyL2Jpbi9kaXR0byIsICRtYWNTREtQYWgsICRpcGhvbmVzaW11 bGF0b3JTREtQYXRoKTsKKyAgICAgICAgICAgIGRpZSAiQ291bGQgbm90IGNvcHkgJG1hY1NES1Bh aCB0byAkaXBob25lc2ltdWxhdG9yU0RLUGF0aDogJCEiIGlmIGV4aXRTdGF0dXMoJD8pOworICAg ICAgICAgICAgc3lzdGVtKCIvdXNyL2Jpbi9kaXR0byIsICRtYWNTREtQYWgsICRpcGhvbmVvc1NE S1BhdGgpOworICAgICAgICAgICAgZGllICJDb3VsZCBub3QgY29weSAkbWFjU0RLUGFoIHRvICRp cGhvbmVvc1NES1BhdGg6ICQhIiBpZiBleGl0U3RhdHVzKCQ/KTsKKyAgICAgICAgICAgIHByaW50 ICJTdWNjZXNzZnVsbHkgY29waWVkICRtYWNTREtQYWggdG8gJGlwaG9uZXNpbXVsYXRvclNES1Bh dGggYW5kICRpcGhvbmVvc1NES1BhdGguXG4iOworICAgICAgICB9CisKICAgICB9CiB9CiAK 319016 2017-08-24 14:11:35 -0700 2017-08-24 14:42:48 -0700 Patch bug-173937-20170824141134.patch text/plain 2916 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyMTE0NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE3LTA4LTI0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBVcGRhdGUgY29uZmlndXJlLXhjb2RlLWZvci1pb3MtZGV2ZWxvcG1lbnQg Zm9yIGlPUyAxMQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTczOTM3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMzAzODkyND4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBYY29kZSA5IGhhcyByZW1vdmVk IHNvbWUgaGVhZGVycyByZXF1aXJlZCBieSBXZWJLaXQgYnVpbGRzIGZvciB0ZXN0aW5nLgorCisg ICAgICAgICogU2NyaXB0cy9jb25maWd1cmUteGNvZGUtZm9yLWlvcy1kZXZlbG9wbWVudDoKKyAg ICAgICAgKGNvcHlNaXNzaW5nSGVhZGVyc1RvSVBob25lT1NTREtJZk5lZWRlZCk6IE1vdmUgc29t ZSByZXF1aXJlZCBjb2RlIGZyb20gTWFjT1MgU0RLCisgICAgICAgIHRvIGJlIHVzZWQgYnkgaU9T IFNpbXVsYXRvci4KKwogMjAxNy0wOC0yNCAgRG9uIE9sbXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQHNv bnkuY29tPgogCiAgICAgICAgIFtDTWFrZV0gVXNlIGZpbmRfcGFja2FnZSBmb3IgU1FMaXRlCklu ZGV4OiBUb29scy9TY3JpcHRzL2NvbmZpZ3VyZS14Y29kZS1mb3ItaW9zLWRldmVsb3BtZW50Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvY29uZmlndXJlLXhjb2RlLWZvci1pb3MtZGV2ZWxv cG1lbnQJKHJldmlzaW9uIDIyMTEzOCkKKysrIFRvb2xzL1NjcmlwdHMvY29uZmlndXJlLXhjb2Rl LWZvci1pb3MtZGV2ZWxvcG1lbnQJKHdvcmtpbmcgY29weSkKQEAgLTcyLDYgKzcyLDEzIEBAIGNv cHlNaXNzaW5nSGVhZGVyc1RvSVBob25lT1NTREtJZk5lZWRlZCgKIAogZXhpdCAwOwogCitzdWIg YXNzZXJ0RGl0dG9TdWNjZXNzZnVsKCQkKQoreworICAgIG15ICgkc291cmNlLCAkZGVzdGluYXRp b24pID0gQF87CisgICAgc3lzdGVtKCIvdXNyL2Jpbi9kaXR0byIsICRzb3VyY2UsICRkZXN0aW5h dGlvbik7CisgICAgZGllICJDb3VsZCBub3QgY29weSAkc291cmNlIHRvICRkZXN0aW5hdGlvbjog JCEiIGlmIGV4aXRTdGF0dXMoJD8pOworfQorCiBzdWIgY29weU1pc3NpbmdIZWFkZXJzVG9JUGhv bmVPU1NES0lmTmVlZGVkKCkKIHsKICAgICBteSBAbWlzc2luZ0hlYWRlcnMgPSBxdygKQEAgLTg4 LDE3ICs5NSwyNiBAQCBzdWIgY29weU1pc3NpbmdIZWFkZXJzVG9JUGhvbmVPU1NES0lmTmVlCiAg ICAgICAgIC91c3IvaW5jbHVkZS9zcWxpdGUzX3ByaXZhdGUuaAogICAgICk7CiAKKyAgICBteSAk bWFjU0RLRGlyZWN0b3J5ID0gc2RrRGlyZWN0b3J5KCJtYWNvc3giKTsKICAgICBteSAkaXBob25l b3NTREtEaXJlY3RvcnkgPSBzZGtEaXJlY3RvcnkoImlwaG9uZW9zIik7CiAgICAgbXkgJGlwaG9u ZXNpbXVsYXRvclNES0RpcmVjdG9yeSA9IHNka0RpcmVjdG9yeSgiaXBob25lc2ltdWxhdG9yIik7 CiAKICAgICBmb3IgbXkgJGhlYWRlciAoQG1pc3NpbmdIZWFkZXJzKSB7CisgICAgICAgIG15ICRt YWNTREtQYXRoID0gRmlsZTo6U3BlYy0+Y2Fub25wYXRoKEZpbGU6OlNwZWMtPmNhdGZpbGUoJG1h Y1NES0RpcmVjdG9yeSwgJGhlYWRlcikpOwogICAgICAgICBteSAkaXBob25lb3NTREtQYXRoID0g RmlsZTo6U3BlYy0+Y2Fub25wYXRoKEZpbGU6OlNwZWMtPmNhdGZpbGUoJGlwaG9uZW9zU0RLRGly ZWN0b3J5LCAkaGVhZGVyKSk7CiAgICAgICAgIG5leHQgaWYgKC1mICRpcGhvbmVvc1NES1BhdGgp OworICAgICAgICBuZXh0IGlmICghLWYgJG1hY1NES1BhdGgpOwogCiAgICAgICAgIG15ICRpcGhv bmVzaW11bGF0b3JTREtQYXRoID0gRmlsZTo6U3BlYy0+Y2Fub25wYXRoKEZpbGU6OlNwZWMtPmNh dGZpbGUoJGlwaG9uZXNpbXVsYXRvclNES0RpcmVjdG9yeSwgJGhlYWRlcikpOwotICAgICAgICBz eXN0ZW0oIi91c3IvYmluL2RpdHRvIiwgJGlwaG9uZXNpbXVsYXRvclNES1BhdGgsICRpcGhvbmVv c1NES1BhdGgpOwotICAgICAgICBkaWUgIkNvdWxkIG5vdCBjb3B5ICRpcGhvbmVzaW11bGF0b3JT REtQYXRoIHRvICRpcGhvbmVvc1NES1BhdGg6ICQhIiBpZiBleGl0U3RhdHVzKCQ/KTsKLSAgICAg ICAgcHJpbnQgIlN1Y2Nlc3NmdWxseSBjb3BpZWQgJGlwaG9uZXNpbXVsYXRvclNES1BhdGggdG8g JGlwaG9uZW9zU0RLUGF0aC5cbiI7CisgICAgICAgIGlmICgtZiAkaXBob25lc2ltdWxhdG9yU0RL UGF0aCkgeworICAgICAgICAgICAgYXNzZXJ0RGl0dG9TdWNjZXNzZnVsKCRpcGhvbmVzaW11bGF0 b3JTREtQYXRoLCAkaXBob25lb3NTREtQYXRoKTsKKyAgICAgICAgICAgIHByaW50ICJTdWNjZXNz ZnVsbHkgY29waWVkICRpcGhvbmVzaW11bGF0b3JTREtQYXRoIHRvICRpcGhvbmVvc1NES1BhdGgu XG4iOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgYXNzZXJ0RGl0dG9TdWNjZXNzZnVs KCRtYWNTREtQYXRoLCAkaXBob25lc2ltdWxhdG9yU0RLUGF0aCk7CisgICAgICAgICAgICBhc3Nl cnREaXR0b1N1Y2Nlc3NmdWwoJG1hY1NES1BhdGgsICRpcGhvbmVvc1NES1BhdGgpOworICAgICAg ICAgICAgcHJpbnQgIlN1Y2Nlc3NmdWxseSBjb3BpZWQgJG1hY1NES1BhdGggdG8gJGlwaG9uZXNp bXVsYXRvclNES1BhdGggYW5kICRpcGhvbmVvc1NES1BhdGguXG4iOworICAgICAgICB9CisKICAg ICB9CiB9CiAK 319018 2017-08-24 14:42:49 -0700 2017-08-24 15:37:47 -0700 Patch bug-173937-20170824144248.patch text/plain 3518 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyMTE2MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDE3LTA4LTI0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBVcGRhdGUgY29uZmlndXJlLXhjb2RlLWZvci1pb3MtZGV2ZWxvcG1lbnQg Zm9yIGlPUyAxMQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTczOTM3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMzAzODkyND4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBYY29kZSA5IGhhcyByZW1vdmVk IHNvbWUgaGVhZGVycyByZXF1aXJlZCBieSBXZWJLaXQgYnVpbGRzIGZvciB0ZXN0aW5nLgorCisg ICAgICAgICogU2NyaXB0cy9jb25maWd1cmUteGNvZGUtZm9yLWlvcy1kZXZlbG9wbWVudDoKKyAg ICAgICAgKGNvcHlNaXNzaW5nSGVhZGVyc0Zyb21TREtUb1NES0lmTmVlZGVkKTogQ29weSBhbGwg bWlzc2luZyBoZWFkZXIgZnJvbSBvbmUgU0RLCisgICAgICAgIGludG8gYW5vdGhlciBpZiB0aG9z ZSBoZWFkZXJzIGRvIG5vdCBleGlzdCBpbiB0aGUgZGVzdGluYXRpb24gU0RLLgorICAgICAgICAo Y29weU1pc3NpbmdIZWFkZXJzVG9JUGhvbmVPU1NES0lmTmVlZGVkKTogRGVsZXRlZC4KKwogMjAx Ny0wOC0yNCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAg ICBMYXlvdXQgc2l6ZSBvdmVycmlkZSBjaGFuZ2VzIGR1cmluZyBpbi1mbGlnaHQgYW5pbWF0ZWQg cmVzaXplIGFyZSBkcm9wcGVkIG9uIHRoZSBmbG9vciBmb3JldmVyCkluZGV4OiBUb29scy9TY3Jp cHRzL2NvbmZpZ3VyZS14Y29kZS1mb3ItaW9zLWRldmVsb3BtZW50Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvY29uZmlndXJlLXhjb2RlLWZvci1pb3MtZGV2ZWxvcG1lbnQJKHJldmlzaW9u IDIyMTE2MCkKKysrIFRvb2xzL1NjcmlwdHMvY29uZmlndXJlLXhjb2RlLWZvci1pb3MtZGV2ZWxv cG1lbnQJKHdvcmtpbmcgY29weSkKQEAgLTQwLDcgKzQwLDcgQEAgdXNlIEZpbmRCaW47CiB1c2Ug bGliICRGaW5kQmluOjpCaW47CiB1c2Ugd2Via2l0ZGlyczsKIAotc3ViIGNvcHlNaXNzaW5nSGVh ZGVyc1RvSVBob25lT1NTREtJZk5lZWRlZCgpOworc3ViIGNvcHlNaXNzaW5nSGVhZGVyc0Zyb21T REtUb1NES0lmTmVlZGVkKCQkKTsKIHN1YiBjb3B5TWlzc2luZ1hTTFRIZWFkZXJzVG9TREtJZk5l ZWRlZCgkKTsKIHN1YiBjcmVhdGVMZWdhY3lYY29kZVNwZWNpZmljYXRpb25GaWxlc0ZvclNES0lm TmVlZGVkKCQpOwogc3ViIG1lcmdlWGNvZGVTcGVjaWZpY2F0aW9uV2l0aFNwZWNpZmljYXRpb25B bmRJZCgkJCQpOwpAQCAtNjgsMTEgKzY4LDEyIEBAIGZvciBteSAkc2RrIChxdyhpcGhvbmVvcyBp cGhvbmVzaW11bGF0b3IKICAgICBjb3B5TWlzc2luZ1hTTFRIZWFkZXJzVG9TREtJZk5lZWRlZCgk c2RrKTsKIH0KIAotY29weU1pc3NpbmdIZWFkZXJzVG9JUGhvbmVPU1NES0lmTmVlZGVkKCk7Citj b3B5TWlzc2luZ0hlYWRlcnNGcm9tU0RLVG9TREtJZk5lZWRlZCgibWFjb3N4IiwgImlwaG9uZXNp bXVsYXRvciIpOworY29weU1pc3NpbmdIZWFkZXJzRnJvbVNES1RvU0RLSWZOZWVkZWQoImlwaG9u ZXNpbXVsYXRvciIsICJpcGhvbmVvcyIpOwogCiBleGl0IDA7CiAKLXN1YiBjb3B5TWlzc2luZ0hl YWRlcnNUb0lQaG9uZU9TU0RLSWZOZWVkZWQoKQorc3ViIGNvcHlNaXNzaW5nSGVhZGVyc0Zyb21T REtUb1NES0lmTmVlZGVkKCQkKQogewogICAgIG15IEBtaXNzaW5nSGVhZGVycyA9IHF3KAogICAg ICAgICAvdXNyL2luY2x1ZGUvY3J0X2V4dGVybnMuaApAQCAtODgsMTcgKzg5LDE5IEBAIHN1YiBj b3B5TWlzc2luZ0hlYWRlcnNUb0lQaG9uZU9TU0RLSWZOZWUKICAgICAgICAgL3Vzci9pbmNsdWRl L3NxbGl0ZTNfcHJpdmF0ZS5oCiAgICAgKTsKIAotICAgIG15ICRpcGhvbmVvc1NES0RpcmVjdG9y eSA9IHNka0RpcmVjdG9yeSgiaXBob25lb3MiKTsKLSAgICBteSAkaXBob25lc2ltdWxhdG9yU0RL RGlyZWN0b3J5ID0gc2RrRGlyZWN0b3J5KCJpcGhvbmVzaW11bGF0b3IiKTsKKyAgICBteSAoJHNv dXJjZVNESywgJGRlc3RpbmF0aW9uU0RLKSA9IEBfOworICAgIG15ICRzb3VyY2VEaXJlY3Rvcnkg PSBzZGtEaXJlY3RvcnkoJHNvdXJjZVNESyk7CisgICAgbXkgJGRlc3RpbmF0aW9uRGlyZWN0b3J5 ID0gc2RrRGlyZWN0b3J5KCRkZXN0aW5hdGlvblNESyk7CiAKICAgICBmb3IgbXkgJGhlYWRlciAo QG1pc3NpbmdIZWFkZXJzKSB7Ci0gICAgICAgIG15ICRpcGhvbmVvc1NES1BhdGggPSBGaWxlOjpT cGVjLT5jYW5vbnBhdGgoRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkaXBob25lb3NTREtEaXJlY3Rvcnks ICRoZWFkZXIpKTsKLSAgICAgICAgbmV4dCBpZiAoLWYgJGlwaG9uZW9zU0RLUGF0aCk7Ci0KLSAg ICAgICAgbXkgJGlwaG9uZXNpbXVsYXRvclNES1BhdGggPSBGaWxlOjpTcGVjLT5jYW5vbnBhdGgo RmlsZTo6U3BlYy0+Y2F0ZmlsZSgkaXBob25lc2ltdWxhdG9yU0RLRGlyZWN0b3J5LCAkaGVhZGVy KSk7Ci0gICAgICAgIHN5c3RlbSgiL3Vzci9iaW4vZGl0dG8iLCAkaXBob25lc2ltdWxhdG9yU0RL UGF0aCwgJGlwaG9uZW9zU0RLUGF0aCk7Ci0gICAgICAgIGRpZSAiQ291bGQgbm90IGNvcHkgJGlw aG9uZXNpbXVsYXRvclNES1BhdGggdG8gJGlwaG9uZW9zU0RLUGF0aDogJCEiIGlmIGV4aXRTdGF0 dXMoJD8pOwotICAgICAgICBwcmludCAiU3VjY2Vzc2Z1bGx5IGNvcGllZCAkaXBob25lc2ltdWxh dG9yU0RLUGF0aCB0byAkaXBob25lb3NTREtQYXRoLlxuIjsKKyAgICAgICAgbXkgJHNvdXJjZVBh dGggPSBGaWxlOjpTcGVjLT5jYW5vbnBhdGgoRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkc291cmNlRGly ZWN0b3J5LCAkaGVhZGVyKSk7CisgICAgICAgIG15ICRkZXN0aW5hdGlvblBhdGggPSBGaWxlOjpT cGVjLT5jYW5vbnBhdGgoRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkZGVzdGluYXRpb25EaXJlY3Rvcnks ICRoZWFkZXIpKTsKKyAgICAgICAgbmV4dCBpZiAoLWYgJGRlc3RpbmF0aW9uUGF0aCk7CisgICAg ICAgIG5leHQgaWYgKCEtZiAkc291cmNlUGF0aCk7CisKKyAgICAgICAgc3lzdGVtKCIvdXNyL2Jp bi9kaXR0byIsICRzb3VyY2VQYXRoLCAkZGVzdGluYXRpb25QYXRoKTsKKyAgICAgICAgZGllICJD b3VsZCBub3QgY29weSAkc291cmNlUGF0aCB0byAkZGVzdGluYXRpb25QYXRoOiAkISIgaWYgZXhp dFN0YXR1cygkPyk7CisgICAgICAgIHByaW50ICJTdWNjZXNzZnVsbHkgY29waWVkICRzb3VyY2VQ YXRoIHRvICRkZXN0aW5hdGlvblBhdGguXG4iOwogICAgIH0KIH0KIAo= 319028 2017-08-24 15:37:48 -0700 2017-08-24 16:18:19 -0700 Patch for landing bug-173937-20170824153747.patch text/plain 4117 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyMTE2NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI5IEBACisyMDE3LTA4LTI0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBVcGRhdGUgY29uZmlndXJlLXhjb2RlLWZvci1pb3MtZGV2ZWxvcG1lbnQg Zm9yIGlPUyAxMQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTczOTM3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMzAzODkyND4KKworICAgICAgICBS ZXZpZXdlZCBieSBEYW5pZWwgQmF0ZXMuCisKKyAgICAgICAgWGNvZGUgOSBoYXMgcmVtb3ZlZCB0 aGUgZm9sbG93aW5nIGhlYWRlcnMgZnJvbSB0aGUgaU9TIDExIFNpbXVsYXRvciBTREs6CisgICAg ICAgICAgICAgICAgL3Vzci9pbmNsdWRlL2NydF9leHRlcm5zLmgKKyAgICAgICAgICAgICAgICAv dXNyL2luY2x1ZGUvbWFjaC9tYWNoX3R5cGVzLmRlZnMKKyAgICAgICAgICAgICAgICAvdXNyL2lu Y2x1ZGUvbWFjaC9tYWNoaW5lL21hY2hpbmVfdHlwZXMuZGVmcworICAgICAgICAgICAgICAgIC91 c3IvaW5jbHVkZS9tYWNoL3N0ZF90eXBlcy5kZWZzCisgICAgICAgICAgICAgICAgL3Vzci9pbmNs dWRlL29iamMvb2JqYy1jbGFzcy5oCisgICAgICAgICAgICAgICAgL3Vzci9pbmNsdWRlL29iamMv b2JqYy1ydW50aW1lLmgKKyAgICAgICAgICAgICAgICAvdXNyL2luY2x1ZGUvb2JqYy9Qcm90b2Nv bC5oCisgICAgICAgICAgICAgICAgL3Vzci9pbmNsdWRlL3JlYWRsaW5lL2hpc3RvcnkuaAorICAg ICAgICAgICAgICAgIC91c3IvaW5jbHVkZS9yZWFkbGluZS9yZWFkbGluZS5oCisgICAgICAgIFRv IHNvbHZlIHRoaXMgcHJvYmxlbSwgY29uZmlndXJlLXhjb2RlLWZvci1pb3MtZGV2ZWxvcG1lbnQg Y29waWVzIHRoZXNlIGhlYWRlcnMKKyAgICAgICAgZnJvbSB0aGUgYWN0aXZlIG1hY09TIFNESyBp bnRvIHRoZSBpT1MgU2ltdWxhdG9yIFNESy4KKworICAgICAgICAqIFNjcmlwdHMvY29uZmlndXJl LXhjb2RlLWZvci1pb3MtZGV2ZWxvcG1lbnQ6CisgICAgICAgIChjb3B5TWlzc2luZ0hlYWRlcnNG cm9tU0RLVG9TREtJZk5lZWRlZCk6IENvcHkgYWxsIG1pc3NpbmcgaGVhZGVyIGZyb20gb25lIFNE SworICAgICAgICBpbnRvIGFub3RoZXIgaWYgdGhvc2UgaGVhZGVycyBkbyBub3QgZXhpc3QgaW4g dGhlIGRlc3RpbmF0aW9uIFNESy4KKyAgICAgICAgKGNvcHlNaXNzaW5nSGVhZGVyc1RvSVBob25l T1NTREtJZk5lZWRlZCk6IERlbGV0ZWQuCisKIDIwMTctMDgtMjQgIEFsZXggQ2hyaXN0ZW5zZW4g IDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQgV0tVSURlbGVnYXRlUHJp dmF0ZSBjYWxsYmFjayBjb3JyZXNwb25kaW5nIHRvIFBhZ2VVSUNsaWVudCdzIGRpZE5vdEhhbmRs ZVdoZWVsRXZlbnQKSW5kZXg6IFRvb2xzL1NjcmlwdHMvY29uZmlndXJlLXhjb2RlLWZvci1pb3Mt ZGV2ZWxvcG1lbnQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9jb25maWd1cmUteGNvZGUt Zm9yLWlvcy1kZXZlbG9wbWVudAkocmV2aXNpb24gMjIxMTY0KQorKysgVG9vbHMvU2NyaXB0cy9j b25maWd1cmUteGNvZGUtZm9yLWlvcy1kZXZlbG9wbWVudAkod29ya2luZyBjb3B5KQpAQCAtNDAs NyArNDAsNyBAQCB1c2UgRmluZEJpbjsKIHVzZSBsaWIgJEZpbmRCaW46OkJpbjsKIHVzZSB3ZWJr aXRkaXJzOwogCi1zdWIgY29weU1pc3NpbmdIZWFkZXJzVG9JUGhvbmVPU1NES0lmTmVlZGVkKCk7 CitzdWIgY29weU1pc3NpbmdIZWFkZXJzRnJvbVNES1RvU0RLSWZOZWVkZWQoJCQpOwogc3ViIGNv cHlNaXNzaW5nWFNMVEhlYWRlcnNUb1NES0lmTmVlZGVkKCQpOwogc3ViIGNyZWF0ZUxlZ2FjeVhj b2RlU3BlY2lmaWNhdGlvbkZpbGVzRm9yU0RLSWZOZWVkZWQoJCk7CiBzdWIgbWVyZ2VYY29kZVNw ZWNpZmljYXRpb25XaXRoU3BlY2lmaWNhdGlvbkFuZElkKCQkJCk7CkBAIC02OCwxMSArNjgsMTIg QEAgZm9yIG15ICRzZGsgKHF3KGlwaG9uZW9zIGlwaG9uZXNpbXVsYXRvcgogICAgIGNvcHlNaXNz aW5nWFNMVEhlYWRlcnNUb1NES0lmTmVlZGVkKCRzZGspOwogfQogCi1jb3B5TWlzc2luZ0hlYWRl cnNUb0lQaG9uZU9TU0RLSWZOZWVkZWQoKTsKK2NvcHlNaXNzaW5nSGVhZGVyc0Zyb21TREtUb1NE S0lmTmVlZGVkKCJtYWNvc3giLCAiaXBob25lc2ltdWxhdG9yIik7Citjb3B5TWlzc2luZ0hlYWRl cnNGcm9tU0RLVG9TREtJZk5lZWRlZCgiaXBob25lc2ltdWxhdG9yIiwgImlwaG9uZW9zIik7CiAK IGV4aXQgMDsKIAotc3ViIGNvcHlNaXNzaW5nSGVhZGVyc1RvSVBob25lT1NTREtJZk5lZWRlZCgp CitzdWIgY29weU1pc3NpbmdIZWFkZXJzRnJvbVNES1RvU0RLSWZOZWVkZWQoJCQpCiB7CiAgICAg bXkgQG1pc3NpbmdIZWFkZXJzID0gcXcoCiAgICAgICAgIC91c3IvaW5jbHVkZS9jcnRfZXh0ZXJu cy5oCkBAIC04OCwxNyArODksMTkgQEAgc3ViIGNvcHlNaXNzaW5nSGVhZGVyc1RvSVBob25lT1NT REtJZk5lZQogICAgICAgICAvdXNyL2luY2x1ZGUvc3FsaXRlM19wcml2YXRlLmgKICAgICApOwog Ci0gICAgbXkgJGlwaG9uZW9zU0RLRGlyZWN0b3J5ID0gc2RrRGlyZWN0b3J5KCJpcGhvbmVvcyIp OwotICAgIG15ICRpcGhvbmVzaW11bGF0b3JTREtEaXJlY3RvcnkgPSBzZGtEaXJlY3RvcnkoImlw aG9uZXNpbXVsYXRvciIpOworICAgIG15ICgkc291cmNlU0RLLCAkZGVzdGluYXRpb25TREspID0g QF87CisgICAgbXkgJHNvdXJjZURpcmVjdG9yeSA9IHNka0RpcmVjdG9yeSgkc291cmNlU0RLKTsK KyAgICBteSAkZGVzdGluYXRpb25EaXJlY3RvcnkgPSBzZGtEaXJlY3RvcnkoJGRlc3RpbmF0aW9u U0RLKTsKIAogICAgIGZvciBteSAkaGVhZGVyIChAbWlzc2luZ0hlYWRlcnMpIHsKLSAgICAgICAg bXkgJGlwaG9uZW9zU0RLUGF0aCA9IEZpbGU6OlNwZWMtPmNhbm9ucGF0aChGaWxlOjpTcGVjLT5j YXRmaWxlKCRpcGhvbmVvc1NES0RpcmVjdG9yeSwgJGhlYWRlcikpOwotICAgICAgICBuZXh0IGlm ICgtZiAkaXBob25lb3NTREtQYXRoKTsKLQotICAgICAgICBteSAkaXBob25lc2ltdWxhdG9yU0RL UGF0aCA9IEZpbGU6OlNwZWMtPmNhbm9ucGF0aChGaWxlOjpTcGVjLT5jYXRmaWxlKCRpcGhvbmVz aW11bGF0b3JTREtEaXJlY3RvcnksICRoZWFkZXIpKTsKLSAgICAgICAgc3lzdGVtKCIvdXNyL2Jp bi9kaXR0byIsICRpcGhvbmVzaW11bGF0b3JTREtQYXRoLCAkaXBob25lb3NTREtQYXRoKTsKLSAg ICAgICAgZGllICJDb3VsZCBub3QgY29weSAkaXBob25lc2ltdWxhdG9yU0RLUGF0aCB0byAkaXBo b25lb3NTREtQYXRoOiAkISIgaWYgZXhpdFN0YXR1cygkPyk7Ci0gICAgICAgIHByaW50ICJTdWNj ZXNzZnVsbHkgY29waWVkICRpcGhvbmVzaW11bGF0b3JTREtQYXRoIHRvICRpcGhvbmVvc1NES1Bh dGguXG4iOworICAgICAgICBteSAkc291cmNlUGF0aCA9IEZpbGU6OlNwZWMtPmNhbm9ucGF0aChG aWxlOjpTcGVjLT5jYXRmaWxlKCRzb3VyY2VEaXJlY3RvcnksICRoZWFkZXIpKTsKKyAgICAgICAg bXkgJGRlc3RpbmF0aW9uUGF0aCA9IEZpbGU6OlNwZWMtPmNhbm9ucGF0aChGaWxlOjpTcGVjLT5j YXRmaWxlKCRkZXN0aW5hdGlvbkRpcmVjdG9yeSwgJGhlYWRlcikpOworICAgICAgICBuZXh0IGlm ICgtZiAkZGVzdGluYXRpb25QYXRoKTsKKyAgICAgICAgbmV4dCBpZiAoIS1mICRzb3VyY2VQYXRo KTsKKworICAgICAgICBzeXN0ZW0oIi91c3IvYmluL2RpdHRvIiwgJHNvdXJjZVBhdGgsICRkZXN0 aW5hdGlvblBhdGgpOworICAgICAgICBkaWUgIkNvdWxkIG5vdCBjb3B5ICRzb3VyY2VQYXRoIHRv ICRkZXN0aW5hdGlvblBhdGg6ICQhIiBpZiBleGl0U3RhdHVzKCQ/KTsKKyAgICAgICAgcHJpbnQg IlN1Y2Nlc3NmdWxseSBjb3BpZWQgJHNvdXJjZVBhdGggdG8gJGRlc3RpbmF0aW9uUGF0aC5cbiI7 CiAgICAgfQogfQogCg==