228597 2021-07-29 11:59:27 -0700 [webkitscmpy] Add access to `git config` 2021-08-03 12:49:58 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=225985 InRadar P2 Normal --- 228662 1 jbedard jbedard aakash_jain dewei_zhu slewis webkit-bug-importer oldest_to_newest 1780493 0 jbedard 2021-07-29 11:59:27 -0700 We need a function which provides machine-readable access to the git config. 1780495 1 webkit-bug-importer 2021-07-29 12:01:29 -0700 <rdar://problem/81283644> 1780496 2 434553 jbedard 2021-07-29 12:02:49 -0700 Created attachment 434553 Patch 1780499 3 434554 jbedard 2021-07-29 12:04:57 -0700 Created attachment 434554 Patch 1781254 4 434758 jbedard 2021-08-02 08:45:21 -0700 Created attachment 434758 Patch 1781631 5 434758 aakash_jain 2021-08-03 09:16:49 -0700 Comment on attachment 434758 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=434758&action=review > Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:280 > + if command.returncode: should log a warning/error here about failure. > Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:286 > + result[parts[0]] = '='.join(parts[1:]) why join? can there be more than one = in a line in the output of 'git config -l' > Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:597 > + RE_SINGLE_TOP = re.compile(r'^\[\s*(?P<key>\S+)\s*\]') might be a good idea to put an example of expected strings in a comment along-with all these REs. 1781632 6 434758 jbedard 2021-08-03 09:26:10 -0700 Comment on attachment 434758 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=434758&action=review >> Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:286 >> + result[parts[0]] = '='.join(parts[1:]) > > why join? can there be more than one = in a line in the output of 'git config -l' Git allows it, although I'm not sure if it happens in practice. Do something like `git config --global user.name "foo=bar"`and then `git config -l` to see what I mean. >> Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:597 >> + RE_SINGLE_TOP = re.compile(r'^\[\s*(?P<key>\S+)\s*\]') > > might be a good idea to put an example of expected strings in a comment along-with all these REs. Ok 1781640 7 434837 jbedard 2021-08-03 09:55:11 -0700 Created attachment 434837 Patch 1781678 8 434837 aakash_jain 2021-08-03 11:53:41 -0700 Comment on attachment 434837 Patch rs=me 1781685 9 ews-feeder 2021-08-03 12:00:40 -0700 Committed r280604 (240222@main): <https://commits.webkit.org/240222@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 434837. 434553 2021-07-29 12:02:49 -0700 2021-07-29 12:04:55 -0700 Patch bug-228597-20210729120248.patch text/plain 8309 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI4MDQzNykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDIxLTA3LTI5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIEFkZCBhY2Nlc3MgdG8gYGdpdCBjb25maWdgCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg1OTcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5OiBCdW1wIHZlcnNpb24uCisgICAgICAgICog U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHk6IERp dHRvLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L2xvY2FsL2dpdC5weToKKyAgICAgICAgKEdpdC5jb25maWcpOiBSZXR1cm4gZ2l0IGNvbmZpZ3Vy YXRpb24gYXMgZGljdGlvbmFyeS4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9naXQucHk6CisgICAgICAgICogU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3QucHk6Cisg ICAgICAgICh0ZXN0X2NvbmZpZyk6IFRlc3QgcmVwb3NpdG9yeSBjb25maWd1cmF0aW9uLgorICAg ICAgICAodGVzdF9nbG9iYWxfY29uZmlnKTogVGVzdCBnbG9iYWwgY29uZmlndXJhdGlvbi4KKwog MjAyMS0wNy0yOSAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAg ICAgU2VuZCBlbWFpbCBub3RpZmljYXRpb24gd2hlbiBWZXJpZnlHaXRIdWJJbnRlZ3JpdHkgc3Rl cCBmYWlscwpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0 dXAucHkJKHJldmlzaW9uIDI4MDQzNykKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3NldHVwLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yOSw3ICsyOSw3IEBAIGRlZiByZWFk bWUoKToKIAogc2V0dXAoCiAgICAgbmFtZT0nd2Via2l0c2NtcHknLAotICAgIHZlcnNpb249JzEu MC4wJywKKyAgICB2ZXJzaW9uPScxLjAuMScsCiAgICAgZGVzY3JpcHRpb249J0xpYnJhcnkgZGVz aWduZWQgdG8gaW50ZXJhY3Qgd2l0aCBnaXQgYW5kIHN2biByZXBvc2l0b3JpZXMuJywKICAgICBs b25nX2Rlc2NyaXB0aW9uPXJlYWRtZSgpLAogICAgIGNsYXNzaWZpZXJzPVsKSW5kZXg6IFRvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNj bXB5L19faW5pdF9fLnB5CShyZXZpc2lvbiAyODA0MzcpCisrKyBUb29scy9TY3JpcHRzL2xpYnJh cmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQkod29ya2luZyBjb3B5KQpA QCAtNDYsNyArNDYsNyBAQCBleGNlcHQgSW1wb3J0RXJyb3I6CiAgICAgICAgICJQbGVhc2UgaW5z dGFsbCB3ZWJraXRjb3JlcHkgd2l0aCBgcGlwIGluc3RhbGwgd2Via2l0Y29yZXB5IC0tZXh0cmEt aW5kZXgtdXJsIDxwYWNrYWdlIGluZGV4IFVSTD5gIgogICAgICkKIAotdmVyc2lvbiA9IFZlcnNp b24oMSwgMCwgMCkKK3ZlcnNpb24gPSBWZXJzaW9uKDEsIDAsIDEpCiAKIEF1dG9JbnN0YWxsLnJl Z2lzdGVyKFBhY2thZ2UoJ2Zhc3RlbmVycycsIFZlcnNpb24oMCwgMTUsIDApKSkKIEF1dG9JbnN0 YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ21vbm90b25pYycsIFZlcnNpb24oMSwgNSkpKQpJbmRleDog VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0 LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl YmtpdHNjbXB5L2xvY2FsL2dpdC5weQkocmV2aXNpb24gMjgwNDM3KQorKysgVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5CSh3b3JraW5n IGNvcHkpCkBAIC0yNjMsNiArMjYzLDI2IEBAIGNsYXNzIEdpdChTY20pOgogICAgIGRlZiBpc19j aGVja291dChjbHMsIHBhdGgpOgogICAgICAgICByZXR1cm4gcnVuKFtjbHMuZXhlY3V0YWJsZSgp LCAncmV2LXBhcnNlJywgJy0tc2hvdy10b3BsZXZlbCddLCBjd2Q9cGF0aCwgY2FwdHVyZV9vdXRw dXQ9VHJ1ZSkucmV0dXJuY29kZSA9PSAwCiAKKyAgICBAZGVjb3JhdG9ycy5oeWJyaWRtZXRob2QK KyAgICBkZWYgY29uZmlnKGNvbnRleHQpOgorICAgICAgICBhcmdzID0gW2NvbnRleHQuZXhlY3V0 YWJsZSgpLCAnY29uZmlnJywgJy1sJ10KKyAgICAgICAga3dhcmdzID0gZGljdChjYXB0dXJlX291 dHB1dD1UcnVlLCBlbmNvZGluZz0ndXRmLTgnKQorCisgICAgICAgIGlmIGlzaW5zdGFuY2UoY29u dGV4dCwgdHlwZSk6CisgICAgICAgICAgICBhcmdzICs9IFsnLS1nbG9iYWwnXQorICAgICAgICBl bHNlOgorICAgICAgICAgICAga3dhcmdzWydjd2QnXSA9IGNvbnRleHQucm9vdF9wYXRoCisKKyAg ICAgICAgY29tbWFuZCA9IHJ1bihhcmdzLCAqKmt3YXJncykKKyAgICAgICAgaWYgY29tbWFuZC5y ZXR1cm5jb2RlOgorICAgICAgICAgICAgcmV0dXJuIHt9CisKKyAgICAgICAgcmVzdWx0ID0ge30K KyAgICAgICAgZm9yIGxpbmUgaW4gY29tbWFuZC5zdGRvdXQuc3BsaXRsaW5lcygpOgorICAgICAg ICAgICAgcGFydHMgPSBsaW5lLnNwbGl0KCc9JykKKyAgICAgICAgICAgIHJlc3VsdFtwYXJ0c1sw XV0gPSAnPScuam9pbihwYXJ0c1sxOl0pCisgICAgICAgIHJldHVybiByZXN1bHQKKwogICAgIGRl ZiBfX2luaXRfXyhzZWxmLCBwYXRoLCBkZXZfYnJhbmNoZXM9Tm9uZSwgcHJvZF9icmFuY2hlcz1O b25lLCBjb250cmlidXRvcnM9Tm9uZSwgaWQ9Tm9uZSwgY2FjaGVkPXN5cy52ZXJzaW9uX2luZm8g PiAoMywgMCkpOgogICAgICAgICBzdXBlcihHaXQsIHNlbGYpLl9faW5pdF9fKHBhdGgsIGRldl9i cmFuY2hlcz1kZXZfYnJhbmNoZXMsIHByb2RfYnJhbmNoZXM9cHJvZF9icmFuY2hlcywgY29udHJp YnV0b3JzPWNvbnRyaWJ1dG9ycywgaWQ9aWQpCiAgICAgICAgIHNlbGYuX2JyYW5jaCA9IE5vbmUK SW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21v Y2tzL2xvY2FsL2dpdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9naXQucHkJKHJldmlzaW9uIDI4MDQz NykKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21v Y2tzL2xvY2FsL2dpdC5weQkod29ya2luZyBjb3B5KQpAQCAtMjgsNyArMjgsNyBAQCBpbXBvcnQg dGltZQogZnJvbSBkYXRldGltZSBpbXBvcnQgZGF0ZXRpbWUKIGZyb20gbW9jayBpbXBvcnQgcGF0 Y2gKIAotZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IG1vY2tzLCBPdXRwdXRDYXB0dXJlLCBTdHJp bmdJTworZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IGRlY29yYXRvcnMsIG1vY2tzLCBPdXRwdXRD YXB0dXJlLCBTdHJpbmdJTwogZnJvbSB3ZWJraXRzY21weSBpbXBvcnQgbG9jYWwsIENvbW1pdCwg Q29udHJpYnV0b3IKIGZyb20gd2Via2l0c2NtcHkucHJvZ3JhbS5jYW5vbmljYWxpemUuY29tbWl0 dGVyIGltcG9ydCBtYWluIGFzIGNvbW1pdHRlcl9tYWluCiBmcm9tIHdlYmtpdHNjbXB5LnByb2dy YW0uY2Fub25pY2FsaXplLm1lc3NhZ2UgaW1wb3J0IG1haW4gYXMgbWVzc2FnZV9tYWluCkBAIC0z NDAsNiArMzQwLDIxIEBAIG5vdGhpbmcgdG8gY29tbWl0LCB3b3JraW5nIHRyZWUgY2xlYW4KICAg ICAgICAgICAgICAgICBjd2Q9c2VsZi5wYXRoLAogICAgICAgICAgICAgICAgIGNvbXBsZXRpb249 bW9ja3MuUHJvY2Vzc0NvbXBsZXRpb24ocmV0dXJuY29kZT0wKSwKICAgICAgICAgICAgICksIG1v Y2tzLlN1YnByb2Nlc3MuUm91dGUoCisgICAgICAgICAgICAgICAgc2VsZi5leGVjdXRhYmxlLCAn Y29uZmlnJywgJy1sJywKKyAgICAgICAgICAgICAgICBjd2Q9c2VsZi5wYXRoLAorICAgICAgICAg ICAgICAgIGdlbmVyYXRvcj1sYW1iZGEgKmFyZ3MsICoqa3dhcmdzOgorICAgICAgICAgICAgICAg ICAgICBtb2Nrcy5Qcm9jZXNzQ29tcGxldGlvbigKKyAgICAgICAgICAgICAgICAgICAgICAgIHJl dHVybmNvZGU9MCwKKyAgICAgICAgICAgICAgICAgICAgICAgIHN0ZG91dD0nXG4nLmpvaW4oWyd7 fT17fScuZm9ybWF0KGtleSwgdmFsdWUpIGZvciBrZXksIHZhbHVlIGluIHNlbGYuY29uZmlnKCku aXRlbXMoKV0pCisgICAgICAgICAgICAgICAgICAgICksCisgICAgICAgICAgICApLCBtb2Nrcy5T dWJwcm9jZXNzLlJvdXRlKAorICAgICAgICAgICAgICAgIHNlbGYuZXhlY3V0YWJsZSwgJ2NvbmZp ZycsICctbCcsICctLWdsb2JhbCcsCisgICAgICAgICAgICAgICAgZ2VuZXJhdG9yPWxhbWJkYSAq YXJncywgKiprd2FyZ3M6CisgICAgICAgICAgICAgICAgICAgIG1vY2tzLlByb2Nlc3NDb21wbGV0 aW9uKAorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuY29kZT0wLAorICAgICAgICAgICAg ICAgICAgICAgICAgc3Rkb3V0PSdcbicuam9pbihbJ3t9PXt9Jy5mb3JtYXQoa2V5LCB2YWx1ZSkg Zm9yIGtleSwgdmFsdWUgaW4gR2l0LmNvbmZpZygpLml0ZW1zKCldKQorICAgICAgICAgICAgICAg ICAgICApLAorICAgICAgICAgICAgKSwgbW9ja3MuU3VicHJvY2Vzcy5Sb3V0ZSgKICAgICAgICAg ICAgICAgICBzZWxmLmV4ZWN1dGFibGUsCiAgICAgICAgICAgICAgICAgY3dkPXNlbGYucGF0aCwK ICAgICAgICAgICAgICAgICBjb21wbGV0aW9uPW1vY2tzLlByb2Nlc3NDb21wbGV0aW9uKApAQCAt NTcwLDMgKzU4NSwzMyBAQCBub3RoaW5nIHRvIGNvbW1pdCwgd29ya2luZyB0cmVlIGNsZWFuCiAg ICAgICAgICAgICBmb3IgY29tbWl0IGluIHJldmVyc2VkKHNlbGYuY29tbWl0c1tzZWxmLmRlZmF1 bHRfYnJhbmNoXSk6CiAgICAgICAgICAgICAgICAgaWYgcHJldmlvdXMuYnJhbmNoX3BvaW50ID09 IGNvbW1pdC5pZGVudGlmaWVyOgogICAgICAgICAgICAgICAgICAgICBlbmQgPSBjb21taXQuaGFz aAorCisgICAgQGRlY29yYXRvcnMuaHlicmlkbWV0aG9kCisgICAgZGVmIGNvbmZpZyhjb250ZXh0 KToKKyAgICAgICAgaWYgaXNpbnN0YW5jZShjb250ZXh0LCB0eXBlKToKKyAgICAgICAgICAgIHJl dHVybiB7CisgICAgICAgICAgICAgICAgJ3VzZXIubmFtZSc6ICd0YXBwbGVAd2Via2l0Lm9yZycs CisgICAgICAgICAgICAgICAgJ3NlbmRlbWFpbC50cmFuc2ZlcmVuY29kaW5nJzogJ2Jhc2U2NCcs CisgICAgICAgICAgICB9CisKKyAgICAgICAgUkVfU0lOR0xFX1RPUCA9IHJlLmNvbXBpbGUocide XFtccyooP1A8a2V5PlxTKylccypcXScpCisgICAgICAgIFJFX01VTFRJX1RPUCA9IHJlLmNvbXBp bGUocideXFtccyooP1A8a2V5YT5cUyspICIoP1A8a2V5Yj5cUyspIlxzKlxdJykKKyAgICAgICAg UkVfRUxFTUVOVCA9IHJlLmNvbXBpbGUocideXHMrKD9QPGtleT5cUyspXHMqPVxzKig/UDx2YWx1 ZT5cUyspJykKKworICAgICAgICB0b3AgPSBOb25lCisgICAgICAgIHJlc3VsdCA9IEdpdC5jb25m aWcoKQorICAgICAgICB3aXRoIG9wZW4ob3MucGF0aC5qb2luKGNvbnRleHQucGF0aCwgJy5naXQn LCAnY29uZmlnJyksICdyJykgYXMgY29uZmlnZmlsZToKKyAgICAgICAgICAgIGZvciBsaW5lIGlu IGNvbmZpZ2ZpbGUucmVhZGxpbmVzKCk6CisgICAgICAgICAgICAgICAgbWF0Y2ggPSBSRV9NVUxU SV9UT1AubWF0Y2gobGluZSkKKyAgICAgICAgICAgICAgICBpZiBtYXRjaDoKKyAgICAgICAgICAg ICAgICAgICAgdG9wID0gJ3t9Lnt9Jy5mb3JtYXQobWF0Y2guZ3JvdXAoJ2tleWEnKSwgbWF0Y2gu Z3JvdXAoJ2tleWInKSkKKyAgICAgICAgICAgICAgICAgICAgY29udGludWUKKyAgICAgICAgICAg ICAgICBtYXRjaCA9IFJFX1NJTkdMRV9UT1AubWF0Y2gobGluZSkKKyAgICAgICAgICAgICAgICBp ZiBtYXRjaDoKKyAgICAgICAgICAgICAgICAgICAgdG9wID0gbWF0Y2guZ3JvdXAoJ2tleScpCisg ICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCisKKyAgICAgICAgICAgICAgICBtYXRjaCA9IFJF X0VMRU1FTlQubWF0Y2gobGluZSkKKyAgICAgICAgICAgICAgICBpZiB0b3AgYW5kIG1hdGNoOgor ICAgICAgICAgICAgICAgICAgICByZXN1bHRbJ3t9Lnt9Jy5mb3JtYXQodG9wLCBtYXRjaC5ncm91 cCgna2V5JykpXSA9IG1hdGNoLmdyb3VwKCd2YWx1ZScpCisgICAgICAgIHJldHVybiByZXN1bHQK SW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rl c3QvZ2l0X3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAy ODA0MzcpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS90ZXN0L2dpdF91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMzkxLDYgKzM5MSwyMSBA QCBDb21taXREYXRlOiBTYXQgT2N0IDAzIDAyOjA2OjQwIDIwMjAgKzAwCiAgICAgICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKHJlcG8uY2FjaGUudG9fcmV2aXNpb24oaGFzaD0nYmFkYzBkZDFmJyks IE5vbmUpCiAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJlcG8uY2FjaGUudG9fcmV2aXNp b24oaWRlbnRpZmllcj0nNkBtYWluJyksIE5vbmUpCiAKKyAgICBkZWYgdGVzdF9jb25maWcoc2Vs Zik6CisgICAgICAgIHdpdGggbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0aCwgZ2l0X3N2bj1UcnVl KSBhcyBtOgorICAgICAgICAgICAgcmVwbyA9IGxvY2FsLkdpdChzZWxmLnBhdGgpCisKKyAgICAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVwby5jb25maWcoKVsndXNlci5uYW1lJ10sICd0YXBw bGVAd2Via2l0Lm9yZycpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJlcG8uY29uZmln KClbJ2NvcmUuZmlsZW1vZGUnXSwgJ3RydWUnKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChyZXBvLmNvbmZpZygpWydyZW1vdGUub3JpZ2luLnVybCddLCAnZ2l0QGV4YW1wbGUub3JnOi9t b2NrL3JlcG9zaXRvcnknKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChyZXBvLmNvbmZp ZygpWydzdm4tcmVtb3RlLnN2bi51cmwnXSwgJ2h0dHBzOi8vc3ZuLmV4YW1wbGUub3JnL3JlcG9z aXRvcnkvd2Via2l0JykKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVwby5jb25maWco KVsnc3ZuLXJlbW90ZS5zdm4uZmV0Y2gnXSwgJ3RydW5rOnJlZnMvcmVtb3Rlcy9vcmlnaW4vbWFp bicpCisKKyAgICBkZWYgdGVzdF9nbG9iYWxfY29uZmlnKHNlbGYpOgorICAgICAgICB3aXRoIG1v Y2tzLmxvY2FsLkdpdChzZWxmLnBhdGgsIGdpdF9zdm49VHJ1ZSksIE91dHB1dENhcHR1cmUoKToK KyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobG9jYWwuR2l0LmNvbmZpZygpWyd1c2VyLm5h bWUnXSwgJ3RhcHBsZUB3ZWJraXQub3JnJykKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo bG9jYWwuR2l0LmNvbmZpZygpWydzZW5kZW1haWwudHJhbnNmZXJlbmNvZGluZyddLCAnYmFzZTY0 JykKKwogCiBjbGFzcyBUZXN0R2l0SHViKHRlc3RpbmcuVGVzdENhc2UpOgogICAgIHJlbW90ZSA9 ICdodHRwczovL2dpdGh1Yi5leGFtcGxlLmNvbS9XZWJLaXQvV2ViS2l0Jwo= 434554 2021-07-29 12:04:57 -0700 2021-08-02 08:45:19 -0700 Patch bug-228597-20210729120456.patch text/plain 8344 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI4MDQzNykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIxLTA3LTI5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIEFkZCBhY2Nlc3MgdG8gYGdpdCBjb25maWdgCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg1OTcKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgxMjgzNjQ0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv c2V0dXAucHk6IEJ1bXAgdmVyc2lvbi4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5OgorICAgICAg ICAoR2l0LmNvbmZpZyk6IFJldHVybiBnaXQgY29uZmlndXJhdGlvbiBhcyBkaWN0aW9uYXJ5Lgor ICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tz L2xvY2FsL2dpdC5weToKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5weToKKyAgICAgICAgKHRlc3RfY29uZmlnKTog VGVzdCByZXBvc2l0b3J5IGNvbmZpZ3VyYXRpb24uCisgICAgICAgICh0ZXN0X2dsb2JhbF9jb25m aWcpOiBUZXN0IGdsb2JhbCBjb25maWd1cmF0aW9uLgorCiAyMDIxLTA3LTI5ICBBYWthc2ggSmFp biAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBTZW5kIGVtYWlsIG5vdGlmaWNh dGlvbiB3aGVuIFZlcmlmeUdpdEh1YkludGVncml0eSBzdGVwIGZhaWxzCkluZGV4OiBUb29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQkocmV2aXNpb24gMjgwNDM3 KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkJKHdvcmtp bmcgY29weSkKQEAgLTI5LDcgKzI5LDcgQEAgZGVmIHJlYWRtZSgpOgogCiBzZXR1cCgKICAgICBu YW1lPSd3ZWJraXRzY21weScsCi0gICAgdmVyc2lvbj0nMS4wLjAnLAorICAgIHZlcnNpb249JzEu MC4xJywKICAgICBkZXNjcmlwdGlvbj0nTGlicmFyeSBkZXNpZ25lZCB0byBpbnRlcmFjdCB3aXRo IGdpdCBhbmQgc3ZuIHJlcG9zaXRvcmllcy4nLAogICAgIGxvbmdfZGVzY3JpcHRpb249cmVhZG1l KCksCiAgICAgY2xhc3NpZmllcnM9WwpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkJKHJldmlz aW9uIDI4MDQzNykKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00Niw3ICs0Niw3IEBAIGV4Y2Vw dCBJbXBvcnRFcnJvcjoKICAgICAgICAgIlBsZWFzZSBpbnN0YWxsIHdlYmtpdGNvcmVweSB3aXRo IGBwaXAgaW5zdGFsbCB3ZWJraXRjb3JlcHkgLS1leHRyYS1pbmRleC11cmwgPHBhY2thZ2UgaW5k ZXggVVJMPmAiCiAgICAgKQogCi12ZXJzaW9uID0gVmVyc2lvbigxLCAwLCAwKQordmVyc2lvbiA9 IFZlcnNpb24oMSwgMCwgMSkKIAogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZmFzdGVu ZXJzJywgVmVyc2lvbigwLCAxNSwgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgn bW9ub3RvbmljJywgVmVyc2lvbigxLCA1KSkpCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5 CShyZXZpc2lvbiAyODA0MzcpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9sb2NhbC9naXQucHkJKHdvcmtpbmcgY29weSkKQEAgLTI2Myw2ICsyNjMs MjYgQEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgZGVmIGlzX2NoZWNrb3V0KGNscywgcGF0aCk6CiAg ICAgICAgIHJldHVybiBydW4oW2Nscy5leGVjdXRhYmxlKCksICdyZXYtcGFyc2UnLCAnLS1zaG93 LXRvcGxldmVsJ10sIGN3ZD1wYXRoLCBjYXB0dXJlX291dHB1dD1UcnVlKS5yZXR1cm5jb2RlID09 IDAKIAorICAgIEBkZWNvcmF0b3JzLmh5YnJpZG1ldGhvZAorICAgIGRlZiBjb25maWcoY29udGV4 dCk6CisgICAgICAgIGFyZ3MgPSBbY29udGV4dC5leGVjdXRhYmxlKCksICdjb25maWcnLCAnLWwn XQorICAgICAgICBrd2FyZ3MgPSBkaWN0KGNhcHR1cmVfb3V0cHV0PVRydWUsIGVuY29kaW5nPSd1 dGYtOCcpCisKKyAgICAgICAgaWYgaXNpbnN0YW5jZShjb250ZXh0LCB0eXBlKToKKyAgICAgICAg ICAgIGFyZ3MgKz0gWyctLWdsb2JhbCddCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBrd2Fy Z3NbJ2N3ZCddID0gY29udGV4dC5yb290X3BhdGgKKworICAgICAgICBjb21tYW5kID0gcnVuKGFy Z3MsICoqa3dhcmdzKQorICAgICAgICBpZiBjb21tYW5kLnJldHVybmNvZGU6CisgICAgICAgICAg ICByZXR1cm4ge30KKworICAgICAgICByZXN1bHQgPSB7fQorICAgICAgICBmb3IgbGluZSBpbiBj b21tYW5kLnN0ZG91dC5zcGxpdGxpbmVzKCk6CisgICAgICAgICAgICBwYXJ0cyA9IGxpbmUuc3Bs aXQoJz0nKQorICAgICAgICAgICAgcmVzdWx0W3BhcnRzWzBdXSA9ICc9Jy5qb2luKHBhcnRzWzE6 XSkKKyAgICAgICAgcmV0dXJuIHJlc3VsdAorCiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBhdGgs IGRldl9icmFuY2hlcz1Ob25lLCBwcm9kX2JyYW5jaGVzPU5vbmUsIGNvbnRyaWJ1dG9ycz1Ob25l LCBpZD1Ob25lLCBjYWNoZWQ9c3lzLnZlcnNpb25faW5mbyA+ICgzLCAwKSk6CiAgICAgICAgIHN1 cGVyKEdpdCwgc2VsZikuX19pbml0X18ocGF0aCwgZGV2X2JyYW5jaGVzPWRldl9icmFuY2hlcywg cHJvZF9icmFuY2hlcz1wcm9kX2JyYW5jaGVzLCBjb250cmlidXRvcnM9Y29udHJpYnV0b3JzLCBp ZD1pZCkKICAgICAgICAgc2VsZi5fYnJhbmNoID0gTm9uZQpJbmRleDogVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0LnB5Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L21vY2tzL2xvY2FsL2dpdC5weQkocmV2aXNpb24gMjgwNDM3KQorKysgVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0LnB5CSh3b3Jr aW5nIGNvcHkpCkBAIC0yOCw3ICsyOCw3IEBAIGltcG9ydCB0aW1lCiBmcm9tIGRhdGV0aW1lIGlt cG9ydCBkYXRldGltZQogZnJvbSBtb2NrIGltcG9ydCBwYXRjaAogCi1mcm9tIHdlYmtpdGNvcmVw eSBpbXBvcnQgbW9ja3MsIE91dHB1dENhcHR1cmUsIFN0cmluZ0lPCitmcm9tIHdlYmtpdGNvcmVw eSBpbXBvcnQgZGVjb3JhdG9ycywgbW9ja3MsIE91dHB1dENhcHR1cmUsIFN0cmluZ0lPCiBmcm9t IHdlYmtpdHNjbXB5IGltcG9ydCBsb2NhbCwgQ29tbWl0LCBDb250cmlidXRvcgogZnJvbSB3ZWJr aXRzY21weS5wcm9ncmFtLmNhbm9uaWNhbGl6ZS5jb21taXR0ZXIgaW1wb3J0IG1haW4gYXMgY29t bWl0dGVyX21haW4KIGZyb20gd2Via2l0c2NtcHkucHJvZ3JhbS5jYW5vbmljYWxpemUubWVzc2Fn ZSBpbXBvcnQgbWFpbiBhcyBtZXNzYWdlX21haW4KQEAgLTM0MCw2ICszNDAsMjEgQEAgbm90aGlu ZyB0byBjb21taXQsIHdvcmtpbmcgdHJlZSBjbGVhbgogICAgICAgICAgICAgICAgIGN3ZD1zZWxm LnBhdGgsCiAgICAgICAgICAgICAgICAgY29tcGxldGlvbj1tb2Nrcy5Qcm9jZXNzQ29tcGxldGlv bihyZXR1cm5jb2RlPTApLAogICAgICAgICAgICAgKSwgbW9ja3MuU3VicHJvY2Vzcy5Sb3V0ZSgK KyAgICAgICAgICAgICAgICBzZWxmLmV4ZWN1dGFibGUsICdjb25maWcnLCAnLWwnLAorICAgICAg ICAgICAgICAgIGN3ZD1zZWxmLnBhdGgsCisgICAgICAgICAgICAgICAgZ2VuZXJhdG9yPWxhbWJk YSAqYXJncywgKiprd2FyZ3M6CisgICAgICAgICAgICAgICAgICAgIG1vY2tzLlByb2Nlc3NDb21w bGV0aW9uKAorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuY29kZT0wLAorICAgICAgICAg ICAgICAgICAgICAgICAgc3Rkb3V0PSdcbicuam9pbihbJ3t9PXt9Jy5mb3JtYXQoa2V5LCB2YWx1 ZSkgZm9yIGtleSwgdmFsdWUgaW4gc2VsZi5jb25maWcoKS5pdGVtcygpXSkKKyAgICAgICAgICAg ICAgICAgICAgKSwKKyAgICAgICAgICAgICksIG1vY2tzLlN1YnByb2Nlc3MuUm91dGUoCisgICAg ICAgICAgICAgICAgc2VsZi5leGVjdXRhYmxlLCAnY29uZmlnJywgJy1sJywgJy0tZ2xvYmFsJywK KyAgICAgICAgICAgICAgICBnZW5lcmF0b3I9bGFtYmRhICphcmdzLCAqKmt3YXJnczoKKyAgICAg ICAgICAgICAgICAgICAgbW9ja3MuUHJvY2Vzc0NvbXBsZXRpb24oCisgICAgICAgICAgICAgICAg ICAgICAgICByZXR1cm5jb2RlPTAsCisgICAgICAgICAgICAgICAgICAgICAgICBzdGRvdXQ9J1xu Jy5qb2luKFsne309e30nLmZvcm1hdChrZXksIHZhbHVlKSBmb3Iga2V5LCB2YWx1ZSBpbiBHaXQu Y29uZmlnKCkuaXRlbXMoKV0pCisgICAgICAgICAgICAgICAgICAgICksCisgICAgICAgICAgICAp LCBtb2Nrcy5TdWJwcm9jZXNzLlJvdXRlKAogICAgICAgICAgICAgICAgIHNlbGYuZXhlY3V0YWJs ZSwKICAgICAgICAgICAgICAgICBjd2Q9c2VsZi5wYXRoLAogICAgICAgICAgICAgICAgIGNvbXBs ZXRpb249bW9ja3MuUHJvY2Vzc0NvbXBsZXRpb24oCkBAIC01NzAsMyArNTg1LDMzIEBAIG5vdGhp bmcgdG8gY29tbWl0LCB3b3JraW5nIHRyZWUgY2xlYW4KICAgICAgICAgICAgIGZvciBjb21taXQg aW4gcmV2ZXJzZWQoc2VsZi5jb21taXRzW3NlbGYuZGVmYXVsdF9icmFuY2hdKToKICAgICAgICAg ICAgICAgICBpZiBwcmV2aW91cy5icmFuY2hfcG9pbnQgPT0gY29tbWl0LmlkZW50aWZpZXI6CiAg ICAgICAgICAgICAgICAgICAgIGVuZCA9IGNvbW1pdC5oYXNoCisKKyAgICBAZGVjb3JhdG9ycy5o eWJyaWRtZXRob2QKKyAgICBkZWYgY29uZmlnKGNvbnRleHQpOgorICAgICAgICBpZiBpc2luc3Rh bmNlKGNvbnRleHQsIHR5cGUpOgorICAgICAgICAgICAgcmV0dXJuIHsKKyAgICAgICAgICAgICAg ICAndXNlci5uYW1lJzogJ3RhcHBsZUB3ZWJraXQub3JnJywKKyAgICAgICAgICAgICAgICAnc2Vu ZGVtYWlsLnRyYW5zZmVyZW5jb2RpbmcnOiAnYmFzZTY0JywKKyAgICAgICAgICAgIH0KKworICAg ICAgICBSRV9TSU5HTEVfVE9QID0gcmUuY29tcGlsZShyJ15cW1xzKig/UDxrZXk+XFMrKVxzKlxd JykKKyAgICAgICAgUkVfTVVMVElfVE9QID0gcmUuY29tcGlsZShyJ15cW1xzKig/UDxrZXlhPlxT KykgIig/UDxrZXliPlxTKykiXHMqXF0nKQorICAgICAgICBSRV9FTEVNRU5UID0gcmUuY29tcGls ZShyJ15ccysoP1A8a2V5PlxTKylccyo9XHMqKD9QPHZhbHVlPlxTKyknKQorCisgICAgICAgIHRv cCA9IE5vbmUKKyAgICAgICAgcmVzdWx0ID0gR2l0LmNvbmZpZygpCisgICAgICAgIHdpdGggb3Bl bihvcy5wYXRoLmpvaW4oY29udGV4dC5wYXRoLCAnLmdpdCcsICdjb25maWcnKSwgJ3InKSBhcyBj b25maWdmaWxlOgorICAgICAgICAgICAgZm9yIGxpbmUgaW4gY29uZmlnZmlsZS5yZWFkbGluZXMo KToKKyAgICAgICAgICAgICAgICBtYXRjaCA9IFJFX01VTFRJX1RPUC5tYXRjaChsaW5lKQorICAg ICAgICAgICAgICAgIGlmIG1hdGNoOgorICAgICAgICAgICAgICAgICAgICB0b3AgPSAne30ue30n LmZvcm1hdChtYXRjaC5ncm91cCgna2V5YScpLCBtYXRjaC5ncm91cCgna2V5YicpKQorICAgICAg ICAgICAgICAgICAgICBjb250aW51ZQorICAgICAgICAgICAgICAgIG1hdGNoID0gUkVfU0lOR0xF X1RPUC5tYXRjaChsaW5lKQorICAgICAgICAgICAgICAgIGlmIG1hdGNoOgorICAgICAgICAgICAg ICAgICAgICB0b3AgPSBtYXRjaC5ncm91cCgna2V5JykKKyAgICAgICAgICAgICAgICAgICAgY29u dGludWUKKworICAgICAgICAgICAgICAgIG1hdGNoID0gUkVfRUxFTUVOVC5tYXRjaChsaW5lKQor ICAgICAgICAgICAgICAgIGlmIHRvcCBhbmQgbWF0Y2g6CisgICAgICAgICAgICAgICAgICAgIHJl c3VsdFsne30ue30nLmZvcm1hdCh0b3AsIG1hdGNoLmdyb3VwKCdrZXknKSldID0gbWF0Y2guZ3Jv dXAoJ3ZhbHVlJykKKyAgICAgICAgcmV0dXJuIHJlc3VsdApJbmRleDogVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3QucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvdGVzdC9naXRfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI4MDQzNykKKysrIFRvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5 CSh3b3JraW5nIGNvcHkpCkBAIC0zOTEsNiArMzkxLDIxIEBAIENvbW1pdERhdGU6IFNhdCBPY3Qg MDMgMDI6MDY6NDAgMjAyMCArMDAKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVwby5j YWNoZS50b19yZXZpc2lvbihoYXNoPSdiYWRjMGRkMWYnKSwgTm9uZSkKICAgICAgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwocmVwby5jYWNoZS50b19yZXZpc2lvbihpZGVudGlmaWVyPSc2QG1haW4n KSwgTm9uZSkKIAorICAgIGRlZiB0ZXN0X2NvbmZpZyhzZWxmKToKKyAgICAgICAgd2l0aCBtb2Nr cy5sb2NhbC5HaXQoc2VsZi5wYXRoLCBnaXRfc3ZuPVRydWUpIGFzIG06CisgICAgICAgICAgICBy ZXBvID0gbG9jYWwuR2l0KHNlbGYucGF0aCkKKworICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChyZXBvLmNvbmZpZygpWyd1c2VyLm5hbWUnXSwgJ3RhcHBsZUB3ZWJraXQub3JnJykKKyAgICAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVwby5jb25maWcoKVsnY29yZS5maWxlbW9kZSddLCAn dHJ1ZScpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJlcG8uY29uZmlnKClbJ3JlbW90 ZS5vcmlnaW4udXJsJ10sICdnaXRAZXhhbXBsZS5vcmc6L21vY2svcmVwb3NpdG9yeScpCisgICAg ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJlcG8uY29uZmlnKClbJ3N2bi1yZW1vdGUuc3ZuLnVy bCddLCAnaHR0cHM6Ly9zdm4uZXhhbXBsZS5vcmcvcmVwb3NpdG9yeS93ZWJraXQnKQorICAgICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChyZXBvLmNvbmZpZygpWydzdm4tcmVtb3RlLnN2bi5mZXRj aCddLCAndHJ1bms6cmVmcy9yZW1vdGVzL29yaWdpbi9tYWluJykKKworICAgIGRlZiB0ZXN0X2ds b2JhbF9jb25maWcoc2VsZik6CisgICAgICAgIHdpdGggbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0 aCwgZ2l0X3N2bj1UcnVlKSwgT3V0cHV0Q2FwdHVyZSgpOgorICAgICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChsb2NhbC5HaXQuY29uZmlnKClbJ3VzZXIubmFtZSddLCAndGFwcGxlQHdlYmtpdC5v cmcnKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsb2NhbC5HaXQuY29uZmlnKClbJ3Nl bmRlbWFpbC50cmFuc2ZlcmVuY29kaW5nJ10sICdiYXNlNjQnKQorCiAKIGNsYXNzIFRlc3RHaXRI dWIodGVzdGluZy5UZXN0Q2FzZSk6CiAgICAgcmVtb3RlID0gJ2h0dHBzOi8vZ2l0aHViLmV4YW1w bGUuY29tL1dlYktpdC9XZWJLaXQnCg== 434758 2021-08-02 08:45:21 -0700 2021-08-03 09:55:10 -0700 Patch bug-228597-20210802084520.patch text/plain 8717 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNTI5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWU2OTIzZjcxZWMwNDM0ZmU0M2Q3NWMyNGVhZTM0ODBm ZDlkOGRlMy4uZDY2MzJiNzU4ZjM3ZjcwOWY3OGIyNzQ3MzM3MDkwMzA5MDYyOGJhZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDIxLTA4LTAyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIEFkZCBhY2Nlc3MgdG8gYGdpdCBjb25maWdgCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg1OTcKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzgxMjgzNjQ0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAu cHk6IEJ1bXAgdmVyc2lvbi4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9fX2luaXRfXy5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5OgorICAgICAgICAoR2l0 LmNvbmZpZyk6IFJldHVybiBnaXQgY29uZmlndXJhdGlvbiBhcyBkaWN0aW9uYXJ5LgorICAgICAg ICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2Fs L2dpdC5weToKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS90ZXN0L2dpdF91bml0dGVzdC5weToKKyAgICAgICAgKHRlc3RfY29uZmlnKTogVGVzdCBy ZXBvc2l0b3J5IGNvbmZpZ3VyYXRpb24uCisgICAgICAgICh0ZXN0X2dsb2JhbF9jb25maWcpOiBU ZXN0IGdsb2JhbCBjb25maWd1cmF0aW9uLgorCiAyMDIxLTA4LTAyICBMYXVybyBNb3VyYSAgPGxt b3VyYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHTElCXSBNYWtlIENPUlMgYWxsb3dsaXN0IHRl c3Qgd2FpdCBmb3IgcHJvbWlzZSByZXNvbHV0aW9uCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3NldHVwLnB5CmluZGV4IDAyODQ2NTM0MGM3NTI5NzdiYTMxYjhlZjY0NTRk MjFkOWExZGUzOWIuLjljZTIxN2IxY2ExZGJiOWJiNmZmYmY4M2U3NjI1OWNjMmEwZGU5YmYgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5CkBAIC0yOSw3 ICsyOSw3IEBAIGRlZiByZWFkbWUoKToKIAogc2V0dXAoCiAgICAgbmFtZT0nd2Via2l0c2NtcHkn LAotICAgIHZlcnNpb249JzEuMC40JywKKyAgICB2ZXJzaW9uPScxLjAuNScsCiAgICAgZGVzY3Jp cHRpb249J0xpYnJhcnkgZGVzaWduZWQgdG8gaW50ZXJhY3Qgd2l0aCBnaXQgYW5kIHN2biByZXBv c2l0b3JpZXMuJywKICAgICBsb25nX2Rlc2NyaXB0aW9uPXJlYWRtZSgpLAogICAgIGNsYXNzaWZp ZXJzPVsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl YmtpdHNjbXB5L19faW5pdF9fLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkKaW5kZXggNWE5OTI0Njg0ZmFlZmYwZWE0N2U5YzQw M2ZjZDkwZTYxNDI3NzY2YS4uZWM2OWEwM2E1MGU5OTMyNjgwNGVjOTFkNThlMmM3ZTc0OTg4YWEz YyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvX19pbml0X18ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkKQEAgLTQ2LDcgKzQ2LDcgQEAgZXhjZXB0IEltcG9y dEVycm9yOgogICAgICAgICAiUGxlYXNlIGluc3RhbGwgd2Via2l0Y29yZXB5IHdpdGggYHBpcCBp bnN0YWxsIHdlYmtpdGNvcmVweSAtLWV4dHJhLWluZGV4LXVybCA8cGFja2FnZSBpbmRleCBVUkw+ YCIKICAgICApCiAKLXZlcnNpb24gPSBWZXJzaW9uKDEsIDAsIDQpCit2ZXJzaW9uID0gVmVyc2lv bigxLCAwLCA1KQogCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdmYXN0ZW5lcnMnLCBW ZXJzaW9uKDAsIDE1LCAwKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdtb25vdG9u aWMnLCBWZXJzaW9uKDEsIDUpKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weSBiL1Rvb2xzL1NjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weQppbmRleCAyYmY3Mjhj NmYzZTg4YmQ5MzhhMjhjOTZiMzlhYjY2MjM0YmQxN2MyLi5jMWFjNTgzMDA0MjVmYjc1NzMyZGYz ODBkOWM2NmJlYWI1YzE5OTIxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5CkBAIC0yNjYsNiAr MjY2LDI2IEBAIGNsYXNzIEdpdChTY20pOgogICAgIGRlZiBpc19jaGVja291dChjbHMsIHBhdGgp OgogICAgICAgICByZXR1cm4gcnVuKFtjbHMuZXhlY3V0YWJsZSgpLCAncmV2LXBhcnNlJywgJy0t c2hvdy10b3BsZXZlbCddLCBjd2Q9cGF0aCwgY2FwdHVyZV9vdXRwdXQ9VHJ1ZSkucmV0dXJuY29k ZSA9PSAwCiAKKyAgICBAZGVjb3JhdG9ycy5oeWJyaWRtZXRob2QKKyAgICBkZWYgY29uZmlnKGNv bnRleHQpOgorICAgICAgICBhcmdzID0gW2NvbnRleHQuZXhlY3V0YWJsZSgpLCAnY29uZmlnJywg Jy1sJ10KKyAgICAgICAga3dhcmdzID0gZGljdChjYXB0dXJlX291dHB1dD1UcnVlLCBlbmNvZGlu Zz0ndXRmLTgnKQorCisgICAgICAgIGlmIGlzaW5zdGFuY2UoY29udGV4dCwgdHlwZSk6CisgICAg ICAgICAgICBhcmdzICs9IFsnLS1nbG9iYWwnXQorICAgICAgICBlbHNlOgorICAgICAgICAgICAg a3dhcmdzWydjd2QnXSA9IGNvbnRleHQucm9vdF9wYXRoCisKKyAgICAgICAgY29tbWFuZCA9IHJ1 bihhcmdzLCAqKmt3YXJncykKKyAgICAgICAgaWYgY29tbWFuZC5yZXR1cm5jb2RlOgorICAgICAg ICAgICAgcmV0dXJuIHt9CisKKyAgICAgICAgcmVzdWx0ID0ge30KKyAgICAgICAgZm9yIGxpbmUg aW4gY29tbWFuZC5zdGRvdXQuc3BsaXRsaW5lcygpOgorICAgICAgICAgICAgcGFydHMgPSBsaW5l LnNwbGl0KCc9JykKKyAgICAgICAgICAgIHJlc3VsdFtwYXJ0c1swXV0gPSAnPScuam9pbihwYXJ0 c1sxOl0pCisgICAgICAgIHJldHVybiByZXN1bHQKKwogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBw YXRoLCBkZXZfYnJhbmNoZXM9Tm9uZSwgcHJvZF9icmFuY2hlcz1Ob25lLCBjb250cmlidXRvcnM9 Tm9uZSwgaWQ9Tm9uZSwgY2FjaGVkPXN5cy52ZXJzaW9uX2luZm8gPiAoMywgMCkpOgogICAgICAg ICBzdXBlcihHaXQsIHNlbGYpLl9faW5pdF9fKHBhdGgsIGRldl9icmFuY2hlcz1kZXZfYnJhbmNo ZXMsIHByb2RfYnJhbmNoZXM9cHJvZF9icmFuY2hlcywgY29udHJpYnV0b3JzPWNvbnRyaWJ1dG9y cywgaWQ9aWQpCiAgICAgICAgIHNlbGYuX2JyYW5jaCA9IE5vbmUKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL2dp dC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21v Y2tzL2xvY2FsL2dpdC5weQppbmRleCBlMTkwY2UxZWExNDc2ZWUzMTQxMDBlM2RmNjFhMTg1YzQz ZWI0MzJmLi4wZTliYjM5NGNlOTlmZjdmODVkMmUwZTgyZTliN2U1YzI2NTkyY2U1IDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nr cy9sb2NhbC9naXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0LnB5CkBAIC0yOCw3ICsyOCw3IEBAIGltcG9ydCB0 aW1lCiBmcm9tIGRhdGV0aW1lIGltcG9ydCBkYXRldGltZQogZnJvbSBtb2NrIGltcG9ydCBwYXRj aAogCi1mcm9tIHdlYmtpdGNvcmVweSBpbXBvcnQgbW9ja3MsIE91dHB1dENhcHR1cmUsIFN0cmlu Z0lPCitmcm9tIHdlYmtpdGNvcmVweSBpbXBvcnQgZGVjb3JhdG9ycywgbW9ja3MsIE91dHB1dENh cHR1cmUsIFN0cmluZ0lPCiBmcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBsb2NhbCwgQ29tbWl0LCBD b250cmlidXRvcgogZnJvbSB3ZWJraXRzY21weS5wcm9ncmFtLmNhbm9uaWNhbGl6ZS5jb21taXR0 ZXIgaW1wb3J0IG1haW4gYXMgY29tbWl0dGVyX21haW4KIGZyb20gd2Via2l0c2NtcHkucHJvZ3Jh bS5jYW5vbmljYWxpemUubWVzc2FnZSBpbXBvcnQgbWFpbiBhcyBtZXNzYWdlX21haW4KQEAgLTMz OSw2ICszMzksMjEgQEAgbm90aGluZyB0byBjb21taXQsIHdvcmtpbmcgdHJlZSBjbGVhbgogICAg ICAgICAgICAgICAgIHNlbGYuZXhlY3V0YWJsZSwgJ3B1bGwnLAogICAgICAgICAgICAgICAgIGN3 ZD1zZWxmLnBhdGgsCiAgICAgICAgICAgICAgICAgY29tcGxldGlvbj1tb2Nrcy5Qcm9jZXNzQ29t cGxldGlvbihyZXR1cm5jb2RlPTApLAorICAgICAgICAgICAgKSwgbW9ja3MuU3VicHJvY2Vzcy5S b3V0ZSgKKyAgICAgICAgICAgICAgICBzZWxmLmV4ZWN1dGFibGUsICdjb25maWcnLCAnLWwnLAor ICAgICAgICAgICAgICAgIGN3ZD1zZWxmLnBhdGgsCisgICAgICAgICAgICAgICAgZ2VuZXJhdG9y PWxhbWJkYSAqYXJncywgKiprd2FyZ3M6CisgICAgICAgICAgICAgICAgICAgIG1vY2tzLlByb2Nl c3NDb21wbGV0aW9uKAorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuY29kZT0wLAorICAg ICAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PSdcbicuam9pbihbJ3t9PXt9Jy5mb3JtYXQoa2V5 LCB2YWx1ZSkgZm9yIGtleSwgdmFsdWUgaW4gc2VsZi5jb25maWcoKS5pdGVtcygpXSkKKyAgICAg ICAgICAgICAgICAgICAgKSwKKyAgICAgICAgICAgICksIG1vY2tzLlN1YnByb2Nlc3MuUm91dGUo CisgICAgICAgICAgICAgICAgc2VsZi5leGVjdXRhYmxlLCAnY29uZmlnJywgJy1sJywgJy0tZ2xv YmFsJywKKyAgICAgICAgICAgICAgICBnZW5lcmF0b3I9bGFtYmRhICphcmdzLCAqKmt3YXJnczoK KyAgICAgICAgICAgICAgICAgICAgbW9ja3MuUHJvY2Vzc0NvbXBsZXRpb24oCisgICAgICAgICAg ICAgICAgICAgICAgICByZXR1cm5jb2RlPTAsCisgICAgICAgICAgICAgICAgICAgICAgICBzdGRv dXQ9J1xuJy5qb2luKFsne309e30nLmZvcm1hdChrZXksIHZhbHVlKSBmb3Iga2V5LCB2YWx1ZSBp biBHaXQuY29uZmlnKCkuaXRlbXMoKV0pCisgICAgICAgICAgICAgICAgICAgICksCiAgICAgICAg ICAgICApLCBtb2Nrcy5TdWJwcm9jZXNzLlJvdXRlKAogICAgICAgICAgICAgICAgIHNlbGYuZXhl Y3V0YWJsZSwKICAgICAgICAgICAgICAgICBjd2Q9c2VsZi5wYXRoLApAQCAtNTcwLDMgKzU4NSwz MyBAQCBub3RoaW5nIHRvIGNvbW1pdCwgd29ya2luZyB0cmVlIGNsZWFuCiAgICAgICAgICAgICBm b3IgY29tbWl0IGluIHJldmVyc2VkKHNlbGYuY29tbWl0c1tzZWxmLmRlZmF1bHRfYnJhbmNoXSk6 CiAgICAgICAgICAgICAgICAgaWYgcHJldmlvdXMuYnJhbmNoX3BvaW50ID09IGNvbW1pdC5pZGVu dGlmaWVyOgogICAgICAgICAgICAgICAgICAgICBlbmQgPSBjb21taXQuaGFzaAorCisgICAgQGRl Y29yYXRvcnMuaHlicmlkbWV0aG9kCisgICAgZGVmIGNvbmZpZyhjb250ZXh0KToKKyAgICAgICAg aWYgaXNpbnN0YW5jZShjb250ZXh0LCB0eXBlKToKKyAgICAgICAgICAgIHJldHVybiB7CisgICAg ICAgICAgICAgICAgJ3VzZXIubmFtZSc6ICd0YXBwbGVAd2Via2l0Lm9yZycsCisgICAgICAgICAg ICAgICAgJ3NlbmRlbWFpbC50cmFuc2ZlcmVuY29kaW5nJzogJ2Jhc2U2NCcsCisgICAgICAgICAg ICB9CisKKyAgICAgICAgUkVfU0lOR0xFX1RPUCA9IHJlLmNvbXBpbGUocideXFtccyooP1A8a2V5 PlxTKylccypcXScpCisgICAgICAgIFJFX01VTFRJX1RPUCA9IHJlLmNvbXBpbGUocideXFtccyoo P1A8a2V5YT5cUyspICIoP1A8a2V5Yj5cUyspIlxzKlxdJykKKyAgICAgICAgUkVfRUxFTUVOVCA9 IHJlLmNvbXBpbGUocideXHMrKD9QPGtleT5cUyspXHMqPVxzKig/UDx2YWx1ZT5cUyspJykKKwor ICAgICAgICB0b3AgPSBOb25lCisgICAgICAgIHJlc3VsdCA9IEdpdC5jb25maWcoKQorICAgICAg ICB3aXRoIG9wZW4ob3MucGF0aC5qb2luKGNvbnRleHQucGF0aCwgJy5naXQnLCAnY29uZmlnJyks ICdyJykgYXMgY29uZmlnZmlsZToKKyAgICAgICAgICAgIGZvciBsaW5lIGluIGNvbmZpZ2ZpbGUu cmVhZGxpbmVzKCk6CisgICAgICAgICAgICAgICAgbWF0Y2ggPSBSRV9NVUxUSV9UT1AubWF0Y2go bGluZSkKKyAgICAgICAgICAgICAgICBpZiBtYXRjaDoKKyAgICAgICAgICAgICAgICAgICAgdG9w ID0gJ3t9Lnt9Jy5mb3JtYXQobWF0Y2guZ3JvdXAoJ2tleWEnKSwgbWF0Y2guZ3JvdXAoJ2tleWIn KSkKKyAgICAgICAgICAgICAgICAgICAgY29udGludWUKKyAgICAgICAgICAgICAgICBtYXRjaCA9 IFJFX1NJTkdMRV9UT1AubWF0Y2gobGluZSkKKyAgICAgICAgICAgICAgICBpZiBtYXRjaDoKKyAg ICAgICAgICAgICAgICAgICAgdG9wID0gbWF0Y2guZ3JvdXAoJ2tleScpCisgICAgICAgICAgICAg ICAgICAgIGNvbnRpbnVlCisKKyAgICAgICAgICAgICAgICBtYXRjaCA9IFJFX0VMRU1FTlQubWF0 Y2gobGluZSkKKyAgICAgICAgICAgICAgICBpZiB0b3AgYW5kIG1hdGNoOgorICAgICAgICAgICAg ICAgICAgICByZXN1bHRbJ3t9Lnt9Jy5mb3JtYXQodG9wLCBtYXRjaC5ncm91cCgna2V5JykpXSA9 IG1hdGNoLmdyb3VwKCd2YWx1ZScpCisgICAgICAgIHJldHVybiByZXN1bHQKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0 X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvdGVzdC9naXRfdW5pdHRlc3QucHkKaW5kZXggOTMzNDk4Njc3ZDZlZDkxMDVlOTZkMWVl MDljNjNiMjQzOTMxNDliNy4uNmJlMzIzYWNkYjFhM2QzNjQzZWVmNmI3MjU1M2U1NGJiYTc3NzU4 OCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvdGVzdC9naXRfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3QucHkKQEAgLTQwNyw2ICs0 MDcsMjEgQEAgQ29tbWl0RGF0ZTogU2F0IE9jdCAwMyAwMjowNjo0MCAyMDIwICswMDAwCiAgICAg ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJlcG8uY2FjaGUudG9fcmV2aXNpb24oaGFzaD0nYmFk YzBkZDFmJyksIE5vbmUpCiAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJlcG8uY2FjaGUu dG9fcmV2aXNpb24oaWRlbnRpZmllcj0nNkBtYWluJyksIE5vbmUpCiAKKyAgICBkZWYgdGVzdF9j b25maWcoc2VsZik6CisgICAgICAgIHdpdGggbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0aCwgZ2l0 X3N2bj1UcnVlKSBhcyBtOgorICAgICAgICAgICAgcmVwbyA9IGxvY2FsLkdpdChzZWxmLnBhdGgp CisKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVwby5jb25maWcoKVsndXNlci5uYW1l J10sICd0YXBwbGVAd2Via2l0Lm9yZycpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJl cG8uY29uZmlnKClbJ2NvcmUuZmlsZW1vZGUnXSwgJ3RydWUnKQorICAgICAgICAgICAgc2VsZi5h c3NlcnRFcXVhbChyZXBvLmNvbmZpZygpWydyZW1vdGUub3JpZ2luLnVybCddLCAnZ2l0QGV4YW1w bGUub3JnOi9tb2NrL3JlcG9zaXRvcnknKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChy ZXBvLmNvbmZpZygpWydzdm4tcmVtb3RlLnN2bi51cmwnXSwgJ2h0dHBzOi8vc3ZuLmV4YW1wbGUu b3JnL3JlcG9zaXRvcnkvd2Via2l0JykKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVw by5jb25maWcoKVsnc3ZuLXJlbW90ZS5zdm4uZmV0Y2gnXSwgJ3RydW5rOnJlZnMvcmVtb3Rlcy9v cmlnaW4vbWFpbicpCisKKyAgICBkZWYgdGVzdF9nbG9iYWxfY29uZmlnKHNlbGYpOgorICAgICAg ICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgsIGdpdF9zdm49VHJ1ZSksIE91dHB1dENh cHR1cmUoKToKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobG9jYWwuR2l0LmNvbmZpZygp Wyd1c2VyLm5hbWUnXSwgJ3RhcHBsZUB3ZWJraXQub3JnJykKKyAgICAgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwobG9jYWwuR2l0LmNvbmZpZygpWydzZW5kZW1haWwudHJhbnNmZXJlbmNvZGluZydd LCAnYmFzZTY0JykKKwogCiBjbGFzcyBUZXN0R2l0SHViKHRlc3RpbmcuVGVzdENhc2UpOgogICAg IHJlbW90ZSA9ICdodHRwczovL2dpdGh1Yi5leGFtcGxlLmNvbS9XZWJLaXQvV2ViS2l0Jwo= 434837 2021-08-03 09:55:11 -0700 2021-08-03 12:49:58 -0700 Patch bug-228597-20210803095510.patch text/plain 8761 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI4MDU5MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIxLTA4LTAzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIEFkZCBhY2Nlc3MgdG8gYGdpdCBjb25maWdgCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg1OTcKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgxMjgzNjQ0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv c2V0dXAucHk6IEJ1bXAgdmVyc2lvbi4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5OgorICAgICAg ICAoR2l0LmNvbmZpZyk6IFJldHVybiBnaXQgY29uZmlndXJhdGlvbiBhcyBkaWN0aW9uYXJ5Lgor ICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tz L2xvY2FsL2dpdC5weToKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5weToKKyAgICAgICAgKHRlc3RfY29uZmlnKTog VGVzdCByZXBvc2l0b3J5IGNvbmZpZ3VyYXRpb24uCisgICAgICAgICh0ZXN0X2dsb2JhbF9jb25m aWcpOiBUZXN0IGdsb2JhbCBjb25maWd1cmF0aW9uLgorCiAyMDIxLTA4LTAzICBQaGlsaXBwZSBO b3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBbV1BFXVtHVEtdIFNWTl9S RVZJU0lPTiBkcmlmdGluZyBhd2F5IGlmIGJvdHMgZG9uJ3QgcmUtcnVuIGNtYWtlCkluZGV4OiBU b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQkocmV2aXNpb24g MjgwNTkzKQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkJ KHdvcmtpbmcgY29weSkKQEAgLTI5LDcgKzI5LDcgQEAgZGVmIHJlYWRtZSgpOgogCiBzZXR1cCgK ICAgICBuYW1lPSd3ZWJraXRzY21weScsCi0gICAgdmVyc2lvbj0nMS4wLjQnLAorICAgIHZlcnNp b249JzEuMC41JywKICAgICBkZXNjcmlwdGlvbj0nTGlicmFyeSBkZXNpZ25lZCB0byBpbnRlcmFj dCB3aXRoIGdpdCBhbmQgc3ZuIHJlcG9zaXRvcmllcy4nLAogICAgIGxvbmdfZGVzY3JpcHRpb249 cmVhZG1lKCksCiAgICAgY2xhc3NpZmllcnM9WwpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkJ KHJldmlzaW9uIDI4MDU5MykKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00Niw3ICs0Niw3IEBA IGV4Y2VwdCBJbXBvcnRFcnJvcjoKICAgICAgICAgIlBsZWFzZSBpbnN0YWxsIHdlYmtpdGNvcmVw eSB3aXRoIGBwaXAgaW5zdGFsbCB3ZWJraXRjb3JlcHkgLS1leHRyYS1pbmRleC11cmwgPHBhY2th Z2UgaW5kZXggVVJMPmAiCiAgICAgKQogCi12ZXJzaW9uID0gVmVyc2lvbigxLCAwLCA0KQordmVy c2lvbiA9IFZlcnNpb24oMSwgMCwgNSkKIAogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgn ZmFzdGVuZXJzJywgVmVyc2lvbigwLCAxNSwgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFj a2FnZSgnbW9ub3RvbmljJywgVmVyc2lvbigxLCA1KSkpCkluZGV4OiBUb29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwv Z2l0LnB5CShyZXZpc2lvbiAyODA1OTMpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkJKHdvcmtpbmcgY29weSkKQEAgLTI2Niw2 ICsyNjYsMzAgQEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgZGVmIGlzX2NoZWNrb3V0KGNscywgcGF0 aCk6CiAgICAgICAgIHJldHVybiBydW4oW2Nscy5leGVjdXRhYmxlKCksICdyZXYtcGFyc2UnLCAn LS1zaG93LXRvcGxldmVsJ10sIGN3ZD1wYXRoLCBjYXB0dXJlX291dHB1dD1UcnVlKS5yZXR1cm5j b2RlID09IDAKIAorICAgIEBkZWNvcmF0b3JzLmh5YnJpZG1ldGhvZAorICAgIGRlZiBjb25maWco Y29udGV4dCk6CisgICAgICAgIGFyZ3MgPSBbY29udGV4dC5leGVjdXRhYmxlKCksICdjb25maWcn LCAnLWwnXQorICAgICAgICBrd2FyZ3MgPSBkaWN0KGNhcHR1cmVfb3V0cHV0PVRydWUsIGVuY29k aW5nPSd1dGYtOCcpCisKKyAgICAgICAgaWYgaXNpbnN0YW5jZShjb250ZXh0LCB0eXBlKToKKyAg ICAgICAgICAgIGFyZ3MgKz0gWyctLWdsb2JhbCddCisgICAgICAgIGVsc2U6CisgICAgICAgICAg ICBrd2FyZ3NbJ2N3ZCddID0gY29udGV4dC5yb290X3BhdGgKKworICAgICAgICBjb21tYW5kID0g cnVuKGFyZ3MsICoqa3dhcmdzKQorICAgICAgICBpZiBjb21tYW5kLnJldHVybmNvZGU6CisgICAg ICAgICAgICBzeXMuc3RkZXJyLndyaXRlKCJGYWlsZWQgdG8gcnVuICd7fSd7fVxuIi5mb3JtYXQo CisgICAgICAgICAgICAgICAgJyAnLmpvaW4oYXJncyksCisgICAgICAgICAgICAgICAgJycgaWYg aXNpbnN0YW5jZShjb250ZXh0LCB0eXBlKSBlbHNlICcgaW4ge30nLmZvcm1hdChjb250ZXh0LnJv b3RfcGF0aCksCisgICAgICAgICAgICApKQorICAgICAgICAgICAgcmV0dXJuIHt9CisKKyAgICAg ICAgcmVzdWx0ID0ge30KKyAgICAgICAgZm9yIGxpbmUgaW4gY29tbWFuZC5zdGRvdXQuc3BsaXRs aW5lcygpOgorICAgICAgICAgICAgcGFydHMgPSBsaW5lLnNwbGl0KCc9JykKKyAgICAgICAgICAg IHJlc3VsdFtwYXJ0c1swXV0gPSAnPScuam9pbihwYXJ0c1sxOl0pCisgICAgICAgIHJldHVybiBy ZXN1bHQKKwogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwYXRoLCBkZXZfYnJhbmNoZXM9Tm9uZSwg cHJvZF9icmFuY2hlcz1Ob25lLCBjb250cmlidXRvcnM9Tm9uZSwgaWQ9Tm9uZSwgY2FjaGVkPXN5 cy52ZXJzaW9uX2luZm8gPiAoMywgMCkpOgogICAgICAgICBzdXBlcihHaXQsIHNlbGYpLl9faW5p dF9fKHBhdGgsIGRldl9icmFuY2hlcz1kZXZfYnJhbmNoZXMsIHByb2RfYnJhbmNoZXM9cHJvZF9i cmFuY2hlcywgY29udHJpYnV0b3JzPWNvbnRyaWJ1dG9ycywgaWQ9aWQpCiAgICAgICAgIHNlbGYu X2JyYW5jaCA9IE5vbmUKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL2dpdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9naXQucHkJ KHJldmlzaW9uIDI4MDU5MykKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL2dpdC5weQkod29ya2luZyBjb3B5KQpAQCAtMjgsNyAr MjgsNyBAQCBpbXBvcnQgdGltZQogZnJvbSBkYXRldGltZSBpbXBvcnQgZGF0ZXRpbWUKIGZyb20g bW9jayBpbXBvcnQgcGF0Y2gKIAotZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IG1vY2tzLCBPdXRw dXRDYXB0dXJlLCBTdHJpbmdJTworZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IGRlY29yYXRvcnMs IG1vY2tzLCBPdXRwdXRDYXB0dXJlLCBTdHJpbmdJTwogZnJvbSB3ZWJraXRzY21weSBpbXBvcnQg bG9jYWwsIENvbW1pdCwgQ29udHJpYnV0b3IKIGZyb20gd2Via2l0c2NtcHkucHJvZ3JhbS5jYW5v bmljYWxpemUuY29tbWl0dGVyIGltcG9ydCBtYWluIGFzIGNvbW1pdHRlcl9tYWluCiBmcm9tIHdl YmtpdHNjbXB5LnByb2dyYW0uY2Fub25pY2FsaXplLm1lc3NhZ2UgaW1wb3J0IG1haW4gYXMgbWVz c2FnZV9tYWluCkBAIC0zNDAsNiArMzQwLDIxIEBAIG5vdGhpbmcgdG8gY29tbWl0LCB3b3JraW5n IHRyZWUgY2xlYW4KICAgICAgICAgICAgICAgICBjd2Q9c2VsZi5wYXRoLAogICAgICAgICAgICAg ICAgIGNvbXBsZXRpb249bW9ja3MuUHJvY2Vzc0NvbXBsZXRpb24ocmV0dXJuY29kZT0wKSwKICAg ICAgICAgICAgICksIG1vY2tzLlN1YnByb2Nlc3MuUm91dGUoCisgICAgICAgICAgICAgICAgc2Vs Zi5leGVjdXRhYmxlLCAnY29uZmlnJywgJy1sJywKKyAgICAgICAgICAgICAgICBjd2Q9c2VsZi5w YXRoLAorICAgICAgICAgICAgICAgIGdlbmVyYXRvcj1sYW1iZGEgKmFyZ3MsICoqa3dhcmdzOgor ICAgICAgICAgICAgICAgICAgICBtb2Nrcy5Qcm9jZXNzQ29tcGxldGlvbigKKyAgICAgICAgICAg ICAgICAgICAgICAgIHJldHVybmNvZGU9MCwKKyAgICAgICAgICAgICAgICAgICAgICAgIHN0ZG91 dD0nXG4nLmpvaW4oWyd7fT17fScuZm9ybWF0KGtleSwgdmFsdWUpIGZvciBrZXksIHZhbHVlIGlu IHNlbGYuY29uZmlnKCkuaXRlbXMoKV0pCisgICAgICAgICAgICAgICAgICAgICksCisgICAgICAg ICAgICApLCBtb2Nrcy5TdWJwcm9jZXNzLlJvdXRlKAorICAgICAgICAgICAgICAgIHNlbGYuZXhl Y3V0YWJsZSwgJ2NvbmZpZycsICctbCcsICctLWdsb2JhbCcsCisgICAgICAgICAgICAgICAgZ2Vu ZXJhdG9yPWxhbWJkYSAqYXJncywgKiprd2FyZ3M6CisgICAgICAgICAgICAgICAgICAgIG1vY2tz LlByb2Nlc3NDb21wbGV0aW9uKAorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuY29kZT0w LAorICAgICAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PSdcbicuam9pbihbJ3t9PXt9Jy5mb3Jt YXQoa2V5LCB2YWx1ZSkgZm9yIGtleSwgdmFsdWUgaW4gR2l0LmNvbmZpZygpLml0ZW1zKCldKQor ICAgICAgICAgICAgICAgICAgICApLAorICAgICAgICAgICAgKSwgbW9ja3MuU3VicHJvY2Vzcy5S b3V0ZSgKICAgICAgICAgICAgICAgICBzZWxmLmV4ZWN1dGFibGUsCiAgICAgICAgICAgICAgICAg Y3dkPXNlbGYucGF0aCwKICAgICAgICAgICAgICAgICBjb21wbGV0aW9uPW1vY2tzLlByb2Nlc3ND b21wbGV0aW9uKApAQCAtNTcwLDMgKzU4NSwzOSBAQCBub3RoaW5nIHRvIGNvbW1pdCwgd29ya2lu ZyB0cmVlIGNsZWFuCiAgICAgICAgICAgICBmb3IgY29tbWl0IGluIHJldmVyc2VkKHNlbGYuY29t bWl0c1tzZWxmLmRlZmF1bHRfYnJhbmNoXSk6CiAgICAgICAgICAgICAgICAgaWYgcHJldmlvdXMu YnJhbmNoX3BvaW50ID09IGNvbW1pdC5pZGVudGlmaWVyOgogICAgICAgICAgICAgICAgICAgICBl bmQgPSBjb21taXQuaGFzaAorCisgICAgQGRlY29yYXRvcnMuaHlicmlkbWV0aG9kCisgICAgZGVm IGNvbmZpZyhjb250ZXh0KToKKyAgICAgICAgaWYgaXNpbnN0YW5jZShjb250ZXh0LCB0eXBlKToK KyAgICAgICAgICAgIHJldHVybiB7CisgICAgICAgICAgICAgICAgJ3VzZXIubmFtZSc6ICd0YXBw bGVAd2Via2l0Lm9yZycsCisgICAgICAgICAgICAgICAgJ3NlbmRlbWFpbC50cmFuc2ZlcmVuY29k aW5nJzogJ2Jhc2U2NCcsCisgICAgICAgICAgICB9CisKKyAgICAgICAgIyBQYXJzZSBhIC5naXQv Y29uZmlnIHRoYXQgbG9va3MgbGlrZSB0aGlzCisgICAgICAgICMgW2NvcmVdCisgICAgICAgICMg ICAgIHJlcG9zaXRvcnlmb3JtYXR2ZXJzaW9uID0gMAorICAgICAgICAjIFticmFuY2ggIm1haW4i XQorICAgICAgICAjICAgICByZW1vdGUgPSBvcmlnaW4KKyAgICAgICAgIyAJICBtZXJnZSA9IHJl ZnMvaGVhZHMvbWFpbgorICAgICAgICBSRV9TSU5HTEVfVE9QID0gcmUuY29tcGlsZShyJ15cW1xz Kig/UDxrZXk+XFMrKVxzKlxdJykKKyAgICAgICAgUkVfTVVMVElfVE9QID0gcmUuY29tcGlsZShy J15cW1xzKig/UDxrZXlhPlxTKykgIig/UDxrZXliPlxTKykiXHMqXF0nKQorICAgICAgICBSRV9F TEVNRU5UID0gcmUuY29tcGlsZShyJ15ccysoP1A8a2V5PlxTKylccyo9XHMqKD9QPHZhbHVlPlxT KyknKQorCisgICAgICAgIHRvcCA9IE5vbmUKKyAgICAgICAgcmVzdWx0ID0gR2l0LmNvbmZpZygp CisgICAgICAgIHdpdGggb3Blbihvcy5wYXRoLmpvaW4oY29udGV4dC5wYXRoLCAnLmdpdCcsICdj b25maWcnKSwgJ3InKSBhcyBjb25maWdmaWxlOgorICAgICAgICAgICAgZm9yIGxpbmUgaW4gY29u ZmlnZmlsZS5yZWFkbGluZXMoKToKKyAgICAgICAgICAgICAgICBtYXRjaCA9IFJFX01VTFRJX1RP UC5tYXRjaChsaW5lKQorICAgICAgICAgICAgICAgIGlmIG1hdGNoOgorICAgICAgICAgICAgICAg ICAgICB0b3AgPSAne30ue30nLmZvcm1hdChtYXRjaC5ncm91cCgna2V5YScpLCBtYXRjaC5ncm91 cCgna2V5YicpKQorICAgICAgICAgICAgICAgICAgICBjb250aW51ZQorICAgICAgICAgICAgICAg IG1hdGNoID0gUkVfU0lOR0xFX1RPUC5tYXRjaChsaW5lKQorICAgICAgICAgICAgICAgIGlmIG1h dGNoOgorICAgICAgICAgICAgICAgICAgICB0b3AgPSBtYXRjaC5ncm91cCgna2V5JykKKyAgICAg ICAgICAgICAgICAgICAgY29udGludWUKKworICAgICAgICAgICAgICAgIG1hdGNoID0gUkVfRUxF TUVOVC5tYXRjaChsaW5lKQorICAgICAgICAgICAgICAgIGlmIHRvcCBhbmQgbWF0Y2g6CisgICAg ICAgICAgICAgICAgICAgIHJlc3VsdFsne30ue30nLmZvcm1hdCh0b3AsIG1hdGNoLmdyb3VwKCdr ZXknKSldID0gbWF0Y2guZ3JvdXAoJ3ZhbHVlJykKKyAgICAgICAgcmV0dXJuIHJlc3VsdApJbmRl eDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9n aXRfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI4MDU5 MykKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rl c3QvZ2l0X3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC00MDcsNiArNDA3LDIxIEBAIENv bW1pdERhdGU6IFNhdCBPY3QgMDMgMDI6MDY6NDAgMjAyMCArMDAKICAgICAgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWwocmVwby5jYWNoZS50b19yZXZpc2lvbihoYXNoPSdiYWRjMGRkMWYnKSwgTm9u ZSkKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVwby5jYWNoZS50b19yZXZpc2lvbihp ZGVudGlmaWVyPSc2QG1haW4nKSwgTm9uZSkKIAorICAgIGRlZiB0ZXN0X2NvbmZpZyhzZWxmKToK KyAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5HaXQoc2VsZi5wYXRoLCBnaXRfc3ZuPVRydWUpIGFz IG06CisgICAgICAgICAgICByZXBvID0gbG9jYWwuR2l0KHNlbGYucGF0aCkKKworICAgICAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbChyZXBvLmNvbmZpZygpWyd1c2VyLm5hbWUnXSwgJ3RhcHBsZUB3 ZWJraXQub3JnJykKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVwby5jb25maWcoKVsn Y29yZS5maWxlbW9kZSddLCAndHJ1ZScpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJl cG8uY29uZmlnKClbJ3JlbW90ZS5vcmlnaW4udXJsJ10sICdnaXRAZXhhbXBsZS5vcmc6L21vY2sv cmVwb3NpdG9yeScpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJlcG8uY29uZmlnKClb J3N2bi1yZW1vdGUuc3ZuLnVybCddLCAnaHR0cHM6Ly9zdm4uZXhhbXBsZS5vcmcvcmVwb3NpdG9y eS93ZWJraXQnKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChyZXBvLmNvbmZpZygpWydz dm4tcmVtb3RlLnN2bi5mZXRjaCddLCAndHJ1bms6cmVmcy9yZW1vdGVzL29yaWdpbi9tYWluJykK KworICAgIGRlZiB0ZXN0X2dsb2JhbF9jb25maWcoc2VsZik6CisgICAgICAgIHdpdGggbW9ja3Mu bG9jYWwuR2l0KHNlbGYucGF0aCwgZ2l0X3N2bj1UcnVlKSwgT3V0cHV0Q2FwdHVyZSgpOgorICAg ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsb2NhbC5HaXQuY29uZmlnKClbJ3VzZXIubmFtZSdd LCAndGFwcGxlQHdlYmtpdC5vcmcnKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsb2Nh bC5HaXQuY29uZmlnKClbJ3NlbmRlbWFpbC50cmFuc2ZlcmVuY29kaW5nJ10sICdiYXNlNjQnKQor CiAKIGNsYXNzIFRlc3RHaXRIdWIodGVzdGluZy5UZXN0Q2FzZSk6CiAgICAgcmVtb3RlID0gJ2h0 dHBzOi8vZ2l0aHViLmV4YW1wbGUuY29tL1dlYktpdC9XZWJLaXQnCg==