231400 2021-10-07 16:35:39 -0700 [contributors.json] Support GitHub usernames 2021-10-08 14:29:18 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 231453 1 jbedard jbedard alancoon ap dewei_zhu ews-watchlist glenn jlewis3 kocsen_chung ryanhaddad slewis webkit-bug-importer oldest_to_newest 1801858 0 jbedard 2021-10-07 16:35:39 -0700 Contributors need to provide their GitHub usernames for commit-queue and automated review support. 1801859 1 webkit-bug-importer 2021-10-07 16:35:56 -0700 <rdar://problem/84005266> 1801889 2 440561 jbedard 2021-10-07 17:44:46 -0700 Created attachment 440561 Patch 1801890 3 jbedard 2021-10-07 17:47:32 -0700 Along with myself, I added a few GitHub usernames I already know so that once this lands, I can begin work on some review automation. 1802164 4 440649 jbedard 2021-10-08 11:19:37 -0700 Created attachment 440649 Patch for landing 1802176 5 ews-feeder 2021-10-08 11:41:03 -0700 ChangeLog entry in ChangeLog contains OOPS!. 1802182 6 440653 jbedard 2021-10-08 11:59:20 -0700 Created attachment 440653 Patch for landing 1802198 7 ews-feeder 2021-10-08 12:54:04 -0700 Committed r283833 (242713@main): <https://commits.webkit.org/242713@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440653. 440561 2021-10-07 17:44:46 -0700 2021-10-08 11:19:34 -0700 Patch bug-231400-20211007174445.patch text/plain 13934 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNzU5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWI2NmJjNDAzNTE2MmY3NDdmMzc4OGFlZDA5YTZjNGNm NDE4Y2UyMi4uZjkyZTljYjZmYTk3NTVlNTFlZmQzNTJmMzZhYTUwOTM2MGI0YTY5OSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDIxLTEwLTA3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbY29udHJpYnV0b3JzLmpzb25dIFN1cHBvcnQgR2l0SHViIHVzZXJuYW1lcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxNDAwCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS84NDAwNTI2Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl YmtpdHNjbXB5L2NvbnRyaWJ1dG9yLnB5OgorICAgICAgICAoQ29udHJpYnV0b3IuRW5jb2Rlci5k ZWZhdWx0KTogQWRkIEdpdEh1YiBhbmQgQml0QnVja2V0IHVzZXJuYW1lLgorICAgICAgICAoQ29u dHJpYnV0b3IuTWFwcGluZy5sb2FkKTogRGl0dG8uCisgICAgICAgIChDb250cmlidXRvci5NYXBw aW5nLmFkZCk6IERpdHRvLgorICAgICAgICAoQ29udHJpYnV0b3IuX19pbml0X18pOiBEaXR0by4K KyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0 L2NvbnRyaWJ1dG9yX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdENvbnRyaWJ1dG9yKToKKyAg ICAgICAgKFRlc3RDb250cmlidXRvci50ZXN0X2dpdGh1Yik6CisgICAgICAgIChUZXN0Q29udHJp YnV0b3IudGVzdF9iaXRidWNrZXQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9u L2NvbmZpZy9jb21taXR0ZXJzLnB5OgorICAgICAgICAoQ29udHJpYnV0b3IuX19pbml0X18pOiBB ZGQgR2l0SHViIHVzZXJuYW1lLgorICAgICAgICAoQ29udHJpYnV0b3IuYXNfZGljdCk6IERpdHRv LgorICAgICAgICAoQ29tbWl0dGVyLl9faW5pdF9fKTogRGl0dG8uCisgICAgICAgIChSZXZpZXdl ci5fX2luaXRfXyk6IERpdHRvLgorICAgICAgICAoQm90Ll9faW5pdF9fKTogRGl0dG8uCisgICAg ICAgIChDb21taXR0ZXJMaXN0LmxvYWRfanNvbik6IERpdHRvLgorCiAyMDIxLTEwLTA3ICBKb25h dGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBbd2Via2l0c2NtcHld IExpYnJhcnkgc2hvdWxkIG93biBjb250cmlidXRvcnMuanNvbiBsb2FkaW5nCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9jb250cmli dXRvci5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L2NvbnRyaWJ1dG9yLnB5CmluZGV4IDk3ZTg0MzJiMTkwN2E3NGZkZTIyMjFhZTMxYmFlZGE2YzQ1 ZmU1NWEuLjQ1MmNmNzhkMjA0MThkNmYzOTZlNGIzYTcwMzI3ZWY0YjVlZWM4ZDkgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2NvbnRy aWJ1dG9yLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L2NvbnRyaWJ1dG9yLnB5CkBAIC0xLDQgKzEsNCBAQAotIyBDb3B5cmlnaHQgKEMpIDIw MjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMjAs IDIwMjEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlv biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMg bW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBj b25kaXRpb25zCkBAIC00Nyw2ICs0NywxMCBAQCBjbGFzcyBDb250cmlidXRvcihvYmplY3QpOgog ICAgICAgICAgICAgICAgIHJlc3VsdFsnc3RhdHVzJ10gPSBvYmouc3RhdHVzCiAgICAgICAgICAg ICBpZiBvYmouZW1haWxzOgogICAgICAgICAgICAgICAgIHJlc3VsdFsnZW1haWxzJ10gPSBbc3Ry KGVtYWlsKSBmb3IgZW1haWwgaW4gb2JqLmVtYWlsc10KKyAgICAgICAgICAgIGlmIG9iai5naXRo dWI6CisgICAgICAgICAgICAgICAgcmVzdWx0WydnaXRodWInXSA9IG9iai5naXRodWIKKyAgICAg ICAgICAgIGlmIG9iai5iaXRidWNrZXQ6CisgICAgICAgICAgICAgICAgcmVzdWx0WydiaXRidWNr ZXQnXSA9IG9iai5iaXRidWNrZXQKIAogICAgICAgICAgICAgcmV0dXJuIHJlc3VsdAogCkBAIC02 MSw2ICs2NSwxMyBAQCBjbGFzcyBDb250cmlidXRvcihvYmplY3QpOgogICAgICAgICAgICAgICAg ICAgICBjb250aW51ZQogICAgICAgICAgICAgICAgIGNyZWF0ZWQgPSByZXN1bHQuY3JlYXRlKG5h bWUsICpjb250cmlidXRvci5nZXQoJ2VtYWlscycsIFtdKSkKICAgICAgICAgICAgICAgICBjcmVh dGVkLnN0YXR1cyA9IGNvbnRyaWJ1dG9yLmdldCgnc3RhdHVzJywgY3JlYXRlZC5zdGF0dXMpCisg ICAgICAgICAgICAgICAgY3JlYXRlZC5naXRodWIgPSBjb250cmlidXRvci5nZXQoJ2dpdGh1Yics IGNyZWF0ZWQuZ2l0aHViKQorICAgICAgICAgICAgICAgIGNyZWF0ZWQuYml0YnVja2V0ID0gY29u dHJpYnV0b3IuZ2V0KCdiaXRidWNrZXQnLCBjcmVhdGVkLmJpdGJ1Y2tldCkKKworICAgICAgICAg ICAgICAgIGlmIGNyZWF0ZWQuZ2l0aHViOgorICAgICAgICAgICAgICAgICAgICByZXN1bHRbY3Jl YXRlZC5naXRodWJdID0gY3JlYXRlZAorICAgICAgICAgICAgICAgIGlmIGNyZWF0ZWQuYml0YnVj a2V0OgorICAgICAgICAgICAgICAgICAgICByZXN1bHRbY3JlYXRlZC5iaXRidWNrZXRdID0gY3Jl YXRlZAogCiAgICAgICAgICAgICBmb3IgY29udHJpYnV0b3IgaW4gY29udGVudHM6CiAgICAgICAg ICAgICAgICAgY29uc3RydWN0ZWQgPSByZXN1bHQuZ2V0KGNvbnRyaWJ1dG9yLmdldCgnbmFtZScp KQpAQCAtOTQsNyArMTA1LDE4IEBAIGNsYXNzIENvbnRyaWJ1dG9yKG9iamVjdCk6CiAgICAgICAg IGRlZiBhZGQoc2VsZiwgY29udHJpYnV0b3IpOgogICAgICAgICAgICAgaWYgbm90IGlzaW5zdGFu Y2UoY29udHJpYnV0b3IsIENvbnRyaWJ1dG9yKToKICAgICAgICAgICAgICAgICByYWlzZSBWYWx1 ZUVycm9yKCIne30nIGlzIG5vdCBhIENvbnRyaWJ1dG9yIG9iamVjdCIuZm9ybWF0KHR5cGUoY29u dHJpYnV0b3IpKSkKLSAgICAgICAgICAgIHJldHVybiBzZWxmLmNyZWF0ZShjb250cmlidXRvci5u YW1lLCAqY29udHJpYnV0b3IuZW1haWxzKQorCisgICAgICAgICAgICByZXN1bHQgPSBzZWxmLmNy ZWF0ZShjb250cmlidXRvci5uYW1lLCAqY29udHJpYnV0b3IuZW1haWxzKQorICAgICAgICAgICAg cmVzdWx0LnN0YXR1cyA9IGNvbnRyaWJ1dG9yLnN0YXR1cyBvciByZXN1bHQuc3RhdHVzCisgICAg ICAgICAgICByZXN1bHQuZ2l0aHViID0gY29udHJpYnV0b3IuZ2l0aHViIG9yIHJlc3VsdC5naXRo dWIKKyAgICAgICAgICAgIHJlc3VsdC5iaXRidWNrZXQgPSBjb250cmlidXRvci5iaXRidWNrZXQg b3IgcmVzdWx0LmJpdGJ1Y2tldAorCisgICAgICAgICAgICBpZiByZXN1bHQuZ2l0aHViOgorICAg ICAgICAgICAgICAgIHNlbGZbcmVzdWx0LmdpdGh1Yl0gPSByZXN1bHQKKyAgICAgICAgICAgIGlm IHJlc3VsdC5iaXRidWNrZXQ6CisgICAgICAgICAgICAgICAgc2VsZltyZXN1bHQuYml0YnVja2V0 XSA9IHJlc3VsdAorCisgICAgICAgICAgICByZXR1cm4gcmVzdWx0CiAKICAgICAgICAgZGVmIGNy ZWF0ZShzZWxmLCBuYW1lPU5vbmUsICplbWFpbHMpOgogICAgICAgICAgICAgZW1haWxzID0gW2Vt YWlsIGZvciBlbWFpbCBpbiBlbWFpbHMgb3IgW11dCkBAIC0xNjgsMTAgKzE5MCwxMiBAQCBjbGFz cyBDb250cmlidXRvcihvYmplY3QpOgogICAgICAgICAgICAgcmV0dXJuIGNvbnRyaWJ1dG9ycy5j cmVhdGUoYXV0aG9yLCBlbWFpbCkKICAgICAgICAgcmV0dXJuIGNscyhhdXRob3Igb3IgZW1haWws IGVtYWlscz1bZW1haWxdKQogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlscz1O b25lLCBzdGF0dXM9Tm9uZSk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlscz1O b25lLCBzdGF0dXM9Tm9uZSwgZ2l0aHViPU5vbmUsIGJpdGJ1Y2tldD1Ob25lKToKICAgICAgICAg c2VsZi5uYW1lID0gc3RyaW5nX3V0aWxzLmRlY29kZShuYW1lKQogICAgICAgICBzZWxmLmVtYWls cyA9IGxpc3QoZmlsdGVyKHN0cmluZ191dGlscy5kZWNvZGUsIGVtYWlscyBvciBbXSkpCiAgICAg ICAgIHNlbGYuc3RhdHVzID0gc3RhdHVzCisgICAgICAgIHNlbGYuZ2l0aHViID0gZ2l0aHViCisg ICAgICAgIHNlbGYuYml0YnVja2V0ID0gYml0YnVja2V0CiAKICAgICBAcHJvcGVydHkKICAgICBk ZWYgZW1haWwoc2VsZik6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS90ZXN0L2NvbnRyaWJ1dG9yX3VuaXR0ZXN0LnB5IGIvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9jb250cmlidXRv cl91bml0dGVzdC5weQppbmRleCA1MzdjMzY2NzNmYmI2M2U3MzZlOTE3MWZhYjNjZjgxNGNlYzAx NDc0Li40MjU3MzJhMWE5YmY4YWUzZWI0YjAxZDBiNDQ2Y2YwMGE3ZThlZmUwIDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2Nv bnRyaWJ1dG9yX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvY29udHJpYnV0b3JfdW5pdHRlc3QucHkKQEAgLTEsNCAr MSw0IEBACi0jIENvcHlyaWdodCAoQykgMjAyMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCisjIENvcHlyaWdodCAoQykgMjAyMCwgMjAyMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTE4MywzICsxODMsNDQgQEAg Y2xhc3MgVGVzdENvbnRyaWJ1dG9yKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgIHNv cnRlZChbJ2piZWRhcmRAYXBwbGUuY29tJywgJ3NsZXdpc0BhcHBsZS5jb20nXSksCiAgICAgICAg ICAgICBzb3J0ZWQoW2NvbnRyaWJ1dG9yLmVtYWlsIGZvciBjb250cmlidXRvciBpbiBtYXBwaW5n XSksCiAgICAgICAgICkKKworICAgIGRlZiB0ZXN0X2dpdGh1YihzZWxmKToKKyAgICAgICAgbWFw cGluZyA9IENvbnRyaWJ1dG9yLk1hcHBpbmcoKQorICAgICAgICBtYXBwaW5nLmFkZChDb250cmli dXRvcigKKyAgICAgICAgICAgICdKb25hdGhhbiBCZWRhcmQnLAorICAgICAgICAgICAgZW1haWxz PVsnamJlZGFyZEBhcHBsZS5jb20nXSwKKyAgICAgICAgICAgIGdpdGh1Yj0nSm9uV0JlZGFyZCcs CisgICAgICAgICkpCisgICAgICAgIG1hcHBpbmcuYWRkKENvbnRyaWJ1dG9yKAorICAgICAgICAg ICAgJ0pvbmF0aGFuIEJlZGFyZCcsCisgICAgICAgICAgICBlbWFpbHM9WydqYmVkYXJkQGFwcGxl LmNvbSddLAorICAgICAgICAgICAgZ2l0aHViPSdKb25XQmVkYXJkJywKKyAgICAgICAgKSkKKyAg ICAgICAgbWFwcGluZy5hZGQoQ29udHJpYnV0b3IoCisgICAgICAgICAgICAnS29jc2VuIENodW5n JywKKyAgICAgICAgICAgIGVtYWlscz1bJ2tvY3Nlbl9jaHVuZ0BhcHBsZS5jb20nXSwKKyAgICAg ICAgICAgIGdpdGh1Yj0na29jc2VuYycsCisgICAgICAgICkpCisKKyAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChtYXBwaW5nWydKb25XQmVkYXJkJ10sIG1hcHBpbmdbJ2piZWRhcmRAYXBwbGUuY29t J10pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobWFwcGluZ1sna29jc2VuYyddLCBtYXBwaW5n Wydrb2NzZW5fY2h1bmdAYXBwbGUuY29tJ10pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobWFw cGluZ1snamJlZGFyZEBhcHBsZS5jb20nXS5naXRodWIsICdKb25XQmVkYXJkJykKKyAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChtYXBwaW5nWydrb2NzZW5fY2h1bmdAYXBwbGUuY29tJ10uZ2l0aHVi LCAna29jc2VuYycpCisKKyAgICBkZWYgdGVzdF9iaXRidWNrZXQoc2VsZik6CisgICAgICAgIG1h cHBpbmcgPSBDb250cmlidXRvci5NYXBwaW5nKCkKKyAgICAgICAgbWFwcGluZy5hZGQoQ29udHJp YnV0b3IoCisgICAgICAgICAgICAnSm9uYXRoYW4gQmVkYXJkJywKKyAgICAgICAgICAgIGVtYWls cz1bJ2piZWRhcmRAYXBwbGUuY29tJ10sCisgICAgICAgICAgICBiaXRidWNrZXQ9J2pvbmF0aGFu X2JlZGFyZCcsCisgICAgICAgICkpCisgICAgICAgIG1hcHBpbmcuYWRkKENvbnRyaWJ1dG9yKAor ICAgICAgICAgICAgJ0tvY3NlbiBDaHVuZycsCisgICAgICAgICAgICBlbWFpbHM9Wydrb2NzZW5f Y2h1bmdAYXBwbGUuY29tJ10sCisgICAgICAgICAgICBiaXRidWNrZXQ9J2tvY3Nlbl9jaHVuZycs CisgICAgICAgICkpCisKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChtYXBwaW5nWydqb25hdGhh bl9iZWRhcmQnXSwgbWFwcGluZ1snamJlZGFyZEBhcHBsZS5jb20nXSkKKyAgICAgICAgc2VsZi5h c3NlcnRFcXVhbChtYXBwaW5nWydrb2NzZW5fY2h1bmcnXSwgbWFwcGluZ1sna29jc2VuX2NodW5n QGFwcGxlLmNvbSddKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKG1hcHBpbmdbJ2piZWRhcmRA YXBwbGUuY29tJ10uYml0YnVja2V0LCAnam9uYXRoYW5fYmVkYXJkJykKKyAgICAgICAgc2VsZi5h c3NlcnRFcXVhbChtYXBwaW5nWydrb2NzZW5fY2h1bmdAYXBwbGUuY29tJ10uYml0YnVja2V0LCAn a29jc2VuX2NodW5nJykKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L2NvbmZpZy9jb21taXR0ZXJzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29u ZmlnL2NvbW1pdHRlcnMucHkKaW5kZXggZTIxYWI5ZDFmNzFmOTQxNDdkMTM1NjYyMzI4YzE4NGVj OTBkNzdlNS4uNWJiOWQ0YmRlYzAwOTBlZmY5M2FlMGMzNDc3MDczODdjYmZlMGJmZiAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL2NvbW1pdHRlcnMucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL2NvbW1pdHRlcnMucHkK QEAgLTEsNCArMSw0IEBACi0jIENvcHlyaWdodCAoYykgMjAxMSwgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKGMpIDIwMTEsIDIwMjEgQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgogIyBDb3B5cmlnaHQgKGMpIDIwMDksIDIwMTEsIDIwMTIgR29vZ2xl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBp biBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC00Miw3ICs0Miw3 IEBAIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5maWxlc3lzdGVtIGltcG9ydCBGaWxlU3lz dGVtCiAKIAogY2xhc3MgQ29udHJpYnV0b3Iob2JqZWN0KToKLSAgICBkZWYgX19pbml0X18oc2Vs ZiwgbmFtZSwgZW1haWxfb3JfZW1haWxzLCBpcmNfbmlja25hbWVfb3Jfbmlja25hbWVzPU5vbmUs IGFsaWFzX29yX2FsaWFzZXM9Tm9uZSwgZXhwZXJ0aXNlPU5vbmUpOgorICAgIGRlZiBfX2luaXRf XyhzZWxmLCBuYW1lLCBlbWFpbF9vcl9lbWFpbHMsIGlyY19uaWNrbmFtZV9vcl9uaWNrbmFtZXM9 Tm9uZSwgYWxpYXNfb3JfYWxpYXNlcz1Ob25lLCBleHBlcnRpc2U9Tm9uZSwgZ2l0aHViPU5vbmUp OgogICAgICAgICBhc3NlcnQobmFtZSkKICAgICAgICAgYXNzZXJ0KGVtYWlsX29yX2VtYWlscykK ICAgICAgICAgc2VsZi5mdWxsX25hbWUgPSBuYW1lCkBAIC01Miw2ICs1Miw3IEBAIGNsYXNzIENv bnRyaWJ1dG9yKG9iamVjdCk6CiAgICAgICAgICAgICBzZWxmLmVtYWlscyA9IGVtYWlsX29yX2Vt YWlscwogICAgICAgICBzZWxmLl9jYXNlX3ByZXNlcnZlZF9lbWFpbHMgPSBzZWxmLmVtYWlscwog ICAgICAgICBzZWxmLmVtYWlscyA9IGxpc3QobWFwKGxhbWJkYSBlbWFpbDogZW1haWwubG93ZXIo KSwgc2VsZi5lbWFpbHMpKSAgIyBFbWFpbHMgYXJlIGNhc2UtaW5zZW5zaXRpdmUuCisgICAgICAg IHNlbGYuZ2l0aHViID0gZ2l0aHViCiAKICAgICAgICAgaWYgaXNpbnN0YW5jZShpcmNfbmlja25h bWVfb3Jfbmlja25hbWVzLCBzdHIpOgogICAgICAgICAgICAgc2VsZi5pcmNfbmlja25hbWVzID0g W2lyY19uaWNrbmFtZV9vcl9uaWNrbmFtZXNdCkBAIC0xNzcsNyArMTc4LDggQEAgY2xhc3MgQ29u dHJpYnV0b3Iob2JqZWN0KToKICAgICAgICAgICAgIG5hbWU9c2VsZi5mdWxsX25hbWUsCiAgICAg ICAgICAgICBlbWFpbHM9c2VsZi5fY2FzZV9wcmVzZXJ2ZWRfZW1haWxzLAogICAgICAgICApCi0K KyAgICAgICAgaWYgc2VsZi5naXRodWI6CisgICAgICAgICAgICBpbmZvWyJnaXRodWIiXSA9IHNl bGYuZ2l0aHViCiAgICAgICAgIGlmIHNlbGYuYWxpYXNlczoKICAgICAgICAgICAgIGluZm9bImFs aWFzZXMiXSA9IHNlbGYuYWxpYXNlcwogCkBAIC0xOTksMjAgKzIwMSwyMCBAQCBjbGFzcyBDb250 cmlidXRvcihvYmplY3QpOgogCiAKIGNsYXNzIENvbW1pdHRlcihDb250cmlidXRvcik6Ci0gICAg ZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJjX25pY2tuYW1lPU5v bmUsIGFsaWFzX29yX2FsaWFzZXM9Tm9uZSwgZXhwZXJ0aXNlPU5vbmUpOgotICAgICAgICBDb250 cmlidXRvci5fX2luaXRfXyhzZWxmLCBuYW1lLCBlbWFpbF9vcl9lbWFpbHMsIGlyY19uaWNrbmFt ZSwgYWxpYXNfb3JfYWxpYXNlcywgZXhwZXJ0aXNlKQorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBu YW1lLCBlbWFpbF9vcl9lbWFpbHMsIGlyY19uaWNrbmFtZT1Ob25lLCBhbGlhc19vcl9hbGlhc2Vz PU5vbmUsIGV4cGVydGlzZT1Ob25lLCBnaXRodWI9Tm9uZSk6CisgICAgICAgIENvbnRyaWJ1dG9y Ll9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJjX25pY2tuYW1lLCBhbGlh c19vcl9hbGlhc2VzLCBleHBlcnRpc2UsIGdpdGh1YikKICAgICAgICAgc2VsZi5jYW5fY29tbWl0 ID0gVHJ1ZQogCiAKIGNsYXNzIFJldmlld2VyKENvbW1pdHRlcik6Ci0gICAgZGVmIF9faW5pdF9f KHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJjX25pY2tuYW1lPU5vbmUsIGFsaWFzX29y X2FsaWFzZXM9Tm9uZSwgZXhwZXJ0aXNlPU5vbmUpOgotICAgICAgICBDb21taXR0ZXIuX19pbml0 X18oc2VsZiwgbmFtZSwgZW1haWxfb3JfZW1haWxzLCBpcmNfbmlja25hbWUsIGFsaWFzX29yX2Fs aWFzZXMsIGV4cGVydGlzZSkKKyAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgZW1haWxfb3Jf ZW1haWxzLCBpcmNfbmlja25hbWU9Tm9uZSwgYWxpYXNfb3JfYWxpYXNlcz1Ob25lLCBleHBlcnRp c2U9Tm9uZSwgZ2l0aHViPU5vbmUpOgorICAgICAgICBDb21taXR0ZXIuX19pbml0X18oc2VsZiwg bmFtZSwgZW1haWxfb3JfZW1haWxzLCBpcmNfbmlja25hbWUsIGFsaWFzX29yX2FsaWFzZXMsIGV4 cGVydGlzZSwgZ2l0aHViKQogICAgICAgICBzZWxmLmNhbl9yZXZpZXcgPSBUcnVlCiAKIAogY2xh c3MgQm90KENvbnRyaWJ1dG9yKToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgZW1haWxf b3JfZW1haWxzLCBpcmNfbmlja25hbWU9Tm9uZSwgYWxpYXNfb3JfYWxpYXNlcz1Ob25lLCBleHBl cnRpc2U9Tm9uZSk6Ci0gICAgICAgIENvbnRyaWJ1dG9yLl9faW5pdF9fKHNlbGYsIG5hbWUsIGVt YWlsX29yX2VtYWlscywgaXJjX25pY2tuYW1lLCBhbGlhc19vcl9hbGlhc2VzLCBleHBlcnRpc2Up CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJjX25pY2tu YW1lPU5vbmUsIGFsaWFzX29yX2FsaWFzZXM9Tm9uZSwgZXhwZXJ0aXNlPU5vbmUsIGdpdGh1Yj1O b25lKToKKyAgICAgICAgQ29udHJpYnV0b3IuX19pbml0X18oc2VsZiwgbmFtZSwgZW1haWxfb3Jf ZW1haWxzLCBpcmNfbmlja25hbWUsIGFsaWFzX29yX2FsaWFzZXMsIGV4cGVydGlzZSwgZ2l0aHVi KQogICAgICAgICBzZWxmLmlzX2JvdCA9IFRydWUKIAogCkBAIC0yNTIsMTYgKzI1NCwxNiBAQCBj bGFzcyBDb21taXR0ZXJMaXN0KG9iamVjdCk6CiAgICAgICAgICAgICBpZiBub3QgbmFtZToKICAg ICAgICAgICAgICAgICBjb250aW51ZQogICAgICAgICAgICAgaWYgc3RhdHVzID09ICJyZXZpZXdl ciI6Ci0gICAgICAgICAgICAgICAgY29udHJpYnV0b3IgPSBSZXZpZXdlcihuYW1lLCBkYXRhLmdl dCgnZW1haWxzJyksIGRhdGEuZ2V0KCduaWNrcycpLCBkYXRhLmdldCgnYWxpYXNlcycpLCBkYXRh LmdldCgnZXhwZXJ0aXNlJykpCisgICAgICAgICAgICAgICAgY29udHJpYnV0b3IgPSBSZXZpZXdl cihuYW1lLCBkYXRhLmdldCgnZW1haWxzJyksIGRhdGEuZ2V0KCduaWNrcycpLCBkYXRhLmdldCgn YWxpYXNlcycpLCBkYXRhLmdldCgnZXhwZXJ0aXNlJyksIGRhdGEuZ2V0KCdnaXRodWInKSkKICAg ICAgICAgICAgICAgICBzZWxmLl9yZXZpZXdlcnMuYXBwZW5kKGNvbnRyaWJ1dG9yKQogICAgICAg ICAgICAgICAgIHNlbGYuX2NvbW1pdHRlcnMuYXBwZW5kKGNvbnRyaWJ1dG9yKQogICAgICAgICAg ICAgZWxpZiBzdGF0dXMgPT0gImNvbW1pdHRlciI6Ci0gICAgICAgICAgICAgICAgY29udHJpYnV0 b3IgPSBDb21taXR0ZXIobmFtZSwgZGF0YS5nZXQoJ2VtYWlscycpLCBkYXRhLmdldCgnbmlja3Mn KSwgZGF0YS5nZXQoJ2FsaWFzZXMnKSwgZGF0YS5nZXQoJ2V4cGVydGlzZScpKQorICAgICAgICAg ICAgICAgIGNvbnRyaWJ1dG9yID0gQ29tbWl0dGVyKG5hbWUsIGRhdGEuZ2V0KCdlbWFpbHMnKSwg ZGF0YS5nZXQoJ25pY2tzJyksIGRhdGEuZ2V0KCdhbGlhc2VzJyksIGRhdGEuZ2V0KCdleHBlcnRp c2UnKSwgZGF0YS5nZXQoJ2dpdGh1YicpKQogICAgICAgICAgICAgICAgIHNlbGYuX2NvbW1pdHRl cnMuYXBwZW5kKGNvbnRyaWJ1dG9yKQogICAgICAgICAgICAgZWxpZiBzdGF0dXMgPT0gJ2JvdCc6 Ci0gICAgICAgICAgICAgICAgY29udHJpYnV0b3IgPSBCb3QobmFtZSwgZGF0YS5nZXQoJ2VtYWls cycpLCBkYXRhLmdldCgnbmlja3MnKSwgZGF0YS5nZXQoJ2FsaWFzZXMnKSwgZGF0YS5nZXQoJ2V4 cGVydGlzZScpKQorICAgICAgICAgICAgICAgIGNvbnRyaWJ1dG9yID0gQm90KG5hbWUsIGRhdGEu Z2V0KCdlbWFpbHMnKSwgZGF0YS5nZXQoJ25pY2tzJyksIGRhdGEuZ2V0KCdhbGlhc2VzJyksIGRh dGEuZ2V0KCdleHBlcnRpc2UnKSwgZGF0YS5nZXQoJ2dpdGh1YicpKQogICAgICAgICAgICAgZWxz ZToKLSAgICAgICAgICAgICAgICBjb250cmlidXRvciA9IENvbnRyaWJ1dG9yKG5hbWUsIGRhdGEu Z2V0KCdlbWFpbHMnKSwgZGF0YS5nZXQoJ25pY2tzJyksIGRhdGEuZ2V0KCdhbGlhc2VzJyksIGRh dGEuZ2V0KCdleHBlcnRpc2UnKSkKKyAgICAgICAgICAgICAgICBjb250cmlidXRvciA9IENvbnRy aWJ1dG9yKG5hbWUsIGRhdGEuZ2V0KCdlbWFpbHMnKSwgZGF0YS5nZXQoJ25pY2tzJyksIGRhdGEu Z2V0KCdhbGlhc2VzJyksIGRhdGEuZ2V0KCdleHBlcnRpc2UnKSwgZGF0YS5nZXQoJ2dpdGh1Yicp KQogCiAgICAgICAgICAgICBzZWxmLl9jb250cmlidXRvcnMuYXBwZW5kKGNvbnRyaWJ1dG9yKQog CmRpZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXggNmU5MmU0ZTJlMGYzZWUw ZjlhN2YyNTMxNGQ3NzcwZGIyYTNjNGFmNi4uODVhZjI4MGU4NGQ0YTM0Nzc0NzY4NjBlZDljODM0 YWM3NTFhZjRkMCAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDEzIEBACisyMDIxLTEwLTA3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbY29udHJpYnV0b3JzLmpzb25dIFN1cHBvcnQgR2l0SHViIHVzZXJuYW1l cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxNDAw CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NDAwNTI2Nj4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIG1ldGFkYXRhL2NvbnRyaWJ1dG9ycy5qc29u OiBBZGQgc29tZSBHaXRIdWIgdXNlcm5hbWVzLgorCiAyMDIxLTEwLTA3ICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBSZWVuYWJsZSAt ZnZpc2liaWxpdHk9aGlkZGVuCmRpZmYgLS1naXQgYS9tZXRhZGF0YS9jb250cmlidXRvcnMuanNv biBiL21ldGFkYXRhL2NvbnRyaWJ1dG9ycy5qc29uCmluZGV4IGJlZDhhZDI1NWMxMTA5OWFkZDEw MGIxYTc5ODgwMTZmMDhmNjMxMTEuLjk5MzI5MjYzZDFhNGRkYmZiZWVkNmY1ZmE2N2JkOTRkNzdk MDE0OTIgMTAwNjQ0Ci0tLSBhL21ldGFkYXRhL2NvbnRyaWJ1dG9ycy5qc29uCisrKyBiL21ldGFk YXRhL2NvbnRyaWJ1dG9ycy5qc29uCkBAIC0yMjksNiArMjI5LDcgQEAKICAgICAgICJlbWFpbHMi IDogWwogICAgICAgICAgImFsYW5jb29uQGFwcGxlLmNvbSIKICAgICAgIF0sCisgICAgICAiZ2l0 aHViIiA6ICJhbGFuY29vbiIsCiAgICAgICAibmFtZSIgOiAiQWxhbiBDb29uIiwKICAgICAgICJu aWNrcyIgOiBbCiAgICAgICAgICAiYWxhbmNvb24iCkBAIC00MDAsNiArNDAxLDcgQEAKICAgICAg ICAgICJhcEB3ZWJraXQub3JnIiwKICAgICAgICAgICJhcEBhcHBsZS5jb20iCiAgICAgICBdLAor ICAgICAgImdpdGh1YiIgOiAiYXByb3NrdXJ5YWtvdiIsCiAgICAgICAibmFtZSIgOiAiQWxleGV5 IFByb3NrdXJ5YWtvdiIsCiAgICAgICAibmlja3MiIDogWwogICAgICAgICAgImFwIgpAQCAtMzUy OSw2ICszNTMxLDcgQEAKICAgICAgICAgICJqYmVkYXJkQHdlYmtpdC5vcmciCiAgICAgICBdLAog ICAgICAgImV4cGVydGlzZSIgOiAid2Via2l0cHksIFB5dGhvbiwgdGVzdGluZyIsCisgICAgICAi Z2l0aHViIiA6ICJKb25XQmVkYXJkIiwKICAgICAgICJuYW1lIiA6ICJKb25hdGhhbiBCZWRhcmQi LAogICAgICAgIm5pY2tzIiA6IFsKICAgICAgICAgICJqYmVkYXJkIiwKQEAgLTQwMjAsNiArNDAy Myw3IEBACiAgICAgICAiZW1haWxzIiA6IFsKICAgICAgICAgICJrb2NzZW5fY2h1bmdAYXBwbGUu Y29tIgogICAgICAgXSwKKyAgICAgICJnaXRodWIiIDogImtvY3NlbmMiLAogICAgICAgIm5hbWUi IDogIktvY3NlbiBDaHVuZyIsCiAgICAgICAic3RhdHVzIiA6ICJjb21taXR0ZXIiCiAgICB9LApA QCAtNDUyNyw2ICs0NTMxLDcgQEAKICAgICAgICJlbWFpbHMiIDogWwogICAgICAgICAgImpsZXdp czNAYXBwbGUuY29tIgogICAgICAgXSwKKyAgICAgICJnaXRodWIiIDogInJhbmNvcmVkLW1vbmdv b3NlIiwKICAgICAgICJuYW1lIiA6ICJNYXR0IExld2lzIiwKICAgICAgICJuaWNrcyIgOiBbCiAg ICAgICAgICAibWF0dGxld2lzIgpAQCAtNTYwMSw2ICs1NjA2LDcgQEAKICAgICAgICJlbWFpbHMi IDogWwogICAgICAgICAgInJ5YW5oYWRkYWRAYXBwbGUuY29tIgogICAgICAgXSwKKyAgICAgICJn aXRodWIiIDogInJ5YW5oYWRkYWQiLAogICAgICAgIm5hbWUiIDogIlJ5YW4gSGFkZGFkIiwKICAg ICAgICJuaWNrcyIgOiBbCiAgICAgICAgICAicnlhbmhhZGRhZCIKQEAgLTY5MTAsNCArNjkxNiw0 IEBACiAgICAgICBdLAogICAgICAgInN0YXR1cyIgOiAicmV2aWV3ZXIiCiAgICB9Ci1dCitdClwg Tm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQo= 440649 2021-10-08 11:19:37 -0700 2021-10-08 11:59:17 -0700 Patch for landing bug-231400-20211008111936.patch text/plain 15486 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzODEzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2ZkYWVhZDk2Y2NjZmVhMGVlYzhiOGM3YWVkYTY5NWVk ZGRiYWIzZC4uN2I2NDAxNDhjOWE5NjRiZmJjYzgyM2E1ZTA3MjY0YTA4MWVkY2VjYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMw IEBACisyMDIxLTEwLTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbY29udHJpYnV0b3JzLmpzb25dIFN1cHBvcnQgR2l0SHViIHVzZXJuYW1lcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxNDAwCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS84NDAwNTI2Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBEZXdl aSBaaHUuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5w eTogQnVtcCB2ZXJzaW9uLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5OiBEaXR0by4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJh cmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9jb250cmlidXRvci5weToKKyAgICAgICAgKENv bnRyaWJ1dG9yLkVuY29kZXIuZGVmYXVsdCk6IEFkZCBHaXRIdWIgYW5kIEJpdEJ1Y2tldCB1c2Vy bmFtZS4KKyAgICAgICAgKENvbnRyaWJ1dG9yLk1hcHBpbmcubG9hZCk6IERpdHRvLgorICAgICAg ICAoQ29udHJpYnV0b3IuTWFwcGluZy5hZGQpOiBEaXR0by4KKyAgICAgICAgKENvbnRyaWJ1dG9y Ll9faW5pdF9fKTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvdGVzdC9jb250cmlidXRvcl91bml0dGVzdC5weToKKyAgICAgICAgKFRl c3RDb250cmlidXRvcik6CisgICAgICAgIChUZXN0Q29udHJpYnV0b3IudGVzdF9naXRodWIpOgor ICAgICAgICAoVGVzdENvbnRyaWJ1dG9yLnRlc3RfYml0YnVja2V0KToKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29tbWl0dGVycy5weToKKyAgICAgICAgKENvbnRy aWJ1dG9yLl9faW5pdF9fKTogQWRkIEdpdEh1YiB1c2VybmFtZS4KKyAgICAgICAgKENvbnRyaWJ1 dG9yLmFzX2RpY3QpOiBEaXR0by4KKyAgICAgICAgKENvbW1pdHRlci5fX2luaXRfXyk6IERpdHRv LgorICAgICAgICAoUmV2aWV3ZXIuX19pbml0X18pOiBEaXR0by4KKyAgICAgICAgKEJvdC5fX2lu aXRfXyk6IERpdHRvLgorICAgICAgICAoQ29tbWl0dGVyTGlzdC5sb2FkX2pzb24pOiBEaXR0by4K KwogMjAyMS0xMC0wOCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAg ICAgTWFrZSBXVEY6Okl0ZXJhdG9yUmFuZ2UgcmV2ZXJzaWJsZQpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkgYi9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQppbmRleCA5MTE4NmI0MjNlYjllYzJjODFiMzBi YTIwNjNhNzg0MzExNWExODdmLi5kMDdkYmU2ZGVhYzI3YTRmY2E5NjQxNmYyMjM2MDFlNTFhOTA5 NjMyIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1 cC5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQpA QCAtMjksNyArMjksNyBAQCBkZWYgcmVhZG1lKCk6CiAKIHNldHVwKAogICAgIG5hbWU9J3dlYmtp dHNjbXB5JywKLSAgICB2ZXJzaW9uPScyLjIuNicsCisgICAgdmVyc2lvbj0nMi4yLjcnLAogICAg IGRlc2NyaXB0aW9uPSdMaWJyYXJ5IGRlc2lnbmVkIHRvIGludGVyYWN0IHdpdGggZ2l0IGFuZCBz dm4gcmVwb3NpdG9yaWVzLicsCiAgICAgbG9uZ19kZXNjcmlwdGlvbj1yZWFkbWUoKSwKICAgICBj bGFzc2lmaWVycz1bCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS9fX2luaXRfXy5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CmluZGV4IDM5MWUyYzc2Mjg3ZWU2MWM2 ZjhlYzY4ZWUxODRjMWFkYzE2NjM3OWYuLmU1OWFlOWQxODFkMDdmN2I4MzI0OWZkM2Y0NDM3MDQ1 NDNjMzc2MjEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CkBAIC00Niw3ICs0Niw3IEBAIGV4Y2Vw dCBJbXBvcnRFcnJvcjoKICAgICAgICAgIlBsZWFzZSBpbnN0YWxsIHdlYmtpdGNvcmVweSB3aXRo IGBwaXAgaW5zdGFsbCB3ZWJraXRjb3JlcHkgLS1leHRyYS1pbmRleC11cmwgPHBhY2thZ2UgaW5k ZXggVVJMPmAiCiAgICAgKQogCi12ZXJzaW9uID0gVmVyc2lvbigyLCAyLCA2KQordmVyc2lvbiA9 IFZlcnNpb24oMiwgMiwgNykKIAogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZmFzdGVu ZXJzJywgVmVyc2lvbigwLCAxNSwgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgn bW9ub3RvbmljJywgVmVyc2lvbigxLCA1KSkpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9jb250cmlidXRvci5weSBiL1Rvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2NvbnRyaWJ1dG9yLnB5Cmlu ZGV4IDk3ZTg0MzJiMTkwN2E3NGZkZTIyMjFhZTMxYmFlZGE2YzQ1ZmU1NWEuLjQ1MmNmNzhkMjA0 MThkNmYzOTZlNGIzYTcwMzI3ZWY0YjVlZWM4ZDkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2NvbnRyaWJ1dG9yLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2NvbnRyaWJ1dG9y LnB5CkBAIC0xLDQgKzEsNCBAQAotIyBDb3B5cmlnaHQgKEMpIDIwMjAgQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMjAsIDIwMjEgQXBwbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0aW9uLCBhcmUg cGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC00Nyw2 ICs0NywxMCBAQCBjbGFzcyBDb250cmlidXRvcihvYmplY3QpOgogICAgICAgICAgICAgICAgIHJl c3VsdFsnc3RhdHVzJ10gPSBvYmouc3RhdHVzCiAgICAgICAgICAgICBpZiBvYmouZW1haWxzOgog ICAgICAgICAgICAgICAgIHJlc3VsdFsnZW1haWxzJ10gPSBbc3RyKGVtYWlsKSBmb3IgZW1haWwg aW4gb2JqLmVtYWlsc10KKyAgICAgICAgICAgIGlmIG9iai5naXRodWI6CisgICAgICAgICAgICAg ICAgcmVzdWx0WydnaXRodWInXSA9IG9iai5naXRodWIKKyAgICAgICAgICAgIGlmIG9iai5iaXRi dWNrZXQ6CisgICAgICAgICAgICAgICAgcmVzdWx0WydiaXRidWNrZXQnXSA9IG9iai5iaXRidWNr ZXQKIAogICAgICAgICAgICAgcmV0dXJuIHJlc3VsdAogCkBAIC02MSw2ICs2NSwxMyBAQCBjbGFz cyBDb250cmlidXRvcihvYmplY3QpOgogICAgICAgICAgICAgICAgICAgICBjb250aW51ZQogICAg ICAgICAgICAgICAgIGNyZWF0ZWQgPSByZXN1bHQuY3JlYXRlKG5hbWUsICpjb250cmlidXRvci5n ZXQoJ2VtYWlscycsIFtdKSkKICAgICAgICAgICAgICAgICBjcmVhdGVkLnN0YXR1cyA9IGNvbnRy aWJ1dG9yLmdldCgnc3RhdHVzJywgY3JlYXRlZC5zdGF0dXMpCisgICAgICAgICAgICAgICAgY3Jl YXRlZC5naXRodWIgPSBjb250cmlidXRvci5nZXQoJ2dpdGh1YicsIGNyZWF0ZWQuZ2l0aHViKQor ICAgICAgICAgICAgICAgIGNyZWF0ZWQuYml0YnVja2V0ID0gY29udHJpYnV0b3IuZ2V0KCdiaXRi dWNrZXQnLCBjcmVhdGVkLmJpdGJ1Y2tldCkKKworICAgICAgICAgICAgICAgIGlmIGNyZWF0ZWQu Z2l0aHViOgorICAgICAgICAgICAgICAgICAgICByZXN1bHRbY3JlYXRlZC5naXRodWJdID0gY3Jl YXRlZAorICAgICAgICAgICAgICAgIGlmIGNyZWF0ZWQuYml0YnVja2V0OgorICAgICAgICAgICAg ICAgICAgICByZXN1bHRbY3JlYXRlZC5iaXRidWNrZXRdID0gY3JlYXRlZAogCiAgICAgICAgICAg ICBmb3IgY29udHJpYnV0b3IgaW4gY29udGVudHM6CiAgICAgICAgICAgICAgICAgY29uc3RydWN0 ZWQgPSByZXN1bHQuZ2V0KGNvbnRyaWJ1dG9yLmdldCgnbmFtZScpKQpAQCAtOTQsNyArMTA1LDE4 IEBAIGNsYXNzIENvbnRyaWJ1dG9yKG9iamVjdCk6CiAgICAgICAgIGRlZiBhZGQoc2VsZiwgY29u dHJpYnV0b3IpOgogICAgICAgICAgICAgaWYgbm90IGlzaW5zdGFuY2UoY29udHJpYnV0b3IsIENv bnRyaWJ1dG9yKToKICAgICAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCIne30nIGlzIG5v dCBhIENvbnRyaWJ1dG9yIG9iamVjdCIuZm9ybWF0KHR5cGUoY29udHJpYnV0b3IpKSkKLSAgICAg ICAgICAgIHJldHVybiBzZWxmLmNyZWF0ZShjb250cmlidXRvci5uYW1lLCAqY29udHJpYnV0b3Iu ZW1haWxzKQorCisgICAgICAgICAgICByZXN1bHQgPSBzZWxmLmNyZWF0ZShjb250cmlidXRvci5u YW1lLCAqY29udHJpYnV0b3IuZW1haWxzKQorICAgICAgICAgICAgcmVzdWx0LnN0YXR1cyA9IGNv bnRyaWJ1dG9yLnN0YXR1cyBvciByZXN1bHQuc3RhdHVzCisgICAgICAgICAgICByZXN1bHQuZ2l0 aHViID0gY29udHJpYnV0b3IuZ2l0aHViIG9yIHJlc3VsdC5naXRodWIKKyAgICAgICAgICAgIHJl c3VsdC5iaXRidWNrZXQgPSBjb250cmlidXRvci5iaXRidWNrZXQgb3IgcmVzdWx0LmJpdGJ1Y2tl dAorCisgICAgICAgICAgICBpZiByZXN1bHQuZ2l0aHViOgorICAgICAgICAgICAgICAgIHNlbGZb cmVzdWx0LmdpdGh1Yl0gPSByZXN1bHQKKyAgICAgICAgICAgIGlmIHJlc3VsdC5iaXRidWNrZXQ6 CisgICAgICAgICAgICAgICAgc2VsZltyZXN1bHQuYml0YnVja2V0XSA9IHJlc3VsdAorCisgICAg ICAgICAgICByZXR1cm4gcmVzdWx0CiAKICAgICAgICAgZGVmIGNyZWF0ZShzZWxmLCBuYW1lPU5v bmUsICplbWFpbHMpOgogICAgICAgICAgICAgZW1haWxzID0gW2VtYWlsIGZvciBlbWFpbCBpbiBl bWFpbHMgb3IgW11dCkBAIC0xNjgsMTAgKzE5MCwxMiBAQCBjbGFzcyBDb250cmlidXRvcihvYmpl Y3QpOgogICAgICAgICAgICAgcmV0dXJuIGNvbnRyaWJ1dG9ycy5jcmVhdGUoYXV0aG9yLCBlbWFp bCkKICAgICAgICAgcmV0dXJuIGNscyhhdXRob3Igb3IgZW1haWwsIGVtYWlscz1bZW1haWxdKQog Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlscz1Ob25lLCBzdGF0dXM9Tm9uZSk6 CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlscz1Ob25lLCBzdGF0dXM9Tm9uZSwg Z2l0aHViPU5vbmUsIGJpdGJ1Y2tldD1Ob25lKToKICAgICAgICAgc2VsZi5uYW1lID0gc3RyaW5n X3V0aWxzLmRlY29kZShuYW1lKQogICAgICAgICBzZWxmLmVtYWlscyA9IGxpc3QoZmlsdGVyKHN0 cmluZ191dGlscy5kZWNvZGUsIGVtYWlscyBvciBbXSkpCiAgICAgICAgIHNlbGYuc3RhdHVzID0g c3RhdHVzCisgICAgICAgIHNlbGYuZ2l0aHViID0gZ2l0aHViCisgICAgICAgIHNlbGYuYml0YnVj a2V0ID0gYml0YnVja2V0CiAKICAgICBAcHJvcGVydHkKICAgICBkZWYgZW1haWwoc2VsZik6CmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS90ZXN0L2NvbnRyaWJ1dG9yX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9jb250cmlidXRvcl91bml0dGVzdC5weQppbmRl eCA1MzdjMzY2NzNmYmI2M2U3MzZlOTE3MWZhYjNjZjgxNGNlYzAxNDc0Li40MjU3MzJhMWE5YmY4 YWUzZWI0YjAxZDBiNDQ2Y2YwMGE3ZThlZmUwIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2NvbnRyaWJ1dG9yX3VuaXR0ZXN0 LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L3Rlc3QvY29udHJpYnV0b3JfdW5pdHRlc3QucHkKQEAgLTEsNCArMSw0IEBACi0jIENvcHlyaWdo dCAoQykgMjAyMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjIENvcHlyaWdodCAo QykgMjAyMCwgMjAyMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlz dHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0 aG91dAogIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMKQEAgLTE4MywzICsxODMsNDQgQEAgY2xhc3MgVGVzdENvbnRyaWJ1 dG9yKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgIHNvcnRlZChbJ2piZWRhcmRAYXBw bGUuY29tJywgJ3NsZXdpc0BhcHBsZS5jb20nXSksCiAgICAgICAgICAgICBzb3J0ZWQoW2NvbnRy aWJ1dG9yLmVtYWlsIGZvciBjb250cmlidXRvciBpbiBtYXBwaW5nXSksCiAgICAgICAgICkKKwor ICAgIGRlZiB0ZXN0X2dpdGh1YihzZWxmKToKKyAgICAgICAgbWFwcGluZyA9IENvbnRyaWJ1dG9y Lk1hcHBpbmcoKQorICAgICAgICBtYXBwaW5nLmFkZChDb250cmlidXRvcigKKyAgICAgICAgICAg ICdKb25hdGhhbiBCZWRhcmQnLAorICAgICAgICAgICAgZW1haWxzPVsnamJlZGFyZEBhcHBsZS5j b20nXSwKKyAgICAgICAgICAgIGdpdGh1Yj0nSm9uV0JlZGFyZCcsCisgICAgICAgICkpCisgICAg ICAgIG1hcHBpbmcuYWRkKENvbnRyaWJ1dG9yKAorICAgICAgICAgICAgJ0pvbmF0aGFuIEJlZGFy ZCcsCisgICAgICAgICAgICBlbWFpbHM9WydqYmVkYXJkQGFwcGxlLmNvbSddLAorICAgICAgICAg ICAgZ2l0aHViPSdKb25XQmVkYXJkJywKKyAgICAgICAgKSkKKyAgICAgICAgbWFwcGluZy5hZGQo Q29udHJpYnV0b3IoCisgICAgICAgICAgICAnS29jc2VuIENodW5nJywKKyAgICAgICAgICAgIGVt YWlscz1bJ2tvY3Nlbl9jaHVuZ0BhcHBsZS5jb20nXSwKKyAgICAgICAgICAgIGdpdGh1Yj0na29j c2VuYycsCisgICAgICAgICkpCisKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChtYXBwaW5nWydK b25XQmVkYXJkJ10sIG1hcHBpbmdbJ2piZWRhcmRAYXBwbGUuY29tJ10pCisgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWwobWFwcGluZ1sna29jc2VuYyddLCBtYXBwaW5nWydrb2NzZW5fY2h1bmdAYXBw bGUuY29tJ10pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobWFwcGluZ1snamJlZGFyZEBhcHBs ZS5jb20nXS5naXRodWIsICdKb25XQmVkYXJkJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCht YXBwaW5nWydrb2NzZW5fY2h1bmdAYXBwbGUuY29tJ10uZ2l0aHViLCAna29jc2VuYycpCisKKyAg ICBkZWYgdGVzdF9iaXRidWNrZXQoc2VsZik6CisgICAgICAgIG1hcHBpbmcgPSBDb250cmlidXRv ci5NYXBwaW5nKCkKKyAgICAgICAgbWFwcGluZy5hZGQoQ29udHJpYnV0b3IoCisgICAgICAgICAg ICAnSm9uYXRoYW4gQmVkYXJkJywKKyAgICAgICAgICAgIGVtYWlscz1bJ2piZWRhcmRAYXBwbGUu Y29tJ10sCisgICAgICAgICAgICBiaXRidWNrZXQ9J2pvbmF0aGFuX2JlZGFyZCcsCisgICAgICAg ICkpCisgICAgICAgIG1hcHBpbmcuYWRkKENvbnRyaWJ1dG9yKAorICAgICAgICAgICAgJ0tvY3Nl biBDaHVuZycsCisgICAgICAgICAgICBlbWFpbHM9Wydrb2NzZW5fY2h1bmdAYXBwbGUuY29tJ10s CisgICAgICAgICAgICBiaXRidWNrZXQ9J2tvY3Nlbl9jaHVuZycsCisgICAgICAgICkpCisKKyAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChtYXBwaW5nWydqb25hdGhhbl9iZWRhcmQnXSwgbWFwcGlu Z1snamJlZGFyZEBhcHBsZS5jb20nXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChtYXBwaW5n Wydrb2NzZW5fY2h1bmcnXSwgbWFwcGluZ1sna29jc2VuX2NodW5nQGFwcGxlLmNvbSddKQorICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKG1hcHBpbmdbJ2piZWRhcmRAYXBwbGUuY29tJ10uYml0YnVj a2V0LCAnam9uYXRoYW5fYmVkYXJkJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChtYXBwaW5n Wydrb2NzZW5fY2h1bmdAYXBwbGUuY29tJ10uYml0YnVja2V0LCAna29jc2VuX2NodW5nJykKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJz LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL2NvbW1pdHRlcnMucHkK aW5kZXggZTIxYWI5ZDFmNzFmOTQxNDdkMTM1NjYyMzI4YzE4NGVjOTBkNzdlNS4uNWJiOWQ0YmRl YzAwOTBlZmY5M2FlMGMzNDc3MDczODdjYmZlMGJmZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY29uZmlnL2NvbW1pdHRlcnMucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY29uZmlnL2NvbW1pdHRlcnMucHkKQEAgLTEsNCArMSw0IEBACi0j IENvcHlyaWdodCAoYykgMjAxMSwgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBD b3B5cmlnaHQgKGMpIDIwMTEsIDIwMjEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgog IyBDb3B5cmlnaHQgKGMpIDIwMDksIDIwMTEsIDIwMTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC00Miw3ICs0Miw3IEBAIGZyb20gd2Via2l0cHku Y29tbW9uLnN5c3RlbS5maWxlc3lzdGVtIGltcG9ydCBGaWxlU3lzdGVtCiAKIAogY2xhc3MgQ29u dHJpYnV0b3Iob2JqZWN0KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgZW1haWxfb3Jf ZW1haWxzLCBpcmNfbmlja25hbWVfb3Jfbmlja25hbWVzPU5vbmUsIGFsaWFzX29yX2FsaWFzZXM9 Tm9uZSwgZXhwZXJ0aXNlPU5vbmUpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuYW1lLCBlbWFp bF9vcl9lbWFpbHMsIGlyY19uaWNrbmFtZV9vcl9uaWNrbmFtZXM9Tm9uZSwgYWxpYXNfb3JfYWxp YXNlcz1Ob25lLCBleHBlcnRpc2U9Tm9uZSwgZ2l0aHViPU5vbmUpOgogICAgICAgICBhc3NlcnQo bmFtZSkKICAgICAgICAgYXNzZXJ0KGVtYWlsX29yX2VtYWlscykKICAgICAgICAgc2VsZi5mdWxs X25hbWUgPSBuYW1lCkBAIC01Miw2ICs1Miw3IEBAIGNsYXNzIENvbnRyaWJ1dG9yKG9iamVjdCk6 CiAgICAgICAgICAgICBzZWxmLmVtYWlscyA9IGVtYWlsX29yX2VtYWlscwogICAgICAgICBzZWxm Ll9jYXNlX3ByZXNlcnZlZF9lbWFpbHMgPSBzZWxmLmVtYWlscwogICAgICAgICBzZWxmLmVtYWls cyA9IGxpc3QobWFwKGxhbWJkYSBlbWFpbDogZW1haWwubG93ZXIoKSwgc2VsZi5lbWFpbHMpKSAg IyBFbWFpbHMgYXJlIGNhc2UtaW5zZW5zaXRpdmUuCisgICAgICAgIHNlbGYuZ2l0aHViID0gZ2l0 aHViCiAKICAgICAgICAgaWYgaXNpbnN0YW5jZShpcmNfbmlja25hbWVfb3Jfbmlja25hbWVzLCBz dHIpOgogICAgICAgICAgICAgc2VsZi5pcmNfbmlja25hbWVzID0gW2lyY19uaWNrbmFtZV9vcl9u aWNrbmFtZXNdCkBAIC0xNzcsNyArMTc4LDggQEAgY2xhc3MgQ29udHJpYnV0b3Iob2JqZWN0KToK ICAgICAgICAgICAgIG5hbWU9c2VsZi5mdWxsX25hbWUsCiAgICAgICAgICAgICBlbWFpbHM9c2Vs Zi5fY2FzZV9wcmVzZXJ2ZWRfZW1haWxzLAogICAgICAgICApCi0KKyAgICAgICAgaWYgc2VsZi5n aXRodWI6CisgICAgICAgICAgICBpbmZvWyJnaXRodWIiXSA9IHNlbGYuZ2l0aHViCiAgICAgICAg IGlmIHNlbGYuYWxpYXNlczoKICAgICAgICAgICAgIGluZm9bImFsaWFzZXMiXSA9IHNlbGYuYWxp YXNlcwogCkBAIC0xOTksMjAgKzIwMSwyMCBAQCBjbGFzcyBDb250cmlidXRvcihvYmplY3QpOgog CiAKIGNsYXNzIENvbW1pdHRlcihDb250cmlidXRvcik6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYs IG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJjX25pY2tuYW1lPU5vbmUsIGFsaWFzX29yX2FsaWFz ZXM9Tm9uZSwgZXhwZXJ0aXNlPU5vbmUpOgotICAgICAgICBDb250cmlidXRvci5fX2luaXRfXyhz ZWxmLCBuYW1lLCBlbWFpbF9vcl9lbWFpbHMsIGlyY19uaWNrbmFtZSwgYWxpYXNfb3JfYWxpYXNl cywgZXhwZXJ0aXNlKQorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuYW1lLCBlbWFpbF9vcl9lbWFp bHMsIGlyY19uaWNrbmFtZT1Ob25lLCBhbGlhc19vcl9hbGlhc2VzPU5vbmUsIGV4cGVydGlzZT1O b25lLCBnaXRodWI9Tm9uZSk6CisgICAgICAgIENvbnRyaWJ1dG9yLl9faW5pdF9fKHNlbGYsIG5h bWUsIGVtYWlsX29yX2VtYWlscywgaXJjX25pY2tuYW1lLCBhbGlhc19vcl9hbGlhc2VzLCBleHBl cnRpc2UsIGdpdGh1YikKICAgICAgICAgc2VsZi5jYW5fY29tbWl0ID0gVHJ1ZQogCiAKIGNsYXNz IFJldmlld2VyKENvbW1pdHRlcik6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWls X29yX2VtYWlscywgaXJjX25pY2tuYW1lPU5vbmUsIGFsaWFzX29yX2FsaWFzZXM9Tm9uZSwgZXhw ZXJ0aXNlPU5vbmUpOgotICAgICAgICBDb21taXR0ZXIuX19pbml0X18oc2VsZiwgbmFtZSwgZW1h aWxfb3JfZW1haWxzLCBpcmNfbmlja25hbWUsIGFsaWFzX29yX2FsaWFzZXMsIGV4cGVydGlzZSkK KyAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgZW1haWxfb3JfZW1haWxzLCBpcmNfbmlja25h bWU9Tm9uZSwgYWxpYXNfb3JfYWxpYXNlcz1Ob25lLCBleHBlcnRpc2U9Tm9uZSwgZ2l0aHViPU5v bmUpOgorICAgICAgICBDb21taXR0ZXIuX19pbml0X18oc2VsZiwgbmFtZSwgZW1haWxfb3JfZW1h aWxzLCBpcmNfbmlja25hbWUsIGFsaWFzX29yX2FsaWFzZXMsIGV4cGVydGlzZSwgZ2l0aHViKQog ICAgICAgICBzZWxmLmNhbl9yZXZpZXcgPSBUcnVlCiAKIAogY2xhc3MgQm90KENvbnRyaWJ1dG9y KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgZW1haWxfb3JfZW1haWxzLCBpcmNfbmlj a25hbWU9Tm9uZSwgYWxpYXNfb3JfYWxpYXNlcz1Ob25lLCBleHBlcnRpc2U9Tm9uZSk6Ci0gICAg ICAgIENvbnRyaWJ1dG9yLl9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJj X25pY2tuYW1lLCBhbGlhc19vcl9hbGlhc2VzLCBleHBlcnRpc2UpCisgICAgZGVmIF9faW5pdF9f KHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJjX25pY2tuYW1lPU5vbmUsIGFsaWFzX29y X2FsaWFzZXM9Tm9uZSwgZXhwZXJ0aXNlPU5vbmUsIGdpdGh1Yj1Ob25lKToKKyAgICAgICAgQ29u dHJpYnV0b3IuX19pbml0X18oc2VsZiwgbmFtZSwgZW1haWxfb3JfZW1haWxzLCBpcmNfbmlja25h bWUsIGFsaWFzX29yX2FsaWFzZXMsIGV4cGVydGlzZSwgZ2l0aHViKQogICAgICAgICBzZWxmLmlz X2JvdCA9IFRydWUKIAogCkBAIC0yNTIsMTYgKzI1NCwxNiBAQCBjbGFzcyBDb21taXR0ZXJMaXN0 KG9iamVjdCk6CiAgICAgICAgICAgICBpZiBub3QgbmFtZToKICAgICAgICAgICAgICAgICBjb250 aW51ZQogICAgICAgICAgICAgaWYgc3RhdHVzID09ICJyZXZpZXdlciI6Ci0gICAgICAgICAgICAg ICAgY29udHJpYnV0b3IgPSBSZXZpZXdlcihuYW1lLCBkYXRhLmdldCgnZW1haWxzJyksIGRhdGEu Z2V0KCduaWNrcycpLCBkYXRhLmdldCgnYWxpYXNlcycpLCBkYXRhLmdldCgnZXhwZXJ0aXNlJykp CisgICAgICAgICAgICAgICAgY29udHJpYnV0b3IgPSBSZXZpZXdlcihuYW1lLCBkYXRhLmdldCgn ZW1haWxzJyksIGRhdGEuZ2V0KCduaWNrcycpLCBkYXRhLmdldCgnYWxpYXNlcycpLCBkYXRhLmdl dCgnZXhwZXJ0aXNlJyksIGRhdGEuZ2V0KCdnaXRodWInKSkKICAgICAgICAgICAgICAgICBzZWxm Ll9yZXZpZXdlcnMuYXBwZW5kKGNvbnRyaWJ1dG9yKQogICAgICAgICAgICAgICAgIHNlbGYuX2Nv bW1pdHRlcnMuYXBwZW5kKGNvbnRyaWJ1dG9yKQogICAgICAgICAgICAgZWxpZiBzdGF0dXMgPT0g ImNvbW1pdHRlciI6Ci0gICAgICAgICAgICAgICAgY29udHJpYnV0b3IgPSBDb21taXR0ZXIobmFt ZSwgZGF0YS5nZXQoJ2VtYWlscycpLCBkYXRhLmdldCgnbmlja3MnKSwgZGF0YS5nZXQoJ2FsaWFz ZXMnKSwgZGF0YS5nZXQoJ2V4cGVydGlzZScpKQorICAgICAgICAgICAgICAgIGNvbnRyaWJ1dG9y ID0gQ29tbWl0dGVyKG5hbWUsIGRhdGEuZ2V0KCdlbWFpbHMnKSwgZGF0YS5nZXQoJ25pY2tzJyks IGRhdGEuZ2V0KCdhbGlhc2VzJyksIGRhdGEuZ2V0KCdleHBlcnRpc2UnKSwgZGF0YS5nZXQoJ2dp dGh1YicpKQogICAgICAgICAgICAgICAgIHNlbGYuX2NvbW1pdHRlcnMuYXBwZW5kKGNvbnRyaWJ1 dG9yKQogICAgICAgICAgICAgZWxpZiBzdGF0dXMgPT0gJ2JvdCc6Ci0gICAgICAgICAgICAgICAg Y29udHJpYnV0b3IgPSBCb3QobmFtZSwgZGF0YS5nZXQoJ2VtYWlscycpLCBkYXRhLmdldCgnbmlj a3MnKSwgZGF0YS5nZXQoJ2FsaWFzZXMnKSwgZGF0YS5nZXQoJ2V4cGVydGlzZScpKQorICAgICAg ICAgICAgICAgIGNvbnRyaWJ1dG9yID0gQm90KG5hbWUsIGRhdGEuZ2V0KCdlbWFpbHMnKSwgZGF0 YS5nZXQoJ25pY2tzJyksIGRhdGEuZ2V0KCdhbGlhc2VzJyksIGRhdGEuZ2V0KCdleHBlcnRpc2Un KSwgZGF0YS5nZXQoJ2dpdGh1YicpKQogICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAg ICBjb250cmlidXRvciA9IENvbnRyaWJ1dG9yKG5hbWUsIGRhdGEuZ2V0KCdlbWFpbHMnKSwgZGF0 YS5nZXQoJ25pY2tzJyksIGRhdGEuZ2V0KCdhbGlhc2VzJyksIGRhdGEuZ2V0KCdleHBlcnRpc2Un KSkKKyAgICAgICAgICAgICAgICBjb250cmlidXRvciA9IENvbnRyaWJ1dG9yKG5hbWUsIGRhdGEu Z2V0KCdlbWFpbHMnKSwgZGF0YS5nZXQoJ25pY2tzJyksIGRhdGEuZ2V0KCdhbGlhc2VzJyksIGRh dGEuZ2V0KCdleHBlcnRpc2UnKSwgZGF0YS5nZXQoJ2dpdGh1YicpKQogCiAgICAgICAgICAgICBz ZWxmLl9jb250cmlidXRvcnMuYXBwZW5kKGNvbnRyaWJ1dG9yKQogCmRpZmYgLS1naXQgYS9DaGFu Z2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXggNmU5MmU0ZTJlMGYzZWUwZjlhN2YyNTMxNGQ3NzcwZGIy YTNjNGFmNi4uMzY1MzlkMDAxZGI3MmE0Y2NhMDYwZGZjYzM3N2RjNDcxODE3NWI5YiAxMDA2NDQK LS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTEw LTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKworICAgICAgICBOZWVk IGEgc2hvcnQgZGVzY3JpcHRpb24gKE9PUFMhKS4KKyAgICAgICAgTmVlZCB0aGUgYnVnIFVSTCAo T09QUyEpLgorCisgICAgICAgIFJldmlld2VkIGJ5IERld2VpIFpodS4KKworICAgICAgICAqIG1l dGFkYXRhL2NvbnRyaWJ1dG9ycy5qc29uOgorCisyMDIxLTEwLTA4ICBKb25hdGhhbiBCZWRhcmQg IDxqYmVkYXJkQGFwcGxlLmNvbT4KKworICAgICAgICBbY29udHJpYnV0b3JzLmpzb25dIFN1cHBv cnQgR2l0SHViIHVzZXJuYW1lcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjMxNDAwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NDAwNTI2Nj4KKwor ICAgICAgICBSZXZpZXdlZCBieSBEZXdlaSBaaHUuCisKKyAgICAgICAgKiBtZXRhZGF0YS9jb250 cmlidXRvcnMuanNvbjogQWRkIHNvbWUgR2l0SHViIHVzZXJuYW1lcy4KKwogMjAyMS0xMC0wNyAg Q2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dU S10gUmVlbmFibGUgLWZ2aXNpYmlsaXR5PWhpZGRlbgpkaWZmIC0tZ2l0IGEvbWV0YWRhdGEvY29u dHJpYnV0b3JzLmpzb24gYi9tZXRhZGF0YS9jb250cmlidXRvcnMuanNvbgppbmRleCBiZWQ4YWQy NTVjMTEwOTlhZGQxMDBiMWE3OTg4MDE2ZjA4ZjYzMTExLi45OTMyOTI2M2QxYTRkZGJmYmVlZDZm NWZhNjdiZDk0ZDc3ZDAxNDkyIDEwMDY0NAotLS0gYS9tZXRhZGF0YS9jb250cmlidXRvcnMuanNv bgorKysgYi9tZXRhZGF0YS9jb250cmlidXRvcnMuanNvbgpAQCAtMjI5LDYgKzIyOSw3IEBACiAg ICAgICAiZW1haWxzIiA6IFsKICAgICAgICAgICJhbGFuY29vbkBhcHBsZS5jb20iCiAgICAgICBd LAorICAgICAgImdpdGh1YiIgOiAiYWxhbmNvb24iLAogICAgICAgIm5hbWUiIDogIkFsYW4gQ29v biIsCiAgICAgICAibmlja3MiIDogWwogICAgICAgICAgImFsYW5jb29uIgpAQCAtNDAwLDYgKzQw MSw3IEBACiAgICAgICAgICAiYXBAd2Via2l0Lm9yZyIsCiAgICAgICAgICAiYXBAYXBwbGUuY29t IgogICAgICAgXSwKKyAgICAgICJnaXRodWIiIDogImFwcm9za3VyeWFrb3YiLAogICAgICAgIm5h bWUiIDogIkFsZXhleSBQcm9za3VyeWFrb3YiLAogICAgICAgIm5pY2tzIiA6IFsKICAgICAgICAg ICJhcCIKQEAgLTM1MjksNiArMzUzMSw3IEBACiAgICAgICAgICAiamJlZGFyZEB3ZWJraXQub3Jn IgogICAgICAgXSwKICAgICAgICJleHBlcnRpc2UiIDogIndlYmtpdHB5LCBQeXRob24sIHRlc3Rp bmciLAorICAgICAgImdpdGh1YiIgOiAiSm9uV0JlZGFyZCIsCiAgICAgICAibmFtZSIgOiAiSm9u YXRoYW4gQmVkYXJkIiwKICAgICAgICJuaWNrcyIgOiBbCiAgICAgICAgICAiamJlZGFyZCIsCkBA IC00MDIwLDYgKzQwMjMsNyBAQAogICAgICAgImVtYWlscyIgOiBbCiAgICAgICAgICAia29jc2Vu X2NodW5nQGFwcGxlLmNvbSIKICAgICAgIF0sCisgICAgICAiZ2l0aHViIiA6ICJrb2NzZW5jIiwK ICAgICAgICJuYW1lIiA6ICJLb2NzZW4gQ2h1bmciLAogICAgICAgInN0YXR1cyIgOiAiY29tbWl0 dGVyIgogICAgfSwKQEAgLTQ1MjcsNiArNDUzMSw3IEBACiAgICAgICAiZW1haWxzIiA6IFsKICAg ICAgICAgICJqbGV3aXMzQGFwcGxlLmNvbSIKICAgICAgIF0sCisgICAgICAiZ2l0aHViIiA6ICJy YW5jb3JlZC1tb25nb29zZSIsCiAgICAgICAibmFtZSIgOiAiTWF0dCBMZXdpcyIsCiAgICAgICAi bmlja3MiIDogWwogICAgICAgICAgIm1hdHRsZXdpcyIKQEAgLTU2MDEsNiArNTYwNiw3IEBACiAg ICAgICAiZW1haWxzIiA6IFsKICAgICAgICAgICJyeWFuaGFkZGFkQGFwcGxlLmNvbSIKICAgICAg IF0sCisgICAgICAiZ2l0aHViIiA6ICJyeWFuaGFkZGFkIiwKICAgICAgICJuYW1lIiA6ICJSeWFu IEhhZGRhZCIsCiAgICAgICAibmlja3MiIDogWwogICAgICAgICAgInJ5YW5oYWRkYWQiCkBAIC02 OTEwLDQgKzY5MTYsNCBAQAogICAgICAgXSwKICAgICAgICJzdGF0dXMiIDogInJldmlld2VyIgog ICAgfQotXQorXQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK 440653 2021-10-08 11:59:20 -0700 2021-10-08 12:54:05 -0700 Patch for landing bug-231400-20211008115919.patch text/plain 15328 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzODE2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjU0OWZlM2QyOTRmNzgxYjk5MTQwNjIyZmYyMDgzMzc2 NGIxZTgzOC4uYzljMGI1MDY4NmUwNjA3M2JiOTkwMDY1MzBhZDgyMTVlMGUxMTdmNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMw IEBACisyMDIxLTEwLTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbY29udHJpYnV0b3JzLmpzb25dIFN1cHBvcnQgR2l0SHViIHVzZXJuYW1lcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxNDAwCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS84NDAwNTI2Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBEZXdl aSBaaHUuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5w eTogQnVtcCB2ZXJzaW9uLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5OiBEaXR0by4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJh cmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9jb250cmlidXRvci5weToKKyAgICAgICAgKENv bnRyaWJ1dG9yLkVuY29kZXIuZGVmYXVsdCk6IEFkZCBHaXRIdWIgYW5kIEJpdEJ1Y2tldCB1c2Vy bmFtZS4KKyAgICAgICAgKENvbnRyaWJ1dG9yLk1hcHBpbmcubG9hZCk6IERpdHRvLgorICAgICAg ICAoQ29udHJpYnV0b3IuTWFwcGluZy5hZGQpOiBEaXR0by4KKyAgICAgICAgKENvbnRyaWJ1dG9y Ll9faW5pdF9fKTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvdGVzdC9jb250cmlidXRvcl91bml0dGVzdC5weToKKyAgICAgICAgKFRl c3RDb250cmlidXRvcik6CisgICAgICAgIChUZXN0Q29udHJpYnV0b3IudGVzdF9naXRodWIpOgor ICAgICAgICAoVGVzdENvbnRyaWJ1dG9yLnRlc3RfYml0YnVja2V0KToKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29tbWl0dGVycy5weToKKyAgICAgICAgKENvbnRy aWJ1dG9yLl9faW5pdF9fKTogQWRkIEdpdEh1YiB1c2VybmFtZS4KKyAgICAgICAgKENvbnRyaWJ1 dG9yLmFzX2RpY3QpOiBEaXR0by4KKyAgICAgICAgKENvbW1pdHRlci5fX2luaXRfXyk6IERpdHRv LgorICAgICAgICAoUmV2aWV3ZXIuX19pbml0X18pOiBEaXR0by4KKyAgICAgICAgKEJvdC5fX2lu aXRfXyk6IERpdHRvLgorICAgICAgICAoQ29tbWl0dGVyTGlzdC5sb2FkX2pzb24pOiBEaXR0by4K KwogMjAyMS0xMC0wOCAgQW5kcmVzIEdvbnphbGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAK ICAgICAgICAgQVg6IEFYTWF0aFJvb3RSYWRpY2FuZCBzaG91bGQgcmV0dXJuIGFuIGFycmF5IG9m IGVsZW1lbnRzLCBub3QganVzdCB0aGUgZmlyc3QKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvc2V0dXAucHkKaW5kZXggOTExODZiNDIzZWI5ZWMyYzgxYjMwYmEyMDYzYTc4 NDMxMTVhMTg3Zi4uZDA3ZGJlNmRlYWMyN2E0ZmNhOTY0MTZmMjIzNjAxZTUxYTkwOTYzMiAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkKKysr IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkKQEAgLTI5LDcg KzI5LDcgQEAgZGVmIHJlYWRtZSgpOgogCiBzZXR1cCgKICAgICBuYW1lPSd3ZWJraXRzY21weScs Ci0gICAgdmVyc2lvbj0nMi4yLjYnLAorICAgIHZlcnNpb249JzIuMi43JywKICAgICBkZXNjcmlw dGlvbj0nTGlicmFyeSBkZXNpZ25lZCB0byBpbnRlcmFjdCB3aXRoIGdpdCBhbmQgc3ZuIHJlcG9z aXRvcmllcy4nLAogICAgIGxvbmdfZGVzY3JpcHRpb249cmVhZG1lKCksCiAgICAgY2xhc3NpZmll cnM9WwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvX19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9fX2luaXRfXy5weQppbmRleCAzOTFlMmM3NjI4N2VlNjFjNmY4ZWM2OGVl MTg0YzFhZGMxNjYzNzlmLi5lNTlhZTlkMTgxZDA3ZjdiODMyNDlmZDNmNDQzNzA0NTQzYzM3NjIx IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS9fX2luaXRfXy5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9fX2luaXRfXy5weQpAQCAtNDYsNyArNDYsNyBAQCBleGNlcHQgSW1wb3J0 RXJyb3I6CiAgICAgICAgICJQbGVhc2UgaW5zdGFsbCB3ZWJraXRjb3JlcHkgd2l0aCBgcGlwIGlu c3RhbGwgd2Via2l0Y29yZXB5IC0tZXh0cmEtaW5kZXgtdXJsIDxwYWNrYWdlIGluZGV4IFVSTD5g IgogICAgICkKIAotdmVyc2lvbiA9IFZlcnNpb24oMiwgMiwgNikKK3ZlcnNpb24gPSBWZXJzaW9u KDIsIDIsIDcpCiAKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2Zhc3RlbmVycycsIFZl cnNpb24oMCwgMTUsIDApKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ21vbm90b25p YycsIFZlcnNpb24oMSwgNSkpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvd2Via2l0c2NtcHkvY29udHJpYnV0b3IucHkgYi9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9jb250cmlidXRvci5weQppbmRleCA5N2U4 NDMyYjE5MDdhNzRmZGUyMjIxYWUzMWJhZWRhNmM0NWZlNTVhLi40NTJjZjc4ZDIwNDE4ZDZmMzk2 ZTRiM2E3MDMyN2VmNGI1ZWVjOGQ5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS9jb250cmlidXRvci5weQorKysgYi9Ub29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9jb250cmlidXRvci5weQpAQCAt MSw0ICsxLDQgQEAKLSMgQ29weXJpZ2h0IChDKSAyMDIwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDIwLCAyMDIxIEFwcGxlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRl ZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNDcsNiArNDcsMTAg QEAgY2xhc3MgQ29udHJpYnV0b3Iob2JqZWN0KToKICAgICAgICAgICAgICAgICByZXN1bHRbJ3N0 YXR1cyddID0gb2JqLnN0YXR1cwogICAgICAgICAgICAgaWYgb2JqLmVtYWlsczoKICAgICAgICAg ICAgICAgICByZXN1bHRbJ2VtYWlscyddID0gW3N0cihlbWFpbCkgZm9yIGVtYWlsIGluIG9iai5l bWFpbHNdCisgICAgICAgICAgICBpZiBvYmouZ2l0aHViOgorICAgICAgICAgICAgICAgIHJlc3Vs dFsnZ2l0aHViJ10gPSBvYmouZ2l0aHViCisgICAgICAgICAgICBpZiBvYmouYml0YnVja2V0Ogor ICAgICAgICAgICAgICAgIHJlc3VsdFsnYml0YnVja2V0J10gPSBvYmouYml0YnVja2V0CiAKICAg ICAgICAgICAgIHJldHVybiByZXN1bHQKIApAQCAtNjEsNiArNjUsMTMgQEAgY2xhc3MgQ29udHJp YnV0b3Iob2JqZWN0KToKICAgICAgICAgICAgICAgICAgICAgY29udGludWUKICAgICAgICAgICAg ICAgICBjcmVhdGVkID0gcmVzdWx0LmNyZWF0ZShuYW1lLCAqY29udHJpYnV0b3IuZ2V0KCdlbWFp bHMnLCBbXSkpCiAgICAgICAgICAgICAgICAgY3JlYXRlZC5zdGF0dXMgPSBjb250cmlidXRvci5n ZXQoJ3N0YXR1cycsIGNyZWF0ZWQuc3RhdHVzKQorICAgICAgICAgICAgICAgIGNyZWF0ZWQuZ2l0 aHViID0gY29udHJpYnV0b3IuZ2V0KCdnaXRodWInLCBjcmVhdGVkLmdpdGh1YikKKyAgICAgICAg ICAgICAgICBjcmVhdGVkLmJpdGJ1Y2tldCA9IGNvbnRyaWJ1dG9yLmdldCgnYml0YnVja2V0Jywg Y3JlYXRlZC5iaXRidWNrZXQpCisKKyAgICAgICAgICAgICAgICBpZiBjcmVhdGVkLmdpdGh1YjoK KyAgICAgICAgICAgICAgICAgICAgcmVzdWx0W2NyZWF0ZWQuZ2l0aHViXSA9IGNyZWF0ZWQKKyAg ICAgICAgICAgICAgICBpZiBjcmVhdGVkLmJpdGJ1Y2tldDoKKyAgICAgICAgICAgICAgICAgICAg cmVzdWx0W2NyZWF0ZWQuYml0YnVja2V0XSA9IGNyZWF0ZWQKIAogICAgICAgICAgICAgZm9yIGNv bnRyaWJ1dG9yIGluIGNvbnRlbnRzOgogICAgICAgICAgICAgICAgIGNvbnN0cnVjdGVkID0gcmVz dWx0LmdldChjb250cmlidXRvci5nZXQoJ25hbWUnKSkKQEAgLTk0LDcgKzEwNSwxOCBAQCBjbGFz cyBDb250cmlidXRvcihvYmplY3QpOgogICAgICAgICBkZWYgYWRkKHNlbGYsIGNvbnRyaWJ1dG9y KToKICAgICAgICAgICAgIGlmIG5vdCBpc2luc3RhbmNlKGNvbnRyaWJ1dG9yLCBDb250cmlidXRv cik6CiAgICAgICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcigiJ3t9JyBpcyBub3QgYSBDb250 cmlidXRvciBvYmplY3QiLmZvcm1hdCh0eXBlKGNvbnRyaWJ1dG9yKSkpCi0gICAgICAgICAgICBy ZXR1cm4gc2VsZi5jcmVhdGUoY29udHJpYnV0b3IubmFtZSwgKmNvbnRyaWJ1dG9yLmVtYWlscykK KworICAgICAgICAgICAgcmVzdWx0ID0gc2VsZi5jcmVhdGUoY29udHJpYnV0b3IubmFtZSwgKmNv bnRyaWJ1dG9yLmVtYWlscykKKyAgICAgICAgICAgIHJlc3VsdC5zdGF0dXMgPSBjb250cmlidXRv ci5zdGF0dXMgb3IgcmVzdWx0LnN0YXR1cworICAgICAgICAgICAgcmVzdWx0LmdpdGh1YiA9IGNv bnRyaWJ1dG9yLmdpdGh1YiBvciByZXN1bHQuZ2l0aHViCisgICAgICAgICAgICByZXN1bHQuYml0 YnVja2V0ID0gY29udHJpYnV0b3IuYml0YnVja2V0IG9yIHJlc3VsdC5iaXRidWNrZXQKKworICAg ICAgICAgICAgaWYgcmVzdWx0LmdpdGh1YjoKKyAgICAgICAgICAgICAgICBzZWxmW3Jlc3VsdC5n aXRodWJdID0gcmVzdWx0CisgICAgICAgICAgICBpZiByZXN1bHQuYml0YnVja2V0OgorICAgICAg ICAgICAgICAgIHNlbGZbcmVzdWx0LmJpdGJ1Y2tldF0gPSByZXN1bHQKKworICAgICAgICAgICAg cmV0dXJuIHJlc3VsdAogCiAgICAgICAgIGRlZiBjcmVhdGUoc2VsZiwgbmFtZT1Ob25lLCAqZW1h aWxzKToKICAgICAgICAgICAgIGVtYWlscyA9IFtlbWFpbCBmb3IgZW1haWwgaW4gZW1haWxzIG9y IFtdXQpAQCAtMTY4LDEwICsxOTAsMTIgQEAgY2xhc3MgQ29udHJpYnV0b3Iob2JqZWN0KToKICAg ICAgICAgICAgIHJldHVybiBjb250cmlidXRvcnMuY3JlYXRlKGF1dGhvciwgZW1haWwpCiAgICAg ICAgIHJldHVybiBjbHMoYXV0aG9yIG9yIGVtYWlsLCBlbWFpbHM9W2VtYWlsXSkKIAotICAgIGRl ZiBfX2luaXRfXyhzZWxmLCBuYW1lLCBlbWFpbHM9Tm9uZSwgc3RhdHVzPU5vbmUpOgorICAgIGRl ZiBfX2luaXRfXyhzZWxmLCBuYW1lLCBlbWFpbHM9Tm9uZSwgc3RhdHVzPU5vbmUsIGdpdGh1Yj1O b25lLCBiaXRidWNrZXQ9Tm9uZSk6CiAgICAgICAgIHNlbGYubmFtZSA9IHN0cmluZ191dGlscy5k ZWNvZGUobmFtZSkKICAgICAgICAgc2VsZi5lbWFpbHMgPSBsaXN0KGZpbHRlcihzdHJpbmdfdXRp bHMuZGVjb2RlLCBlbWFpbHMgb3IgW10pKQogICAgICAgICBzZWxmLnN0YXR1cyA9IHN0YXR1cwor ICAgICAgICBzZWxmLmdpdGh1YiA9IGdpdGh1YgorICAgICAgICBzZWxmLmJpdGJ1Y2tldCA9IGJp dGJ1Y2tldAogCiAgICAgQHByb3BlcnR5CiAgICAgZGVmIGVtYWlsKHNlbGYpOgpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9j b250cmlidXRvcl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L3Rlc3QvY29udHJpYnV0b3JfdW5pdHRlc3QucHkKaW5kZXggNTM3YzM2 NjczZmJiNjNlNzM2ZTkxNzFmYWIzY2Y4MTRjZWMwMTQ3NC4uNDI1NzMyYTFhOWJmOGFlM2ViNGIw MWQwYjQ0NmNmMDBhN2U4ZWZlMCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9jb250cmlidXRvcl91bml0dGVzdC5weQorKysg Yi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2Nv bnRyaWJ1dG9yX3VuaXR0ZXN0LnB5CkBAIC0xLDQgKzEsNCBAQAotIyBDb3B5cmlnaHQgKEMpIDIw MjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMjAs IDIwMjEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlv biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMg bW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBj b25kaXRpb25zCkBAIC0xODMsMyArMTgzLDQ0IEBAIGNsYXNzIFRlc3RDb250cmlidXRvcih1bml0 dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICBzb3J0ZWQoWydqYmVkYXJkQGFwcGxlLmNvbScs ICdzbGV3aXNAYXBwbGUuY29tJ10pLAogICAgICAgICAgICAgc29ydGVkKFtjb250cmlidXRvci5l bWFpbCBmb3IgY29udHJpYnV0b3IgaW4gbWFwcGluZ10pLAogICAgICAgICApCisKKyAgICBkZWYg dGVzdF9naXRodWIoc2VsZik6CisgICAgICAgIG1hcHBpbmcgPSBDb250cmlidXRvci5NYXBwaW5n KCkKKyAgICAgICAgbWFwcGluZy5hZGQoQ29udHJpYnV0b3IoCisgICAgICAgICAgICAnSm9uYXRo YW4gQmVkYXJkJywKKyAgICAgICAgICAgIGVtYWlscz1bJ2piZWRhcmRAYXBwbGUuY29tJ10sCisg ICAgICAgICAgICBnaXRodWI9J0pvbldCZWRhcmQnLAorICAgICAgICApKQorICAgICAgICBtYXBw aW5nLmFkZChDb250cmlidXRvcigKKyAgICAgICAgICAgICdKb25hdGhhbiBCZWRhcmQnLAorICAg ICAgICAgICAgZW1haWxzPVsnamJlZGFyZEBhcHBsZS5jb20nXSwKKyAgICAgICAgICAgIGdpdGh1 Yj0nSm9uV0JlZGFyZCcsCisgICAgICAgICkpCisgICAgICAgIG1hcHBpbmcuYWRkKENvbnRyaWJ1 dG9yKAorICAgICAgICAgICAgJ0tvY3NlbiBDaHVuZycsCisgICAgICAgICAgICBlbWFpbHM9Wydr b2NzZW5fY2h1bmdAYXBwbGUuY29tJ10sCisgICAgICAgICAgICBnaXRodWI9J2tvY3NlbmMnLAor ICAgICAgICApKQorCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobWFwcGluZ1snSm9uV0JlZGFy ZCddLCBtYXBwaW5nWydqYmVkYXJkQGFwcGxlLmNvbSddKQorICAgICAgICBzZWxmLmFzc2VydEVx dWFsKG1hcHBpbmdbJ2tvY3NlbmMnXSwgbWFwcGluZ1sna29jc2VuX2NodW5nQGFwcGxlLmNvbSdd KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKG1hcHBpbmdbJ2piZWRhcmRAYXBwbGUuY29tJ10u Z2l0aHViLCAnSm9uV0JlZGFyZCcpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobWFwcGluZ1sn a29jc2VuX2NodW5nQGFwcGxlLmNvbSddLmdpdGh1YiwgJ2tvY3NlbmMnKQorCisgICAgZGVmIHRl c3RfYml0YnVja2V0KHNlbGYpOgorICAgICAgICBtYXBwaW5nID0gQ29udHJpYnV0b3IuTWFwcGlu ZygpCisgICAgICAgIG1hcHBpbmcuYWRkKENvbnRyaWJ1dG9yKAorICAgICAgICAgICAgJ0pvbmF0 aGFuIEJlZGFyZCcsCisgICAgICAgICAgICBlbWFpbHM9WydqYmVkYXJkQGFwcGxlLmNvbSddLAor ICAgICAgICAgICAgYml0YnVja2V0PSdqb25hdGhhbl9iZWRhcmQnLAorICAgICAgICApKQorICAg ICAgICBtYXBwaW5nLmFkZChDb250cmlidXRvcigKKyAgICAgICAgICAgICdLb2NzZW4gQ2h1bmcn LAorICAgICAgICAgICAgZW1haWxzPVsna29jc2VuX2NodW5nQGFwcGxlLmNvbSddLAorICAgICAg ICAgICAgYml0YnVja2V0PSdrb2NzZW5fY2h1bmcnLAorICAgICAgICApKQorCisgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwobWFwcGluZ1snam9uYXRoYW5fYmVkYXJkJ10sIG1hcHBpbmdbJ2piZWRh cmRAYXBwbGUuY29tJ10pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobWFwcGluZ1sna29jc2Vu X2NodW5nJ10sIG1hcHBpbmdbJ2tvY3Nlbl9jaHVuZ0BhcHBsZS5jb20nXSkKKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChtYXBwaW5nWydqYmVkYXJkQGFwcGxlLmNvbSddLmJpdGJ1Y2tldCwgJ2pv bmF0aGFuX2JlZGFyZCcpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobWFwcGluZ1sna29jc2Vu X2NodW5nQGFwcGxlLmNvbSddLmJpdGJ1Y2tldCwgJ2tvY3Nlbl9jaHVuZycpCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29tbWl0dGVycy5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzLnB5CmluZGV4IGUy MWFiOWQxZjcxZjk0MTQ3ZDEzNTY2MjMyOGMxODRlYzkwZDc3ZTUuLjViYjlkNGJkZWMwMDkwZWZm OTNhZTBjMzQ3NzA3Mzg3Y2JmZTBiZmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzLnB5CkBAIC0xLDQgKzEsNCBAQAotIyBDb3B5cmln aHQgKGMpIDIwMTEsIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0 IChjKSAyMDExLCAyMDIxIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMgQ29weXJp Z2h0IChjKSAyMDA5LCAyMDExLCAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu CiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dApAQCAtNDIsNyArNDIsNyBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5z eXN0ZW0uZmlsZXN5c3RlbSBpbXBvcnQgRmlsZVN5c3RlbQogCiAKIGNsYXNzIENvbnRyaWJ1dG9y KG9iamVjdCk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWlscywg aXJjX25pY2tuYW1lX29yX25pY2tuYW1lcz1Ob25lLCBhbGlhc19vcl9hbGlhc2VzPU5vbmUsIGV4 cGVydGlzZT1Ob25lKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgZW1haWxfb3JfZW1h aWxzLCBpcmNfbmlja25hbWVfb3Jfbmlja25hbWVzPU5vbmUsIGFsaWFzX29yX2FsaWFzZXM9Tm9u ZSwgZXhwZXJ0aXNlPU5vbmUsIGdpdGh1Yj1Ob25lKToKICAgICAgICAgYXNzZXJ0KG5hbWUpCiAg ICAgICAgIGFzc2VydChlbWFpbF9vcl9lbWFpbHMpCiAgICAgICAgIHNlbGYuZnVsbF9uYW1lID0g bmFtZQpAQCAtNTIsNiArNTIsNyBAQCBjbGFzcyBDb250cmlidXRvcihvYmplY3QpOgogICAgICAg ICAgICAgc2VsZi5lbWFpbHMgPSBlbWFpbF9vcl9lbWFpbHMKICAgICAgICAgc2VsZi5fY2FzZV9w cmVzZXJ2ZWRfZW1haWxzID0gc2VsZi5lbWFpbHMKICAgICAgICAgc2VsZi5lbWFpbHMgPSBsaXN0 KG1hcChsYW1iZGEgZW1haWw6IGVtYWlsLmxvd2VyKCksIHNlbGYuZW1haWxzKSkgICMgRW1haWxz IGFyZSBjYXNlLWluc2Vuc2l0aXZlLgorICAgICAgICBzZWxmLmdpdGh1YiA9IGdpdGh1YgogCiAg ICAgICAgIGlmIGlzaW5zdGFuY2UoaXJjX25pY2tuYW1lX29yX25pY2tuYW1lcywgc3RyKToKICAg ICAgICAgICAgIHNlbGYuaXJjX25pY2tuYW1lcyA9IFtpcmNfbmlja25hbWVfb3Jfbmlja25hbWVz XQpAQCAtMTc3LDcgKzE3OCw4IEBAIGNsYXNzIENvbnRyaWJ1dG9yKG9iamVjdCk6CiAgICAgICAg ICAgICBuYW1lPXNlbGYuZnVsbF9uYW1lLAogICAgICAgICAgICAgZW1haWxzPXNlbGYuX2Nhc2Vf cHJlc2VydmVkX2VtYWlscywKICAgICAgICAgKQotCisgICAgICAgIGlmIHNlbGYuZ2l0aHViOgor ICAgICAgICAgICAgaW5mb1siZ2l0aHViIl0gPSBzZWxmLmdpdGh1YgogICAgICAgICBpZiBzZWxm LmFsaWFzZXM6CiAgICAgICAgICAgICBpbmZvWyJhbGlhc2VzIl0gPSBzZWxmLmFsaWFzZXMKIApA QCAtMTk5LDIwICsyMDEsMjAgQEAgY2xhc3MgQ29udHJpYnV0b3Iob2JqZWN0KToKIAogCiBjbGFz cyBDb21taXR0ZXIoQ29udHJpYnV0b3IpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuYW1lLCBl bWFpbF9vcl9lbWFpbHMsIGlyY19uaWNrbmFtZT1Ob25lLCBhbGlhc19vcl9hbGlhc2VzPU5vbmUs IGV4cGVydGlzZT1Ob25lKToKLSAgICAgICAgQ29udHJpYnV0b3IuX19pbml0X18oc2VsZiwgbmFt ZSwgZW1haWxfb3JfZW1haWxzLCBpcmNfbmlja25hbWUsIGFsaWFzX29yX2FsaWFzZXMsIGV4cGVy dGlzZSkKKyAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgZW1haWxfb3JfZW1haWxzLCBpcmNf bmlja25hbWU9Tm9uZSwgYWxpYXNfb3JfYWxpYXNlcz1Ob25lLCBleHBlcnRpc2U9Tm9uZSwgZ2l0 aHViPU5vbmUpOgorICAgICAgICBDb250cmlidXRvci5fX2luaXRfXyhzZWxmLCBuYW1lLCBlbWFp bF9vcl9lbWFpbHMsIGlyY19uaWNrbmFtZSwgYWxpYXNfb3JfYWxpYXNlcywgZXhwZXJ0aXNlLCBn aXRodWIpCiAgICAgICAgIHNlbGYuY2FuX2NvbW1pdCA9IFRydWUKIAogCiBjbGFzcyBSZXZpZXdl cihDb21taXR0ZXIpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuYW1lLCBlbWFpbF9vcl9lbWFp bHMsIGlyY19uaWNrbmFtZT1Ob25lLCBhbGlhc19vcl9hbGlhc2VzPU5vbmUsIGV4cGVydGlzZT1O b25lKToKLSAgICAgICAgQ29tbWl0dGVyLl9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2Vt YWlscywgaXJjX25pY2tuYW1lLCBhbGlhc19vcl9hbGlhc2VzLCBleHBlcnRpc2UpCisgICAgZGVm IF9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJjX25pY2tuYW1lPU5vbmUs IGFsaWFzX29yX2FsaWFzZXM9Tm9uZSwgZXhwZXJ0aXNlPU5vbmUsIGdpdGh1Yj1Ob25lKToKKyAg ICAgICAgQ29tbWl0dGVyLl9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJj X25pY2tuYW1lLCBhbGlhc19vcl9hbGlhc2VzLCBleHBlcnRpc2UsIGdpdGh1YikKICAgICAgICAg c2VsZi5jYW5fcmV2aWV3ID0gVHJ1ZQogCiAKIGNsYXNzIEJvdChDb250cmlidXRvcik6Ci0gICAg ZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJjX25pY2tuYW1lPU5v bmUsIGFsaWFzX29yX2FsaWFzZXM9Tm9uZSwgZXhwZXJ0aXNlPU5vbmUpOgotICAgICAgICBDb250 cmlidXRvci5fX2luaXRfXyhzZWxmLCBuYW1lLCBlbWFpbF9vcl9lbWFpbHMsIGlyY19uaWNrbmFt ZSwgYWxpYXNfb3JfYWxpYXNlcywgZXhwZXJ0aXNlKQorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBu YW1lLCBlbWFpbF9vcl9lbWFpbHMsIGlyY19uaWNrbmFtZT1Ob25lLCBhbGlhc19vcl9hbGlhc2Vz PU5vbmUsIGV4cGVydGlzZT1Ob25lLCBnaXRodWI9Tm9uZSk6CisgICAgICAgIENvbnRyaWJ1dG9y Ll9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJjX25pY2tuYW1lLCBhbGlh c19vcl9hbGlhc2VzLCBleHBlcnRpc2UsIGdpdGh1YikKICAgICAgICAgc2VsZi5pc19ib3QgPSBU cnVlCiAKIApAQCAtMjUyLDE2ICsyNTQsMTYgQEAgY2xhc3MgQ29tbWl0dGVyTGlzdChvYmplY3Qp OgogICAgICAgICAgICAgaWYgbm90IG5hbWU6CiAgICAgICAgICAgICAgICAgY29udGludWUKICAg ICAgICAgICAgIGlmIHN0YXR1cyA9PSAicmV2aWV3ZXIiOgotICAgICAgICAgICAgICAgIGNvbnRy aWJ1dG9yID0gUmV2aWV3ZXIobmFtZSwgZGF0YS5nZXQoJ2VtYWlscycpLCBkYXRhLmdldCgnbmlj a3MnKSwgZGF0YS5nZXQoJ2FsaWFzZXMnKSwgZGF0YS5nZXQoJ2V4cGVydGlzZScpKQorICAgICAg ICAgICAgICAgIGNvbnRyaWJ1dG9yID0gUmV2aWV3ZXIobmFtZSwgZGF0YS5nZXQoJ2VtYWlscycp LCBkYXRhLmdldCgnbmlja3MnKSwgZGF0YS5nZXQoJ2FsaWFzZXMnKSwgZGF0YS5nZXQoJ2V4cGVy dGlzZScpLCBkYXRhLmdldCgnZ2l0aHViJykpCiAgICAgICAgICAgICAgICAgc2VsZi5fcmV2aWV3 ZXJzLmFwcGVuZChjb250cmlidXRvcikKICAgICAgICAgICAgICAgICBzZWxmLl9jb21taXR0ZXJz LmFwcGVuZChjb250cmlidXRvcikKICAgICAgICAgICAgIGVsaWYgc3RhdHVzID09ICJjb21taXR0 ZXIiOgotICAgICAgICAgICAgICAgIGNvbnRyaWJ1dG9yID0gQ29tbWl0dGVyKG5hbWUsIGRhdGEu Z2V0KCdlbWFpbHMnKSwgZGF0YS5nZXQoJ25pY2tzJyksIGRhdGEuZ2V0KCdhbGlhc2VzJyksIGRh dGEuZ2V0KCdleHBlcnRpc2UnKSkKKyAgICAgICAgICAgICAgICBjb250cmlidXRvciA9IENvbW1p dHRlcihuYW1lLCBkYXRhLmdldCgnZW1haWxzJyksIGRhdGEuZ2V0KCduaWNrcycpLCBkYXRhLmdl dCgnYWxpYXNlcycpLCBkYXRhLmdldCgnZXhwZXJ0aXNlJyksIGRhdGEuZ2V0KCdnaXRodWInKSkK ICAgICAgICAgICAgICAgICBzZWxmLl9jb21taXR0ZXJzLmFwcGVuZChjb250cmlidXRvcikKICAg ICAgICAgICAgIGVsaWYgc3RhdHVzID09ICdib3QnOgotICAgICAgICAgICAgICAgIGNvbnRyaWJ1 dG9yID0gQm90KG5hbWUsIGRhdGEuZ2V0KCdlbWFpbHMnKSwgZGF0YS5nZXQoJ25pY2tzJyksIGRh dGEuZ2V0KCdhbGlhc2VzJyksIGRhdGEuZ2V0KCdleHBlcnRpc2UnKSkKKyAgICAgICAgICAgICAg ICBjb250cmlidXRvciA9IEJvdChuYW1lLCBkYXRhLmdldCgnZW1haWxzJyksIGRhdGEuZ2V0KCdu aWNrcycpLCBkYXRhLmdldCgnYWxpYXNlcycpLCBkYXRhLmdldCgnZXhwZXJ0aXNlJyksIGRhdGEu Z2V0KCdnaXRodWInKSkKICAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgY29udHJp YnV0b3IgPSBDb250cmlidXRvcihuYW1lLCBkYXRhLmdldCgnZW1haWxzJyksIGRhdGEuZ2V0KCdu aWNrcycpLCBkYXRhLmdldCgnYWxpYXNlcycpLCBkYXRhLmdldCgnZXhwZXJ0aXNlJykpCisgICAg ICAgICAgICAgICAgY29udHJpYnV0b3IgPSBDb250cmlidXRvcihuYW1lLCBkYXRhLmdldCgnZW1h aWxzJyksIGRhdGEuZ2V0KCduaWNrcycpLCBkYXRhLmdldCgnYWxpYXNlcycpLCBkYXRhLmdldCgn ZXhwZXJ0aXNlJyksIGRhdGEuZ2V0KCdnaXRodWInKSkKIAogICAgICAgICAgICAgc2VsZi5fY29u dHJpYnV0b3JzLmFwcGVuZChjb250cmlidXRvcikKIApkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIv Q2hhbmdlTG9nCmluZGV4IDZlOTJlNGUyZTBmM2VlMGY5YTdmMjUzMTRkNzc3MGRiMmEzYzRhZjYu LjRjYzc2MDY0NmE5YjY3MDNiMjUxMDU1MTM2NjBlMTQ4NTMwM2Q5NzYgMTAwNjQ0Ci0tLSBhL0No YW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0xMC0wOCAgSm9u YXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CisKKyAgICAgICAgW2NvbnRyaWJ1dG9y cy5qc29uXSBTdXBwb3J0IEdpdEh1YiB1c2VybmFtZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTQwMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0v ODQwMDUyNjY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGV3ZWkgWmh1LgorCisgICAgICAgICog bWV0YWRhdGEvY29udHJpYnV0b3JzLmpzb246IEFkZCBzb21lIEdpdEh1YiB1c2VybmFtZXMuCisK IDIwMjEtMTAtMDcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgog CiAgICAgICAgIFtHVEtdIFJlZW5hYmxlIC1mdmlzaWJpbGl0eT1oaWRkZW4KZGlmZiAtLWdpdCBh L21ldGFkYXRhL2NvbnRyaWJ1dG9ycy5qc29uIGIvbWV0YWRhdGEvY29udHJpYnV0b3JzLmpzb24K aW5kZXggYmVkOGFkMjU1YzExMDk5YWRkMTAwYjFhNzk4ODAxNmYwOGY2MzExMS4uOTkzMjkyNjNk MWE0ZGRiZmJlZWQ2ZjVmYTY3YmQ5NGQ3N2QwMTQ5MiAxMDA2NDQKLS0tIGEvbWV0YWRhdGEvY29u dHJpYnV0b3JzLmpzb24KKysrIGIvbWV0YWRhdGEvY29udHJpYnV0b3JzLmpzb24KQEAgLTIyOSw2 ICsyMjksNyBAQAogICAgICAgImVtYWlscyIgOiBbCiAgICAgICAgICAiYWxhbmNvb25AYXBwbGUu Y29tIgogICAgICAgXSwKKyAgICAgICJnaXRodWIiIDogImFsYW5jb29uIiwKICAgICAgICJuYW1l IiA6ICJBbGFuIENvb24iLAogICAgICAgIm5pY2tzIiA6IFsKICAgICAgICAgICJhbGFuY29vbiIK QEAgLTQwMCw2ICs0MDEsNyBAQAogICAgICAgICAgImFwQHdlYmtpdC5vcmciLAogICAgICAgICAg ImFwQGFwcGxlLmNvbSIKICAgICAgIF0sCisgICAgICAiZ2l0aHViIiA6ICJhcHJvc2t1cnlha292 IiwKICAgICAgICJuYW1lIiA6ICJBbGV4ZXkgUHJvc2t1cnlha292IiwKICAgICAgICJuaWNrcyIg OiBbCiAgICAgICAgICAiYXAiCkBAIC0zNTI5LDYgKzM1MzEsNyBAQAogICAgICAgICAgImpiZWRh cmRAd2Via2l0Lm9yZyIKICAgICAgIF0sCiAgICAgICAiZXhwZXJ0aXNlIiA6ICJ3ZWJraXRweSwg UHl0aG9uLCB0ZXN0aW5nIiwKKyAgICAgICJnaXRodWIiIDogIkpvbldCZWRhcmQiLAogICAgICAg Im5hbWUiIDogIkpvbmF0aGFuIEJlZGFyZCIsCiAgICAgICAibmlja3MiIDogWwogICAgICAgICAg ImpiZWRhcmQiLApAQCAtNDAyMCw2ICs0MDIzLDcgQEAKICAgICAgICJlbWFpbHMiIDogWwogICAg ICAgICAgImtvY3Nlbl9jaHVuZ0BhcHBsZS5jb20iCiAgICAgICBdLAorICAgICAgImdpdGh1YiIg OiAia29jc2VuYyIsCiAgICAgICAibmFtZSIgOiAiS29jc2VuIENodW5nIiwKICAgICAgICJzdGF0 dXMiIDogImNvbW1pdHRlciIKICAgIH0sCkBAIC00NTI3LDYgKzQ1MzEsNyBAQAogICAgICAgImVt YWlscyIgOiBbCiAgICAgICAgICAiamxld2lzM0BhcHBsZS5jb20iCiAgICAgICBdLAorICAgICAg ImdpdGh1YiIgOiAicmFuY29yZWQtbW9uZ29vc2UiLAogICAgICAgIm5hbWUiIDogIk1hdHQgTGV3 aXMiLAogICAgICAgIm5pY2tzIiA6IFsKICAgICAgICAgICJtYXR0bGV3aXMiCkBAIC01NjAxLDYg KzU2MDYsNyBAQAogICAgICAgImVtYWlscyIgOiBbCiAgICAgICAgICAicnlhbmhhZGRhZEBhcHBs ZS5jb20iCiAgICAgICBdLAorICAgICAgImdpdGh1YiIgOiAicnlhbmhhZGRhZCIsCiAgICAgICAi bmFtZSIgOiAiUnlhbiBIYWRkYWQiLAogICAgICAgIm5pY2tzIiA6IFsKICAgICAgICAgICJyeWFu aGFkZGFkIgpAQCAtNjkxMCw0ICs2OTE2LDQgQEAKICAgICAgIF0sCiAgICAgICAic3RhdHVzIiA6 ICJyZXZpZXdlciIKICAgIH0KLV0KK10KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCg==