214951 2020-07-29 17:26:45 -0700 [webkitpy] Use webkitcorepy's auto installer for requests 2020-08-12 16:10:15 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=214950 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain dewei_zhu ews-watchlist glenn slewis webkit-bug-importer oldest_to_newest 1676252 0 jbedard 2020-07-29 17:26:45 -0700 webkitcorepy has an auto-installed version of the requests library, we should be using that. 1676297 1 webkit-bug-importer 2020-07-29 20:46:42 -0700 <rdar://problem/66308049> 1676303 2 405545 jbedard 2020-07-29 21:29:23 -0700 Created attachment 405545 Patch 1676304 3 405545 jbedard 2020-07-29 21:34:38 -0700 Comment on attachment 405545 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405545&action=review > Tools/Scripts/webkitpy/thirdparty/__init__.py:86 > + sys.path.insert(1 if 'libraries/autoinstalled' in sys.path[0] else 0, _AUTOINSTALLED_DIR) Needed for compatibility. webkitpy cannot override webkitcorepy since webkitcorepy is, in some cases, uses more updated versions of the auto-installed libraries. We also don't want to require existing checkouts to delete their webkitpy auto install directory. 1676305 4 405546 jbedard 2020-07-29 21:40:41 -0700 Created attachment 405546 Patch 1676368 5 405568 jbedard 2020-07-30 07:17:24 -0700 Created attachment 405568 Patch 1676704 6 405659 jbedard 2020-07-30 21:01:26 -0700 Created attachment 405659 Patch 1677198 7 405659 jbedard 2020-08-01 21:04:10 -0700 Comment on attachment 405659 Patch Blocking this on <https://bugs.webkit.org/show_bug.cgi?id=215067>, since that problem more correctly solves some of the issues this patch attempts to. 1677785 8 405954 jbedard 2020-08-04 16:02:14 -0700 Created attachment 405954 Patch 1677801 9 405962 jbedard 2020-08-04 16:27:57 -0700 Created attachment 405962 Patch 1679866 10 ews-feeder 2020-08-12 16:10:14 -0700 Committed r265574: <https://trac.webkit.org/changeset/265574> All reviewed patches have been landed. Closing bug and clearing flags on attachment 405954. 405545 2020-07-29 21:29:23 -0700 2020-07-29 21:40:39 -0700 Patch bug-214951-20200729212923.patch text/plain 9253 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTA3MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI2IEBACisyMDIwLTA3LTI5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0cHldIFVzZSB3ZWJraXRjb3JlcHkncyBhdXRvIGluc3RhbGxl ciBmb3IgcmVxdWVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxNDk1MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjYzMDgwNDk+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJh cmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5OiBCdW1wIGxpYnJhcnkg dmVyc2lvbiwgYWRkIHVybGxpYjMuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weToKKyAgICAgICAgKFBhY2thZ2UuaW5z dGFsbCk6IFN1cHBvcnQgcGFja2FnZSBmb3JtYXQgd2hlcmUgcGFja2FnZSBpcyBjb250YWluZWQg aW4gYSAnc3JjJyBmb2xkZXIuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0 L2J1Z3ppbGxhL3Rlc3RfZXhwZWN0YXRpb25fdXBkYXRlci5weTogVXNlIHdlYmtpdGNvcmVweSdz IGF1dG8gaW5zdGFsbGVyLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcmVzdWx0cy91cGxv YWQucHk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcmVzdWx0cy91cGxvYWRf dW5pdHRlc3QucHk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0 eS9fX2luaXRfXy5weToKKyAgICAgICAgKEF1dG9pbnN0YWxsSW1wb3J0SG9vay5fZW5zdXJlX2F1 dG9pbnN0YWxsZWRfZGlyX2lzX2luX3N5c19wYXRoKTogTWFrZSBzdXJlIHdlYmtpdGNvcmVweSB0 YWtlcyBwcmVjZWRlbmNlCisgICAgICAgIG92ZXIgd2Via2l0cHkuCisgICAgICAgIChBdXRvaW5z dGFsbEltcG9ydEhvb2suZmluZF9tb2R1bGUpOiBEZWxldGUgX2luc3RhbGxfcmVxdWVzdHMuCisg ICAgICAgIChBdXRvaW5zdGFsbEltcG9ydEhvb2suX2luc3RhbGxfcHl0ZXN0KTogRGl0dG8uCisg ICAgICAgIChBdXRvaW5zdGFsbEltcG9ydEhvb2suX2luc3RhbGxfYmVhdXRpZnVsc291cCk6IERp dHRvLgorICAgICAgICAoQXV0b2luc3RhbGxJbXBvcnRIb29rLl9pbnN0YWxsX3NlbGVuaXVtKTog RGl0dG8uCisgICAgICAgIChBdXRvaW5zdGFsbEltcG9ydEhvb2suX2luc3RhbGxfcmVxdWVzdHMp OiBEZWxldGVkLgorCiAyMDIwLTA3LTI5ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4K IAogICAgICAgICBBZGQgc2NyaXB0IHRvIGhlbHAgdXMgY291bnQgdXNlcyBvZiBub24taW5jbHVz aXZlIHRlcm1zCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Vi a2l0Y29yZXB5L19faW5pdF9fLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI2NTA3 MCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkv X19pbml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAgLTI4LDcgKzI4LDcgQEAgbG9nID0gbG9nZ2lu Zy5nZXRMb2dnZXIoJ3dlYmtpdGNvcmVweScpCiBmcm9tIHdlYmtpdGNvcmVweS52ZXJzaW9uIGlt cG9ydCBWZXJzaW9uCiBmcm9tIHdlYmtpdGNvcmVweS5zdHJpbmdfdXRpbHMgaW1wb3J0IEJ5dGVz SU8sIFN0cmluZ0lPLCBVbmljb2RlSU8sIHVuaWNvZGUKIAotdmVyc2lvbiA9IFZlcnNpb24oMCwg MCwgMykKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDAsIDQpCiAKIGZyb20gd2Via2l0Y29yZXB5LmF1 dG9pbnN0YWxsIGltcG9ydCBQYWNrYWdlLCBBdXRvSW5zdGFsbAogaWYgc3lzLnZlcnNpb25faW5m byA+ICgzLCAwKToKQEAgLTM3LDQgKzM3LDUgQEAgZWxzZToKICAgICBBdXRvSW5zdGFsbC5yZWdp c3RlcihQYWNrYWdlKCdtb2NrJywgVmVyc2lvbigzLCAwLCA1KSkpCiAKIEF1dG9JbnN0YWxsLnJl Z2lzdGVyKFBhY2thZ2UoJ2NlcnRpZmknLCBWZXJzaW9uKDIwMjAsIDYsIDIwKSkpCitBdXRvSW5z dGFsbC5yZWdpc3RlcihQYWNrYWdlKCd1cmxsaWIzJywgVmVyc2lvbigxLCAyNSwgMTApKSkKIEF1 dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3JlcXVlc3RzJywgVmVyc2lvbigyLCAyNCkpKQpJ bmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9h dXRvaW5zdGFsbC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5CShyZXZpc2lvbiAyNjUwNzApCisr KyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9p bnN0YWxsLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xNzUsNyArMTc1LDE1IEBAIGNsYXNzIFBhY2th Z2Uob2JqZWN0KToKICAgICAgICAgICAgIGFyY2hpdmUudW5wYWNrKHRlbXBfbG9jYXRpb24pCiAK ICAgICAgICAgICAgIHNodXRpbC5ybXRyZWUoc2VsZi5sb2NhdGlvbiwgaWdub3JlX2Vycm9ycz1U cnVlKQotICAgICAgICAgICAgc2h1dGlsLm1vdmUob3MucGF0aC5qb2luKHRlbXBfbG9jYXRpb24s IHN0cihhcmNoaXZlKSwgc2VsZi5uYW1lKSwgc2VsZi5sb2NhdGlvbikKKyAgICAgICAgICAgIGZv ciBjYW5kaWRhdGUgaW4gWworICAgICAgICAgICAgICAgIG9zLnBhdGguam9pbih0ZW1wX2xvY2F0 aW9uLCBzdHIoYXJjaGl2ZSksIHNlbGYubmFtZSksCisgICAgICAgICAgICAgICAgb3MucGF0aC5q b2luKHRlbXBfbG9jYXRpb24sIHN0cihhcmNoaXZlKSwgJ3NyYycsIHNlbGYubmFtZSksCisgICAg ICAgICAgICBdOgorICAgICAgICAgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKGNhbmRpZGF0ZSk6 CisgICAgICAgICAgICAgICAgICAgIHNodXRpbC5tb3ZlKGNhbmRpZGF0ZSwgc2VsZi5sb2NhdGlv bikKKyAgICAgICAgICAgICAgICAgICAgYnJlYWsKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAg ICAgICAgICAgcmFpc2UgT1NFcnJvcignQ2Fubm90IGluc3RhbGwge30nLmZvcm1hdChzZWxmLm5h bWUpKQogCiAgICAgICAgICAgICBzZWxmLmRvX3Bvc3RfaW5zdGFsbCh0ZW1wX2xvY2F0aW9uKQog CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvdGVzdF9l eHBlY3RhdGlvbl91cGRhdGVyLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL25ldC9idWd6aWxsYS90ZXN0X2V4cGVjdGF0aW9uX3VwZGF0ZXIucHkJKHJldmlz aW9uIDI2NTA3MCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxs YS90ZXN0X2V4cGVjdGF0aW9uX3VwZGF0ZXIucHkJKHdvcmtpbmcgY29weSkKQEAgLTQwLDkgKzQw LDEwIEBAIGZyb20gd2Via2l0cHkuY29tbW9uLm5ldC5sYXlvdXR0ZXN0cmVzdWwKIGZyb20gd2Vi a2l0cHkuY29tbW9uLndlYmtpdF9maW5kZXIgaW1wb3J0IFdlYktpdEZpbmRlcgogZnJvbSB3ZWJr aXRweS5sYXlvdXRfdGVzdHMuY29udHJvbGxlcnMudGVzdF9yZXN1bHRfd3JpdGVyIGltcG9ydCBU ZXN0UmVzdWx0V3JpdGVyCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5tb2RlbHMgaW1wb3J0 IHRlc3RfZXhwZWN0YXRpb25zCi1mcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxl ZCBpbXBvcnQgcmVxdWVzdHMKKwogaW1wb3J0IGpzb24KIGltcG9ydCByZQoraW1wb3J0IHJlcXVl c3RzCiAKICMgQnVpbGRib3Qgc3RhdHVzIGNvZGVzIHJlZmVyZW5jZWQgZnJvbSBodHRwczovL2dp dGh1Yi5jb20vYnVpbGRib3QvYnVpbGRib3QvYmxvYi9tYXN0ZXIvbWFzdGVyL2J1aWxkYm90L3By b2Nlc3MvcmVzdWx0cy5weQogRVdTX1NUQVRFQ09ERVMgPSB7J1NVQ0NFU1MnOiAwLCAnV0FSTklO R1MnOiAxLCAnRkFJTFVSRSc6IDIsICdTS0lQUEVEJzogMywgJ0VYQ0VQVElPTic6IDQsICdSRVRS WSc6IDUsICdDQU5DRUxMRUQnOiA2fQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9yZXN1 bHRzL3VwbG9hZC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Jlc3Vs dHMvdXBsb2FkLnB5CShyZXZpc2lvbiAyNjUwNzApCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3Jlc3VsdHMvdXBsb2FkLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yMCw3ICsyMCw2IEBACiAjIE9S IFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkg V0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBP RiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKLWltcG9ydCB3ZWJraXRweS50aGly ZHBhcnR5LmF1dG9pbnN0YWxsZWQucmVxdWVzdHMKIGZyb20gd2Via2l0cHkucG9ydC5jb25maWcg aW1wb3J0IGFwcGxlX2FkZGl0aW9ucwogCiBpbXBvcnQgbWF0aApJbmRleDogVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9yZXN1bHRzL3VwbG9hZF91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3Jlc3VsdHMvdXBsb2FkX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAy NjUwNzApCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Jlc3VsdHMvdXBsb2FkX3VuaXR0ZXN0 LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yMCw3ICsyMCw3IEBACiAjIE9SIFRPUlQgKElOQ0xVRElO RyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUg VVNFCiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJ VFkgT0YgU1VDSCBEQU1BR0UuCiAKLWltcG9ydCB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9pbnN0 YWxsZWQucmVxdWVzdHMKK2Zyb20gd2Via2l0Y29yZXB5IGltcG9ydCBCeXRlc0lPCiAKIGltcG9y dCBjb2xsZWN0aW9ucwogaW1wb3J0IGpzb24KQEAgLTI5LDggKzI5LDYgQEAgaW1wb3J0IHN5cwog aW1wb3J0IHRpbWUKIGltcG9ydCB1bml0dGVzdAogCi1mcm9tIHdlYmtpdGNvcmVweSBpbXBvcnQg Qnl0ZXNJTwotCiBmcm9tIHdlYmtpdHB5LnJlc3VsdHMudXBsb2FkIGltcG9ydCBVcGxvYWQKIGZy b20gd2Via2l0cHkudGhpcmRwYXJ0eSBpbXBvcnQgbW9jawogCkluZGV4OiBUb29scy9TY3JpcHRz L3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X18ucHkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2Ny aXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5CShyZXZpc2lvbiAyNjUwNzApCisr KyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X18ucHkJKHdvcmtpbmcg Y29weSkKQEAgLTgzLDcgKzgzLDcgQEAgY2xhc3MgQXV0b2luc3RhbGxJbXBvcnRIb29rKG9iamVj dCk6CiAgICAgZGVmIF9lbnN1cmVfYXV0b2luc3RhbGxlZF9kaXJfaXNfaW5fc3lzX3BhdGgoc2Vs Zik6CiAgICAgICAgICMgU29tZSBwYWNrYWdlcyByZXF1aXJlIHRoYXQgdGhlIGFyZSBiZWluZyBw dXQgc29tZXdoZXJlIHVuZGVyIGEgZGlyZWN0b3J5IGluIHN5cy5wYXRoLgogICAgICAgICBpZiBu b3QgX0FVVE9JTlNUQUxMRURfRElSIGluIHN5cy5wYXRoOgotICAgICAgICAgICAgc3lzLnBhdGgu aW5zZXJ0KDAsIF9BVVRPSU5TVEFMTEVEX0RJUikKKyAgICAgICAgICAgIHN5cy5wYXRoLmluc2Vy dCgxIGlmICdsaWJyYXJpZXMvYXV0b2luc3RhbGxlZCcgaW4gc3lzLnBhdGhbMF0gZWxzZSAwLCBf QVVUT0lOU1RBTExFRF9ESVIpCiAKICAgICBkZWYgZmluZF9tb2R1bGUoc2VsZiwgZnVsbG5hbWUs IHBhdGg9Tm9uZSk6CiAgICAgICAgICMgVGhpcyBtZXRob2Qgd2lsbCBydW4gYmVmb3JlIGVhY2gg aW1wb3J0LiBTZWUgaHR0cDovL3d3dy5weXRob24ub3JnL2Rldi9wZXBzL3BlcC0wMzAyLwpAQCAt MTIwLDggKzEyMCw2IEBAIGNsYXNzIEF1dG9pbnN0YWxsSW1wb3J0SG9vayhvYmplY3QpOgogICAg ICAgICAgICAgc2VsZi5faW5zdGFsbF9weXRlc3RfdGltZW91dCgpCiAgICAgICAgIGVsaWYgJy5w eXRlc3QnIGluIGZ1bGxuYW1lOgogICAgICAgICAgICAgc2VsZi5faW5zdGFsbF9weXRlc3QoKQot ICAgICAgICBlbGlmICcucmVxdWVzdHMnIGluIGZ1bGxuYW1lOgotICAgICAgICAgICAgc2VsZi5f aW5zdGFsbF9yZXF1ZXN0cygpCiAgICAgICAgIGVsaWYgJy5iczQnIGluIGZ1bGxuYW1lOgogICAg ICAgICAgICAgc2VsZi5faW5zdGFsbF9iZWF1dGlmdWxzb3VwKCkKICAgICAgICAgZWxpZiAnLmh0 bWw1bGliJyBpbiBmdWxsbmFtZToKQEAgLTE5MCwyNCArMTg4LDEwIEBAIGNsYXNzIEF1dG9pbnN0 YWxsSW1wb3J0SG9vayhvYmplY3QpOgogICAgICAgICBzZWxmLl9pbnN0YWxsKCJodHRwczovL2Zp bGVzLnB5dGhvbmhvc3RlZC5vcmcvcGFja2FnZXMvYTIvZWMvNDE1ZDBjY2NjMWVkNDFjZDdmZGY2 OWFkOTg5ZGExNmE4ZDEzMDU3OTk2MzcxMDA0Y2FiNGJhZmM0OGYzL3B5dGVzdC0zLjYuMi50YXIu Z3oiLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInB5dGVzdC0zLjYuMi9zcmMvcHl0 ZXN0LnB5IikKIAotICAgIGRlZiBfaW5zdGFsbF9yZXF1ZXN0cyhzZWxmKToKLSAgICAgICAgc2Vs Zi5fZW5zdXJlX2F1dG9pbnN0YWxsZWRfZGlyX2lzX2luX3N5c19wYXRoKCkKLSAgICAgICAgc2Vs Zi5faW5zdGFsbCgiaHR0cHM6Ly9maWxlcy5weXRob25ob3N0ZWQub3JnL3BhY2thZ2VzLzA2L2I4 L2QxZWEzODUxM2MyMmU4YzkwNjI3NWQxMzU4MThmZWUxNmFkODQ5NTk4NTk1NmE5YjdlMmJiMjE5 NDJhMS9jZXJ0aWZpLTIwMTkuMy45LnRhci5neiIsCi0gICAgICAgICAgICAgICAgICAgICAgImNl cnRpZmktMjAxOS4zLjkvY2VydGlmaSIpCi0gICAgICAgIHNlbGYuX2luc3RhbGwoImh0dHBzOi8v ZmlsZXMucHl0aG9uaG9zdGVkLm9yZy9wYWNrYWdlcy9mYy9iYi9hNTc2OGMyMzBmOWRkYjAzYWNj OWVmM2YwZDRhM2NmOTM0NjI0NzM3OTVkMThlOTUzNTQ5OGM4ZjkyOWQvY2hhcmRldC0zLjAuNC50 YXIuZ3oiLAotICAgICAgICAgICAgICAgICAgICAgICJjaGFyZGV0LTMuMC40L2NoYXJkZXQiKQot ICAgICAgICBzZWxmLl9pbnN0YWxsKCJodHRwczovL2ZpbGVzLnB5dGhvbmhvc3RlZC5vcmcvcGFj a2FnZXMvYWQvMTMvZWI1Njk1MWI2Zjc5NTBjYWRiNTc5Y2ExNjZlNDQ4YmE3N2Y5ZDI0ZWZjMDNl ZGQ3ZTU1ZmE1N2QwNGI3L2lkbmEtMi44LnRhci5neiIsCi0gICAgICAgICAgICAgICAgICAgICAg ImlkbmEtMi44L2lkbmEiKQotICAgICAgICBzZWxmLl9pbnN0YWxsKCJodHRwczovL2ZpbGVzLnB5 dGhvbmhvc3RlZC5vcmcvcGFja2FnZXMvZmYvNDQvMjk2NTUxNjhkYTQ0MWRmZjY2ZGUwMzk1Mjg4 MGM2ZTJkMTdiMjUyODM2ZmYxYWE0NDIxZmJhNTU2NDI0L3VybGxpYjMtMS4yNS42LnRhci5neiIs Ci0gICAgICAgICAgICAgICAgICAgICAgInVybGxpYjMtMS4yNS42L3NyYy91cmxsaWIzIikKLSAg ICAgICAgc2VsZi5faW5zdGFsbCgiaHR0cHM6Ly9maWxlcy5weXRob25ob3N0ZWQub3JnL3BhY2th Z2VzLzAxLzYyL2RkY2Y3NmQxZDE5ODg1ZTg1NzlhY2IxYjFkZjI2YTg1MmIwMzQ3MmMwZTQ2ZDJi OTU5YTcxNGM5MDYwOC9yZXF1ZXN0cy0yLjIyLjAudGFyLmd6IiwKLSAgICAgICAgICAgICAgICAg ICAgICAicmVxdWVzdHMtMi4yMi4wL3JlcXVlc3RzIikKLQogICAgIGRlZiBfaW5zdGFsbF9iZWF1 dGlmdWxzb3VwKHNlbGYpOgogICAgICAgICBpZiBzeXMudmVyc2lvbl9pbmZvIDwgKDMsIDApOgog ICAgICAgICAgICAgcmV0dXJuCiAKLSAgICAgICAgc2VsZi5faW5zdGFsbF9yZXF1ZXN0cygpCiAg ICAgICAgIHNlbGYuX2luc3RhbGxfaHRtbDVsaWIoKQogICAgICAgICBzZWxmLl9lbnN1cmVfYXV0 b2luc3RhbGxlZF9kaXJfaXNfaW5fc3lzX3BhdGgoKQogICAgICAgICBzZWxmLl9pbnN0YWxsKCJo dHRwczovL2ZpbGVzLnB5dGhvbmhvc3RlZC5vcmcvcGFja2FnZXMvN2YvNGUvOTVhMTM1MjdlMThi NmYxYTE1YzkzZjFjNjM0Yjg2ZDVmYTYzNGM1NjE5ZGNlNjk1ZjRlMGNkNjgxODJmL3NvdXBzaWV2 ZS0xLjkuNC50YXIuZ3oiLApAQCAtMjg2LDkgKzI3MCw2IEBAIGNsYXNzIEF1dG9pbnN0YWxsSW1w b3J0SG9vayhvYmplY3QpOgogICAgIGRlZiBfaW5zdGFsbF9zZWxlbml1bShzZWxmKToKICAgICAg ICAgc2VsZi5fZW5zdXJlX2F1dG9pbnN0YWxsZWRfZGlyX2lzX2luX3N5c19wYXRoKCkKIAotICAg ICAgICBpbnN0YWxsZXIgPSBBdXRvSW5zdGFsbGVyKHByZXBlbmRfdG9fc2VhcmNoX3BhdGg9VHJ1 ZSwgdGFyZ2V0X2Rpcj1zZWxmLl9mcy5qb2luKF9BVVRPSU5TVEFMTEVEX0RJUiwgInVybGxpYjMi KSkKLSAgICAgICAgaW5zdGFsbGVyLmluc3RhbGwodXJsPSJodHRwczovL2ZpbGVzLnB5dGhvbmhv c3RlZC5vcmcvcGFja2FnZXMvZmYvNDQvMjk2NTUxNjhkYTQ0MWRmZjY2ZGUwMzk1Mjg4MGM2ZTJk MTdiMjUyODM2ZmYxYWE0NDIxZmJhNTU2NDI0L3VybGxpYjMtMS4yNS42LnRhci5neiIsIHVybF9z dWJwYXRoPSJ1cmxsaWIzLTEuMjUuNiIpCi0KICAgICAgICAgbWluaW11bV92ZXJzaW9uID0gJzMu NS4wJwogICAgICAgICBpZiBvcy5wYXRoLmlzZmlsZShvcy5wYXRoLmpvaW4oX0FVVE9JTlNUQUxM RURfRElSLCAnc2VsZW5pdW0nLCAnX19pbml0X18ucHknKSk6CiAgICAgICAgICAgICBpbXBvcnQg c2VsZW5pdW0ud2ViZHJpdmVyCg== 405546 2020-07-29 21:40:41 -0700 2020-07-30 07:17:23 -0700 Patch bug-214951-20200729214040.patch text/plain 9313 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTA3MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI2IEBACisyMDIwLTA3LTI5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0cHldIFVzZSB3ZWJraXRjb3JlcHkncyBhdXRvIGluc3RhbGxl ciBmb3IgcmVxdWVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxNDk1MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjYzMDgwNDk+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJh cmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5OiBCdW1wIGxpYnJhcnkg dmVyc2lvbiwgYWRkIHVybGxpYjMuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weToKKyAgICAgICAgKFBhY2thZ2UuaW5z dGFsbCk6IFN1cHBvcnQgcGFja2FnZSBmb3JtYXQgd2hlcmUgcGFja2FnZSBpcyBjb250YWluZWQg aW4gYSAnc3JjJyBmb2xkZXIuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0 L2J1Z3ppbGxhL3Rlc3RfZXhwZWN0YXRpb25fdXBkYXRlci5weTogVXNlIHdlYmtpdGNvcmVweSdz IGF1dG8gaW5zdGFsbGVyLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcmVzdWx0cy91cGxv YWQucHk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcmVzdWx0cy91cGxvYWRf dW5pdHRlc3QucHk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0 eS9fX2luaXRfXy5weToKKyAgICAgICAgKEF1dG9pbnN0YWxsSW1wb3J0SG9vay5fZW5zdXJlX2F1 dG9pbnN0YWxsZWRfZGlyX2lzX2luX3N5c19wYXRoKTogTWFrZSBzdXJlIHdlYmtpdGNvcmVweSB0 YWtlcyBwcmVjZWRlbmNlCisgICAgICAgIG92ZXIgd2Via2l0cHkuCisgICAgICAgIChBdXRvaW5z dGFsbEltcG9ydEhvb2suZmluZF9tb2R1bGUpOiBEZWxldGUgX2luc3RhbGxfcmVxdWVzdHMuCisg ICAgICAgIChBdXRvaW5zdGFsbEltcG9ydEhvb2suX2luc3RhbGxfcHl0ZXN0KTogRGl0dG8uCisg ICAgICAgIChBdXRvaW5zdGFsbEltcG9ydEhvb2suX2luc3RhbGxfYmVhdXRpZnVsc291cCk6IERp dHRvLgorICAgICAgICAoQXV0b2luc3RhbGxJbXBvcnRIb29rLl9pbnN0YWxsX3NlbGVuaXVtKTog RGl0dG8uCisgICAgICAgIChBdXRvaW5zdGFsbEltcG9ydEhvb2suX2luc3RhbGxfcmVxdWVzdHMp OiBEZWxldGVkLgorCiAyMDIwLTA3LTI5ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4K IAogICAgICAgICBBZGQgc2NyaXB0IHRvIGhlbHAgdXMgY291bnQgdXNlcyBvZiBub24taW5jbHVz aXZlIHRlcm1zCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Vi a2l0Y29yZXB5L19faW5pdF9fLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI2NTA3 MCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkv X19pbml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAgLTI4LDcgKzI4LDcgQEAgbG9nID0gbG9nZ2lu Zy5nZXRMb2dnZXIoJ3dlYmtpdGNvcmVweScpCiBmcm9tIHdlYmtpdGNvcmVweS52ZXJzaW9uIGlt cG9ydCBWZXJzaW9uCiBmcm9tIHdlYmtpdGNvcmVweS5zdHJpbmdfdXRpbHMgaW1wb3J0IEJ5dGVz SU8sIFN0cmluZ0lPLCBVbmljb2RlSU8sIHVuaWNvZGUKIAotdmVyc2lvbiA9IFZlcnNpb24oMCwg MCwgMykKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDAsIDQpCiAKIGZyb20gd2Via2l0Y29yZXB5LmF1 dG9pbnN0YWxsIGltcG9ydCBQYWNrYWdlLCBBdXRvSW5zdGFsbAogaWYgc3lzLnZlcnNpb25faW5m byA+ICgzLCAwKToKQEAgLTM3LDQgKzM3LDYgQEAgZWxzZToKICAgICBBdXRvSW5zdGFsbC5yZWdp c3RlcihQYWNrYWdlKCdtb2NrJywgVmVyc2lvbigzLCAwLCA1KSkpCiAKIEF1dG9JbnN0YWxsLnJl Z2lzdGVyKFBhY2thZ2UoJ2NlcnRpZmknLCBWZXJzaW9uKDIwMjAsIDYsIDIwKSkpCitBdXRvSW5z dGFsbC5yZWdpc3RlcihQYWNrYWdlKCd1cmxsaWIzJywgVmVyc2lvbigxLCAyNSwgMTApKSkKK0F1 dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2NoYXJkZXQnLCBWZXJzaW9uKDMsIDAsIDQpKSkK IEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3JlcXVlc3RzJywgVmVyc2lvbigyLCAyNCkp KQpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVw eS9hdXRvaW5zdGFsbC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5CShyZXZpc2lvbiAyNjUwNzAp CisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1 dG9pbnN0YWxsLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xNzUsNyArMTc1LDE1IEBAIGNsYXNzIFBh Y2thZ2Uob2JqZWN0KToKICAgICAgICAgICAgIGFyY2hpdmUudW5wYWNrKHRlbXBfbG9jYXRpb24p CiAKICAgICAgICAgICAgIHNodXRpbC5ybXRyZWUoc2VsZi5sb2NhdGlvbiwgaWdub3JlX2Vycm9y cz1UcnVlKQotICAgICAgICAgICAgc2h1dGlsLm1vdmUob3MucGF0aC5qb2luKHRlbXBfbG9jYXRp b24sIHN0cihhcmNoaXZlKSwgc2VsZi5uYW1lKSwgc2VsZi5sb2NhdGlvbikKKyAgICAgICAgICAg IGZvciBjYW5kaWRhdGUgaW4gWworICAgICAgICAgICAgICAgIG9zLnBhdGguam9pbih0ZW1wX2xv Y2F0aW9uLCBzdHIoYXJjaGl2ZSksIHNlbGYubmFtZSksCisgICAgICAgICAgICAgICAgb3MucGF0 aC5qb2luKHRlbXBfbG9jYXRpb24sIHN0cihhcmNoaXZlKSwgJ3NyYycsIHNlbGYubmFtZSksCisg ICAgICAgICAgICBdOgorICAgICAgICAgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKGNhbmRpZGF0 ZSk6CisgICAgICAgICAgICAgICAgICAgIHNodXRpbC5tb3ZlKGNhbmRpZGF0ZSwgc2VsZi5sb2Nh dGlvbikKKyAgICAgICAgICAgICAgICAgICAgYnJlYWsKKyAgICAgICAgICAgIGVsc2U6CisgICAg ICAgICAgICAgICAgcmFpc2UgT1NFcnJvcignQ2Fubm90IGluc3RhbGwge30nLmZvcm1hdChzZWxm Lm5hbWUpKQogCiAgICAgICAgICAgICBzZWxmLmRvX3Bvc3RfaW5zdGFsbCh0ZW1wX2xvY2F0aW9u KQogCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvdGVz dF9leHBlY3RhdGlvbl91cGRhdGVyLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS90ZXN0X2V4cGVjdGF0aW9uX3VwZGF0ZXIucHkJKHJl dmlzaW9uIDI2NTA3MCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6 aWxsYS90ZXN0X2V4cGVjdGF0aW9uX3VwZGF0ZXIucHkJKHdvcmtpbmcgY29weSkKQEAgLTQwLDkg KzQwLDEwIEBAIGZyb20gd2Via2l0cHkuY29tbW9uLm5ldC5sYXlvdXR0ZXN0cmVzdWwKIGZyb20g d2Via2l0cHkuY29tbW9uLndlYmtpdF9maW5kZXIgaW1wb3J0IFdlYktpdEZpbmRlcgogZnJvbSB3 ZWJraXRweS5sYXlvdXRfdGVzdHMuY29udHJvbGxlcnMudGVzdF9yZXN1bHRfd3JpdGVyIGltcG9y dCBUZXN0UmVzdWx0V3JpdGVyCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5tb2RlbHMgaW1w b3J0IHRlc3RfZXhwZWN0YXRpb25zCi1mcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3Rh bGxlZCBpbXBvcnQgcmVxdWVzdHMKKwogaW1wb3J0IGpzb24KIGltcG9ydCByZQoraW1wb3J0IHJl cXVlc3RzCiAKICMgQnVpbGRib3Qgc3RhdHVzIGNvZGVzIHJlZmVyZW5jZWQgZnJvbSBodHRwczov L2dpdGh1Yi5jb20vYnVpbGRib3QvYnVpbGRib3QvYmxvYi9tYXN0ZXIvbWFzdGVyL2J1aWxkYm90 L3Byb2Nlc3MvcmVzdWx0cy5weQogRVdTX1NUQVRFQ09ERVMgPSB7J1NVQ0NFU1MnOiAwLCAnV0FS TklOR1MnOiAxLCAnRkFJTFVSRSc6IDIsICdTS0lQUEVEJzogMywgJ0VYQ0VQVElPTic6IDQsICdS RVRSWSc6IDUsICdDQU5DRUxMRUQnOiA2fQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9y ZXN1bHRzL3VwbG9hZC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Jl c3VsdHMvdXBsb2FkLnB5CShyZXZpc2lvbiAyNjUwNzApCisrKyBUb29scy9TY3JpcHRzL3dlYmtp dHB5L3Jlc3VsdHMvdXBsb2FkLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yMCw3ICsyMCw2IEBACiAj IE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBB TlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNF RCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKLWltcG9ydCB3ZWJraXRweS50 aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQucmVxdWVzdHMKIGZyb20gd2Via2l0cHkucG9ydC5jb25m aWcgaW1wb3J0IGFwcGxlX2FkZGl0aW9ucwogCiBpbXBvcnQgbWF0aApJbmRleDogVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9yZXN1bHRzL3VwbG9hZF91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3Jlc3VsdHMvdXBsb2FkX3VuaXR0ZXN0LnB5CShyZXZpc2lv biAyNjUwNzApCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Jlc3VsdHMvdXBsb2FkX3VuaXR0 ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yMCw3ICsyMCw3IEBACiAjIE9SIFRPUlQgKElOQ0xV RElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBU SEUgVVNFCiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKLWltcG9ydCB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9p bnN0YWxsZWQucmVxdWVzdHMKK2Zyb20gd2Via2l0Y29yZXB5IGltcG9ydCBCeXRlc0lPCiAKIGlt cG9ydCBjb2xsZWN0aW9ucwogaW1wb3J0IGpzb24KQEAgLTI5LDggKzI5LDYgQEAgaW1wb3J0IHN5 cwogaW1wb3J0IHRpbWUKIGltcG9ydCB1bml0dGVzdAogCi1mcm9tIHdlYmtpdGNvcmVweSBpbXBv cnQgQnl0ZXNJTwotCiBmcm9tIHdlYmtpdHB5LnJlc3VsdHMudXBsb2FkIGltcG9ydCBVcGxvYWQK IGZyb20gd2Via2l0cHkudGhpcmRwYXJ0eSBpbXBvcnQgbW9jawogCkluZGV4OiBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X18ucHkKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv U2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5CShyZXZpc2lvbiAyNjUwNzAp CisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X18ucHkJKHdvcmtp bmcgY29weSkKQEAgLTgzLDcgKzgzLDcgQEAgY2xhc3MgQXV0b2luc3RhbGxJbXBvcnRIb29rKG9i amVjdCk6CiAgICAgZGVmIF9lbnN1cmVfYXV0b2luc3RhbGxlZF9kaXJfaXNfaW5fc3lzX3BhdGgo c2VsZik6CiAgICAgICAgICMgU29tZSBwYWNrYWdlcyByZXF1aXJlIHRoYXQgdGhlIGFyZSBiZWlu ZyBwdXQgc29tZXdoZXJlIHVuZGVyIGEgZGlyZWN0b3J5IGluIHN5cy5wYXRoLgogICAgICAgICBp ZiBub3QgX0FVVE9JTlNUQUxMRURfRElSIGluIHN5cy5wYXRoOgotICAgICAgICAgICAgc3lzLnBh dGguaW5zZXJ0KDAsIF9BVVRPSU5TVEFMTEVEX0RJUikKKyAgICAgICAgICAgIHN5cy5wYXRoLmlu c2VydCgxIGlmICdsaWJyYXJpZXMvYXV0b2luc3RhbGxlZCcgaW4gc3lzLnBhdGhbMF0gZWxzZSAw LCBfQVVUT0lOU1RBTExFRF9ESVIpCiAKICAgICBkZWYgZmluZF9tb2R1bGUoc2VsZiwgZnVsbG5h bWUsIHBhdGg9Tm9uZSk6CiAgICAgICAgICMgVGhpcyBtZXRob2Qgd2lsbCBydW4gYmVmb3JlIGVh Y2ggaW1wb3J0LiBTZWUgaHR0cDovL3d3dy5weXRob24ub3JnL2Rldi9wZXBzL3BlcC0wMzAyLwpA QCAtMTIwLDggKzEyMCw2IEBAIGNsYXNzIEF1dG9pbnN0YWxsSW1wb3J0SG9vayhvYmplY3QpOgog ICAgICAgICAgICAgc2VsZi5faW5zdGFsbF9weXRlc3RfdGltZW91dCgpCiAgICAgICAgIGVsaWYg Jy5weXRlc3QnIGluIGZ1bGxuYW1lOgogICAgICAgICAgICAgc2VsZi5faW5zdGFsbF9weXRlc3Qo KQotICAgICAgICBlbGlmICcucmVxdWVzdHMnIGluIGZ1bGxuYW1lOgotICAgICAgICAgICAgc2Vs Zi5faW5zdGFsbF9yZXF1ZXN0cygpCiAgICAgICAgIGVsaWYgJy5iczQnIGluIGZ1bGxuYW1lOgog ICAgICAgICAgICAgc2VsZi5faW5zdGFsbF9iZWF1dGlmdWxzb3VwKCkKICAgICAgICAgZWxpZiAn Lmh0bWw1bGliJyBpbiBmdWxsbmFtZToKQEAgLTE5MCwyNCArMTg4LDEwIEBAIGNsYXNzIEF1dG9p bnN0YWxsSW1wb3J0SG9vayhvYmplY3QpOgogICAgICAgICBzZWxmLl9pbnN0YWxsKCJodHRwczov L2ZpbGVzLnB5dGhvbmhvc3RlZC5vcmcvcGFja2FnZXMvYTIvZWMvNDE1ZDBjY2NjMWVkNDFjZDdm ZGY2OWFkOTg5ZGExNmE4ZDEzMDU3OTk2MzcxMDA0Y2FiNGJhZmM0OGYzL3B5dGVzdC0zLjYuMi50 YXIuZ3oiLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInB5dGVzdC0zLjYuMi9zcmMv cHl0ZXN0LnB5IikKIAotICAgIGRlZiBfaW5zdGFsbF9yZXF1ZXN0cyhzZWxmKToKLSAgICAgICAg c2VsZi5fZW5zdXJlX2F1dG9pbnN0YWxsZWRfZGlyX2lzX2luX3N5c19wYXRoKCkKLSAgICAgICAg c2VsZi5faW5zdGFsbCgiaHR0cHM6Ly9maWxlcy5weXRob25ob3N0ZWQub3JnL3BhY2thZ2VzLzA2 L2I4L2QxZWEzODUxM2MyMmU4YzkwNjI3NWQxMzU4MThmZWUxNmFkODQ5NTk4NTk1NmE5YjdlMmJi MjE5NDJhMS9jZXJ0aWZpLTIwMTkuMy45LnRhci5neiIsCi0gICAgICAgICAgICAgICAgICAgICAg ImNlcnRpZmktMjAxOS4zLjkvY2VydGlmaSIpCi0gICAgICAgIHNlbGYuX2luc3RhbGwoImh0dHBz Oi8vZmlsZXMucHl0aG9uaG9zdGVkLm9yZy9wYWNrYWdlcy9mYy9iYi9hNTc2OGMyMzBmOWRkYjAz YWNjOWVmM2YwZDRhM2NmOTM0NjI0NzM3OTVkMThlOTUzNTQ5OGM4ZjkyOWQvY2hhcmRldC0zLjAu NC50YXIuZ3oiLAotICAgICAgICAgICAgICAgICAgICAgICJjaGFyZGV0LTMuMC40L2NoYXJkZXQi KQotICAgICAgICBzZWxmLl9pbnN0YWxsKCJodHRwczovL2ZpbGVzLnB5dGhvbmhvc3RlZC5vcmcv cGFja2FnZXMvYWQvMTMvZWI1Njk1MWI2Zjc5NTBjYWRiNTc5Y2ExNjZlNDQ4YmE3N2Y5ZDI0ZWZj MDNlZGQ3ZTU1ZmE1N2QwNGI3L2lkbmEtMi44LnRhci5neiIsCi0gICAgICAgICAgICAgICAgICAg ICAgImlkbmEtMi44L2lkbmEiKQotICAgICAgICBzZWxmLl9pbnN0YWxsKCJodHRwczovL2ZpbGVz LnB5dGhvbmhvc3RlZC5vcmcvcGFja2FnZXMvZmYvNDQvMjk2NTUxNjhkYTQ0MWRmZjY2ZGUwMzk1 Mjg4MGM2ZTJkMTdiMjUyODM2ZmYxYWE0NDIxZmJhNTU2NDI0L3VybGxpYjMtMS4yNS42LnRhci5n eiIsCi0gICAgICAgICAgICAgICAgICAgICAgInVybGxpYjMtMS4yNS42L3NyYy91cmxsaWIzIikK LSAgICAgICAgc2VsZi5faW5zdGFsbCgiaHR0cHM6Ly9maWxlcy5weXRob25ob3N0ZWQub3JnL3Bh Y2thZ2VzLzAxLzYyL2RkY2Y3NmQxZDE5ODg1ZTg1NzlhY2IxYjFkZjI2YTg1MmIwMzQ3MmMwZTQ2 ZDJiOTU5YTcxNGM5MDYwOC9yZXF1ZXN0cy0yLjIyLjAudGFyLmd6IiwKLSAgICAgICAgICAgICAg ICAgICAgICAicmVxdWVzdHMtMi4yMi4wL3JlcXVlc3RzIikKLQogICAgIGRlZiBfaW5zdGFsbF9i ZWF1dGlmdWxzb3VwKHNlbGYpOgogICAgICAgICBpZiBzeXMudmVyc2lvbl9pbmZvIDwgKDMsIDAp OgogICAgICAgICAgICAgcmV0dXJuCiAKLSAgICAgICAgc2VsZi5faW5zdGFsbF9yZXF1ZXN0cygp CiAgICAgICAgIHNlbGYuX2luc3RhbGxfaHRtbDVsaWIoKQogICAgICAgICBzZWxmLl9lbnN1cmVf YXV0b2luc3RhbGxlZF9kaXJfaXNfaW5fc3lzX3BhdGgoKQogICAgICAgICBzZWxmLl9pbnN0YWxs KCJodHRwczovL2ZpbGVzLnB5dGhvbmhvc3RlZC5vcmcvcGFja2FnZXMvN2YvNGUvOTVhMTM1Mjdl MThiNmYxYTE1YzkzZjFjNjM0Yjg2ZDVmYTYzNGM1NjE5ZGNlNjk1ZjRlMGNkNjgxODJmL3NvdXBz aWV2ZS0xLjkuNC50YXIuZ3oiLApAQCAtMjg2LDkgKzI3MCw2IEBAIGNsYXNzIEF1dG9pbnN0YWxs SW1wb3J0SG9vayhvYmplY3QpOgogICAgIGRlZiBfaW5zdGFsbF9zZWxlbml1bShzZWxmKToKICAg ICAgICAgc2VsZi5fZW5zdXJlX2F1dG9pbnN0YWxsZWRfZGlyX2lzX2luX3N5c19wYXRoKCkKIAot ICAgICAgICBpbnN0YWxsZXIgPSBBdXRvSW5zdGFsbGVyKHByZXBlbmRfdG9fc2VhcmNoX3BhdGg9 VHJ1ZSwgdGFyZ2V0X2Rpcj1zZWxmLl9mcy5qb2luKF9BVVRPSU5TVEFMTEVEX0RJUiwgInVybGxp YjMiKSkKLSAgICAgICAgaW5zdGFsbGVyLmluc3RhbGwodXJsPSJodHRwczovL2ZpbGVzLnB5dGhv bmhvc3RlZC5vcmcvcGFja2FnZXMvZmYvNDQvMjk2NTUxNjhkYTQ0MWRmZjY2ZGUwMzk1Mjg4MGM2 ZTJkMTdiMjUyODM2ZmYxYWE0NDIxZmJhNTU2NDI0L3VybGxpYjMtMS4yNS42LnRhci5neiIsIHVy bF9zdWJwYXRoPSJ1cmxsaWIzLTEuMjUuNiIpCi0KICAgICAgICAgbWluaW11bV92ZXJzaW9uID0g JzMuNS4wJwogICAgICAgICBpZiBvcy5wYXRoLmlzZmlsZShvcy5wYXRoLmpvaW4oX0FVVE9JTlNU QUxMRURfRElSLCAnc2VsZW5pdW0nLCAnX19pbml0X18ucHknKSk6CiAgICAgICAgICAgICBpbXBv cnQgc2VsZW5pdW0ud2ViZHJpdmVyCg== 405568 2020-07-30 07:17:24 -0700 2020-07-30 21:01:24 -0700 Patch bug-214951-20200730071723.patch text/plain 10076 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTA4MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI4IEBACisyMDIwLTA3LTI5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0cHldIFVzZSB3ZWJraXRjb3JlcHkncyBhdXRvIGluc3RhbGxl ciBmb3IgcmVxdWVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxNDk1MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjYzMDgwNDk+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJh cmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5OiBCdW1wIGxpYnJhcnkg dmVyc2lvbiwgYWRkIHVybGxpYjMuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weToKKyAgICAgICAgKFBhY2thZ2UuYXJj aGl2ZXMpOiBTdXBwb3J0IGFyY2hpdmUgd2l0aCBubyB0aW55IHZlcnNpb24uCisgICAgICAgIChQ YWNrYWdlLmluc3RhbGwpOiBTdXBwb3J0IHBhY2thZ2UgZm9ybWF0IHdoZXJlIHBhY2thZ2UgaXMg Y29udGFpbmVkIGluIGEgJ3NyYycgZm9sZGVyLCBvciBvbmUgd2l0aCBubworICAgICAgICB0aW55 IHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxh L3Rlc3RfZXhwZWN0YXRpb25fdXBkYXRlci5weTogVXNlIHdlYmtpdGNvcmVweSdzIGF1dG8gaW5z dGFsbGVyLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcmVzdWx0cy91cGxvYWQucHk6IERp dHRvLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcmVzdWx0cy91cGxvYWRfdW5pdHRlc3Qu cHk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRf Xy5weToKKyAgICAgICAgKEF1dG9pbnN0YWxsSW1wb3J0SG9vay5fZW5zdXJlX2F1dG9pbnN0YWxs ZWRfZGlyX2lzX2luX3N5c19wYXRoKTogTWFrZSBzdXJlIHdlYmtpdGNvcmVweSB0YWtlcyBwcmVj ZWRlbmNlCisgICAgICAgIG92ZXIgd2Via2l0cHkuCisgICAgICAgIChBdXRvaW5zdGFsbEltcG9y dEhvb2suZmluZF9tb2R1bGUpOiBEZWxldGUgX2luc3RhbGxfcmVxdWVzdHMuCisgICAgICAgIChB dXRvaW5zdGFsbEltcG9ydEhvb2suX2luc3RhbGxfcHl0ZXN0KTogRGl0dG8uCisgICAgICAgIChB dXRvaW5zdGFsbEltcG9ydEhvb2suX2luc3RhbGxfYmVhdXRpZnVsc291cCk6IERpdHRvLgorICAg ICAgICAoQXV0b2luc3RhbGxJbXBvcnRIb29rLl9pbnN0YWxsX3NlbGVuaXVtKTogRGl0dG8uCisg ICAgICAgIChBdXRvaW5zdGFsbEltcG9ydEhvb2suX2luc3RhbGxfcmVxdWVzdHMpOiBEZWxldGVk LgorCiAyMDIwLTA3LTE1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNv bT4KIAogICAgICAgICBbR1RLNF0gRW5hYmxlIEFQSSB0ZXN0cwpJbmRleDogVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5 L19faW5pdF9fLnB5CShyZXZpc2lvbiAyNjUwNzApCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkpCkBA IC0yOCw3ICsyOCw3IEBAIGxvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKCd3ZWJraXRjb3JlcHknKQog ZnJvbSB3ZWJraXRjb3JlcHkudmVyc2lvbiBpbXBvcnQgVmVyc2lvbgogZnJvbSB3ZWJraXRjb3Jl cHkuc3RyaW5nX3V0aWxzIGltcG9ydCBCeXRlc0lPLCBTdHJpbmdJTywgVW5pY29kZUlPLCB1bmlj b2RlCiAKLXZlcnNpb24gPSBWZXJzaW9uKDAsIDAsIDMpCit2ZXJzaW9uID0gVmVyc2lvbigwLCAw LCA0KQogCiBmcm9tIHdlYmtpdGNvcmVweS5hdXRvaW5zdGFsbCBpbXBvcnQgUGFja2FnZSwgQXV0 b0luc3RhbGwKIGlmIHN5cy52ZXJzaW9uX2luZm8gPiAoMywgMCk6CkBAIC0zNyw0ICszNyw3IEBA IGVsc2U6CiAgICAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnbW9jaycsIFZlcnNpb24o MywgMCwgNSkpKQogCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdjZXJ0aWZpJywgVmVy c2lvbigyMDIwLCA2LCAyMCkpKQorQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgndXJsbGli MycsIFZlcnNpb24oMSwgMjUsIDEwKSkpCitBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdp ZG5hJywgVmVyc2lvbigyLCAxMCkpKQorQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnY2hh cmRldCcsIFZlcnNpb24oMywgMCwgNCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgn cmVxdWVzdHMnLCBWZXJzaW9uKDIsIDI0KSkpCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2lu c3RhbGwucHkJKHJldmlzaW9uIDI2NTA3MCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHkJKHdvcmtpbmcgY29weSkKQEAg LTEyMiw3ICsxMjIsNyBAQCBjbGFzcyBQYWNrYWdlKG9iamVjdCk6CiAgICAgICAgICAgICAgICAg aWYgcmVxdWlyZXMgYW5kIG5vdCBBdXRvSW5zdGFsbC52ZXJzaW9uLm1hdGNoZXMocmVxdWlyZXMp OgogICAgICAgICAgICAgICAgICAgICBjb250aW51ZQogCi0gICAgICAgICAgICAgICAgdmVyc2lv bl9jYW5kaWRhdGUgPSByZS5zZWFyY2gocidcZCtcLlxkK1wuXGQrJywgZWxlbWVudC5jaGlsZE5v ZGVzWzBdLmRhdGEpCisgICAgICAgICAgICAgICAgdmVyc2lvbl9jYW5kaWRhdGUgPSByZS5zZWFy Y2gocidcZCtcLlxkKyhcLlxkKyk/JywgZWxlbWVudC5jaGlsZE5vZGVzWzBdLmRhdGEpCiAgICAg ICAgICAgICAgICAgaWYgbm90IHZlcnNpb25fY2FuZGlkYXRlOgogICAgICAgICAgICAgICAgICAg ICBjb250aW51ZQogICAgICAgICAgICAgICAgIHZlcnNpb24gPSBWZXJzaW9uKCp2ZXJzaW9uX2Nh bmRpZGF0ZS5ncm91cCgpLnNwbGl0KCcuJykpCkBAIC0xNzUsNyArMTc1LDE2IEBAIGNsYXNzIFBh Y2thZ2Uob2JqZWN0KToKICAgICAgICAgICAgIGFyY2hpdmUudW5wYWNrKHRlbXBfbG9jYXRpb24p CiAKICAgICAgICAgICAgIHNodXRpbC5ybXRyZWUoc2VsZi5sb2NhdGlvbiwgaWdub3JlX2Vycm9y cz1UcnVlKQotICAgICAgICAgICAgc2h1dGlsLm1vdmUob3MucGF0aC5qb2luKHRlbXBfbG9jYXRp b24sIHN0cihhcmNoaXZlKSwgc2VsZi5uYW1lKSwgc2VsZi5sb2NhdGlvbikKKyAgICAgICAgICAg IGZvciBjYW5kaWRhdGUgaW4gWworICAgICAgICAgICAgICAgIG9zLnBhdGguam9pbih0ZW1wX2xv Y2F0aW9uLCBzdHIoYXJjaGl2ZSksIHNlbGYubmFtZSksCisgICAgICAgICAgICAgICAgb3MucGF0 aC5qb2luKHRlbXBfbG9jYXRpb24sICd7fS17fS57fScuZm9ybWF0KGFyY2hpdmUubmFtZSwgYXJj aGl2ZS52ZXJzaW9uLm1ham9yLCBhcmNoaXZlLnZlcnNpb24ubWlub3IpLCBzZWxmLm5hbWUpLAor ICAgICAgICAgICAgICAgIG9zLnBhdGguam9pbih0ZW1wX2xvY2F0aW9uLCBzdHIoYXJjaGl2ZSks ICdzcmMnLCBzZWxmLm5hbWUpLAorICAgICAgICAgICAgXToKKyAgICAgICAgICAgICAgICBpZiBv cy5wYXRoLmV4aXN0cyhjYW5kaWRhdGUpOgorICAgICAgICAgICAgICAgICAgICBzaHV0aWwubW92 ZShjYW5kaWRhdGUsIHNlbGYubG9jYXRpb24pCisgICAgICAgICAgICAgICAgICAgIGJyZWFrCisg ICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgIHJhaXNlIE9TRXJyb3IoJ0Nhbm5vdCBp bnN0YWxsIHt9Jy5mb3JtYXQoc2VsZi5uYW1lKSkKIAogICAgICAgICAgICAgc2VsZi5kb19wb3N0 X2luc3RhbGwodGVtcF9sb2NhdGlvbikKIApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vbmV0L2J1Z3ppbGxhL3Rlc3RfZXhwZWN0YXRpb25fdXBkYXRlci5weQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvdGVzdF9leHBl Y3RhdGlvbl91cGRhdGVyLnB5CShyZXZpc2lvbiAyNjUwNzApCisrKyBUb29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvdGVzdF9leHBlY3RhdGlvbl91cGRhdGVyLnB5CSh3 b3JraW5nIGNvcHkpCkBAIC00MCw5ICs0MCwxMCBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5uZXQu bGF5b3V0dGVzdHJlc3VsCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi53ZWJraXRfZmluZGVyIGltcG9y dCBXZWJLaXRGaW5kZXIKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLmNvbnRyb2xsZXJzLnRl c3RfcmVzdWx0X3dyaXRlciBpbXBvcnQgVGVzdFJlc3VsdFdyaXRlcgogZnJvbSB3ZWJraXRweS5s YXlvdXRfdGVzdHMubW9kZWxzIGltcG9ydCB0ZXN0X2V4cGVjdGF0aW9ucwotZnJvbSB3ZWJraXRw eS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQgaW1wb3J0IHJlcXVlc3RzCisKIGltcG9ydCBqc29u CiBpbXBvcnQgcmUKK2ltcG9ydCByZXF1ZXN0cwogCiAjIEJ1aWxkYm90IHN0YXR1cyBjb2RlcyBy ZWZlcmVuY2VkIGZyb20gaHR0cHM6Ly9naXRodWIuY29tL2J1aWxkYm90L2J1aWxkYm90L2Jsb2Iv bWFzdGVyL21hc3Rlci9idWlsZGJvdC9wcm9jZXNzL3Jlc3VsdHMucHkKIEVXU19TVEFURUNPREVT ID0geydTVUNDRVNTJzogMCwgJ1dBUk5JTkdTJzogMSwgJ0ZBSUxVUkUnOiAyLCAnU0tJUFBFRCc6 IDMsICdFWENFUFRJT04nOiA0LCAnUkVUUlknOiA1LCAnQ0FOQ0VMTEVEJzogNn0KSW5kZXg6IFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvcmVzdWx0cy91cGxvYWQucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvU2NyaXB0cy93ZWJraXRweS9yZXN1bHRzL3VwbG9hZC5weQkocmV2aXNpb24gMjY1MDcwKQor KysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9yZXN1bHRzL3VwbG9hZC5weQkod29ya2luZyBjb3B5 KQpAQCAtMjAsNyArMjAsNiBAQAogIyBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBP VEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQogIyBPRiBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LgogCi1pbXBvcnQgd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkLnJlcXVlc3RzCiBm cm9tIHdlYmtpdHB5LnBvcnQuY29uZmlnIGltcG9ydCBhcHBsZV9hZGRpdGlvbnMKIAogaW1wb3J0 IG1hdGgKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcmVzdWx0cy91cGxvYWRfdW5pdHRl c3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9yZXN1bHRzL3VwbG9h ZF91bml0dGVzdC5weQkocmV2aXNpb24gMjY1MDcwKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9yZXN1bHRzL3VwbG9hZF91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMjAsNyArMjAs NyBAQAogIyBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJ TkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElG IEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCi1pbXBvcnQgd2Vi a2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkLnJlcXVlc3RzCitmcm9tIHdlYmtpdGNvcmVw eSBpbXBvcnQgQnl0ZXNJTwogCiBpbXBvcnQgY29sbGVjdGlvbnMKIGltcG9ydCBqc29uCkBAIC0y OSw4ICsyOSw2IEBAIGltcG9ydCBzeXMKIGltcG9ydCB0aW1lCiBpbXBvcnQgdW5pdHRlc3QKIAot ZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IEJ5dGVzSU8KLQogZnJvbSB3ZWJraXRweS5yZXN1bHRz LnVwbG9hZCBpbXBvcnQgVXBsb2FkCiBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkgaW1wb3J0IG1v Y2sKIApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRf Xy5weQkocmV2aXNpb24gMjY1MDcwKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGlyZHBh cnR5L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkpCkBAIC04Myw3ICs4Myw3IEBAIGNsYXNzIEF1 dG9pbnN0YWxsSW1wb3J0SG9vayhvYmplY3QpOgogICAgIGRlZiBfZW5zdXJlX2F1dG9pbnN0YWxs ZWRfZGlyX2lzX2luX3N5c19wYXRoKHNlbGYpOgogICAgICAgICAjIFNvbWUgcGFja2FnZXMgcmVx dWlyZSB0aGF0IHRoZSBhcmUgYmVpbmcgcHV0IHNvbWV3aGVyZSB1bmRlciBhIGRpcmVjdG9yeSBp biBzeXMucGF0aC4KICAgICAgICAgaWYgbm90IF9BVVRPSU5TVEFMTEVEX0RJUiBpbiBzeXMucGF0 aDoKLSAgICAgICAgICAgIHN5cy5wYXRoLmluc2VydCgwLCBfQVVUT0lOU1RBTExFRF9ESVIpCisg ICAgICAgICAgICBzeXMucGF0aC5pbnNlcnQoMSBpZiAnbGlicmFyaWVzL2F1dG9pbnN0YWxsZWQn IGluIHN5cy5wYXRoWzBdIGVsc2UgMCwgX0FVVE9JTlNUQUxMRURfRElSKQogCiAgICAgZGVmIGZp bmRfbW9kdWxlKHNlbGYsIGZ1bGxuYW1lLCBwYXRoPU5vbmUpOgogICAgICAgICAjIFRoaXMgbWV0 aG9kIHdpbGwgcnVuIGJlZm9yZSBlYWNoIGltcG9ydC4gU2VlIGh0dHA6Ly93d3cucHl0aG9uLm9y Zy9kZXYvcGVwcy9wZXAtMDMwMi8KQEAgLTEyMCw4ICsxMjAsNiBAQCBjbGFzcyBBdXRvaW5zdGFs bEltcG9ydEhvb2sob2JqZWN0KToKICAgICAgICAgICAgIHNlbGYuX2luc3RhbGxfcHl0ZXN0X3Rp bWVvdXQoKQogICAgICAgICBlbGlmICcucHl0ZXN0JyBpbiBmdWxsbmFtZToKICAgICAgICAgICAg IHNlbGYuX2luc3RhbGxfcHl0ZXN0KCkKLSAgICAgICAgZWxpZiAnLnJlcXVlc3RzJyBpbiBmdWxs bmFtZToKLSAgICAgICAgICAgIHNlbGYuX2luc3RhbGxfcmVxdWVzdHMoKQogICAgICAgICBlbGlm ICcuYnM0JyBpbiBmdWxsbmFtZToKICAgICAgICAgICAgIHNlbGYuX2luc3RhbGxfYmVhdXRpZnVs c291cCgpCiAgICAgICAgIGVsaWYgJy5odG1sNWxpYicgaW4gZnVsbG5hbWU6CkBAIC0xOTAsMjQg KzE4OCwxMCBAQCBjbGFzcyBBdXRvaW5zdGFsbEltcG9ydEhvb2sob2JqZWN0KToKICAgICAgICAg c2VsZi5faW5zdGFsbCgiaHR0cHM6Ly9maWxlcy5weXRob25ob3N0ZWQub3JnL3BhY2thZ2VzL2Ey L2VjLzQxNWQwY2NjYzFlZDQxY2Q3ZmRmNjlhZDk4OWRhMTZhOGQxMzA1Nzk5NjM3MTAwNGNhYjRi YWZjNDhmMy9weXRlc3QtMy42LjIudGFyLmd6IiwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICJweXRlc3QtMy42LjIvc3JjL3B5dGVzdC5weSIpCiAKLSAgICBkZWYgX2luc3RhbGxfcmVx dWVzdHMoc2VsZik6Ci0gICAgICAgIHNlbGYuX2Vuc3VyZV9hdXRvaW5zdGFsbGVkX2Rpcl9pc19p bl9zeXNfcGF0aCgpCi0gICAgICAgIHNlbGYuX2luc3RhbGwoImh0dHBzOi8vZmlsZXMucHl0aG9u aG9zdGVkLm9yZy9wYWNrYWdlcy8wNi9iOC9kMWVhMzg1MTNjMjJlOGM5MDYyNzVkMTM1ODE4ZmVl MTZhZDg0OTU5ODU5NTZhOWI3ZTJiYjIxOTQyYTEvY2VydGlmaS0yMDE5LjMuOS50YXIuZ3oiLAot ICAgICAgICAgICAgICAgICAgICAgICJjZXJ0aWZpLTIwMTkuMy45L2NlcnRpZmkiKQotICAgICAg ICBzZWxmLl9pbnN0YWxsKCJodHRwczovL2ZpbGVzLnB5dGhvbmhvc3RlZC5vcmcvcGFja2FnZXMv ZmMvYmIvYTU3NjhjMjMwZjlkZGIwM2FjYzllZjNmMGQ0YTNjZjkzNDYyNDczNzk1ZDE4ZTk1MzU0 OThjOGY5MjlkL2NoYXJkZXQtMy4wLjQudGFyLmd6IiwKLSAgICAgICAgICAgICAgICAgICAgICAi Y2hhcmRldC0zLjAuNC9jaGFyZGV0IikKLSAgICAgICAgc2VsZi5faW5zdGFsbCgiaHR0cHM6Ly9m aWxlcy5weXRob25ob3N0ZWQub3JnL3BhY2thZ2VzL2FkLzEzL2ViNTY5NTFiNmY3OTUwY2FkYjU3 OWNhMTY2ZTQ0OGJhNzdmOWQyNGVmYzAzZWRkN2U1NWZhNTdkMDRiNy9pZG5hLTIuOC50YXIuZ3oi LAotICAgICAgICAgICAgICAgICAgICAgICJpZG5hLTIuOC9pZG5hIikKLSAgICAgICAgc2VsZi5f aW5zdGFsbCgiaHR0cHM6Ly9maWxlcy5weXRob25ob3N0ZWQub3JnL3BhY2thZ2VzL2ZmLzQ0LzI5 NjU1MTY4ZGE0NDFkZmY2NmRlMDM5NTI4ODBjNmUyZDE3YjI1MjgzNmZmMWFhNDQyMWZiYTU1NjQy NC91cmxsaWIzLTEuMjUuNi50YXIuZ3oiLAotICAgICAgICAgICAgICAgICAgICAgICJ1cmxsaWIz LTEuMjUuNi9zcmMvdXJsbGliMyIpCi0gICAgICAgIHNlbGYuX2luc3RhbGwoImh0dHBzOi8vZmls ZXMucHl0aG9uaG9zdGVkLm9yZy9wYWNrYWdlcy8wMS82Mi9kZGNmNzZkMWQxOTg4NWU4NTc5YWNi MWIxZGYyNmE4NTJiMDM0NzJjMGU0NmQyYjk1OWE3MTRjOTA2MDgvcmVxdWVzdHMtMi4yMi4wLnRh ci5neiIsCi0gICAgICAgICAgICAgICAgICAgICAgInJlcXVlc3RzLTIuMjIuMC9yZXF1ZXN0cyIp Ci0KICAgICBkZWYgX2luc3RhbGxfYmVhdXRpZnVsc291cChzZWxmKToKICAgICAgICAgaWYgc3lz LnZlcnNpb25faW5mbyA8ICgzLCAwKToKICAgICAgICAgICAgIHJldHVybgogCi0gICAgICAgIHNl bGYuX2luc3RhbGxfcmVxdWVzdHMoKQogICAgICAgICBzZWxmLl9pbnN0YWxsX2h0bWw1bGliKCkK ICAgICAgICAgc2VsZi5fZW5zdXJlX2F1dG9pbnN0YWxsZWRfZGlyX2lzX2luX3N5c19wYXRoKCkK ICAgICAgICAgc2VsZi5faW5zdGFsbCgiaHR0cHM6Ly9maWxlcy5weXRob25ob3N0ZWQub3JnL3Bh Y2thZ2VzLzdmLzRlLzk1YTEzNTI3ZTE4YjZmMWExNWM5M2YxYzYzNGI4NmQ1ZmE2MzRjNTYxOWRj ZTY5NWY0ZTBjZDY4MTgyZi9zb3Vwc2lldmUtMS45LjQudGFyLmd6IiwKQEAgLTI4Niw5ICsyNzAs NiBAQCBjbGFzcyBBdXRvaW5zdGFsbEltcG9ydEhvb2sob2JqZWN0KToKICAgICBkZWYgX2luc3Rh bGxfc2VsZW5pdW0oc2VsZik6CiAgICAgICAgIHNlbGYuX2Vuc3VyZV9hdXRvaW5zdGFsbGVkX2Rp cl9pc19pbl9zeXNfcGF0aCgpCiAKLSAgICAgICAgaW5zdGFsbGVyID0gQXV0b0luc3RhbGxlcihw cmVwZW5kX3RvX3NlYXJjaF9wYXRoPVRydWUsIHRhcmdldF9kaXI9c2VsZi5fZnMuam9pbihfQVVU T0lOU1RBTExFRF9ESVIsICJ1cmxsaWIzIikpCi0gICAgICAgIGluc3RhbGxlci5pbnN0YWxsKHVy bD0iaHR0cHM6Ly9maWxlcy5weXRob25ob3N0ZWQub3JnL3BhY2thZ2VzL2ZmLzQ0LzI5NjU1MTY4 ZGE0NDFkZmY2NmRlMDM5NTI4ODBjNmUyZDE3YjI1MjgzNmZmMWFhNDQyMWZiYTU1NjQyNC91cmxs aWIzLTEuMjUuNi50YXIuZ3oiLCB1cmxfc3VicGF0aD0idXJsbGliMy0xLjI1LjYiKQotCiAgICAg ICAgIG1pbmltdW1fdmVyc2lvbiA9ICczLjUuMCcKICAgICAgICAgaWYgb3MucGF0aC5pc2ZpbGUo b3MucGF0aC5qb2luKF9BVVRPSU5TVEFMTEVEX0RJUiwgJ3NlbGVuaXVtJywgJ19faW5pdF9fLnB5 JykpOgogICAgICAgICAgICAgaW1wb3J0IHNlbGVuaXVtLndlYmRyaXZlcgo= 405659 2020-07-30 21:01:26 -0700 2020-08-04 16:02:13 -0700 Patch bug-214951-20200730210125.patch text/plain 10110 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTEyOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI4IEBACisyMDIwLTA3LTMwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0cHldIFVzZSB3ZWJraXRjb3JlcHkncyBhdXRvIGluc3RhbGxl ciBmb3IgcmVxdWVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxNDk1MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjYzMDgwNDk+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJh cmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5OiBCdW1wIGxpYnJhcnkg dmVyc2lvbiwgYWRkIHVybGxpYjMuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weToKKyAgICAgICAgKFBhY2thZ2UuYXJj aGl2ZXMpOiBTdXBwb3J0IGFyY2hpdmUgd2l0aCBubyB0aW55IHZlcnNpb24uCisgICAgICAgIChQ YWNrYWdlLmluc3RhbGwpOiBTdXBwb3J0IHBhY2thZ2UgZm9ybWF0IHdoZXJlIHBhY2thZ2UgaXMg Y29udGFpbmVkIGluIGEgJ3NyYycgZm9sZGVyLCBvciBvbmUgd2l0aCBubworICAgICAgICB0aW55 IHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxh L3Rlc3RfZXhwZWN0YXRpb25fdXBkYXRlci5weTogVXNlIHdlYmtpdGNvcmVweSdzIGF1dG8gaW5z dGFsbGVyLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcmVzdWx0cy91cGxvYWQucHk6IERp dHRvLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcmVzdWx0cy91cGxvYWRfdW5pdHRlc3Qu cHk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRf Xy5weToKKyAgICAgICAgKEF1dG9pbnN0YWxsSW1wb3J0SG9vay5fZW5zdXJlX2F1dG9pbnN0YWxs ZWRfZGlyX2lzX2luX3N5c19wYXRoKTogTWFrZSBzdXJlIHdlYmtpdGNvcmVweSB0YWtlcyBwcmVj ZWRlbmNlCisgICAgICAgIG92ZXIgd2Via2l0cHkuCisgICAgICAgIChBdXRvaW5zdGFsbEltcG9y dEhvb2suZmluZF9tb2R1bGUpOiBEZWxldGUgX2luc3RhbGxfcmVxdWVzdHMuCisgICAgICAgIChB dXRvaW5zdGFsbEltcG9ydEhvb2suX2luc3RhbGxfcHl0ZXN0KTogRGl0dG8uCisgICAgICAgIChB dXRvaW5zdGFsbEltcG9ydEhvb2suX2luc3RhbGxfYmVhdXRpZnVsc291cCk6IERpdHRvLgorICAg ICAgICAoQXV0b2luc3RhbGxJbXBvcnRIb29rLl9pbnN0YWxsX3NlbGVuaXVtKTogRGl0dG8uCisg ICAgICAgIChBdXRvaW5zdGFsbEltcG9ydEhvb2suX2luc3RhbGxfcmVxdWVzdHMpOiBEZWxldGVk LgorCiAyMDIwLTA3LTMwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAog ICAgICAgICBbd2Via2l0Y29yZXB5XSBBZGQgYW4gYXV0by1pbnN0YWxsZXIgKFVucmV2aWV3ZWQg Zm9sbG93LXVwIGZpeCkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVw eS93ZWJraXRjb3JlcHkvX19pbml0X18ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQkocmV2aXNpb24g MjY1MTI5KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNv cmVweS9fX2luaXRfXy5weQkod29ya2luZyBjb3B5KQpAQCAtMjgsNyArMjgsNyBAQCBsb2cgPSBs b2dnaW5nLmdldExvZ2dlcignd2Via2l0Y29yZXB5JykKIGZyb20gd2Via2l0Y29yZXB5LnZlcnNp b24gaW1wb3J0IFZlcnNpb24KIGZyb20gd2Via2l0Y29yZXB5LnN0cmluZ191dGlscyBpbXBvcnQg Qnl0ZXNJTywgU3RyaW5nSU8sIFVuaWNvZGVJTywgdW5pY29kZQogCi12ZXJzaW9uID0gVmVyc2lv bigwLCAwLCA0KQordmVyc2lvbiA9IFZlcnNpb24oMCwgMCwgNSkKIAogZnJvbSB3ZWJraXRjb3Jl cHkuYXV0b2luc3RhbGwgaW1wb3J0IFBhY2thZ2UsIEF1dG9JbnN0YWxsCiBpZiBzeXMudmVyc2lv bl9pbmZvID4gKDMsIDApOgpAQCAtMzcsNCArMzcsNyBAQCBlbHNlOgogICAgIEF1dG9JbnN0YWxs LnJlZ2lzdGVyKFBhY2thZ2UoJ21vY2snLCBWZXJzaW9uKDMsIDAsIDUpKSkKIAogQXV0b0luc3Rh bGwucmVnaXN0ZXIoUGFja2FnZSgnY2VydGlmaScsIFZlcnNpb24oMjAyMCwgNiwgMjApKSkKK0F1 dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3VybGxpYjMnLCBWZXJzaW9uKDEsIDI1LCAxMCkp KQorQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnaWRuYScsIFZlcnNpb24oMiwgMTApKSkK K0F1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2NoYXJkZXQnLCBWZXJzaW9uKDMsIDAsIDQp KSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3JlcXVlc3RzJywgVmVyc2lvbigyLCAy NCkpKQpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNv cmVweS9hdXRvaW5zdGFsbC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5CShyZXZpc2lvbiAyNjUx MjkpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5 L2F1dG9pbnN0YWxsLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMjIsNyArMTIyLDcgQEAgY2xhc3Mg UGFja2FnZShvYmplY3QpOgogICAgICAgICAgICAgICAgIGlmIHJlcXVpcmVzIGFuZCBub3QgQXV0 b0luc3RhbGwudmVyc2lvbi5tYXRjaGVzKHJlcXVpcmVzKToKICAgICAgICAgICAgICAgICAgICAg Y29udGludWUKIAotICAgICAgICAgICAgICAgIHZlcnNpb25fY2FuZGlkYXRlID0gcmUuc2VhcmNo KHInXGQrXC5cZCtcLlxkKycsIGVsZW1lbnQuY2hpbGROb2Rlc1swXS5kYXRhKQorICAgICAgICAg ICAgICAgIHZlcnNpb25fY2FuZGlkYXRlID0gcmUuc2VhcmNoKHInXGQrXC5cZCsoXC5cZCspPycs IGVsZW1lbnQuY2hpbGROb2Rlc1swXS5kYXRhKQogICAgICAgICAgICAgICAgIGlmIG5vdCB2ZXJz aW9uX2NhbmRpZGF0ZToKICAgICAgICAgICAgICAgICAgICAgY29udGludWUKICAgICAgICAgICAg ICAgICB2ZXJzaW9uID0gVmVyc2lvbigqdmVyc2lvbl9jYW5kaWRhdGUuZ3JvdXAoKS5zcGxpdCgn LicpKQpAQCAtMTc1LDcgKzE3NSwxNiBAQCBjbGFzcyBQYWNrYWdlKG9iamVjdCk6CiAgICAgICAg ICAgICBhcmNoaXZlLnVucGFjayh0ZW1wX2xvY2F0aW9uKQogCiAgICAgICAgICAgICBzaHV0aWwu cm10cmVlKHNlbGYubG9jYXRpb24sIGlnbm9yZV9lcnJvcnM9VHJ1ZSkKLSAgICAgICAgICAgIHNo dXRpbC5tb3ZlKG9zLnBhdGguam9pbih0ZW1wX2xvY2F0aW9uLCBzdHIoYXJjaGl2ZSksIHNlbGYu bmFtZSksIHNlbGYubG9jYXRpb24pCisgICAgICAgICAgICBmb3IgY2FuZGlkYXRlIGluIFsKKyAg ICAgICAgICAgICAgICBvcy5wYXRoLmpvaW4odGVtcF9sb2NhdGlvbiwgc3RyKGFyY2hpdmUpLCBz ZWxmLm5hbWUpLAorICAgICAgICAgICAgICAgIG9zLnBhdGguam9pbih0ZW1wX2xvY2F0aW9uLCAn e30te30ue30nLmZvcm1hdChhcmNoaXZlLm5hbWUsIGFyY2hpdmUudmVyc2lvbi5tYWpvciwgYXJj aGl2ZS52ZXJzaW9uLm1pbm9yKSwgc2VsZi5uYW1lKSwKKyAgICAgICAgICAgICAgICBvcy5wYXRo LmpvaW4odGVtcF9sb2NhdGlvbiwgc3RyKGFyY2hpdmUpLCAnc3JjJywgc2VsZi5uYW1lKSwKKyAg ICAgICAgICAgIF06CisgICAgICAgICAgICAgICAgaWYgb3MucGF0aC5leGlzdHMoY2FuZGlkYXRl KToKKyAgICAgICAgICAgICAgICAgICAgc2h1dGlsLm1vdmUoY2FuZGlkYXRlLCBzZWxmLmxvY2F0 aW9uKQorICAgICAgICAgICAgICAgICAgICBicmVhaworICAgICAgICAgICAgZWxzZToKKyAgICAg ICAgICAgICAgICByYWlzZSBPU0Vycm9yKCdDYW5ub3QgaW5zdGFsbCB7fScuZm9ybWF0KHNlbGYu bmFtZSkpCiAKICAgICAgICAgICAgIHNlbGYuZG9fcG9zdF9pbnN0YWxsKHRlbXBfbG9jYXRpb24p CiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS90ZXN0 X2V4cGVjdGF0aW9uX3VwZGF0ZXIucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL3Rlc3RfZXhwZWN0YXRpb25fdXBkYXRlci5weQkocmV2 aXNpb24gMjY1MTI5KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3pp bGxhL3Rlc3RfZXhwZWN0YXRpb25fdXBkYXRlci5weQkod29ya2luZyBjb3B5KQpAQCAtNDAsOSAr NDAsMTAgQEAgZnJvbSB3ZWJraXRweS5jb21tb24ubmV0LmxheW91dHRlc3RyZXN1bAogZnJvbSB3 ZWJraXRweS5jb21tb24ud2Via2l0X2ZpbmRlciBpbXBvcnQgV2ViS2l0RmluZGVyCiBmcm9tIHdl YmtpdHB5LmxheW91dF90ZXN0cy5jb250cm9sbGVycy50ZXN0X3Jlc3VsdF93cml0ZXIgaW1wb3J0 IFRlc3RSZXN1bHRXcml0ZXIKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLm1vZGVscyBpbXBv cnQgdGVzdF9leHBlY3RhdGlvbnMKLWZyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFs bGVkIGltcG9ydCByZXF1ZXN0cworCiBpbXBvcnQganNvbgogaW1wb3J0IHJlCitpbXBvcnQgcmVx dWVzdHMKIAogIyBCdWlsZGJvdCBzdGF0dXMgY29kZXMgcmVmZXJlbmNlZCBmcm9tIGh0dHBzOi8v Z2l0aHViLmNvbS9idWlsZGJvdC9idWlsZGJvdC9ibG9iL21hc3Rlci9tYXN0ZXIvYnVpbGRib3Qv cHJvY2Vzcy9yZXN1bHRzLnB5CiBFV1NfU1RBVEVDT0RFUyA9IHsnU1VDQ0VTUyc6IDAsICdXQVJO SU5HUyc6IDEsICdGQUlMVVJFJzogMiwgJ1NLSVBQRUQnOiAzLCAnRVhDRVBUSU9OJzogNCwgJ1JF VFJZJzogNSwgJ0NBTkNFTExFRCc6IDZ9CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Jl c3VsdHMvdXBsb2FkLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcmVz dWx0cy91cGxvYWQucHkJKHJldmlzaW9uIDI2NTEyOSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvcmVzdWx0cy91cGxvYWQucHkJKHdvcmtpbmcgY29weSkKQEAgLTIwLDcgKzIwLDYgQEAKICMg T1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFO WSBXQVkgT1VUIE9GIFRIRSBVU0UKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAotaW1wb3J0IHdlYmtpdHB5LnRo aXJkcGFydHkuYXV0b2luc3RhbGxlZC5yZXF1ZXN0cwogZnJvbSB3ZWJraXRweS5wb3J0LmNvbmZp ZyBpbXBvcnQgYXBwbGVfYWRkaXRpb25zCiAKIGltcG9ydCBtYXRoCkluZGV4OiBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3Jlc3VsdHMvdXBsb2FkX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvcmVzdWx0cy91cGxvYWRfdW5pdHRlc3QucHkJKHJldmlzaW9u IDI2NTEyOSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcmVzdWx0cy91cGxvYWRfdW5pdHRl c3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTIwLDcgKzIwLDcgQEAKICMgT1IgVE9SVCAoSU5DTFVE SU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRI RSBVU0UKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KIAotaW1wb3J0IHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2lu c3RhbGxlZC5yZXF1ZXN0cworZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IEJ5dGVzSU8KIAogaW1w b3J0IGNvbGxlY3Rpb25zCiBpbXBvcnQganNvbgpAQCAtMjksOCArMjksNiBAQCBpbXBvcnQgc3lz CiBpbXBvcnQgdGltZQogaW1wb3J0IHVuaXR0ZXN0CiAKLWZyb20gd2Via2l0Y29yZXB5IGltcG9y dCBCeXRlc0lPCi0KIGZyb20gd2Via2l0cHkucmVzdWx0cy51cGxvYWQgaW1wb3J0IFVwbG9hZAog ZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5IGltcG9ydCBtb2NrCiAKSW5kZXg6IFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRfXy5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI2NTEyOSkK KysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRfXy5weQkod29ya2lu ZyBjb3B5KQpAQCAtODMsNyArODMsNyBAQCBjbGFzcyBBdXRvaW5zdGFsbEltcG9ydEhvb2sob2Jq ZWN0KToKICAgICBkZWYgX2Vuc3VyZV9hdXRvaW5zdGFsbGVkX2Rpcl9pc19pbl9zeXNfcGF0aChz ZWxmKToKICAgICAgICAgIyBTb21lIHBhY2thZ2VzIHJlcXVpcmUgdGhhdCB0aGUgYXJlIGJlaW5n IHB1dCBzb21ld2hlcmUgdW5kZXIgYSBkaXJlY3RvcnkgaW4gc3lzLnBhdGguCiAgICAgICAgIGlm IG5vdCBfQVVUT0lOU1RBTExFRF9ESVIgaW4gc3lzLnBhdGg6Ci0gICAgICAgICAgICBzeXMucGF0 aC5pbnNlcnQoMCwgX0FVVE9JTlNUQUxMRURfRElSKQorICAgICAgICAgICAgc3lzLnBhdGguaW5z ZXJ0KDEgaWYgJ2xpYnJhcmllcy9hdXRvaW5zdGFsbGVkJyBpbiBzeXMucGF0aFswXSBlbHNlIDAs IF9BVVRPSU5TVEFMTEVEX0RJUikKIAogICAgIGRlZiBmaW5kX21vZHVsZShzZWxmLCBmdWxsbmFt ZSwgcGF0aD1Ob25lKToKICAgICAgICAgIyBUaGlzIG1ldGhvZCB3aWxsIHJ1biBiZWZvcmUgZWFj aCBpbXBvcnQuIFNlZSBodHRwOi8vd3d3LnB5dGhvbi5vcmcvZGV2L3BlcHMvcGVwLTAzMDIvCkBA IC0xMjAsOCArMTIwLDYgQEAgY2xhc3MgQXV0b2luc3RhbGxJbXBvcnRIb29rKG9iamVjdCk6CiAg ICAgICAgICAgICBzZWxmLl9pbnN0YWxsX3B5dGVzdF90aW1lb3V0KCkKICAgICAgICAgZWxpZiAn LnB5dGVzdCcgaW4gZnVsbG5hbWU6CiAgICAgICAgICAgICBzZWxmLl9pbnN0YWxsX3B5dGVzdCgp Ci0gICAgICAgIGVsaWYgJy5yZXF1ZXN0cycgaW4gZnVsbG5hbWU6Ci0gICAgICAgICAgICBzZWxm Ll9pbnN0YWxsX3JlcXVlc3RzKCkKICAgICAgICAgZWxpZiAnLmJzNCcgaW4gZnVsbG5hbWU6CiAg ICAgICAgICAgICBzZWxmLl9pbnN0YWxsX2JlYXV0aWZ1bHNvdXAoKQogICAgICAgICBlbGlmICcu aHRtbDVsaWInIGluIGZ1bGxuYW1lOgpAQCAtMTkwLDI0ICsxODgsMTAgQEAgY2xhc3MgQXV0b2lu c3RhbGxJbXBvcnRIb29rKG9iamVjdCk6CiAgICAgICAgIHNlbGYuX2luc3RhbGwoImh0dHBzOi8v ZmlsZXMucHl0aG9uaG9zdGVkLm9yZy9wYWNrYWdlcy9hMi9lYy80MTVkMGNjY2MxZWQ0MWNkN2Zk ZjY5YWQ5ODlkYTE2YThkMTMwNTc5OTYzNzEwMDRjYWI0YmFmYzQ4ZjMvcHl0ZXN0LTMuNi4yLnRh ci5neiIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAicHl0ZXN0LTMuNi4yL3NyYy9w eXRlc3QucHkiKQogCi0gICAgZGVmIF9pbnN0YWxsX3JlcXVlc3RzKHNlbGYpOgotICAgICAgICBz ZWxmLl9lbnN1cmVfYXV0b2luc3RhbGxlZF9kaXJfaXNfaW5fc3lzX3BhdGgoKQotICAgICAgICBz ZWxmLl9pbnN0YWxsKCJodHRwczovL2ZpbGVzLnB5dGhvbmhvc3RlZC5vcmcvcGFja2FnZXMvMDYv YjgvZDFlYTM4NTEzYzIyZThjOTA2Mjc1ZDEzNTgxOGZlZTE2YWQ4NDk1OTg1OTU2YTliN2UyYmIy MTk0MmExL2NlcnRpZmktMjAxOS4zLjkudGFyLmd6IiwKLSAgICAgICAgICAgICAgICAgICAgICAi Y2VydGlmaS0yMDE5LjMuOS9jZXJ0aWZpIikKLSAgICAgICAgc2VsZi5faW5zdGFsbCgiaHR0cHM6 Ly9maWxlcy5weXRob25ob3N0ZWQub3JnL3BhY2thZ2VzL2ZjL2JiL2E1NzY4YzIzMGY5ZGRiMDNh Y2M5ZWYzZjBkNGEzY2Y5MzQ2MjQ3Mzc5NWQxOGU5NTM1NDk4YzhmOTI5ZC9jaGFyZGV0LTMuMC40 LnRhci5neiIsCi0gICAgICAgICAgICAgICAgICAgICAgImNoYXJkZXQtMy4wLjQvY2hhcmRldCIp Ci0gICAgICAgIHNlbGYuX2luc3RhbGwoImh0dHBzOi8vZmlsZXMucHl0aG9uaG9zdGVkLm9yZy9w YWNrYWdlcy9hZC8xMy9lYjU2OTUxYjZmNzk1MGNhZGI1NzljYTE2NmU0NDhiYTc3ZjlkMjRlZmMw M2VkZDdlNTVmYTU3ZDA0YjcvaWRuYS0yLjgudGFyLmd6IiwKLSAgICAgICAgICAgICAgICAgICAg ICAiaWRuYS0yLjgvaWRuYSIpCi0gICAgICAgIHNlbGYuX2luc3RhbGwoImh0dHBzOi8vZmlsZXMu cHl0aG9uaG9zdGVkLm9yZy9wYWNrYWdlcy9mZi80NC8yOTY1NTE2OGRhNDQxZGZmNjZkZTAzOTUy ODgwYzZlMmQxN2IyNTI4MzZmZjFhYTQ0MjFmYmE1NTY0MjQvdXJsbGliMy0xLjI1LjYudGFyLmd6 IiwKLSAgICAgICAgICAgICAgICAgICAgICAidXJsbGliMy0xLjI1LjYvc3JjL3VybGxpYjMiKQot ICAgICAgICBzZWxmLl9pbnN0YWxsKCJodHRwczovL2ZpbGVzLnB5dGhvbmhvc3RlZC5vcmcvcGFj a2FnZXMvMDEvNjIvZGRjZjc2ZDFkMTk4ODVlODU3OWFjYjFiMWRmMjZhODUyYjAzNDcyYzBlNDZk MmI5NTlhNzE0YzkwNjA4L3JlcXVlc3RzLTIuMjIuMC50YXIuZ3oiLAotICAgICAgICAgICAgICAg ICAgICAgICJyZXF1ZXN0cy0yLjIyLjAvcmVxdWVzdHMiKQotCiAgICAgZGVmIF9pbnN0YWxsX2Jl YXV0aWZ1bHNvdXAoc2VsZik6CiAgICAgICAgIGlmIHN5cy52ZXJzaW9uX2luZm8gPCAoMywgMCk6 CiAgICAgICAgICAgICByZXR1cm4KIAotICAgICAgICBzZWxmLl9pbnN0YWxsX3JlcXVlc3RzKCkK ICAgICAgICAgc2VsZi5faW5zdGFsbF9odG1sNWxpYigpCiAgICAgICAgIHNlbGYuX2Vuc3VyZV9h dXRvaW5zdGFsbGVkX2Rpcl9pc19pbl9zeXNfcGF0aCgpCiAgICAgICAgIHNlbGYuX2luc3RhbGwo Imh0dHBzOi8vZmlsZXMucHl0aG9uaG9zdGVkLm9yZy9wYWNrYWdlcy83Zi80ZS85NWExMzUyN2Ux OGI2ZjFhMTVjOTNmMWM2MzRiODZkNWZhNjM0YzU2MTlkY2U2OTVmNGUwY2Q2ODE4MmYvc291cHNp ZXZlLTEuOS40LnRhci5neiIsCkBAIC0yODYsOSArMjcwLDYgQEAgY2xhc3MgQXV0b2luc3RhbGxJ bXBvcnRIb29rKG9iamVjdCk6CiAgICAgZGVmIF9pbnN0YWxsX3NlbGVuaXVtKHNlbGYpOgogICAg ICAgICBzZWxmLl9lbnN1cmVfYXV0b2luc3RhbGxlZF9kaXJfaXNfaW5fc3lzX3BhdGgoKQogCi0g ICAgICAgIGluc3RhbGxlciA9IEF1dG9JbnN0YWxsZXIocHJlcGVuZF90b19zZWFyY2hfcGF0aD1U cnVlLCB0YXJnZXRfZGlyPXNlbGYuX2ZzLmpvaW4oX0FVVE9JTlNUQUxMRURfRElSLCAidXJsbGli MyIpKQotICAgICAgICBpbnN0YWxsZXIuaW5zdGFsbCh1cmw9Imh0dHBzOi8vZmlsZXMucHl0aG9u aG9zdGVkLm9yZy9wYWNrYWdlcy9mZi80NC8yOTY1NTE2OGRhNDQxZGZmNjZkZTAzOTUyODgwYzZl MmQxN2IyNTI4MzZmZjFhYTQ0MjFmYmE1NTY0MjQvdXJsbGliMy0xLjI1LjYudGFyLmd6IiwgdXJs X3N1YnBhdGg9InVybGxpYjMtMS4yNS42IikKLQogICAgICAgICBtaW5pbXVtX3ZlcnNpb24gPSAn My41LjAnCiAgICAgICAgIGlmIG9zLnBhdGguaXNmaWxlKG9zLnBhdGguam9pbihfQVVUT0lOU1RB TExFRF9ESVIsICdzZWxlbml1bScsICdfX2luaXRfXy5weScpKToKICAgICAgICAgICAgIGltcG9y dCBzZWxlbml1bS53ZWJkcml2ZXIK 405954 2020-08-04 16:02:14 -0700 2020-08-12 16:10:15 -0700 Patch bug-214951-20200804160213.patch text/plain 7098 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTI2NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIzIEBACisyMDIwLTA4LTA0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0cHldIFVzZSB3ZWJraXRjb3JlcHkncyBhdXRvIGluc3RhbGxl ciBmb3IgcmVxdWVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxNDk1MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjYzMDgwNDk+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvdGVzdF9leHBlY3RhdGlvbl91cGRhdGVyLnB5OiBVc2Ug d2Via2l0Y29yZXB5J3MgYXV0byBpbnN0YWxsZXIuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9yZXN1bHRzL3VwbG9hZC5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9y ZXN1bHRzL3VwbG9hZF91bml0dGVzdC5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5OgorICAgICAgICAoQXV0b2luc3RhbGxJbXBvcnRI b29rLl9lbnN1cmVfYXV0b2luc3RhbGxlZF9kaXJfaXNfaW5fc3lzX3BhdGgpOiBNYWtlIHN1cmUg d2Via2l0Y29yZXB5IHRha2VzIHByZWNlZGVuY2UKKyAgICAgICAgb3ZlciB3ZWJraXRweS4KKyAg ICAgICAgKEF1dG9pbnN0YWxsSW1wb3J0SG9vay5maW5kX21vZHVsZSk6IERlbGV0ZSBfaW5zdGFs bF9yZXF1ZXN0cy4KKyAgICAgICAgKEF1dG9pbnN0YWxsSW1wb3J0SG9vay5faW5zdGFsbF9weXRl c3QpOiBEaXR0by4KKyAgICAgICAgKEF1dG9pbnN0YWxsSW1wb3J0SG9vay5faW5zdGFsbF9iZWF1 dGlmdWxzb3VwKTogRGl0dG8uCisgICAgICAgIChBdXRvaW5zdGFsbEltcG9ydEhvb2suX2luc3Rh bGxfc2VsZW5pdW0pOiBEaXR0by4KKyAgICAgICAgKEF1dG9pbnN0YWxsSW1wb3J0SG9vay5faW5z dGFsbF9yZXF1ZXN0cyk6IERlbGV0ZWQuCisKIDIwMjAtMDgtMDQgIFBlciBBcm5lIFZvbGxhbiAg PHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIENoZWNrIHRoYXQgQWNjZXNzaWJp bGl0eSBpcyBlbmFibGVkIHdoZW4gcmVjZWl2aW5nIHRoZSBlbmFibGUgQWNjZXNzaWJpbGl0eSBu b3RpZmljYXRpb24KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6 aWxsYS90ZXN0X2V4cGVjdGF0aW9uX3VwZGF0ZXIucHkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL3Rlc3RfZXhwZWN0YXRpb25fdXBkYXRl ci5weQkocmV2aXNpb24gMjY1MjY0KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v bmV0L2J1Z3ppbGxhL3Rlc3RfZXhwZWN0YXRpb25fdXBkYXRlci5weQkod29ya2luZyBjb3B5KQpA QCAtNDAsOSArNDAsMTAgQEAgZnJvbSB3ZWJraXRweS5jb21tb24ubmV0LmxheW91dHRlc3RyZXN1 bAogZnJvbSB3ZWJraXRweS5jb21tb24ud2Via2l0X2ZpbmRlciBpbXBvcnQgV2ViS2l0RmluZGVy CiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5jb250cm9sbGVycy50ZXN0X3Jlc3VsdF93cml0 ZXIgaW1wb3J0IFRlc3RSZXN1bHRXcml0ZXIKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLm1v ZGVscyBpbXBvcnQgdGVzdF9leHBlY3RhdGlvbnMKLWZyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5h dXRvaW5zdGFsbGVkIGltcG9ydCByZXF1ZXN0cworCiBpbXBvcnQganNvbgogaW1wb3J0IHJlCitp bXBvcnQgcmVxdWVzdHMKIAogIyBCdWlsZGJvdCBzdGF0dXMgY29kZXMgcmVmZXJlbmNlZCBmcm9t IGh0dHBzOi8vZ2l0aHViLmNvbS9idWlsZGJvdC9idWlsZGJvdC9ibG9iL21hc3Rlci9tYXN0ZXIv YnVpbGRib3QvcHJvY2Vzcy9yZXN1bHRzLnB5CiBFV1NfU1RBVEVDT0RFUyA9IHsnU1VDQ0VTUyc6 IDAsICdXQVJOSU5HUyc6IDEsICdGQUlMVVJFJzogMiwgJ1NLSVBQRUQnOiAzLCAnRVhDRVBUSU9O JzogNCwgJ1JFVFJZJzogNSwgJ0NBTkNFTExFRCc6IDZ9CkluZGV4OiBUb29scy9TY3JpcHRzL3dl YmtpdHB5L3Jlc3VsdHMvdXBsb2FkLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcmVzdWx0cy91cGxvYWQucHkJKHJldmlzaW9uIDI2NTI2NCkKKysrIFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvcmVzdWx0cy91cGxvYWQucHkJKHdvcmtpbmcgY29weSkKQEAgLTIwLDcgKzIw LDYgQEAKICMgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklT SU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJ RiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAotaW1wb3J0IHdl YmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxlZC5yZXF1ZXN0cwogZnJvbSB3ZWJraXRweS5w b3J0LmNvbmZpZyBpbXBvcnQgYXBwbGVfYWRkaXRpb25zCiAKIGltcG9ydCBtYXRoCkluZGV4OiBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3Jlc3VsdHMvdXBsb2FkX3VuaXR0ZXN0LnB5Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcmVzdWx0cy91cGxvYWRfdW5pdHRlc3QucHkJ KHJldmlzaW9uIDI2NTI2NCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcmVzdWx0cy91cGxv YWRfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTIwLDcgKzIwLDcgQEAKICMgT1IgVE9S VCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkg T1VUIE9GIFRIRSBVU0UKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRI RSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAotaW1wb3J0IHdlYmtpdHB5LnRoaXJkcGFy dHkuYXV0b2luc3RhbGxlZC5yZXF1ZXN0cworZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IEJ5dGVz SU8KIAogaW1wb3J0IGNvbGxlY3Rpb25zCiBpbXBvcnQganNvbgpAQCAtMjksOCArMjksNiBAQCBp bXBvcnQgc3lzCiBpbXBvcnQgdGltZQogaW1wb3J0IHVuaXR0ZXN0CiAKLWZyb20gd2Via2l0Y29y ZXB5IGltcG9ydCBCeXRlc0lPCi0KIGZyb20gd2Via2l0cHkucmVzdWx0cy51cGxvYWQgaW1wb3J0 IFVwbG9hZAogZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5IGltcG9ydCBtb2NrCiAKSW5kZXg6IFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRfXy5weQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X18ucHkJKHJldmlzaW9u IDI2NTI2NCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRfXy5w eQkod29ya2luZyBjb3B5KQpAQCAtODMsNyArODMsNyBAQCBjbGFzcyBBdXRvaW5zdGFsbEltcG9y dEhvb2sob2JqZWN0KToKICAgICBkZWYgX2Vuc3VyZV9hdXRvaW5zdGFsbGVkX2Rpcl9pc19pbl9z eXNfcGF0aChzZWxmKToKICAgICAgICAgIyBTb21lIHBhY2thZ2VzIHJlcXVpcmUgdGhhdCB0aGUg YXJlIGJlaW5nIHB1dCBzb21ld2hlcmUgdW5kZXIgYSBkaXJlY3RvcnkgaW4gc3lzLnBhdGguCiAg ICAgICAgIGlmIG5vdCBfQVVUT0lOU1RBTExFRF9ESVIgaW4gc3lzLnBhdGg6Ci0gICAgICAgICAg ICBzeXMucGF0aC5pbnNlcnQoMCwgX0FVVE9JTlNUQUxMRURfRElSKQorICAgICAgICAgICAgc3lz LnBhdGguaW5zZXJ0KDEgaWYgJ2xpYnJhcmllcy9hdXRvaW5zdGFsbGVkJyBpbiBzeXMucGF0aFsw XSBlbHNlIDAsIF9BVVRPSU5TVEFMTEVEX0RJUikKIAogICAgIGRlZiBmaW5kX21vZHVsZShzZWxm LCBmdWxsbmFtZSwgcGF0aD1Ob25lKToKICAgICAgICAgIyBUaGlzIG1ldGhvZCB3aWxsIHJ1biBi ZWZvcmUgZWFjaCBpbXBvcnQuIFNlZSBodHRwOi8vd3d3LnB5dGhvbi5vcmcvZGV2L3BlcHMvcGVw LTAzMDIvCkBAIC0xMjAsOCArMTIwLDYgQEAgY2xhc3MgQXV0b2luc3RhbGxJbXBvcnRIb29rKG9i amVjdCk6CiAgICAgICAgICAgICBzZWxmLl9pbnN0YWxsX3B5dGVzdF90aW1lb3V0KCkKICAgICAg ICAgZWxpZiAnLnB5dGVzdCcgaW4gZnVsbG5hbWU6CiAgICAgICAgICAgICBzZWxmLl9pbnN0YWxs X3B5dGVzdCgpCi0gICAgICAgIGVsaWYgJy5yZXF1ZXN0cycgaW4gZnVsbG5hbWU6Ci0gICAgICAg ICAgICBzZWxmLl9pbnN0YWxsX3JlcXVlc3RzKCkKICAgICAgICAgZWxpZiAnLmJzNCcgaW4gZnVs bG5hbWU6CiAgICAgICAgICAgICBzZWxmLl9pbnN0YWxsX2JlYXV0aWZ1bHNvdXAoKQogICAgICAg ICBlbGlmICcuaHRtbDVsaWInIGluIGZ1bGxuYW1lOgpAQCAtMTkwLDI0ICsxODgsMTAgQEAgY2xh c3MgQXV0b2luc3RhbGxJbXBvcnRIb29rKG9iamVjdCk6CiAgICAgICAgIHNlbGYuX2luc3RhbGwo Imh0dHBzOi8vZmlsZXMucHl0aG9uaG9zdGVkLm9yZy9wYWNrYWdlcy9hMi9lYy80MTVkMGNjY2Mx ZWQ0MWNkN2ZkZjY5YWQ5ODlkYTE2YThkMTMwNTc5OTYzNzEwMDRjYWI0YmFmYzQ4ZjMvcHl0ZXN0 LTMuNi4yLnRhci5neiIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAicHl0ZXN0LTMu Ni4yL3NyYy9weXRlc3QucHkiKQogCi0gICAgZGVmIF9pbnN0YWxsX3JlcXVlc3RzKHNlbGYpOgot ICAgICAgICBzZWxmLl9lbnN1cmVfYXV0b2luc3RhbGxlZF9kaXJfaXNfaW5fc3lzX3BhdGgoKQot ICAgICAgICBzZWxmLl9pbnN0YWxsKCJodHRwczovL2ZpbGVzLnB5dGhvbmhvc3RlZC5vcmcvcGFj a2FnZXMvMDYvYjgvZDFlYTM4NTEzYzIyZThjOTA2Mjc1ZDEzNTgxOGZlZTE2YWQ4NDk1OTg1OTU2 YTliN2UyYmIyMTk0MmExL2NlcnRpZmktMjAxOS4zLjkudGFyLmd6IiwKLSAgICAgICAgICAgICAg ICAgICAgICAiY2VydGlmaS0yMDE5LjMuOS9jZXJ0aWZpIikKLSAgICAgICAgc2VsZi5faW5zdGFs bCgiaHR0cHM6Ly9maWxlcy5weXRob25ob3N0ZWQub3JnL3BhY2thZ2VzL2ZjL2JiL2E1NzY4YzIz MGY5ZGRiMDNhY2M5ZWYzZjBkNGEzY2Y5MzQ2MjQ3Mzc5NWQxOGU5NTM1NDk4YzhmOTI5ZC9jaGFy ZGV0LTMuMC40LnRhci5neiIsCi0gICAgICAgICAgICAgICAgICAgICAgImNoYXJkZXQtMy4wLjQv Y2hhcmRldCIpCi0gICAgICAgIHNlbGYuX2luc3RhbGwoImh0dHBzOi8vZmlsZXMucHl0aG9uaG9z dGVkLm9yZy9wYWNrYWdlcy9hZC8xMy9lYjU2OTUxYjZmNzk1MGNhZGI1NzljYTE2NmU0NDhiYTc3 ZjlkMjRlZmMwM2VkZDdlNTVmYTU3ZDA0YjcvaWRuYS0yLjgudGFyLmd6IiwKLSAgICAgICAgICAg ICAgICAgICAgICAiaWRuYS0yLjgvaWRuYSIpCi0gICAgICAgIHNlbGYuX2luc3RhbGwoImh0dHBz Oi8vZmlsZXMucHl0aG9uaG9zdGVkLm9yZy9wYWNrYWdlcy9mZi80NC8yOTY1NTE2OGRhNDQxZGZm NjZkZTAzOTUyODgwYzZlMmQxN2IyNTI4MzZmZjFhYTQ0MjFmYmE1NTY0MjQvdXJsbGliMy0xLjI1 LjYudGFyLmd6IiwKLSAgICAgICAgICAgICAgICAgICAgICAidXJsbGliMy0xLjI1LjYvc3JjL3Vy bGxpYjMiKQotICAgICAgICBzZWxmLl9pbnN0YWxsKCJodHRwczovL2ZpbGVzLnB5dGhvbmhvc3Rl ZC5vcmcvcGFja2FnZXMvMDEvNjIvZGRjZjc2ZDFkMTk4ODVlODU3OWFjYjFiMWRmMjZhODUyYjAz NDcyYzBlNDZkMmI5NTlhNzE0YzkwNjA4L3JlcXVlc3RzLTIuMjIuMC50YXIuZ3oiLAotICAgICAg ICAgICAgICAgICAgICAgICJyZXF1ZXN0cy0yLjIyLjAvcmVxdWVzdHMiKQotCiAgICAgZGVmIF9p bnN0YWxsX2JlYXV0aWZ1bHNvdXAoc2VsZik6CiAgICAgICAgIGlmIHN5cy52ZXJzaW9uX2luZm8g PCAoMywgMCk6CiAgICAgICAgICAgICByZXR1cm4KIAotICAgICAgICBzZWxmLl9pbnN0YWxsX3Jl cXVlc3RzKCkKICAgICAgICAgc2VsZi5faW5zdGFsbF9odG1sNWxpYigpCiAgICAgICAgIHNlbGYu X2Vuc3VyZV9hdXRvaW5zdGFsbGVkX2Rpcl9pc19pbl9zeXNfcGF0aCgpCiAgICAgICAgIHNlbGYu X2luc3RhbGwoImh0dHBzOi8vZmlsZXMucHl0aG9uaG9zdGVkLm9yZy9wYWNrYWdlcy83Zi80ZS85 NWExMzUyN2UxOGI2ZjFhMTVjOTNmMWM2MzRiODZkNWZhNjM0YzU2MTlkY2U2OTVmNGUwY2Q2ODE4 MmYvc291cHNpZXZlLTEuOS40LnRhci5neiIsCkBAIC0yODYsOSArMjcwLDYgQEAgY2xhc3MgQXV0 b2luc3RhbGxJbXBvcnRIb29rKG9iamVjdCk6CiAgICAgZGVmIF9pbnN0YWxsX3NlbGVuaXVtKHNl bGYpOgogICAgICAgICBzZWxmLl9lbnN1cmVfYXV0b2luc3RhbGxlZF9kaXJfaXNfaW5fc3lzX3Bh dGgoKQogCi0gICAgICAgIGluc3RhbGxlciA9IEF1dG9JbnN0YWxsZXIocHJlcGVuZF90b19zZWFy Y2hfcGF0aD1UcnVlLCB0YXJnZXRfZGlyPXNlbGYuX2ZzLmpvaW4oX0FVVE9JTlNUQUxMRURfRElS LCAidXJsbGliMyIpKQotICAgICAgICBpbnN0YWxsZXIuaW5zdGFsbCh1cmw9Imh0dHBzOi8vZmls ZXMucHl0aG9uaG9zdGVkLm9yZy9wYWNrYWdlcy9mZi80NC8yOTY1NTE2OGRhNDQxZGZmNjZkZTAz OTUyODgwYzZlMmQxN2IyNTI4MzZmZjFhYTQ0MjFmYmE1NTY0MjQvdXJsbGliMy0xLjI1LjYudGFy Lmd6IiwgdXJsX3N1YnBhdGg9InVybGxpYjMtMS4yNS42IikKLQogICAgICAgICBtaW5pbXVtX3Zl cnNpb24gPSAnMy41LjAnCiAgICAgICAgIGlmIG9zLnBhdGguaXNmaWxlKG9zLnBhdGguam9pbihf QVVUT0lOU1RBTExFRF9ESVIsICdzZWxlbml1bScsICdfX2luaXRfXy5weScpKToKICAgICAgICAg ICAgIGltcG9ydCBzZWxlbml1bS53ZWJkcml2ZXIK 405962 2020-08-04 16:27:57 -0700 2020-08-04 21:05:50 -0700 Patch bug-214951-20200804162756.patch text/plain 8273 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTI2NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIzIEBACisyMDIwLTA4LTA0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0cHldIFVzZSB3ZWJraXRjb3JlcHkncyBhdXRvIGluc3RhbGxl ciBmb3IgcmVxdWVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxNDk1MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjYzMDgwNDk+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvdGVzdF9leHBlY3RhdGlvbl91cGRhdGVyLnB5OiBVc2Ug d2Via2l0Y29yZXB5J3MgYXV0byBpbnN0YWxsZXIuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9yZXN1bHRzL3VwbG9hZC5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9y ZXN1bHRzL3VwbG9hZF91bml0dGVzdC5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5OgorICAgICAgICAoQXV0b2luc3RhbGxJbXBvcnRI b29rLl9lbnN1cmVfYXV0b2luc3RhbGxlZF9kaXJfaXNfaW5fc3lzX3BhdGgpOiBNYWtlIHN1cmUg d2Via2l0Y29yZXB5IHRha2VzIHByZWNlZGVuY2UKKyAgICAgICAgb3ZlciB3ZWJraXRweS4KKyAg ICAgICAgKEF1dG9pbnN0YWxsSW1wb3J0SG9vay5maW5kX21vZHVsZSk6IERlbGV0ZSBfaW5zdGFs bF9yZXF1ZXN0cy4KKyAgICAgICAgKEF1dG9pbnN0YWxsSW1wb3J0SG9vay5faW5zdGFsbF9weXRl c3QpOiBEaXR0by4KKyAgICAgICAgKEF1dG9pbnN0YWxsSW1wb3J0SG9vay5faW5zdGFsbF9iZWF1 dGlmdWxzb3VwKTogRGl0dG8uCisgICAgICAgIChBdXRvaW5zdGFsbEltcG9ydEhvb2suX2luc3Rh bGxfc2VsZW5pdW0pOiBEaXR0by4KKyAgICAgICAgKEF1dG9pbnN0YWxsSW1wb3J0SG9vay5faW5z dGFsbF9yZXF1ZXN0cyk6IERlbGV0ZWQuCisKIDIwMjAtMDgtMDQgIFBlciBBcm5lIFZvbGxhbiAg PHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIENoZWNrIHRoYXQgQWNjZXNzaWJp bGl0eSBpcyBlbmFibGVkIHdoZW4gcmVjZWl2aW5nIHRoZSBlbmFibGUgQWNjZXNzaWJpbGl0eSBu b3RpZmljYXRpb24KSW5kZXg6IFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CShyZXZpc2lvbiAyNjUyNjQpCisrKyBUb29s cy9TY3JpcHRzL2J1aWxkLXdlYmtpdAkod29ya2luZyBjb3B5KQpAQCAtODAsNiArODAsOSBAQCBt eSAkYXJjaHMzMmJpdCA9IDA7CiBteSAkc2tpcExpYnJhcnlVcGRhdGUgPSAwOwogbXkgJHVzZUND YWNoZSA9IC0xOwogCitzeXN0ZW0gIlRvb2xzL1NjcmlwdHMvdGVzdC13ZWJraXRweSI7CitzeXN0 ZW0gIlRvb2xzL1NjcmlwdHMvdGVzdC13ZWJraXRweS1weXRob24zIjsKKwogbXkgQGZlYXR1cmVz ID0gZ2V0RmVhdHVyZU9wdGlvbkxpc3QoKTsKIAogIyBBZGRpdGlvbmFsIGVudmlyb25tZW50IHBh cmFtZXRlcnMKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJr aXRjb3JlcHkvYXV0b2luc3RhbGwucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weQkocmV2aXNpb24g MjY1MjY0KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNv cmVweS9hdXRvaW5zdGFsbC5weQkod29ya2luZyBjb3B5KQpAQCAtMjM0LDggKzIzNCw4IEBAIGNs YXNzIFBhY2thZ2Uob2JqZWN0KToKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQQVRIRVhU PW9zLmVudmlyb24uZ2V0KCdQQVRIRVhUJywgJycpLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFBZVEhPTlBBVEg9aW5zdGFsbF9sb2NhdGlvbiwKICAgICAgICAgICAgICAgICAgICAgICAg ICksCi0gICAgICAgICAgICAgICAgICAgICAgICBzdGRvdXQ9ZGV2bnVsbCwKLSAgICAgICAgICAg ICAgICAgICAgICAgIHN0ZGVycj1kZXZudWxsLAorICAgICAgICAgICAgICAgICAgICAgICAgI3N0 ZG91dD1kZXZudWxsLAorICAgICAgICAgICAgICAgICAgICAgICAgI3N0ZGVycj1kZXZudWxsLAog ICAgICAgICAgICAgICAgICAgICApCiAKICAgICAgICAgICAgICAgICBicmVhawpJbmRleDogVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL3Rlc3RfZXhwZWN0YXRpb25f dXBkYXRlci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9u ZXQvYnVnemlsbGEvdGVzdF9leHBlY3RhdGlvbl91cGRhdGVyLnB5CShyZXZpc2lvbiAyNjUyNjQp CisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvdGVzdF9leHBl Y3RhdGlvbl91cGRhdGVyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00MCw5ICs0MCwxMCBAQCBmcm9t IHdlYmtpdHB5LmNvbW1vbi5uZXQubGF5b3V0dGVzdHJlc3VsCiBmcm9tIHdlYmtpdHB5LmNvbW1v bi53ZWJraXRfZmluZGVyIGltcG9ydCBXZWJLaXRGaW5kZXIKIGZyb20gd2Via2l0cHkubGF5b3V0 X3Rlc3RzLmNvbnRyb2xsZXJzLnRlc3RfcmVzdWx0X3dyaXRlciBpbXBvcnQgVGVzdFJlc3VsdFdy aXRlcgogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzIGltcG9ydCB0ZXN0X2V4cGVj dGF0aW9ucwotZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQgaW1wb3J0IHJl cXVlc3RzCisKIGltcG9ydCBqc29uCiBpbXBvcnQgcmUKK2ltcG9ydCByZXF1ZXN0cwogCiAjIEJ1 aWxkYm90IHN0YXR1cyBjb2RlcyByZWZlcmVuY2VkIGZyb20gaHR0cHM6Ly9naXRodWIuY29tL2J1 aWxkYm90L2J1aWxkYm90L2Jsb2IvbWFzdGVyL21hc3Rlci9idWlsZGJvdC9wcm9jZXNzL3Jlc3Vs dHMucHkKIEVXU19TVEFURUNPREVTID0geydTVUNDRVNTJzogMCwgJ1dBUk5JTkdTJzogMSwgJ0ZB SUxVUkUnOiAyLCAnU0tJUFBFRCc6IDMsICdFWENFUFRJT04nOiA0LCAnUkVUUlknOiA1LCAnQ0FO Q0VMTEVEJzogNn0KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcmVzdWx0cy91cGxvYWQu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9yZXN1bHRzL3VwbG9hZC5w eQkocmV2aXNpb24gMjY1MjY0KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9yZXN1bHRzL3Vw bG9hZC5weQkod29ya2luZyBjb3B5KQpAQCAtMjAsNyArMjAsNiBAQAogIyBPUiBUT1JUIChJTkNM VURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0Yg VEhFIFVTRQogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJ QklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCi1pbXBvcnQgd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRv aW5zdGFsbGVkLnJlcXVlc3RzCiBmcm9tIHdlYmtpdHB5LnBvcnQuY29uZmlnIGltcG9ydCBhcHBs ZV9hZGRpdGlvbnMKIAogaW1wb3J0IG1hdGgKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv cmVzdWx0cy91cGxvYWRfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9yZXN1bHRzL3VwbG9hZF91bml0dGVzdC5weQkocmV2aXNpb24gMjY1MjY0KQorKysg VG9vbHMvU2NyaXB0cy93ZWJraXRweS9yZXN1bHRzL3VwbG9hZF91bml0dGVzdC5weQkod29ya2lu ZyBjb3B5KQpAQCAtMjAsNyArMjAsNyBAQAogIyBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5D RSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQogIyBPRiBU SElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgogCi1pbXBvcnQgd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkLnJlcXVl c3RzCitmcm9tIHdlYmtpdGNvcmVweSBpbXBvcnQgQnl0ZXNJTwogCiBpbXBvcnQgY29sbGVjdGlv bnMKIGltcG9ydCBqc29uCkBAIC0yOSw4ICsyOSw2IEBAIGltcG9ydCBzeXMKIGltcG9ydCB0aW1l CiBpbXBvcnQgdW5pdHRlc3QKIAotZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IEJ5dGVzSU8KLQog ZnJvbSB3ZWJraXRweS5yZXN1bHRzLnVwbG9hZCBpbXBvcnQgVXBsb2FkCiBmcm9tIHdlYmtpdHB5 LnRoaXJkcGFydHkgaW1wb3J0IG1vY2sKIApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS90 aGlyZHBhcnR5L19faW5pdF9fLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdGhpcmRwYXJ0eS9fX2luaXRfXy5weQkocmV2aXNpb24gMjY1MjY0KQorKysgVG9vbHMvU2Ny aXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkpCkBAIC04 Myw3ICs4Myw3IEBAIGNsYXNzIEF1dG9pbnN0YWxsSW1wb3J0SG9vayhvYmplY3QpOgogICAgIGRl ZiBfZW5zdXJlX2F1dG9pbnN0YWxsZWRfZGlyX2lzX2luX3N5c19wYXRoKHNlbGYpOgogICAgICAg ICAjIFNvbWUgcGFja2FnZXMgcmVxdWlyZSB0aGF0IHRoZSBhcmUgYmVpbmcgcHV0IHNvbWV3aGVy ZSB1bmRlciBhIGRpcmVjdG9yeSBpbiBzeXMucGF0aC4KICAgICAgICAgaWYgbm90IF9BVVRPSU5T VEFMTEVEX0RJUiBpbiBzeXMucGF0aDoKLSAgICAgICAgICAgIHN5cy5wYXRoLmluc2VydCgwLCBf QVVUT0lOU1RBTExFRF9ESVIpCisgICAgICAgICAgICBzeXMucGF0aC5pbnNlcnQoMSBpZiAnbGli cmFyaWVzL2F1dG9pbnN0YWxsZWQnIGluIHN5cy5wYXRoWzBdIGVsc2UgMCwgX0FVVE9JTlNUQUxM RURfRElSKQogCiAgICAgZGVmIGZpbmRfbW9kdWxlKHNlbGYsIGZ1bGxuYW1lLCBwYXRoPU5vbmUp OgogICAgICAgICAjIFRoaXMgbWV0aG9kIHdpbGwgcnVuIGJlZm9yZSBlYWNoIGltcG9ydC4gU2Vl IGh0dHA6Ly93d3cucHl0aG9uLm9yZy9kZXYvcGVwcy9wZXAtMDMwMi8KQEAgLTEyMCw4ICsxMjAs NiBAQCBjbGFzcyBBdXRvaW5zdGFsbEltcG9ydEhvb2sob2JqZWN0KToKICAgICAgICAgICAgIHNl bGYuX2luc3RhbGxfcHl0ZXN0X3RpbWVvdXQoKQogICAgICAgICBlbGlmICcucHl0ZXN0JyBpbiBm dWxsbmFtZToKICAgICAgICAgICAgIHNlbGYuX2luc3RhbGxfcHl0ZXN0KCkKLSAgICAgICAgZWxp ZiAnLnJlcXVlc3RzJyBpbiBmdWxsbmFtZToKLSAgICAgICAgICAgIHNlbGYuX2luc3RhbGxfcmVx dWVzdHMoKQogICAgICAgICBlbGlmICcuYnM0JyBpbiBmdWxsbmFtZToKICAgICAgICAgICAgIHNl bGYuX2luc3RhbGxfYmVhdXRpZnVsc291cCgpCiAgICAgICAgIGVsaWYgJy5odG1sNWxpYicgaW4g ZnVsbG5hbWU6CkBAIC0xOTAsMjQgKzE4OCwxMCBAQCBjbGFzcyBBdXRvaW5zdGFsbEltcG9ydEhv b2sob2JqZWN0KToKICAgICAgICAgc2VsZi5faW5zdGFsbCgiaHR0cHM6Ly9maWxlcy5weXRob25o b3N0ZWQub3JnL3BhY2thZ2VzL2EyL2VjLzQxNWQwY2NjYzFlZDQxY2Q3ZmRmNjlhZDk4OWRhMTZh OGQxMzA1Nzk5NjM3MTAwNGNhYjRiYWZjNDhmMy9weXRlc3QtMy42LjIudGFyLmd6IiwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICJweXRlc3QtMy42LjIvc3JjL3B5dGVzdC5weSIpCiAK LSAgICBkZWYgX2luc3RhbGxfcmVxdWVzdHMoc2VsZik6Ci0gICAgICAgIHNlbGYuX2Vuc3VyZV9h dXRvaW5zdGFsbGVkX2Rpcl9pc19pbl9zeXNfcGF0aCgpCi0gICAgICAgIHNlbGYuX2luc3RhbGwo Imh0dHBzOi8vZmlsZXMucHl0aG9uaG9zdGVkLm9yZy9wYWNrYWdlcy8wNi9iOC9kMWVhMzg1MTNj MjJlOGM5MDYyNzVkMTM1ODE4ZmVlMTZhZDg0OTU5ODU5NTZhOWI3ZTJiYjIxOTQyYTEvY2VydGlm aS0yMDE5LjMuOS50YXIuZ3oiLAotICAgICAgICAgICAgICAgICAgICAgICJjZXJ0aWZpLTIwMTku My45L2NlcnRpZmkiKQotICAgICAgICBzZWxmLl9pbnN0YWxsKCJodHRwczovL2ZpbGVzLnB5dGhv bmhvc3RlZC5vcmcvcGFja2FnZXMvZmMvYmIvYTU3NjhjMjMwZjlkZGIwM2FjYzllZjNmMGQ0YTNj ZjkzNDYyNDczNzk1ZDE4ZTk1MzU0OThjOGY5MjlkL2NoYXJkZXQtMy4wLjQudGFyLmd6IiwKLSAg ICAgICAgICAgICAgICAgICAgICAiY2hhcmRldC0zLjAuNC9jaGFyZGV0IikKLSAgICAgICAgc2Vs Zi5faW5zdGFsbCgiaHR0cHM6Ly9maWxlcy5weXRob25ob3N0ZWQub3JnL3BhY2thZ2VzL2FkLzEz L2ViNTY5NTFiNmY3OTUwY2FkYjU3OWNhMTY2ZTQ0OGJhNzdmOWQyNGVmYzAzZWRkN2U1NWZhNTdk MDRiNy9pZG5hLTIuOC50YXIuZ3oiLAotICAgICAgICAgICAgICAgICAgICAgICJpZG5hLTIuOC9p ZG5hIikKLSAgICAgICAgc2VsZi5faW5zdGFsbCgiaHR0cHM6Ly9maWxlcy5weXRob25ob3N0ZWQu b3JnL3BhY2thZ2VzL2ZmLzQ0LzI5NjU1MTY4ZGE0NDFkZmY2NmRlMDM5NTI4ODBjNmUyZDE3YjI1 MjgzNmZmMWFhNDQyMWZiYTU1NjQyNC91cmxsaWIzLTEuMjUuNi50YXIuZ3oiLAotICAgICAgICAg ICAgICAgICAgICAgICJ1cmxsaWIzLTEuMjUuNi9zcmMvdXJsbGliMyIpCi0gICAgICAgIHNlbGYu X2luc3RhbGwoImh0dHBzOi8vZmlsZXMucHl0aG9uaG9zdGVkLm9yZy9wYWNrYWdlcy8wMS82Mi9k ZGNmNzZkMWQxOTg4NWU4NTc5YWNiMWIxZGYyNmE4NTJiMDM0NzJjMGU0NmQyYjk1OWE3MTRjOTA2 MDgvcmVxdWVzdHMtMi4yMi4wLnRhci5neiIsCi0gICAgICAgICAgICAgICAgICAgICAgInJlcXVl c3RzLTIuMjIuMC9yZXF1ZXN0cyIpCi0KICAgICBkZWYgX2luc3RhbGxfYmVhdXRpZnVsc291cChz ZWxmKToKICAgICAgICAgaWYgc3lzLnZlcnNpb25faW5mbyA8ICgzLCAwKToKICAgICAgICAgICAg IHJldHVybgogCi0gICAgICAgIHNlbGYuX2luc3RhbGxfcmVxdWVzdHMoKQogICAgICAgICBzZWxm Ll9pbnN0YWxsX2h0bWw1bGliKCkKICAgICAgICAgc2VsZi5fZW5zdXJlX2F1dG9pbnN0YWxsZWRf ZGlyX2lzX2luX3N5c19wYXRoKCkKICAgICAgICAgc2VsZi5faW5zdGFsbCgiaHR0cHM6Ly9maWxl cy5weXRob25ob3N0ZWQub3JnL3BhY2thZ2VzLzdmLzRlLzk1YTEzNTI3ZTE4YjZmMWExNWM5M2Yx YzYzNGI4NmQ1ZmE2MzRjNTYxOWRjZTY5NWY0ZTBjZDY4MTgyZi9zb3Vwc2lldmUtMS45LjQudGFy Lmd6IiwKQEAgLTI4Niw5ICsyNzAsNiBAQCBjbGFzcyBBdXRvaW5zdGFsbEltcG9ydEhvb2sob2Jq ZWN0KToKICAgICBkZWYgX2luc3RhbGxfc2VsZW5pdW0oc2VsZik6CiAgICAgICAgIHNlbGYuX2Vu c3VyZV9hdXRvaW5zdGFsbGVkX2Rpcl9pc19pbl9zeXNfcGF0aCgpCiAKLSAgICAgICAgaW5zdGFs bGVyID0gQXV0b0luc3RhbGxlcihwcmVwZW5kX3RvX3NlYXJjaF9wYXRoPVRydWUsIHRhcmdldF9k aXI9c2VsZi5fZnMuam9pbihfQVVUT0lOU1RBTExFRF9ESVIsICJ1cmxsaWIzIikpCi0gICAgICAg IGluc3RhbGxlci5pbnN0YWxsKHVybD0iaHR0cHM6Ly9maWxlcy5weXRob25ob3N0ZWQub3JnL3Bh Y2thZ2VzL2ZmLzQ0LzI5NjU1MTY4ZGE0NDFkZmY2NmRlMDM5NTI4ODBjNmUyZDE3YjI1MjgzNmZm MWFhNDQyMWZiYTU1NjQyNC91cmxsaWIzLTEuMjUuNi50YXIuZ3oiLCB1cmxfc3VicGF0aD0idXJs bGliMy0xLjI1LjYiKQotCiAgICAgICAgIG1pbmltdW1fdmVyc2lvbiA9ICczLjUuMCcKICAgICAg ICAgaWYgb3MucGF0aC5pc2ZpbGUob3MucGF0aC5qb2luKF9BVVRPSU5TVEFMTEVEX0RJUiwgJ3Nl bGVuaXVtJywgJ19faW5pdF9fLnB5JykpOgogICAgICAgICAgICAgaW1wb3J0IHNlbGVuaXVtLndl YmRyaXZlcgo=