213088 2020-06-11 11:59:58 -0700 Style checker should check for non-inclusive terminology 2021-05-17 16:13:19 -0700 1 1 1 Unclassified WebKit Tools / Tests Safari Technology Preview Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 213092 1 simon.fraser aakash_jain aakash_jain ap bdakin darin ews-watchlist glenn jbedard ryanhaddad simon.fraser webkit-bug-importer oldest_to_newest 1661681 0 simon.fraser 2020-06-11 11:59:58 -0700 The style checker should point out uses of non-inclusive terminology in patches, specifically blacklist/whitelist, master/slave. 1661744 1 jbedard 2020-06-11 14:41:59 -0700 (In reply to Simon Fraser (smfr) from comment #0) > The style checker should point out uses of non-inclusive terminology in > patches, specifically blacklist/whitelist, master/slave. Removing 'slave' references requires transitioning to buildbot 0.9, if I recall (although Aakash is expert here) Removing 'master' references is not something I think we can reasonably track in this bug, as newer versions of buildbot still use it to refer to the 'build-master'. Any generalized git tooling will also use 'master' to refer to the default branch since that's what the vast majority of projects use to refer to their primary branch. 1661845 2 simon.fraser 2020-06-11 20:40:51 -0700 Let's start with blacklist/whitelist. 1760854 3 428859 aakash_jain 2021-05-17 13:28:00 -0700 Created attachment 428859 Patch 1760855 4 aakash_jain 2021-05-17 13:30:00 -0700 Style EWS failure in https://ews-build.webkit.org/#/builders/6/builds/47628 is expected (and shows that this code is working). 1760856 5 428859 jbedard 2021-05-17 13:32:17 -0700 Comment on attachment 428859 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=428859&action=review > Tools/Scripts/webkitpy/style/checkers/inclusive_language.py:37 > + 'Line contains non-inclusive term.') Can we print the term considered non-inclusive here too? 1760878 6 428867 aakash_jain 2021-05-17 14:09:15 -0700 Created attachment 428867 Patch 1760879 7 aakash_jain 2021-05-17 14:10:19 -0700 (In reply to Jonathan Bedard from comment #5) > Can we print the term considered non-inclusive here too? Done in updated patch. 1760928 8 ews-feeder 2021-05-17 16:12:50 -0700 Committed r277612 (237827@main): <https://commits.webkit.org/237827@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428867. 1760929 9 webkit-bug-importer 2021-05-17 16:13:19 -0700 <rdar://problem/78127249> 428859 2021-05-17 13:28:00 -0700 2021-05-17 14:09:11 -0700 Patch bug-213088-20210517162759.patch text/plain 10096 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3NzYwMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIyIEBACisyMDIxLTA1LTE3ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBTdHlsZSBjaGVja2VyIHNob3VsZCBjaGVjayBmb3Igbm9uLWluY2x1c2l2 ZSB0ZXJtaW5vbG9neQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjEzMDg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgU3R5bGUgY2hlY2tlciBzaG91bGQgY2hlY2sgZm9yIG5vbi1pbmNsdXNpdmUgdGVybWlu b2xvZ3kgc28gdGhhdCB3ZSBjYW4gYXZvaWQgdW5pbnRlbnRpb25hbCBhZGRpdGlvbgorICAgICAg ICBvZiBub24taW5jbHVzaXZlIHRlcm1pbm9sb2d5IGluIG91ciBjb2RlYmFzZS4KKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2luY2x1c2l2ZV9sYW5ndWFnZS5weTog QWRkZWQgaW5jbHVzaXZlIGxhbmd1YWdlIGNoZWNrZXIuCisgICAgICAgIChJbmNsdXNpdmVMYW5n dWFnZUNoZWNrZXIpOgorICAgICAgICAoSW5jbHVzaXZlTGFuZ3VhZ2VDaGVja2VyLmNoZWNrKToK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NoYW5nZWxvZy5weTog Q2hlY2sgZm9yIGluY2x1c2l2ZSBsYW5ndWFnZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L3N0eWxlL2NoZWNrZXJzL2NwcC5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9jaGVja2Vycy9qcy5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9jaGVja2Vycy9weXRob24ucHk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvc3R5bGUvY2hlY2tlcnMvdGV4dC5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy9y ZXBvcnQtbm9uLWluY2x1c2l2ZS1sYW5ndWFnZTogSWdub3JlIHRoZSBuZXdseSBhZGRlZCBpbmNs dXNpdmVfbGFuZ3VhZ2UucHkgZmlsZS4KKwogMjAyMS0wNS0xNSAgSmVyIE5vYmxlICA8amVyLm5v YmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBNZWRpYVNlc3Npb25Db29yZGluYXRvciBzdXJ2aXZl cyBwYWdlIHJlbG9hZC9uYXZpZ2F0aW9uCkluZGV4OiBUb29scy9TY3JpcHRzL3JlcG9ydC1ub24t aW5jbHVzaXZlLWxhbmd1YWdlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvcmVwb3J0LW5v bi1pbmNsdXNpdmUtbGFuZ3VhZ2UJKHJldmlzaW9uIDI3NzYwMikKKysrIFRvb2xzL1NjcmlwdHMv cmVwb3J0LW5vbi1pbmNsdXNpdmUtbGFuZ3VhZ2UJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDcgKzQ0 LDcgQEAgbm9uSW5jbHVzaXZlVGVybXMgPSBbCiBJR05PUkVfRElSRUNUT1JJRVMgPSBbJy5zdm4n LCAnLmdpdCcsICdhdXRvaW5zdGFsbGVkJywgJ2J1aWxkc3RyZWFtJywgJ25vZGVfbW9kdWxlcydd CiBJR05PUkVfRklMRVNfU1RBUlRJTkdfV0lUSCA9ICgnQ2hhbmdlTG9nJykKIElHTk9SRV9GSUxF U19FTkRJTkdfV0lUSCA9ICgnLmxvZycsICcub3JkZXInLCAnLnB5YycsICcuc3dwJywgJy54Y3Vz ZXJzdGF0ZScsICcuZGInLCAnLmRiLXNobScsICcuZGItd2FsJykKLUlHTk9SRV9GSUxFX05BTUVT ID0gWydyZXBvcnQtbm9uLWluY2x1c2l2ZS1sYW5ndWFnZSddCitJR05PUkVfRklMRV9OQU1FUyA9 IFsncmVwb3J0LW5vbi1pbmNsdXNpdmUtbGFuZ3VhZ2UnLCAnaW5jbHVzaXZlX2xhbmd1YWdlLnB5 J10KIAogcGFyc2VyID0gYXJncGFyc2UuQXJndW1lbnRQYXJzZXIoZGVzY3JpcHRpb249J1JlcG9y dCBjb3VudHMgYW5kIGxvY2F0aW9ucyBvZiBub24taW5jbHVzaXZlIHRlcm1zLicpCiBwYXJzZXIu YWRkX2FyZ3VtZW50KCctLXZlcmJvc2UnLCAnLXYnLCBhY3Rpb249J3N0b3JlX3RydWUnKTsKSW5k ZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY2hhbmdlbG9nLnB5Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY2hhbmdl bG9nLnB5CShyZXZpc2lvbiAyNzc2MDIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXJzL2NoYW5nZWxvZy5weQkod29ya2luZyBjb3B5KQpAQCAtMjYsNiArMjYsNyBAQAog ZnJvbSBzeXMgaW1wb3J0IG1heHNpemUKIGZyb20gd2Via2l0cHkuY29tbW9uLmNoZWNrb3V0LmNo YW5nZWxvZyBpbXBvcnQgcGFyc2VfYnVnX2lkX2Zyb21fY2hhbmdlbG9nCiBmcm9tIHdlYmtpdHB5 LnN0eWxlLmNoZWNrZXJzLmNvbW1vbiBpbXBvcnQgVGFiQ2hlY2tlciwgbWF0Y2gsIHNlYXJjaCwg c2VhcmNoSWdub3JlY2FzZQorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2Vycy5pbmNsdXNpdmVf bGFuZ3VhZ2UgaW1wb3J0IEluY2x1c2l2ZUxhbmd1YWdlQ2hlY2tlcgogCiAKIGNsYXNzIENoYW5n ZUxvZ0NoZWNrZXIob2JqZWN0KToKQEAgLTM4LDYgKzM5LDcgQEAgY2xhc3MgQ2hhbmdlTG9nQ2hl Y2tlcihvYmplY3QpOgogICAgICAgICBzZWxmLmhhbmRsZV9zdHlsZV9lcnJvciA9IGhhbmRsZV9z dHlsZV9lcnJvcgogICAgICAgICBzZWxmLnNob3VsZF9saW5lX2JlX2NoZWNrZWQgPSBzaG91bGRf bGluZV9iZV9jaGVja2VkCiAgICAgICAgIHNlbGYuX3RhYl9jaGVja2VyID0gVGFiQ2hlY2tlcihm aWxlX3BhdGgsIGhhbmRsZV9zdHlsZV9lcnJvcikKKyAgICAgICAgc2VsZi5faW5jbHVzaXZlX2xh bmd1YWdlX2NoZWNrZXIgPSBJbmNsdXNpdmVMYW5ndWFnZUNoZWNrZXIoaGFuZGxlX3N0eWxlX2Vy cm9yKQogCiAgICAgZGVmIGNoZWNrX2VudHJ5KHNlbGYsIGZpcnN0X2xpbmVfY2hlY2tlZCwgZW50 cnlfbGluZXMpOgogICAgICAgICBpZiBub3QgZW50cnlfbGluZXM6CkBAIC03OSw2ICs4MSw3IEBA IGNsYXNzIENoYW5nZUxvZ0NoZWNrZXIob2JqZWN0KToKIAogICAgIGRlZiBjaGVjayhzZWxmLCBs aW5lcyk6CiAgICAgICAgIHNlbGYuX3RhYl9jaGVja2VyLmNoZWNrKGxpbmVzKQorICAgICAgICBz ZWxmLl9pbmNsdXNpdmVfbGFuZ3VhZ2VfY2hlY2tlci5jaGVjayhsaW5lcykKICAgICAgICAgZmly c3RfbGluZV9jaGVja2VkID0gMAogICAgICAgICBlbnRyeV9saW5lcyA9IFtdCiAKSW5kZXg6IFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CShyZXZpc2lvbiAy Nzc2MDIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcC5weQko d29ya2luZyBjb3B5KQpAQCAtNDgsNiArNDgsNyBAQCBpbXBvcnQgdW5pY29kZWRhdGEKIGZyb20g d2Via2l0Y29yZXB5IGltcG9ydCB1bmljb2RlLCBWZXJzaW9uCiAKIGZyb20gd2Via2l0cHkuc3R5 bGUuY2hlY2tlcnMuY29tbW9uIGltcG9ydCBtYXRjaCwgc2VhcmNoLCBzdWIsIHN1Ym4KK2Zyb20g d2Via2l0cHkuc3R5bGUuY2hlY2tlcnMuaW5jbHVzaXZlX2xhbmd1YWdlIGltcG9ydCBJbmNsdXNp dmVMYW5ndWFnZUNoZWNrZXIKIGZyb20gd2Via2l0cHkuY29tbW9uLm1lbW9pemVkIGltcG9ydCBt ZW1vaXplZAogZnJvbSB3ZWJraXRweS5jb21tb24udmVyc2lvbl9uYW1lX21hcCBpbXBvcnQgVmVy c2lvbk5hbWVNYXAKIApAQCAtNDcwMSw2ICs0NzAyLDcgQEAgY2xhc3MgQ3BwQ2hlY2tlcihvYmpl Y3QpOgogICAgICAgICBzZWxmLmZpbGVfcGF0aCA9IGZpbGVfcGF0aAogICAgICAgICBzZWxmLmhh bmRsZV9zdHlsZV9lcnJvciA9IGhhbmRsZV9zdHlsZV9lcnJvcgogICAgICAgICBzZWxmLm1pbl9j b25maWRlbmNlID0gbWluX2NvbmZpZGVuY2UKKyAgICAgICAgc2VsZi5faW5jbHVzaXZlX2xhbmd1 YWdlX2NoZWNrZXIgPSBJbmNsdXNpdmVMYW5ndWFnZUNoZWNrZXIoaGFuZGxlX3N0eWxlX2Vycm9y KQogICAgICAgICBfdW5pdF90ZXN0X2NvbmZpZyA9IHVuaXRfdGVzdF9jb25maWcKIAogICAgICMg VXNlZnVsIGZvciB1bml0IHRlc3RpbmcuCkBAIC00NzI3LDMgKzQ3MjksNCBAQCBjbGFzcyBDcHBD aGVja2VyKG9iamVjdCk6CiAgICAgICAgICAgICByZXR1cm4KICAgICAgICAgX3Byb2Nlc3NfbGlu ZXMoc2VsZi5maWxlX3BhdGgsIHNlbGYuZmlsZV9leHRlbnNpb24sIGxpbmVzLAogICAgICAgICAg ICAgICAgICAgICAgICBzZWxmLmhhbmRsZV9zdHlsZV9lcnJvciwgc2VsZi5taW5fY29uZmlkZW5j ZSkKKyAgICAgICAgc2VsZi5faW5jbHVzaXZlX2xhbmd1YWdlX2NoZWNrZXIuY2hlY2sobGluZXMp CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2luY2x1c2l2ZV9s YW5ndWFnZS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2No ZWNrZXJzL2luY2x1c2l2ZV9sYW5ndWFnZS5weQkobm9uZXhpc3RlbnQpCisrKyBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2luY2x1c2l2ZV9sYW5ndWFnZS5weQkod29ya2lu ZyBjb3B5KQpAQCAtMCwwICsxLDM3IEBACisjIENvcHlyaWdodCAoQykgMjAxOC0yMDIxIEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMKKyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBp biBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlv biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwor IyBhcmUgbWV0OgorIyAxLiAgUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0 YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMgMi4gIFJlZGlzdHJpYnV0aW9u cyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisjICAg ICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2Ns YWltZXIgaW4gdGhlCisjICAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMg cHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBS T1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnIEFORAor IyBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBM SU1JVEVEIFRPLCBUSEUgSU1QTElFRAorIyBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBB TkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFCisjIERJU0NMQUlNRUQuIElO IE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUg Rk9SCisjIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExB UlksIE9SIENPTlNFUVVFTlRJQUwKKyMgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlU RUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IKKyMgU0VSVklDRVM7IExP U1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhP V0VWRVIKKyMgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJ TiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwKKyMgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJ R0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyMg T0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBT VUNIIERBTUFHRS4KKworCitjbGFzcyBJbmNsdXNpdmVMYW5ndWFnZUNoZWNrZXIob2JqZWN0KToK KyAgICAiIiJTdXBwb3J0cyBjaGVja2luZyBmb3IgaW5jbHVzaXZlIGxhbmd1YWdlLiIiIgorCisg ICAgTk9OX0lOQ0xVU0lWRV9URVJNUyA9IFsnd2hpdGVsaXN0JywgJ2JsYWNrbGlzdCcsICdzbGF2 ZSddCisKKyAgICBkZWYgX19pbml0X18oc2VsZiwgaGFuZGxlX3N0eWxlX2Vycm9yKToKKyAgICAg ICAgc2VsZi5oYW5kbGVfc3R5bGVfZXJyb3IgPSBoYW5kbGVfc3R5bGVfZXJyb3IKKworICAgIGRl ZiBjaGVjayhzZWxmLCBsaW5lcyk6CisgICAgICAgIGZvciBsaW5lX251bWJlciwgbGluZSBpbiBl bnVtZXJhdGUobGluZXMpOgorICAgICAgICAgICAgaWYgYW55KG5vbl9pbmNsdXNpdmVfdGVybSBp biBsaW5lLmxvd2VyKCkgZm9yIG5vbl9pbmNsdXNpdmVfdGVybSBpbiBzZWxmLk5PTl9JTkNMVVNJ VkVfVEVSTVMpOgorICAgICAgICAgICAgICAgIHNlbGYuaGFuZGxlX3N0eWxlX2Vycm9yKGxpbmVf bnVtYmVyICsgMSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnbm9u LWluY2x1c2l2ZS10ZXJtJywgMSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAnTGluZSBjb250YWlucyBub24taW5jbHVzaXZlIHRlcm0uJykKSW5kZXg6IFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvanMucHkKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv U2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9qcy5weQkocmV2aXNpb24gMjc3NjAyKQor KysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9qcy5weQkod29ya2luZyBj b3B5KQpAQCAtMzIsNiArMzIsNyBAQCBUaGlzIGNoZWNrZXIgaXMgb25seSB1c2VkIHRvIGNoZWNr IFdlYkluCiAKIGltcG9ydCByZQogZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2Vycy5jb21tb24g aW1wb3J0IFRhYkNoZWNrZXIKK2Zyb20gd2Via2l0cHkuc3R5bGUuY2hlY2tlcnMuaW5jbHVzaXZl X2xhbmd1YWdlIGltcG9ydCBJbmNsdXNpdmVMYW5ndWFnZUNoZWNrZXIKIAogCiBjbGFzcyBKU0No ZWNrZXIob2JqZWN0KToKQEAgLTQ0LDEwICs0NSwxMiBAQCBjbGFzcyBKU0NoZWNrZXIob2JqZWN0 KToKICAgICAgICAgc2VsZi5faGFuZGxlX3N0eWxlX2Vycm9yID0gaGFuZGxlX3N0eWxlX2Vycm9y CiAgICAgICAgIHNlbGYuX3RhYl9jaGVja2VyID0gVGFiQ2hlY2tlcihmaWxlX3BhdGgsIGhhbmRs ZV9zdHlsZV9lcnJvcikKICAgICAgICAgc2VsZi5fc2luZ2xlX3F1b3RlX2NoZWNrZXIgPSBTaW5n bGVRdW90ZUNoZWNrZXIoZmlsZV9wYXRoLCBoYW5kbGVfc3R5bGVfZXJyb3IpCisgICAgICAgIHNl bGYuX2luY2x1c2l2ZV9sYW5ndWFnZV9jaGVja2VyID0gSW5jbHVzaXZlTGFuZ3VhZ2VDaGVja2Vy KGhhbmRsZV9zdHlsZV9lcnJvcikKIAogICAgIGRlZiBjaGVjayhzZWxmLCBsaW5lcyk6CiAgICAg ICAgIHNlbGYuX3RhYl9jaGVja2VyLmNoZWNrKGxpbmVzKQogICAgICAgICBzZWxmLl9zaW5nbGVf cXVvdGVfY2hlY2tlci5jaGVjayhsaW5lcykKKyAgICAgICAgc2VsZi5faW5jbHVzaXZlX2xhbmd1 YWdlX2NoZWNrZXIuY2hlY2sobGluZXMpCiAKIAogY2xhc3MgU2luZ2xlUXVvdGVDaGVja2VyKG9i amVjdCk6CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3B5dGhv bi5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJz L3B5dGhvbi5weQkocmV2aXNpb24gMjc3NjAyKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9z dHlsZS9jaGVja2Vycy9weXRob24ucHkJKHdvcmtpbmcgY29weSkKQEAgLTMwLDYgKzMwLDcgQEAg ZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IFN0cmluZ0lPCiAKIGZyb20gd2Via2l0cHkuY29tbW9u LnN5c3RlbS5maWxlc3lzdGVtIGltcG9ydCBGaWxlU3lzdGVtCiBmcm9tIHdlYmtpdHB5LmNvbW1v bi53ZWJraXRfZmluZGVyIGltcG9ydCBXZWJLaXRGaW5kZXIKK2Zyb20gd2Via2l0cHkuc3R5bGUu Y2hlY2tlcnMuaW5jbHVzaXZlX2xhbmd1YWdlIGltcG9ydCBJbmNsdXNpdmVMYW5ndWFnZUNoZWNr ZXIKIAogaW1wb3J0IHB5Y29kZXN0eWxlCiAKQEAgLTQwLDYgKzQxLDcgQEAgY2xhc3MgUHl0aG9u Q2hlY2tlcihvYmplY3QpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBmaWxlX3BhdGgsIGhhbmRs ZV9zdHlsZV9lcnJvcik6CiAgICAgICAgIHNlbGYuX2ZpbGVfcGF0aCA9IGZpbGVfcGF0aAogICAg ICAgICBzZWxmLl9oYW5kbGVfc3R5bGVfZXJyb3IgPSBoYW5kbGVfc3R5bGVfZXJyb3IKKyAgICAg ICAgc2VsZi5faW5jbHVzaXZlX2xhbmd1YWdlX2NoZWNrZXIgPSBJbmNsdXNpdmVMYW5ndWFnZUNo ZWNrZXIoaGFuZGxlX3N0eWxlX2Vycm9yKQogCiAgICAgZGVmIGNoZWNrKHNlbGYsIGxpbmVzKToK ICAgICAgICAgc2VsZi5fY2hlY2tfcHljb2Rlc3R5bGUobGluZXMpCkBAIC00Nyw2ICs0OSw3IEBA IGNsYXNzIFB5dGhvbkNoZWNrZXIob2JqZWN0KToKICAgICAgICAgIyBQeWxpbnQgY2FuJ3QgbGl2 ZSBoYXBwaWx5IGluIHB5dGhvbiAyIGFuZCAzIHdvcmxkLCB3ZSBuZWVkIHRvIHBpY2sgb25lCiAg ICAgICAgIGlmIHN5cy52ZXJzaW9uX2luZm8gPCAoMywgMCk6CiAgICAgICAgICAgICBzZWxmLl9j aGVja19weWxpbnQobGluZXMpCisgICAgICAgIHNlbGYuX2luY2x1c2l2ZV9sYW5ndWFnZV9jaGVj a2VyLmNoZWNrKGxpbmVzKQogCiAgICAgZGVmIF9jaGVja19weWNvZGVzdHlsZShzZWxmLCBsaW5l cyk6CiAgICAgICAgICMgSW5pdGlhbGl6ZSBweWNvZGVzdHlsZS5vcHRpb25zLCB3aGljaCBpcyBu ZWNlc3NhcnkgZm9yCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJz L3RleHQucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVj a2Vycy90ZXh0LnB5CShyZXZpc2lvbiAyNzc2MDIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3N0eWxlL2NoZWNrZXJzL3RleHQucHkJKHdvcmtpbmcgY29weSkKQEAgLTMwLDYgKzMwLDcgQEAK ICIiIkNoZWNrcyBXZWJLaXQgc3R5bGUgZm9yIHRleHQgZmlsZXMuIiIiCiAKIGZyb20gd2Via2l0 cHkuc3R5bGUuY2hlY2tlcnMuY29tbW9uIGltcG9ydCBUYWJDaGVja2VyCitmcm9tIHdlYmtpdHB5 LnN0eWxlLmNoZWNrZXJzLmluY2x1c2l2ZV9sYW5ndWFnZSBpbXBvcnQgSW5jbHVzaXZlTGFuZ3Vh Z2VDaGVja2VyCiAKIAogY2xhc3MgVGV4dENoZWNrZXIob2JqZWN0KToKQEAgLTQwLDYgKzQxLDgg QEAgY2xhc3MgVGV4dENoZWNrZXIob2JqZWN0KToKICAgICAgICAgc2VsZi5maWxlX3BhdGggPSBm aWxlX3BhdGgKICAgICAgICAgc2VsZi5oYW5kbGVfc3R5bGVfZXJyb3IgPSBoYW5kbGVfc3R5bGVf ZXJyb3IKICAgICAgICAgc2VsZi5fdGFiX2NoZWNrZXIgPSBUYWJDaGVja2VyKGZpbGVfcGF0aCwg aGFuZGxlX3N0eWxlX2Vycm9yKQorICAgICAgICBzZWxmLl9pbmNsdXNpdmVfbGFuZ3VhZ2VfY2hl Y2tlciA9IEluY2x1c2l2ZUxhbmd1YWdlQ2hlY2tlcihoYW5kbGVfc3R5bGVfZXJyb3IpCiAKICAg ICBkZWYgY2hlY2soc2VsZiwgbGluZXMpOgogICAgICAgICBzZWxmLl90YWJfY2hlY2tlci5jaGVj ayhsaW5lcykKKyAgICAgICAgc2VsZi5faW5jbHVzaXZlX2xhbmd1YWdlX2NoZWNrZXIuY2hlY2so bGluZXMpCg== 428867 2021-05-17 14:09:15 -0700 2021-05-17 16:12:51 -0700 Patch bug-213088-20210517170914.patch text/plain 10101 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3NzYwMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIyIEBACisyMDIxLTA1LTE3ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBTdHlsZSBjaGVja2VyIHNob3VsZCBjaGVjayBmb3Igbm9uLWluY2x1c2l2 ZSB0ZXJtaW5vbG9neQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjEzMDg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgU3R5bGUgY2hlY2tlciBzaG91bGQgY2hlY2sgZm9yIG5vbi1pbmNsdXNpdmUgdGVybWlu b2xvZ3kgc28gdGhhdCB3ZSBjYW4gYXZvaWQgdW5pbnRlbnRpb25hbCBhZGRpdGlvbgorICAgICAg ICBvZiBub24taW5jbHVzaXZlIHRlcm1pbm9sb2d5IGluIG91ciBjb2RlYmFzZS4KKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2luY2x1c2l2ZV9sYW5ndWFnZS5weTog QWRkZWQgaW5jbHVzaXZlIGxhbmd1YWdlIGNoZWNrZXIuCisgICAgICAgIChJbmNsdXNpdmVMYW5n dWFnZUNoZWNrZXIpOgorICAgICAgICAoSW5jbHVzaXZlTGFuZ3VhZ2VDaGVja2VyLmNoZWNrKToK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NoYW5nZWxvZy5weTog Q2hlY2sgZm9yIGluY2x1c2l2ZSBsYW5ndWFnZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L3N0eWxlL2NoZWNrZXJzL2NwcC5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9jaGVja2Vycy9qcy5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9jaGVja2Vycy9weXRob24ucHk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvc3R5bGUvY2hlY2tlcnMvdGV4dC5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy9y ZXBvcnQtbm9uLWluY2x1c2l2ZS1sYW5ndWFnZTogSWdub3JlIHRoZSBuZXdseSBhZGRlZCBpbmNs dXNpdmVfbGFuZ3VhZ2UucHkgZmlsZS4KKwogMjAyMS0wNS0xNSAgSmVyIE5vYmxlICA8amVyLm5v YmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBNZWRpYVNlc3Npb25Db29yZGluYXRvciBzdXJ2aXZl cyBwYWdlIHJlbG9hZC9uYXZpZ2F0aW9uCkluZGV4OiBUb29scy9TY3JpcHRzL3JlcG9ydC1ub24t aW5jbHVzaXZlLWxhbmd1YWdlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvcmVwb3J0LW5v bi1pbmNsdXNpdmUtbGFuZ3VhZ2UJKHJldmlzaW9uIDI3NzYwMikKKysrIFRvb2xzL1NjcmlwdHMv cmVwb3J0LW5vbi1pbmNsdXNpdmUtbGFuZ3VhZ2UJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDcgKzQ0 LDcgQEAgbm9uSW5jbHVzaXZlVGVybXMgPSBbCiBJR05PUkVfRElSRUNUT1JJRVMgPSBbJy5zdm4n LCAnLmdpdCcsICdhdXRvaW5zdGFsbGVkJywgJ2J1aWxkc3RyZWFtJywgJ25vZGVfbW9kdWxlcydd CiBJR05PUkVfRklMRVNfU1RBUlRJTkdfV0lUSCA9ICgnQ2hhbmdlTG9nJykKIElHTk9SRV9GSUxF U19FTkRJTkdfV0lUSCA9ICgnLmxvZycsICcub3JkZXInLCAnLnB5YycsICcuc3dwJywgJy54Y3Vz ZXJzdGF0ZScsICcuZGInLCAnLmRiLXNobScsICcuZGItd2FsJykKLUlHTk9SRV9GSUxFX05BTUVT ID0gWydyZXBvcnQtbm9uLWluY2x1c2l2ZS1sYW5ndWFnZSddCitJR05PUkVfRklMRV9OQU1FUyA9 IFsncmVwb3J0LW5vbi1pbmNsdXNpdmUtbGFuZ3VhZ2UnLCAnaW5jbHVzaXZlX2xhbmd1YWdlLnB5 J10KIAogcGFyc2VyID0gYXJncGFyc2UuQXJndW1lbnRQYXJzZXIoZGVzY3JpcHRpb249J1JlcG9y dCBjb3VudHMgYW5kIGxvY2F0aW9ucyBvZiBub24taW5jbHVzaXZlIHRlcm1zLicpCiBwYXJzZXIu YWRkX2FyZ3VtZW50KCctLXZlcmJvc2UnLCAnLXYnLCBhY3Rpb249J3N0b3JlX3RydWUnKTsKSW5k ZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY2hhbmdlbG9nLnB5Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY2hhbmdl bG9nLnB5CShyZXZpc2lvbiAyNzc2MDIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXJzL2NoYW5nZWxvZy5weQkod29ya2luZyBjb3B5KQpAQCAtMjYsNiArMjYsNyBAQAog ZnJvbSBzeXMgaW1wb3J0IG1heHNpemUKIGZyb20gd2Via2l0cHkuY29tbW9uLmNoZWNrb3V0LmNo YW5nZWxvZyBpbXBvcnQgcGFyc2VfYnVnX2lkX2Zyb21fY2hhbmdlbG9nCiBmcm9tIHdlYmtpdHB5 LnN0eWxlLmNoZWNrZXJzLmNvbW1vbiBpbXBvcnQgVGFiQ2hlY2tlciwgbWF0Y2gsIHNlYXJjaCwg c2VhcmNoSWdub3JlY2FzZQorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2Vycy5pbmNsdXNpdmVf bGFuZ3VhZ2UgaW1wb3J0IEluY2x1c2l2ZUxhbmd1YWdlQ2hlY2tlcgogCiAKIGNsYXNzIENoYW5n ZUxvZ0NoZWNrZXIob2JqZWN0KToKQEAgLTM4LDYgKzM5LDcgQEAgY2xhc3MgQ2hhbmdlTG9nQ2hl Y2tlcihvYmplY3QpOgogICAgICAgICBzZWxmLmhhbmRsZV9zdHlsZV9lcnJvciA9IGhhbmRsZV9z dHlsZV9lcnJvcgogICAgICAgICBzZWxmLnNob3VsZF9saW5lX2JlX2NoZWNrZWQgPSBzaG91bGRf bGluZV9iZV9jaGVja2VkCiAgICAgICAgIHNlbGYuX3RhYl9jaGVja2VyID0gVGFiQ2hlY2tlcihm aWxlX3BhdGgsIGhhbmRsZV9zdHlsZV9lcnJvcikKKyAgICAgICAgc2VsZi5faW5jbHVzaXZlX2xh bmd1YWdlX2NoZWNrZXIgPSBJbmNsdXNpdmVMYW5ndWFnZUNoZWNrZXIoaGFuZGxlX3N0eWxlX2Vy cm9yKQogCiAgICAgZGVmIGNoZWNrX2VudHJ5KHNlbGYsIGZpcnN0X2xpbmVfY2hlY2tlZCwgZW50 cnlfbGluZXMpOgogICAgICAgICBpZiBub3QgZW50cnlfbGluZXM6CkBAIC03OSw2ICs4MSw3IEBA IGNsYXNzIENoYW5nZUxvZ0NoZWNrZXIob2JqZWN0KToKIAogICAgIGRlZiBjaGVjayhzZWxmLCBs aW5lcyk6CiAgICAgICAgIHNlbGYuX3RhYl9jaGVja2VyLmNoZWNrKGxpbmVzKQorICAgICAgICBz ZWxmLl9pbmNsdXNpdmVfbGFuZ3VhZ2VfY2hlY2tlci5jaGVjayhsaW5lcykKICAgICAgICAgZmly c3RfbGluZV9jaGVja2VkID0gMAogICAgICAgICBlbnRyeV9saW5lcyA9IFtdCiAKSW5kZXg6IFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CShyZXZpc2lvbiAy Nzc2MDIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcC5weQko d29ya2luZyBjb3B5KQpAQCAtNDgsNiArNDgsNyBAQCBpbXBvcnQgdW5pY29kZWRhdGEKIGZyb20g d2Via2l0Y29yZXB5IGltcG9ydCB1bmljb2RlLCBWZXJzaW9uCiAKIGZyb20gd2Via2l0cHkuc3R5 bGUuY2hlY2tlcnMuY29tbW9uIGltcG9ydCBtYXRjaCwgc2VhcmNoLCBzdWIsIHN1Ym4KK2Zyb20g d2Via2l0cHkuc3R5bGUuY2hlY2tlcnMuaW5jbHVzaXZlX2xhbmd1YWdlIGltcG9ydCBJbmNsdXNp dmVMYW5ndWFnZUNoZWNrZXIKIGZyb20gd2Via2l0cHkuY29tbW9uLm1lbW9pemVkIGltcG9ydCBt ZW1vaXplZAogZnJvbSB3ZWJraXRweS5jb21tb24udmVyc2lvbl9uYW1lX21hcCBpbXBvcnQgVmVy c2lvbk5hbWVNYXAKIApAQCAtNDcwMSw2ICs0NzAyLDcgQEAgY2xhc3MgQ3BwQ2hlY2tlcihvYmpl Y3QpOgogICAgICAgICBzZWxmLmZpbGVfcGF0aCA9IGZpbGVfcGF0aAogICAgICAgICBzZWxmLmhh bmRsZV9zdHlsZV9lcnJvciA9IGhhbmRsZV9zdHlsZV9lcnJvcgogICAgICAgICBzZWxmLm1pbl9j b25maWRlbmNlID0gbWluX2NvbmZpZGVuY2UKKyAgICAgICAgc2VsZi5faW5jbHVzaXZlX2xhbmd1 YWdlX2NoZWNrZXIgPSBJbmNsdXNpdmVMYW5ndWFnZUNoZWNrZXIoaGFuZGxlX3N0eWxlX2Vycm9y KQogICAgICAgICBfdW5pdF90ZXN0X2NvbmZpZyA9IHVuaXRfdGVzdF9jb25maWcKIAogICAgICMg VXNlZnVsIGZvciB1bml0IHRlc3RpbmcuCkBAIC00NzI3LDMgKzQ3MjksNCBAQCBjbGFzcyBDcHBD aGVja2VyKG9iamVjdCk6CiAgICAgICAgICAgICByZXR1cm4KICAgICAgICAgX3Byb2Nlc3NfbGlu ZXMoc2VsZi5maWxlX3BhdGgsIHNlbGYuZmlsZV9leHRlbnNpb24sIGxpbmVzLAogICAgICAgICAg ICAgICAgICAgICAgICBzZWxmLmhhbmRsZV9zdHlsZV9lcnJvciwgc2VsZi5taW5fY29uZmlkZW5j ZSkKKyAgICAgICAgc2VsZi5faW5jbHVzaXZlX2xhbmd1YWdlX2NoZWNrZXIuY2hlY2sobGluZXMp CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2luY2x1c2l2ZV9s YW5ndWFnZS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2No ZWNrZXJzL2luY2x1c2l2ZV9sYW5ndWFnZS5weQkobm9uZXhpc3RlbnQpCisrKyBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2luY2x1c2l2ZV9sYW5ndWFnZS5weQkod29ya2lu ZyBjb3B5KQpAQCAtMCwwICsxLDM3IEBACisjIENvcHlyaWdodCAoQykgMjAyMSBBcHBsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291 cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorIyBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyMgYXJl IG1ldDoKKyMgMS4gIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0 aGUgYWJvdmUgY29weXJpZ2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisjIDIuICBSZWRpc3RyaWJ1dGlvbnMgaW4g YmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorIyAgICAgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy IGluIHRoZQorIyAgICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3Zp ZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURF RCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJyBBTkQKKyMgQU5Z IEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRF RCBUTywgVEhFIElNUExJRUQKKyMgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJ VE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRQorIyBESVNDTEFJTUVELiBJTiBOTyBF VkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUgor IyBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBP UiBDT05TRVFVRU5USUFMCisjIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRP LCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SCisjIFNFUlZJQ0VTOyBMT1NTIE9G IFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVS CisjIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09O VFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksCisjIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNF IE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisjIE9GIFRI SVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBE QU1BR0UuCisKKworY2xhc3MgSW5jbHVzaXZlTGFuZ3VhZ2VDaGVja2VyKG9iamVjdCk6CisgICAg IiIiU3VwcG9ydHMgY2hlY2tpbmcgZm9yIGluY2x1c2l2ZSBsYW5ndWFnZS4iIiIKKworICAgIE5P Tl9JTkNMVVNJVkVfVEVSTVMgPSBbJ3doaXRlbGlzdCcsICdibGFja2xpc3QnLCAnc2xhdmUnXQor CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGhhbmRsZV9zdHlsZV9lcnJvcik6CisgICAgICAgIHNl bGYuaGFuZGxlX3N0eWxlX2Vycm9yID0gaGFuZGxlX3N0eWxlX2Vycm9yCisKKyAgICBkZWYgY2hl Y2soc2VsZiwgbGluZXMpOgorICAgICAgICBmb3IgbGluZV9udW1iZXIsIGxpbmUgaW4gZW51bWVy YXRlKGxpbmVzKToKKyAgICAgICAgICAgIGZvciBub25faW5jbHVzaXZlX3Rlcm0gaW4gc2VsZi5O T05fSU5DTFVTSVZFX1RFUk1TOgorICAgICAgICAgICAgICAgIGlmIG5vbl9pbmNsdXNpdmVfdGVy bSBpbiBsaW5lLmxvd2VyKCk6CisgICAgICAgICAgICAgICAgICAgIHNlbGYuaGFuZGxlX3N0eWxl X2Vycm9yKGxpbmVfbnVtYmVyICsgMSwgJ25vbi1pbmNsdXNpdmUtdGVybScsIDEsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdMaW5lIGNvbnRhaW5zIG5vbi1p bmNsdXNpdmUgdGVybToge30nLmZvcm1hdChub25faW5jbHVzaXZlX3Rlcm0pKQpJbmRleDogVG9v bHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9qcy5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2pzLnB5CShyZXZpc2lvbiAyNzc2 MDIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2pzLnB5CSh3b3Jr aW5nIGNvcHkpCkBAIC0zMiw2ICszMiw3IEBAIFRoaXMgY2hlY2tlciBpcyBvbmx5IHVzZWQgdG8g Y2hlY2sgV2ViSW4KIAogaW1wb3J0IHJlCiBmcm9tIHdlYmtpdHB5LnN0eWxlLmNoZWNrZXJzLmNv bW1vbiBpbXBvcnQgVGFiQ2hlY2tlcgorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2Vycy5pbmNs dXNpdmVfbGFuZ3VhZ2UgaW1wb3J0IEluY2x1c2l2ZUxhbmd1YWdlQ2hlY2tlcgogCiAKIGNsYXNz IEpTQ2hlY2tlcihvYmplY3QpOgpAQCAtNDQsMTAgKzQ1LDEyIEBAIGNsYXNzIEpTQ2hlY2tlcihv YmplY3QpOgogICAgICAgICBzZWxmLl9oYW5kbGVfc3R5bGVfZXJyb3IgPSBoYW5kbGVfc3R5bGVf ZXJyb3IKICAgICAgICAgc2VsZi5fdGFiX2NoZWNrZXIgPSBUYWJDaGVja2VyKGZpbGVfcGF0aCwg aGFuZGxlX3N0eWxlX2Vycm9yKQogICAgICAgICBzZWxmLl9zaW5nbGVfcXVvdGVfY2hlY2tlciA9 IFNpbmdsZVF1b3RlQ2hlY2tlcihmaWxlX3BhdGgsIGhhbmRsZV9zdHlsZV9lcnJvcikKKyAgICAg ICAgc2VsZi5faW5jbHVzaXZlX2xhbmd1YWdlX2NoZWNrZXIgPSBJbmNsdXNpdmVMYW5ndWFnZUNo ZWNrZXIoaGFuZGxlX3N0eWxlX2Vycm9yKQogCiAgICAgZGVmIGNoZWNrKHNlbGYsIGxpbmVzKToK ICAgICAgICAgc2VsZi5fdGFiX2NoZWNrZXIuY2hlY2sobGluZXMpCiAgICAgICAgIHNlbGYuX3Np bmdsZV9xdW90ZV9jaGVja2VyLmNoZWNrKGxpbmVzKQorICAgICAgICBzZWxmLl9pbmNsdXNpdmVf bGFuZ3VhZ2VfY2hlY2tlci5jaGVjayhsaW5lcykKIAogCiBjbGFzcyBTaW5nbGVRdW90ZUNoZWNr ZXIob2JqZWN0KToKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMv cHl0aG9uLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hl Y2tlcnMvcHl0aG9uLnB5CShyZXZpc2lvbiAyNzc2MDIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtp dHB5L3N0eWxlL2NoZWNrZXJzL3B5dGhvbi5weQkod29ya2luZyBjb3B5KQpAQCAtMzAsNiArMzAs NyBAQCBmcm9tIHdlYmtpdGNvcmVweSBpbXBvcnQgU3RyaW5nSU8KIAogZnJvbSB3ZWJraXRweS5j b21tb24uc3lzdGVtLmZpbGVzeXN0ZW0gaW1wb3J0IEZpbGVTeXN0ZW0KIGZyb20gd2Via2l0cHku Y29tbW9uLndlYmtpdF9maW5kZXIgaW1wb3J0IFdlYktpdEZpbmRlcgorZnJvbSB3ZWJraXRweS5z dHlsZS5jaGVja2Vycy5pbmNsdXNpdmVfbGFuZ3VhZ2UgaW1wb3J0IEluY2x1c2l2ZUxhbmd1YWdl Q2hlY2tlcgogCiBpbXBvcnQgcHljb2Rlc3R5bGUKIApAQCAtNDAsNiArNDEsNyBAQCBjbGFzcyBQ eXRob25DaGVja2VyKG9iamVjdCk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIGZpbGVfcGF0aCwg aGFuZGxlX3N0eWxlX2Vycm9yKToKICAgICAgICAgc2VsZi5fZmlsZV9wYXRoID0gZmlsZV9wYXRo CiAgICAgICAgIHNlbGYuX2hhbmRsZV9zdHlsZV9lcnJvciA9IGhhbmRsZV9zdHlsZV9lcnJvcgor ICAgICAgICBzZWxmLl9pbmNsdXNpdmVfbGFuZ3VhZ2VfY2hlY2tlciA9IEluY2x1c2l2ZUxhbmd1 YWdlQ2hlY2tlcihoYW5kbGVfc3R5bGVfZXJyb3IpCiAKICAgICBkZWYgY2hlY2soc2VsZiwgbGlu ZXMpOgogICAgICAgICBzZWxmLl9jaGVja19weWNvZGVzdHlsZShsaW5lcykKQEAgLTQ3LDYgKzQ5 LDcgQEAgY2xhc3MgUHl0aG9uQ2hlY2tlcihvYmplY3QpOgogICAgICAgICAjIFB5bGludCBjYW4n dCBsaXZlIGhhcHBpbHkgaW4gcHl0aG9uIDIgYW5kIDMgd29ybGQsIHdlIG5lZWQgdG8gcGljayBv bmUKICAgICAgICAgaWYgc3lzLnZlcnNpb25faW5mbyA8ICgzLCAwKToKICAgICAgICAgICAgIHNl bGYuX2NoZWNrX3B5bGludChsaW5lcykKKyAgICAgICAgc2VsZi5faW5jbHVzaXZlX2xhbmd1YWdl X2NoZWNrZXIuY2hlY2sobGluZXMpCiAKICAgICBkZWYgX2NoZWNrX3B5Y29kZXN0eWxlKHNlbGYs IGxpbmVzKToKICAgICAgICAgIyBJbml0aWFsaXplIHB5Y29kZXN0eWxlLm9wdGlvbnMsIHdoaWNo IGlzIG5lY2Vzc2FyeSBmb3IKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hl Y2tlcnMvdGV4dC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXJzL3RleHQucHkJKHJldmlzaW9uIDI3NzYwMikKKysrIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvc3R5bGUvY2hlY2tlcnMvdGV4dC5weQkod29ya2luZyBjb3B5KQpAQCAtMzAsNiArMzAs NyBAQAogIiIiQ2hlY2tzIFdlYktpdCBzdHlsZSBmb3IgdGV4dCBmaWxlcy4iIiIKIAogZnJvbSB3 ZWJraXRweS5zdHlsZS5jaGVja2Vycy5jb21tb24gaW1wb3J0IFRhYkNoZWNrZXIKK2Zyb20gd2Vi a2l0cHkuc3R5bGUuY2hlY2tlcnMuaW5jbHVzaXZlX2xhbmd1YWdlIGltcG9ydCBJbmNsdXNpdmVM YW5ndWFnZUNoZWNrZXIKIAogCiBjbGFzcyBUZXh0Q2hlY2tlcihvYmplY3QpOgpAQCAtNDAsNiAr NDEsOCBAQCBjbGFzcyBUZXh0Q2hlY2tlcihvYmplY3QpOgogICAgICAgICBzZWxmLmZpbGVfcGF0 aCA9IGZpbGVfcGF0aAogICAgICAgICBzZWxmLmhhbmRsZV9zdHlsZV9lcnJvciA9IGhhbmRsZV9z dHlsZV9lcnJvcgogICAgICAgICBzZWxmLl90YWJfY2hlY2tlciA9IFRhYkNoZWNrZXIoZmlsZV9w YXRoLCBoYW5kbGVfc3R5bGVfZXJyb3IpCisgICAgICAgIHNlbGYuX2luY2x1c2l2ZV9sYW5ndWFn ZV9jaGVja2VyID0gSW5jbHVzaXZlTGFuZ3VhZ2VDaGVja2VyKGhhbmRsZV9zdHlsZV9lcnJvcikK IAogICAgIGRlZiBjaGVjayhzZWxmLCBsaW5lcyk6CiAgICAgICAgIHNlbGYuX3RhYl9jaGVja2Vy LmNoZWNrKGxpbmVzKQorICAgICAgICBzZWxmLl9pbmNsdXNpdmVfbGFuZ3VhZ2VfY2hlY2tlci5j aGVjayhsaW5lcykK