232447 2021-10-28 12:15:19 -0700 [webkitscmpy] Add fetch and rebase 2021-10-29 08:44:35 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard webkit-bug-importer oldest_to_newest 1809776 0 jbedard 2021-10-28 12:15:19 -0700 We need to rebase against a specific branch when landing a pull-request. Additionally, we should be more explicit about updating local branch refs when we are pull/rebasing against those refs. When we rebase a branch, we need to clear any cache associated with that branch. 1809777 1 webkit-bug-importer 2021-10-28 12:15:38 -0700 <rdar://problem/84770221> 1809778 2 442728 jbedard 2021-10-28 12:18:10 -0700 Created attachment 442728 Patch 1809779 3 jbedard 2021-10-28 12:18:40 -0700 PR: https://github.com/WebKit/WebKit/pull/27 1809892 4 442763 jbedard 2021-10-28 16:28:58 -0700 Created attachment 442763 Patch 1810066 5 442814 jbedard 2021-10-29 08:10:38 -0700 Created attachment 442814 Patch for landing 1810089 6 ews-feeder 2021-10-29 08:44:34 -0700 Committed r285029 (243673@main): <https://commits.webkit.org/243673@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442814. 442728 2021-10-28 12:18:10 -0700 2021-10-28 16:28:56 -0700 Patch bug-232447-20211028121809.patch text/plain 8104 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTk0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYWJjOTg3NWVmMDA1NmQ3MzQwYzdmOWI2Zjk0NjAxY2Ew Y2IyM2RmNS4uYzg0NWVjMmY4MmUyY2VjNjExZDI2NGE0NGJiY2E2ODlkOTU4ZmZjYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDIxLTEwLTE4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIEFkZCBmZXRjaCBhbmQgcmViYXNlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI0NDcKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzg0NzcwMjIxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRvIGxhbmQgY29tbWl0cywgd2UgbmVlZCB0byBiZSBhYmxlIHRvIHJlYmFz ZSBhIGJyYW5jaCBhZ2FpbnN0IGFub3RoZXIuCisgICAgICAgIEFkZGl0aW9uYWxseSwgd2hlbiBy ZWJhc2luZywgd2UgbmVlZCB0byBkaXNjYXJkIHN0YWxlIGNhY2hlIGJpdHMuIFRoaXMKKyAgICAg ICAgaXMgYWxzbyB0cnVlIHdoZW4gcHVsbGluZyBhbmQgcmViYXNpbmcgYWdhaW5zdCBtYWluLgor CisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9j YWwvZ2l0LnB5OgorICAgICAgICAoR2l0LkNhY2hlLmNsZWFyKTogQ2xlYXIgY2FjaGUgb2YgYSBz cGVjaWZpYyBicmFuY2guCisgICAgICAgIChHaXQucmViYXNlKTogUmViYXNlIGEgYnJhbmNoIG9u IHRvcCBvZiBhbm90aGVyLgorICAgICAgICAoR2l0LmZldGNoKTogRmV0Y2ggc3BlY2lmaWMgYnJh bmNoIHJlZi4KKyAgICAgICAgKEdpdC5wdWxsKTogVXNlIGdlbmVyYWxpemVkIGZldGNoIGNvbW1h bmQsIGNsZWFyIGNhY2hlIGZvciB1cGRhdGVkIGJyYW5jaAorICAgICAgICBpZiB0aGF0IGJyYW5j aCBpcyBub3QgdGhlIGRlZmF1bHQgYnJhbmNoLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL2dpdC5weToKKyAgICAgICAgKEdp dC5fX2luaXRfXyk6IEFkZCByZWJhc2UgbW9jay4KKyAgICAgICAgKEdpdC5yZWJhc2UpOiAKKyAg ICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2dp dF91bml0dGVzdC5weToKKyAgICAgICAgKHRlc3RfcmViYXNlKToKKwogMjAyMS0xMC0yOCAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBQcmVwYXJlIFNp bmdsZVRlc3RSdW5uZXJUZXN0IHRvIHJlYWQgZnV6enkgcGl4ZWwgbWF0Y2hpbmcgZGF0YQpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv bG9jYWwvZ2l0LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvbG9jYWwvZ2l0LnB5CmluZGV4IDBiNDk1MDU5Mjg5NmQ5MmExMjFkZDNiYWRlNzJlNDEz NzMwZjU0YjAuLjFjZWM2ZmQ3ZjZmZDdjZWU4NjYwNzA1MzAwNmE1ZmZlNWM2YWNmOWQgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xv Y2FsL2dpdC5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJr aXRzY21weS9sb2NhbC9naXQucHkKQEAgLTE5OCw2ICsxOTgsMjkgQEAgY2xhc3MgR2l0KFNjbSk6 CiAgICAgICAgICAgICBleGNlcHQgKElPRXJyb3IsIE9TRXJyb3IpOgogICAgICAgICAgICAgICAg IHNlbGYucmVwby5sb2coIkZhaWxlZCB0byB3cml0ZSBpZGVudGlmaWVyIGNhY2hlIHRvICd7fSci LmZvcm1hdChzZWxmLnBhdGgpKQogCisgICAgICAgIGRlZiBjbGVhcihzZWxmLCBicmFuY2gpOgor ICAgICAgICAgICAgZm9yIGQgaW4gW3NlbGYuX29yZGVyZWRfY29tbWl0cywgc2VsZi5fb3JkZXJl ZF9yZXZpc2lvbnMsIHNlbGYuX2xhc3RfcG9wdWxhdGVkXToKKyAgICAgICAgICAgICAgICBpZiBi cmFuY2ggaW4gZDoKKyAgICAgICAgICAgICAgICAgICAgZGVsIGRbYnJhbmNoXQorCisgICAgICAg ICAgICBzZWxmLl9oYXNoX3RvX2lkZW50aWZpZXJzID0gTmVzdGVkRnV6enlEaWN0KHByaW1hcnlf c2l6ZT02KQorICAgICAgICAgICAgc2VsZi5fcmV2aXNpb25zX3RvX2lkZW50aWZpZXJzID0ge30K KworICAgICAgICAgICAgc2VsZi5fZmlsbChzZWxmLnJlcG8uZGVmYXVsdF9icmFuY2gpCisgICAg ICAgICAgICBmb3IgYnJhbmNoIGluIHNlbGYuX29yZGVyZWRfY29tbWl0cy5rZXlzKCk6CisgICAg ICAgICAgICAgICAgaWYgYnJhbmNoID09IHNlbGYucmVwby5kZWZhdWx0X2JyYW5jaDoKKyAgICAg ICAgICAgICAgICAgICAgY29udGludWUKKyAgICAgICAgICAgICAgICBzZWxmLl9maWxsKGJyYW5j aCkKKworICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgIHdpdGggb3BlbihzZWxmLnBh dGgsICd3JykgYXMgZmlsZToKKyAgICAgICAgICAgICAgICAgICAganNvbi5kdW1wKGRpY3QoCisg ICAgICAgICAgICAgICAgICAgICAgICBoYXNoZXM9c2VsZi5fb3JkZXJlZF9jb21taXRzLAorICAg ICAgICAgICAgICAgICAgICAgICAgcmV2aXNpb25zPXNlbGYuX29yZGVyZWRfcmV2aXNpb25zLAor ICAgICAgICAgICAgICAgICAgICApLCBmaWxlLCBpbmRlbnQ9NCkKKyAgICAgICAgICAgIGV4Y2Vw dCAoSU9FcnJvciwgT1NFcnJvcik6CisgICAgICAgICAgICAgICAgc2VsZi5yZXBvLmxvZygiRmFp bGVkIHRvIHdyaXRlIGlkZW50aWZpZXIgY2FjaGUgdG8gJ3t9JyIuZm9ybWF0KHNlbGYucGF0aCkp CisKICAgICAgICAgZGVmIHRvX2hhc2goc2VsZiwgcmV2aXNpb249Tm9uZSwgaWRlbnRpZmllcj1O b25lLCBwb3B1bGF0ZT1UcnVlLCBicmFuY2g9Tm9uZSk6CiAgICAgICAgICAgICBpZiByZXZpc2lv bjoKICAgICAgICAgICAgICAgICBpZGVudGlmaWVyID0gc2VsZi50b19pZGVudGlmaWVyKHJldmlz aW9uPXJldmlzaW9uLCBwb3B1bGF0ZT1wb3B1bGF0ZSwgYnJhbmNoPWJyYW5jaCkKQEAgLTgwMiw2 ICs4MjUsMjggQEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgICAgICAgICBjd2Q9c2VsZi5yb290X3Bh dGgsCiAgICAgICAgICkucmV0dXJuY29kZSBlbHNlIHNlbGYuY29tbWl0KCkKIAorICAgIGRlZiBy ZWJhc2Uoc2VsZiwgdGFyZ2V0LCBiYXNlPU5vbmUsIGhlYWQ9J0hFQUQnLCByZWNvbW1pdD1UcnVl KToKKyAgICAgICAgaWYgaGVhZCA9PSBzZWxmLmRlZmF1bHRfYnJhbmNoIG9yIHNlbGYucHJvZF9i cmFuY2hlcy5tYXRjaChoZWFkKToKKyAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcigiUmVi YXNpbmcgcHJvZHVjdGlvbiBicmFuY2ggJ3t9JyBiYW5uZWQgaW4gdG9vbGluZyEiLmZvcm1hdCho ZWFkKSkKKworICAgICAgICBjb2RlID0gcnVuKFtzZWxmLmV4ZWN1dGFibGUoKSwgJ3JlYmFzZScs ICctLW9udG8nLCB0YXJnZXQsIGJhc2Ugb3IgdGFyZ2V0LCBoZWFkXSwgY3dkPXNlbGYucm9vdF9w YXRoKS5yZXR1cm5jb2RlCisgICAgICAgIGlmIHNlbGYuY2FjaGU6CisgICAgICAgICAgICBzZWxm LmNhY2hlLmNsZWFyKGhlYWQgaWYgaGVhZCAhPSAnSEVBRCcgZWxzZSBzZWxmLmJyYW5jaCkKKyAg ICAgICAgaWYgY29kZSBvciBub3QgcmVjb21taXQ6CisgICAgICAgICAgICByZXR1cm4gY29kZQor ICAgICAgICByZXR1cm4gcnVuKFsKKyAgICAgICAgICAgIHNlbGYuZXhlY3V0YWJsZSgpLCAnZmls dGVyLWJyYW5jaCcsICctZicsCisgICAgICAgICAgICAnLS1lbnYtZmlsdGVyJywgIkdJVF9BVVRI T1JfREFURT0ne2RhdGV9JztHSVRfQ09NTUlUVEVSX0RBVEU9J3tkYXRlfSciLmZvcm1hdCgKKyAg ICAgICAgICAgICAgICBkYXRlPSd7fSAte30nLmZvcm1hdChpbnQodGltZS50aW1lKCkpLCBpbnQo dGltZS5sb2NhbHRpbWUoKS50bV9nbXRvZmYgKiAxMDAgLyAoNjAgKiA2MCkpKQorICAgICAgICAg ICAgKSwgJ3t9Li4ue30nLmZvcm1hdCh0YXJnZXQsIGhlYWQpLAorICAgICAgICBdLCBjd2Q9c2Vs Zi5yb290X3BhdGgsIGVudj17J0ZJTFRFUl9CUkFOQ0hfU1FVRUxDSF9XQVJOSU5HJzogJzEnfSwg Y2FwdHVyZV9vdXRwdXQ9VHJ1ZSkucmV0dXJuY29kZQorCisgICAgZGVmIGZldGNoKHNlbGYsIGJy YW5jaCwgcmVtb3RlPSdvcmlnaW4nKToKKyAgICAgICAgcmV0dXJuIHJ1bigKKyAgICAgICAgICAg IFtzZWxmLmV4ZWN1dGFibGUoKSwgJ2ZldGNoJywgcmVtb3RlLCAne306e30nLmZvcm1hdChicmFu Y2gsIGJyYW5jaCldLAorICAgICAgICAgICAgY3dkPXNlbGYucm9vdF9wYXRoLAorICAgICAgICAp LnJldHVybmNvZGUKKwogICAgIGRlZiBwdWxsKHNlbGYsIHJlYmFzZT1Ob25lLCBicmFuY2g9Tm9u ZSwgcmVtb3RlPSdvcmlnaW4nKToKICAgICAgICAgY29tbWl0ID0gc2VsZi5jb21taXQoKSBpZiBz ZWxmLmlzX3N2biBvciBicmFuY2ggZWxzZSBOb25lCiAgICAgICAgIGNvZGUgPSBydW4oCkBAIC04 MTEsMTIgKzg1NiwxMSBAQCBjbGFzcyBHaXQoU2NtKToKICAgICAgICAgICAgICAgICBbXSBpZiBy ZWJhc2UgaXMgTm9uZSBlbHNlIFsnLS1yZWJhc2U9e30nLmZvcm1hdCgnVHJ1ZScgaWYgcmViYXNl IGVsc2UgJ0ZhbHNlJyldCiAgICAgICAgICAgICApLCBjd2Q9c2VsZi5yb290X3BhdGgsCiAgICAg ICAgICkucmV0dXJuY29kZQorICAgICAgICBpZiBzZWxmLmNhY2hlIGFuZCByZWJhc2UgYW5kIGJy YW5jaCAhPSBzZWxmLmJyYW5jaDoKKyAgICAgICAgICAgIHNlbGYuY2FjaGUuY2xlYXIoc2VsZi5i cmFuY2gpCiAKICAgICAgICAgaWYgbm90IGNvZGUgYW5kIGJyYW5jaDoKLSAgICAgICAgICAgIGNv ZGUgPSBydW4oCi0gICAgICAgICAgICAgICAgW3NlbGYuZXhlY3V0YWJsZSgpLCAnZmV0Y2gnLCBy ZW1vdGUsICd7fTp7fScuZm9ybWF0KGJyYW5jaCwgYnJhbmNoKV0sCi0gICAgICAgICAgICAgICAg Y3dkPXNlbGYucm9vdF9wYXRoLAotICAgICAgICAgICAgKS5yZXR1cm5jb2RlCisgICAgICAgICAg ICBjb2RlID0gc2VsZi5mZXRjaChicmFuY2g9YnJhbmNoLCByZW1vdGU9cmVtb3RlKQogCiAgICAg ICAgIGlmIG5vdCBjb2RlIGFuZCBicmFuY2ggYW5kIHJlYmFzZToKICAgICAgICAgICAgIHJlc3Vs dCA9IHJ1bihbc2VsZi5leGVjdXRhYmxlKCksICdyZXYtcGFyc2UnLCAnSEVBRCddLCBjd2Q9c2Vs Zi5yb290X3BhdGgsIGNhcHR1cmVfb3V0cHV0PVRydWUsIGVuY29kaW5nPSd1dGYtOCcpCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9t b2Nrcy9sb2NhbC9naXQucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9naXQucHkKaW5kZXggNGM3ZWJmM2IzY2QzMWZhZTY0ZDVm MjAyZWVjZmFkYTE3ODI4NDdhMy4uYmUwNGYxY2VmZmZkMTU1Nzk1NTkxNTU0ZTZmN2MyYjI5NDY0 NWExOSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL2dpdC5weQpAQCAtNDM0LDYgKzQz NCwxMCBAQCBub3RoaW5nIHRvIGNvbW1pdCwgd29ya2luZyB0cmVlIGNsZWFuCiAgICAgICAgICAg ICAgICAgc2VsZi5leGVjdXRhYmxlLCAnZmV0Y2gnLCAnb3JpZ2luJywgcmUuY29tcGlsZShyJy4r Oi4rJyksCiAgICAgICAgICAgICAgICAgY3dkPXNlbGYucGF0aCwKICAgICAgICAgICAgICAgICBn ZW5lcmF0b3I9bGFtYmRhICphcmdzLCAqKmt3YXJnczogbW9ja3MuUHJvY2Vzc0NvbXBsZXRpb24o cmV0dXJuY29kZT0wKSwKKyAgICAgICAgICAgICksIG1vY2tzLlN1YnByb2Nlc3MuUm91dGUoCisg ICAgICAgICAgICAgICAgc2VsZi5leGVjdXRhYmxlLCAncmViYXNlJywgJy0tb250bycsIHJlLmNv bXBpbGUocicuKycpLCByZS5jb21waWxlKHInLisnKSwgcmUuY29tcGlsZShyJy4rJyksCisgICAg ICAgICAgICAgICAgY3dkPXNlbGYucGF0aCwKKyAgICAgICAgICAgICAgICBnZW5lcmF0b3I9bGFt YmRhICphcmdzLCAqKmt3YXJnczogc2VsZi5yZWJhc2UoYXJnc1szXSwgYXJnc1s0XSwgYXJnc1s1 XSksCiAgICAgICAgICAgICApLCBtb2Nrcy5TdWJwcm9jZXNzLlJvdXRlKAogICAgICAgICAgICAg ICAgIHNlbGYuZXhlY3V0YWJsZSwKICAgICAgICAgICAgICAgICBjd2Q9c2VsZi5wYXRoLApAQCAt Nzc4LDMgKzc4MiwxMiBAQCBub3RoaW5nIHRvIGNvbW1pdCwgd29ya2luZyB0cmVlIGNsZWFuCiAg ICAgICAgICAgICBzZWxmLnN0YWdlZFtrZXldID0gdmFsdWUKICAgICAgICAgc2VsZi5tb2RpZmll ZCA9IHt9CiAgICAgICAgIHJldHVybiBtb2Nrcy5Qcm9jZXNzQ29tcGxldGlvbihyZXR1cm5jb2Rl PTApCisKKyAgICBkZWYgcmViYXNlKHNlbGYsIHRhcmdldCwgYmFzZSwgaGVhZCk6CisgICAgICAg IGlmIHRhcmdldCBub3QgaW4gc2VsZi5jb21taXRzIG9yIGJhc2Ugbm90IGluIHNlbGYuY29tbWl0 cyBvciBoZWFkIG5vdCBpbiBzZWxmLmNvbW1pdHM6CisgICAgICAgICAgICByZXR1cm4gbW9ja3Mu UHJvY2Vzc0NvbXBsZXRpb24ocmV0dXJuY29kZT0xKQorICAgICAgICBmb3IgY29tbWl0IGluIHNl bGYuY29tbWl0c1toZWFkXToKKyAgICAgICAgICAgIGNvbW1pdC5icmFuY2hfcG9pbnQgPSBzZWxm LmNvbW1pdHNbdGFyZ2V0XVstMV0uYnJhbmNoX3BvaW50IG9yIHNlbGYuY29tbWl0c1t0YXJnZXRd Wy0xXS5pZGVudGlmaWVyCisgICAgICAgICAgICBpZiBzZWxmLmNvbW1pdHNbdGFyZ2V0XVstMV0u YnJhbmNoX3BvaW50OgorICAgICAgICAgICAgICAgIGNvbW1pdC5pZGVudGlmaWVyICs9IHNlbGYu Y29tbWl0c1t0YXJnZXRdWy0xXS5pZGVudGlmaWVyCisgICAgICAgIHJldHVybiBtb2Nrcy5Qcm9j ZXNzQ29tcGxldGlvbihyZXR1cm5jb2RlPTApCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5weSBiL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3Vu aXR0ZXN0LnB5CmluZGV4IDhmZDZiNDE2MWQ5MTU1NjJkMTNjYzAwYjE0NGE1ZWU0ZjJhMTY0MDEu LmU5OWI0Y2MzN2NjOTczYzYzODg0NmM1NjUwNDM1YzBmNjc0ODg5NDIgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3Vu aXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5CkBAIC00NzYsNiArNDc2LDEzIEBAIENvbW1pdERh dGU6IHt0aW1lX2N9CiAgICAgICAgICAgICBtcmVwby5zdGFnZWRbJ21vZGlmaWVkLnR4dCddID0g J2RpZmYnCiAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJlcG8ubW9kaWZpZWQoc3RhZ2Vk PVRydWUpLCBbJ2FkZGVkLnR4dCcsICdtb2RpZmllZC50eHQnXSkKIAorICAgIGRlZiB0ZXN0X3Jl YmFzZShzZWxmKToKKyAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5HaXQoc2VsZi5wYXRoKToKKyAg ICAgICAgICAgIHJlcG8gPSBsb2NhbC5HaXQoc2VsZi5wYXRoKQorICAgICAgICAgICAgc2VsZi5h c3NlcnRFcXVhbChzdHIocmVwby5jb21taXQoYnJhbmNoPSdicmFuY2gtYScpKSwgJzIuMkBicmFu Y2gtYScpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJlcG8ucmViYXNlKHRhcmdldD0n bWFpbicsIGJhc2U9J21haW4nLCBoZWFkPSdicmFuY2gtYScsIHJlY29tbWl0PUZhbHNlKSwgMCkK KyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3RyKHJlcG8uY29tbWl0KGJyYW5jaD0nYnJh bmNoLWEnKSksICc1LjJAYnJhbmNoLWEnKQorCiAKIGNsYXNzIFRlc3RHaXRIdWIodGVzdGluZy5U ZXN0Q2FzZSk6CiAgICAgcmVtb3RlID0gJ2h0dHBzOi8vZ2l0aHViLmV4YW1wbGUuY29tL1dlYktp dC9XZWJLaXQnCg== 442763 2021-10-28 16:28:58 -0700 2021-10-29 08:10:36 -0700 Patch bug-232447-20211028162857.patch text/plain 12062 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MDA1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTkwYWQyZTVjOTZmNGE0ZjUzZjBiZjM2MTNiN2Q5NmY0 Y2IwN2ZlZS4uYzRkY2E2MjZmZTg5OGJlZTg1MjI0ODE3OThlOWE5MzNkMzg5MjdmOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMw IEBACisyMDIxLTEwLTI4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIEFkZCBmZXRjaCBhbmQgcmViYXNlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI0NDcKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzg0NzcwMjIxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRvIGxhbmQgY29tbWl0cywgd2UgbmVlZCB0byBiZSBhYmxlIHRvIHJlYmFz ZSBhIGJyYW5jaCBhZ2FpbnN0IGFub3RoZXIuCisgICAgICAgIEFkZGl0aW9uYWxseSwgd2hlbiBy ZWJhc2luZywgd2UgbmVlZCB0byBkaXNjYXJkIHN0YWxlIGNhY2hlIGJpdHMuIFRoaXMKKyAgICAg ICAgaXMgYWxzbyB0cnVlIHdoZW4gcHVsbGluZyBhbmQgcmViYXNpbmcgYWdhaW5zdCBtYWluLgor CisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9j YWwvZ2l0LnB5OgorICAgICAgICAoR2l0LkNhY2hlLmNsZWFyKTogQ2xlYXIgY2FjaGUgb2YgYSBz cGVjaWZpYyBicmFuY2guCisgICAgICAgIChHaXQucmViYXNlKTogUmViYXNlIGEgYnJhbmNoIG9u IHRvcCBvZiBhbm90aGVyLgorICAgICAgICAoR2l0LmZldGNoKTogRmV0Y2ggc3BlY2lmaWMgYnJh bmNoIHJlZi4KKyAgICAgICAgKEdpdC5wdWxsKTogVXNlIGdlbmVyYWxpemVkIGZldGNoIGNvbW1h bmQsIGNsZWFyIGNhY2hlIGZvciB1cGRhdGVkIGJyYW5jaAorICAgICAgICBpZiB0aGF0IGJyYW5j aCBpcyBub3QgdGhlIGRlZmF1bHQgYnJhbmNoLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL2dpdC5weToKKyAgICAgICAgKEdp dC5fX2luaXRfXyk6IEFkZCByZWJhc2UgbW9jay4KKyAgICAgICAgKEdpdC5yZWJhc2UpOgorICAg ICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0v cHVsbF9yZXF1ZXN0LnB5OgorICAgICAgICAoUHVsbFJlcXVlc3QubWFpbik6IFJlY29tcHV0ZSBi cmFuY2gtcG9pbnQgYWZ0ZXIgcmViYXNlLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvcHVsbF9yZXF1ZXN0X3VuaXR0ZXN0LnB5OgorICAg ICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0 X3VuaXR0ZXN0LnB5OgorICAgICAgICAodGVzdF9yZWJhc2UpOgorCiAyMDIxLTEwLTI4ICBKb25h dGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBbd2Via2l0c2NtcHld IEZpeCBjb21taXRzIHNldCBvbiBicmFuY2gKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weSBiL1Rvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weQppbmRleCBm Y2I5M2JiZGY5ZjA3NTMwNjczNzIxMTAxNGQ3OGRlZjQzY2EwZGViLi43M2E1OWM4ZWM4YWE1YzJh NDQxMjRjMTk5NTY2YmFlNjU0MGU0MDNlIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJh cmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5CkBAIC0x OTgsNiArMTk4LDI5IEBAIGNsYXNzIEdpdChTY20pOgogICAgICAgICAgICAgZXhjZXB0IChJT0Vy cm9yLCBPU0Vycm9yKToKICAgICAgICAgICAgICAgICBzZWxmLnJlcG8ubG9nKCJGYWlsZWQgdG8g d3JpdGUgaWRlbnRpZmllciBjYWNoZSB0byAne30nIi5mb3JtYXQoc2VsZi5wYXRoKSkKIAorICAg ICAgICBkZWYgY2xlYXIoc2VsZiwgYnJhbmNoKToKKyAgICAgICAgICAgIGZvciBkIGluIFtzZWxm Ll9vcmRlcmVkX2NvbW1pdHMsIHNlbGYuX29yZGVyZWRfcmV2aXNpb25zLCBzZWxmLl9sYXN0X3Bv cHVsYXRlZF06CisgICAgICAgICAgICAgICAgaWYgYnJhbmNoIGluIGQ6CisgICAgICAgICAgICAg ICAgICAgIGRlbCBkW2JyYW5jaF0KKworICAgICAgICAgICAgc2VsZi5faGFzaF90b19pZGVudGlm aWVycyA9IE5lc3RlZEZ1enp5RGljdChwcmltYXJ5X3NpemU9NikKKyAgICAgICAgICAgIHNlbGYu X3JldmlzaW9uc190b19pZGVudGlmaWVycyA9IHt9CisKKyAgICAgICAgICAgIHNlbGYuX2ZpbGwo c2VsZi5yZXBvLmRlZmF1bHRfYnJhbmNoKQorICAgICAgICAgICAgZm9yIGJyYW5jaCBpbiBzZWxm Ll9vcmRlcmVkX2NvbW1pdHMua2V5cygpOgorICAgICAgICAgICAgICAgIGlmIGJyYW5jaCA9PSBz ZWxmLnJlcG8uZGVmYXVsdF9icmFuY2g6CisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCisg ICAgICAgICAgICAgICAgc2VsZi5fZmlsbChicmFuY2gpCisKKyAgICAgICAgICAgIHRyeToKKyAg ICAgICAgICAgICAgICB3aXRoIG9wZW4oc2VsZi5wYXRoLCAndycpIGFzIGZpbGU6CisgICAgICAg ICAgICAgICAgICAgIGpzb24uZHVtcChkaWN0KAorICAgICAgICAgICAgICAgICAgICAgICAgaGFz aGVzPXNlbGYuX29yZGVyZWRfY29tbWl0cywKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldmlz aW9ucz1zZWxmLl9vcmRlcmVkX3JldmlzaW9ucywKKyAgICAgICAgICAgICAgICAgICAgKSwgZmls ZSwgaW5kZW50PTQpCisgICAgICAgICAgICBleGNlcHQgKElPRXJyb3IsIE9TRXJyb3IpOgorICAg ICAgICAgICAgICAgIHNlbGYucmVwby5sb2coIkZhaWxlZCB0byB3cml0ZSBpZGVudGlmaWVyIGNh Y2hlIHRvICd7fSciLmZvcm1hdChzZWxmLnBhdGgpKQorCiAgICAgICAgIGRlZiB0b19oYXNoKHNl bGYsIHJldmlzaW9uPU5vbmUsIGlkZW50aWZpZXI9Tm9uZSwgcG9wdWxhdGU9VHJ1ZSwgYnJhbmNo PU5vbmUpOgogICAgICAgICAgICAgaWYgcmV2aXNpb246CiAgICAgICAgICAgICAgICAgaWRlbnRp ZmllciA9IHNlbGYudG9faWRlbnRpZmllcihyZXZpc2lvbj1yZXZpc2lvbiwgcG9wdWxhdGU9cG9w dWxhdGUsIGJyYW5jaD1icmFuY2gpCkBAIC04MDIsNiArODI1LDI4IEBAIGNsYXNzIEdpdChTY20p OgogICAgICAgICAgICAgY3dkPXNlbGYucm9vdF9wYXRoLAogICAgICAgICApLnJldHVybmNvZGUg ZWxzZSBzZWxmLmNvbW1pdCgpCiAKKyAgICBkZWYgcmViYXNlKHNlbGYsIHRhcmdldCwgYmFzZT1O b25lLCBoZWFkPSdIRUFEJywgcmVjb21taXQ9VHJ1ZSk6CisgICAgICAgIGlmIGhlYWQgPT0gc2Vs Zi5kZWZhdWx0X2JyYW5jaCBvciBzZWxmLnByb2RfYnJhbmNoZXMubWF0Y2goaGVhZCk6CisgICAg ICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IoIlJlYmFzaW5nIHByb2R1Y3Rpb24gYnJhbmNoICd7 fScgYmFubmVkIGluIHRvb2xpbmchIi5mb3JtYXQoaGVhZCkpCisKKyAgICAgICAgY29kZSA9IHJ1 bihbc2VsZi5leGVjdXRhYmxlKCksICdyZWJhc2UnLCAnLS1vbnRvJywgdGFyZ2V0LCBiYXNlIG9y IHRhcmdldCwgaGVhZF0sIGN3ZD1zZWxmLnJvb3RfcGF0aCkucmV0dXJuY29kZQorICAgICAgICBp ZiBzZWxmLmNhY2hlOgorICAgICAgICAgICAgc2VsZi5jYWNoZS5jbGVhcihoZWFkIGlmIGhlYWQg IT0gJ0hFQUQnIGVsc2Ugc2VsZi5icmFuY2gpCisgICAgICAgIGlmIGNvZGUgb3Igbm90IHJlY29t bWl0OgorICAgICAgICAgICAgcmV0dXJuIGNvZGUKKyAgICAgICAgcmV0dXJuIHJ1bihbCisgICAg ICAgICAgICBzZWxmLmV4ZWN1dGFibGUoKSwgJ2ZpbHRlci1icmFuY2gnLCAnLWYnLAorICAgICAg ICAgICAgJy0tZW52LWZpbHRlcicsICJHSVRfQVVUSE9SX0RBVEU9J3tkYXRlfSc7R0lUX0NPTU1J VFRFUl9EQVRFPSd7ZGF0ZX0nIi5mb3JtYXQoCisgICAgICAgICAgICAgICAgZGF0ZT0ne30gLXt9 Jy5mb3JtYXQoaW50KHRpbWUudGltZSgpKSwgaW50KHRpbWUubG9jYWx0aW1lKCkudG1fZ210b2Zm ICogMTAwIC8gKDYwICogNjApKSkKKyAgICAgICAgICAgICksICd7fS4uLnt9Jy5mb3JtYXQodGFy Z2V0LCBoZWFkKSwKKyAgICAgICAgXSwgY3dkPXNlbGYucm9vdF9wYXRoLCBlbnY9eydGSUxURVJf QlJBTkNIX1NRVUVMQ0hfV0FSTklORyc6ICcxJ30sIGNhcHR1cmVfb3V0cHV0PVRydWUpLnJldHVy bmNvZGUKKworICAgIGRlZiBmZXRjaChzZWxmLCBicmFuY2gsIHJlbW90ZT0nb3JpZ2luJyk6Cisg ICAgICAgIHJldHVybiBydW4oCisgICAgICAgICAgICBbc2VsZi5leGVjdXRhYmxlKCksICdmZXRj aCcsIHJlbW90ZSwgJ3t9Ont9Jy5mb3JtYXQoYnJhbmNoLCBicmFuY2gpXSwKKyAgICAgICAgICAg IGN3ZD1zZWxmLnJvb3RfcGF0aCwKKyAgICAgICAgKS5yZXR1cm5jb2RlCisKICAgICBkZWYgcHVs bChzZWxmLCByZWJhc2U9Tm9uZSwgYnJhbmNoPU5vbmUsIHJlbW90ZT0nb3JpZ2luJyk6CiAgICAg ICAgIGNvbW1pdCA9IHNlbGYuY29tbWl0KCkgaWYgc2VsZi5pc19zdm4gb3IgYnJhbmNoIGVsc2Ug Tm9uZQogICAgICAgICBjb2RlID0gcnVuKApAQCAtODExLDEyICs4NTYsMTEgQEAgY2xhc3MgR2l0 KFNjbSk6CiAgICAgICAgICAgICAgICAgW10gaWYgcmViYXNlIGlzIE5vbmUgZWxzZSBbJy0tcmVi YXNlPXt9Jy5mb3JtYXQoJ1RydWUnIGlmIHJlYmFzZSBlbHNlICdGYWxzZScpXQogICAgICAgICAg ICAgKSwgY3dkPXNlbGYucm9vdF9wYXRoLAogICAgICAgICApLnJldHVybmNvZGUKKyAgICAgICAg aWYgc2VsZi5jYWNoZSBhbmQgcmViYXNlIGFuZCBicmFuY2ggIT0gc2VsZi5icmFuY2g6CisgICAg ICAgICAgICBzZWxmLmNhY2hlLmNsZWFyKHNlbGYuYnJhbmNoKQogCiAgICAgICAgIGlmIG5vdCBj b2RlIGFuZCBicmFuY2g6Ci0gICAgICAgICAgICBjb2RlID0gcnVuKAotICAgICAgICAgICAgICAg IFtzZWxmLmV4ZWN1dGFibGUoKSwgJ2ZldGNoJywgcmVtb3RlLCAne306e30nLmZvcm1hdChicmFu Y2gsIGJyYW5jaCldLAotICAgICAgICAgICAgICAgIGN3ZD1zZWxmLnJvb3RfcGF0aCwKLSAgICAg ICAgICAgICkucmV0dXJuY29kZQorICAgICAgICAgICAgY29kZSA9IHNlbGYuZmV0Y2goYnJhbmNo PWJyYW5jaCwgcmVtb3RlPXJlbW90ZSkKIAogICAgICAgICBpZiBub3QgY29kZSBhbmQgYnJhbmNo IGFuZCByZWJhc2U6CiAgICAgICAgICAgICByZXN1bHQgPSBydW4oW3NlbGYuZXhlY3V0YWJsZSgp LCAncmV2LXBhcnNlJywgJ0hFQUQnXSwgY3dkPXNlbGYucm9vdF9wYXRoLCBjYXB0dXJlX291dHB1 dD1UcnVlLCBlbmNvZGluZz0ndXRmLTgnKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0LnB5IGIvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0 LnB5CmluZGV4IDRjN2ViZjNiM2NkMzFmYWU2NGQ1ZjIwMmVlY2ZhZGExNzgyODQ3YTMuLmJlMDRm MWNlZmZmZDE1NTc5NTU5MTU1NGU2ZjdjMmIyOTQ2NDVhMTkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL2dpdC5w eQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9t b2Nrcy9sb2NhbC9naXQucHkKQEAgLTQzNCw2ICs0MzQsMTAgQEAgbm90aGluZyB0byBjb21taXQs IHdvcmtpbmcgdHJlZSBjbGVhbgogICAgICAgICAgICAgICAgIHNlbGYuZXhlY3V0YWJsZSwgJ2Zl dGNoJywgJ29yaWdpbicsIHJlLmNvbXBpbGUocicuKzouKycpLAogICAgICAgICAgICAgICAgIGN3 ZD1zZWxmLnBhdGgsCiAgICAgICAgICAgICAgICAgZ2VuZXJhdG9yPWxhbWJkYSAqYXJncywgKipr d2FyZ3M6IG1vY2tzLlByb2Nlc3NDb21wbGV0aW9uKHJldHVybmNvZGU9MCksCisgICAgICAgICAg ICApLCBtb2Nrcy5TdWJwcm9jZXNzLlJvdXRlKAorICAgICAgICAgICAgICAgIHNlbGYuZXhlY3V0 YWJsZSwgJ3JlYmFzZScsICctLW9udG8nLCByZS5jb21waWxlKHInLisnKSwgcmUuY29tcGlsZShy Jy4rJyksIHJlLmNvbXBpbGUocicuKycpLAorICAgICAgICAgICAgICAgIGN3ZD1zZWxmLnBhdGgs CisgICAgICAgICAgICAgICAgZ2VuZXJhdG9yPWxhbWJkYSAqYXJncywgKiprd2FyZ3M6IHNlbGYu cmViYXNlKGFyZ3NbM10sIGFyZ3NbNF0sIGFyZ3NbNV0pLAogICAgICAgICAgICAgKSwgbW9ja3Mu U3VicHJvY2Vzcy5Sb3V0ZSgKICAgICAgICAgICAgICAgICBzZWxmLmV4ZWN1dGFibGUsCiAgICAg ICAgICAgICAgICAgY3dkPXNlbGYucGF0aCwKQEAgLTc3OCwzICs3ODIsMTIgQEAgbm90aGluZyB0 byBjb21taXQsIHdvcmtpbmcgdHJlZSBjbGVhbgogICAgICAgICAgICAgc2VsZi5zdGFnZWRba2V5 XSA9IHZhbHVlCiAgICAgICAgIHNlbGYubW9kaWZpZWQgPSB7fQogICAgICAgICByZXR1cm4gbW9j a3MuUHJvY2Vzc0NvbXBsZXRpb24ocmV0dXJuY29kZT0wKQorCisgICAgZGVmIHJlYmFzZShzZWxm LCB0YXJnZXQsIGJhc2UsIGhlYWQpOgorICAgICAgICBpZiB0YXJnZXQgbm90IGluIHNlbGYuY29t bWl0cyBvciBiYXNlIG5vdCBpbiBzZWxmLmNvbW1pdHMgb3IgaGVhZCBub3QgaW4gc2VsZi5jb21t aXRzOgorICAgICAgICAgICAgcmV0dXJuIG1vY2tzLlByb2Nlc3NDb21wbGV0aW9uKHJldHVybmNv ZGU9MSkKKyAgICAgICAgZm9yIGNvbW1pdCBpbiBzZWxmLmNvbW1pdHNbaGVhZF06CisgICAgICAg ICAgICBjb21taXQuYnJhbmNoX3BvaW50ID0gc2VsZi5jb21taXRzW3RhcmdldF1bLTFdLmJyYW5j aF9wb2ludCBvciBzZWxmLmNvbW1pdHNbdGFyZ2V0XVstMV0uaWRlbnRpZmllcgorICAgICAgICAg ICAgaWYgc2VsZi5jb21taXRzW3RhcmdldF1bLTFdLmJyYW5jaF9wb2ludDoKKyAgICAgICAgICAg ICAgICBjb21taXQuaWRlbnRpZmllciArPSBzZWxmLmNvbW1pdHNbdGFyZ2V0XVstMV0uaWRlbnRp ZmllcgorICAgICAgICByZXR1cm4gbW9ja3MuUHJvY2Vzc0NvbXBsZXRpb24ocmV0dXJuY29kZT0w KQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvcHJvZ3JhbS9wdWxsX3JlcXVlc3QucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS9wcm9ncmFtL3B1bGxfcmVxdWVzdC5weQppbmRleCA3Yzlh ZDI0ZTNiMzQyNjZiNjczZDU1NWE4ZmY5YjM2YmYwOWQxZDk5Li4wOGZjNTE2MTI1NWRmMjJhMmJh OTQzZmM5MTRiMTdhZGVhYzg0MDdmIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS9wcm9ncmFtL3B1bGxfcmVxdWVzdC5weQorKysgYi9U b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9wcm9ncmFtL3B1 bGxfcmVxdWVzdC5weQpAQCAtMTA2LDYgKzEwNiw3IEBAIGNsYXNzIFB1bGxSZXF1ZXN0KENvbW1h bmQpOgogICAgICAgICAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoIkZhaWxlZCB0byByZWJhc2Ug J3t9JyBvbiAne30sJyBwbGVhc2UgcmVzb2x2ZSBjb25mbGljdHNcbiIuZm9ybWF0KHJlcG9zaXRv cnkuYnJhbmNoLCBicmFuY2hfcG9pbnQuYnJhbmNoKSkKICAgICAgICAgICAgICAgICByZXR1cm4g MQogICAgICAgICAgICAgbG9nLndhcm5pbmcoIlJlYmFzZWQgJ3t9JyBvbiAne30hJyIuZm9ybWF0 KHJlcG9zaXRvcnkuYnJhbmNoLCBicmFuY2hfcG9pbnQuYnJhbmNoKSkKKyAgICAgICAgICAgIGJy YW5jaF9wb2ludCA9IEJyYW5jaC5icmFuY2hfcG9pbnQocmVwb3NpdG9yeSkKIAogICAgICAgICBy bXQgPSByZXBvc2l0b3J5LnJlbW90ZSgpCiAgICAgICAgIGlmIG5vdCBybXQ6CmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2dp dF91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5CmluZGV4IDQ0ODBjOTM2ODAzNDJiYTI2ZmYxYWE1 MGUyNTE1ZWY0MDMzZmY5OTMuLjZlNDEwZjZkMzM1MTM3NTRmODFlN2YyNzUwNzMyMzBiYzlmOTFk Y2EgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5CkBAIC00NzYsNiAr NDc2LDEzIEBAIENvbW1pdERhdGU6IHt0aW1lX2N9CiAgICAgICAgICAgICBtcmVwby5zdGFnZWRb J21vZGlmaWVkLnR4dCddID0gJ2RpZmYnCiAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJl cG8ubW9kaWZpZWQoc3RhZ2VkPVRydWUpLCBbJ2FkZGVkLnR4dCcsICdtb2RpZmllZC50eHQnXSkK IAorICAgIGRlZiB0ZXN0X3JlYmFzZShzZWxmKToKKyAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5H aXQoc2VsZi5wYXRoKToKKyAgICAgICAgICAgIHJlcG8gPSBsb2NhbC5HaXQoc2VsZi5wYXRoKQor ICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzdHIocmVwby5jb21taXQoYnJhbmNoPSdicmFu Y2gtYScpKSwgJzIuMkBicmFuY2gtYScpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJl cG8ucmViYXNlKHRhcmdldD0nbWFpbicsIGJhc2U9J21haW4nLCBoZWFkPSdicmFuY2gtYScsIHJl Y29tbWl0PUZhbHNlKSwgMCkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3RyKHJlcG8u Y29tbWl0KGJyYW5jaD0nYnJhbmNoLWEnKSksICc1LjJAYnJhbmNoLWEnKQorCiAKIGNsYXNzIFRl c3RHaXRIdWIodGVzdGluZy5UZXN0Q2FzZSk6CiAgICAgcmVtb3RlID0gJ2h0dHBzOi8vZ2l0aHVi LmV4YW1wbGUuY29tL1dlYktpdC9XZWJLaXQnCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L3B1bGxfcmVxdWVzdF91bml0dGVz dC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rl c3QvcHVsbF9yZXF1ZXN0X3VuaXR0ZXN0LnB5CmluZGV4IGIxNWYzMDAwZTMxMDk5ZGZkZmI3YzJj YzkwOTY2Y2U1YjA0YThkZmIuLmVjMTU2YjljNTVmYmRmMzJkMTdjNzg5NjhiOWNhOWMwZDI0YzMw YmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L3Rlc3QvcHVsbF9yZXF1ZXN0X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvcHVsbF9yZXF1ZXN0X3VuaXR0 ZXN0LnB5CkBAIC0yODgsNyArMjg4LDggQEAgY2xhc3MgVGVzdERvUHVsbFJlcXVlc3QodGVzdGlu Zy5QYXRoVGVzdENhc2UpOgogQ3JlYXRpbmcgY29tbWl0Li4uCiAgICAgRm91bmQgMSBjb21taXQu Li4KIFJlYmFzaW5nICdlbmcvcHItYnJhbmNoJyBvbiAnbWFpbicuLi4KLVJlYmFzZWQgJ2VuZy9w ci1icmFuY2gnIG9uICdtYWluISciIiIpCitSZWJhc2VkICdlbmcvcHItYnJhbmNoJyBvbiAnbWFp biEnCisgICAgRm91bmQgMSBjb21taXQuLi4iIiIpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo Y2FwdHVyZWQuc3RkZXJyLmdldHZhbHVlKCksICIne30nIGRvZXNuJ3QgaGF2ZSBhIHJlY29nbml6 ZWQgcmVtb3RlXG4iLmZvcm1hdChzZWxmLnBhdGgpKQogCiAgICAgZGVmIHRlc3RfbW9kaWZpZWQo c2VsZik6CkBAIC0zMTAsNyArMzExLDggQEAgUmViYXNlZCAnZW5nL3ByLWJyYW5jaCcgb24gJ21h aW4hJyIiIikKIENyZWF0aW5nIGNvbW1pdC4uLgogICAgIEZvdW5kIDEgY29tbWl0Li4uCiBSZWJh c2luZyAnZW5nL3ByLWJyYW5jaCcgb24gJ21haW4nLi4uCi1SZWJhc2VkICdlbmcvcHItYnJhbmNo JyBvbiAnbWFpbiEnIiIiKQorUmViYXNlZCAnZW5nL3ByLWJyYW5jaCcgb24gJ21haW4hJworICAg IEZvdW5kIDEgY29tbWl0Li4uIiIiKQogCiAgICAgZGVmIHRlc3RfZ2l0aHViKHNlbGYpOgogICAg ICAgICB3aXRoIE91dHB1dENhcHR1cmUoKSBhcyBjYXB0dXJlZCwgbW9ja3MucmVtb3RlLkdpdEh1 YigpIGFzIHJlbW90ZSwgXApAQCAtMzMxLDYgKzMzMyw3IEBAIFJlYmFzZWQgJ2VuZy9wci1icmFu Y2gnIG9uICdtYWluISciIiIpCiAgICAgICAgICAgICAgICAgJyAgICBGb3VuZCAxIGNvbW1pdC4u LicsCiAgICAgICAgICAgICAgICAgIlJlYmFzaW5nICdlbmcvcHItYnJhbmNoJyBvbiAnbWFpbicu Li4iLAogICAgICAgICAgICAgICAgICJSZWJhc2VkICdlbmcvcHItYnJhbmNoJyBvbiAnbWFpbiEn IiwKKyAgICAgICAgICAgICAgICAiICAgIEZvdW5kIDEgY29tbWl0Li4uIiwKICAgICAgICAgICAg ICAgICAiUHVzaGluZyAnZW5nL3ByLWJyYW5jaCcgdG8gJ2ZvcmsnLi4uIiwKICAgICAgICAgICAg ICAgICAiQ3JlYXRpbmcgcHVsbC1yZXF1ZXN0IGZvciAnZW5nL3ByLWJyYW5jaCcuLi4iLAogICAg ICAgICAgICAgICAgICJDcmVhdGVkICdQUiAxIHwgQ3JlYXRlZCBjb21taXQnISIsCkBAIC0zNjIs NiArMzY1LDcgQEAgUmViYXNlZCAnZW5nL3ByLWJyYW5jaCcgb24gJ21haW4hJyIiIikKICAgICAg ICAgICAgICAgICAnICAgIEZvdW5kIDEgY29tbWl0Li4uJywKICAgICAgICAgICAgICAgICAiUmVi YXNpbmcgJ2VuZy9wci1icmFuY2gnIG9uICdtYWluJy4uLiIsCiAgICAgICAgICAgICAgICAgIlJl YmFzZWQgJ2VuZy9wci1icmFuY2gnIG9uICdtYWluISciLAorICAgICAgICAgICAgICAgICIgICAg Rm91bmQgMSBjb21taXQuLi4iLAogICAgICAgICAgICAgICAgICJQdXNoaW5nICdlbmcvcHItYnJh bmNoJyB0byAnZm9yaycuLi4iLAogICAgICAgICAgICAgICAgICJVcGRhdGluZyBwdWxsLXJlcXVl c3QgZm9yICdlbmcvcHItYnJhbmNoJy4uLiIsCiAgICAgICAgICAgICAgICAgIlVwZGF0ZWQgJ1BS IDEgfCBBbWVuZGVkIGNvbW1pdCchIiwKQEAgLTM4OCw2ICszOTIsNyBAQCBSZWJhc2VkICdlbmcv cHItYnJhbmNoJyBvbiAnbWFpbiEnIiIiKQogICAgICAgICAgICAgICAgICcgICAgRm91bmQgMSBj b21taXQuLi4nLAogICAgICAgICAgICAgICAgICJSZWJhc2luZyAnZW5nL3ByLWJyYW5jaCcgb24g J21haW4nLi4uIiwKICAgICAgICAgICAgICAgICAiUmViYXNlZCAnZW5nL3ByLWJyYW5jaCcgb24g J21haW4hJyIsCisgICAgICAgICAgICAgICAgIiAgICBGb3VuZCAxIGNvbW1pdC4uLiIsCiAgICAg ICAgICAgICAgICAgIlB1c2hpbmcgJ2VuZy9wci1icmFuY2gnIHRvICdvcmlnaW4nLi4uIiwKICAg ICAgICAgICAgICAgICAiQ3JlYXRpbmcgcHVsbC1yZXF1ZXN0IGZvciAnZW5nL3ByLWJyYW5jaCcu Li4iLAogICAgICAgICAgICAgICAgICJDcmVhdGVkICdQUiAxIHwgQ3JlYXRlZCBjb21taXQnISIs CkBAIC00MjAsNiArNDI1LDcgQEAgUmViYXNlZCAnZW5nL3ByLWJyYW5jaCcgb24gJ21haW4hJyIi IikKICAgICAgICAgICAgICAgICAnICAgIEZvdW5kIDEgY29tbWl0Li4uJywKICAgICAgICAgICAg ICAgICAiUmViYXNpbmcgJ2VuZy9wci1icmFuY2gnIG9uICdtYWluJy4uLiIsCiAgICAgICAgICAg ICAgICAgIlJlYmFzZWQgJ2VuZy9wci1icmFuY2gnIG9uICdtYWluISciLAorICAgICAgICAgICAg ICAgICIgICAgRm91bmQgMSBjb21taXQuLi4iLAogICAgICAgICAgICAgICAgICJQdXNoaW5nICdl bmcvcHItYnJhbmNoJyB0byAnb3JpZ2luJy4uLiIsCiAgICAgICAgICAgICAgICAgIlVwZGF0aW5n IHB1bGwtcmVxdWVzdCBmb3IgJ2VuZy9wci1icmFuY2gnLi4uIiwKICAgICAgICAgICAgICAgICAi VXBkYXRlZCAnUFIgMSB8IEFtZW5kZWQgY29tbWl0JyEiLAo= 442814 2021-10-29 08:10:38 -0700 2021-10-29 08:44:35 -0700 Patch for landing bug-232447-20211029081037.patch text/plain 13495 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MDI3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmRiODc5MzJjMzA1NDBhYTllMjU0MDY2NjU2ZDMxMTMz N2VhZmUyZS4uZjVkMzg0NjkzNzU3OTdjMDQyODZjZjU3OGEzZDg3NDk0NDRlNGNkZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDIxLTEwLTI5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIEFkZCBmZXRjaCBhbmQgcmViYXNlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI0NDcKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzg0NzcwMjIxPgorCisgICAgICAgIFJldmlld2VkIGJ5IERld2VpIFpodS4KKwor ICAgICAgICBUbyBsYW5kIGNvbW1pdHMsIHdlIG5lZWQgdG8gYmUgYWJsZSB0byByZWJhc2UgYSBi cmFuY2ggYWdhaW5zdCBhbm90aGVyLgorICAgICAgICBBZGRpdGlvbmFsbHksIHdoZW4gcmViYXNp bmcsIHdlIG5lZWQgdG8gZGlzY2FyZCBzdGFsZSBjYWNoZSBiaXRzLiBUaGlzCisgICAgICAgIGlz IGFsc28gdHJ1ZSB3aGVuIHB1bGxpbmcgYW5kIHJlYmFzaW5nIGFnYWluc3QgbWFpbi4KKworICAg ICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5OiBCdW1wIHZlcnNp b24uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv X19pbml0X18ucHk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weToKKyAgICAgICAgKEdpdC5DYWNoZS5jbGVhcik6 IENsZWFyIGNhY2hlIG9mIGEgc3BlY2lmaWMgYnJhbmNoLgorICAgICAgICAoR2l0LnJlYmFzZSk6 IFJlYmFzZSBhIGJyYW5jaCBvbiB0b3Agb2YgYW5vdGhlci4KKyAgICAgICAgKEdpdC5mZXRjaCk6 IEZldGNoIHNwZWNpZmljIGJyYW5jaCByZWYuCisgICAgICAgIChHaXQucHVsbCk6IFVzZSBnZW5l cmFsaXplZCBmZXRjaCBjb21tYW5kLCBjbGVhciBjYWNoZSBmb3IgdXBkYXRlZCBicmFuY2gKKyAg ICAgICAgaWYgdGhhdCBicmFuY2ggaXMgbm90IHRoZSBkZWZhdWx0IGJyYW5jaC4KKyAgICAgICAg KiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9n aXQucHk6CisgICAgICAgIChHaXQuX19pbml0X18pOiBBZGQgcmViYXNlIG1vY2suCisgICAgICAg IChHaXQucmViYXNlKToKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS9wcm9ncmFtL3B1bGxfcmVxdWVzdC5weToKKyAgICAgICAgKFB1bGxSZXF1ZXN0 Lm1haW4pOiBSZWNvbXB1dGUgYnJhbmNoLXBvaW50IGFmdGVyIHJlYmFzZS4KKyAgICAgICAgKiBT Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L3B1bGxfcmVxdWVz dF91bml0dGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5weToKKyAgICAgICAgKHRlc3RfcmViYXNlKToK KwogMjAyMS0xMC0yOSAgVGFrYXNoaSBLb21vcmkgIDxUYWthc2hpLktvbW9yaUBzb255LmNvbT4K IAogICAgICAgICBXS0FQSSBkb2VzIG5vdCBoYXZlIGFueSBBUElzIHRvIHNldCBjb29raWUgcGF0 aCB0byBXS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uUmVmCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weSBiL1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5CmluZGV4IDQ2MWIxZmM5OTU1MzZlM2M5ZTc5 ZGNkOWFmOWFmNjZhMDY4YjBhMDcuLjFlY2Y3ZGQ4OGQxNTExZTIzYmJlNTM3NjcwMWEwYzQ0YTlm ZGQ1ODggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3Nl dHVwLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5 CkBAIC0yOSw3ICsyOSw3IEBAIGRlZiByZWFkbWUoKToKIAogc2V0dXAoCiAgICAgbmFtZT0nd2Vi a2l0c2NtcHknLAotICAgIHZlcnNpb249JzIuMi4xOScsCisgICAgdmVyc2lvbj0nMi4yLjIwJywK ICAgICBkZXNjcmlwdGlvbj0nTGlicmFyeSBkZXNpZ25lZCB0byBpbnRlcmFjdCB3aXRoIGdpdCBh bmQgc3ZuIHJlcG9zaXRvcmllcy4nLAogICAgIGxvbmdfZGVzY3JpcHRpb249cmVhZG1lKCksCiAg ICAgY2xhc3NpZmllcnM9WwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQppbmRleCBkYzliZTg2OTBhN2Qw OGVjYjA3NDM2ZmYzYjQ2YTFhMTQ1YWVkNDcwLi5hYzM2MWVmMTJjMjFkNWYxNjc1N2UxNDNkYWZi NTFiMjNjZDhmZTIxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQpAQCAtNDYsNyArNDYsNyBAQCBl eGNlcHQgSW1wb3J0RXJyb3I6CiAgICAgICAgICJQbGVhc2UgaW5zdGFsbCB3ZWJraXRjb3JlcHkg d2l0aCBgcGlwIGluc3RhbGwgd2Via2l0Y29yZXB5IC0tZXh0cmEtaW5kZXgtdXJsIDxwYWNrYWdl IGluZGV4IFVSTD5gIgogICAgICkKIAotdmVyc2lvbiA9IFZlcnNpb24oMiwgMiwgMTkpCit2ZXJz aW9uID0gVmVyc2lvbigyLCAyLCAyMCkKIAogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgn ZmFzdGVuZXJzJywgVmVyc2lvbigwLCAxNSwgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFj a2FnZSgnamluamEyJywgVmVyc2lvbigyLCAxMSwgMykpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5IGIvVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5 CmluZGV4IGZjYjkzYmJkZjlmMDc1MzA2NzM3MjExMDE0ZDc4ZGVmNDNjYTBkZWIuLjczYTU5Yzhl YzhhYTVjMmE0NDEyNGMxOTk1NjZiYWU2NTQwZTQwM2UgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weQorKysgYi9U b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQu cHkKQEAgLTE5OCw2ICsxOTgsMjkgQEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgICAgICAgICBleGNl cHQgKElPRXJyb3IsIE9TRXJyb3IpOgogICAgICAgICAgICAgICAgIHNlbGYucmVwby5sb2coIkZh aWxlZCB0byB3cml0ZSBpZGVudGlmaWVyIGNhY2hlIHRvICd7fSciLmZvcm1hdChzZWxmLnBhdGgp KQogCisgICAgICAgIGRlZiBjbGVhcihzZWxmLCBicmFuY2gpOgorICAgICAgICAgICAgZm9yIGQg aW4gW3NlbGYuX29yZGVyZWRfY29tbWl0cywgc2VsZi5fb3JkZXJlZF9yZXZpc2lvbnMsIHNlbGYu X2xhc3RfcG9wdWxhdGVkXToKKyAgICAgICAgICAgICAgICBpZiBicmFuY2ggaW4gZDoKKyAgICAg ICAgICAgICAgICAgICAgZGVsIGRbYnJhbmNoXQorCisgICAgICAgICAgICBzZWxmLl9oYXNoX3Rv X2lkZW50aWZpZXJzID0gTmVzdGVkRnV6enlEaWN0KHByaW1hcnlfc2l6ZT02KQorICAgICAgICAg ICAgc2VsZi5fcmV2aXNpb25zX3RvX2lkZW50aWZpZXJzID0ge30KKworICAgICAgICAgICAgc2Vs Zi5fZmlsbChzZWxmLnJlcG8uZGVmYXVsdF9icmFuY2gpCisgICAgICAgICAgICBmb3IgYnJhbmNo IGluIHNlbGYuX29yZGVyZWRfY29tbWl0cy5rZXlzKCk6CisgICAgICAgICAgICAgICAgaWYgYnJh bmNoID09IHNlbGYucmVwby5kZWZhdWx0X2JyYW5jaDoKKyAgICAgICAgICAgICAgICAgICAgY29u dGludWUKKyAgICAgICAgICAgICAgICBzZWxmLl9maWxsKGJyYW5jaCkKKworICAgICAgICAgICAg dHJ5OgorICAgICAgICAgICAgICAgIHdpdGggb3BlbihzZWxmLnBhdGgsICd3JykgYXMgZmlsZToK KyAgICAgICAgICAgICAgICAgICAganNvbi5kdW1wKGRpY3QoCisgICAgICAgICAgICAgICAgICAg ICAgICBoYXNoZXM9c2VsZi5fb3JkZXJlZF9jb21taXRzLAorICAgICAgICAgICAgICAgICAgICAg ICAgcmV2aXNpb25zPXNlbGYuX29yZGVyZWRfcmV2aXNpb25zLAorICAgICAgICAgICAgICAgICAg ICApLCBmaWxlLCBpbmRlbnQ9NCkKKyAgICAgICAgICAgIGV4Y2VwdCAoSU9FcnJvciwgT1NFcnJv cik6CisgICAgICAgICAgICAgICAgc2VsZi5yZXBvLmxvZygiRmFpbGVkIHRvIHdyaXRlIGlkZW50 aWZpZXIgY2FjaGUgdG8gJ3t9JyIuZm9ybWF0KHNlbGYucGF0aCkpCisKICAgICAgICAgZGVmIHRv X2hhc2goc2VsZiwgcmV2aXNpb249Tm9uZSwgaWRlbnRpZmllcj1Ob25lLCBwb3B1bGF0ZT1UcnVl LCBicmFuY2g9Tm9uZSk6CiAgICAgICAgICAgICBpZiByZXZpc2lvbjoKICAgICAgICAgICAgICAg ICBpZGVudGlmaWVyID0gc2VsZi50b19pZGVudGlmaWVyKHJldmlzaW9uPXJldmlzaW9uLCBwb3B1 bGF0ZT1wb3B1bGF0ZSwgYnJhbmNoPWJyYW5jaCkKQEAgLTgwMiw2ICs4MjUsMjggQEAgY2xhc3Mg R2l0KFNjbSk6CiAgICAgICAgICAgICBjd2Q9c2VsZi5yb290X3BhdGgsCiAgICAgICAgICkucmV0 dXJuY29kZSBlbHNlIHNlbGYuY29tbWl0KCkKIAorICAgIGRlZiByZWJhc2Uoc2VsZiwgdGFyZ2V0 LCBiYXNlPU5vbmUsIGhlYWQ9J0hFQUQnLCByZWNvbW1pdD1UcnVlKToKKyAgICAgICAgaWYgaGVh ZCA9PSBzZWxmLmRlZmF1bHRfYnJhbmNoIG9yIHNlbGYucHJvZF9icmFuY2hlcy5tYXRjaChoZWFk KToKKyAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcigiUmViYXNpbmcgcHJvZHVjdGlvbiBi cmFuY2ggJ3t9JyBiYW5uZWQgaW4gdG9vbGluZyEiLmZvcm1hdChoZWFkKSkKKworICAgICAgICBj b2RlID0gcnVuKFtzZWxmLmV4ZWN1dGFibGUoKSwgJ3JlYmFzZScsICctLW9udG8nLCB0YXJnZXQs IGJhc2Ugb3IgdGFyZ2V0LCBoZWFkXSwgY3dkPXNlbGYucm9vdF9wYXRoKS5yZXR1cm5jb2RlCisg ICAgICAgIGlmIHNlbGYuY2FjaGU6CisgICAgICAgICAgICBzZWxmLmNhY2hlLmNsZWFyKGhlYWQg aWYgaGVhZCAhPSAnSEVBRCcgZWxzZSBzZWxmLmJyYW5jaCkKKyAgICAgICAgaWYgY29kZSBvciBu b3QgcmVjb21taXQ6CisgICAgICAgICAgICByZXR1cm4gY29kZQorICAgICAgICByZXR1cm4gcnVu KFsKKyAgICAgICAgICAgIHNlbGYuZXhlY3V0YWJsZSgpLCAnZmlsdGVyLWJyYW5jaCcsICctZics CisgICAgICAgICAgICAnLS1lbnYtZmlsdGVyJywgIkdJVF9BVVRIT1JfREFURT0ne2RhdGV9JztH SVRfQ09NTUlUVEVSX0RBVEU9J3tkYXRlfSciLmZvcm1hdCgKKyAgICAgICAgICAgICAgICBkYXRl PSd7fSAte30nLmZvcm1hdChpbnQodGltZS50aW1lKCkpLCBpbnQodGltZS5sb2NhbHRpbWUoKS50 bV9nbXRvZmYgKiAxMDAgLyAoNjAgKiA2MCkpKQorICAgICAgICAgICAgKSwgJ3t9Li4ue30nLmZv cm1hdCh0YXJnZXQsIGhlYWQpLAorICAgICAgICBdLCBjd2Q9c2VsZi5yb290X3BhdGgsIGVudj17 J0ZJTFRFUl9CUkFOQ0hfU1FVRUxDSF9XQVJOSU5HJzogJzEnfSwgY2FwdHVyZV9vdXRwdXQ9VHJ1 ZSkucmV0dXJuY29kZQorCisgICAgZGVmIGZldGNoKHNlbGYsIGJyYW5jaCwgcmVtb3RlPSdvcmln aW4nKToKKyAgICAgICAgcmV0dXJuIHJ1bigKKyAgICAgICAgICAgIFtzZWxmLmV4ZWN1dGFibGUo KSwgJ2ZldGNoJywgcmVtb3RlLCAne306e30nLmZvcm1hdChicmFuY2gsIGJyYW5jaCldLAorICAg ICAgICAgICAgY3dkPXNlbGYucm9vdF9wYXRoLAorICAgICAgICApLnJldHVybmNvZGUKKwogICAg IGRlZiBwdWxsKHNlbGYsIHJlYmFzZT1Ob25lLCBicmFuY2g9Tm9uZSwgcmVtb3RlPSdvcmlnaW4n KToKICAgICAgICAgY29tbWl0ID0gc2VsZi5jb21taXQoKSBpZiBzZWxmLmlzX3N2biBvciBicmFu Y2ggZWxzZSBOb25lCiAgICAgICAgIGNvZGUgPSBydW4oCkBAIC04MTEsMTIgKzg1NiwxMSBAQCBj bGFzcyBHaXQoU2NtKToKICAgICAgICAgICAgICAgICBbXSBpZiByZWJhc2UgaXMgTm9uZSBlbHNl IFsnLS1yZWJhc2U9e30nLmZvcm1hdCgnVHJ1ZScgaWYgcmViYXNlIGVsc2UgJ0ZhbHNlJyldCiAg ICAgICAgICAgICApLCBjd2Q9c2VsZi5yb290X3BhdGgsCiAgICAgICAgICkucmV0dXJuY29kZQor ICAgICAgICBpZiBzZWxmLmNhY2hlIGFuZCByZWJhc2UgYW5kIGJyYW5jaCAhPSBzZWxmLmJyYW5j aDoKKyAgICAgICAgICAgIHNlbGYuY2FjaGUuY2xlYXIoc2VsZi5icmFuY2gpCiAKICAgICAgICAg aWYgbm90IGNvZGUgYW5kIGJyYW5jaDoKLSAgICAgICAgICAgIGNvZGUgPSBydW4oCi0gICAgICAg ICAgICAgICAgW3NlbGYuZXhlY3V0YWJsZSgpLCAnZmV0Y2gnLCByZW1vdGUsICd7fTp7fScuZm9y bWF0KGJyYW5jaCwgYnJhbmNoKV0sCi0gICAgICAgICAgICAgICAgY3dkPXNlbGYucm9vdF9wYXRo LAotICAgICAgICAgICAgKS5yZXR1cm5jb2RlCisgICAgICAgICAgICBjb2RlID0gc2VsZi5mZXRj aChicmFuY2g9YnJhbmNoLCByZW1vdGU9cmVtb3RlKQogCiAgICAgICAgIGlmIG5vdCBjb2RlIGFu ZCBicmFuY2ggYW5kIHJlYmFzZToKICAgICAgICAgICAgIHJlc3VsdCA9IHJ1bihbc2VsZi5leGVj dXRhYmxlKCksICdyZXYtcGFyc2UnLCAnSEVBRCddLCBjd2Q9c2VsZi5yb290X3BhdGgsIGNhcHR1 cmVfb3V0cHV0PVRydWUsIGVuY29kaW5nPSd1dGYtOCcpCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9naXQucHkg Yi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9s b2NhbC9naXQucHkKaW5kZXggNGM3ZWJmM2IzY2QzMWZhZTY0ZDVmMjAyZWVjZmFkYTE3ODI4NDdh My4uYmUwNGYxY2VmZmZkMTU1Nzk1NTkxNTU0ZTZmN2MyYjI5NDY0NWExOSAxMDA2NDQKLS0tIGEv VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9j YWwvZ2l0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L21vY2tzL2xvY2FsL2dpdC5weQpAQCAtNDM0LDYgKzQzNCwxMCBAQCBub3RoaW5nIHRv IGNvbW1pdCwgd29ya2luZyB0cmVlIGNsZWFuCiAgICAgICAgICAgICAgICAgc2VsZi5leGVjdXRh YmxlLCAnZmV0Y2gnLCAnb3JpZ2luJywgcmUuY29tcGlsZShyJy4rOi4rJyksCiAgICAgICAgICAg ICAgICAgY3dkPXNlbGYucGF0aCwKICAgICAgICAgICAgICAgICBnZW5lcmF0b3I9bGFtYmRhICph cmdzLCAqKmt3YXJnczogbW9ja3MuUHJvY2Vzc0NvbXBsZXRpb24ocmV0dXJuY29kZT0wKSwKKyAg ICAgICAgICAgICksIG1vY2tzLlN1YnByb2Nlc3MuUm91dGUoCisgICAgICAgICAgICAgICAgc2Vs Zi5leGVjdXRhYmxlLCAncmViYXNlJywgJy0tb250bycsIHJlLmNvbXBpbGUocicuKycpLCByZS5j b21waWxlKHInLisnKSwgcmUuY29tcGlsZShyJy4rJyksCisgICAgICAgICAgICAgICAgY3dkPXNl bGYucGF0aCwKKyAgICAgICAgICAgICAgICBnZW5lcmF0b3I9bGFtYmRhICphcmdzLCAqKmt3YXJn czogc2VsZi5yZWJhc2UoYXJnc1szXSwgYXJnc1s0XSwgYXJnc1s1XSksCiAgICAgICAgICAgICAp LCBtb2Nrcy5TdWJwcm9jZXNzLlJvdXRlKAogICAgICAgICAgICAgICAgIHNlbGYuZXhlY3V0YWJs ZSwKICAgICAgICAgICAgICAgICBjd2Q9c2VsZi5wYXRoLApAQCAtNzc4LDMgKzc4MiwxMiBAQCBu b3RoaW5nIHRvIGNvbW1pdCwgd29ya2luZyB0cmVlIGNsZWFuCiAgICAgICAgICAgICBzZWxmLnN0 YWdlZFtrZXldID0gdmFsdWUKICAgICAgICAgc2VsZi5tb2RpZmllZCA9IHt9CiAgICAgICAgIHJl dHVybiBtb2Nrcy5Qcm9jZXNzQ29tcGxldGlvbihyZXR1cm5jb2RlPTApCisKKyAgICBkZWYgcmVi YXNlKHNlbGYsIHRhcmdldCwgYmFzZSwgaGVhZCk6CisgICAgICAgIGlmIHRhcmdldCBub3QgaW4g c2VsZi5jb21taXRzIG9yIGJhc2Ugbm90IGluIHNlbGYuY29tbWl0cyBvciBoZWFkIG5vdCBpbiBz ZWxmLmNvbW1pdHM6CisgICAgICAgICAgICByZXR1cm4gbW9ja3MuUHJvY2Vzc0NvbXBsZXRpb24o cmV0dXJuY29kZT0xKQorICAgICAgICBmb3IgY29tbWl0IGluIHNlbGYuY29tbWl0c1toZWFkXToK KyAgICAgICAgICAgIGNvbW1pdC5icmFuY2hfcG9pbnQgPSBzZWxmLmNvbW1pdHNbdGFyZ2V0XVst MV0uYnJhbmNoX3BvaW50IG9yIHNlbGYuY29tbWl0c1t0YXJnZXRdWy0xXS5pZGVudGlmaWVyCisg ICAgICAgICAgICBpZiBzZWxmLmNvbW1pdHNbdGFyZ2V0XVstMV0uYnJhbmNoX3BvaW50OgorICAg ICAgICAgICAgICAgIGNvbW1pdC5pZGVudGlmaWVyICs9IHNlbGYuY29tbWl0c1t0YXJnZXRdWy0x XS5pZGVudGlmaWVyCisgICAgICAgIHJldHVybiBtb2Nrcy5Qcm9jZXNzQ29tcGxldGlvbihyZXR1 cm5jb2RlPTApCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9wcm9ncmFtL3B1bGxfcmVxdWVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vcHVsbF9yZXF1ZXN0LnB5Cmlu ZGV4IDdjOWFkMjRlM2IzNDI2NmI2NzNkNTU1YThmZjliMzZiZjA5ZDFkOTkuLjA4ZmM1MTYxMjU1 ZGYyMmEyYmE5NDNmYzkxNGIxN2FkZWFjODQwN2YgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vcHVsbF9yZXF1ZXN0LnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3By b2dyYW0vcHVsbF9yZXF1ZXN0LnB5CkBAIC0xMDYsNiArMTA2LDcgQEAgY2xhc3MgUHVsbFJlcXVl c3QoQ29tbWFuZCk6CiAgICAgICAgICAgICAgICAgc3lzLnN0ZGVyci53cml0ZSgiRmFpbGVkIHRv IHJlYmFzZSAne30nIG9uICd7fSwnIHBsZWFzZSByZXNvbHZlIGNvbmZsaWN0c1xuIi5mb3JtYXQo cmVwb3NpdG9yeS5icmFuY2gsIGJyYW5jaF9wb2ludC5icmFuY2gpKQogICAgICAgICAgICAgICAg IHJldHVybiAxCiAgICAgICAgICAgICBsb2cud2FybmluZygiUmViYXNlZCAne30nIG9uICd7fSEn Ii5mb3JtYXQocmVwb3NpdG9yeS5icmFuY2gsIGJyYW5jaF9wb2ludC5icmFuY2gpKQorICAgICAg ICAgICAgYnJhbmNoX3BvaW50ID0gQnJhbmNoLmJyYW5jaF9wb2ludChyZXBvc2l0b3J5KQogCiAg ICAgICAgIHJtdCA9IHJlcG9zaXRvcnkucmVtb3RlKCkKICAgICAgICAgaWYgbm90IHJtdDoKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3QucHkKaW5kZXggNDQ4MGM5MzY4MDM0MmJh MjZmZjFhYTUwZTI1MTVlZjQwMzNmZjk5My4uNmU0MTBmNmQzMzUxMzc1NGY4MWU3ZjI3NTA3MzIz MGJjOWY5MWRjYSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3QucHkKQEAg LTQ3Niw2ICs0NzYsMTMgQEAgQ29tbWl0RGF0ZToge3RpbWVfY30KICAgICAgICAgICAgIG1yZXBv LnN0YWdlZFsnbW9kaWZpZWQudHh0J10gPSAnZGlmZicKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwocmVwby5tb2RpZmllZChzdGFnZWQ9VHJ1ZSksIFsnYWRkZWQudHh0JywgJ21vZGlmaWVk LnR4dCddKQogCisgICAgZGVmIHRlc3RfcmViYXNlKHNlbGYpOgorICAgICAgICB3aXRoIG1vY2tz LmxvY2FsLkdpdChzZWxmLnBhdGgpOgorICAgICAgICAgICAgcmVwbyA9IGxvY2FsLkdpdChzZWxm LnBhdGgpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHN0cihyZXBvLmNvbW1pdChicmFu Y2g9J2JyYW5jaC1hJykpLCAnMi4yQGJyYW5jaC1hJykKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwocmVwby5yZWJhc2UodGFyZ2V0PSdtYWluJywgYmFzZT0nbWFpbicsIGhlYWQ9J2JyYW5j aC1hJywgcmVjb21taXQ9RmFsc2UpLCAwKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChz dHIocmVwby5jb21taXQoYnJhbmNoPSdicmFuY2gtYScpKSwgJzUuMkBicmFuY2gtYScpCisKIAog Y2xhc3MgVGVzdEdpdEh1Yih0ZXN0aW5nLlRlc3RDYXNlKToKICAgICByZW1vdGUgPSAnaHR0cHM6 Ly9naXRodWIuZXhhbXBsZS5jb20vV2ViS2l0L1dlYktpdCcKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvcHVsbF9yZXF1ZXN0 X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvdGVzdC9wdWxsX3JlcXVlc3RfdW5pdHRlc3QucHkKaW5kZXggYjE1ZjMwMDBlMzEwOTlk ZmRmYjdjMmNjOTA5NjZjZTViMDRhOGRmYi4uZWMxNTZiOWM1NWZiZGYzMmQxN2M3ODk2OGI5Y2E5 YzBkMjRjMzBiZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvdGVzdC9wdWxsX3JlcXVlc3RfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9wdWxsX3JlcXVl c3RfdW5pdHRlc3QucHkKQEAgLTI4OCw3ICsyODgsOCBAQCBjbGFzcyBUZXN0RG9QdWxsUmVxdWVz dCh0ZXN0aW5nLlBhdGhUZXN0Q2FzZSk6CiBDcmVhdGluZyBjb21taXQuLi4KICAgICBGb3VuZCAx IGNvbW1pdC4uLgogUmViYXNpbmcgJ2VuZy9wci1icmFuY2gnIG9uICdtYWluJy4uLgotUmViYXNl ZCAnZW5nL3ByLWJyYW5jaCcgb24gJ21haW4hJyIiIikKK1JlYmFzZWQgJ2VuZy9wci1icmFuY2gn IG9uICdtYWluIScKKyAgICBGb3VuZCAxIGNvbW1pdC4uLiIiIikKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChjYXB0dXJlZC5zdGRlcnIuZ2V0dmFsdWUoKSwgIid7fScgZG9lc24ndCBoYXZlIGEg cmVjb2duaXplZCByZW1vdGVcbiIuZm9ybWF0KHNlbGYucGF0aCkpCiAKICAgICBkZWYgdGVzdF9t b2RpZmllZChzZWxmKToKQEAgLTMxMCw3ICszMTEsOCBAQCBSZWJhc2VkICdlbmcvcHItYnJhbmNo JyBvbiAnbWFpbiEnIiIiKQogQ3JlYXRpbmcgY29tbWl0Li4uCiAgICAgRm91bmQgMSBjb21taXQu Li4KIFJlYmFzaW5nICdlbmcvcHItYnJhbmNoJyBvbiAnbWFpbicuLi4KLVJlYmFzZWQgJ2VuZy9w ci1icmFuY2gnIG9uICdtYWluISciIiIpCitSZWJhc2VkICdlbmcvcHItYnJhbmNoJyBvbiAnbWFp biEnCisgICAgRm91bmQgMSBjb21taXQuLi4iIiIpCiAKICAgICBkZWYgdGVzdF9naXRodWIoc2Vs Zik6CiAgICAgICAgIHdpdGggT3V0cHV0Q2FwdHVyZSgpIGFzIGNhcHR1cmVkLCBtb2Nrcy5yZW1v dGUuR2l0SHViKCkgYXMgcmVtb3RlLCBcCkBAIC0zMzEsNiArMzMzLDcgQEAgUmViYXNlZCAnZW5n L3ByLWJyYW5jaCcgb24gJ21haW4hJyIiIikKICAgICAgICAgICAgICAgICAnICAgIEZvdW5kIDEg Y29tbWl0Li4uJywKICAgICAgICAgICAgICAgICAiUmViYXNpbmcgJ2VuZy9wci1icmFuY2gnIG9u ICdtYWluJy4uLiIsCiAgICAgICAgICAgICAgICAgIlJlYmFzZWQgJ2VuZy9wci1icmFuY2gnIG9u ICdtYWluISciLAorICAgICAgICAgICAgICAgICIgICAgRm91bmQgMSBjb21taXQuLi4iLAogICAg ICAgICAgICAgICAgICJQdXNoaW5nICdlbmcvcHItYnJhbmNoJyB0byAnZm9yaycuLi4iLAogICAg ICAgICAgICAgICAgICJDcmVhdGluZyBwdWxsLXJlcXVlc3QgZm9yICdlbmcvcHItYnJhbmNoJy4u LiIsCiAgICAgICAgICAgICAgICAgIkNyZWF0ZWQgJ1BSIDEgfCBDcmVhdGVkIGNvbW1pdCchIiwK QEAgLTM2Miw2ICszNjUsNyBAQCBSZWJhc2VkICdlbmcvcHItYnJhbmNoJyBvbiAnbWFpbiEnIiIi KQogICAgICAgICAgICAgICAgICcgICAgRm91bmQgMSBjb21taXQuLi4nLAogICAgICAgICAgICAg ICAgICJSZWJhc2luZyAnZW5nL3ByLWJyYW5jaCcgb24gJ21haW4nLi4uIiwKICAgICAgICAgICAg ICAgICAiUmViYXNlZCAnZW5nL3ByLWJyYW5jaCcgb24gJ21haW4hJyIsCisgICAgICAgICAgICAg ICAgIiAgICBGb3VuZCAxIGNvbW1pdC4uLiIsCiAgICAgICAgICAgICAgICAgIlB1c2hpbmcgJ2Vu Zy9wci1icmFuY2gnIHRvICdmb3JrJy4uLiIsCiAgICAgICAgICAgICAgICAgIlVwZGF0aW5nIHB1 bGwtcmVxdWVzdCBmb3IgJ2VuZy9wci1icmFuY2gnLi4uIiwKICAgICAgICAgICAgICAgICAiVXBk YXRlZCAnUFIgMSB8IEFtZW5kZWQgY29tbWl0JyEiLApAQCAtMzg4LDYgKzM5Miw3IEBAIFJlYmFz ZWQgJ2VuZy9wci1icmFuY2gnIG9uICdtYWluISciIiIpCiAgICAgICAgICAgICAgICAgJyAgICBG b3VuZCAxIGNvbW1pdC4uLicsCiAgICAgICAgICAgICAgICAgIlJlYmFzaW5nICdlbmcvcHItYnJh bmNoJyBvbiAnbWFpbicuLi4iLAogICAgICAgICAgICAgICAgICJSZWJhc2VkICdlbmcvcHItYnJh bmNoJyBvbiAnbWFpbiEnIiwKKyAgICAgICAgICAgICAgICAiICAgIEZvdW5kIDEgY29tbWl0Li4u IiwKICAgICAgICAgICAgICAgICAiUHVzaGluZyAnZW5nL3ByLWJyYW5jaCcgdG8gJ29yaWdpbicu Li4iLAogICAgICAgICAgICAgICAgICJDcmVhdGluZyBwdWxsLXJlcXVlc3QgZm9yICdlbmcvcHIt YnJhbmNoJy4uLiIsCiAgICAgICAgICAgICAgICAgIkNyZWF0ZWQgJ1BSIDEgfCBDcmVhdGVkIGNv bW1pdCchIiwKQEAgLTQyMCw2ICs0MjUsNyBAQCBSZWJhc2VkICdlbmcvcHItYnJhbmNoJyBvbiAn bWFpbiEnIiIiKQogICAgICAgICAgICAgICAgICcgICAgRm91bmQgMSBjb21taXQuLi4nLAogICAg ICAgICAgICAgICAgICJSZWJhc2luZyAnZW5nL3ByLWJyYW5jaCcgb24gJ21haW4nLi4uIiwKICAg ICAgICAgICAgICAgICAiUmViYXNlZCAnZW5nL3ByLWJyYW5jaCcgb24gJ21haW4hJyIsCisgICAg ICAgICAgICAgICAgIiAgICBGb3VuZCAxIGNvbW1pdC4uLiIsCiAgICAgICAgICAgICAgICAgIlB1 c2hpbmcgJ2VuZy9wci1icmFuY2gnIHRvICdvcmlnaW4nLi4uIiwKICAgICAgICAgICAgICAgICAi VXBkYXRpbmcgcHVsbC1yZXF1ZXN0IGZvciAnZW5nL3ByLWJyYW5jaCcuLi4iLAogICAgICAgICAg ICAgICAgICJVcGRhdGVkICdQUiAxIHwgQW1lbmRlZCBjb21taXQnISIsCg==