232574 2021-11-01 12:35:04 -0700 [webkitscmpy] Reduce autoinstalls on import 2021-11-04 08:07:06 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=232573 InRadar P2 Normal --- 1 jbedard jbedard repstein webkit-bug-importer oldest_to_newest 1810766 0 jbedard 2021-11-01 12:35:04 -0700 webkitscmpy autoinstalls too much when we import the library. 1810769 1 webkit-bug-importer 2021-11-01 12:38:27 -0700 <rdar://problem/84894275> 1810791 2 443003 jbedard 2021-11-01 12:48:37 -0700 Created attachment 443003 Patch 1810803 3 repstein 2021-11-01 12:51:19 -0700 Thanks, Jonathan! Maintaining lightweight auto installation is key to avoiding frustration/confusion! rs=me 1811118 4 443091 jbedard 2021-11-02 08:22:53 -0700 Created attachment 443091 Patch 1811231 5 jbedard 2021-11-02 12:58:58 -0700 Landed <https://commits.webkit.org/243809@main> (r285175) 443003 2021-11-01 12:48:37 -0700 2021-11-02 08:22:51 -0700 Patch bug-232574-20211101124835.patch text/plain 15474 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MTIxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjUxZDZhZjQ3NGNmOWRhNGUxYTgwMDNlOTMxMGUyZWZi NGI1NjkwMC4uMzQ4MjUwOTM2OTM0ZGE5ZTM3MWVhMjZjODI4NjNmZDE3Yjg0MDVlMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDIxLTExLTAxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIFJlZHVjZSBhdXRvaW5zdGFsbHMgb24gaW1wb3J0CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI1NzQKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzg0ODk0Mjc1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvX19pbml0X18ucHk6IFJlbW92ZSB3aGljaGNyYWZ0ICh3ZWJraXRjb3JlcHkgcmVn aXN0ZXJzIGl0KS4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJr aXRzY21weS9jb21taXQucHk6IE1vdmUgc2l4IGltcG9ydCB0byBmdW5jdGlvbnMuCisgICAgICAg ICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5 OiBEaXR0by4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS9sb2NhbC9zY20ucHk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vY29tbWFuZC5weTogTW92ZSB3aGljaGNyYWZ0 IHRvIGZ1bmN0aW9uLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl YmtpdHNjbXB5L3Byb2dyYW0vc2V0dXAucHk6IE1vdmUgamluamEyIHRvIGZ1bmN0aW9uLgorICAg ICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3B1bGxfcmVx dWVzdC5weTogTW92ZSBzaXggaW1wb3J0IHRvIGZ1bmN0aW9ucy4KKyAgICAgICAgKiBTY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvYml0YnVja2V0LnB5OiBE aXR0by4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS9yZW1vdGUvZ2l0X2h1Yi5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3NjbS5weTogRGl0dG8uCisgICAgICAgICog U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3N2bi5weTog TW92ZSBmYXN0ZW5lcnMsIHhtbHRvZGljdCBpbXBvcnQgdG8gZnVuY3Rpb25zLgorICAgICAgICAq IFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3NjbV9iYXNlLnB5OiBN b3ZlIHNpeCBpbXBvcnQgdG8gZnVuY3Rpb25zLgorCiAyMDIxLTExLTAxICBCcmFkeSBFaWRzb24g IDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICB3ZWJwdXNoZDogQWRkIG1vY2sgaW4tbWVt b3J5IHJlZ2lzdHJhdGlvbiwgYW5kIHRoZSBXS1dlYnNpdGVEYXRhU3RvcmUgU1BJIHRvIG1hbmFn ZSB0aGVtCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS9fX2luaXRfXy5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CmluZGV4IDk5NGE2OWZjMmI0NGE3NDE3ZTE4NzJh ZjNlM2NhMmVkYmU3MTRjNzAuLmQ1ZmIzYTVlNjM3ZDk3YThkZmM2MTBhZmJiZjM2NDFlYTY5NmJm ZDUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L19faW5pdF9fLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CkBAIC01MSw3ICs1MSw2IEBAIHZlcnNpb24gPSBW ZXJzaW9uKDIsIDIsIDIxKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZmFzdGVuZXJz JywgVmVyc2lvbigwLCAxNSwgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnamlu amEyJywgVmVyc2lvbigyLCAxMSwgMykpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgn bW9ub3RvbmljJywgVmVyc2lvbigxLCA1KSkpCi1BdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdl KCd3aGljaGNyYWZ0JywgVmVyc2lvbigwLCA2LCAxKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQ YWNrYWdlKCd4bWx0b2RpY3QnLCBWZXJzaW9uKDAsIDExLCAwKSkpCiBBdXRvSW5zdGFsbC5yZWdp c3RlcihQYWNrYWdlKCdtYXJrdXBzYWZlJywgVmVyc2lvbigxLCAxLCAxKSwgcHlwaV9uYW1lPSdN YXJrdXBTYWZlJykpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L2NvbW1pdC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L2NvbW1pdC5weQppbmRleCAzNDk4OWUxZTM5MWEzNWVjOWYy YjhhNTJiOWE3ODMyZmEyZDQyM2YwLi4yODU3YThhN2E3MzU4ODllMTg2MmJhZDk2OTk3NzBmZTQ2 OWM2MzMxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS9jb21taXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvd2Via2l0c2NtcHkvY29tbWl0LnB5CkBAIC0yMSw3ICsyMSw2IEBACiAjIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCiBp bXBvcnQganNvbgotaW1wb3J0IHNpeAogaW1wb3J0IHJlCiAKIGZyb20gZGF0ZXRpbWUgaW1wb3J0 IGRhdGV0aW1lCkBAIC02Miw2ICs2MSw4IEBAIGNsYXNzIENvbW1pdChvYmplY3QpOgogCiAgICAg QGNsYXNzbWV0aG9kCiAgICAgZGVmIF9wYXJzZV9oYXNoKGNscywgaGFzaCwgZG9fYXNzZXJ0PUZh bHNlKToKKyAgICAgICAgaW1wb3J0IHNpeAorCiAgICAgICAgIGlmIGhhc2ggaXMgTm9uZToKICAg ICAgICAgICAgIHJldHVybiBOb25lCiAKQEAgLTc5LDYgKzgwLDggQEAgY2xhc3MgQ29tbWl0KG9i amVjdCk6CiAKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgX3BhcnNlX3JldmlzaW9uKGNscywg cmV2aXNpb24sIGRvX2Fzc2VydD1GYWxzZSk6CisgICAgICAgIGltcG9ydCBzaXgKKwogICAgICAg ICBpZiByZXZpc2lvbiBpcyBOb25lOgogICAgICAgICAgICAgcmV0dXJuIE5vbmUKIApAQCAtMTA3 LDYgKzExMCw4IEBAIGNsYXNzIENvbW1pdChvYmplY3QpOgogCiAgICAgQGNsYXNzbWV0aG9kCiAg ICAgZGVmIF9wYXJzZV9pZGVudGlmaWVyKGNscywgaWRlbnRpZmllciwgZG9fYXNzZXJ0PUZhbHNl KToKKyAgICAgICAgaW1wb3J0IHNpeAorCiAgICAgICAgIGlmIGlkZW50aWZpZXIgaXMgTm9uZToK ICAgICAgICAgICAgIHJldHVybiBOb25lCiAKQEAgLTE3OCw2ICsxODMsOCBAQCBjbGFzcyBDb21t aXQob2JqZWN0KToKICAgICAgICAgaWRlbnRpZmllcj1Ob25lLCBicmFuY2g9Tm9uZSwgYnJhbmNo X3BvaW50PU5vbmUsCiAgICAgICAgIHRpbWVzdGFtcD1Ob25lLCBhdXRob3I9Tm9uZSwgbWVzc2Fn ZT1Ob25lLCBvcmRlcj1Ob25lLCByZXBvc2l0b3J5X2lkPU5vbmUKICAgICApOgorICAgICAgICBp bXBvcnQgc2l4CisKICAgICAgICAgc2VsZi5oYXNoID0gc2VsZi5fcGFyc2VfaGFzaChoYXNoLCBk b19hc3NlcnQ9VHJ1ZSkKICAgICAgICAgc2VsZi5yZXZpc2lvbiA9IHNlbGYuX3BhcnNlX3Jldmlz aW9uKHJldmlzaW9uLCBkb19hc3NlcnQ9VHJ1ZSkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5IGIvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5Cmlu ZGV4IDczYTU5YzhlYzhhYTVjMmE0NDEyNGMxOTk1NjZiYWU2NTQwZTQwM2UuLmI5NTZiYmIzNGYw Mjk0NmM3ODk2MTE4ZmQ5MDA4OWZhZWZmNDM2ZDYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weQorKysgYi9Ub29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkK QEAgLTI1LDcgKzI1LDYgQEAgaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCBvcwogaW1wb3J0IGpzb24K IGltcG9ydCByZQotaW1wb3J0IHNpeAogaW1wb3J0IHN1YnByb2Nlc3MKIGltcG9ydCBzeXMKIGlt cG9ydCB0aW1lCkBAIC0zNSw3ICszNCw3IEBAIGZyb20gY29sbGVjdGlvbnMgaW1wb3J0IGRlZmF1 bHRkaWN0CiAKIGZyb20gd2Via2l0Y29yZXB5IGltcG9ydCBydW4sIGRlY29yYXRvcnMsIE5lc3Rl ZEZ1enp5RGljdAogZnJvbSB3ZWJraXRzY21weS5sb2NhbCBpbXBvcnQgU2NtCi1mcm9tIHdlYmtp dHNjbXB5IGltcG9ydCByZW1vdGUsIENvbW1pdCwgQ29udHJpYnV0b3IsIGxvZworZnJvbSB3ZWJr aXRzY21weSBpbXBvcnQgcmVtb3RlCiBmcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBDb21taXQsIENv bnRyaWJ1dG9yLCBsb2cKIAogCkBAIC03NjMsNiArNzYyLDggQEAgY2xhc3MgR2l0KFNjbSk6CiAg ICAgICAgICAgICAgICAgbG9nLmtpbGwoKQogCiAgICAgZGVmIGZpbmQoc2VsZiwgYXJndW1lbnQs IGluY2x1ZGVfbG9nPVRydWUsIGluY2x1ZGVfaWRlbnRpZmllcj1UcnVlKToKKyAgICAgICAgaW1w b3J0IHNpeAorCiAgICAgICAgIGlmIG5vdCBpc2luc3RhbmNlKGFyZ3VtZW50LCBzaXguc3RyaW5n X3R5cGVzKToKICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoIkV4cGVjdGVkICdhcmd1bWVu dCcgdG8gYmUgYSBzdHJpbmcsIG5vdCAne30nIi5mb3JtYXQodHlwZShhcmd1bWVudCkpKQogCkBA IC03OTUsNiArNzk2LDggQEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgICAgIHJldHVybiBzZWxmLmNv bW1pdChoYXNoPW91dHB1dC5zdGRvdXQucnN0cmlwKCksIGluY2x1ZGVfbG9nPWluY2x1ZGVfbG9n LCBpbmNsdWRlX2lkZW50aWZpZXI9aW5jbHVkZV9pZGVudGlmaWVyKQogCiAgICAgZGVmIGNoZWNr b3V0KHNlbGYsIGFyZ3VtZW50KToKKyAgICAgICAgaW1wb3J0IHNpeAorCiAgICAgICAgIGlmIG5v dCBpc2luc3RhbmNlKGFyZ3VtZW50LCBzaXguc3RyaW5nX3R5cGVzKToKICAgICAgICAgICAgIHJh aXNlIFZhbHVlRXJyb3IoIkV4cGVjdGVkICdhcmd1bWVudCcgdG8gYmUgYSBzdHJpbmcsIG5vdCAn e30nIi5mb3JtYXQodHlwZShhcmd1bWVudCkpKQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zY20ucHkgYi9Ub29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zY20ucHkKaW5k ZXggMDA4ZTQzZWFjZGU3MThlN2FmODQzOWU2YTI2YzA4MmIzMTU4ZGMzMC4uNjc5ZmQ3NTdiODcw NDA0ZDBhMGQxM2NmMTZmMmVkMGNlY2I1M2UwNCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvc2NtLnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3NjbS5weQpA QCAtMjMsOSArMjMsNyBAQAogCiBpbXBvcnQgb3MKIGltcG9ydCByZQotaW1wb3J0IHNpeAogCi1m cm9tIHdlYmtpdGNvcmVweSBpbXBvcnQgcnVuCiBmcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBTY21C YXNlLCBDb250cmlidXRvcgogCiAKQEAgLTU1LDYgKzUzLDggQEAgY2xhc3MgU2NtKFNjbUJhc2Up OgogICAgICAgICByYWlzZSBPU0Vycm9yKCIne30nIGlzIG5vdCBhIGtub3duIFNDTSB0eXBlIi5m b3JtYXQocGF0aCkpCiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgcGF0aCwgZGV2X2JyYW5jaGVz PU5vbmUsIHByb2RfYnJhbmNoZXM9Tm9uZSwgY29udHJpYnV0b3JzPU5vbmUsIGlkPU5vbmUpOgor ICAgICAgICBpbXBvcnQgc2l4CisKICAgICAgICAgaWYgbm90IGlzaW5zdGFuY2UocGF0aCwgc2l4 LnN0cmluZ190eXBlcyk6CiAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCJFeHBlY3RlZCAn cGF0aCcgdG8gYmUgYSBzdHJpbmcgdHlwZSwgbm90ICd7fSciLmZvcm1hdCh0eXBlKHBhdGgpKSkK ICAgICAgICAgc2VsZi5wYXRoID0gcGF0aApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9jb21tYW5kLnB5IGIvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9jb21tYW5k LnB5CmluZGV4IGNjYTVlMjM3NmNmNmNjMjAwNjk4ZWJhYzgwMTc2ODExNjkyOTJlNjkuLmU1NGQz MGU0YjY4YmZiOGU2NGVlYzVkMjU2NzUxNzI5YzVkYTE4ZTMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vY29tbWFuZC5w eQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9w cm9ncmFtL2NvbW1hbmQucHkKQEAgLTI5LDcgKzI5LDYgQEAgaW1wb3J0IHRpbWUKIAogZnJvbSB3 ZWJraXRjb3JlcHkgaW1wb3J0IFRlcm1pbmFsCiBmcm9tIHdlYmtpdHNjbXB5LmNvbW1pdCBpbXBv cnQgQ29tbWl0Ci1mcm9tIHdoaWNoY3JhZnQgaW1wb3J0IHdoaWNoCiAKIAogY2xhc3MgQ29tbWFu ZChvYmplY3QpOgpAQCAtMTA0LDYgKzEwMyw4IEBAIGNsYXNzIEZpbHRlcmVkQ29tbWFuZChDb21t YW5kKToKIAogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBwYWdlcihjbHMsIGFyZ3MsIHJlcG9z aXRvcnksIGZpbGU9Tm9uZSwgKiprd2FyZ3MpOgorICAgICAgICBmcm9tIHdoaWNoY3JhZnQgaW1w b3J0IHdoaWNoCisKICAgICAgICAgaWYgbm90IHJlcG9zaXRvcnkucGF0aDoKICAgICAgICAgICAg IHN5cy5zdGRlcnIud3JpdGUoIkNhbm5vdCBydW4gJ3t9JyBvbiByZW1vdGUgcmVwb3NpdG9yeVxu Ii5mb3JtYXQoY2xzLm5hbWUpKQogICAgICAgICAgICAgcmV0dXJuIDEKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vc2V0 dXAucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9w cm9ncmFtL3NldHVwLnB5CmluZGV4IGViMGYzZDVlM2I3MTMzMGNmYzFmYTE2NDFjMTE3ZDM2MTI0 ZWU4OTguLmI1ODE0NDA4YzIyNWMxZjJjYTYzZGY2ZmRjZmMwNjBhOWU2OGNlYjUgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dy YW0vc2V0dXAucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvcHJvZ3JhbS9zZXR1cC5weQpAQCAtMjUsNyArMjUsNiBAQCBpbXBvcnQgcmVxdWVz dHMKIGltcG9ydCBzeXMKIAogZnJvbSAuY29tbWFuZCBpbXBvcnQgQ29tbWFuZAotZnJvbSBqaW5q YTIgaW1wb3J0IFRlbXBsYXRlCiBmcm9tIHJlcXVlc3RzLmF1dGggaW1wb3J0IEhUVFBCYXNpY0F1 dGgKIGZyb20gd2Via2l0Y29yZXB5IGltcG9ydCBhcmd1bWVudHMsIHJ1biwgRWRpdG9yLCBUZXJt aW5hbAogZnJvbSB3ZWJraXRzY21weSBpbXBvcnQgbG9nLCBsb2NhbCwgcmVtb3RlCkBAIC0xNTUs NiArMTU0LDcgQEAgY2xhc3MgU2V0dXAoQ29tbWFuZCk6CiAgICAgICAgICAgICAgICAgICAgIGNv bnRpbnVlCiAgICAgICAgICAgICAgICAgbG9nLndhcm5pbmcoJ0NvbmZpZ3VyaW5nIGFuZCBjb3B5 aW5nIGhvb2sge30nLmZvcm1hdChzb3VyY2VfcGF0aCkpCiAgICAgICAgICAgICAgICAgd2l0aCBv cGVuKHNvdXJjZV9wYXRoLCAncicpIGFzIGY6CisgICAgICAgICAgICAgICAgICAgIGZyb20gamlu amEyIGltcG9ydCBUZW1wbGF0ZQogICAgICAgICAgICAgICAgICAgICBjb250ZW50cyA9IFRlbXBs YXRlKGYucmVhZCgpKS5yZW5kZXIoCiAgICAgICAgICAgICAgICAgICAgICAgICBnaXQ9bG9jYWwu R2l0LmV4ZWN1dGFibGUoKSwKICAgICAgICAgICAgICAgICAgICAgICAgIGxvY2F0aW9uPXNvdXJj ZV9wYXRoLApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvcHVsbF9yZXF1ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvcHVsbF9yZXF1ZXN0LnB5CmluZGV4IDNmYjI3OGZkODI2YzMy Njk0MDlhYmNmNWU3ZDYyYzg4ZWYzOTE4ZmMuLjIwZmMyMTlhMmUwMmEyMjQyMWRjZTRhNmZiZjIy N2ZhMDVkNDkwM2YgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L3B1bGxfcmVxdWVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJh cmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9wdWxsX3JlcXVlc3QucHkKQEAgLTIxLDcgKzIx LDYgQEAKICMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuCiAKIGltcG9ydCByZQotaW1wb3J0IHNpeAogCiBmcm9tIC5jb21taXQgaW1w b3J0IENvbW1pdAogZnJvbSBkYXRldGltZSBpbXBvcnQgZGF0ZXRpbWUKQEAgLTM0LDYgKzMzLDgg QEAgY2xhc3MgUHVsbFJlcXVlc3Qob2JqZWN0KToKIAogICAgIGNsYXNzIENvbW1lbnQob2JqZWN0 KToKICAgICAgICAgZGVmIF9faW5pdF9fKHNlbGYsIGF1dGhvciwgdGltZXN0YW1wLCBjb250ZW50 KToKKyAgICAgICAgICAgIGltcG9ydCBzaXgKKwogICAgICAgICAgICAgaWYgYXV0aG9yIGFuZCBp c2luc3RhbmNlKGF1dGhvciwgZGljdCkgYW5kIGF1dGhvci5nZXQoJ25hbWUnKToKICAgICAgICAg ICAgICAgICBzZWxmLmF1dGhvciA9IENvbnRyaWJ1dG9yKGF1dGhvci5nZXQoJ25hbWUnKSwgYXV0 aG9yLmdldCgnZW1haWxzJykpCiAgICAgICAgICAgICBlbGlmIGF1dGhvciBhbmQgaXNpbnN0YW5j ZShhdXRob3IsIHNpeC5zdHJpbmdfdHlwZXMpIGFuZCAnQCcgaW4gYXV0aG9yOgpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3Rl L2JpdGJ1Y2tldC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L3JlbW90ZS9iaXRidWNrZXQucHkKaW5kZXggZThmM2FmMGQyYWQwNGRlODAwNjE5MGNj NmQyMzExMDMwZmM2YmI5ZS4uYjBhNjIwNWE4ZGQwNjhlNDgyNGU0MGMzNDAzZDdmMzgyZjY1Y2Ix MyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvcmVtb3RlL2JpdGJ1Y2tldC5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvYml0YnVja2V0LnB5CkBAIC0yMiw3ICsyMiw2 IEBACiAKIGltcG9ydCByZQogaW1wb3J0IHJlcXVlc3RzCi1pbXBvcnQgc2l4CiBpbXBvcnQgc3lz CiAKIGZyb20gd2Via2l0Y29yZXB5IGltcG9ydCBkZWNvcmF0b3JzCkBAIC00OTEsNiArNDkwLDgg QEAgY2xhc3MgQml0QnVja2V0KFNjbSk6CiAgICAgICAgICkKIAogICAgIGRlZiBmaW5kKHNlbGYs IGFyZ3VtZW50LCBpbmNsdWRlX2xvZz1UcnVlLCBpbmNsdWRlX2lkZW50aWZpZXI9VHJ1ZSk6Cisg ICAgICAgIGltcG9ydCBzaXgKKwogICAgICAgICBpZiBub3QgaXNpbnN0YW5jZShhcmd1bWVudCwg c2l4LnN0cmluZ190eXBlcyk6CiAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCJFeHBlY3Rl ZCAnYXJndW1lbnQnIHRvIGJlIGEgc3RyaW5nLCBub3QgJ3t9JyIuZm9ybWF0KHR5cGUoYXJndW1l bnQpKSkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvcmVtb3RlL2dpdF9odWIucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvZ2l0X2h1Yi5weQppbmRleCAzN2YxNmQ2Zjhh ZTg4ODQ2NWI0OGJhOTExOWYwNmQyOTM1MjA0ZDRlLi42ODUyZWJjM2E2M2ZlMWNkOTM1NDlmODBh ZjlmMjgyMDNjYzkxYTBhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvZ2l0X2h1Yi5weQorKysgYi9Ub29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvZ2l0X2h1Yi5weQpAQCAt MjMsNyArMjMsNiBAQAogaW1wb3J0IGNhbGVuZGFyCiBpbXBvcnQgcmUKIGltcG9ydCByZXF1ZXN0 cwotaW1wb3J0IHNpeAogaW1wb3J0IHN5cwogCiBmcm9tIGRhdGV0aW1lIGltcG9ydCBkYXRldGlt ZQpAQCAtNjIxLDYgKzYyMCw4IEBAIGZvciB5b3VyIHt9IHVzZXInJycuZm9ybWF0KHNlbGYudXJs LnNwbGl0KCcvJylbMl0pLAogCiAKICAgICBkZWYgZmluZChzZWxmLCBhcmd1bWVudCwgaW5jbHVk ZV9sb2c9VHJ1ZSwgaW5jbHVkZV9pZGVudGlmaWVyPVRydWUpOgorICAgICAgICBpbXBvcnQgc2l4 CisKICAgICAgICAgaWYgbm90IGlzaW5zdGFuY2UoYXJndW1lbnQsIHNpeC5zdHJpbmdfdHlwZXMp OgogICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcigiRXhwZWN0ZWQgJ2FyZ3VtZW50JyB0byBi ZSBhIHN0cmluZywgbm90ICd7fSciLmZvcm1hdCh0eXBlKGFyZ3VtZW50KSkpCiAKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90 ZS9zY20ucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS9yZW1vdGUvc2NtLnB5CmluZGV4IGNkZTc1OWZkY2E4MzMzMzk2MDY0MWQyMmNlMzFmM2JmOWIz NjEwMTMuLjEwM2ZhOTQ3MTk2NGI4Yzk5ZDZkOTM5YTBhZjNkMWE5NzQ4YTFkZTQgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90 ZS9zY20ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvcmVtb3RlL3NjbS5weQpAQCAtMjAsOCArMjAsNiBAQAogIyBPUiBUT1JUIChJTkNMVURJ TkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhF IFVTRQogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklM SVRZIE9GIFNVQ0ggREFNQUdFLgogCi1pbXBvcnQgc2l4Ci0KIGZyb20gd2Via2l0c2NtcHkuc2Nt X2Jhc2UgaW1wb3J0IFNjbUJhc2UKIAogCkBAIC02Myw2ICs2MSw4IEBAIGNsYXNzIFNjbShTY21C YXNlKToKICAgICAgICAgcmFpc2UgT1NFcnJvcigiJ3t9JyBpcyBub3QgYSBrbm93biBTQ00gc2Vy dmVyIi5mb3JtYXQodXJsKSkKIAogICAgIGRlZiBfX2luaXRfXyhzZWxmLCB1cmwsIGRldl9icmFu Y2hlcz1Ob25lLCBwcm9kX2JyYW5jaGVzPU5vbmUsIGNvbnRyaWJ1dG9ycz1Ob25lLCBpZD1Ob25l KToKKyAgICAgICAgaW1wb3J0IHNpeAorCiAgICAgICAgIHN1cGVyKFNjbSwgc2VsZikuX19pbml0 X18oZGV2X2JyYW5jaGVzPWRldl9icmFuY2hlcywgcHJvZF9icmFuY2hlcz1wcm9kX2JyYW5jaGVz LCBjb250cmlidXRvcnM9Y29udHJpYnV0b3JzLCBpZD1pZCkKIAogICAgICAgICBpZiBub3QgaXNp bnN0YW5jZSh1cmwsIHNpeC5zdHJpbmdfdHlwZXMpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3N2bi5weSBiL1Rvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9zdm4ucHkK aW5kZXggNGRiNDBmZjAzNjhkMzA1OTg3OWY0MjI4NTZmZDYzZjk0ZmE2Yjg5NS4uMmFkYjA0YzQ0 YmQ3OGM3YmQwYzE4ZmFjOWUyNjExY2MzNzAxMGI2NyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3N2bi5weQorKysgYi9U b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvc3Zu LnB5CkBAIC0yMiwxMyArMjIsMTEgQEAKIAogaW1wb3J0IGJpc2VjdAogaW1wb3J0IGNhbGVuZGFy Ci1pbXBvcnQgZmFzdGVuZXJzCiBpbXBvcnQganNvbgogaW1wb3J0IG9zCiBpbXBvcnQgcmUKIGlt cG9ydCByZXF1ZXN0cwogaW1wb3J0IHRlbXBmaWxlCi1pbXBvcnQgeG1sdG9kaWN0CiAKIGZyb20g ZGF0ZXRpbWUgaW1wb3J0IGRhdGV0aW1lCiAKQEAgLTEwMCw2ICs5OCw4IEBAIGNsYXNzIFN2bihT Y20pOgogCiAgICAgQGRlY29yYXRvcnMuTWVtb2l6ZShjYWNoZWQ9RmFsc2UpCiAgICAgZGVmIGlu Zm8oc2VsZiwgYnJhbmNoPU5vbmUsIHJldmlzaW9uPU5vbmUsIHRhZz1Ob25lKToKKyAgICAgICAg aW1wb3J0IHhtbHRvZGljdAorCiAgICAgICAgIGlmIHRhZyBhbmQgYnJhbmNoOgogICAgICAgICAg ICAgcmFpc2UgVmFsdWVFcnJvcignQ2Fubm90IHNwZWNpZnkgYm90aCBicmFuY2ggYW5kIHRhZycp CiAgICAgICAgIGlmIHRhZyBhbmQgcmV2aXNpb246CkBAIC0xNjMsNiArMTYzLDggQEAgY2xhc3Mg U3ZuKFNjbSk6CiAgICAgICAgIHJldHVybiAndHJ1bmsnCiAKICAgICBkZWYgbGlzdChzZWxmLCBj YXRlZ29yeSk6CisgICAgICAgIGltcG9ydCB4bWx0b2RpY3QKKwogICAgICAgICByZXZpc2lvbiA9 IHNlbGYuX2xhdGVzdCgpCiAgICAgICAgIGlmIG5vdCByZXZpc2lvbjoKICAgICAgICAgICAgIHJl dHVybiBbXQpAQCAtMjAzLDYgKzIwNSw3IEBAIGNsYXNzIFN2bihTY20pOgogICAgICAgICByZXR1 cm4gc2VsZi5saXN0KCd0YWdzJykKIAogICAgIGRlZiBfY2FjaGVfbG9jayhzZWxmKToKKyAgICAg ICAgaW1wb3J0IGZhc3RlbmVycwogICAgICAgICByZXR1cm4gZmFzdGVuZXJzLkludGVyUHJvY2Vz c0xvY2sob3MucGF0aC5qb2luKG9zLnBhdGguZGlybmFtZShzZWxmLl9jYWNoZV9wYXRoKSwgJ2Nh Y2hlLmxvY2snKSkKIAogICAgIGRlZiBfY2FjaGVfcmV2aXNpb25zKHNlbGYsIGJyYW5jaD1Ob25l KToKQEAgLTI4Miw2ICsyODUsOCBAQCBjbGFzcyBTdm4oU2NtKToKICAgICAgICAgcmV0dXJuIHNl bGYuX21ldGFkYXRhX2NhY2hlW2JyYW5jaF0KIAogICAgIGRlZiBfYnJhbmNoX2ZvcihzZWxmLCBy ZXZpc2lvbik6CisgICAgICAgIGltcG9ydCB4bWx0b2RpY3QKKwogICAgICAgICByZXNwb25zZSA9 IHJlcXVlc3RzLnJlcXVlc3QoCiAgICAgICAgICAgICBtZXRob2Q9J1JFUE9SVCcsCiAgICAgICAg ICAgICB1cmw9J3t9IXN2bi9ydnIve30nLmZvcm1hdChzZWxmLnVybCwgcmV2aXNpb24pLApAQCAt MzMyLDYgKzMzNyw4IEBAIGNsYXNzIFN2bihTY20pOgogICAgICAgICByZXR1cm4gc2VsZi5fY29t bWl0X2NvdW50KHJldmlzaW9uPXNlbGYuX21ldGFkYXRhX2NhY2hlW2JyYW5jaF1bMF0sIGJyYW5j aD1zZWxmLmRlZmF1bHRfYnJhbmNoKQogCiAgICAgZGVmIGNvbW1pdChzZWxmLCBoYXNoPU5vbmUs IHJldmlzaW9uPU5vbmUsIGlkZW50aWZpZXI9Tm9uZSwgYnJhbmNoPU5vbmUsIHRhZz1Ob25lLCBp bmNsdWRlX2xvZz1UcnVlLCBpbmNsdWRlX2lkZW50aWZpZXI9VHJ1ZSk6CisgICAgICAgIGltcG9y dCB4bWx0b2RpY3QKKwogICAgICAgICBpZiBoYXNoOgogICAgICAgICAgICAgcmFpc2UgVmFsdWVF cnJvcignU1ZOIGRvZXMgbm90IHN1cHBvcnQgR2l0IGhhc2hlcycpCiAKQEAgLTQ1Niw2ICs0NjMs OCBAQCBjbGFzcyBTdm4oU2NtKToKICAgICAgICAgKQogCiAgICAgZGVmIF9hcmdzX2Zyb21fY29u dGVudChzZWxmLCBjb250ZW50LCBpbmNsdWRlX2xvZz1UcnVlKToKKyAgICAgICAgaW1wb3J0IHht bHRvZGljdAorCiAgICAgICAgIHhtbCA9IHhtbHRvZGljdC5wYXJzZShjb250ZW50KQogICAgICAg ICBkYXRlID0gZGF0ZXRpbWUuc3RycHRpbWUoc3RyaW5nX3V0aWxzLmRlY29kZSh4bWxbJ1M6bG9n LWl0ZW0nXVsnUzpkYXRlJ10pLnNwbGl0KCcuJylbMF0sICclWS0lbS0lZFQlSDolTTolUycpCiAg ICAgICAgIG5hbWUgPSBzdHJpbmdfdXRpbHMuZGVjb2RlKHhtbFsnUzpsb2ctaXRlbSddWydEOmNy ZWF0b3ItZGlzcGxheW5hbWUnXSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3NjbV9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvc2NtX2Jhc2UucHkKaW5kZXggZTMzOWZmOGZj ZDI3OTQ5NTA1NzNmYmVjZTM0OTMyZDQ2YjI3YWExMy4uOWFhYTAzMmZmMWNiYjU3ZWMwMWM1YTgz ZGU1ZTFhODViZGY3ODRhZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvc2NtX2Jhc2UucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvc2NtX2Jhc2UucHkKQEAgLTIyLDcgKzIyLDYg QEAKIAogaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCByZQotaW1wb3J0IHNpeAogaW1wb3J0IHN5cwog CiBmcm9tIGxvZ2dpbmcgaW1wb3J0IE51bGxIYW5kbGVyCkBAIC00MSw2ICs0MCw4IEBAIGNsYXNz IFNjbUJhc2Uob2JqZWN0KToKICAgICBERUZBVUxUX0JSQU5DSEVTID0gWydtYWluJywgJ21hc3Rl cicsICd0cnVuayddCiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgZGV2X2JyYW5jaGVzPU5vbmUs IHByb2RfYnJhbmNoZXM9Tm9uZSwgY29udHJpYnV0b3JzPU5vbmUsIGlkPU5vbmUpOgorICAgICAg ICBpbXBvcnQgc2l4CisKICAgICAgICAgc2VsZi5kZXZfYnJhbmNoZXMgPSBkZXZfYnJhbmNoZXMg b3Igc2VsZi5ERVZfQlJBTkNIRVMKICAgICAgICAgc2VsZi5wcm9kX2JyYW5jaGVzID0gcHJvZF9i cmFuY2hlcyBvciBzZWxmLlBST0RfQlJBTkNIRVMKICAgICAgICAgc2VsZi5wYXRoID0gZ2V0YXR0 cihzZWxmLCAncGF0aCcsIE5vbmUpCkBAIC0xMjUsNiArMTI2LDggQEAgY2xhc3MgU2NtQmFzZShv YmplY3QpOgogICAgICAgICByZXR1cm4gc29ydGVkKGZpbHRlcmVkX2NhbmRpZGF0ZXMpWzBdCiAK ICAgICBkZWYgZmluZChzZWxmLCBhcmd1bWVudCwgaW5jbHVkZV9sb2c9VHJ1ZSwgaW5jbHVkZV9p ZGVudGlmaWVyPVRydWUpOgorICAgICAgICBpbXBvcnQgc2l4CisKICAgICAgICAgaWYgbm90IGlz aW5zdGFuY2UoYXJndW1lbnQsIHNpeC5zdHJpbmdfdHlwZXMpOgogICAgICAgICAgICAgcmFpc2Ug VmFsdWVFcnJvcigiRXhwZWN0ZWQgJ2FyZ3VtZW50JyB0byBiZSBhIHN0cmluZywgbm90ICd7fSci LmZvcm1hdCh0eXBlKGFyZ3VtZW50KSkpCiAK 443091 2021-11-02 08:22:53 -0700 2021-11-04 08:06:52 -0700 Patch bug-232574-20211102082252.patch text/plain 7489 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MTU4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTAwMTE3NWY2NWQxYWE0NjY4ZmM2ZTQxN2QzMzQzOTg5 OGRkZWM4ZS4uMjgxZmZkYTg3Y2JjZDIxMjBiMTNmYTk0NjNjMmMxODc0Yzc0NDUzYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDIxLTExLTAyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIFJlZHVjZSBhdXRvaW5zdGFsbHMgb24gaW1wb3J0CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI1NzQKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzg0ODk0Mjc1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl YmtpdHNjbXB5L19faW5pdF9fLnB5OiBSZW1vdmUgd2hpY2hjcmFmdCAod2Via2l0Y29yZXB5IHJl Z2lzdGVycyBpdCkuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvbG9jYWwvZ2l0LnB5OiBSZW1vdmUgdW51c2VkIHdlYmtpdHNjbXB5IGltcG9ydHMu CisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9j YWwvc2NtLnB5OiBSZW1vdGUgdW51c2VkIHdlYmtpdGNvcmVweSBpbXBvcnQuCisgICAgICAgICog U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9jb21tYW5k LnB5OiBNb3ZlIHdoaWNoY3JhZnQgdG8gZnVuY3Rpb24uCisgICAgICAgICogU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9zZXR1cC5weTogTW92ZSBqaW5q YTIgdG8gZnVuY3Rpb24uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvcmVtb3RlL3N2bi5weTogTW92ZSBmYXN0ZW5lcnMsIHhtbHRvZGljdCBpbXBv cnQgdG8gZnVuY3Rpb25zLgorCiAyMDIxLTExLTAyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJk QGFwcGxlLmNvbT4KIAogICAgICAgICBbd2Via2l0c2NtcHldIEdlbmVyYWxpemUgcHVsbC1yZXF1 ZXN0IHRpdGxlIGdlbmVyYXRpb24uCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weSBiL1Rvb2xzL1NjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CmluZGV4IGIyYzY0NTRj YWM5YThhZmNmZTE2ZTY2YzQ1OGUwMjRiZTYxODFlY2YuLmM5NzE2MDA4M2U3NDE5NjQ2NmE1MDQ1 NjFiZmQ0MmZmNmJlMTUzZmEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CkBAIC01MSw3ICs1MSw2 IEBAIHZlcnNpb24gPSBWZXJzaW9uKDIsIDIsIDIzKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFj a2FnZSgnZmFzdGVuZXJzJywgVmVyc2lvbigwLCAxNSwgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0 ZXIoUGFja2FnZSgnamluamEyJywgVmVyc2lvbigyLCAxMSwgMykpKQogQXV0b0luc3RhbGwucmVn aXN0ZXIoUGFja2FnZSgnbW9ub3RvbmljJywgVmVyc2lvbigxLCA1KSkpCi1BdXRvSW5zdGFsbC5y ZWdpc3RlcihQYWNrYWdlKCd3aGljaGNyYWZ0JywgVmVyc2lvbigwLCA2LCAxKSkpCiBBdXRvSW5z dGFsbC5yZWdpc3RlcihQYWNrYWdlKCd4bWx0b2RpY3QnLCBWZXJzaW9uKDAsIDExLCAwKSkpCiBB dXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdtYXJrdXBzYWZlJywgVmVyc2lvbigxLCAxLCAx KSwgcHlwaV9uYW1lPSdNYXJrdXBTYWZlJykpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weSBiL1Rvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weQppbmRl eCA3M2E1OWM4ZWM4YWE1YzJhNDQxMjRjMTk5NTY2YmFlNjU0MGU0MDNlLi5jMmZhYjJjNWNiOGI3 ZWEzNjEwNmUxYTFkOTIyMGJlOTJmYWE5YTFjIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkKKysrIGIvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5CkBA IC0zNSw3ICszNSw3IEBAIGZyb20gY29sbGVjdGlvbnMgaW1wb3J0IGRlZmF1bHRkaWN0CiAKIGZy b20gd2Via2l0Y29yZXB5IGltcG9ydCBydW4sIGRlY29yYXRvcnMsIE5lc3RlZEZ1enp5RGljdAog ZnJvbSB3ZWJraXRzY21weS5sb2NhbCBpbXBvcnQgU2NtCi1mcm9tIHdlYmtpdHNjbXB5IGltcG9y dCByZW1vdGUsIENvbW1pdCwgQ29udHJpYnV0b3IsIGxvZworZnJvbSB3ZWJraXRzY21weSBpbXBv cnQgcmVtb3RlCiBmcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBDb21taXQsIENvbnRyaWJ1dG9yLCBs b2cKIAogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS9sb2NhbC9zY20ucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS9sb2NhbC9zY20ucHkKaW5kZXggMDA4ZTQzZWFjZGU3MThlN2FmODQz OWU2YTI2YzA4MmIzMTU4ZGMzMC4uYTY3Y2M5NDc2OWFlYjJhNTgxMzBkYTQxN2M3NjQyYmFjZmRl MGQxNiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvbG9jYWwvc2NtLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3NjbS5weQpAQCAtMjUsNyArMjUsNiBAQCBpbXBvcnQg b3MKIGltcG9ydCByZQogaW1wb3J0IHNpeAogCi1mcm9tIHdlYmtpdGNvcmVweSBpbXBvcnQgcnVu CiBmcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBTY21CYXNlLCBDb250cmlidXRvcgogCiAKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3By b2dyYW0vY29tbWFuZC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl YmtpdHNjbXB5L3Byb2dyYW0vY29tbWFuZC5weQppbmRleCBjY2E1ZTIzNzZjZjZjYzIwMDY5OGVi YWM4MDE3NjgxMTY5MjkyZTY5Li5lNTRkMzBlNGI2OGJmYjhlNjRlZWM1ZDI1Njc1MTcyOWM1ZGEx OGUzIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJr aXRzY21weS9wcm9ncmFtL2NvbW1hbmQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9jb21tYW5kLnB5CkBAIC0yOSw3ICsyOSw2 IEBAIGltcG9ydCB0aW1lCiAKIGZyb20gd2Via2l0Y29yZXB5IGltcG9ydCBUZXJtaW5hbAogZnJv bSB3ZWJraXRzY21weS5jb21taXQgaW1wb3J0IENvbW1pdAotZnJvbSB3aGljaGNyYWZ0IGltcG9y dCB3aGljaAogCiAKIGNsYXNzIENvbW1hbmQob2JqZWN0KToKQEAgLTEwNCw2ICsxMDMsOCBAQCBj bGFzcyBGaWx0ZXJlZENvbW1hbmQoQ29tbWFuZCk6CiAKICAgICBAY2xhc3NtZXRob2QKICAgICBk ZWYgcGFnZXIoY2xzLCBhcmdzLCByZXBvc2l0b3J5LCBmaWxlPU5vbmUsICoqa3dhcmdzKToKKyAg ICAgICAgZnJvbSB3aGljaGNyYWZ0IGltcG9ydCB3aGljaAorCiAgICAgICAgIGlmIG5vdCByZXBv c2l0b3J5LnBhdGg6CiAgICAgICAgICAgICBzeXMuc3RkZXJyLndyaXRlKCJDYW5ub3QgcnVuICd7 fScgb24gcmVtb3RlIHJlcG9zaXRvcnlcbiIuZm9ybWF0KGNscy5uYW1lKSkKICAgICAgICAgICAg IHJldHVybiAxCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9wcm9ncmFtL3NldHVwLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9zZXR1cC5weQppbmRleCBlYjBmM2Q1ZTNi NzEzMzBjZmMxZmExNjQxYzExN2QzNjEyNGVlODk4Li5iNTgxNDQwOGMyMjVjMWYyY2E2M2RmNmZk Y2ZjMDYwYTllNjhjZWI1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS9wcm9ncmFtL3NldHVwLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vc2V0dXAucHkKQEAgLTI1 LDcgKzI1LDYgQEAgaW1wb3J0IHJlcXVlc3RzCiBpbXBvcnQgc3lzCiAKIGZyb20gLmNvbW1hbmQg aW1wb3J0IENvbW1hbmQKLWZyb20gamluamEyIGltcG9ydCBUZW1wbGF0ZQogZnJvbSByZXF1ZXN0 cy5hdXRoIGltcG9ydCBIVFRQQmFzaWNBdXRoCiBmcm9tIHdlYmtpdGNvcmVweSBpbXBvcnQgYXJn dW1lbnRzLCBydW4sIEVkaXRvciwgVGVybWluYWwKIGZyb20gd2Via2l0c2NtcHkgaW1wb3J0IGxv ZywgbG9jYWwsIHJlbW90ZQpAQCAtMTU1LDYgKzE1NCw3IEBAIGNsYXNzIFNldHVwKENvbW1hbmQp OgogICAgICAgICAgICAgICAgICAgICBjb250aW51ZQogICAgICAgICAgICAgICAgIGxvZy53YXJu aW5nKCdDb25maWd1cmluZyBhbmQgY29weWluZyBob29rIHt9Jy5mb3JtYXQoc291cmNlX3BhdGgp KQogICAgICAgICAgICAgICAgIHdpdGggb3Blbihzb3VyY2VfcGF0aCwgJ3InKSBhcyBmOgorICAg ICAgICAgICAgICAgICAgICBmcm9tIGppbmphMiBpbXBvcnQgVGVtcGxhdGUKICAgICAgICAgICAg ICAgICAgICAgY29udGVudHMgPSBUZW1wbGF0ZShmLnJlYWQoKSkucmVuZGVyKAogICAgICAgICAg ICAgICAgICAgICAgICAgZ2l0PWxvY2FsLkdpdC5leGVjdXRhYmxlKCksCiAgICAgICAgICAgICAg ICAgICAgICAgICBsb2NhdGlvbj1zb3VyY2VfcGF0aCwKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9zdm4ucHkgYi9Ub29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvc3ZuLnB5 CmluZGV4IDRkYjQwZmYwMzY4ZDMwNTk4NzlmNDIyODU2ZmQ2M2Y5NGZhNmI4OTUuLjJhZGIwNGM0 NGJkNzhjN2JkMGMxOGZhYzllMjYxMWNjMzcwMTBiNjcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9zdm4ucHkKKysrIGIv VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3N2 bi5weQpAQCAtMjIsMTMgKzIyLDExIEBACiAKIGltcG9ydCBiaXNlY3QKIGltcG9ydCBjYWxlbmRh cgotaW1wb3J0IGZhc3RlbmVycwogaW1wb3J0IGpzb24KIGltcG9ydCBvcwogaW1wb3J0IHJlCiBp bXBvcnQgcmVxdWVzdHMKIGltcG9ydCB0ZW1wZmlsZQotaW1wb3J0IHhtbHRvZGljdAogCiBmcm9t IGRhdGV0aW1lIGltcG9ydCBkYXRldGltZQogCkBAIC0xMDAsNiArOTgsOCBAQCBjbGFzcyBTdm4o U2NtKToKIAogICAgIEBkZWNvcmF0b3JzLk1lbW9pemUoY2FjaGVkPUZhbHNlKQogICAgIGRlZiBp bmZvKHNlbGYsIGJyYW5jaD1Ob25lLCByZXZpc2lvbj1Ob25lLCB0YWc9Tm9uZSk6CisgICAgICAg IGltcG9ydCB4bWx0b2RpY3QKKwogICAgICAgICBpZiB0YWcgYW5kIGJyYW5jaDoKICAgICAgICAg ICAgIHJhaXNlIFZhbHVlRXJyb3IoJ0Nhbm5vdCBzcGVjaWZ5IGJvdGggYnJhbmNoIGFuZCB0YWcn KQogICAgICAgICBpZiB0YWcgYW5kIHJldmlzaW9uOgpAQCAtMTYzLDYgKzE2Myw4IEBAIGNsYXNz IFN2bihTY20pOgogICAgICAgICByZXR1cm4gJ3RydW5rJwogCiAgICAgZGVmIGxpc3Qoc2VsZiwg Y2F0ZWdvcnkpOgorICAgICAgICBpbXBvcnQgeG1sdG9kaWN0CisKICAgICAgICAgcmV2aXNpb24g PSBzZWxmLl9sYXRlc3QoKQogICAgICAgICBpZiBub3QgcmV2aXNpb246CiAgICAgICAgICAgICBy ZXR1cm4gW10KQEAgLTIwMyw2ICsyMDUsNyBAQCBjbGFzcyBTdm4oU2NtKToKICAgICAgICAgcmV0 dXJuIHNlbGYubGlzdCgndGFncycpCiAKICAgICBkZWYgX2NhY2hlX2xvY2soc2VsZik6CisgICAg ICAgIGltcG9ydCBmYXN0ZW5lcnMKICAgICAgICAgcmV0dXJuIGZhc3RlbmVycy5JbnRlclByb2Nl c3NMb2NrKG9zLnBhdGguam9pbihvcy5wYXRoLmRpcm5hbWUoc2VsZi5fY2FjaGVfcGF0aCksICdj YWNoZS5sb2NrJykpCiAKICAgICBkZWYgX2NhY2hlX3JldmlzaW9ucyhzZWxmLCBicmFuY2g9Tm9u ZSk6CkBAIC0yODIsNiArMjg1LDggQEAgY2xhc3MgU3ZuKFNjbSk6CiAgICAgICAgIHJldHVybiBz ZWxmLl9tZXRhZGF0YV9jYWNoZVticmFuY2hdCiAKICAgICBkZWYgX2JyYW5jaF9mb3Ioc2VsZiwg cmV2aXNpb24pOgorICAgICAgICBpbXBvcnQgeG1sdG9kaWN0CisKICAgICAgICAgcmVzcG9uc2Ug PSByZXF1ZXN0cy5yZXF1ZXN0KAogICAgICAgICAgICAgbWV0aG9kPSdSRVBPUlQnLAogICAgICAg ICAgICAgdXJsPSd7fSFzdm4vcnZyL3t9Jy5mb3JtYXQoc2VsZi51cmwsIHJldmlzaW9uKSwKQEAg LTMzMiw2ICszMzcsOCBAQCBjbGFzcyBTdm4oU2NtKToKICAgICAgICAgcmV0dXJuIHNlbGYuX2Nv bW1pdF9jb3VudChyZXZpc2lvbj1zZWxmLl9tZXRhZGF0YV9jYWNoZVticmFuY2hdWzBdLCBicmFu Y2g9c2VsZi5kZWZhdWx0X2JyYW5jaCkKIAogICAgIGRlZiBjb21taXQoc2VsZiwgaGFzaD1Ob25l LCByZXZpc2lvbj1Ob25lLCBpZGVudGlmaWVyPU5vbmUsIGJyYW5jaD1Ob25lLCB0YWc9Tm9uZSwg aW5jbHVkZV9sb2c9VHJ1ZSwgaW5jbHVkZV9pZGVudGlmaWVyPVRydWUpOgorICAgICAgICBpbXBv cnQgeG1sdG9kaWN0CisKICAgICAgICAgaWYgaGFzaDoKICAgICAgICAgICAgIHJhaXNlIFZhbHVl RXJyb3IoJ1NWTiBkb2VzIG5vdCBzdXBwb3J0IEdpdCBoYXNoZXMnKQogCkBAIC00NTYsNiArNDYz LDggQEAgY2xhc3MgU3ZuKFNjbSk6CiAgICAgICAgICkKIAogICAgIGRlZiBfYXJnc19mcm9tX2Nv bnRlbnQoc2VsZiwgY29udGVudCwgaW5jbHVkZV9sb2c9VHJ1ZSk6CisgICAgICAgIGltcG9ydCB4 bWx0b2RpY3QKKwogICAgICAgICB4bWwgPSB4bWx0b2RpY3QucGFyc2UoY29udGVudCkKICAgICAg ICAgZGF0ZSA9IGRhdGV0aW1lLnN0cnB0aW1lKHN0cmluZ191dGlscy5kZWNvZGUoeG1sWydTOmxv Zy1pdGVtJ11bJ1M6ZGF0ZSddKS5zcGxpdCgnLicpWzBdLCAnJVktJW0tJWRUJUg6JU06JVMnKQog ICAgICAgICBuYW1lID0gc3RyaW5nX3V0aWxzLmRlY29kZSh4bWxbJ1M6bG9nLWl0ZW0nXVsnRDpj cmVhdG9yLWRpc3BsYXluYW1lJ10pCg==