231345 2021-10-06 17:37:53 -0700 [webkitscmpy] Allow repositories to define custom setup commands 2021-10-18 10:14:58 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=231023 InRadar P2 Normal --- 1 jbedard jbedard dewei_zhu slewis webkit-bug-importer ysuzuki oldest_to_newest 1801449 0 jbedard 2021-10-06 17:37:53 -0700 Repositories may need to define custom setup commands, for example, WebKit can automatically resolve rebase conflicts in ChangeLogs. 1801450 1 webkit-bug-importer 2021-10-06 17:39:14 -0700 <rdar://problem/83960249> 1801452 2 440458 jbedard 2021-10-06 17:40:49 -0700 Created attachment 440458 Patch 1804905 3 jbedard 2021-10-15 10:55:05 -0700 PR: https://github.com/WebKit/WebKit/pull/15 1804906 4 441403 jbedard 2021-10-15 10:56:56 -0700 Created attachment 441403 Patch 1805089 5 jbedard 2021-10-15 15:51:50 -0700 Committed r284283 (243086@main): <https://commits.webkit.org/243086@main> 1805100 6 jbedard 2021-10-15 16:07:49 -0700 *** Bug 231713 has been marked as a duplicate of this bug. *** 1805619 7 jbedard 2021-10-18 09:36:16 -0700 Reopening to attach new patch. 1805620 8 441616 jbedard 2021-10-18 09:36:18 -0700 Created attachment 441616 Patch for landing 1805633 9 ews-feeder 2021-10-18 10:14:56 -0700 Committed r284378 (243162@main): <https://commits.webkit.org/243162@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 441616. 440458 2021-10-06 17:40:49 -0700 2021-10-15 10:56:54 -0700 Patch bug-231345-20211006174048.patch text/plain 8711 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNjc4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTI2ODcyMGE5MjRmNjJhMTUxZTA1NzU2MzNkNjNkYzli ZThiZDE5MS4uMDVkZGEzNzc1ZWMzM2FmMGUzYjk4NTdkMDE2NTY4Zjk5NzEzYmEyMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDIxLTEwLTA2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIEFsbG93IHJlcG9zaXRvcmllcyB0byBkZWZpbmUgY3VzdG9t IHNldHVwIGNvbW1hbmRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMzEzNDUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgzOTYwMjQ5PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9naXQt d2Via2l0OiBEZWZpbmUgY2hhbmdlbG9nIGNvbmZsaWN0IHJlc29sdmVyLgorICAgICAgICAqIFNj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5OiBBZGQgaW5zcGVjdDIgYXMgZGVw ZW5kZW5jeS4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS9fX2luaXRfXy5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9fX2luaXRfXy5weToKKyAgICAgICAgKG1haW4p OiBBdHRlbXB0IHRvIHJlc29sdmUgYWRkaXRpb25hbF9zZXR1cCBmdW5jdGlvbi4KKyAgICAgICAg KiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9wcm9ncmFtL3NldHVw LnB5OgorICAgICAgICAoU2V0dXAuZ2l0aHViKTogSW52b2tlIGFkZGl0aW9uYWxfc2V0dXAgZnVu Y3Rpb24sIGlmIGl0IGV4aXN0cy4KKyAgICAgICAgKFNldHVwLmdpdCk6IERpdHRvLgorCiAyMDIx LTEwLTA2ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAg IE1vdmUgRmx1c2hJZGVudGlmaWVyIG91dCBvZiB0aGUgRGlzcGxheUxpc3QgbmFtZXNwYWNlCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2dpdC13ZWJraXQgYi9Ub29scy9TY3JpcHRzL2dpdC13 ZWJraXQKaW5kZXggZjM2NjU4YTllNjBlZWMxNDg3MmVlNWYxNjI5YzFmMGRhZDcyYmEzMy4uMGMx MmFkYjczNjFmYTBlNjdhNGIwNDk2MzhiMzdmM2Q2ZjJmYWIwMCAxMDA3NTUKLS0tIGEvVG9vbHMv U2NyaXB0cy9naXQtd2Via2l0CisrKyBiL1Rvb2xzL1NjcmlwdHMvZ2l0LXdlYmtpdApAQCAtMjYs NyArMjYsOCBAQCBpbXBvcnQgb3MKIGltcG9ydCBzeXMKIAogZnJvbSB3ZWJraXRweS5jb21tb24u Y29uZmlnLmNvbW1pdHRlcnMgaW1wb3J0IENvbW1pdHRlckxpc3QKLWZyb20gd2Via2l0c2NtcHkg aW1wb3J0IGxvY2FsLCBwcm9ncmFtLCByZW1vdGUsIENvbnRyaWJ1dG9yCitmcm9tIHdlYmtpdGNv cmVweSBpbXBvcnQgcnVuCitmcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBsb2NhbCwgcHJvZ3JhbSwg cmVtb3RlLCBDb250cmlidXRvciwgbG9nCiAKIAogZGVmIGlzX3dlYmtpdF9maWx0ZXIodG9fcmV0 dXJuKToKQEAgLTQ1LDYgKzQ2LDI1IEBAIGRlZiBpc193ZWJraXRfZmlsdGVyKHRvX3JldHVybik6 CiAgICAgcmV0dXJuIGNhbGxiYWNrCiAKIAorZGVmIGFkZGl0aW9uYWxfc2V0dXAoYXJncywgcmVw b3NpdG9yeSk6CisgICAgaWYgbm90IGlzaW5zdGFuY2UocmVwb3NpdG9yeSwgbG9jYWwuR2l0KToK KyAgICAgICAgcmV0dXJuIDAKKworICAgIGxvZy53YXJuaW5nKCdTZXR0aW5nIG1lcmdpbmcgYmVo YXZpb3IgZm9yIGNoYW5nZWxvZ3MuLi4nKQorICAgIGlmIHJ1bihbCisgICAgICAgIHJlcG9zaXRv cnkuZXhlY3V0YWJsZSgpLAorICAgICAgICAnY29uZmlnJywgJ21lcmdlLmNoYW5nZWxvZy5kcml2 ZXInLAorICAgICAgICAncGVybCB7fSAtLWZpeC1tZXJnZWQgLS1tZXJnZS1kcml2ZXIgJU8gJUEg JUInLmZvcm1hdChvcy5wYXRoLmpvaW4oCisgICAgICAgICAgICBvcy5wYXRoLmRpcm5hbWUob3Mu cGF0aC5kaXJuYW1lKG9zLnBhdGguZGlybmFtZShvcy5wYXRoLmRpcm5hbWUoX19maWxlX18pKSkp LAorICAgICAgICAgICAgJ09wZW5Tb3VyY2UnLCAnVG9vbHMnLCAnU2NyaXB0cycsICdyZXNvbHZl LUNoYW5nZUxvZ3MnLAorICAgICAgICApKSwKKyAgICBdLCBjYXB0dXJlX291dHB1dD1UcnVlLCBj d2Q9cmVwb3NpdG9yeS5yb290X3BhdGgpLnJldHVybmNvZGU6CisgICAgICAgIHN5cy5zdGRlcnIu d3JpdGUoJ0ZhaWxlZCB0byBzZXQgdGhlIGdpdCBtZXJnaW5nIGJlaGFpdm9yIGZvciBjaGFuZ2Vs b2dzLi4uXG4nKQorICAgICAgICByZXR1cm4gMQorICAgIGxvZy53YXJuaW5nKCdTZXQgbWVyZ2lu ZyBiZWhhdmlvciBmb3IgY2hhbmdlbG9ncyEnKQorICAgIHJldHVybiAwCisKKwogaWYgJ19fbWFp bl9fJyA9PSBfX25hbWVfXzoKICAgICBjb250cmlidXRvcnMgPSBDb250cmlidXRvci5NYXBwaW5n KCkKICAgICBmb3IgY29udHJpYnV0b3IgaW4gQ29tbWl0dGVyTGlzdCgpLmNvbnRyaWJ1dG9ycygp OgpAQCAtNjMsNSArODMsNiBAQCBpZiAnX19tYWluX18nID09IF9fbmFtZV9fOgogICAgICAgICBj b250cmlidXRvcnM9aXNfd2Via2l0X2ZpbHRlcihjb250cmlidXRvcnMpLAogICAgICAgICBpZGVu dGlmaWVyX3RlbXBsYXRlPWlzX3dlYmtpdF9maWx0ZXIoJ0Nhbm9uaWNhbCBsaW5rOiBodHRwczov L2NvbW1pdHMud2Via2l0Lm9yZy97fScpLAogICAgICAgICBzdWJ2ZXJzaW9uPWlzX3dlYmtpdF9m aWx0ZXIoJ2h0dHBzOi8vc3ZuLndlYmtpdC5vcmcvcmVwb3NpdG9yeS93ZWJraXQnKSwKKyAgICAg ICAgYWRkaXRpb25hbF9zZXR1cD1pc193ZWJraXRfZmlsdGVyKGFkZGl0aW9uYWxfc2V0dXApLAog ICAgICkpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3NldHVwLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkK aW5kZXggM2Q5NTM1MjIwNTAyYzEyMTA3N2JmOGI5ZjE5OTExNmVlZDljN2Y1OC4uNWI5ODNjYjhk MTk0NGZjNTExMTJjYzBlZjE5MzIzY2MzYzg0NmM3MSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkKQEAgLTU4LDcgKzU4LDcgQEAgc2V0dXAoCiAgICAg ICAgICd3ZWJraXRzY21weS50ZXN0JywKICAgICBdLAogICAgIHNjcmlwdHM9WydnaXQtd2Via2l0 J10sCi0gICAgaW5zdGFsbF9yZXF1aXJlcz1bJ2Zhc3RlbmVycycsICdtb25vdG9uaWMnLCAnd2Vi a2l0Y29yZXB5JywgJ3htbHRvZGljdCddLAorICAgIGluc3RhbGxfcmVxdWlyZXM9WydmYXN0ZW5l cnMnLCAnaW5zcGVjdDInLCAnbW9ub3RvbmljJywgJ3dlYmtpdGNvcmVweScsICd4bWx0b2RpY3Qn XSwKICAgICBpbmNsdWRlX3BhY2thZ2VfZGF0YT1UcnVlLAogICAgIHppcF9zYWZlPUZhbHNlLAog KQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvX19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS9fX2luaXRfXy5weQppbmRleCAxYTZmZWQ0YzdjNjllODQyNDFjMjMzZjlkNTY1 OThmNDM5ZGQzZDJmLi4zMTNjNDAzYWNkNmY1YzJlM2EzOGRhMTVkYzU5OWY2OGVhNTFiZjQxIDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS9fX2luaXRfXy5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS9fX2luaXRfXy5weQpAQCAtNTMsNiArNTMsOSBAQCBBdXRvSW5zdGFsbC5yZWdp c3RlcihQYWNrYWdlKCdtb25vdG9uaWMnLCBWZXJzaW9uKDEsIDUpKSkKIEF1dG9JbnN0YWxsLnJl Z2lzdGVyKFBhY2thZ2UoJ3doaWNoY3JhZnQnLCBWZXJzaW9uKDAsIDYsIDEpKSkKIEF1dG9JbnN0 YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3htbHRvZGljdCcsIFZlcnNpb24oMCwgMTEsIDApKSkKIAor aWYgc3lzLnZlcnNpb25faW5mbyA8ICgzLCAwKToKKyAgICBBdXRvSW5zdGFsbC5yZWdpc3RlcihQ YWNrYWdlKCdpbnNwZWN0MicsIFZlcnNpb24oMCwgMSwgMikpKQorCiBmcm9tIHdlYmtpdHNjbXB5 LmNvbnRyaWJ1dG9yIGltcG9ydCBDb250cmlidXRvcgogZnJvbSB3ZWJraXRzY21weS5jb21taXQg aW1wb3J0IENvbW1pdAogZnJvbSB3ZWJraXRzY21weS5wdWxsX3JlcXVlc3QgaW1wb3J0IFB1bGxS ZXF1ZXN0CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS9wcm9ncmFtL19faW5pdF9fLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9fX2luaXRfXy5weQppbmRleCA3MzcyMGU4 ODY3ODdiYThlMTI2MzUxMjIxYTM5NGZkY2FkOWUwN2YxLi41MDgxNmJlYzRiMTMwNzUwYzQyNDdh YTFkNGNiZmJiOWVlNzA1ZjQxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS9wcm9ncmFtL19faW5pdF9fLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vX19pbml0X18u cHkKQEAgLTQyLDcgKzQyLDEwIEBAIGZyb20gd2Via2l0Y29yZXB5IGltcG9ydCBhcmd1bWVudHMs IGxvZyBhcyB3ZWJraXRjb3JlcHlfbG9nCiBmcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBsb2NhbCwg bG9nLCByZW1vdGUKIAogCi1kZWYgbWFpbihhcmdzPU5vbmUsIHBhdGg9Tm9uZSwgbG9nZ2Vycz1O b25lLCBjb250cmlidXRvcnM9Tm9uZSwgaWRlbnRpZmllcl90ZW1wbGF0ZT1Ob25lLCBzdWJ2ZXJz aW9uPU5vbmUpOgorZGVmIG1haW4oCisgICAgYXJncz1Ob25lLCBwYXRoPU5vbmUsIGxvZ2dlcnM9 Tm9uZSwgY29udHJpYnV0b3JzPU5vbmUsCisgICAgaWRlbnRpZmllcl90ZW1wbGF0ZT1Ob25lLCBz dWJ2ZXJzaW9uPU5vbmUsIGFkZGl0aW9uYWxfc2V0dXA9Tm9uZSwKKyk6CiAgICAgbG9nZ2luZy5i YXNpY0NvbmZpZyhsZXZlbD1sb2dnaW5nLldBUk5JTkcpCiAKICAgICBsb2dnZXJzID0gW2xvZ2dp bmcuZ2V0TG9nZ2VyKCksIHdlYmtpdGNvcmVweV9sb2csICBsb2ddICsgKGxvZ2dlcnMgb3IgW10p CkBAIC0xMTAsNiArMTEzLDEzIEBAIGRlZiBtYWluKGFyZ3M9Tm9uZSwgcGF0aD1Ob25lLCBsb2dn ZXJzPU5vbmUsIGNvbnRyaWJ1dG9ycz1Ob25lLCBpZGVudGlmaWVyX3RlbXBsCiAgICAgaWYgY2Fs bGFibGUoc3VidmVyc2lvbik6CiAgICAgICAgIHN1YnZlcnNpb24gPSBzdWJ2ZXJzaW9uKHJlcG9z aXRvcnkpCiAKKyAgICBpZiBzeXMudmVyc2lvbl9pbmZvID4gKDMsIDApOgorICAgICAgICBpbXBv cnQgaW5zcGVjdAorICAgIGVsc2U6CisgICAgICAgIGltcG9ydCBpbnNwZWN0MiBhcyBpbnNwZWN0 CisgICAgaWYgY2FsbGFibGUoYWRkaXRpb25hbF9zZXR1cCkgYW5kIGxpc3QoaW5zcGVjdC5zaWdu YXR1cmUoYWRkaXRpb25hbF9zZXR1cCkucGFyYW1ldGVycy5rZXlzKCkpID09IFsncmVwb3NpdG9y eSddOgorICAgICAgICBhZGRpdGlvbmFsX3NldHVwID0gYWRkaXRpb25hbF9zZXR1cChyZXBvc2l0 b3J5KQorCiAgICAgaWYgbm90IGdldGF0dHIocGFyc2VkLCAnbWFpbicsIE5vbmUpOgogICAgICAg ICBwYXJzZXIucHJpbnRfaGVscCgpCiAgICAgICAgIHJldHVybiAtMQpAQCAtMTE5LDQgKzEyOSw1 IEBAIGRlZiBtYWluKGFyZ3M9Tm9uZSwgcGF0aD1Ob25lLCBsb2dnZXJzPU5vbmUsIGNvbnRyaWJ1 dG9ycz1Ob25lLCBpZGVudGlmaWVyX3RlbXBsCiAgICAgICAgIHJlcG9zaXRvcnk9cmVwb3NpdG9y eSwKICAgICAgICAgaWRlbnRpZmllcl90ZW1wbGF0ZT1pZGVudGlmaWVyX3RlbXBsYXRlLAogICAg ICAgICBzdWJ2ZXJzaW9uPXN1YnZlcnNpb24sCisgICAgICAgIGFkZGl0aW9uYWxfc2V0dXA9YWRk aXRpb25hbF9zZXR1cCwKICAgICApCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS9wcm9ncmFtL3NldHVwLnB5IGIvVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9zZXR1cC5weQppbmRl eCA2YzgxMTMyODhmNGFjN2Y4NTJhYWEzMzcyNmY2ZGEwNGY4MjlhNDE0Li5lZWQwY2VkZWZjMzMz YTA5Y2NkZjQ0NzFjOGEzN2ViNDliNGJiMWUxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9wcm9ncmFtL3NldHVwLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vc2V0 dXAucHkKQEAgLTM0LDExICszNCwxNiBAQCBjbGFzcyBTZXR1cChDb21tYW5kKToKICAgICBoZWxw ID0gJ0NvbmZpZ3VyZSBsb2NhbCBzZXR0aW5ncyBmb3IgdGhlIGN1cnJlbnQgcmVwb3NpdG9yeScK IAogICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBnaXRodWIoY2xzLCBhcmdzLCByZXBvc2l0b3J5 LCAqKmt3YXJncyk6CisgICAgZGVmIGdpdGh1YihjbHMsIGFyZ3MsIHJlcG9zaXRvcnksIGFkZGl0 aW9uYWxfc2V0dXA9Tm9uZSwgKiprd2FyZ3MpOgogICAgICAgICBsb2cud2FybmluZygnU2F2aW5n IEdpdEh1YiBjcmVkZW50aWFscyBpbiBzeXN0ZW0gY3JlZGVudGlhbCBzdG9yZS4uLicpCiAgICAg ICAgIHVzZXJuYW1lLCBhY2Nlc3NfdG9rZW4gPSByZXBvc2l0b3J5LmNyZWRlbnRpYWxzKHJlcXVp cmVkPVRydWUpCiAgICAgICAgIGxvZy53YXJuaW5nKCdHaXRIdWIgY3JlZGVudGlhbHMgc2F2ZWQg dmlhIEtleXJpbmchJykKIAorICAgICAgICAjIEFueSBhZGRpdGlvbmFsIHNldHVwIHBhc3NlZCB0 byBtYWluCisgICAgICAgIHJlc3VsdCA9IDAKKyAgICAgICAgaWYgYWRkaXRpb25hbF9zZXR1cDoK KyAgICAgICAgICAgIHJlc3VsdCArPSBhZGRpdGlvbmFsX3NldHVwKGFyZ3MsIHJlcG9zaXRvcnkp CisKICAgICAgICAgbG9nLndhcm5pbmcoJ1ZlcmlmeWluZyB1c2VyIG93bmVkIGZvcmsuLi4nKQog ICAgICAgICBhdXRoID0gSFRUUEJhc2ljQXV0aCh1c2VybmFtZSwgYWNjZXNzX3Rva2VuKQogICAg ICAgICByZXNwb25zZSA9IHJlcXVlc3RzLmdldCgne30vcmVwb3Mve30ve30nLmZvcm1hdCgKQEAg LTQ4LDcgKzUzLDcgQEAgY2xhc3MgU2V0dXAoQ29tbWFuZCk6CiAgICAgICAgICksIGF1dGg9YXV0 aCwgaGVhZGVycz1kaWN0KEFjY2VwdD0nYXBwbGljYXRpb24vdm5kLmdpdGh1Yi52Mytqc29uJykp CiAgICAgICAgIGlmIHJlc3BvbnNlLnN0YXR1c19jb2RlID09IDIwMDoKICAgICAgICAgICAgIGxv Zy53YXJuaW5nKCJVc2VyIGFscmVhZHkgb3ducyBhIGZvcmsgb2YgJ3t9JyEiLmZvcm1hdChyZXBv c2l0b3J5Lm5hbWUpKQotICAgICAgICAgICAgcmV0dXJuIDAKKyAgICAgICAgICAgIHJldHVybiBy ZXN1bHQKIAogICAgICAgICBpZiByZXBvc2l0b3J5Lm93bmVyID09IHVzZXJuYW1lIG9yIGFyZ3Mu ZGVmYXVsdHMgb3IgVGVybWluYWwuY2hvb3NlKAogICAgICAgICAgICAgIkNyZWF0ZSBhIHByaXZh dGUgZm9yayBvZiAne30nIGJlbG9uZ2luZyB0byAne30nIi5mb3JtYXQocmVwb3NpdG9yeS5uYW1l LCB1c2VybmFtZSksCkBAIC03MCwxMCArNzUsMTAgQEAgY2xhc3MgU2V0dXAoQ29tbWFuZCk6CiAg ICAgICAgICAgICBzeXMuc3RkZXJyLndyaXRlKCJGYWlsZWQgdG8gY3JlYXRlIGEgZm9yayBvZiAn e30nIGJlbG9uZ2luZyB0byAne30nXG4iLmZvcm1hdChyZXBvc2l0b3J5Lm5hbWUsIHVzZXJuYW1l KSkKICAgICAgICAgICAgIHJldHVybiAxCiAgICAgICAgIGxvZy53YXJuaW5nKCJDcmVhdGVkIGEg cHJpdmF0ZSBmb3JrIG9mICd7fScgYmVsb25naW5nIHRvICd7fSchIi5mb3JtYXQocmVwb3NpdG9y eS5uYW1lLCB1c2VybmFtZSkpCi0gICAgICAgIHJldHVybiAwCisgICAgICAgIHJldHVybiByZXN1 bHQKIAogICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBnaXQoY2xzLCBhcmdzLCByZXBvc2l0b3J5 LCAqKmt3YXJncyk6CisgICAgZGVmIGdpdChjbHMsIGFyZ3MsIHJlcG9zaXRvcnksIGFkZGl0aW9u YWxfc2V0dXA9Tm9uZSwgKiprd2FyZ3MpOgogICAgICAgICBnbG9iYWxfY29uZmlnID0gbG9jYWwu R2l0LmNvbmZpZygpCiAgICAgICAgIHJlc3VsdCA9IDAKIApAQCAtMTYwLDYgKzE2NSwxMCBAQCBj bGFzcyBTZXR1cChDb21tYW5kKToKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIGxvZy53YXJu aW5nKCJTZXQgZ2l0IGVkaXRvciB0byAne30nIi5mb3JtYXQoZWRpdG9yX25hbWUpKQogCisgICAg ICAgICMgQW55IGFkZGl0aW9uYWwgc2V0dXAgcGFzc2VkIHRvIG1haW4KKyAgICAgICAgaWYgYWRk aXRpb25hbF9zZXR1cDoKKyAgICAgICAgICAgIHJlc3VsdCArPSBhZGRpdGlvbmFsX3NldHVwKGFy Z3MsIHJlcG9zaXRvcnkpCisKICAgICAgICAgIyBPbmx5IGNvbmZpZ3VyZSBHaXRIdWIgaWYgdGhl IFVSTCBpcyBhIEdpdEh1YiBVUkwKICAgICAgICAgcm10ID0gcmVwb3NpdG9yeS5yZW1vdGUoKQog ICAgICAgICBpZiBub3QgaXNpbnN0YW5jZShybXQsIHJlbW90ZS5HaXRIdWIpOgo= 441403 2021-10-15 10:56:56 -0700 2021-10-15 17:10:04 -0700 Patch bug-231345-20211015105655.patch text/plain 8546 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MjU1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODFmYTIzMTVjMjc5NjBlZmJiYWUyYWFkYTQ1MWZhNDNm NzBhYWE4OS4uNGNkYTI0MmFmZmYwZjJjMWY3NzdhOWY5Y2MyNWIyMjE0YTZhNTUzOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDIxLTEwLTE1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIEFsbG93IHJlcG9zaXRvcmllcyB0byBkZWZpbmUgY3VzdG9t IHNldHVwIGNvbW1hbmRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMzEzNDUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgzOTYwMjQ5PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9naXQt d2Via2l0OiBEZWZpbmUgY2hhbmdlbG9nIGNvbmZsaWN0IHJlc29sdmVyLgorICAgICAgICAqIFNj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5OiBBZGQgaW5zcGVjdDIgYXMgZGVw ZW5kZW5jeS4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS9fX2luaXRfXy5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9fX2luaXRfXy5weToKKyAgICAgICAgKG1haW4p OiBBdHRlbXB0IHRvIHJlc29sdmUgYWRkaXRpb25hbF9zZXR1cCBmdW5jdGlvbi4KKyAgICAgICAg KiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9wcm9ncmFtL3NldHVw LnB5OgorICAgICAgICAoU2V0dXAuZ2l0aHViKTogSW52b2tlIGFkZGl0aW9uYWxfc2V0dXAgZnVu Y3Rpb24sIGlmIGl0IGV4aXN0cy4KKyAgICAgICAgKFNldHVwLmdpdCk6IERpdHRvLgorCiAyMDIx LTEwLTE0ICBKb2huIFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFRl c3RXZWJLaXRBUEkuUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQuRnJhdWRQcmV2ZW50aW9uIGlzIGEg Y29uc3RhbnQgdGltZW91dApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9naXQtd2Via2l0IGIv VG9vbHMvU2NyaXB0cy9naXQtd2Via2l0CmluZGV4IDE5NDUxMWUxMWUwMWU1ZTdkMTA2MGVkYmZh Y2JlNjI0ZWQ2Nzg0MjguLjU0YTIwZjE3Zjc4ZGYwNzIxZmRhMDFhNjk2OTFjNzE0N2E3OWU0YjUg MTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvZ2l0LXdlYmtpdAorKysgYi9Ub29scy9TY3JpcHRz L2dpdC13ZWJraXQKQEAgLTI2LDcgKzI2LDggQEAgaW1wb3J0IG9zCiBpbXBvcnQgc3lzCiAKIGlt cG9ydCB3ZWJraXRweQotZnJvbSB3ZWJraXRzY21weSBpbXBvcnQgbG9jYWwsIHByb2dyYW0sIHJl bW90ZQorZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IHJ1bgorZnJvbSB3ZWJraXRzY21weSBpbXBv cnQgbG9jYWwsIHByb2dyYW0sIHJlbW90ZSwgQ29udHJpYnV0b3IsIGxvZwogCiAKIGRlZiBpc193 ZWJraXRfZmlsdGVyKHRvX3JldHVybik6CkBAIC00NSwxMCArNDYsMzAgQEAgZGVmIGlzX3dlYmtp dF9maWx0ZXIodG9fcmV0dXJuKToKICAgICByZXR1cm4gY2FsbGJhY2sKIAogCitkZWYgYWRkaXRp b25hbF9zZXR1cChhcmdzLCByZXBvc2l0b3J5KToKKyAgICBpZiBub3QgaXNpbnN0YW5jZShyZXBv c2l0b3J5LCBsb2NhbC5HaXQpOgorICAgICAgICByZXR1cm4gMAorCisgICAgbG9nLndhcm5pbmco J1NldHRpbmcgbWVyZ2luZyBiZWhhdmlvciBmb3IgY2hhbmdlbG9ncy4uLicpCisgICAgaWYgcnVu KFsKKyAgICAgICAgcmVwb3NpdG9yeS5leGVjdXRhYmxlKCksCisgICAgICAgICdjb25maWcnLCAn bWVyZ2UuY2hhbmdlbG9nLmRyaXZlcicsCisgICAgICAgICdwZXJsIHt9IC0tZml4LW1lcmdlZCAt LW1lcmdlLWRyaXZlciAlTyAlQSAlQicuZm9ybWF0KG9zLnBhdGguam9pbigKKyAgICAgICAgICAg IG9zLnBhdGguZGlybmFtZShvcy5wYXRoLmRpcm5hbWUob3MucGF0aC5kaXJuYW1lKG9zLnBhdGgu ZGlybmFtZShfX2ZpbGVfXykpKSksCisgICAgICAgICAgICAnT3BlblNvdXJjZScsICdUb29scycs ICdTY3JpcHRzJywgJ3Jlc29sdmUtQ2hhbmdlTG9ncycsCisgICAgICAgICkpLAorICAgIF0sIGNh cHR1cmVfb3V0cHV0PVRydWUsIGN3ZD1yZXBvc2l0b3J5LnJvb3RfcGF0aCkucmV0dXJuY29kZToK KyAgICAgICAgc3lzLnN0ZGVyci53cml0ZSgnRmFpbGVkIHRvIHNldCB0aGUgZ2l0IG1lcmdpbmcg YmVoYWl2b3IgZm9yIGNoYW5nZWxvZ3MuLi5cbicpCisgICAgICAgIHJldHVybiAxCisgICAgbG9n Lndhcm5pbmcoJ1NldCBtZXJnaW5nIGJlaGF2aW9yIGZvciBjaGFuZ2Vsb2dzIScpCisgICAgcmV0 dXJuIDAKKworCiBpZiAnX19tYWluX18nID09IF9fbmFtZV9fOgogICAgIHN5cy5leGl0KHByb2dy YW0ubWFpbigKICAgICAgICAgcGF0aD1vcy5wYXRoLmRpcm5hbWUoX19maWxlX18pLAogICAgICAg ICBpZGVudGlmaWVyX3RlbXBsYXRlPWlzX3dlYmtpdF9maWx0ZXIoJ0Nhbm9uaWNhbCBsaW5rOiBo dHRwczovL2NvbW1pdHMud2Via2l0Lm9yZy97fScpLAogICAgICAgICBzdWJ2ZXJzaW9uPWlzX3dl YmtpdF9maWx0ZXIoJ2h0dHBzOi8vc3ZuLndlYmtpdC5vcmcvcmVwb3NpdG9yeS93ZWJraXQnKSwK KyAgICAgICAgYWRkaXRpb25hbF9zZXR1cD1pc193ZWJraXRfZmlsdGVyKGFkZGl0aW9uYWxfc2V0 dXApLAogICAgICkpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3NldHVwLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0 dXAucHkKaW5kZXggNGY1MmE4YWQ2MmIzNjZjY2NmMTUwNGU1NGY0YzZkZmZiYmM4NjQ4YS4uY2M0 NDRiYWEwYjJmMDZmMGJhMTRmOGI5ZTE3N2RkYWJlOGNmZGJmYyAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkKQEAgLTU4LDcgKzU4LDcgQEAgc2V0dXAo CiAgICAgICAgICd3ZWJraXRzY21weS50ZXN0JywKICAgICBdLAogICAgIHNjcmlwdHM9WydnaXQt d2Via2l0J10sCi0gICAgaW5zdGFsbF9yZXF1aXJlcz1bJ2Zhc3RlbmVycycsICdtb25vdG9uaWMn LCAnd2Via2l0Y29yZXB5JywgJ3htbHRvZGljdCddLAorICAgIGluc3RhbGxfcmVxdWlyZXM9Wydm YXN0ZW5lcnMnLCAnaW5zcGVjdDInLCAnbW9ub3RvbmljJywgJ3dlYmtpdGNvcmVweScsICd4bWx0 b2RpY3QnXSwKICAgICBpbmNsdWRlX3BhY2thZ2VfZGF0YT1UcnVlLAogICAgIHppcF9zYWZlPUZh bHNlLAogKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvX19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQppbmRleCAyMjdlOWU0MWJkNzNhM2U2YmQxODJm ZTQwNWI4MDk1MDQ1MzRjMGE1Li4xMzk5ZDhjODdiN2JlNTZlZjFmNGFlOWI4YTg0NmJlMTJkMjBm ZjNkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJr aXRzY21weS9fX2luaXRfXy5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQpAQCAtNTMsNiArNTMsOSBAQCBBdXRvSW5zdGFs bC5yZWdpc3RlcihQYWNrYWdlKCdtb25vdG9uaWMnLCBWZXJzaW9uKDEsIDUpKSkKIEF1dG9JbnN0 YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3doaWNoY3JhZnQnLCBWZXJzaW9uKDAsIDYsIDEpKSkKIEF1 dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3htbHRvZGljdCcsIFZlcnNpb24oMCwgMTEsIDAp KSkKIAoraWYgc3lzLnZlcnNpb25faW5mbyA8ICgzLCAwKToKKyAgICBBdXRvSW5zdGFsbC5yZWdp c3RlcihQYWNrYWdlKCdpbnNwZWN0MicsIFZlcnNpb24oMCwgMSwgMikpKQorCiBmcm9tIHdlYmtp dHNjbXB5LmNvbnRyaWJ1dG9yIGltcG9ydCBDb250cmlidXRvcgogZnJvbSB3ZWJraXRzY21weS5j b21taXQgaW1wb3J0IENvbW1pdAogZnJvbSB3ZWJraXRzY21weS5wdWxsX3JlcXVlc3QgaW1wb3J0 IFB1bGxSZXF1ZXN0CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS9wcm9ncmFtL19faW5pdF9fLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9fX2luaXRfXy5weQppbmRleCA3 MzcyMGU4ODY3ODdiYThlMTI2MzUxMjIxYTM5NGZkY2FkOWUwN2YxLi41MDgxNmJlYzRiMTMwNzUw YzQyNDdhYTFkNGNiZmJiOWVlNzA1ZjQxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJh cmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9wcm9ncmFtL19faW5pdF9fLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vX19p bml0X18ucHkKQEAgLTQyLDcgKzQyLDEwIEBAIGZyb20gd2Via2l0Y29yZXB5IGltcG9ydCBhcmd1 bWVudHMsIGxvZyBhcyB3ZWJraXRjb3JlcHlfbG9nCiBmcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBs b2NhbCwgbG9nLCByZW1vdGUKIAogCi1kZWYgbWFpbihhcmdzPU5vbmUsIHBhdGg9Tm9uZSwgbG9n Z2Vycz1Ob25lLCBjb250cmlidXRvcnM9Tm9uZSwgaWRlbnRpZmllcl90ZW1wbGF0ZT1Ob25lLCBz dWJ2ZXJzaW9uPU5vbmUpOgorZGVmIG1haW4oCisgICAgYXJncz1Ob25lLCBwYXRoPU5vbmUsIGxv Z2dlcnM9Tm9uZSwgY29udHJpYnV0b3JzPU5vbmUsCisgICAgaWRlbnRpZmllcl90ZW1wbGF0ZT1O b25lLCBzdWJ2ZXJzaW9uPU5vbmUsIGFkZGl0aW9uYWxfc2V0dXA9Tm9uZSwKKyk6CiAgICAgbG9n Z2luZy5iYXNpY0NvbmZpZyhsZXZlbD1sb2dnaW5nLldBUk5JTkcpCiAKICAgICBsb2dnZXJzID0g W2xvZ2dpbmcuZ2V0TG9nZ2VyKCksIHdlYmtpdGNvcmVweV9sb2csICBsb2ddICsgKGxvZ2dlcnMg b3IgW10pCkBAIC0xMTAsNiArMTEzLDEzIEBAIGRlZiBtYWluKGFyZ3M9Tm9uZSwgcGF0aD1Ob25l LCBsb2dnZXJzPU5vbmUsIGNvbnRyaWJ1dG9ycz1Ob25lLCBpZGVudGlmaWVyX3RlbXBsCiAgICAg aWYgY2FsbGFibGUoc3VidmVyc2lvbik6CiAgICAgICAgIHN1YnZlcnNpb24gPSBzdWJ2ZXJzaW9u KHJlcG9zaXRvcnkpCiAKKyAgICBpZiBzeXMudmVyc2lvbl9pbmZvID4gKDMsIDApOgorICAgICAg ICBpbXBvcnQgaW5zcGVjdAorICAgIGVsc2U6CisgICAgICAgIGltcG9ydCBpbnNwZWN0MiBhcyBp bnNwZWN0CisgICAgaWYgY2FsbGFibGUoYWRkaXRpb25hbF9zZXR1cCkgYW5kIGxpc3QoaW5zcGVj dC5zaWduYXR1cmUoYWRkaXRpb25hbF9zZXR1cCkucGFyYW1ldGVycy5rZXlzKCkpID09IFsncmVw b3NpdG9yeSddOgorICAgICAgICBhZGRpdGlvbmFsX3NldHVwID0gYWRkaXRpb25hbF9zZXR1cChy ZXBvc2l0b3J5KQorCiAgICAgaWYgbm90IGdldGF0dHIocGFyc2VkLCAnbWFpbicsIE5vbmUpOgog ICAgICAgICBwYXJzZXIucHJpbnRfaGVscCgpCiAgICAgICAgIHJldHVybiAtMQpAQCAtMTE5LDQg KzEyOSw1IEBAIGRlZiBtYWluKGFyZ3M9Tm9uZSwgcGF0aD1Ob25lLCBsb2dnZXJzPU5vbmUsIGNv bnRyaWJ1dG9ycz1Ob25lLCBpZGVudGlmaWVyX3RlbXBsCiAgICAgICAgIHJlcG9zaXRvcnk9cmVw b3NpdG9yeSwKICAgICAgICAgaWRlbnRpZmllcl90ZW1wbGF0ZT1pZGVudGlmaWVyX3RlbXBsYXRl LAogICAgICAgICBzdWJ2ZXJzaW9uPXN1YnZlcnNpb24sCisgICAgICAgIGFkZGl0aW9uYWxfc2V0 dXA9YWRkaXRpb25hbF9zZXR1cCwKICAgICApCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9wcm9ncmFtL3NldHVwLnB5IGIvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9zZXR1cC5w eQppbmRleCA2YzgxMTMyODhmNGFjN2Y4NTJhYWEzMzcyNmY2ZGEwNGY4MjlhNDE0Li5lZWQwY2Vk ZWZjMzMzYTA5Y2NkZjQ0NzFjOGEzN2ViNDliNGJiMWUxIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9wcm9ncmFtL3NldHVwLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dy YW0vc2V0dXAucHkKQEAgLTM0LDExICszNCwxNiBAQCBjbGFzcyBTZXR1cChDb21tYW5kKToKICAg ICBoZWxwID0gJ0NvbmZpZ3VyZSBsb2NhbCBzZXR0aW5ncyBmb3IgdGhlIGN1cnJlbnQgcmVwb3Np dG9yeScKIAogICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBnaXRodWIoY2xzLCBhcmdzLCByZXBv c2l0b3J5LCAqKmt3YXJncyk6CisgICAgZGVmIGdpdGh1YihjbHMsIGFyZ3MsIHJlcG9zaXRvcnks IGFkZGl0aW9uYWxfc2V0dXA9Tm9uZSwgKiprd2FyZ3MpOgogICAgICAgICBsb2cud2FybmluZygn U2F2aW5nIEdpdEh1YiBjcmVkZW50aWFscyBpbiBzeXN0ZW0gY3JlZGVudGlhbCBzdG9yZS4uLicp CiAgICAgICAgIHVzZXJuYW1lLCBhY2Nlc3NfdG9rZW4gPSByZXBvc2l0b3J5LmNyZWRlbnRpYWxz KHJlcXVpcmVkPVRydWUpCiAgICAgICAgIGxvZy53YXJuaW5nKCdHaXRIdWIgY3JlZGVudGlhbHMg c2F2ZWQgdmlhIEtleXJpbmchJykKIAorICAgICAgICAjIEFueSBhZGRpdGlvbmFsIHNldHVwIHBh c3NlZCB0byBtYWluCisgICAgICAgIHJlc3VsdCA9IDAKKyAgICAgICAgaWYgYWRkaXRpb25hbF9z ZXR1cDoKKyAgICAgICAgICAgIHJlc3VsdCArPSBhZGRpdGlvbmFsX3NldHVwKGFyZ3MsIHJlcG9z aXRvcnkpCisKICAgICAgICAgbG9nLndhcm5pbmcoJ1ZlcmlmeWluZyB1c2VyIG93bmVkIGZvcmsu Li4nKQogICAgICAgICBhdXRoID0gSFRUUEJhc2ljQXV0aCh1c2VybmFtZSwgYWNjZXNzX3Rva2Vu KQogICAgICAgICByZXNwb25zZSA9IHJlcXVlc3RzLmdldCgne30vcmVwb3Mve30ve30nLmZvcm1h dCgKQEAgLTQ4LDcgKzUzLDcgQEAgY2xhc3MgU2V0dXAoQ29tbWFuZCk6CiAgICAgICAgICksIGF1 dGg9YXV0aCwgaGVhZGVycz1kaWN0KEFjY2VwdD0nYXBwbGljYXRpb24vdm5kLmdpdGh1Yi52Mytq c29uJykpCiAgICAgICAgIGlmIHJlc3BvbnNlLnN0YXR1c19jb2RlID09IDIwMDoKICAgICAgICAg ICAgIGxvZy53YXJuaW5nKCJVc2VyIGFscmVhZHkgb3ducyBhIGZvcmsgb2YgJ3t9JyEiLmZvcm1h dChyZXBvc2l0b3J5Lm5hbWUpKQotICAgICAgICAgICAgcmV0dXJuIDAKKyAgICAgICAgICAgIHJl dHVybiByZXN1bHQKIAogICAgICAgICBpZiByZXBvc2l0b3J5Lm93bmVyID09IHVzZXJuYW1lIG9y IGFyZ3MuZGVmYXVsdHMgb3IgVGVybWluYWwuY2hvb3NlKAogICAgICAgICAgICAgIkNyZWF0ZSBh IHByaXZhdGUgZm9yayBvZiAne30nIGJlbG9uZ2luZyB0byAne30nIi5mb3JtYXQocmVwb3NpdG9y eS5uYW1lLCB1c2VybmFtZSksCkBAIC03MCwxMCArNzUsMTAgQEAgY2xhc3MgU2V0dXAoQ29tbWFu ZCk6CiAgICAgICAgICAgICBzeXMuc3RkZXJyLndyaXRlKCJGYWlsZWQgdG8gY3JlYXRlIGEgZm9y ayBvZiAne30nIGJlbG9uZ2luZyB0byAne30nXG4iLmZvcm1hdChyZXBvc2l0b3J5Lm5hbWUsIHVz ZXJuYW1lKSkKICAgICAgICAgICAgIHJldHVybiAxCiAgICAgICAgIGxvZy53YXJuaW5nKCJDcmVh dGVkIGEgcHJpdmF0ZSBmb3JrIG9mICd7fScgYmVsb25naW5nIHRvICd7fSchIi5mb3JtYXQocmVw b3NpdG9yeS5uYW1lLCB1c2VybmFtZSkpCi0gICAgICAgIHJldHVybiAwCisgICAgICAgIHJldHVy biByZXN1bHQKIAogICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBnaXQoY2xzLCBhcmdzLCByZXBv c2l0b3J5LCAqKmt3YXJncyk6CisgICAgZGVmIGdpdChjbHMsIGFyZ3MsIHJlcG9zaXRvcnksIGFk ZGl0aW9uYWxfc2V0dXA9Tm9uZSwgKiprd2FyZ3MpOgogICAgICAgICBnbG9iYWxfY29uZmlnID0g bG9jYWwuR2l0LmNvbmZpZygpCiAgICAgICAgIHJlc3VsdCA9IDAKIApAQCAtMTYwLDYgKzE2NSwx MCBAQCBjbGFzcyBTZXR1cChDb21tYW5kKToKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIGxv Zy53YXJuaW5nKCJTZXQgZ2l0IGVkaXRvciB0byAne30nIi5mb3JtYXQoZWRpdG9yX25hbWUpKQog CisgICAgICAgICMgQW55IGFkZGl0aW9uYWwgc2V0dXAgcGFzc2VkIHRvIG1haW4KKyAgICAgICAg aWYgYWRkaXRpb25hbF9zZXR1cDoKKyAgICAgICAgICAgIHJlc3VsdCArPSBhZGRpdGlvbmFsX3Nl dHVwKGFyZ3MsIHJlcG9zaXRvcnkpCisKICAgICAgICAgIyBPbmx5IGNvbmZpZ3VyZSBHaXRIdWIg aWYgdGhlIFVSTCBpcyBhIEdpdEh1YiBVUkwKICAgICAgICAgcm10ID0gcmVwb3NpdG9yeS5yZW1v dGUoKQogICAgICAgICBpZiBub3QgaXNpbnN0YW5jZShybXQsIHJlbW90ZS5HaXRIdWIpOgo= 441616 2021-10-18 09:36:18 -0700 2021-10-18 10:14:57 -0700 Patch for landing bug-231345-20211018093617.patch text/plain 1539 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0Mzc3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTI2YTAzODJkMThmM2QyNmUzMjljZTYxZDdkNTczMTUz M2YxOWIyNC4uNzViODM3YjUyYjc2YWY4ODc1Y2QwMGFlMzIwNjczOTM1MmYxOWNmNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDIxLTEwLTE4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIEFsbG93IHJlcG9zaXRvcmllcyB0byBkZWZpbmUgY3VzdG9t IHNldHVwIGNvbW1hbmRzIChGb2xsb3cwLXVwKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxMzQ1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84Mzk2 MDI0OT4KKworICAgICAgICBVbnJldmlld2VkIGZvbGxvdy11cCBmaXguCisKKyAgICAgICAgKiBT Y3JpcHRzL2dpdC13ZWJraXQ6IERvIG5vdCBzcGVjaWZ5IE9wZW5Tb3VyY2UgaW4gVG9vbHMvU2Ny aXB0cyBwYXRoLgorCiAyMDIxLTEwLTE4ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2Vu QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVncmVzc2lvbiAocjI4NDMwNCkgOiBbIGlPUyAxNSBS ZWxlYXNlIF0gaHR0cC90ZXN0cy9wcml2YXRlQ2xpY2tNZWFzdXJlbWVudCB0ZXN0cyBhcmUgZmFp bGluZwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9naXQtd2Via2l0IGIvVG9vbHMvU2NyaXB0 cy9naXQtd2Via2l0CmluZGV4IDFjNTJlYWVhMmU5ODNiZmFiMTA5ZTcyNmFhNzM5NzRlNThiMDU5 YjEuLjYzM2NjOTIzNWNiY2Y2ZWRmMjZmOTJmZmU1NGU5Y2ZiOGYzM2JhYjYgMTAwNzU1Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvZ2l0LXdlYmtpdAorKysgYi9Ub29scy9TY3JpcHRzL2dpdC13ZWJraXQK QEAgLTU2LDcgKzU2LDcgQEAgZGVmIGFkZGl0aW9uYWxfc2V0dXAoYXJncywgcmVwb3NpdG9yeSk6 CiAgICAgICAgICdjb25maWcnLCAnbWVyZ2UuY2hhbmdlbG9nLmRyaXZlcicsCiAgICAgICAgICdw ZXJsIHt9IC0tbWVyZ2UtZHJpdmVyIC1jICVPICVBICVCJy5mb3JtYXQob3MucGF0aC5qb2luKAog ICAgICAgICAgICAgb3MucGF0aC5hYnNwYXRoKG9zLnBhdGguZGlybmFtZShvcy5wYXRoLmRpcm5h bWUob3MucGF0aC5kaXJuYW1lKG9zLnBhdGguZGlybmFtZShfX2ZpbGVfXykpKSkpLAotICAgICAg ICAgICAgJ09wZW5Tb3VyY2UnLCAnVG9vbHMnLCAnU2NyaXB0cycsICdyZXNvbHZlLUNoYW5nZUxv Z3MnLAorICAgICAgICAgICAgJ1Rvb2xzJywgJ1NjcmlwdHMnLCAncmVzb2x2ZS1DaGFuZ2VMb2dz JywKICAgICAgICAgKSksCiAgICAgXSwgY2FwdHVyZV9vdXRwdXQ9VHJ1ZSwgY3dkPXJlcG9zaXRv cnkucm9vdF9wYXRoKS5yZXR1cm5jb2RlOgogICAgICAgICBzeXMuc3RkZXJyLndyaXRlKCdGYWls ZWQgdG8gc2V0IHRoZSBnaXQgbWVyZ2luZyBiZWhhaXZvciBmb3IgY2hhbmdlbG9ncy4uLlxuJykK