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 13812 invoked from network); 11 Nov 2022 16:49:54 -0000 Received: from localhost (HELO inbox.vuxu.org) (::1) by localhost with ESMTPUTF8; 11 Nov 2022 16:49:54 -0000 Content-Type: multipart/mixed; boundary="===============2757470619649473404==" 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:49:53 +0100 List-Id: Message-ID: <20221111164953.ktNRwMGtNGS9jiIwbqOsWJ-reOy4sokDe_7ia7rrQB0@z> GitHub notification mails are now in MIME to allow UTF8. --===============2757470619649473404== 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== --===============2757470619649473404== Content-Type: text/x-diff MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="github-pr-dispcalgui-40420.patch" RnJvbSBhNDg3YjI0Mzk3OTUzMmJkNmM4MWZjODk3Mjc5MWQ4NTYxYzAzNjJhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLcnVsIENldGVyIDxrcnVjZXRlckBwcm90b24ubWU+CkRhdGU6 IFdlZCwgOSBOb3YgMjAyMiAyMDowODoxNyArMDMwMApTdWJqZWN0OiBbUEFUQ0hdIGRpc3BjYWxH VUk6IHVwZGF0ZSB0byAzLjkuOCwgY2hhbmdlIHVwc3RyZWFtLgoKZGlzcGNhbEdVSSBpcyBub3Qg bWFpbnRhaW5lZCBieSBpdHMgb3JpZ2luYWwgYXV0aG9ycyBhbnltb3JlLgoKVGhlIHNpZ25pZmlj YW50IGFkdmFudGFnZSBvZiB0aGUgZm9yayBpcyBweXRob24gMyBzdXBwb3J0IHdoaWNoCmV4Y2x1 ZGVzIHB5dGhvbiAyIGZyb20gZGVwZW5kZW5jaWVzIChyZWxhdGVkIHRvIHZvaWQtcGFja2FnZXMj MzgyMjkpLgotLS0KIC4uLi9kaXNwY2FsR1VJL3BhdGNoZXMvZW5hYmxlLWFwcGRhdGEucGF0Y2gg ICB8ICAyOCArKysrKwogc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvZXJyb3IucGF0Y2ggICAg ICAgIHwgIDQ0ICsrKy0tLS0KIHNyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2ZpeC1nZXR0ZXh0 LnBhdGNoICB8ICAxMyArKwogLi4uL3BhdGNoZXMvZml4LWhhcmRjb2RlZC1pbXBvcnQucGF0Y2gg ICAgICAgIHwgIDE4ICsrKwogLi4uL2Rpc3BjYWxHVUkvcGF0Y2hlcy9maXgtc2V0dXB0b29scy5w YXRjaCAgIHwgIDk1ICsrKysrKysrKysrKysrKwogc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMv Zml4LXZlcnNpb24ucGF0Y2ggIHwgMTExICsrKysrKysrKysrKysrKysrKwogLi4uL2Rpc3BjYWxH VUkvcGF0Y2hlcy9ybS14ZGctYXV0b3N0YXJ0LnBhdGNoIHwgIDE2ICsrKwogc3JjcGtncy9kaXNw Y2FsR1VJL3BhdGNoZXMvdXBkYXRlLWNoZWNrLnBhdGNoIHwgIDkwICsrKysrKysrKysrKysrCiBz cmNwa2dzL2Rpc3BjYWxHVUkvdGVtcGxhdGUgICAgICAgICAgICAgICAgICAgfCAgMzcgKysrLS0t CiA5IGZpbGVzIGNoYW5nZWQsIDQxNiBpbnNlcnRpb25zKCspLCAzNiBkZWxldGlvbnMoLSkKIGNy ZWF0ZSBtb2RlIDEwMDY0NCBzcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy9lbmFibGUtYXBwZGF0 YS5wYXRjaAogY3JlYXRlIG1vZGUgMTAwNjQ0IHNyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2Zp eC1nZXR0ZXh0LnBhdGNoCiBjcmVhdGUgbW9kZSAxMDA2NDQgc3JjcGtncy9kaXNwY2FsR1VJL3Bh dGNoZXMvZml4LWhhcmRjb2RlZC1pbXBvcnQucGF0Y2gKIGNyZWF0ZSBtb2RlIDEwMDY0NCBzcmNw a2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy9maXgtc2V0dXB0b29scy5wYXRjaAogY3JlYXRlIG1vZGUg MTAwNjQ0IHNyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2ZpeC12ZXJzaW9uLnBhdGNoCiBjcmVh dGUgbW9kZSAxMDA2NDQgc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvcm0teGRnLWF1dG9zdGFy dC5wYXRjaAogY3JlYXRlIG1vZGUgMTAwNjQ0IHNyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL3Vw ZGF0ZS1jaGVjay5wYXRjaAoKZGlmZiAtLWdpdCBhL3NyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVz L2VuYWJsZS1hcHBkYXRhLnBhdGNoIGIvc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvZW5hYmxl LWFwcGRhdGEucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi5j YjFhZjdmZWQ2ODgKLS0tIC9kZXYvbnVsbAorKysgYi9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hl cy9lbmFibGUtYXBwZGF0YS5wYXRjaApAQCAtMCwwICsxLDI4IEBACitjcmVhdGVfYXBwZGF0YSBh bmQgYnVpbGRzZXJ2aWNlIGFyZSBub3Qgc2V0IHRvIFRydWUgYWZ0ZXIgY2FsbGluZworc2V0dXAu cHkgZXh0ZXJuYWxseSAoInNkaXN0IiBhbmQvb3IgImluc3RhbGwiIGFyZSBub3QgdXNlZCksIGxl YWRpbmcgdG8KK25ldC5kaXNwbGF5Y2FsLkRpc3BsYXlDQUwuYXBwZGF0YS54bWwgbm90IGJlaW5n IGZvdW5kIGZvciBjb3B5aW5nIGluCit0aGUgYnVpbGQgcGhhc2UuCisKKy0tLSBhL3NldHVwLnB5 CisrKysgYi9zZXR1cC5weQorQEAgLTYzOSwxOCArNjM5LDggQEAKKyAgICAgICAgIGlmIGxlbihz eXMuYXJndikgPT0gMSBvciAobGVuKHN5cy5hcmd2KSA9PSAyIGFuZCBkcnlfcnVuKToKKyAgICAg ICAgICAgICByZXR1cm4KKyAKKy0gICAgY3JlYXRlX2FwcGRhdGEgPSAoCistICAgICAgICAoYXBw ZGF0YSBvciAiaW5zdGFsbCIgaW4gc3lzLmFyZ3ZbMTpdIG9yICJzZGlzdCIgaW4gc3lzLmFyZ3Zb MTpdKQorLSAgICAgICAgYW5kIG5vdCBoZWxwCistICAgICAgICBhbmQgbm90IGRyeV9ydW4KKy0g ICAgKQorLQorLSAgICBpZiAoCistICAgICAgICAic2Rpc3QiIGluIHN5cy5hcmd2WzE6XQorLSAg ICAgICAgb3IgImluc3RhbGwiIGluIHN5cy5hcmd2WzE6XQorLSAgICAgICAgb3IgImJkaXN0X2Rl YiIgaW4gc3lzLmFyZ3ZbMTpdCistICAgICkgYW5kIG5vdCBoZWxwOgorLSAgICAgICAgYnVpbGRz ZXJ2aWNlID0gVHJ1ZQorKyAgICBjcmVhdGVfYXBwZGF0YSA9IFRydWUKKysgICAgYnVpbGRzZXJ2 aWNlID0gVHJ1ZQorIAorICAgICBpZiBjcmVhdGVfYXBwZGF0YSBvciBidWlsZHNlcnZpY2U6Cisg ICAgICAgICB3aXRoIGNvZGVjcy5vcGVuKHN0cihQYXRoKHB5ZGlyLCAiQ0hBTkdFUy5odG1sIikp LCAiciIsICJVVEYtOCIpIGFzIGY6CmRpZmYgLS1naXQgYS9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0 Y2hlcy9lcnJvci5wYXRjaCBiL3NyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2Vycm9yLnBhdGNo CmluZGV4IDE2OWZjNTI4YjEzOC4uNzU3YTkwNmI5ZGRjIDEwMDY0NAotLS0gYS9zcmNwa2dzL2Rp c3BjYWxHVUkvcGF0Y2hlcy9lcnJvci5wYXRjaAorKysgYi9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0 Y2hlcy9lcnJvci5wYXRjaApAQCAtNCwzMCArNCwzMCBAQCBUaGVyZWZvcmUgdGhlIGN1cnJlbnQg Y29kZSBlaXRoZXIgcmVzdWx0cyBpbiBnYXJibGVkIG91dHB1dCBvcgogZG9lc24ndCB3b3JrIGF0 IGFsbC4gUmVwbGFjZSBpdCB3aXRoIGEgc2ltcGxlIHByaW50Zi4KIAogLS0tCi0tLS0gYS9EaXNw bGF5Q0FML1JlYWxEaXNwbGF5U2l6ZU1NLmMJMjAxOC0wNy0yNSAxNjo0NzowMS4wMDAwMDAwMDAg KzAyMDAKLSsrKyBiL0Rpc3BsYXlDQUwvUmVhbERpc3BsYXlTaXplTU0uYwkyMDE4LTA3LTI1IDE2 OjQ3OjAxLjAwMDAwMDAwMCArMDIwMAotQEAgLTgyMiwxMyArODIyLDEzIEBACi0gCQkJCQkJc3By aW50ZihkZXNjMSwgIl9JQ0NfUFJPRklMRV8lZCIsZGlzcHNbbmRpc3BzXS0+dXNjcmVlbik7Cist LS0gYS9EaXNwbGF5Q0FML1JlYWxEaXNwbGF5U2l6ZU1NLmMKKysrKyBiL0Rpc3BsYXlDQUwvUmVh bERpc3BsYXlTaXplTU0uYworQEAgLTgzNSwxMyArODM1LDEzIEBACisgICAgICAgICAgICAgICAg ICAgICAgICAgc3ByaW50ZihkZXNjMSwgIl9JQ0NfUFJPRklMRV8lZCIsZGlzcHNbbmRpc3BzXS0+ dXNjcmVlbik7CiAgCi0gCQkJCQlpZiAoKGRpc3BzW25kaXNwc10tPmljY19hdG9tID0gWEludGVy bkF0b20obXlkaXNwbGF5LCBkZXNjMSwgRmFsc2UpKSA9PSBOb25lKQotLQkJCQkJCWVycm9yKCJV bmFibGUgdG8gaW50ZXJuIGF0b20gJyVzJyIsZGVzYzEpOwotKwkJCQkJCWZwcmludGYoc3RkZXJy LCAiVW5hYmxlIHRvIGludGVybiBhdG9tICclcyciLGRlc2MxKTsKKyAgICAgICAgICAgICAgICAg ICAgIGlmICgoZGlzcHNbbmRpc3BzXS0+aWNjX2F0b20gPSBYSW50ZXJuQXRvbShteWRpc3BsYXks IGRlc2MxLCBGYWxzZSkpID09IE5vbmUpCistICAgICAgICAgICAgICAgICAgICAgICAgZXJyb3Io IlVuYWJsZSB0byBpbnRlcm4gYXRvbSAnJXMnIixkZXNjMSk7CisrICAgICAgICAgICAgICAgICAg ICAgICAgZnByaW50ZihzdGRlcnIsICJVbmFibGUgdG8gaW50ZXJuIGF0b20gJyVzJyIsZGVzYzEp OwogIAotIAkJCQkJZGVidWdycjIoKGVycm91dCwiUm9vdCBhdG9tICclcydcbiIsZGVzYzEpKTsK KyAgICAgICAgICAgICAgICAgICAgIGRlYnVncnIyKChlcnJvdXQsIlJvb3QgYXRvbSAnJXMnXG4i LGRlc2MxKSk7CiAgCi0gCQkJCQkvKiBDcmVhdGUgdGhlIGF0b20gb2YgdGhlIG91dHB1dCB0aGF0 IG1heSBjb250YWluIHRoZSBhc3NvY2lhdGVkIElDQyBwcm9maWxlICovCi0gCQkJCQlpZiAoKGRp c3BzW25kaXNwc10tPmljY19vdXRfYXRvbSA9IFhJbnRlcm5BdG9tKG15ZGlzcGxheSwgIl9JQ0Nf UFJPRklMRSIsIEZhbHNlKSkgPT0gTm9uZSkKLS0JCQkJCQllcnJvcigiVW5hYmxlIHRvIGludGVy biBhdG9tICclcyciLCJfSUNDX1BST0ZJTEUiKTsKLSsJCQkJCQlmcHJpbnRmKHN0ZGVyciwgIlVu YWJsZSB0byBpbnRlcm4gYXRvbSAnJXMnIiwiX0lDQ19QUk9GSUxFIik7Ci0gCQkKLSAJCQkJCS8q IEdyYWIgdGhlIEVESUQgZnJvbSB0aGUgb3V0cHV0ICovCi0gCQkJCQl7Ci1AQCAtOTkzLDcgKzk5 Myw3IEBACi0gCQkJCXNwcmludGYoZGVzYzEsICJfSUNDX1BST0ZJTEVfJWQiLGRpc3BzW2ldLT51 c2NyZWVuKTsKKyAgICAgICAgICAgICAgICAgICAgIC8qIENyZWF0ZSB0aGUgYXRvbSBvZiB0aGUg b3V0cHV0IHRoYXQgbWF5IGNvbnRhaW4gdGhlIGFzc29jaWF0ZWQgSUNDIHByb2ZpbGUgKi8KKyAg ICAgICAgICAgICAgICAgICAgIGlmICgoZGlzcHNbbmRpc3BzXS0+aWNjX291dF9hdG9tID0gWElu dGVybkF0b20obXlkaXNwbGF5LCAiX0lDQ19QUk9GSUxFIiwgRmFsc2UpKSA9PSBOb25lKQorLSAg ICAgICAgICAgICAgICAgICAgICAgIGVycm9yKCJVbmFibGUgdG8gaW50ZXJuIGF0b20gJyVzJyIs Il9JQ0NfUFJPRklMRSIpOworKyAgICAgICAgICAgICAgICAgICAgICAgIGZwcmludGYoc3RkZXJy LCAiVW5hYmxlIHRvIGludGVybiBhdG9tICclcyciLCJfSUNDX1BST0ZJTEUiKTsKICAKLSAJCQlp ZiAoKGRpc3BzW2ldLT5pY2NfYXRvbSA9IFhJbnRlcm5BdG9tKG15ZGlzcGxheSwgZGVzYzEsIEZh bHNlKSkgPT0gTm9uZSkKLS0JCQkJZXJyb3IoIlVuYWJsZSB0byBpbnRlcm4gYXRvbSAnJXMnIixk ZXNjMSk7Ci0rCQkJCWZwcmludGYoc3RkZXJyLCAiVW5hYmxlIHRvIGludGVybiBhdG9tICclcyci LGRlc2MxKTsKKyAgICAgICAgICAgICAgICAgICAgIC8qIEdyYWIgdGhlIEVESUQgZnJvbSB0aGUg b3V0cHV0ICovCisgICAgICAgICAgICAgICAgICAgICB7CitAQCAtMTAwNyw3ICsxMDA3LDcgQEAK KyAgICAgICAgICAgICAgICAgc3ByaW50ZihkZXNjMSwgIl9JQ0NfUFJPRklMRV8lZCIsZGlzcHNb aV0tPnVzY3JlZW4pOwogIAotIAkJCS8qIFNlZSBpZiB3ZSBjYW4gbG9jYXRlIHRoZSBFRElEIG9m IHRoZSBtb25pdG9yIGZvciB0aGlzIHNjcmVlbiAqLwotIAkJCWZvciAoaiA9IDA7IGogPCAyOyBq KyspIHsgCisgICAgICAgICAgICAgaWYgKChkaXNwc1tpXS0+aWNjX2F0b20gPSBYSW50ZXJuQXRv bShteWRpc3BsYXksIGRlc2MxLCBGYWxzZSkpID09IE5vbmUpCistICAgICAgICAgICAgICAgIGVy cm9yKCJVbmFibGUgdG8gaW50ZXJuIGF0b20gJyVzJyIsZGVzYzEpOworKyAgICAgICAgICAgICAg ICBmcHJpbnRmKHN0ZGVyciwgIlVuYWJsZSB0byBpbnRlcm4gYXRvbSAnJXMnIixkZXNjMSk7Cisg CisgICAgICAgICAgICAgLyogU2VlIGlmIHdlIGNhbiBsb2NhdGUgdGhlIEVESUQgb2YgdGhlIG1v bml0b3IgZm9yIHRoaXMgc2NyZWVuICovCisgICAgICAgICAgICAgZm9yIChqID0gMDsgaiA8IDI7 IGorKykgewpkaWZmIC0tZ2l0IGEvc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvZml4LWdldHRl eHQucGF0Y2ggYi9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy9maXgtZ2V0dGV4dC5wYXRjaApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjgyMzZkY2E4NTdjMQotLS0g L2Rldi9udWxsCisrKyBiL3NyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2ZpeC1nZXR0ZXh0LnBh dGNoCkBAIC0wLDAgKzEsMTMgQEAKKyJjb2Rlc2V0IiBpbiBnZXR0ZXh0LnRyYW5zbGF0aW9uKCkg aXMgZGVwcmVjYXRlZCB3aXRoIHB5dGhvbiAzLjExCisKKy0tLSBhL0Rpc3BsYXlDQUwvZGVmYXVs dHBhdGhzLnB5CisrKysgYi9EaXNwbGF5Q0FML2RlZmF1bHRwYXRocy5weQorQEAgLTIzMSw3ICsy MzEsNyBAQAorIAorICAgICAgICAgICAgIHRyeToKKyAgICAgICAgICAgICAgICAgb2JqLnRyYW5z bGF0aW9uID0gZ2V0dGV4dC50cmFuc2xhdGlvbigKKy0gICAgICAgICAgICAgICAgICAgIG9iai5H RVRURVhUX1BBQ0tBR0UsIGxvY2FsZV9kaXIsIGNvZGVzZXQ9IlVURi04IgorKyAgICAgICAgICAg ICAgICAgICAgb2JqLkdFVFRFWFRfUEFDS0FHRSwgbG9jYWxlX2RpcgorICAgICAgICAgICAgICAg ICApCisgICAgICAgICAgICAgZXhjZXB0IElPRXJyb3IgYXMgZXhjZXB0aW9uOgorICAgICAgICAg ICAgICAgICBwcmludCgiWERHOiIsIGV4Y2VwdGlvbikKZGlmZiAtLWdpdCBhL3NyY3BrZ3MvZGlz cGNhbEdVSS9wYXRjaGVzL2ZpeC1oYXJkY29kZWQtaW1wb3J0LnBhdGNoIGIvc3JjcGtncy9kaXNw Y2FsR1VJL3BhdGNoZXMvZml4LWhhcmRjb2RlZC1pbXBvcnQucGF0Y2gKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi5lMzI3Y2M1MTJmYzQKLS0tIC9kZXYvbnVsbAorKysg Yi9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy9maXgtaGFyZGNvZGVkLWltcG9ydC5wYXRjaApA QCAtMCwwICsxLDE4IEBACistLS0gYS9EaXNwbGF5Q0FML1JlYWxEaXNwbGF5U2l6ZU1NLnB5Cisr KysgYi9EaXNwbGF5Q0FML1JlYWxEaXNwbGF5U2l6ZU1NLnB5CitAQCAtMTcsMTQgKzE3LDcgQEAK KyAgICAgICAgICMgVE9ETzogSW50ZWwgdnMgQVJNIChBcHBsZSBTaWxpY29uKSBkaXN0aW5jdGlv bgorICAgICAgICAgZnJvbSBEaXNwbGF5Q0FMLmxpYjY0LlJlYWxEaXNwbGF5U2l6ZU1NIGltcG9y dCAqCisgZWxzZToKKy0gICAgIyBlbGlmIHN5cy5wbGF0Zm9ybSA9PSAid2luMzIiOgorLSAgICAj IFdpbmRvd3MgaGF2ZSBzZXBhcmF0ZSBmaWxlcworLSAgICBpZiBzeXMudmVyc2lvbl9pbmZvWzoy XSA9PSAoMywgOCk6CistICAgICAgICBmcm9tIERpc3BsYXlDQUwubGliNjQucHl0aG9uMzguUmVh bERpc3BsYXlTaXplTU0gaW1wb3J0ICoKKy0gICAgZWxpZiBzeXMudmVyc2lvbl9pbmZvWzoyXSA9 PSAoMywgOSk6CistICAgICAgICBmcm9tIERpc3BsYXlDQUwubGliNjQucHl0aG9uMzkuUmVhbERp c3BsYXlTaXplTU0gaW1wb3J0ICoKKy0gICAgZWxpZiBzeXMudmVyc2lvbl9pbmZvWzoyXSA9PSAo MywgMTApOgorLSAgICAgICAgZnJvbSBEaXNwbGF5Q0FMLmxpYjY0LnB5dGhvbjMxMC5SZWFsRGlz cGxheVNpemVNTSBpbXBvcnQgKgorKyAgICBmcm9tIERpc3BsYXlDQUwubGliNjQucHl0aG9uQFBZ X1ZFUkAuUmVhbERpc3BsYXlTaXplTU0gaW1wb3J0ICoKKyAjIGVsc2U6CisgIyAgICAgcGFzcwor IApkaWZmIC0tZ2l0IGEvc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvZml4LXNldHVwdG9vbHMu cGF0Y2ggYi9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy9maXgtc2V0dXB0b29scy5wYXRjaApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjQ3ZWYwZWEyZjZjOQotLS0g L2Rldi9udWxsCisrKyBiL3NyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2ZpeC1zZXR1cHRvb2xz LnBhdGNoCkBAIC0wLDAgKzEsOTUgQEAKK3NldHVwdG9vbHMgZm9yIHNvbWUgcmVhc29uIGlzIHVz ZWQgYXMgYSB2YXJpYWJsZSBhbmQgYSBtb2R1bGUuCisKK0luaXRpYWxseSB0aGlzIGxlYWRzIHRv ICJzZXR1cHRvb2xzLmZpbmRhbGwiIG5vdCBiZWluZyByZWNvZ25pemVkIGFzCithIGNvbW1hbmQg cmVsYXRlZCB0byB0aGUgbW9kdWxlIGF0IGFsbC4KKworQW55IHVzZSBvZiBtb2R1bGUgbmFtZSBp biBjb25kaXRpb25hbCBzdGF0ZW1lbnRzIGFsc28gbGVhZHMgdG8gZXJyb3IsCitoZW5jZSBzaW1w bGUgc29sdXRpb246IHJlbmFtZSB0aGUgdmFyaWFibGUuCisKKy0tLSBhL0Rpc3BsYXlDQUwvc2V0 dXAucHkKKysrKyBiL0Rpc3BsYXlDQUwvc2V0dXAucHkKK0BAIC00NTMsNyArNDUzLDcgQEAKKyAg ICAgcHJlZml4ID0gIiIKKyAgICAgcmVjb3JkZmlsZV9uYW1lID0gTm9uZSAgIyByZWNvcmQgaW5z dGFsbGVkIGZpbGVzIHRvIHRoaXMgZmlsZQorICAgICBzZGlzdCA9ICJzZGlzdCIgaW4gc3lzLmFy Z3ZbMTpdCistICAgIHNldHVwdG9vbHMgPSBOb25lCisrICAgIHNldG9vbHMgPSBOb25lCisgICAg IHNraXBfcG9zdGluc3RhbGwgPSAiLS1za2lwLXBvc3RpbnN0YWxsIiBpbiBzeXMuYXJndlsxOl0K KyAgICAgdXNlX2Rpc3R1dGlscyA9IG5vdCBiZGlzdF9iYmZyZWV6ZSBhbmQgbm90IGRvX3B5MmFw cAorICAgICB1c2Vfc2V0dXB0b29scyA9ICgKK0BAIC00ODAsNyArNDgwLDcgQEAKKyAgICAgICAg ICAgICBpbXBvcnQgc2V0dXB0b29scworICAgICAgICAgICAgIGZyb20gc2V0dXB0b29scyBpbXBv cnQgc2V0dXAsIEV4dGVuc2lvbgorIAorLSAgICAgICAgICAgIHNldHVwdG9vbHMgPSBUcnVlCisr ICAgICAgICAgICAgc2V0b29scyA9IFRydWUKKyAgICAgICAgICAgICBwcmludCgidXNpbmcgc2V0 dXB0b29scyIpCisgICAgICAgICAgICAgY3VycmVudF9maW5kYWxsID0gc2V0dXB0b29scy5maW5k YWxsCisgICAgICAgICBleGNlcHQgSW1wb3J0RXJyb3I6CitAQCAtNTA5LDcgKzUwOSw3IEBACisg CisgICAgICAgICBkaXN0dXRpbHMuZmlsZWxpc3QuZmluZGFsbCA9IGZpbmRhbGwKKyAKKy0gICAg aWYgbm90IHNldHVwdG9vbHM6CisrICAgIGlmIG5vdCBzZXRvb2xzOgorICAgICAgICAgZnJvbSBk aXN0dXRpbHMuY29yZSBpbXBvcnQgc2V0dXAsIEV4dGVuc2lvbgorIAorICAgICAgICAgcHJpbnQo InVzaW5nIGRpc3R1dGlscyIpCitAQCAtOTQ1LDcgKzk0NSw3IEBACisgICAgIGV4dF9tb2R1bGVz ID0gW1JlYWxEaXNwbGF5U2l6ZU1NXQorIAorICAgICByZXF1aXJlcyA9IFtdCistICAgIGlmIG5v dCBzZXR1cHRvb2xzIG9yIHN5cy5wbGF0Zm9ybSAhPSAid2luMzIiOgorKyAgICBpZiBub3Qgc2V0 b29scyBvciBzeXMucGxhdGZvcm0gIT0gIndpbjMyIjoKKyAgICAgICAgICMgd3hQeXRob24gd2lu ZG93cyBpbnN0YWxsZXIgZG9lc24ndCBhZGQgZWdnLWluZm8gZW50cnksIHNvCisgICAgICAgICAj IGEgZGVwZW5kZW5jeSBjaGVjayBmcm9tIHBrZ19yZXNvdXJjZXMgd291bGQgYWx3YXlzIGZhaWwK KyAgICAgICAgIHJlcXVpcmVzLmFwcGVuZCgid3hQeXRob24gKD49ICVzKSIgJSAiLiIuam9pbihz dHIobikgZm9yIG4gaW4gd3hfbWludmVyc2lvbikpCitAQCAtMTAyMSw3ICsxMDIxLDcgQEAKKyAg ICAgICAgICJ2ZXJzaW9uIjogbXNpdmVyc2lvbiBpZiAiYmRpc3RfbXNpIiBpbiBzeXMuYXJndlsx Ol0gZWxzZSB2ZXJzaW9uLAorICAgICB9CisgCistICAgIGlmIHNldHVwdG9vbHM6CisrICAgIGlm IHNldG9vbHM6CisgICAgICAgICBhdHRyc1siZW50cnlfcG9pbnRzIl0gPSB7CisgICAgICAgICAg ICAgImd1aV9zY3JpcHRzIjogWworICAgICAgICAgICAgICAgICAiJXMgPSAlcy5tYWluOm1haW4l cyIKK0BAIC0xMjc4LDcgKzEyNzgsNyBAQAorICAgICAgICAgICAgIGF0dHJzWyJvcHRpb25zIl1b InB5MmV4ZSJdLnVwZGF0ZSgKKyAgICAgICAgICAgICAgICAgeyJidW5kbGVfZmlsZXMiOiAzLCAi Y29tcHJlc3NlZCI6IDAsICJvcHRpbWl6ZSI6IDAsICJza2lwX2FyY2hpdmUiOiAxfQorICAgICAg ICAgICAgICkKKy0gICAgICAgIGlmIHNldHVwdG9vbHM6CisrICAgICAgICBpZiBzZXRvb2xzOgor ICAgICAgICAgICAgIGF0dHJzWyJzZXR1cF9yZXF1aXJlcyJdID0gWyJweTJleGUiXQorICAgICAg ICAgYXR0cnNbInppcGZpbGUiXSA9IG9zLnBhdGguam9pbigibGliIiwgImxpYnJhcnkuemlwIikK KyAKK0BAIC0xMzI4LDEwICsxMzI4LDEwIEBACisgICAgICAgICAjIHNpdGUtcGFja2FnZXMgKG9u IE1hYyBhbmQgV2luZG93cykgYW5kIHdoZW4gd2Ugd2FudCB0byBtYWtlIHRoZW0KKyAgICAgICAg ICMgYWJzb2x1dGUgKExpbnV4KQorICAgICAgICAgbGludXggPSBzeXMucGxhdGZvcm0gbm90IGlu ICgiZGFyd2luIiwgIndpbjMyIikgYW5kICgKKy0gICAgICAgICAgICBub3QgY21kLnJvb3QgYW5k IHNldHVwdG9vbHMKKysgICAgICAgICAgICBub3QgY21kLnJvb3QgYW5kIHNldG9vbHMKKyAgICAg ICAgICkKKyAgICAgICAgIGRhcl93aW4gPSAoCistICAgICAgICAgICAgc3lzLnBsYXRmb3JtIGlu ICgiZGFyd2luIiwgIndpbjMyIikgYW5kIChjbWQucm9vdCBvciBub3Qgc2V0dXB0b29scykKKysg ICAgICAgICAgICBzeXMucGxhdGZvcm0gaW4gKCJkYXJ3aW4iLCAid2luMzIiKSBhbmQgKGNtZC5y b290IG9yIG5vdCBzZXRvb2xzKQorICAgICAgICAgKSBvciBiZGlzdF93aW4KKyAgICAgICAgIGlm ICgKKyAgICAgICAgICAgICBub3QgZG9fdW5pbnN0YWxsCitAQCAtMTM4MCw3ICsxMzgwLDcgQEAK KyAgICAgICAgICAgICAjIGxvZ2ljIHRvIGZpbmQgdGhlbQorICAgICAgICAgICAgIHBhdGhzID0g c2FmZV9nbG9iKG9zLnBhdGguam9pbihjbWQuaW5zdGFsbF9zY3JpcHRzLCBuYW1lKSkKKyAgICAg ICAgICAgICBpZiBzeXMucGxhdGZvcm0gPT0gIndpbjMyIjoKKy0gICAgICAgICAgICAgICAgaWYg c2V0dXB0b29sczoKKysgICAgICAgICAgICAgICAgaWYgc2V0b29sczoKKyAgICAgICAgICAgICAg ICAgICAgIHBhdGhzICs9IHNhZmVfZ2xvYihvcy5wYXRoLmpvaW4oY21kLmluc3RhbGxfc2NyaXB0 cywgZiJ7bmFtZX0uZXhlIikpCisgICAgICAgICAgICAgICAgICAgICBwYXRocyArPSBzYWZlX2ds b2IoCisgICAgICAgICAgICAgICAgICAgICAgICAgb3MucGF0aC5qb2luKGNtZC5pbnN0YWxsX3Nj cmlwdHMsIGYie25hbWV9LXNjcmlwdC5weSIpCitAQCAtMTU4Nyw3ICsxNTg3LDcgQEAKKyAgICAg ICAgIG1hbmlmZXN0X2luLmFwcGVuZCgiaW5jbHVkZSAiICsgb3MucGF0aC5qb2luKCJ0ZXN0cyIs ICIqIikpCisgICAgICAgICBtYW5pZmVzdF9pbi5hcHBlbmQoInJlY3Vyc2l2ZS1pbmNsdWRlIHRo ZW1lICoiKQorICAgICAgICAgbWFuaWZlc3RfaW4uYXBwZW5kKCJyZWN1cnNpdmUtaW5jbHVkZSB1 dGlsICouY21kICoucHkgKi5zaCIpCistICAgICAgICBpZiBzeXMucGxhdGZvcm0gPT0gIndpbjMy IiBhbmQgbm90IHNldHVwdG9vbHM6CisrICAgICAgICBpZiBzeXMucGxhdGZvcm0gPT0gIndpbjMy IiBhbmQgbm90IHNldG9vbHM6CisgICAgICAgICAgICAgIyBPbmx5IG5lZWRlZCB1bmRlciBXaW5k b3dzCisgICAgICAgICAgICAgbWFuaWZlc3RfaW4uYXBwZW5kKCJnbG9iYWwtZXhjbHVkZSAuc3Zu LyoiKQorICAgICAgICAgbWFuaWZlc3RfaW4uYXBwZW5kKCJnbG9iYWwtZXhjbHVkZSAqfiIpCmRp ZmYgLS1naXQgYS9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy9maXgtdmVyc2lvbi5wYXRjaCBi L3NyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2ZpeC12ZXJzaW9uLnBhdGNoCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uYWUwNzA5YjJiNjhjCi0tLSAvZGV2L251bGwK KysrIGIvc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvZml4LXZlcnNpb24ucGF0Y2gKQEAgLTAs MCArMSwxMTEgQEAKK3NldHVwLnB5IHVzZXMgcGFja2FnZSB2ZXJzaW9uIHByb3ZpZGVkIHRoYXQg dGhlIGJ1aWxkZGlyIGlzIGEgZ2l0CityZXBvc2l0b3J5IGFuZCBnaXQgaXMgcHJlc2VudCBpbiBo b3N0bWFrZWRlcGVuZHMuCisKK090aGVyd2lzZSAwLjAuMCBpcyBzdXBwbGllZCBhcyB0aGUgdmVy c2lvbi4KKworLS0tIGEvc2V0dXAucHkKKysrKyBiL3NldHVwLnB5CitAQCAtNDQ1LDcxICs0NDUs NDAgQEAKKyAKKyAgICAgZnJvbSBEaXNwbGF5Q0FMLnV0aWxfb3MgaW1wb3J0IHdoaWNoCisgCist ICAgIGlmICgKKy0gICAgICAgIFBhdGgocHlkaXIsICIuZ2l0IikuaXNfZGlyKCkKKy0gICAgICAg IGFuZCAod2hpY2goImdpdCIpIG9yIHdoaWNoKCJnaXQuZXhlIikpCistICAgICAgICBhbmQgKG5v dCBzeXMuYXJndlsxOl0gb3IgKGxlbihub25fYnVpbGRfYXJncykgPCBsZW4oc3lzLmFyZ3ZbMTpd KSBhbmQgbm90IGhlbHApKQorLSAgICApOgorLSAgICAgICAgcHJpbnQoIlRyeWluZyB0byBnZXQg Z2l0IHZlcnNpb24gaW5mb3JtYXRpb24uLi4iKQorLSAgICAgICAgZ2l0X3ZlcnNpb24gPSBOb25l CistCistICAgICAgICB0cnk6CistICAgICAgICAgICAgcCA9IHN1YnByb2Nlc3MuUG9wZW4oCist ICAgICAgICAgICAgICAgIFsiZ2l0IiwgInJldi1wYXJzZSIsICItLXNob3J0IiwgIkhFQUQiXSwK Ky0gICAgICAgICAgICAgICAgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSwKKy0gICAgICAgICAgICAg ICAgY3dkPXB5ZGlyLAorLSAgICAgICAgICAgICkKKy0gICAgICAgIGV4Y2VwdCBFeGNlcHRpb24g YXMgZXhjZXB0aW9uOgorLSAgICAgICAgICAgIHByaW50KCIuLi5mYWlsZWQ6IiwgZXhjZXB0aW9u KQorLSAgICAgICAgZWxzZToKKy0gICAgICAgICAgICBnaXRfdmVyc2lvbiA9IHAuY29tbXVuaWNh dGUoKVswXS5zdHJpcCgpLmRlY29kZSgpCistICAgICAgICAgICAgdmVyc2lvbl9iYXNlX2ZpbGVf cGF0aCA9IFBhdGgocHlkaXIsICJWRVJTSU9OX0JBU0UiKQorLSAgICAgICAgICAgIHZlcnNpb25f YmFzZSA9ICIwLjAuMCIuc3BsaXQoIi4iKQorLQorLSAgICAgICAgICAgIGlmIHZlcnNpb25fYmFz ZV9maWxlX3BhdGguaXNfZmlsZSgpOgorLSAgICAgICAgICAgICAgICB3aXRoIG9wZW4odmVyc2lv bl9iYXNlX2ZpbGVfcGF0aCkgYXMgdmVyc2lvbl9iYXNlX2ZpbGU6CistICAgICAgICAgICAgICAg ICAgICB2ZXJzaW9uX2Jhc2UgPSB2ZXJzaW9uX2Jhc2VfZmlsZS5yZWFkKCkuc3RyaXAoKS5zcGxp dCgiLiIpCistCistICAgICAgICBwcmludCgiVHJ5aW5nIHRvIGdldCBnaXQgaW5mb3JtYXRpb24u Li4iKQorLSAgICAgICAgbGFzdG1vZCA9ICIiCistICAgICAgICB0aW1lc3RhbXAgPSBOb25lCist ICAgICAgICBtdGltZSA9IDAKKy0KKy0gICAgICAgIHRyeToKKy0gICAgICAgICAgICBwID0gc3Vi cHJvY2Vzcy5Qb3BlbigKKy0gICAgICAgICAgICAgICAgWyJnaXQiLCAibG9nIiwgIi0xIiwgIi0t Zm9ybWF0PSVjdCJdLCBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFLCBjd2Q9cHlkaXIKKysgICAgdmVy c2lvbl9iYXNlX2ZpbGVfcGF0aCA9IFBhdGgocHlkaXIsICJWRVJTSU9OX0JBU0UiKQorKworKyAg ICB3aXRoIG9wZW4odmVyc2lvbl9iYXNlX2ZpbGVfcGF0aCkgYXMgdmVyc2lvbl9iYXNlX2ZpbGU6 CisrICAgICAgICB2ZXJzaW9uX2Jhc2UgPSB2ZXJzaW9uX2Jhc2VfZmlsZS5yZWFkKCkuc3RyaXAo KS5zcGxpdCgiLiIpCisrCisrICAgIGxhc3Rtb2QgPSAiIgorKyAgICB0aW1lc3RhbXAgPSBOb25l CisrICAgIG10aW1lID0gMAorKyAgICB0aW1lc3RhbXAgPSB0aW1lLmdtdGltZShtdGltZSkKKysK KysgICAgaWYgdGltZXN0YW1wOgorKyAgICAgICAgbGFzdG1vZCA9IGYie3N0cmZ0aW1lKCclWS0l bS0lZFQlSDolTTolUycsIHRpbWVzdGFtcCl9WiIKKysKKysgICAgaWYgbm90IGRyeV9ydW46Cisr ICAgICAgICBwcmludCgiR2VuZXJhdGluZyBfX3ZlcnNpb25fXy5weSIpCisrCisrICAgICAgICB3 aXRoIG9wZW4oUGF0aChweWRpciwgIkRpc3BsYXlDQUwiLCAiX192ZXJzaW9uX18ucHkiKSwgInci KSBhcyB2ZXJzaW9ucHk6CisrICAgICAgICAgICAgdmVyc2lvbnB5LndyaXRlKCIjIGdlbmVyYXRl ZCBieSBzZXR1cC5weVxuXG4iKQorKyAgICAgICAgICAgIGJ1aWxkX3RpbWUgPSB0aW1lLnRpbWUo KQorKyAgICAgICAgICAgIHZlcnNpb25weS53cml0ZSgKKysgICAgICAgICAgICAgICAgZiJCVUlM RF9EQVRFID0gIgorKyAgICAgICAgICAgICAgICBmIlwie3N0cmZ0aW1lKCclWS0lbS0lZFQlSDol TTolUycsIGdtdGltZShidWlsZF90aW1lKSl9WlwiXG4iCisgICAgICAgICAgICAgKQorLSAgICAg ICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBleGNlcHRpb246CistICAgICAgICAgICAgcHJpbnQoIi4u LmZhaWxlZDoiLCBleGNlcHRpb24pCistICAgICAgICBlbHNlOgorLSAgICAgICAgICAgIG10aW1l ID0gaW50KHAuY29tbXVuaWNhdGUoKVswXS5zdHJpcCgpLmRlY29kZSgpKQorLSAgICAgICAgICAg IHRpbWVzdGFtcCA9IHRpbWUuZ210aW1lKG10aW1lKQorLQorLSAgICAgICAgaWYgdGltZXN0YW1w OgorLSAgICAgICAgICAgIGxhc3Rtb2QgPSBmIntzdHJmdGltZSgnJVktJW0tJWRUJUg6JU06JVMn LCB0aW1lc3RhbXApfVoiCistCistICAgICAgICBpZiBub3QgZHJ5X3J1bjoKKy0gICAgICAgICAg ICBwcmludCgiR2VuZXJhdGluZyBfX3ZlcnNpb25fXy5weSIpCistCistICAgICAgICAgICAgd2l0 aCBvcGVuKFBhdGgocHlkaXIsICJEaXNwbGF5Q0FMIiwgIl9fdmVyc2lvbl9fLnB5IiksICJ3Iikg YXMgdmVyc2lvbnB5OgorLSAgICAgICAgICAgICAgICB2ZXJzaW9ucHkud3JpdGUoIiMgZ2VuZXJh dGVkIGJ5IHNldHVwLnB5XG5cbiIpCistICAgICAgICAgICAgICAgIGJ1aWxkX3RpbWUgPSB0aW1l LnRpbWUoKQorLSAgICAgICAgICAgICAgICB2ZXJzaW9ucHkud3JpdGUoCistICAgICAgICAgICAg ICAgICAgICBmIkJVSUxEX0RBVEUgPSAiCistICAgICAgICAgICAgICAgICAgICBmIlwie3N0cmZ0 aW1lKCclWS0lbS0lZFQlSDolTTolUycsIGdtdGltZShidWlsZF90aW1lKSl9WlwiXG4iCistICAg ICAgICAgICAgICAgICkKKy0KKy0gICAgICAgICAgICAgICAgaWYgbGFzdG1vZDoKKy0gICAgICAg ICAgICAgICAgICAgIHZlcnNpb25weS53cml0ZShmIkxBU1RNT0QgPSB7bGFzdG1vZCFyfVxuIikK Ky0KKy0gICAgICAgICAgICAgICAgaWYgZ2l0X3ZlcnNpb246CistICAgICAgICAgICAgICAgICAg ICBwcmludCgiVmVyc2lvbiIsICIuIi5qb2luKHZlcnNpb25fYmFzZSkpCistICAgICAgICAgICAg ICAgICAgICB2ZXJzaW9ucHkud3JpdGUoIlZFUlNJT04gPSAoJXMpXG4iICUgIiwgIi5qb2luKHZl cnNpb25fYmFzZSkpCistICAgICAgICAgICAgICAgICAgICB2ZXJzaW9ucHkud3JpdGUoIlZFUlNJ T05fQkFTRSA9ICglcylcbiIgJSAiLCAiLmpvaW4odmVyc2lvbl9iYXNlKSkKKy0gICAgICAgICAg ICAgICAgICAgIHZlcnNpb25weS53cml0ZSgiVkVSU0lPTl9TVFJJTkcgPSAlclxuIiAlICIuIi5q b2luKHZlcnNpb25fYmFzZSkpCisgCistICAgICAgICAgICAgICAgICAgICB3aXRoIG9wZW4oUGF0 aChweWRpciwgIlZFUlNJT04iKSwgInciKSBhcyB2ZXJzaW9udHh0OgorLSAgICAgICAgICAgICAg ICAgICAgICAgIHZlcnNpb250eHQud3JpdGUoIi4iLmpvaW4odmVyc2lvbl9iYXNlKSkKKysgICAg ICAgICAgICBpZiBsYXN0bW9kOgorKyAgICAgICAgICAgICAgICB2ZXJzaW9ucHkud3JpdGUoZiJM QVNUTU9EID0ge2xhc3Rtb2Qhcn1cbiIpCisrCisrICAgICAgICAgICAgcHJpbnQoIlZlcnNpb24i LCAiLiIuam9pbih2ZXJzaW9uX2Jhc2UpKQorKyAgICAgICAgICAgIHZlcnNpb25weS53cml0ZSgi VkVSU0lPTiA9ICglcylcbiIgJSAiLCAiLmpvaW4odmVyc2lvbl9iYXNlKSkKKysgICAgICAgICAg ICB2ZXJzaW9ucHkud3JpdGUoIlZFUlNJT05fQkFTRSA9ICglcylcbiIgJSAiLCAiLmpvaW4odmVy c2lvbl9iYXNlKSkKKysgICAgICAgICAgICB2ZXJzaW9ucHkud3JpdGUoIlZFUlNJT05fU1RSSU5H ID0gJXJcbiIgJSAiLiIuam9pbih2ZXJzaW9uX2Jhc2UpKQorKworKyAgICAgICAgICAgIHdpdGgg b3BlbihQYXRoKHB5ZGlyLCAiVkVSU0lPTiIpLCAidyIpIGFzIHZlcnNpb250eHQ6CisrICAgICAg ICAgICAgICAgIHZlcnNpb250eHQud3JpdGUoIi4iLmpvaW4odmVyc2lvbl9iYXNlKSkKKyAKKyAg ICAgYmFja3VwX3NldHVwX3BhdGggPSBQYXRoKHB5ZGlyLCAic2V0dXAuY2ZnLmJhY2t1cCIpCisg ICAgIHNldHVwX3BhdGggPSBQYXRoKHB5ZGlyLCAic2V0dXAuY2ZnIikKZGlmZiAtLWdpdCBhL3Ny Y3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL3JtLXhkZy1hdXRvc3RhcnQucGF0Y2ggYi9zcmNwa2dz L2Rpc3BjYWxHVUkvcGF0Y2hlcy9ybS14ZGctYXV0b3N0YXJ0LnBhdGNoCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uN2Y5NWUwNzUyMWYyCi0tLSAvZGV2L251bGwKKysr IGIvc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvcm0teGRnLWF1dG9zdGFydC5wYXRjaApAQCAt MCwwICsxLDE2IEBACitUcmllcyB0byBpbnN0YWxsIGEgZGVza3RvcCBmaWxlIGluIC91c3Ivc2hh cmUvdG1wIGluc3RlYWQgb2YKKy9ldGMveGRnL2F1dG9zdGFydC4KKworLS0tIGEvRGlzcGxheUNB TC9zZXR1cC5weQorKysrIGIvRGlzcGxheUNBTC9zZXR1cC5weQorQEAgLTcwOSw5ICs3MDksNyBA QAorICAgICAgICAgICAgICkKKyAgICAgICAgICAgICBkYXRhX2ZpbGVzLmFwcGVuZCgKKyAgICAg ICAgICAgICAgICAgKAorLSAgICAgICAgICAgICAgICAgICAgYXV0b3N0YXJ0CistICAgICAgICAg ICAgICAgICAgICBpZiBvcy5nZXRldWlkKCkgPT0gMCBvciBwcmVmaXguc3RhcnRzd2l0aCgiLyIp CistICAgICAgICAgICAgICAgICAgICBlbHNlIGF1dG9zdGFydF9ob21lLAorKyAgICAgICAgICAg ICAgICAgICAgYXV0b3N0YXJ0LAorICAgICAgICAgICAgICAgICAgICAgWworICAgICAgICAgICAg ICAgICAgICAgICAgIG9zLnBhdGguam9pbigKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg cHlkaXIsCmRpZmYgLS1naXQgYS9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy91cGRhdGUtY2hl Y2sucGF0Y2ggYi9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy91cGRhdGUtY2hlY2sucGF0Y2gK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi4zODI5NDNhNjcyNGUKLS0t IC9kZXYvbnVsbAorKysgYi9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy91cGRhdGUtY2hlY2su cGF0Y2gKQEAgLTAsMCArMSw5MCBAQAorUXVpdGUgYSBjcnVkZSBhdHRlbXB0IHRvIHJlbW92ZSB1 cGRhdGUgY2hlY2tzLCBidXQgaXQgc2hvdWxkIHdvcmsuCisKK1VwZGF0ZSBjaGVja3MgYWxzbyB1 c2VkIHRvIHRyaWdnZXIgcG9wdXAgZG9uYXRpb24gd2luZG93IGF0IHN0YXJ0dXAsCitidXQgbm90 IGFueW1vcmUgd2l0aCB0aGVzZSBwYXRjaGVzLgorCistLS0gYS9EaXNwbGF5Q0FML2Rpc3BsYXlf Y2FsLnB5CisrKysgYi9EaXNwbGF5Q0FML2Rpc3BsYXlfY2FsLnB5CitAQCAtMzExOSwxNiArMzEx OSw2IEBACisgICAgICAgICBzZWxmLkJpbmQod3guRVZUX01FTlUsIHNlbGYuaGVscF9zdXBwb3J0 X2hhbmRsZXIsIG1lbnVpdGVtKQorICAgICAgICAgbWVudWl0ZW0gPSBoZWxwLkZpbmRJdGVtQnlJ ZChoZWxwLkZpbmRJdGVtKCJidWdfcmVwb3J0IikpCisgICAgICAgICBzZWxmLkJpbmQod3guRVZU X01FTlUsIHNlbGYuYnVnX3JlcG9ydF9oYW5kbGVyLCBtZW51aXRlbSkKKy0gICAgICAgIHNlbGYu bWVudWl0ZW1fYXBwX2F1dG9fdXBkYXRlX2NoZWNrID0gaGVscC5GaW5kSXRlbUJ5SWQoCistICAg ICAgICAgICAgaGVscC5GaW5kSXRlbSgidXBkYXRlX2NoZWNrLm9uc3RhcnR1cCIpCistICAgICAg ICApCistICAgICAgICBzZWxmLkJpbmQoCistICAgICAgICAgICAgd3guRVZUX01FTlUsCistICAg ICAgICAgICAgc2VsZi5hcHBfYXV0b191cGRhdGVfY2hlY2tfaGFuZGxlciwKKy0gICAgICAgICAg ICBzZWxmLm1lbnVpdGVtX2FwcF9hdXRvX3VwZGF0ZV9jaGVjaywKKy0gICAgICAgICkKKy0gICAg ICAgIG1lbnVpdGVtID0gaGVscC5GaW5kSXRlbUJ5SWQoaGVscC5GaW5kSXRlbSgidXBkYXRlX2No ZWNrIikpCistICAgICAgICBzZWxmLkJpbmQod3guRVZUX01FTlUsIHNlbGYuYXBwX3VwZGF0ZV9j aGVja19oYW5kbGVyLCBtZW51aXRlbSkKKyAKKyAgICAgICAgIGlmIHN5cy5wbGF0Zm9ybSA9PSAi ZGFyd2luIjoKKyAgICAgICAgICAgICB3eC5HZXRBcHAoKS5TZXRNYWNBYm91dE1lbnVJdGVtSWQo c2VsZi5tZW51aXRlbV9hYm91dC5HZXRJZCgpKQorQEAgLTMyNTcsNyArMzI0Nyw2IEBACisgICAg ICAgICBzZWxmLm1lbnVpdGVtX3Nob3dfbG9nLkNoZWNrKGJvb2woZ2V0Y2ZnKCJsb2cuc2hvdyIp KSkKKyAgICAgICAgIHNlbGYubWVudWl0ZW1fbG9nX2F1dG9zaG93LkVuYWJsZShub3QgYm9vbChn ZXRjZmcoImxvZy5zaG93IikpKQorICAgICAgICAgc2VsZi5tZW51aXRlbV9sb2dfYXV0b3Nob3cu Q2hlY2soYm9vbChnZXRjZmcoImxvZy5hdXRvc2hvdyIpKSkKKy0gICAgICAgIHNlbGYubWVudWl0 ZW1fYXBwX2F1dG9fdXBkYXRlX2NoZWNrLkNoZWNrKGJvb2woZ2V0Y2ZnKCJ1cGRhdGVfY2hlY2si KSkpCisgCisgICAgIGRlZiBpbml0X2NvbnRyb2xzKHNlbGYpOgorICAgICAgICAgIiIiSW5pdGlh bGl6ZSB0aGUgbWFpbiB3aW5kb3cgY29udHJvbHMgYW5kIHRoZWlyIGV2ZW50IGhhbmRsZXJzLiIi IgorQEAgLTQwNDcsNyArNDAzNiw2IEBACisgICAgICAgICAgICAgInVudGV0aGVyZWQubWF4X2Rl bHRhLmNocm9tYSIsCisgICAgICAgICAgICAgInVudGV0aGVyZWQubWluX2RlbHRhIiwKKyAgICAg ICAgICAgICAidW50ZXRoZXJlZC5taW5fZGVsdGEubGlnaHRuZXNzIiwKKy0gICAgICAgICAgICAi dXBkYXRlX2NoZWNrIiwKKyAgICAgICAgICAgICAid2Vic2VydmVyLnBvcnRudW1iZXIiLAorICAg ICAgICAgICAgICJ3aGl0ZXBvaW50LnZpc3VhbF9lZGl0b3IuYmdfdiIsCisgICAgICAgICAgICAg IndoaXRlcG9pbnQudmlzdWFsX2VkaXRvci5iIiwKK0BAIC0xOTQ3NCwxOSArMTk0NjIsNiBAQAor ICAgICAgICAgYXBwLmZyYW1lLlNob3coKQorICAgICAgICAgYXBwLnByb2Nlc3NfYXJndigxKQor ICAgICAgICAgd3guQ2FsbEFmdGVyKGFwcC5mcmFtZS5SYWlzZSkKKy0gICAgICAgICMgQ2hlY2sg Zm9yIHVwZGF0ZXMgaWYgY29uZmlndXJlZAorLSAgICAgICAgaWYgZ2V0Y2ZnKCJ1cGRhdGVfY2hl Y2siKToKKy0gICAgICAgICAgICAjIEdpdmUgdGltZSBmb3IgdGhlIG1haW4gd2luZG93IHRvIGdh aW4gZm9jdXMgYmVmb3JlIGNoZWNraW5nIGZvcgorLSAgICAgICAgICAgICMgdXBkYXRlLCBvdGhl cndpc2UgdGhlIG1haW4gd2luZG93IG1heSBzdGVhbCB0aGUgdXBkYXRlCistICAgICAgICAgICAg IyBjb25maXJtYXRpb24gZGlhbG9nJ3MgZm9jdXMgd2hpY2ggbG9va3Mgd2VpcmQKKy0gICAgICAg ICAgICB3eC5DYWxsQWZ0ZXIoYXBwLmZyYW1lLmFwcF91cGRhdGVfY2hlY2tfaGFuZGxlciwgTm9u ZSwgc2lsZW50PVRydWUpCistICAgICAgICBlbHNlOgorLSAgICAgICAgICAgICMgQ2hlY2sgaWYg d2UgbmVlZCB0byBydW4gaW5zdHJ1bWVudCBzZXR1cAorLSAgICAgICAgICAgIHd4LkNhbGxBZnRl cigKKy0gICAgICAgICAgICAgICAgYXBwLmZyYW1lLmNoZWNrX2luc3RydW1lbnRfc2V0dXAsCist ICAgICAgICAgICAgICAgIGNoZWNrX2RvbmF0aW9uLAorLSAgICAgICAgICAgICAgICAoYXBwLmZy YW1lLCBWRVJTSU9OID4gVkVSU0lPTl9CQVNFKSwKKy0gICAgICAgICAgICApCisgICAgICAgICAj IElmIHJlc291cmNlcyBhcmUgbWlzc2luZywgWFJDIHNob3dzIGFuIGVycm9yIGRpYWxvZyB3aGlj aCBpbW1lZGlhdGVseQorICAgICAgICAgIyBnZXRzIGhpZGRlbiB3aGVuIHdlIGNsb3NlIG91cnNl bHZlcyBiZWNhdXNlIHdlIGFyZSB0aGUgcGFyZW50LgorICAgICAgICAgIyBIaWRlIGluc3RlYWQu CistLS0gYS9EaXNwbGF5Q0FML3dvcmtlci5weQorKysrIGIvRGlzcGxheUNBTC93b3JrZXIucHkK K0BAIC0xNjEwLDEwICsxNjEwLDYgQEAKKyAgICAgICAgIGRsZ19yZXN1bHQgPSBkbGcuU2hvd01v ZGFsKCkKKyAgICAgICAgIGRsZy5EZXN0cm95KCkKKyAgICAgICAgIGlmIGRsZ19yZXN1bHQgPT0g d3guSURfT0s6CistICAgICAgICAgICAgIyBEb3dubG9hZCBBcmd5bGwgQ01TCistICAgICAgICAg ICAgZnJvbSBEaXNwbGF5Q0FMLmRpc3BsYXlfY2FsIGltcG9ydCBhcHBfdXBkYXRlX2NoZWNrCist CistICAgICAgICAgICAgYXBwX3VwZGF0ZV9jaGVjayhwYXJlbnQsIHNpbGVudCwgYXJneWxsPVRy dWUpCisgICAgICAgICAgICAgcmV0dXJuIEZhbHNlCisgICAgICAgICBlbGlmIGRsZ19yZXN1bHQg PT0gd3guSURfQ0FOQ0VMOgorICAgICAgICAgICAgIGlmIGNhbGxhZnRlcjoKKy0tLSBhL0Rpc3Bs YXlDQUwveHJjL21haW5tZW51LnhyYworKysrIGIvRGlzcGxheUNBTC94cmMvbWFpbm1lbnUueHJj CitAQCAtMjMxLDE0ICsyMzEsNiBAQAorICAgICAgICAgPGxhYmVsPmJ1Z19yZXBvcnQ8L2xhYmVs PgorICAgICAgIDwvb2JqZWN0PgorICAgICAgIDxvYmplY3QgY2xhc3M9InNlcGFyYXRvciIvPgor LSAgICAgIDxvYmplY3QgY2xhc3M9Ind4TWVudUl0ZW0iIG5hbWU9InVwZGF0ZV9jaGVjay5vbnN0 YXJ0dXAiPgorLSAgICAgICAgPGxhYmVsPnVwZGF0ZV9jaGVjay5vbnN0YXJ0dXA8L2xhYmVsPgor LSAgICAgICAgPGNoZWNrYWJsZT4xPC9jaGVja2FibGU+CistICAgICAgPC9vYmplY3Q+CistICAg ICAgPG9iamVjdCBjbGFzcz0id3hNZW51SXRlbSIgbmFtZT0idXBkYXRlX2NoZWNrIj4KKy0gICAg ICAgIDxsYWJlbD51cGRhdGVfY2hlY2s8L2xhYmVsPgorLSAgICAgIDwvb2JqZWN0PgorLSAgICAg IDxvYmplY3QgY2xhc3M9InNlcGFyYXRvciIvPgorICAgICAgIDxsYWJlbD5tZW51LmhlbHA8L2xh YmVsPgorICAgICA8L29iamVjdD4KKyAgIDwvb2JqZWN0PgpkaWZmIC0tZ2l0IGEvc3JjcGtncy9k aXNwY2FsR1VJL3RlbXBsYXRlIGIvc3JjcGtncy9kaXNwY2FsR1VJL3RlbXBsYXRlCmluZGV4IDA1 MDg2Yjk3ZTVhMi4uYjY4NDY1ZmNjM2FkIDEwMDY0NAotLS0gYS9zcmNwa2dzL2Rpc3BjYWxHVUkv dGVtcGxhdGUKKysrIGIvc3JjcGtncy9kaXNwY2FsR1VJL3RlbXBsYXRlCkBAIC0xLDI1ICsxLDM0 IEBACiAjIFRlbXBsYXRlIGZpbGUgZm9yICdkaXNwY2FsR1VJJwogcGtnbmFtZT1kaXNwY2FsR1VJ Ci12ZXJzaW9uPTMuOC45LjMKLXJldmlzaW9uPTUKLV9uYW1lPSJEaXNwbGF5Q0FMIgotYnVpbGRf c3R5bGU9cHl0aG9uMi1tb2R1bGUKLWhvc3RtYWtlZGVwZW5kcz0icHl0aG9uIgotbWFrZWRlcGVu ZHM9InB5dGhvbi1kZXZlbCBsaWJYeGY4NnZtLWRldmVsIGxpYlhpbmVyYW1hLWRldmVsIGxpYlhy YW5kci1kZXZlbCIKLWRlcGVuZHM9InB5dGhvbi1kYnVzIHB5dGhvbi1udW1weSB3eFB5dGhvbiBh cmd5bGxjbXMiCit2ZXJzaW9uPTMuOS44CityZXZpc2lvbj0xCitidWlsZF9zdHlsZT1weXRob24z LXBlcDUxNworaG9zdG1ha2VkZXBlbmRzPSJweXRob24zLXNldHVwdG9vbHMgcHl0aG9uMy13aGVl bCIKK21ha2VkZXBlbmRzPSJweXRob24zLWRldmVsIGxpYlh4Zjg2dm0tZGV2ZWwgbGliWGluZXJh bWEtZGV2ZWwgbGliWHJhbmRyLWRldmVsIgorZGVwZW5kcz0icHl0aG9uMy1kaXN0cm8gcHl0aG9u My1kYnVzIHB5dGhvbjMtbnVtcHkgcHl0aG9uMy1QaWxsb3cKKyBweXRob24zLWNocm9tZWNhc3Qg cHl0aG9uMy1zZW5kMnRyYXNoIHd4UHl0aG9uNCBweXRob24zLXplcm9jb25mCisgcHl0aG9uMy1j ZXJ0aWZpIGFyZ3lsbGNtcyIKIHNob3J0X2Rlc2M9IkRpc3BsYXkgQ2FsaWJyYXRpb24gYW5kIENo YXJhY3Rlcml6YXRpb24iCiBtYWludGFpbmVyPSJsZW1taSA8bGVtbWlAbmVyZDJuZXJkLm9yZz4i CiBsaWNlbnNlPSJHUEwtMy4wLW9yLWxhdGVyIgotaG9tZXBhZ2U9Imh0dHBzOi8vZGlzcGxheWNh bC5uZXQvIgotY2hhbmdlbG9nPSJodHRwczovL2Rpc3BsYXljYWwubmV0L0NIQU5HRVMuaHRtbCIK LWRpc3RmaWxlcz0iJHtTT1VSQ0VGT1JHRV9TSVRFfS9kaXNwY2FsZ3VpLyR7X25hbWV9LSR7dmVy c2lvbn0udGFyLmd6IgotY2hlY2tzdW09N2MzNGRmYmQ5ZjY2ZjI0ZjFkNGM4OGRlNGE1YTBkZTY4 OGFhZDcxOWYwOTU4NzRiNjI1OTYzN2QzMDg5M2JlYQoraG9tZXBhZ2U9Imh0dHBzOi8vZ2l0aHVi LmNvbS9lb3lpbG1hei9kaXNwbGF5Y2FsLXB5MyIKK2NoYW5nZWxvZz0iaHR0cHM6Ly9naXRodWIu Y29tL2VveWlsbWF6L2Rpc3BsYXljYWwtcHkzL3JlbGVhc2VzL3RhZy8ke3ZlcnNpb259IgorZGlz dGZpbGVzPSJodHRwczovL2dpdGh1Yi5jb20vZW95aWxtYXovZGlzcGxheWNhbC1weTMvYXJjaGl2 ZS8ke3ZlcnNpb259LnRhci5neiIKK2NoZWNrc3VtPWE5ZThiYmEwMmY5YmRmOGRmNTA2ZjBkY2Ji ZWE0ZWFlNDg3OTUwMDFjYjgxZWE1OTY4ZmJmYzQxZjRiNzJlMWQKKyMgcmVxdWlyZXMgcnVubmlu ZyBYMTEgc2VydmVyIGFuZCBkYnVzLWRhZW1vbgorbWFrZV9jaGVjaz1ubworCitwb3N0X3BhdGNo KCkgeworCSMgc2V0IHRoZSBoYXJkY29kZWQgdmVyc2lvbiBvZiBweXRob24gMyB0byB0aGUgbGF0 ZXN0IG9uZQorCXNlZCAtaSAic3xeXChweV9tYXh2ZXJzaW9uID1cKS4qfFwxICgke3B5M192ZXIl Lip9LCAke3B5M192ZXIjKi59KXwiIERpc3BsYXlDQUwvbWV0YS5weQorCisJc2VkIC1pICJzfEBQ WV9WRVJAfCR7cHkzX3Zlci8uL318ZyIgRGlzcGxheUNBTC9SZWFsRGlzcGxheVNpemVNTS5weQor fQogCiBwcmVfY29uZmlndXJlKCkgewogCXNlZCAtaSAnc3xNaW1lVHlwZT1tb2RlbC92cm1sO3gt d29ybGQveC12cm1sO3xNaW1lVHlwZT1tb2RlbC92cm1sO3wnIG1pc2MvZGlzcGxheWNhbC12cm1s LXRvLXgzZC1jb252ZXJ0ZXIuZGVza3RvcAogfQogCi1wb3N0X2luc3RhbGwoKSB7Ci0JZmluZCAk e0RFU1RESVJ9L3Vzci8gLWV4ZWMgY2htb2QgYStyIFx7XH0gKwotCWZpbmQgJHtERVNURElSfS91 c3IvIC10eXBlIGQgLWV4ZWMgY2htb2QgYSt4IFx7XH0gKworZG9faW5zdGFsbCgpIHsKKwlweXRo b24zIC1tIGluc3RhbGxlciAtLWRlc3RkaXIgJHtERVNURElSfSBkaXN0Lyoud2hsCiB9Cg== --===============2757470619649473404==--