203762 2019-11-01 14:42:57 -0700 Python 3: Add support in webkitpy.style 2019-11-14 16:18:19 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=203761 https://bugs.webkit.org/show_bug.cgi?id=184986 https://bugs.webkit.org/show_bug.cgi?id=204133 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain commit-queue ews-watchlist glenn slewis webkit-bug-importer oldest_to_newest 1586573 0 jbedard 2019-11-01 14:42:57 -0700 Our style checker should support Python 3. 1590253 1 383556 jbedard 2019-11-14 08:11:12 -0800 Created attachment 383556 Patch 1590278 2 383561 jbedard 2019-11-14 11:12:09 -0800 Created attachment 383561 Patch 1590279 3 jbedard 2019-11-14 11:13:52 -0800 This patch lets us run check-webkit-style with Python 3, via: python3 Tools/Scripts/check-webkit-style Not changing the shebang, but on systems where python maps to Python 3, check-webkit-style should work once this lands. 1590358 4 383561 commit-queue 2019-11-14 16:17:04 -0800 Comment on attachment 383561 Patch Clearing flags on attachment: 383561 Committed r252468: <https://trac.webkit.org/changeset/252468> 1590359 5 commit-queue 2019-11-14 16:17:06 -0800 All reviewed patches have been landed. Closing bug. 1590360 6 webkit-bug-importer 2019-11-14 16:18:19 -0800 <rdar://problem/57209242> 383556 2019-11-14 08:11:12 -0800 2019-11-14 11:12:07 -0800 Patch bug-203762-20191114081109.patch text/plain 13628 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MjQ1NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI2IEBACisyMDE5LTExLTE0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBQeXRob24gMzogQWRkIHN1cHBvcnQgaW4gd2Via2l0cHkuc3R5bGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzc2MgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdvcmsgaW4gcHJv Z3Jlc3MuCisKKyAgICAgICAgKiBTY3JpcHRzL2NoZWNrLXdlYmtpdC1zdHlsZToKKyAgICAgICAg KiBTY3JpcHRzL3Rlc3Qtd2Via2l0cHktcHl0aG9uMzoKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L3N0eWxlL2NoZWNrZXIucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9j aGVja2VyX3VuaXR0ZXN0LnB5OgorICAgICAgICAoR2xvYmFsVmFyaWFibGVzVGVzdC50ZXN0X21h eF9yZXBvcnRzX3Blcl9jYXRlZ29yeSk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHls ZS9jaGVja2Vycy9jb250cmlidXRvcnMucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9z dHlsZS9jaGVja2Vycy90ZXN0X2V4cGVjdGF0aW9ucy5weToKKyAgICAgICAgKFRlc3RFeHBlY3Rh dGlvbnNDaGVja2VyLl9zaG91bGRfbG9nX2xpbnRlcl93YXJuaW5nKToKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L3N0eWxlL2Vycm9yX2hhbmRsZXJzX3VuaXR0ZXN0LnB5OgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvZmlsdGVyX3VuaXR0ZXN0LnB5OgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvc3R5bGUvbWFpbl91bml0dGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3N0eWxlL3BhdGNocmVhZGVyLnB5OgorICAgICAgICAoUGF0Y2hSZWFkZXIuY2hl Y2spOgorCiAyMDE5LTExLTE0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4K IAogICAgICAgICB3ZWJraXRweTogQ2xhcmlmeSB3ZWJraXRweS9zdHlsZS9vcHRwYXJzZXJfdW5p dHRlc3QucHkgYnkgcmVtb3ZpbmcgcGFyc2UgdmFyaWFibGVzCkluZGV4OiBUb29scy9TY3JpcHRz L2NoZWNrLXdlYmtpdC1zdHlsZQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2NoZWNrLXdl YmtpdC1zdHlsZQkocmV2aXNpb24gMjUyNDU2KQorKysgVG9vbHMvU2NyaXB0cy9jaGVjay13ZWJr aXQtc3R5bGUJKHdvcmtpbmcgY29weSkKQEAgLTM5LDggKzM5LDYgQEAgZmluZCBpcyBsZWdpdGlt YXRlbHkgYSBwcm9ibGVtLiIiIgogCiBpbXBvcnQgc3lzCiAKLWltcG9ydCB3ZWJraXRweS5jb21t b24udmVyc2lvbl9jaGVjawotCiBmcm9tIHdlYmtpdHB5LnN0eWxlLm1haW4gaW1wb3J0IENoZWNr V2ViS2l0U3R5bGUKIAogCkluZGV4OiBUb29scy9TY3JpcHRzL3Rlc3Qtd2Via2l0cHktcHl0aG9u Mwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3Rlc3Qtd2Via2l0cHktcHl0aG9uMwkocmV2 aXNpb24gMjUyNDU2KQorKysgVG9vbHMvU2NyaXB0cy90ZXN0LXdlYmtpdHB5LXB5dGhvbjMJKHdv cmtpbmcgY29weSkKQEAgLTM5LDcgKzM5LDcgQEAgUFlUSE9OM19DT01QQVRJQkxFX0RJUkVDVE9S SUVTID0gWwogICAnd2Via2l0cHkubGF5b3V0X3Rlc3RzLm1vZGVscycsCiAgICd3ZWJraXRweS5w b3J0JywKICAgJ3dlYmtpdHB5LnJlc3VsdHMnLAotICAnd2Via2l0cHkuc3R5bGUuY2hlY2tlcnMn LAorICAnd2Via2l0cHkuc3R5bGUnLAogICAnd2Via2l0cHkueGNvZGUnLAogXQogU0xPV19URVNU UyA9IFsKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXIucHkJKHJldmlz aW9uIDI1MjQ1NikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weQko d29ya2luZyBjb3B5KQpAQCAtMzUsMzUgKzM1LDM1IEBAIGltcG9ydCBsb2dnaW5nCiBpbXBvcnQg b3MucGF0aAogaW1wb3J0IHJlCiAKLWZyb20gY2hlY2tlcnMuY29tbW9uIGltcG9ydCBjYXRlZ29y aWVzIGFzIENvbW1vbkNhdGVnb3JpZXMKLWZyb20gY2hlY2tlcnMuY29tbW9uIGltcG9ydCBDYXJy aWFnZVJldHVybkNoZWNrZXIKLWZyb20gY2hlY2tlcnMuY29udHJpYnV0b3JzIGltcG9ydCBDb250 cmlidXRvcnNDaGVja2VyCi1mcm9tIGNoZWNrZXJzLmNoYW5nZWxvZyBpbXBvcnQgQ2hhbmdlTG9n Q2hlY2tlcgotZnJvbSBjaGVja2Vycy5jcHAgaW1wb3J0IENwcENoZWNrZXIKLWZyb20gY2hlY2tl cnMuY21ha2UgaW1wb3J0IENNYWtlQ2hlY2tlcgotZnJvbSBjaGVja2Vycy5mZWF0dXJlZGVmaW5l cyBpbXBvcnQgRmVhdHVyZURlZmluZXNDaGVja2VyCi1mcm9tIGNoZWNrZXJzLmpzIGltcG9ydCBK U0NoZWNrZXIKLWZyb20gY2hlY2tlcnMuanNvbmNoZWNrZXIgaW1wb3J0IEpTT05DaGVja2VyCi1m cm9tIGNoZWNrZXJzLmpzb25jaGVja2VyIGltcG9ydCBKU09OQ29udHJpYnV0b3JzQ2hlY2tlcgot ZnJvbSBjaGVja2Vycy5qc29uY2hlY2tlciBpbXBvcnQgSlNPTkZlYXR1cmVzQ2hlY2tlcgotZnJv bSBjaGVja2Vycy5qc29uY2hlY2tlciBpbXBvcnQgSlNPTkNTU1Byb3BlcnRpZXNDaGVja2VyCi1m cm9tIGNoZWNrZXJzLmpzdGVzdCBpbXBvcnQgSlNUZXN0Q2hlY2tlcgotZnJvbSBjaGVja2Vycy5t ZXNzYWdlc2luIGltcG9ydCBNZXNzYWdlc0luQ2hlY2tlcgotZnJvbSBjaGVja2Vycy5wbmcgaW1w b3J0IFBOR0NoZWNrZXIKLWZyb20gY2hlY2tlcnMucHl0aG9uIGltcG9ydCBQeXRob25DaGVja2Vy LCBQeXRob24zQ2hlY2tlcgotZnJvbSBjaGVja2Vycy5zZGt2YXJpYW50IGltcG9ydCBTREtWYXJp YW50Q2hlY2tlcgotZnJvbSBjaGVja2Vycy50ZXN0X2V4cGVjdGF0aW9ucyBpbXBvcnQgVGVzdEV4 cGVjdGF0aW9uc0NoZWNrZXIKLWZyb20gY2hlY2tlcnMudGV4dCBpbXBvcnQgVGV4dENoZWNrZXIK LWZyb20gY2hlY2tlcnMud2F0Y2hsaXN0IGltcG9ydCBXYXRjaExpc3RDaGVja2VyCi1mcm9tIGNo ZWNrZXJzLnhjb2RlcHJvaiBpbXBvcnQgWGNvZGVQcm9qZWN0RmlsZUNoZWNrZXIKLWZyb20gY2hl Y2tlcnMueG1sIGltcG9ydCBYTUxDaGVja2VyCi1mcm9tIGVycm9yX2hhbmRsZXJzIGltcG9ydCBE ZWZhdWx0U3R5bGVFcnJvckhhbmRsZXIKLWZyb20gZmlsdGVyIGltcG9ydCBGaWx0ZXJDb25maWd1 cmF0aW9uCi1mcm9tIG9wdHBhcnNlciBpbXBvcnQgQXJndW1lbnRQYXJzZXIKLWZyb20gb3B0cGFy c2VyIGltcG9ydCBEZWZhdWx0Q29tbWFuZE9wdGlvblZhbHVlcwogZnJvbSB3ZWJraXRweS5jb21t b24uaG9zdCBpbXBvcnQgSG9zdAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmxvZ3V0aWxz IGltcG9ydCBjb25maWd1cmVfbG9nZ2luZyBhcyBfY29uZmlndXJlX2xvZ2dpbmcKIGZyb20gd2Vi a2l0cHkucG9ydC5jb25maWcgaW1wb3J0IGFwcGxlX2FkZGl0aW9ucworZnJvbSB3ZWJraXRweS5z dHlsZS5jaGVja2Vycy5jb21tb24gaW1wb3J0IGNhdGVnb3JpZXMgYXMgQ29tbW9uQ2F0ZWdvcmll cworZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2Vycy5jb21tb24gaW1wb3J0IENhcnJpYWdlUmV0 dXJuQ2hlY2tlcgorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2Vycy5jb250cmlidXRvcnMgaW1w b3J0IENvbnRyaWJ1dG9yc0NoZWNrZXIKK2Zyb20gd2Via2l0cHkuc3R5bGUuY2hlY2tlcnMuY2hh bmdlbG9nIGltcG9ydCBDaGFuZ2VMb2dDaGVja2VyCitmcm9tIHdlYmtpdHB5LnN0eWxlLmNoZWNr ZXJzLmNwcCBpbXBvcnQgQ3BwQ2hlY2tlcgorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2Vycy5j bWFrZSBpbXBvcnQgQ01ha2VDaGVja2VyCitmcm9tIHdlYmtpdHB5LnN0eWxlLmNoZWNrZXJzLmZl YXR1cmVkZWZpbmVzIGltcG9ydCBGZWF0dXJlRGVmaW5lc0NoZWNrZXIKK2Zyb20gd2Via2l0cHku c3R5bGUuY2hlY2tlcnMuanMgaW1wb3J0IEpTQ2hlY2tlcgorZnJvbSB3ZWJraXRweS5zdHlsZS5j aGVja2Vycy5qc29uY2hlY2tlciBpbXBvcnQgSlNPTkNoZWNrZXIKK2Zyb20gd2Via2l0cHkuc3R5 bGUuY2hlY2tlcnMuanNvbmNoZWNrZXIgaW1wb3J0IEpTT05Db250cmlidXRvcnNDaGVja2VyCitm cm9tIHdlYmtpdHB5LnN0eWxlLmNoZWNrZXJzLmpzb25jaGVja2VyIGltcG9ydCBKU09ORmVhdHVy ZXNDaGVja2VyCitmcm9tIHdlYmtpdHB5LnN0eWxlLmNoZWNrZXJzLmpzb25jaGVja2VyIGltcG9y dCBKU09OQ1NTUHJvcGVydGllc0NoZWNrZXIKK2Zyb20gd2Via2l0cHkuc3R5bGUuY2hlY2tlcnMu anN0ZXN0IGltcG9ydCBKU1Rlc3RDaGVja2VyCitmcm9tIHdlYmtpdHB5LnN0eWxlLmNoZWNrZXJz Lm1lc3NhZ2VzaW4gaW1wb3J0IE1lc3NhZ2VzSW5DaGVja2VyCitmcm9tIHdlYmtpdHB5LnN0eWxl LmNoZWNrZXJzLnBuZyBpbXBvcnQgUE5HQ2hlY2tlcgorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVj a2Vycy5weXRob24gaW1wb3J0IFB5dGhvbkNoZWNrZXIsIFB5dGhvbjNDaGVja2VyCitmcm9tIHdl YmtpdHB5LnN0eWxlLmNoZWNrZXJzLnNka3ZhcmlhbnQgaW1wb3J0IFNES1ZhcmlhbnRDaGVja2Vy Citmcm9tIHdlYmtpdHB5LnN0eWxlLmNoZWNrZXJzLnRlc3RfZXhwZWN0YXRpb25zIGltcG9ydCBU ZXN0RXhwZWN0YXRpb25zQ2hlY2tlcgorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2Vycy50ZXh0 IGltcG9ydCBUZXh0Q2hlY2tlcgorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2Vycy53YXRjaGxp c3QgaW1wb3J0IFdhdGNoTGlzdENoZWNrZXIKK2Zyb20gd2Via2l0cHkuc3R5bGUuY2hlY2tlcnMu eGNvZGVwcm9qIGltcG9ydCBYY29kZVByb2plY3RGaWxlQ2hlY2tlcgorZnJvbSB3ZWJraXRweS5z dHlsZS5jaGVja2Vycy54bWwgaW1wb3J0IFhNTENoZWNrZXIKK2Zyb20gd2Via2l0cHkuc3R5bGUu ZXJyb3JfaGFuZGxlcnMgaW1wb3J0IERlZmF1bHRTdHlsZUVycm9ySGFuZGxlcgorZnJvbSB3ZWJr aXRweS5zdHlsZS5maWx0ZXIgaW1wb3J0IEZpbHRlckNvbmZpZ3VyYXRpb24KK2Zyb20gd2Via2l0 cHkuc3R5bGUub3B0cGFyc2VyIGltcG9ydCBBcmd1bWVudFBhcnNlcgorZnJvbSB3ZWJraXRweS5z dHlsZS5vcHRwYXJzZXIgaW1wb3J0IERlZmF1bHRDb21tYW5kT3B0aW9uVmFsdWVzCiAKIAogX2xv ZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9zdHlsZS9jaGVja2VyX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcl91bml0dGVzdC5weQkocmV2aXNpb24gMjUyNDU2KQor KysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyX3VuaXR0ZXN0LnB5CSh3b3Jr aW5nIGNvcHkpCkBAIC0zNywzMyArMzcsMzIgQEAgaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCBvcwog aW1wb3J0IHVuaXR0ZXN0CiAKLWltcG9ydCBjaGVja2VyIGFzIHN0eWxlCi1mcm9tIHdlYmtpdHB5 LmNvbW1vbi5zeXN0ZW0ubG9ndGVzdGluZyBpbXBvcnQgTG9nVGVzdGluZywgVGVzdExvZ1N0cmVh bQotZnJvbSBjaGVja2VyIGltcG9ydCBfQkFTRV9GSUxURVJfUlVMRVMKLWZyb20gY2hlY2tlciBp bXBvcnQgX01BWF9SRVBPUlRTX1BFUl9DQVRFR09SWQotZnJvbSBjaGVja2VyIGltcG9ydCBfUEFU SF9SVUxFU19TUEVDSUZJRVIgYXMgUEFUSF9SVUxFU19TUEVDSUZJRVIKLWZyb20gY2hlY2tlciBp bXBvcnQgX2FsbF9jYXRlZ29yaWVzCi1mcm9tIGNoZWNrZXIgaW1wb3J0IGNoZWNrX3dlYmtpdF9z dHlsZV9jb25maWd1cmF0aW9uCi1mcm9tIGNoZWNrZXIgaW1wb3J0IGNoZWNrX3dlYmtpdF9zdHls ZV9wYXJzZXIKLWZyb20gY2hlY2tlciBpbXBvcnQgY29uZmlndXJlX2xvZ2dpbmcKLWZyb20gY2hl Y2tlciBpbXBvcnQgQ2hlY2tlckRpc3BhdGNoZXIKLWZyb20gY2hlY2tlciBpbXBvcnQgUHJvY2Vz c29yQmFzZQotZnJvbSBjaGVja2VyIGltcG9ydCBTdHlsZVByb2Nlc3NvcgotZnJvbSBjaGVja2Vy IGltcG9ydCBTdHlsZVByb2Nlc3NvckNvbmZpZ3VyYXRpb24KLWZyb20gY2hlY2tlcnMuY2hhbmdl bG9nIGltcG9ydCBDaGFuZ2VMb2dDaGVja2VyCi1mcm9tIGNoZWNrZXJzLmNwcCBpbXBvcnQgQ3Bw Q2hlY2tlcgotZnJvbSBjaGVja2Vycy5qcyBpbXBvcnQgSlNDaGVja2VyCi1mcm9tIGNoZWNrZXJz Lmpzb25jaGVja2VyIGltcG9ydCBKU09OQ2hlY2tlcgotZnJvbSBjaGVja2Vycy5weXRob24gaW1w b3J0IFB5dGhvbkNoZWNrZXIKLWZyb20gY2hlY2tlcnMudGV4dCBpbXBvcnQgVGV4dENoZWNrZXIK LWZyb20gY2hlY2tlcnMueG1sIGltcG9ydCBYTUxDaGVja2VyCi1mcm9tIGVycm9yX2hhbmRsZXJz IGltcG9ydCBEZWZhdWx0U3R5bGVFcnJvckhhbmRsZXIKLWZyb20gZmlsdGVyIGltcG9ydCB2YWxp ZGF0ZV9maWx0ZXJfcnVsZXMKLWZyb20gZmlsdGVyIGltcG9ydCBGaWx0ZXJDb25maWd1cmF0aW9u Ci1mcm9tIG9wdHBhcnNlciBpbXBvcnQgQXJndW1lbnRQYXJzZXIKLWZyb20gb3B0cGFyc2VyIGlt cG9ydCBDb21tYW5kT3B0aW9uVmFsdWVzCi1mcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0ubG9n dGVzdGluZyBpbXBvcnQgTG9nZ2luZ1Rlc3RDYXNlCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0 ZW0ubG9ndGVzdGluZyBpbXBvcnQgTG9nVGVzdGluZywgVGVzdExvZ1N0cmVhbSwgTG9nZ2luZ1Rl c3RDYXNlCitmcm9tIHdlYmtpdHB5LnN0eWxlIGltcG9ydCBjaGVja2VyIGFzIHN0eWxlCitmcm9t IHdlYmtpdHB5LnN0eWxlLmNoZWNrZXIgaW1wb3J0IF9CQVNFX0ZJTFRFUl9SVUxFUworZnJvbSB3 ZWJraXRweS5zdHlsZS5jaGVja2VyIGltcG9ydCBfTUFYX1JFUE9SVFNfUEVSX0NBVEVHT1JZCitm cm9tIHdlYmtpdHB5LnN0eWxlLmNoZWNrZXIgaW1wb3J0IF9QQVRIX1JVTEVTX1NQRUNJRklFUiBh cyBQQVRIX1JVTEVTX1NQRUNJRklFUgorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2VyIGltcG9y dCBfYWxsX2NhdGVnb3JpZXMKK2Zyb20gd2Via2l0cHkuc3R5bGUuY2hlY2tlciBpbXBvcnQgY2hl Y2tfd2Via2l0X3N0eWxlX2NvbmZpZ3VyYXRpb24KK2Zyb20gd2Via2l0cHkuc3R5bGUuY2hlY2tl ciBpbXBvcnQgY2hlY2tfd2Via2l0X3N0eWxlX3BhcnNlcgorZnJvbSB3ZWJraXRweS5zdHlsZS5j aGVja2VyIGltcG9ydCBjb25maWd1cmVfbG9nZ2luZworZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVj a2VyIGltcG9ydCBDaGVja2VyRGlzcGF0Y2hlcgorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2Vy IGltcG9ydCBQcm9jZXNzb3JCYXNlCitmcm9tIHdlYmtpdHB5LnN0eWxlLmNoZWNrZXIgaW1wb3J0 IFN0eWxlUHJvY2Vzc29yCitmcm9tIHdlYmtpdHB5LnN0eWxlLmNoZWNrZXIgaW1wb3J0IFN0eWxl UHJvY2Vzc29yQ29uZmlndXJhdGlvbgorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2Vycy5jaGFu Z2Vsb2cgaW1wb3J0IENoYW5nZUxvZ0NoZWNrZXIKK2Zyb20gd2Via2l0cHkuc3R5bGUuY2hlY2tl cnMuY3BwIGltcG9ydCBDcHBDaGVja2VyCitmcm9tIHdlYmtpdHB5LnN0eWxlLmNoZWNrZXJzLmpz IGltcG9ydCBKU0NoZWNrZXIKK2Zyb20gd2Via2l0cHkuc3R5bGUuY2hlY2tlcnMuanNvbmNoZWNr ZXIgaW1wb3J0IEpTT05DaGVja2VyCitmcm9tIHdlYmtpdHB5LnN0eWxlLmNoZWNrZXJzLnB5dGhv biBpbXBvcnQgUHl0aG9uQ2hlY2tlcgorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2Vycy50ZXh0 IGltcG9ydCBUZXh0Q2hlY2tlcgorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2Vycy54bWwgaW1w b3J0IFhNTENoZWNrZXIKK2Zyb20gd2Via2l0cHkuc3R5bGUuZXJyb3JfaGFuZGxlcnMgaW1wb3J0 IERlZmF1bHRTdHlsZUVycm9ySGFuZGxlcgorZnJvbSB3ZWJraXRweS5zdHlsZS5vcHRwYXJzZXIg aW1wb3J0IENvbW1hbmRPcHRpb25WYWx1ZXMKIGZyb20gd2Via2l0cHkuc3R5bGUuZmlsZXJlYWRl ciBpbXBvcnQgVGV4dEZpbGVSZWFkZXIKK2Zyb20gd2Via2l0cHkuc3R5bGUuZmlsdGVyIGltcG9y dCB2YWxpZGF0ZV9maWx0ZXJfcnVsZXMKK2Zyb20gd2Via2l0cHkuc3R5bGUuZmlsdGVyIGltcG9y dCBGaWx0ZXJDb25maWd1cmF0aW9uCitmcm9tIHdlYmtpdHB5LnN0eWxlLm9wdHBhcnNlciBpbXBv cnQgQXJndW1lbnRQYXJzZXIKIAogCiBjbGFzcyBDb25maWd1cmVMb2dnaW5nVGVzdEJhc2UodW5p dHRlc3QuVGVzdENhc2UpOgpAQCAtMjYyLDcgKzI2MSw3IEBAIGNsYXNzIEdsb2JhbFZhcmlhYmxl c1Rlc3QodW5pdHRlc3QuVGVzdEMKICAgICBkZWYgdGVzdF9tYXhfcmVwb3J0c19wZXJfY2F0ZWdv cnkoc2VsZik6CiAgICAgICAgICIiIkNoZWNrIHRoYXQgX01BWF9SRVBPUlRTX1BFUl9DQVRFR09S WSBpcyB2YWxpZC4iIiIKICAgICAgICAgYWxsX2NhdGVnb3JpZXMgPSBzZWxmLl9hbGxfY2F0ZWdv cmllcygpCi0gICAgICAgIGZvciBjYXRlZ29yeSBpbiBfTUFYX1JFUE9SVFNfUEVSX0NBVEVHT1JZ Lml0ZXJrZXlzKCk6CisgICAgICAgIGZvciBjYXRlZ29yeSBpbiBfTUFYX1JFUE9SVFNfUEVSX0NB VEVHT1JZLmtleXMoKToKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0SW4oY2F0ZWdvcnksIGFsbF9j YXRlZ29yaWVzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAnS2V5ICIlcyIgaXMgbm90IGEg Y2F0ZWdvcnknICUgY2F0ZWdvcnkpCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5 bGUvZXJyb3JfaGFuZGxlcnNfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9zdHlsZS9lcnJvcl9oYW5kbGVyc191bml0dGVzdC5weQkocmV2aXNpb24gMjUy NDU2KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9lcnJvcl9oYW5kbGVyc191bml0 dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMjUsMTAgKzI1LDEwIEBACiAKIGltcG9ydCB1bml0 dGVzdAogCi1mcm9tIGNoZWNrZXIgaW1wb3J0IFN0eWxlUHJvY2Vzc29yQ29uZmlndXJhdGlvbgot ZnJvbSBlcnJvcl9oYW5kbGVycyBpbXBvcnQgRGVmYXVsdFN0eWxlRXJyb3JIYW5kbGVyCi1mcm9t IGZpbHRlciBpbXBvcnQgRmlsdGVyQ29uZmlndXJhdGlvbgogZnJvbSB3ZWJraXRweS5jb21tb24u c3lzdGVtLmxvZ3Rlc3RpbmcgaW1wb3J0IExvZ2dpbmdUZXN0Q2FzZQorZnJvbSB3ZWJraXRweS5z dHlsZS5jaGVja2VyIGltcG9ydCBTdHlsZVByb2Nlc3NvckNvbmZpZ3VyYXRpb24KK2Zyb20gd2Vi a2l0cHkuc3R5bGUuZXJyb3JfaGFuZGxlcnMgaW1wb3J0IERlZmF1bHRTdHlsZUVycm9ySGFuZGxl cgorZnJvbSB3ZWJraXRweS5zdHlsZS5maWx0ZXIgaW1wb3J0IEZpbHRlckNvbmZpZ3VyYXRpb24K IAogCiBjbGFzcyBEZWZhdWx0U3R5bGVFcnJvckhhbmRsZXJUZXN0KExvZ2dpbmdUZXN0Q2FzZSk6 CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2ZpbHRlcl91bml0dGVzdC5weQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2ZpbHRlcl91bml0dGVz dC5weQkocmV2aXNpb24gMjUyNDU2KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9m aWx0ZXJfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTI0LDkgKzI0LDkgQEAKIAogaW1w b3J0IHVuaXR0ZXN0CiAKLWZyb20gZmlsdGVyIGltcG9ydCBfQ2F0ZWdvcnlGaWx0ZXIgYXMgQ2F0 ZWdvcnlGaWx0ZXIKLWZyb20gZmlsdGVyIGltcG9ydCB2YWxpZGF0ZV9maWx0ZXJfcnVsZXMKLWZy b20gZmlsdGVyIGltcG9ydCBGaWx0ZXJDb25maWd1cmF0aW9uCitmcm9tIHdlYmtpdHB5LnN0eWxl LmZpbHRlciBpbXBvcnQgX0NhdGVnb3J5RmlsdGVyIGFzIENhdGVnb3J5RmlsdGVyCitmcm9tIHdl YmtpdHB5LnN0eWxlLmZpbHRlciBpbXBvcnQgdmFsaWRhdGVfZmlsdGVyX3J1bGVzCitmcm9tIHdl YmtpdHB5LnN0eWxlLmZpbHRlciBpbXBvcnQgRmlsdGVyQ29uZmlndXJhdGlvbgogCiAjIE9uIFRl c3RpbmcgX19lcV9fKCkgYW5kIF9fbmVfXygpOgogIwpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9zdHlsZS9tYWluX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvc3R5bGUvbWFpbl91bml0dGVzdC5weQkocmV2aXNpb24gMjUyNDU2KQorKysgVG9v bHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9tYWluX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkp CkBAIC0yNiwxMyArMjYsMTMgQEAgaW1wb3J0IHVuaXR0ZXN0CiAKIGltcG9ydCB3ZWJraXRweS5z dHlsZS5jaGVja2VyIGFzIGNoZWNrZXIKIAotZnJvbSBtYWluIGltcG9ydCBjaGFuZ2VfZGlyZWN0 b3J5CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5ob3N0IGltcG9ydCBIb3N0CiBmcm9tIHdlYmtpdHB5 LmNvbW1vbi5zeXN0ZW0uZmlsZXN5c3RlbV9tb2NrIGltcG9ydCBNb2NrRmlsZVN5c3RlbQogZnJv bSB3ZWJraXRweS5jb21tb24uc3lzdGVtLm91dHB1dGNhcHR1cmUgaW1wb3J0IE91dHB1dENhcHR1 cmUsIE91dHB1dENhcHR1cmVTY29wZQogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmxvZ3Rl c3RpbmcgaW1wb3J0IExvZ1Rlc3RpbmcKIGZyb20gd2Via2l0cHkuc3R5bGUuY2hlY2tlciBpbXBv cnQgU3R5bGVQcm9jZXNzb3IKIGZyb20gd2Via2l0cHkuc3R5bGUuZmlsZXJlYWRlciBpbXBvcnQg VGV4dEZpbGVSZWFkZXIKK2Zyb20gd2Via2l0cHkuc3R5bGUubWFpbiBpbXBvcnQgY2hhbmdlX2Rp cmVjdG9yeQogCiAKIGNsYXNzIENoYW5nZURpcmVjdG9yeVRlc3QodW5pdHRlc3QuVGVzdENhc2Up OgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9wYXRjaHJlYWRlci5weQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL3BhdGNocmVhZGVyLnB5CShy ZXZpc2lvbiAyNTI0NTYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL3BhdGNocmVh ZGVyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC02MCw3ICs2MCw3IEBAIGNsYXNzIFBhdGNoUmVhZGVy KG9iamVjdCk6CiAgICAgICAgICMgSWYgdGhlIHVzZXIgdXNlcyBnaXQsIGNoZWNraW5nIHN1YnZl cnNpb24gY29uZmlnIGZpbGUgb25seSBvbmNlIGlzIGVub3VnaC4KICAgICAgICAgY2FsbF9vbmx5 X29uY2UgPSBUcnVlCiAKLSAgICAgICAgZm9yIHBhdGgsIGRpZmZfZmlsZSBpbiBwYXRjaF9maWxl cy5pdGVyaXRlbXMoKToKKyAgICAgICAgZm9yIHBhdGgsIGRpZmZfZmlsZSBpbiBwYXRjaF9maWxl cy5pdGVtcygpOgogICAgICAgICAgICAgbGluZV9udW1iZXJzID0gZGlmZl9maWxlLmFkZGVkX29y X21vZGlmaWVkX2xpbmVfbnVtYmVycygpCiAgICAgICAgICAgICBfbG9nLmRlYnVnKCdGb3VuZCAl cyBuZXcgb3IgbW9kaWZpZWQgbGluZXMgaW46ICVzJyAlIChsZW4obGluZV9udW1iZXJzKSwgcGF0 aCkpCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY29udHJp YnV0b3JzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hl Y2tlcnMvY29udHJpYnV0b3JzLnB5CShyZXZpc2lvbiAyNTI0NTYpCisrKyBUb29scy9TY3JpcHRz L3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NvbnRyaWJ1dG9ycy5weQkod29ya2luZyBjb3B5KQpA QCAtMjUsNyArMjUsNiBAQAogaW1wb3J0IGRpZmZsaWIKIGltcG9ydCBqc29uCiBpbXBvcnQgcmUK LWZyb20gc2V0cyBpbXBvcnQgU2V0CiBmcm9tIHdlYmtpdHB5LnN0eWxlLmNoZWNrZXJzLmpzb25j aGVja2VyIGltcG9ydCBKU09OQ2hlY2tlcgogZnJvbSB3ZWJraXRweS5jb21tb24uY29uZmlnLmNv bW1pdHRlcnMgaW1wb3J0IENvbW1pdHRlckxpc3QKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3Rl bS5maWxlc3lzdGVtIGltcG9ydCBGaWxlU3lzdGVtCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtp dHB5L3N0eWxlL2NoZWNrZXJzL3Rlc3RfZXhwZWN0YXRpb25zLnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvdGVzdF9leHBlY3RhdGlvbnMucHkJ KHJldmlzaW9uIDI1MjQ1NikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tl cnMvdGVzdF9leHBlY3RhdGlvbnMucHkJKHdvcmtpbmcgY29weSkKQEAgLTM1LDYgKzM1LDcgQEAg aW1wb3J0IHJlCiBpbXBvcnQgc3lzCiAKIGZyb20gd2Via2l0cHkuY29tbW9uLmhvc3QgaW1wb3J0 IEhvc3QKK2Zyb20gd2Via2l0cHkuY29tbW9uLml0ZXJhdGlvbl9jb21wYXRpYmlsaXR5IGltcG9y dCBpdGVyaXRlbXMKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLm1vZGVscyBpbXBvcnQgdGVz dF9leHBlY3RhdGlvbnMKIGZyb20gd2Via2l0cHkuc3R5bGUuY2hlY2tlcnMuY29tbW9uIGltcG9y dCBUYWJDaGVja2VyCiBmcm9tIHdlYmtpdHB5LnN0eWxlLmVycm9yX2hhbmRsZXJzIGltcG9ydCBE ZWZhdWx0U3R5bGVFcnJvckhhbmRsZXIKQEAgLTEwNiw3ICsxMDcsNyBAQCBjbGFzcyBUZXN0RXhw ZWN0YXRpb25zQ2hlY2tlcihvYmplY3QpOgogICAgICAgICBpZiBhYnNfZmlsZW5hbWUgaW4gZmls ZXMgYW5kIGZpbGVzW2Fic19maWxlbmFtZV0gYW5kIHdhcm5pbmcubGluZV9udW1iZXIgaW4gZmls ZXNbYWJzX2ZpbGVuYW1lXToKICAgICAgICAgICAgIHJldHVybiBUcnVlCiAKLSAgICAgICAgZm9y IGZpbGUsIGxpbmVzIGluIHdhcm5pbmcucmVsYXRlZF9maWxlcy5pdGVyaXRlbXMoKToKKyAgICAg ICAgZm9yIGZpbGUsIGxpbmVzIGluIGl0ZXJpdGVtcyh3YXJuaW5nLnJlbGF0ZWRfZmlsZXMpOgog ICAgICAgICAgICAgYWJzX2ZpbGVuYW1lID0gaG9zdC5maWxlc3lzdGVtLmpvaW4oY3dkLCBmaWxl KQogICAgICAgICAgICAgaWYgYWJzX2ZpbGVuYW1lIGluIGZpbGVzOgogICAgICAgICAgICAgICAg ICMgQ2FzZSAyLCBhIGZpbGUgYXNzb2NpYXRlZCB3aXRoIHRoZSB3YXJuaW5nIGlzIGluIG91ciBw YXRjaAo= 383561 2019-11-14 11:12:09 -0800 2019-11-14 16:17:04 -0800 Patch bug-203762-20191114111208.patch text/plain 16718 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MjQ1OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMwIEBACisyMDE5LTExLTE0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBQeXRob24gMzogQWRkIHN1cHBvcnQgaW4gd2Via2l0cHkuc3R5bGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzc2MgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9j aGVjay13ZWJraXQtc3R5bGU6IFJlbW92ZSBQeXRob24gMiB2ZXJzaW9uIGNoZWNrLgorICAgICAg ICAqIFNjcmlwdHMvdGVzdC13ZWJraXRweS1weXRob24zOiBBZGQgd2Via2l0cHkuc3R5bGUuCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyLnB5OiBVc2UgZXhwbGljaXQg aW1wb3J0cy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJfdW5pdHRl c3QucHk6CisgICAgICAgIChHbG9iYWxWYXJpYWJsZXNUZXN0LnRlc3RfbWF4X3JlcG9ydHNfcGVy X2NhdGVnb3J5KTogVXNlIGtleXMoKSBvdmVyIGl0ZXJrZXlzLgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY29udHJpYnV0b3JzLnB5OiBVc2UgZXhwbGljaXQgaW1w b3J0cy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rlc3RfZXhw ZWN0YXRpb25zLnB5OgorICAgICAgICAoVGVzdEV4cGVjdGF0aW9uc0NoZWNrZXIuX3Nob3VsZF9s b2dfbGludGVyX3dhcm5pbmcpOiBVc2UgY29tcGF0aWJsZSBpdGVyaXRlbXMuCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9zdHlsZS9lcnJvcl9oYW5kbGVyc191bml0dGVzdC5weTogVXNlIGV4 cGxpY2l0IGltcG9ydHMuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9maWx0ZXIu cHk6CisgICAgICAgIChGaWx0ZXJDb25maWd1cmF0aW9uLl9nZXRfcGF0aF9zcGVjaWZpY19sb3dl cik6IFJldHVybiBsaXN0IGluc3RlYWQgb2YgaXRlcmF0b3IuCisgICAgICAgIChGaWx0ZXJDb25m aWd1cmF0aW9uLl9maWx0ZXJfZnJvbV9wYXRoKTogQXZvaWQgY29uZnVzaW9uIHdpdGggZmlsdGVy IGJ1aWx0aW4uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9maWx0ZXJfdW5pdHRl c3QucHk6IFVzZSBleHBsaWNpdCBpbXBvcnRzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv c3R5bGUvbWFpbi5weToKKyAgICAgICAgKENoZWNrV2ViS2l0U3R5bGUuX2VuZ2FnZV9hd2Vzb21l X3N0ZGVycl9oYWNrcyk6IE5vIHJlYXNvbiB0byBhcHBseSBlbmNvZGluZyB0byBzdGRlcnIKKyAg ICAgICAgaW4gUHl0aG9uIDMuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9tYWlu X3VuaXR0ZXN0LnB5OiBVc2UgZXhwbGljaXQgaW1wb3J0cy4KKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3N0eWxlL3BhdGNocmVhZGVyLnB5OgorICAgICAgICAoUGF0Y2hSZWFkZXIuY2hlY2sp OiBFbnN1cmUgdGhhdCB0aGUgcHJvdmlkZWQgcGF0Y2ggaXMgYSBzdHJpbmcsIHVzZSBpdGVtcyBv dmVyIGl0ZXJpdGVtcy4KKwogMjAxOS0xMS0xNCAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBs ZS5jb20+CiAKICAgICAgICAgU3VtbWFyeTogV0tXZWJWaWV3IGlzIG1pc3NpbmcgYW4gZXF1aXZh bGVudCB0byBXZWJLaXQgMSdzIEFQSSB0byBzZXQgdGhlIG1lZGlhIHN0eWxlLgpJbmRleDogVG9v bHMvU2NyaXB0cy9jaGVjay13ZWJraXQtc3R5bGUKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0 cy9jaGVjay13ZWJraXQtc3R5bGUJKHJldmlzaW9uIDI1MjQ1NikKKysrIFRvb2xzL1NjcmlwdHMv Y2hlY2std2Via2l0LXN0eWxlCSh3b3JraW5nIGNvcHkpCkBAIC0zOSw4ICszOSw2IEBAIGZpbmQg aXMgbGVnaXRpbWF0ZWx5IGEgcHJvYmxlbS4iIiIKIAogaW1wb3J0IHN5cwogCi1pbXBvcnQgd2Vi a2l0cHkuY29tbW9uLnZlcnNpb25fY2hlY2sKLQogZnJvbSB3ZWJraXRweS5zdHlsZS5tYWluIGlt cG9ydCBDaGVja1dlYktpdFN0eWxlCiAKIApJbmRleDogVG9vbHMvU2NyaXB0cy90ZXN0LXdlYmtp dHB5LXB5dGhvbjMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy90ZXN0LXdlYmtpdHB5LXB5 dGhvbjMJKHJldmlzaW9uIDI1MjQ1NikKKysrIFRvb2xzL1NjcmlwdHMvdGVzdC13ZWJraXRweS1w eXRob24zCSh3b3JraW5nIGNvcHkpCkBAIC0zOSw3ICszOSw3IEBAIFBZVEhPTjNfQ09NUEFUSUJM RV9ESVJFQ1RPUklFUyA9IFsKICAgJ3dlYmtpdHB5LmxheW91dF90ZXN0cy5tb2RlbHMnLAogICAn d2Via2l0cHkucG9ydCcsCiAgICd3ZWJraXRweS5yZXN1bHRzJywKLSAgJ3dlYmtpdHB5LnN0eWxl LmNoZWNrZXJzJywKKyAgJ3dlYmtpdHB5LnN0eWxlJywKICAgJ3dlYmtpdHB5Lnhjb2RlJywKIF0K IFNMT1dfVEVTVFMgPSBbCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNr ZXIucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vy LnB5CShyZXZpc2lvbiAyNTI0NTYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2No ZWNrZXIucHkJKHdvcmtpbmcgY29weSkKQEAgLTM1LDM1ICszNSwzNSBAQCBpbXBvcnQgbG9nZ2lu ZwogaW1wb3J0IG9zLnBhdGgKIGltcG9ydCByZQogCi1mcm9tIGNoZWNrZXJzLmNvbW1vbiBpbXBv cnQgY2F0ZWdvcmllcyBhcyBDb21tb25DYXRlZ29yaWVzCi1mcm9tIGNoZWNrZXJzLmNvbW1vbiBp bXBvcnQgQ2FycmlhZ2VSZXR1cm5DaGVja2VyCi1mcm9tIGNoZWNrZXJzLmNvbnRyaWJ1dG9ycyBp bXBvcnQgQ29udHJpYnV0b3JzQ2hlY2tlcgotZnJvbSBjaGVja2Vycy5jaGFuZ2Vsb2cgaW1wb3J0 IENoYW5nZUxvZ0NoZWNrZXIKLWZyb20gY2hlY2tlcnMuY3BwIGltcG9ydCBDcHBDaGVja2VyCi1m cm9tIGNoZWNrZXJzLmNtYWtlIGltcG9ydCBDTWFrZUNoZWNrZXIKLWZyb20gY2hlY2tlcnMuZmVh dHVyZWRlZmluZXMgaW1wb3J0IEZlYXR1cmVEZWZpbmVzQ2hlY2tlcgotZnJvbSBjaGVja2Vycy5q cyBpbXBvcnQgSlNDaGVja2VyCi1mcm9tIGNoZWNrZXJzLmpzb25jaGVja2VyIGltcG9ydCBKU09O Q2hlY2tlcgotZnJvbSBjaGVja2Vycy5qc29uY2hlY2tlciBpbXBvcnQgSlNPTkNvbnRyaWJ1dG9y c0NoZWNrZXIKLWZyb20gY2hlY2tlcnMuanNvbmNoZWNrZXIgaW1wb3J0IEpTT05GZWF0dXJlc0No ZWNrZXIKLWZyb20gY2hlY2tlcnMuanNvbmNoZWNrZXIgaW1wb3J0IEpTT05DU1NQcm9wZXJ0aWVz Q2hlY2tlcgotZnJvbSBjaGVja2Vycy5qc3Rlc3QgaW1wb3J0IEpTVGVzdENoZWNrZXIKLWZyb20g Y2hlY2tlcnMubWVzc2FnZXNpbiBpbXBvcnQgTWVzc2FnZXNJbkNoZWNrZXIKLWZyb20gY2hlY2tl cnMucG5nIGltcG9ydCBQTkdDaGVja2VyCi1mcm9tIGNoZWNrZXJzLnB5dGhvbiBpbXBvcnQgUHl0 aG9uQ2hlY2tlciwgUHl0aG9uM0NoZWNrZXIKLWZyb20gY2hlY2tlcnMuc2RrdmFyaWFudCBpbXBv cnQgU0RLVmFyaWFudENoZWNrZXIKLWZyb20gY2hlY2tlcnMudGVzdF9leHBlY3RhdGlvbnMgaW1w b3J0IFRlc3RFeHBlY3RhdGlvbnNDaGVja2VyCi1mcm9tIGNoZWNrZXJzLnRleHQgaW1wb3J0IFRl eHRDaGVja2VyCi1mcm9tIGNoZWNrZXJzLndhdGNobGlzdCBpbXBvcnQgV2F0Y2hMaXN0Q2hlY2tl cgotZnJvbSBjaGVja2Vycy54Y29kZXByb2ogaW1wb3J0IFhjb2RlUHJvamVjdEZpbGVDaGVja2Vy Ci1mcm9tIGNoZWNrZXJzLnhtbCBpbXBvcnQgWE1MQ2hlY2tlcgotZnJvbSBlcnJvcl9oYW5kbGVy cyBpbXBvcnQgRGVmYXVsdFN0eWxlRXJyb3JIYW5kbGVyCi1mcm9tIGZpbHRlciBpbXBvcnQgRmls dGVyQ29uZmlndXJhdGlvbgotZnJvbSBvcHRwYXJzZXIgaW1wb3J0IEFyZ3VtZW50UGFyc2VyCi1m cm9tIG9wdHBhcnNlciBpbXBvcnQgRGVmYXVsdENvbW1hbmRPcHRpb25WYWx1ZXMKIGZyb20gd2Vi a2l0cHkuY29tbW9uLmhvc3QgaW1wb3J0IEhvc3QKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3Rl bS5sb2d1dGlscyBpbXBvcnQgY29uZmlndXJlX2xvZ2dpbmcgYXMgX2NvbmZpZ3VyZV9sb2dnaW5n CiBmcm9tIHdlYmtpdHB5LnBvcnQuY29uZmlnIGltcG9ydCBhcHBsZV9hZGRpdGlvbnMKK2Zyb20g d2Via2l0cHkuc3R5bGUuY2hlY2tlcnMuY29tbW9uIGltcG9ydCBjYXRlZ29yaWVzIGFzIENvbW1v bkNhdGVnb3JpZXMKK2Zyb20gd2Via2l0cHkuc3R5bGUuY2hlY2tlcnMuY29tbW9uIGltcG9ydCBD YXJyaWFnZVJldHVybkNoZWNrZXIKK2Zyb20gd2Via2l0cHkuc3R5bGUuY2hlY2tlcnMuY29udHJp YnV0b3JzIGltcG9ydCBDb250cmlidXRvcnNDaGVja2VyCitmcm9tIHdlYmtpdHB5LnN0eWxlLmNo ZWNrZXJzLmNoYW5nZWxvZyBpbXBvcnQgQ2hhbmdlTG9nQ2hlY2tlcgorZnJvbSB3ZWJraXRweS5z dHlsZS5jaGVja2Vycy5jcHAgaW1wb3J0IENwcENoZWNrZXIKK2Zyb20gd2Via2l0cHkuc3R5bGUu Y2hlY2tlcnMuY21ha2UgaW1wb3J0IENNYWtlQ2hlY2tlcgorZnJvbSB3ZWJraXRweS5zdHlsZS5j aGVja2Vycy5mZWF0dXJlZGVmaW5lcyBpbXBvcnQgRmVhdHVyZURlZmluZXNDaGVja2VyCitmcm9t IHdlYmtpdHB5LnN0eWxlLmNoZWNrZXJzLmpzIGltcG9ydCBKU0NoZWNrZXIKK2Zyb20gd2Via2l0 cHkuc3R5bGUuY2hlY2tlcnMuanNvbmNoZWNrZXIgaW1wb3J0IEpTT05DaGVja2VyCitmcm9tIHdl YmtpdHB5LnN0eWxlLmNoZWNrZXJzLmpzb25jaGVja2VyIGltcG9ydCBKU09OQ29udHJpYnV0b3Jz Q2hlY2tlcgorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2Vycy5qc29uY2hlY2tlciBpbXBvcnQg SlNPTkZlYXR1cmVzQ2hlY2tlcgorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2Vycy5qc29uY2hl Y2tlciBpbXBvcnQgSlNPTkNTU1Byb3BlcnRpZXNDaGVja2VyCitmcm9tIHdlYmtpdHB5LnN0eWxl LmNoZWNrZXJzLmpzdGVzdCBpbXBvcnQgSlNUZXN0Q2hlY2tlcgorZnJvbSB3ZWJraXRweS5zdHls ZS5jaGVja2Vycy5tZXNzYWdlc2luIGltcG9ydCBNZXNzYWdlc0luQ2hlY2tlcgorZnJvbSB3ZWJr aXRweS5zdHlsZS5jaGVja2Vycy5wbmcgaW1wb3J0IFBOR0NoZWNrZXIKK2Zyb20gd2Via2l0cHku c3R5bGUuY2hlY2tlcnMucHl0aG9uIGltcG9ydCBQeXRob25DaGVja2VyLCBQeXRob24zQ2hlY2tl cgorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2Vycy5zZGt2YXJpYW50IGltcG9ydCBTREtWYXJp YW50Q2hlY2tlcgorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2Vycy50ZXN0X2V4cGVjdGF0aW9u cyBpbXBvcnQgVGVzdEV4cGVjdGF0aW9uc0NoZWNrZXIKK2Zyb20gd2Via2l0cHkuc3R5bGUuY2hl Y2tlcnMudGV4dCBpbXBvcnQgVGV4dENoZWNrZXIKK2Zyb20gd2Via2l0cHkuc3R5bGUuY2hlY2tl cnMud2F0Y2hsaXN0IGltcG9ydCBXYXRjaExpc3RDaGVja2VyCitmcm9tIHdlYmtpdHB5LnN0eWxl LmNoZWNrZXJzLnhjb2RlcHJvaiBpbXBvcnQgWGNvZGVQcm9qZWN0RmlsZUNoZWNrZXIKK2Zyb20g d2Via2l0cHkuc3R5bGUuY2hlY2tlcnMueG1sIGltcG9ydCBYTUxDaGVja2VyCitmcm9tIHdlYmtp dHB5LnN0eWxlLmVycm9yX2hhbmRsZXJzIGltcG9ydCBEZWZhdWx0U3R5bGVFcnJvckhhbmRsZXIK K2Zyb20gd2Via2l0cHkuc3R5bGUuZmlsdGVyIGltcG9ydCBGaWx0ZXJDb25maWd1cmF0aW9uCitm cm9tIHdlYmtpdHB5LnN0eWxlLm9wdHBhcnNlciBpbXBvcnQgQXJndW1lbnRQYXJzZXIKK2Zyb20g d2Via2l0cHkuc3R5bGUub3B0cGFyc2VyIGltcG9ydCBEZWZhdWx0Q29tbWFuZE9wdGlvblZhbHVl cwogCiAKIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKSW5kZXg6IFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcl91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJfdW5pdHRlc3QucHkJKHJldmlzaW9u IDI1MjQ1NikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcl91bml0dGVz dC5weQkod29ya2luZyBjb3B5KQpAQCAtMzcsMzMgKzM3LDMyIEBAIGltcG9ydCBsb2dnaW5nCiBp bXBvcnQgb3MKIGltcG9ydCB1bml0dGVzdAogCi1pbXBvcnQgY2hlY2tlciBhcyBzdHlsZQotZnJv bSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmxvZ3Rlc3RpbmcgaW1wb3J0IExvZ1Rlc3RpbmcsIFRl c3RMb2dTdHJlYW0KLWZyb20gY2hlY2tlciBpbXBvcnQgX0JBU0VfRklMVEVSX1JVTEVTCi1mcm9t IGNoZWNrZXIgaW1wb3J0IF9NQVhfUkVQT1JUU19QRVJfQ0FURUdPUlkKLWZyb20gY2hlY2tlciBp bXBvcnQgX1BBVEhfUlVMRVNfU1BFQ0lGSUVSIGFzIFBBVEhfUlVMRVNfU1BFQ0lGSUVSCi1mcm9t IGNoZWNrZXIgaW1wb3J0IF9hbGxfY2F0ZWdvcmllcwotZnJvbSBjaGVja2VyIGltcG9ydCBjaGVj a193ZWJraXRfc3R5bGVfY29uZmlndXJhdGlvbgotZnJvbSBjaGVja2VyIGltcG9ydCBjaGVja193 ZWJraXRfc3R5bGVfcGFyc2VyCi1mcm9tIGNoZWNrZXIgaW1wb3J0IGNvbmZpZ3VyZV9sb2dnaW5n Ci1mcm9tIGNoZWNrZXIgaW1wb3J0IENoZWNrZXJEaXNwYXRjaGVyCi1mcm9tIGNoZWNrZXIgaW1w b3J0IFByb2Nlc3NvckJhc2UKLWZyb20gY2hlY2tlciBpbXBvcnQgU3R5bGVQcm9jZXNzb3IKLWZy b20gY2hlY2tlciBpbXBvcnQgU3R5bGVQcm9jZXNzb3JDb25maWd1cmF0aW9uCi1mcm9tIGNoZWNr ZXJzLmNoYW5nZWxvZyBpbXBvcnQgQ2hhbmdlTG9nQ2hlY2tlcgotZnJvbSBjaGVja2Vycy5jcHAg aW1wb3J0IENwcENoZWNrZXIKLWZyb20gY2hlY2tlcnMuanMgaW1wb3J0IEpTQ2hlY2tlcgotZnJv bSBjaGVja2Vycy5qc29uY2hlY2tlciBpbXBvcnQgSlNPTkNoZWNrZXIKLWZyb20gY2hlY2tlcnMu cHl0aG9uIGltcG9ydCBQeXRob25DaGVja2VyCi1mcm9tIGNoZWNrZXJzLnRleHQgaW1wb3J0IFRl eHRDaGVja2VyCi1mcm9tIGNoZWNrZXJzLnhtbCBpbXBvcnQgWE1MQ2hlY2tlcgotZnJvbSBlcnJv cl9oYW5kbGVycyBpbXBvcnQgRGVmYXVsdFN0eWxlRXJyb3JIYW5kbGVyCi1mcm9tIGZpbHRlciBp bXBvcnQgdmFsaWRhdGVfZmlsdGVyX3J1bGVzCi1mcm9tIGZpbHRlciBpbXBvcnQgRmlsdGVyQ29u ZmlndXJhdGlvbgotZnJvbSBvcHRwYXJzZXIgaW1wb3J0IEFyZ3VtZW50UGFyc2VyCi1mcm9tIG9w dHBhcnNlciBpbXBvcnQgQ29tbWFuZE9wdGlvblZhbHVlcwotZnJvbSB3ZWJraXRweS5jb21tb24u c3lzdGVtLmxvZ3Rlc3RpbmcgaW1wb3J0IExvZ2dpbmdUZXN0Q2FzZQorZnJvbSB3ZWJraXRweS5j b21tb24uc3lzdGVtLmxvZ3Rlc3RpbmcgaW1wb3J0IExvZ1Rlc3RpbmcsIFRlc3RMb2dTdHJlYW0s IExvZ2dpbmdUZXN0Q2FzZQorZnJvbSB3ZWJraXRweS5zdHlsZSBpbXBvcnQgY2hlY2tlciBhcyBz dHlsZQorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2VyIGltcG9ydCBfQkFTRV9GSUxURVJfUlVM RVMKK2Zyb20gd2Via2l0cHkuc3R5bGUuY2hlY2tlciBpbXBvcnQgX01BWF9SRVBPUlRTX1BFUl9D QVRFR09SWQorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2VyIGltcG9ydCBfUEFUSF9SVUxFU19T UEVDSUZJRVIgYXMgUEFUSF9SVUxFU19TUEVDSUZJRVIKK2Zyb20gd2Via2l0cHkuc3R5bGUuY2hl Y2tlciBpbXBvcnQgX2FsbF9jYXRlZ29yaWVzCitmcm9tIHdlYmtpdHB5LnN0eWxlLmNoZWNrZXIg aW1wb3J0IGNoZWNrX3dlYmtpdF9zdHlsZV9jb25maWd1cmF0aW9uCitmcm9tIHdlYmtpdHB5LnN0 eWxlLmNoZWNrZXIgaW1wb3J0IGNoZWNrX3dlYmtpdF9zdHlsZV9wYXJzZXIKK2Zyb20gd2Via2l0 cHkuc3R5bGUuY2hlY2tlciBpbXBvcnQgY29uZmlndXJlX2xvZ2dpbmcKK2Zyb20gd2Via2l0cHku c3R5bGUuY2hlY2tlciBpbXBvcnQgQ2hlY2tlckRpc3BhdGNoZXIKK2Zyb20gd2Via2l0cHkuc3R5 bGUuY2hlY2tlciBpbXBvcnQgUHJvY2Vzc29yQmFzZQorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVj a2VyIGltcG9ydCBTdHlsZVByb2Nlc3NvcgorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2VyIGlt cG9ydCBTdHlsZVByb2Nlc3NvckNvbmZpZ3VyYXRpb24KK2Zyb20gd2Via2l0cHkuc3R5bGUuY2hl Y2tlcnMuY2hhbmdlbG9nIGltcG9ydCBDaGFuZ2VMb2dDaGVja2VyCitmcm9tIHdlYmtpdHB5LnN0 eWxlLmNoZWNrZXJzLmNwcCBpbXBvcnQgQ3BwQ2hlY2tlcgorZnJvbSB3ZWJraXRweS5zdHlsZS5j aGVja2Vycy5qcyBpbXBvcnQgSlNDaGVja2VyCitmcm9tIHdlYmtpdHB5LnN0eWxlLmNoZWNrZXJz Lmpzb25jaGVja2VyIGltcG9ydCBKU09OQ2hlY2tlcgorZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVj a2Vycy5weXRob24gaW1wb3J0IFB5dGhvbkNoZWNrZXIKK2Zyb20gd2Via2l0cHkuc3R5bGUuY2hl Y2tlcnMudGV4dCBpbXBvcnQgVGV4dENoZWNrZXIKK2Zyb20gd2Via2l0cHkuc3R5bGUuY2hlY2tl cnMueG1sIGltcG9ydCBYTUxDaGVja2VyCitmcm9tIHdlYmtpdHB5LnN0eWxlLmVycm9yX2hhbmRs ZXJzIGltcG9ydCBEZWZhdWx0U3R5bGVFcnJvckhhbmRsZXIKK2Zyb20gd2Via2l0cHkuc3R5bGUu b3B0cGFyc2VyIGltcG9ydCBDb21tYW5kT3B0aW9uVmFsdWVzCiBmcm9tIHdlYmtpdHB5LnN0eWxl LmZpbGVyZWFkZXIgaW1wb3J0IFRleHRGaWxlUmVhZGVyCitmcm9tIHdlYmtpdHB5LnN0eWxlLmZp bHRlciBpbXBvcnQgdmFsaWRhdGVfZmlsdGVyX3J1bGVzCitmcm9tIHdlYmtpdHB5LnN0eWxlLmZp bHRlciBpbXBvcnQgRmlsdGVyQ29uZmlndXJhdGlvbgorZnJvbSB3ZWJraXRweS5zdHlsZS5vcHRw YXJzZXIgaW1wb3J0IEFyZ3VtZW50UGFyc2VyCiAKIAogY2xhc3MgQ29uZmlndXJlTG9nZ2luZ1Rl c3RCYXNlKHVuaXR0ZXN0LlRlc3RDYXNlKToKQEAgLTI2Miw3ICsyNjEsNyBAQCBjbGFzcyBHbG9i YWxWYXJpYWJsZXNUZXN0KHVuaXR0ZXN0LlRlc3RDCiAgICAgZGVmIHRlc3RfbWF4X3JlcG9ydHNf cGVyX2NhdGVnb3J5KHNlbGYpOgogICAgICAgICAiIiJDaGVjayB0aGF0IF9NQVhfUkVQT1JUU19Q RVJfQ0FURUdPUlkgaXMgdmFsaWQuIiIiCiAgICAgICAgIGFsbF9jYXRlZ29yaWVzID0gc2VsZi5f YWxsX2NhdGVnb3JpZXMoKQotICAgICAgICBmb3IgY2F0ZWdvcnkgaW4gX01BWF9SRVBPUlRTX1BF Ul9DQVRFR09SWS5pdGVya2V5cygpOgorICAgICAgICBmb3IgY2F0ZWdvcnkgaW4gX01BWF9SRVBP UlRTX1BFUl9DQVRFR09SWS5rZXlzKCk6CiAgICAgICAgICAgICBzZWxmLmFzc2VydEluKGNhdGVn b3J5LCBhbGxfY2F0ZWdvcmllcywKICAgICAgICAgICAgICAgICAgICAgICAgICAgJ0tleSAiJXMi IGlzIG5vdCBhIGNhdGVnb3J5JyAlIGNhdGVnb3J5KQogCkluZGV4OiBUb29scy9TY3JpcHRzL3dl YmtpdHB5L3N0eWxlL2Vycm9yX2hhbmRsZXJzX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZXJyb3JfaGFuZGxlcnNfdW5pdHRlc3QucHkJKHJl dmlzaW9uIDI1MjQ1NikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZXJyb3JfaGFu ZGxlcnNfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTI1LDEwICsyNSwxMCBAQAogCiBp bXBvcnQgdW5pdHRlc3QKIAotZnJvbSBjaGVja2VyIGltcG9ydCBTdHlsZVByb2Nlc3NvckNvbmZp Z3VyYXRpb24KLWZyb20gZXJyb3JfaGFuZGxlcnMgaW1wb3J0IERlZmF1bHRTdHlsZUVycm9ySGFu ZGxlcgotZnJvbSBmaWx0ZXIgaW1wb3J0IEZpbHRlckNvbmZpZ3VyYXRpb24KIGZyb20gd2Via2l0 cHkuY29tbW9uLnN5c3RlbS5sb2d0ZXN0aW5nIGltcG9ydCBMb2dnaW5nVGVzdENhc2UKK2Zyb20g d2Via2l0cHkuc3R5bGUuY2hlY2tlciBpbXBvcnQgU3R5bGVQcm9jZXNzb3JDb25maWd1cmF0aW9u Citmcm9tIHdlYmtpdHB5LnN0eWxlLmVycm9yX2hhbmRsZXJzIGltcG9ydCBEZWZhdWx0U3R5bGVF cnJvckhhbmRsZXIKK2Zyb20gd2Via2l0cHkuc3R5bGUuZmlsdGVyIGltcG9ydCBGaWx0ZXJDb25m aWd1cmF0aW9uCiAKIAogY2xhc3MgRGVmYXVsdFN0eWxlRXJyb3JIYW5kbGVyVGVzdChMb2dnaW5n VGVzdENhc2UpOgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9maWx0ZXIucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9maWx0ZXIucHkJKHJl dmlzaW9uIDI1MjQ1NikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZmlsdGVyLnB5 CSh3b3JraW5nIGNvcHkpCkBAIC0xOTcsNyArMTk3LDcgQEAgY2xhc3MgRmlsdGVyQ29uZmlndXJh dGlvbihvYmplY3QpOgogICAgICAgICBpZiBzZWxmLl9wYXRoX3NwZWNpZmljX2xvd2VyIGlzIE5v bmU6CiAgICAgICAgICAgICBzZWxmLl9wYXRoX3NwZWNpZmljX2xvd2VyID0gW10KICAgICAgICAg ICAgIGZvciAoc3ViX3BhdGhzLCBwYXRoX3J1bGVzKSBpbiBzZWxmLl9wYXRoX3NwZWNpZmljOgot ICAgICAgICAgICAgICAgIHN1Yl9wYXRocyA9IG1hcChzdHIubG93ZXIsIHN1Yl9wYXRocykKKyAg ICAgICAgICAgICAgICBzdWJfcGF0aHMgPSBsaXN0KG1hcChzdHIubG93ZXIsIHN1Yl9wYXRocykp CiAgICAgICAgICAgICAgICAgc2VsZi5fcGF0aF9zcGVjaWZpY19sb3dlci5hcHBlbmQoKHN1Yl9w YXRocywgcGF0aF9ydWxlcykpCiAgICAgICAgIHJldHVybiBzZWxmLl9wYXRoX3NwZWNpZmljX2xv d2VyCiAKQEAgLTIzOCw4ICsyMzgsNyBAQCBjbGFzcyBGaWx0ZXJDb25maWd1cmF0aW9uKG9iamVj dCk6CiAgICAgICAgICIiIlJldHVybiB0aGUgQ2F0ZWdvcnlGaWx0ZXIgYXNzb2NpYXRlZCB0byBh IHBhdGguIiIiCiAgICAgICAgIGlmIHBhdGggbm90IGluIHNlbGYuX3BhdGhfdG9fZmlsdGVyOgog ICAgICAgICAgICAgcGF0aF9ydWxlcyA9IHNlbGYuX3BhdGhfcnVsZXNfZnJvbV9wYXRoKHBhdGgp Ci0gICAgICAgICAgICBmaWx0ZXIgPSBzZWxmLl9maWx0ZXJfZnJvbV9wYXRoX3J1bGVzKHBhdGhf cnVsZXMpCi0gICAgICAgICAgICBzZWxmLl9wYXRoX3RvX2ZpbHRlcltwYXRoXSA9IGZpbHRlcgor ICAgICAgICAgICAgc2VsZi5fcGF0aF90b19maWx0ZXJbcGF0aF0gPSBzZWxmLl9maWx0ZXJfZnJv bV9wYXRoX3J1bGVzKHBhdGhfcnVsZXMpCiAKICAgICAgICAgcmV0dXJuIHNlbGYuX3BhdGhfdG9f ZmlsdGVyW3BhdGhdCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZmlsdGVy X3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUv ZmlsdGVyX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNTI0NTYpCisrKyBUb29scy9TY3JpcHRzL3dl YmtpdHB5L3N0eWxlL2ZpbHRlcl91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMjQsOSAr MjQsOSBAQAogCiBpbXBvcnQgdW5pdHRlc3QKIAotZnJvbSBmaWx0ZXIgaW1wb3J0IF9DYXRlZ29y eUZpbHRlciBhcyBDYXRlZ29yeUZpbHRlcgotZnJvbSBmaWx0ZXIgaW1wb3J0IHZhbGlkYXRlX2Zp bHRlcl9ydWxlcwotZnJvbSBmaWx0ZXIgaW1wb3J0IEZpbHRlckNvbmZpZ3VyYXRpb24KK2Zyb20g d2Via2l0cHkuc3R5bGUuZmlsdGVyIGltcG9ydCBfQ2F0ZWdvcnlGaWx0ZXIgYXMgQ2F0ZWdvcnlG aWx0ZXIKK2Zyb20gd2Via2l0cHkuc3R5bGUuZmlsdGVyIGltcG9ydCB2YWxpZGF0ZV9maWx0ZXJf cnVsZXMKK2Zyb20gd2Via2l0cHkuc3R5bGUuZmlsdGVyIGltcG9ydCBGaWx0ZXJDb25maWd1cmF0 aW9uCiAKICMgT24gVGVzdGluZyBfX2VxX18oKSBhbmQgX19uZV9fKCk6CiAjCkluZGV4OiBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL21haW4ucHkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9zdHlsZS9tYWluLnB5CShyZXZpc2lvbiAyNTI0NTYpCisrKyBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3N0eWxlL21haW4ucHkJKHdvcmtpbmcgY29weSkKQEAgLTEwMiw2ICsx MDIsMTAgQEAgZGVmIGNoYW5nZV9kaXJlY3RvcnkoZmlsZXN5c3RlbSwgY2hlY2tvdQogCiBjbGFz cyBDaGVja1dlYktpdFN0eWxlKG9iamVjdCk6CiAgICAgZGVmIF9lbmdhZ2VfYXdlc29tZV9zdGRl cnJfaGFja3Moc2VsZik6CisgICAgICAgICMgUHl0aG9uIDMgc3RyaW5ncyBhcmUgdW5pY29kZSwg d2UgZG9uJ3QgbmVlZCB0byBlbmNvZGUgc3RkZXJyCisgICAgICAgIGlmIHN5cy52ZXJzaW9uX2lu Zm8gPiAoMywgMCk6CisgICAgICAgICAgICByZXR1cm4gc3lzLnN0ZGVycgorCiAgICAgICAgICMg Q2hhbmdlIHN0ZGVyciB0byB3cml0ZSB3aXRoIHJlcGxhY2VtZW50IGNoYXJhY3RlcnMgc28gd2Ug ZG9uJ3QgZGllCiAgICAgICAgICMgaWYgd2UgdHJ5IHRvIHByaW50IHNvbWV0aGluZyBjb250YWlu aW5nIG5vbi1BU0NJSSBjaGFyYWN0ZXJzLgogICAgICAgICBzdGRlcnIgPSBjb2RlY3MuU3RyZWFt UmVhZGVyV3JpdGVyKHN5cy5zdGRlcnIsCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0 eWxlL21haW5fdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9tYWluX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNTI0NTYpCisrKyBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3N0eWxlL21haW5fdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTI2 LDEzICsyNiwxMyBAQCBpbXBvcnQgdW5pdHRlc3QKIAogaW1wb3J0IHdlYmtpdHB5LnN0eWxlLmNo ZWNrZXIgYXMgY2hlY2tlcgogCi1mcm9tIG1haW4gaW1wb3J0IGNoYW5nZV9kaXJlY3RvcnkKIGZy b20gd2Via2l0cHkuY29tbW9uLmhvc3QgaW1wb3J0IEhvc3QKIGZyb20gd2Via2l0cHkuY29tbW9u LnN5c3RlbS5maWxlc3lzdGVtX21vY2sgaW1wb3J0IE1vY2tGaWxlU3lzdGVtCiBmcm9tIHdlYmtp dHB5LmNvbW1vbi5zeXN0ZW0ub3V0cHV0Y2FwdHVyZSBpbXBvcnQgT3V0cHV0Q2FwdHVyZSwgT3V0 cHV0Q2FwdHVyZVNjb3BlCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0ubG9ndGVzdGluZyBp bXBvcnQgTG9nVGVzdGluZwogZnJvbSB3ZWJraXRweS5zdHlsZS5jaGVja2VyIGltcG9ydCBTdHls ZVByb2Nlc3NvcgogZnJvbSB3ZWJraXRweS5zdHlsZS5maWxlcmVhZGVyIGltcG9ydCBUZXh0Rmls ZVJlYWRlcgorZnJvbSB3ZWJraXRweS5zdHlsZS5tYWluIGltcG9ydCBjaGFuZ2VfZGlyZWN0b3J5 CiAKIAogY2xhc3MgQ2hhbmdlRGlyZWN0b3J5VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CkluZGV4 OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL3BhdGNocmVhZGVyLnB5Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvcGF0Y2hyZWFkZXIucHkJKHJldmlzaW9u IDI1MjQ1NikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvcGF0Y2hyZWFkZXIucHkJ KHdvcmtpbmcgY29weSkKQEAgLTM1LDYgKzM1LDcgQEAgZnJvbSB3ZWJraXRweS5jb21tb24uY2hl Y2tvdXQuZGlmZl9wYXJzZQogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBp bXBvcnQgRXhlY3V0aXZlCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZmlsZXN5c3RlbSBp bXBvcnQgRmlsZVN5c3RlbQogZnJvbSB3ZWJraXRweS5jb21tb24uY2hlY2tvdXQuc2NtLmRldGVj dGlvbiBpbXBvcnQgU0NNRGV0ZWN0b3IKK2Zyb20gd2Via2l0cHkuY29tbW9uLnVuaWNvZGVfY29t cGF0aWJpbGl0eSBpbXBvcnQgZGVjb2RlX2ZvcgogCiAKIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dl cihfX25hbWVfXykKQEAgLTU1LDEyICs1NiwxMyBAQCBjbGFzcyBQYXRjaFJlYWRlcihvYmplY3Qp OgogICAgIGRlZiBjaGVjayhzZWxmLCBwYXRjaF9zdHJpbmcsIGZzPU5vbmUpOgogICAgICAgICAi IiJDaGVjayBzdHlsZSBpbiB0aGUgZ2l2ZW4gcGF0Y2guIiIiCiAgICAgICAgIGZzID0gZnMgb3Ig RmlsZVN5c3RlbSgpCisgICAgICAgIHBhdGNoX3N0cmluZyA9IGRlY29kZV9mb3IocGF0Y2hfc3Ry aW5nLCBzdHIpCiAgICAgICAgIHBhdGNoX2ZpbGVzID0gRGlmZlBhcnNlcihwYXRjaF9zdHJpbmcu c3BsaXRsaW5lcygpKS5maWxlcwogCiAgICAgICAgICMgSWYgdGhlIHVzZXIgdXNlcyBnaXQsIGNo ZWNraW5nIHN1YnZlcnNpb24gY29uZmlnIGZpbGUgb25seSBvbmNlIGlzIGVub3VnaC4KICAgICAg ICAgY2FsbF9vbmx5X29uY2UgPSBUcnVlCiAKLSAgICAgICAgZm9yIHBhdGgsIGRpZmZfZmlsZSBp biBwYXRjaF9maWxlcy5pdGVyaXRlbXMoKToKKyAgICAgICAgZm9yIHBhdGgsIGRpZmZfZmlsZSBp biBwYXRjaF9maWxlcy5pdGVtcygpOgogICAgICAgICAgICAgbGluZV9udW1iZXJzID0gZGlmZl9m aWxlLmFkZGVkX29yX21vZGlmaWVkX2xpbmVfbnVtYmVycygpCiAgICAgICAgICAgICBfbG9nLmRl YnVnKCdGb3VuZCAlcyBuZXcgb3IgbW9kaWZpZWQgbGluZXMgaW46ICVzJyAlIChsZW4obGluZV9u dW1iZXJzKSwgcGF0aCkpCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hl Y2tlcnMvY29udHJpYnV0b3JzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvc3R5bGUvY2hlY2tlcnMvY29udHJpYnV0b3JzLnB5CShyZXZpc2lvbiAyNTI0NTYpCisrKyBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NvbnRyaWJ1dG9ycy5weQkod29y a2luZyBjb3B5KQpAQCAtMjUsNyArMjUsNiBAQAogaW1wb3J0IGRpZmZsaWIKIGltcG9ydCBqc29u CiBpbXBvcnQgcmUKLWZyb20gc2V0cyBpbXBvcnQgU2V0CiBmcm9tIHdlYmtpdHB5LnN0eWxlLmNo ZWNrZXJzLmpzb25jaGVja2VyIGltcG9ydCBKU09OQ2hlY2tlcgogZnJvbSB3ZWJraXRweS5jb21t b24uY29uZmlnLmNvbW1pdHRlcnMgaW1wb3J0IENvbW1pdHRlckxpc3QKIGZyb20gd2Via2l0cHku Y29tbW9uLnN5c3RlbS5maWxlc3lzdGVtIGltcG9ydCBGaWxlU3lzdGVtCkluZGV4OiBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rlc3RfZXhwZWN0YXRpb25zLnB5Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvdGVzdF9leHBl Y3RhdGlvbnMucHkJKHJldmlzaW9uIDI1MjQ1NikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv c3R5bGUvY2hlY2tlcnMvdGVzdF9leHBlY3RhdGlvbnMucHkJKHdvcmtpbmcgY29weSkKQEAgLTM1 LDYgKzM1LDcgQEAgaW1wb3J0IHJlCiBpbXBvcnQgc3lzCiAKIGZyb20gd2Via2l0cHkuY29tbW9u Lmhvc3QgaW1wb3J0IEhvc3QKK2Zyb20gd2Via2l0cHkuY29tbW9uLml0ZXJhdGlvbl9jb21wYXRp YmlsaXR5IGltcG9ydCBpdGVyaXRlbXMKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLm1vZGVs cyBpbXBvcnQgdGVzdF9leHBlY3RhdGlvbnMKIGZyb20gd2Via2l0cHkuc3R5bGUuY2hlY2tlcnMu Y29tbW9uIGltcG9ydCBUYWJDaGVja2VyCiBmcm9tIHdlYmtpdHB5LnN0eWxlLmVycm9yX2hhbmRs ZXJzIGltcG9ydCBEZWZhdWx0U3R5bGVFcnJvckhhbmRsZXIKQEAgLTEwNiw3ICsxMDcsNyBAQCBj bGFzcyBUZXN0RXhwZWN0YXRpb25zQ2hlY2tlcihvYmplY3QpOgogICAgICAgICBpZiBhYnNfZmls ZW5hbWUgaW4gZmlsZXMgYW5kIGZpbGVzW2Fic19maWxlbmFtZV0gYW5kIHdhcm5pbmcubGluZV9u dW1iZXIgaW4gZmlsZXNbYWJzX2ZpbGVuYW1lXToKICAgICAgICAgICAgIHJldHVybiBUcnVlCiAK LSAgICAgICAgZm9yIGZpbGUsIGxpbmVzIGluIHdhcm5pbmcucmVsYXRlZF9maWxlcy5pdGVyaXRl bXMoKToKKyAgICAgICAgZm9yIGZpbGUsIGxpbmVzIGluIGl0ZXJpdGVtcyh3YXJuaW5nLnJlbGF0 ZWRfZmlsZXMpOgogICAgICAgICAgICAgYWJzX2ZpbGVuYW1lID0gaG9zdC5maWxlc3lzdGVtLmpv aW4oY3dkLCBmaWxlKQogICAgICAgICAgICAgaWYgYWJzX2ZpbGVuYW1lIGluIGZpbGVzOgogICAg ICAgICAgICAgICAgICMgQ2FzZSAyLCBhIGZpbGUgYXNzb2NpYXRlZCB3aXRoIHRoZSB3YXJuaW5n IGlzIGluIG91ciBwYXRjaAo=