225889 2021-05-17 14:34:10 -0700 [webkitscmpy] Support branch queries in mock git log 2021-06-16 15:41:44 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=225616 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain dean_johnson dewei_zhu slewis webkit-bug-importer oldest_to_newest 1760894 0 jbedard 2021-05-17 14:34:10 -0700 Our `git log` mocks do not support branches, which has some major downsides when developing additional git tooling. 1760895 1 webkit-bug-importer 2021-05-17 14:34:26 -0700 <rdar://problem/78122705> 1760899 2 428873 jbedard 2021-05-17 14:37:37 -0700 Created attachment 428873 Patch 1760952 3 428891 jbedard 2021-05-17 16:49:11 -0700 Created attachment 428891 Patch 1760956 4 428894 jbedard 2021-05-17 16:57:37 -0700 Created attachment 428894 Patch 1761651 5 429084 jbedard 2021-05-19 12:14:57 -0700 Created attachment 429084 Patch 1767882 6 430883 jbedard 2021-06-08 13:27:34 -0700 Created attachment 430883 Patch 1767888 7 dean_johnson 2021-06-08 13:36:03 -0700 LGTM; unofficial r+. 1770284 8 431568 jbedard 2021-06-16 11:09:18 -0700 Created attachment 431568 Patch 1770370 9 431568 slewis 2021-06-16 13:49:26 -0700 Comment on attachment 431568 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=431568&action=review > Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:532 > + if commit.hash.startswith(end) or end == branch: is it ever passible that the first commit will be in the middle of the range? This code would treat it as out of range 1770394 10 431568 jbedard 2021-06-16 14:23:52 -0700 Comment on attachment 431568 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=431568&action=review >> Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:532 >> + if commit.hash.startswith(end) or end == branch: > > is it ever passible that the first commit will be in the middle of the range? This code would treat it as out of range Not if tests are well constructed. This change is entirely in unit testing code, so if begin is older than end, this function shouldn't return anything. 1770429 11 431612 jbedard 2021-06-16 15:15:55 -0700 Created attachment 431612 Patch for landing 1770446 12 ews-feeder 2021-06-16 15:41:43 -0700 Committed r278963 (238890@main): <https://commits.webkit.org/238890@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 431612. 428873 2021-05-17 14:37:37 -0700 2021-05-17 16:49:08 -0700 Patch bug-225889-20210517143736.patch text/plain 8951 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NjAzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjUwYjMyOTBiYjNkODYxOWM4YmNjODA0YThhNWY5NjY2 Y2ViZTE1MS4uOTA3ZTJhZjhhMWRhMDVjOTUwODk3ZTU2OGY4Mjc3Yzg0OWJjODJmMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDIxLTA1LTE3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIFN1cHBvcnQgYnJhbmNoIHF1ZXJpZXMgaW4gbW9jayBnaXQg bG9nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU4 ODkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc4MTIyNzA1PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvc2V0dXAucHk6IEJ1bXAgdmVyc2lvbi4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weTogRGl0dG8uCisgICAgICAgICog U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0 LnB5OiBBZGQgc3VwcG9ydCBmb3IgYnJhbmNoZXMgaW4KKyAgICAgICAgYGdpdCBsb2dgIGNvbW1h bmRzLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdEdpdC50ZXN0X2xvZyk6CisgICAg ICAgIChUZXN0R2l0LnRlc3RfYnJhbmNoX2xvZyk6CisKIDIwMjEtMDUtMTUgIEplciBOb2JsZSAg PGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgTWVkaWFTZXNzaW9uQ29vcmRpbmF0b3Ig c3Vydml2ZXMgcGFnZSByZWxvYWQvbmF2aWdhdGlvbgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS9zZXR1cC5weQppbmRleCBkOGUwYTA5OGM5MmViZTE5NWZmOTJlZjdmZjcw YzMyODZiNTE4Nzg1Li4yMWVjMTk5NzE5Yzc1OTY0MTRjMDk1YzkyZGRmNGUzYmFmNzNlYmI1IDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQor KysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQpAQCAtMjks NyArMjksNyBAQCBkZWYgcmVhZG1lKCk6CiAKIHNldHVwKAogICAgIG5hbWU9J3dlYmtpdHNjbXB5 JywKLSAgICB2ZXJzaW9uPScwLjE0LjEnLAorICAgIHZlcnNpb249JzAuMTQuMicsCiAgICAgZGVz Y3JpcHRpb249J0xpYnJhcnkgZGVzaWduZWQgdG8gaW50ZXJhY3Qgd2l0aCBnaXQgYW5kIHN2biBy ZXBvc2l0b3JpZXMuJywKICAgICBsb25nX2Rlc2NyaXB0aW9uPXJlYWRtZSgpLAogICAgIGNsYXNz aWZpZXJzPVsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkKaW5kZXggNDI0NTE2MDM0NjUxNDRlNTE5ZjBi MDY1MTJhY2U4YWNlNmE2OTJmYy4uZWZjZTg4MzljZWUzZDkzOGVhZjEyMTBmNmQzMmQyMzk3MTRm NzdiYiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvX19pbml0X18ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkKQEAgLTQ2LDcgKzQ2LDcgQEAgZXhjZXB0IElt cG9ydEVycm9yOgogICAgICAgICAiUGxlYXNlIGluc3RhbGwgd2Via2l0Y29yZXB5IHdpdGggYHBp cCBpbnN0YWxsIHdlYmtpdGNvcmVweSAtLWV4dHJhLWluZGV4LXVybCA8cGFja2FnZSBpbmRleCBV Ukw+YCIKICAgICApCiAKLXZlcnNpb24gPSBWZXJzaW9uKDAsIDE0LCAxKQordmVyc2lvbiA9IFZl cnNpb24oMCwgMTQsIDIpCiAKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2Zhc3RlbmVy cycsIFZlcnNpb24oMCwgMTUsIDApKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ21v bm90b25pYycsIFZlcnNpb24oMSwgNSkpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0LnB5IGIvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0 LnB5CmluZGV4IGRhOThlYmMyNDA3ODVkMzA5NGVkOTA5NmY2NDA4MjZlYmYzYjZmZmIuLjlmNmRl NDRjOWViMTQ3ODE1NjY1Yjg3Y2NlNTY0MzhkZmUzZWNmZjcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL2dpdC5w eQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9t b2Nrcy9sb2NhbC9naXQucHkKQEAgLTI1MSw3ICsyNTEsNyBAQCBub3RoaW5nIHRvIGNvbW1pdCwg d29ya2luZyB0cmVlIGNsZWFuCiAgICAgICAgICAgICAgICAgICAgICAgICAnQXV0aG9yRGF0ZTog e2RhdGV9XG4nCiAgICAgICAgICAgICAgICAgICAgICAgICAnQ29tbWl0OiAgICAge2F1dGhvcn0g PHtlbWFpbH0+XG4nCiAgICAgICAgICAgICAgICAgICAgICAgICAnQ29tbWl0RGF0ZToge2RhdGV9 XG4nCi0gICAgICAgICAgICAgICAgICAgICAgICAnXG57bG9nfScuZm9ybWF0KAorICAgICAgICAg ICAgICAgICAgICAgICAgJ1xue2xvZ31cbicuZm9ybWF0KAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGhhc2g9Y29tbWl0Lmhhc2gsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXV0 aG9yPWNvbW1pdC5hdXRob3IubmFtZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbWFp bD1jb21taXQuYXV0aG9yLmVtYWlsLApAQCAtNDk0LDI3ICs0OTQsMzQgQEAgbm90aGluZyB0byBj b21taXQsIHdvcmtpbmcgdHJlZSBjbGVhbgogCiAgICAgZGVmIGNvbW1pdHNfaW5fcmFuZ2Uoc2Vs ZiwgYmVnaW4sIGVuZCk6CiAgICAgICAgIGJyYW5jaGVzID0gW3NlbGYuZGVmYXVsdF9icmFuY2hd Ci0gICAgICAgIGZvciBicmFuY2gsIGNvbW1pdHMgaW4gc2VsZi5jb21taXRzLml0ZW1zKCk6Ci0g ICAgICAgICAgICBpZiBicmFuY2ggPT0gc2VsZi5kZWZhdWx0X2JyYW5jaDoKLSAgICAgICAgICAg ICAgICBjb250aW51ZQotICAgICAgICAgICAgZm9yIGNvbW1pdCBpbiBjb21taXRzOgotICAgICAg ICAgICAgICAgIGlmIGNvbW1pdC5oYXNoID09IGVuZDoKLSAgICAgICAgICAgICAgICAgICAgYnJh bmNoZXMuaW5zZXJ0KDAsIGJyYW5jaCkKKyAgICAgICAgaWYgZW5kIGluIHNlbGYuY29tbWl0cy5r ZXlzKCkgYW5kIGVuZCAhPSBzZWxmLmRlZmF1bHRfYnJhbmNoOgorICAgICAgICAgICAgYnJhbmNo ZXMuYXBwZW5kKGVuZCkKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIGZvciBicmFuY2gsIGNv bW1pdHMgaW4gc2VsZi5jb21taXRzLml0ZW1zKCk6CisgICAgICAgICAgICAgICAgaWYgYnJhbmNo ID09IHNlbGYuZGVmYXVsdF9icmFuY2g6CisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCisg ICAgICAgICAgICAgICAgZm9yIGNvbW1pdCBpbiBjb21taXRzOgorICAgICAgICAgICAgICAgICAg ICBpZiBjb21taXQuaGFzaC5zdGFydHN3aXRoKGVuZCk6CisgICAgICAgICAgICAgICAgICAgICAg ICBicmFuY2hlcy5pbnNlcnQoMCwgYnJhbmNoKQorICAgICAgICAgICAgICAgICAgICAgICAgYnJl YWsKKyAgICAgICAgICAgICAgICBpZiBsZW4oYnJhbmNoZXMpID4gMToKICAgICAgICAgICAgICAg ICAgICAgYnJlYWsKLSAgICAgICAgICAgIGlmIGxlbihicmFuY2hlcykgPiAxOgotICAgICAgICAg ICAgICAgIGJyZWFrCiAKICAgICAgICAgaW5fcmFuZ2UgPSBGYWxzZQogICAgICAgICBwcmV2aW91 cyA9IE5vbmUKICAgICAgICAgZm9yIGJyYW5jaCBpbiBicmFuY2hlczoKICAgICAgICAgICAgIGZv ciBjb21taXQgaW4gcmV2ZXJzZWQoc2VsZi5jb21taXRzW2JyYW5jaF0pOgotICAgICAgICAgICAg ICAgIGlmIGNvbW1pdC5oYXNoID09IGVuZDoKKyAgICAgICAgICAgICAgICBpZiBicmFuY2ggPT0g YmVnaW46CisgICAgICAgICAgICAgICAgICAgIGJyZWFrCisgICAgICAgICAgICAgICAgaWYgY29t bWl0Lmhhc2guc3RhcnRzd2l0aChlbmQpIG9yIGVuZCA9PSBicmFuY2g6CiAgICAgICAgICAgICAg ICAgICAgIGluX3JhbmdlID0gVHJ1ZQogICAgICAgICAgICAgICAgIGlmIGluX3JhbmdlIGFuZCAo bm90IHByZXZpb3VzIG9yIGNvbW1pdC5oYXNoICE9IHByZXZpb3VzLmhhc2gpOgogICAgICAgICAg ICAgICAgICAgICB5aWVsZCBjb21taXQKICAgICAgICAgICAgICAgICBwcmV2aW91cyA9IGNvbW1p dAotICAgICAgICAgICAgICAgIGlmIGNvbW1pdC5oYXNoID09IGJlZ2luOgorICAgICAgICAgICAg ICAgIGlmIGNvbW1pdC5oYXNoLnN0YXJ0c3dpdGgoYmVnaW4pOgogICAgICAgICAgICAgICAgICAg ICBpbl9yYW5nZSA9IEZhbHNlCisgICAgICAgICAgICAgICAgICAgIGJyZWFrCisKICAgICAgICAg ICAgIGluX3JhbmdlID0gRmFsc2UKICAgICAgICAgICAgIGlmIG5vdCBwcmV2aW91cyBvciBicmFu Y2ggPT0gc2VsZi5kZWZhdWx0X2JyYW5jaDoKICAgICAgICAgICAgICAgICBjb250aW51ZQpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv dGVzdC9naXRfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5weQppbmRleCBiYzdiNjM5MjliNGFmNDc1 NjljZjVmY2JkZjgzZjliOGE2NmYxOWM5Li45NTgzMGY4NzRkYzAxZTMzMTE4NzI1ZDY0MmI0ODlh ZmQ2MDFmYTM0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5weQpAQCAt MjYsNyArMjYsNyBAQCBpbXBvcnQgdGVtcGZpbGUKIGltcG9ydCB1bml0dGVzdAogCiBmcm9tIGRh dGV0aW1lIGltcG9ydCBkYXRldGltZQotZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IExvZ2dlckNh cHR1cmUsIE91dHB1dENhcHR1cmUKK2Zyb20gd2Via2l0Y29yZXB5IGltcG9ydCBydW4sIExvZ2dl ckNhcHR1cmUsIE91dHB1dENhcHR1cmUKIGZyb20gd2Via2l0Y29yZXB5Lm1vY2tzIGltcG9ydCBU aW1lIGFzIE1vY2tUaW1lCiBmcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBDb21taXQsIGxvY2FsLCBt b2NrcywgcmVtb3RlCiAKQEAgLTMwNSw2ICszMDUsODAgQEAgY2xhc3MgVGVzdEdpdCh1bml0dGVz dC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICAgICAgICAgIGdpdC5jb21taXQoaGFzaD0nOWI4MzEx ZjInKSwKICAgICAgICAgICAgICAgICBdKSwgQ29tbWl0LkVuY29kZXIoKS5kZWZhdWx0KGxpc3Qo Z2l0LmNvbW1pdHMoYmVnaW49ZGljdChhcmd1bWVudD0nOWI4MzExZjInKSwgZW5kPWRpY3QoYXJn dW1lbnQ9JzYyMTY1MmFkJykpKSkpCiAKKyAgICBkZWYgdGVzdF9sb2coc2VsZik6CisgICAgICAg IHNlbGYubWF4RGlmZiA9IE5vbmUKKyAgICAgICAgcHJpbnQoJ1xuXG5cbi0tLS0tLS0tLS0tLScp CisgICAgICAgIHdpdGggbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0aCwgZ2l0X3N2bj1UcnVlKToK KyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoCisgICAgICAgICAgICAgICAgcnVuKFsKKyAg ICAgICAgICAgICAgICAgICAgbG9jYWwuR2l0LmV4ZWN1dGFibGUoKSwgJ2xvZycsICctLWZvcm1h dD1mdWxsZXInLCAnbWFpbi4uLjFhYmUyNWI0JywKKyAgICAgICAgICAgICAgICBdLCBjd2Q9c2Vs Zi5wYXRoLCBjYXB0dXJlX291dHB1dD1UcnVlLCBlbmNvZGluZz0ndXRmLTgnKS5zdGRvdXQsCisg ICAgICAgICAgICAgICAgJycnY29tbWl0IGQ4YmNlMjZmYTY1YzZmYzhmMzljMTc5MjdhYmI3N2Y2 OWZhYjgyZmMKK0F1dGhvcjogICAgIEpvbmF0aGFuIEJlZGFyZCA8amJlZGFyZEBhcHBsZS5jb20+ CitBdXRob3JEYXRlOiBTYXQgT2N0IDAzIDAzOjQ2OjQwIDIwMjAgKzAwMDAKK0NvbW1pdDogICAg IEpvbmF0aGFuIEJlZGFyZCA8amJlZGFyZEBhcHBsZS5jb20+CitDb21taXREYXRlOiBTYXQgT2N0 IDAzIDAzOjQ2OjQwIDIwMjAgKzAwMDAKKworICAgIFBhdGNoIFNlcmllcworICAgIGdpdC1zdm4t aWQ6IGh0dHBzOi8vc3ZuLmV4YW1wbGUub3JnL3JlcG9zaXRvcnkvcmVwb3NpdG9yeS90cnVua0A5 IDI2OGY0NWNjLWNkMDktMDQxMC1hYjNjLWQ1MjY5MWI0ZGJmYworCitjb21taXQgYmFlNWQxZTkw OTk5ZDRmOTE2YThhMTU4MTBjY2ZhNDNmMzdhMmZkNgorQXV0aG9yOiAgICAgSm9uYXRoYW4gQmVk YXJkIDxqYmVkYXJkQGFwcGxlLmNvbT4KK0F1dGhvckRhdGU6IFNhdCBPY3QgMDMgMDM6NDY6NDAg MjAyMCArMDAwMAorQ29tbWl0OiAgICAgSm9uYXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNv bT4KK0NvbW1pdERhdGU6IFNhdCBPY3QgMDMgMDM6NDY6NDAgMjAyMCArMDAwMAorCisgICAgOHRo IGNvbW1pdAorICAgIGdpdC1zdm4taWQ6IGh0dHBzOi8vc3ZuLmV4YW1wbGUub3JnL3JlcG9zaXRv cnkvcmVwb3NpdG9yeS90cnVua0A4IDI2OGY0NWNjLWNkMDktMDQxMC1hYjNjLWQ1MjY5MWI0ZGJm YworCitjb21taXQgMWFiZTI1YjQ0M2U5ODVmOTNiOTBkODMwZTRhN2UzNzMxMzM2YWY0ZAorQXV0 aG9yOiAgICAgSm9uYXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNvbT4KK0F1dGhvckRhdGU6 IFNhdCBPY3QgMDMgMDI6MjM6MjAgMjAyMCArMDAwMAorQ29tbWl0OiAgICAgSm9uYXRoYW4gQmVk YXJkIDxqYmVkYXJkQGFwcGxlLmNvbT4KK0NvbW1pdERhdGU6IFNhdCBPY3QgMDMgMDI6MjM6MjAg MjAyMCArMDAwMAorCisgICAgNHRoIGNvbW1pdAorICAgIGdpdC1zdm4taWQ6IGh0dHBzOi8vc3Zu LmV4YW1wbGUub3JnL3JlcG9zaXRvcnkvcmVwb3NpdG9yeS90cnVua0A0IDI2OGY0NWNjLWNkMDkt MDQxMC1hYjNjLWQ1MjY5MWI0ZGJmYworJycnCisgICAgICAgICAgICApCisKKyAgICBkZWYgdGVz dF9icmFuY2hfbG9nKHNlbGYpOgorICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBh dGgsIGdpdF9zdm49VHJ1ZSk6CisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKAorICAgICAg ICAgICAgICAgIHJ1bihbCisgICAgICAgICAgICAgICAgICAgIGxvY2FsLkdpdC5leGVjdXRhYmxl KCksICdsb2cnLCAnLS1mb3JtYXQ9ZnVsbGVyJywgJ2JyYW5jaC1iLi4ubWFpbicsCisgICAgICAg ICAgICAgICAgXSwgY3dkPXNlbGYucGF0aCwgY2FwdHVyZV9vdXRwdXQ9VHJ1ZSwgZW5jb2Rpbmc9 J3V0Zi04Jykuc3Rkb3V0LAorICAgICAgICAgICAgICAgICcnJ2NvbW1pdCA3OTA3MjVhNmQ3OWUy OGRiMmVjZGRlMjk1NDhkMjI2MmMwYmQwNTlkCitBdXRob3I6ICAgICBKb25hdGhhbiBCZWRhcmQg PGpiZWRhcmRAYXBwbGUuY29tPgorQXV0aG9yRGF0ZTogU2F0IE9jdCAwMyAwMzozMDowMCAyMDIw ICswMDAwCitDb21taXQ6ICAgICBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgor Q29tbWl0RGF0ZTogU2F0IE9jdCAwMyAwMzozMDowMCAyMDIwICswMDAwCisKKyAgICA3dGggY29t bWl0CisgICAgZ2l0LXN2bi1pZDogaHR0cHM6Ly9zdm4uZXhhbXBsZS5vcmcvcmVwb3NpdG9yeS9y ZXBvc2l0b3J5L3RydW5rQDcgMjY4ZjQ1Y2MtY2QwOS0wNDEwLWFiM2MtZDUyNjkxYjRkYmZjCisK K2NvbW1pdCAzY2QzMmUzNTI0MTA1NjViYjU0MzgyMWZiZjg1NmE2ZDNjYWFkMWM0CitBdXRob3I6 ICAgICBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgorQXV0aG9yRGF0ZTogU2F0 IE9jdCAwMyAwMjo0MDowMCAyMDIwICswMDAwCitDb21taXQ6ICAgICBKb25hdGhhbiBCZWRhcmQg PGpiZWRhcmRAYXBwbGUuY29tPgorQ29tbWl0RGF0ZTogU2F0IE9jdCAwMyAwMjo0MDowMCAyMDIw ICswMDAwCisKKyAgICA1dGggY29tbWl0CisgICAgICAgIENoZXJyeSBwaWNrCisgICAgICAgIGdp dC1zdm4taWQ6IGh0dHBzOi8vc3ZuLndlYmtpdC5vcmcvcmVwb3NpdG9yeS93ZWJraXQvdHJ1bmtA NiAyNjhmNDVjYy1jZDA5LTA0MTAtYWIzYy1kNTI2OTFiNGRiZmMKKyAgICBnaXQtc3ZuLWlkOiBo dHRwczovL3N2bi5leGFtcGxlLm9yZy9yZXBvc2l0b3J5L3JlcG9zaXRvcnkvdHJ1bmtANSAyNjhm NDVjYy1jZDA5LTA0MTAtYWIzYy1kNTI2OTFiNGRiZmMKKworY29tbWl0IGEzMGNlODQ5NGJmMWFj MjgwN2E2OTg0NGY3MjZiZTRhOTg0M2NhNTUKK0F1dGhvcjogICAgIEpvbmF0aGFuIEJlZGFyZCA8 amJlZGFyZEBhcHBsZS5jb20+CitBdXRob3JEYXRlOiBTYXQgT2N0IDAzIDAyOjA2OjQwIDIwMjAg KzAwMDAKK0NvbW1pdDogICAgIEpvbmF0aGFuIEJlZGFyZCA8amJlZGFyZEBhcHBsZS5jb20+CitD b21taXREYXRlOiBTYXQgT2N0IDAzIDAyOjA2OjQwIDIwMjAgKzAwMDAKKworICAgIDNyZCBjb21t aXQKKyAgICBnaXQtc3ZuLWlkOiBodHRwczovL3N2bi5leGFtcGxlLm9yZy9yZXBvc2l0b3J5L3Jl cG9zaXRvcnkvdHJ1bmtAMyAyNjhmNDVjYy1jZDA5LTA0MTAtYWIzYy1kNTI2OTFiNGRiZmMKKycn JworICAgICAgICAgICAgKQorCiAKIGNsYXNzIFRlc3RHaXRIdWIodW5pdHRlc3QuVGVzdENhc2Up OgogICAgIHJlbW90ZSA9ICdodHRwczovL2dpdGh1Yi5leGFtcGxlLmNvbS9XZWJLaXQvV2ViS2l0 Jwo= 428891 2021-05-17 16:49:11 -0700 2021-05-17 16:57:35 -0700 Patch bug-225889-20210517164910.patch text/plain 9109 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NjE0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYWY0OGEyM2U0MjA1NzQ4YmU2NDFjNzBlMWE1NDU3OGQy YmIwMmNlMS4uYmM1ODNhNDUxNzU5ZWM5YzdkZDc3YjJhNmVkM2I0ZDdjZmZiOTkxOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDIxLTA1LTE3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIFN1cHBvcnQgYnJhbmNoIHF1ZXJpZXMgaW4gbW9jayBnaXQg bG9nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU4 ODkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc4MTIyNzA1PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvc2V0dXAucHk6IEJ1bXAgdmVyc2lvbi4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weTogRGl0dG8uCisgICAgICAgICog U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0 LnB5OiBBZGQgc3VwcG9ydCBmb3IgYnJhbmNoZXMgaW4KKyAgICAgICAgYGdpdCBsb2dgIGNvbW1h bmRzLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdEdpdC50ZXN0X2xvZyk6CisgICAg ICAgIChUZXN0R2l0LnRlc3RfYnJhbmNoX2xvZyk6CisKIDIwMjEtMDUtMTcgIEFsZXggQ2hyaXN0 ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZW1vdmUgQVBJOjpP YmplY3Q6OlR5cGU6OkJ1bmRsZVBhZ2VHcm91cApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS9zZXR1cC5weQppbmRleCBkOGUwYTA5OGM5MmViZTE5NWZmOTJlZjdmZjcwYzMy ODZiNTE4Nzg1Li4yMWVjMTk5NzE5Yzc1OTY0MTRjMDk1YzkyZGRmNGUzYmFmNzNlYmI1IDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQorKysg Yi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQpAQCAtMjksNyAr MjksNyBAQCBkZWYgcmVhZG1lKCk6CiAKIHNldHVwKAogICAgIG5hbWU9J3dlYmtpdHNjbXB5JywK LSAgICB2ZXJzaW9uPScwLjE0LjEnLAorICAgIHZlcnNpb249JzAuMTQuMicsCiAgICAgZGVzY3Jp cHRpb249J0xpYnJhcnkgZGVzaWduZWQgdG8gaW50ZXJhY3Qgd2l0aCBnaXQgYW5kIHN2biByZXBv c2l0b3JpZXMuJywKICAgICBsb25nX2Rlc2NyaXB0aW9uPXJlYWRtZSgpLAogICAgIGNsYXNzaWZp ZXJzPVsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl YmtpdHNjbXB5L19faW5pdF9fLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkKaW5kZXggNDI0NTE2MDM0NjUxNDRlNTE5ZjBiMDY1 MTJhY2U4YWNlNmE2OTJmYy4uZWZjZTg4MzljZWUzZDkzOGVhZjEyMTBmNmQzMmQyMzk3MTRmNzdi YiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvX19pbml0X18ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkKQEAgLTQ2LDcgKzQ2LDcgQEAgZXhjZXB0IEltcG9y dEVycm9yOgogICAgICAgICAiUGxlYXNlIGluc3RhbGwgd2Via2l0Y29yZXB5IHdpdGggYHBpcCBp bnN0YWxsIHdlYmtpdGNvcmVweSAtLWV4dHJhLWluZGV4LXVybCA8cGFja2FnZSBpbmRleCBVUkw+ YCIKICAgICApCiAKLXZlcnNpb24gPSBWZXJzaW9uKDAsIDE0LCAxKQordmVyc2lvbiA9IFZlcnNp b24oMCwgMTQsIDIpCiAKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2Zhc3RlbmVycycs IFZlcnNpb24oMCwgMTUsIDApKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ21vbm90 b25pYycsIFZlcnNpb24oMSwgNSkpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0LnB5IGIvVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0LnB5 CmluZGV4IGRhOThlYmMyNDA3ODVkMzA5NGVkOTA5NmY2NDA4MjZlYmYzYjZmZmIuLmMzYWY5Mjky ZmNjMzJmNWMyMTVkNzlhYzI5Mjk3NmUzMDBlNDcxYmEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL2dpdC5weQor KysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nr cy9sb2NhbC9naXQucHkKQEAgLTI1MSw3ICsyNTEsNyBAQCBub3RoaW5nIHRvIGNvbW1pdCwgd29y a2luZyB0cmVlIGNsZWFuCiAgICAgICAgICAgICAgICAgICAgICAgICAnQXV0aG9yRGF0ZToge2Rh dGV9XG4nCiAgICAgICAgICAgICAgICAgICAgICAgICAnQ29tbWl0OiAgICAge2F1dGhvcn0gPHtl bWFpbH0+XG4nCiAgICAgICAgICAgICAgICAgICAgICAgICAnQ29tbWl0RGF0ZToge2RhdGV9XG4n Ci0gICAgICAgICAgICAgICAgICAgICAgICAnXG57bG9nfScuZm9ybWF0KAorICAgICAgICAgICAg ICAgICAgICAgICAgJ1xue2xvZ31cbicuZm9ybWF0KAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGhhc2g9Y29tbWl0Lmhhc2gsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXV0aG9y PWNvbW1pdC5hdXRob3IubmFtZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbWFpbD1j b21taXQuYXV0aG9yLmVtYWlsLApAQCAtNDkzLDI4ICs0OTMsMzggQEAgbm90aGluZyB0byBjb21t aXQsIHdvcmtpbmcgdHJlZSBjbGVhbgogICAgICAgICApCiAKICAgICBkZWYgY29tbWl0c19pbl9y YW5nZShzZWxmLCBiZWdpbiwgZW5kKToKKyAgICAgICAgYmVnaW4gPSBiZWdpbi5yZXBsYWNlKCdy ZW1vdGVzL29yaWdpbicsICcnKSBpZiBiZWdpbiBlbHNlIE5vbmUKKyAgICAgICAgZW5kID0gZW5k LnJlcGxhY2UoJ3JlbW90ZXMvb3JpZ2luJywgJycpIGlmIGVuZCBlbHNlIE5vbmUKKwogICAgICAg ICBicmFuY2hlcyA9IFtzZWxmLmRlZmF1bHRfYnJhbmNoXQotICAgICAgICBmb3IgYnJhbmNoLCBj b21taXRzIGluIHNlbGYuY29tbWl0cy5pdGVtcygpOgotICAgICAgICAgICAgaWYgYnJhbmNoID09 IHNlbGYuZGVmYXVsdF9icmFuY2g6Ci0gICAgICAgICAgICAgICAgY29udGludWUKLSAgICAgICAg ICAgIGZvciBjb21taXQgaW4gY29tbWl0czoKLSAgICAgICAgICAgICAgICBpZiBjb21taXQuaGFz aCA9PSBlbmQ6Ci0gICAgICAgICAgICAgICAgICAgIGJyYW5jaGVzLmluc2VydCgwLCBicmFuY2gp CisgICAgICAgIGlmIGVuZCBpbiBzZWxmLmNvbW1pdHMua2V5cygpIGFuZCBlbmQgIT0gc2VsZi5k ZWZhdWx0X2JyYW5jaDoKKyAgICAgICAgICAgIGJyYW5jaGVzLmFwcGVuZChlbmQpCisgICAgICAg IGVsc2U6CisgICAgICAgICAgICBmb3IgYnJhbmNoLCBjb21taXRzIGluIHNlbGYuY29tbWl0cy5p dGVtcygpOgorICAgICAgICAgICAgICAgIGlmIGJyYW5jaCA9PSBzZWxmLmRlZmF1bHRfYnJhbmNo OgorICAgICAgICAgICAgICAgICAgICBjb250aW51ZQorICAgICAgICAgICAgICAgIGZvciBjb21t aXQgaW4gY29tbWl0czoKKyAgICAgICAgICAgICAgICAgICAgaWYgY29tbWl0Lmhhc2guc3RhcnRz d2l0aChlbmQpOgorICAgICAgICAgICAgICAgICAgICAgICAgYnJhbmNoZXMuaW5zZXJ0KDAsIGJy YW5jaCkKKyAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrCisgICAgICAgICAgICAgICAgaWYg bGVuKGJyYW5jaGVzKSA+IDE6CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrCi0gICAgICAgICAg ICBpZiBsZW4oYnJhbmNoZXMpID4gMToKLSAgICAgICAgICAgICAgICBicmVhawogCiAgICAgICAg IGluX3JhbmdlID0gRmFsc2UKICAgICAgICAgcHJldmlvdXMgPSBOb25lCiAgICAgICAgIGZvciBi cmFuY2ggaW4gYnJhbmNoZXM6CiAgICAgICAgICAgICBmb3IgY29tbWl0IGluIHJldmVyc2VkKHNl bGYuY29tbWl0c1ticmFuY2hdKToKLSAgICAgICAgICAgICAgICBpZiBjb21taXQuaGFzaCA9PSBl bmQ6CisgICAgICAgICAgICAgICAgaWYgYnJhbmNoID09IGJlZ2luOgorICAgICAgICAgICAgICAg ICAgICBicmVhaworICAgICAgICAgICAgICAgIGlmIGNvbW1pdC5oYXNoLnN0YXJ0c3dpdGgoZW5k KSBvciBlbmQgPT0gYnJhbmNoOgogICAgICAgICAgICAgICAgICAgICBpbl9yYW5nZSA9IFRydWUK ICAgICAgICAgICAgICAgICBpZiBpbl9yYW5nZSBhbmQgKG5vdCBwcmV2aW91cyBvciBjb21taXQu aGFzaCAhPSBwcmV2aW91cy5oYXNoKToKICAgICAgICAgICAgICAgICAgICAgeWllbGQgY29tbWl0 CiAgICAgICAgICAgICAgICAgcHJldmlvdXMgPSBjb21taXQKLSAgICAgICAgICAgICAgICBpZiBj b21taXQuaGFzaCA9PSBiZWdpbjoKKyAgICAgICAgICAgICAgICBpZiBiZWdpbiBhbmQgY29tbWl0 Lmhhc2guc3RhcnRzd2l0aChiZWdpbik6CiAgICAgICAgICAgICAgICAgICAgIGluX3JhbmdlID0g RmFsc2UKKyAgICAgICAgICAgICAgICAgICAgYnJlYWsKKwogICAgICAgICAgICAgaW5fcmFuZ2Ug PSBGYWxzZQogICAgICAgICAgICAgaWYgbm90IHByZXZpb3VzIG9yIGJyYW5jaCA9PSBzZWxmLmRl ZmF1bHRfYnJhbmNoOgogICAgICAgICAgICAgICAgIGNvbnRpbnVlCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0 dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5CmluZGV4IGJjN2I2MzkyOWI0YWY0NzU2OWNmNWZjYmRmODNm OWI4YTY2ZjE5YzkuLjk1ODMwZjg3NGRjMDFlMzMxMTg3MjVkNjQyYjQ4OWFmZDYwMWZhMzQgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5CkBAIC0yNiw3ICsyNiw3IEBA IGltcG9ydCB0ZW1wZmlsZQogaW1wb3J0IHVuaXR0ZXN0CiAKIGZyb20gZGF0ZXRpbWUgaW1wb3J0 IGRhdGV0aW1lCi1mcm9tIHdlYmtpdGNvcmVweSBpbXBvcnQgTG9nZ2VyQ2FwdHVyZSwgT3V0cHV0 Q2FwdHVyZQorZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IHJ1biwgTG9nZ2VyQ2FwdHVyZSwgT3V0 cHV0Q2FwdHVyZQogZnJvbSB3ZWJraXRjb3JlcHkubW9ja3MgaW1wb3J0IFRpbWUgYXMgTW9ja1Rp bWUKIGZyb20gd2Via2l0c2NtcHkgaW1wb3J0IENvbW1pdCwgbG9jYWwsIG1vY2tzLCByZW1vdGUK IApAQCAtMzA1LDYgKzMwNSw4MCBAQCBjbGFzcyBUZXN0R2l0KHVuaXR0ZXN0LlRlc3RDYXNlKToK ICAgICAgICAgICAgICAgICAgICAgZ2l0LmNvbW1pdChoYXNoPSc5YjgzMTFmMicpLAogICAgICAg ICAgICAgICAgIF0pLCBDb21taXQuRW5jb2RlcigpLmRlZmF1bHQobGlzdChnaXQuY29tbWl0cyhi ZWdpbj1kaWN0KGFyZ3VtZW50PSc5YjgzMTFmMicpLCBlbmQ9ZGljdChhcmd1bWVudD0nNjIxNjUy YWQnKSkpKSkKIAorICAgIGRlZiB0ZXN0X2xvZyhzZWxmKToKKyAgICAgICAgc2VsZi5tYXhEaWZm ID0gTm9uZQorICAgICAgICBwcmludCgnXG5cblxuLS0tLS0tLS0tLS0tJykKKyAgICAgICAgd2l0 aCBtb2Nrcy5sb2NhbC5HaXQoc2VsZi5wYXRoLCBnaXRfc3ZuPVRydWUpOgorICAgICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbCgKKyAgICAgICAgICAgICAgICBydW4oWworICAgICAgICAgICAgICAg ICAgICBsb2NhbC5HaXQuZXhlY3V0YWJsZSgpLCAnbG9nJywgJy0tZm9ybWF0PWZ1bGxlcicsICdt YWluLi4uMWFiZTI1YjQnLAorICAgICAgICAgICAgICAgIF0sIGN3ZD1zZWxmLnBhdGgsIGNhcHR1 cmVfb3V0cHV0PVRydWUsIGVuY29kaW5nPSd1dGYtOCcpLnN0ZG91dCwKKyAgICAgICAgICAgICAg ICAnJydjb21taXQgZDhiY2UyNmZhNjVjNmZjOGYzOWMxNzkyN2FiYjc3ZjY5ZmFiODJmYworQXV0 aG9yOiAgICAgSm9uYXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNvbT4KK0F1dGhvckRhdGU6 IFNhdCBPY3QgMDMgMDM6NDY6NDAgMjAyMCArMDAwMAorQ29tbWl0OiAgICAgSm9uYXRoYW4gQmVk YXJkIDxqYmVkYXJkQGFwcGxlLmNvbT4KK0NvbW1pdERhdGU6IFNhdCBPY3QgMDMgMDM6NDY6NDAg MjAyMCArMDAwMAorCisgICAgUGF0Y2ggU2VyaWVzCisgICAgZ2l0LXN2bi1pZDogaHR0cHM6Ly9z dm4uZXhhbXBsZS5vcmcvcmVwb3NpdG9yeS9yZXBvc2l0b3J5L3RydW5rQDkgMjY4ZjQ1Y2MtY2Qw OS0wNDEwLWFiM2MtZDUyNjkxYjRkYmZjCisKK2NvbW1pdCBiYWU1ZDFlOTA5OTlkNGY5MTZhOGEx NTgxMGNjZmE0M2YzN2EyZmQ2CitBdXRob3I6ICAgICBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRA YXBwbGUuY29tPgorQXV0aG9yRGF0ZTogU2F0IE9jdCAwMyAwMzo0Njo0MCAyMDIwICswMDAwCitD b21taXQ6ICAgICBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgorQ29tbWl0RGF0 ZTogU2F0IE9jdCAwMyAwMzo0Njo0MCAyMDIwICswMDAwCisKKyAgICA4dGggY29tbWl0CisgICAg Z2l0LXN2bi1pZDogaHR0cHM6Ly9zdm4uZXhhbXBsZS5vcmcvcmVwb3NpdG9yeS9yZXBvc2l0b3J5 L3RydW5rQDggMjY4ZjQ1Y2MtY2QwOS0wNDEwLWFiM2MtZDUyNjkxYjRkYmZjCisKK2NvbW1pdCAx YWJlMjViNDQzZTk4NWY5M2I5MGQ4MzBlNGE3ZTM3MzEzMzZhZjRkCitBdXRob3I6ICAgICBKb25h dGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgorQXV0aG9yRGF0ZTogU2F0IE9jdCAwMyAw MjoyMzoyMCAyMDIwICswMDAwCitDb21taXQ6ICAgICBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRA YXBwbGUuY29tPgorQ29tbWl0RGF0ZTogU2F0IE9jdCAwMyAwMjoyMzoyMCAyMDIwICswMDAwCisK KyAgICA0dGggY29tbWl0CisgICAgZ2l0LXN2bi1pZDogaHR0cHM6Ly9zdm4uZXhhbXBsZS5vcmcv cmVwb3NpdG9yeS9yZXBvc2l0b3J5L3RydW5rQDQgMjY4ZjQ1Y2MtY2QwOS0wNDEwLWFiM2MtZDUy NjkxYjRkYmZjCisnJycKKyAgICAgICAgICAgICkKKworICAgIGRlZiB0ZXN0X2JyYW5jaF9sb2co c2VsZik6CisgICAgICAgIHdpdGggbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0aCwgZ2l0X3N2bj1U cnVlKToKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoCisgICAgICAgICAgICAgICAgcnVu KFsKKyAgICAgICAgICAgICAgICAgICAgbG9jYWwuR2l0LmV4ZWN1dGFibGUoKSwgJ2xvZycsICct LWZvcm1hdD1mdWxsZXInLCAnYnJhbmNoLWIuLi5tYWluJywKKyAgICAgICAgICAgICAgICBdLCBj d2Q9c2VsZi5wYXRoLCBjYXB0dXJlX291dHB1dD1UcnVlLCBlbmNvZGluZz0ndXRmLTgnKS5zdGRv dXQsCisgICAgICAgICAgICAgICAgJycnY29tbWl0IDc5MDcyNWE2ZDc5ZTI4ZGIyZWNkZGUyOTU0 OGQyMjYyYzBiZDA1OWQKK0F1dGhvcjogICAgIEpvbmF0aGFuIEJlZGFyZCA8amJlZGFyZEBhcHBs ZS5jb20+CitBdXRob3JEYXRlOiBTYXQgT2N0IDAzIDAzOjMwOjAwIDIwMjAgKzAwMDAKK0NvbW1p dDogICAgIEpvbmF0aGFuIEJlZGFyZCA8amJlZGFyZEBhcHBsZS5jb20+CitDb21taXREYXRlOiBT YXQgT2N0IDAzIDAzOjMwOjAwIDIwMjAgKzAwMDAKKworICAgIDd0aCBjb21taXQKKyAgICBnaXQt c3ZuLWlkOiBodHRwczovL3N2bi5leGFtcGxlLm9yZy9yZXBvc2l0b3J5L3JlcG9zaXRvcnkvdHJ1 bmtANyAyNjhmNDVjYy1jZDA5LTA0MTAtYWIzYy1kNTI2OTFiNGRiZmMKKworY29tbWl0IDNjZDMy ZTM1MjQxMDU2NWJiNTQzODIxZmJmODU2YTZkM2NhYWQxYzQKK0F1dGhvcjogICAgIEpvbmF0aGFu IEJlZGFyZCA8amJlZGFyZEBhcHBsZS5jb20+CitBdXRob3JEYXRlOiBTYXQgT2N0IDAzIDAyOjQw OjAwIDIwMjAgKzAwMDAKK0NvbW1pdDogICAgIEpvbmF0aGFuIEJlZGFyZCA8amJlZGFyZEBhcHBs ZS5jb20+CitDb21taXREYXRlOiBTYXQgT2N0IDAzIDAyOjQwOjAwIDIwMjAgKzAwMDAKKworICAg IDV0aCBjb21taXQKKyAgICAgICAgQ2hlcnJ5IHBpY2sKKyAgICAgICAgZ2l0LXN2bi1pZDogaHR0 cHM6Ly9zdm4ud2Via2l0Lm9yZy9yZXBvc2l0b3J5L3dlYmtpdC90cnVua0A2IDI2OGY0NWNjLWNk MDktMDQxMC1hYjNjLWQ1MjY5MWI0ZGJmYworICAgIGdpdC1zdm4taWQ6IGh0dHBzOi8vc3ZuLmV4 YW1wbGUub3JnL3JlcG9zaXRvcnkvcmVwb3NpdG9yeS90cnVua0A1IDI2OGY0NWNjLWNkMDktMDQx MC1hYjNjLWQ1MjY5MWI0ZGJmYworCitjb21taXQgYTMwY2U4NDk0YmYxYWMyODA3YTY5ODQ0Zjcy NmJlNGE5ODQzY2E1NQorQXV0aG9yOiAgICAgSm9uYXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxl LmNvbT4KK0F1dGhvckRhdGU6IFNhdCBPY3QgMDMgMDI6MDY6NDAgMjAyMCArMDAwMAorQ29tbWl0 OiAgICAgSm9uYXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNvbT4KK0NvbW1pdERhdGU6IFNh dCBPY3QgMDMgMDI6MDY6NDAgMjAyMCArMDAwMAorCisgICAgM3JkIGNvbW1pdAorICAgIGdpdC1z dm4taWQ6IGh0dHBzOi8vc3ZuLmV4YW1wbGUub3JnL3JlcG9zaXRvcnkvcmVwb3NpdG9yeS90cnVu a0AzIDI2OGY0NWNjLWNkMDktMDQxMC1hYjNjLWQ1MjY5MWI0ZGJmYworJycnCisgICAgICAgICAg ICApCisKIAogY2xhc3MgVGVzdEdpdEh1Yih1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgcmVtb3Rl ID0gJ2h0dHBzOi8vZ2l0aHViLmV4YW1wbGUuY29tL1dlYktpdC9XZWJLaXQnCg== 428894 2021-05-17 16:57:37 -0700 2021-05-19 12:14:55 -0700 Patch bug-225889-20210517165736.patch text/plain 9124 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NjE1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWNkZjYxNzYyZjljNjJlMjA0MzYyYzIxYzQ3ZmRmZTNl OTA1NzEwZC4uZWM5MWZhYzViYzY5NzE1M2U5ODM2MTBkYTM1OWNhZTUwN2I5YTY3NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDIxLTA1LTE3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIFN1cHBvcnQgYnJhbmNoIHF1ZXJpZXMgaW4gbW9jayBnaXQg bG9nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU4 ODkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc4MTIyNzA1PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvc2V0dXAucHk6IEJ1bXAgdmVyc2lvbi4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weTogRGl0dG8uCisgICAgICAgICog U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0 LnB5OiBBZGQgc3VwcG9ydCBmb3IgYnJhbmNoZXMgaW4KKyAgICAgICAgYGdpdCBsb2dgIGNvbW1h bmRzLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdEdpdC50ZXN0X2xvZyk6CisgICAg ICAgIChUZXN0R2l0LnRlc3RfYnJhbmNoX2xvZyk6CisKIDIwMjEtMDUtMTcgIEpvbmF0aGFuIEJl ZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAgICAgIFt3ZWJraXRzY21weV0gU3VwcG9y dCB0ZXN0aW5nIG9uIG1hY2hpbmVzIHdpdGhvdXQgc3ZuIGluc3RhbGxlZApkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkgYi9Ub29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQppbmRleCAyMWVjMTk5NzE5Yzc1OTY0 MTRjMDk1YzkyZGRmNGUzYmFmNzNlYmI1Li4zNTIxOGIzYjYzNjhiOTM4MTQ2MmZlMjA3OTM5YzNk ZmRmYTM0ODVmIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS9zZXR1cC5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1 cC5weQpAQCAtMjksNyArMjksNyBAQCBkZWYgcmVhZG1lKCk6CiAKIHNldHVwKAogICAgIG5hbWU9 J3dlYmtpdHNjbXB5JywKLSAgICB2ZXJzaW9uPScwLjE0LjInLAorICAgIHZlcnNpb249JzAuMTQu MycsCiAgICAgZGVzY3JpcHRpb249J0xpYnJhcnkgZGVzaWduZWQgdG8gaW50ZXJhY3Qgd2l0aCBn aXQgYW5kIHN2biByZXBvc2l0b3JpZXMuJywKICAgICBsb25nX2Rlc2NyaXB0aW9uPXJlYWRtZSgp LAogICAgIGNsYXNzaWZpZXJzPVsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkKaW5kZXggZWZjZTg4Mzlj ZWUzZDkzOGVhZjEyMTBmNmQzMmQyMzk3MTRmNzdiYi4uZWU0YmEzODExYmQzZGViYjczNjlkYjk5 YzVkYWM0ZmYxNDZjYTg1YyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkKQEAgLTQ2LDcgKzQ2LDcg QEAgZXhjZXB0IEltcG9ydEVycm9yOgogICAgICAgICAiUGxlYXNlIGluc3RhbGwgd2Via2l0Y29y ZXB5IHdpdGggYHBpcCBpbnN0YWxsIHdlYmtpdGNvcmVweSAtLWV4dHJhLWluZGV4LXVybCA8cGFj a2FnZSBpbmRleCBVUkw+YCIKICAgICApCiAKLXZlcnNpb24gPSBWZXJzaW9uKDAsIDE0LCAyKQor dmVyc2lvbiA9IFZlcnNpb24oMCwgMTQsIDMpCiAKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2th Z2UoJ2Zhc3RlbmVycycsIFZlcnNpb24oMCwgMTUsIDApKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVy KFBhY2thZ2UoJ21vbm90b25pYycsIFZlcnNpb24oMSwgNSkpKQpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0 LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9j a3MvbG9jYWwvZ2l0LnB5CmluZGV4IDNlZjAxZWZjMjJiZTg2NDAxZjYyZDBhMDAwMjQ2ZjU5NGZm YzYzOGQuLjBlYjUzNGI2NDhlNzZhY2ZmNDNhOGU5ZjRiNWEzNjg2MjIxZTQ4ODcgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tz L2xvY2FsL2dpdC5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9naXQucHkKQEAgLTI1Myw3ICsyNTMsNyBAQCBub3RoaW5n IHRvIGNvbW1pdCwgd29ya2luZyB0cmVlIGNsZWFuCiAgICAgICAgICAgICAgICAgICAgICAgICAn QXV0aG9yRGF0ZToge2RhdGV9XG4nCiAgICAgICAgICAgICAgICAgICAgICAgICAnQ29tbWl0OiAg ICAge2F1dGhvcn0gPHtlbWFpbH0+XG4nCiAgICAgICAgICAgICAgICAgICAgICAgICAnQ29tbWl0 RGF0ZToge2RhdGV9XG4nCi0gICAgICAgICAgICAgICAgICAgICAgICAnXG57bG9nfScuZm9ybWF0 KAorICAgICAgICAgICAgICAgICAgICAgICAgJ1xue2xvZ31cbicuZm9ybWF0KAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGhhc2g9Y29tbWl0Lmhhc2gsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgYXV0aG9yPWNvbW1pdC5hdXRob3IubmFtZSwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBlbWFpbD1jb21taXQuYXV0aG9yLmVtYWlsLApAQCAtNTAxLDI4ICs1MDEsMzggQEAg bm90aGluZyB0byBjb21taXQsIHdvcmtpbmcgdHJlZSBjbGVhbgogICAgICAgICApCiAKICAgICBk ZWYgY29tbWl0c19pbl9yYW5nZShzZWxmLCBiZWdpbiwgZW5kKToKKyAgICAgICAgYmVnaW4gPSBi ZWdpbi5yZXBsYWNlKCdyZW1vdGVzL29yaWdpbicsICcnKSBpZiBiZWdpbiBlbHNlIE5vbmUKKyAg ICAgICAgZW5kID0gZW5kLnJlcGxhY2UoJ3JlbW90ZXMvb3JpZ2luJywgJycpIGlmIGVuZCBlbHNl IE5vbmUKKwogICAgICAgICBicmFuY2hlcyA9IFtzZWxmLmRlZmF1bHRfYnJhbmNoXQotICAgICAg ICBmb3IgYnJhbmNoLCBjb21taXRzIGluIHNlbGYuY29tbWl0cy5pdGVtcygpOgotICAgICAgICAg ICAgaWYgYnJhbmNoID09IHNlbGYuZGVmYXVsdF9icmFuY2g6Ci0gICAgICAgICAgICAgICAgY29u dGludWUKLSAgICAgICAgICAgIGZvciBjb21taXQgaW4gY29tbWl0czoKLSAgICAgICAgICAgICAg ICBpZiBjb21taXQuaGFzaCA9PSBlbmQ6Ci0gICAgICAgICAgICAgICAgICAgIGJyYW5jaGVzLmlu c2VydCgwLCBicmFuY2gpCisgICAgICAgIGlmIGVuZCBpbiBzZWxmLmNvbW1pdHMua2V5cygpIGFu ZCBlbmQgIT0gc2VsZi5kZWZhdWx0X2JyYW5jaDoKKyAgICAgICAgICAgIGJyYW5jaGVzLmFwcGVu ZChlbmQpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBmb3IgYnJhbmNoLCBjb21taXRzIGlu IHNlbGYuY29tbWl0cy5pdGVtcygpOgorICAgICAgICAgICAgICAgIGlmIGJyYW5jaCA9PSBzZWxm LmRlZmF1bHRfYnJhbmNoOgorICAgICAgICAgICAgICAgICAgICBjb250aW51ZQorICAgICAgICAg ICAgICAgIGZvciBjb21taXQgaW4gY29tbWl0czoKKyAgICAgICAgICAgICAgICAgICAgaWYgY29t bWl0Lmhhc2guc3RhcnRzd2l0aChlbmQpOgorICAgICAgICAgICAgICAgICAgICAgICAgYnJhbmNo ZXMuaW5zZXJ0KDAsIGJyYW5jaCkKKyAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrCisgICAg ICAgICAgICAgICAgaWYgbGVuKGJyYW5jaGVzKSA+IDE6CiAgICAgICAgICAgICAgICAgICAgIGJy ZWFrCi0gICAgICAgICAgICBpZiBsZW4oYnJhbmNoZXMpID4gMToKLSAgICAgICAgICAgICAgICBi cmVhawogCiAgICAgICAgIGluX3JhbmdlID0gRmFsc2UKICAgICAgICAgcHJldmlvdXMgPSBOb25l CiAgICAgICAgIGZvciBicmFuY2ggaW4gYnJhbmNoZXM6CiAgICAgICAgICAgICBmb3IgY29tbWl0 IGluIHJldmVyc2VkKHNlbGYuY29tbWl0c1ticmFuY2hdKToKLSAgICAgICAgICAgICAgICBpZiBj b21taXQuaGFzaCA9PSBlbmQ6CisgICAgICAgICAgICAgICAgaWYgYnJhbmNoID09IGJlZ2luOgor ICAgICAgICAgICAgICAgICAgICBicmVhaworICAgICAgICAgICAgICAgIGlmIGNvbW1pdC5oYXNo LnN0YXJ0c3dpdGgoZW5kKSBvciBlbmQgPT0gYnJhbmNoOgogICAgICAgICAgICAgICAgICAgICBp bl9yYW5nZSA9IFRydWUKICAgICAgICAgICAgICAgICBpZiBpbl9yYW5nZSBhbmQgKG5vdCBwcmV2 aW91cyBvciBjb21taXQuaGFzaCAhPSBwcmV2aW91cy5oYXNoKToKICAgICAgICAgICAgICAgICAg ICAgeWllbGQgY29tbWl0CiAgICAgICAgICAgICAgICAgcHJldmlvdXMgPSBjb21taXQKLSAgICAg ICAgICAgICAgICBpZiBjb21taXQuaGFzaCA9PSBiZWdpbjoKKyAgICAgICAgICAgICAgICBpZiBi ZWdpbiBhbmQgY29tbWl0Lmhhc2guc3RhcnRzd2l0aChiZWdpbik6CiAgICAgICAgICAgICAgICAg ICAgIGluX3JhbmdlID0gRmFsc2UKKyAgICAgICAgICAgICAgICAgICAgYnJlYWsKKwogICAgICAg ICAgICAgaW5fcmFuZ2UgPSBGYWxzZQogICAgICAgICAgICAgaWYgbm90IHByZXZpb3VzIG9yIGJy YW5jaCA9PSBzZWxmLmRlZmF1bHRfYnJhbmNoOgogICAgICAgICAgICAgICAgIGNvbnRpbnVlCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS90ZXN0L2dpdF91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5CmluZGV4IGJjN2I2MzkyOWI0YWY0 NzU2OWNmNWZjYmRmODNmOWI4YTY2ZjE5YzkuLjk1ODMwZjg3NGRjMDFlMzMxMTg3MjVkNjQyYjQ4 OWFmZDYwMWZhMzQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5CkBA IC0yNiw3ICsyNiw3IEBAIGltcG9ydCB0ZW1wZmlsZQogaW1wb3J0IHVuaXR0ZXN0CiAKIGZyb20g ZGF0ZXRpbWUgaW1wb3J0IGRhdGV0aW1lCi1mcm9tIHdlYmtpdGNvcmVweSBpbXBvcnQgTG9nZ2Vy Q2FwdHVyZSwgT3V0cHV0Q2FwdHVyZQorZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IHJ1biwgTG9n Z2VyQ2FwdHVyZSwgT3V0cHV0Q2FwdHVyZQogZnJvbSB3ZWJraXRjb3JlcHkubW9ja3MgaW1wb3J0 IFRpbWUgYXMgTW9ja1RpbWUKIGZyb20gd2Via2l0c2NtcHkgaW1wb3J0IENvbW1pdCwgbG9jYWws IG1vY2tzLCByZW1vdGUKIApAQCAtMzA1LDYgKzMwNSw4MCBAQCBjbGFzcyBUZXN0R2l0KHVuaXR0 ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgICAgICAgICAgZ2l0LmNvbW1pdChoYXNoPSc5Yjgz MTFmMicpLAogICAgICAgICAgICAgICAgIF0pLCBDb21taXQuRW5jb2RlcigpLmRlZmF1bHQobGlz dChnaXQuY29tbWl0cyhiZWdpbj1kaWN0KGFyZ3VtZW50PSc5YjgzMTFmMicpLCBlbmQ9ZGljdChh cmd1bWVudD0nNjIxNjUyYWQnKSkpKSkKIAorICAgIGRlZiB0ZXN0X2xvZyhzZWxmKToKKyAgICAg ICAgc2VsZi5tYXhEaWZmID0gTm9uZQorICAgICAgICBwcmludCgnXG5cblxuLS0tLS0tLS0tLS0t JykKKyAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5HaXQoc2VsZi5wYXRoLCBnaXRfc3ZuPVRydWUp OgorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKKyAgICAgICAgICAgICAgICBydW4oWwor ICAgICAgICAgICAgICAgICAgICBsb2NhbC5HaXQuZXhlY3V0YWJsZSgpLCAnbG9nJywgJy0tZm9y bWF0PWZ1bGxlcicsICdtYWluLi4uMWFiZTI1YjQnLAorICAgICAgICAgICAgICAgIF0sIGN3ZD1z ZWxmLnBhdGgsIGNhcHR1cmVfb3V0cHV0PVRydWUsIGVuY29kaW5nPSd1dGYtOCcpLnN0ZG91dCwK KyAgICAgICAgICAgICAgICAnJydjb21taXQgZDhiY2UyNmZhNjVjNmZjOGYzOWMxNzkyN2FiYjc3 ZjY5ZmFiODJmYworQXV0aG9yOiAgICAgSm9uYXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNv bT4KK0F1dGhvckRhdGU6IFNhdCBPY3QgMDMgMDM6NDY6NDAgMjAyMCArMDAwMAorQ29tbWl0OiAg ICAgSm9uYXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNvbT4KK0NvbW1pdERhdGU6IFNhdCBP Y3QgMDMgMDM6NDY6NDAgMjAyMCArMDAwMAorCisgICAgUGF0Y2ggU2VyaWVzCisgICAgZ2l0LXN2 bi1pZDogaHR0cHM6Ly9zdm4uZXhhbXBsZS5vcmcvcmVwb3NpdG9yeS9yZXBvc2l0b3J5L3RydW5r QDkgMjY4ZjQ1Y2MtY2QwOS0wNDEwLWFiM2MtZDUyNjkxYjRkYmZjCisKK2NvbW1pdCBiYWU1ZDFl OTA5OTlkNGY5MTZhOGExNTgxMGNjZmE0M2YzN2EyZmQ2CitBdXRob3I6ICAgICBKb25hdGhhbiBC ZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgorQXV0aG9yRGF0ZTogU2F0IE9jdCAwMyAwMzo0Njo0 MCAyMDIwICswMDAwCitDb21taXQ6ICAgICBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUu Y29tPgorQ29tbWl0RGF0ZTogU2F0IE9jdCAwMyAwMzo0Njo0MCAyMDIwICswMDAwCisKKyAgICA4 dGggY29tbWl0CisgICAgZ2l0LXN2bi1pZDogaHR0cHM6Ly9zdm4uZXhhbXBsZS5vcmcvcmVwb3Np dG9yeS9yZXBvc2l0b3J5L3RydW5rQDggMjY4ZjQ1Y2MtY2QwOS0wNDEwLWFiM2MtZDUyNjkxYjRk YmZjCisKK2NvbW1pdCAxYWJlMjViNDQzZTk4NWY5M2I5MGQ4MzBlNGE3ZTM3MzEzMzZhZjRkCitB dXRob3I6ICAgICBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgorQXV0aG9yRGF0 ZTogU2F0IE9jdCAwMyAwMjoyMzoyMCAyMDIwICswMDAwCitDb21taXQ6ICAgICBKb25hdGhhbiBC ZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgorQ29tbWl0RGF0ZTogU2F0IE9jdCAwMyAwMjoyMzoy MCAyMDIwICswMDAwCisKKyAgICA0dGggY29tbWl0CisgICAgZ2l0LXN2bi1pZDogaHR0cHM6Ly9z dm4uZXhhbXBsZS5vcmcvcmVwb3NpdG9yeS9yZXBvc2l0b3J5L3RydW5rQDQgMjY4ZjQ1Y2MtY2Qw OS0wNDEwLWFiM2MtZDUyNjkxYjRkYmZjCisnJycKKyAgICAgICAgICAgICkKKworICAgIGRlZiB0 ZXN0X2JyYW5jaF9sb2coc2VsZik6CisgICAgICAgIHdpdGggbW9ja3MubG9jYWwuR2l0KHNlbGYu cGF0aCwgZ2l0X3N2bj1UcnVlKToKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoCisgICAg ICAgICAgICAgICAgcnVuKFsKKyAgICAgICAgICAgICAgICAgICAgbG9jYWwuR2l0LmV4ZWN1dGFi bGUoKSwgJ2xvZycsICctLWZvcm1hdD1mdWxsZXInLCAnYnJhbmNoLWIuLi5tYWluJywKKyAgICAg ICAgICAgICAgICBdLCBjd2Q9c2VsZi5wYXRoLCBjYXB0dXJlX291dHB1dD1UcnVlLCBlbmNvZGlu Zz0ndXRmLTgnKS5zdGRvdXQsCisgICAgICAgICAgICAgICAgJycnY29tbWl0IDc5MDcyNWE2ZDc5 ZTI4ZGIyZWNkZGUyOTU0OGQyMjYyYzBiZDA1OWQKK0F1dGhvcjogICAgIEpvbmF0aGFuIEJlZGFy ZCA8amJlZGFyZEBhcHBsZS5jb20+CitBdXRob3JEYXRlOiBTYXQgT2N0IDAzIDAzOjMwOjAwIDIw MjAgKzAwMDAKK0NvbW1pdDogICAgIEpvbmF0aGFuIEJlZGFyZCA8amJlZGFyZEBhcHBsZS5jb20+ CitDb21taXREYXRlOiBTYXQgT2N0IDAzIDAzOjMwOjAwIDIwMjAgKzAwMDAKKworICAgIDd0aCBj b21taXQKKyAgICBnaXQtc3ZuLWlkOiBodHRwczovL3N2bi5leGFtcGxlLm9yZy9yZXBvc2l0b3J5 L3JlcG9zaXRvcnkvdHJ1bmtANyAyNjhmNDVjYy1jZDA5LTA0MTAtYWIzYy1kNTI2OTFiNGRiZmMK KworY29tbWl0IDNjZDMyZTM1MjQxMDU2NWJiNTQzODIxZmJmODU2YTZkM2NhYWQxYzQKK0F1dGhv cjogICAgIEpvbmF0aGFuIEJlZGFyZCA8amJlZGFyZEBhcHBsZS5jb20+CitBdXRob3JEYXRlOiBT YXQgT2N0IDAzIDAyOjQwOjAwIDIwMjAgKzAwMDAKK0NvbW1pdDogICAgIEpvbmF0aGFuIEJlZGFy ZCA8amJlZGFyZEBhcHBsZS5jb20+CitDb21taXREYXRlOiBTYXQgT2N0IDAzIDAyOjQwOjAwIDIw MjAgKzAwMDAKKworICAgIDV0aCBjb21taXQKKyAgICAgICAgQ2hlcnJ5IHBpY2sKKyAgICAgICAg Z2l0LXN2bi1pZDogaHR0cHM6Ly9zdm4ud2Via2l0Lm9yZy9yZXBvc2l0b3J5L3dlYmtpdC90cnVu a0A2IDI2OGY0NWNjLWNkMDktMDQxMC1hYjNjLWQ1MjY5MWI0ZGJmYworICAgIGdpdC1zdm4taWQ6 IGh0dHBzOi8vc3ZuLmV4YW1wbGUub3JnL3JlcG9zaXRvcnkvcmVwb3NpdG9yeS90cnVua0A1IDI2 OGY0NWNjLWNkMDktMDQxMC1hYjNjLWQ1MjY5MWI0ZGJmYworCitjb21taXQgYTMwY2U4NDk0YmYx YWMyODA3YTY5ODQ0ZjcyNmJlNGE5ODQzY2E1NQorQXV0aG9yOiAgICAgSm9uYXRoYW4gQmVkYXJk IDxqYmVkYXJkQGFwcGxlLmNvbT4KK0F1dGhvckRhdGU6IFNhdCBPY3QgMDMgMDI6MDY6NDAgMjAy MCArMDAwMAorQ29tbWl0OiAgICAgSm9uYXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNvbT4K K0NvbW1pdERhdGU6IFNhdCBPY3QgMDMgMDI6MDY6NDAgMjAyMCArMDAwMAorCisgICAgM3JkIGNv bW1pdAorICAgIGdpdC1zdm4taWQ6IGh0dHBzOi8vc3ZuLmV4YW1wbGUub3JnL3JlcG9zaXRvcnkv cmVwb3NpdG9yeS90cnVua0AzIDI2OGY0NWNjLWNkMDktMDQxMC1hYjNjLWQ1MjY5MWI0ZGJmYwor JycnCisgICAgICAgICAgICApCisKIAogY2xhc3MgVGVzdEdpdEh1Yih1bml0dGVzdC5UZXN0Q2Fz ZSk6CiAgICAgcmVtb3RlID0gJ2h0dHBzOi8vZ2l0aHViLmV4YW1wbGUuY29tL1dlYktpdC9XZWJL aXQnCg== 429084 2021-05-19 12:14:57 -0700 2021-06-08 13:27:32 -0700 Patch bug-225889-20210519121457.patch text/plain 8390 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NzQwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTQ3N2RkYmZjNGQ4NjlmMGNiNjU2MDlmMGU3NDNjMGNk YTJhNDkzMS4uY2I2MmM1MTI4YTU5MjBjMmYzNDkxOGM3MGYzMmE3MDNhMzYzMWM5ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDIxLTA1LTE5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIFN1cHBvcnQgYnJhbmNoIHF1ZXJpZXMgaW4gbW9jayBnaXQg bG9nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU4 ODkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc4MTIyNzA1PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvc2V0dXAucHk6IEJ1bXAgdmVyc2lvbi4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weTogRGl0dG8uCisgICAgICAgICog U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0 LnB5OiBBZGQgc3VwcG9ydCBmb3IgYnJhbmNoZXMgaW4KKyAgICAgICAgYGdpdCBsb2dgIGNvbW1h bmRzLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdEdpdC50ZXN0X2xvZyk6CisgICAg ICAgIChUZXN0R2l0LnRlc3RfYnJhbmNoX2xvZyk6CisKIDIwMjEtMDUtMTkgIFNhbSBXZWluaWcg IDx3ZWluaWdAYXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0ZSBCYXNlNjQgZW5jb2RpbmcvZGVj b2RpbmcgdG8gbWF0Y2ggbW9yZSBtb2Rlcm4gV2ViS2l0IGNvbnZlbnRpb25zCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9s b2NhbC9naXQucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS9tb2Nrcy9sb2NhbC9naXQucHkKaW5kZXggM2VmMDFlZmMyMmJlODY0MDFmNjJkMGEwMDAy NDZmNTk0ZmZjNjM4ZC4uYzc4ZjUwMjU3OTU5YWYxYjdkOWU1YmFiNzAxNzZiOTQ5Y2RiNWM5ZSAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvbW9ja3MvbG9jYWwvZ2l0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL2dpdC5weQpAQCAtMjUzLDcgKzI1Myw3IEBA IG5vdGhpbmcgdG8gY29tbWl0LCB3b3JraW5nIHRyZWUgY2xlYW4KICAgICAgICAgICAgICAgICAg ICAgICAgICdBdXRob3JEYXRlOiB7ZGF0ZX1cbicKICAgICAgICAgICAgICAgICAgICAgICAgICdD b21taXQ6ICAgICB7YXV0aG9yfSA8e2VtYWlsfT5cbicKICAgICAgICAgICAgICAgICAgICAgICAg ICdDb21taXREYXRlOiB7ZGF0ZX1cbicKLSAgICAgICAgICAgICAgICAgICAgICAgICdcbntsb2d9 Jy5mb3JtYXQoCisgICAgICAgICAgICAgICAgICAgICAgICAnXG57bG9nfVxuJy5mb3JtYXQoCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgaGFzaD1jb21taXQuaGFzaCwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBhdXRob3I9Y29tbWl0LmF1dGhvci5uYW1lLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGVtYWlsPWNvbW1pdC5hdXRob3IuZW1haWwsCkBAIC0zNTMsNyArMzUz LDcgQEAgbm90aGluZyB0byBjb21taXQsIHdvcmtpbmcgdHJlZSBjbGVhbgogICAgICAgICAgICAg ICAgICAgICByZXR1cm4gc2VsZi5jb21taXRzW3NlbGYuZGVmYXVsdF9icmFuY2hdW2ZvdW5kLmJy YW5jaF9wb2ludCAtIGRpZmZlcmVuY2UgLSAxXQogICAgICAgICAgICAgICAgIHJldHVybiBOb25l CiAKLSAgICAgICAgc29tZXRoaW5nID0gc3RyKHNvbWV0aGluZykKKyAgICAgICAgc29tZXRoaW5n ID0gc3RyKHNvbWV0aGluZykucmVwbGFjZSgncmVtb3Rlcy8nLCAnJykKICAgICAgICAgaWYgJy4u JyBpbiBzb21ldGhpbmc6CiAgICAgICAgICAgICBhLCBiID0gc29tZXRoaW5nLnNwbGl0KCcuLicp CiAgICAgICAgICAgICBhID0gc2VsZi5maW5kKGEpCkBAIC01MDEsMjggKzUwMSw0MyBAQCBub3Ro aW5nIHRvIGNvbW1pdCwgd29ya2luZyB0cmVlIGNsZWFuCiAgICAgICAgICkKIAogICAgIGRlZiBj b21taXRzX2luX3JhbmdlKHNlbGYsIGJlZ2luLCBlbmQpOgorICAgICAgICBiZWdpbiA9IGJlZ2lu LnJlcGxhY2UoJ3JlbW90ZXMvJywgJycpIGlmIGJlZ2luIGVsc2UgYmVnaW4KKyAgICAgICAgZW5k ID0gZW5kLnJlcGxhY2UoJ3JlbW90ZXMvJywgJycpIGlmIGVuZCBlbHNlIGVuZAorCisgICAgICAg IGlmIGJlZ2luIGFuZCBzZWxmLnJlbW90ZXMuZ2V0KGJlZ2luKToKKyAgICAgICAgICAgIGJlZ2lu ID0gc2VsZi5yZW1vdGVzLmdldChiZWdpbikuaGFzaAorICAgICAgICBpZiBlbmQgYW5kIHNlbGYu cmVtb3Rlcy5nZXQoZW5kKToKKyAgICAgICAgICAgIGVuZCA9IHNlbGYucmVtb3Rlcy5nZXQoZW5k KS5oYXNoCisKICAgICAgICAgYnJhbmNoZXMgPSBbc2VsZi5kZWZhdWx0X2JyYW5jaF0KLSAgICAg ICAgZm9yIGJyYW5jaCwgY29tbWl0cyBpbiBzZWxmLmNvbW1pdHMuaXRlbXMoKToKLSAgICAgICAg ICAgIGlmIGJyYW5jaCA9PSBzZWxmLmRlZmF1bHRfYnJhbmNoOgotICAgICAgICAgICAgICAgIGNv bnRpbnVlCi0gICAgICAgICAgICBmb3IgY29tbWl0IGluIGNvbW1pdHM6Ci0gICAgICAgICAgICAg ICAgaWYgY29tbWl0Lmhhc2ggPT0gZW5kOgotICAgICAgICAgICAgICAgICAgICBicmFuY2hlcy5p bnNlcnQoMCwgYnJhbmNoKQorICAgICAgICBpZiBlbmQgaW4gc2VsZi5jb21taXRzLmtleXMoKSBh bmQgZW5kICE9IHNlbGYuZGVmYXVsdF9icmFuY2g6CisgICAgICAgICAgICBicmFuY2hlcy5hcHBl bmQoZW5kKQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgZm9yIGJyYW5jaCwgY29tbWl0cyBp biBzZWxmLmNvbW1pdHMuaXRlbXMoKToKKyAgICAgICAgICAgICAgICBpZiBicmFuY2ggPT0gc2Vs Zi5kZWZhdWx0X2JyYW5jaDoKKyAgICAgICAgICAgICAgICAgICAgY29udGludWUKKyAgICAgICAg ICAgICAgICBmb3IgY29tbWl0IGluIGNvbW1pdHM6CisgICAgICAgICAgICAgICAgICAgIGlmIGNv bW1pdC5oYXNoLnN0YXJ0c3dpdGgoZW5kKToKKyAgICAgICAgICAgICAgICAgICAgICAgIGJyYW5j aGVzLmluc2VydCgwLCBicmFuY2gpCisgICAgICAgICAgICAgICAgICAgICAgICBicmVhaworICAg ICAgICAgICAgICAgIGlmIGxlbihicmFuY2hlcykgPiAxOgogICAgICAgICAgICAgICAgICAgICBi cmVhawotICAgICAgICAgICAgaWYgbGVuKGJyYW5jaGVzKSA+IDE6Ci0gICAgICAgICAgICAgICAg YnJlYWsKIAogICAgICAgICBpbl9yYW5nZSA9IEZhbHNlCiAgICAgICAgIHByZXZpb3VzID0gTm9u ZQogICAgICAgICBmb3IgYnJhbmNoIGluIGJyYW5jaGVzOgogICAgICAgICAgICAgZm9yIGNvbW1p dCBpbiByZXZlcnNlZChzZWxmLmNvbW1pdHNbYnJhbmNoXSk6Ci0gICAgICAgICAgICAgICAgaWYg Y29tbWl0Lmhhc2ggPT0gZW5kOgorICAgICAgICAgICAgICAgIGlmIGJyYW5jaCA9PSBiZWdpbjoK KyAgICAgICAgICAgICAgICAgICAgYnJlYWsKKyAgICAgICAgICAgICAgICBpZiBjb21taXQuaGFz aC5zdGFydHN3aXRoKGVuZCkgb3IgZW5kID09IGJyYW5jaDoKICAgICAgICAgICAgICAgICAgICAg aW5fcmFuZ2UgPSBUcnVlCiAgICAgICAgICAgICAgICAgaWYgaW5fcmFuZ2UgYW5kIChub3QgcHJl dmlvdXMgb3IgY29tbWl0Lmhhc2ggIT0gcHJldmlvdXMuaGFzaCk6CiAgICAgICAgICAgICAgICAg ICAgIHlpZWxkIGNvbW1pdAogICAgICAgICAgICAgICAgIHByZXZpb3VzID0gY29tbWl0Ci0gICAg ICAgICAgICAgICAgaWYgY29tbWl0Lmhhc2ggPT0gYmVnaW46CisgICAgICAgICAgICAgICAgaWYg YmVnaW4gYW5kIGNvbW1pdC5oYXNoLnN0YXJ0c3dpdGgoYmVnaW4pOgogICAgICAgICAgICAgICAg ICAgICBpbl9yYW5nZSA9IEZhbHNlCisgICAgICAgICAgICAgICAgICAgIGJyZWFrCisKICAgICAg ICAgICAgIGluX3JhbmdlID0gRmFsc2UKICAgICAgICAgICAgIGlmIG5vdCBwcmV2aW91cyBvciBi cmFuY2ggPT0gc2VsZi5kZWZhdWx0X2JyYW5jaDoKICAgICAgICAgICAgICAgICBjb250aW51ZQpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvdGVzdC9naXRfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5weQppbmRleCBiYzdiNjM5MjliNGFm NDc1NjljZjVmY2JkZjgzZjliOGE2NmYxOWM5Li4xZGM0OGIwNzAyYmVjNjk3ODEwMjZiY2QxMmY3 MWM2Y2FlZjRiZTNlIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5weQpA QCAtMjYsNyArMjYsNyBAQCBpbXBvcnQgdGVtcGZpbGUKIGltcG9ydCB1bml0dGVzdAogCiBmcm9t IGRhdGV0aW1lIGltcG9ydCBkYXRldGltZQotZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IExvZ2dl ckNhcHR1cmUsIE91dHB1dENhcHR1cmUKK2Zyb20gd2Via2l0Y29yZXB5IGltcG9ydCBydW4sIExv Z2dlckNhcHR1cmUsIE91dHB1dENhcHR1cmUKIGZyb20gd2Via2l0Y29yZXB5Lm1vY2tzIGltcG9y dCBUaW1lIGFzIE1vY2tUaW1lCiBmcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBDb21taXQsIGxvY2Fs LCBtb2NrcywgcmVtb3RlCiAKQEAgLTMwNSw2ICszMDUsNzggQEAgY2xhc3MgVGVzdEdpdCh1bml0 dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICAgICAgICAgIGdpdC5jb21taXQoaGFzaD0nOWI4 MzExZjInKSwKICAgICAgICAgICAgICAgICBdKSwgQ29tbWl0LkVuY29kZXIoKS5kZWZhdWx0KGxp c3QoZ2l0LmNvbW1pdHMoYmVnaW49ZGljdChhcmd1bWVudD0nOWI4MzExZjInKSwgZW5kPWRpY3Qo YXJndW1lbnQ9JzYyMTY1MmFkJykpKSkpCiAKKyAgICBkZWYgdGVzdF9sb2coc2VsZik6CisgICAg ICAgIHdpdGggbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0aCwgZ2l0X3N2bj1UcnVlKToKKyAgICAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoCisgICAgICAgICAgICAgICAgcnVuKFsKKyAgICAgICAg ICAgICAgICAgICAgbG9jYWwuR2l0LmV4ZWN1dGFibGUoKSwgJ2xvZycsICctLWZvcm1hdD1mdWxs ZXInLCAncmVtb3Rlcy9vcmlnaW4vbWFpbi4uLjFhYmUyNWI0JywKKyAgICAgICAgICAgICAgICBd LCBjd2Q9c2VsZi5wYXRoLCBjYXB0dXJlX291dHB1dD1UcnVlLCBlbmNvZGluZz0ndXRmLTgnKS5z dGRvdXQsCisgICAgICAgICAgICAgICAgJycnY29tbWl0IGQ4YmNlMjZmYTY1YzZmYzhmMzljMTc5 MjdhYmI3N2Y2OWZhYjgyZmMKK0F1dGhvcjogICAgIEpvbmF0aGFuIEJlZGFyZCA8amJlZGFyZEBh cHBsZS5jb20+CitBdXRob3JEYXRlOiBTYXQgT2N0IDAzIDAzOjQ2OjQwIDIwMjAgKzAwMDAKK0Nv bW1pdDogICAgIEpvbmF0aGFuIEJlZGFyZCA8amJlZGFyZEBhcHBsZS5jb20+CitDb21taXREYXRl OiBTYXQgT2N0IDAzIDAzOjQ2OjQwIDIwMjAgKzAwMDAKKworICAgIFBhdGNoIFNlcmllcworICAg IGdpdC1zdm4taWQ6IGh0dHBzOi8vc3ZuLmV4YW1wbGUub3JnL3JlcG9zaXRvcnkvcmVwb3NpdG9y eS90cnVua0A5IDI2OGY0NWNjLWNkMDktMDQxMC1hYjNjLWQ1MjY5MWI0ZGJmYworCitjb21taXQg YmFlNWQxZTkwOTk5ZDRmOTE2YThhMTU4MTBjY2ZhNDNmMzdhMmZkNgorQXV0aG9yOiAgICAgSm9u YXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNvbT4KK0F1dGhvckRhdGU6IFNhdCBPY3QgMDMg MDM6NDY6NDAgMjAyMCArMDAwMAorQ29tbWl0OiAgICAgSm9uYXRoYW4gQmVkYXJkIDxqYmVkYXJk QGFwcGxlLmNvbT4KK0NvbW1pdERhdGU6IFNhdCBPY3QgMDMgMDM6NDY6NDAgMjAyMCArMDAwMAor CisgICAgOHRoIGNvbW1pdAorICAgIGdpdC1zdm4taWQ6IGh0dHBzOi8vc3ZuLmV4YW1wbGUub3Jn L3JlcG9zaXRvcnkvcmVwb3NpdG9yeS90cnVua0A4IDI2OGY0NWNjLWNkMDktMDQxMC1hYjNjLWQ1 MjY5MWI0ZGJmYworCitjb21taXQgMWFiZTI1YjQ0M2U5ODVmOTNiOTBkODMwZTRhN2UzNzMxMzM2 YWY0ZAorQXV0aG9yOiAgICAgSm9uYXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNvbT4KK0F1 dGhvckRhdGU6IFNhdCBPY3QgMDMgMDI6MjM6MjAgMjAyMCArMDAwMAorQ29tbWl0OiAgICAgSm9u YXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNvbT4KK0NvbW1pdERhdGU6IFNhdCBPY3QgMDMg MDI6MjM6MjAgMjAyMCArMDAwMAorCisgICAgNHRoIGNvbW1pdAorICAgIGdpdC1zdm4taWQ6IGh0 dHBzOi8vc3ZuLmV4YW1wbGUub3JnL3JlcG9zaXRvcnkvcmVwb3NpdG9yeS90cnVua0A0IDI2OGY0 NWNjLWNkMDktMDQxMC1hYjNjLWQ1MjY5MWI0ZGJmYworJycnCisgICAgICAgICAgICApCisKKyAg ICBkZWYgdGVzdF9icmFuY2hfbG9nKHNlbGYpOgorICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdp dChzZWxmLnBhdGgsIGdpdF9zdm49VHJ1ZSk6CisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFs KAorICAgICAgICAgICAgICAgIHJ1bihbCisgICAgICAgICAgICAgICAgICAgIGxvY2FsLkdpdC5l eGVjdXRhYmxlKCksICdsb2cnLCAnLS1mb3JtYXQ9ZnVsbGVyJywgJ2JyYW5jaC1iLi4ubWFpbics CisgICAgICAgICAgICAgICAgXSwgY3dkPXNlbGYucGF0aCwgY2FwdHVyZV9vdXRwdXQ9VHJ1ZSwg ZW5jb2Rpbmc9J3V0Zi04Jykuc3Rkb3V0LAorICAgICAgICAgICAgICAgICcnJ2NvbW1pdCA3OTA3 MjVhNmQ3OWUyOGRiMmVjZGRlMjk1NDhkMjI2MmMwYmQwNTlkCitBdXRob3I6ICAgICBKb25hdGhh biBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgorQXV0aG9yRGF0ZTogU2F0IE9jdCAwMyAwMzoz MDowMCAyMDIwICswMDAwCitDb21taXQ6ICAgICBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBw bGUuY29tPgorQ29tbWl0RGF0ZTogU2F0IE9jdCAwMyAwMzozMDowMCAyMDIwICswMDAwCisKKyAg ICA3dGggY29tbWl0CisgICAgZ2l0LXN2bi1pZDogaHR0cHM6Ly9zdm4uZXhhbXBsZS5vcmcvcmVw b3NpdG9yeS9yZXBvc2l0b3J5L3RydW5rQDcgMjY4ZjQ1Y2MtY2QwOS0wNDEwLWFiM2MtZDUyNjkx YjRkYmZjCisKK2NvbW1pdCAzY2QzMmUzNTI0MTA1NjViYjU0MzgyMWZiZjg1NmE2ZDNjYWFkMWM0 CitBdXRob3I6ICAgICBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgorQXV0aG9y RGF0ZTogU2F0IE9jdCAwMyAwMjo0MDowMCAyMDIwICswMDAwCitDb21taXQ6ICAgICBKb25hdGhh biBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgorQ29tbWl0RGF0ZTogU2F0IE9jdCAwMyAwMjo0 MDowMCAyMDIwICswMDAwCisKKyAgICA1dGggY29tbWl0CisgICAgICAgIENoZXJyeSBwaWNrCisg ICAgICAgIGdpdC1zdm4taWQ6IGh0dHBzOi8vc3ZuLndlYmtpdC5vcmcvcmVwb3NpdG9yeS93ZWJr aXQvdHJ1bmtANiAyNjhmNDVjYy1jZDA5LTA0MTAtYWIzYy1kNTI2OTFiNGRiZmMKKyAgICBnaXQt c3ZuLWlkOiBodHRwczovL3N2bi5leGFtcGxlLm9yZy9yZXBvc2l0b3J5L3JlcG9zaXRvcnkvdHJ1 bmtANSAyNjhmNDVjYy1jZDA5LTA0MTAtYWIzYy1kNTI2OTFiNGRiZmMKKworY29tbWl0IGEzMGNl ODQ5NGJmMWFjMjgwN2E2OTg0NGY3MjZiZTRhOTg0M2NhNTUKK0F1dGhvcjogICAgIEpvbmF0aGFu IEJlZGFyZCA8amJlZGFyZEBhcHBsZS5jb20+CitBdXRob3JEYXRlOiBTYXQgT2N0IDAzIDAyOjA2 OjQwIDIwMjAgKzAwMDAKK0NvbW1pdDogICAgIEpvbmF0aGFuIEJlZGFyZCA8amJlZGFyZEBhcHBs ZS5jb20+CitDb21taXREYXRlOiBTYXQgT2N0IDAzIDAyOjA2OjQwIDIwMjAgKzAwMDAKKworICAg IDNyZCBjb21taXQKKyAgICBnaXQtc3ZuLWlkOiBodHRwczovL3N2bi5leGFtcGxlLm9yZy9yZXBv c2l0b3J5L3JlcG9zaXRvcnkvdHJ1bmtAMyAyNjhmNDVjYy1jZDA5LTA0MTAtYWIzYy1kNTI2OTFi NGRiZmMKKycnJworICAgICAgICAgICAgKQorCiAKIGNsYXNzIFRlc3RHaXRIdWIodW5pdHRlc3Qu VGVzdENhc2UpOgogICAgIHJlbW90ZSA9ICdodHRwczovL2dpdGh1Yi5leGFtcGxlLmNvbS9XZWJL aXQvV2ViS2l0Jwo= 430883 2021-06-08 13:27:34 -0700 2021-06-16 11:09:15 -0700 Patch bug-225889-20210608132733.patch text/plain 9325 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3ODYyNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDIxLTA2LTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIFN1cHBvcnQgYnJhbmNoIHF1ZXJpZXMgaW4gbW9j ayBnaXQgbG9nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjU4ODkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc4MTIyNzA1PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvc2V0dXAucHk6IEJ1bXAgdmVyc2lvbi4KKyAgICAgICAgKiBTY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weTogRGl0dG8uCisgICAg ICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9j YWwvZ2l0LnB5OiBBZGQgc3VwcG9ydCBmb3IgYnJhbmNoZXMgaW4KKyAgICAgICAgYGdpdCBsb2dg IGNvbW1hbmRzLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdEdpdC50ZXN0X2xvZyk6 CisgICAgICAgIChUZXN0R2l0LnRlc3RfYnJhbmNoX2xvZyk6CisKIDIwMjEtMDYtMDggIEZ1amlp IEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAgICAgICAgcnVuLXdlYmtp dC10ZXN0czogVGFza1Bvb2wgcmVwb3J0cyBQaWNrbGluZ0Vycm9yIGZvciBXaW5kb3dzIFB5dGhv bgpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkJ KHJldmlzaW9uIDI3ODYyNSkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3NldHVwLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yOSw3ICsyOSw3IEBAIGRlZiByZWFkbWUoKToK IAogc2V0dXAoCiAgICAgbmFtZT0nd2Via2l0c2NtcHknLAotICAgIHZlcnNpb249JzAuMTQuMycs CisgICAgdmVyc2lvbj0nMC4xNC40JywKICAgICBkZXNjcmlwdGlvbj0nTGlicmFyeSBkZXNpZ25l ZCB0byBpbnRlcmFjdCB3aXRoIGdpdCBhbmQgc3ZuIHJlcG9zaXRvcmllcy4nLAogICAgIGxvbmdf ZGVzY3JpcHRpb249cmVhZG1lKCksCiAgICAgY2xhc3NpZmllcnM9WwpJbmRleDogVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv X19pbml0X18ucHkJKHJldmlzaW9uIDI3ODYyNSkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00 Niw3ICs0Niw3IEBAIGV4Y2VwdCBJbXBvcnRFcnJvcjoKICAgICAgICAgIlBsZWFzZSBpbnN0YWxs IHdlYmtpdGNvcmVweSB3aXRoIGBwaXAgaW5zdGFsbCB3ZWJraXRjb3JlcHkgLS1leHRyYS1pbmRl eC11cmwgPHBhY2thZ2UgaW5kZXggVVJMPmAiCiAgICAgKQogCi12ZXJzaW9uID0gVmVyc2lvbigw LCAxNCwgMykKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDE0LCA0KQogCiBBdXRvSW5zdGFsbC5yZWdp c3RlcihQYWNrYWdlKCdmYXN0ZW5lcnMnLCBWZXJzaW9uKDAsIDE1LCAwKSkpCiBBdXRvSW5zdGFs bC5yZWdpc3RlcihQYWNrYWdlKCdtb25vdG9uaWMnLCBWZXJzaW9uKDEsIDUpKSkKSW5kZXg6IFRv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2Fs L2dpdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9naXQucHkJKHJldmlzaW9uIDI3ODYyNSkKKysrIFRv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2Fs L2dpdC5weQkod29ya2luZyBjb3B5KQpAQCAtMjUzLDcgKzI1Myw3IEBAIG5vdGhpbmcgdG8gY29t bWl0LCB3b3JraW5nIHRyZWUgY2xlYW4KICAgICAgICAgICAgICAgICAgICAgICAgICdBdXRob3JE YXRlOiB7ZGF0ZX1cbicKICAgICAgICAgICAgICAgICAgICAgICAgICdDb21taXQ6ICAgICB7YXV0 aG9yfSA8e2VtYWlsfT5cbicKICAgICAgICAgICAgICAgICAgICAgICAgICdDb21taXREYXRlOiB7 ZGF0ZX1cbicKLSAgICAgICAgICAgICAgICAgICAgICAgICdcbntsb2d9Jy5mb3JtYXQoCisgICAg ICAgICAgICAgICAgICAgICAgICAnXG57bG9nfVxuJy5mb3JtYXQoCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgaGFzaD1jb21taXQuaGFzaCwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBhdXRob3I9Y29tbWl0LmF1dGhvci5uYW1lLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg IGVtYWlsPWNvbW1pdC5hdXRob3IuZW1haWwsCkBAIC0zNTMsNyArMzUzLDcgQEAgbm90aGluZyB0 byBjb21taXQsIHdvcmtpbmcgdHJlZSBjbGVhbgogICAgICAgICAgICAgICAgICAgICByZXR1cm4g c2VsZi5jb21taXRzW3NlbGYuZGVmYXVsdF9icmFuY2hdW2ZvdW5kLmJyYW5jaF9wb2ludCAtIGRp ZmZlcmVuY2UgLSAxXQogICAgICAgICAgICAgICAgIHJldHVybiBOb25lCiAKLSAgICAgICAgc29t ZXRoaW5nID0gc3RyKHNvbWV0aGluZykKKyAgICAgICAgc29tZXRoaW5nID0gc3RyKHNvbWV0aGlu ZykucmVwbGFjZSgncmVtb3Rlcy8nLCAnJykKICAgICAgICAgaWYgJy4uJyBpbiBzb21ldGhpbmc6 CiAgICAgICAgICAgICBhLCBiID0gc29tZXRoaW5nLnNwbGl0KCcuLicpCiAgICAgICAgICAgICBh ID0gc2VsZi5maW5kKGEpCkBAIC01MDEsMjggKzUwMSw0MyBAQCBub3RoaW5nIHRvIGNvbW1pdCwg d29ya2luZyB0cmVlIGNsZWFuCiAgICAgICAgICkKIAogICAgIGRlZiBjb21taXRzX2luX3Jhbmdl KHNlbGYsIGJlZ2luLCBlbmQpOgorICAgICAgICBiZWdpbiA9IGJlZ2luLnJlcGxhY2UoJ3JlbW90 ZXMvJywgJycpIGlmIGJlZ2luIGVsc2UgYmVnaW4KKyAgICAgICAgZW5kID0gZW5kLnJlcGxhY2Uo J3JlbW90ZXMvJywgJycpIGlmIGVuZCBlbHNlIGVuZAorCisgICAgICAgIGlmIGJlZ2luIGFuZCBz ZWxmLnJlbW90ZXMuZ2V0KGJlZ2luKToKKyAgICAgICAgICAgIGJlZ2luID0gc2VsZi5yZW1vdGVz LmdldChiZWdpbikuaGFzaAorICAgICAgICBpZiBlbmQgYW5kIHNlbGYucmVtb3Rlcy5nZXQoZW5k KToKKyAgICAgICAgICAgIGVuZCA9IHNlbGYucmVtb3Rlcy5nZXQoZW5kKS5oYXNoCisKICAgICAg ICAgYnJhbmNoZXMgPSBbc2VsZi5kZWZhdWx0X2JyYW5jaF0KLSAgICAgICAgZm9yIGJyYW5jaCwg Y29tbWl0cyBpbiBzZWxmLmNvbW1pdHMuaXRlbXMoKToKLSAgICAgICAgICAgIGlmIGJyYW5jaCA9 PSBzZWxmLmRlZmF1bHRfYnJhbmNoOgotICAgICAgICAgICAgICAgIGNvbnRpbnVlCi0gICAgICAg ICAgICBmb3IgY29tbWl0IGluIGNvbW1pdHM6Ci0gICAgICAgICAgICAgICAgaWYgY29tbWl0Lmhh c2ggPT0gZW5kOgotICAgICAgICAgICAgICAgICAgICBicmFuY2hlcy5pbnNlcnQoMCwgYnJhbmNo KQorICAgICAgICBpZiBlbmQgaW4gc2VsZi5jb21taXRzLmtleXMoKSBhbmQgZW5kICE9IHNlbGYu ZGVmYXVsdF9icmFuY2g6CisgICAgICAgICAgICBicmFuY2hlcy5hcHBlbmQoZW5kKQorICAgICAg ICBlbHNlOgorICAgICAgICAgICAgZm9yIGJyYW5jaCwgY29tbWl0cyBpbiBzZWxmLmNvbW1pdHMu aXRlbXMoKToKKyAgICAgICAgICAgICAgICBpZiBicmFuY2ggPT0gc2VsZi5kZWZhdWx0X2JyYW5j aDoKKyAgICAgICAgICAgICAgICAgICAgY29udGludWUKKyAgICAgICAgICAgICAgICBmb3IgY29t bWl0IGluIGNvbW1pdHM6CisgICAgICAgICAgICAgICAgICAgIGlmIGNvbW1pdC5oYXNoLnN0YXJ0 c3dpdGgoZW5kKToKKyAgICAgICAgICAgICAgICAgICAgICAgIGJyYW5jaGVzLmluc2VydCgwLCBi cmFuY2gpCisgICAgICAgICAgICAgICAgICAgICAgICBicmVhaworICAgICAgICAgICAgICAgIGlm IGxlbihicmFuY2hlcykgPiAxOgogICAgICAgICAgICAgICAgICAgICBicmVhawotICAgICAgICAg ICAgaWYgbGVuKGJyYW5jaGVzKSA+IDE6Ci0gICAgICAgICAgICAgICAgYnJlYWsKIAogICAgICAg ICBpbl9yYW5nZSA9IEZhbHNlCiAgICAgICAgIHByZXZpb3VzID0gTm9uZQogICAgICAgICBmb3Ig YnJhbmNoIGluIGJyYW5jaGVzOgogICAgICAgICAgICAgZm9yIGNvbW1pdCBpbiByZXZlcnNlZChz ZWxmLmNvbW1pdHNbYnJhbmNoXSk6Ci0gICAgICAgICAgICAgICAgaWYgY29tbWl0Lmhhc2ggPT0g ZW5kOgorICAgICAgICAgICAgICAgIGlmIGJyYW5jaCA9PSBiZWdpbjoKKyAgICAgICAgICAgICAg ICAgICAgYnJlYWsKKyAgICAgICAgICAgICAgICBpZiBjb21taXQuaGFzaC5zdGFydHN3aXRoKGVu ZCkgb3IgZW5kID09IGJyYW5jaDoKICAgICAgICAgICAgICAgICAgICAgaW5fcmFuZ2UgPSBUcnVl CiAgICAgICAgICAgICAgICAgaWYgaW5fcmFuZ2UgYW5kIChub3QgcHJldmlvdXMgb3IgY29tbWl0 Lmhhc2ggIT0gcHJldmlvdXMuaGFzaCk6CiAgICAgICAgICAgICAgICAgICAgIHlpZWxkIGNvbW1p dAogICAgICAgICAgICAgICAgIHByZXZpb3VzID0gY29tbWl0Ci0gICAgICAgICAgICAgICAgaWYg Y29tbWl0Lmhhc2ggPT0gYmVnaW46CisgICAgICAgICAgICAgICAgaWYgYmVnaW4gYW5kIGNvbW1p dC5oYXNoLnN0YXJ0c3dpdGgoYmVnaW4pOgogICAgICAgICAgICAgICAgICAgICBpbl9yYW5nZSA9 IEZhbHNlCisgICAgICAgICAgICAgICAgICAgIGJyZWFrCisKICAgICAgICAgICAgIGluX3Jhbmdl ID0gRmFsc2UKICAgICAgICAgICAgIGlmIG5vdCBwcmV2aW91cyBvciBicmFuY2ggPT0gc2VsZi5k ZWZhdWx0X2JyYW5jaDoKICAgICAgICAgICAgICAgICBjb250aW51ZQpJbmRleDogVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3Qu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI3ODYyNSkKKysrIFRvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0 ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yNiw3ICsyNiw3IEBAIGltcG9ydCB0ZW1wZmlsZQog aW1wb3J0IHVuaXR0ZXN0CiAKIGZyb20gZGF0ZXRpbWUgaW1wb3J0IGRhdGV0aW1lCi1mcm9tIHdl YmtpdGNvcmVweSBpbXBvcnQgTG9nZ2VyQ2FwdHVyZSwgT3V0cHV0Q2FwdHVyZQorZnJvbSB3ZWJr aXRjb3JlcHkgaW1wb3J0IHJ1biwgTG9nZ2VyQ2FwdHVyZSwgT3V0cHV0Q2FwdHVyZQogZnJvbSB3 ZWJraXRjb3JlcHkubW9ja3MgaW1wb3J0IFRpbWUgYXMgTW9ja1RpbWUKIGZyb20gd2Via2l0c2Nt cHkgaW1wb3J0IENvbW1pdCwgbG9jYWwsIG1vY2tzLCByZW1vdGUKIApAQCAtMzA1LDYgKzMwNSw3 OCBAQCBjbGFzcyBUZXN0R2l0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgICAgICAg ICAgZ2l0LmNvbW1pdChoYXNoPSc5YjgzMTFmMicpLAogICAgICAgICAgICAgICAgIF0pLCBDb21t aXQuRW5jb2RlcigpLmRlZmF1bHQobGlzdChnaXQuY29tbWl0cyhiZWdpbj1kaWN0KGFyZ3VtZW50 PSc5YjgzMTFmMicpLCBlbmQ9ZGljdChhcmd1bWVudD0nNjIxNjUyYWQnKSkpKSkKIAorICAgIGRl ZiB0ZXN0X2xvZyhzZWxmKToKKyAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5HaXQoc2VsZi5wYXRo LCBnaXRfc3ZuPVRydWUpOgorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKKyAgICAgICAg ICAgICAgICBydW4oWworICAgICAgICAgICAgICAgICAgICBsb2NhbC5HaXQuZXhlY3V0YWJsZSgp LCAnbG9nJywgJy0tZm9ybWF0PWZ1bGxlcicsICdyZW1vdGVzL29yaWdpbi9tYWluLi4uMWFiZTI1 YjQnLAorICAgICAgICAgICAgICAgIF0sIGN3ZD1zZWxmLnBhdGgsIGNhcHR1cmVfb3V0cHV0PVRy dWUsIGVuY29kaW5nPSd1dGYtOCcpLnN0ZG91dCwKKyAgICAgICAgICAgICAgICAnJydjb21taXQg ZDhiY2UyNmZhNjVjNmZjOGYzOWMxNzkyN2FiYjc3ZjY5ZmFiODJmYworQXV0aG9yOiAgICAgSm9u YXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNvbT4KK0F1dGhvckRhdGU6IFNhdCBPY3QgMDMg MDM6NDY6NDAgMjAyMCArMDAwMAorQ29tbWl0OiAgICAgSm9uYXRoYW4gQmVkYXJkIDxqYmVkYXJk QGFwcGxlLmNvbT4KK0NvbW1pdERhdGU6IFNhdCBPY3QgMDMgMDM6NDY6NDAgMjAyMCArMDAwMAor CisgICAgUGF0Y2ggU2VyaWVzCisgICAgZ2l0LXN2bi1pZDogaHR0cHM6Ly9zdm4uZXhhbXBsZS5v cmcvcmVwb3NpdG9yeS9yZXBvc2l0b3J5L3RydW5rQDkgMjY4ZjQ1Y2MtY2QwOS0wNDEwLWFiM2Mt ZDUyNjkxYjRkYmZjCisKK2NvbW1pdCBiYWU1ZDFlOTA5OTlkNGY5MTZhOGExNTgxMGNjZmE0M2Yz N2EyZmQ2CitBdXRob3I6ICAgICBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgor QXV0aG9yRGF0ZTogU2F0IE9jdCAwMyAwMzo0Njo0MCAyMDIwICswMDAwCitDb21taXQ6ICAgICBK b25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgorQ29tbWl0RGF0ZTogU2F0IE9jdCAw MyAwMzo0Njo0MCAyMDIwICswMDAwCisKKyAgICA4dGggY29tbWl0CisgICAgZ2l0LXN2bi1pZDog aHR0cHM6Ly9zdm4uZXhhbXBsZS5vcmcvcmVwb3NpdG9yeS9yZXBvc2l0b3J5L3RydW5rQDggMjY4 ZjQ1Y2MtY2QwOS0wNDEwLWFiM2MtZDUyNjkxYjRkYmZjCisKK2NvbW1pdCAxYWJlMjViNDQzZTk4 NWY5M2I5MGQ4MzBlNGE3ZTM3MzEzMzZhZjRkCitBdXRob3I6ICAgICBKb25hdGhhbiBCZWRhcmQg PGpiZWRhcmRAYXBwbGUuY29tPgorQXV0aG9yRGF0ZTogU2F0IE9jdCAwMyAwMjoyMzoyMCAyMDIw ICswMDAwCitDb21taXQ6ICAgICBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgor Q29tbWl0RGF0ZTogU2F0IE9jdCAwMyAwMjoyMzoyMCAyMDIwICswMDAwCisKKyAgICA0dGggY29t bWl0CisgICAgZ2l0LXN2bi1pZDogaHR0cHM6Ly9zdm4uZXhhbXBsZS5vcmcvcmVwb3NpdG9yeS9y ZXBvc2l0b3J5L3RydW5rQDQgMjY4ZjQ1Y2MtY2QwOS0wNDEwLWFiM2MtZDUyNjkxYjRkYmZjCisn JycKKyAgICAgICAgICAgICkKKworICAgIGRlZiB0ZXN0X2JyYW5jaF9sb2coc2VsZik6CisgICAg ICAgIHdpdGggbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0aCwgZ2l0X3N2bj1UcnVlKToKKyAgICAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoCisgICAgICAgICAgICAgICAgcnVuKFsKKyAgICAgICAg ICAgICAgICAgICAgbG9jYWwuR2l0LmV4ZWN1dGFibGUoKSwgJ2xvZycsICctLWZvcm1hdD1mdWxs ZXInLCAnYnJhbmNoLWIuLi5tYWluJywKKyAgICAgICAgICAgICAgICBdLCBjd2Q9c2VsZi5wYXRo LCBjYXB0dXJlX291dHB1dD1UcnVlLCBlbmNvZGluZz0ndXRmLTgnKS5zdGRvdXQsCisgICAgICAg ICAgICAgICAgJycnY29tbWl0IDc5MDcyNWE2ZDc5ZTI4ZGIyZWNkZGUyOTU0OGQyMjYyYzBiZDA1 OWQKK0F1dGhvcjogICAgIEpvbmF0aGFuIEJlZGFyZCA8amJlZGFyZEBhcHBsZS5jb20+CitBdXRo b3JEYXRlOiBTYXQgT2N0IDAzIDAzOjMwOjAwIDIwMjAgKzAwMDAKK0NvbW1pdDogICAgIEpvbmF0 aGFuIEJlZGFyZCA8amJlZGFyZEBhcHBsZS5jb20+CitDb21taXREYXRlOiBTYXQgT2N0IDAzIDAz OjMwOjAwIDIwMjAgKzAwMDAKKworICAgIDd0aCBjb21taXQKKyAgICBnaXQtc3ZuLWlkOiBodHRw czovL3N2bi5leGFtcGxlLm9yZy9yZXBvc2l0b3J5L3JlcG9zaXRvcnkvdHJ1bmtANyAyNjhmNDVj Yy1jZDA5LTA0MTAtYWIzYy1kNTI2OTFiNGRiZmMKKworY29tbWl0IDNjZDMyZTM1MjQxMDU2NWJi NTQzODIxZmJmODU2YTZkM2NhYWQxYzQKK0F1dGhvcjogICAgIEpvbmF0aGFuIEJlZGFyZCA8amJl ZGFyZEBhcHBsZS5jb20+CitBdXRob3JEYXRlOiBTYXQgT2N0IDAzIDAyOjQwOjAwIDIwMjAgKzAw MDAKK0NvbW1pdDogICAgIEpvbmF0aGFuIEJlZGFyZCA8amJlZGFyZEBhcHBsZS5jb20+CitDb21t aXREYXRlOiBTYXQgT2N0IDAzIDAyOjQwOjAwIDIwMjAgKzAwMDAKKworICAgIDV0aCBjb21taXQK KyAgICAgICAgQ2hlcnJ5IHBpY2sKKyAgICAgICAgZ2l0LXN2bi1pZDogaHR0cHM6Ly9zdm4ud2Vi a2l0Lm9yZy9yZXBvc2l0b3J5L3dlYmtpdC90cnVua0A2IDI2OGY0NWNjLWNkMDktMDQxMC1hYjNj LWQ1MjY5MWI0ZGJmYworICAgIGdpdC1zdm4taWQ6IGh0dHBzOi8vc3ZuLmV4YW1wbGUub3JnL3Jl cG9zaXRvcnkvcmVwb3NpdG9yeS90cnVua0A1IDI2OGY0NWNjLWNkMDktMDQxMC1hYjNjLWQ1MjY5 MWI0ZGJmYworCitjb21taXQgYTMwY2U4NDk0YmYxYWMyODA3YTY5ODQ0ZjcyNmJlNGE5ODQzY2E1 NQorQXV0aG9yOiAgICAgSm9uYXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNvbT4KK0F1dGhv ckRhdGU6IFNhdCBPY3QgMDMgMDI6MDY6NDAgMjAyMCArMDAwMAorQ29tbWl0OiAgICAgSm9uYXRo YW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNvbT4KK0NvbW1pdERhdGU6IFNhdCBPY3QgMDMgMDI6 MDY6NDAgMjAyMCArMDAwMAorCisgICAgM3JkIGNvbW1pdAorICAgIGdpdC1zdm4taWQ6IGh0dHBz Oi8vc3ZuLmV4YW1wbGUub3JnL3JlcG9zaXRvcnkvcmVwb3NpdG9yeS90cnVua0AzIDI2OGY0NWNj LWNkMDktMDQxMC1hYjNjLWQ1MjY5MWI0ZGJmYworJycnCisgICAgICAgICAgICApCisKIAogY2xh c3MgVGVzdEdpdEh1Yih1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgcmVtb3RlID0gJ2h0dHBzOi8v Z2l0aHViLmV4YW1wbGUuY29tL1dlYktpdC9XZWJLaXQnCg== 431568 2021-06-16 11:09:18 -0700 2021-06-16 15:15:53 -0700 Patch bug-225889-20210616110917.patch text/plain 8187 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3ODkzOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDIxLTA2LTE2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIFN1cHBvcnQgYnJhbmNoIHF1ZXJpZXMgaW4gbW9j ayBnaXQgbG9nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjU4ODkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc4MTIyNzA1PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvc2V0dXAucHk6IEJ1bXAgdmVyc2lvbi4KKyAgICAgICAgKiBTY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weTogRGl0dG8uCisgICAg ICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9j YWwvZ2l0LnB5OiBBZGQgc3VwcG9ydCBmb3IgYnJhbmNoZXMgaW4KKyAgICAgICAgYGdpdCBsb2dg IGNvbW1hbmRzLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdEdpdC50ZXN0X2xvZyk6 CisgICAgICAgIChUZXN0R2l0LnRlc3RfYnJhbmNoX2xvZyk6CisKIDIwMjEtMDYtMTYgIEFsaWNp YSBCb3lhIEdhcmPDrWEgIDxhYm95YUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtXVEZdIERhdGFN dXRleDogQXNzZXJ0IG9uIGRvdWJsZSBsb2NraW5nIG9uIHRoZSBzYW1lIHRocmVhZApJbmRleDog VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9j YWwvZ2l0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL2dpdC5weQkocmV2aXNpb24gMjc4OTM5KQorKysg VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9j YWwvZ2l0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yNTMsNyArMjUzLDcgQEAgbm90aGluZyB0byBj b21taXQsIHdvcmtpbmcgdHJlZSBjbGVhbgogICAgICAgICAgICAgICAgICAgICAgICAgJ0F1dGhv ckRhdGU6IHtkYXRlfVxuJwogICAgICAgICAgICAgICAgICAgICAgICAgJ0NvbW1pdDogICAgIHth dXRob3J9IDx7ZW1haWx9PlxuJwogICAgICAgICAgICAgICAgICAgICAgICAgJ0NvbW1pdERhdGU6 IHtkYXRlfVxuJwotICAgICAgICAgICAgICAgICAgICAgICAgJ1xue2xvZ30nLmZvcm1hdCgKKyAg ICAgICAgICAgICAgICAgICAgICAgICdcbntsb2d9XG4nLmZvcm1hdCgKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBoYXNoPWNvbW1pdC5oYXNoLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGF1dGhvcj1jb21taXQuYXV0aG9yLm5hbWUsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZW1haWw9Y29tbWl0LmF1dGhvci5lbWFpbCwKQEAgLTM1Myw3ICszNTMsNyBAQCBub3RoaW5n IHRvIGNvbW1pdCwgd29ya2luZyB0cmVlIGNsZWFuCiAgICAgICAgICAgICAgICAgICAgIHJldHVy biBzZWxmLmNvbW1pdHNbc2VsZi5kZWZhdWx0X2JyYW5jaF1bZm91bmQuYnJhbmNoX3BvaW50IC0g ZGlmZmVyZW5jZSAtIDFdCiAgICAgICAgICAgICAgICAgcmV0dXJuIE5vbmUKIAotICAgICAgICBz b21ldGhpbmcgPSBzdHIoc29tZXRoaW5nKQorICAgICAgICBzb21ldGhpbmcgPSBzdHIoc29tZXRo aW5nKS5yZXBsYWNlKCdyZW1vdGVzLycsICcnKQogICAgICAgICBpZiAnLi4nIGluIHNvbWV0aGlu ZzoKICAgICAgICAgICAgIGEsIGIgPSBzb21ldGhpbmcuc3BsaXQoJy4uJykKICAgICAgICAgICAg IGEgPSBzZWxmLmZpbmQoYSkKQEAgLTUwMSwyOCArNTAxLDQzIEBAIG5vdGhpbmcgdG8gY29tbWl0 LCB3b3JraW5nIHRyZWUgY2xlYW4KICAgICAgICAgKQogCiAgICAgZGVmIGNvbW1pdHNfaW5fcmFu Z2Uoc2VsZiwgYmVnaW4sIGVuZCk6CisgICAgICAgIGJlZ2luID0gYmVnaW4ucmVwbGFjZSgncmVt b3Rlcy8nLCAnJykgaWYgYmVnaW4gZWxzZSBiZWdpbgorICAgICAgICBlbmQgPSBlbmQucmVwbGFj ZSgncmVtb3Rlcy8nLCAnJykgaWYgZW5kIGVsc2UgZW5kCisKKyAgICAgICAgaWYgYmVnaW4gYW5k IHNlbGYucmVtb3Rlcy5nZXQoYmVnaW4pOgorICAgICAgICAgICAgYmVnaW4gPSBzZWxmLnJlbW90 ZXMuZ2V0KGJlZ2luKS5oYXNoCisgICAgICAgIGlmIGVuZCBhbmQgc2VsZi5yZW1vdGVzLmdldChl bmQpOgorICAgICAgICAgICAgZW5kID0gc2VsZi5yZW1vdGVzLmdldChlbmQpLmhhc2gKKwogICAg ICAgICBicmFuY2hlcyA9IFtzZWxmLmRlZmF1bHRfYnJhbmNoXQotICAgICAgICBmb3IgYnJhbmNo LCBjb21taXRzIGluIHNlbGYuY29tbWl0cy5pdGVtcygpOgotICAgICAgICAgICAgaWYgYnJhbmNo ID09IHNlbGYuZGVmYXVsdF9icmFuY2g6Ci0gICAgICAgICAgICAgICAgY29udGludWUKLSAgICAg ICAgICAgIGZvciBjb21taXQgaW4gY29tbWl0czoKLSAgICAgICAgICAgICAgICBpZiBjb21taXQu aGFzaCA9PSBlbmQ6Ci0gICAgICAgICAgICAgICAgICAgIGJyYW5jaGVzLmluc2VydCgwLCBicmFu Y2gpCisgICAgICAgIGlmIGVuZCBpbiBzZWxmLmNvbW1pdHMua2V5cygpIGFuZCBlbmQgIT0gc2Vs Zi5kZWZhdWx0X2JyYW5jaDoKKyAgICAgICAgICAgIGJyYW5jaGVzLmFwcGVuZChlbmQpCisgICAg ICAgIGVsc2U6CisgICAgICAgICAgICBmb3IgYnJhbmNoLCBjb21taXRzIGluIHNlbGYuY29tbWl0 cy5pdGVtcygpOgorICAgICAgICAgICAgICAgIGlmIGJyYW5jaCA9PSBzZWxmLmRlZmF1bHRfYnJh bmNoOgorICAgICAgICAgICAgICAgICAgICBjb250aW51ZQorICAgICAgICAgICAgICAgIGZvciBj b21taXQgaW4gY29tbWl0czoKKyAgICAgICAgICAgICAgICAgICAgaWYgY29tbWl0Lmhhc2guc3Rh cnRzd2l0aChlbmQpOgorICAgICAgICAgICAgICAgICAgICAgICAgYnJhbmNoZXMuaW5zZXJ0KDAs IGJyYW5jaCkKKyAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrCisgICAgICAgICAgICAgICAg aWYgbGVuKGJyYW5jaGVzKSA+IDE6CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrCi0gICAgICAg ICAgICBpZiBsZW4oYnJhbmNoZXMpID4gMToKLSAgICAgICAgICAgICAgICBicmVhawogCiAgICAg ICAgIGluX3JhbmdlID0gRmFsc2UKICAgICAgICAgcHJldmlvdXMgPSBOb25lCiAgICAgICAgIGZv ciBicmFuY2ggaW4gYnJhbmNoZXM6CiAgICAgICAgICAgICBmb3IgY29tbWl0IGluIHJldmVyc2Vk KHNlbGYuY29tbWl0c1ticmFuY2hdKToKLSAgICAgICAgICAgICAgICBpZiBjb21taXQuaGFzaCA9 PSBlbmQ6CisgICAgICAgICAgICAgICAgaWYgYnJhbmNoID09IGJlZ2luOgorICAgICAgICAgICAg ICAgICAgICBicmVhaworICAgICAgICAgICAgICAgIGlmIGNvbW1pdC5oYXNoLnN0YXJ0c3dpdGgo ZW5kKSBvciBlbmQgPT0gYnJhbmNoOgogICAgICAgICAgICAgICAgICAgICBpbl9yYW5nZSA9IFRy dWUKICAgICAgICAgICAgICAgICBpZiBpbl9yYW5nZSBhbmQgKG5vdCBwcmV2aW91cyBvciBjb21t aXQuaGFzaCAhPSBwcmV2aW91cy5oYXNoKToKICAgICAgICAgICAgICAgICAgICAgeWllbGQgY29t bWl0CiAgICAgICAgICAgICAgICAgcHJldmlvdXMgPSBjb21taXQKLSAgICAgICAgICAgICAgICBp ZiBjb21taXQuaGFzaCA9PSBiZWdpbjoKKyAgICAgICAgICAgICAgICBpZiBiZWdpbiBhbmQgY29t bWl0Lmhhc2guc3RhcnRzd2l0aChiZWdpbik6CiAgICAgICAgICAgICAgICAgICAgIGluX3Jhbmdl ID0gRmFsc2UKKyAgICAgICAgICAgICAgICAgICAgYnJlYWsKKwogICAgICAgICAgICAgaW5fcmFu Z2UgPSBGYWxzZQogICAgICAgICAgICAgaWYgbm90IHByZXZpb3VzIG9yIGJyYW5jaCA9PSBzZWxm LmRlZmF1bHRfYnJhbmNoOgogICAgICAgICAgICAgICAgIGNvbnRpbnVlCkluZGV4OiBUb29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVz dC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5weQkocmV2aXNpb24gMjc4OTM5KQorKysgVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5p dHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTI2LDcgKzI2LDcgQEAgaW1wb3J0IHRlbXBmaWxl CiBpbXBvcnQgdW5pdHRlc3QKIAogZnJvbSBkYXRldGltZSBpbXBvcnQgZGF0ZXRpbWUKLWZyb20g d2Via2l0Y29yZXB5IGltcG9ydCBMb2dnZXJDYXB0dXJlLCBPdXRwdXRDYXB0dXJlCitmcm9tIHdl YmtpdGNvcmVweSBpbXBvcnQgcnVuLCBMb2dnZXJDYXB0dXJlLCBPdXRwdXRDYXB0dXJlCiBmcm9t IHdlYmtpdGNvcmVweS5tb2NrcyBpbXBvcnQgVGltZSBhcyBNb2NrVGltZQogZnJvbSB3ZWJraXRz Y21weSBpbXBvcnQgQ29tbWl0LCBsb2NhbCwgbW9ja3MsIHJlbW90ZQogCkBAIC0zMDUsNiArMzA1 LDc4IEBAIGNsYXNzIFRlc3RHaXQodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgICAg ICAgICBnaXQuY29tbWl0KGhhc2g9JzliODMxMWYyJyksCiAgICAgICAgICAgICAgICAgXSksIENv bW1pdC5FbmNvZGVyKCkuZGVmYXVsdChsaXN0KGdpdC5jb21taXRzKGJlZ2luPWRpY3QoYXJndW1l bnQ9JzliODMxMWYyJyksIGVuZD1kaWN0KGFyZ3VtZW50PSc2MjE2NTJhZCcpKSkpKQogCisgICAg ZGVmIHRlc3RfbG9nKHNlbGYpOgorICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBh dGgsIGdpdF9zdm49VHJ1ZSk6CisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKAorICAgICAg ICAgICAgICAgIHJ1bihbCisgICAgICAgICAgICAgICAgICAgIGxvY2FsLkdpdC5leGVjdXRhYmxl KCksICdsb2cnLCAnLS1mb3JtYXQ9ZnVsbGVyJywgJ3JlbW90ZXMvb3JpZ2luL21haW4uLi4xYWJl MjViNCcsCisgICAgICAgICAgICAgICAgXSwgY3dkPXNlbGYucGF0aCwgY2FwdHVyZV9vdXRwdXQ9 VHJ1ZSwgZW5jb2Rpbmc9J3V0Zi04Jykuc3Rkb3V0LAorICAgICAgICAgICAgICAgICcnJ2NvbW1p dCBkOGJjZTI2ZmE2NWM2ZmM4ZjM5YzE3OTI3YWJiNzdmNjlmYWI4MmZjCitBdXRob3I6ICAgICBK b25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgorQXV0aG9yRGF0ZTogU2F0IE9jdCAw MyAwMzo0Njo0MCAyMDIwICswMDAwCitDb21taXQ6ICAgICBKb25hdGhhbiBCZWRhcmQgPGpiZWRh cmRAYXBwbGUuY29tPgorQ29tbWl0RGF0ZTogU2F0IE9jdCAwMyAwMzo0Njo0MCAyMDIwICswMDAw CisKKyAgICBQYXRjaCBTZXJpZXMKKyAgICBnaXQtc3ZuLWlkOiBodHRwczovL3N2bi5leGFtcGxl Lm9yZy9yZXBvc2l0b3J5L3JlcG9zaXRvcnkvdHJ1bmtAOSAyNjhmNDVjYy1jZDA5LTA0MTAtYWIz Yy1kNTI2OTFiNGRiZmMKKworY29tbWl0IGJhZTVkMWU5MDk5OWQ0ZjkxNmE4YTE1ODEwY2NmYTQz ZjM3YTJmZDYKK0F1dGhvcjogICAgIEpvbmF0aGFuIEJlZGFyZCA8amJlZGFyZEBhcHBsZS5jb20+ CitBdXRob3JEYXRlOiBTYXQgT2N0IDAzIDAzOjQ2OjQwIDIwMjAgKzAwMDAKK0NvbW1pdDogICAg IEpvbmF0aGFuIEJlZGFyZCA8amJlZGFyZEBhcHBsZS5jb20+CitDb21taXREYXRlOiBTYXQgT2N0 IDAzIDAzOjQ2OjQwIDIwMjAgKzAwMDAKKworICAgIDh0aCBjb21taXQKKyAgICBnaXQtc3ZuLWlk OiBodHRwczovL3N2bi5leGFtcGxlLm9yZy9yZXBvc2l0b3J5L3JlcG9zaXRvcnkvdHJ1bmtAOCAy NjhmNDVjYy1jZDA5LTA0MTAtYWIzYy1kNTI2OTFiNGRiZmMKKworY29tbWl0IDFhYmUyNWI0NDNl OTg1ZjkzYjkwZDgzMGU0YTdlMzczMTMzNmFmNGQKK0F1dGhvcjogICAgIEpvbmF0aGFuIEJlZGFy ZCA8amJlZGFyZEBhcHBsZS5jb20+CitBdXRob3JEYXRlOiBTYXQgT2N0IDAzIDAyOjIzOjIwIDIw MjAgKzAwMDAKK0NvbW1pdDogICAgIEpvbmF0aGFuIEJlZGFyZCA8amJlZGFyZEBhcHBsZS5jb20+ CitDb21taXREYXRlOiBTYXQgT2N0IDAzIDAyOjIzOjIwIDIwMjAgKzAwMDAKKworICAgIDR0aCBj b21taXQKKyAgICBnaXQtc3ZuLWlkOiBodHRwczovL3N2bi5leGFtcGxlLm9yZy9yZXBvc2l0b3J5 L3JlcG9zaXRvcnkvdHJ1bmtANCAyNjhmNDVjYy1jZDA5LTA0MTAtYWIzYy1kNTI2OTFiNGRiZmMK KycnJworICAgICAgICAgICAgKQorCisgICAgZGVmIHRlc3RfYnJhbmNoX2xvZyhzZWxmKToKKyAg ICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5HaXQoc2VsZi5wYXRoLCBnaXRfc3ZuPVRydWUpOgorICAg ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKKyAgICAgICAgICAgICAgICBydW4oWworICAgICAg ICAgICAgICAgICAgICBsb2NhbC5HaXQuZXhlY3V0YWJsZSgpLCAnbG9nJywgJy0tZm9ybWF0PWZ1 bGxlcicsICdicmFuY2gtYi4uLm1haW4nLAorICAgICAgICAgICAgICAgIF0sIGN3ZD1zZWxmLnBh dGgsIGNhcHR1cmVfb3V0cHV0PVRydWUsIGVuY29kaW5nPSd1dGYtOCcpLnN0ZG91dCwKKyAgICAg ICAgICAgICAgICAnJydjb21taXQgNzkwNzI1YTZkNzllMjhkYjJlY2RkZTI5NTQ4ZDIyNjJjMGJk MDU5ZAorQXV0aG9yOiAgICAgSm9uYXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNvbT4KK0F1 dGhvckRhdGU6IFNhdCBPY3QgMDMgMDM6MzA6MDAgMjAyMCArMDAwMAorQ29tbWl0OiAgICAgSm9u YXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNvbT4KK0NvbW1pdERhdGU6IFNhdCBPY3QgMDMg MDM6MzA6MDAgMjAyMCArMDAwMAorCisgICAgN3RoIGNvbW1pdAorICAgIGdpdC1zdm4taWQ6IGh0 dHBzOi8vc3ZuLmV4YW1wbGUub3JnL3JlcG9zaXRvcnkvcmVwb3NpdG9yeS90cnVua0A3IDI2OGY0 NWNjLWNkMDktMDQxMC1hYjNjLWQ1MjY5MWI0ZGJmYworCitjb21taXQgM2NkMzJlMzUyNDEwNTY1 YmI1NDM4MjFmYmY4NTZhNmQzY2FhZDFjNAorQXV0aG9yOiAgICAgSm9uYXRoYW4gQmVkYXJkIDxq YmVkYXJkQGFwcGxlLmNvbT4KK0F1dGhvckRhdGU6IFNhdCBPY3QgMDMgMDI6NDA6MDAgMjAyMCAr MDAwMAorQ29tbWl0OiAgICAgSm9uYXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNvbT4KK0Nv bW1pdERhdGU6IFNhdCBPY3QgMDMgMDI6NDA6MDAgMjAyMCArMDAwMAorCisgICAgNXRoIGNvbW1p dAorICAgICAgICBDaGVycnkgcGljaworICAgICAgICBnaXQtc3ZuLWlkOiBodHRwczovL3N2bi53 ZWJraXQub3JnL3JlcG9zaXRvcnkvd2Via2l0L3RydW5rQDYgMjY4ZjQ1Y2MtY2QwOS0wNDEwLWFi M2MtZDUyNjkxYjRkYmZjCisgICAgZ2l0LXN2bi1pZDogaHR0cHM6Ly9zdm4uZXhhbXBsZS5vcmcv cmVwb3NpdG9yeS9yZXBvc2l0b3J5L3RydW5rQDUgMjY4ZjQ1Y2MtY2QwOS0wNDEwLWFiM2MtZDUy NjkxYjRkYmZjCisKK2NvbW1pdCBhMzBjZTg0OTRiZjFhYzI4MDdhNjk4NDRmNzI2YmU0YTk4NDNj YTU1CitBdXRob3I6ICAgICBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgorQXV0 aG9yRGF0ZTogU2F0IE9jdCAwMyAwMjowNjo0MCAyMDIwICswMDAwCitDb21taXQ6ICAgICBKb25h dGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgorQ29tbWl0RGF0ZTogU2F0IE9jdCAwMyAw MjowNjo0MCAyMDIwICswMDAwCisKKyAgICAzcmQgY29tbWl0CisgICAgZ2l0LXN2bi1pZDogaHR0 cHM6Ly9zdm4uZXhhbXBsZS5vcmcvcmVwb3NpdG9yeS9yZXBvc2l0b3J5L3RydW5rQDMgMjY4ZjQ1 Y2MtY2QwOS0wNDEwLWFiM2MtZDUyNjkxYjRkYmZjCisnJycKKyAgICAgICAgICAgICkKKwogCiBj bGFzcyBUZXN0R2l0SHViKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICByZW1vdGUgPSAnaHR0cHM6 Ly9naXRodWIuZXhhbXBsZS5jb20vV2ViS2l0L1dlYktpdCcK 431612 2021-06-16 15:15:55 -0700 2021-06-16 15:41:44 -0700 Patch for landing bug-225889-20210616151554.patch text/plain 9611 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4OTU1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTQzZGU5Y2I2MjgyYjAzNWJjZWJjZWU4MjkyNWYyMzg1 YWIwOGM4MS4uNTI4ZjMxNmFiMTRiOWRmMzAzNDE3MzA2NGNlYmY4ZWZhYTg0YzcyMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDIxLTA2LTE2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIFN1cHBvcnQgYnJhbmNoIHF1ZXJpZXMgaW4gbW9jayBnaXQg bG9nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU4 ODkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc4MTIyNzA1PgorCisgICAgICAgIFJldmlld2Vk IGJ5IFN0ZXBoYW5pZSBMZXdpcy4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3NldHVwLnB5OiBCdW1wIHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHk6IERpdHRvLgorICAgICAgICAq IFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL2dp dC5weTogQWRkIHN1cHBvcnQgZm9yIGJyYW5jaGVzIGluCisgICAgICAgIGBnaXQgbG9nYCBjb21t YW5kcy4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS90ZXN0L2dpdF91bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RHaXQudGVzdF9sb2cpOgorICAg ICAgICAoVGVzdEdpdC50ZXN0X2JyYW5jaF9sb2cpOgorCiAyMDIxLTA2LTE2ICBKb25hdGhhbiBC ZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBbd2Via2l0c2NtcHldIENhY2hl IG1vcmUgR2l0IGNvbW1hbmRzCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS9zZXR1cC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3NldHVwLnB5CmluZGV4IDIwNDY3MTM1MGI2ZGFkMGM2M2E3OGM0N2EzNjlkYWM5N2VlMDhlZGYu LmQ1MDY2MWI4NjM4YjgxYmEzYTJhNTk1MTc1ZGY1NmEyMzc0NzQxNWQgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5CkBAIC0yOSw3ICsyOSw3IEBAIGRl ZiByZWFkbWUoKToKIAogc2V0dXAoCiAgICAgbmFtZT0nd2Via2l0c2NtcHknLAotICAgIHZlcnNp b249JzAuMTQuNScsCisgICAgdmVyc2lvbj0nMC4xNC42JywKICAgICBkZXNjcmlwdGlvbj0nTGli cmFyeSBkZXNpZ25lZCB0byBpbnRlcmFjdCB3aXRoIGdpdCBhbmQgc3ZuIHJlcG9zaXRvcmllcy4n LAogICAgIGxvbmdfZGVzY3JpcHRpb249cmVhZG1lKCksCiAgICAgY2xhc3NpZmllcnM9WwpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv X19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS9fX2luaXRfXy5weQppbmRleCA5OTZlMmVhYTdiZGQ2OGY5MDMyMzZiN2RiYzAwYjI2ZTIx MGMxODYyLi43OTUwMGY2MTA4NjFjNDliZTkwM2JhM2U2MDkzMjg1YmVlZDkwZmZjIDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2lu aXRfXy5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS9fX2luaXRfXy5weQpAQCAtNDYsNyArNDYsNyBAQCBleGNlcHQgSW1wb3J0RXJyb3I6CiAg ICAgICAgICJQbGVhc2UgaW5zdGFsbCB3ZWJraXRjb3JlcHkgd2l0aCBgcGlwIGluc3RhbGwgd2Vi a2l0Y29yZXB5IC0tZXh0cmEtaW5kZXgtdXJsIDxwYWNrYWdlIGluZGV4IFVSTD5gIgogICAgICkK IAotdmVyc2lvbiA9IFZlcnNpb24oMCwgMTQsIDUpCit2ZXJzaW9uID0gVmVyc2lvbigwLCAxNCwg NikKIAogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZmFzdGVuZXJzJywgVmVyc2lvbigw LCAxNSwgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnbW9ub3RvbmljJywgVmVy c2lvbigxLCA1KSkpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9naXQucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJh cmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9naXQucHkKaW5kZXggM2Vm MDFlZmMyMmJlODY0MDFmNjJkMGEwMDAyNDZmNTk0ZmZjNjM4ZC4uYzc4ZjUwMjU3OTU5YWYxYjdk OWU1YmFiNzAxNzZiOTQ5Y2RiNWM5ZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0LnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL2dp dC5weQpAQCAtMjUzLDcgKzI1Myw3IEBAIG5vdGhpbmcgdG8gY29tbWl0LCB3b3JraW5nIHRyZWUg Y2xlYW4KICAgICAgICAgICAgICAgICAgICAgICAgICdBdXRob3JEYXRlOiB7ZGF0ZX1cbicKICAg ICAgICAgICAgICAgICAgICAgICAgICdDb21taXQ6ICAgICB7YXV0aG9yfSA8e2VtYWlsfT5cbicK ICAgICAgICAgICAgICAgICAgICAgICAgICdDb21taXREYXRlOiB7ZGF0ZX1cbicKLSAgICAgICAg ICAgICAgICAgICAgICAgICdcbntsb2d9Jy5mb3JtYXQoCisgICAgICAgICAgICAgICAgICAgICAg ICAnXG57bG9nfVxuJy5mb3JtYXQoCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGFzaD1j b21taXQuaGFzaCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhdXRob3I9Y29tbWl0LmF1 dGhvci5uYW1lLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVtYWlsPWNvbW1pdC5hdXRo b3IuZW1haWwsCkBAIC0zNTMsNyArMzUzLDcgQEAgbm90aGluZyB0byBjb21taXQsIHdvcmtpbmcg dHJlZSBjbGVhbgogICAgICAgICAgICAgICAgICAgICByZXR1cm4gc2VsZi5jb21taXRzW3NlbGYu ZGVmYXVsdF9icmFuY2hdW2ZvdW5kLmJyYW5jaF9wb2ludCAtIGRpZmZlcmVuY2UgLSAxXQogICAg ICAgICAgICAgICAgIHJldHVybiBOb25lCiAKLSAgICAgICAgc29tZXRoaW5nID0gc3RyKHNvbWV0 aGluZykKKyAgICAgICAgc29tZXRoaW5nID0gc3RyKHNvbWV0aGluZykucmVwbGFjZSgncmVtb3Rl cy8nLCAnJykKICAgICAgICAgaWYgJy4uJyBpbiBzb21ldGhpbmc6CiAgICAgICAgICAgICBhLCBi ID0gc29tZXRoaW5nLnNwbGl0KCcuLicpCiAgICAgICAgICAgICBhID0gc2VsZi5maW5kKGEpCkBA IC01MDEsMjggKzUwMSw0MyBAQCBub3RoaW5nIHRvIGNvbW1pdCwgd29ya2luZyB0cmVlIGNsZWFu CiAgICAgICAgICkKIAogICAgIGRlZiBjb21taXRzX2luX3JhbmdlKHNlbGYsIGJlZ2luLCBlbmQp OgorICAgICAgICBiZWdpbiA9IGJlZ2luLnJlcGxhY2UoJ3JlbW90ZXMvJywgJycpIGlmIGJlZ2lu IGVsc2UgYmVnaW4KKyAgICAgICAgZW5kID0gZW5kLnJlcGxhY2UoJ3JlbW90ZXMvJywgJycpIGlm IGVuZCBlbHNlIGVuZAorCisgICAgICAgIGlmIGJlZ2luIGFuZCBzZWxmLnJlbW90ZXMuZ2V0KGJl Z2luKToKKyAgICAgICAgICAgIGJlZ2luID0gc2VsZi5yZW1vdGVzLmdldChiZWdpbikuaGFzaAor ICAgICAgICBpZiBlbmQgYW5kIHNlbGYucmVtb3Rlcy5nZXQoZW5kKToKKyAgICAgICAgICAgIGVu ZCA9IHNlbGYucmVtb3Rlcy5nZXQoZW5kKS5oYXNoCisKICAgICAgICAgYnJhbmNoZXMgPSBbc2Vs Zi5kZWZhdWx0X2JyYW5jaF0KLSAgICAgICAgZm9yIGJyYW5jaCwgY29tbWl0cyBpbiBzZWxmLmNv bW1pdHMuaXRlbXMoKToKLSAgICAgICAgICAgIGlmIGJyYW5jaCA9PSBzZWxmLmRlZmF1bHRfYnJh bmNoOgotICAgICAgICAgICAgICAgIGNvbnRpbnVlCi0gICAgICAgICAgICBmb3IgY29tbWl0IGlu IGNvbW1pdHM6Ci0gICAgICAgICAgICAgICAgaWYgY29tbWl0Lmhhc2ggPT0gZW5kOgotICAgICAg ICAgICAgICAgICAgICBicmFuY2hlcy5pbnNlcnQoMCwgYnJhbmNoKQorICAgICAgICBpZiBlbmQg aW4gc2VsZi5jb21taXRzLmtleXMoKSBhbmQgZW5kICE9IHNlbGYuZGVmYXVsdF9icmFuY2g6Cisg ICAgICAgICAgICBicmFuY2hlcy5hcHBlbmQoZW5kKQorICAgICAgICBlbHNlOgorICAgICAgICAg ICAgZm9yIGJyYW5jaCwgY29tbWl0cyBpbiBzZWxmLmNvbW1pdHMuaXRlbXMoKToKKyAgICAgICAg ICAgICAgICBpZiBicmFuY2ggPT0gc2VsZi5kZWZhdWx0X2JyYW5jaDoKKyAgICAgICAgICAgICAg ICAgICAgY29udGludWUKKyAgICAgICAgICAgICAgICBmb3IgY29tbWl0IGluIGNvbW1pdHM6Cisg ICAgICAgICAgICAgICAgICAgIGlmIGNvbW1pdC5oYXNoLnN0YXJ0c3dpdGgoZW5kKToKKyAgICAg ICAgICAgICAgICAgICAgICAgIGJyYW5jaGVzLmluc2VydCgwLCBicmFuY2gpCisgICAgICAgICAg ICAgICAgICAgICAgICBicmVhaworICAgICAgICAgICAgICAgIGlmIGxlbihicmFuY2hlcykgPiAx OgogICAgICAgICAgICAgICAgICAgICBicmVhawotICAgICAgICAgICAgaWYgbGVuKGJyYW5jaGVz KSA+IDE6Ci0gICAgICAgICAgICAgICAgYnJlYWsKIAogICAgICAgICBpbl9yYW5nZSA9IEZhbHNl CiAgICAgICAgIHByZXZpb3VzID0gTm9uZQogICAgICAgICBmb3IgYnJhbmNoIGluIGJyYW5jaGVz OgogICAgICAgICAgICAgZm9yIGNvbW1pdCBpbiByZXZlcnNlZChzZWxmLmNvbW1pdHNbYnJhbmNo XSk6Ci0gICAgICAgICAgICAgICAgaWYgY29tbWl0Lmhhc2ggPT0gZW5kOgorICAgICAgICAgICAg ICAgIGlmIGJyYW5jaCA9PSBiZWdpbjoKKyAgICAgICAgICAgICAgICAgICAgYnJlYWsKKyAgICAg ICAgICAgICAgICBpZiBjb21taXQuaGFzaC5zdGFydHN3aXRoKGVuZCkgb3IgZW5kID09IGJyYW5j aDoKICAgICAgICAgICAgICAgICAgICAgaW5fcmFuZ2UgPSBUcnVlCiAgICAgICAgICAgICAgICAg aWYgaW5fcmFuZ2UgYW5kIChub3QgcHJldmlvdXMgb3IgY29tbWl0Lmhhc2ggIT0gcHJldmlvdXMu aGFzaCk6CiAgICAgICAgICAgICAgICAgICAgIHlpZWxkIGNvbW1pdAogICAgICAgICAgICAgICAg IHByZXZpb3VzID0gY29tbWl0Ci0gICAgICAgICAgICAgICAgaWYgY29tbWl0Lmhhc2ggPT0gYmVn aW46CisgICAgICAgICAgICAgICAgaWYgYmVnaW4gYW5kIGNvbW1pdC5oYXNoLnN0YXJ0c3dpdGgo YmVnaW4pOgogICAgICAgICAgICAgICAgICAgICBpbl9yYW5nZSA9IEZhbHNlCisgICAgICAgICAg ICAgICAgICAgIGJyZWFrCisKICAgICAgICAgICAgIGluX3JhbmdlID0gRmFsc2UKICAgICAgICAg ICAgIGlmIG5vdCBwcmV2aW91cyBvciBicmFuY2ggPT0gc2VsZi5kZWZhdWx0X2JyYW5jaDoKICAg ICAgICAgICAgICAgICBjb250aW51ZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3QucHkgYi9Ub29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVz dC5weQppbmRleCBiYzdiNjM5MjliNGFmNDc1NjljZjVmY2JkZjgzZjliOGE2NmYxOWM5Li4xZGM0 OGIwNzAyYmVjNjk3ODEwMjZiY2QxMmY3MWM2Y2FlZjRiZTNlIDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVz dC5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS90ZXN0L2dpdF91bml0dGVzdC5weQpAQCAtMjYsNyArMjYsNyBAQCBpbXBvcnQgdGVtcGZpbGUK IGltcG9ydCB1bml0dGVzdAogCiBmcm9tIGRhdGV0aW1lIGltcG9ydCBkYXRldGltZQotZnJvbSB3 ZWJraXRjb3JlcHkgaW1wb3J0IExvZ2dlckNhcHR1cmUsIE91dHB1dENhcHR1cmUKK2Zyb20gd2Vi a2l0Y29yZXB5IGltcG9ydCBydW4sIExvZ2dlckNhcHR1cmUsIE91dHB1dENhcHR1cmUKIGZyb20g d2Via2l0Y29yZXB5Lm1vY2tzIGltcG9ydCBUaW1lIGFzIE1vY2tUaW1lCiBmcm9tIHdlYmtpdHNj bXB5IGltcG9ydCBDb21taXQsIGxvY2FsLCBtb2NrcywgcmVtb3RlCiAKQEAgLTMwNSw2ICszMDUs NzggQEAgY2xhc3MgVGVzdEdpdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICAgICAg ICAgIGdpdC5jb21taXQoaGFzaD0nOWI4MzExZjInKSwKICAgICAgICAgICAgICAgICBdKSwgQ29t bWl0LkVuY29kZXIoKS5kZWZhdWx0KGxpc3QoZ2l0LmNvbW1pdHMoYmVnaW49ZGljdChhcmd1bWVu dD0nOWI4MzExZjInKSwgZW5kPWRpY3QoYXJndW1lbnQ9JzYyMTY1MmFkJykpKSkpCiAKKyAgICBk ZWYgdGVzdF9sb2coc2VsZik6CisgICAgICAgIHdpdGggbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0 aCwgZ2l0X3N2bj1UcnVlKToKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoCisgICAgICAg ICAgICAgICAgcnVuKFsKKyAgICAgICAgICAgICAgICAgICAgbG9jYWwuR2l0LmV4ZWN1dGFibGUo KSwgJ2xvZycsICctLWZvcm1hdD1mdWxsZXInLCAncmVtb3Rlcy9vcmlnaW4vbWFpbi4uLjFhYmUy NWI0JywKKyAgICAgICAgICAgICAgICBdLCBjd2Q9c2VsZi5wYXRoLCBjYXB0dXJlX291dHB1dD1U cnVlLCBlbmNvZGluZz0ndXRmLTgnKS5zdGRvdXQsCisgICAgICAgICAgICAgICAgJycnY29tbWl0 IGQ4YmNlMjZmYTY1YzZmYzhmMzljMTc5MjdhYmI3N2Y2OWZhYjgyZmMKK0F1dGhvcjogICAgIEpv bmF0aGFuIEJlZGFyZCA8amJlZGFyZEBhcHBsZS5jb20+CitBdXRob3JEYXRlOiBTYXQgT2N0IDAz IDAzOjQ2OjQwIDIwMjAgKzAwMDAKK0NvbW1pdDogICAgIEpvbmF0aGFuIEJlZGFyZCA8amJlZGFy ZEBhcHBsZS5jb20+CitDb21taXREYXRlOiBTYXQgT2N0IDAzIDAzOjQ2OjQwIDIwMjAgKzAwMDAK KworICAgIFBhdGNoIFNlcmllcworICAgIGdpdC1zdm4taWQ6IGh0dHBzOi8vc3ZuLmV4YW1wbGUu b3JnL3JlcG9zaXRvcnkvcmVwb3NpdG9yeS90cnVua0A5IDI2OGY0NWNjLWNkMDktMDQxMC1hYjNj LWQ1MjY5MWI0ZGJmYworCitjb21taXQgYmFlNWQxZTkwOTk5ZDRmOTE2YThhMTU4MTBjY2ZhNDNm MzdhMmZkNgorQXV0aG9yOiAgICAgSm9uYXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNvbT4K K0F1dGhvckRhdGU6IFNhdCBPY3QgMDMgMDM6NDY6NDAgMjAyMCArMDAwMAorQ29tbWl0OiAgICAg Sm9uYXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNvbT4KK0NvbW1pdERhdGU6IFNhdCBPY3Qg MDMgMDM6NDY6NDAgMjAyMCArMDAwMAorCisgICAgOHRoIGNvbW1pdAorICAgIGdpdC1zdm4taWQ6 IGh0dHBzOi8vc3ZuLmV4YW1wbGUub3JnL3JlcG9zaXRvcnkvcmVwb3NpdG9yeS90cnVua0A4IDI2 OGY0NWNjLWNkMDktMDQxMC1hYjNjLWQ1MjY5MWI0ZGJmYworCitjb21taXQgMWFiZTI1YjQ0M2U5 ODVmOTNiOTBkODMwZTRhN2UzNzMxMzM2YWY0ZAorQXV0aG9yOiAgICAgSm9uYXRoYW4gQmVkYXJk IDxqYmVkYXJkQGFwcGxlLmNvbT4KK0F1dGhvckRhdGU6IFNhdCBPY3QgMDMgMDI6MjM6MjAgMjAy MCArMDAwMAorQ29tbWl0OiAgICAgSm9uYXRoYW4gQmVkYXJkIDxqYmVkYXJkQGFwcGxlLmNvbT4K K0NvbW1pdERhdGU6IFNhdCBPY3QgMDMgMDI6MjM6MjAgMjAyMCArMDAwMAorCisgICAgNHRoIGNv bW1pdAorICAgIGdpdC1zdm4taWQ6IGh0dHBzOi8vc3ZuLmV4YW1wbGUub3JnL3JlcG9zaXRvcnkv cmVwb3NpdG9yeS90cnVua0A0IDI2OGY0NWNjLWNkMDktMDQxMC1hYjNjLWQ1MjY5MWI0ZGJmYwor JycnCisgICAgICAgICAgICApCisKKyAgICBkZWYgdGVzdF9icmFuY2hfbG9nKHNlbGYpOgorICAg ICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgsIGdpdF9zdm49VHJ1ZSk6CisgICAg ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKAorICAgICAgICAgICAgICAgIHJ1bihbCisgICAgICAg ICAgICAgICAgICAgIGxvY2FsLkdpdC5leGVjdXRhYmxlKCksICdsb2cnLCAnLS1mb3JtYXQ9ZnVs bGVyJywgJ2JyYW5jaC1iLi4ubWFpbicsCisgICAgICAgICAgICAgICAgXSwgY3dkPXNlbGYucGF0 aCwgY2FwdHVyZV9vdXRwdXQ9VHJ1ZSwgZW5jb2Rpbmc9J3V0Zi04Jykuc3Rkb3V0LAorICAgICAg ICAgICAgICAgICcnJ2NvbW1pdCA3OTA3MjVhNmQ3OWUyOGRiMmVjZGRlMjk1NDhkMjI2MmMwYmQw NTlkCitBdXRob3I6ICAgICBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgorQXV0 aG9yRGF0ZTogU2F0IE9jdCAwMyAwMzozMDowMCAyMDIwICswMDAwCitDb21taXQ6ICAgICBKb25h dGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgorQ29tbWl0RGF0ZTogU2F0IE9jdCAwMyAw MzozMDowMCAyMDIwICswMDAwCisKKyAgICA3dGggY29tbWl0CisgICAgZ2l0LXN2bi1pZDogaHR0 cHM6Ly9zdm4uZXhhbXBsZS5vcmcvcmVwb3NpdG9yeS9yZXBvc2l0b3J5L3RydW5rQDcgMjY4ZjQ1 Y2MtY2QwOS0wNDEwLWFiM2MtZDUyNjkxYjRkYmZjCisKK2NvbW1pdCAzY2QzMmUzNTI0MTA1NjVi YjU0MzgyMWZiZjg1NmE2ZDNjYWFkMWM0CitBdXRob3I6ICAgICBKb25hdGhhbiBCZWRhcmQgPGpi ZWRhcmRAYXBwbGUuY29tPgorQXV0aG9yRGF0ZTogU2F0IE9jdCAwMyAwMjo0MDowMCAyMDIwICsw MDAwCitDb21taXQ6ICAgICBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgorQ29t bWl0RGF0ZTogU2F0IE9jdCAwMyAwMjo0MDowMCAyMDIwICswMDAwCisKKyAgICA1dGggY29tbWl0 CisgICAgICAgIENoZXJyeSBwaWNrCisgICAgICAgIGdpdC1zdm4taWQ6IGh0dHBzOi8vc3ZuLndl YmtpdC5vcmcvcmVwb3NpdG9yeS93ZWJraXQvdHJ1bmtANiAyNjhmNDVjYy1jZDA5LTA0MTAtYWIz Yy1kNTI2OTFiNGRiZmMKKyAgICBnaXQtc3ZuLWlkOiBodHRwczovL3N2bi5leGFtcGxlLm9yZy9y ZXBvc2l0b3J5L3JlcG9zaXRvcnkvdHJ1bmtANSAyNjhmNDVjYy1jZDA5LTA0MTAtYWIzYy1kNTI2 OTFiNGRiZmMKKworY29tbWl0IGEzMGNlODQ5NGJmMWFjMjgwN2E2OTg0NGY3MjZiZTRhOTg0M2Nh NTUKK0F1dGhvcjogICAgIEpvbmF0aGFuIEJlZGFyZCA8amJlZGFyZEBhcHBsZS5jb20+CitBdXRo b3JEYXRlOiBTYXQgT2N0IDAzIDAyOjA2OjQwIDIwMjAgKzAwMDAKK0NvbW1pdDogICAgIEpvbmF0 aGFuIEJlZGFyZCA8amJlZGFyZEBhcHBsZS5jb20+CitDb21taXREYXRlOiBTYXQgT2N0IDAzIDAy OjA2OjQwIDIwMjAgKzAwMDAKKworICAgIDNyZCBjb21taXQKKyAgICBnaXQtc3ZuLWlkOiBodHRw czovL3N2bi5leGFtcGxlLm9yZy9yZXBvc2l0b3J5L3JlcG9zaXRvcnkvdHJ1bmtAMyAyNjhmNDVj Yy1jZDA5LTA0MTAtYWIzYy1kNTI2OTFiNGRiZmMKKycnJworICAgICAgICAgICAgKQorCiAKIGNs YXNzIFRlc3RHaXRIdWIodW5pdHRlc3QuVGVzdENhc2UpOgogICAgIHJlbW90ZSA9ICdodHRwczov L2dpdGh1Yi5leGFtcGxlLmNvbS9XZWJLaXQvV2ViS2l0Jwo=