229625 2021-08-27 13:02:02 -0700 [git-webkit] Automatic rebasing of pull-requests 2021-09-07 12:23:47 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=229089 https://bugs.webkit.org/show_bug.cgi?id=222847 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain darin dewei_zhu jlewis3 slewis webkit-bug-importer ysuzuki oldest_to_newest 1788128 0 jbedard 2021-08-27 13:02:02 -0700 By default, we should rebase pull-requests on the target branch whenever a user uploads them. 1788130 1 webkit-bug-importer 2021-08-27 13:02:26 -0700 <rdar://problem/82451030> 1788131 2 436661 jbedard 2021-08-27 13:04:44 -0700 Created attachment 436661 Patch 1788134 3 jbedard 2021-08-27 13:10:43 -0700 pull-request: https://github.com/WebKit/WebKit/pull/5 1788587 4 jlewis3 2021-08-30 11:28:42 -0700 Looks like your argument parser addition for rebase wouldn't work as expected/ is confusing. You're flags are `--no-rebase` and `--rebase` on the same argument that looks to be saying not to use rebase. 1788638 5 436807 jbedard 2021-08-30 13:24:22 -0700 Created attachment 436807 Patch 1788894 6 436882 jbedard 2021-08-31 07:32:11 -0700 Created attachment 436882 Patch 1789005 7 436882 dewei_zhu 2021-08-31 12:00:36 -0700 Comment on attachment 436882 Patch r=me 1789041 8 436931 jbedard 2021-08-31 13:16:51 -0700 Created attachment 436931 Patch for landing 1789062 9 ews-feeder 2021-08-31 13:42:20 -0700 Committed r281821 (241155@main): <https://commits.webkit.org/241155@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 436931. 1789408 10 jbedard 2021-09-01 12:19:37 -0700 Reopening to attach new patch. 1789409 11 437052 jbedard 2021-09-01 12:19:38 -0700 Created attachment 437052 Patch 1789412 12 437052 ysuzuki 2021-09-01 12:25:10 -0700 Comment on attachment 437052 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437052&action=review > Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:775 > + commit = self.commit if self.is_svn else None Isn't it `self.commit()`? 1789421 13 437055 jbedard 2021-09-01 12:46:49 -0700 Created attachment 437055 Patch 1789430 14 437055 ysuzuki 2021-09-01 12:52:46 -0700 Comment on attachment 437055 Patch This is a regression from https://trac.webkit.org/changeset/281821/webkit, and the change looks good to me. 1789451 15 ews-feeder 2021-09-01 13:22:25 -0700 Committed r281871 (241201@main): <https://commits.webkit.org/241201@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 437055. 436661 2021-08-27 13:04:44 -0700 2021-08-30 13:24:20 -0700 Patch bug-229625-20210827130443.patch text/plain 10079 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzE0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmViMDllNTgxZGRlZjU4ODgzZDNhY2JlZjAwZDcyMGQ0 ZTA5ZDFkZi4uYTFmNTE3NmE5YTBmMjRkYTk3OWUzMzIzOWVlY2M3YmQ2MDBhYmZlMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDIxLTA4LTI3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbZ2l0LXdlYmtpdF0gQXV0b21hdGljIHJlYmFzaW5nIG9yIHB1bGwtcmVxdWVzdHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTYyNQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODI0NTEwMzA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9sb2NhbC9naXQucHk6CisgICAgICAgIChHaXQucHVsbCk6IEFkZCByZWJh c2UgYW5kIGJyYW5jaCBhcmd1bWVudHMuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9wdWxsLnB5OgorICAgICAgICAoUHVsbCk6IEFk ZCAndXAnIGFuZCAndXBkYXRlJyBhbGlhc2VzLgorICAgICAgICAoUHVsbC5tYWluKTogVXBkYXRl IHRoZSBzb3VyY2UgYnJhbmNoIG9mIGEgcHVsbC1yZXF1ZXN0IGJyYW5jaGVzLgorICAgICAgICAq IFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vcHVsbF9y ZXF1ZXN0LnB5OgorICAgICAgICAoUHVsbFJlcXVlc3QucGFyc2VyKTogQWRkIC0tcmViYXNlLy0t bm8tcmViYXNlIG9wdGlvbnMuCisgICAgICAgIChQdWxsUmVxdWVzdC5tYWluKTogVXBkYXRlIGFu ZCByZWJhc2UgYSBwdWxsLXJlcXVlc3Qgb24gaXQncyBzb3VyY2UgYnJhbmNoLgorICAgICAgICAq IFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvcHVsbF9yZXF1 ZXN0X3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdFB1bGxSZXF1ZXN0LnRlc3Rfc3RhZ2VkKToK KyAgICAgICAgKFRlc3RQdWxsUmVxdWVzdC50ZXN0X21vZGlmaWVkKToKKyAgICAgICAgKFRlc3RQ dWxsUmVxdWVzdC50ZXN0X2dpdGh1Yik6CisgICAgICAgIChUZXN0UHVsbFJlcXVlc3QudGVzdF9n aXRodWJfdXBkYXRlKToKKyAgICAgICAgKFRlc3RQdWxsUmVxdWVzdC50ZXN0X2JpdGJ1Y2tldCk6 CisgICAgICAgIChUZXN0UHVsbFJlcXVlc3QudGVzdF9iaXRidWNrZXRfdXBkYXRlKToKKwogMjAy MS0wOC0yNyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEV4dGVu ZCBBUEkgdGVzdCBjb3ZlcmFnZSB0byBtYWtlIHN1cmUgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZCBp cyBub3QgY2FsbGVkIHVwb24gQ09PUCBwcm9jZXNzIHN3YXAKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weSBiL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5w eQppbmRleCBlYzRjOWI2N2Y1MDQ4YWVjNDdmMTZlYzE1OWY2YzE4NDNjNjhmZjZhLi5lZjEzOTU4 N2Y3MzE2N2JkYTBmMjRhZTBhZTg1OWE2NGUzYWJkNTczIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkKKysrIGIv VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0 LnB5CkBAIC03NzEsOSArNzcxLDE0IEBAIGNsYXNzIEdpdChTY20pOgogICAgICAgICAgICAgY3dk PXNlbGYucm9vdF9wYXRoLAogICAgICAgICApLnJldHVybmNvZGUgZWxzZSBzZWxmLmNvbW1pdCgp CiAKLSAgICBkZWYgcHVsbChzZWxmKToKLSAgICAgICAgY29tbWl0ID0gc2VsZi5jb21taXQoKQot ICAgICAgICBjb2RlID0gcnVuKFtzZWxmLmV4ZWN1dGFibGUoKSwgJ3B1bGwnXSwgY3dkPXNlbGYu cm9vdF9wYXRoKS5yZXR1cm5jb2RlCisgICAgZGVmIHB1bGwoc2VsZiwgcmViYXNlPU5vbmUsIGJy YW5jaD1Ob25lKToKKyAgICAgICAgY29kZSA9IHJ1bigKKyAgICAgICAgICAgIFtzZWxmLmV4ZWN1 dGFibGUoKSwgJ3B1bGwnXSArICgKKyAgICAgICAgICAgICAgICBbJ29yaWdpbicsIGJyYW5jaF0g aWYgYnJhbmNoIGVsc2UgW10KKyAgICAgICAgICAgICkgKyAoCisgICAgICAgICAgICAgICAgW10g aWYgcmViYXNlIGlzIE5vbmUgZWxzZSBbJy0tcmViYXNlPXt9Jy5mb3JtYXQoJ1RydWUnIGlmIHJl YmFzZSBlbHNlICdGYWxzZScpXQorICAgICAgICAgICAgKSwgY3dkPXNlbGYucm9vdF9wYXRoLAor ICAgICAgICApLnJldHVybmNvZGUKICAgICAgICAgaWYgbm90IGNvZGUgYW5kIHNlbGYuaXNfc3Zu OgogICAgICAgICAgICAgcmV0dXJuIHJ1bihbCiAgICAgICAgICAgICAgICAgc2VsZi5leGVjdXRh YmxlKCksICdzdm4nLCAnZmV0Y2gnLCAnLS1sb2ctd2luZG93LXNpemU9NTAwMCcsICctcicsICd7 fTpIRUFEJy5mb3JtYXQoY29tbWl0LnJldmlzaW9uKSwKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vcHVsbC5weSBiL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vcHVs bC5weQppbmRleCBmN2VhMzY1N2Q3YzNiZTRiNmExODkwZWUzOTg5YmU1MjM3ODc2ZDA2Li43NjZk NjEyNWFlOTFkMmYwODI3NjE4ZjE4MjY5ZTkyMmU3NTc4MTMxIDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9wcm9ncmFtL3B1bGwucHkK KysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJv Z3JhbS9wdWxsLnB5CkBAIC0yMywxMCArMjMsMTMgQEAKIGltcG9ydCBzeXMKIAogZnJvbSAuY29t bWFuZCBpbXBvcnQgQ29tbWFuZAorZnJvbSAucHVsbF9yZXF1ZXN0IGltcG9ydCBQdWxsUmVxdWVz dAorZnJvbSB3ZWJraXRzY21weSBpbXBvcnQgbG9jYWwKIAogCiBjbGFzcyBQdWxsKENvbW1hbmQp OgogICAgIG5hbWUgPSAncHVsbCcKKyAgICBhbGlhc2VzID0gWyd1cCcsICd1cGRhdGUnXQogICAg IGhlbHAgPSAnVXBkYXRlIHRoZSBjdXJyZW50IGNoZWNrb3V0LCBzeW5jaHJvbml6ZSBnaXQtc3Zu IGlmIGNvbmZpZ3VyZWQnCiAKICAgICBAY2xhc3NtZXRob2QKQEAgLTM0LDQgKzM3LDggQEAgY2xh c3MgUHVsbChDb21tYW5kKToKICAgICAgICAgaWYgbm90IHJlcG9zaXRvcnkucGF0aDoKICAgICAg ICAgICAgIHN5cy5zdGRlcnIud3JpdGUoJ0Nhbm5vdCB1cGRhdGUgcmVtb3RlIHJlcG9zaXRvcnlc bicpCiAgICAgICAgICAgICByZXR1cm4gMQorCisgICAgICAgIGlmIGlzaW5zdGFuY2UocmVwb3Np dG9yeSwgbG9jYWwuR2l0KToKKyAgICAgICAgICAgIGJyYW5jaF9wb2ludCA9IFB1bGxSZXF1ZXN0 LmJyYW5jaF9wb2ludChhcmdzLCByZXBvc2l0b3J5LCAqKmt3YXJncykKKyAgICAgICAgICAgIHJl dHVybiByZXBvc2l0b3J5LnB1bGwocmViYXNlPVRydWUsIGJyYW5jaD1icmFuY2hfcG9pbnQuYnJh bmNoKQogICAgICAgICByZXR1cm4gcmVwb3NpdG9yeS5wdWxsKCkKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vcHVsbF9y ZXF1ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvcHJvZ3JhbS9wdWxsX3JlcXVlc3QucHkKaW5kZXggNjc0NzViZjkwOWU4ZjUwMmY4YWQ2Mjg2 MTg0OTZmOThhNjkyODA5NC4uN2IwZmM5MDMyNmE2YThlY2IwODQxNjM4ZDk4ZDE2ZGYxNDFmMWJl YiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvcHJvZ3JhbS9wdWxsX3JlcXVlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9wdWxsX3JlcXVlc3QucHkKQEAgLTQz LDYgKzQzLDEyIEBAIGNsYXNzIFB1bGxSZXF1ZXN0KENvbW1hbmQpOgogICAgICAgICAgICAgaGVs cD0nV2hlbiBkcmFmdGluZyBhIGNoYW5nZSwgYWRkIChvciBuZXZlciBhZGQpIG1vZGlmaWVkIGZp bGVzIHRvIHNldCBvZiBzdGFnZWQgY2hhbmdlcyB0byBiZSBjb21taXR0ZWQnLAogICAgICAgICAg ICAgYWN0aW9uPWFyZ3VtZW50cy5Ob0FjdGlvbiwKICAgICAgICAgKQorICAgICAgICBwYXJzZXIu YWRkX2FyZ3VtZW50KAorICAgICAgICAgICAgJy0tbm8tcmViYXNlJywgJy0tcmViYXNlJywKKyAg ICAgICAgICAgIGRlc3Q9J3JlYmFzZScsIGRlZmF1bHQ9VHJ1ZSwKKyAgICAgICAgICAgIGhlbHA9 J1JlYmFzZSB0aGUgcHVsbC1yZXF1ZXN0IG9uIHRoZSBzb3VyY2UgYnJhbmNoIGJlZm9yZSBwdXNo aW5nJywKKyAgICAgICAgICAgIGFjdGlvbj1hcmd1bWVudHMuTm9BY3Rpb24sCisgICAgICAgICkK IAogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBjcmVhdGVfY29tbWl0KGNscywgYXJncywgcmVw b3NpdG9yeSwgKiprd2FyZ3MpOgpAQCAtMTA1LDYgKzExMSwxMiBAQCBjbGFzcyBQdWxsUmVxdWVz dChDb21tYW5kKToKICAgICAgICAgICAgIHJldHVybiByZXN1bHQKIAogICAgICAgICBicmFuY2hf cG9pbnQgPSBjbHMuYnJhbmNoX3BvaW50KGFyZ3MsIHJlcG9zaXRvcnksICoqa3dhcmdzKQorICAg ICAgICBpZiBhcmdzLnJlYmFzZToKKyAgICAgICAgICAgIGxvZy53YXJuaW5nKCJSZWJhc2luZyAn e30nIG9uICd7fScuLi4iLmZvcm1hdChyZXBvc2l0b3J5LmJyYW5jaCwgYnJhbmNoX3BvaW50LmJy YW5jaCkpCisgICAgICAgICAgICBpZiByZXBvc2l0b3J5LnB1bGwocmViYXNlPVRydWUsIGJyYW5j aD1icmFuY2hfcG9pbnQuYnJhbmNoKToKKyAgICAgICAgICAgICAgICBzeXMuc3RkZXJyLndyaXRl KCJGYWlsZWQgdG8gcmViYXNlICd7fScgb24gJ3t9LCcgcGxlYXNlIHJlc29sdmUgY29uZmxpY3Rz XG4iLmZvcm1hdChyZXBvc2l0b3J5LmJyYW5jaCwgYnJhbmNoX3BvaW50LmJyYW5jaCkpCisgICAg ICAgICAgICAgICAgcmV0dXJuIDEKKyAgICAgICAgICAgIGxvZy53YXJuaW5nKCJSZWJhc2VkICd7 fScgb24gJ3t9ISciLmZvcm1hdChyZXBvc2l0b3J5LmJyYW5jaCwgYnJhbmNoX3BvaW50LmJyYW5j aCkpCiAKICAgICAgICAgcm10ID0gcmVwb3NpdG9yeS5yZW1vdGUoKQogICAgICAgICBpZiBub3Qg cm10OgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvdGVzdC9wdWxsX3JlcXVlc3RfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L3B1bGxfcmVxdWVzdF91bml0dGVz dC5weQppbmRleCAzYjA2YjFjZTUxOWVhYjE3NjQ4ZjdhNmRkNWQ5YWM1YjYwN2NhMmQwLi41Njg2 OGEzYTM5Nzc1YjdjNWEzNDk1ZTc5Mjc3NmIzNjI2YTdmZmFjIDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L3B1bGxfcmVxdWVz dF91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS90ZXN0L3B1bGxfcmVxdWVzdF91bml0dGVzdC5weQpAQCAtMTk0LDYgKzE5NCw4 IEBAIGNsYXNzIFRlc3REb1B1bGxSZXF1ZXN0KHRlc3RpbmcuUGF0aFRlc3RDYXNlKToKICAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbChjYXB0dXJlZC5yb290LmxvZy5nZXR2YWx1ZSgpLCAnJydDcmVh dGluZyB0aGUgbG9jYWwgZGV2ZWxvcG1lbnQgYnJhbmNoICdlbmcvcHItYnJhbmNoJy4uLgogQ3Jl YXRpbmcgY29tbWl0Li4uCiAgICAgRm91bmQgMSBjb21taXQuLi4KK1JlYmFzaW5nICdlbmcvcHIt YnJhbmNoJyBvbiAnbWFpbicuLi4KK1JlYmFzZWQgJ2VuZy9wci1icmFuY2gnIG9uICdtYWluIScK ICcnJykKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjYXB0dXJlZC5zdGRlcnIuZ2V0dmFsdWUo KSwgIid7fScgZG9lc24ndCBoYXZlIGEgcmVjb2duaXplZCByZW1vdGVcbiIuZm9ybWF0KHNlbGYu cGF0aCkpCiAKQEAgLTIxMyw2ICsyMTUsOCBAQCBDcmVhdGluZyBjb21taXQuLi4KICAgICBBZGRp bmcgbW9kaWZpZWQudHh0Li4uCiBDcmVhdGluZyBjb21taXQuLi4KICAgICBGb3VuZCAxIGNvbW1p dC4uLgorUmViYXNpbmcgJ2VuZy9wci1icmFuY2gnIG9uICdtYWluJy4uLgorUmViYXNlZCAnZW5n L3ByLWJyYW5jaCcgb24gJ21haW4hJwogJycnKQogCiAgICAgZGVmIHRlc3RfZ2l0aHViKHNlbGYp OgpAQCAtMjI4LDEwICsyMzIsMTIgQEAgQ3JlYXRpbmcgY29tbWl0Li4uCiAgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWwoY2FwdHVyZWQuc3RkZXJyLmdldHZhbHVlKCksICcnKQogICAgICAgICBsb2cg PSBjYXB0dXJlZC5yb290LmxvZy5nZXR2YWx1ZSgpLnNwbGl0bGluZXMoKQogICAgICAgICBzZWxm LmFzc2VydEVxdWFsKAotICAgICAgICAgICAgbG9nWzo0XSArIGxvZ1s3IGlmIHN5cy52ZXJzaW9u X2luZm8gPiAoMywgMCkgZWxzZSA1Ol0sIFsKKyAgICAgICAgICAgIGxvZ1s6Nl0gKyBsb2dbOSBp ZiBzeXMudmVyc2lvbl9pbmZvID4gKDMsIDApIGVsc2UgNzpdLCBbCiAgICAgICAgICAgICAgICAg IkNyZWF0aW5nIHRoZSBsb2NhbCBkZXZlbG9wbWVudCBicmFuY2ggJ2VuZy9wci1icmFuY2gnLi4u IiwKICAgICAgICAgICAgICAgICAnQ3JlYXRpbmcgY29tbWl0Li4uJywKICAgICAgICAgICAgICAg ICAnICAgIEZvdW5kIDEgY29tbWl0Li4uJywKKyAgICAgICAgICAgICAgICAiUmViYXNpbmcgJ2Vu Zy9wci1icmFuY2gnIG9uICdtYWluJy4uLiIsCisgICAgICAgICAgICAgICAgIlJlYmFzZWQgJ2Vu Zy9wci1icmFuY2gnIG9uICdtYWluISciLAogICAgICAgICAgICAgICAgICJQdXNoaW5nICdlbmcv cHItYnJhbmNoJyB0byAnZm9yaycuLi4iLAogICAgICAgICAgICAgICAgICJDcmVhdGluZyBwdWxs LXJlcXVlc3QgZm9yICdlbmcvcHItYnJhbmNoJy4uLiIsCiAgICAgICAgICAgICAgICAgIkNyZWF0 ZWQgJ1BSIDEgfCBDcmVhdGVkIGNvbW1pdCchIiwKQEAgLTI1NywxNiArMjYzLDE4IEBAIENyZWF0 aW5nIGNvbW1pdC4uLgogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNhcHR1cmVkLnN0ZGVyci5n ZXR2YWx1ZSgpLCAnJykKICAgICAgICAgbG9nID0gY2FwdHVyZWQucm9vdC5sb2cuZ2V0dmFsdWUo KS5zcGxpdGxpbmVzKCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKLSAgICAgICAgICAgIGxv Z1s6M10gKyBsb2dbNiBpZiBzeXMudmVyc2lvbl9pbmZvID4gKDMsIDApIGVsc2UgNDpdLCBbCisg ICAgICAgICAgICBsb2dbOjVdICsgbG9nWzggaWYgc3lzLnZlcnNpb25faW5mbyA+ICgzLCAwKSBl bHNlIDY6XSwgWwogICAgICAgICAgICAgICAgICJBbWVuZGluZyBjb21taXQuLi4iLAogICAgICAg ICAgICAgICAgICcgICAgRm91bmQgMSBjb21taXQuLi4nLAorICAgICAgICAgICAgICAgICJSZWJh c2luZyAnZW5nL3ByLWJyYW5jaCcgb24gJ21haW4nLi4uIiwKKyAgICAgICAgICAgICAgICAiUmVi YXNlZCAnZW5nL3ByLWJyYW5jaCcgb24gJ21haW4hJyIsCiAgICAgICAgICAgICAgICAgIlB1c2hp bmcgJ2VuZy9wci1icmFuY2gnIHRvICdmb3JrJy4uLiIsCiAgICAgICAgICAgICAgICAgIlVwZGF0 aW5nIHB1bGwtcmVxdWVzdCBmb3IgJ2VuZy9wci1icmFuY2gnLi4uIiwKICAgICAgICAgICAgICAg ICAiVXBkYXRlZCAnUFIgMSB8IEFtZW5kZWQgY29tbWl0JyEiLAogICAgICAgICAgICAgXSwKICAg ICAgICAgKQogCi0gICAgZGVmIHRlc3Rfc3Rhc2goc2VsZik6CisgICAgZGVmIHRlc3RfYml0YnVj a2V0KHNlbGYpOgogICAgICAgICB3aXRoIE91dHB1dENhcHR1cmUoKSBhcyBjYXB0dXJlZCwgbW9j a3MucmVtb3RlLkJpdEJ1Y2tldCgpIGFzIHJlbW90ZSwgbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0 aCwgcmVtb3RlPSdzc2g6Ly9naXRAe30ve30ve30uZ2l0Jy5mb3JtYXQoCiAgICAgICAgICAgICBy ZW1vdGUuaG9zdHNbMF0sIHJlbW90ZS5wcm9qZWN0LnNwbGl0KCcvJylbMV0sIHJlbW90ZS5wcm9q ZWN0LnNwbGl0KCcvJylbM10sCiAgICAgICAgICkpIGFzIHJlcG8sIG1vY2tzLmxvY2FsLlN2bigp OgpAQCAtMjgwLDE3ICsyODgsMTkgQEAgQ3JlYXRpbmcgY29tbWl0Li4uCiAgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWwoY2FwdHVyZWQuc3RkZXJyLmdldHZhbHVlKCksICcnKQogICAgICAgICBsb2cg PSBjYXB0dXJlZC5yb290LmxvZy5nZXR2YWx1ZSgpLnNwbGl0bGluZXMoKQogICAgICAgICBzZWxm LmFzc2VydEVxdWFsKAotICAgICAgICAgICAgbG9nWzo0XSArIGxvZ1s3IGlmIHN5cy52ZXJzaW9u X2luZm8gPiAoMywgMCkgZWxzZSA1Ol0sIFsKKyAgICAgICAgICAgIGxvZ1s6Nl0gKyBsb2dbOSBp ZiBzeXMudmVyc2lvbl9pbmZvID4gKDMsIDApIGVsc2UgNzpdLCBbCiAgICAgICAgICAgICAgICAg IkNyZWF0aW5nIHRoZSBsb2NhbCBkZXZlbG9wbWVudCBicmFuY2ggJ2VuZy9wci1icmFuY2gnLi4u IiwKICAgICAgICAgICAgICAgICAnQ3JlYXRpbmcgY29tbWl0Li4uJywKICAgICAgICAgICAgICAg ICAnICAgIEZvdW5kIDEgY29tbWl0Li4uJywKKyAgICAgICAgICAgICAgICAiUmViYXNpbmcgJ2Vu Zy9wci1icmFuY2gnIG9uICdtYWluJy4uLiIsCisgICAgICAgICAgICAgICAgIlJlYmFzZWQgJ2Vu Zy9wci1icmFuY2gnIG9uICdtYWluISciLAogICAgICAgICAgICAgICAgICJQdXNoaW5nICdlbmcv cHItYnJhbmNoJyB0byAnb3JpZ2luJy4uLiIsCiAgICAgICAgICAgICAgICAgIkNyZWF0aW5nIHB1 bGwtcmVxdWVzdCBmb3IgJ2VuZy9wci1icmFuY2gnLi4uIiwKICAgICAgICAgICAgICAgICAiQ3Jl YXRlZCAnUFIgMSB8IENyZWF0ZWQgY29tbWl0JyEiLAogICAgICAgICAgICAgXSwKICAgICAgICAg KQogCi0gICAgZGVmIHRlc3Rfc3Rhc2hfdXBkYXRlKHNlbGYpOgorICAgIGRlZiB0ZXN0X2JpdGJ1 Y2tldF91cGRhdGUoc2VsZik6CiAgICAgICAgIHdpdGggbW9ja3MucmVtb3RlLkJpdEJ1Y2tldCgp IGFzIHJlbW90ZSwgbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0aCwgcmVtb3RlPSdzc2g6Ly9naXRA e30ve30ve30uZ2l0Jy5mb3JtYXQoCiAgICAgICAgICAgICByZW1vdGUuaG9zdHNbMF0sIHJlbW90 ZS5wcm9qZWN0LnNwbGl0KCcvJylbMV0sIHJlbW90ZS5wcm9qZWN0LnNwbGl0KCcvJylbM10sCiAg ICAgICAgICkpIGFzIHJlcG8sIG1vY2tzLmxvY2FsLlN2bigpOgpAQCAtMzExLDkgKzMyMSwxMSBA QCBDcmVhdGluZyBjb21taXQuLi4KICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjYXB0dXJlZC5z dGRlcnIuZ2V0dmFsdWUoKSwgJycpCiAgICAgICAgIGxvZyA9IGNhcHR1cmVkLnJvb3QubG9nLmdl dHZhbHVlKCkuc3BsaXRsaW5lcygpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoCi0gICAgICAg ICAgICBsb2dbOjNdICsgbG9nWzYgaWYgc3lzLnZlcnNpb25faW5mbyA+ICgzLCAwKSBlbHNlIDQ6 XSwgWworICAgICAgICAgICAgbG9nWzo1XSArIGxvZ1s4IGlmIHN5cy52ZXJzaW9uX2luZm8gPiAo MywgMCkgZWxzZSA2Ol0sIFsKICAgICAgICAgICAgICAgICAiQW1lbmRpbmcgY29tbWl0Li4uIiwK ICAgICAgICAgICAgICAgICAnICAgIEZvdW5kIDEgY29tbWl0Li4uJywKKyAgICAgICAgICAgICAg ICAiUmViYXNpbmcgJ2VuZy9wci1icmFuY2gnIG9uICdtYWluJy4uLiIsCisgICAgICAgICAgICAg ICAgIlJlYmFzZWQgJ2VuZy9wci1icmFuY2gnIG9uICdtYWluISciLAogICAgICAgICAgICAgICAg ICJQdXNoaW5nICdlbmcvcHItYnJhbmNoJyB0byAnb3JpZ2luJy4uLiIsCiAgICAgICAgICAgICAg ICAgIlVwZGF0aW5nIHB1bGwtcmVxdWVzdCBmb3IgJ2VuZy9wci1icmFuY2gnLi4uIiwKICAgICAg ICAgICAgICAgICAiVXBkYXRlZCAnUFIgMSB8IEFtZW5kZWQgY29tbWl0JyEiLAo= 436807 2021-08-30 13:24:22 -0700 2021-08-31 07:32:09 -0700 Patch bug-229625-20210830132421.patch text/plain 10368 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzcxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTU4NTUxMzQ0ZjBjMmVjNmRkZjBmYTkwYzE4ODNjYTIx MDkxODRlOC4uZjBmMzA1Njk0OWU4ZmFkNzkyZmIxMWJiMWEzNGRjNzg2OTY2MWI3NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDIxLTA4LTMwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbZ2l0LXdlYmtpdF0gQXV0b21hdGljIHJlYmFzaW5nIG9yIHB1bGwtcmVxdWVzdHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTYyNQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODI0NTEwMzA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9sb2NhbC9naXQucHk6CisgICAgICAgIChHaXQucHVsbCk6IEFkZCByZWJh c2UgYW5kIGJyYW5jaCBhcmd1bWVudHMuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9wdWxsLnB5OgorICAgICAgICAoUHVsbCk6IEFk ZCAndXAnIGFuZCAndXBkYXRlJyBhbGlhc2VzLgorICAgICAgICAoUHVsbC5tYWluKTogVXBkYXRl IHRoZSBzb3VyY2UgYnJhbmNoIG9mIGEgcHVsbC1yZXF1ZXN0IGJyYW5jaGVzLgorICAgICAgICAq IFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vcHVsbF9y ZXF1ZXN0LnB5OgorICAgICAgICAoUHVsbFJlcXVlc3QucGFyc2VyKTogQWRkIC0tcmViYXNlLy0t bm8tcmViYXNlIG9wdGlvbnMuCisgICAgICAgIChQdWxsUmVxdWVzdC5tYWluKTogVXBkYXRlIGFu ZCByZWJhc2UgYSBwdWxsLXJlcXVlc3Qgb24gaXQncyBzb3VyY2UgYnJhbmNoLgorICAgICAgICAq IFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvcHVsbF9yZXF1 ZXN0X3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdFB1bGxSZXF1ZXN0LnRlc3Rfc3RhZ2VkKToK KyAgICAgICAgKFRlc3RQdWxsUmVxdWVzdC50ZXN0X21vZGlmaWVkKToKKyAgICAgICAgKFRlc3RQ dWxsUmVxdWVzdC50ZXN0X2dpdGh1Yik6CisgICAgICAgIChUZXN0UHVsbFJlcXVlc3QudGVzdF9n aXRodWJfdXBkYXRlKToKKyAgICAgICAgKFRlc3RQdWxsUmVxdWVzdC50ZXN0X2JpdGJ1Y2tldCk6 CisgICAgICAgIChUZXN0UHVsbFJlcXVlc3QudGVzdF9iaXRidWNrZXRfdXBkYXRlKToKKwogMjAy MS0wOC0zMCAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAgICAg ZXdzIG1pZ2h0IG1hcmsgYnVpbGQgYXMgc3VjY2Vzc2Z1bCBpZiBKU0MgdGVzdHMgZmFpbCB0byBy dW4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L2xvY2FsL2dpdC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weQppbmRleCBlYzRjOWI2N2Y1MDQ4YWVjNDdmMTZlYzE1 OWY2YzE4NDNjNjhmZjZhLi5lZjEzOTU4N2Y3MzE2N2JkYTBmMjRhZTBhZTg1OWE2NGUzYWJkNTcz IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS9sb2NhbC9naXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5CkBAIC03NzEsOSArNzcxLDE0IEBAIGNsYXNzIEdp dChTY20pOgogICAgICAgICAgICAgY3dkPXNlbGYucm9vdF9wYXRoLAogICAgICAgICApLnJldHVy bmNvZGUgZWxzZSBzZWxmLmNvbW1pdCgpCiAKLSAgICBkZWYgcHVsbChzZWxmKToKLSAgICAgICAg Y29tbWl0ID0gc2VsZi5jb21taXQoKQotICAgICAgICBjb2RlID0gcnVuKFtzZWxmLmV4ZWN1dGFi bGUoKSwgJ3B1bGwnXSwgY3dkPXNlbGYucm9vdF9wYXRoKS5yZXR1cm5jb2RlCisgICAgZGVmIHB1 bGwoc2VsZiwgcmViYXNlPU5vbmUsIGJyYW5jaD1Ob25lKToKKyAgICAgICAgY29kZSA9IHJ1bigK KyAgICAgICAgICAgIFtzZWxmLmV4ZWN1dGFibGUoKSwgJ3B1bGwnXSArICgKKyAgICAgICAgICAg ICAgICBbJ29yaWdpbicsIGJyYW5jaF0gaWYgYnJhbmNoIGVsc2UgW10KKyAgICAgICAgICAgICkg KyAoCisgICAgICAgICAgICAgICAgW10gaWYgcmViYXNlIGlzIE5vbmUgZWxzZSBbJy0tcmViYXNl PXt9Jy5mb3JtYXQoJ1RydWUnIGlmIHJlYmFzZSBlbHNlICdGYWxzZScpXQorICAgICAgICAgICAg KSwgY3dkPXNlbGYucm9vdF9wYXRoLAorICAgICAgICApLnJldHVybmNvZGUKICAgICAgICAgaWYg bm90IGNvZGUgYW5kIHNlbGYuaXNfc3ZuOgogICAgICAgICAgICAgcmV0dXJuIHJ1bihbCiAgICAg ICAgICAgICAgICAgc2VsZi5leGVjdXRhYmxlKCksICdzdm4nLCAnZmV0Y2gnLCAnLS1sb2ctd2lu ZG93LXNpemU9NTAwMCcsICctcicsICd7fTpIRUFEJy5mb3JtYXQoY29tbWl0LnJldmlzaW9uKSwK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNj bXB5L3Byb2dyYW0vcHVsbC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L3Byb2dyYW0vcHVsbC5weQppbmRleCBmN2VhMzY1N2Q3YzNiZTRiNmExODkw ZWUzOTg5YmU1MjM3ODc2ZDA2Li43NjZkNjEyNWFlOTFkMmYwODI3NjE4ZjE4MjY5ZTkyMmU3NTc4 MTMxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJr aXRzY21weS9wcm9ncmFtL3B1bGwucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9wdWxsLnB5CkBAIC0yMywxMCArMjMsMTMgQEAK IGltcG9ydCBzeXMKIAogZnJvbSAuY29tbWFuZCBpbXBvcnQgQ29tbWFuZAorZnJvbSAucHVsbF9y ZXF1ZXN0IGltcG9ydCBQdWxsUmVxdWVzdAorZnJvbSB3ZWJraXRzY21weSBpbXBvcnQgbG9jYWwK IAogCiBjbGFzcyBQdWxsKENvbW1hbmQpOgogICAgIG5hbWUgPSAncHVsbCcKKyAgICBhbGlhc2Vz ID0gWyd1cCcsICd1cGRhdGUnXQogICAgIGhlbHAgPSAnVXBkYXRlIHRoZSBjdXJyZW50IGNoZWNr b3V0LCBzeW5jaHJvbml6ZSBnaXQtc3ZuIGlmIGNvbmZpZ3VyZWQnCiAKICAgICBAY2xhc3NtZXRo b2QKQEAgLTM0LDQgKzM3LDggQEAgY2xhc3MgUHVsbChDb21tYW5kKToKICAgICAgICAgaWYgbm90 IHJlcG9zaXRvcnkucGF0aDoKICAgICAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoJ0Nhbm5vdCB1 cGRhdGUgcmVtb3RlIHJlcG9zaXRvcnlcbicpCiAgICAgICAgICAgICByZXR1cm4gMQorCisgICAg ICAgIGlmIGlzaW5zdGFuY2UocmVwb3NpdG9yeSwgbG9jYWwuR2l0KToKKyAgICAgICAgICAgIGJy YW5jaF9wb2ludCA9IFB1bGxSZXF1ZXN0LmJyYW5jaF9wb2ludChhcmdzLCByZXBvc2l0b3J5LCAq Kmt3YXJncykKKyAgICAgICAgICAgIHJldHVybiByZXBvc2l0b3J5LnB1bGwocmViYXNlPVRydWUs IGJyYW5jaD1icmFuY2hfcG9pbnQuYnJhbmNoKQogICAgICAgICByZXR1cm4gcmVwb3NpdG9yeS5w dWxsKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl YmtpdHNjbXB5L3Byb2dyYW0vcHVsbF9yZXF1ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9wdWxsX3JlcXVlc3QucHkKaW5kZXgg Njc0NzViZjkwOWU4ZjUwMmY4YWQ2Mjg2MTg0OTZmOThhNjkyODA5NC4uMDA4Y2FlYzU4YmYxZDI0 NTY1NjcyZjZlMjY0YzRmODBkZWUwNzQzNiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9wdWxsX3JlcXVlc3QucHkKKysr IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3Jh bS9wdWxsX3JlcXVlc3QucHkKQEAgLTM4LDExICszOCwxNyBAQCBjbGFzcyBQdWxsUmVxdWVzdChD b21tYW5kKToKICAgICBkZWYgcGFyc2VyKGNscywgcGFyc2VyLCBsb2dnZXJzPU5vbmUpOgogICAg ICAgICBCcmFuY2gucGFyc2VyKHBhcnNlciwgbG9nZ2Vycz1sb2dnZXJzKQogICAgICAgICBwYXJz ZXIuYWRkX2FyZ3VtZW50KAotICAgICAgICAgICAgJy0tbm8tYWRkJywgJy0tYWRkJywKKyAgICAg ICAgICAgICctLWFkZCcsICctLW5vLWFkZCcsCiAgICAgICAgICAgICBkZXN0PSd3aWxsX2FkZCcs IGRlZmF1bHQ9Tm9uZSwKICAgICAgICAgICAgIGhlbHA9J1doZW4gZHJhZnRpbmcgYSBjaGFuZ2Us IGFkZCAob3IgbmV2ZXIgYWRkKSBtb2RpZmllZCBmaWxlcyB0byBzZXQgb2Ygc3RhZ2VkIGNoYW5n ZXMgdG8gYmUgY29tbWl0dGVkJywKICAgICAgICAgICAgIGFjdGlvbj1hcmd1bWVudHMuTm9BY3Rp b24sCiAgICAgICAgICkKKyAgICAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgKKyAgICAgICAgICAg ICctLXJlYmFzZScsICctLW5vLXJlYmFzZScsCisgICAgICAgICAgICBkZXN0PSdyZWJhc2UnLCBk ZWZhdWx0PU5vbmUsCisgICAgICAgICAgICBoZWxwPSdSZWJhc2UgKG9yIGRvIG5vdCByZWJhc2Up IHRoZSBwdWxsLXJlcXVlc3Qgb24gdGhlIHNvdXJjZSBicmFuY2ggYmVmb3JlIHB1c2hpbmcnLAor ICAgICAgICAgICAgYWN0aW9uPWFyZ3VtZW50cy5Ob0FjdGlvbiwKKyAgICAgICAgKQogCiAgICAg QGNsYXNzbWV0aG9kCiAgICAgZGVmIGNyZWF0ZV9jb21taXQoY2xzLCBhcmdzLCByZXBvc2l0b3J5 LCAqKmt3YXJncyk6CkBAIC0xMDUsNiArMTExLDEyIEBAIGNsYXNzIFB1bGxSZXF1ZXN0KENvbW1h bmQpOgogICAgICAgICAgICAgcmV0dXJuIHJlc3VsdAogCiAgICAgICAgIGJyYW5jaF9wb2ludCA9 IGNscy5icmFuY2hfcG9pbnQoYXJncywgcmVwb3NpdG9yeSwgKiprd2FyZ3MpCisgICAgICAgIGlm IGFyZ3MucmViYXNlIG9yIChhcmdzLnJlYmFzZSBpcyBOb25lIGFuZCByZXBvc2l0b3J5LmNvbmZp ZygpLmdldCgncHVsbC5yZWJhc2UnKSk6CisgICAgICAgICAgICBsb2cud2FybmluZygiUmViYXNp bmcgJ3t9JyBvbiAne30nLi4uIi5mb3JtYXQocmVwb3NpdG9yeS5icmFuY2gsIGJyYW5jaF9wb2lu dC5icmFuY2gpKQorICAgICAgICAgICAgaWYgcmVwb3NpdG9yeS5wdWxsKHJlYmFzZT1UcnVlLCBi cmFuY2g9YnJhbmNoX3BvaW50LmJyYW5jaCk6CisgICAgICAgICAgICAgICAgc3lzLnN0ZGVyci53 cml0ZSgiRmFpbGVkIHRvIHJlYmFzZSAne30nIG9uICd7fSwnIHBsZWFzZSByZXNvbHZlIGNvbmZs aWN0c1xuIi5mb3JtYXQocmVwb3NpdG9yeS5icmFuY2gsIGJyYW5jaF9wb2ludC5icmFuY2gpKQor ICAgICAgICAgICAgICAgIHJldHVybiAxCisgICAgICAgICAgICBsb2cud2FybmluZygiUmViYXNl ZCAne30nIG9uICd7fSEnIi5mb3JtYXQocmVwb3NpdG9yeS5icmFuY2gsIGJyYW5jaF9wb2ludC5i cmFuY2gpKQogCiAgICAgICAgIHJtdCA9IHJlcG9zaXRvcnkucmVtb3RlKCkKICAgICAgICAgaWYg bm90IHJtdDoKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L3Rlc3QvcHVsbF9yZXF1ZXN0X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9wdWxsX3JlcXVlc3RfdW5p dHRlc3QucHkKaW5kZXggM2IwNmIxY2U1MTllYWIxNzY0OGY3YTZkZDVkOWFjNWI2MDdjYTJkMC4u NTY4NjhhM2EzOTc3NWI3YzVhMzQ5NWU3OTI3NzZiMzYyNmE3ZmZhYyAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9wdWxsX3Jl cXVlc3RfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvdGVzdC9wdWxsX3JlcXVlc3RfdW5pdHRlc3QucHkKQEAgLTE5NCw2ICsx OTQsOCBAQCBjbGFzcyBUZXN0RG9QdWxsUmVxdWVzdCh0ZXN0aW5nLlBhdGhUZXN0Q2FzZSk6CiAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY2FwdHVyZWQucm9vdC5sb2cuZ2V0dmFsdWUoKSwgJycn Q3JlYXRpbmcgdGhlIGxvY2FsIGRldmVsb3BtZW50IGJyYW5jaCAnZW5nL3ByLWJyYW5jaCcuLi4K IENyZWF0aW5nIGNvbW1pdC4uLgogICAgIEZvdW5kIDEgY29tbWl0Li4uCitSZWJhc2luZyAnZW5n L3ByLWJyYW5jaCcgb24gJ21haW4nLi4uCitSZWJhc2VkICdlbmcvcHItYnJhbmNoJyBvbiAnbWFp biEnCiAnJycpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY2FwdHVyZWQuc3RkZXJyLmdldHZh bHVlKCksICIne30nIGRvZXNuJ3QgaGF2ZSBhIHJlY29nbml6ZWQgcmVtb3RlXG4iLmZvcm1hdChz ZWxmLnBhdGgpKQogCkBAIC0yMTMsNiArMjE1LDggQEAgQ3JlYXRpbmcgY29tbWl0Li4uCiAgICAg QWRkaW5nIG1vZGlmaWVkLnR4dC4uLgogQ3JlYXRpbmcgY29tbWl0Li4uCiAgICAgRm91bmQgMSBj b21taXQuLi4KK1JlYmFzaW5nICdlbmcvcHItYnJhbmNoJyBvbiAnbWFpbicuLi4KK1JlYmFzZWQg J2VuZy9wci1icmFuY2gnIG9uICdtYWluIScKICcnJykKIAogICAgIGRlZiB0ZXN0X2dpdGh1Yihz ZWxmKToKQEAgLTIyOCwxMCArMjMyLDEyIEBAIENyZWF0aW5nIGNvbW1pdC4uLgogICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKGNhcHR1cmVkLnN0ZGVyci5nZXR2YWx1ZSgpLCAnJykKICAgICAgICAg bG9nID0gY2FwdHVyZWQucm9vdC5sb2cuZ2V0dmFsdWUoKS5zcGxpdGxpbmVzKCkKICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbCgKLSAgICAgICAgICAgIGxvZ1s6NF0gKyBsb2dbNyBpZiBzeXMudmVy c2lvbl9pbmZvID4gKDMsIDApIGVsc2UgNTpdLCBbCisgICAgICAgICAgICBsb2dbOjZdICsgbG9n WzkgaWYgc3lzLnZlcnNpb25faW5mbyA+ICgzLCAwKSBlbHNlIDc6XSwgWwogICAgICAgICAgICAg ICAgICJDcmVhdGluZyB0aGUgbG9jYWwgZGV2ZWxvcG1lbnQgYnJhbmNoICdlbmcvcHItYnJhbmNo Jy4uLiIsCiAgICAgICAgICAgICAgICAgJ0NyZWF0aW5nIGNvbW1pdC4uLicsCiAgICAgICAgICAg ICAgICAgJyAgICBGb3VuZCAxIGNvbW1pdC4uLicsCisgICAgICAgICAgICAgICAgIlJlYmFzaW5n ICdlbmcvcHItYnJhbmNoJyBvbiAnbWFpbicuLi4iLAorICAgICAgICAgICAgICAgICJSZWJhc2Vk ICdlbmcvcHItYnJhbmNoJyBvbiAnbWFpbiEnIiwKICAgICAgICAgICAgICAgICAiUHVzaGluZyAn ZW5nL3ByLWJyYW5jaCcgdG8gJ2ZvcmsnLi4uIiwKICAgICAgICAgICAgICAgICAiQ3JlYXRpbmcg cHVsbC1yZXF1ZXN0IGZvciAnZW5nL3ByLWJyYW5jaCcuLi4iLAogICAgICAgICAgICAgICAgICJD cmVhdGVkICdQUiAxIHwgQ3JlYXRlZCBjb21taXQnISIsCkBAIC0yNTcsMTYgKzI2MywxOCBAQCBD cmVhdGluZyBjb21taXQuLi4KICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjYXB0dXJlZC5zdGRl cnIuZ2V0dmFsdWUoKSwgJycpCiAgICAgICAgIGxvZyA9IGNhcHR1cmVkLnJvb3QubG9nLmdldHZh bHVlKCkuc3BsaXRsaW5lcygpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoCi0gICAgICAgICAg ICBsb2dbOjNdICsgbG9nWzYgaWYgc3lzLnZlcnNpb25faW5mbyA+ICgzLCAwKSBlbHNlIDQ6XSwg WworICAgICAgICAgICAgbG9nWzo1XSArIGxvZ1s4IGlmIHN5cy52ZXJzaW9uX2luZm8gPiAoMywg MCkgZWxzZSA2Ol0sIFsKICAgICAgICAgICAgICAgICAiQW1lbmRpbmcgY29tbWl0Li4uIiwKICAg ICAgICAgICAgICAgICAnICAgIEZvdW5kIDEgY29tbWl0Li4uJywKKyAgICAgICAgICAgICAgICAi UmViYXNpbmcgJ2VuZy9wci1icmFuY2gnIG9uICdtYWluJy4uLiIsCisgICAgICAgICAgICAgICAg IlJlYmFzZWQgJ2VuZy9wci1icmFuY2gnIG9uICdtYWluISciLAogICAgICAgICAgICAgICAgICJQ dXNoaW5nICdlbmcvcHItYnJhbmNoJyB0byAnZm9yaycuLi4iLAogICAgICAgICAgICAgICAgICJV cGRhdGluZyBwdWxsLXJlcXVlc3QgZm9yICdlbmcvcHItYnJhbmNoJy4uLiIsCiAgICAgICAgICAg ICAgICAgIlVwZGF0ZWQgJ1BSIDEgfCBBbWVuZGVkIGNvbW1pdCchIiwKICAgICAgICAgICAgIF0s CiAgICAgICAgICkKIAotICAgIGRlZiB0ZXN0X3N0YXNoKHNlbGYpOgorICAgIGRlZiB0ZXN0X2Jp dGJ1Y2tldChzZWxmKToKICAgICAgICAgd2l0aCBPdXRwdXRDYXB0dXJlKCkgYXMgY2FwdHVyZWQs IG1vY2tzLnJlbW90ZS5CaXRCdWNrZXQoKSBhcyByZW1vdGUsIG1vY2tzLmxvY2FsLkdpdChzZWxm LnBhdGgsIHJlbW90ZT0nc3NoOi8vZ2l0QHt9L3t9L3t9LmdpdCcuZm9ybWF0KAogICAgICAgICAg ICAgcmVtb3RlLmhvc3RzWzBdLCByZW1vdGUucHJvamVjdC5zcGxpdCgnLycpWzFdLCByZW1vdGUu cHJvamVjdC5zcGxpdCgnLycpWzNdLAogICAgICAgICApKSBhcyByZXBvLCBtb2Nrcy5sb2NhbC5T dm4oKToKQEAgLTI4MCwxNyArMjg4LDE5IEBAIENyZWF0aW5nIGNvbW1pdC4uLgogICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKGNhcHR1cmVkLnN0ZGVyci5nZXR2YWx1ZSgpLCAnJykKICAgICAgICAg bG9nID0gY2FwdHVyZWQucm9vdC5sb2cuZ2V0dmFsdWUoKS5zcGxpdGxpbmVzKCkKICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbCgKLSAgICAgICAgICAgIGxvZ1s6NF0gKyBsb2dbNyBpZiBzeXMudmVy c2lvbl9pbmZvID4gKDMsIDApIGVsc2UgNTpdLCBbCisgICAgICAgICAgICBsb2dbOjZdICsgbG9n WzkgaWYgc3lzLnZlcnNpb25faW5mbyA+ICgzLCAwKSBlbHNlIDc6XSwgWwogICAgICAgICAgICAg ICAgICJDcmVhdGluZyB0aGUgbG9jYWwgZGV2ZWxvcG1lbnQgYnJhbmNoICdlbmcvcHItYnJhbmNo Jy4uLiIsCiAgICAgICAgICAgICAgICAgJ0NyZWF0aW5nIGNvbW1pdC4uLicsCiAgICAgICAgICAg ICAgICAgJyAgICBGb3VuZCAxIGNvbW1pdC4uLicsCisgICAgICAgICAgICAgICAgIlJlYmFzaW5n ICdlbmcvcHItYnJhbmNoJyBvbiAnbWFpbicuLi4iLAorICAgICAgICAgICAgICAgICJSZWJhc2Vk ICdlbmcvcHItYnJhbmNoJyBvbiAnbWFpbiEnIiwKICAgICAgICAgICAgICAgICAiUHVzaGluZyAn ZW5nL3ByLWJyYW5jaCcgdG8gJ29yaWdpbicuLi4iLAogICAgICAgICAgICAgICAgICJDcmVhdGlu ZyBwdWxsLXJlcXVlc3QgZm9yICdlbmcvcHItYnJhbmNoJy4uLiIsCiAgICAgICAgICAgICAgICAg IkNyZWF0ZWQgJ1BSIDEgfCBDcmVhdGVkIGNvbW1pdCchIiwKICAgICAgICAgICAgIF0sCiAgICAg ICAgICkKIAotICAgIGRlZiB0ZXN0X3N0YXNoX3VwZGF0ZShzZWxmKToKKyAgICBkZWYgdGVzdF9i aXRidWNrZXRfdXBkYXRlKHNlbGYpOgogICAgICAgICB3aXRoIG1vY2tzLnJlbW90ZS5CaXRCdWNr ZXQoKSBhcyByZW1vdGUsIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgsIHJlbW90ZT0nc3NoOi8v Z2l0QHt9L3t9L3t9LmdpdCcuZm9ybWF0KAogICAgICAgICAgICAgcmVtb3RlLmhvc3RzWzBdLCBy ZW1vdGUucHJvamVjdC5zcGxpdCgnLycpWzFdLCByZW1vdGUucHJvamVjdC5zcGxpdCgnLycpWzNd LAogICAgICAgICApKSBhcyByZXBvLCBtb2Nrcy5sb2NhbC5Tdm4oKToKQEAgLTMxMSw5ICszMjEs MTEgQEAgQ3JlYXRpbmcgY29tbWl0Li4uCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY2FwdHVy ZWQuc3RkZXJyLmdldHZhbHVlKCksICcnKQogICAgICAgICBsb2cgPSBjYXB0dXJlZC5yb290Lmxv Zy5nZXR2YWx1ZSgpLnNwbGl0bGluZXMoKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKAotICAg ICAgICAgICAgbG9nWzozXSArIGxvZ1s2IGlmIHN5cy52ZXJzaW9uX2luZm8gPiAoMywgMCkgZWxz ZSA0Ol0sIFsKKyAgICAgICAgICAgIGxvZ1s6NV0gKyBsb2dbOCBpZiBzeXMudmVyc2lvbl9pbmZv ID4gKDMsIDApIGVsc2UgNjpdLCBbCiAgICAgICAgICAgICAgICAgIkFtZW5kaW5nIGNvbW1pdC4u LiIsCiAgICAgICAgICAgICAgICAgJyAgICBGb3VuZCAxIGNvbW1pdC4uLicsCisgICAgICAgICAg ICAgICAgIlJlYmFzaW5nICdlbmcvcHItYnJhbmNoJyBvbiAnbWFpbicuLi4iLAorICAgICAgICAg ICAgICAgICJSZWJhc2VkICdlbmcvcHItYnJhbmNoJyBvbiAnbWFpbiEnIiwKICAgICAgICAgICAg ICAgICAiUHVzaGluZyAnZW5nL3ByLWJyYW5jaCcgdG8gJ29yaWdpbicuLi4iLAogICAgICAgICAg ICAgICAgICJVcGRhdGluZyBwdWxsLXJlcXVlc3QgZm9yICdlbmcvcHItYnJhbmNoJy4uLiIsCiAg ICAgICAgICAgICAgICAgIlVwZGF0ZWQgJ1BSIDEgfCBBbWVuZGVkIGNvbW1pdCchIiwK 436882 2021-08-31 07:32:11 -0700 2021-08-31 13:16:49 -0700 Patch bug-229625-20210831073211.patch text/plain 12752 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxODAxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzI5NDEyODU1NWZkMzEzZDJmYmNkNGVhMWZiNjE4MWUx ZThiNGM3MS4uZmUxNDFhNGNiNTFjMDYyNWJmNTdlOTdlMTRhOGRmNTZmNzgyYTBjZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDIxLTA4LTMxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbZ2l0LXdlYmtpdF0gQXV0b21hdGljIHJlYmFzaW5nIG9yIHB1bGwtcmVxdWVzdHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTYyNQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODI0NTEwMzA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9sb2NhbC9naXQucHk6CisgICAgICAgIChHaXQucHVsbCk6IEFkZCByZWJh c2UgYW5kIGJyYW5jaCBhcmd1bWVudHMuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0LnB5OgorICAgICAgICAoR2l0Ll9f aW5pdF9fKTogQWRkIHB1bGwucmViYXNlID0gdHJ1ZSBpbiBkZWZhdWx0IGNvbmZpZy4KKyAgICAg ICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9wcm9ncmFtL3B1 bGwucHk6CisgICAgICAgIChQdWxsKTogQWRkICd1cCcgYW5kICd1cGRhdGUnIGFsaWFzZXMuCisg ICAgICAgIChQdWxsLm1haW4pOiBVcGRhdGUgdGhlIHNvdXJjZSBicmFuY2ggb2YgYSBwdWxsLXJl cXVlc3QgYnJhbmNoZXMuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvcHJvZ3JhbS9wdWxsX3JlcXVlc3QucHk6CisgICAgICAgIChQdWxsUmVxdWVz dC5wYXJzZXIpOiBBZGQgLS1yZWJhc2UvLS1uby1yZWJhc2Ugb3B0aW9ucy4KKyAgICAgICAgKFB1 bGxSZXF1ZXN0Lm1haW4pOiBVcGRhdGUgYW5kIHJlYmFzZSBhIHB1bGwtcmVxdWVzdCBvbiBpdCdz IHNvdXJjZSBicmFuY2guCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvdGVzdC9wdWxsX3JlcXVlc3RfdW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0 UHVsbFJlcXVlc3QudGVzdF9zdGFnZWQpOgorICAgICAgICAoVGVzdFB1bGxSZXF1ZXN0LnRlc3Rf bW9kaWZpZWQpOgorICAgICAgICAoVGVzdFB1bGxSZXF1ZXN0LnRlc3RfZ2l0aHViKToKKyAgICAg ICAgKFRlc3RQdWxsUmVxdWVzdC50ZXN0X2dpdGh1Yl91cGRhdGUpOgorICAgICAgICAoVGVzdFB1 bGxSZXF1ZXN0LnRlc3RfYml0YnVja2V0KToKKyAgICAgICAgKFRlc3RQdWxsUmVxdWVzdC50ZXN0 X2JpdGJ1Y2tldF91cGRhdGUpOgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L3Rlc3Qvc2V0dXBfZ2l0X3N2bl91bml0dGVzdC5weToKKyAgICAgICAg KFRlc3RTZXR1cEdpdFN2bi50ZXN0X2VtcHR5KToKKyAgICAgICAgKFRlc3RTZXR1cEdpdFN2bi50 ZXN0X2FkZCk6CisKIDIwMjEtMDgtMzAgIE1lZ2FuIEdhcmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFw cGxlLmNvbT4KIAogICAgICAgICBGaXggZG91YmxlLXRhcC1vbi1lZGl0YWJsZS1jb250ZW50LWZv ci1zZWxlY3Rpb24tdGhlbi1kcmFnLSogdGVzdHMuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkgYi9Ub29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkKaW5k ZXggZWM0YzliNjdmNTA0OGFlYzQ3ZjE2ZWMxNTlmNmMxODQzYzY4ZmY2YS4uZWYxMzk1ODdmNzMx NjdiZGEwZjI0YWUwYWU4NTlhNjRlM2FiZDU3MyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weQpA QCAtNzcxLDkgKzc3MSwxNCBAQCBjbGFzcyBHaXQoU2NtKToKICAgICAgICAgICAgIGN3ZD1zZWxm LnJvb3RfcGF0aCwKICAgICAgICAgKS5yZXR1cm5jb2RlIGVsc2Ugc2VsZi5jb21taXQoKQogCi0g ICAgZGVmIHB1bGwoc2VsZik6Ci0gICAgICAgIGNvbW1pdCA9IHNlbGYuY29tbWl0KCkKLSAgICAg ICAgY29kZSA9IHJ1bihbc2VsZi5leGVjdXRhYmxlKCksICdwdWxsJ10sIGN3ZD1zZWxmLnJvb3Rf cGF0aCkucmV0dXJuY29kZQorICAgIGRlZiBwdWxsKHNlbGYsIHJlYmFzZT1Ob25lLCBicmFuY2g9 Tm9uZSk6CisgICAgICAgIGNvZGUgPSBydW4oCisgICAgICAgICAgICBbc2VsZi5leGVjdXRhYmxl KCksICdwdWxsJ10gKyAoCisgICAgICAgICAgICAgICAgWydvcmlnaW4nLCBicmFuY2hdIGlmIGJy YW5jaCBlbHNlIFtdCisgICAgICAgICAgICApICsgKAorICAgICAgICAgICAgICAgIFtdIGlmIHJl YmFzZSBpcyBOb25lIGVsc2UgWyctLXJlYmFzZT17fScuZm9ybWF0KCdUcnVlJyBpZiByZWJhc2Ug ZWxzZSAnRmFsc2UnKV0KKyAgICAgICAgICAgICksIGN3ZD1zZWxmLnJvb3RfcGF0aCwKKyAgICAg ICAgKS5yZXR1cm5jb2RlCiAgICAgICAgIGlmIG5vdCBjb2RlIGFuZCBzZWxmLmlzX3N2bjoKICAg ICAgICAgICAgIHJldHVybiBydW4oWwogICAgICAgICAgICAgICAgIHNlbGYuZXhlY3V0YWJsZSgp LCAnc3ZuJywgJ2ZldGNoJywgJy0tbG9nLXdpbmRvdy1zaXplPTUwMDAnLCAnLXInLCAne306SEVB RCcuZm9ybWF0KGNvbW1pdC5yZXZpc2lvbiksCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9naXQucHkgYi9Ub29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9n aXQucHkKaW5kZXggMjZmNTY4MzljZDM3ODBlNzBlMzJlN2I0NDRiZjNjNDA1OTkyZGQwYi4uMDRm ZTk1N2M5ZGRiYTE3ZWQ5Y2VlZmJkYjhhOGRmZjZjNzBhZmJhNCAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0 LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L21vY2tzL2xvY2FsL2dpdC5weQpAQCAtOTIsNiArOTIsOCBAQCBjbGFzcyBHaXQobW9ja3MuU3Vi cHJvY2Vzcyk6CiAgICAgICAgICAgICAgICAgICAgICdcdGxvZ2FsbHJlZnVwZGF0ZXMgPSB0cnVl XG4nCiAgICAgICAgICAgICAgICAgICAgICdcdGlnbm9yZWNhc2UgPSB0cnVlXG4nCiAgICAgICAg ICAgICAgICAgICAgICdcdHByZWNvbXBvc2V1bmljb2RlID0gdHJ1ZVxuJworICAgICAgICAgICAg ICAgICAgICAnW3B1bGxdXG4nCisJICAgICAgICAgICAgICAgICdcdHJlYmFzZSA9IHRydWVcbicK ICAgICAgICAgICAgICAgICAgICAgJ1tyZW1vdGUgIm9yaWdpbiJdXG4nCiAgICAgICAgICAgICAg ICAgICAgICdcdHVybCA9IHtyZW1vdGV9XG4nCiAgICAgICAgICAgICAgICAgICAgICdcdGZldGNo ID0gK3JlZnMvaGVhZHMvKjpyZWZzL3JlbW90ZXMvb3JpZ2luLypcbicKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vcHVs bC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3By b2dyYW0vcHVsbC5weQppbmRleCBmN2VhMzY1N2Q3YzNiZTRiNmExODkwZWUzOTg5YmU1MjM3ODc2 ZDA2Li43NjZkNjEyNWFlOTFkMmYwODI3NjE4ZjE4MjY5ZTkyMmU3NTc4MTMxIDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9wcm9ncmFt L3B1bGwucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvcHJvZ3JhbS9wdWxsLnB5CkBAIC0yMywxMCArMjMsMTMgQEAKIGltcG9ydCBzeXMKIAog ZnJvbSAuY29tbWFuZCBpbXBvcnQgQ29tbWFuZAorZnJvbSAucHVsbF9yZXF1ZXN0IGltcG9ydCBQ dWxsUmVxdWVzdAorZnJvbSB3ZWJraXRzY21weSBpbXBvcnQgbG9jYWwKIAogCiBjbGFzcyBQdWxs KENvbW1hbmQpOgogICAgIG5hbWUgPSAncHVsbCcKKyAgICBhbGlhc2VzID0gWyd1cCcsICd1cGRh dGUnXQogICAgIGhlbHAgPSAnVXBkYXRlIHRoZSBjdXJyZW50IGNoZWNrb3V0LCBzeW5jaHJvbml6 ZSBnaXQtc3ZuIGlmIGNvbmZpZ3VyZWQnCiAKICAgICBAY2xhc3NtZXRob2QKQEAgLTM0LDQgKzM3 LDggQEAgY2xhc3MgUHVsbChDb21tYW5kKToKICAgICAgICAgaWYgbm90IHJlcG9zaXRvcnkucGF0 aDoKICAgICAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoJ0Nhbm5vdCB1cGRhdGUgcmVtb3RlIHJl cG9zaXRvcnlcbicpCiAgICAgICAgICAgICByZXR1cm4gMQorCisgICAgICAgIGlmIGlzaW5zdGFu Y2UocmVwb3NpdG9yeSwgbG9jYWwuR2l0KToKKyAgICAgICAgICAgIGJyYW5jaF9wb2ludCA9IFB1 bGxSZXF1ZXN0LmJyYW5jaF9wb2ludChhcmdzLCByZXBvc2l0b3J5LCAqKmt3YXJncykKKyAgICAg ICAgICAgIHJldHVybiByZXBvc2l0b3J5LnB1bGwocmViYXNlPVRydWUsIGJyYW5jaD1icmFuY2hf cG9pbnQuYnJhbmNoKQogICAgICAgICByZXR1cm4gcmVwb3NpdG9yeS5wdWxsKCkKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dy YW0vcHVsbF9yZXF1ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvcHJvZ3JhbS9wdWxsX3JlcXVlc3QucHkKaW5kZXggNjc0NzViZjkwOWU4ZjUw MmY4YWQ2Mjg2MTg0OTZmOThhNjkyODA5NC4uMDA4Y2FlYzU4YmYxZDI0NTY1NjcyZjZlMjY0YzRm ODBkZWUwNzQzNiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9wdWxsX3JlcXVlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9wdWxsX3JlcXVlc3Qu cHkKQEAgLTM4LDExICszOCwxNyBAQCBjbGFzcyBQdWxsUmVxdWVzdChDb21tYW5kKToKICAgICBk ZWYgcGFyc2VyKGNscywgcGFyc2VyLCBsb2dnZXJzPU5vbmUpOgogICAgICAgICBCcmFuY2gucGFy c2VyKHBhcnNlciwgbG9nZ2Vycz1sb2dnZXJzKQogICAgICAgICBwYXJzZXIuYWRkX2FyZ3VtZW50 KAotICAgICAgICAgICAgJy0tbm8tYWRkJywgJy0tYWRkJywKKyAgICAgICAgICAgICctLWFkZCcs ICctLW5vLWFkZCcsCiAgICAgICAgICAgICBkZXN0PSd3aWxsX2FkZCcsIGRlZmF1bHQ9Tm9uZSwK ICAgICAgICAgICAgIGhlbHA9J1doZW4gZHJhZnRpbmcgYSBjaGFuZ2UsIGFkZCAob3IgbmV2ZXIg YWRkKSBtb2RpZmllZCBmaWxlcyB0byBzZXQgb2Ygc3RhZ2VkIGNoYW5nZXMgdG8gYmUgY29tbWl0 dGVkJywKICAgICAgICAgICAgIGFjdGlvbj1hcmd1bWVudHMuTm9BY3Rpb24sCiAgICAgICAgICkK KyAgICAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgKKyAgICAgICAgICAgICctLXJlYmFzZScsICct LW5vLXJlYmFzZScsCisgICAgICAgICAgICBkZXN0PSdyZWJhc2UnLCBkZWZhdWx0PU5vbmUsCisg ICAgICAgICAgICBoZWxwPSdSZWJhc2UgKG9yIGRvIG5vdCByZWJhc2UpIHRoZSBwdWxsLXJlcXVl c3Qgb24gdGhlIHNvdXJjZSBicmFuY2ggYmVmb3JlIHB1c2hpbmcnLAorICAgICAgICAgICAgYWN0 aW9uPWFyZ3VtZW50cy5Ob0FjdGlvbiwKKyAgICAgICAgKQogCiAgICAgQGNsYXNzbWV0aG9kCiAg ICAgZGVmIGNyZWF0ZV9jb21taXQoY2xzLCBhcmdzLCByZXBvc2l0b3J5LCAqKmt3YXJncyk6CkBA IC0xMDUsNiArMTExLDEyIEBAIGNsYXNzIFB1bGxSZXF1ZXN0KENvbW1hbmQpOgogICAgICAgICAg ICAgcmV0dXJuIHJlc3VsdAogCiAgICAgICAgIGJyYW5jaF9wb2ludCA9IGNscy5icmFuY2hfcG9p bnQoYXJncywgcmVwb3NpdG9yeSwgKiprd2FyZ3MpCisgICAgICAgIGlmIGFyZ3MucmViYXNlIG9y IChhcmdzLnJlYmFzZSBpcyBOb25lIGFuZCByZXBvc2l0b3J5LmNvbmZpZygpLmdldCgncHVsbC5y ZWJhc2UnKSk6CisgICAgICAgICAgICBsb2cud2FybmluZygiUmViYXNpbmcgJ3t9JyBvbiAne30n Li4uIi5mb3JtYXQocmVwb3NpdG9yeS5icmFuY2gsIGJyYW5jaF9wb2ludC5icmFuY2gpKQorICAg ICAgICAgICAgaWYgcmVwb3NpdG9yeS5wdWxsKHJlYmFzZT1UcnVlLCBicmFuY2g9YnJhbmNoX3Bv aW50LmJyYW5jaCk6CisgICAgICAgICAgICAgICAgc3lzLnN0ZGVyci53cml0ZSgiRmFpbGVkIHRv IHJlYmFzZSAne30nIG9uICd7fSwnIHBsZWFzZSByZXNvbHZlIGNvbmZsaWN0c1xuIi5mb3JtYXQo cmVwb3NpdG9yeS5icmFuY2gsIGJyYW5jaF9wb2ludC5icmFuY2gpKQorICAgICAgICAgICAgICAg IHJldHVybiAxCisgICAgICAgICAgICBsb2cud2FybmluZygiUmViYXNlZCAne30nIG9uICd7fSEn Ii5mb3JtYXQocmVwb3NpdG9yeS5icmFuY2gsIGJyYW5jaF9wb2ludC5icmFuY2gpKQogCiAgICAg ICAgIHJtdCA9IHJlcG9zaXRvcnkucmVtb3RlKCkKICAgICAgICAgaWYgbm90IHJtdDoKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rl c3QvcHVsbF9yZXF1ZXN0X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9wdWxsX3JlcXVlc3RfdW5pdHRlc3QucHkKaW5kZXgg M2IwNmIxY2U1MTllYWIxNzY0OGY3YTZkZDVkOWFjNWI2MDdjYTJkMC4uNTY4NjhhM2EzOTc3NWI3 YzVhMzQ5NWU3OTI3NzZiMzYyNmE3ZmZhYyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9wdWxsX3JlcXVlc3RfdW5pdHRlc3Qu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv dGVzdC9wdWxsX3JlcXVlc3RfdW5pdHRlc3QucHkKQEAgLTE5NCw2ICsxOTQsOCBAQCBjbGFzcyBU ZXN0RG9QdWxsUmVxdWVzdCh0ZXN0aW5nLlBhdGhUZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwoY2FwdHVyZWQucm9vdC5sb2cuZ2V0dmFsdWUoKSwgJycnQ3JlYXRpbmcgdGhlIGxv Y2FsIGRldmVsb3BtZW50IGJyYW5jaCAnZW5nL3ByLWJyYW5jaCcuLi4KIENyZWF0aW5nIGNvbW1p dC4uLgogICAgIEZvdW5kIDEgY29tbWl0Li4uCitSZWJhc2luZyAnZW5nL3ByLWJyYW5jaCcgb24g J21haW4nLi4uCitSZWJhc2VkICdlbmcvcHItYnJhbmNoJyBvbiAnbWFpbiEnCiAnJycpCiAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoY2FwdHVyZWQuc3RkZXJyLmdldHZhbHVlKCksICIne30nIGRv ZXNuJ3QgaGF2ZSBhIHJlY29nbml6ZWQgcmVtb3RlXG4iLmZvcm1hdChzZWxmLnBhdGgpKQogCkBA IC0yMTMsNiArMjE1LDggQEAgQ3JlYXRpbmcgY29tbWl0Li4uCiAgICAgQWRkaW5nIG1vZGlmaWVk LnR4dC4uLgogQ3JlYXRpbmcgY29tbWl0Li4uCiAgICAgRm91bmQgMSBjb21taXQuLi4KK1JlYmFz aW5nICdlbmcvcHItYnJhbmNoJyBvbiAnbWFpbicuLi4KK1JlYmFzZWQgJ2VuZy9wci1icmFuY2gn IG9uICdtYWluIScKICcnJykKIAogICAgIGRlZiB0ZXN0X2dpdGh1YihzZWxmKToKQEAgLTIyOCwx MCArMjMyLDEyIEBAIENyZWF0aW5nIGNvbW1pdC4uLgogICAgICAgICBzZWxmLmFzc2VydEVxdWFs KGNhcHR1cmVkLnN0ZGVyci5nZXR2YWx1ZSgpLCAnJykKICAgICAgICAgbG9nID0gY2FwdHVyZWQu cm9vdC5sb2cuZ2V0dmFsdWUoKS5zcGxpdGxpbmVzKCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bCgKLSAgICAgICAgICAgIGxvZ1s6NF0gKyBsb2dbNyBpZiBzeXMudmVyc2lvbl9pbmZvID4gKDMs IDApIGVsc2UgNTpdLCBbCisgICAgICAgICAgICBsb2dbOjZdICsgbG9nWzkgaWYgc3lzLnZlcnNp b25faW5mbyA+ICgzLCAwKSBlbHNlIDc6XSwgWwogICAgICAgICAgICAgICAgICJDcmVhdGluZyB0 aGUgbG9jYWwgZGV2ZWxvcG1lbnQgYnJhbmNoICdlbmcvcHItYnJhbmNoJy4uLiIsCiAgICAgICAg ICAgICAgICAgJ0NyZWF0aW5nIGNvbW1pdC4uLicsCiAgICAgICAgICAgICAgICAgJyAgICBGb3Vu ZCAxIGNvbW1pdC4uLicsCisgICAgICAgICAgICAgICAgIlJlYmFzaW5nICdlbmcvcHItYnJhbmNo JyBvbiAnbWFpbicuLi4iLAorICAgICAgICAgICAgICAgICJSZWJhc2VkICdlbmcvcHItYnJhbmNo JyBvbiAnbWFpbiEnIiwKICAgICAgICAgICAgICAgICAiUHVzaGluZyAnZW5nL3ByLWJyYW5jaCcg dG8gJ2ZvcmsnLi4uIiwKICAgICAgICAgICAgICAgICAiQ3JlYXRpbmcgcHVsbC1yZXF1ZXN0IGZv ciAnZW5nL3ByLWJyYW5jaCcuLi4iLAogICAgICAgICAgICAgICAgICJDcmVhdGVkICdQUiAxIHwg Q3JlYXRlZCBjb21taXQnISIsCkBAIC0yNTcsMTYgKzI2MywxOCBAQCBDcmVhdGluZyBjb21taXQu Li4KICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjYXB0dXJlZC5zdGRlcnIuZ2V0dmFsdWUoKSwg JycpCiAgICAgICAgIGxvZyA9IGNhcHR1cmVkLnJvb3QubG9nLmdldHZhbHVlKCkuc3BsaXRsaW5l cygpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoCi0gICAgICAgICAgICBsb2dbOjNdICsgbG9n WzYgaWYgc3lzLnZlcnNpb25faW5mbyA+ICgzLCAwKSBlbHNlIDQ6XSwgWworICAgICAgICAgICAg bG9nWzo1XSArIGxvZ1s4IGlmIHN5cy52ZXJzaW9uX2luZm8gPiAoMywgMCkgZWxzZSA2Ol0sIFsK ICAgICAgICAgICAgICAgICAiQW1lbmRpbmcgY29tbWl0Li4uIiwKICAgICAgICAgICAgICAgICAn ICAgIEZvdW5kIDEgY29tbWl0Li4uJywKKyAgICAgICAgICAgICAgICAiUmViYXNpbmcgJ2VuZy9w ci1icmFuY2gnIG9uICdtYWluJy4uLiIsCisgICAgICAgICAgICAgICAgIlJlYmFzZWQgJ2VuZy9w ci1icmFuY2gnIG9uICdtYWluISciLAogICAgICAgICAgICAgICAgICJQdXNoaW5nICdlbmcvcHIt YnJhbmNoJyB0byAnZm9yaycuLi4iLAogICAgICAgICAgICAgICAgICJVcGRhdGluZyBwdWxsLXJl cXVlc3QgZm9yICdlbmcvcHItYnJhbmNoJy4uLiIsCiAgICAgICAgICAgICAgICAgIlVwZGF0ZWQg J1BSIDEgfCBBbWVuZGVkIGNvbW1pdCchIiwKICAgICAgICAgICAgIF0sCiAgICAgICAgICkKIAot ICAgIGRlZiB0ZXN0X3N0YXNoKHNlbGYpOgorICAgIGRlZiB0ZXN0X2JpdGJ1Y2tldChzZWxmKToK ICAgICAgICAgd2l0aCBPdXRwdXRDYXB0dXJlKCkgYXMgY2FwdHVyZWQsIG1vY2tzLnJlbW90ZS5C aXRCdWNrZXQoKSBhcyByZW1vdGUsIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgsIHJlbW90ZT0n c3NoOi8vZ2l0QHt9L3t9L3t9LmdpdCcuZm9ybWF0KAogICAgICAgICAgICAgcmVtb3RlLmhvc3Rz WzBdLCByZW1vdGUucHJvamVjdC5zcGxpdCgnLycpWzFdLCByZW1vdGUucHJvamVjdC5zcGxpdCgn LycpWzNdLAogICAgICAgICApKSBhcyByZXBvLCBtb2Nrcy5sb2NhbC5Tdm4oKToKQEAgLTI4MCwx NyArMjg4LDE5IEBAIENyZWF0aW5nIGNvbW1pdC4uLgogICAgICAgICBzZWxmLmFzc2VydEVxdWFs KGNhcHR1cmVkLnN0ZGVyci5nZXR2YWx1ZSgpLCAnJykKICAgICAgICAgbG9nID0gY2FwdHVyZWQu cm9vdC5sb2cuZ2V0dmFsdWUoKS5zcGxpdGxpbmVzKCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bCgKLSAgICAgICAgICAgIGxvZ1s6NF0gKyBsb2dbNyBpZiBzeXMudmVyc2lvbl9pbmZvID4gKDMs IDApIGVsc2UgNTpdLCBbCisgICAgICAgICAgICBsb2dbOjZdICsgbG9nWzkgaWYgc3lzLnZlcnNp b25faW5mbyA+ICgzLCAwKSBlbHNlIDc6XSwgWwogICAgICAgICAgICAgICAgICJDcmVhdGluZyB0 aGUgbG9jYWwgZGV2ZWxvcG1lbnQgYnJhbmNoICdlbmcvcHItYnJhbmNoJy4uLiIsCiAgICAgICAg ICAgICAgICAgJ0NyZWF0aW5nIGNvbW1pdC4uLicsCiAgICAgICAgICAgICAgICAgJyAgICBGb3Vu ZCAxIGNvbW1pdC4uLicsCisgICAgICAgICAgICAgICAgIlJlYmFzaW5nICdlbmcvcHItYnJhbmNo JyBvbiAnbWFpbicuLi4iLAorICAgICAgICAgICAgICAgICJSZWJhc2VkICdlbmcvcHItYnJhbmNo JyBvbiAnbWFpbiEnIiwKICAgICAgICAgICAgICAgICAiUHVzaGluZyAnZW5nL3ByLWJyYW5jaCcg dG8gJ29yaWdpbicuLi4iLAogICAgICAgICAgICAgICAgICJDcmVhdGluZyBwdWxsLXJlcXVlc3Qg Zm9yICdlbmcvcHItYnJhbmNoJy4uLiIsCiAgICAgICAgICAgICAgICAgIkNyZWF0ZWQgJ1BSIDEg fCBDcmVhdGVkIGNvbW1pdCchIiwKICAgICAgICAgICAgIF0sCiAgICAgICAgICkKIAotICAgIGRl ZiB0ZXN0X3N0YXNoX3VwZGF0ZShzZWxmKToKKyAgICBkZWYgdGVzdF9iaXRidWNrZXRfdXBkYXRl KHNlbGYpOgogICAgICAgICB3aXRoIG1vY2tzLnJlbW90ZS5CaXRCdWNrZXQoKSBhcyByZW1vdGUs IG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgsIHJlbW90ZT0nc3NoOi8vZ2l0QHt9L3t9L3t9Lmdp dCcuZm9ybWF0KAogICAgICAgICAgICAgcmVtb3RlLmhvc3RzWzBdLCByZW1vdGUucHJvamVjdC5z cGxpdCgnLycpWzFdLCByZW1vdGUucHJvamVjdC5zcGxpdCgnLycpWzNdLAogICAgICAgICApKSBh cyByZXBvLCBtb2Nrcy5sb2NhbC5Tdm4oKToKQEAgLTMxMSw5ICszMjEsMTEgQEAgQ3JlYXRpbmcg Y29tbWl0Li4uCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY2FwdHVyZWQuc3RkZXJyLmdldHZh bHVlKCksICcnKQogICAgICAgICBsb2cgPSBjYXB0dXJlZC5yb290LmxvZy5nZXR2YWx1ZSgpLnNw bGl0bGluZXMoKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKAotICAgICAgICAgICAgbG9nWzoz XSArIGxvZ1s2IGlmIHN5cy52ZXJzaW9uX2luZm8gPiAoMywgMCkgZWxzZSA0Ol0sIFsKKyAgICAg ICAgICAgIGxvZ1s6NV0gKyBsb2dbOCBpZiBzeXMudmVyc2lvbl9pbmZvID4gKDMsIDApIGVsc2Ug NjpdLCBbCiAgICAgICAgICAgICAgICAgIkFtZW5kaW5nIGNvbW1pdC4uLiIsCiAgICAgICAgICAg ICAgICAgJyAgICBGb3VuZCAxIGNvbW1pdC4uLicsCisgICAgICAgICAgICAgICAgIlJlYmFzaW5n ICdlbmcvcHItYnJhbmNoJyBvbiAnbWFpbicuLi4iLAorICAgICAgICAgICAgICAgICJSZWJhc2Vk ICdlbmcvcHItYnJhbmNoJyBvbiAnbWFpbiEnIiwKICAgICAgICAgICAgICAgICAiUHVzaGluZyAn ZW5nL3ByLWJyYW5jaCcgdG8gJ29yaWdpbicuLi4iLAogICAgICAgICAgICAgICAgICJVcGRhdGlu ZyBwdWxsLXJlcXVlc3QgZm9yICdlbmcvcHItYnJhbmNoJy4uLiIsCiAgICAgICAgICAgICAgICAg IlVwZGF0ZWQgJ1BSIDEgfCBBbWVuZGVkIGNvbW1pdCchIiwKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3Qvc2V0dXBfZ2l0X3N2 bl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L3Rlc3Qvc2V0dXBfZ2l0X3N2bl91bml0dGVzdC5weQppbmRleCA4ZWVhZWQ0NDBhMzM1 Y2EwMjQzMjU2YTgyNmY0Mzg3MzgxNjNmNTkxLi42NmU3MjA3MGVhN2M2MDMyYmI0MzhkMmU2ZGZl NjAxYTBiMzkyYzE0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS90ZXN0L3NldHVwX2dpdF9zdm5fdW5pdHRlc3QucHkKKysrIGIvVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9zZXR1cF9n aXRfc3ZuX3VuaXR0ZXN0LnB5CkBAIC02OSw2ICs2OSw4IEBAIGNsYXNzIFRlc3RTZXR1cEdpdFN2 bih0ZXN0aW5nLlBhdGhUZXN0Q2FzZSk6CiAgICAgICAgICAgICAgICAgJ1x0bG9nYWxscmVmdXBk YXRlcyA9IHRydWVcbicKICAgICAgICAgICAgICAgICAnXHRpZ25vcmVjYXNlID0gdHJ1ZVxuJwog ICAgICAgICAgICAgICAgICdcdHByZWNvbXBvc2V1bmljb2RlID0gdHJ1ZVxuJworICAgICAgICAg ICAgICAgICdbcHVsbF1cbicKKwkgICAgICAgICAgICAnXHRyZWJhc2UgPSB0cnVlXG4nCiAgICAg ICAgICAgICAgICAgJ1tyZW1vdGUgIm9yaWdpbiJdXG4nCiAgICAgICAgICAgICAgICAgJ1x0dXJs ID0ge2dpdF9yZW1vdGV9XG4nCiAgICAgICAgICAgICAgICAgJ1x0ZmV0Y2ggPSArcmVmcy9oZWFk cy8qOnJlZnMvcmVtb3Rlcy9vcmlnaW4vKlxuJwpAQCAtMTEzLDYgKzExNSw4IEBAIGNsYXNzIFRl c3RTZXR1cEdpdFN2bih0ZXN0aW5nLlBhdGhUZXN0Q2FzZSk6CiAgICAgICAgICAgICAgICAgJ1x0 bG9nYWxscmVmdXBkYXRlcyA9IHRydWVcbicKICAgICAgICAgICAgICAgICAnXHRpZ25vcmVjYXNl ID0gdHJ1ZVxuJwogICAgICAgICAgICAgICAgICdcdHByZWNvbXBvc2V1bmljb2RlID0gdHJ1ZVxu JworICAgICAgICAgICAgICAgICdbcHVsbF1cbicKKwkgICAgICAgICAgICAnXHRyZWJhc2UgPSB0 cnVlXG4nCiAgICAgICAgICAgICAgICAgJ1tyZW1vdGUgIm9yaWdpbiJdXG4nCiAgICAgICAgICAg ICAgICAgJ1x0dXJsID0ge2dpdF9yZW1vdGV9XG4nCiAgICAgICAgICAgICAgICAgJ1x0ZmV0Y2gg PSArcmVmcy9oZWFkcy8qOnJlZnMvcmVtb3Rlcy9vcmlnaW4vKlxuJwo= 436931 2021-08-31 13:16:51 -0700 2021-08-31 13:42:21 -0700 Patch for landing bug-229625-20210831131650.patch text/plain 14111 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxODE0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTkzNTBmMDZlNzNiMTIxNTVmZDU4NjU4ODAwYjRjNzcw OGM4YzI5NC4uNTZmNzgxNzM3NjZhNzZkYzZjMGJkNDcyMGY3NzMyNjU4ZWVkOGFlOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0 IEBACisyMDIxLTA4LTMxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbZ2l0LXdlYmtpdF0gQXV0b21hdGljIHJlYmFzaW5nIG9yIHB1bGwtcmVxdWVzdHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTYyNQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODI0NTEwMzA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg RGV3ZWkgWmh1LgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0 dXAucHk6IEJ1bXAgdmVyc2lvbi4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS9fX2luaXRfXy5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5OgorICAgICAgICAo R2l0LnB1bGwpOiBBZGQgcmViYXNlIGFuZCBicmFuY2ggYXJndW1lbnRzLgorICAgICAgICAqIFNj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL2dpdC5w eToKKyAgICAgICAgKEdpdC5fX2luaXRfXyk6IEFkZCBwdWxsLnJlYmFzZSA9IHRydWUgaW4gZGVm YXVsdCBjb25maWcuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvcHJvZ3JhbS9wdWxsLnB5OgorICAgICAgICAoUHVsbCk6IEFkZCAndXAnIGFuZCAn dXBkYXRlJyBhbGlhc2VzLgorICAgICAgICAoUHVsbC5tYWluKTogVXBkYXRlIHRoZSBzb3VyY2Ug YnJhbmNoIG9mIGEgcHVsbC1yZXF1ZXN0IGJyYW5jaGVzLgorICAgICAgICAqIFNjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vcHVsbF9yZXF1ZXN0LnB5Ogor ICAgICAgICAoUHVsbFJlcXVlc3QucGFyc2VyKTogQWRkIC0tcmViYXNlLy0tbm8tcmViYXNlIG9w dGlvbnMuCisgICAgICAgIChQdWxsUmVxdWVzdC5tYWluKTogVXBkYXRlIGFuZCByZWJhc2UgYSBw dWxsLXJlcXVlc3Qgb24gaXQncyBzb3VyY2UgYnJhbmNoLgorICAgICAgICAqIFNjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvcHVsbF9yZXF1ZXN0X3VuaXR0ZXN0 LnB5OgorICAgICAgICAoVGVzdFB1bGxSZXF1ZXN0LnRlc3Rfc3RhZ2VkKToKKyAgICAgICAgKFRl c3RQdWxsUmVxdWVzdC50ZXN0X21vZGlmaWVkKToKKyAgICAgICAgKFRlc3RQdWxsUmVxdWVzdC50 ZXN0X2dpdGh1Yik6CisgICAgICAgIChUZXN0UHVsbFJlcXVlc3QudGVzdF9naXRodWJfdXBkYXRl KToKKyAgICAgICAgKFRlc3RQdWxsUmVxdWVzdC50ZXN0X2JpdGJ1Y2tldCk6CisgICAgICAgIChU ZXN0UHVsbFJlcXVlc3QudGVzdF9iaXRidWNrZXRfdXBkYXRlKToKKyAgICAgICAgKiBTY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L3NldHVwX2dpdF9zdm5fdW5p dHRlc3QucHk6CisgICAgICAgIChUZXN0U2V0dXBHaXRTdm4udGVzdF9lbXB0eSk6CisgICAgICAg IChUZXN0U2V0dXBHaXRTdm4udGVzdF9hZGQpOgorCiAyMDIxLTA4LTMxICBKb25hdGhhbiBCZWRh cmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBbY29udHJpYnV0b3JzLmpzb25dIFJl cGxhY2UgY2xhc3M9Ym90IHdpdGggc3RhdHVzPWJvdApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS9zZXR1cC5weQppbmRleCA3MWJjYWUyZjcwYzcwNzA0MGZkNGRiZDQyNjll NWJiZTEyZmFlYmYwLi42Y2VlZWQwYzdlNTI5YTkwOGE0ZjMxYTc2ZDQzNGUxYmM0ZDJlY2FjIDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQor KysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQpAQCAtMjks NyArMjksNyBAQCBkZWYgcmVhZG1lKCk6CiAKIHNldHVwKAogICAgIG5hbWU9J3dlYmtpdHNjbXB5 JywKLSAgICB2ZXJzaW9uPScyLjAuMCcsCisgICAgdmVyc2lvbj0nMi4wLjEnLAogICAgIGRlc2Ny aXB0aW9uPSdMaWJyYXJ5IGRlc2lnbmVkIHRvIGludGVyYWN0IHdpdGggZ2l0IGFuZCBzdm4gcmVw b3NpdG9yaWVzLicsCiAgICAgbG9uZ19kZXNjcmlwdGlvbj1yZWFkbWUoKSwKICAgICBjbGFzc2lm aWVycz1bCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS9fX2luaXRfXy5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CmluZGV4IDk3YzEwYjMxY2NmZWE5MmNhNzE3YTVj NjllYjliM2I2NDk3MGY4YzcuLjRkOTc3ZDY0YzJjZTk1NTM3Nzg2ZGEyOTgyNzJjNDFhODQ2NTM3 NzkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L19faW5pdF9fLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CkBAIC00Niw3ICs0Niw3IEBAIGV4Y2VwdCBJbXBv cnRFcnJvcjoKICAgICAgICAgIlBsZWFzZSBpbnN0YWxsIHdlYmtpdGNvcmVweSB3aXRoIGBwaXAg aW5zdGFsbCB3ZWJraXRjb3JlcHkgLS1leHRyYS1pbmRleC11cmwgPHBhY2thZ2UgaW5kZXggVVJM PmAiCiAgICAgKQogCi12ZXJzaW9uID0gVmVyc2lvbigyLCAwLCAwKQordmVyc2lvbiA9IFZlcnNp b24oMiwgMCwgMSkKIAogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZmFzdGVuZXJzJywg VmVyc2lvbigwLCAxNSwgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnbW9ub3Rv bmljJywgVmVyc2lvbigxLCA1KSkpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkgYi9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkKaW5kZXggZWM0Yzli NjdmNTA0OGFlYzQ3ZjE2ZWMxNTlmNmMxODQzYzY4ZmY2YS4uZWYxMzk1ODdmNzMxNjdiZGEwZjI0 YWUwYWU4NTlhNjRlM2FiZDU3MyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weQpAQCAtNzcxLDkg Kzc3MSwxNCBAQCBjbGFzcyBHaXQoU2NtKToKICAgICAgICAgICAgIGN3ZD1zZWxmLnJvb3RfcGF0 aCwKICAgICAgICAgKS5yZXR1cm5jb2RlIGVsc2Ugc2VsZi5jb21taXQoKQogCi0gICAgZGVmIHB1 bGwoc2VsZik6Ci0gICAgICAgIGNvbW1pdCA9IHNlbGYuY29tbWl0KCkKLSAgICAgICAgY29kZSA9 IHJ1bihbc2VsZi5leGVjdXRhYmxlKCksICdwdWxsJ10sIGN3ZD1zZWxmLnJvb3RfcGF0aCkucmV0 dXJuY29kZQorICAgIGRlZiBwdWxsKHNlbGYsIHJlYmFzZT1Ob25lLCBicmFuY2g9Tm9uZSk6Cisg ICAgICAgIGNvZGUgPSBydW4oCisgICAgICAgICAgICBbc2VsZi5leGVjdXRhYmxlKCksICdwdWxs J10gKyAoCisgICAgICAgICAgICAgICAgWydvcmlnaW4nLCBicmFuY2hdIGlmIGJyYW5jaCBlbHNl IFtdCisgICAgICAgICAgICApICsgKAorICAgICAgICAgICAgICAgIFtdIGlmIHJlYmFzZSBpcyBO b25lIGVsc2UgWyctLXJlYmFzZT17fScuZm9ybWF0KCdUcnVlJyBpZiByZWJhc2UgZWxzZSAnRmFs c2UnKV0KKyAgICAgICAgICAgICksIGN3ZD1zZWxmLnJvb3RfcGF0aCwKKyAgICAgICAgKS5yZXR1 cm5jb2RlCiAgICAgICAgIGlmIG5vdCBjb2RlIGFuZCBzZWxmLmlzX3N2bjoKICAgICAgICAgICAg IHJldHVybiBydW4oWwogICAgICAgICAgICAgICAgIHNlbGYuZXhlY3V0YWJsZSgpLCAnc3ZuJywg J2ZldGNoJywgJy0tbG9nLXdpbmRvdy1zaXplPTUwMDAnLCAnLXInLCAne306SEVBRCcuZm9ybWF0 KGNvbW1pdC5yZXZpc2lvbiksCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9naXQucHkgYi9Ub29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9naXQucHkKaW5k ZXggMjZmNTY4MzljZDM3ODBlNzBlMzJlN2I0NDRiZjNjNDA1OTkyZGQwYi4uMDRmZTk1N2M5ZGRi YTE3ZWQ5Y2VlZmJkYjhhOGRmZjZjNzBhZmJhNCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0LnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xv Y2FsL2dpdC5weQpAQCAtOTIsNiArOTIsOCBAQCBjbGFzcyBHaXQobW9ja3MuU3VicHJvY2Vzcyk6 CiAgICAgICAgICAgICAgICAgICAgICdcdGxvZ2FsbHJlZnVwZGF0ZXMgPSB0cnVlXG4nCiAgICAg ICAgICAgICAgICAgICAgICdcdGlnbm9yZWNhc2UgPSB0cnVlXG4nCiAgICAgICAgICAgICAgICAg ICAgICdcdHByZWNvbXBvc2V1bmljb2RlID0gdHJ1ZVxuJworICAgICAgICAgICAgICAgICAgICAn W3B1bGxdXG4nCisJICAgICAgICAgICAgICAgICdcdHJlYmFzZSA9IHRydWVcbicKICAgICAgICAg ICAgICAgICAgICAgJ1tyZW1vdGUgIm9yaWdpbiJdXG4nCiAgICAgICAgICAgICAgICAgICAgICdc dHVybCA9IHtyZW1vdGV9XG4nCiAgICAgICAgICAgICAgICAgICAgICdcdGZldGNoID0gK3JlZnMv aGVhZHMvKjpyZWZzL3JlbW90ZXMvb3JpZ2luLypcbicKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vcHVsbC5weSBiL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vcHVs bC5weQppbmRleCBmN2VhMzY1N2Q3YzNiZTRiNmExODkwZWUzOTg5YmU1MjM3ODc2ZDA2Li43NjZk NjEyNWFlOTFkMmYwODI3NjE4ZjE4MjY5ZTkyMmU3NTc4MTMxIDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9wcm9ncmFtL3B1bGwucHkK KysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJv Z3JhbS9wdWxsLnB5CkBAIC0yMywxMCArMjMsMTMgQEAKIGltcG9ydCBzeXMKIAogZnJvbSAuY29t bWFuZCBpbXBvcnQgQ29tbWFuZAorZnJvbSAucHVsbF9yZXF1ZXN0IGltcG9ydCBQdWxsUmVxdWVz dAorZnJvbSB3ZWJraXRzY21weSBpbXBvcnQgbG9jYWwKIAogCiBjbGFzcyBQdWxsKENvbW1hbmQp OgogICAgIG5hbWUgPSAncHVsbCcKKyAgICBhbGlhc2VzID0gWyd1cCcsICd1cGRhdGUnXQogICAg IGhlbHAgPSAnVXBkYXRlIHRoZSBjdXJyZW50IGNoZWNrb3V0LCBzeW5jaHJvbml6ZSBnaXQtc3Zu IGlmIGNvbmZpZ3VyZWQnCiAKICAgICBAY2xhc3NtZXRob2QKQEAgLTM0LDQgKzM3LDggQEAgY2xh c3MgUHVsbChDb21tYW5kKToKICAgICAgICAgaWYgbm90IHJlcG9zaXRvcnkucGF0aDoKICAgICAg ICAgICAgIHN5cy5zdGRlcnIud3JpdGUoJ0Nhbm5vdCB1cGRhdGUgcmVtb3RlIHJlcG9zaXRvcnlc bicpCiAgICAgICAgICAgICByZXR1cm4gMQorCisgICAgICAgIGlmIGlzaW5zdGFuY2UocmVwb3Np dG9yeSwgbG9jYWwuR2l0KToKKyAgICAgICAgICAgIGJyYW5jaF9wb2ludCA9IFB1bGxSZXF1ZXN0 LmJyYW5jaF9wb2ludChhcmdzLCByZXBvc2l0b3J5LCAqKmt3YXJncykKKyAgICAgICAgICAgIHJl dHVybiByZXBvc2l0b3J5LnB1bGwocmViYXNlPVRydWUsIGJyYW5jaD1icmFuY2hfcG9pbnQuYnJh bmNoKQogICAgICAgICByZXR1cm4gcmVwb3NpdG9yeS5wdWxsKCkKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vcHVsbF9y ZXF1ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvcHJvZ3JhbS9wdWxsX3JlcXVlc3QucHkKaW5kZXggNjc0NzViZjkwOWU4ZjUwMmY4YWQ2Mjg2 MTg0OTZmOThhNjkyODA5NC4uMDA4Y2FlYzU4YmYxZDI0NTY1NjcyZjZlMjY0YzRmODBkZWUwNzQz NiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvcHJvZ3JhbS9wdWxsX3JlcXVlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9wdWxsX3JlcXVlc3QucHkKQEAgLTM4 LDExICszOCwxNyBAQCBjbGFzcyBQdWxsUmVxdWVzdChDb21tYW5kKToKICAgICBkZWYgcGFyc2Vy KGNscywgcGFyc2VyLCBsb2dnZXJzPU5vbmUpOgogICAgICAgICBCcmFuY2gucGFyc2VyKHBhcnNl ciwgbG9nZ2Vycz1sb2dnZXJzKQogICAgICAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KAotICAgICAg ICAgICAgJy0tbm8tYWRkJywgJy0tYWRkJywKKyAgICAgICAgICAgICctLWFkZCcsICctLW5vLWFk ZCcsCiAgICAgICAgICAgICBkZXN0PSd3aWxsX2FkZCcsIGRlZmF1bHQ9Tm9uZSwKICAgICAgICAg ICAgIGhlbHA9J1doZW4gZHJhZnRpbmcgYSBjaGFuZ2UsIGFkZCAob3IgbmV2ZXIgYWRkKSBtb2Rp ZmllZCBmaWxlcyB0byBzZXQgb2Ygc3RhZ2VkIGNoYW5nZXMgdG8gYmUgY29tbWl0dGVkJywKICAg ICAgICAgICAgIGFjdGlvbj1hcmd1bWVudHMuTm9BY3Rpb24sCiAgICAgICAgICkKKyAgICAgICAg cGFyc2VyLmFkZF9hcmd1bWVudCgKKyAgICAgICAgICAgICctLXJlYmFzZScsICctLW5vLXJlYmFz ZScsCisgICAgICAgICAgICBkZXN0PSdyZWJhc2UnLCBkZWZhdWx0PU5vbmUsCisgICAgICAgICAg ICBoZWxwPSdSZWJhc2UgKG9yIGRvIG5vdCByZWJhc2UpIHRoZSBwdWxsLXJlcXVlc3Qgb24gdGhl IHNvdXJjZSBicmFuY2ggYmVmb3JlIHB1c2hpbmcnLAorICAgICAgICAgICAgYWN0aW9uPWFyZ3Vt ZW50cy5Ob0FjdGlvbiwKKyAgICAgICAgKQogCiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIGNy ZWF0ZV9jb21taXQoY2xzLCBhcmdzLCByZXBvc2l0b3J5LCAqKmt3YXJncyk6CkBAIC0xMDUsNiAr MTExLDEyIEBAIGNsYXNzIFB1bGxSZXF1ZXN0KENvbW1hbmQpOgogICAgICAgICAgICAgcmV0dXJu IHJlc3VsdAogCiAgICAgICAgIGJyYW5jaF9wb2ludCA9IGNscy5icmFuY2hfcG9pbnQoYXJncywg cmVwb3NpdG9yeSwgKiprd2FyZ3MpCisgICAgICAgIGlmIGFyZ3MucmViYXNlIG9yIChhcmdzLnJl YmFzZSBpcyBOb25lIGFuZCByZXBvc2l0b3J5LmNvbmZpZygpLmdldCgncHVsbC5yZWJhc2UnKSk6 CisgICAgICAgICAgICBsb2cud2FybmluZygiUmViYXNpbmcgJ3t9JyBvbiAne30nLi4uIi5mb3Jt YXQocmVwb3NpdG9yeS5icmFuY2gsIGJyYW5jaF9wb2ludC5icmFuY2gpKQorICAgICAgICAgICAg aWYgcmVwb3NpdG9yeS5wdWxsKHJlYmFzZT1UcnVlLCBicmFuY2g9YnJhbmNoX3BvaW50LmJyYW5j aCk6CisgICAgICAgICAgICAgICAgc3lzLnN0ZGVyci53cml0ZSgiRmFpbGVkIHRvIHJlYmFzZSAn e30nIG9uICd7fSwnIHBsZWFzZSByZXNvbHZlIGNvbmZsaWN0c1xuIi5mb3JtYXQocmVwb3NpdG9y eS5icmFuY2gsIGJyYW5jaF9wb2ludC5icmFuY2gpKQorICAgICAgICAgICAgICAgIHJldHVybiAx CisgICAgICAgICAgICBsb2cud2FybmluZygiUmViYXNlZCAne30nIG9uICd7fSEnIi5mb3JtYXQo cmVwb3NpdG9yeS5icmFuY2gsIGJyYW5jaF9wb2ludC5icmFuY2gpKQogCiAgICAgICAgIHJtdCA9 IHJlcG9zaXRvcnkucmVtb3RlKCkKICAgICAgICAgaWYgbm90IHJtdDoKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvcHVsbF9y ZXF1ZXN0X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvdGVzdC9wdWxsX3JlcXVlc3RfdW5pdHRlc3QucHkKaW5kZXggM2IwNmIxY2U1 MTllYWIxNzY0OGY3YTZkZDVkOWFjNWI2MDdjYTJkMC4uNTY4NjhhM2EzOTc3NWI3YzVhMzQ5NWU3 OTI3NzZiMzYyNmE3ZmZhYyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9wdWxsX3JlcXVlc3RfdW5pdHRlc3QucHkKKysrIGIv VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9wdWxs X3JlcXVlc3RfdW5pdHRlc3QucHkKQEAgLTE5NCw2ICsxOTQsOCBAQCBjbGFzcyBUZXN0RG9QdWxs UmVxdWVzdCh0ZXN0aW5nLlBhdGhUZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo Y2FwdHVyZWQucm9vdC5sb2cuZ2V0dmFsdWUoKSwgJycnQ3JlYXRpbmcgdGhlIGxvY2FsIGRldmVs b3BtZW50IGJyYW5jaCAnZW5nL3ByLWJyYW5jaCcuLi4KIENyZWF0aW5nIGNvbW1pdC4uLgogICAg IEZvdW5kIDEgY29tbWl0Li4uCitSZWJhc2luZyAnZW5nL3ByLWJyYW5jaCcgb24gJ21haW4nLi4u CitSZWJhc2VkICdlbmcvcHItYnJhbmNoJyBvbiAnbWFpbiEnCiAnJycpCiAgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWwoY2FwdHVyZWQuc3RkZXJyLmdldHZhbHVlKCksICIne30nIGRvZXNuJ3QgaGF2 ZSBhIHJlY29nbml6ZWQgcmVtb3RlXG4iLmZvcm1hdChzZWxmLnBhdGgpKQogCkBAIC0yMTMsNiAr MjE1LDggQEAgQ3JlYXRpbmcgY29tbWl0Li4uCiAgICAgQWRkaW5nIG1vZGlmaWVkLnR4dC4uLgog Q3JlYXRpbmcgY29tbWl0Li4uCiAgICAgRm91bmQgMSBjb21taXQuLi4KK1JlYmFzaW5nICdlbmcv cHItYnJhbmNoJyBvbiAnbWFpbicuLi4KK1JlYmFzZWQgJ2VuZy9wci1icmFuY2gnIG9uICdtYWlu IScKICcnJykKIAogICAgIGRlZiB0ZXN0X2dpdGh1YihzZWxmKToKQEAgLTIyOCwxMCArMjMyLDEy IEBAIENyZWF0aW5nIGNvbW1pdC4uLgogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNhcHR1cmVk LnN0ZGVyci5nZXR2YWx1ZSgpLCAnJykKICAgICAgICAgbG9nID0gY2FwdHVyZWQucm9vdC5sb2cu Z2V0dmFsdWUoKS5zcGxpdGxpbmVzKCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKLSAgICAg ICAgICAgIGxvZ1s6NF0gKyBsb2dbNyBpZiBzeXMudmVyc2lvbl9pbmZvID4gKDMsIDApIGVsc2Ug NTpdLCBbCisgICAgICAgICAgICBsb2dbOjZdICsgbG9nWzkgaWYgc3lzLnZlcnNpb25faW5mbyA+ ICgzLCAwKSBlbHNlIDc6XSwgWwogICAgICAgICAgICAgICAgICJDcmVhdGluZyB0aGUgbG9jYWwg ZGV2ZWxvcG1lbnQgYnJhbmNoICdlbmcvcHItYnJhbmNoJy4uLiIsCiAgICAgICAgICAgICAgICAg J0NyZWF0aW5nIGNvbW1pdC4uLicsCiAgICAgICAgICAgICAgICAgJyAgICBGb3VuZCAxIGNvbW1p dC4uLicsCisgICAgICAgICAgICAgICAgIlJlYmFzaW5nICdlbmcvcHItYnJhbmNoJyBvbiAnbWFp bicuLi4iLAorICAgICAgICAgICAgICAgICJSZWJhc2VkICdlbmcvcHItYnJhbmNoJyBvbiAnbWFp biEnIiwKICAgICAgICAgICAgICAgICAiUHVzaGluZyAnZW5nL3ByLWJyYW5jaCcgdG8gJ2Zvcmsn Li4uIiwKICAgICAgICAgICAgICAgICAiQ3JlYXRpbmcgcHVsbC1yZXF1ZXN0IGZvciAnZW5nL3By LWJyYW5jaCcuLi4iLAogICAgICAgICAgICAgICAgICJDcmVhdGVkICdQUiAxIHwgQ3JlYXRlZCBj b21taXQnISIsCkBAIC0yNTcsMTYgKzI2MywxOCBAQCBDcmVhdGluZyBjb21taXQuLi4KICAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbChjYXB0dXJlZC5zdGRlcnIuZ2V0dmFsdWUoKSwgJycpCiAgICAg ICAgIGxvZyA9IGNhcHR1cmVkLnJvb3QubG9nLmdldHZhbHVlKCkuc3BsaXRsaW5lcygpCiAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoCi0gICAgICAgICAgICBsb2dbOjNdICsgbG9nWzYgaWYgc3lz LnZlcnNpb25faW5mbyA+ICgzLCAwKSBlbHNlIDQ6XSwgWworICAgICAgICAgICAgbG9nWzo1XSAr IGxvZ1s4IGlmIHN5cy52ZXJzaW9uX2luZm8gPiAoMywgMCkgZWxzZSA2Ol0sIFsKICAgICAgICAg ICAgICAgICAiQW1lbmRpbmcgY29tbWl0Li4uIiwKICAgICAgICAgICAgICAgICAnICAgIEZvdW5k IDEgY29tbWl0Li4uJywKKyAgICAgICAgICAgICAgICAiUmViYXNpbmcgJ2VuZy9wci1icmFuY2gn IG9uICdtYWluJy4uLiIsCisgICAgICAgICAgICAgICAgIlJlYmFzZWQgJ2VuZy9wci1icmFuY2gn IG9uICdtYWluISciLAogICAgICAgICAgICAgICAgICJQdXNoaW5nICdlbmcvcHItYnJhbmNoJyB0 byAnZm9yaycuLi4iLAogICAgICAgICAgICAgICAgICJVcGRhdGluZyBwdWxsLXJlcXVlc3QgZm9y ICdlbmcvcHItYnJhbmNoJy4uLiIsCiAgICAgICAgICAgICAgICAgIlVwZGF0ZWQgJ1BSIDEgfCBB bWVuZGVkIGNvbW1pdCchIiwKICAgICAgICAgICAgIF0sCiAgICAgICAgICkKIAotICAgIGRlZiB0 ZXN0X3N0YXNoKHNlbGYpOgorICAgIGRlZiB0ZXN0X2JpdGJ1Y2tldChzZWxmKToKICAgICAgICAg d2l0aCBPdXRwdXRDYXB0dXJlKCkgYXMgY2FwdHVyZWQsIG1vY2tzLnJlbW90ZS5CaXRCdWNrZXQo KSBhcyByZW1vdGUsIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgsIHJlbW90ZT0nc3NoOi8vZ2l0 QHt9L3t9L3t9LmdpdCcuZm9ybWF0KAogICAgICAgICAgICAgcmVtb3RlLmhvc3RzWzBdLCByZW1v dGUucHJvamVjdC5zcGxpdCgnLycpWzFdLCByZW1vdGUucHJvamVjdC5zcGxpdCgnLycpWzNdLAog ICAgICAgICApKSBhcyByZXBvLCBtb2Nrcy5sb2NhbC5Tdm4oKToKQEAgLTI4MCwxNyArMjg4LDE5 IEBAIENyZWF0aW5nIGNvbW1pdC4uLgogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNhcHR1cmVk LnN0ZGVyci5nZXR2YWx1ZSgpLCAnJykKICAgICAgICAgbG9nID0gY2FwdHVyZWQucm9vdC5sb2cu Z2V0dmFsdWUoKS5zcGxpdGxpbmVzKCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKLSAgICAg ICAgICAgIGxvZ1s6NF0gKyBsb2dbNyBpZiBzeXMudmVyc2lvbl9pbmZvID4gKDMsIDApIGVsc2Ug NTpdLCBbCisgICAgICAgICAgICBsb2dbOjZdICsgbG9nWzkgaWYgc3lzLnZlcnNpb25faW5mbyA+ ICgzLCAwKSBlbHNlIDc6XSwgWwogICAgICAgICAgICAgICAgICJDcmVhdGluZyB0aGUgbG9jYWwg ZGV2ZWxvcG1lbnQgYnJhbmNoICdlbmcvcHItYnJhbmNoJy4uLiIsCiAgICAgICAgICAgICAgICAg J0NyZWF0aW5nIGNvbW1pdC4uLicsCiAgICAgICAgICAgICAgICAgJyAgICBGb3VuZCAxIGNvbW1p dC4uLicsCisgICAgICAgICAgICAgICAgIlJlYmFzaW5nICdlbmcvcHItYnJhbmNoJyBvbiAnbWFp bicuLi4iLAorICAgICAgICAgICAgICAgICJSZWJhc2VkICdlbmcvcHItYnJhbmNoJyBvbiAnbWFp biEnIiwKICAgICAgICAgICAgICAgICAiUHVzaGluZyAnZW5nL3ByLWJyYW5jaCcgdG8gJ29yaWdp bicuLi4iLAogICAgICAgICAgICAgICAgICJDcmVhdGluZyBwdWxsLXJlcXVlc3QgZm9yICdlbmcv cHItYnJhbmNoJy4uLiIsCiAgICAgICAgICAgICAgICAgIkNyZWF0ZWQgJ1BSIDEgfCBDcmVhdGVk IGNvbW1pdCchIiwKICAgICAgICAgICAgIF0sCiAgICAgICAgICkKIAotICAgIGRlZiB0ZXN0X3N0 YXNoX3VwZGF0ZShzZWxmKToKKyAgICBkZWYgdGVzdF9iaXRidWNrZXRfdXBkYXRlKHNlbGYpOgog ICAgICAgICB3aXRoIG1vY2tzLnJlbW90ZS5CaXRCdWNrZXQoKSBhcyByZW1vdGUsIG1vY2tzLmxv Y2FsLkdpdChzZWxmLnBhdGgsIHJlbW90ZT0nc3NoOi8vZ2l0QHt9L3t9L3t9LmdpdCcuZm9ybWF0 KAogICAgICAgICAgICAgcmVtb3RlLmhvc3RzWzBdLCByZW1vdGUucHJvamVjdC5zcGxpdCgnLycp WzFdLCByZW1vdGUucHJvamVjdC5zcGxpdCgnLycpWzNdLAogICAgICAgICApKSBhcyByZXBvLCBt b2Nrcy5sb2NhbC5Tdm4oKToKQEAgLTMxMSw5ICszMjEsMTEgQEAgQ3JlYXRpbmcgY29tbWl0Li4u CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY2FwdHVyZWQuc3RkZXJyLmdldHZhbHVlKCksICcn KQogICAgICAgICBsb2cgPSBjYXB0dXJlZC5yb290LmxvZy5nZXR2YWx1ZSgpLnNwbGl0bGluZXMo KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKAotICAgICAgICAgICAgbG9nWzozXSArIGxvZ1s2 IGlmIHN5cy52ZXJzaW9uX2luZm8gPiAoMywgMCkgZWxzZSA0Ol0sIFsKKyAgICAgICAgICAgIGxv Z1s6NV0gKyBsb2dbOCBpZiBzeXMudmVyc2lvbl9pbmZvID4gKDMsIDApIGVsc2UgNjpdLCBbCiAg ICAgICAgICAgICAgICAgIkFtZW5kaW5nIGNvbW1pdC4uLiIsCiAgICAgICAgICAgICAgICAgJyAg ICBGb3VuZCAxIGNvbW1pdC4uLicsCisgICAgICAgICAgICAgICAgIlJlYmFzaW5nICdlbmcvcHIt YnJhbmNoJyBvbiAnbWFpbicuLi4iLAorICAgICAgICAgICAgICAgICJSZWJhc2VkICdlbmcvcHIt YnJhbmNoJyBvbiAnbWFpbiEnIiwKICAgICAgICAgICAgICAgICAiUHVzaGluZyAnZW5nL3ByLWJy YW5jaCcgdG8gJ29yaWdpbicuLi4iLAogICAgICAgICAgICAgICAgICJVcGRhdGluZyBwdWxsLXJl cXVlc3QgZm9yICdlbmcvcHItYnJhbmNoJy4uLiIsCiAgICAgICAgICAgICAgICAgIlVwZGF0ZWQg J1BSIDEgfCBBbWVuZGVkIGNvbW1pdCchIiwKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3Qvc2V0dXBfZ2l0X3N2bl91bml0dGVz dC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rl c3Qvc2V0dXBfZ2l0X3N2bl91bml0dGVzdC5weQppbmRleCA4ZWVhZWQ0NDBhMzM1Y2EwMjQzMjU2 YTgyNmY0Mzg3MzgxNjNmNTkxLi42NmU3MjA3MGVhN2M2MDMyYmI0MzhkMmU2ZGZlNjAxYTBiMzky YzE0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJr aXRzY21weS90ZXN0L3NldHVwX2dpdF9zdm5fdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9zZXR1cF9naXRfc3ZuX3Vu aXR0ZXN0LnB5CkBAIC02OSw2ICs2OSw4IEBAIGNsYXNzIFRlc3RTZXR1cEdpdFN2bih0ZXN0aW5n LlBhdGhUZXN0Q2FzZSk6CiAgICAgICAgICAgICAgICAgJ1x0bG9nYWxscmVmdXBkYXRlcyA9IHRy dWVcbicKICAgICAgICAgICAgICAgICAnXHRpZ25vcmVjYXNlID0gdHJ1ZVxuJwogICAgICAgICAg ICAgICAgICdcdHByZWNvbXBvc2V1bmljb2RlID0gdHJ1ZVxuJworICAgICAgICAgICAgICAgICdb cHVsbF1cbicKKwkgICAgICAgICAgICAnXHRyZWJhc2UgPSB0cnVlXG4nCiAgICAgICAgICAgICAg ICAgJ1tyZW1vdGUgIm9yaWdpbiJdXG4nCiAgICAgICAgICAgICAgICAgJ1x0dXJsID0ge2dpdF9y ZW1vdGV9XG4nCiAgICAgICAgICAgICAgICAgJ1x0ZmV0Y2ggPSArcmVmcy9oZWFkcy8qOnJlZnMv cmVtb3Rlcy9vcmlnaW4vKlxuJwpAQCAtMTEzLDYgKzExNSw4IEBAIGNsYXNzIFRlc3RTZXR1cEdp dFN2bih0ZXN0aW5nLlBhdGhUZXN0Q2FzZSk6CiAgICAgICAgICAgICAgICAgJ1x0bG9nYWxscmVm dXBkYXRlcyA9IHRydWVcbicKICAgICAgICAgICAgICAgICAnXHRpZ25vcmVjYXNlID0gdHJ1ZVxu JwogICAgICAgICAgICAgICAgICdcdHByZWNvbXBvc2V1bmljb2RlID0gdHJ1ZVxuJworICAgICAg ICAgICAgICAgICdbcHVsbF1cbicKKwkgICAgICAgICAgICAnXHRyZWJhc2UgPSB0cnVlXG4nCiAg ICAgICAgICAgICAgICAgJ1tyZW1vdGUgIm9yaWdpbiJdXG4nCiAgICAgICAgICAgICAgICAgJ1x0 dXJsID0ge2dpdF9yZW1vdGV9XG4nCiAgICAgICAgICAgICAgICAgJ1x0ZmV0Y2ggPSArcmVmcy9o ZWFkcy8qOnJlZnMvcmVtb3Rlcy9vcmlnaW4vKlxuJwo= 437052 2021-09-01 12:19:38 -0700 2021-09-01 12:49:01 -0700 Patch bug-229625-20210901121938.patch text/plain 2774 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxODY2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODY5NzI0ODdiYWFiODdmMGIzZmZjYzgyNmUyNjMwZjk1 NjVmMDU1ZS4uODY0OTZkMjg5MTJkNDY4MWE1MTkxYjg5YmVkNGE2OTcxMGNiZGQ3YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDIxLTA5LTAxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbZ2l0LXdlYmtpdF0gQXV0b21hdGljIHJlYmFzaW5nIG9yIHB1bGwtcmVxdWVzdHMg KEZvbGxvdy11cCBmaXguKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI5NjI1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84MjQ1MTAzMD4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5OiBCdW1wIHZlcnNpb24uCisgICAgICAgICogU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHk6IERpdHRv LgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xv Y2FsL2dpdC5weToKKyAgICAgICAgKEdpdC5wdWxsKTogU2V0IGNvbW1pdCBmb3IgZ2l0LXN2biBj aGVja291dHMuCisKIDIwMjEtMDktMDEgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUu Y29tPgogCiAgICAgICAgIFtnaXQtd2Via2l0XSBBZGQgYXV0b21hdGljIEVkaXRvciBjb25maWd1 cmF0aW9uCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9z ZXR1cC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5Cmlu ZGV4IDkyNTIzOGY4N2E4YmRlZTZiMmFhNmI3Mzc0MzBkNDcwN2I4ZDY4NTUuLjFjMDVmZjZjODQ0 YzE0Y2IwYjhlMjAyNDZkN2Q2ZTgwNDc2Mjk2MGYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5CkBAIC0yOSw3ICsyOSw3IEBAIGRlZiByZWFkbWUoKToK IAogc2V0dXAoCiAgICAgbmFtZT0nd2Via2l0c2NtcHknLAotICAgIHZlcnNpb249JzIuMS4wJywK KyAgICB2ZXJzaW9uPScyLjEuMScsCiAgICAgZGVzY3JpcHRpb249J0xpYnJhcnkgZGVzaWduZWQg dG8gaW50ZXJhY3Qgd2l0aCBnaXQgYW5kIHN2biByZXBvc2l0b3JpZXMuJywKICAgICBsb25nX2Rl c2NyaXB0aW9uPXJlYWRtZSgpLAogICAgIGNsYXNzaWZpZXJzPVsKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5IGIv VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18u cHkKaW5kZXggN2I0MjQ5NjliZWNmZmYyNjA5OGQ2MTcxMDc0ZDg5NmM1ZmQxM2QxYi4uNDM0OTcx MjhhNTMzNmJjODI1Y2IyNWQwZmYwNDcwODA4YmY4MDY5NyAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkKKysrIGIv VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18u cHkKQEAgLTQ2LDcgKzQ2LDcgQEAgZXhjZXB0IEltcG9ydEVycm9yOgogICAgICAgICAiUGxlYXNl IGluc3RhbGwgd2Via2l0Y29yZXB5IHdpdGggYHBpcCBpbnN0YWxsIHdlYmtpdGNvcmVweSAtLWV4 dHJhLWluZGV4LXVybCA8cGFja2FnZSBpbmRleCBVUkw+YCIKICAgICApCiAKLXZlcnNpb24gPSBW ZXJzaW9uKDIsIDEsIDApCit2ZXJzaW9uID0gVmVyc2lvbigyLCAxLCAxKQogCiBBdXRvSW5zdGFs bC5yZWdpc3RlcihQYWNrYWdlKCdmYXN0ZW5lcnMnLCBWZXJzaW9uKDAsIDE1LCAwKSkpCiBBdXRv SW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdtb25vdG9uaWMnLCBWZXJzaW9uKDEsIDUpKSkKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L2xvY2FsL2dpdC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L2xvY2FsL2dpdC5weQppbmRleCBlZjEzOTU4N2Y3MzE2N2JkYTBmMjRhZTBhZTg1OWE2 NGUzYWJkNTczLi4zNTQyYjY2Y2I3MDg0ZjBmMWI5MzE4YzdjMGZiNDQ0MzdlODYwN2Q1IDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9s b2NhbC9naXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvbG9jYWwvZ2l0LnB5CkBAIC03NzIsNiArNzcyLDcgQEAgY2xhc3MgR2l0KFNjbSk6 CiAgICAgICAgICkucmV0dXJuY29kZSBlbHNlIHNlbGYuY29tbWl0KCkKIAogICAgIGRlZiBwdWxs KHNlbGYsIHJlYmFzZT1Ob25lLCBicmFuY2g9Tm9uZSk6CisgICAgICAgIGNvbW1pdCA9IHNlbGYu Y29tbWl0IGlmIHNlbGYuaXNfc3ZuIGVsc2UgTm9uZQogICAgICAgICBjb2RlID0gcnVuKAogICAg ICAgICAgICAgW3NlbGYuZXhlY3V0YWJsZSgpLCAncHVsbCddICsgKAogICAgICAgICAgICAgICAg IFsnb3JpZ2luJywgYnJhbmNoXSBpZiBicmFuY2ggZWxzZSBbXQo= 437055 2021-09-01 12:46:49 -0700 2021-09-01 13:22:26 -0700 Patch bug-229625-20210901124648.patch text/plain 2776 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxODY2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODY5NzI0ODdiYWFiODdmMGIzZmZjYzgyNmUyNjMwZjk1 NjVmMDU1ZS4uODY0OTZkMjg5MTJkNDY4MWE1MTkxYjg5YmVkNGE2OTcxMGNiZGQ3YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDIxLTA5LTAxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbZ2l0LXdlYmtpdF0gQXV0b21hdGljIHJlYmFzaW5nIG9yIHB1bGwtcmVxdWVzdHMg KEZvbGxvdy11cCBmaXguKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI5NjI1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84MjQ1MTAzMD4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5OiBCdW1wIHZlcnNpb24uCisgICAgICAgICogU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHk6IERpdHRv LgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xv Y2FsL2dpdC5weToKKyAgICAgICAgKEdpdC5wdWxsKTogU2V0IGNvbW1pdCBmb3IgZ2l0LXN2biBj aGVja291dHMuCisKIDIwMjEtMDktMDEgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUu Y29tPgogCiAgICAgICAgIFtnaXQtd2Via2l0XSBBZGQgYXV0b21hdGljIEVkaXRvciBjb25maWd1 cmF0aW9uCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9z ZXR1cC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5Cmlu ZGV4IDkyNTIzOGY4N2E4YmRlZTZiMmFhNmI3Mzc0MzBkNDcwN2I4ZDY4NTUuLjFjMDVmZjZjODQ0 YzE0Y2IwYjhlMjAyNDZkN2Q2ZTgwNDc2Mjk2MGYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5CkBAIC0yOSw3ICsyOSw3IEBAIGRlZiByZWFkbWUoKToK IAogc2V0dXAoCiAgICAgbmFtZT0nd2Via2l0c2NtcHknLAotICAgIHZlcnNpb249JzIuMS4wJywK KyAgICB2ZXJzaW9uPScyLjEuMScsCiAgICAgZGVzY3JpcHRpb249J0xpYnJhcnkgZGVzaWduZWQg dG8gaW50ZXJhY3Qgd2l0aCBnaXQgYW5kIHN2biByZXBvc2l0b3JpZXMuJywKICAgICBsb25nX2Rl c2NyaXB0aW9uPXJlYWRtZSgpLAogICAgIGNsYXNzaWZpZXJzPVsKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5IGIv VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18u cHkKaW5kZXggN2I0MjQ5NjliZWNmZmYyNjA5OGQ2MTcxMDc0ZDg5NmM1ZmQxM2QxYi4uNDM0OTcx MjhhNTMzNmJjODI1Y2IyNWQwZmYwNDcwODA4YmY4MDY5NyAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkKKysrIGIv VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18u cHkKQEAgLTQ2LDcgKzQ2LDcgQEAgZXhjZXB0IEltcG9ydEVycm9yOgogICAgICAgICAiUGxlYXNl IGluc3RhbGwgd2Via2l0Y29yZXB5IHdpdGggYHBpcCBpbnN0YWxsIHdlYmtpdGNvcmVweSAtLWV4 dHJhLWluZGV4LXVybCA8cGFja2FnZSBpbmRleCBVUkw+YCIKICAgICApCiAKLXZlcnNpb24gPSBW ZXJzaW9uKDIsIDEsIDApCit2ZXJzaW9uID0gVmVyc2lvbigyLCAxLCAxKQogCiBBdXRvSW5zdGFs bC5yZWdpc3RlcihQYWNrYWdlKCdmYXN0ZW5lcnMnLCBWZXJzaW9uKDAsIDE1LCAwKSkpCiBBdXRv SW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdtb25vdG9uaWMnLCBWZXJzaW9uKDEsIDUpKSkKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L2xvY2FsL2dpdC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L2xvY2FsL2dpdC5weQppbmRleCBlZjEzOTU4N2Y3MzE2N2JkYTBmMjRhZTBhZTg1OWE2 NGUzYWJkNTczLi5hMDIzYzgzZGIwMzZhOTE5MGIwOGY1NjBhNDZhODliNmI5MGE0MTM5IDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9s b2NhbC9naXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvbG9jYWwvZ2l0LnB5CkBAIC03NzIsNiArNzcyLDcgQEAgY2xhc3MgR2l0KFNjbSk6 CiAgICAgICAgICkucmV0dXJuY29kZSBlbHNlIHNlbGYuY29tbWl0KCkKIAogICAgIGRlZiBwdWxs KHNlbGYsIHJlYmFzZT1Ob25lLCBicmFuY2g9Tm9uZSk6CisgICAgICAgIGNvbW1pdCA9IHNlbGYu Y29tbWl0KCkgaWYgc2VsZi5pc19zdm4gZWxzZSBOb25lCiAgICAgICAgIGNvZGUgPSBydW4oCiAg ICAgICAgICAgICBbc2VsZi5leGVjdXRhYmxlKCksICdwdWxsJ10gKyAoCiAgICAgICAgICAgICAg ICAgWydvcmlnaW4nLCBicmFuY2hdIGlmIGJyYW5jaCBlbHNlIFtdCg==