From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 14118 invoked from network); 11 Nov 2022 16:51:46 -0000 Received: from localhost (HELO inbox.vuxu.org) (::1) by localhost with ESMTPUTF8; 11 Nov 2022 16:51:46 -0000 Content-Type: multipart/mixed; boundary="===============3379103998142044418==" MIME-Version: 1.0 Subject: =?utf8?q?Re=3A_=5BPR_PATCH=5D_=5BUpdated=5D_dispcalGUI=3A_update_to_3=2E9=2E8=2C_change_upstream=2E?= To: ml@inbox.vuxu.org From: kruceter Reply-to: ml@inbox.vuxu.org In-Reply-To: References: Date: Fri, 11 Nov 2022 17:51:46 +0100 List-Id: Message-ID: <20221111165146.8NLNCOpeKLxtnKF8mn2Pu0bpIgWtagAotzowyReuO6g@z> GitHub notification mails are now in MIME to allow UTF8. --===============3379103998142044418== Content-Type: text/plain; charset="utf8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 VGhlcmUgaXMgYW4gdXBkYXRlZCBwdWxsIHJlcXVlc3QgYnkga3J1Y2V0ZXIgYWdhaW5zdCBtYXN0 ZXIgb24gdGhlIHZvaWQtcGFja2FnZXMgcmVwb3NpdG9yeQoKaHR0cHM6Ly9naXRodWIuY29tL2ty dWNldGVyL3ZvaWQtcGFja2FnZXMgZGlzcGNhbGd1aQpodHRwczovL2dpdGh1Yi5jb20vdm9pZC1s aW51eC92b2lkLXBhY2thZ2VzL3B1bGwvNDA0MjAKCmRpc3BjYWxHVUk6IHVwZGF0ZSB0byAzLjku OCwgY2hhbmdlIHVwc3RyZWFtLgpkaXNwY2FsR1VJIGlzIG5vdCBtYWludGFpbmVkIGJ5IGl0cyBv cmlnaW5hbCBhdXRob3JzIGFueW1vcmUuDQoNClRoZSBzaWduaWZpY2FudCBhZHZhbnRhZ2Ugb2Yg dGhlIGZvcmsgaXMgcHl0aG9uIDMgc3VwcG9ydCB3aGljaCBleGNsdWRlcyBweXRob24gMiBmcm9t IGRlcGVuZGVuY2llcyAocmVsYXRlZCB0byAjMzgyMjkpLg0KDQpjYzogQGxlbW1pIA0KDQojIyMj IFRlc3RpbmcgdGhlIGNoYW5nZXMNCi0gSSB0ZXN0ZWQgdGhlIGNoYW5nZXMgaW4gdGhpcyBQUjog KipicmllZmx5KioKCkEgcGF0Y2ggZmlsZSBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS92b2lkLWxp bnV4L3ZvaWQtcGFja2FnZXMvcHVsbC80MDQyMC5wYXRjaCBpcyBhdHRhY2hlZA== --===============3379103998142044418== Content-Type: text/x-diff MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="github-pr-dispcalgui-40420.patch" RnJvbSAzMzRmOTM4MDI4MjQyY2RmZmIyZDFiN2ZjYmFjNjg0YTllMzJiNWUyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLcnVsIENldGVyIDxrcnVjZXRlckBwcm90b24ubWU+CkRhdGU6 IFdlZCwgOSBOb3YgMjAyMiAyMDowODoxNyArMDMwMApTdWJqZWN0OiBbUEFUQ0hdIGRpc3BjYWxH VUk6IHVwZGF0ZSB0byAzLjkuOCwgY2hhbmdlIHVwc3RyZWFtLgoKZGlzcGNhbEdVSSBpcyBub3Qg bWFpbnRhaW5lZCBieSBpdHMgb3JpZ2luYWwgYXV0aG9ycyBhbnltb3JlLgoKVGhlIHNpZ25pZmlj YW50IGFkdmFudGFnZSBvZiB0aGUgZm9yayBpcyBweXRob24gMyBzdXBwb3J0IHdoaWNoCmV4Y2x1 ZGVzIHB5dGhvbiAyIGZyb20gZGVwZW5kZW5jaWVzIChyZWxhdGVkIHRvIHZvaWQtcGFja2FnZXMj MzgyMjkpLgotLS0KIC4uLi9kaXNwY2FsR1VJL3BhdGNoZXMvZW5hYmxlLWFwcGRhdGEucGF0Y2gg ICB8ICAyOCArKysrKwogc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvZXJyb3IucGF0Y2ggICAg ICAgIHwgIDQ0ICsrKy0tLS0KIHNyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2ZpeC1nZXR0ZXh0 LnBhdGNoICB8ICAxMyArKwogLi4uL3BhdGNoZXMvZml4LWhhcmRjb2RlZC1pbXBvcnQucGF0Y2gg ICAgICAgIHwgIDE4ICsrKwogLi4uL2Rpc3BjYWxHVUkvcGF0Y2hlcy9maXgtc2V0dXB0b29scy5w YXRjaCAgIHwgIDk1ICsrKysrKysrKysrKysrKwogc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMv Zml4LXZlcnNpb24ucGF0Y2ggIHwgMTExICsrKysrKysrKysrKysrKysrKwogc3JjcGtncy9kaXNw Y2FsR1VJL3BhdGNoZXMvdXBkYXRlLWNoZWNrLnBhdGNoIHwgIDkwICsrKysrKysrKysrKysrCiAu Li4vZGlzcGNhbEdVSS9wYXRjaGVzL3hkZy1hdXRvc3RhcnQucGF0Y2ggICAgfCAgMTYgKysrCiBz cmNwa2dzL2Rpc3BjYWxHVUkvdGVtcGxhdGUgICAgICAgICAgICAgICAgICAgfCAgMzcgKysrLS0t CiA5IGZpbGVzIGNoYW5nZWQsIDQxNiBpbnNlcnRpb25zKCspLCAzNiBkZWxldGlvbnMoLSkKIGNy ZWF0ZSBtb2RlIDEwMDY0NCBzcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy9lbmFibGUtYXBwZGF0 YS5wYXRjaAogY3JlYXRlIG1vZGUgMTAwNjQ0IHNyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2Zp eC1nZXR0ZXh0LnBhdGNoCiBjcmVhdGUgbW9kZSAxMDA2NDQgc3JjcGtncy9kaXNwY2FsR1VJL3Bh dGNoZXMvZml4LWhhcmRjb2RlZC1pbXBvcnQucGF0Y2gKIGNyZWF0ZSBtb2RlIDEwMDY0NCBzcmNw a2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy9maXgtc2V0dXB0b29scy5wYXRjaAogY3JlYXRlIG1vZGUg MTAwNjQ0IHNyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2ZpeC12ZXJzaW9uLnBhdGNoCiBjcmVh dGUgbW9kZSAxMDA2NDQgc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvdXBkYXRlLWNoZWNrLnBh dGNoCiBjcmVhdGUgbW9kZSAxMDA2NDQgc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMveGRnLWF1 dG9zdGFydC5wYXRjaAoKZGlmZiAtLWdpdCBhL3NyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2Vu YWJsZS1hcHBkYXRhLnBhdGNoIGIvc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvZW5hYmxlLWFw cGRhdGEucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi5jYjFh ZjdmZWQ2ODgKLS0tIC9kZXYvbnVsbAorKysgYi9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy9l bmFibGUtYXBwZGF0YS5wYXRjaApAQCAtMCwwICsxLDI4IEBACitjcmVhdGVfYXBwZGF0YSBhbmQg YnVpbGRzZXJ2aWNlIGFyZSBub3Qgc2V0IHRvIFRydWUgYWZ0ZXIgY2FsbGluZworc2V0dXAucHkg ZXh0ZXJuYWxseSAoInNkaXN0IiBhbmQvb3IgImluc3RhbGwiIGFyZSBub3QgdXNlZCksIGxlYWRp bmcgdG8KK25ldC5kaXNwbGF5Y2FsLkRpc3BsYXlDQUwuYXBwZGF0YS54bWwgbm90IGJlaW5nIGZv dW5kIGZvciBjb3B5aW5nIGluCit0aGUgYnVpbGQgcGhhc2UuCisKKy0tLSBhL3NldHVwLnB5Cisr KysgYi9zZXR1cC5weQorQEAgLTYzOSwxOCArNjM5LDggQEAKKyAgICAgICAgIGlmIGxlbihzeXMu YXJndikgPT0gMSBvciAobGVuKHN5cy5hcmd2KSA9PSAyIGFuZCBkcnlfcnVuKToKKyAgICAgICAg ICAgICByZXR1cm4KKyAKKy0gICAgY3JlYXRlX2FwcGRhdGEgPSAoCistICAgICAgICAoYXBwZGF0 YSBvciAiaW5zdGFsbCIgaW4gc3lzLmFyZ3ZbMTpdIG9yICJzZGlzdCIgaW4gc3lzLmFyZ3ZbMTpd KQorLSAgICAgICAgYW5kIG5vdCBoZWxwCistICAgICAgICBhbmQgbm90IGRyeV9ydW4KKy0gICAg KQorLQorLSAgICBpZiAoCistICAgICAgICAic2Rpc3QiIGluIHN5cy5hcmd2WzE6XQorLSAgICAg ICAgb3IgImluc3RhbGwiIGluIHN5cy5hcmd2WzE6XQorLSAgICAgICAgb3IgImJkaXN0X2RlYiIg aW4gc3lzLmFyZ3ZbMTpdCistICAgICkgYW5kIG5vdCBoZWxwOgorLSAgICAgICAgYnVpbGRzZXJ2 aWNlID0gVHJ1ZQorKyAgICBjcmVhdGVfYXBwZGF0YSA9IFRydWUKKysgICAgYnVpbGRzZXJ2aWNl ID0gVHJ1ZQorIAorICAgICBpZiBjcmVhdGVfYXBwZGF0YSBvciBidWlsZHNlcnZpY2U6CisgICAg ICAgICB3aXRoIGNvZGVjcy5vcGVuKHN0cihQYXRoKHB5ZGlyLCAiQ0hBTkdFUy5odG1sIikpLCAi ciIsICJVVEYtOCIpIGFzIGY6CmRpZmYgLS1naXQgYS9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hl cy9lcnJvci5wYXRjaCBiL3NyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2Vycm9yLnBhdGNoCmlu ZGV4IDE2OWZjNTI4YjEzOC4uNzU3YTkwNmI5ZGRjIDEwMDY0NAotLS0gYS9zcmNwa2dzL2Rpc3Bj YWxHVUkvcGF0Y2hlcy9lcnJvci5wYXRjaAorKysgYi9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hl cy9lcnJvci5wYXRjaApAQCAtNCwzMCArNCwzMCBAQCBUaGVyZWZvcmUgdGhlIGN1cnJlbnQgY29k ZSBlaXRoZXIgcmVzdWx0cyBpbiBnYXJibGVkIG91dHB1dCBvcgogZG9lc24ndCB3b3JrIGF0IGFs bC4gUmVwbGFjZSBpdCB3aXRoIGEgc2ltcGxlIHByaW50Zi4KIAogLS0tCi0tLS0gYS9EaXNwbGF5 Q0FML1JlYWxEaXNwbGF5U2l6ZU1NLmMJMjAxOC0wNy0yNSAxNjo0NzowMS4wMDAwMDAwMDAgKzAy MDAKLSsrKyBiL0Rpc3BsYXlDQUwvUmVhbERpc3BsYXlTaXplTU0uYwkyMDE4LTA3LTI1IDE2OjQ3 OjAxLjAwMDAwMDAwMCArMDIwMAotQEAgLTgyMiwxMyArODIyLDEzIEBACi0gCQkJCQkJc3ByaW50 ZihkZXNjMSwgIl9JQ0NfUFJPRklMRV8lZCIsZGlzcHNbbmRpc3BzXS0+dXNjcmVlbik7CistLS0g YS9EaXNwbGF5Q0FML1JlYWxEaXNwbGF5U2l6ZU1NLmMKKysrKyBiL0Rpc3BsYXlDQUwvUmVhbERp c3BsYXlTaXplTU0uYworQEAgLTgzNSwxMyArODM1LDEzIEBACisgICAgICAgICAgICAgICAgICAg ICAgICAgc3ByaW50ZihkZXNjMSwgIl9JQ0NfUFJPRklMRV8lZCIsZGlzcHNbbmRpc3BzXS0+dXNj cmVlbik7CiAgCi0gCQkJCQlpZiAoKGRpc3BzW25kaXNwc10tPmljY19hdG9tID0gWEludGVybkF0 b20obXlkaXNwbGF5LCBkZXNjMSwgRmFsc2UpKSA9PSBOb25lKQotLQkJCQkJCWVycm9yKCJVbmFi bGUgdG8gaW50ZXJuIGF0b20gJyVzJyIsZGVzYzEpOwotKwkJCQkJCWZwcmludGYoc3RkZXJyLCAi VW5hYmxlIHRvIGludGVybiBhdG9tICclcyciLGRlc2MxKTsKKyAgICAgICAgICAgICAgICAgICAg IGlmICgoZGlzcHNbbmRpc3BzXS0+aWNjX2F0b20gPSBYSW50ZXJuQXRvbShteWRpc3BsYXksIGRl c2MxLCBGYWxzZSkpID09IE5vbmUpCistICAgICAgICAgICAgICAgICAgICAgICAgZXJyb3IoIlVu YWJsZSB0byBpbnRlcm4gYXRvbSAnJXMnIixkZXNjMSk7CisrICAgICAgICAgICAgICAgICAgICAg ICAgZnByaW50ZihzdGRlcnIsICJVbmFibGUgdG8gaW50ZXJuIGF0b20gJyVzJyIsZGVzYzEpOwog IAotIAkJCQkJZGVidWdycjIoKGVycm91dCwiUm9vdCBhdG9tICclcydcbiIsZGVzYzEpKTsKKyAg ICAgICAgICAgICAgICAgICAgIGRlYnVncnIyKChlcnJvdXQsIlJvb3QgYXRvbSAnJXMnXG4iLGRl c2MxKSk7CiAgCi0gCQkJCQkvKiBDcmVhdGUgdGhlIGF0b20gb2YgdGhlIG91dHB1dCB0aGF0IG1h eSBjb250YWluIHRoZSBhc3NvY2lhdGVkIElDQyBwcm9maWxlICovCi0gCQkJCQlpZiAoKGRpc3Bz W25kaXNwc10tPmljY19vdXRfYXRvbSA9IFhJbnRlcm5BdG9tKG15ZGlzcGxheSwgIl9JQ0NfUFJP RklMRSIsIEZhbHNlKSkgPT0gTm9uZSkKLS0JCQkJCQllcnJvcigiVW5hYmxlIHRvIGludGVybiBh dG9tICclcyciLCJfSUNDX1BST0ZJTEUiKTsKLSsJCQkJCQlmcHJpbnRmKHN0ZGVyciwgIlVuYWJs ZSB0byBpbnRlcm4gYXRvbSAnJXMnIiwiX0lDQ19QUk9GSUxFIik7Ci0gCQkKLSAJCQkJCS8qIEdy YWIgdGhlIEVESUQgZnJvbSB0aGUgb3V0cHV0ICovCi0gCQkJCQl7Ci1AQCAtOTkzLDcgKzk5Myw3 IEBACi0gCQkJCXNwcmludGYoZGVzYzEsICJfSUNDX1BST0ZJTEVfJWQiLGRpc3BzW2ldLT51c2Ny ZWVuKTsKKyAgICAgICAgICAgICAgICAgICAgIC8qIENyZWF0ZSB0aGUgYXRvbSBvZiB0aGUgb3V0 cHV0IHRoYXQgbWF5IGNvbnRhaW4gdGhlIGFzc29jaWF0ZWQgSUNDIHByb2ZpbGUgKi8KKyAgICAg ICAgICAgICAgICAgICAgIGlmICgoZGlzcHNbbmRpc3BzXS0+aWNjX291dF9hdG9tID0gWEludGVy bkF0b20obXlkaXNwbGF5LCAiX0lDQ19QUk9GSUxFIiwgRmFsc2UpKSA9PSBOb25lKQorLSAgICAg ICAgICAgICAgICAgICAgICAgIGVycm9yKCJVbmFibGUgdG8gaW50ZXJuIGF0b20gJyVzJyIsIl9J Q0NfUFJPRklMRSIpOworKyAgICAgICAgICAgICAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAi VW5hYmxlIHRvIGludGVybiBhdG9tICclcyciLCJfSUNDX1BST0ZJTEUiKTsKICAKLSAJCQlpZiAo KGRpc3BzW2ldLT5pY2NfYXRvbSA9IFhJbnRlcm5BdG9tKG15ZGlzcGxheSwgZGVzYzEsIEZhbHNl KSkgPT0gTm9uZSkKLS0JCQkJZXJyb3IoIlVuYWJsZSB0byBpbnRlcm4gYXRvbSAnJXMnIixkZXNj MSk7Ci0rCQkJCWZwcmludGYoc3RkZXJyLCAiVW5hYmxlIHRvIGludGVybiBhdG9tICclcyciLGRl c2MxKTsKKyAgICAgICAgICAgICAgICAgICAgIC8qIEdyYWIgdGhlIEVESUQgZnJvbSB0aGUgb3V0 cHV0ICovCisgICAgICAgICAgICAgICAgICAgICB7CitAQCAtMTAwNyw3ICsxMDA3LDcgQEAKKyAg ICAgICAgICAgICAgICAgc3ByaW50ZihkZXNjMSwgIl9JQ0NfUFJPRklMRV8lZCIsZGlzcHNbaV0t PnVzY3JlZW4pOwogIAotIAkJCS8qIFNlZSBpZiB3ZSBjYW4gbG9jYXRlIHRoZSBFRElEIG9mIHRo ZSBtb25pdG9yIGZvciB0aGlzIHNjcmVlbiAqLwotIAkJCWZvciAoaiA9IDA7IGogPCAyOyBqKysp IHsgCisgICAgICAgICAgICAgaWYgKChkaXNwc1tpXS0+aWNjX2F0b20gPSBYSW50ZXJuQXRvbSht eWRpc3BsYXksIGRlc2MxLCBGYWxzZSkpID09IE5vbmUpCistICAgICAgICAgICAgICAgIGVycm9y KCJVbmFibGUgdG8gaW50ZXJuIGF0b20gJyVzJyIsZGVzYzEpOworKyAgICAgICAgICAgICAgICBm cHJpbnRmKHN0ZGVyciwgIlVuYWJsZSB0byBpbnRlcm4gYXRvbSAnJXMnIixkZXNjMSk7CisgCisg ICAgICAgICAgICAgLyogU2VlIGlmIHdlIGNhbiBsb2NhdGUgdGhlIEVESUQgb2YgdGhlIG1vbml0 b3IgZm9yIHRoaXMgc2NyZWVuICovCisgICAgICAgICAgICAgZm9yIChqID0gMDsgaiA8IDI7IGor KykgewpkaWZmIC0tZ2l0IGEvc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvZml4LWdldHRleHQu cGF0Y2ggYi9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy9maXgtZ2V0dGV4dC5wYXRjaApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjgyMzZkY2E4NTdjMQotLS0gL2Rl di9udWxsCisrKyBiL3NyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2ZpeC1nZXR0ZXh0LnBhdGNo CkBAIC0wLDAgKzEsMTMgQEAKKyJjb2Rlc2V0IiBpbiBnZXR0ZXh0LnRyYW5zbGF0aW9uKCkgaXMg ZGVwcmVjYXRlZCB3aXRoIHB5dGhvbiAzLjExCisKKy0tLSBhL0Rpc3BsYXlDQUwvZGVmYXVsdHBh dGhzLnB5CisrKysgYi9EaXNwbGF5Q0FML2RlZmF1bHRwYXRocy5weQorQEAgLTIzMSw3ICsyMzEs NyBAQAorIAorICAgICAgICAgICAgIHRyeToKKyAgICAgICAgICAgICAgICAgb2JqLnRyYW5zbGF0 aW9uID0gZ2V0dGV4dC50cmFuc2xhdGlvbigKKy0gICAgICAgICAgICAgICAgICAgIG9iai5HRVRU RVhUX1BBQ0tBR0UsIGxvY2FsZV9kaXIsIGNvZGVzZXQ9IlVURi04IgorKyAgICAgICAgICAgICAg ICAgICAgb2JqLkdFVFRFWFRfUEFDS0FHRSwgbG9jYWxlX2RpcgorICAgICAgICAgICAgICAgICAp CisgICAgICAgICAgICAgZXhjZXB0IElPRXJyb3IgYXMgZXhjZXB0aW9uOgorICAgICAgICAgICAg ICAgICBwcmludCgiWERHOiIsIGV4Y2VwdGlvbikKZGlmZiAtLWdpdCBhL3NyY3BrZ3MvZGlzcGNh bEdVSS9wYXRjaGVzL2ZpeC1oYXJkY29kZWQtaW1wb3J0LnBhdGNoIGIvc3JjcGtncy9kaXNwY2Fs R1VJL3BhdGNoZXMvZml4LWhhcmRjb2RlZC1pbXBvcnQucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwLi5lMzI3Y2M1MTJmYzQKLS0tIC9kZXYvbnVsbAorKysgYi9z cmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy9maXgtaGFyZGNvZGVkLWltcG9ydC5wYXRjaApAQCAt MCwwICsxLDE4IEBACistLS0gYS9EaXNwbGF5Q0FML1JlYWxEaXNwbGF5U2l6ZU1NLnB5CisrKysg Yi9EaXNwbGF5Q0FML1JlYWxEaXNwbGF5U2l6ZU1NLnB5CitAQCAtMTcsMTQgKzE3LDcgQEAKKyAg ICAgICAgICMgVE9ETzogSW50ZWwgdnMgQVJNIChBcHBsZSBTaWxpY29uKSBkaXN0aW5jdGlvbgor ICAgICAgICAgZnJvbSBEaXNwbGF5Q0FMLmxpYjY0LlJlYWxEaXNwbGF5U2l6ZU1NIGltcG9ydCAq CisgZWxzZToKKy0gICAgIyBlbGlmIHN5cy5wbGF0Zm9ybSA9PSAid2luMzIiOgorLSAgICAjIFdp bmRvd3MgaGF2ZSBzZXBhcmF0ZSBmaWxlcworLSAgICBpZiBzeXMudmVyc2lvbl9pbmZvWzoyXSA9 PSAoMywgOCk6CistICAgICAgICBmcm9tIERpc3BsYXlDQUwubGliNjQucHl0aG9uMzguUmVhbERp c3BsYXlTaXplTU0gaW1wb3J0ICoKKy0gICAgZWxpZiBzeXMudmVyc2lvbl9pbmZvWzoyXSA9PSAo MywgOSk6CistICAgICAgICBmcm9tIERpc3BsYXlDQUwubGliNjQucHl0aG9uMzkuUmVhbERpc3Bs YXlTaXplTU0gaW1wb3J0ICoKKy0gICAgZWxpZiBzeXMudmVyc2lvbl9pbmZvWzoyXSA9PSAoMywg MTApOgorLSAgICAgICAgZnJvbSBEaXNwbGF5Q0FMLmxpYjY0LnB5dGhvbjMxMC5SZWFsRGlzcGxh eVNpemVNTSBpbXBvcnQgKgorKyAgICBmcm9tIERpc3BsYXlDQUwubGliNjQucHl0aG9uQFBZX1ZF UkAuUmVhbERpc3BsYXlTaXplTU0gaW1wb3J0ICoKKyAjIGVsc2U6CisgIyAgICAgcGFzcworIApk aWZmIC0tZ2l0IGEvc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvZml4LXNldHVwdG9vbHMucGF0 Y2ggYi9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy9maXgtc2V0dXB0b29scy5wYXRjaApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjQ3ZWYwZWEyZjZjOQotLS0gL2Rl di9udWxsCisrKyBiL3NyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2ZpeC1zZXR1cHRvb2xzLnBh dGNoCkBAIC0wLDAgKzEsOTUgQEAKK3NldHVwdG9vbHMgZm9yIHNvbWUgcmVhc29uIGlzIHVzZWQg YXMgYSB2YXJpYWJsZSBhbmQgYSBtb2R1bGUuCisKK0luaXRpYWxseSB0aGlzIGxlYWRzIHRvICJz ZXR1cHRvb2xzLmZpbmRhbGwiIG5vdCBiZWluZyByZWNvZ25pemVkIGFzCithIGNvbW1hbmQgcmVs YXRlZCB0byB0aGUgbW9kdWxlIGF0IGFsbC4KKworQW55IHVzZSBvZiBtb2R1bGUgbmFtZSBpbiBj b25kaXRpb25hbCBzdGF0ZW1lbnRzIGFsc28gbGVhZHMgdG8gZXJyb3IsCitoZW5jZSBzaW1wbGUg c29sdXRpb246IHJlbmFtZSB0aGUgdmFyaWFibGUuCisKKy0tLSBhL0Rpc3BsYXlDQUwvc2V0dXAu cHkKKysrKyBiL0Rpc3BsYXlDQUwvc2V0dXAucHkKK0BAIC00NTMsNyArNDUzLDcgQEAKKyAgICAg cHJlZml4ID0gIiIKKyAgICAgcmVjb3JkZmlsZV9uYW1lID0gTm9uZSAgIyByZWNvcmQgaW5zdGFs bGVkIGZpbGVzIHRvIHRoaXMgZmlsZQorICAgICBzZGlzdCA9ICJzZGlzdCIgaW4gc3lzLmFyZ3Zb MTpdCistICAgIHNldHVwdG9vbHMgPSBOb25lCisrICAgIHNldG9vbHMgPSBOb25lCisgICAgIHNr aXBfcG9zdGluc3RhbGwgPSAiLS1za2lwLXBvc3RpbnN0YWxsIiBpbiBzeXMuYXJndlsxOl0KKyAg ICAgdXNlX2Rpc3R1dGlscyA9IG5vdCBiZGlzdF9iYmZyZWV6ZSBhbmQgbm90IGRvX3B5MmFwcAor ICAgICB1c2Vfc2V0dXB0b29scyA9ICgKK0BAIC00ODAsNyArNDgwLDcgQEAKKyAgICAgICAgICAg ICBpbXBvcnQgc2V0dXB0b29scworICAgICAgICAgICAgIGZyb20gc2V0dXB0b29scyBpbXBvcnQg c2V0dXAsIEV4dGVuc2lvbgorIAorLSAgICAgICAgICAgIHNldHVwdG9vbHMgPSBUcnVlCisrICAg ICAgICAgICAgc2V0b29scyA9IFRydWUKKyAgICAgICAgICAgICBwcmludCgidXNpbmcgc2V0dXB0 b29scyIpCisgICAgICAgICAgICAgY3VycmVudF9maW5kYWxsID0gc2V0dXB0b29scy5maW5kYWxs CisgICAgICAgICBleGNlcHQgSW1wb3J0RXJyb3I6CitAQCAtNTA5LDcgKzUwOSw3IEBACisgCisg ICAgICAgICBkaXN0dXRpbHMuZmlsZWxpc3QuZmluZGFsbCA9IGZpbmRhbGwKKyAKKy0gICAgaWYg bm90IHNldHVwdG9vbHM6CisrICAgIGlmIG5vdCBzZXRvb2xzOgorICAgICAgICAgZnJvbSBkaXN0 dXRpbHMuY29yZSBpbXBvcnQgc2V0dXAsIEV4dGVuc2lvbgorIAorICAgICAgICAgcHJpbnQoInVz aW5nIGRpc3R1dGlscyIpCitAQCAtOTQ1LDcgKzk0NSw3IEBACisgICAgIGV4dF9tb2R1bGVzID0g W1JlYWxEaXNwbGF5U2l6ZU1NXQorIAorICAgICByZXF1aXJlcyA9IFtdCistICAgIGlmIG5vdCBz ZXR1cHRvb2xzIG9yIHN5cy5wbGF0Zm9ybSAhPSAid2luMzIiOgorKyAgICBpZiBub3Qgc2V0b29s cyBvciBzeXMucGxhdGZvcm0gIT0gIndpbjMyIjoKKyAgICAgICAgICMgd3hQeXRob24gd2luZG93 cyBpbnN0YWxsZXIgZG9lc24ndCBhZGQgZWdnLWluZm8gZW50cnksIHNvCisgICAgICAgICAjIGEg ZGVwZW5kZW5jeSBjaGVjayBmcm9tIHBrZ19yZXNvdXJjZXMgd291bGQgYWx3YXlzIGZhaWwKKyAg ICAgICAgIHJlcXVpcmVzLmFwcGVuZCgid3hQeXRob24gKD49ICVzKSIgJSAiLiIuam9pbihzdHIo bikgZm9yIG4gaW4gd3hfbWludmVyc2lvbikpCitAQCAtMTAyMSw3ICsxMDIxLDcgQEAKKyAgICAg ICAgICJ2ZXJzaW9uIjogbXNpdmVyc2lvbiBpZiAiYmRpc3RfbXNpIiBpbiBzeXMuYXJndlsxOl0g ZWxzZSB2ZXJzaW9uLAorICAgICB9CisgCistICAgIGlmIHNldHVwdG9vbHM6CisrICAgIGlmIHNl dG9vbHM6CisgICAgICAgICBhdHRyc1siZW50cnlfcG9pbnRzIl0gPSB7CisgICAgICAgICAgICAg Imd1aV9zY3JpcHRzIjogWworICAgICAgICAgICAgICAgICAiJXMgPSAlcy5tYWluOm1haW4lcyIK K0BAIC0xMjc4LDcgKzEyNzgsNyBAQAorICAgICAgICAgICAgIGF0dHJzWyJvcHRpb25zIl1bInB5 MmV4ZSJdLnVwZGF0ZSgKKyAgICAgICAgICAgICAgICAgeyJidW5kbGVfZmlsZXMiOiAzLCAiY29t cHJlc3NlZCI6IDAsICJvcHRpbWl6ZSI6IDAsICJza2lwX2FyY2hpdmUiOiAxfQorICAgICAgICAg ICAgICkKKy0gICAgICAgIGlmIHNldHVwdG9vbHM6CisrICAgICAgICBpZiBzZXRvb2xzOgorICAg ICAgICAgICAgIGF0dHJzWyJzZXR1cF9yZXF1aXJlcyJdID0gWyJweTJleGUiXQorICAgICAgICAg YXR0cnNbInppcGZpbGUiXSA9IG9zLnBhdGguam9pbigibGliIiwgImxpYnJhcnkuemlwIikKKyAK K0BAIC0xMzI4LDEwICsxMzI4LDEwIEBACisgICAgICAgICAjIHNpdGUtcGFja2FnZXMgKG9uIE1h YyBhbmQgV2luZG93cykgYW5kIHdoZW4gd2Ugd2FudCB0byBtYWtlIHRoZW0KKyAgICAgICAgICMg YWJzb2x1dGUgKExpbnV4KQorICAgICAgICAgbGludXggPSBzeXMucGxhdGZvcm0gbm90IGluICgi ZGFyd2luIiwgIndpbjMyIikgYW5kICgKKy0gICAgICAgICAgICBub3QgY21kLnJvb3QgYW5kIHNl dHVwdG9vbHMKKysgICAgICAgICAgICBub3QgY21kLnJvb3QgYW5kIHNldG9vbHMKKyAgICAgICAg ICkKKyAgICAgICAgIGRhcl93aW4gPSAoCistICAgICAgICAgICAgc3lzLnBsYXRmb3JtIGluICgi ZGFyd2luIiwgIndpbjMyIikgYW5kIChjbWQucm9vdCBvciBub3Qgc2V0dXB0b29scykKKysgICAg ICAgICAgICBzeXMucGxhdGZvcm0gaW4gKCJkYXJ3aW4iLCAid2luMzIiKSBhbmQgKGNtZC5yb290 IG9yIG5vdCBzZXRvb2xzKQorICAgICAgICAgKSBvciBiZGlzdF93aW4KKyAgICAgICAgIGlmICgK KyAgICAgICAgICAgICBub3QgZG9fdW5pbnN0YWxsCitAQCAtMTM4MCw3ICsxMzgwLDcgQEAKKyAg ICAgICAgICAgICAjIGxvZ2ljIHRvIGZpbmQgdGhlbQorICAgICAgICAgICAgIHBhdGhzID0gc2Fm ZV9nbG9iKG9zLnBhdGguam9pbihjbWQuaW5zdGFsbF9zY3JpcHRzLCBuYW1lKSkKKyAgICAgICAg ICAgICBpZiBzeXMucGxhdGZvcm0gPT0gIndpbjMyIjoKKy0gICAgICAgICAgICAgICAgaWYgc2V0 dXB0b29sczoKKysgICAgICAgICAgICAgICAgaWYgc2V0b29sczoKKyAgICAgICAgICAgICAgICAg ICAgIHBhdGhzICs9IHNhZmVfZ2xvYihvcy5wYXRoLmpvaW4oY21kLmluc3RhbGxfc2NyaXB0cywg ZiJ7bmFtZX0uZXhlIikpCisgICAgICAgICAgICAgICAgICAgICBwYXRocyArPSBzYWZlX2dsb2Io CisgICAgICAgICAgICAgICAgICAgICAgICAgb3MucGF0aC5qb2luKGNtZC5pbnN0YWxsX3Njcmlw dHMsIGYie25hbWV9LXNjcmlwdC5weSIpCitAQCAtMTU4Nyw3ICsxNTg3LDcgQEAKKyAgICAgICAg IG1hbmlmZXN0X2luLmFwcGVuZCgiaW5jbHVkZSAiICsgb3MucGF0aC5qb2luKCJ0ZXN0cyIsICIq IikpCisgICAgICAgICBtYW5pZmVzdF9pbi5hcHBlbmQoInJlY3Vyc2l2ZS1pbmNsdWRlIHRoZW1l ICoiKQorICAgICAgICAgbWFuaWZlc3RfaW4uYXBwZW5kKCJyZWN1cnNpdmUtaW5jbHVkZSB1dGls ICouY21kICoucHkgKi5zaCIpCistICAgICAgICBpZiBzeXMucGxhdGZvcm0gPT0gIndpbjMyIiBh bmQgbm90IHNldHVwdG9vbHM6CisrICAgICAgICBpZiBzeXMucGxhdGZvcm0gPT0gIndpbjMyIiBh bmQgbm90IHNldG9vbHM6CisgICAgICAgICAgICAgIyBPbmx5IG5lZWRlZCB1bmRlciBXaW5kb3dz CisgICAgICAgICAgICAgbWFuaWZlc3RfaW4uYXBwZW5kKCJnbG9iYWwtZXhjbHVkZSAuc3ZuLyoi KQorICAgICAgICAgbWFuaWZlc3RfaW4uYXBwZW5kKCJnbG9iYWwtZXhjbHVkZSAqfiIpCmRpZmYg LS1naXQgYS9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy9maXgtdmVyc2lvbi5wYXRjaCBiL3Ny Y3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2ZpeC12ZXJzaW9uLnBhdGNoCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uYWUwNzA5YjJiNjhjCi0tLSAvZGV2L251bGwKKysr IGIvc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvZml4LXZlcnNpb24ucGF0Y2gKQEAgLTAsMCAr MSwxMTEgQEAKK3NldHVwLnB5IHVzZXMgcGFja2FnZSB2ZXJzaW9uIHByb3ZpZGVkIHRoYXQgdGhl IGJ1aWxkZGlyIGlzIGEgZ2l0CityZXBvc2l0b3J5IGFuZCBnaXQgaXMgcHJlc2VudCBpbiBob3N0 bWFrZWRlcGVuZHMuCisKK090aGVyd2lzZSAwLjAuMCBpcyBzdXBwbGllZCBhcyB0aGUgdmVyc2lv bi4KKworLS0tIGEvc2V0dXAucHkKKysrKyBiL3NldHVwLnB5CitAQCAtNDQ1LDcxICs0NDUsNDAg QEAKKyAKKyAgICAgZnJvbSBEaXNwbGF5Q0FMLnV0aWxfb3MgaW1wb3J0IHdoaWNoCisgCistICAg IGlmICgKKy0gICAgICAgIFBhdGgocHlkaXIsICIuZ2l0IikuaXNfZGlyKCkKKy0gICAgICAgIGFu ZCAod2hpY2goImdpdCIpIG9yIHdoaWNoKCJnaXQuZXhlIikpCistICAgICAgICBhbmQgKG5vdCBz eXMuYXJndlsxOl0gb3IgKGxlbihub25fYnVpbGRfYXJncykgPCBsZW4oc3lzLmFyZ3ZbMTpdKSBh bmQgbm90IGhlbHApKQorLSAgICApOgorLSAgICAgICAgcHJpbnQoIlRyeWluZyB0byBnZXQgZ2l0 IHZlcnNpb24gaW5mb3JtYXRpb24uLi4iKQorLSAgICAgICAgZ2l0X3ZlcnNpb24gPSBOb25lCist CistICAgICAgICB0cnk6CistICAgICAgICAgICAgcCA9IHN1YnByb2Nlc3MuUG9wZW4oCistICAg ICAgICAgICAgICAgIFsiZ2l0IiwgInJldi1wYXJzZSIsICItLXNob3J0IiwgIkhFQUQiXSwKKy0g ICAgICAgICAgICAgICAgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSwKKy0gICAgICAgICAgICAgICAg Y3dkPXB5ZGlyLAorLSAgICAgICAgICAgICkKKy0gICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMg ZXhjZXB0aW9uOgorLSAgICAgICAgICAgIHByaW50KCIuLi5mYWlsZWQ6IiwgZXhjZXB0aW9uKQor LSAgICAgICAgZWxzZToKKy0gICAgICAgICAgICBnaXRfdmVyc2lvbiA9IHAuY29tbXVuaWNhdGUo KVswXS5zdHJpcCgpLmRlY29kZSgpCistICAgICAgICAgICAgdmVyc2lvbl9iYXNlX2ZpbGVfcGF0 aCA9IFBhdGgocHlkaXIsICJWRVJTSU9OX0JBU0UiKQorLSAgICAgICAgICAgIHZlcnNpb25fYmFz ZSA9ICIwLjAuMCIuc3BsaXQoIi4iKQorLQorLSAgICAgICAgICAgIGlmIHZlcnNpb25fYmFzZV9m aWxlX3BhdGguaXNfZmlsZSgpOgorLSAgICAgICAgICAgICAgICB3aXRoIG9wZW4odmVyc2lvbl9i YXNlX2ZpbGVfcGF0aCkgYXMgdmVyc2lvbl9iYXNlX2ZpbGU6CistICAgICAgICAgICAgICAgICAg ICB2ZXJzaW9uX2Jhc2UgPSB2ZXJzaW9uX2Jhc2VfZmlsZS5yZWFkKCkuc3RyaXAoKS5zcGxpdCgi LiIpCistCistICAgICAgICBwcmludCgiVHJ5aW5nIHRvIGdldCBnaXQgaW5mb3JtYXRpb24uLi4i KQorLSAgICAgICAgbGFzdG1vZCA9ICIiCistICAgICAgICB0aW1lc3RhbXAgPSBOb25lCistICAg ICAgICBtdGltZSA9IDAKKy0KKy0gICAgICAgIHRyeToKKy0gICAgICAgICAgICBwID0gc3VicHJv Y2Vzcy5Qb3BlbigKKy0gICAgICAgICAgICAgICAgWyJnaXQiLCAibG9nIiwgIi0xIiwgIi0tZm9y bWF0PSVjdCJdLCBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFLCBjd2Q9cHlkaXIKKysgICAgdmVyc2lv bl9iYXNlX2ZpbGVfcGF0aCA9IFBhdGgocHlkaXIsICJWRVJTSU9OX0JBU0UiKQorKworKyAgICB3 aXRoIG9wZW4odmVyc2lvbl9iYXNlX2ZpbGVfcGF0aCkgYXMgdmVyc2lvbl9iYXNlX2ZpbGU6Cisr ICAgICAgICB2ZXJzaW9uX2Jhc2UgPSB2ZXJzaW9uX2Jhc2VfZmlsZS5yZWFkKCkuc3RyaXAoKS5z cGxpdCgiLiIpCisrCisrICAgIGxhc3Rtb2QgPSAiIgorKyAgICB0aW1lc3RhbXAgPSBOb25lCisr ICAgIG10aW1lID0gMAorKyAgICB0aW1lc3RhbXAgPSB0aW1lLmdtdGltZShtdGltZSkKKysKKysg ICAgaWYgdGltZXN0YW1wOgorKyAgICAgICAgbGFzdG1vZCA9IGYie3N0cmZ0aW1lKCclWS0lbS0l ZFQlSDolTTolUycsIHRpbWVzdGFtcCl9WiIKKysKKysgICAgaWYgbm90IGRyeV9ydW46CisrICAg ICAgICBwcmludCgiR2VuZXJhdGluZyBfX3ZlcnNpb25fXy5weSIpCisrCisrICAgICAgICB3aXRo IG9wZW4oUGF0aChweWRpciwgIkRpc3BsYXlDQUwiLCAiX192ZXJzaW9uX18ucHkiKSwgInciKSBh cyB2ZXJzaW9ucHk6CisrICAgICAgICAgICAgdmVyc2lvbnB5LndyaXRlKCIjIGdlbmVyYXRlZCBi eSBzZXR1cC5weVxuXG4iKQorKyAgICAgICAgICAgIGJ1aWxkX3RpbWUgPSB0aW1lLnRpbWUoKQor KyAgICAgICAgICAgIHZlcnNpb25weS53cml0ZSgKKysgICAgICAgICAgICAgICAgZiJCVUlMRF9E QVRFID0gIgorKyAgICAgICAgICAgICAgICBmIlwie3N0cmZ0aW1lKCclWS0lbS0lZFQlSDolTTol UycsIGdtdGltZShidWlsZF90aW1lKSl9WlwiXG4iCisgICAgICAgICAgICAgKQorLSAgICAgICAg ZXhjZXB0IEV4Y2VwdGlvbiBhcyBleGNlcHRpb246CistICAgICAgICAgICAgcHJpbnQoIi4uLmZh aWxlZDoiLCBleGNlcHRpb24pCistICAgICAgICBlbHNlOgorLSAgICAgICAgICAgIG10aW1lID0g aW50KHAuY29tbXVuaWNhdGUoKVswXS5zdHJpcCgpLmRlY29kZSgpKQorLSAgICAgICAgICAgIHRp bWVzdGFtcCA9IHRpbWUuZ210aW1lKG10aW1lKQorLQorLSAgICAgICAgaWYgdGltZXN0YW1wOgor LSAgICAgICAgICAgIGxhc3Rtb2QgPSBmIntzdHJmdGltZSgnJVktJW0tJWRUJUg6JU06JVMnLCB0 aW1lc3RhbXApfVoiCistCistICAgICAgICBpZiBub3QgZHJ5X3J1bjoKKy0gICAgICAgICAgICBw cmludCgiR2VuZXJhdGluZyBfX3ZlcnNpb25fXy5weSIpCistCistICAgICAgICAgICAgd2l0aCBv cGVuKFBhdGgocHlkaXIsICJEaXNwbGF5Q0FMIiwgIl9fdmVyc2lvbl9fLnB5IiksICJ3IikgYXMg dmVyc2lvbnB5OgorLSAgICAgICAgICAgICAgICB2ZXJzaW9ucHkud3JpdGUoIiMgZ2VuZXJhdGVk IGJ5IHNldHVwLnB5XG5cbiIpCistICAgICAgICAgICAgICAgIGJ1aWxkX3RpbWUgPSB0aW1lLnRp bWUoKQorLSAgICAgICAgICAgICAgICB2ZXJzaW9ucHkud3JpdGUoCistICAgICAgICAgICAgICAg ICAgICBmIkJVSUxEX0RBVEUgPSAiCistICAgICAgICAgICAgICAgICAgICBmIlwie3N0cmZ0aW1l KCclWS0lbS0lZFQlSDolTTolUycsIGdtdGltZShidWlsZF90aW1lKSl9WlwiXG4iCistICAgICAg ICAgICAgICAgICkKKy0KKy0gICAgICAgICAgICAgICAgaWYgbGFzdG1vZDoKKy0gICAgICAgICAg ICAgICAgICAgIHZlcnNpb25weS53cml0ZShmIkxBU1RNT0QgPSB7bGFzdG1vZCFyfVxuIikKKy0K Ky0gICAgICAgICAgICAgICAgaWYgZ2l0X3ZlcnNpb246CistICAgICAgICAgICAgICAgICAgICBw cmludCgiVmVyc2lvbiIsICIuIi5qb2luKHZlcnNpb25fYmFzZSkpCistICAgICAgICAgICAgICAg ICAgICB2ZXJzaW9ucHkud3JpdGUoIlZFUlNJT04gPSAoJXMpXG4iICUgIiwgIi5qb2luKHZlcnNp b25fYmFzZSkpCistICAgICAgICAgICAgICAgICAgICB2ZXJzaW9ucHkud3JpdGUoIlZFUlNJT05f QkFTRSA9ICglcylcbiIgJSAiLCAiLmpvaW4odmVyc2lvbl9iYXNlKSkKKy0gICAgICAgICAgICAg ICAgICAgIHZlcnNpb25weS53cml0ZSgiVkVSU0lPTl9TVFJJTkcgPSAlclxuIiAlICIuIi5qb2lu KHZlcnNpb25fYmFzZSkpCisgCistICAgICAgICAgICAgICAgICAgICB3aXRoIG9wZW4oUGF0aChw eWRpciwgIlZFUlNJT04iKSwgInciKSBhcyB2ZXJzaW9udHh0OgorLSAgICAgICAgICAgICAgICAg ICAgICAgIHZlcnNpb250eHQud3JpdGUoIi4iLmpvaW4odmVyc2lvbl9iYXNlKSkKKysgICAgICAg ICAgICBpZiBsYXN0bW9kOgorKyAgICAgICAgICAgICAgICB2ZXJzaW9ucHkud3JpdGUoZiJMQVNU TU9EID0ge2xhc3Rtb2Qhcn1cbiIpCisrCisrICAgICAgICAgICAgcHJpbnQoIlZlcnNpb24iLCAi LiIuam9pbih2ZXJzaW9uX2Jhc2UpKQorKyAgICAgICAgICAgIHZlcnNpb25weS53cml0ZSgiVkVS U0lPTiA9ICglcylcbiIgJSAiLCAiLmpvaW4odmVyc2lvbl9iYXNlKSkKKysgICAgICAgICAgICB2 ZXJzaW9ucHkud3JpdGUoIlZFUlNJT05fQkFTRSA9ICglcylcbiIgJSAiLCAiLmpvaW4odmVyc2lv bl9iYXNlKSkKKysgICAgICAgICAgICB2ZXJzaW9ucHkud3JpdGUoIlZFUlNJT05fU1RSSU5HID0g JXJcbiIgJSAiLiIuam9pbih2ZXJzaW9uX2Jhc2UpKQorKworKyAgICAgICAgICAgIHdpdGggb3Bl bihQYXRoKHB5ZGlyLCAiVkVSU0lPTiIpLCAidyIpIGFzIHZlcnNpb250eHQ6CisrICAgICAgICAg ICAgICAgIHZlcnNpb250eHQud3JpdGUoIi4iLmpvaW4odmVyc2lvbl9iYXNlKSkKKyAKKyAgICAg YmFja3VwX3NldHVwX3BhdGggPSBQYXRoKHB5ZGlyLCAic2V0dXAuY2ZnLmJhY2t1cCIpCisgICAg IHNldHVwX3BhdGggPSBQYXRoKHB5ZGlyLCAic2V0dXAuY2ZnIikKZGlmZiAtLWdpdCBhL3NyY3Br Z3MvZGlzcGNhbEdVSS9wYXRjaGVzL3VwZGF0ZS1jaGVjay5wYXRjaCBiL3NyY3BrZ3MvZGlzcGNh bEdVSS9wYXRjaGVzL3VwZGF0ZS1jaGVjay5wYXRjaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAuLjM4Mjk0M2E2NzI0ZQotLS0gL2Rldi9udWxsCisrKyBiL3NyY3BrZ3Mv ZGlzcGNhbEdVSS9wYXRjaGVzL3VwZGF0ZS1jaGVjay5wYXRjaApAQCAtMCwwICsxLDkwIEBACitR dWl0ZSBhIGNydWRlIGF0dGVtcHQgdG8gcmVtb3ZlIHVwZGF0ZSBjaGVja3MsIGJ1dCBpdCBzaG91 bGQgd29yay4KKworVXBkYXRlIGNoZWNrcyBhbHNvIHVzZWQgdG8gdHJpZ2dlciBwb3B1cCBkb25h dGlvbiB3aW5kb3cgYXQgc3RhcnR1cCwKK2J1dCBub3QgYW55bW9yZSB3aXRoIHRoZXNlIHBhdGNo ZXMuCisKKy0tLSBhL0Rpc3BsYXlDQUwvZGlzcGxheV9jYWwucHkKKysrKyBiL0Rpc3BsYXlDQUwv ZGlzcGxheV9jYWwucHkKK0BAIC0zMTE5LDE2ICszMTE5LDYgQEAKKyAgICAgICAgIHNlbGYuQmlu ZCh3eC5FVlRfTUVOVSwgc2VsZi5oZWxwX3N1cHBvcnRfaGFuZGxlciwgbWVudWl0ZW0pCisgICAg ICAgICBtZW51aXRlbSA9IGhlbHAuRmluZEl0ZW1CeUlkKGhlbHAuRmluZEl0ZW0oImJ1Z19yZXBv cnQiKSkKKyAgICAgICAgIHNlbGYuQmluZCh3eC5FVlRfTUVOVSwgc2VsZi5idWdfcmVwb3J0X2hh bmRsZXIsIG1lbnVpdGVtKQorLSAgICAgICAgc2VsZi5tZW51aXRlbV9hcHBfYXV0b191cGRhdGVf Y2hlY2sgPSBoZWxwLkZpbmRJdGVtQnlJZCgKKy0gICAgICAgICAgICBoZWxwLkZpbmRJdGVtKCJ1 cGRhdGVfY2hlY2sub25zdGFydHVwIikKKy0gICAgICAgICkKKy0gICAgICAgIHNlbGYuQmluZCgK Ky0gICAgICAgICAgICB3eC5FVlRfTUVOVSwKKy0gICAgICAgICAgICBzZWxmLmFwcF9hdXRvX3Vw ZGF0ZV9jaGVja19oYW5kbGVyLAorLSAgICAgICAgICAgIHNlbGYubWVudWl0ZW1fYXBwX2F1dG9f dXBkYXRlX2NoZWNrLAorLSAgICAgICAgKQorLSAgICAgICAgbWVudWl0ZW0gPSBoZWxwLkZpbmRJ dGVtQnlJZChoZWxwLkZpbmRJdGVtKCJ1cGRhdGVfY2hlY2siKSkKKy0gICAgICAgIHNlbGYuQmlu ZCh3eC5FVlRfTUVOVSwgc2VsZi5hcHBfdXBkYXRlX2NoZWNrX2hhbmRsZXIsIG1lbnVpdGVtKQor IAorICAgICAgICAgaWYgc3lzLnBsYXRmb3JtID09ICJkYXJ3aW4iOgorICAgICAgICAgICAgIHd4 LkdldEFwcCgpLlNldE1hY0Fib3V0TWVudUl0ZW1JZChzZWxmLm1lbnVpdGVtX2Fib3V0LkdldElk KCkpCitAQCAtMzI1Nyw3ICszMjQ3LDYgQEAKKyAgICAgICAgIHNlbGYubWVudWl0ZW1fc2hvd19s b2cuQ2hlY2soYm9vbChnZXRjZmcoImxvZy5zaG93IikpKQorICAgICAgICAgc2VsZi5tZW51aXRl bV9sb2dfYXV0b3Nob3cuRW5hYmxlKG5vdCBib29sKGdldGNmZygibG9nLnNob3ciKSkpCisgICAg ICAgICBzZWxmLm1lbnVpdGVtX2xvZ19hdXRvc2hvdy5DaGVjayhib29sKGdldGNmZygibG9nLmF1 dG9zaG93IikpKQorLSAgICAgICAgc2VsZi5tZW51aXRlbV9hcHBfYXV0b191cGRhdGVfY2hlY2su Q2hlY2soYm9vbChnZXRjZmcoInVwZGF0ZV9jaGVjayIpKSkKKyAKKyAgICAgZGVmIGluaXRfY29u dHJvbHMoc2VsZik6CisgICAgICAgICAiIiJJbml0aWFsaXplIHRoZSBtYWluIHdpbmRvdyBjb250 cm9scyBhbmQgdGhlaXIgZXZlbnQgaGFuZGxlcnMuIiIiCitAQCAtNDA0Nyw3ICs0MDM2LDYgQEAK KyAgICAgICAgICAgICAidW50ZXRoZXJlZC5tYXhfZGVsdGEuY2hyb21hIiwKKyAgICAgICAgICAg ICAidW50ZXRoZXJlZC5taW5fZGVsdGEiLAorICAgICAgICAgICAgICJ1bnRldGhlcmVkLm1pbl9k ZWx0YS5saWdodG5lc3MiLAorLSAgICAgICAgICAgICJ1cGRhdGVfY2hlY2siLAorICAgICAgICAg ICAgICJ3ZWJzZXJ2ZXIucG9ydG51bWJlciIsCisgICAgICAgICAgICAgIndoaXRlcG9pbnQudmlz dWFsX2VkaXRvci5iZ192IiwKKyAgICAgICAgICAgICAid2hpdGVwb2ludC52aXN1YWxfZWRpdG9y LmIiLAorQEAgLTE5NDc0LDE5ICsxOTQ2Miw2IEBACisgICAgICAgICBhcHAuZnJhbWUuU2hvdygp CisgICAgICAgICBhcHAucHJvY2Vzc19hcmd2KDEpCisgICAgICAgICB3eC5DYWxsQWZ0ZXIoYXBw LmZyYW1lLlJhaXNlKQorLSAgICAgICAgIyBDaGVjayBmb3IgdXBkYXRlcyBpZiBjb25maWd1cmVk CistICAgICAgICBpZiBnZXRjZmcoInVwZGF0ZV9jaGVjayIpOgorLSAgICAgICAgICAgICMgR2l2 ZSB0aW1lIGZvciB0aGUgbWFpbiB3aW5kb3cgdG8gZ2FpbiBmb2N1cyBiZWZvcmUgY2hlY2tpbmcg Zm9yCistICAgICAgICAgICAgIyB1cGRhdGUsIG90aGVyd2lzZSB0aGUgbWFpbiB3aW5kb3cgbWF5 IHN0ZWFsIHRoZSB1cGRhdGUKKy0gICAgICAgICAgICAjIGNvbmZpcm1hdGlvbiBkaWFsb2cncyBm b2N1cyB3aGljaCBsb29rcyB3ZWlyZAorLSAgICAgICAgICAgIHd4LkNhbGxBZnRlcihhcHAuZnJh bWUuYXBwX3VwZGF0ZV9jaGVja19oYW5kbGVyLCBOb25lLCBzaWxlbnQ9VHJ1ZSkKKy0gICAgICAg IGVsc2U6CistICAgICAgICAgICAgIyBDaGVjayBpZiB3ZSBuZWVkIHRvIHJ1biBpbnN0cnVtZW50 IHNldHVwCistICAgICAgICAgICAgd3guQ2FsbEFmdGVyKAorLSAgICAgICAgICAgICAgICBhcHAu ZnJhbWUuY2hlY2tfaW5zdHJ1bWVudF9zZXR1cCwKKy0gICAgICAgICAgICAgICAgY2hlY2tfZG9u YXRpb24sCistICAgICAgICAgICAgICAgIChhcHAuZnJhbWUsIFZFUlNJT04gPiBWRVJTSU9OX0JB U0UpLAorLSAgICAgICAgICAgICkKKyAgICAgICAgICMgSWYgcmVzb3VyY2VzIGFyZSBtaXNzaW5n LCBYUkMgc2hvd3MgYW4gZXJyb3IgZGlhbG9nIHdoaWNoIGltbWVkaWF0ZWx5CisgICAgICAgICAj IGdldHMgaGlkZGVuIHdoZW4gd2UgY2xvc2Ugb3Vyc2VsdmVzIGJlY2F1c2Ugd2UgYXJlIHRoZSBw YXJlbnQuCisgICAgICAgICAjIEhpZGUgaW5zdGVhZC4KKy0tLSBhL0Rpc3BsYXlDQUwvd29ya2Vy LnB5CisrKysgYi9EaXNwbGF5Q0FML3dvcmtlci5weQorQEAgLTE2MTAsMTAgKzE2MTAsNiBAQAor ICAgICAgICAgZGxnX3Jlc3VsdCA9IGRsZy5TaG93TW9kYWwoKQorICAgICAgICAgZGxnLkRlc3Ry b3koKQorICAgICAgICAgaWYgZGxnX3Jlc3VsdCA9PSB3eC5JRF9PSzoKKy0gICAgICAgICAgICAj IERvd25sb2FkIEFyZ3lsbCBDTVMKKy0gICAgICAgICAgICBmcm9tIERpc3BsYXlDQUwuZGlzcGxh eV9jYWwgaW1wb3J0IGFwcF91cGRhdGVfY2hlY2sKKy0KKy0gICAgICAgICAgICBhcHBfdXBkYXRl X2NoZWNrKHBhcmVudCwgc2lsZW50LCBhcmd5bGw9VHJ1ZSkKKyAgICAgICAgICAgICByZXR1cm4g RmFsc2UKKyAgICAgICAgIGVsaWYgZGxnX3Jlc3VsdCA9PSB3eC5JRF9DQU5DRUw6CisgICAgICAg ICAgICAgaWYgY2FsbGFmdGVyOgorLS0tIGEvRGlzcGxheUNBTC94cmMvbWFpbm1lbnUueHJjCisr KysgYi9EaXNwbGF5Q0FML3hyYy9tYWlubWVudS54cmMKK0BAIC0yMzEsMTQgKzIzMSw2IEBACisg ICAgICAgICA8bGFiZWw+YnVnX3JlcG9ydDwvbGFiZWw+CisgICAgICAgPC9vYmplY3Q+CisgICAg ICAgPG9iamVjdCBjbGFzcz0ic2VwYXJhdG9yIi8+CistICAgICAgPG9iamVjdCBjbGFzcz0id3hN ZW51SXRlbSIgbmFtZT0idXBkYXRlX2NoZWNrLm9uc3RhcnR1cCI+CistICAgICAgICA8bGFiZWw+ dXBkYXRlX2NoZWNrLm9uc3RhcnR1cDwvbGFiZWw+CistICAgICAgICA8Y2hlY2thYmxlPjE8L2No ZWNrYWJsZT4KKy0gICAgICA8L29iamVjdD4KKy0gICAgICA8b2JqZWN0IGNsYXNzPSJ3eE1lbnVJ dGVtIiBuYW1lPSJ1cGRhdGVfY2hlY2siPgorLSAgICAgICAgPGxhYmVsPnVwZGF0ZV9jaGVjazwv bGFiZWw+CistICAgICAgPC9vYmplY3Q+CistICAgICAgPG9iamVjdCBjbGFzcz0ic2VwYXJhdG9y Ii8+CisgICAgICAgPGxhYmVsPm1lbnUuaGVscDwvbGFiZWw+CisgICAgIDwvb2JqZWN0PgorICAg PC9vYmplY3Q+CmRpZmYgLS1naXQgYS9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy94ZGctYXV0 b3N0YXJ0LnBhdGNoIGIvc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMveGRnLWF1dG9zdGFydC5w YXRjaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjdmOTVlMDc1MjFm MgotLS0gL2Rldi9udWxsCisrKyBiL3NyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL3hkZy1hdXRv c3RhcnQucGF0Y2gKQEAgLTAsMCArMSwxNiBAQAorVHJpZXMgdG8gaW5zdGFsbCBhIGRlc2t0b3Ag ZmlsZSBpbiAvdXNyL3NoYXJlL3RtcCBpbnN0ZWFkIG9mCisvZXRjL3hkZy9hdXRvc3RhcnQuCisK Ky0tLSBhL0Rpc3BsYXlDQUwvc2V0dXAucHkKKysrKyBiL0Rpc3BsYXlDQUwvc2V0dXAucHkKK0BA IC03MDksOSArNzA5LDcgQEAKKyAgICAgICAgICAgICApCisgICAgICAgICAgICAgZGF0YV9maWxl cy5hcHBlbmQoCisgICAgICAgICAgICAgICAgICgKKy0gICAgICAgICAgICAgICAgICAgIGF1dG9z dGFydAorLSAgICAgICAgICAgICAgICAgICAgaWYgb3MuZ2V0ZXVpZCgpID09IDAgb3IgcHJlZml4 LnN0YXJ0c3dpdGgoIi8iKQorLSAgICAgICAgICAgICAgICAgICAgZWxzZSBhdXRvc3RhcnRfaG9t ZSwKKysgICAgICAgICAgICAgICAgICAgIGF1dG9zdGFydCwKKyAgICAgICAgICAgICAgICAgICAg IFsKKyAgICAgICAgICAgICAgICAgICAgICAgICBvcy5wYXRoLmpvaW4oCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHB5ZGlyLApkaWZmIC0tZ2l0IGEvc3JjcGtncy9kaXNwY2FsR1VJL3Rl bXBsYXRlIGIvc3JjcGtncy9kaXNwY2FsR1VJL3RlbXBsYXRlCmluZGV4IDA1MDg2Yjk3ZTVhMi4u YjY4NDY1ZmNjM2FkIDEwMDY0NAotLS0gYS9zcmNwa2dzL2Rpc3BjYWxHVUkvdGVtcGxhdGUKKysr IGIvc3JjcGtncy9kaXNwY2FsR1VJL3RlbXBsYXRlCkBAIC0xLDI1ICsxLDM0IEBACiAjIFRlbXBs YXRlIGZpbGUgZm9yICdkaXNwY2FsR1VJJwogcGtnbmFtZT1kaXNwY2FsR1VJCi12ZXJzaW9uPTMu OC45LjMKLXJldmlzaW9uPTUKLV9uYW1lPSJEaXNwbGF5Q0FMIgotYnVpbGRfc3R5bGU9cHl0aG9u Mi1tb2R1bGUKLWhvc3RtYWtlZGVwZW5kcz0icHl0aG9uIgotbWFrZWRlcGVuZHM9InB5dGhvbi1k ZXZlbCBsaWJYeGY4NnZtLWRldmVsIGxpYlhpbmVyYW1hLWRldmVsIGxpYlhyYW5kci1kZXZlbCIK LWRlcGVuZHM9InB5dGhvbi1kYnVzIHB5dGhvbi1udW1weSB3eFB5dGhvbiBhcmd5bGxjbXMiCit2 ZXJzaW9uPTMuOS44CityZXZpc2lvbj0xCitidWlsZF9zdHlsZT1weXRob24zLXBlcDUxNworaG9z dG1ha2VkZXBlbmRzPSJweXRob24zLXNldHVwdG9vbHMgcHl0aG9uMy13aGVlbCIKK21ha2VkZXBl bmRzPSJweXRob24zLWRldmVsIGxpYlh4Zjg2dm0tZGV2ZWwgbGliWGluZXJhbWEtZGV2ZWwgbGli WHJhbmRyLWRldmVsIgorZGVwZW5kcz0icHl0aG9uMy1kaXN0cm8gcHl0aG9uMy1kYnVzIHB5dGhv bjMtbnVtcHkgcHl0aG9uMy1QaWxsb3cKKyBweXRob24zLWNocm9tZWNhc3QgcHl0aG9uMy1zZW5k MnRyYXNoIHd4UHl0aG9uNCBweXRob24zLXplcm9jb25mCisgcHl0aG9uMy1jZXJ0aWZpIGFyZ3ls bGNtcyIKIHNob3J0X2Rlc2M9IkRpc3BsYXkgQ2FsaWJyYXRpb24gYW5kIENoYXJhY3Rlcml6YXRp b24iCiBtYWludGFpbmVyPSJsZW1taSA8bGVtbWlAbmVyZDJuZXJkLm9yZz4iCiBsaWNlbnNlPSJH UEwtMy4wLW9yLWxhdGVyIgotaG9tZXBhZ2U9Imh0dHBzOi8vZGlzcGxheWNhbC5uZXQvIgotY2hh bmdlbG9nPSJodHRwczovL2Rpc3BsYXljYWwubmV0L0NIQU5HRVMuaHRtbCIKLWRpc3RmaWxlcz0i JHtTT1VSQ0VGT1JHRV9TSVRFfS9kaXNwY2FsZ3VpLyR7X25hbWV9LSR7dmVyc2lvbn0udGFyLmd6 IgotY2hlY2tzdW09N2MzNGRmYmQ5ZjY2ZjI0ZjFkNGM4OGRlNGE1YTBkZTY4OGFhZDcxOWYwOTU4 NzRiNjI1OTYzN2QzMDg5M2JlYQoraG9tZXBhZ2U9Imh0dHBzOi8vZ2l0aHViLmNvbS9lb3lpbG1h ei9kaXNwbGF5Y2FsLXB5MyIKK2NoYW5nZWxvZz0iaHR0cHM6Ly9naXRodWIuY29tL2VveWlsbWF6 L2Rpc3BsYXljYWwtcHkzL3JlbGVhc2VzL3RhZy8ke3ZlcnNpb259IgorZGlzdGZpbGVzPSJodHRw czovL2dpdGh1Yi5jb20vZW95aWxtYXovZGlzcGxheWNhbC1weTMvYXJjaGl2ZS8ke3ZlcnNpb259 LnRhci5neiIKK2NoZWNrc3VtPWE5ZThiYmEwMmY5YmRmOGRmNTA2ZjBkY2JiZWE0ZWFlNDg3OTUw MDFjYjgxZWE1OTY4ZmJmYzQxZjRiNzJlMWQKKyMgcmVxdWlyZXMgcnVubmluZyBYMTEgc2VydmVy IGFuZCBkYnVzLWRhZW1vbgorbWFrZV9jaGVjaz1ubworCitwb3N0X3BhdGNoKCkgeworCSMgc2V0 IHRoZSBoYXJkY29kZWQgdmVyc2lvbiBvZiBweXRob24gMyB0byB0aGUgbGF0ZXN0IG9uZQorCXNl ZCAtaSAic3xeXChweV9tYXh2ZXJzaW9uID1cKS4qfFwxICgke3B5M192ZXIlLip9LCAke3B5M192 ZXIjKi59KXwiIERpc3BsYXlDQUwvbWV0YS5weQorCisJc2VkIC1pICJzfEBQWV9WRVJAfCR7cHkz X3Zlci8uL318ZyIgRGlzcGxheUNBTC9SZWFsRGlzcGxheVNpemVNTS5weQorfQogCiBwcmVfY29u ZmlndXJlKCkgewogCXNlZCAtaSAnc3xNaW1lVHlwZT1tb2RlbC92cm1sO3gtd29ybGQveC12cm1s O3xNaW1lVHlwZT1tb2RlbC92cm1sO3wnIG1pc2MvZGlzcGxheWNhbC12cm1sLXRvLXgzZC1jb252 ZXJ0ZXIuZGVza3RvcAogfQogCi1wb3N0X2luc3RhbGwoKSB7Ci0JZmluZCAke0RFU1RESVJ9L3Vz ci8gLWV4ZWMgY2htb2QgYStyIFx7XH0gKwotCWZpbmQgJHtERVNURElSfS91c3IvIC10eXBlIGQg LWV4ZWMgY2htb2QgYSt4IFx7XH0gKworZG9faW5zdGFsbCgpIHsKKwlweXRob24zIC1tIGluc3Rh bGxlciAtLWRlc3RkaXIgJHtERVNURElSfSBkaXN0Lyoud2hsCiB9Cg== --===============3379103998142044418==--