213685 2020-06-27 14:27:51 -0700 compare-results should be able to parse multiple JSONs at once by merging them 2020-06-28 12:47:28 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 keith_miller keith_miller ews-watchlist glenn jbedard mark.lam saam webkit-bug-importer oldest_to_newest 1666809 0 keith_miller 2020-06-27 14:27:51 -0700 compare-results should be able to parse multiple JSONs at once by merging them 1666810 1 402973 keith_miller 2020-06-27 14:34:32 -0700 Created attachment 402973 Patch 1666811 2 402974 keith_miller 2020-06-27 14:53:00 -0700 Created attachment 402974 Patch for landing 1666814 3 ews-feeder 2020-06-27 15:18:45 -0700 Committed r263629: <https://trac.webkit.org/changeset/263629> All reviewed patches have been landed. Closing bug and clearing flags on attachment 402974. 1666815 4 webkit-bug-importer 2020-06-27 15:19:14 -0700 <rdar://problem/64849553> 1666816 5 webkit-bug-importer 2020-06-27 15:19:15 -0700 <rdar://problem/64849554> 1666896 6 mark.lam 2020-06-28 12:47:28 -0700 <rdar://problem/64849553> 402973 2020-06-27 14:34:32 -0700 2020-06-27 14:52:58 -0700 Patch bug-213685-20200627143431.patch text/plain 10097 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNTI1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2JjZTZlNzg1M2JkYTg0MmFjZjE5NDJkMGIzYTRkZTdi ZDQzZDQ1OS4uMWZlNjU5ZTY3MTdmMTY0M2Q5NThkMDE1Y2Y4MTUxNTkwZjNiZjczZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2 IEBACisyMDIwLTA2LTI3ICBLZWl0aCBNaWxsZXIgIDxrZWl0aF9taWxsZXJAYXBwbGUuY29tPgor CisgICAgICAgIGNvbXBhcmUtcmVzdWx0cyBzaG91bGQgYmUgYWJsZSB0byBwYXJzZSBtdWx0aXBs ZSBKU09OcyBhdCBvbmNlIGJ5IG1lcmdpbmcgdGhlbQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzNjg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBpbXByb3ZlcyB0aGUgY29tcGFyZS1y ZXN1bHRzIHNjcmlwdCB0byBlbmFibGUgaXQgdG8KKyAgICAgICAgbWVyZ2UgSlNPTiBvdXRwdXQg ZmlsZXMuIFRoaXMgaXMgaGFuZHkgd2hlbiBydW5uaW5nIHNjcmlwdHMgYnkKKyAgICAgICAgaGFu ZCB3aGVyZSB5b3UnbGwgZ2V0IG1hbnkgYSBhbmQgYiBKU09Ocy4gIFRvIGRvIHRoZSBtZXJnaW5n IHRoaXMKKyAgICAgICAgcGF0Y2ggbW92ZXMgdGhlIGxvZ2ljIG9mIG1lcmdlLXJlc3VsdC1qc29u cyBpbnRvIGEgc2hhcmVkIGxpYnJhcnkuCisKKyAgICAgICAgY29tcGFyZS1yZXN1bHRzIGNhbiB0 YWtlIG11bHRpcGxlIGZpbGVzIHNlcXVlbnRhbGx5IG9yIGJ5IHBhc3NpbmcKKyAgICAgICAgdGhl ICctYScvJy1iJyBmbGFncyBtdWx0aXBsZSB0aW1lcy4gZS5nLiBgL2NvbXBhcmUtcmVzdWx0cyAt YQorICAgICAgICBPRy0xLmpzb24gLWEgT0ctMi5qc29uIC1hIE9HLTMuanNvbiAtYSBPRy00Lmpz b24gLWIgTUMtMS5qc29uCisgICAgICAgIE1DLTIuanNvbiBNQy0zLmpzb24gTUMtNC5qc29uYCB3 aWxsIGJlaGF2ZSBhcyB5b3UnZCBleHBlY3Q7CisgICAgICAgIGNvbWJpbmluZyBhbGwgdGhlIE9H IEpTT05zIGFuZCB0aGUgTUMgSlNPTnMgYmVmb3JlIGNvbXB1dGluZyB0aGUKKyAgICAgICAgcmVz dWx0LgorCisgICAgICAgICogU2NyaXB0cy9jb21wYXJlLXJlc3VsdHM6CisgICAgICAgIChnZXRP cHRpb25zKToKKyAgICAgICAgKG1haW4pOgorICAgICAgICAqIFNjcmlwdHMvbWVyZ2UtcmVzdWx0 LWpzb25zOgorICAgICAgICAocmVhZEpTT05GaWxlKToKKyAgICAgICAgKGRlZXBBcHBlbmQpOiBE ZWxldGVkLgorICAgICAgICAobWVyZ2VKU09Ocyk6IERlbGV0ZWQuCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2JlbmNobWFya19qc29uX21lcmdlLnB5OiBDb3Bp ZWQgZnJvbSBUb29scy9TY3JpcHRzL21lcmdlLXJlc3VsdC1qc29ucy4KKyAgICAgICAgKGRlZXBB cHBlbmQpOgorICAgICAgICAobWVyZ2VKU09Ocyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9iZW5jaG1hcmtfcnVubmVyL2JlbmNobWFya19yZXN1bHRzLnB5OgorICAgICAgICAoQmVuY2ht YXJrUmVzdWx0cy5fYWdncmVnYXRlX3Jlc3VsdHNfZm9yX3Rlc3QpOgorICAgICAgICAoQmVuY2ht YXJrUmVzdWx0cy5fbGludF9zdWJ0ZXN0X3Jlc3VsdHMpOgorCiAyMDIwLTA2LTI1ICBBYWthc2gg SmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBbZXdzXSBTaGFyZSBtb3Jl IGJvdHMgYmV0d2VlbiBFV1MgYnVpbGRlciBhbmQgdGVzdGVycwpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy9jb21wYXJlLXJlc3VsdHMgYi9Ub29scy9TY3JpcHRzL2NvbXBhcmUtcmVzdWx0cwpp bmRleCA2NzZkYjRjMmQ1MmVlMGNjZDY4MDYwYzllNzhhOWEyYjE0MzY5NTllLi44MGQxZDY2NGQ4 ZDg2Y2Q5ZTRlZTk2Zjg3YjlkNzk3N2VlMjM3ZjQwIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRz L2NvbXBhcmUtcmVzdWx0cworKysgYi9Ub29scy9TY3JpcHRzL2NvbXBhcmUtcmVzdWx0cwpAQCAt MjksNyArMjksOSBAQAogaW1wb3J0IHN5cwogaW1wb3J0IGFyZ3BhcnNlCiBpbXBvcnQganNvbgor aW1wb3J0IGl0ZXJ0b29scwogZnJvbSB3ZWJraXRweS5iZW5jaG1hcmtfcnVubmVyLmJlbmNobWFy a19yZXN1bHRzIGltcG9ydCBCZW5jaG1hcmtSZXN1bHRzCitmcm9tIHdlYmtpdHB5LmJlbmNobWFy a19ydW5uZXIuYmVuY2htYXJrX2pzb25fbWVyZ2UgaW1wb3J0IG1lcmdlSlNPTnMKIAogdHJ5Ogog ICAgIGZyb20gc2NpcHkgaW1wb3J0IHN0YXRzCkBAIC0zOTUsMTcgKzM5NywyMSBAQCBkZWYgdHRl c3QoYmVuY2htYXJrVHlwZSwgYSwgYik6CiAgICAgICAgIHByaW50ICJSZXN1bHRzIEFSRSBOT1Qg c2lnbmlmaWNhbnQiCiAKIGRlZiBnZXRPcHRpb25zKCk6Ci0gICAgcGFyc2VyID0gYXJncGFyc2Uu QXJndW1lbnRQYXJzZXIoZGVzY3JpcHRpb249IkNvbXBhcmUgdHdvIFdlYktpdCBiZW5jaG1hcmsg cmVzdWx0cy4gUGFzcyBpbiB0d28gSlNPTiByZXN1bHQgZmlsZXMgdG8gY29tcGFyZSB0aGVtLiBU aGlzIHNjcmlwdCBwcmludHMgdGhlIHBWYWx1ZSBhbG9uZyB3aXRoIHRoZSBtYWduaXR1ZGUgb2Yg dGhlIGNoYW5nZS4iKQorICAgIHBhcnNlciA9IGFyZ3BhcnNlLkFyZ3VtZW50UGFyc2VyKGRlc2Ny aXB0aW9uPSJDb21wYXJlIHR3byBXZWJLaXQgYmVuY2htYXJrIHJlc3VsdHMuIFBhc3MgaW4gYXQg bGVhc3QgdHdvIEpTT04gcmVzdWx0IGZpbGVzIHRvIGNvbXBhcmUgdGhlbS4gVGhpcyBzY3JpcHQg cHJpbnRzIHRoZSBwVmFsdWUgYWxvbmcgd2l0aCB0aGUgbWFnbml0dWRlIG9mIHRoZSBjaGFuZ2Uu IElmIG1vcmUgdGhhbiBvbmUgSlNPTiBpcyBwYXNzZWQgYXMgYS9iIHRoZXkgd2lsbCBiZSBtZXJn ZWQgd2hlbiBjb21wdXRpbmcgdGhlIGJyZWFrZG93bi4iKQogCiAgICAgcGFyc2VyLmFkZF9hcmd1 bWVudCgiLWEiLAogICAgICAgICB0eXBlPXN0ciwKICAgICAgICAgcmVxdWlyZWQ9VHJ1ZSwKLSAg ICAgICAgaGVscD0iYSBvZiBhL2IuIFBhdGggdG8gSlNPTiByZXN1bHRzIGZpbGUuIikKKyAgICAg ICAgbmFyZ3M9JysnLAorICAgICAgICBhY3Rpb249ImFwcGVuZCIsCisgICAgICAgIGhlbHA9ImEg SlNPTnMgb2YgYS9iLiBQYXRoIHRvIEpTT04gcmVzdWx0cyBmaWxlLiBUYWtlcyBtdWx0aXBsZSB2 YWx1ZXMgYW5kIGNhbiBiZSBwYXNzZWQgbXVsdGlwbGUgdGltZXMuIikKIAogICAgIHBhcnNlci5h ZGRfYXJndW1lbnQoIi1iIiwKICAgICAgICAgdHlwZT1zdHIsCiAgICAgICAgIHJlcXVpcmVkPVRy dWUsCi0gICAgICAgIGhlbHA9ImIgb2YgYS9iLiBQYXRoIHRvIEpTT04gcmVzdWx0cyBmaWxlLiIp CisgICAgICAgIG5hcmdzPScrJywKKyAgICAgICAgYWN0aW9uPSJhcHBlbmQiLAorICAgICAgICBo ZWxwPSJiIEpTT05zIG9mIGEvYi4gUGF0aCB0byBKU09OIHJlc3VsdHMgZmlsZS4gVGFrZXMgbXVs dGlwbGUgdmFsdWVzIGFuZCBjYW4gYmUgcGFzc2VkIG11bHRpcGxlIHRpbWVzLiIpCiAKICAgICBw YXJzZXIuYWRkX2FyZ3VtZW50KCItLWNzdiIsCiAgICAgICAgIHR5cGU9c3RyLApAQCAtNDIxLDgg KzQyNywxMiBAQCBkZWYgZ2V0T3B0aW9ucygpOgogZGVmIG1haW4oKToKICAgICBhcmdzID0gZ2V0 T3B0aW9ucygpCiAKLSAgICBhID0gcmVhZEpTT05GaWxlKGFyZ3MuYSkKLSAgICBiID0gcmVhZEpT T05GaWxlKGFyZ3MuYikKKyAgICAjIEZsYXR0ZW4gdGhlIGxpc3Qgb2YgbGlzdHMgb2YgSlNPTiBm aWxlcy4KKyAgICBhID0gaXRlcnRvb2xzLmNoYWluLmZyb21faXRlcmFibGUoYXJncy5hKQorICAg IGIgPSBpdGVydG9vbHMuY2hhaW4uZnJvbV9pdGVyYWJsZShhcmdzLmIpCisKKyAgICBhID0gbWVy Z2VKU09OcyhsaXN0KG1hcChyZWFkSlNPTkZpbGUsIGEpKSkKKyAgICBiID0gbWVyZ2VKU09Ocyhs aXN0KG1hcChyZWFkSlNPTkZpbGUsIGIpKSkKIAogICAgIHR5cGVBID0gZGV0ZWN0QmVuY2htYXJr KGEpCiAgICAgdHlwZUIgPSBkZXRlY3RCZW5jaG1hcmsoYikKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvbWVyZ2UtcmVzdWx0LWpzb25zIGIvVG9vbHMvU2NyaXB0cy9tZXJnZS1yZXN1bHQtanNv bnMKaW5kZXggMjIyNTVkYzViY2Q0M2JhMTI2ZTBmNWIwMWE3ZTQzM2IxMGMyZWM1NS4uYjY5YmY4 ZTQ4MGYyYWRjNmMzMGI1MWE0YWJkNjQxNWI1ZWVlNTkwMCAxMDA3NTUKLS0tIGEvVG9vbHMvU2Ny aXB0cy9tZXJnZS1yZXN1bHQtanNvbnMKKysrIGIvVG9vbHMvU2NyaXB0cy9tZXJnZS1yZXN1bHQt anNvbnMKQEAgLTEsNiArMSw2IEBACiAjIS91c3IvYmluL2VudiBweXRob24gLXUKIAotIyBDb3B5 cmlnaHQgKEMpIDIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmln aHQgKEMpIDIwMTktMjAyMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAogIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTI4LDMyICsyOCwxMiBAQAogCiBpbXBvcnQgYXJncGFy c2UKIGltcG9ydCBqc29uCi0KK2Zyb20gd2Via2l0cHkuYmVuY2htYXJrX3J1bm5lci5iZW5jaG1h cmtfanNvbl9tZXJnZSBpbXBvcnQgbWVyZ2VKU09OcwogCiBkZWYgcmVhZEpTT05GaWxlKHBhdGgp OgogICAgIHdpdGggb3BlbihwYXRoLCAncicpIGFzIGNvbnRlbnRzOgogICAgICAgICByZXR1cm4g anNvbi5sb2FkKGNvbnRlbnRzKQogCi0KLWRlZiBkZWVwQXBwZW5kKHZhbHVlMSwgdmFsdWUyLCBj dXJyZW50S2V5PU5vbmUpOgotICAgIGlmIHR5cGUodmFsdWUxKSAhPSB0eXBlKHZhbHVlMik6Ci0g ICAgICAgIHJhaXNlIFR5cGVFcnJvcigidmFsdWVzIGhhdmUgZGlmZmVyZW50IHR5cGVzIGZvciBr ZXk6IHt9LCB7fSBhbmQge30iLmZvcm1hdChjdXJyZW50S2V5LCB0eXBlKHZhbHVlMSksIHR5cGUo dmFsdWUyKSkpCi0gICAgaWYgaXNpbnN0YW5jZSh2YWx1ZTEsIGxpc3QpOgotICAgICAgICByZXR1 cm4gdmFsdWUxICsgdmFsdWUyCi0KLSAgICByZXN1bHQgPSB7fTsKLSAgICBmb3Iga2V5IGluICh2 YWx1ZTEua2V5cygpICsgdmFsdWUyLmtleXMoKSk6Ci0gICAgICAgIGlmIGtleSBub3QgaW4gcmVz dWx0OgotICAgICAgICAgICAgcmVzdWx0W2tleV0gPSBkZWVwQXBwZW5kKHZhbHVlMVtrZXldLCB2 YWx1ZTJba2V5XSwga2V5KQotICAgIHJldHVybiByZXN1bHQKLQotZGVmIG1lcmdlSlNPTnMoanNv bnMpOgotICAgIGlmIGxlbihqc29ucykgPT0gMDoKLSAgICAgICAgcmFpc2UgVHlwZUVycm9yKCJu byBqc29ucyB0byBtZXJnZSIpCi0KLSAgICBsYXN0ID0ganNvbnMucG9wKCkKLSAgICByZXR1cm4g cmVkdWNlKGRlZXBBcHBlbmQsIGpzb25zLCBsYXN0KQotCiBkZWYgbWFpbigpOgogICAgIHBhcnNl ciA9IGFyZ3BhcnNlLkFyZ3VtZW50UGFyc2VyKGRlc2NyaXB0aW9uPSJNZXJnZSB0aGUgcmVzdWx0 aW5nIGpzb24gZmlsZXMgZnJvbSBtdWx0aXBsZSBpbnZvY2F0aW9ucyBvZiB0aGUgcnVuX2JlbmNo bWFyayBzY3JpcHQuIikKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5j aG1hcmtfcnVubmVyL2JlbmNobWFya19qc29uX21lcmdlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9iZW5jaG1hcmtfcnVubmVyL2JlbmNobWFya19qc29uX21lcmdlLnB5Cm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LjE0NWEwYzc0MDJlYjk2ZmE4NTFlM2IyYTBkN2NjZmNiMDM2NWI3NzcKLS0tIC9kZXYvbnVsbAor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX2pz b25fbWVyZ2UucHkKQEAgLTAsMCArMSw0OSBAQAorIyBDb3B5cmlnaHQgKEMpIDIwMTktMjAyMCBB cHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorIyBtb2RpZmlj YXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlv bnMKKyMgYXJlIG1ldDoKKyMKKyMgMS4gIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBt dXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisjIDIuICBSZWRpc3Ry aWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdo dAorIyAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyIGluIHRoZQorIyAgICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0 ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyMgMy4gIE5laXRoZXIgdGhl IG5hbWUgb2YgQXBwbGUgSW5jLiAoIkFwcGxlIikgbm9yIHRoZSBuYW1lcyBvZgorIyAgICAgaXRz IGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMg ZGVyaXZlZAorIyAgICAgZnJvbSB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Ig d3JpdHRlbiBwZXJtaXNzaW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQ UExFIEFORCBJVFMgQ09OVFJJQlVUT1JTICJBUyBJUyIgQU5EIEFOWQorIyBFWFBSRVNTIE9SIElN UExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRSBJTVBM SUVECisjIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBB UlRJQ1VMQVIgUFVSUE9TRSBBUkUKKyMgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQ TEUgT1IgSVRTIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWQorIyBESVJFQ1QsIElORElS RUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFN QUdFUworIyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNV QlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7CisjIExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9G SVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORAorIyBPTiBB TlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJ TElUWSwgT1IgVE9SVAorIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklT SU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YKKyMgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJ RiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKworaW1wb3J0IGpz b24KK2Zyb20gd2Via2l0cHkuY29tbW9uLml0ZXJhdGlvbl9jb21wYXRpYmlsaXR5IGltcG9ydCBp dGVyaXRlbXMKKworCitkZWYgZGVlcEFwcGVuZCh2YWx1ZTEsIHZhbHVlMiwgY3VycmVudEtleT1O b25lKToKKyAgICBpZiB0eXBlKHZhbHVlMSkgIT0gdHlwZSh2YWx1ZTIpOgorICAgICAgICByYWlz ZSBUeXBlRXJyb3IoInZhbHVlcyBoYXZlIGRpZmZlcmVudCB0eXBlcyBmb3Iga2V5OiB7fSwge30g YW5kIHt9Ii5mb3JtYXQoY3VycmVudEtleSwgdHlwZSh2YWx1ZTEpLCB0eXBlKHZhbHVlMikpKQor ICAgIGlmIGlzaW5zdGFuY2UodmFsdWUxLCBsaXN0KToKKyAgICAgICAgcmV0dXJuIHZhbHVlMSAr IHZhbHVlMgorCisgICAgcmVzdWx0ID0ge30KKyAgICBmb3Iga2V5IGluICh2YWx1ZTEua2V5cygp ICsgdmFsdWUyLmtleXMoKSk6CisgICAgICAgIGlmIGtleSBub3QgaW4gcmVzdWx0OgorICAgICAg ICAgICAgcmVzdWx0W2tleV0gPSBkZWVwQXBwZW5kKHZhbHVlMVtrZXldLCB2YWx1ZTJba2V5XSwg a2V5KQorICAgIHJldHVybiByZXN1bHQKKworCitkZWYgbWVyZ2VKU09Ocyhqc29ucyk6CisgICAg aWYgbGVuKGpzb25zKSA9PSAwOgorICAgICAgICByYWlzZSBUeXBlRXJyb3IoIm5vIGpzb25zIHRv IG1lcmdlIikKKworICAgIGxhc3QgPSBqc29ucy5wb3AoKQorICAgIHJldHVybiByZWR1Y2UoZGVl cEFwcGVuZCwganNvbnMsIGxhc3QpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3Jlc3VsdHMucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3Jlc3VsdHMucHkKaW5kZXggMzlkNTFj MTkyYTdmZmVjMWY4MWZmODU5YjBlMTJkMzk5NjUwMGY0OS4uMTU2NTcyZDc4OWRjZGQ3MWJlZDQw NGE1NDYwZGRjMGQ5OWIwZDM0NyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9i ZW5jaG1hcmtfcnVubmVyL2JlbmNobWFya19yZXN1bHRzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfcmVzdWx0cy5weQpAQCAtMTUzLDcg KzE1Myw4IEBAIGNsYXNzIEJlbmNobWFya1Jlc3VsdHMob2JqZWN0KToKICAgICAgICAgICAgICAg ICAgICAgcmVzdWx0c1ttZXRyaWNfbmFtZV1bTm9uZV1bY29uZmlnX25hbWVdID0gY2xzLl9mbGF0 dGVuX2xpc3QodmFsdWVzKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAKLSAgICAgICAgICAg IGFnZ3JlZ2F0b3JfbGlzdCA9IG1ldHJpYworICAgICAgICAgICAgIyBGaWx0ZXIgZHVwbGljYXRl IGFnZ3JlZ2F0b3JzIHRoYXQgY291bGQgaGF2ZSBhcmlzZW4gZnJvbSBtZXJnaW5nIEpTT05zLgor ICAgICAgICAgICAgYWdncmVnYXRvcl9saXN0ID0gbGlzdChzZXQobWV0cmljKSkKICAgICAgICAg ICAgIHJlc3VsdHNbbWV0cmljX25hbWVdID0ge30KICAgICAgICAgICAgIGZvciBhZ2dyZWdhdG9y IGluIGFnZ3JlZ2F0b3JfbGlzdDoKICAgICAgICAgICAgICAgICB2YWx1ZXNfYnlfY29uZmlnX2l0 ZXJhdGlvbiA9IGNscy5fc3VidGVzdF92YWx1ZXNfYnlfY29uZmlnX2l0ZXJhdGlvbihzdWJ0ZXN0 X3Jlc3VsdHMsIG1ldHJpY19uYW1lLCBhZ2dyZWdhdG9yKQpAQCAtMjE2LDggKzIxNyw5IEBAIGNs YXNzIEJlbmNobWFya1Jlc3VsdHMob2JqZWN0KToKICAgICAgICAgICAgICAgICAgICAgcmFpc2Ug VHlwZUVycm9yKCdUaGUgbWV0cmljcyBpbiAiJXMiIGlzIG5vdCBhIGRpY3Rpb25hcnknICUgdGVz dF9uYW1lKQogICAgICAgICAgICAgICAgIGZvciBtZXRyaWNfbmFtZSwgbWV0cmljIGluIGl0ZXJp dGVtcyhtZXRyaWNzKToKICAgICAgICAgICAgICAgICAgICAgaWYgaXNpbnN0YW5jZShtZXRyaWMs IGxpc3QpOgotICAgICAgICAgICAgICAgICAgICAgICAgY2xzLl9saW50X2FnZ3JlZ2F0b3JfbGlz dCh0ZXN0X25hbWUsIG1ldHJpY19uYW1lLCBtZXRyaWMsIHBhcmVudF90ZXN0LCBwYXJlbnRfYWdn cmVnYXRvcl9saXN0KQotICAgICAgICAgICAgICAgICAgICAgICAgYWdncmVnYXRvcl9saXN0ID0g bWV0cmljCisgICAgICAgICAgICAgICAgICAgICAgICAjIEZpbHRlciBkdXBsaWNhdGUgYWdncmVn YXRvcnMgdGhhdCBjb3VsZCBoYXZlIGFyaXNlbiBmcm9tIG1lcmdpbmcgSlNPTnMuCisgICAgICAg ICAgICAgICAgICAgICAgICBhZ2dyZWdhdG9yX2xpc3QgPSBsaXN0KHNldChtZXRyaWMpKQorICAg ICAgICAgICAgICAgICAgICAgICAgY2xzLl9saW50X2FnZ3JlZ2F0b3JfbGlzdCh0ZXN0X25hbWUs IG1ldHJpY19uYW1lLCBhZ2dyZWdhdG9yX2xpc3QsIHBhcmVudF90ZXN0LCBwYXJlbnRfYWdncmVn YXRvcl9saXN0KQogICAgICAgICAgICAgICAgICAgICBlbGlmIGlzaW5zdGFuY2UobWV0cmljLCBk aWN0KToKICAgICAgICAgICAgICAgICAgICAgICAgIGNscy5fbGludF9jb25maWd1cmF0aW9uKHRl c3RfbmFtZSwgbWV0cmljX25hbWUsIG1ldHJpYywgcGFyZW50X3Rlc3QsIHBhcmVudF9hZ2dyZWdh dG9yX2xpc3QsIGl0ZXJhdGlvbl9ncm91cHNfYnlfY29uZmlnKQogICAgICAgICAgICAgICAgICAg ICBlbHNlOgo= 402974 2020-06-27 14:53:00 -0700 2020-06-27 15:18:45 -0700 Patch for landing bug-213685-20200627145259.patch text/plain 12300 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNTI1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2JjZTZlNzg1M2JkYTg0MmFjZjE5NDJkMGIzYTRkZTdi ZDQzZDQ1OS4uMjA5ZGM1NTU4ZTA3YWE2YjU1ZjY1OTQzZDA1ZDg5MGE1MGU1YTRjMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQy IEBACisyMDIwLTA2LTI3ICBLZWl0aCBNaWxsZXIgIDxrZWl0aF9taWxsZXJAYXBwbGUuY29tPgor CisgICAgICAgIGNvbXBhcmUtcmVzdWx0cyBzaG91bGQgYmUgYWJsZSB0byBwYXJzZSBtdWx0aXBs ZSBKU09OcyBhdCBvbmNlIGJ5IG1lcmdpbmcgdGhlbQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzNjg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2Fh bSBCYXJhdGkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBpbXByb3ZlcyB0aGUgY29tcGFyZS1yZXN1 bHRzIHNjcmlwdCB0byBlbmFibGUgaXQgdG8KKyAgICAgICAgbWVyZ2UgSlNPTiBvdXRwdXQgZmls ZXMuIFRoaXMgaXMgaGFuZHkgd2hlbiBydW5uaW5nIHNjcmlwdHMgYnkKKyAgICAgICAgaGFuZCB3 aGVyZSB5b3UnbGwgZ2V0IG1hbnkgYSBhbmQgYiBKU09Ocy4gIFRvIGRvIHRoZSBtZXJnaW5nIHRo aXMKKyAgICAgICAgcGF0Y2ggbW92ZXMgdGhlIGxvZ2ljIG9mIG1lcmdlLXJlc3VsdC1qc29ucyBp bnRvIGEgc2hhcmVkIGxpYnJhcnkuCisKKyAgICAgICAgY29tcGFyZS1yZXN1bHRzIGNhbiB0YWtl IG11bHRpcGxlIGZpbGVzIHNlcXVlbnRhbGx5IG9yIGJ5IHBhc3NpbmcKKyAgICAgICAgdGhlICct YScvJy1iJyBmbGFncyBtdWx0aXBsZSB0aW1lcy4gZS5nLiBgL2NvbXBhcmUtcmVzdWx0cyAtYQor ICAgICAgICBPRy0xLmpzb24gLWEgT0ctMi5qc29uIC1hIE9HLTMuanNvbiAtYSBPRy00Lmpzb24g LWIgTUMtMS5qc29uCisgICAgICAgIE1DLTIuanNvbiBNQy0zLmpzb24gTUMtNC5qc29uYCB3aWxs IGJlaGF2ZSBhcyB5b3UnZCBleHBlY3Q7CisgICAgICAgIGNvbWJpbmluZyBhbGwgdGhlIE9HIEpT T05zIGFuZCB0aGUgTUMgSlNPTnMgYmVmb3JlIGNvbXB1dGluZyB0aGUKKyAgICAgICAgcmVzdWx0 LgorCisgICAgICAgIExhc3RseSwgdGhlIGJlbmNobWFya19yZXN1bHRzIHNjcmlwdCBub3cgY2Fu IGhhbmRsZSBkdXBsaWNhdGVzIG9mCisgICAgICAgIGFuIGFnZ3JlZ2F0b3IgaW4gdGhlIGFnZ3Jl Z2F0b3IgbGlzdC4gVGhpcyBpcyB1c2VmdWwgYmVjYXVzZQorICAgICAgICBvdGhlcndpc2UgdGhl IGxvZ2ljIG9mIG1lcmdpbmcgSlNPTnMgaXMgc2lnbmlmaWNhbnRseSBtb3JlCisgICAgICAgIGNv bXBsaWNhdGVkLgorCisgICAgICAgICogU2NyaXB0cy9jb21wYXJlLXJlc3VsdHM6CisgICAgICAg IChnZXRPcHRpb25zKToKKyAgICAgICAgKG1haW4pOgorICAgICAgICAqIFNjcmlwdHMvbWVyZ2Ut cmVzdWx0LWpzb25zOgorICAgICAgICAocmVhZEpTT05GaWxlKToKKyAgICAgICAgKGRlZXBBcHBl bmQpOiBEZWxldGVkLgorICAgICAgICAobWVyZ2VKU09Ocyk6IERlbGV0ZWQuCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2JlbmNobWFya19qc29uX21lcmdlLnB5 OiBDb3BpZWQgZnJvbSBUb29scy9TY3JpcHRzL21lcmdlLXJlc3VsdC1qc29ucy4KKyAgICAgICAg KGRlZXBBcHBlbmQpOgorICAgICAgICAobWVyZ2VKU09Ocyk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2JlbmNobWFya19yZXN1bHRzLnB5OgorICAgICAgICAo QmVuY2htYXJrUmVzdWx0cy5fYWdncmVnYXRlX3Jlc3VsdHNfZm9yX3Rlc3QpOgorICAgICAgICAo QmVuY2htYXJrUmVzdWx0cy5fbGludF9zdWJ0ZXN0X3Jlc3VsdHMpOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfcmVzdWx0c191bml0dGVzdC5w eToKKwogMjAyMC0wNi0yNSAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW2V3c10gU2hhcmUgbW9yZSBib3RzIGJldHdlZW4gRVdTIGJ1aWxkZXIgYW5kIHRl c3RlcnMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvY29tcGFyZS1yZXN1bHRzIGIvVG9vbHMv U2NyaXB0cy9jb21wYXJlLXJlc3VsdHMKaW5kZXggNjc2ZGI0YzJkNTJlZTBjY2Q2ODA2MGM5ZTc4 YTlhMmIxNDM2OTU5ZS4uODBkMWQ2NjRkOGQ4NmNkOWU0ZWU5NmY4N2I5ZDc5NzdlZTIzN2Y0MCAx MDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9jb21wYXJlLXJlc3VsdHMKKysrIGIvVG9vbHMvU2Ny aXB0cy9jb21wYXJlLXJlc3VsdHMKQEAgLTI5LDcgKzI5LDkgQEAKIGltcG9ydCBzeXMKIGltcG9y dCBhcmdwYXJzZQogaW1wb3J0IGpzb24KK2ltcG9ydCBpdGVydG9vbHMKIGZyb20gd2Via2l0cHku YmVuY2htYXJrX3J1bm5lci5iZW5jaG1hcmtfcmVzdWx0cyBpbXBvcnQgQmVuY2htYXJrUmVzdWx0 cworZnJvbSB3ZWJraXRweS5iZW5jaG1hcmtfcnVubmVyLmJlbmNobWFya19qc29uX21lcmdlIGlt cG9ydCBtZXJnZUpTT05zCiAKIHRyeToKICAgICBmcm9tIHNjaXB5IGltcG9ydCBzdGF0cwpAQCAt Mzk1LDE3ICszOTcsMjEgQEAgZGVmIHR0ZXN0KGJlbmNobWFya1R5cGUsIGEsIGIpOgogICAgICAg ICBwcmludCAiUmVzdWx0cyBBUkUgTk9UIHNpZ25pZmljYW50IgogCiBkZWYgZ2V0T3B0aW9ucygp OgotICAgIHBhcnNlciA9IGFyZ3BhcnNlLkFyZ3VtZW50UGFyc2VyKGRlc2NyaXB0aW9uPSJDb21w YXJlIHR3byBXZWJLaXQgYmVuY2htYXJrIHJlc3VsdHMuIFBhc3MgaW4gdHdvIEpTT04gcmVzdWx0 IGZpbGVzIHRvIGNvbXBhcmUgdGhlbS4gVGhpcyBzY3JpcHQgcHJpbnRzIHRoZSBwVmFsdWUgYWxv bmcgd2l0aCB0aGUgbWFnbml0dWRlIG9mIHRoZSBjaGFuZ2UuIikKKyAgICBwYXJzZXIgPSBhcmdw YXJzZS5Bcmd1bWVudFBhcnNlcihkZXNjcmlwdGlvbj0iQ29tcGFyZSB0d28gV2ViS2l0IGJlbmNo bWFyayByZXN1bHRzLiBQYXNzIGluIGF0IGxlYXN0IHR3byBKU09OIHJlc3VsdCBmaWxlcyB0byBj b21wYXJlIHRoZW0uIFRoaXMgc2NyaXB0IHByaW50cyB0aGUgcFZhbHVlIGFsb25nIHdpdGggdGhl IG1hZ25pdHVkZSBvZiB0aGUgY2hhbmdlLiBJZiBtb3JlIHRoYW4gb25lIEpTT04gaXMgcGFzc2Vk IGFzIGEvYiB0aGV5IHdpbGwgYmUgbWVyZ2VkIHdoZW4gY29tcHV0aW5nIHRoZSBicmVha2Rvd24u IikKIAogICAgIHBhcnNlci5hZGRfYXJndW1lbnQoIi1hIiwKICAgICAgICAgdHlwZT1zdHIsCiAg ICAgICAgIHJlcXVpcmVkPVRydWUsCi0gICAgICAgIGhlbHA9ImEgb2YgYS9iLiBQYXRoIHRvIEpT T04gcmVzdWx0cyBmaWxlLiIpCisgICAgICAgIG5hcmdzPScrJywKKyAgICAgICAgYWN0aW9uPSJh cHBlbmQiLAorICAgICAgICBoZWxwPSJhIEpTT05zIG9mIGEvYi4gUGF0aCB0byBKU09OIHJlc3Vs dHMgZmlsZS4gVGFrZXMgbXVsdGlwbGUgdmFsdWVzIGFuZCBjYW4gYmUgcGFzc2VkIG11bHRpcGxl IHRpbWVzLiIpCiAKICAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCItYiIsCiAgICAgICAgIHR5cGU9 c3RyLAogICAgICAgICByZXF1aXJlZD1UcnVlLAotICAgICAgICBoZWxwPSJiIG9mIGEvYi4gUGF0 aCB0byBKU09OIHJlc3VsdHMgZmlsZS4iKQorICAgICAgICBuYXJncz0nKycsCisgICAgICAgIGFj dGlvbj0iYXBwZW5kIiwKKyAgICAgICAgaGVscD0iYiBKU09OcyBvZiBhL2IuIFBhdGggdG8gSlNP TiByZXN1bHRzIGZpbGUuIFRha2VzIG11bHRpcGxlIHZhbHVlcyBhbmQgY2FuIGJlIHBhc3NlZCBt dWx0aXBsZSB0aW1lcy4iKQogCiAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgiLS1jc3YiLAogICAg ICAgICB0eXBlPXN0ciwKQEAgLTQyMSw4ICs0MjcsMTIgQEAgZGVmIGdldE9wdGlvbnMoKToKIGRl ZiBtYWluKCk6CiAgICAgYXJncyA9IGdldE9wdGlvbnMoKQogCi0gICAgYSA9IHJlYWRKU09ORmls ZShhcmdzLmEpCi0gICAgYiA9IHJlYWRKU09ORmlsZShhcmdzLmIpCisgICAgIyBGbGF0dGVuIHRo ZSBsaXN0IG9mIGxpc3RzIG9mIEpTT04gZmlsZXMuCisgICAgYSA9IGl0ZXJ0b29scy5jaGFpbi5m cm9tX2l0ZXJhYmxlKGFyZ3MuYSkKKyAgICBiID0gaXRlcnRvb2xzLmNoYWluLmZyb21faXRlcmFi bGUoYXJncy5iKQorCisgICAgYSA9IG1lcmdlSlNPTnMobGlzdChtYXAocmVhZEpTT05GaWxlLCBh KSkpCisgICAgYiA9IG1lcmdlSlNPTnMobGlzdChtYXAocmVhZEpTT05GaWxlLCBiKSkpCiAKICAg ICB0eXBlQSA9IGRldGVjdEJlbmNobWFyayhhKQogICAgIHR5cGVCID0gZGV0ZWN0QmVuY2htYXJr KGIpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL21lcmdlLXJlc3VsdC1qc29ucyBiL1Rvb2xz L1NjcmlwdHMvbWVyZ2UtcmVzdWx0LWpzb25zCmluZGV4IDIyMjU1ZGM1YmNkNDNiYTEyNmUwZjVi MDFhN2U0MzNiMTBjMmVjNTUuLmI2OWJmOGU0ODBmMmFkYzZjMzBiNTFhNGFiZDY0MTViNWVlZTU5 MDAgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbWVyZ2UtcmVzdWx0LWpzb25zCisrKyBiL1Rv b2xzL1NjcmlwdHMvbWVyZ2UtcmVzdWx0LWpzb25zCkBAIC0xLDYgKzEsNiBAQAogIyEvdXNyL2Jp bi9lbnYgcHl0aG9uIC11CiAKLSMgQ29weXJpZ2h0IChDKSAyMDE5IEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDE5LTIwMjAgQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBh bmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yOCwzMiAr MjgsMTIgQEAKIAogaW1wb3J0IGFyZ3BhcnNlCiBpbXBvcnQganNvbgotCitmcm9tIHdlYmtpdHB5 LmJlbmNobWFya19ydW5uZXIuYmVuY2htYXJrX2pzb25fbWVyZ2UgaW1wb3J0IG1lcmdlSlNPTnMK IAogZGVmIHJlYWRKU09ORmlsZShwYXRoKToKICAgICB3aXRoIG9wZW4ocGF0aCwgJ3InKSBhcyBj b250ZW50czoKICAgICAgICAgcmV0dXJuIGpzb24ubG9hZChjb250ZW50cykKIAotCi1kZWYgZGVl cEFwcGVuZCh2YWx1ZTEsIHZhbHVlMiwgY3VycmVudEtleT1Ob25lKToKLSAgICBpZiB0eXBlKHZh bHVlMSkgIT0gdHlwZSh2YWx1ZTIpOgotICAgICAgICByYWlzZSBUeXBlRXJyb3IoInZhbHVlcyBo YXZlIGRpZmZlcmVudCB0eXBlcyBmb3Iga2V5OiB7fSwge30gYW5kIHt9Ii5mb3JtYXQoY3VycmVu dEtleSwgdHlwZSh2YWx1ZTEpLCB0eXBlKHZhbHVlMikpKQotICAgIGlmIGlzaW5zdGFuY2UodmFs dWUxLCBsaXN0KToKLSAgICAgICAgcmV0dXJuIHZhbHVlMSArIHZhbHVlMgotCi0gICAgcmVzdWx0 ID0ge307Ci0gICAgZm9yIGtleSBpbiAodmFsdWUxLmtleXMoKSArIHZhbHVlMi5rZXlzKCkpOgot ICAgICAgICBpZiBrZXkgbm90IGluIHJlc3VsdDoKLSAgICAgICAgICAgIHJlc3VsdFtrZXldID0g ZGVlcEFwcGVuZCh2YWx1ZTFba2V5XSwgdmFsdWUyW2tleV0sIGtleSkKLSAgICByZXR1cm4gcmVz dWx0Ci0KLWRlZiBtZXJnZUpTT05zKGpzb25zKToKLSAgICBpZiBsZW4oanNvbnMpID09IDA6Ci0g ICAgICAgIHJhaXNlIFR5cGVFcnJvcigibm8ganNvbnMgdG8gbWVyZ2UiKQotCi0gICAgbGFzdCA9 IGpzb25zLnBvcCgpCi0gICAgcmV0dXJuIHJlZHVjZShkZWVwQXBwZW5kLCBqc29ucywgbGFzdCkK LQogZGVmIG1haW4oKToKICAgICBwYXJzZXIgPSBhcmdwYXJzZS5Bcmd1bWVudFBhcnNlcihkZXNj cmlwdGlvbj0iTWVyZ2UgdGhlIHJlc3VsdGluZyBqc29uIGZpbGVzIGZyb20gbXVsdGlwbGUgaW52 b2NhdGlvbnMgb2YgdGhlIHJ1bl9iZW5jaG1hcmsgc2NyaXB0LiIpCiAKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfanNvbl9tZXJn ZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtf anNvbl9tZXJnZS5weQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xNDVhMGM3NDAyZWI5NmZhODUxZTNiMmEwZDdjY2Zj YjAzNjViNzc3Ci0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5j aG1hcmtfcnVubmVyL2JlbmNobWFya19qc29uX21lcmdlLnB5CkBAIC0wLDAgKzEsNDkgQEAKKyMg Q29weXJpZ2h0IChDKSAyMDE5LTIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor IworIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3 aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisjIGFyZSBtZXQ6CisjCisjIDEuICBSZWRpc3Ry aWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAor IyAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyLgorIyAyLiAgUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVw cm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNv bmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyMgICAgIGRvY3Vt ZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmli dXRpb24uCisjIDMuICBOZWl0aGVyIHRoZSBuYW1lIG9mIEFwcGxlIEluYy4gKCJBcHBsZSIpIG5v ciB0aGUgbmFtZXMgb2YKKyMgICAgIGl0cyBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5k b3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQKKyMgICAgIGZyb20gdGhpcyBzb2Z0d2Fy ZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KKyMKKyMgVEhJUyBT T0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBBTkQgSVRTIENPTlRSSUJVVE9SUyAiQVMgSVMi IEFORCBBTlkKKyMgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVU IE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAorIyBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJ TElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFCisjIERJU0NMQUlN RUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIE9SIElUUyBDT05UUklCVVRPUlMgQkUgTElBQkxF IEZPUiBBTlkKKyMgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBM QVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMKKyMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1J VEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOworIyBM T1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBI T1dFVkVSIENBVVNFRCBBTkQKKyMgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIg SU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyMgKElOQ0xVRElORyBORUdM SUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9G CisjIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuCisKK2ltcG9ydCBqc29uCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5pdGVyYXRp b25fY29tcGF0aWJpbGl0eSBpbXBvcnQgaXRlcml0ZW1zCisKKworZGVmIGRlZXBBcHBlbmQodmFs dWUxLCB2YWx1ZTIsIGN1cnJlbnRLZXk9Tm9uZSk6CisgICAgaWYgdHlwZSh2YWx1ZTEpICE9IHR5 cGUodmFsdWUyKToKKyAgICAgICAgcmFpc2UgVHlwZUVycm9yKCJ2YWx1ZXMgaGF2ZSBkaWZmZXJl bnQgdHlwZXMgZm9yIGtleToge30sIHt9IGFuZCB7fSIuZm9ybWF0KGN1cnJlbnRLZXksIHR5cGUo dmFsdWUxKSwgdHlwZSh2YWx1ZTIpKSkKKyAgICBpZiBpc2luc3RhbmNlKHZhbHVlMSwgbGlzdCk6 CisgICAgICAgIHJldHVybiB2YWx1ZTEgKyB2YWx1ZTIKKworICAgIHJlc3VsdCA9IHt9CisgICAg Zm9yIGtleSBpbiAodmFsdWUxLmtleXMoKSArIHZhbHVlMi5rZXlzKCkpOgorICAgICAgICBpZiBr ZXkgbm90IGluIHJlc3VsdDoKKyAgICAgICAgICAgIHJlc3VsdFtrZXldID0gZGVlcEFwcGVuZCh2 YWx1ZTFba2V5XSwgdmFsdWUyW2tleV0sIGtleSkKKyAgICByZXR1cm4gcmVzdWx0CisKKworZGVm IG1lcmdlSlNPTnMoanNvbnMpOgorICAgIGlmIGxlbihqc29ucykgPT0gMDoKKyAgICAgICAgcmFp c2UgVHlwZUVycm9yKCJubyBqc29ucyB0byBtZXJnZSIpCisKKyAgICBsYXN0ID0ganNvbnMucG9w KCkKKyAgICByZXR1cm4gcmVkdWNlKGRlZXBBcHBlbmQsIGpzb25zLCBsYXN0KQpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2JlbmNobWFya19yZXN1 bHRzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2JlbmNobWFy a19yZXN1bHRzLnB5CmluZGV4IDM5ZDUxYzE5MmE3ZmZlYzFmODFmZjg1OWIwZTEyZDM5OTY1MDBm NDkuLjE1NjU3MmQ3ODlkY2RkNzFiZWQ0MDRhNTQ2MGRkYzBkOTliMGQzNDcgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfcmVzdWx0 cy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2ht YXJrX3Jlc3VsdHMucHkKQEAgLTE1Myw3ICsxNTMsOCBAQCBjbGFzcyBCZW5jaG1hcmtSZXN1bHRz KG9iamVjdCk6CiAgICAgICAgICAgICAgICAgICAgIHJlc3VsdHNbbWV0cmljX25hbWVdW05vbmVd W2NvbmZpZ19uYW1lXSA9IGNscy5fZmxhdHRlbl9saXN0KHZhbHVlcykKICAgICAgICAgICAgICAg ICBjb250aW51ZQogCi0gICAgICAgICAgICBhZ2dyZWdhdG9yX2xpc3QgPSBtZXRyaWMKKyAgICAg ICAgICAgICMgRmlsdGVyIGR1cGxpY2F0ZSBhZ2dyZWdhdG9ycyB0aGF0IGNvdWxkIGhhdmUgYXJp c2VuIGZyb20gbWVyZ2luZyBKU09Ocy4KKyAgICAgICAgICAgIGFnZ3JlZ2F0b3JfbGlzdCA9IGxp c3Qoc2V0KG1ldHJpYykpCiAgICAgICAgICAgICByZXN1bHRzW21ldHJpY19uYW1lXSA9IHt9CiAg ICAgICAgICAgICBmb3IgYWdncmVnYXRvciBpbiBhZ2dyZWdhdG9yX2xpc3Q6CiAgICAgICAgICAg ICAgICAgdmFsdWVzX2J5X2NvbmZpZ19pdGVyYXRpb24gPSBjbHMuX3N1YnRlc3RfdmFsdWVzX2J5 X2NvbmZpZ19pdGVyYXRpb24oc3VidGVzdF9yZXN1bHRzLCBtZXRyaWNfbmFtZSwgYWdncmVnYXRv cikKQEAgLTIxNiw4ICsyMTcsOSBAQCBjbGFzcyBCZW5jaG1hcmtSZXN1bHRzKG9iamVjdCk6CiAg ICAgICAgICAgICAgICAgICAgIHJhaXNlIFR5cGVFcnJvcignVGhlIG1ldHJpY3MgaW4gIiVzIiBp cyBub3QgYSBkaWN0aW9uYXJ5JyAlIHRlc3RfbmFtZSkKICAgICAgICAgICAgICAgICBmb3IgbWV0 cmljX25hbWUsIG1ldHJpYyBpbiBpdGVyaXRlbXMobWV0cmljcyk6CiAgICAgICAgICAgICAgICAg ICAgIGlmIGlzaW5zdGFuY2UobWV0cmljLCBsaXN0KToKLSAgICAgICAgICAgICAgICAgICAgICAg IGNscy5fbGludF9hZ2dyZWdhdG9yX2xpc3QodGVzdF9uYW1lLCBtZXRyaWNfbmFtZSwgbWV0cmlj LCBwYXJlbnRfdGVzdCwgcGFyZW50X2FnZ3JlZ2F0b3JfbGlzdCkKLSAgICAgICAgICAgICAgICAg ICAgICAgIGFnZ3JlZ2F0b3JfbGlzdCA9IG1ldHJpYworICAgICAgICAgICAgICAgICAgICAgICAg IyBGaWx0ZXIgZHVwbGljYXRlIGFnZ3JlZ2F0b3JzIHRoYXQgY291bGQgaGF2ZSBhcmlzZW4gZnJv bSBtZXJnaW5nIEpTT05zLgorICAgICAgICAgICAgICAgICAgICAgICAgYWdncmVnYXRvcl9saXN0 ID0gbGlzdChzZXQobWV0cmljKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGNscy5fbGludF9h Z2dyZWdhdG9yX2xpc3QodGVzdF9uYW1lLCBtZXRyaWNfbmFtZSwgYWdncmVnYXRvcl9saXN0LCBw YXJlbnRfdGVzdCwgcGFyZW50X2FnZ3JlZ2F0b3JfbGlzdCkKICAgICAgICAgICAgICAgICAgICAg ZWxpZiBpc2luc3RhbmNlKG1ldHJpYywgZGljdCk6CiAgICAgICAgICAgICAgICAgICAgICAgICBj bHMuX2xpbnRfY29uZmlndXJhdGlvbih0ZXN0X25hbWUsIG1ldHJpY19uYW1lLCBtZXRyaWMsIHBh cmVudF90ZXN0LCBwYXJlbnRfYWdncmVnYXRvcl9saXN0LCBpdGVyYXRpb25fZ3JvdXBzX2J5X2Nv bmZpZykKICAgICAgICAgICAgICAgICAgICAgZWxzZToKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfcmVzdWx0c191bml0dGVzdC5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfcmVz dWx0c191bml0dGVzdC5weQppbmRleCBmYzlmZjAxNzJhNWJmNTY4OWU2NDg0MGFkMTI2NTc1NmY4 ZTUwMWE3Li4yYjI4MWJhMmIwNjc2YzFlMGY5ZmYwNzI5ZGNmN2FiMzQ5ZWQxYmY0IDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3Jl c3VsdHNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtf cnVubmVyL2JlbmNobWFya19yZXN1bHRzX3VuaXR0ZXN0LnB5CkBAIC0yODMsNiArMjgzLDkgQEAg U29tZVRlc3Q6VGltZTpBcml0aG1ldGljOiAzLjBtcyBzdGRldj0zMy4zJQogCiAgICAgICAgIHNl bGYuYXNzZXJ0VHJ1ZShCZW5jaG1hcmtSZXN1bHRzLl9saW50X3Jlc3VsdHMoeydTb21lVGVzdCc6 IHsnbWV0cmljcyc6IHsnVGltZSc6IHsnY3VycmVudCc6IFsxLCAyXX19fX0pKQogCisgICAgICAg IHNlbGYuYXNzZXJ0VHJ1ZShCZW5jaG1hcmtSZXN1bHRzLl9saW50X3Jlc3VsdHMoeydTb21lVGVz dCc6IHsnbWV0cmljcyc6IHsnVGltZSc6IFsnVG90YWwnLCAnVG90YWwnXX0sICd0ZXN0cyc6IHsK KyAgICAgICAgICAgICdTdWJUZXN0MSc6IHsnbWV0cmljcyc6IHsnVGltZSc6IHsnY3VycmVudCc6 IFtdfX19fX19KSkKKwogICAgICAgICB3aXRoIHNlbGYuYXNzZXJ0UmFpc2VzUmVnZXhwKFR5cGVF cnJvciwgciciVGltZSIgbWV0cmljIG9mICJTb21lVGVzdCIgd2FzIG5vdCBhbiBhZ2dyZWdhdG9y IGxpc3Qgb3IgYSBkaWN0aW9uYXJ5IG9mIGNvbmZpZ3VyYXRpb25zOiAxJyk6CiAgICAgICAgICAg ICBCZW5jaG1hcmtSZXN1bHRzLl9saW50X3Jlc3VsdHMoeydTb21lVGVzdCc6IHsnbWV0cmljcyc6 IHsnVGltZSc6IDF9fX0pCiAKQEAgLTI5OCwxMCArMzAxLDYgQEAgU29tZVRlc3Q6VGltZTpBcml0 aG1ldGljOiAzLjBtcyBzdGRldj0zMy4zJQogICAgICAgICB3aXRoIHNlbGYuYXNzZXJ0UmFpc2Vz UmVnZXhwKFR5cGVFcnJvciwgciciT3RoZXJUZXN0IiByZXF1aXJlcyBhZ2dyZWdhdGlvbiBidXQg aXQgaGFzIG5vIHN1YnRlc3RzJyk6CiAgICAgICAgICAgICBCZW5jaG1hcmtSZXN1bHRzLl9saW50 X3Jlc3VsdHMoeydPdGhlclRlc3QnOiB7J21ldHJpY3MnOiB7J1RpbWUnOiBbJ1RvdGFsJ119fX0p CiAKLSAgICAgICAgd2l0aCBzZWxmLmFzc2VydFJhaXNlc1JlZ2V4cChUeXBlRXJyb3IsIHInIlRp bWUiIG1ldHJpYyBvZiAiU29tZVRlc3QiIGhhZCBpbnZhbGlkIGFnZ3JlZ2F0b3IgbGlzdDogXFsi VG90YWwiLCAiVG90YWwiXF0nKToKLSAgICAgICAgICAgIEJlbmNobWFya1Jlc3VsdHMuX2xpbnRf cmVzdWx0cyh7J1NvbWVUZXN0JzogeydtZXRyaWNzJzogeydUaW1lJzogWydUb3RhbCcsICdUb3Rh bCddfSwgJ3Rlc3RzJzogewotICAgICAgICAgICAgICAgICdTdWJUZXN0MSc6IHsnbWV0cmljcyc6 IHsnVGltZSc6IHsnY3VycmVudCc6IFtdfX19fX19KQotCiAgICAgICAgIHdpdGggc2VsZi5hc3Nl cnRSYWlzZXNSZWdleHAoVHlwZUVycm9yLCByJyJUaW1lIiBtZXRyaWMgb2YgIlNvbWVUZXN0IiB1 c2VzIHVua25vd24gYWdncmVnYXRvcjogS2l0dGVuTWVhbicpOgogICAgICAgICAgICAgQmVuY2ht YXJrUmVzdWx0cy5fbGludF9yZXN1bHRzKHsnU29tZVRlc3QnOiB7J21ldHJpY3MnOiB7J1RpbWUn OiBbJ0tpdHRlbk1lYW4nXX0sICd0ZXN0cyc6IHsKICAgICAgICAgICAgICAgICAnU3ViVGVzdDEn OiB7J21ldHJpY3MnOiB7J1RpbWUnOiB7J2N1cnJlbnQnOiBbXX19fX19fSkK