177595 2017-09-27 23:54:18 -0700 run-safari --ios-simulator is no longer working with Xcode 9 2019-09-26 13:55:00 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=199852 InRadar P2 Normal --- 178203 1 fred.wang fred.wang ap dbates dean_johnson fred.wang jbedard lforschler mitz simon.fraser webkit-bug-importer oldest_to_newest 1354053 0 fred.wang 2017-09-27 23:54:18 -0700 I've recently upgraded XCode to version 9 (released 2017/09/19) and rebuilt Safari but when I try running Safari on the simulator, I get the following errors: Tools/Scripts/build-safari --ios-simulator --debug Tools/Scripts/run-safari --ios-simulator Quitting and launching iOS Simulator... Installing /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator11.0.sdk/Applications/MobileSafari.app. An error was encountered processing the command (domain=NSPOSIXErrorDomain, code=2): Failed to install the requested application An application bundle was not found at the provided path. Provide a valid path to the desired application bundle. Died at /Users/fred/WebKit/Tools/Scripts/webkitdirs.pm line 2546. can not find any MobileSafari.app in my WebKitBuild directory nor in the /Applications/ directory calculated by webkitdirs.pm ; trying to hardcode a different path in webkitdirs.pm I instead obtain: Quitting and launching iOS Simulator... Installing /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/Applications/MobileSafari.app. An error was encountered processing the command (domain=IXUserPresentableErrorDomain, code=2): This app was unable to be installed. Died at /Users/fred/WebKit/Tools/Scripts/webkitdirs.pm line 2546. Note that run-webkit-tests --ios-simulator works as expected. 1354117 1 ap 2017-09-28 09:15:24 -0700 > /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator11.0.sdk/Applications/MobileSafari.app. It's now here: /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/Applications/MobileSafari.app Given that we no longer support older OS versions, the expedient fix will be to change the hardcoded path. Frédéric, would you be willing to post a patch after confirming that this works? 1354121 2 fred.wang 2017-09-28 09:27:29 -0700 (In reply to Alexey Proskuryakov from comment #1) > It's now here: > /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/ > Developer/Library/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/ > Resources/RuntimeRoot/Applications/MobileSafari.app > > Given that we no longer support older OS versions, the expedient fix will be > to change the hardcoded path. Frédéric, would you be willing to post a patch > after confirming that this works? I would be happy to do so. However, as I said in my first comment after changing the hardcoded path I got a different message: "This app was unable to be installed.". So maybe more is needed. I won't be able to try again in upcoming days. 1354131 3 ap 2017-09-28 09:34:58 -0700 Sorry, I didn't realize that you changed it to the same path (just misread the bug description). I wonder why we are trying to install MobileSafari in the first place. 1354132 4 jbedard 2017-09-28 09:36:49 -0700 Should we even be using the SDK to determine the app bundle ID? It seems like it would be better to just launch using com.apple.MobileSafari directly instead of going through the SDK to compute the bundle ID. Also, given Frédéric's comment, it seems like that code-path attempts to install the app as well. Which it shouldn't since, it's a system installed app...that would likely mean that the path returned by iosSimulatorApplicationsPath(...) is not correct. 1358745 5 fred.wang 2017-10-10 06:12:13 -0700 (In reply to Frédéric Wang (:fredw) from comment #2) > I would be happy to do so. However, as I said in my first comment after > changing the hardcoded path I got a different message: "This app was unable > to be installed.". So maybe more is needed. I won't be able to try again in > upcoming days. (In reply to Jonathan Bedard from comment #4) > Also, given Frédéric's comment, it seems like that code-path attempts to > install the app as well. Which it shouldn't since, it's a system installed > app...that would likely mean that the path returned by > iosSimulatorApplicationsPath(...) is not correct. Hi. I just went back to Paris and had time to check again. Indeed, hardcoding the new path in iosSimulatorApplicationsPath rather than runIOSWebKitAppInSimulator does allow to launch Safari again, thanks. I'll try and upload a patch. 1358751 6 323303 fred.wang 2017-10-10 06:49:29 -0700 Created attachment 323303 Patch 1358864 7 323303 jbedard 2017-10-10 13:18:27 -0700 Comment on attachment 323303 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=323303&action=review Minor nit-pick, generally, looks good. (Note that I'm not a reviewer) > Tools/Scripts/webkitdirs.pm:2315 > + my $iphoneOSPlatformPath = `xcrun --sdk iphoneos --show-sdk-platform-path`; > + die 'Failed to get iphoneOS SDK platform path from xcrun' if $?; > + chomp $iphoneOSPlatformPath; Take a look at the code in Tools/Scripts/configure-xcode-for-ios-development, line 223. That does this same sort of thing a little bit more concisely. 1358888 8 jbedard 2017-10-10 13:55:17 -0700 Credit to Dean Johnson for pointing this out: could we retain compatibility with Xcode 7/8? This code won't work for Xcode 8 (I just checked) and there are a few tools which use this code-path, we can't guarantee we won't run with old Xcode versions. webkitdirs.pm has a function, determineXcodeVersion(), which should do the trick. 1358892 9 fred.wang 2017-10-10 13:59:08 -0700 @Jonathan: Thanks for the feedback, I'll upload a new version tomorrow. 1358893 10 ap 2017-10-10 13:59:16 -0700 What are the situations where you expect having Xcode 7/8? I think that only Xcode 9 works with iOS 11 simulator, and we only support building for iOS 11. 1359091 11 323398 fred.wang 2017-10-11 02:09:08 -0700 Created attachment 323398 Patch I added Jonathan's suggestion to check Xcode version. If that's not needed, it is straightforward to remove the corresponding code. 1359187 12 jbedard 2017-10-11 08:43:04 -0700 Unofficial r+ on attachment 323398. It seems reasonable to not deliberately break Xcode <9.0, even if we don't currently support iOS WebKit on Xcode <9.0, although, I will note that after looking through how we use this code path, breaking Xcode <9.0 shouldn't have any effect on CI infrastructure. 1359311 13 ap 2017-10-11 12:11:41 -0700 Jonathan and Dean, have you come to the agreement that the check is needed after all? 1359528 14 323398 dbates 2017-10-11 22:37:14 -0700 Comment on attachment 323398 Patch If we do not support Xcode 9 for iOS WebKit development/we no longer have any Xcode 9 iOS simulator builders on build.webkit.org/no longer have any Xcode 9 iOS Simulator EWS bots then we should remove the conditional code in webkitdirs::iosSimulatorApplicationsPath(). 1359530 15 323398 dbates 2017-10-11 22:43:05 -0700 Comment on attachment 323398 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=323398&action=review > Tools/ChangeLog:8 > + In XCode 9, the path of the simulator application is now in a new CoreSimulator subdirectory XCode => Xcode (Please fix all occurrences throughout this change log) > Tools/ChangeLog:13 > + * Scripts/configure-xcode-for-ios-development: Move sdkDirectory and sdkPlatformDirectory sdkDirectory => sdkDirectory() sdkPlatformDirectory => sdkPlatformDirectory() (As they are functions, please fix all occurrences throughout this change log) > Tools/ChangeLog:20 > + (XcodeSDKPath): Rely on sdkDirectory to implement this function. Ditto. > Tools/ChangeLog:22 > + by relying on sdkPlatformDirectory. Ditto. > Tools/Scripts/webkitdirs.pm:85 > &iosVersion I know you did not add this line. I suggest moving this line such that this export list is in sorted order according to the hr UNIX sort command. 1359548 16 fred.wang 2017-10-12 01:37:58 -0700 Committed r223234: <https://trac.webkit.org/changeset/223234> 1359549 17 webkit-bug-importer 2017-10-12 01:38:48 -0700 <rdar://problem/34951701> 323303 2017-10-10 06:49:29 -0700 2017-10-11 02:09:08 -0700 Patch bug-177595-20171010154928.patch text/plain 1807 fred.wang U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzMTMxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDYyNTliNDBhNDBmZDg5N2QyYzI4N2MwMjdhN2RhODAx NzRkZDA3ZS4uMTI1Njk2N2NmNTE4YjZmZjM2N2Q3ZjNjYjUzODc4MjQxZWEyOTQ5OSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE3LTEwLTEwICBGcmVkZXJpYyBXYW5nICA8ZndhbmdAaWdhbGlhLmNvbT4KKworICAg ICAgICBydW4tc2FmYXJpIC0taW9zLXNpbXVsYXRvciBpcyBubyBsb25nZXIgd29ya2luZyB3aXRo IFhDb2RlIDkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE3NzU5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEluIFhDb2RlIDksIHRoZSBwYXRoIG9mIHRoZSBzaW11bGF0b3IgYXBwbGljYXRpb24gaXMgbm93 IGluIGEgbmV3IENvcmVTaW11bGF0b3Igc3ViZGlyZWN0b3J5CisgICAgICAgIG9mIHRoZSBpcGhv bmVPUyBTREsgcGxhdGZvcm0uIFRoaXMgcGF0Y2ggdXBkYXRlcyB0aGUgbGF1bmNoZXIgc2NyaXB0 IHRvIHVzZSB0aGUgbmV3IHBhdGggc28KKyAgICAgICAgdGhhdCBpdCBpcyBwb3NzaWJsZSB0byBy dW4gU2FmYXJpIG9uIGlPUyBzaW11bGF0b3IgYWdhaW4uCisKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdGRpcnMucG06CisgICAgICAgIChpb3NTaW11bGF0b3JBcHBsaWNhdGlvbnNQYXRoKTogQ2Fs Y3VsYXRlIHRoZSBuZXcgcGF0aC4KKwogMjAxNy0xMC0wOSAgWW91ZW5uIEZhYmxldCAgPHlvdWVu bkBhcHBsZS5jb20+CiAKICAgICAgICAgVmVjdG9yIHNob3VsZCBiZSBhYmxlIHRvIGVhc2lseSBj cmVhdGUgZnJvbSBhIGxpc3Qgb2YgbW92YWJsZSBvbmx5IGl0ZW1zCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5k ZXggNGQ3YmM2ZTVkNjZmZWY3OTUyMmRlYzBmYTI4N2JjYTJkMDg3N2JhMy4uYTI5YTg1NjQxMmUx N2JiZGU3NTA3YjljNjBiZGI3NDk5YmUxZGE1NyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMjMxMCw3 ICsyMzEwLDEyIEBAIHN1YiBzZXR1cElPU1dlYktpdEVudmlyb25tZW50KCQpCiAKIHN1YiBpb3NT aW11bGF0b3JBcHBsaWNhdGlvbnNQYXRoKCkKIHsKLSAgICByZXR1cm4gRmlsZTo6U3BlYy0+Y2F0 ZGlyKFhjb2RlU0RLUGF0aCgpLCAiQXBwbGljYXRpb25zIik7CisgICAgbXkgJGlwaG9uZU9TUGxh dGZvcm1QYXRoID0gYHhjcnVuIC0tc2RrIGlwaG9uZW9zIC0tc2hvdy1zZGstcGxhdGZvcm0tcGF0 aGA7CisgICAgZGllICdGYWlsZWQgdG8gZ2V0IGlwaG9uZU9TIFNESyBwbGF0Zm9ybSBwYXRoIGZy b20geGNydW4nIGlmICQ/OworICAgIGNob21wICRpcGhvbmVPU1BsYXRmb3JtUGF0aDsKKworICAg IG15ICRzaW11bGF0b3JBcHBsaWNhdGlvbnNQYXRoID0gIkRldmVsb3Blci9MaWJyYXJ5L0NvcmVT aW11bGF0b3IvUHJvZmlsZXMvUnVudGltZXMvaU9TLnNpbXJ1bnRpbWUvQ29udGVudHMvUmVzb3Vy Y2VzL1J1bnRpbWVSb290L0FwcGxpY2F0aW9ucyI7CisgICAgcmV0dXJuIEZpbGU6OlNwZWMtPmNh dGRpcigkaXBob25lT1NQbGF0Zm9ybVBhdGgsICRzaW11bGF0b3JBcHBsaWNhdGlvbnNQYXRoKTsK IH0KIAogc3ViIGluc3RhbGxlZE1vYmlsZVNhZmFyaUJ1bmRsZSgpCg== 323398 2017-10-11 02:09:08 -0700 2017-10-11 22:37:14 -0700 Patch 0001-Bug-177595-run-safari-ios-simulator-is-no-longer-wor.patch text/plain 5378 fred.wang RnJvbSBiMDFmYTE4ZGE2MTk1OGQzMTE0YWZiZDQ5Yzk5YjA1NjI0NmMxY2IwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGcmVkZXJpYyBXYW5nIDxmd2FuZ0BpZ2FsaWEuY29tPgpEYXRl OiBXZWQsIDExIE9jdCAyMDE3IDExOjAzOjE0ICswMjAwClN1YmplY3Q6IFtQQVRDSF0gQnVnIDE3 NzU5NSAtIHJ1bi1zYWZhcmkgLS1pb3Mtc2ltdWxhdG9yIGlzIG5vIGxvbmdlciB3b3JraW5nCiB3 aXRoIFhDb2RlIDkKCi0tLQogVG9vbHMvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB8IDIzICsrKysrKysrKysrKysrKysKIFRvb2xzL1NjcmlwdHMvY29uZmlndXJl LXhjb2RlLWZvci1pb3MtZGV2ZWxvcG1lbnQgfCAxOCAtLS0tLS0tLS0tLS0tCiBUb29scy9TY3Jp cHRzL3dlYmtpdGRpcnMucG0gICAgICAgICAgICAgICAgICAgICAgIHwgMzMgKysrKysrKysrKysr KysrKysrLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgNDkgaW5zZXJ0aW9ucygrKSwgMjUgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmlu ZGV4IDA2MjU5YjQwYTQuLjY3OWU1NjMyNmQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZwor KysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxNy0xMC0xMSAgRnJlZGVy aWMgV2FuZyAgPGZ3YW5nQGlnYWxpYS5jb20+CisKKyAgICAgICAgcnVuLXNhZmFyaSAtLWlvcy1z aW11bGF0b3IgaXMgbm8gbG9uZ2VyIHdvcmtpbmcgd2l0aCBYQ29kZSA5CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzc1OTUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBYQ29kZSA5LCB0aGUgcGF0aCBv ZiB0aGUgc2ltdWxhdG9yIGFwcGxpY2F0aW9uIGlzIG5vdyBpbiBhIG5ldyBDb3JlU2ltdWxhdG9y IHN1YmRpcmVjdG9yeQorICAgICAgICBvZiB0aGUgaXBob25lT1MgU0RLIHBsYXRmb3JtLiBUaGlz IHBhdGNoIHVwZGF0ZXMgd2Via2l0ZGlycy5wbSB0byB1c2UgdGhlIG5ldyBwYXRoIGluCisgICAg ICAgIFhDb2RlIDkgb3IgaGlnaGVyIHNvIHRoYXQgaXQgaXMgcG9zc2libGUgdG8gcnVuIFNhZmFy aSBvbiB0aGUgaU9TIHNpbXVsYXRvciBhZ2Fpbi4gSXQgYWxzbworICAgICAgICBkb2VzIHNvbWUg bWlub3IgY29kZSByZWZhY3RvcmluZyB0byBpbXByb3ZlIGNvZGUgcmV1c2UuCisKKyAgICAgICAg KiBTY3JpcHRzL2NvbmZpZ3VyZS14Y29kZS1mb3ItaW9zLWRldmVsb3BtZW50OiBNb3ZlIHNka0Rp cmVjdG9yeSBhbmQgc2RrUGxhdGZvcm1EaXJlY3RvcnkKKyAgICAgICAgaW50byB3ZWJraXRkaXJz LgorICAgICAgICAoc2RrRGlyZWN0b3J5KTogRGVsZXRlZC4KKyAgICAgICAgKHNka1BsYXRmb3Jt RGlyZWN0b3J5KTogRGVsZXRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06IEV4 cG9zZSBuZXcgc2RrRGlyZWN0b3J5IGFuZCBzZGtQbGF0Zm9ybURpcmVjdG9yeS4KKyAgICAgICAg KHNka0RpcmVjdG9yeSk6IE1vdmVkIGZyb20gY29uZmlndXJlLXhjb2RlLWZvci1pb3MtZGV2ZWxv cG1lbnQuCisgICAgICAgIChzZGtQbGF0Zm9ybURpcmVjdG9yeSk6IERpdHRvLgorICAgICAgICAo WGNvZGVTREtQYXRoKTogUmVseSBvbiBzZGtEaXJlY3RvcnkgdG8gaW1wbGVtZW50IHRoaXMgZnVu Y3Rpb24uCisgICAgICAgIChpb3NTaW11bGF0b3JBcHBsaWNhdGlvbnNQYXRoKTogSW4gWENvZGUg OSBvciBoaWdoZXIgdXNlIHRoZSBuZXcgcGF0aC4gSXQgaXMgY2FsY3VsYXRlZAorICAgICAgICBi eSByZWx5aW5nIG9uIHNka1BsYXRmb3JtRGlyZWN0b3J5LgorCiAyMDE3LTEwLTA5ICBZb3Vlbm4g RmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBWZWN0b3Igc2hvdWxkIGJlIGFi bGUgdG8gZWFzaWx5IGNyZWF0ZSBmcm9tIGEgbGlzdCBvZiBtb3ZhYmxlIG9ubHkgaXRlbXMKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvY29uZmlndXJlLXhjb2RlLWZvci1pb3MtZGV2ZWxvcG1l bnQgYi9Ub29scy9TY3JpcHRzL2NvbmZpZ3VyZS14Y29kZS1mb3ItaW9zLWRldmVsb3BtZW50Cmlu ZGV4IDIwMWIzMmFhMjguLmQyYjkwZTQwYTEgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvY29u ZmlndXJlLXhjb2RlLWZvci1pb3MtZGV2ZWxvcG1lbnQKKysrIGIvVG9vbHMvU2NyaXB0cy9jb25m aWd1cmUteGNvZGUtZm9yLWlvcy1kZXZlbG9wbWVudApAQCAtNDUsOCArNDUsNiBAQCBzdWIgY29w eU1pc3NpbmdYU0xUSGVhZGVyc1RvU0RLSWZOZWVkZWQoJCk7CiBzdWIgY3JlYXRlTGVnYWN5WGNv ZGVTcGVjaWZpY2F0aW9uRmlsZXNGb3JTREtJZk5lZWRlZCgkKTsKIHN1YiBtZXJnZVhjb2RlU3Bl Y2lmaWNhdGlvbldpdGhTcGVjaWZpY2F0aW9uQW5kSWQoJCQkKTsKIHN1YiByZWFkWGNvZGVTcGVj aWZpY2F0aW9uQnlJZCgkJCk7Ci1zdWIgc2RrRGlyZWN0b3J5KCQpOwotc3ViIHNka1BsYXRmb3Jt RGlyZWN0b3J5KCQpOwogc3ViIHVwZGF0ZVhjb2RlN1NwZWNpZmljYXRpb25GaWxlKCQpOwogc3Vi IHVwZGF0ZVhjb2RlU3BlY2lmaWNhdGlvbkZpbGVzRm9yU0RLSWZOZWVkZWQoJCk7CiBzdWIgeGNv ZGVTREtTcGVjaWZpY2F0aW9uc1BhdGgoJCk7CkBAIC0yMTIsMjIgKzIxMCw2IEBAIHN1YiBjcmVh dGVMZWdhY3lYY29kZVNwZWNpZmljYXRpb25GaWxlc0ZvclNES0lmTmVlZGVkKCQpCiAgICAgfQog fQogCi1zdWIgc2RrRGlyZWN0b3J5KCQpCi17Ci0gICAgbXkgKCRzZGtOYW1lKSA9IEBfOwotICAg IGNob21wKG15ICRzZGtEaXJlY3RvcnkgPSBgeGNydW4gLS1zZGsgJyRzZGtOYW1lJyAtLXNob3ct c2RrLXBhdGhgKTsKLSAgICBkaWUgIkZhaWxlZCB0byBnZXQgU0RLIHBhdGggZnJvbSB4Y3J1bjog JCEiIGlmIGV4aXRTdGF0dXMoJD8pOwotICAgIHJldHVybiAkc2RrRGlyZWN0b3J5OwotfQotCi1z dWIgc2RrUGxhdGZvcm1EaXJlY3RvcnkoJCkKLXsKLSAgICBteSAoJHNka05hbWUpID0gQF87Ci0g ICAgY2hvbXAobXkgJHNka1BsYXRmb3JtRGlyZWN0b3J5ID0gYHhjcnVuIC0tc2RrICckc2RrTmFt ZScgLS1zaG93LXNkay1wbGF0Zm9ybS1wYXRoYCk7Ci0gICAgZGllICJGYWlsZWQgdG8gZ2V0IFNE SyBwbGF0Zm9ybSBwYXRoIGZyb20geGNydW46ICQhIiBpZiBleGl0U3RhdHVzKCQ/KTsKLSAgICBy ZXR1cm4gJHNka1BsYXRmb3JtRGlyZWN0b3J5OwotfQotCiBzdWIgd3JpdGVYY29kZVNwZWNpZmlj YXRpb24oJCQpCiB7CiAgICAgbXkgKCR4Y29kZVNwZWNpZmljYXRpb25GaWxlLCAkc3BlY2lmaWNh dGlvbikgPSBAXzsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCA0ZDdiYzZlNWQ2Li41ZWY1ODJlMjNjIDEw MDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRkaXJzLnBtCkBAIC04Myw2ICs4Myw4IEBAIEJFR0lOIHsKICAgICAgICAmcnVuTWFj V2ViS2l0QXBwCiAgICAgICAgJnNhZmFyaVBhdGgKICAgICAgICAmaW9zVmVyc2lvbgorICAgICAg ICZzZGtEaXJlY3RvcnkKKyAgICAgICAmc2RrUGxhdGZvcm1EaXJlY3RvcnkKICAgICAgICAmc2V0 Q29uZmlndXJhdGlvbgogICAgICAgICZzZXR1cE1hY1dlYktpdEVudmlyb25tZW50CiAgICAgICAg JnNoYXJlZENvbW1hbmRMaW5lT3B0aW9ucwpAQCAtMTY1LDYgKzE2NywyMiBAQCBzdWIgZXhpdFN0 YXR1cygkKTsKIHN1YiBmaW5kTWF0Y2hpbmdBcmd1bWVudHMoJCQpOwogc3ViIGhhc0FyZ3VtZW50 KCQkKTsKIAorc3ViIHNka0RpcmVjdG9yeSgkKQoreworICAgIG15ICgkc2RrTmFtZSkgPSBAXzsK KyAgICBjaG9tcChteSAkc2RrRGlyZWN0b3J5ID0gYHhjcnVuIC0tc2RrICckc2RrTmFtZScgLS1z aG93LXNkay1wYXRoYCk7CisgICAgZGllICJGYWlsZWQgdG8gZ2V0IFNESyBwYXRoIGZyb20geGNy dW46ICQhIiBpZiBleGl0U3RhdHVzKCQ/KTsKKyAgICByZXR1cm4gJHNka0RpcmVjdG9yeTsKK30K Kworc3ViIHNka1BsYXRmb3JtRGlyZWN0b3J5KCQpCit7CisgICAgbXkgKCRzZGtOYW1lKSA9IEBf OworICAgIGNob21wKG15ICRzZGtQbGF0Zm9ybURpcmVjdG9yeSA9IGB4Y3J1biAtLXNkayAnJHNk a05hbWUnIC0tc2hvdy1zZGstcGxhdGZvcm0tcGF0aGApOworICAgIGRpZSAiRmFpbGVkIHRvIGdl dCBTREsgcGxhdGZvcm0gcGF0aCBmcm9tIHhjcnVuOiAkISIgaWYgZXhpdFN0YXR1cygkPyk7Cisg ICAgcmV0dXJuICRzZGtQbGF0Zm9ybURpcmVjdG9yeTsKK30KKwogc3ViIGRldGVybWluZVNvdXJj ZURpcgogewogICAgIHJldHVybiBpZiAkc291cmNlRGlyOwpAQCAtNTQwLDEyICs1NTgsNyBAQCBz dWIgWGNvZGVTREtQYXRoCiAgICAgZGV0ZXJtaW5lWGNvZGVTREsoKTsKIAogICAgIGRpZSAiQ2Fu J3QgZmluZCB0aGUgU0RLIHBhdGggYmVjYXVzZSBubyBYY29kZSBTREsgd2FzIHNwZWNpZmllZCIg aWYgbm90ICR4Y29kZVNESzsKLQotICAgIG15ICRzZGtQYXRoID0gYHhjcnVuIC0tc2RrICR4Y29k ZVNESyAtLXNob3ctc2RrLXBhdGhgIGlmICR4Y29kZVNESzsKLSAgICBkaWUgJ0ZhaWxlZCB0byBn ZXQgU0RLIHBhdGggZnJvbSB4Y3J1bicgaWYgJD87Ci0gICAgY2hvbXAgJHNka1BhdGg7Ci0KLSAg ICByZXR1cm4gJHNka1BhdGg7CisgICAgcmV0dXJuIHNka0RpcmVjdG9yeSgkeGNvZGVTREspOwog fQogCiBzdWIgeGNvZGVTREtWZXJzaW9uCkBAIC0yMzEwLDcgKzIzMjMsMTMgQEAgc3ViIHNldHVw SU9TV2ViS2l0RW52aXJvbm1lbnQoJCkKIAogc3ViIGlvc1NpbXVsYXRvckFwcGxpY2F0aW9uc1Bh dGgoKQogewotICAgIHJldHVybiBGaWxlOjpTcGVjLT5jYXRkaXIoWGNvZGVTREtQYXRoKCksICJB cHBsaWNhdGlvbnMiKTsKKyAgICBkZXRlcm1pbmVYY29kZVZlcnNpb24oKTsKKyAgICBpZiAoZXZh bCAidiR4Y29kZVZlcnNpb24iIGx0IHY5LjApIHsKKyAgICAgICAgcmV0dXJuIEZpbGU6OlNwZWMt PmNhdGRpcihYY29kZVNES1BhdGgoKSwgIkFwcGxpY2F0aW9ucyIpOworICAgIH0KKworICAgIG15 ICRpcGhvbmVPU1BsYXRmb3JtUGF0aCA9IHNka1BsYXRmb3JtRGlyZWN0b3J5KCJpcGhvbmVvcyIp OworICAgIHJldHVybiBGaWxlOjpTcGVjLT5jYXRkaXIoJGlwaG9uZU9TUGxhdGZvcm1QYXRoLCAi RGV2ZWxvcGVyIiwgIkxpYnJhcnkiLCAiQ29yZVNpbXVsYXRvciIsICJQcm9maWxlcyIsICJSdW50 aW1lcyIsICJpT1Muc2ltcnVudGltZSIsICJDb250ZW50cyIsICJSZXNvdXJjZXMiLCAiUnVudGlt ZVJvb3QiLCAiQXBwbGljYXRpb25zIik7CiB9CiAKIHN1YiBpbnN0YWxsZWRNb2JpbGVTYWZhcmlC dW5kbGUoKQotLSAKMi4xNC4xCgo=