198517 2019-06-03 22:39:11 -0700 Make it possible for validate-committer-lists to dump a mailmap file 2019-06-13 14:23:28 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton ap commit-queue ews-watchlist glenn simon.fraser webkit-bug-importer oldest_to_newest 1541460 0 thorton 2019-06-03 22:39:11 -0700 Make it possible for validate-committer-lists to dump a mailmap file 1541461 1 371249 thorton 2019-06-03 22:39:57 -0700 Created attachment 371249 Patch 1541463 2 ews-watchlist 2019-06-03 22:43:14 -0700 Attachment 371249 did not pass style-queue: ERROR: Tools/Scripts/webkitpy/common/config/contributors.json:0: contributors.json should not be modified through the commit queue [json/syntax] [5] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1541464 3 thorton 2019-06-03 22:56:45 -0700 e.g. before: Author: rniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> After: Author: Ryosuke Niwa <rniwa@webkit.org> 1541546 4 371249 ap 2019-06-04 07:01:35 -0700 Comment on attachment 371249 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=371249&action=review > Tools/Scripts/webkitpy/common/config/contributors.json:6042 > + "youenn.fablet@crf.canon.fr" So one thing I’m unsure of is whether secondary emails in contributors.json can be used to set cq+ in bugzilla. If so, then adding historical emails that people no longer control (old employers, expired domains) is not good. 1541687 5 thorton 2019-06-04 12:16:52 -0700 (In reply to Alexey Proskuryakov from comment #4) > Comment on attachment 371249 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=371249&action=review > > > Tools/Scripts/webkitpy/common/config/contributors.json:6042 > > + "youenn.fablet@crf.canon.fr" > > So one thing I’m unsure of is whether secondary emails in contributors.json > can be used to set cq+ in bugzilla. If so, then adding historical emails > that people no longer control (old employers, expired domains) is not good. Good question! Will have to check; could always add a “retired” addresses section. 1544393 6 372034 thorton 2019-06-13 01:57:20 -0700 Created attachment 372034 Patch 1544394 7 thorton 2019-06-13 01:57:25 -0700 OK, let's start with just the mailman part, we can add more addresses later. 1544571 8 372034 simon.fraser 2019-06-13 12:58:28 -0700 Comment on attachment 372034 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372034&action=review > Tools/Scripts/validate-committer-lists:342 > + return "<{0}@268f45cc-cd09-0410-ab3c-d52691b4dbfc>".format(email) Huh? 1544589 9 thorton 2019-06-13 13:51:29 -0700 (In reply to Simon Fraser (smfr) from comment #8) > Comment on attachment 372034 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=372034&action=review > > > Tools/Scripts/validate-committer-lists:342 > > + return "<{0}@268f45cc-cd09-0410-ab3c-d52691b4dbfc>".format(email) > > Huh? It's some hash of something that git-svn uses to identify the (svn.webkit.org) origin, as far as I can tell. It's stable and consistent for our Git mirror. 1544600 10 372034 commit-queue 2019-06-13 14:22:28 -0700 Comment on attachment 372034 Patch Clearing flags on attachment: 372034 Committed r246414: <https://trac.webkit.org/changeset/246414> 1544601 11 commit-queue 2019-06-13 14:22:29 -0700 All reviewed patches have been landed. Closing bug. 1544602 12 webkit-bug-importer 2019-06-13 14:23:28 -0700 <rdar://problem/51722355> 371249 2019-06-03 22:39:57 -0700 2019-06-13 01:57:19 -0700 Patch bug-198517-20190603223956.patch text/plain 10406 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MDEzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjg4MzQ5MDMzY2VlYzcyOGJkY2QyYjI4ZDkyMjcyNTQ5 ZTBjNjc0Yy4uMjVhM2NjZWRhMjUzYmUyN2Q5ZGVhODEzYmEzMTcxNTgxNjIzOWY5MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMw IEBACisyMDE5LTA2LTAzICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgor CisgICAgICAgIE1ha2UgaXQgcG9zc2libGUgZm9yIHZhbGlkYXRlLWNvbW1pdHRlci1saXN0cyB0 byBkdW1wIGEgbWFpbG1hcCBmaWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTg1MTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBNYWlsbWFwcyB3aWxkbHkgaW1wcm92ZSB0aGUgb3V0cHV0IG9mIHZhcmlv dXMgR2l0IHRvb2xzLCBpbmNsdWRpbmcKKyAgICAgICAgYGdpdCBzaG9ydGxvZyAtc25lYCwgbWFw cGluZyBjb21taXR0ZXJzIHRvIG91ciBjYW5vbmljYWwgbmFtZS9lbWFpbCBwYWlyLgorCisgICAg ICAgICogU2NyaXB0cy92YWxpZGF0ZS1jb21taXR0ZXItbGlzdHM6CisgICAgICAgIChDb21taXR0 ZXJMaXN0RnJvbUdpdCk6CisgICAgICAgIChDb21taXR0ZXJMaXN0QnVnemlsbGFDaGVja2VyLnBy aW50X2NvbW1pdHRlcnNfd2l0aF9pbnZhbGlkX2J1Z3ppbGxhX2VtYWlscyk6CisgICAgICAgIEFk ZCBzb21lIG1pc3NpbmcgbGVnYWN5IHVzZXJuYW1lIG1hcHBpbmdzLgorCisgICAgICAgIChkdW1w X21haWxtYXApOgorICAgICAgICAoZHVtcF9tYWlsbWFwLmZvcm1hdF9lbWFpbCk6CisgICAgICAg IChkdW1wX21haWxtYXAuZm9ybWF0X2VtYWlsX3dpdGhfZ2l0c3ZuX3V1aWQpOgorICAgICAgICAo ZHVtcF9tYWlsbWFwLm1hcF9lbWFpbHNfdG9fbGVnYWN5X3VzZXJuYW1lKToKKyAgICAgICAgKG1h aW4pOgorICAgICAgICBBZGQgYHZhbGlkYXRlLWNvbW1pdHRlci1saXN0cyAtLWR1bXAtbWFpbG1h cGAsIHdoaWNoIGdlbmVyYXRlcworICAgICAgICBvbmUgZ2l2ZW4gY29tbWl0dGVycy5qc29uIGFu ZCB0aGUgZXhpc3RpbmcgbWFwcGluZyBvZiBsZWdhY3kgdXNlcm5hbWUKKyAgICAgICAgdG8gZW1h aWwgYWRkcmVzc2VzIHRoYXQgZXhpc3RzIGluIHZhbGlkYXRlLWNvbW1pdHRlci1saXN0cy4KKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb250cmlidXRvcnMuanNv bjoKKyAgICAgICAgQWRkIHNvbWUgaGlzdG9yaWNhbCBlbWFpbCBhZGRyZXNzZXMgZm9yIHBlb3Bs ZSBhcyBhbGlhc2VzIHRvIGltcHJvdmUgbWFwcGluZy4KKwogMjAxOS0wNS0zMSAgU2lodWkgTGl1 ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBUZXN0V2ViS2l0QVBJLldLV2ViVmll dy5Mb2NhbFN0b3JhZ2VQcm9jZXNzU3VzcGVuZHMgaXMgZmxha3kKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvdmFsaWRhdGUtY29tbWl0dGVyLWxpc3RzIGIvVG9vbHMvU2NyaXB0cy92YWxpZGF0 ZS1jb21taXR0ZXItbGlzdHMKaW5kZXggMGJhNGI3ZWQzMTE1MDc3MDg3NTQ4NTE0N2YyMzk5MTQ3 N2E2N2VjNS4uMmQ5YzRlZTBjNjM2Y2JlM2I3MTI4YjdkZTI3YzEzNmU3NzE0ODM1OCAxMDA3NTUK LS0tIGEvVG9vbHMvU2NyaXB0cy92YWxpZGF0ZS1jb21taXR0ZXItbGlzdHMKKysrIGIvVG9vbHMv U2NyaXB0cy92YWxpZGF0ZS1jb21taXR0ZXItbGlzdHMKQEAgLTEyMSwyMCArMTIxLDM5IEBAIGNs YXNzIENvbW1pdHRlckxpc3RGcm9tTWFpbGluZ0xpc3Qob2JqZWN0KToKIAogY2xhc3MgQ29tbWl0 dGVyTGlzdEZyb21HaXQob2JqZWN0KToKICAgICBsb2dpbl90b19lbWFpbF9hZGRyZXNzID0gewor ICAgICAgICAnYWJvdWxlJyA6ICdhYm91bGVAYXBwbGUuY29tJywKKyAgICAgICAgJ2FkYWNoYW4n IDogJ2FkYWNoYW5AYXBwbGUuY29tJywKKyAgICAgICAgJ2FkZWxlJyA6ICdhZGVsZUBhcHBsZS5j b20nLAogICAgICAgICAnYWxpY2VsaTEnIDogJ2FsaWNlLmxpdUBhcHBsZS5jb20nLAorICAgICAg ICAnYWxwJyA6ICdhbHBAbnVhbnRpLmNvbScsCisgICAgICAgICdhbmRlcnNjYScgOiAnYW5kZXJz Y2FAYXBwbGUuY29tJywKKyAgICAgICAgJ2FudHRpJyA6ICdrb2l2aXN0b0Bpa2kuZmknLAorICAg ICAgICAnYXAnIDogJ2FwQHdlYmtpdC5vcmcnLAorICAgICAgICAnYXJvYmVuJyA6ICdhcm9iZW5A d2Via2l0Lm9yZycsCisgICAgICAgICdiZGFraW4nIDogJ2JkYWtpbkBhcHBsZS5jb20nLAogICAg ICAgICAnYmRhc2gnIDogJ21yb3dlQGFwcGxlLmNvbScsCiAgICAgICAgICdiZGliZWxsbycgOiAn YmRpYmVsbG9AYXBwbGUuY29tJywgIyBCcnVjZSBEaUJlbGxvLCBvbmx5IDQgY29tbWl0czogcjEw MDIzLCByOTU0OCwgcjk1MzgsIHI5NTM1CisgICAgICAgICdiZWlkc29uJyA6ICdiZWlkc29uQGFw cGxlLmNvbScsCiAgICAgICAgICdjYmx1JyA6ICdjYmx1QGFwcGxlLmNvbScsCiAgICAgICAgICdj cGV0ZXJzZScgOiAnY3BldGVyc2VuQGFwcGxlLmNvbScsCisgICAgICAgICdkYXJpbicgOiAnZGFy aW5AYXBwbGUuY29tJywKKyAgICAgICAgJ2Rka2lsemVyJyA6ICdkZGtpbHplckB3ZWJraXQub3Jn JywKKyAgICAgICAgJ2RzbWl0aCcgOiAnY2F0ZmlzaC5tYW5AZ21haWwuY29tJywKICAgICAgICAg J2VzZWlkZWwnIDogJ2VyaWNAd2Via2l0Lm9yZycsCiAgICAgICAgICdnZGVubmlzJyA6ICdnZGVu bmlzQHdlYmtpdC5vcmcnLAorICAgICAgICAnZ2dhcmVuJyA6ICdnZ2FyZW5AYXBwbGUuY29tJywK ICAgICAgICAgJ2dvbGRzbWl0JyA6ICdnb2xkc21pdEBhcHBsZS5jb20nLCAjIERlYmJpZSBHb2xk c21pdGgsIG9ubHkgb25lIGNvbW1pdCByODgzOQogICAgICAgICAnZ3JhbXBzJyA6ICdncmFtcHNA YXBwbGUuY29tJywKKyAgICAgICAgJ2hhcnJpc29uJyA6ICdoYXJyaXNvbkBhcHBsZS5jb20nLAor ICAgICAgICAnaGF1c21hbm4nIDogJ2hhdXNtYW5uQHdlYmtpdC5vcmcnLAogICAgICAgICAnaG9u ZXljdXR0JyA6ICdqaG9uZXljdXR0QGFwcGxlLmNvbScsCisgICAgICAgICdoeWF0dCcgOiAnaHlh dHRAYXBwbGUuY29tJywKICAgICAgICAgJ2pkZXZhbGsnIDogJ2pvb3N0QHdlYmtpdC5vcmcnLAog ICAgICAgICAnamVucycgOiAnamVuc0BhcHBsZS5jb20nLAogICAgICAgICAnanVzdGluZycgOiAn anVzdGluLmdhcmNpYUBhcHBsZS5jb20nLAogICAgICAgICAna2FsaScgOiAna2FsaUBhcHBsZS5j b20nLCAjIENocmlzdHkgV2FycmVuLCBkaWQgQklESSB3b3JrLCA1IGNvbW1pdHM6IHI4ODE1LCBy ODgwMiwgcjg4MDEsIHI4NzkxLCByODc3Mywgcjg2MDMKKyAgICAgICAgJ2tkZWNrZXInIDogJ2tk ZWNrZXJAYXBwbGUuY29tJywKKyAgICAgICAgJ2tldmlubycgOiAna2V2aW5vQHRoZW9sbGl2aWVy cy5jb20nLAogICAgICAgICAna2prJyA6ICdra293YWxjenlrQGdtYWlsLmNvbScsCiAgICAgICAg ICdrbWNjdWxsbycgOiAna21jY3VsbG91Z2hAYXBwbGUuY29tJywKICAgICAgICAgJ2tvY2llbmRh JyA6ICdrb2NpZW5kYUBhcHBsZS5jb20nLApAQCAtMTQzLDE4ICsxNjIsMzAgQEAgY2xhc3MgQ29t bWl0dGVyTGlzdEZyb21HaXQob2JqZWN0KToKICAgICAgICAgJ2x3ZWludHJhdWInIDogJ2x3ZWlu dHJhdWJAYXBwbGUuY29tJywKICAgICAgICAgJ2x5cGFub3YnIDogJ2x5cGFub3ZAa2RlLm9yZycs CiAgICAgICAgICdtaGF5JyA6ICdtaGF5QGFwcGxlLmNvbScsICMgTWlrZSBIYXksIDMgY29tbWl0 czogcjM4MTMsIHIyNTUyLCByMjU0OAorICAgICAgICAnbWl0eicgOiAnbWl0ekB3ZWJraXQub3Jn JywKKyAgICAgICAgJ21qcycgOiAnbWpzQGFwcGxlLmNvbScsCisgICAgICAgICdvbGl2ZXInIDog J29saXZlckBhcHBsZS5jb20nLAogICAgICAgICAnb3VjaCcgOiAnb3VjaEBhcHBsZS5jb20nLCAj IEpvaG4gTG91Y2gKKyAgICAgICAgJ3Bld3Rlcm1vb3NlJyA6ICdkZXYrd2Via2l0QG1hdHRsaWxl ay5jb20nLAogICAgICAgICAncHllaCcgOiAncGF0dGlAYXBwbGUuY29tJywgIyBQYXR0aSBZZWgs IGRpZCBWb2ljZU92ZXIgd29yayBpbiBXZWJLaXQKICAgICAgICAgJ3JqdycgOiAncmp3QGFwcGxl LmNvbScsCisgICAgICAgICdyd2xidWlzJyA6ICdyd2xidWlzQGdtYWlsLmNvbScsCiAgICAgICAg ICdzZWFuZ2llcycgOiAnc2VhbmdpZXNAYXBwbGUuY29tJywgIyBTZWFuIEdpZXM/LCBvbmx5IDUg Y29tbWl0czogcjE2NjAwLCByMTY1OTIsIHIxNjUxMSwgcjE2NDg5LCByMTY0ODQKKyAgICAgICAg J3NmYWxrZW4nIDogJ3NmYWxrZW5AYXBwbGUuY29tJywKICAgICAgICAgJ3NoZXJpZGFuJyA6ICdz aGVyaWRhbkBhcHBsZS5jb20nLCAjIFNoZWxseSBTaGVyaWRhbgorICAgICAgICAnc2xld2lzJyA6 ICdzbGV3aXNAYXBwbGUuY29tJywKKyAgICAgICAgJ3N0YWlrb3MnIDogJ3N0YWlrb3NAa2RlLm9y ZycsCisgICAgICAgICdzdWxsaXZhbicgOiAnc3VsbGl2YW5AYXBwbGUuY29tJywKICAgICAgICAg J3RoYXRjaGVyJyA6ICd0aW1vdGh5QGFwcGxlLmNvbScsCiAgICAgICAgICd0b21lcm5pYycgOiAn dGltb0BhcHBsZS5jb20nLAorICAgICAgICAndHJlYXQnIDogJ21hbnlvc29AeWFob28uY29tJywK ICAgICAgICAgJ3RyZXknIDogJ3RyZXlAdXNhLm5ldCcsCiAgICAgICAgICd0cmlzdGFuJyA6ICd0 cmlzdGFuQGFwcGxlLmNvbScsCiAgICAgICAgICd2aWNraScgOiAndmlja2lAYXBwbGUuY29tJywK ICAgICAgICAgJ3ZvYXMnIDogJ3ZvYXNAYXBwbGUuY29tJywgIyBFZCBWb2FzLCBkaWQgc29tZSBD YXJib24gd29yayBpbiBXZWJLaXQKKyAgICAgICAgJ3dlaW5pZycgOiAnc2FtQHdlYmtpdC5vcmcn LAogICAgICAgICAnemFjaycgOiAnemFja0BrZGUub3JnJywKKyAgICAgICAgJ3plY2tlJyA6ICd6 ZWNrZUBzZWxmaXNoLm9yZycsCiAgICAgICAgICd6aW1tZXJtYW5uJyA6ICd6aW1tZXJtYW5uQHdl YmtpdC5vcmcnLAogICAgIH0KIApAQCAtMzAzLDEwICszMzQsNDAgQEAgY2xhc3MgQ29tbWl0dGVy TGlzdEJ1Z3ppbGxhQ2hlY2tlcihvYmplY3QpOgogICAgICAgICBwcmludF9saXN0X2lmX25vbl9l bXB0eSgiQ29tbWl0dGVycyB3aXRoIGludmFsaWQgYnVnemlsbGEgZW1haWw6IiwgY29tbWl0dGVy c193aXRoX2ludmFsaWRfYnVnemlsbGFfZW1haWwpCiAKIAorZGVmIGR1bXBfbWFpbG1hcChjb21t aXR0ZXJfbGlzdCk6CisgICAgZGVmIGZvcm1hdF9lbWFpbChlbWFpbCk6CisgICAgICAgIHJldHVy biAiPHswfT4iLmZvcm1hdChlbWFpbCkKKworICAgIGRlZiBmb3JtYXRfZW1haWxfd2l0aF9naXRz dm5fdXVpZChlbWFpbCk6CisgICAgICAgIHJldHVybiAiPHswfUAyNjhmNDVjYy1jZDA5LTA0MTAt YWIzYy1kNTI2OTFiNGRiZmM+Ii5mb3JtYXQoZW1haWwpICAgICAgICAKKworICAgIGVtYWlsX3Rv X2xlZ2FjeV91c2VybmFtZSA9IGRpY3QobWFwKHJldmVyc2VkLCBDb21taXR0ZXJMaXN0RnJvbUdp dC5sb2dpbl90b19lbWFpbF9hZGRyZXNzLml0ZW1zKCkpKQorICAgIGRlZiBtYXBfZW1haWxzX3Rv X2xlZ2FjeV91c2VybmFtZShlbWFpbHMpOgorICAgICAgICBsZWdhY3lfdXNlcm5hbWUgPSBOb25l CisgICAgICAgIGZvciBlbWFpbCBpbiBlbWFpbHM6CisgICAgICAgICAgICBsZWdhY3lfdXNlcm5h bWUgPSBlbWFpbF90b19sZWdhY3lfdXNlcm5hbWUuZ2V0KGVtYWlsKQorICAgICAgICAgICAgaWYg bGVnYWN5X3VzZXJuYW1lOgorICAgICAgICAgICAgICAgIGJyZWFrCisgICAgICAgIHJldHVybiBs ZWdhY3lfdXNlcm5hbWUKKworICAgIGZvciBjb250cmlidXRvciBpbiBjb21taXR0ZXJfbGlzdC5j b250cmlidXRvcnMoKToKKyAgICAgICAgZnVsbF9uYW1lID0gY29udHJpYnV0b3IuZnVsbF9uYW1l LmVuY29kZSgidXRmLTgiKQorICAgICAgICBjYW5vbmljYWxfZW1haWwgPSBjb250cmlidXRvci5i dWd6aWxsYV9lbWFpbCgpCisgICAgICAgIG90aGVyX2VtYWlscyA9IGNvbnRyaWJ1dG9yLmVtYWls cworICAgICAgICBsZWdhY3lfdXNlcm5hbWUgPSBtYXBfZW1haWxzX3RvX2xlZ2FjeV91c2VybmFt ZShjb250cmlidXRvci5lbWFpbHMpCisgICAgICAgIGlmIGxlZ2FjeV91c2VybmFtZToKKyAgICAg ICAgICAgIG90aGVyX2VtYWlscy5hcHBlbmQobGVnYWN5X3VzZXJuYW1lKQorCisgICAgICAgIGZv ciBvdGhlcl9lbWFpbCBpbiBvdGhlcl9lbWFpbHM6CisgICAgICAgICAgICBwcmludCBmdWxsX25h bWUsIGZvcm1hdF9lbWFpbChjYW5vbmljYWxfZW1haWwpLCBmb3JtYXRfZW1haWwob3RoZXJfZW1h aWwpCisgICAgICAgICAgICBwcmludCBmdWxsX25hbWUsIGZvcm1hdF9lbWFpbChjYW5vbmljYWxf ZW1haWwpLCBmb3JtYXRfZW1haWxfd2l0aF91dWlkKG90aGVyX2VtYWlsKQorCisKIGRlZiBtYWlu KCk6CiAgICAgcGFyc2VyID0gT3B0aW9uUGFyc2VyKCkKICAgICBwYXJzZXIuYWRkX29wdGlvbigi LWIiLCAiLS1jaGVjay1idWd6aWxsYS1lbWFpbHMiLCBhY3Rpb249InN0b3JlX3RydWUiLCBoZWxw PSJDaGVjayB0aGUgYnVnemlsbGFfZW1haWwgZm9yIGVhY2ggY29tbWl0dGVyIGFnYWluc3QgYnVn cy53ZWJraXQub3JnIikKICAgICBwYXJzZXIuYWRkX29wdGlvbigiLWQiLCAiLS1kdW1wIiwgYWN0 aW9uPSJzdG9yZV90cnVlIiwgaGVscD0iRHVtcCB0aGUgY29udHJpYnV0b3IgbGlzdCBhcyBKU09O IHRvIHN0ZG91dCAoc3VpdGFibGUgZm9yIHNhdmluZyB0byBjb250cmlidXRvcnMuanNvbikiKQor ICAgIHBhcnNlci5hZGRfb3B0aW9uKCItLWR1bXAtbWFpbG1hcCIsIGFjdGlvbj0ic3RvcmVfdHJ1 ZSIsIGhlbHA9IkR1bXAgdGhlIGNvbnRyaWJ1dG9yIGxpc3QgYXMgYSBHaXQgTWFpbG1hcCB0byBz dGRvdXQiKQogICAgIHBhcnNlci5hZGRfb3B0aW9uKCItYyIsICItLWNhbm9uaWNhbGl6ZSIsIGFj dGlvbj0ic3RvcmVfdHJ1ZSIsIGhlbHA9IkNhbm9uaWNhbGl6ZSBjb250cmlidXRvcnMuanNvbiwg cmV3cml0aW5nIGl0IGluLXBsYWNlIikKIAogICAgIChvcHRpb25zLCBhcmdzKSA9IHBhcnNlci5w YXJzZV9hcmdzKCkKQEAgLTMxNCwxMyArMzc1LDE3IEBAIGRlZiBtYWluKCk6CiAgICAgY29tbWl0 dGVyX2xpc3QgPSBDb21taXR0ZXJMaXN0KCkKICAgICBpZiBvcHRpb25zLmR1bXA6CiAgICAgICAg IHByaW50IGNvbW1pdHRlcl9saXN0LmFzX2pzb24oKQotICAgICAgICByZXR1cm4gMDsKKyAgICAg ICAgcmV0dXJuIDAKKworICAgIGlmIG9wdGlvbnMuZHVtcF9tYWlsbWFwOgorICAgICAgICBkdW1w X21haWxtYXAoY29tbWl0dGVyX2xpc3QpCisgICAgICAgIHJldHVybiAwCiAKICAgICBpZiBvcHRp b25zLmNhbm9uaWNhbGl6ZToKICAgICAgICAgcHJpbnQgIlVwZGF0aW5nIGNvbnRyaWJ1dG9ycy5q c29uIGluLXBsYWNlLi4uIgogICAgICAgICBjb21taXR0ZXJfbGlzdC5yZWZvcm1hdF9pbl9wbGFj ZSgpCiAgICAgICAgIHByaW50ICJEb25lIgotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0 dXJuIDAKIAogICAgIENvbW1pdHRlckxpc3RGcm9tTWFpbGluZ0xpc3QoKS5jaGVja19mb3JfZW1h aWxzX21pc3NpbmdfZnJvbV9saXN0KGNvbW1pdHRlcl9saXN0KQogIApkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL2NvbnRyaWJ1dG9ycy5qc29uIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL2NvbnRyaWJ1dG9ycy5qc29uCmluZGV4 IDgyOGUxYjBlZTc5NzU1OWZmM2VlOWYxNDkzY2UwZjBiMGEzODJkNDEuLmU5Y2YxMTFlN2M0MTMz YjFhZGIxMDYzMGJhYzk5YmI3ZTIxMjk2NjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL2NvbmZpZy9jb250cmlidXRvcnMuanNvbgorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29udHJpYnV0b3JzLmpzb24KQEAgLTExOTAsNyArMTE5 MCw4IEBACiAgICB9LAogICAgIkNoYW5nU2VvayBPaCIgOiB7CiAgICAgICAiZW1haWxzIiA6IFsK LSAgICAgICAgICJjaGFuZ3Nlb2tAd2Via2l0Lm9yZyIKKyAgICAgICAgICJjaGFuZ3Nlb2tAd2Vi a2l0Lm9yZyIsCisgICAgICAgICAiY2hhbmdzZW9rLm9oQGNvbGxhYm9yYS5jb20iCiAgICAgICBd LAogICAgICAgImV4cGVydGlzZSIgOiAiVGhlIFdlYktpdEdUSysgcG9ydCwgSC9XIGFjY2VsZXJh dGlvbiwgTGF5b3V0IGFuZCBSZW5kZXJpbmciLAogICAgICAgIm5pY2tzIiA6IFsKQEAgLTI3ODUs NyArMjc4Niw4IEBACiAgICB9LAogICAgIkphc29uIExpdSIgOiB7CiAgICAgICAiZW1haWxzIiA6 IFsKLSAgICAgICAgICJqYXNvbmxpdXdlYmtpdEBnbWFpbC5jb20iCisgICAgICAgICAiamFzb25s aXV3ZWJraXRAZ21haWwuY29tIiwKKyAgICAgICAgICJqYXNvbi5saXVAdG9yY2htb2JpbGUuY29t LmNuIgogICAgICAgXSwKICAgICAgICJuaWNrcyIgOiBbCiAgICAgICAgICAiamFzb25saXUiCkBA IC0zNzY5LDcgKzM3NzEsOCBAQAogICAgICAgICAgImxlb3lhbmdAcmltLmNvbSIsCiAgICAgICAg ICAibGVveWFuZ0BibGFja2JlcnJ5LmNvbSIsCiAgICAgICAgICAibGVveWFuZ0B3ZWJraXQub3Jn IiwKLSAgICAgICAgICJsZW95YW5nLndlYmtpdEBnbWFpbC5jb20iCisgICAgICAgICAibGVveWFu Zy53ZWJraXRAZ21haWwuY29tIiwKKyAgICAgICAgICJsZW8ueWFuZ0B0b3JjaG1vYmlsZS5jb20u Y24iCiAgICAgICBdLAogICAgICAgImV4cGVydGlzZSIgOiAiVGhlIEJsYWNrQmVycnkgUG9ydCIs CiAgICAgICAibmlja3MiIDogWwpAQCAtMzgwNyw3ICszODEwLDggQEAKICAgIH0sCiAgICAiTGlu ZyBIbyIgOiB7CiAgICAgICAiZW1haWxzIiA6IFsKLSAgICAgICAgICJsaW5naG9AYXBwbGUuY29t IgorICAgICAgICAgImxpbmdob0BhcHBsZS5jb20iLAorICAgICAgICAgImxpbmdjaGVyZF9ob0Bh cHBsZS5jb20iCiAgICAgICBdLAogICAgICAgImV4cGVydGlzZSIgOiAid2Via2l0Lm9yZyBhZG1p biIKICAgIH0sCkBAIC00MDIwLDcgKzQwMjQsOCBAQAogICAgIk1hcnkgV3UiIDogewogICAgICAg ImVtYWlscyIgOiBbCiAgICAgICAgICAibWF3dUBibGFja2JlcnJ5LmNvbSIsCi0gICAgICAgICAi d3dlbmR5MjAwN0BnbWFpbC5jb20iCisgICAgICAgICAid3dlbmR5MjAwN0BnbWFpbC5jb20iLAor ICAgICAgICAgIm1hcnkud3VAdG9yY2htb2JpbGUuY29tLmNuIgogICAgICAgXSwKICAgICAgICJu aWNrcyIgOiBbCiAgICAgICAgICAibWFyeXd1IgpAQCAtNjAzMyw3ICs2MDM4LDggQEAKICAgICAg ICJlbWFpbHMiIDogWwogICAgICAgICAgInlvdWVubmZAZ21haWwuY29tIiwKICAgICAgICAgICJ5 b3Vlbm5AYXBwbGUuY29tIiwKLSAgICAgICAgICJ5ZmFibGV0QGFwcGxlLmNvbSIKKyAgICAgICAg ICJ5ZmFibGV0QGFwcGxlLmNvbSIsCisgICAgICAgICAieW91ZW5uLmZhYmxldEBjcmYuY2Fub24u ZnIiCiAgICAgICBdLAogICAgICAgIm5pY2tzIiA6IFsKICAgICAgICAgICJ5b3Vlbm4iCmRpZmYg LS1naXQgYS8uZ2l0aWdub3JlIGIvLmdpdGlnbm9yZQppbmRleCA4ZWNkYmViNGI4Y2JlNmVkZmI5 ODY0YjQ4MjNmM2E2YWUyMGM1NDJhLi41ZGEyYzJkN2EwNTJlYzAxZGVmMzFhZTA0Zjk0ODRkODMx ODBiMmIzIDEwMDY0NAotLS0gYS8uZ2l0aWdub3JlCisrKyBiLy5naXRpZ25vcmUKQEAgLTExLDYg KzExLDcgQEAgYnVpbGQvCiBhdXRvaW5zdGFsbC5jYWNoZS5kCiBwcm9qZWN0Lnhjd29ya3NwYWNl CiB4Y3VzZXJkYXRhCisubWFpbG1hcAogCiAjIElnbm9yZSBhdXRvLWdlbmVyYXRlZCBmaWxlcyBi eSBWUyAmIFZTQ29kZS4KICoudmNwcm9qLioudXNlcgpkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIv Q2hhbmdlTG9nCmluZGV4IDRmYjQ2NDUyMWQ5NTExMTQ2MWU3YjNhN2QxYjEzMWEyMjZjN2ExNjUu LmUzYzY1NzA5ZTNiN2E2Njc0YzcxOTY5NzBhNzNmZTQ5Y2FmMjc2MmEgMTAwNjQ0Ci0tLSBhL0No YW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxOS0wNi0wMyAgVGlt IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIGl0IHBv c3NpYmxlIGZvciB2YWxpZGF0ZS1jb21taXR0ZXItbGlzdHMgdG8gZHVtcCBhIG1haWxtYXAgZmls ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4NTE3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiAuZ2l0 aWdub3JlOgorICAgICAgICBJZ25vcmUgLm1haWxtYXAgZmlsZXMuCisKIDIwMTktMDUtMzAgIERv biBPbG1zdGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNvbT4KIAogICAgICAgICBbQ01ha2VdIEFk ZCBXRUJLSVRfRlJBTUVXT1JLX1RBUkdFVCBtYWNybwo= 372034 2019-06-13 01:57:20 -0700 2019-06-13 14:22:28 -0700 Patch bug-198517-20190613015720.patch text/plain 8377 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2Mzk3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTFhYjAxOGJlY2NkZjQ2Njc5ZGJmOTQyNmE4Njk4YmM1 MTJlM2E2MS4uMzlkZDY3Yzk5ZGNhZmU0YmRmOTZjNjk2MDNkMjQwMmQ2NzJiNDIyMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDE5LTA2LTEzICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgor CisgICAgICAgIE1ha2UgaXQgcG9zc2libGUgZm9yIHZhbGlkYXRlLWNvbW1pdHRlci1saXN0cyB0 byBkdW1wIGEgbWFpbG1hcCBmaWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTg1MTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBNYWlsbWFwcyB3aWxkbHkgaW1wcm92ZSB0aGUgb3V0cHV0IG9mIHZhcmlv dXMgR2l0IHRvb2xzLCBpbmNsdWRpbmcKKyAgICAgICAgYGdpdCBzaG9ydGxvZyAtc25lYCwgbWFw cGluZyBjb21taXR0ZXJzIHRvIG91ciBjYW5vbmljYWwgbmFtZS9lbWFpbCBwYWlyLgorCisgICAg ICAgICogU2NyaXB0cy92YWxpZGF0ZS1jb21taXR0ZXItbGlzdHM6CisgICAgICAgIChDb21taXR0 ZXJMaXN0RnJvbUdpdCk6CisgICAgICAgIChDb21taXR0ZXJMaXN0QnVnemlsbGFDaGVja2VyLnBy aW50X2NvbW1pdHRlcnNfd2l0aF9pbnZhbGlkX2J1Z3ppbGxhX2VtYWlscyk6CisgICAgICAgIEFk ZCBzb21lIG1pc3NpbmcgbGVnYWN5IHVzZXJuYW1lIG1hcHBpbmdzLgorCisgICAgICAgIChkdW1w X21haWxtYXApOgorICAgICAgICAoZHVtcF9tYWlsbWFwLmZvcm1hdF9lbWFpbCk6CisgICAgICAg IChkdW1wX21haWxtYXAuZm9ybWF0X2VtYWlsX3dpdGhfZ2l0c3ZuX3V1aWQpOgorICAgICAgICAo ZHVtcF9tYWlsbWFwLm1hcF9lbWFpbHNfdG9fbGVnYWN5X3VzZXJuYW1lKToKKyAgICAgICAgKG1h aW4pOgorICAgICAgICBBZGQgYHZhbGlkYXRlLWNvbW1pdHRlci1saXN0cyAtLWR1bXAtbWFpbG1h cGAsIHdoaWNoIGdlbmVyYXRlcworICAgICAgICBvbmUgZ2l2ZW4gY29tbWl0dGVycy5qc29uIGFu ZCB0aGUgZXhpc3RpbmcgbWFwcGluZyBvZiBsZWdhY3kgdXNlcm5hbWUKKyAgICAgICAgdG8gZW1h aWwgYWRkcmVzc2VzIHRoYXQgZXhpc3RzIGluIHZhbGlkYXRlLWNvbW1pdHRlci1saXN0cy4KKwog MjAxOS0wNi0xMiAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAg ICAgUmVwbGFjZSBkb3VibGUtcXVvdGVzIHdpdGggc2luZ2xlIHF1b3RlcyBpbiBsb2FkQ29uZmln LnB5CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3ZhbGlkYXRlLWNvbW1pdHRlci1saXN0cyBi L1Rvb2xzL1NjcmlwdHMvdmFsaWRhdGUtY29tbWl0dGVyLWxpc3RzCmluZGV4IDBiYTRiN2VkMzEx NTA3NzA4NzU0ODUxNDdmMjM5OTE0NzdhNjdlYzUuLjJkOWM0ZWUwYzYzNmNiZTNiNzEyOGI3ZGUy N2MxMzZlNzcxNDgzNTggMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvdmFsaWRhdGUtY29tbWl0 dGVyLWxpc3RzCisrKyBiL1Rvb2xzL1NjcmlwdHMvdmFsaWRhdGUtY29tbWl0dGVyLWxpc3RzCkBA IC0xMjEsMjAgKzEyMSwzOSBAQCBjbGFzcyBDb21taXR0ZXJMaXN0RnJvbU1haWxpbmdMaXN0KG9i amVjdCk6CiAKIGNsYXNzIENvbW1pdHRlckxpc3RGcm9tR2l0KG9iamVjdCk6CiAgICAgbG9naW5f dG9fZW1haWxfYWRkcmVzcyA9IHsKKyAgICAgICAgJ2Fib3VsZScgOiAnYWJvdWxlQGFwcGxlLmNv bScsCisgICAgICAgICdhZGFjaGFuJyA6ICdhZGFjaGFuQGFwcGxlLmNvbScsCisgICAgICAgICdh ZGVsZScgOiAnYWRlbGVAYXBwbGUuY29tJywKICAgICAgICAgJ2FsaWNlbGkxJyA6ICdhbGljZS5s aXVAYXBwbGUuY29tJywKKyAgICAgICAgJ2FscCcgOiAnYWxwQG51YW50aS5jb20nLAorICAgICAg ICAnYW5kZXJzY2EnIDogJ2FuZGVyc2NhQGFwcGxlLmNvbScsCisgICAgICAgICdhbnR0aScgOiAn a29pdmlzdG9AaWtpLmZpJywKKyAgICAgICAgJ2FwJyA6ICdhcEB3ZWJraXQub3JnJywKKyAgICAg ICAgJ2Fyb2JlbicgOiAnYXJvYmVuQHdlYmtpdC5vcmcnLAorICAgICAgICAnYmRha2luJyA6ICdi ZGFraW5AYXBwbGUuY29tJywKICAgICAgICAgJ2JkYXNoJyA6ICdtcm93ZUBhcHBsZS5jb20nLAog ICAgICAgICAnYmRpYmVsbG8nIDogJ2JkaWJlbGxvQGFwcGxlLmNvbScsICMgQnJ1Y2UgRGlCZWxs bywgb25seSA0IGNvbW1pdHM6IHIxMDAyMywgcjk1NDgsIHI5NTM4LCByOTUzNQorICAgICAgICAn YmVpZHNvbicgOiAnYmVpZHNvbkBhcHBsZS5jb20nLAogICAgICAgICAnY2JsdScgOiAnY2JsdUBh cHBsZS5jb20nLAogICAgICAgICAnY3BldGVyc2UnIDogJ2NwZXRlcnNlbkBhcHBsZS5jb20nLAor ICAgICAgICAnZGFyaW4nIDogJ2RhcmluQGFwcGxlLmNvbScsCisgICAgICAgICdkZGtpbHplcicg OiAnZGRraWx6ZXJAd2Via2l0Lm9yZycsCisgICAgICAgICdkc21pdGgnIDogJ2NhdGZpc2gubWFu QGdtYWlsLmNvbScsCiAgICAgICAgICdlc2VpZGVsJyA6ICdlcmljQHdlYmtpdC5vcmcnLAogICAg ICAgICAnZ2Rlbm5pcycgOiAnZ2Rlbm5pc0B3ZWJraXQub3JnJywKKyAgICAgICAgJ2dnYXJlbicg OiAnZ2dhcmVuQGFwcGxlLmNvbScsCiAgICAgICAgICdnb2xkc21pdCcgOiAnZ29sZHNtaXRAYXBw bGUuY29tJywgIyBEZWJiaWUgR29sZHNtaXRoLCBvbmx5IG9uZSBjb21taXQgcjg4MzkKICAgICAg ICAgJ2dyYW1wcycgOiAnZ3JhbXBzQGFwcGxlLmNvbScsCisgICAgICAgICdoYXJyaXNvbicgOiAn aGFycmlzb25AYXBwbGUuY29tJywKKyAgICAgICAgJ2hhdXNtYW5uJyA6ICdoYXVzbWFubkB3ZWJr aXQub3JnJywKICAgICAgICAgJ2hvbmV5Y3V0dCcgOiAnamhvbmV5Y3V0dEBhcHBsZS5jb20nLAor ICAgICAgICAnaHlhdHQnIDogJ2h5YXR0QGFwcGxlLmNvbScsCiAgICAgICAgICdqZGV2YWxrJyA6 ICdqb29zdEB3ZWJraXQub3JnJywKICAgICAgICAgJ2plbnMnIDogJ2plbnNAYXBwbGUuY29tJywK ICAgICAgICAgJ2p1c3RpbmcnIDogJ2p1c3Rpbi5nYXJjaWFAYXBwbGUuY29tJywKICAgICAgICAg J2thbGknIDogJ2thbGlAYXBwbGUuY29tJywgIyBDaHJpc3R5IFdhcnJlbiwgZGlkIEJJREkgd29y aywgNSBjb21taXRzOiByODgxNSwgcjg4MDIsIHI4ODAxLCByODc5MSwgcjg3NzMsIHI4NjAzCisg ICAgICAgICdrZGVja2VyJyA6ICdrZGVja2VyQGFwcGxlLmNvbScsCisgICAgICAgICdrZXZpbm8n IDogJ2tldmlub0B0aGVvbGxpdmllcnMuY29tJywKICAgICAgICAgJ2tqaycgOiAna2tvd2FsY3p5 a0BnbWFpbC5jb20nLAogICAgICAgICAna21jY3VsbG8nIDogJ2ttY2N1bGxvdWdoQGFwcGxlLmNv bScsCiAgICAgICAgICdrb2NpZW5kYScgOiAna29jaWVuZGFAYXBwbGUuY29tJywKQEAgLTE0Mywx OCArMTYyLDMwIEBAIGNsYXNzIENvbW1pdHRlckxpc3RGcm9tR2l0KG9iamVjdCk6CiAgICAgICAg ICdsd2VpbnRyYXViJyA6ICdsd2VpbnRyYXViQGFwcGxlLmNvbScsCiAgICAgICAgICdseXBhbm92 JyA6ICdseXBhbm92QGtkZS5vcmcnLAogICAgICAgICAnbWhheScgOiAnbWhheUBhcHBsZS5jb20n LCAjIE1pa2UgSGF5LCAzIGNvbW1pdHM6IHIzODEzLCByMjU1MiwgcjI1NDgKKyAgICAgICAgJ21p dHonIDogJ21pdHpAd2Via2l0Lm9yZycsCisgICAgICAgICdtanMnIDogJ21qc0BhcHBsZS5jb20n LAorICAgICAgICAnb2xpdmVyJyA6ICdvbGl2ZXJAYXBwbGUuY29tJywKICAgICAgICAgJ291Y2gn IDogJ291Y2hAYXBwbGUuY29tJywgIyBKb2huIExvdWNoCisgICAgICAgICdwZXd0ZXJtb29zZScg OiAnZGV2K3dlYmtpdEBtYXR0bGlsZWsuY29tJywKICAgICAgICAgJ3B5ZWgnIDogJ3BhdHRpQGFw cGxlLmNvbScsICMgUGF0dGkgWWVoLCBkaWQgVm9pY2VPdmVyIHdvcmsgaW4gV2ViS2l0CiAgICAg ICAgICdyancnIDogJ3Jqd0BhcHBsZS5jb20nLAorICAgICAgICAncndsYnVpcycgOiAncndsYnVp c0BnbWFpbC5jb20nLAogICAgICAgICAnc2VhbmdpZXMnIDogJ3NlYW5naWVzQGFwcGxlLmNvbScs ICMgU2VhbiBHaWVzPywgb25seSA1IGNvbW1pdHM6IHIxNjYwMCwgcjE2NTkyLCByMTY1MTEsIHIx NjQ4OSwgcjE2NDg0CisgICAgICAgICdzZmFsa2VuJyA6ICdzZmFsa2VuQGFwcGxlLmNvbScsCiAg ICAgICAgICdzaGVyaWRhbicgOiAnc2hlcmlkYW5AYXBwbGUuY29tJywgIyBTaGVsbHkgU2hlcmlk YW4KKyAgICAgICAgJ3NsZXdpcycgOiAnc2xld2lzQGFwcGxlLmNvbScsCisgICAgICAgICdzdGFp a29zJyA6ICdzdGFpa29zQGtkZS5vcmcnLAorICAgICAgICAnc3VsbGl2YW4nIDogJ3N1bGxpdmFu QGFwcGxlLmNvbScsCiAgICAgICAgICd0aGF0Y2hlcicgOiAndGltb3RoeUBhcHBsZS5jb20nLAog ICAgICAgICAndG9tZXJuaWMnIDogJ3RpbW9AYXBwbGUuY29tJywKKyAgICAgICAgJ3RyZWF0JyA6 ICdtYW55b3NvQHlhaG9vLmNvbScsCiAgICAgICAgICd0cmV5JyA6ICd0cmV5QHVzYS5uZXQnLAog ICAgICAgICAndHJpc3RhbicgOiAndHJpc3RhbkBhcHBsZS5jb20nLAogICAgICAgICAndmlja2kn IDogJ3ZpY2tpQGFwcGxlLmNvbScsCiAgICAgICAgICd2b2FzJyA6ICd2b2FzQGFwcGxlLmNvbScs ICMgRWQgVm9hcywgZGlkIHNvbWUgQ2FyYm9uIHdvcmsgaW4gV2ViS2l0CisgICAgICAgICd3ZWlu aWcnIDogJ3NhbUB3ZWJraXQub3JnJywKICAgICAgICAgJ3phY2snIDogJ3phY2tAa2RlLm9yZycs CisgICAgICAgICd6ZWNrZScgOiAnemVja2VAc2VsZmlzaC5vcmcnLAogICAgICAgICAnemltbWVy bWFubicgOiAnemltbWVybWFubkB3ZWJraXQub3JnJywKICAgICB9CiAKQEAgLTMwMywxMCArMzM0 LDQwIEBAIGNsYXNzIENvbW1pdHRlckxpc3RCdWd6aWxsYUNoZWNrZXIob2JqZWN0KToKICAgICAg ICAgcHJpbnRfbGlzdF9pZl9ub25fZW1wdHkoIkNvbW1pdHRlcnMgd2l0aCBpbnZhbGlkIGJ1Z3pp bGxhIGVtYWlsOiIsIGNvbW1pdHRlcnNfd2l0aF9pbnZhbGlkX2J1Z3ppbGxhX2VtYWlsKQogCiAK K2RlZiBkdW1wX21haWxtYXAoY29tbWl0dGVyX2xpc3QpOgorICAgIGRlZiBmb3JtYXRfZW1haWwo ZW1haWwpOgorICAgICAgICByZXR1cm4gIjx7MH0+Ii5mb3JtYXQoZW1haWwpCisKKyAgICBkZWYg Zm9ybWF0X2VtYWlsX3dpdGhfZ2l0c3ZuX3V1aWQoZW1haWwpOgorICAgICAgICByZXR1cm4gIjx7 MH1AMjY4ZjQ1Y2MtY2QwOS0wNDEwLWFiM2MtZDUyNjkxYjRkYmZjPiIuZm9ybWF0KGVtYWlsKSAg ICAgICAgCisKKyAgICBlbWFpbF90b19sZWdhY3lfdXNlcm5hbWUgPSBkaWN0KG1hcChyZXZlcnNl ZCwgQ29tbWl0dGVyTGlzdEZyb21HaXQubG9naW5fdG9fZW1haWxfYWRkcmVzcy5pdGVtcygpKSkK KyAgICBkZWYgbWFwX2VtYWlsc190b19sZWdhY3lfdXNlcm5hbWUoZW1haWxzKToKKyAgICAgICAg bGVnYWN5X3VzZXJuYW1lID0gTm9uZQorICAgICAgICBmb3IgZW1haWwgaW4gZW1haWxzOgorICAg ICAgICAgICAgbGVnYWN5X3VzZXJuYW1lID0gZW1haWxfdG9fbGVnYWN5X3VzZXJuYW1lLmdldChl bWFpbCkKKyAgICAgICAgICAgIGlmIGxlZ2FjeV91c2VybmFtZToKKyAgICAgICAgICAgICAgICBi cmVhaworICAgICAgICByZXR1cm4gbGVnYWN5X3VzZXJuYW1lCisKKyAgICBmb3IgY29udHJpYnV0 b3IgaW4gY29tbWl0dGVyX2xpc3QuY29udHJpYnV0b3JzKCk6CisgICAgICAgIGZ1bGxfbmFtZSA9 IGNvbnRyaWJ1dG9yLmZ1bGxfbmFtZS5lbmNvZGUoInV0Zi04IikKKyAgICAgICAgY2Fub25pY2Fs X2VtYWlsID0gY29udHJpYnV0b3IuYnVnemlsbGFfZW1haWwoKQorICAgICAgICBvdGhlcl9lbWFp bHMgPSBjb250cmlidXRvci5lbWFpbHMKKyAgICAgICAgbGVnYWN5X3VzZXJuYW1lID0gbWFwX2Vt YWlsc190b19sZWdhY3lfdXNlcm5hbWUoY29udHJpYnV0b3IuZW1haWxzKQorICAgICAgICBpZiBs ZWdhY3lfdXNlcm5hbWU6CisgICAgICAgICAgICBvdGhlcl9lbWFpbHMuYXBwZW5kKGxlZ2FjeV91 c2VybmFtZSkKKworICAgICAgICBmb3Igb3RoZXJfZW1haWwgaW4gb3RoZXJfZW1haWxzOgorICAg ICAgICAgICAgcHJpbnQgZnVsbF9uYW1lLCBmb3JtYXRfZW1haWwoY2Fub25pY2FsX2VtYWlsKSwg Zm9ybWF0X2VtYWlsKG90aGVyX2VtYWlsKQorICAgICAgICAgICAgcHJpbnQgZnVsbF9uYW1lLCBm b3JtYXRfZW1haWwoY2Fub25pY2FsX2VtYWlsKSwgZm9ybWF0X2VtYWlsX3dpdGhfdXVpZChvdGhl cl9lbWFpbCkKKworCiBkZWYgbWFpbigpOgogICAgIHBhcnNlciA9IE9wdGlvblBhcnNlcigpCiAg ICAgcGFyc2VyLmFkZF9vcHRpb24oIi1iIiwgIi0tY2hlY2stYnVnemlsbGEtZW1haWxzIiwgYWN0 aW9uPSJzdG9yZV90cnVlIiwgaGVscD0iQ2hlY2sgdGhlIGJ1Z3ppbGxhX2VtYWlsIGZvciBlYWNo IGNvbW1pdHRlciBhZ2FpbnN0IGJ1Z3Mud2Via2l0Lm9yZyIpCiAgICAgcGFyc2VyLmFkZF9vcHRp b24oIi1kIiwgIi0tZHVtcCIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGhlbHA9IkR1bXAgdGhlIGNv bnRyaWJ1dG9yIGxpc3QgYXMgSlNPTiB0byBzdGRvdXQgKHN1aXRhYmxlIGZvciBzYXZpbmcgdG8g Y29udHJpYnV0b3JzLmpzb24pIikKKyAgICBwYXJzZXIuYWRkX29wdGlvbigiLS1kdW1wLW1haWxt YXAiLCBhY3Rpb249InN0b3JlX3RydWUiLCBoZWxwPSJEdW1wIHRoZSBjb250cmlidXRvciBsaXN0 IGFzIGEgR2l0IE1haWxtYXAgdG8gc3Rkb3V0IikKICAgICBwYXJzZXIuYWRkX29wdGlvbigiLWMi LCAiLS1jYW5vbmljYWxpemUiLCBhY3Rpb249InN0b3JlX3RydWUiLCBoZWxwPSJDYW5vbmljYWxp emUgY29udHJpYnV0b3JzLmpzb24sIHJld3JpdGluZyBpdCBpbi1wbGFjZSIpCiAKICAgICAob3B0 aW9ucywgYXJncykgPSBwYXJzZXIucGFyc2VfYXJncygpCkBAIC0zMTQsMTMgKzM3NSwxNyBAQCBk ZWYgbWFpbigpOgogICAgIGNvbW1pdHRlcl9saXN0ID0gQ29tbWl0dGVyTGlzdCgpCiAgICAgaWYg b3B0aW9ucy5kdW1wOgogICAgICAgICBwcmludCBjb21taXR0ZXJfbGlzdC5hc19qc29uKCkKLSAg ICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiAwCisKKyAgICBpZiBvcHRpb25zLmR1bXBf bWFpbG1hcDoKKyAgICAgICAgZHVtcF9tYWlsbWFwKGNvbW1pdHRlcl9saXN0KQorICAgICAgICBy ZXR1cm4gMAogCiAgICAgaWYgb3B0aW9ucy5jYW5vbmljYWxpemU6CiAgICAgICAgIHByaW50ICJV cGRhdGluZyBjb250cmlidXRvcnMuanNvbiBpbi1wbGFjZS4uLiIKICAgICAgICAgY29tbWl0dGVy X2xpc3QucmVmb3JtYXRfaW5fcGxhY2UoKQogICAgICAgICBwcmludCAiRG9uZSIKLSAgICAgICAg cmV0dXJuIDA7CisgICAgICAgIHJldHVybiAwCiAKICAgICBDb21taXR0ZXJMaXN0RnJvbU1haWxp bmdMaXN0KCkuY2hlY2tfZm9yX2VtYWlsc19taXNzaW5nX2Zyb21fbGlzdChjb21taXR0ZXJfbGlz dCkKICAKZGlmZiAtLWdpdCBhLy5naXRpZ25vcmUgYi8uZ2l0aWdub3JlCmluZGV4IDhlY2RiZWI0 YjhjYmU2ZWRmYjk4NjRiNDgyM2YzYTZhZTIwYzU0MmEuLjVkYTJjMmQ3YTA1MmVjMDFkZWYzMWFl MDRmOTQ4NGQ4MzE4MGIyYjMgMTAwNjQ0Ci0tLSBhLy5naXRpZ25vcmUKKysrIGIvLmdpdGlnbm9y ZQpAQCAtMTEsNiArMTEsNyBAQCBidWlsZC8KIGF1dG9pbnN0YWxsLmNhY2hlLmQKIHByb2plY3Qu eGN3b3Jrc3BhY2UKIHhjdXNlcmRhdGEKKy5tYWlsbWFwCiAKICMgSWdub3JlIGF1dG8tZ2VuZXJh dGVkIGZpbGVzIGJ5IFZTICYgVlNDb2RlLgogKi52Y3Byb2ouKi51c2VyCmRpZmYgLS1naXQgYS9D aGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXggNDJhMmY3NWQ3YWNkYTFjNzNiMTNjNWI4MDRjZDkw YzQ2MzE3MjE3MC4uODM0NmE2MjY4YzA2Y2NmZmEyMDg3MDU0MDUxMzZiNGNiYzQ4NDY2NyAxMDA2 NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE5 LTA2LTEzICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAg IE1ha2UgaXQgcG9zc2libGUgZm9yIHZhbGlkYXRlLWNvbW1pdHRlci1saXN0cyB0byBkdW1wIGEg bWFpbG1hcCBmaWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTg1MTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIC5naXRpZ25vcmU6CisgICAgICAgIElnbm9yZSAubWFpbG1hcCBmaWxlcy4KKwogMjAx OS0wNi0xMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW0dUS10gUmVtb3ZlIG9wdGlvbiBSRURJUkVDVEVEX1hDT01QT1NJVEVfV0lORE9XCg==