231039 2021-09-30 15:15:30 -0700 [webkitscmpy] Get pull-request by number 2021-10-01 17:53:39 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard dewei_zhu slewis webkit-bug-importer oldest_to_newest 1799039 0 jbedard 2021-09-30 15:15:30 -0700 We need to be able to access pull-requests from both GitHub and BitBucket by pull-request number. 1799040 1 webkit-bug-importer 2021-09-30 15:15:45 -0700 <rdar://problem/83740215> 1799041 2 439782 jbedard 2021-09-30 15:16:50 -0700 Created attachment 439782 Patch 1799657 3 439940 jbedard 2021-10-01 17:25:51 -0700 Created attachment 439940 Patch for landing 1799668 4 ews-feeder 2021-10-01 17:53:37 -0700 Committed r283428 (242415@main): <https://commits.webkit.org/242415@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439940. 439782 2021-09-30 15:16:50 -0700 2021-10-01 17:25:49 -0700 Patch bug-231039-20210930151650.patch text/plain 14754 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMzQwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjJmNDI2MjNiODViMjJhOGRiOGJmMDNlMmY1MThkNDg5 OTU1NWM0ZC4uZDQ4YzEzYTcxNDI1NzU5ZmYyMTE2OGE5MjU0MTY0NmE1MWM0ZDA0OSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDIxLTA5LTMwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIEdldCBwdWxsLXJlcXVlc3QgYnkgbnVtYmVyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzEwMzkKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzgzNzQwMjE1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvbW9ja3MvcmVtb3RlL2dpdF9odWIucHk6CisgICAgICAgIChHaXRIdWIucmVxdWVzdCk6 IEFkZCBwdWxsLXJlcXVlc3QgYWNjZXNzIGJ5IG51bWJlci4KKyAgICAgICAgKiBTY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvYml0YnVja2V0LnB5OgorICAg ICAgICAoQml0QnVja2V0LlBSR2VuZXJhdG9yLlB1bGxSZXF1ZXN0KTogU2hhcmVkIEpTT04gcHVs bC1yZXF1ZXN0IGdlbmVyYXRvci4KKyAgICAgICAgKEJpdEJ1Y2tldC5QUkdlbmVyYXRvci5nZXQp OiBHZXQgcHVsbC1yZXF1ZXN0IGJ5IG51bWJlci4KKyAgICAgICAgKEJpdEJ1Y2tldC5QUkdlbmVy YXRvci5maW5kKTogVXNlIHNoYXJlZCBwdWxsLXJlcXVlc3QgZ2VuZXJhdG9yLgorICAgICAgICAo Qml0QnVja2V0LlBSR2VuZXJhdG9yLmNyZWF0ZSk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9naXRfaHViLnB5OgorICAg ICAgICAoR2l0SHViLlBSR2VuZXJhdG9yLlB1bGxSZXF1ZXN0KTogU2hhcmVkIEpTT04gcHVsbC1y ZXF1ZXN0IGdlbmVyYXRvci4KKyAgICAgICAgKEdpdEh1Yi5QUkdlbmVyYXRvci5nZXQpOiBHZXQg cHVsbC1yZXF1ZXN0IGJ5IG51bWJlci4KKyAgICAgICAgKEdpdEh1Yi5QUkdlbmVyYXRvci5maW5k KTogVXNlIHNoYXJlZCBwdWxsLXJlcXVlc3QgZ2VuZXJhdG9yLgorICAgICAgICAoR2l0SHViLlBS R2VuZXJhdG9yLmNyZWF0ZSk6CisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvcmVtb3RlL3NjbS5weToKKyAgICAgICAgKFNjbS5QUkdlbmVyYXRvci5n ZXQpOgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L3Rlc3QvcHVsbF9yZXF1ZXN0X3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdE5ldHdvcmtQdWxs UmVxdWVzdEdpdEh1Yik6IEFkZGVkLgorCiAyMDIxLTA5LTMwICBGdWppaSBIaXJvbm9yaSAgPEhp cm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFB5dGhvbiAzIGZhaWxzIHRvIHJ1biBy dW4tYnVpbHRpbnMtZ2VuZXJhdG9yLXRlc3RzIDogTW9kdWxlTm90Rm91bmRFcnJvcjogTm8gbW9k dWxlIG5hbWVkICdidWlsdGluc19tb2RlbCcKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL3JlbW90ZS9naXRfaHViLnB5IGIv VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvcmVt b3RlL2dpdF9odWIucHkKaW5kZXggYTU1MTQ1MjI2M2QyOWRhZTg2MDE4NzVkMGM4OWE5MDk2MGNl YTJiYy4uOThjYWVkZGNkMzliMTJhNGZjYjk0YjZkYTY2OTgwOTY0ZWM5MzgwNCAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3Mv cmVtb3RlL2dpdF9odWIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvbW9ja3MvcmVtb3RlL2dpdF9odWIucHkKQEAgLTMzNSw3ICszMzUsNyBA QCBjbGFzcyBHaXRIdWIobW9ja3MuUmVxdWVzdHMpOgogICAgICAgICAgICAgdXNlcm5hbWUgPSAo anNvbiBvciB7fSkuZ2V0KCdvd25lcicsIE5vbmUpCiAgICAgICAgICAgICBpZiB1c2VybmFtZToK ICAgICAgICAgICAgICAgICBzZWxmLmZvcmtzLmFwcGVuZCh1c2VybmFtZSkKLSAgICAgICAgICAg IHJldHVybiBtb2Nrcy5SZXNwb25zZS5mcm9tSnNvbih7fSkgaWYgdXNlcm5hbWUgZWxzZSBtb2Nr cy5SZXNwb25zZS5jcmVhdGU0MDQodXJsKQorICAgICAgICAgICAgcmV0dXJuIG1vY2tzLlJlc3Bv bnNlLmZyb21Kc29uKHt9LCB1cmw9dXJsKSBpZiB1c2VybmFtZSBlbHNlIG1vY2tzLlJlc3BvbnNl LmNyZWF0ZTQwNCh1cmwpCiAKICAgICAgICAgIyBBbGwgcHVsbC1yZXF1ZXN0cwogICAgICAgICBw cl9iYXNlID0gJ3t9L3B1bGxzJy5mb3JtYXQoc2VsZi5hcGlfcmVtb3RlKQpAQCAtMzUyLDcgKzM1 MiwxNCBAQCBjbGFzcyBHaXRIdWIobW9ja3MuUmVxdWVzdHMpOgogICAgICAgICAgICAgICAgIGlm IGhlYWQgYW5kIGhlYWQgbm90IGluIFtjYW5kaWRhdGUuZ2V0KCdoZWFkJywge30pLmdldCgncmVm JyksIGNhbmRpZGF0ZS5nZXQoJ2hlYWQnLCB7fSkuZ2V0KCdsYWJlbCcpXToKICAgICAgICAgICAg ICAgICAgICAgY29udGludWUKICAgICAgICAgICAgICAgICBwcnMuYXBwZW5kKGNhbmRpZGF0ZSkK LSAgICAgICAgICAgIHJldHVybiBtb2Nrcy5SZXNwb25zZS5mcm9tSnNvbihwcnMpCisgICAgICAg ICAgICByZXR1cm4gbW9ja3MuUmVzcG9uc2UuZnJvbUpzb24ocHJzLCB1cmw9dXJsKQorCisgICAg ICAgICMgUHVsbC1yZXF1ZXN0IGJ5IG51bWJlcgorICAgICAgICBpZiBtZXRob2QgPT0gJ0dFVCcg YW5kIHN0cmlwcGVkX3VybC5zdGFydHN3aXRoKHByX2Jhc2UpOgorICAgICAgICAgICAgZm9yIGNh bmRpZGF0ZSBpbiBzZWxmLnB1bGxfcmVxdWVzdHM6CisgICAgICAgICAgICAgICAgaWYgc3RyaXBw ZWRfdXJsLnNwbGl0KCcvJylbLTFdID09IHN0cihjYW5kaWRhdGVbJ251bWJlciddKToKKyAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIG1vY2tzLlJlc3BvbnNlLmZyb21Kc29uKGNhbmRpZGF0ZSwg dXJsPXVybCkKKyAgICAgICAgICAgIHJldHVybiBtb2Nrcy5SZXNwb25zZS5jcmVhdGU0MDQodXJs KQogCiAgICAgICAgICMgQ3JlYXRlL3VwZGF0ZSBwdWxsLXJlcXVlc3QKICAgICAgICAgcHIgPSBk aWN0KCkKQEAgLTM3OSw3ICszODYsNyBAQCBjbGFzcyBHaXRIdWIobW9ja3MuUmVxdWVzdHMpOgog ICAgICAgICAgICAgcHJbJ251bWJlciddID0gMSArIG1heChbMF0gKyBbcHIuZ2V0KCdudW1iZXIn LCAwKSBmb3IgcHIgaW4gc2VsZi5wdWxsX3JlcXVlc3RzXSkKICAgICAgICAgICAgIHByWyd1c2Vy J10gPSBkaWN0KGxvZ2luPWF1dGgudXNlcm5hbWUpCiAgICAgICAgICAgICBzZWxmLnB1bGxfcmVx dWVzdHMuYXBwZW5kKHByKQotICAgICAgICAgICAgcmV0dXJuIG1vY2tzLlJlc3BvbnNlLmZyb21K c29uKHByKQorICAgICAgICAgICAgcmV0dXJuIG1vY2tzLlJlc3BvbnNlLmZyb21Kc29uKHByLCB1 cmw9dXJsKQogCiAgICAgICAgICMgVXBkYXRlIHNwZWNpZmljYWxseQogICAgICAgICBpZiBtZXRo b2QgPT0gJ1BPU1QnIGFuZCBhdXRoIGFuZCBzdHJpcHBlZF91cmwuc3RhcnRzd2l0aChwcl9iYXNl KToKQEAgLTM5MSw2ICszOTgsNiBAQCBjbGFzcyBHaXRIdWIobW9ja3MuUmVxdWVzdHMpOgogICAg ICAgICAgICAgaWYgZXhpc3RpbmcgaXMgTm9uZToKICAgICAgICAgICAgICAgICByZXR1cm4gbW9j a3MuUmVzcG9uc2UuY3JlYXRlNDA0KHVybCkKICAgICAgICAgICAgIHNlbGYucHVsbF9yZXF1ZXN0 c1tleGlzdGluZ10udXBkYXRlKHByKQotICAgICAgICAgICAgcmV0dXJuIG1vY2tzLlJlc3BvbnNl LmZyb21Kc29uKHNlbGYucHVsbF9yZXF1ZXN0c1tpXSkKKyAgICAgICAgICAgIHJldHVybiBtb2Nr cy5SZXNwb25zZS5mcm9tSnNvbihzZWxmLnB1bGxfcmVxdWVzdHNbaV0sIHVybD11cmwpCiAKICAg ICAgICAgcmV0dXJuIG1vY2tzLlJlc3BvbnNlLmNyZWF0ZTQwNCh1cmwpCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvYml0 YnVja2V0LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvcmVtb3RlL2JpdGJ1Y2tldC5weQppbmRleCBiNmZlMTFkYzU3ZTg4ZjU0NjBkN2U5NGYzOGMy NDRjZWE3NWY3M2NjLi5mMjhhYjdkY2RiMWUwM2RmMzA3ODViYzI0NTBkMjM2YWIxYTkwYWE4IDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS9yZW1vdGUvYml0YnVja2V0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9iaXRidWNrZXQucHkKQEAgLTM5LDYgKzM5LDIzIEBA IGNsYXNzIEJpdEJ1Y2tldChTY20pOgogICAgICAgICBUSVRMRV9DSEFSX0xJTUlUID0gMjU0CiAg ICAgICAgIEJPRFlfQ0hBUl9MSU1JVCA9IDMyNzY2CiAKKyAgICAgICAgZGVmIFB1bGxSZXF1ZXN0 KHNlbGYsIGRhdGEpOgorICAgICAgICAgICAgaWYgbm90IGRhdGE6CisgICAgICAgICAgICAgICAg cmV0dXJuIE5vbmUKKyAgICAgICAgICAgIHJldHVybiBQdWxsUmVxdWVzdCgKKyAgICAgICAgICAg ICAgICBudW1iZXI9ZGF0YVsnaWQnXSwKKyAgICAgICAgICAgICAgICB0aXRsZT1kYXRhLmdldCgn dGl0bGUnKSwKKyAgICAgICAgICAgICAgICBib2R5PWRhdGEuZ2V0KCdkZXNjcmlwdGlvbicpLAor ICAgICAgICAgICAgICAgIGF1dGhvcj1zZWxmLnJlcG9zaXRvcnkuY29udHJpYnV0b3JzLmNyZWF0 ZSgKKyAgICAgICAgICAgICAgICAgICAgZGF0YVsnYXV0aG9yJ11bJ3VzZXInXVsnZGlzcGxheU5h bWUnXSwKKyAgICAgICAgICAgICAgICAgICAgZGF0YVsnYXV0aG9yJ11bJ3VzZXInXVsnZW1haWxB ZGRyZXNzJ10sCisgICAgICAgICAgICAgICAgKSwgaGVhZD1kYXRhWydmcm9tUmVmJ11bJ2Rpc3Bs YXlJZCddLAorICAgICAgICAgICAgICAgIGJhc2U9ZGF0YVsndG9SZWYnXVsnZGlzcGxheUlkJ10s CisgICAgICAgICAgICApCisKKyAgICAgICAgZGVmIGdldChzZWxmLCBudW1iZXIpOgorICAgICAg ICAgICAgcmV0dXJuIHNlbGYuUHVsbFJlcXVlc3Qoc2VsZi5yZXBvc2l0b3J5LnJlcXVlc3QoJ3B1 bGwtcmVxdWVzdHMve30nLmZvcm1hdChpbnQobnVtYmVyKSkpKQorCiAgICAgICAgIGRlZiBmaW5k KHNlbGYsIHN0YXRlPU5vbmUsIGhlYWQ9Tm9uZSwgYmFzZT1Ob25lKToKICAgICAgICAgICAgIHBh cmFtcyA9IGRpY3QoCiAgICAgICAgICAgICAgICAgbGltaXQ9MTAwLApAQCAtNTYsMTYgKzczLDcg QEAgY2xhc3MgQml0QnVja2V0KFNjbSk6CiAgICAgICAgICAgICBmb3IgZGF0dW0gaW4gZGF0YSBv ciBbXToKICAgICAgICAgICAgICAgICBpZiBiYXNlIGFuZCBub3QgZGF0dW1bJ3RvUmVmJ11bJ2lk J10uZW5kc3dpdGgoYmFzZSk6CiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCi0gICAgICAg ICAgICAgICAgeWllbGQgUHVsbFJlcXVlc3QoCi0gICAgICAgICAgICAgICAgICAgIG51bWJlcj1k YXR1bVsnaWQnXSwKLSAgICAgICAgICAgICAgICAgICAgdGl0bGU9ZGF0dW0uZ2V0KCd0aXRsZScp LAotICAgICAgICAgICAgICAgICAgICBib2R5PWRhdHVtLmdldCgnZGVzY3JpcHRpb24nKSwKLSAg ICAgICAgICAgICAgICAgICAgYXV0aG9yPXNlbGYucmVwb3NpdG9yeS5jb250cmlidXRvcnMuY3Jl YXRlKAotICAgICAgICAgICAgICAgICAgICAgICAgZGF0dW1bJ2F1dGhvciddWyd1c2VyJ11bJ2Rp c3BsYXlOYW1lJ10sCi0gICAgICAgICAgICAgICAgICAgICAgICBkYXR1bVsnYXV0aG9yJ11bJ3Vz ZXInXVsnZW1haWxBZGRyZXNzJ10sCi0gICAgICAgICAgICAgICAgICAgICksIGhlYWQ9ZGF0dW1b J2Zyb21SZWYnXVsnZGlzcGxheUlkJ10sCi0gICAgICAgICAgICAgICAgICAgIGJhc2U9ZGF0dW1b J3RvUmVmJ11bJ2Rpc3BsYXlJZCddLAotICAgICAgICAgICAgICAgICkKKyAgICAgICAgICAgICAg ICB5aWVsZCBzZWxmLlB1bGxSZXF1ZXN0KGRhdHVtKQogCiAgICAgICAgIGRlZiBjcmVhdGUoc2Vs ZiwgaGVhZCwgdGl0bGUsIGJvZHk9Tm9uZSwgY29tbWl0cz1Ob25lLCBiYXNlPU5vbmUpOgogICAg ICAgICAgICAgZm9yIGtleSwgdmFsdWUgaW4gZGljdChoZWFkPWhlYWQsIHRpdGxlPXRpdGxlKS5p dGVtcygpOgpAQCAtMTAyLDE3ICsxMTAsNyBAQCBjbGFzcyBCaXRCdWNrZXQoU2NtKToKICAgICAg ICAgICAgICkKICAgICAgICAgICAgIGlmIHJlc3BvbnNlLnN0YXR1c19jb2RlIC8vIDEwMCAhPSAy OgogICAgICAgICAgICAgICAgIHJldHVybiBOb25lCi0gICAgICAgICAgICBkYXRhID0gcmVzcG9u c2UuanNvbigpCi0gICAgICAgICAgICByZXR1cm4gUHVsbFJlcXVlc3QoCi0gICAgICAgICAgICAg ICAgbnVtYmVyPWRhdGFbJ2lkJ10sCi0gICAgICAgICAgICAgICAgdGl0bGU9ZGF0YS5nZXQoJ3Rp dGxlJyksCi0gICAgICAgICAgICAgICAgYm9keT1kYXRhLmdldCgnZGVzY3JpcHRpb24nKSwKLSAg ICAgICAgICAgICAgICBhdXRob3I9c2VsZi5yZXBvc2l0b3J5LmNvbnRyaWJ1dG9ycy5jcmVhdGUo Ci0gICAgICAgICAgICAgICAgICAgIGRhdGFbJ2F1dGhvciddWyd1c2VyJ11bJ2Rpc3BsYXlOYW1l J10sCi0gICAgICAgICAgICAgICAgICAgIGRhdGFbJ2F1dGhvciddWyd1c2VyJ11bJ2VtYWlsQWRk cmVzcyddLAotICAgICAgICAgICAgICAgICksIGhlYWQ9ZGF0YVsnZnJvbVJlZiddWydkaXNwbGF5 SWQnXSwKLSAgICAgICAgICAgICAgICBiYXNlPWRhdGFbJ3RvUmVmJ11bJ2Rpc3BsYXlJZCddLAot ICAgICAgICAgICAgKQorICAgICAgICAgICAgcmV0dXJuIHNlbGYuUHVsbFJlcXVlc3QocmVzcG9u c2UuanNvbigpKQogCiAgICAgICAgIGRlZiB1cGRhdGUoc2VsZiwgcHVsbF9yZXF1ZXN0LCBoZWFk PU5vbmUsIHRpdGxlPU5vbmUsIGJvZHk9Tm9uZSwgY29tbWl0cz1Ob25lLCBiYXNlPU5vbmUpOgog ICAgICAgICAgICAgaWYgbm90IGlzaW5zdGFuY2UocHVsbF9yZXF1ZXN0LCBQdWxsUmVxdWVzdCk6 CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS9yZW1vdGUvZ2l0X2h1Yi5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9naXRfaHViLnB5CmluZGV4IDY0ZWRmYzJkNzZkMzdmMTMx ZmJiNDhhZDJiMTI5ZjJlNTdkODIwOWEuLjJmM2Y0NDFmN2RmZjlmYWEzYTVkNzQyZTE5YjA2ZTY3 ZmQ0ODQxYjcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L3JlbW90ZS9naXRfaHViLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9naXRfaHViLnB5CkBAIC0zOSw2ICsz OSwyMSBAQCBjbGFzcyBHaXRIdWIoU2NtKToKICAgICBFTUFJTF9SRSA9IHJlLmNvbXBpbGUocico P1A8ZW1haWw+W15AXStAW15AXSspKEAuKik/JykKIAogICAgIGNsYXNzIFBSR2VuZXJhdG9yKFNj bS5QUkdlbmVyYXRvcik6CisgICAgICAgIGRlZiBQdWxsUmVxdWVzdChzZWxmLCBkYXRhKToKKyAg ICAgICAgICAgIGlmIG5vdCBkYXRhOgorICAgICAgICAgICAgICAgIHJldHVybiBOb25lCisgICAg ICAgICAgICByZXR1cm4gUHVsbFJlcXVlc3QoCisgICAgICAgICAgICAgICAgbnVtYmVyPWRhdGFb J251bWJlciddLAorICAgICAgICAgICAgICAgIHRpdGxlPWRhdGEuZ2V0KCd0aXRsZScpLAorICAg ICAgICAgICAgICAgIGJvZHk9ZGF0YS5nZXQoJ2JvZHknKSwKKyAgICAgICAgICAgICAgICBhdXRo b3I9c2VsZi5yZXBvc2l0b3J5LmNvbnRyaWJ1dG9ycy5jcmVhdGUoZGF0YVsndXNlciddWydsb2dp biddKSwKKyAgICAgICAgICAgICAgICBoZWFkPWRhdGFbJ2hlYWQnXVsncmVmJ10sCisgICAgICAg ICAgICAgICAgYmFzZT1kYXRhWydiYXNlJ11bJ3JlZiddLAorICAgICAgICAgICAgKQorCisgICAg ICAgIGRlZiBnZXQoc2VsZiwgbnVtYmVyKToKKyAgICAgICAgICAgIHJldHVybiBzZWxmLlB1bGxS ZXF1ZXN0KHNlbGYucmVwb3NpdG9yeS5yZXF1ZXN0KCdwdWxscy97fScuZm9ybWF0KGludChudW1i ZXIpKSkpCisKICAgICAgICAgZGVmIGZpbmQoc2VsZiwgc3RhdGU9Tm9uZSwgaGVhZD1Ob25lLCBi YXNlPU5vbmUpOgogICAgICAgICAgICAgaWYgbm90IHN0YXRlOgogICAgICAgICAgICAgICAgIHN0 YXRlID0gJ2FsbCcKQEAgLTUxLDE2ICs2Niw5IEBAIGNsYXNzIEdpdEh1YihTY20pOgogICAgICAg ICAgICAgZm9yIGRhdHVtIGluIGRhdGEgb3IgW106CiAgICAgICAgICAgICAgICAgaWYgYmFzZSBh bmQgZGF0dW1bJ2Jhc2UnXVsncmVmJ10gIT0gYmFzZToKICAgICAgICAgICAgICAgICAgICAgY29u dGludWUKLSAgICAgICAgICAgICAgICBpZiBoZWFkIGFuZCBub3QgZGF0dW1bJ2hlYWQnXVsncmVm J10uZW5kc3dpdGgoaGVhZCk6CisgICAgICAgICAgICAgICAgaWYgaGVhZCBhbmQgbm90IGRhdHVt WydoZWFkJ11bJ3JlZiddLmVuZHN3aXRoKGhlYWQuc3BsaXQoJzonKVstMV0pOgogICAgICAgICAg ICAgICAgICAgICBjb250aW51ZQotICAgICAgICAgICAgICAgIHlpZWxkIFB1bGxSZXF1ZXN0KAot ICAgICAgICAgICAgICAgICAgICBudW1iZXI9ZGF0dW1bJ251bWJlciddLAotICAgICAgICAgICAg ICAgICAgICB0aXRsZT1kYXR1bS5nZXQoJ3RpdGxlJyksCi0gICAgICAgICAgICAgICAgICAgIGJv ZHk9ZGF0dW0uZ2V0KCdib2R5JyksCi0gICAgICAgICAgICAgICAgICAgIGF1dGhvcj1zZWxmLnJl cG9zaXRvcnkuY29udHJpYnV0b3JzLmNyZWF0ZShkYXR1bVsndXNlciddWydsb2dpbiddKSwKLSAg ICAgICAgICAgICAgICAgICAgaGVhZD1kYXR1bVsnaGVhZCddWydyZWYnXSwKLSAgICAgICAgICAg ICAgICAgICAgYmFzZT1kYXR1bVsnYmFzZSddWydyZWYnXSwKLSAgICAgICAgICAgICAgICApCisg ICAgICAgICAgICAgICAgeWllbGQgc2VsZi5QdWxsUmVxdWVzdChkYXR1bSkKIAogICAgICAgICBk ZWYgY3JlYXRlKHNlbGYsIGhlYWQsIHRpdGxlLCBib2R5PU5vbmUsIGNvbW1pdHM9Tm9uZSwgYmFz ZT1Ob25lKToKICAgICAgICAgICAgIGZvciBrZXksIHZhbHVlIGluIGRpY3QoaGVhZD1oZWFkLCB0 aXRsZT10aXRsZSkuaXRlbXMoKToKQEAgLTg0LDE1ICs5Miw3IEBAIGNsYXNzIEdpdEh1YihTY20p OgogICAgICAgICAgICAgKQogICAgICAgICAgICAgaWYgcmVzcG9uc2Uuc3RhdHVzX2NvZGUgLy8g MTAwICE9IDI6CiAgICAgICAgICAgICAgICAgcmV0dXJuIE5vbmUKLSAgICAgICAgICAgIGRhdGEg PSByZXNwb25zZS5qc29uKCkKLSAgICAgICAgICAgIHJldHVybiBQdWxsUmVxdWVzdCgKLSAgICAg ICAgICAgICAgICBudW1iZXI9ZGF0YVsnbnVtYmVyJ10sCi0gICAgICAgICAgICAgICAgdGl0bGU9 ZGF0YS5nZXQoJ3RpdGxlJyksCi0gICAgICAgICAgICAgICAgYm9keT1kYXRhLmdldCgnYm9keScp LAotICAgICAgICAgICAgICAgIGF1dGhvcj1zZWxmLnJlcG9zaXRvcnkuY29udHJpYnV0b3JzLmNy ZWF0ZShkYXRhWyd1c2VyJ11bJ2xvZ2luJ10pLAotICAgICAgICAgICAgICAgIGhlYWQ9ZGF0YVsn aGVhZCddWydyZWYnXSwKLSAgICAgICAgICAgICAgICBiYXNlPWRhdGFbJ2Jhc2UnXVsncmVmJ10s Ci0gICAgICAgICAgICApCisgICAgICAgICAgICByZXR1cm4gc2VsZi5QdWxsUmVxdWVzdChyZXNw b25zZS5qc29uKCkpCiAKICAgICAgICAgZGVmIHVwZGF0ZShzZWxmLCBwdWxsX3JlcXVlc3QsIGhl YWQ9Tm9uZSwgdGl0bGU9Tm9uZSwgYm9keT1Ob25lLCBjb21taXRzPU5vbmUsIGJhc2U9Tm9uZSk6 CiAgICAgICAgICAgICBpZiBub3QgaXNpbnN0YW5jZShwdWxsX3JlcXVlc3QsIFB1bGxSZXF1ZXN0 KToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L3JlbW90ZS9zY20ucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9yZW1vdGUvc2NtLnB5CmluZGV4IGZiZWJmZTg4YzlhZThjMTliNzk3ODJh YjViMGExYjBkZjY5NzMyOTMuLmQ1MjdmNGMwMDdmZWQ1ODVjMWUzZjIyNGFhNmRlNmFiZDZkZDQy MDggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L3JlbW90ZS9zY20ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3NjbS5weQpAQCAtMzAsNiArMzAsOSBAQCBjbGFzcyBT Y20oU2NtQmFzZSk6CiAgICAgICAgIGRlZiBfX2luaXRfXyhzZWxmLCByZXBvc2l0b3J5KToKICAg ICAgICAgICAgIHNlbGYucmVwb3NpdG9yeSA9IHJlcG9zaXRvcnkKIAorICAgICAgICBkZWYgZ2V0 KHNlbGYsIG51bWJlcik6CisgICAgICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yKCkK KwogICAgICAgICBkZWYgZmluZChzZWxmLCBzdGF0ZT1Ob25lLCBoZWFkPU5vbmUsIGJhc2U9Tm9u ZSk6CiAgICAgICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yKCkKIApkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9w dWxsX3JlcXVlc3RfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS90ZXN0L3B1bGxfcmVxdWVzdF91bml0dGVzdC5weQppbmRleCA5YjNk MDIxYTM3YmMxZTVkMjYxNmNkMjVhMWIwOGMxYzU1M2QwYTk5Li44OWJmMmZlM2UyOTZhMGJmMjg4 ZDA0ZTEzOGYzNmE5NGRiYzg3NTRmIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L3B1bGxfcmVxdWVzdF91bml0dGVzdC5weQor KysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0 L3B1bGxfcmVxdWVzdF91bml0dGVzdC5weQpAQCAtMjUsNyArMjUsNyBAQCBpbXBvcnQgc3lzCiBp bXBvcnQgdW5pdHRlc3QKIAogZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IE91dHB1dENhcHR1cmUs IHRlc3RpbmcKLWZyb20gd2Via2l0c2NtcHkgaW1wb3J0IENvbW1pdCwgUHVsbFJlcXVlc3QsIHBy b2dyYW0sIG1vY2tzCitmcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBDb21taXQsIFB1bGxSZXF1ZXN0 LCBwcm9ncmFtLCBtb2NrcywgcmVtb3RlCiAKIAogY2xhc3MgVGVzdFB1bGxSZXF1ZXN0KHVuaXR0 ZXN0LlRlc3RDYXNlKToKQEAgLTMzNCwzICszMzQsOTcgQEAgUmViYXNlZCAnZW5nL3ByLWJyYW5j aCcgb24gJ21haW4hJyIiIikKICAgICAgICAgICAgICAgICAiVXBkYXRlZCAnUFIgMSB8IEFtZW5k ZWQgY29tbWl0JyEiLAogICAgICAgICAgICAgXSwKICAgICAgICAgKQorCisKK2NsYXNzIFRlc3RO ZXR3b3JrUHVsbFJlcXVlc3RHaXRIdWIodW5pdHRlc3QuVGVzdENhc2UpOgorICAgIHJlbW90ZSA9 ICdodHRwczovL2dpdGh1Yi5leGFtcGxlLmNvbS9XZWJLaXQvV2ViS2l0JworCisgICAgQGNsYXNz bWV0aG9kCisgICAgZGVmIHdlYnNlcnZlcihjbHMpOgorICAgICAgICByZXN1bHQgPSBtb2Nrcy5y ZW1vdGUuR2l0SHViKCkKKyAgICAgICAgcmVzdWx0LnB1bGxfcmVxdWVzdHMgPSBbZGljdCgKKyAg ICAgICAgICAgIG51bWJlcj0xLAorICAgICAgICAgICAgc3RhdGU9J29wZW4nLAorICAgICAgICAg ICAgdGl0bGU9J0V4YW1wbGUgQ2hhbmdlJywKKyAgICAgICAgICAgIHVzZXI9ZGljdChsb2dpbj0n dGNvbnRyaWJ1dG9yJyksCisgICAgICAgICAgICBib2R5PScnJyMjIyMgOTU1MDdlM2ExYTRhOTE5 ZDFhMTU2YWJiYzI3OWZkZjZkMjRiMTNmNQorPHByZT4KK0V4YW1wbGUgQ2hhbmdlCis8YSBocmVm PSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIzNCI+aHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMzQ8L2E+CisKK1Jldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisqIFNvdXJjZS9maWxlLmNwcDoKKzwvcHJlPgorJycnLAorICAgICAg ICAgICAgaGVhZD1kaWN0KHJlZj0nZW5nL3B1bGwtcmVxdWVzdCcpLAorICAgICAgICAgICAgYmFz ZT1kaWN0KHJlZj0nbWFpbicpLAorICAgICAgICApXQorICAgICAgICByZXR1cm4gcmVzdWx0CisK KyAgICBkZWYgdGVzdF9maW5kKHNlbGYpOgorICAgICAgICB3aXRoIHNlbGYud2Vic2VydmVyKCk6 CisgICAgICAgICAgICBwcnMgPSBsaXN0KHJlbW90ZS5HaXRIdWIoc2VsZi5yZW1vdGUpLnB1bGxf cmVxdWVzdHMuZmluZCgpKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsZW4ocHJzKSwg MSkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocHJzWzBdLm51bWJlciwgMSkKKyAgICAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocHJzWzBdLnRpdGxlLCAnRXhhbXBsZSBDaGFuZ2UnKQor ICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwcnNbMF0uaGVhZCwgJ2VuZy9wdWxsLXJlcXVl c3QnKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwcnNbMF0uYmFzZSwgJ21haW4nKQor CisgICAgZGVmIHRlc3RfZ2V0KHNlbGYpOgorICAgICAgICB3aXRoIHNlbGYud2Vic2VydmVyKCk6 CisgICAgICAgICAgICBwciA9IHJlbW90ZS5HaXRIdWIoc2VsZi5yZW1vdGUpLnB1bGxfcmVxdWVz dHMuZ2V0KDEpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHByLm51bWJlciwgMSkKKyAg ICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocHIudGl0bGUsICdFeGFtcGxlIENoYW5nZScpCisg ICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHByLmhlYWQsICdlbmcvcHVsbC1yZXF1ZXN0JykK KyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocHIuYmFzZSwgJ21haW4nKQorCisKK2NsYXNz IFRlc3ROZXR3b3JrUHVsbFJlcXVlc3RCaXRCdWNrZXQodW5pdHRlc3QuVGVzdENhc2UpOgorICAg IHJlbW90ZSA9ICdodHRwczovL2JpdGJ1Y2tldC5leGFtcGxlLmNvbS9wcm9qZWN0cy9XRUJLSVQv cmVwb3Mvd2Via2l0JworCisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIHdlYnNlcnZlcihjbHMp OgorICAgICAgICByZXN1bHQgPSBtb2Nrcy5yZW1vdGUuQml0QnVja2V0KCkKKyAgICAgICAgcmVz dWx0LnB1bGxfcmVxdWVzdHMgPSBbZGljdCgKKyAgICAgICAgICAgIGlkPTEsCisgICAgICAgICAg ICBzdGF0ZT0nT1BFTicsCisgICAgICAgICAgICB0aXRsZT0nRXhhbXBsZSBDaGFuZ2UnLAorICAg ICAgICAgICAgYXV0aG9yPWRpY3QoCisgICAgICAgICAgICAgICAgdXNlcj1kaWN0KAorICAgICAg ICAgICAgICAgICAgICBuYW1lPSd0Y29udHJpYnV0b3InLAorICAgICAgICAgICAgICAgICAgICBl bWFpbEFkZHJlc3M9J3Rjb250cmlidXRvckBhcHBsZS5jb20nLAorICAgICAgICAgICAgICAgICAg ICBkaXNwbGF5TmFtZT0nVGltIENvbnRyaWJ1dG9yJywKKyAgICAgICAgICAgICAgICApLAorICAg ICAgICAgICAgKSwgYm9keT0nJycjIyMjIDk1NTA3ZTNhMWE0YTkxOWQxYTE1NmFiYmMyNzlmZGY2 ZDI0YjEzZjUKK2BgYAorRXhhbXBsZSBDaGFuZ2UKK2h0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjM0CisKK1Jldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisqIFNv dXJjZS9maWxlLmNwcDoKK2BgYAorJycnLAorICAgICAgICAgICAgZnJvbVJlZj1kaWN0KGRpc3Bs YXlJZD0nZW5nL3B1bGwtcmVxdWVzdCcpLAorICAgICAgICAgICAgdG9SZWY9ZGljdChkaXNwbGF5 SWQ9J21haW4nKSwKKyAgICAgICAgKV0KKyAgICAgICAgcmV0dXJuIHJlc3VsdAorCisgICAgZGVm IHRlc3RfZmluZChzZWxmKToKKyAgICAgICAgd2l0aCBzZWxmLndlYnNlcnZlcigpOgorICAgICAg ICAgICAgd2l0aCBzZWxmLndlYnNlcnZlcigpOgorICAgICAgICAgICAgICAgIHBycyA9IGxpc3Qo cmVtb3RlLkJpdEJ1Y2tldChzZWxmLnJlbW90ZSkucHVsbF9yZXF1ZXN0cy5maW5kKCkpCisgICAg ICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsZW4ocHJzKSwgMSkKKyAgICAgICAgICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKHByc1swXS5udW1iZXIsIDEpCisgICAgICAgICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChwcnNbMF0udGl0bGUsICdFeGFtcGxlIENoYW5nZScpCisgICAgICAgICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChwcnNbMF0uaGVhZCwgJ2VuZy9wdWxsLXJlcXVlc3QnKQor ICAgICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocHJzWzBdLmJhc2UsICdtYWluJykKKwor ICAgIGRlZiB0ZXN0X2dldChzZWxmKToKKyAgICAgICAgd2l0aCBzZWxmLndlYnNlcnZlcigpOgor ICAgICAgICAgICAgcHIgPSByZW1vdGUuQml0QnVja2V0KHNlbGYucmVtb3RlKS5wdWxsX3JlcXVl c3RzLmdldCgxKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwci5udW1iZXIsIDEpCisg ICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHByLnRpdGxlLCAnRXhhbXBsZSBDaGFuZ2UnKQor ICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwci5oZWFkLCAnZW5nL3B1bGwtcmVxdWVzdCcp CisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHByLmJhc2UsICdtYWluJykK 439940 2021-10-01 17:25:51 -0700 2021-10-01 17:53:38 -0700 Patch for landing bug-231039-20211001172550.patch text/plain 16069 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNDI1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWZiMzY5NzQ4OTBhM2IxNjEwNDhjNzY4MzczMzc4OTQ4 YjY2NmI1My4uNGUzNGEwNDZmYmQ4OTliNTI1YWRiNDQ2NTZlNzFkMjEzN2UyMTEzNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMw IEBACisyMDIxLTEwLTAxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIEdldCBwdWxsLXJlcXVlc3QgYnkgbnVtYmVyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzEwMzkKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzgzNzQwMjE1PgorCisgICAgICAgIFJldmlld2VkIGJ5IFN0ZXBoYW5p ZSBMZXdpcy4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVw LnB5OiBCdW1wIHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvX19pbml0X18ucHk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL3JlbW90ZS9naXRfaHViLnB5Ogor ICAgICAgICAoR2l0SHViLnJlcXVlc3QpOiBBZGQgcHVsbC1yZXF1ZXN0IGFjY2VzcyBieSBudW1i ZXIuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv cmVtb3RlL2JpdGJ1Y2tldC5weToKKyAgICAgICAgKEJpdEJ1Y2tldC5QUkdlbmVyYXRvci5QdWxs UmVxdWVzdCk6IFNoYXJlZCBKU09OIHB1bGwtcmVxdWVzdCBnZW5lcmF0b3IuCisgICAgICAgIChC aXRCdWNrZXQuUFJHZW5lcmF0b3IuZ2V0KTogR2V0IHB1bGwtcmVxdWVzdCBieSBudW1iZXIuCisg ICAgICAgIChCaXRCdWNrZXQuUFJHZW5lcmF0b3IuZmluZCk6IFVzZSBzaGFyZWQgcHVsbC1yZXF1 ZXN0IGdlbmVyYXRvci4KKyAgICAgICAgKEJpdEJ1Y2tldC5QUkdlbmVyYXRvci5jcmVhdGUpOiBE aXR0by4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS9yZW1vdGUvZ2l0X2h1Yi5weToKKyAgICAgICAgKEdpdEh1Yi5QUkdlbmVyYXRvci5QdWxsUmVx dWVzdCk6IFNoYXJlZCBKU09OIHB1bGwtcmVxdWVzdCBnZW5lcmF0b3IuCisgICAgICAgIChHaXRI dWIuUFJHZW5lcmF0b3IuZ2V0KTogR2V0IHB1bGwtcmVxdWVzdCBieSBudW1iZXIuCisgICAgICAg IChHaXRIdWIuUFJHZW5lcmF0b3IuZmluZCk6IFVzZSBzaGFyZWQgcHVsbC1yZXF1ZXN0IGdlbmVy YXRvci4KKyAgICAgICAgKEdpdEh1Yi5QUkdlbmVyYXRvci5jcmVhdGUpOgorICAgICAgICAqIFNj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9zY20ucHk6Cisg ICAgICAgIChTY20uUFJHZW5lcmF0b3IuZ2V0KToKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L3B1bGxfcmVxdWVzdF91bml0dGVzdC5weToK KyAgICAgICAgKFRlc3ROZXR3b3JrUHVsbFJlcXVlc3RHaXRIdWIpOiBBZGRlZC4KKwogMjAyMS0x MC0wMSAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgW3dl YmtpdGNvcmVweV0gQWRkIFRhc2tQb29sIChGb2xsb3ctdXAgZml4KQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkgYi9Ub29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQppbmRleCA1YzM4MDNjMzNlNDc3ZmMzMGE5 ZjMzZDhmYTYxMTI3ZGViYTdmM2U1Li4zZDk1MzUyMjA1MDJjMTIxMDc3YmY4YjlmMTk5MTE2ZWVk OWM3ZjU4IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9z ZXR1cC5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5w eQpAQCAtMjksNyArMjksNyBAQCBkZWYgcmVhZG1lKCk6CiAKIHNldHVwKAogICAgIG5hbWU9J3dl YmtpdHNjbXB5JywKLSAgICB2ZXJzaW9uPScyLjIuMycsCisgICAgdmVyc2lvbj0nMi4yLjQnLAog ICAgIGRlc2NyaXB0aW9uPSdMaWJyYXJ5IGRlc2lnbmVkIHRvIGludGVyYWN0IHdpdGggZ2l0IGFu ZCBzdm4gcmVwb3NpdG9yaWVzLicsCiAgICAgbG9uZ19kZXNjcmlwdGlvbj1yZWFkbWUoKSwKICAg ICBjbGFzc2lmaWVycz1bCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CmluZGV4IGZkM2U5NTQ4Nzk0NmRl NThhMjdjZDVhMTY2ZWFlOWExNmNmYzgyMGQuLjFhNmZlZDRjN2M2OWU4NDI0MWMyMzNmOWQ1NjU5 OGY0MzlkZDNkMmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CkBAIC00Niw3ICs0Niw3IEBAIGV4 Y2VwdCBJbXBvcnRFcnJvcjoKICAgICAgICAgIlBsZWFzZSBpbnN0YWxsIHdlYmtpdGNvcmVweSB3 aXRoIGBwaXAgaW5zdGFsbCB3ZWJraXRjb3JlcHkgLS1leHRyYS1pbmRleC11cmwgPHBhY2thZ2Ug aW5kZXggVVJMPmAiCiAgICAgKQogCi12ZXJzaW9uID0gVmVyc2lvbigyLCAyLCAzKQordmVyc2lv biA9IFZlcnNpb24oMiwgMiwgNCkKIAogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZmFz dGVuZXJzJywgVmVyc2lvbigwLCAxNSwgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2Fn ZSgnbW9ub3RvbmljJywgVmVyc2lvbigxLCA1KSkpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9yZW1vdGUvZ2l0X2h1Yi5w eSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tz L3JlbW90ZS9naXRfaHViLnB5CmluZGV4IGE1NTE0NTIyNjNkMjlkYWU4NjAxODc1ZDBjODlhOTA5 NjBjZWEyYmMuLjk4Y2FlZGRjZDM5YjEyYTRmY2I5NGI2ZGE2Njk4MDk2NGVjOTM4MDQgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21v Y2tzL3JlbW90ZS9naXRfaHViLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL3JlbW90ZS9naXRfaHViLnB5CkBAIC0zMzUsNyArMzM1 LDcgQEAgY2xhc3MgR2l0SHViKG1vY2tzLlJlcXVlc3RzKToKICAgICAgICAgICAgIHVzZXJuYW1l ID0gKGpzb24gb3Ige30pLmdldCgnb3duZXInLCBOb25lKQogICAgICAgICAgICAgaWYgdXNlcm5h bWU6CiAgICAgICAgICAgICAgICAgc2VsZi5mb3Jrcy5hcHBlbmQodXNlcm5hbWUpCi0gICAgICAg ICAgICByZXR1cm4gbW9ja3MuUmVzcG9uc2UuZnJvbUpzb24oe30pIGlmIHVzZXJuYW1lIGVsc2Ug bW9ja3MuUmVzcG9uc2UuY3JlYXRlNDA0KHVybCkKKyAgICAgICAgICAgIHJldHVybiBtb2Nrcy5S ZXNwb25zZS5mcm9tSnNvbih7fSwgdXJsPXVybCkgaWYgdXNlcm5hbWUgZWxzZSBtb2Nrcy5SZXNw b25zZS5jcmVhdGU0MDQodXJsKQogCiAgICAgICAgICMgQWxsIHB1bGwtcmVxdWVzdHMKICAgICAg ICAgcHJfYmFzZSA9ICd7fS9wdWxscycuZm9ybWF0KHNlbGYuYXBpX3JlbW90ZSkKQEAgLTM1Miw3 ICszNTIsMTQgQEAgY2xhc3MgR2l0SHViKG1vY2tzLlJlcXVlc3RzKToKICAgICAgICAgICAgICAg ICBpZiBoZWFkIGFuZCBoZWFkIG5vdCBpbiBbY2FuZGlkYXRlLmdldCgnaGVhZCcsIHt9KS5nZXQo J3JlZicpLCBjYW5kaWRhdGUuZ2V0KCdoZWFkJywge30pLmdldCgnbGFiZWwnKV06CiAgICAgICAg ICAgICAgICAgICAgIGNvbnRpbnVlCiAgICAgICAgICAgICAgICAgcHJzLmFwcGVuZChjYW5kaWRh dGUpCi0gICAgICAgICAgICByZXR1cm4gbW9ja3MuUmVzcG9uc2UuZnJvbUpzb24ocHJzKQorICAg ICAgICAgICAgcmV0dXJuIG1vY2tzLlJlc3BvbnNlLmZyb21Kc29uKHBycywgdXJsPXVybCkKKwor ICAgICAgICAjIFB1bGwtcmVxdWVzdCBieSBudW1iZXIKKyAgICAgICAgaWYgbWV0aG9kID09ICdH RVQnIGFuZCBzdHJpcHBlZF91cmwuc3RhcnRzd2l0aChwcl9iYXNlKToKKyAgICAgICAgICAgIGZv ciBjYW5kaWRhdGUgaW4gc2VsZi5wdWxsX3JlcXVlc3RzOgorICAgICAgICAgICAgICAgIGlmIHN0 cmlwcGVkX3VybC5zcGxpdCgnLycpWy0xXSA9PSBzdHIoY2FuZGlkYXRlWydudW1iZXInXSk6Cisg ICAgICAgICAgICAgICAgICAgIHJldHVybiBtb2Nrcy5SZXNwb25zZS5mcm9tSnNvbihjYW5kaWRh dGUsIHVybD11cmwpCisgICAgICAgICAgICByZXR1cm4gbW9ja3MuUmVzcG9uc2UuY3JlYXRlNDA0 KHVybCkKIAogICAgICAgICAjIENyZWF0ZS91cGRhdGUgcHVsbC1yZXF1ZXN0CiAgICAgICAgIHBy ID0gZGljdCgpCkBAIC0zNzksNyArMzg2LDcgQEAgY2xhc3MgR2l0SHViKG1vY2tzLlJlcXVlc3Rz KToKICAgICAgICAgICAgIHByWydudW1iZXInXSA9IDEgKyBtYXgoWzBdICsgW3ByLmdldCgnbnVt YmVyJywgMCkgZm9yIHByIGluIHNlbGYucHVsbF9yZXF1ZXN0c10pCiAgICAgICAgICAgICBwclsn dXNlciddID0gZGljdChsb2dpbj1hdXRoLnVzZXJuYW1lKQogICAgICAgICAgICAgc2VsZi5wdWxs X3JlcXVlc3RzLmFwcGVuZChwcikKLSAgICAgICAgICAgIHJldHVybiBtb2Nrcy5SZXNwb25zZS5m cm9tSnNvbihwcikKKyAgICAgICAgICAgIHJldHVybiBtb2Nrcy5SZXNwb25zZS5mcm9tSnNvbihw ciwgdXJsPXVybCkKIAogICAgICAgICAjIFVwZGF0ZSBzcGVjaWZpY2FsbHkKICAgICAgICAgaWYg bWV0aG9kID09ICdQT1NUJyBhbmQgYXV0aCBhbmQgc3RyaXBwZWRfdXJsLnN0YXJ0c3dpdGgocHJf YmFzZSk6CkBAIC0zOTEsNiArMzk4LDYgQEAgY2xhc3MgR2l0SHViKG1vY2tzLlJlcXVlc3RzKToK ICAgICAgICAgICAgIGlmIGV4aXN0aW5nIGlzIE5vbmU6CiAgICAgICAgICAgICAgICAgcmV0dXJu IG1vY2tzLlJlc3BvbnNlLmNyZWF0ZTQwNCh1cmwpCiAgICAgICAgICAgICBzZWxmLnB1bGxfcmVx dWVzdHNbZXhpc3RpbmddLnVwZGF0ZShwcikKLSAgICAgICAgICAgIHJldHVybiBtb2Nrcy5SZXNw b25zZS5mcm9tSnNvbihzZWxmLnB1bGxfcmVxdWVzdHNbaV0pCisgICAgICAgICAgICByZXR1cm4g bW9ja3MuUmVzcG9uc2UuZnJvbUpzb24oc2VsZi5wdWxsX3JlcXVlc3RzW2ldLCB1cmw9dXJsKQog CiAgICAgICAgIHJldHVybiBtb2Nrcy5SZXNwb25zZS5jcmVhdGU0MDQodXJsKQpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3Rl L2JpdGJ1Y2tldC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L3JlbW90ZS9iaXRidWNrZXQucHkKaW5kZXggYjQxNTIyNjU2NmU1OGI0MjQ2NDZmYTkw N2I0NzYxNTQ2NDMwNDU0Mi4uMzM3MWNjZDZhOTQ1YTU5MzBjMDYwYWMzYzU3YzljNGZmOTZkMTVk ZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvcmVtb3RlL2JpdGJ1Y2tldC5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvYml0YnVja2V0LnB5CkBAIC0zOSw2ICszOSwy MyBAQCBjbGFzcyBCaXRCdWNrZXQoU2NtKToKICAgICAgICAgVElUTEVfQ0hBUl9MSU1JVCA9IDI1 NAogICAgICAgICBCT0RZX0NIQVJfTElNSVQgPSAzMjc2NgogCisgICAgICAgIGRlZiBQdWxsUmVx dWVzdChzZWxmLCBkYXRhKToKKyAgICAgICAgICAgIGlmIG5vdCBkYXRhOgorICAgICAgICAgICAg ICAgIHJldHVybiBOb25lCisgICAgICAgICAgICByZXR1cm4gUHVsbFJlcXVlc3QoCisgICAgICAg ICAgICAgICAgbnVtYmVyPWRhdGFbJ2lkJ10sCisgICAgICAgICAgICAgICAgdGl0bGU9ZGF0YS5n ZXQoJ3RpdGxlJyksCisgICAgICAgICAgICAgICAgYm9keT1kYXRhLmdldCgnZGVzY3JpcHRpb24n KSwKKyAgICAgICAgICAgICAgICBhdXRob3I9c2VsZi5yZXBvc2l0b3J5LmNvbnRyaWJ1dG9ycy5j cmVhdGUoCisgICAgICAgICAgICAgICAgICAgIGRhdGFbJ2F1dGhvciddWyd1c2VyJ11bJ2Rpc3Bs YXlOYW1lJ10sCisgICAgICAgICAgICAgICAgICAgIGRhdGFbJ2F1dGhvciddWyd1c2VyJ11bJ2Vt YWlsQWRkcmVzcyddLAorICAgICAgICAgICAgICAgICksIGhlYWQ9ZGF0YVsnZnJvbVJlZiddWydk aXNwbGF5SWQnXSwKKyAgICAgICAgICAgICAgICBiYXNlPWRhdGFbJ3RvUmVmJ11bJ2Rpc3BsYXlJ ZCddLAorICAgICAgICAgICAgKQorCisgICAgICAgIGRlZiBnZXQoc2VsZiwgbnVtYmVyKToKKyAg ICAgICAgICAgIHJldHVybiBzZWxmLlB1bGxSZXF1ZXN0KHNlbGYucmVwb3NpdG9yeS5yZXF1ZXN0 KCdwdWxsLXJlcXVlc3RzL3t9Jy5mb3JtYXQoaW50KG51bWJlcikpKSkKKwogICAgICAgICBkZWYg ZmluZChzZWxmLCBzdGF0ZT1Ob25lLCBoZWFkPU5vbmUsIGJhc2U9Tm9uZSk6CiAgICAgICAgICAg ICBwYXJhbXMgPSBkaWN0KAogICAgICAgICAgICAgICAgIGxpbWl0PTEwMCwKQEAgLTU2LDE2ICs3 Myw3IEBAIGNsYXNzIEJpdEJ1Y2tldChTY20pOgogICAgICAgICAgICAgZm9yIGRhdHVtIGluIGRh dGEgb3IgW106CiAgICAgICAgICAgICAgICAgaWYgYmFzZSBhbmQgbm90IGRhdHVtWyd0b1JlZidd WydpZCddLmVuZHN3aXRoKGJhc2UpOgogICAgICAgICAgICAgICAgICAgICBjb250aW51ZQotICAg ICAgICAgICAgICAgIHlpZWxkIFB1bGxSZXF1ZXN0KAotICAgICAgICAgICAgICAgICAgICBudW1i ZXI9ZGF0dW1bJ2lkJ10sCi0gICAgICAgICAgICAgICAgICAgIHRpdGxlPWRhdHVtLmdldCgndGl0 bGUnKSwKLSAgICAgICAgICAgICAgICAgICAgYm9keT1kYXR1bS5nZXQoJ2Rlc2NyaXB0aW9uJyks Ci0gICAgICAgICAgICAgICAgICAgIGF1dGhvcj1zZWxmLnJlcG9zaXRvcnkuY29udHJpYnV0b3Jz LmNyZWF0ZSgKLSAgICAgICAgICAgICAgICAgICAgICAgIGRhdHVtWydhdXRob3InXVsndXNlcidd WydkaXNwbGF5TmFtZSddLAotICAgICAgICAgICAgICAgICAgICAgICAgZGF0dW1bJ2F1dGhvcidd Wyd1c2VyJ11bJ2VtYWlsQWRkcmVzcyddLAotICAgICAgICAgICAgICAgICAgICApLCBoZWFkPWRh dHVtWydmcm9tUmVmJ11bJ2Rpc3BsYXlJZCddLAotICAgICAgICAgICAgICAgICAgICBiYXNlPWRh dHVtWyd0b1JlZiddWydkaXNwbGF5SWQnXSwKLSAgICAgICAgICAgICAgICApCisgICAgICAgICAg ICAgICAgeWllbGQgc2VsZi5QdWxsUmVxdWVzdChkYXR1bSkKIAogICAgICAgICBkZWYgY3JlYXRl KHNlbGYsIGhlYWQsIHRpdGxlLCBib2R5PU5vbmUsIGNvbW1pdHM9Tm9uZSwgYmFzZT1Ob25lKToK ICAgICAgICAgICAgIGZvciBrZXksIHZhbHVlIGluIGRpY3QoaGVhZD1oZWFkLCB0aXRsZT10aXRs ZSkuaXRlbXMoKToKQEAgLTEwMiwxNyArMTEwLDcgQEAgY2xhc3MgQml0QnVja2V0KFNjbSk6CiAg ICAgICAgICAgICApCiAgICAgICAgICAgICBpZiByZXNwb25zZS5zdGF0dXNfY29kZSAvLyAxMDAg IT0gMjoKICAgICAgICAgICAgICAgICByZXR1cm4gTm9uZQotICAgICAgICAgICAgZGF0YSA9IHJl c3BvbnNlLmpzb24oKQotICAgICAgICAgICAgcmV0dXJuIFB1bGxSZXF1ZXN0KAotICAgICAgICAg ICAgICAgIG51bWJlcj1kYXRhWydpZCddLAotICAgICAgICAgICAgICAgIHRpdGxlPWRhdGEuZ2V0 KCd0aXRsZScpLAotICAgICAgICAgICAgICAgIGJvZHk9ZGF0YS5nZXQoJ2Rlc2NyaXB0aW9uJyks Ci0gICAgICAgICAgICAgICAgYXV0aG9yPXNlbGYucmVwb3NpdG9yeS5jb250cmlidXRvcnMuY3Jl YXRlKAotICAgICAgICAgICAgICAgICAgICBkYXRhWydhdXRob3InXVsndXNlciddWydkaXNwbGF5 TmFtZSddLAotICAgICAgICAgICAgICAgICAgICBkYXRhWydhdXRob3InXVsndXNlciddWydlbWFp bEFkZHJlc3MnXSwKLSAgICAgICAgICAgICAgICApLCBoZWFkPWRhdGFbJ2Zyb21SZWYnXVsnZGlz cGxheUlkJ10sCi0gICAgICAgICAgICAgICAgYmFzZT1kYXRhWyd0b1JlZiddWydkaXNwbGF5SWQn XSwKLSAgICAgICAgICAgICkKKyAgICAgICAgICAgIHJldHVybiBzZWxmLlB1bGxSZXF1ZXN0KHJl c3BvbnNlLmpzb24oKSkKIAogICAgICAgICBkZWYgdXBkYXRlKHNlbGYsIHB1bGxfcmVxdWVzdCwg aGVhZD1Ob25lLCB0aXRsZT1Ob25lLCBib2R5PU5vbmUsIGNvbW1pdHM9Tm9uZSwgYmFzZT1Ob25l KToKICAgICAgICAgICAgIGlmIG5vdCBpc2luc3RhbmNlKHB1bGxfcmVxdWVzdCwgUHVsbFJlcXVl c3QpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvcmVtb3RlL2dpdF9odWIucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvZ2l0X2h1Yi5weQppbmRleCA2NGVkZmMyZDc2ZDM3 ZjEzMWZiYjQ4YWQyYjEyOWYyZTU3ZDgyMDlhLi4yZjNmNDQxZjdkZmY5ZmFhM2E1ZDc0MmUxOWIw NmU2N2ZkNDg0MWI3IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS9yZW1vdGUvZ2l0X2h1Yi5weQorKysgYi9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvZ2l0X2h1Yi5weQpAQCAtMzks NiArMzksMjEgQEAgY2xhc3MgR2l0SHViKFNjbSk6CiAgICAgRU1BSUxfUkUgPSByZS5jb21waWxl KHInKD9QPGVtYWlsPlteQF0rQFteQF0rKShALiopPycpCiAKICAgICBjbGFzcyBQUkdlbmVyYXRv cihTY20uUFJHZW5lcmF0b3IpOgorICAgICAgICBkZWYgUHVsbFJlcXVlc3Qoc2VsZiwgZGF0YSk6 CisgICAgICAgICAgICBpZiBub3QgZGF0YToKKyAgICAgICAgICAgICAgICByZXR1cm4gTm9uZQor ICAgICAgICAgICAgcmV0dXJuIFB1bGxSZXF1ZXN0KAorICAgICAgICAgICAgICAgIG51bWJlcj1k YXRhWydudW1iZXInXSwKKyAgICAgICAgICAgICAgICB0aXRsZT1kYXRhLmdldCgndGl0bGUnKSwK KyAgICAgICAgICAgICAgICBib2R5PWRhdGEuZ2V0KCdib2R5JyksCisgICAgICAgICAgICAgICAg YXV0aG9yPXNlbGYucmVwb3NpdG9yeS5jb250cmlidXRvcnMuY3JlYXRlKGRhdGFbJ3VzZXInXVsn bG9naW4nXSksCisgICAgICAgICAgICAgICAgaGVhZD1kYXRhWydoZWFkJ11bJ3JlZiddLAorICAg ICAgICAgICAgICAgIGJhc2U9ZGF0YVsnYmFzZSddWydyZWYnXSwKKyAgICAgICAgICAgICkKKwor ICAgICAgICBkZWYgZ2V0KHNlbGYsIG51bWJlcik6CisgICAgICAgICAgICByZXR1cm4gc2VsZi5Q dWxsUmVxdWVzdChzZWxmLnJlcG9zaXRvcnkucmVxdWVzdCgncHVsbHMve30nLmZvcm1hdChpbnQo bnVtYmVyKSkpKQorCiAgICAgICAgIGRlZiBmaW5kKHNlbGYsIHN0YXRlPU5vbmUsIGhlYWQ9Tm9u ZSwgYmFzZT1Ob25lKToKICAgICAgICAgICAgIGlmIG5vdCBzdGF0ZToKICAgICAgICAgICAgICAg ICBzdGF0ZSA9ICdhbGwnCkBAIC01MSwxNiArNjYsOSBAQCBjbGFzcyBHaXRIdWIoU2NtKToKICAg ICAgICAgICAgIGZvciBkYXR1bSBpbiBkYXRhIG9yIFtdOgogICAgICAgICAgICAgICAgIGlmIGJh c2UgYW5kIGRhdHVtWydiYXNlJ11bJ3JlZiddICE9IGJhc2U6CiAgICAgICAgICAgICAgICAgICAg IGNvbnRpbnVlCi0gICAgICAgICAgICAgICAgaWYgaGVhZCBhbmQgbm90IGRhdHVtWydoZWFkJ11b J3JlZiddLmVuZHN3aXRoKGhlYWQpOgorICAgICAgICAgICAgICAgIGlmIGhlYWQgYW5kIG5vdCBk YXR1bVsnaGVhZCddWydyZWYnXS5lbmRzd2l0aChoZWFkLnNwbGl0KCc6JylbLTFdKToKICAgICAg ICAgICAgICAgICAgICAgY29udGludWUKLSAgICAgICAgICAgICAgICB5aWVsZCBQdWxsUmVxdWVz dCgKLSAgICAgICAgICAgICAgICAgICAgbnVtYmVyPWRhdHVtWydudW1iZXInXSwKLSAgICAgICAg ICAgICAgICAgICAgdGl0bGU9ZGF0dW0uZ2V0KCd0aXRsZScpLAotICAgICAgICAgICAgICAgICAg ICBib2R5PWRhdHVtLmdldCgnYm9keScpLAotICAgICAgICAgICAgICAgICAgICBhdXRob3I9c2Vs Zi5yZXBvc2l0b3J5LmNvbnRyaWJ1dG9ycy5jcmVhdGUoZGF0dW1bJ3VzZXInXVsnbG9naW4nXSks Ci0gICAgICAgICAgICAgICAgICAgIGhlYWQ9ZGF0dW1bJ2hlYWQnXVsncmVmJ10sCi0gICAgICAg ICAgICAgICAgICAgIGJhc2U9ZGF0dW1bJ2Jhc2UnXVsncmVmJ10sCi0gICAgICAgICAgICAgICAg KQorICAgICAgICAgICAgICAgIHlpZWxkIHNlbGYuUHVsbFJlcXVlc3QoZGF0dW0pCiAKICAgICAg ICAgZGVmIGNyZWF0ZShzZWxmLCBoZWFkLCB0aXRsZSwgYm9keT1Ob25lLCBjb21taXRzPU5vbmUs IGJhc2U9Tm9uZSk6CiAgICAgICAgICAgICBmb3Iga2V5LCB2YWx1ZSBpbiBkaWN0KGhlYWQ9aGVh ZCwgdGl0bGU9dGl0bGUpLml0ZW1zKCk6CkBAIC04NCwxNSArOTIsNyBAQCBjbGFzcyBHaXRIdWIo U2NtKToKICAgICAgICAgICAgICkKICAgICAgICAgICAgIGlmIHJlc3BvbnNlLnN0YXR1c19jb2Rl IC8vIDEwMCAhPSAyOgogICAgICAgICAgICAgICAgIHJldHVybiBOb25lCi0gICAgICAgICAgICBk YXRhID0gcmVzcG9uc2UuanNvbigpCi0gICAgICAgICAgICByZXR1cm4gUHVsbFJlcXVlc3QoCi0g ICAgICAgICAgICAgICAgbnVtYmVyPWRhdGFbJ251bWJlciddLAotICAgICAgICAgICAgICAgIHRp dGxlPWRhdGEuZ2V0KCd0aXRsZScpLAotICAgICAgICAgICAgICAgIGJvZHk9ZGF0YS5nZXQoJ2Jv ZHknKSwKLSAgICAgICAgICAgICAgICBhdXRob3I9c2VsZi5yZXBvc2l0b3J5LmNvbnRyaWJ1dG9y cy5jcmVhdGUoZGF0YVsndXNlciddWydsb2dpbiddKSwKLSAgICAgICAgICAgICAgICBoZWFkPWRh dGFbJ2hlYWQnXVsncmVmJ10sCi0gICAgICAgICAgICAgICAgYmFzZT1kYXRhWydiYXNlJ11bJ3Jl ZiddLAotICAgICAgICAgICAgKQorICAgICAgICAgICAgcmV0dXJuIHNlbGYuUHVsbFJlcXVlc3Qo cmVzcG9uc2UuanNvbigpKQogCiAgICAgICAgIGRlZiB1cGRhdGUoc2VsZiwgcHVsbF9yZXF1ZXN0 LCBoZWFkPU5vbmUsIHRpdGxlPU5vbmUsIGJvZHk9Tm9uZSwgY29tbWl0cz1Ob25lLCBiYXNlPU5v bmUpOgogICAgICAgICAgICAgaWYgbm90IGlzaW5zdGFuY2UocHVsbF9yZXF1ZXN0LCBQdWxsUmVx dWVzdCk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS9yZW1vdGUvc2NtLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3NjbS5weQppbmRleCBmYmViZmU4OGM5YWU4YzE5Yjc5 NzgyYWI1YjBhMWIwZGY2OTczMjkzLi5kNTI3ZjRjMDA3ZmVkNTg1YzFlM2YyMjRhYTZkZTZhYmQ2 ZGQ0MjA4IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS9yZW1vdGUvc2NtLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9zY20ucHkKQEAgLTMwLDYgKzMwLDkgQEAgY2xh c3MgU2NtKFNjbUJhc2UpOgogICAgICAgICBkZWYgX19pbml0X18oc2VsZiwgcmVwb3NpdG9yeSk6 CiAgICAgICAgICAgICBzZWxmLnJlcG9zaXRvcnkgPSByZXBvc2l0b3J5CiAKKyAgICAgICAgZGVm IGdldChzZWxmLCBudW1iZXIpOgorICAgICAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJv cigpCisKICAgICAgICAgZGVmIGZpbmQoc2VsZiwgc3RhdGU9Tm9uZSwgaGVhZD1Ob25lLCBiYXNl PU5vbmUpOgogICAgICAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcigpCiAKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rl c3QvcHVsbF9yZXF1ZXN0X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9wdWxsX3JlcXVlc3RfdW5pdHRlc3QucHkKaW5kZXgg MGEwYjVlZmM5NDZiYjRiMDIwNjIyZmQ0NWI1YTVjZjlhNmQ1Y2E0ZS4uYTk2NTJiNDhlM2Y5NzU4 ZmI5ZmIxYmM0NzFiZWMwYWFmMWE5Yzk5ZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9wdWxsX3JlcXVlc3RfdW5pdHRlc3Qu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv dGVzdC9wdWxsX3JlcXVlc3RfdW5pdHRlc3QucHkKQEAgLTI1LDcgKzI1LDcgQEAgaW1wb3J0IHN5 cwogaW1wb3J0IHVuaXR0ZXN0CiAKIGZyb20gd2Via2l0Y29yZXB5IGltcG9ydCBPdXRwdXRDYXB0 dXJlLCB0ZXN0aW5nCi1mcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBDb21taXQsIFB1bGxSZXF1ZXN0 LCBwcm9ncmFtLCBtb2NrcworZnJvbSB3ZWJraXRzY21weSBpbXBvcnQgQ29tbWl0LCBQdWxsUmVx dWVzdCwgcHJvZ3JhbSwgbW9ja3MsIHJlbW90ZQogCiAKIGNsYXNzIFRlc3RQdWxsUmVxdWVzdCh1 bml0dGVzdC5UZXN0Q2FzZSk6CkBAIC00MjUsMyArNDI1LDk3IEBAIFJlYmFzZWQgJ2VuZy9wci1i cmFuY2gnIG9uICdtYWluISciIiIpCiAgICAgICAgICAgICAgICAgIlVwZGF0ZWQgJ1BSIDEgfCBB bWVuZGVkIGNvbW1pdCchIiwKICAgICAgICAgICAgIF0sCiAgICAgICAgICkKKworCitjbGFzcyBU ZXN0TmV0d29ya1B1bGxSZXF1ZXN0R2l0SHViKHVuaXR0ZXN0LlRlc3RDYXNlKToKKyAgICByZW1v dGUgPSAnaHR0cHM6Ly9naXRodWIuZXhhbXBsZS5jb20vV2ViS2l0L1dlYktpdCcKKworICAgIEBj bGFzc21ldGhvZAorICAgIGRlZiB3ZWJzZXJ2ZXIoY2xzKToKKyAgICAgICAgcmVzdWx0ID0gbW9j a3MucmVtb3RlLkdpdEh1YigpCisgICAgICAgIHJlc3VsdC5wdWxsX3JlcXVlc3RzID0gW2RpY3Qo CisgICAgICAgICAgICBudW1iZXI9MSwKKyAgICAgICAgICAgIHN0YXRlPSdvcGVuJywKKyAgICAg ICAgICAgIHRpdGxlPSdFeGFtcGxlIENoYW5nZScsCisgICAgICAgICAgICB1c2VyPWRpY3QobG9n aW49J3Rjb250cmlidXRvcicpLAorICAgICAgICAgICAgYm9keT0nJycjIyMjIDk1NTA3ZTNhMWE0 YTkxOWQxYTE1NmFiYmMyNzlmZGY2ZDI0YjEzZjUKKzxwcmU+CitFeGFtcGxlIENoYW5nZQorPGEg aHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMzQiPmh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjM0PC9hPgorCitSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworKiBTb3VyY2UvZmlsZS5jcHA6Cis8L3ByZT4KKycnJywKKyAg ICAgICAgICAgIGhlYWQ9ZGljdChyZWY9J2VuZy9wdWxsLXJlcXVlc3QnKSwKKyAgICAgICAgICAg IGJhc2U9ZGljdChyZWY9J21haW4nKSwKKyAgICAgICAgKV0KKyAgICAgICAgcmV0dXJuIHJlc3Vs dAorCisgICAgZGVmIHRlc3RfZmluZChzZWxmKToKKyAgICAgICAgd2l0aCBzZWxmLndlYnNlcnZl cigpOgorICAgICAgICAgICAgcHJzID0gbGlzdChyZW1vdGUuR2l0SHViKHNlbGYucmVtb3RlKS5w dWxsX3JlcXVlc3RzLmZpbmQoKSkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobGVuKHBy cyksIDEpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHByc1swXS5udW1iZXIsIDEpCisg ICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHByc1swXS50aXRsZSwgJ0V4YW1wbGUgQ2hhbmdl JykKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocHJzWzBdLmhlYWQsICdlbmcvcHVsbC1y ZXF1ZXN0JykKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocHJzWzBdLmJhc2UsICdtYWlu JykKKworICAgIGRlZiB0ZXN0X2dldChzZWxmKToKKyAgICAgICAgd2l0aCBzZWxmLndlYnNlcnZl cigpOgorICAgICAgICAgICAgcHIgPSByZW1vdGUuR2l0SHViKHNlbGYucmVtb3RlKS5wdWxsX3Jl cXVlc3RzLmdldCgxKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwci5udW1iZXIsIDEp CisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHByLnRpdGxlLCAnRXhhbXBsZSBDaGFuZ2Un KQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwci5oZWFkLCAnZW5nL3B1bGwtcmVxdWVz dCcpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHByLmJhc2UsICdtYWluJykKKworCitj bGFzcyBUZXN0TmV0d29ya1B1bGxSZXF1ZXN0Qml0QnVja2V0KHVuaXR0ZXN0LlRlc3RDYXNlKToK KyAgICByZW1vdGUgPSAnaHR0cHM6Ly9iaXRidWNrZXQuZXhhbXBsZS5jb20vcHJvamVjdHMvV0VC S0lUL3JlcG9zL3dlYmtpdCcKKworICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiB3ZWJzZXJ2ZXIo Y2xzKToKKyAgICAgICAgcmVzdWx0ID0gbW9ja3MucmVtb3RlLkJpdEJ1Y2tldCgpCisgICAgICAg IHJlc3VsdC5wdWxsX3JlcXVlc3RzID0gW2RpY3QoCisgICAgICAgICAgICBpZD0xLAorICAgICAg ICAgICAgc3RhdGU9J09QRU4nLAorICAgICAgICAgICAgdGl0bGU9J0V4YW1wbGUgQ2hhbmdlJywK KyAgICAgICAgICAgIGF1dGhvcj1kaWN0KAorICAgICAgICAgICAgICAgIHVzZXI9ZGljdCgKKyAg ICAgICAgICAgICAgICAgICAgbmFtZT0ndGNvbnRyaWJ1dG9yJywKKyAgICAgICAgICAgICAgICAg ICAgZW1haWxBZGRyZXNzPSd0Y29udHJpYnV0b3JAYXBwbGUuY29tJywKKyAgICAgICAgICAgICAg ICAgICAgZGlzcGxheU5hbWU9J1RpbSBDb250cmlidXRvcicsCisgICAgICAgICAgICAgICAgKSwK KyAgICAgICAgICAgICksIGJvZHk9JycnIyMjIyA5NTUwN2UzYTFhNGE5MTlkMWExNTZhYmJjMjc5 ZmRmNmQyNGIxM2Y1CitgYGAKK0V4YW1wbGUgQ2hhbmdlCitodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTIzNAorCitSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor KiBTb3VyY2UvZmlsZS5jcHA6CitgYGAKKycnJywKKyAgICAgICAgICAgIGZyb21SZWY9ZGljdChk aXNwbGF5SWQ9J2VuZy9wdWxsLXJlcXVlc3QnKSwKKyAgICAgICAgICAgIHRvUmVmPWRpY3QoZGlz cGxheUlkPSdtYWluJyksCisgICAgICAgICldCisgICAgICAgIHJldHVybiByZXN1bHQKKworICAg IGRlZiB0ZXN0X2ZpbmQoc2VsZik6CisgICAgICAgIHdpdGggc2VsZi53ZWJzZXJ2ZXIoKToKKyAg ICAgICAgICAgIHdpdGggc2VsZi53ZWJzZXJ2ZXIoKToKKyAgICAgICAgICAgICAgICBwcnMgPSBs aXN0KHJlbW90ZS5CaXRCdWNrZXQoc2VsZi5yZW1vdGUpLnB1bGxfcmVxdWVzdHMuZmluZCgpKQor ICAgICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobGVuKHBycyksIDEpCisgICAgICAgICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChwcnNbMF0ubnVtYmVyLCAxKQorICAgICAgICAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwocHJzWzBdLnRpdGxlLCAnRXhhbXBsZSBDaGFuZ2UnKQorICAgICAg ICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocHJzWzBdLmhlYWQsICdlbmcvcHVsbC1yZXF1ZXN0 JykKKyAgICAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHByc1swXS5iYXNlLCAnbWFpbicp CisKKyAgICBkZWYgdGVzdF9nZXQoc2VsZik6CisgICAgICAgIHdpdGggc2VsZi53ZWJzZXJ2ZXIo KToKKyAgICAgICAgICAgIHByID0gcmVtb3RlLkJpdEJ1Y2tldChzZWxmLnJlbW90ZSkucHVsbF9y ZXF1ZXN0cy5nZXQoMSkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocHIubnVtYmVyLCAx KQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwci50aXRsZSwgJ0V4YW1wbGUgQ2hhbmdl JykKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocHIuaGVhZCwgJ2VuZy9wdWxsLXJlcXVl c3QnKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwci5iYXNlLCAnbWFpbicpCg==