186352 2018-06-06 09:20:27 -0700 webkitperl: Generalize .internal SDK suffix 2018-06-07 09:24:56 -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 ews-watchlist lforschler ryanhaddad webkit-bug-importer oldest_to_newest 1430463 0 jbedard 2018-06-06 09:20:27 -0700 The current assumption about only embedded device sdk's appending .internal is too limiting. Generalize this code to cover all possible trailing sdk specifications. 1430464 1 webkit-bug-importer 2018-06-06 09:21:22 -0700 <rdar://problem/40853947> 1430467 2 342051 jbedard 2018-06-06 09:26:45 -0700 Created attachment 342051 Patch 1430469 3 jbedard 2018-06-06 09:27:29 -0700 (In reply to Jonathan Bedard from comment #2) > Created attachment 342051 [details] > Patch Change still needs to be verified on a few different configurations and some help messages need to be updated. 1430492 4 342051 ap 2018-06-06 10:27:53 -0700 Comment on attachment 342051 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=342051&action=review > Tools/Scripts/webkitdirs.pm:507 > +sub availableXcodeSDKS A function with this name would need to return the SDKs. I think that you want "determineAvailableXcodeSDKs". > Tools/Scripts/webkitdirs.pm:553 > + # Prefer the more specific version of an sdk, if it exists. Should just say that we prefer the internal version. > Tools/Scripts/webkitdirs.pm:558 > + next if (index($sdk, "$xcodeSDK.") == -1); and check for exactly that. 1430500 5 342060 jbedard 2018-06-06 10:39:39 -0700 Created attachment 342060 Patch 1430511 6 jbedard 2018-06-06 10:52:05 -0700 (In reply to Alexey Proskuryakov from comment #4) > Comment on attachment 342051 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=342051&action=review > > > Tools/Scripts/webkitdirs.pm:507 > > +sub availableXcodeSDKS > > A function with this name would need to return the SDKs. I think that you > want "determineAvailableXcodeSDKs". Fixed in the updated patch. > > > Tools/Scripts/webkitdirs.pm:553 > > + # Prefer the more specific version of an sdk, if it exists. > > Should just say that we prefer the internal version. > > > Tools/Scripts/webkitdirs.pm:558 > > + next if (index($sdk, "$xcodeSDK.") == -1); > > and check for exactly that. 1430534 7 dbates 2018-06-06 11:36:50 -0700 Not a fan of this parsing dance. Preferred the old style. 1430535 8 342060 dbates 2018-06-06 11:36:59 -0700 Comment on attachment 342060 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=342060&action=review > Tools/Scripts/package-root:52 > + --ios-simulator Use "iphonesimulator.*" SDK if installed, else "iphonesimulator" SDK (iOS only) Is this correct? 1430536 9 342060 dbates 2018-06-06 11:40:57 -0700 Comment on attachment 342060 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=342060&action=review > Tools/Scripts/webkitdirs.pm:513 > + if ($line =~ /-sdk (\D+)([\d\.]+)(\D*)\n/) { Specifically, not a fan of using regular expressions for this. I prefer hardcoidng the SDK name over this regex. Also prefer the failure mode of a hard coded name over a regex that may silently match something it shouldn’t. If we really need to use a regex then please split it out into its own function and add unit tests for this. 1430544 10 342069 jbedard 2018-06-06 12:05:51 -0700 Created attachment 342069 Patch 1430631 11 342096 jbedard 2018-06-06 16:56:28 -0700 Created attachment 342096 Patch 1430687 12 342096 ap 2018-06-06 20:13:13 -0700 Comment on attachment 342096 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=342096&action=review > Tools/Scripts/webkitdirs.pm:508 > +sub parseAvailableXcodeSDKS($) I think that the last s should be lower case. > Tools/Scripts/webkitdirs.pm:528 > +sub availableXcodeSDKS Ditto. 1430843 13 342171 jbedard 2018-06-07 08:45:30 -0700 Created attachment 342171 Patch for landing 1430869 14 342171 commit-queue 2018-06-07 09:24:54 -0700 Comment on attachment 342171 Patch for landing Clearing flags on attachment: 342171 Committed r232583: <https://trac.webkit.org/changeset/232583> 1430870 15 commit-queue 2018-06-07 09:24:56 -0700 All reviewed patches have been landed. Closing bug. 342051 2018-06-06 09:26:45 -0700 2018-06-06 10:39:39 -0700 Patch bug-186352-20180606092644.patch text/plain 3631 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzMjU0MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDE4LTA2LTA2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRwZXJsOiBTdXBwb3J0IG1vcmUgZGl2ZXJzZSBYY29kZSBzZGsg dHlwZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4 NjM1MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDA4NTM5NDc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06 CisgICAgICAgIChhdmFpbGFibGVYY29kZVNES1MpOiBHZW5lcmF0ZSBhIGxpc3Qgb2YgYWxsIGF2 YWlsYWJsZSBYY29kZSBTREtzIG9uIHRoaXMgbWFjaGluZS4KKyAgICAgICAgKGRldGVybWluZVhj b2RlU0RLKTogQWx3YXlzIHByZWZlciBhIG1vcmUgc3BlY2lmaWMgZW1iZWRkZWQgU0RLIGlmIG9u ZSBpcyBhdmFpbGFibGUuCisKIDIwMTgtMDYtMDUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxl LmNvbT4KIAogICAgICAgICBSZWdyZXNzaW9uKHIyMzIwODIpOiBXZWJzaXRlcyBnZXQgbG9hZGVk IGluc2lkZSBvZiBNZXNzYWdlcyBBcHAgY2hhdCB0cmFuc2NyaXB0CkluZGV4OiBUb29scy9TY3Jp cHRzL3dlYmtpdGRpcnMucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJz LnBtCShyZXZpc2lvbiAyMzI1MzkpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHdv cmtpbmcgY29weSkKQEAgLTEzMiw2ICsxMzIsNyBAQCBteSAkbWF4Q1BVTG9hZDsKIG15ICRiYXNl UHJvZHVjdERpcjsKIG15IEBiYXNlUHJvZHVjdERpck9wdGlvbjsKIG15ICRjb25maWd1cmF0aW9u OworbXkgQGF2YWlsYWJsZVhjb2RlU0RLczsKIG15ICR4Y29kZVNESzsKIG15ICRjb25maWd1cmF0 aW9uRm9yVmlzdWFsU3R1ZGlvOwogbXkgJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyOwpAQCAtNTAz LDM0ICs1MDQsNjEgQEAgc3ViIGV4dHJhY3ROb25NYWNPU0hvc3RDb25maWd1cmF0aW9uCiAgICAg cmV0dXJuIEBhcmdzOwogfQogCitzdWIgYXZhaWxhYmxlWGNvZGVTREtTCit7CisgICAgcmV0dXJu IGlmIEBhdmFpbGFibGVYY29kZVNES3M7CisgICAgQGF2YWlsYWJsZVhjb2RlU0RLcyA9ICgpOwor ICAgIAorICAgIG15IEBvdXRwdXQgPSBgeGNvZGVidWlsZCAtc2hvd3Nka3NgOworICAgIGZvcmVh Y2ggbXkgJGxpbmUgKEBvdXRwdXQpIHsKKyAgICAgICAgaWYgKCRsaW5lID1+IC8tc2RrIChcRCsp KFtcZFwuXSspKFxEKilcbi8pIHsKKyAgICAgICAgICAgIGlmICgkMykgeworICAgICAgICAgICAg ICAgIHB1c2ggQGF2YWlsYWJsZVhjb2RlU0RLcywgIiQxLiQzIjsKKyAgICAgICAgICAgIH0gZWxz ZSB7CisgICAgICAgICAgICAgICAgcHVzaCBAYXZhaWxhYmxlWGNvZGVTREtzLCAiJDEiOworICAg ICAgICAgICAgfQorICAgICAgICB9CisgICAgfQorfQorCiBzdWIgZGV0ZXJtaW5lWGNvZGVTREsK IHsKICAgICByZXR1cm4gaWYgZGVmaW5lZCAkeGNvZGVTREs7CiAgICAgbXkgJHNkazsKKyAgICAK KyAgICAjIFRoZSB1c2VyIGV4cGxpY2l0bHkgc3BlY2lmaWVkIHRoZSBzZGssIGRvbid0IGFzc3Vt ZSBhbnl0aGluZwogICAgIGlmIChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1ZHZXR0 aW5nVmFsdWUoIi0tc2RrIiwgXCRzZGspKSB7CiAgICAgICAgICR4Y29kZVNESyA9ICRzZGs7Cisg ICAgICAgIHJldHVybjsKICAgICB9CiAgICAgaWYgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVG cm9tQVJHVigiLS1kZXZpY2UiKSB8fCBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1Yo Ii0taW9zLWRldmljZSIpKSB7Ci0gICAgICAgIG15ICRoYXNJbnRlcm5hbFNESyA9IGV4aXRTdGF0 dXMoc3lzdGVtKCJ4Y3J1biAtLXNkayBpcGhvbmVvcy5pbnRlcm5hbCAtLXNob3ctc2RrLXZlcnNp b24gPiAvZGV2L251bGwgMj4mMSIpKSA9PSAwOwotICAgICAgICAkeGNvZGVTREsgfHw9ICRoYXNJ bnRlcm5hbFNESyA/ICJpcGhvbmVvcy5pbnRlcm5hbCIgOiAiaXBob25lb3MiOworICAgICAgICAk eGNvZGVTREsgfHw9ICJpcGhvbmVvcyI7CiAgICAgfQogICAgIGlmIChjaGVja0ZvckFyZ3VtZW50 QW5kUmVtb3ZlRnJvbUFSR1YoIi0tc2ltdWxhdG9yIikgfHwgY2hlY2tGb3JBcmd1bWVudEFuZFJl bW92ZUZyb21BUkdWKCItLWlvcy1zaW11bGF0b3IiKSkgewogICAgICAgICAkeGNvZGVTREsgfHw9 ICdpcGhvbmVzaW11bGF0b3InOwogICAgIH0KICAgICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJl bW92ZUZyb21BUkdWKCItLXR2b3MtZGV2aWNlIikpIHsKLSAgICAgICAgbXkgJGhhc0ludGVybmFs U0RLID0gZXhpdFN0YXR1cyhzeXN0ZW0oInhjcnVuIC0tc2RrIGFwcGxldHZvcy5pbnRlcm5hbCAt LXNob3ctc2RrLXZlcnNpb24gPiAvZGV2L251bGwgMj4mMSIpKSA9PSAwOwotICAgICAgICAkeGNv ZGVTREsgfHw9ICAkaGFzSW50ZXJuYWxTREsgPyAiYXBwbGV0dm9zLmludGVybmFsIiA6ICJhcHBs ZXR2b3MiOworICAgICAgICAkeGNvZGVTREsgfHw9ICAiYXBwbGV0dm9zIjsKICAgICB9CiAgICAg aWYgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS10dm9zLXNpbXVsYXRvciIp KSB7CiAgICAgICAgICR4Y29kZVNESyB8fD0gImFwcGxldHZzaW11bGF0b3IiOwogICAgIH0KICAg ICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItLXdhdGNob3MtZGV2aWNl IikpIHsKLSAgICAgICAgbXkgJGhhc0ludGVybmFsU0RLID0gZXhpdFN0YXR1cyhzeXN0ZW0oInhj cnVuIC0tc2RrIHdhdGNob3MuaW50ZXJuYWwgLS1zaG93LXNkay12ZXJzaW9uID4gL2Rldi9udWxs IDI+JjEiKSkgPT0gMDsKLSAgICAgICAgJHhjb2RlU0RLIHx8PSAgJGhhc0ludGVybmFsU0RLID8g IndhdGNob3MuaW50ZXJuYWwiIDogIndhdGNob3MiOworICAgICAgICAkeGNvZGVTREsgfHw9ICAi d2F0Y2hvcyI7CiAgICAgfQogICAgIGlmIChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFS R1YoIi0td2F0Y2hvcy1zaW11bGF0b3IiKSkgewogICAgICAgICAkeGNvZGVTREsgfHw9ICJ3YXRj aHNpbXVsYXRvciI7CiAgICAgfQorICAgIAorICAgICMgUHJlZmVyIHRoZSBtb3JlIHNwZWNpZmlj IHZlcnNpb24gb2YgYW4gc2RrLCBpZiBpdCBleGlzdHMuCisgICAgYXZhaWxhYmxlWGNvZGVTREtT KCk7CisgICAgCisgICAgZm9yZWFjaCBteSAkc2RrIChAYXZhaWxhYmxlWGNvZGVTREtzKSB7Cisg ICAgICAgIG5leHQgaWYgJHNkayBlcSAkeGNvZGVTREs7CisgICAgICAgIG5leHQgaWYgKGluZGV4 KCRzZGssICIkeGNvZGVTREsuIikgPT0gLTEpOworICAgICAgICAkeGNvZGVTREsgPSAkc2RrOwor ICAgICAgICBsYXN0OworICAgIH0KIH0KIAogc3ViIHhjb2RlU0RLCg== 342060 2018-06-06 10:39:39 -0700 2018-06-06 11:54:23 -0700 Patch generalizedSDKs.patch text/plain 6080 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzMjU0NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDE4LTA2LTA2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRwZXJsOiBTdXBwb3J0IG1vcmUgZGl2ZXJzZSBYY29kZSBzZGsg dHlwZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4 NjM1MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDA4NTM5NDc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2J1aWxkLXdlYmtpdDoK KyAgICAgICAgKiBTY3JpcHRzL3BhY2thZ2Utcm9vdDoKKyAgICAgICAgKHVzYWdlKToKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChhdmFpbGFibGVYY29kZVNES1Mp OiBHZW5lcmF0ZSBhIGxpc3Qgb2YgYWxsIGF2YWlsYWJsZSBYY29kZSBTREtzIG9uIHRoaXMgbWFj aGluZS4KKyAgICAgICAgKGRldGVybWluZVhjb2RlU0RLKTogQWx3YXlzIHByZWZlciBhIG1vcmUg c3BlY2lmaWMgZW1iZWRkZWQgU0RLIGlmIG9uZSBpcyBhdmFpbGFibGUuCisKIDIwMTgtMDYtMDUg IENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZWdyZXNzaW9uKHIy MzIwODIpOiBXZWJzaXRlcyBnZXQgbG9hZGVkIGluc2lkZSBvZiBNZXNzYWdlcyBBcHAgY2hhdCB0 cmFuc2NyaXB0CkluZGV4OiBUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAkocmV2aXNpb24gMjMyNTM5KQorKysgVG9vbHMv U2NyaXB0cy9idWlsZC13ZWJraXQJKHdvcmtpbmcgY29weSkKQEAgLTk5LDkgKzk5LDkgQEAgVXNh Z2U6ICRwcm9ncmFtTmFtZSBbb3B0aW9uc10gW29wdGlvbnMgdAogICAtLWRlYnVnICAgICAgICAg ICAgICAgICAgICAgICAgICAgQ29tcGlsZSB3aXRoIERlYnVnIGNvbmZpZ3VyYXRpb24KICAgLS1y ZWxlYXNlICAgICAgICAgICAgICAgICAgICAgICAgIENvbXBpbGUgd2l0aCBSZWxlYXNlIGNvbmZp Z3VyYXRpb24KICAgLS1zZGs9PHNkaz4gICAgICAgICAgICAgICAgICAgICAgIFVzZSBhIHNwZWNp ZmljIFhjb2RlIFNESyAoaU9TIGFuZCBNYWMgb25seSkKLSAgLS1pb3MtZGV2aWNlICAgICAgICAg ICAgICAgICAgICAgIFVzZSAiaXBob25lb3MuaW50ZXJuYWwiIFNESyBpZiBpbnN0YWxsZWQsIGVs c2UgImlwaG9uZW9zIiBTREsgKGlPUyBvbmx5KQorICAtLWlvcy1kZXZpY2UgICAgICAgICAgICAg ICAgICAgICAgVXNlICJpcGhvbmVvcy4qIiBTREsgaWYgaW5zdGFsbGVkLCBlbHNlICJpcGhvbmVv cyIgU0RLIChpT1Mgb25seSkKICAgLS1kZXZpY2UgICAgICAgICAgICAgICAgICAgICAgICAgIERF UFJFQ0FURUQgYWxpYXMgb2YgLS1pb3MtZGV2aWNlCi0gIC0taW9zLXNpbXVsYXRvciAgICAgICAg ICAgICAgICAgICBVc2UgdGhlIGN1cnJlbnQgaXBob25lc2ltdWxhdG9yIFNESyAoaU9TIG9ubHkp CisgIC0taW9zLXNpbXVsYXRvciAgICAgICAgICAgICAgICAgICBVc2UgImlwaG9uZXNpbXVsYXRv ci4qIiBTREsgaWYgaW5zdGFsbGVkLCBlbHNlICJpcGhvbmVzaW11bGF0b3IiIFNESyAoaU9TIG9u bHkpCiAgIC0tc2ltdWxhdG9yICAgICAgICAgICAgICAgICAgICAgICBERVBSRUNBVEVEIGFsaWFz IG9mIC0taW9zLXNpbXVsYXRvcgogICAtLWNvdmVyYWdlICAgICAgICAgICAgICAgICAgICAgICAg RW5hYmxlIGNvZGUgY292ZXJhZ2Ugc3VwcG9ydCAoTWFjIG9ubHkpCiAgIC0tYW5hbHl6ZSAgICAg ICAgICAgICAgICAgICAgICAgICBFbmFibGUgc3RhdGljIGFuYXlsc2lzIChpT1MgYW5kIE1hYyBv bmx5KQpJbmRleDogVG9vbHMvU2NyaXB0cy9wYWNrYWdlLXJvb3QKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvU2NyaXB0cy9wYWNrYWdlLXJvb3QJKHJldmlzaW9uIDIzMjUzOSkKKysrIFRvb2xzL1Njcmlw dHMvcGFja2FnZS1yb290CSh3b3JraW5nIGNvcHkpCkBAIC00Nyw5ICs0Nyw5IEBAIHN1YiB1c2Fn ZSgpCiAgICAgICAtLWhlbHAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU2hvdyB0aGlzIGhl bHAgbWVzc2FnZQogICAgICAgLS1zZGsgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFNwZWNp ZmllcyBTREsgZm9yIHdoaWNoIHRoZSByb290cyBhcmUgc3RhZ2VkCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKERlZmF1bHQ6IGN1cnJlbnRseSBpbnN0YWxsZWQgQmFz ZSBTREspCi0gICAgICAtLWlvcy1kZXZpY2UgICAgICAgICAgICAgICAgICAgICAgRXF1aXZhbGVu dCB0byAtLXNkayBpcGhvbmVvcy5pbnRlcm5hbAorICAgICAgLS1pb3MtZGV2aWNlICAgICAgICAg ICAgICAgICAgICAgIFVzZSAiaXBob25lb3MuKiIgU0RLIGlmIGluc3RhbGxlZCwgZWxzZSAiaXBo b25lb3MiIFNESyAoaU9TIG9ubHkpCiAgICAgICAtLWRldmljZSAgICAgICAgICAgICAgICAgICAg ICAgICAgREVQUkVDQVRFRCBhbGlhcyBvZiAtLWlvcy1kZXZpY2UKLSAgICAgIC0taW9zLXNpbXVs YXRvciAgICAgICAgICAgICAgICAgICBFcXVpdmFsZW50IHRvIC0tc2RrIGlwaG9uZXNpbXVsYXRv cgorICAgICAgLS1pb3Mtc2ltdWxhdG9yICAgICAgICAgICAgICAgICAgIFVzZSAiaXBob25lc2lt dWxhdG9yLioiIFNESyBpZiBpbnN0YWxsZWQsIGVsc2UgImlwaG9uZXNpbXVsYXRvciIgU0RLIChp T1Mgb25seSkKICAgICAgIC0tc2ltdWxhdG9yICAgICAgICAgICAgICAgICAgICAgICBERVBSRUNB VEVEIGFsaWFzIG9mIC0taW9zLXNpbXVsYXRvcgogICAgICAgLS1kZWJ1ZyAgICAgICAgICAgICAg ICAgICAgICAgICAgIFBhY2thZ2Ugcm9vdHMgZnJvbSBEZWJ1Zy08cGxhdGZvcm0+CiAgICAgICAt LXJlbGVhc2UgICAgICAgICAgICAgICAgICAgICAgICAgUGFja2FnZSByb290cyBmcm9tIFJlbGVh c2UtPHBsYXRmb3JtPgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkocmV2aXNpb24gMjMyNTM5KQorKysg VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCSh3b3JraW5nIGNvcHkpCkBAIC02MSw2ICs2MSw3 IEBAIEJFR0lOIHsKICAgICAgICAmYXBwRGlzcGxheU5hbWVGcm9tQnVuZGxlCiAgICAgICAgJmFw cGVuZFRvRW52aXJvbm1lbnRWYXJpYWJsZUxpc3QKICAgICAgICAmYXJjaENvbW1hbmRMaW5lQXJn dW1lbnRzRm9yUmVzdHJpY3RlZEVudmlyb25tZW50VmFyaWFibGVzCisgICAgICAgJmF2YWlsYWJs ZVhjb2RlU0RLcwogICAgICAgICZiYXNlUHJvZHVjdERpcgogICAgICAgICZjaGRpcldlYktpdAog ICAgICAgICZjaGVja0ZyYW1ld29ya3MKQEAgLTUwMywzNCArNTA0LDYxIEBAIHN1YiBleHRyYWN0 Tm9uTWFjT1NIb3N0Q29uZmlndXJhdGlvbgogICAgIHJldHVybiBAYXJnczsKIH0KIAorc3ViIGF2 YWlsYWJsZVhjb2RlU0RLUworeworICAgIG15IEByZXN1bHQgPSAoKTsKKyAgICAKKyAgICBteSBA b3V0cHV0ID0gYHhjb2RlYnVpbGQgLXNob3dzZGtzYDsKKyAgICBmb3JlYWNoIG15ICRsaW5lIChA b3V0cHV0KSB7CisgICAgICAgIGlmICgkbGluZSA9fiAvLXNkayAoXEQrKShbXGRcLl0rKShcRCop XG4vKSB7CisgICAgICAgICAgICBpZiAoJDMpIHsKKyAgICAgICAgICAgICAgICBwdXNoIEByZXN1 bHQsICIkMS4kMyI7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIHB1c2gg QHJlc3VsdCwgIiQxIjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0KKyAgICByZXR1 cm4gQHJlc3VsdDsKK30KKwogc3ViIGRldGVybWluZVhjb2RlU0RLCiB7CiAgICAgcmV0dXJuIGlm IGRlZmluZWQgJHhjb2RlU0RLOwogICAgIG15ICRzZGs7CisgICAgCisgICAgIyBUaGUgdXNlciBl eHBsaWNpdGx5IHNwZWNpZmllZCB0aGUgc2RrLCBkb24ndCBhc3N1bWUgYW55dGhpbmcKICAgICBp ZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWR2V0dGluZ1ZhbHVlKCItLXNkayIs IFwkc2RrKSkgewogICAgICAgICAkeGNvZGVTREsgPSAkc2RrOworICAgICAgICByZXR1cm47CiAg ICAgfQogICAgIGlmIChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tZGV2aWNl IikgfHwgY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItLWlvcy1kZXZpY2UiKSkg ewotICAgICAgICBteSAkaGFzSW50ZXJuYWxTREsgPSBleGl0U3RhdHVzKHN5c3RlbSgieGNydW4g LS1zZGsgaXBob25lb3MuaW50ZXJuYWwgLS1zaG93LXNkay12ZXJzaW9uID4gL2Rldi9udWxsIDI+ JjEiKSkgPT0gMDsKLSAgICAgICAgJHhjb2RlU0RLIHx8PSAkaGFzSW50ZXJuYWxTREsgPyAiaXBo b25lb3MuaW50ZXJuYWwiIDogImlwaG9uZW9zIjsKKyAgICAgICAgJHhjb2RlU0RLIHx8PSAiaXBo b25lb3MiOwogICAgIH0KICAgICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdW KCItLXNpbXVsYXRvciIpIHx8IGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS1p b3Mtc2ltdWxhdG9yIikpIHsKICAgICAgICAgJHhjb2RlU0RLIHx8PSAnaXBob25lc2ltdWxhdG9y JzsKICAgICB9CiAgICAgaWYgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS10 dm9zLWRldmljZSIpKSB7Ci0gICAgICAgIG15ICRoYXNJbnRlcm5hbFNESyA9IGV4aXRTdGF0dXMo c3lzdGVtKCJ4Y3J1biAtLXNkayBhcHBsZXR2b3MuaW50ZXJuYWwgLS1zaG93LXNkay12ZXJzaW9u ID4gL2Rldi9udWxsIDI+JjEiKSkgPT0gMDsKLSAgICAgICAgJHhjb2RlU0RLIHx8PSAgJGhhc0lu dGVybmFsU0RLID8gImFwcGxldHZvcy5pbnRlcm5hbCIgOiAiYXBwbGV0dm9zIjsKKyAgICAgICAg JHhjb2RlU0RLIHx8PSAgImFwcGxldHZvcyI7CiAgICAgfQogICAgIGlmIChjaGVja0ZvckFyZ3Vt ZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tdHZvcy1zaW11bGF0b3IiKSkgewogICAgICAgICAkeGNv ZGVTREsgfHw9ICJhcHBsZXR2c2ltdWxhdG9yIjsKICAgICB9CiAgICAgaWYgKGNoZWNrRm9yQXJn dW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS13YXRjaG9zLWRldmljZSIpKSB7Ci0gICAgICAgIG15 ICRoYXNJbnRlcm5hbFNESyA9IGV4aXRTdGF0dXMoc3lzdGVtKCJ4Y3J1biAtLXNkayB3YXRjaG9z LmludGVybmFsIC0tc2hvdy1zZGstdmVyc2lvbiA+IC9kZXYvbnVsbCAyPiYxIikpID09IDA7Ci0g ICAgICAgICR4Y29kZVNESyB8fD0gICRoYXNJbnRlcm5hbFNESyA/ICJ3YXRjaG9zLmludGVybmFs IiA6ICJ3YXRjaG9zIjsKKyAgICAgICAgJHhjb2RlU0RLIHx8PSAgIndhdGNob3MiOwogICAgIH0K ICAgICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItLXdhdGNob3Mtc2lt dWxhdG9yIikpIHsKICAgICAgICAgJHhjb2RlU0RLIHx8PSAid2F0Y2hzaW11bGF0b3IiOwogICAg IH0KKyAgICAKKyAgICAjIFByZWZlciB0aGUgbW9yZSBzcGVjaWZpYyB2ZXJzaW9uIG9mIGFuIHNk aywgaWYgaXQgZXhpc3RzLgorICAgIG15IEBhdmFpbGFibGVTREtTID0gYXZhaWxhYmxlWGNvZGVT REtTKCk7CisgICAgCisgICAgZm9yZWFjaCBteSAkc2RrIChAYXZhaWxhYmxlU0RLUykgeworICAg ICAgICBuZXh0IGlmICRzZGsgZXEgJHhjb2RlU0RLOworICAgICAgICBuZXh0IGlmIChpbmRleCgk c2RrLCAiJHhjb2RlU0RLLiIpID09IC0xKTsKKyAgICAgICAgJHhjb2RlU0RLID0gJHNkazsKKyAg ICAgICAgbGFzdDsKKyAgICB9CiB9CiAKIHN1YiB4Y29kZVNESwo= 342069 2018-06-06 12:05:51 -0700 2018-06-06 16:56:26 -0700 Patch Change.patch text/plain 5820 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzMjU1MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDE4LTA2LTA2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRwZXJsOiBHZW5lcmFsaXplIC5pbnRlcm5hbCBTREsgc3VmZml4 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODYzNTIK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQwODUzOTQ3PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9idWlsZC13ZWJraXQ6CisgICAg ICAgICogU2NyaXB0cy9wYWNrYWdlLXJvb3Q6CisgICAgICAgICh1c2FnZSk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoYXZhaWxhYmxlWGNvZGVTREtTKTogR2Vu ZXJhdGUgYSBsaXN0IG9mIGFsbCBhdmFpbGFibGUgWGNvZGUgU0RLcyBvbiB0aGlzIG1hY2hpbmUu CisgICAgICAgIChkZXRlcm1pbmVYY29kZVNESyk6IEFsd2F5cyBwcmVmZXIgLmludGVybmFsIFNE S3MgaWYgYXZhaWxhYmxlLgorCiAyMDE4LTA2LTA2ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1A YXBwbGUuY29tPgogCiAgICAgICAgIEFkanVzdCBjb21waWxlIGFuZCBydW50aW1lIGZsYWdzIHRv IG1hdGNoIHNoaXBwYWJsZSBzdGF0ZSBvZiBmZWF0dXJlcyAoUGFydCAyKQpJbmRleDogVG9vbHMv U2NyaXB0cy9idWlsZC13ZWJraXQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9idWlsZC13 ZWJraXQJKHJldmlzaW9uIDIzMjU1MCkKKysrIFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CSh3 b3JraW5nIGNvcHkpCkBAIC0xMDEsNyArMTAxLDcgQEAgVXNhZ2U6ICRwcm9ncmFtTmFtZSBbb3B0 aW9uc10gW29wdGlvbnMgdAogICAtLXNkaz08c2RrPiAgICAgICAgICAgICAgICAgICAgICAgVXNl IGEgc3BlY2lmaWMgWGNvZGUgU0RLIChpT1MgYW5kIE1hYyBvbmx5KQogICAtLWlvcy1kZXZpY2Ug ICAgICAgICAgICAgICAgICAgICAgVXNlICJpcGhvbmVvcy5pbnRlcm5hbCIgU0RLIGlmIGluc3Rh bGxlZCwgZWxzZSAiaXBob25lb3MiIFNESyAoaU9TIG9ubHkpCiAgIC0tZGV2aWNlICAgICAgICAg ICAgICAgICAgICAgICAgICBERVBSRUNBVEVEIGFsaWFzIG9mIC0taW9zLWRldmljZQotICAtLWlv cy1zaW11bGF0b3IgICAgICAgICAgICAgICAgICAgVXNlIHRoZSBjdXJyZW50IGlwaG9uZXNpbXVs YXRvciBTREsgKGlPUyBvbmx5KQorICAtLWlvcy1zaW11bGF0b3IgICAgICAgICAgICAgICAgICAg VXNlICJpcGhvbmVzaW11bGF0b3IuaW50ZXJuYWwiIFNESyBpZiBpbnN0YWxsZWQsIGVsc2UgImlw aG9uZXNpbXVsYXRvciIgU0RLIChpT1Mgb25seSkKICAgLS1zaW11bGF0b3IgICAgICAgICAgICAg ICAgICAgICAgIERFUFJFQ0FURUQgYWxpYXMgb2YgLS1pb3Mtc2ltdWxhdG9yCiAgIC0tY292ZXJh Z2UgICAgICAgICAgICAgICAgICAgICAgICBFbmFibGUgY29kZSBjb3ZlcmFnZSBzdXBwb3J0IChN YWMgb25seSkKICAgLS1hbmFseXplICAgICAgICAgICAgICAgICAgICAgICAgIEVuYWJsZSBzdGF0 aWMgYW5heWxzaXMgKGlPUyBhbmQgTWFjIG9ubHkpCkluZGV4OiBUb29scy9TY3JpcHRzL3BhY2th Z2Utcm9vdAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3BhY2thZ2Utcm9vdAkocmV2aXNp b24gMjMyNTUwKQorKysgVG9vbHMvU2NyaXB0cy9wYWNrYWdlLXJvb3QJKHdvcmtpbmcgY29weSkK QEAgLTQ3LDkgKzQ3LDkgQEAgc3ViIHVzYWdlKCkKICAgICAgIC0taGVscCAgICAgICAgICAgICAg ICAgICAgICAgICAgICBTaG93IHRoaXMgaGVscCBtZXNzYWdlCiAgICAgICAtLXNkayAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgU3BlY2lmaWVzIFNESyBmb3Igd2hpY2ggdGhlIHJvb3RzIGFy ZSBzdGFnZWQKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoRGVmYXVs dDogY3VycmVudGx5IGluc3RhbGxlZCBCYXNlIFNESykKLSAgICAgIC0taW9zLWRldmljZSAgICAg ICAgICAgICAgICAgICAgICBFcXVpdmFsZW50IHRvIC0tc2RrIGlwaG9uZW9zLmludGVybmFsCisg ICAgICAtLWlvcy1kZXZpY2UgICAgICAgICAgICAgICAgICAgICAgVXNlICJpcGhvbmVvcy5pbnRl cm5hbCIgU0RLIGlmIGluc3RhbGxlZCwgZWxzZSAiaXBob25lb3MiIFNESyAoaU9TIG9ubHkpCiAg ICAgICAtLWRldmljZSAgICAgICAgICAgICAgICAgICAgICAgICAgREVQUkVDQVRFRCBhbGlhcyBv ZiAtLWlvcy1kZXZpY2UKLSAgICAgIC0taW9zLXNpbXVsYXRvciAgICAgICAgICAgICAgICAgICBF cXVpdmFsZW50IHRvIC0tc2RrIGlwaG9uZXNpbXVsYXRvcgorICAgICAgLS1pb3Mtc2ltdWxhdG9y ICAgICAgICAgICAgICAgICAgIFVzZSAiaXBob25lc2ltdWxhdG9yLmludGVybmFsIiBTREsgaWYg aW5zdGFsbGVkLCBlbHNlICJpcGhvbmVzaW11bGF0b3IiIFNESyAoaU9TIG9ubHkpCiAgICAgICAt LXNpbXVsYXRvciAgICAgICAgICAgICAgICAgICAgICAgREVQUkVDQVRFRCBhbGlhcyBvZiAtLWlv cy1zaW11bGF0b3IKICAgICAgIC0tZGVidWcgICAgICAgICAgICAgICAgICAgICAgICAgICBQYWNr YWdlIHJvb3RzIGZyb20gRGVidWctPHBsYXRmb3JtPgogICAgICAgLS1yZWxlYXNlICAgICAgICAg ICAgICAgICAgICAgICAgIFBhY2thZ2Ugcm9vdHMgZnJvbSBSZWxlYXNlLTxwbGF0Zm9ybT4KSW5k ZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp cHRzL3dlYmtpdGRpcnMucG0JKHJldmlzaW9uIDIzMjU1MCkKKysrIFRvb2xzL1NjcmlwdHMvd2Vi a2l0ZGlycy5wbQkod29ya2luZyBjb3B5KQpAQCAtNjEsNiArNjEsNyBAQCBCRUdJTiB7CiAgICAg ICAgJmFwcERpc3BsYXlOYW1lRnJvbUJ1bmRsZQogICAgICAgICZhcHBlbmRUb0Vudmlyb25tZW50 VmFyaWFibGVMaXN0CiAgICAgICAgJmFyY2hDb21tYW5kTGluZUFyZ3VtZW50c0ZvclJlc3RyaWN0 ZWRFbnZpcm9ubWVudFZhcmlhYmxlcworICAgICAgICZhdmFpbGFibGVYY29kZVNES3MKICAgICAg ICAmYmFzZVByb2R1Y3REaXIKICAgICAgICAmY2hkaXJXZWJLaXQKICAgICAgICAmY2hlY2tGcmFt ZXdvcmtzCkBAIC01MDMsMzQgKzUwNCw2MSBAQCBzdWIgZXh0cmFjdE5vbk1hY09TSG9zdENvbmZp Z3VyYXRpb24KICAgICByZXR1cm4gQGFyZ3M7CiB9CiAKK3N1YiBhdmFpbGFibGVYY29kZVNES1MK K3sKKyAgICBteSBAcmVzdWx0ID0gKCk7CisgICAgCisgICAgbXkgQG91dHB1dCA9IGB4Y29kZWJ1 aWxkIC1zaG93c2Rrc2A7CisgICAgZm9yZWFjaCBteSAkbGluZSAoQG91dHB1dCkgeworICAgICAg ICBpZiAoJGxpbmUgPX4gLy1zZGsgKFxEKykoW1xkXC5dKykoXEQqKVxuLykgeworICAgICAgICAg ICAgaWYgKCQzKSB7CisgICAgICAgICAgICAgICAgcHVzaCBAcmVzdWx0LCAiJDEuJDMiOworICAg ICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBwdXNoIEByZXN1bHQsICIkMSI7Cisg ICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIEByZXN1bHQ7Cit9CisK IHN1YiBkZXRlcm1pbmVYY29kZVNESwogewogICAgIHJldHVybiBpZiBkZWZpbmVkICR4Y29kZVNE SzsKICAgICBteSAkc2RrOworICAgIAorICAgICMgVGhlIHVzZXIgZXhwbGljaXRseSBzcGVjaWZp ZWQgdGhlIHNkaywgZG9uJ3QgYXNzdW1lIGFueXRoaW5nCiAgICAgaWYgKGNoZWNrRm9yQXJndW1l bnRBbmRSZW1vdmVGcm9tQVJHVkdldHRpbmdWYWx1ZSgiLS1zZGsiLCBcJHNkaykpIHsKICAgICAg ICAgJHhjb2RlU0RLID0gJHNkazsKKyAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBpZiAoY2hl Y2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItLWRldmljZSIpIHx8IGNoZWNrRm9yQXJn dW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS1pb3MtZGV2aWNlIikpIHsKLSAgICAgICAgbXkgJGhh c0ludGVybmFsU0RLID0gZXhpdFN0YXR1cyhzeXN0ZW0oInhjcnVuIC0tc2RrIGlwaG9uZW9zLmlu dGVybmFsIC0tc2hvdy1zZGstdmVyc2lvbiA+IC9kZXYvbnVsbCAyPiYxIikpID09IDA7Ci0gICAg ICAgICR4Y29kZVNESyB8fD0gJGhhc0ludGVybmFsU0RLID8gImlwaG9uZW9zLmludGVybmFsIiA6 ICJpcGhvbmVvcyI7CisgICAgICAgICR4Y29kZVNESyB8fD0gImlwaG9uZW9zIjsKICAgICB9CiAg ICAgaWYgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS1zaW11bGF0b3IiKSB8 fCBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0taW9zLXNpbXVsYXRvciIpKSB7 CiAgICAgICAgICR4Y29kZVNESyB8fD0gJ2lwaG9uZXNpbXVsYXRvcic7CiAgICAgfQogICAgIGlm IChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tdHZvcy1kZXZpY2UiKSkgewot ICAgICAgICBteSAkaGFzSW50ZXJuYWxTREsgPSBleGl0U3RhdHVzKHN5c3RlbSgieGNydW4gLS1z ZGsgYXBwbGV0dm9zLmludGVybmFsIC0tc2hvdy1zZGstdmVyc2lvbiA+IC9kZXYvbnVsbCAyPiYx IikpID09IDA7Ci0gICAgICAgICR4Y29kZVNESyB8fD0gICRoYXNJbnRlcm5hbFNESyA/ICJhcHBs ZXR2b3MuaW50ZXJuYWwiIDogImFwcGxldHZvcyI7CisgICAgICAgICR4Y29kZVNESyB8fD0gICJh cHBsZXR2b3MiOwogICAgIH0KICAgICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21B UkdWKCItLXR2b3Mtc2ltdWxhdG9yIikpIHsKICAgICAgICAgJHhjb2RlU0RLIHx8PSAiYXBwbGV0 dnNpbXVsYXRvciI7CiAgICAgfQogICAgIGlmIChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJv bUFSR1YoIi0td2F0Y2hvcy1kZXZpY2UiKSkgewotICAgICAgICBteSAkaGFzSW50ZXJuYWxTREsg PSBleGl0U3RhdHVzKHN5c3RlbSgieGNydW4gLS1zZGsgd2F0Y2hvcy5pbnRlcm5hbCAtLXNob3ct c2RrLXZlcnNpb24gPiAvZGV2L251bGwgMj4mMSIpKSA9PSAwOwotICAgICAgICAkeGNvZGVTREsg fHw9ICAkaGFzSW50ZXJuYWxTREsgPyAid2F0Y2hvcy5pbnRlcm5hbCIgOiAid2F0Y2hvcyI7Cisg ICAgICAgICR4Y29kZVNESyB8fD0gICJ3YXRjaG9zIjsKICAgICB9CiAgICAgaWYgKGNoZWNrRm9y QXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS13YXRjaG9zLXNpbXVsYXRvciIpKSB7CiAgICAg ICAgICR4Y29kZVNESyB8fD0gIndhdGNoc2ltdWxhdG9yIjsKICAgICB9CisgICAgcmV0dXJuIGlm ICFkZWZpbmVkICR4Y29kZVNESzsKKyAgICAKKyAgICAjIFByZWZlciB0aGUgaW50ZXJuYWwgdmVy c2lvbiBvZiBhbiBzZGssIGlmIGl0IGV4aXN0cy4KKyAgICBteSBAYXZhaWxhYmxlU0RLUyA9IGF2 YWlsYWJsZVhjb2RlU0RLUygpOworCisgICAgZm9yZWFjaCBteSAkc2RrIChAYXZhaWxhYmxlU0RL UykgeworICAgICAgICBuZXh0IGlmICRzZGsgbmUgIiR4Y29kZVNESy5pbnRlcm5hbCI7CisgICAg ICAgICR4Y29kZVNESyA9ICRzZGs7CisgICAgICAgIGxhc3Q7CisgICAgfQogfQogCiBzdWIgeGNv ZGVTREsK 342096 2018-06-06 16:56:28 -0700 2018-06-07 08:45:28 -0700 Patch bug-186352-20180606165627.patch text/plain 9229 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzMjU2MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE4LTA2LTA2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRwZXJsOiBHZW5lcmFsaXplIC5pbnRlcm5hbCBTREsgc3VmZml4 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODYzNTIK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQwODUzOTQ3PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9idWlsZC13ZWJraXQ6CisgICAg ICAgICogU2NyaXB0cy9wYWNrYWdlLXJvb3Q6CisgICAgICAgICh1c2FnZSk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAocGFyc2VBdmFpbGFibGVYY29kZVNES1Mp OiBQYXJzZSAneGNvZGVidWlsZCAtc2hvd3Nka3MnIG91dHB1dC4KKyAgICAgICAgKGF2YWlsYWJs ZVhjb2RlU0RLUyk6IEdlbmVyYXRlIGEgbGlzdCBvZiBhbGwgYXZhaWxhYmxlIFhjb2RlIFNES3Mg b24gdGhpcyBtYWNoaW5lLgorICAgICAgICAoZGV0ZXJtaW5lWGNvZGVTREspOiBBbHdheXMgcHJl ZmVyIC5pbnRlcm5hbCBTREtzIGlmIGF2YWlsYWJsZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHBlcmwvd2Via2l0ZGlyc191bml0dGVzdC9hdmFpbGFibGVYY29kZVNES1MucGw6CisgICAgICAg IAogMjAxOC0wNi0wNiAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29tPgogCiAgICAg ICAgIFJlbmFtZSBjb2xvci1maWx0ZXIgdG8gLWFwcGxlLWNvbG9yLWZpbHRlciBhbmQgZG8gbm90 IGV4cG9zZSBpdCB0byBXZWIgY29udGVudApJbmRleDogVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJr aXQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQJKHJldmlzaW9uIDIz MjU1MCkKKysrIFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CSh3b3JraW5nIGNvcHkpCkBAIC0x MDEsNyArMTAxLDcgQEAgVXNhZ2U6ICRwcm9ncmFtTmFtZSBbb3B0aW9uc10gW29wdGlvbnMgdAog ICAtLXNkaz08c2RrPiAgICAgICAgICAgICAgICAgICAgICAgVXNlIGEgc3BlY2lmaWMgWGNvZGUg U0RLIChpT1MgYW5kIE1hYyBvbmx5KQogICAtLWlvcy1kZXZpY2UgICAgICAgICAgICAgICAgICAg ICAgVXNlICJpcGhvbmVvcy5pbnRlcm5hbCIgU0RLIGlmIGluc3RhbGxlZCwgZWxzZSAiaXBob25l b3MiIFNESyAoaU9TIG9ubHkpCiAgIC0tZGV2aWNlICAgICAgICAgICAgICAgICAgICAgICAgICBE RVBSRUNBVEVEIGFsaWFzIG9mIC0taW9zLWRldmljZQotICAtLWlvcy1zaW11bGF0b3IgICAgICAg ICAgICAgICAgICAgVXNlIHRoZSBjdXJyZW50IGlwaG9uZXNpbXVsYXRvciBTREsgKGlPUyBvbmx5 KQorICAtLWlvcy1zaW11bGF0b3IgICAgICAgICAgICAgICAgICAgVXNlICJpcGhvbmVzaW11bGF0 b3IuaW50ZXJuYWwiIFNESyBpZiBpbnN0YWxsZWQsIGVsc2UgImlwaG9uZXNpbXVsYXRvciIgU0RL IChpT1Mgb25seSkKICAgLS1zaW11bGF0b3IgICAgICAgICAgICAgICAgICAgICAgIERFUFJFQ0FU RUQgYWxpYXMgb2YgLS1pb3Mtc2ltdWxhdG9yCiAgIC0tY292ZXJhZ2UgICAgICAgICAgICAgICAg ICAgICAgICBFbmFibGUgY29kZSBjb3ZlcmFnZSBzdXBwb3J0IChNYWMgb25seSkKICAgLS1hbmFs eXplICAgICAgICAgICAgICAgICAgICAgICAgIEVuYWJsZSBzdGF0aWMgYW5heWxzaXMgKGlPUyBh bmQgTWFjIG9ubHkpCkluZGV4OiBUb29scy9TY3JpcHRzL3BhY2thZ2Utcm9vdAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9TY3JpcHRzL3BhY2thZ2Utcm9vdAkocmV2aXNpb24gMjMyNTUwKQorKysgVG9v bHMvU2NyaXB0cy9wYWNrYWdlLXJvb3QJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDkgKzQ3LDkgQEAg c3ViIHVzYWdlKCkKICAgICAgIC0taGVscCAgICAgICAgICAgICAgICAgICAgICAgICAgICBTaG93 IHRoaXMgaGVscCBtZXNzYWdlCiAgICAgICAtLXNkayAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgU3BlY2lmaWVzIFNESyBmb3Igd2hpY2ggdGhlIHJvb3RzIGFyZSBzdGFnZWQKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoRGVmYXVsdDogY3VycmVudGx5IGluc3Rh bGxlZCBCYXNlIFNESykKLSAgICAgIC0taW9zLWRldmljZSAgICAgICAgICAgICAgICAgICAgICBF cXVpdmFsZW50IHRvIC0tc2RrIGlwaG9uZW9zLmludGVybmFsCisgICAgICAtLWlvcy1kZXZpY2Ug ICAgICAgICAgICAgICAgICAgICAgVXNlICJpcGhvbmVvcy5pbnRlcm5hbCIgU0RLIGlmIGluc3Rh bGxlZCwgZWxzZSAiaXBob25lb3MiIFNESyAoaU9TIG9ubHkpCiAgICAgICAtLWRldmljZSAgICAg ICAgICAgICAgICAgICAgICAgICAgREVQUkVDQVRFRCBhbGlhcyBvZiAtLWlvcy1kZXZpY2UKLSAg ICAgIC0taW9zLXNpbXVsYXRvciAgICAgICAgICAgICAgICAgICBFcXVpdmFsZW50IHRvIC0tc2Rr IGlwaG9uZXNpbXVsYXRvcgorICAgICAgLS1pb3Mtc2ltdWxhdG9yICAgICAgICAgICAgICAgICAg IFVzZSAiaXBob25lc2ltdWxhdG9yLmludGVybmFsIiBTREsgaWYgaW5zdGFsbGVkLCBlbHNlICJp cGhvbmVzaW11bGF0b3IiIFNESyAoaU9TIG9ubHkpCiAgICAgICAtLXNpbXVsYXRvciAgICAgICAg ICAgICAgICAgICAgICAgREVQUkVDQVRFRCBhbGlhcyBvZiAtLWlvcy1zaW11bGF0b3IKICAgICAg IC0tZGVidWcgICAgICAgICAgICAgICAgICAgICAgICAgICBQYWNrYWdlIHJvb3RzIGZyb20gRGVi dWctPHBsYXRmb3JtPgogICAgICAgLS1yZWxlYXNlICAgICAgICAgICAgICAgICAgICAgICAgIFBh Y2thZ2Ugcm9vdHMgZnJvbSBSZWxlYXNlLTxwbGF0Zm9ybT4KSW5kZXg6IFRvb2xzL1NjcmlwdHMv d2Via2l0ZGlycy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0J KHJldmlzaW9uIDIzMjU1MCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2lu ZyBjb3B5KQpAQCAtNjEsNiArNjEsNyBAQCBCRUdJTiB7CiAgICAgICAgJmFwcERpc3BsYXlOYW1l RnJvbUJ1bmRsZQogICAgICAgICZhcHBlbmRUb0Vudmlyb25tZW50VmFyaWFibGVMaXN0CiAgICAg ICAgJmFyY2hDb21tYW5kTGluZUFyZ3VtZW50c0ZvclJlc3RyaWN0ZWRFbnZpcm9ubWVudFZhcmlh YmxlcworICAgICAgICZhdmFpbGFibGVYY29kZVNES3MKICAgICAgICAmYmFzZVByb2R1Y3REaXIK ICAgICAgICAmY2hkaXJXZWJLaXQKICAgICAgICAmY2hlY2tGcmFtZXdvcmtzCkBAIC01MDMsMzQg KzUwNCw3MSBAQCBzdWIgZXh0cmFjdE5vbk1hY09TSG9zdENvbmZpZ3VyYXRpb24KICAgICByZXR1 cm4gQGFyZ3M7CiB9CiAKKyMgRklYTUU6IENvbnZlcnQgdG8ganNvbiA8cmRhcjovL3Byb2JsZW0v MjE1OTQzMDg+CitzdWIgcGFyc2VBdmFpbGFibGVYY29kZVNES1MoJCkKK3sKKyAgICBteSBAb3V0 cHV0VG9QYXJzZSA9IEB7JF9bMF19OworICAgIG15IEByZXN1bHQgPSAoKTsKKyAgICBmb3JlYWNo IG15ICRsaW5lIChAb3V0cHV0VG9QYXJzZSkgeworICAgICAgICAjIEV4YW1wbGVzOgorICAgICAg ICAjICAgIGlPUyAxMi4wIC1zZGsgaXBob25lb3MxMi4wCisgICAgICAgICMgICAgU2ltdWxhdG9y IC0gaU9TIDEyLjAgLXNkayBpcGhvbmVzaW11bGF0b3IxMi4wCisgICAgICAgICMgICAgbWFjT1Mg MTAuMTQgLXNkayBtYWNvc3gxMC4xNAorICAgICAgICBpZiAoJGxpbmUgPX4gLy1zZGsgKFxEKyko W1xkXC5dKykoXEQqKVxuLykgeworICAgICAgICAgICAgaWYgKCQzKSB7CisgICAgICAgICAgICAg ICAgcHVzaCBAcmVzdWx0LCAiJDEuJDMiOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAg ICAgICAgICBwdXNoIEByZXN1bHQsICIkMSI7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAg ICB9CisgICAgcmV0dXJuIEByZXN1bHQ7Cit9CisKK3N1YiBhdmFpbGFibGVYY29kZVNES1MKK3sK KyAgICBteSBAb3V0cHV0ID0gYHhjb2RlYnVpbGQgLXNob3dzZGtzYDsKKyAgICByZXR1cm4gcGFy c2VBdmFpbGFibGVYY29kZVNES1MoXEBvdXRwdXQpOworfQorCiBzdWIgZGV0ZXJtaW5lWGNvZGVT REsKIHsKICAgICByZXR1cm4gaWYgZGVmaW5lZCAkeGNvZGVTREs7CiAgICAgbXkgJHNkazsKKyAg ICAKKyAgICAjIFRoZSB1c2VyIGV4cGxpY2l0bHkgc3BlY2lmaWVkIHRoZSBzZGssIGRvbid0IGFz c3VtZSBhbnl0aGluZwogICAgIGlmIChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1ZH ZXR0aW5nVmFsdWUoIi0tc2RrIiwgXCRzZGspKSB7CiAgICAgICAgICR4Y29kZVNESyA9ICRzZGs7 CisgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgaWYgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1v dmVGcm9tQVJHVigiLS1kZXZpY2UiKSB8fCBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFS R1YoIi0taW9zLWRldmljZSIpKSB7Ci0gICAgICAgIG15ICRoYXNJbnRlcm5hbFNESyA9IGV4aXRT dGF0dXMoc3lzdGVtKCJ4Y3J1biAtLXNkayBpcGhvbmVvcy5pbnRlcm5hbCAtLXNob3ctc2RrLXZl cnNpb24gPiAvZGV2L251bGwgMj4mMSIpKSA9PSAwOwotICAgICAgICAkeGNvZGVTREsgfHw9ICRo YXNJbnRlcm5hbFNESyA/ICJpcGhvbmVvcy5pbnRlcm5hbCIgOiAiaXBob25lb3MiOworICAgICAg ICAkeGNvZGVTREsgfHw9ICJpcGhvbmVvcyI7CiAgICAgfQogICAgIGlmIChjaGVja0ZvckFyZ3Vt ZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tc2ltdWxhdG9yIikgfHwgY2hlY2tGb3JBcmd1bWVudEFu ZFJlbW92ZUZyb21BUkdWKCItLWlvcy1zaW11bGF0b3IiKSkgewogICAgICAgICAkeGNvZGVTREsg fHw9ICdpcGhvbmVzaW11bGF0b3InOwogICAgIH0KICAgICBpZiAoY2hlY2tGb3JBcmd1bWVudEFu ZFJlbW92ZUZyb21BUkdWKCItLXR2b3MtZGV2aWNlIikpIHsKLSAgICAgICAgbXkgJGhhc0ludGVy bmFsU0RLID0gZXhpdFN0YXR1cyhzeXN0ZW0oInhjcnVuIC0tc2RrIGFwcGxldHZvcy5pbnRlcm5h bCAtLXNob3ctc2RrLXZlcnNpb24gPiAvZGV2L251bGwgMj4mMSIpKSA9PSAwOwotICAgICAgICAk eGNvZGVTREsgfHw9ICAkaGFzSW50ZXJuYWxTREsgPyAiYXBwbGV0dm9zLmludGVybmFsIiA6ICJh cHBsZXR2b3MiOworICAgICAgICAkeGNvZGVTREsgfHw9ICAiYXBwbGV0dm9zIjsKICAgICB9CiAg ICAgaWYgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS10dm9zLXNpbXVsYXRv ciIpKSB7CiAgICAgICAgICR4Y29kZVNESyB8fD0gImFwcGxldHZzaW11bGF0b3IiOwogICAgIH0K ICAgICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItLXdhdGNob3MtZGV2 aWNlIikpIHsKLSAgICAgICAgbXkgJGhhc0ludGVybmFsU0RLID0gZXhpdFN0YXR1cyhzeXN0ZW0o InhjcnVuIC0tc2RrIHdhdGNob3MuaW50ZXJuYWwgLS1zaG93LXNkay12ZXJzaW9uID4gL2Rldi9u dWxsIDI+JjEiKSkgPT0gMDsKLSAgICAgICAgJHhjb2RlU0RLIHx8PSAgJGhhc0ludGVybmFsU0RL ID8gIndhdGNob3MuaW50ZXJuYWwiIDogIndhdGNob3MiOworICAgICAgICAkeGNvZGVTREsgfHw9 ICAid2F0Y2hvcyI7CiAgICAgfQogICAgIGlmIChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJv bUFSR1YoIi0td2F0Y2hvcy1zaW11bGF0b3IiKSkgewogICAgICAgICAkeGNvZGVTREsgfHw9ICJ3 YXRjaHNpbXVsYXRvciI7CiAgICAgfQorICAgIHJldHVybiBpZiAhZGVmaW5lZCAkeGNvZGVTREs7 CisgICAgCisgICAgIyBQcmVmZXIgdGhlIGludGVybmFsIHZlcnNpb24gb2YgYW4gc2RrLCBpZiBp dCBleGlzdHMuCisgICAgbXkgQGF2YWlsYWJsZVNES1MgPSBhdmFpbGFibGVYY29kZVNES1MoKTsK KworICAgIGZvcmVhY2ggbXkgJHNkayAoQGF2YWlsYWJsZVNES1MpIHsKKyAgICAgICAgbmV4dCBp ZiAkc2RrIG5lICIkeGNvZGVTREsuaW50ZXJuYWwiOworICAgICAgICAkeGNvZGVTREsgPSAkc2Rr OworICAgICAgICBsYXN0OworICAgIH0KIH0KIAogc3ViIHhjb2RlU0RLCkluZGV4OiBUb29scy9T Y3JpcHRzL3dlYmtpdHBlcmwvd2Via2l0ZGlyc191bml0dGVzdC9hdmFpbGFibGVYY29kZVNES1Mu cGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL3dlYmtpdGRpcnNfdW5p dHRlc3QvYXZhaWxhYmxlWGNvZGVTREtTLnBsCShub25leGlzdGVudCkKKysrIFRvb2xzL1Njcmlw dHMvd2Via2l0cGVybC93ZWJraXRkaXJzX3VuaXR0ZXN0L2F2YWlsYWJsZVhjb2RlU0RLUy5wbAko d29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDY0IEBACisjIS91c3IvYmluL2VudiBwZXJsCisKKyMg Q29weXJpZ2h0IChDKSAyMDE4IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMKKyMg UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv ciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucworIyBhcmUgbWV0OgorIyAxLiAgUmVkaXN0cmlidXRpb25z IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgIG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l ci4KKyMgMi4gIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0 aGUgYWJvdmUgY29weXJpZ2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisjICAgICBkb2N1bWVudGF0aW9u IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgor IworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05U UklCVVRPUlMgYGBBUyBJUycnIEFORCBBTlkKKyMgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJ RVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAorIyBXQVJSQU5U SUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBP U0UgQVJFCisjIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRT IENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWQorIyBESVJFQ1QsIElORElSRUNULCBJTkNJ REVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUworIyAo SU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUg R09PRFMgT1IgU0VSVklDRVM7CisjIExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBC VVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTgorIyBBTlkgVEhFT1JZ IE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1Ig VE9SVAorIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFO WSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUworIyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKworIyBVbml0IHRlc3RzIGZvciB3 ZWJraXRkaXJzOjpwYXJzZUF2YWlsYWJsZVhjb2RlU0RLUygkKS4KKwordXNlIHN0cmljdDsKK3Vz ZSB3YXJuaW5nczsKKwordXNlIENvbmZpZzsKK3VzZSBUZXN0OjpNb3JlOwordXNlIHdlYmtpdGRp cnM7CisKK3BsYW4odGVzdHMgPT4gMik7CisKK215IEBmdWxsWGNvZGVidWlsZE91dHB1dCA9IDw8 RU5EID1+IG0vKF4uKlxuKS9tZzsKK2lPUyBTREtzOgoraU9TIDEyLjAgICAgICAgICAgICAgICAg ICAgICAgICAgIC1zZGsgaXBob25lb3MxMi4wCitpT1MgMTIuMCBJbnRlcm5hbCAgICAgICAgICAg ICAgICAgLXNkayBpcGhvbmVvczEyLjAuaW50ZXJuYWwKKworaU9TIFNpbXVsYXRvciBTREtzOgor U2ltdWxhdG9yIC0gaU9TIDEyLjAgSW50ZXJuYWwgICAgIC1zZGsgaXBob25lc2ltdWxhdG9yMTIu MAorCittYWNPUyBTREtzOgorbWFjT1MgMTAuMTQgICAgICAgICAgICAgICAgICAgICAgIC1zZGsg bWFjb3N4MTAuMTQKK21hY09TIDEwLjE0IEludGVybmFsICAgICAgICAgICAgICAtc2RrIG1hY29z eDEwLjE0aW50ZXJuYWwKKworRU5ECisKK215IEByZXN1bHQgPSBwYXJzZUF2YWlsYWJsZVhjb2Rl U0RLUyhcQGZ1bGxYY29kZWJ1aWxkT3V0cHV0KTsKK215IEBleHBlY3RlZFJlc3VsdCA9ICgiaXBo b25lb3MiLCAiaXBob25lb3MuaW50ZXJuYWwiLCAiaXBob25lc2ltdWxhdG9yIiwgIm1hY29zeCIs ICJtYWNvc3guaW50ZXJuYWwiKTsKK2lzX2RlZXBseShcQHJlc3VsdCwgXEBleHBlY3RlZFJlc3Vs dCwgInBhcnNlQXZhaWxhYmxlWGNvZGVTREtTOiBGdWxsIHhjb2RlYnVpbGQgb3V0cHV0Iik7CisK K215IEBjbG9zZU1hdGNoT3V0cHV0ID0gPDxFTkQgPX4gbS8oXi4qXG4pL21nOworTm9uLW1hdGNo aW5nIFNES3M6Cit3YXRjaE9TIDUuMCAgICAgICAgICAgICAgICAgICAgICAgLVNESyB3YXRjaG9z NS4wCit0dk9TIDEyLjAgICAgICAgICAgICAgICAgICAgICAgICAgLXNkayBhcHBsZXR2b3MKK2lP UyAxMi4wICAgICAgICAgICAgICAgICAgICAgICAgICAtU0RLIGlwaG9uZW9zMTIuMC5pbnRlcm5h bC40CisKK0VORAorCitteSBAZW1wdHlMaXN0ID0gKCk7CitAcmVzdWx0ID0gcGFyc2VBdmFpbGFi bGVYY29kZVNES1MoXEBjbG9zZU1hdGNoT3V0cHV0KTsKK2lzX2RlZXBseShcQHJlc3VsdCwgXEBl bXB0eUxpc3QsICJwYXJzZUF2YWlsYWJsZVhjb2RlU0RLUzogTmVhciBtYXRjaGVzIik7Cg== 342171 2018-06-07 08:45:30 -0700 2018-06-07 09:24:54 -0700 Patch for landing bug-186352-20180607084529.patch text/plain 9215 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzMjU4MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE4LTA2LTA3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRwZXJsOiBHZW5lcmFsaXplIC5pbnRlcm5hbCBTREsgc3VmZml4 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODYzNTIK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQwODUzOTQ3PgorCisgICAgICAgIFJldmlld2VkIGJ5 IEFsZXhleSBQcm9za3VyeWFrb3YuCisKKyAgICAgICAgKiBTY3JpcHRzL2J1aWxkLXdlYmtpdDoK KyAgICAgICAgKiBTY3JpcHRzL3BhY2thZ2Utcm9vdDoKKyAgICAgICAgKHVzYWdlKToKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChwYXJzZUF2YWlsYWJsZVhjb2Rl U0RLUyk6IFBhcnNlICd4Y29kZWJ1aWxkIC1zaG93c2Rrcycgb3V0cHV0LgorICAgICAgICAoYXZh aWxhYmxlWGNvZGVTREtTKTogR2VuZXJhdGUgYSBsaXN0IG9mIGFsbCBhdmFpbGFibGUgWGNvZGUg U0RLcyBvbiB0aGlzIG1hY2hpbmUuCisgICAgICAgIChkZXRlcm1pbmVYY29kZVNESyk6IEFsd2F5 cyBwcmVmZXIgLmludGVybmFsIFNES3MgaWYgYXZhaWxhYmxlLgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cGVybC93ZWJraXRkaXJzX3VuaXR0ZXN0L2F2YWlsYWJsZVhjb2RlU0RLUy5wbDoKKyAg ICAgICAgCiAyMDE4LTA2LTA3ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnku Y29tPgogCiAgICAgICAgIFtXaW5dW01pbmlCcm93c2VyXSBTdXBwb3J0IG11bHRpcGxlIHdpbmRv d3MgcHJvcGVybHkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CShyZXZpc2lvbiAyMzI1ODApCisrKyBUb29s cy9TY3JpcHRzL2J1aWxkLXdlYmtpdAkod29ya2luZyBjb3B5KQpAQCAtMTAxLDcgKzEwMSw3IEBA IFVzYWdlOiAkcHJvZ3JhbU5hbWUgW29wdGlvbnNdIFtvcHRpb25zIHQKICAgLS1zZGs9PHNkaz4g ICAgICAgICAgICAgICAgICAgICAgIFVzZSBhIHNwZWNpZmljIFhjb2RlIFNESyAoaU9TIGFuZCBN YWMgb25seSkKICAgLS1pb3MtZGV2aWNlICAgICAgICAgICAgICAgICAgICAgIFVzZSAiaXBob25l b3MuaW50ZXJuYWwiIFNESyBpZiBpbnN0YWxsZWQsIGVsc2UgImlwaG9uZW9zIiBTREsgKGlPUyBv bmx5KQogICAtLWRldmljZSAgICAgICAgICAgICAgICAgICAgICAgICAgREVQUkVDQVRFRCBhbGlh cyBvZiAtLWlvcy1kZXZpY2UKLSAgLS1pb3Mtc2ltdWxhdG9yICAgICAgICAgICAgICAgICAgIFVz ZSB0aGUgY3VycmVudCBpcGhvbmVzaW11bGF0b3IgU0RLIChpT1Mgb25seSkKKyAgLS1pb3Mtc2lt dWxhdG9yICAgICAgICAgICAgICAgICAgIFVzZSAiaXBob25lc2ltdWxhdG9yLmludGVybmFsIiBT REsgaWYgaW5zdGFsbGVkLCBlbHNlICJpcGhvbmVzaW11bGF0b3IiIFNESyAoaU9TIG9ubHkpCiAg IC0tc2ltdWxhdG9yICAgICAgICAgICAgICAgICAgICAgICBERVBSRUNBVEVEIGFsaWFzIG9mIC0t aW9zLXNpbXVsYXRvcgogICAtLWNvdmVyYWdlICAgICAgICAgICAgICAgICAgICAgICAgRW5hYmxl IGNvZGUgY292ZXJhZ2Ugc3VwcG9ydCAoTWFjIG9ubHkpCiAgIC0tYW5hbHl6ZSAgICAgICAgICAg ICAgICAgICAgICAgICBFbmFibGUgc3RhdGljIGFuYXlsc2lzIChpT1MgYW5kIE1hYyBvbmx5KQpJ bmRleDogVG9vbHMvU2NyaXB0cy9wYWNrYWdlLXJvb3QKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2Ny aXB0cy9wYWNrYWdlLXJvb3QJKHJldmlzaW9uIDIzMjU4MCkKKysrIFRvb2xzL1NjcmlwdHMvcGFj a2FnZS1yb290CSh3b3JraW5nIGNvcHkpCkBAIC00Nyw5ICs0Nyw5IEBAIHN1YiB1c2FnZSgpCiAg ICAgICAtLWhlbHAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU2hvdyB0aGlzIGhlbHAgbWVz c2FnZQogICAgICAgLS1zZGsgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFNwZWNpZmllcyBT REsgZm9yIHdoaWNoIHRoZSByb290cyBhcmUgc3RhZ2VkCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgKERlZmF1bHQ6IGN1cnJlbnRseSBpbnN0YWxsZWQgQmFzZSBTREsp Ci0gICAgICAtLWlvcy1kZXZpY2UgICAgICAgICAgICAgICAgICAgICAgRXF1aXZhbGVudCB0byAt LXNkayBpcGhvbmVvcy5pbnRlcm5hbAorICAgICAgLS1pb3MtZGV2aWNlICAgICAgICAgICAgICAg ICAgICAgIFVzZSAiaXBob25lb3MuaW50ZXJuYWwiIFNESyBpZiBpbnN0YWxsZWQsIGVsc2UgImlw aG9uZW9zIiBTREsgKGlPUyBvbmx5KQogICAgICAgLS1kZXZpY2UgICAgICAgICAgICAgICAgICAg ICAgICAgIERFUFJFQ0FURUQgYWxpYXMgb2YgLS1pb3MtZGV2aWNlCi0gICAgICAtLWlvcy1zaW11 bGF0b3IgICAgICAgICAgICAgICAgICAgRXF1aXZhbGVudCB0byAtLXNkayBpcGhvbmVzaW11bGF0 b3IKKyAgICAgIC0taW9zLXNpbXVsYXRvciAgICAgICAgICAgICAgICAgICBVc2UgImlwaG9uZXNp bXVsYXRvci5pbnRlcm5hbCIgU0RLIGlmIGluc3RhbGxlZCwgZWxzZSAiaXBob25lc2ltdWxhdG9y IiBTREsgKGlPUyBvbmx5KQogICAgICAgLS1zaW11bGF0b3IgICAgICAgICAgICAgICAgICAgICAg IERFUFJFQ0FURUQgYWxpYXMgb2YgLS1pb3Mtc2ltdWxhdG9yCiAgICAgICAtLWRlYnVnICAgICAg ICAgICAgICAgICAgICAgICAgICAgUGFja2FnZSByb290cyBmcm9tIERlYnVnLTxwbGF0Zm9ybT4K ICAgICAgIC0tcmVsZWFzZSAgICAgICAgICAgICAgICAgICAgICAgICBQYWNrYWdlIHJvb3RzIGZy b20gUmVsZWFzZS08cGxhdGZvcm0+CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCShyZXZpc2lvbiAyMzI1 ODApCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHdvcmtpbmcgY29weSkKQEAgLTYx LDYgKzYxLDcgQEAgQkVHSU4gewogICAgICAgICZhcHBEaXNwbGF5TmFtZUZyb21CdW5kbGUKICAg ICAgICAmYXBwZW5kVG9FbnZpcm9ubWVudFZhcmlhYmxlTGlzdAogICAgICAgICZhcmNoQ29tbWFu ZExpbmVBcmd1bWVudHNGb3JSZXN0cmljdGVkRW52aXJvbm1lbnRWYXJpYWJsZXMKKyAgICAgICAm YXZhaWxhYmxlWGNvZGVTREtzCiAgICAgICAgJmJhc2VQcm9kdWN0RGlyCiAgICAgICAgJmNoZGly V2ViS2l0CiAgICAgICAgJmNoZWNrRnJhbWV3b3JrcwpAQCAtNTAzLDM0ICs1MDQsNzEgQEAgc3Vi IGV4dHJhY3ROb25NYWNPU0hvc3RDb25maWd1cmF0aW9uCiAgICAgcmV0dXJuIEBhcmdzOwogfQog CisjIEZJWE1FOiBDb252ZXJ0IHRvIGpzb24gPHJkYXI6Ly9wcm9ibGVtLzIxNTk0MzA4Pgorc3Vi IHBhcnNlQXZhaWxhYmxlWGNvZGVTREtzKCQpCit7CisgICAgbXkgQG91dHB1dFRvUGFyc2UgPSBA eyRfWzBdfTsKKyAgICBteSBAcmVzdWx0ID0gKCk7CisgICAgZm9yZWFjaCBteSAkbGluZSAoQG91 dHB1dFRvUGFyc2UpIHsKKyAgICAgICAgIyBFeGFtcGxlczoKKyAgICAgICAgIyAgICBpT1MgMTIu MCAtc2RrIGlwaG9uZW9zMTIuMAorICAgICAgICAjICAgIFNpbXVsYXRvciAtIGlPUyAxMi4wIC1z ZGsgaXBob25lc2ltdWxhdG9yMTIuMAorICAgICAgICAjICAgIG1hY09TIDEwLjE0IC1zZGsgbWFj b3N4MTAuMTQKKyAgICAgICAgaWYgKCRsaW5lID1+IC8tc2RrIChcRCspKFtcZFwuXSspKFxEKilc bi8pIHsKKyAgICAgICAgICAgIGlmICgkMykgeworICAgICAgICAgICAgICAgIHB1c2ggQHJlc3Vs dCwgIiQxLiQzIjsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgcHVzaCBA cmVzdWx0LCAiJDEiOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQorICAgIHJldHVy biBAcmVzdWx0OworfQorCitzdWIgYXZhaWxhYmxlWGNvZGVTREtzCit7CisgICAgbXkgQG91dHB1 dCA9IGB4Y29kZWJ1aWxkIC1zaG93c2Rrc2A7CisgICAgcmV0dXJuIHBhcnNlQXZhaWxhYmxlWGNv ZGVTREtzKFxAb3V0cHV0KTsKK30KKwogc3ViIGRldGVybWluZVhjb2RlU0RLCiB7CiAgICAgcmV0 dXJuIGlmIGRlZmluZWQgJHhjb2RlU0RLOwogICAgIG15ICRzZGs7CisgICAgCisgICAgIyBUaGUg dXNlciBleHBsaWNpdGx5IHNwZWNpZmllZCB0aGUgc2RrLCBkb24ndCBhc3N1bWUgYW55dGhpbmcK ICAgICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWR2V0dGluZ1ZhbHVlKCIt LXNkayIsIFwkc2RrKSkgewogICAgICAgICAkeGNvZGVTREsgPSAkc2RrOworICAgICAgICByZXR1 cm47CiAgICAgfQogICAgIGlmIChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0t ZGV2aWNlIikgfHwgY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItLWlvcy1kZXZp Y2UiKSkgewotICAgICAgICBteSAkaGFzSW50ZXJuYWxTREsgPSBleGl0U3RhdHVzKHN5c3RlbSgi eGNydW4gLS1zZGsgaXBob25lb3MuaW50ZXJuYWwgLS1zaG93LXNkay12ZXJzaW9uID4gL2Rldi9u dWxsIDI+JjEiKSkgPT0gMDsKLSAgICAgICAgJHhjb2RlU0RLIHx8PSAkaGFzSW50ZXJuYWxTREsg PyAiaXBob25lb3MuaW50ZXJuYWwiIDogImlwaG9uZW9zIjsKKyAgICAgICAgJHhjb2RlU0RLIHx8 PSAiaXBob25lb3MiOwogICAgIH0KICAgICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZy b21BUkdWKCItLXNpbXVsYXRvciIpIHx8IGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJH VigiLS1pb3Mtc2ltdWxhdG9yIikpIHsKICAgICAgICAgJHhjb2RlU0RLIHx8PSAnaXBob25lc2lt dWxhdG9yJzsKICAgICB9CiAgICAgaWYgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJH VigiLS10dm9zLWRldmljZSIpKSB7Ci0gICAgICAgIG15ICRoYXNJbnRlcm5hbFNESyA9IGV4aXRT dGF0dXMoc3lzdGVtKCJ4Y3J1biAtLXNkayBhcHBsZXR2b3MuaW50ZXJuYWwgLS1zaG93LXNkay12 ZXJzaW9uID4gL2Rldi9udWxsIDI+JjEiKSkgPT0gMDsKLSAgICAgICAgJHhjb2RlU0RLIHx8PSAg JGhhc0ludGVybmFsU0RLID8gImFwcGxldHZvcy5pbnRlcm5hbCIgOiAiYXBwbGV0dm9zIjsKKyAg ICAgICAgJHhjb2RlU0RLIHx8PSAgImFwcGxldHZvcyI7CiAgICAgfQogICAgIGlmIChjaGVja0Zv ckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tdHZvcy1zaW11bGF0b3IiKSkgewogICAgICAg ICAkeGNvZGVTREsgfHw9ICJhcHBsZXR2c2ltdWxhdG9yIjsKICAgICB9CiAgICAgaWYgKGNoZWNr Rm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS13YXRjaG9zLWRldmljZSIpKSB7Ci0gICAg ICAgIG15ICRoYXNJbnRlcm5hbFNESyA9IGV4aXRTdGF0dXMoc3lzdGVtKCJ4Y3J1biAtLXNkayB3 YXRjaG9zLmludGVybmFsIC0tc2hvdy1zZGstdmVyc2lvbiA+IC9kZXYvbnVsbCAyPiYxIikpID09 IDA7Ci0gICAgICAgICR4Y29kZVNESyB8fD0gICRoYXNJbnRlcm5hbFNESyA/ICJ3YXRjaG9zLmlu dGVybmFsIiA6ICJ3YXRjaG9zIjsKKyAgICAgICAgJHhjb2RlU0RLIHx8PSAgIndhdGNob3MiOwog ICAgIH0KICAgICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItLXdhdGNo b3Mtc2ltdWxhdG9yIikpIHsKICAgICAgICAgJHhjb2RlU0RLIHx8PSAid2F0Y2hzaW11bGF0b3Ii OwogICAgIH0KKyAgICByZXR1cm4gaWYgIWRlZmluZWQgJHhjb2RlU0RLOworICAgIAorICAgICMg UHJlZmVyIHRoZSBpbnRlcm5hbCB2ZXJzaW9uIG9mIGFuIHNkaywgaWYgaXQgZXhpc3RzLgorICAg IG15IEBhdmFpbGFibGVTREtzID0gYXZhaWxhYmxlWGNvZGVTREtzKCk7CisKKyAgICBmb3JlYWNo IG15ICRzZGsgKEBhdmFpbGFibGVTREtzKSB7CisgICAgICAgIG5leHQgaWYgJHNkayBuZSAiJHhj b2RlU0RLLmludGVybmFsIjsKKyAgICAgICAgJHhjb2RlU0RLID0gJHNkazsKKyAgICAgICAgbGFz dDsKKyAgICB9CiB9CiAKIHN1YiB4Y29kZVNESwpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRw ZXJsL3dlYmtpdGRpcnNfdW5pdHRlc3QvYXZhaWxhYmxlWGNvZGVTREtTLnBsCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cGVybC93ZWJraXRkaXJzX3VuaXR0ZXN0L2F2YWlsYWJs ZVhjb2RlU0RLUy5wbAkobm9uZXhpc3RlbnQpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHBlcmwv d2Via2l0ZGlyc191bml0dGVzdC9hdmFpbGFibGVYY29kZVNES1MucGwJKHdvcmtpbmcgY29weSkK QEAgLTAsMCArMSw2NCBAQAorIyEvdXNyL2Jpbi9lbnYgcGVybAorCisjIENvcHlyaWdodCAoQykg MjAxOCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlzdHJpYnV0aW9u IGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorIyBt b2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNv bmRpdGlvbnMKKyMgYXJlIG1ldDoKKyMgMS4gIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29k ZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlz dCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisjIDIuICBSZWRp c3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHly aWdodAorIyAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyIGluIHRoZQorIyAgICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIg bWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyMKKyMgVEhJUyBTT0ZU V0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMg SVMnJyBBTkQgQU5ZCisjIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcs IEJVVCBOT1QgTElNSVRFRCBUTywgVEhFIElNUExJRUQKKyMgV0FSUkFOVElFUyBPRiBNRVJDSEFO VEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRQorIyBESVND TEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMg QkUgTElBQkxFIEZPUiBBTlkKKyMgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lB TCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMKKyMgKElOQ0xVRElORywgQlVU IE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJ Q0VTOworIyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJS VVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04KKyMgQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFks IFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyMgKElOQ0xV RElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBU SEUgVVNFIE9GIFRISVMKKyMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCisKKyMgVW5pdCB0ZXN0cyBmb3Igd2Via2l0ZGlyczo6cGFy c2VBdmFpbGFibGVYY29kZVNES3MoJCkuCisKK3VzZSBzdHJpY3Q7Cit1c2Ugd2FybmluZ3M7CisK K3VzZSBDb25maWc7Cit1c2UgVGVzdDo6TW9yZTsKK3VzZSB3ZWJraXRkaXJzOworCitwbGFuKHRl c3RzID0+IDIpOworCitteSBAZnVsbFhjb2RlYnVpbGRPdXRwdXQgPSA8PEVORCA9fiBtLyheLipc bikvbWc7CitpT1MgU0RLczoKK2lPUyAxMi4wICAgICAgICAgICAgICAgICAgICAgICAgICAtc2Rr IGlwaG9uZW9zMTIuMAoraU9TIDEyLjAgSW50ZXJuYWwgICAgICAgICAgICAgICAgIC1zZGsgaXBo b25lb3MxMi4wLmludGVybmFsCisKK2lPUyBTaW11bGF0b3IgU0RLczoKK1NpbXVsYXRvciAtIGlP UyAxMi4wIEludGVybmFsICAgICAtc2RrIGlwaG9uZXNpbXVsYXRvcjEyLjAKKworbWFjT1MgU0RL czoKK21hY09TIDEwLjE0ICAgICAgICAgICAgICAgICAgICAgICAtc2RrIG1hY29zeDEwLjE0Citt YWNPUyAxMC4xNCBJbnRlcm5hbCAgICAgICAgICAgICAgLXNkayBtYWNvc3gxMC4xNGludGVybmFs CisKK0VORAorCitteSBAcmVzdWx0ID0gcGFyc2VBdmFpbGFibGVYY29kZVNES3MoXEBmdWxsWGNv ZGVidWlsZE91dHB1dCk7CitteSBAZXhwZWN0ZWRSZXN1bHQgPSAoImlwaG9uZW9zIiwgImlwaG9u ZW9zLmludGVybmFsIiwgImlwaG9uZXNpbXVsYXRvciIsICJtYWNvc3giLCAibWFjb3N4LmludGVy bmFsIik7Citpc19kZWVwbHkoXEByZXN1bHQsIFxAZXhwZWN0ZWRSZXN1bHQsICJwYXJzZUF2YWls YWJsZVhjb2RlU0RLczogRnVsbCB4Y29kZWJ1aWxkIG91dHB1dCIpOworCitteSBAY2xvc2VNYXRj aE91dHB1dCA9IDw8RU5EID1+IG0vKF4uKlxuKS9tZzsKK05vbi1tYXRjaGluZyBTREtzOgord2F0 Y2hPUyA1LjAgICAgICAgICAgICAgICAgICAgICAgIC1TREsgd2F0Y2hvczUuMAordHZPUyAxMi4w ICAgICAgICAgICAgICAgICAgICAgICAgIC1zZGsgYXBwbGV0dm9zCitpT1MgMTIuMCAgICAgICAg ICAgICAgICAgICAgICAgICAgLVNESyBpcGhvbmVvczEyLjAuaW50ZXJuYWwuNAorCitFTkQKKwor bXkgQGVtcHR5TGlzdCA9ICgpOworQHJlc3VsdCA9IHBhcnNlQXZhaWxhYmxlWGNvZGVTREtzKFxA Y2xvc2VNYXRjaE91dHB1dCk7Citpc19kZWVwbHkoXEByZXN1bHQsIFxAZW1wdHlMaXN0LCAicGFy c2VBdmFpbGFibGVYY29kZVNES3M6IE5lYXIgbWF0Y2hlcyIpOwo=