140704 2015-01-20 16:54:59 -0800 [iOS] Update configure-xcode-for-ios-development to copy missing headers to iphoneos SDK 2015-01-22 20:07:11 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ddkilzer ddkilzer ap dbates ddkilzer jake.nielsen.webkit oldest_to_newest 1062945 0 ddkilzer 2015-01-20 16:54:59 -0800 The iphoneos SDK is missing the <objc/objc-runtime.h> and <objc/Protocol.h> headers, so they need to be copied from the iphonesimulator SDK to make WebKit build with the external iOS SDK. This is another step in making the ios-ews queue build. 1062949 1 245035 ddkilzer 2015-01-20 17:03:29 -0800 Created attachment 245035 Patch v1 1063037 2 ddkilzer 2015-01-21 02:30:14 -0800 *** Bug 140702 has been marked as a duplicate of this bug. *** 1063040 3 245035 ddkilzer 2015-01-21 02:36:36 -0800 Comment on attachment 245035 Patch v1 Will post a new patch to include fix for Bug 140702. 1063041 4 245056 ddkilzer 2015-01-21 02:47:33 -0800 Created attachment 245056 Patch v2 1063043 5 ddkilzer 2015-01-21 02:47:57 -0800 *** Bug 140702 has been marked as a duplicate of this bug. *** 1063102 6 245056 dbates 2015-01-21 11:04:40 -0800 Comment on attachment 245056 Patch v2 View in context: https://bugs.webkit.org/attachment.cgi?id=245056&action=review > Tools/Scripts/configure-xcode-for-ios-development:85 > + die "Could not copy $iphonesimulatorSDKPath to $iphoneosSDKPath: $!" if (exitStatus($?) != 0); I take it you feel it that improves the readability of the code to explicitly check that the exit status is not zero. 1063125 7 ddkilzer 2015-01-21 11:49:39 -0800 (In reply to comment #6) > Comment on attachment 245056 [details] > Patch v2 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=245056&action=review > > > Tools/Scripts/configure-xcode-for-ios-development:85 > > + die "Could not copy $iphonesimulatorSDKPath to $iphoneosSDKPath: $!" if (exitStatus($?) != 0); > > I take it you feel it that improves the readability of the code to > explicitly check that the exit status is not zero. I don't feel strongly either way. Does most code use `!exitStatus($?)` instead of `exitStatus($?) != 0`? 1063127 8 ddkilzer 2015-01-21 11:56:10 -0800 (In reply to comment #7) > (In reply to comment #6) > > Comment on attachment 245056 [details] > > Patch v2 > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=245056&action=review > > > > > Tools/Scripts/configure-xcode-for-ios-development:85 > > > + die "Could not copy $iphonesimulatorSDKPath to $iphoneosSDKPath: $!" if (exitStatus($?) != 0); > > > > I take it you feel it that improves the readability of the code to > > explicitly check that the exit status is not zero. > > I don't feel strongly either way. Does most code use `!exitStatus($?)` > instead of `exitStatus($?) != 0`? And by `!exitStatus($?)` I meant `exitStatus($?)`. Will fix before landing. 1063205 9 ddkilzer 2015-01-21 15:22:24 -0800 Committed r178866: <http://trac.webkit.org/changeset/178866> 1063206 10 ddkilzer 2015-01-21 15:24:02 -0800 (In reply to comment #9) > Committed r178866: <http://trac.webkit.org/changeset/178866> Note that I added all the headers that were needed to successfully build for the iphoneos SDK at r178719. 1063582 11 ddkilzer 2015-01-22 20:07:11 -0800 (In reply to comment #10) > (In reply to comment #9) > > Committed r178866: <http://trac.webkit.org/changeset/178866> > > Note that I added all the headers that were needed to successfully build for > the iphoneos SDK at r178719. Follow-up fix for a runtime issue: Committed r178979: <http://trac.webkit.org/changeset/178979> 245035 2015-01-20 17:03:29 -0800 2015-01-21 02:36:36 -0800 Patch v1 bug-140704-20150120170336.patch text/plain 4879 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4NzA5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjgxMWU5MDgwNmY0ZGFmMzQ5YTk5YTk3YWE1NTYxMmY5 YzI2MDhhZS4uMzNhMjE2NTY2NjIwZTRjMTdlZGZkY2NkZWU1MzA1YjYxMmFjZGY4MCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1 IEBACiAyMDE1LTAxLTIwICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKKyAg ICAgICAgW2lPU10gVXBkYXRlIGNvbmZpZ3VyZS14Y29kZS1mb3ItaW9zLWRldmVsb3BtZW50IHRv IGNvcHkgbWlzc2luZyBvYmpjIGhlYWRlcnMgdG8gaXBob25lb3MgU0RLCisgICAgICAgIDxodHRw Oi8vd2Via2l0Lm9yZy9iLzE0MDcwND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvY29uZmlndXJlLXhjb2RlLWZvci1pb3MtZGV2ZWxv cG1lbnQ6CisgICAgICAgIC0gVXBkYXRlIGNvcHlyaWdodC4KKyAgICAgICAgLSBSZW1vdmUgRklY TUUgYWRkcmVzc2VkIGJ5IHIxNzg3MDkuCisgICAgICAgIC0gQ2FsbCBjb3B5TWlzc2luZ0hlYWRl cnNUb0lQaG9uZU9TU0RLSWZOZWVkZWQoKS4KKyAgICAgICAgKGNvcHlNaXNzaW5nSGVhZGVyc1Rv SVBob25lT1NTREtJZk5lZWRlZCk6IEFkZCBtZXRob2QgdG8gY29weQorICAgICAgICBtaXNzaW5n IGhlYWRlcnMgZnJvbSBpcGhvbmVzaW11bGF0b3IgU0RLIHRvIGlwaG9uZW9zIFNESy4KKyAgICAg ICAgKHNka0RpcmVjdG9yeSk6IEFkZCBtZXRob2QgdGhhdCByZXR1cm5zIFNESyBkaXJlY3Rvcnku CisgICAgICAgIChzZGtQbGF0Zm9ybURpcmVjdG9yeSk6IEV4dHJhY3QgbWV0aG9kIGZyb20KKyAg ICAgICAgeGNvZGVTREtTcGVjaWZpY2F0aW9uc1BhdGgoKSB0aGF0IHJldHVybnMgU0RLIHBsYXRm b3JtCisgICAgICAgIGRpcmVjdG9yeS4KKyAgICAgICAgKHhjb2RlU0RLU3BlY2lmaWNhdGlvbnNQ YXRoKTogVXBkYXRlIHRvIHVzZQorICAgICAgICBzZGtQbGF0Zm9ybURpcmVjdG9yeSgpLgorCisy MDE1LTAxLTIwICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKICAgICAgICAg W2lPU10gYnVpbGQtd2Via2l0IHNob3VsZCBub3QgdHJ5IHRvIGJ1aWxkIGpzYyBjb21tYW5kLWxp bmUgdG9vbCB3aXRoIGV4dGVybmFsIFNESwogICAgICAgICA8aHR0cDovL3dlYmtpdC5vcmcvYi8x NDA3MDI+CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvY29uZmlndXJlLXhjb2RlLWZvci1p b3MtZGV2ZWxvcG1lbnQgYi9Ub29scy9TY3JpcHRzL2NvbmZpZ3VyZS14Y29kZS1mb3ItaW9zLWRl dmVsb3BtZW50CmluZGV4IGUxZjkzZDZmOWM2NDMyNjc3Zjg5ZGUxMWRjMjk1NGYzN2QyNzg2ODQu LjcwZWY3OTZmZWY5MTA1NDNiZDUxZjNmMTg5ZjM3YjljZTBhYTNjNGYgMTAwNzU1Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvY29uZmlndXJlLXhjb2RlLWZvci1pb3MtZGV2ZWxvcG1lbnQKKysrIGIvVG9v bHMvU2NyaXB0cy9jb25maWd1cmUteGNvZGUtZm9yLWlvcy1kZXZlbG9wbWVudApAQCAtMSw2ICsx LDYgQEAKICMhL3Vzci9iaW4vcGVybCAtdwogCi0jIENvcHlyaWdodCAoQykgMjAxNCBBcHBsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjIENvcHlyaWdodCAoQykgMjAxNCwgMjAxNSBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBtb2RpZmljYXRp b24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMK QEAgLTI3LDggKzI3LDYgQEAKICMgdG9vbCBwcm9kdWN0LSBhbmQgcGFja2FnZS0gdHlwZSB1c2lu ZyB0aGUgZGVmaW5pdGlvbnMgaW4gdGhlIE9TIFggU0RLIGZvciB0aGUKICMgc2FtZSB0eXBlcy4K IAotIyBGSVhNRTogV2Ugc2hvdWxkIGFsc28gY29uZmlndXJlIFhjb2RlIHRvIHN1cHBvcnQgYnVp bGRpbmcgYSBjb21tYW5kIGxpbmUgdG9vbCBmb3IgYW4gaU9TIGRldmljZS4KLQogdXNlIHN0cmlj dDsKIHVzZSB3YXJuaW5nczsKIApAQCAtMzgsOCArMzYsMTEgQEAgdXNlIEZpbGU6OkZpbmQ7CiB1 c2UgRmlsZTo6U3BlYzsKIHVzZSBGaWxlOjpUZW1wIHF3KHRlbXBmaWxlKTsKIAorc3ViIGNvcHlN aXNzaW5nSGVhZGVyc1RvSVBob25lT1NTREtJZk5lZWRlZCgpOwogc3ViIGNyZWF0ZVhjb2RlU3Bl Y2lmaWNhdGlvbkZpbGVzRm9yU0RLSWZOZWVkZWQoJCk7CiBzdWIgY3JlYXRlWGNvZGVTcGVjaWZp Y2F0aW9uRnJvbVNwZWNpZmljYXRpb25BbmRJZCgkJCQpOworc3ViIHNka0RpcmVjdG9yeSgkKTsK K3N1YiBzZGtQbGF0Zm9ybURpcmVjdG9yeSgkKTsKIHN1YiByZWFkWGNvZGVTcGVjaWZpY2F0aW9u QnlJZCgkJCk7CiBzdWIgeGNvZGVTREtTcGVjaWZpY2F0aW9uc1BhdGgoJCk7CiAKQEAgLTU4LDgg KzU5LDMxIEBAIGZvciBteSAkc2RrIChxdyhpcGhvbmVvcyBpcGhvbmVzaW11bGF0b3IpKSB7CiAg ICAgY3JlYXRlWGNvZGVTcGVjaWZpY2F0aW9uRmlsZXNGb3JTREtJZk5lZWRlZCgkc2RrKTsKIH0K IAorY29weU1pc3NpbmdIZWFkZXJzVG9JUGhvbmVPU1NES0lmTmVlZGVkKCk7CisKIGV4aXQgMDsK IAorc3ViIGNvcHlNaXNzaW5nSGVhZGVyc1RvSVBob25lT1NTREtJZk5lZWRlZCgpCit7CisgICAg bXkgQG1pc3NpbmdIZWFkZXJzID0gcXcoCisgICAgICAgIC91c3IvaW5jbHVkZS9vYmpjL29iamMt cnVudGltZS5oCisgICAgICAgIC91c3IvaW5jbHVkZS9vYmpjL1Byb3RvY29sLmgKKyAgICApOwor CisgICAgbXkgJGlwaG9uZW9zU0RLRGlyZWN0b3J5ID0gc2RrRGlyZWN0b3J5KCJpcGhvbmVvcyIp OworICAgIG15ICRpcGhvbmVzaW11bGF0b3JTREtEaXJlY3RvcnkgPSBzZGtEaXJlY3RvcnkoImlw aG9uZXNpbXVsYXRvciIpOworCisgICAgZm9yIG15ICRoZWFkZXIgKEBtaXNzaW5nSGVhZGVycykg eworICAgICAgICBteSAkaXBob25lb3NTREtQYXRoID0gRmlsZTo6U3BlYy0+Y2Fub25wYXRoKEZp bGU6OlNwZWMtPmNhdGZpbGUoJGlwaG9uZW9zU0RLRGlyZWN0b3J5LCAkaGVhZGVyKSk7CisgICAg ICAgIG5leHQgaWYgKC1mICRpcGhvbmVvc1NES1BhdGgpOworCisgICAgICAgIG15ICRpcGhvbmVz aW11bGF0b3JTREtQYXRoID0gRmlsZTo6U3BlYy0+Y2Fub25wYXRoKEZpbGU6OlNwZWMtPmNhdGZp bGUoJGlwaG9uZXNpbXVsYXRvclNES0RpcmVjdG9yeSwgJGhlYWRlcikpOworICAgICAgICBzeXN0 ZW0oIi91c3IvYmluL2RpdHRvIiwgJGlwaG9uZXNpbXVsYXRvclNES1BhdGgsICRpcGhvbmVvc1NE S1BhdGgpOworICAgICAgICBkaWUgIkNvdWxkIG5vdCBjb3B5ICRpcGhvbmVzaW11bGF0b3JTREtQ YXRoIHRvICRpcGhvbmVvc1NES1BhdGg6ICQhIiBpZiAoZXhpdFN0YXR1cygkPykgIT0gMCk7Cisg ICAgICAgIHByaW50ICJTdWNjZXNzZnVsbHkgY29waWVkICRpcGhvbmVzaW11bGF0b3JTREtQYXRo IHRvICRpcGhvbmVvc1NES1BhdGguXG4iOworICAgIH0KK30KKwogc3ViIGNyZWF0ZVhjb2RlU3Bl Y2lmaWNhdGlvbkZpbGVzRm9yU0RLSWZOZWVkZWQoJCkKIHsKICAgICBteSAoJHNkaykgPSBAXzsK QEAgLTExOSw2ICsxNDMsMjIgQEAgc3ViIGNyZWF0ZVhjb2RlU3BlY2lmaWNhdGlvbkZpbGVzRm9y U0RLSWZOZWVkZWQoJCkKICAgICB9CiB9CiAKK3N1YiBzZGtEaXJlY3RvcnkoJCkKK3sKKyAgICBt eSAoJHNka05hbWUpID0gQF87CisgICAgY2hvbXAobXkgJHNka0RpcmVjdG9yeSA9IGB4Y3J1biAt LXNkayAnJHNka05hbWUnIC0tc2hvdy1zZGstcGF0aGApOworICAgIGRpZSAiRmFpbGVkIHRvIGdl dCBTREsgcGF0aCBmcm9tIHhjcnVuOiAkISIgaWYgKGV4aXRTdGF0dXMoJD8pICE9IDApOworICAg IHJldHVybiAkc2RrRGlyZWN0b3J5OworfQorCitzdWIgc2RrUGxhdGZvcm1EaXJlY3RvcnkoJCkK K3sKKyAgICBteSAoJHNka05hbWUpID0gQF87CisgICAgY2hvbXAobXkgJHNka1BsYXRmb3JtRGly ZWN0b3J5ID0gYHhjcnVuIC0tc2RrICckc2RrTmFtZScgLS1zaG93LXNkay1wbGF0Zm9ybS1wYXRo YCk7CisgICAgZGllICJGYWlsZWQgdG8gZ2V0IFNESyBwbGF0Zm9ybSBwYXRoIGZyb20geGNydW46 ICQhIiBpZiAoZXhpdFN0YXR1cygkPykgIT0gMCk7CisgICAgcmV0dXJuICRzZGtQbGF0Zm9ybURp cmVjdG9yeTsKK30KKwogc3ViIHdyaXRlWGNvZGVTcGVjaWZpY2F0aW9uKCQkKQogewogICAgIG15 ICgkeGNvZGVTcGVjaWZpY2F0aW9uRmlsZSwgJHNwZWNpZmljYXRpb24pID0gQF87CkBAIC0xNzcs MTAgKzIxNyw4IEBAIHN1YiByZWFkWGNvZGVTcGVjaWZpY2F0aW9uQnlJZCgkJCkKIHN1YiB4Y29k ZVNES1NwZWNpZmljYXRpb25zUGF0aCgkKQogewogICAgIG15ICgkc2RrTmFtZSkgPSBAXzsKLSAg ICBjaG9tcChteSAkc2RrUGxhdGZvcm1EaXJlY3RvcnkgPSBgeGNydW4gLS1zZGsgJyRzZGtOYW1l JyAtLXNob3ctc2RrLXBsYXRmb3JtLXBhdGhgKTsKLSAgICBkaWUgIkZhaWxlZCB0byBnZXQgU0RL IHBsYXRmb3JtIHBhdGggZnJvbSB4Y3J1biIgaWYgJD87CiAKLSAgICByZXR1cm4gRmlsZTo6U3Bl Yy0+Y2F0ZGlyKCRzZGtQbGF0Zm9ybURpcmVjdG9yeSwgIkRldmVsb3BlciIsICJMaWJyYXJ5Iiwg Ilhjb2RlIiwgIlNwZWNpZmljYXRpb25zIik7CisgICAgcmV0dXJuIEZpbGU6OlNwZWMtPmNhdGRp cihzZGtQbGF0Zm9ybURpcmVjdG9yeSgkc2RrTmFtZSksICJEZXZlbG9wZXIiLCAiTGlicmFyeSIs ICJYY29kZSIsICJTcGVjaWZpY2F0aW9ucyIpOwogfQogCiBzdWIgY3JlYXRlWGNvZGVTcGVjaWZp Y2F0aW9uRnJvbVNwZWNpZmljYXRpb25BbmRJZCgkJCQpCg== 245056 2015-01-21 02:47:33 -0800 2015-01-21 11:56:17 -0800 Patch v2 bug-140704-20150121024740.patch text/plain 4933 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4NzA5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmFmYzM5MDY3ZmU1MDA0YWM0NjYxZjQzOGE1Njc4Zjhi OGRhNWY2Mi4uZWM0NDIxY2Y4Y2VkYzUyOWMxZDdiMDEzOWIwMTdiYjc5Yzk0ODY3NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDE1LTAxLTIxICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAg ICAgICAgW2lPU10gVXBkYXRlIGNvbmZpZ3VyZS14Y29kZS1mb3ItaW9zLWRldmVsb3BtZW50IHRv IGNvcHkgbWlzc2luZyBoZWFkZXJzIHRvIGlwaG9uZW9zIFNESworICAgICAgICA8aHR0cDovL3dl YmtpdC5vcmcvYi8xNDA3MDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTY3JpcHRzL2NvbmZpZ3VyZS14Y29kZS1mb3ItaW9zLWRldmVsb3BtZW50 OgorICAgICAgICAtIFVwZGF0ZSBjb3B5cmlnaHQuCisgICAgICAgIC0gUmVtb3ZlIEZJWE1FIGFk ZHJlc3NlZCBieSByMTc4NzA5LgorICAgICAgICAtIENhbGwgY29weU1pc3NpbmdIZWFkZXJzVG9J UGhvbmVPU1NES0lmTmVlZGVkKCkuCisgICAgICAgIChjb3B5TWlzc2luZ0hlYWRlcnNUb0lQaG9u ZU9TU0RLSWZOZWVkZWQpOiBBZGQgbWV0aG9kIHRvIGNvcHkKKyAgICAgICAgbWlzc2luZyBoZWFk ZXJzIGZyb20gaXBob25lc2ltdWxhdG9yIFNESyB0byBpcGhvbmVvcyBTREsuCisgICAgICAgIChz ZGtEaXJlY3RvcnkpOiBBZGQgbWV0aG9kIHRoYXQgcmV0dXJucyBTREsgZGlyZWN0b3J5LgorICAg ICAgICAoc2RrUGxhdGZvcm1EaXJlY3RvcnkpOiBFeHRyYWN0IG1ldGhvZCBmcm9tCisgICAgICAg IHhjb2RlU0RLU3BlY2lmaWNhdGlvbnNQYXRoKCkgdGhhdCByZXR1cm5zIFNESyBwbGF0Zm9ybQor ICAgICAgICBkaXJlY3RvcnkuCisgICAgICAgICh4Y29kZVNES1NwZWNpZmljYXRpb25zUGF0aCk6 IFVwZGF0ZSB0byB1c2UKKyAgICAgICAgc2RrUGxhdGZvcm1EaXJlY3RvcnkoKS4KKwogMjAxNS0w MS0yMCAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIGNvbmZp Z3VyZS14Y29kZS1mb3ItaW9zLWRldmVsb3BtZW50IG5lZWRzIHRvIHVwZGF0ZSBpUGhvbmVPUyBT REsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvY29uZmlndXJlLXhjb2RlLWZvci1pb3MtZGV2 ZWxvcG1lbnQgYi9Ub29scy9TY3JpcHRzL2NvbmZpZ3VyZS14Y29kZS1mb3ItaW9zLWRldmVsb3Bt ZW50CmluZGV4IGUxZjkzZDZmOWM2NDMyNjc3Zjg5ZGUxMWRjMjk1NGYzN2QyNzg2ODQuLjQxZWE3 ZGQyYmY3ZWZiMTY1ZDUxMGRlYjg3OWE0ZWUyZmEyNjRlZDAgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvY29uZmlndXJlLXhjb2RlLWZvci1pb3MtZGV2ZWxvcG1lbnQKKysrIGIvVG9vbHMvU2Ny aXB0cy9jb25maWd1cmUteGNvZGUtZm9yLWlvcy1kZXZlbG9wbWVudApAQCAtMSw2ICsxLDYgQEAK ICMhL3Vzci9iaW4vcGVybCAtdwogCi0jIENvcHlyaWdodCAoQykgMjAxNCBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCisjIENvcHlyaWdodCAoQykgMjAxNCwgMjAxNSBBcHBsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291 cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTI3 LDggKzI3LDYgQEAKICMgdG9vbCBwcm9kdWN0LSBhbmQgcGFja2FnZS0gdHlwZSB1c2luZyB0aGUg ZGVmaW5pdGlvbnMgaW4gdGhlIE9TIFggU0RLIGZvciB0aGUKICMgc2FtZSB0eXBlcy4KIAotIyBG SVhNRTogV2Ugc2hvdWxkIGFsc28gY29uZmlndXJlIFhjb2RlIHRvIHN1cHBvcnQgYnVpbGRpbmcg YSBjb21tYW5kIGxpbmUgdG9vbCBmb3IgYW4gaU9TIGRldmljZS4KLQogdXNlIHN0cmljdDsKIHVz ZSB3YXJuaW5nczsKIApAQCAtMzgsOCArMzYsMTEgQEAgdXNlIEZpbGU6OkZpbmQ7CiB1c2UgRmls ZTo6U3BlYzsKIHVzZSBGaWxlOjpUZW1wIHF3KHRlbXBmaWxlKTsKIAorc3ViIGNvcHlNaXNzaW5n SGVhZGVyc1RvSVBob25lT1NTREtJZk5lZWRlZCgpOwogc3ViIGNyZWF0ZVhjb2RlU3BlY2lmaWNh dGlvbkZpbGVzRm9yU0RLSWZOZWVkZWQoJCk7CiBzdWIgY3JlYXRlWGNvZGVTcGVjaWZpY2F0aW9u RnJvbVNwZWNpZmljYXRpb25BbmRJZCgkJCQpOworc3ViIHNka0RpcmVjdG9yeSgkKTsKK3N1YiBz ZGtQbGF0Zm9ybURpcmVjdG9yeSgkKTsKIHN1YiByZWFkWGNvZGVTcGVjaWZpY2F0aW9uQnlJZCgk JCk7CiBzdWIgeGNvZGVTREtTcGVjaWZpY2F0aW9uc1BhdGgoJCk7CiAKQEAgLTU4LDggKzU5LDM0 IEBAIGZvciBteSAkc2RrIChxdyhpcGhvbmVvcyBpcGhvbmVzaW11bGF0b3IpKSB7CiAgICAgY3Jl YXRlWGNvZGVTcGVjaWZpY2F0aW9uRmlsZXNGb3JTREtJZk5lZWRlZCgkc2RrKTsKIH0KIAorY29w eU1pc3NpbmdIZWFkZXJzVG9JUGhvbmVPU1NES0lmTmVlZGVkKCk7CisKIGV4aXQgMDsKIAorc3Vi IGNvcHlNaXNzaW5nSGVhZGVyc1RvSVBob25lT1NTREtJZk5lZWRlZCgpCit7CisgICAgbXkgQG1p c3NpbmdIZWFkZXJzID0gcXcoCisgICAgICAgIC91c3IvaW5jbHVkZS9NYWNFcnJvcnMuaAorICAg ICAgICAvdXNyL2luY2x1ZGUvb2JqYy9vYmpjLXJ1bnRpbWUuaAorICAgICAgICAvdXNyL2luY2x1 ZGUvb2JqYy9Qcm90b2NvbC5oCisgICAgICAgIC91c3IvaW5jbHVkZS9yZWFkbGluZS9oaXN0b3J5 LmgKKyAgICAgICAgL3Vzci9pbmNsdWRlL3JlYWRsaW5lL3JlYWRsaW5lLmgKKyAgICApOworCisg ICAgbXkgJGlwaG9uZW9zU0RLRGlyZWN0b3J5ID0gc2RrRGlyZWN0b3J5KCJpcGhvbmVvcyIpOwor ICAgIG15ICRpcGhvbmVzaW11bGF0b3JTREtEaXJlY3RvcnkgPSBzZGtEaXJlY3RvcnkoImlwaG9u ZXNpbXVsYXRvciIpOworCisgICAgZm9yIG15ICRoZWFkZXIgKEBtaXNzaW5nSGVhZGVycykgewor ICAgICAgICBteSAkaXBob25lb3NTREtQYXRoID0gRmlsZTo6U3BlYy0+Y2Fub25wYXRoKEZpbGU6 OlNwZWMtPmNhdGZpbGUoJGlwaG9uZW9zU0RLRGlyZWN0b3J5LCAkaGVhZGVyKSk7CisgICAgICAg IG5leHQgaWYgKC1mICRpcGhvbmVvc1NES1BhdGgpOworCisgICAgICAgIG15ICRpcGhvbmVzaW11 bGF0b3JTREtQYXRoID0gRmlsZTo6U3BlYy0+Y2Fub25wYXRoKEZpbGU6OlNwZWMtPmNhdGZpbGUo JGlwaG9uZXNpbXVsYXRvclNES0RpcmVjdG9yeSwgJGhlYWRlcikpOworICAgICAgICBzeXN0ZW0o Ii91c3IvYmluL2RpdHRvIiwgJGlwaG9uZXNpbXVsYXRvclNES1BhdGgsICRpcGhvbmVvc1NES1Bh dGgpOworICAgICAgICBkaWUgIkNvdWxkIG5vdCBjb3B5ICRpcGhvbmVzaW11bGF0b3JTREtQYXRo IHRvICRpcGhvbmVvc1NES1BhdGg6ICQhIiBpZiAoZXhpdFN0YXR1cygkPykgIT0gMCk7CisgICAg ICAgIHByaW50ICJTdWNjZXNzZnVsbHkgY29waWVkICRpcGhvbmVzaW11bGF0b3JTREtQYXRoIHRv ICRpcGhvbmVvc1NES1BhdGguXG4iOworICAgIH0KK30KKwogc3ViIGNyZWF0ZVhjb2RlU3BlY2lm aWNhdGlvbkZpbGVzRm9yU0RLSWZOZWVkZWQoJCkKIHsKICAgICBteSAoJHNkaykgPSBAXzsKQEAg LTExOSw2ICsxNDYsMjIgQEAgc3ViIGNyZWF0ZVhjb2RlU3BlY2lmaWNhdGlvbkZpbGVzRm9yU0RL SWZOZWVkZWQoJCkKICAgICB9CiB9CiAKK3N1YiBzZGtEaXJlY3RvcnkoJCkKK3sKKyAgICBteSAo JHNka05hbWUpID0gQF87CisgICAgY2hvbXAobXkgJHNka0RpcmVjdG9yeSA9IGB4Y3J1biAtLXNk ayAnJHNka05hbWUnIC0tc2hvdy1zZGstcGF0aGApOworICAgIGRpZSAiRmFpbGVkIHRvIGdldCBT REsgcGF0aCBmcm9tIHhjcnVuOiAkISIgaWYgKGV4aXRTdGF0dXMoJD8pICE9IDApOworICAgIHJl dHVybiAkc2RrRGlyZWN0b3J5OworfQorCitzdWIgc2RrUGxhdGZvcm1EaXJlY3RvcnkoJCkKK3sK KyAgICBteSAoJHNka05hbWUpID0gQF87CisgICAgY2hvbXAobXkgJHNka1BsYXRmb3JtRGlyZWN0 b3J5ID0gYHhjcnVuIC0tc2RrICckc2RrTmFtZScgLS1zaG93LXNkay1wbGF0Zm9ybS1wYXRoYCk7 CisgICAgZGllICJGYWlsZWQgdG8gZ2V0IFNESyBwbGF0Zm9ybSBwYXRoIGZyb20geGNydW46ICQh IiBpZiAoZXhpdFN0YXR1cygkPykgIT0gMCk7CisgICAgcmV0dXJuICRzZGtQbGF0Zm9ybURpcmVj dG9yeTsKK30KKwogc3ViIHdyaXRlWGNvZGVTcGVjaWZpY2F0aW9uKCQkKQogewogICAgIG15ICgk eGNvZGVTcGVjaWZpY2F0aW9uRmlsZSwgJHNwZWNpZmljYXRpb24pID0gQF87CkBAIC0xNzcsMTAg KzIyMCw4IEBAIHN1YiByZWFkWGNvZGVTcGVjaWZpY2F0aW9uQnlJZCgkJCkKIHN1YiB4Y29kZVNE S1NwZWNpZmljYXRpb25zUGF0aCgkKQogewogICAgIG15ICgkc2RrTmFtZSkgPSBAXzsKLSAgICBj aG9tcChteSAkc2RrUGxhdGZvcm1EaXJlY3RvcnkgPSBgeGNydW4gLS1zZGsgJyRzZGtOYW1lJyAt LXNob3ctc2RrLXBsYXRmb3JtLXBhdGhgKTsKLSAgICBkaWUgIkZhaWxlZCB0byBnZXQgU0RLIHBs YXRmb3JtIHBhdGggZnJvbSB4Y3J1biIgaWYgJD87CiAKLSAgICByZXR1cm4gRmlsZTo6U3BlYy0+ Y2F0ZGlyKCRzZGtQbGF0Zm9ybURpcmVjdG9yeSwgIkRldmVsb3BlciIsICJMaWJyYXJ5IiwgIlhj b2RlIiwgIlNwZWNpZmljYXRpb25zIik7CisgICAgcmV0dXJuIEZpbGU6OlNwZWMtPmNhdGRpcihz ZGtQbGF0Zm9ybURpcmVjdG9yeSgkc2RrTmFtZSksICJEZXZlbG9wZXIiLCAiTGlicmFyeSIsICJY Y29kZSIsICJTcGVjaWZpY2F0aW9ucyIpOwogfQogCiBzdWIgY3JlYXRlWGNvZGVTcGVjaWZpY2F0 aW9uRnJvbVNwZWNpZmljYXRpb25BbmRJZCgkJCQpCg==