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 11474 invoked from network); 12 Nov 2022 19:59:11 -0000 Received: from localhost (HELO inbox.vuxu.org) (::1) by localhost with ESMTPUTF8; 12 Nov 2022 19:59:11 -0000 Content-Type: multipart/mixed; boundary="===============1653642577793935146==" 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: Sat, 12 Nov 2022 20:59:10 +0100 List-Id: Message-ID: <20221112195910.xbpewcNsoWxRF-REOSzKopVzqRUQgV0JwjrQ5tx2OeY@z> GitHub notification mails are now in MIME to allow UTF8. --===============1653642577793935146== 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== --===============1653642577793935146== Content-Type: text/x-diff MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="github-pr-dispcalgui-40420.patch" RnJvbSBiOWUwMzFkNjZiZGFkNGNlZGYyZTljMzA2Y2E1NjkyMDRlNGM4ODdjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLcnVsIENldGVyIDxrcnVjZXRlckBwcm90b24ubWU+CkRhdGU6 IFdlZCwgOSBOb3YgMjAyMiAyMDowODoxNyArMDMwMApTdWJqZWN0OiBbUEFUQ0hdIGRpc3BjYWxH VUk6IHVwZGF0ZSB0byAzLjkuOCwgY2hhbmdlIHVwc3RyZWFtLgoKZGlzcGNhbEdVSSBpcyBub3Qg bWFpbnRhaW5lZCBieSBpdHMgb3JpZ2luYWwgYXV0aG9ycyBhbnltb3JlLgoKVGhlIHNpZ25pZmlj YW50IGFkdmFudGFnZSBvZiB0aGUgZm9yayBpcyBweXRob24gMyBzdXBwb3J0IHdoaWNoCmV4Y2x1 ZGVzIHB5dGhvbiAyIGZyb20gZGVwZW5kZW5jaWVzIChyZWxhdGVkIHRvCnZvaWQtbGludXgvdm9p ZC1wYWNrYWdlcyMzODIyOSkuCi0tLQogLi4uL2Rpc3BjYWxHVUkvcGF0Y2hlcy9lbmFibGUtYXBw ZGF0YS5wYXRjaCAgIHwgIDI4ICsrKysrCiBzcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy9lcnJv ci5wYXRjaCAgICAgICAgfCAgNDQgKysrLS0tLQogc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMv Zml4LWdldHRleHQucGF0Y2ggIHwgIDEzICsrCiAuLi4vcGF0Y2hlcy9maXgtaGFyZGNvZGVkLWlt cG9ydC5wYXRjaCAgICAgICAgfCAgMTggKysrCiAuLi4vZGlzcGNhbEdVSS9wYXRjaGVzL2ZpeC1z ZXR1cHRvb2xzLnBhdGNoICAgfCAgOTUgKysrKysrKysrKysrKysrCiBzcmNwa2dzL2Rpc3BjYWxH VUkvcGF0Y2hlcy9maXgtdmVyc2lvbi5wYXRjaCAgfCAxMTEgKysrKysrKysrKysrKysrKysrCiBz cmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy91cGRhdGUtY2hlY2sucGF0Y2ggfCAgOTAgKysrKysr KysrKysrKysKIC4uLi9kaXNwY2FsR1VJL3BhdGNoZXMveGRnLWF1dG9zdGFydC5wYXRjaCAgICB8 ICAxNiArKysKIHNyY3BrZ3MvZGlzcGNhbEdVSS90ZW1wbGF0ZSAgICAgICAgICAgICAgICAgICB8 ICAzNyArKystLS0KIDkgZmlsZXMgY2hhbmdlZCwgNDE2IGluc2VydGlvbnMoKyksIDM2IGRlbGV0 aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IHNyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2Vu YWJsZS1hcHBkYXRhLnBhdGNoCiBjcmVhdGUgbW9kZSAxMDA2NDQgc3JjcGtncy9kaXNwY2FsR1VJ L3BhdGNoZXMvZml4LWdldHRleHQucGF0Y2gKIGNyZWF0ZSBtb2RlIDEwMDY0NCBzcmNwa2dzL2Rp c3BjYWxHVUkvcGF0Y2hlcy9maXgtaGFyZGNvZGVkLWltcG9ydC5wYXRjaAogY3JlYXRlIG1vZGUg MTAwNjQ0IHNyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2ZpeC1zZXR1cHRvb2xzLnBhdGNoCiBj cmVhdGUgbW9kZSAxMDA2NDQgc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvZml4LXZlcnNpb24u cGF0Y2gKIGNyZWF0ZSBtb2RlIDEwMDY0NCBzcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy91cGRh dGUtY2hlY2sucGF0Y2gKIGNyZWF0ZSBtb2RlIDEwMDY0NCBzcmNwa2dzL2Rpc3BjYWxHVUkvcGF0 Y2hlcy94ZGctYXV0b3N0YXJ0LnBhdGNoCgpkaWZmIC0tZ2l0IGEvc3JjcGtncy9kaXNwY2FsR1VJ L3BhdGNoZXMvZW5hYmxlLWFwcGRhdGEucGF0Y2ggYi9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hl cy9lbmFibGUtYXBwZGF0YS5wYXRjaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAuLmNiMWFmN2ZlZDY4OAotLS0gL2Rldi9udWxsCisrKyBiL3NyY3BrZ3MvZGlzcGNhbEdV SS9wYXRjaGVzL2VuYWJsZS1hcHBkYXRhLnBhdGNoCkBAIC0wLDAgKzEsMjggQEAKK2NyZWF0ZV9h cHBkYXRhIGFuZCBidWlsZHNlcnZpY2UgYXJlIG5vdCBzZXQgdG8gVHJ1ZSBhZnRlciBjYWxsaW5n CitzZXR1cC5weSBleHRlcm5hbGx5ICgic2Rpc3QiIGFuZC9vciAiaW5zdGFsbCIgYXJlIG5vdCB1 c2VkKSwgbGVhZGluZyB0bworbmV0LmRpc3BsYXljYWwuRGlzcGxheUNBTC5hcHBkYXRhLnhtbCBu b3QgYmVpbmcgZm91bmQgZm9yIGNvcHlpbmcgaW4KK3RoZSBidWlsZCBwaGFzZS4KKworLS0tIGEv c2V0dXAucHkKKysrKyBiL3NldHVwLnB5CitAQCAtNjM5LDE4ICs2MzksOCBAQAorICAgICAgICAg aWYgbGVuKHN5cy5hcmd2KSA9PSAxIG9yIChsZW4oc3lzLmFyZ3YpID09IDIgYW5kIGRyeV9ydW4p OgorICAgICAgICAgICAgIHJldHVybgorIAorLSAgICBjcmVhdGVfYXBwZGF0YSA9ICgKKy0gICAg ICAgIChhcHBkYXRhIG9yICJpbnN0YWxsIiBpbiBzeXMuYXJndlsxOl0gb3IgInNkaXN0IiBpbiBz eXMuYXJndlsxOl0pCistICAgICAgICBhbmQgbm90IGhlbHAKKy0gICAgICAgIGFuZCBub3QgZHJ5 X3J1bgorLSAgICApCistCistICAgIGlmICgKKy0gICAgICAgICJzZGlzdCIgaW4gc3lzLmFyZ3Zb MTpdCistICAgICAgICBvciAiaW5zdGFsbCIgaW4gc3lzLmFyZ3ZbMTpdCistICAgICAgICBvciAi YmRpc3RfZGViIiBpbiBzeXMuYXJndlsxOl0KKy0gICAgKSBhbmQgbm90IGhlbHA6CistICAgICAg ICBidWlsZHNlcnZpY2UgPSBUcnVlCisrICAgIGNyZWF0ZV9hcHBkYXRhID0gVHJ1ZQorKyAgICBi dWlsZHNlcnZpY2UgPSBUcnVlCisgCisgICAgIGlmIGNyZWF0ZV9hcHBkYXRhIG9yIGJ1aWxkc2Vy dmljZToKKyAgICAgICAgIHdpdGggY29kZWNzLm9wZW4oc3RyKFBhdGgocHlkaXIsICJDSEFOR0VT Lmh0bWwiKSksICJyIiwgIlVURi04IikgYXMgZjoKZGlmZiAtLWdpdCBhL3NyY3BrZ3MvZGlzcGNh bEdVSS9wYXRjaGVzL2Vycm9yLnBhdGNoIGIvc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvZXJy b3IucGF0Y2gKaW5kZXggMTY5ZmM1MjhiMTM4Li43NTdhOTA2YjlkZGMgMTAwNjQ0Ci0tLSBhL3Ny Y3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2Vycm9yLnBhdGNoCisrKyBiL3NyY3BrZ3MvZGlzcGNh bEdVSS9wYXRjaGVzL2Vycm9yLnBhdGNoCkBAIC00LDMwICs0LDMwIEBAIFRoZXJlZm9yZSB0aGUg Y3VycmVudCBjb2RlIGVpdGhlciByZXN1bHRzIGluIGdhcmJsZWQgb3V0cHV0IG9yCiBkb2Vzbid0 IHdvcmsgYXQgYWxsLiBSZXBsYWNlIGl0IHdpdGggYSBzaW1wbGUgcHJpbnRmLgogCiAtLS0KLS0t LSBhL0Rpc3BsYXlDQUwvUmVhbERpc3BsYXlTaXplTU0uYwkyMDE4LTA3LTI1IDE2OjQ3OjAxLjAw MDAwMDAwMCArMDIwMAotKysrIGIvRGlzcGxheUNBTC9SZWFsRGlzcGxheVNpemVNTS5jCTIwMTgt MDctMjUgMTY6NDc6MDEuMDAwMDAwMDAwICswMjAwCi1AQCAtODIyLDEzICs4MjIsMTMgQEAKLSAJ CQkJCQlzcHJpbnRmKGRlc2MxLCAiX0lDQ19QUk9GSUxFXyVkIixkaXNwc1tuZGlzcHNdLT51c2Ny ZWVuKTsKKy0tLSBhL0Rpc3BsYXlDQUwvUmVhbERpc3BsYXlTaXplTU0uYworKysrIGIvRGlzcGxh eUNBTC9SZWFsRGlzcGxheVNpemVNTS5jCitAQCAtODM1LDEzICs4MzUsMTMgQEAKKyAgICAgICAg ICAgICAgICAgICAgICAgICBzcHJpbnRmKGRlc2MxLCAiX0lDQ19QUk9GSUxFXyVkIixkaXNwc1tu ZGlzcHNdLT51c2NyZWVuKTsKICAKLSAJCQkJCWlmICgoZGlzcHNbbmRpc3BzXS0+aWNjX2F0b20g PSBYSW50ZXJuQXRvbShteWRpc3BsYXksIGRlc2MxLCBGYWxzZSkpID09IE5vbmUpCi0tCQkJCQkJ ZXJyb3IoIlVuYWJsZSB0byBpbnRlcm4gYXRvbSAnJXMnIixkZXNjMSk7Ci0rCQkJCQkJZnByaW50 ZihzdGRlcnIsICJVbmFibGUgdG8gaW50ZXJuIGF0b20gJyVzJyIsZGVzYzEpOworICAgICAgICAg ICAgICAgICAgICAgaWYgKChkaXNwc1tuZGlzcHNdLT5pY2NfYXRvbSA9IFhJbnRlcm5BdG9tKG15 ZGlzcGxheSwgZGVzYzEsIEZhbHNlKSkgPT0gTm9uZSkKKy0gICAgICAgICAgICAgICAgICAgICAg ICBlcnJvcigiVW5hYmxlIHRvIGludGVybiBhdG9tICclcyciLGRlc2MxKTsKKysgICAgICAgICAg ICAgICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIlVuYWJsZSB0byBpbnRlcm4gYXRvbSAnJXMn IixkZXNjMSk7CiAgCi0gCQkJCQlkZWJ1Z3JyMigoZXJyb3V0LCJSb290IGF0b20gJyVzJ1xuIixk ZXNjMSkpOworICAgICAgICAgICAgICAgICAgICAgZGVidWdycjIoKGVycm91dCwiUm9vdCBhdG9t ICclcydcbiIsZGVzYzEpKTsKICAKLSAJCQkJCS8qIENyZWF0ZSB0aGUgYXRvbSBvZiB0aGUgb3V0 cHV0IHRoYXQgbWF5IGNvbnRhaW4gdGhlIGFzc29jaWF0ZWQgSUNDIHByb2ZpbGUgKi8KLSAJCQkJ CWlmICgoZGlzcHNbbmRpc3BzXS0+aWNjX291dF9hdG9tID0gWEludGVybkF0b20obXlkaXNwbGF5 LCAiX0lDQ19QUk9GSUxFIiwgRmFsc2UpKSA9PSBOb25lKQotLQkJCQkJCWVycm9yKCJVbmFibGUg dG8gaW50ZXJuIGF0b20gJyVzJyIsIl9JQ0NfUFJPRklMRSIpOwotKwkJCQkJCWZwcmludGYoc3Rk ZXJyLCAiVW5hYmxlIHRvIGludGVybiBhdG9tICclcyciLCJfSUNDX1BST0ZJTEUiKTsKLSAJCQot IAkJCQkJLyogR3JhYiB0aGUgRURJRCBmcm9tIHRoZSBvdXRwdXQgKi8KLSAJCQkJCXsKLUBAIC05 OTMsNyArOTkzLDcgQEAKLSAJCQkJc3ByaW50ZihkZXNjMSwgIl9JQ0NfUFJPRklMRV8lZCIsZGlz cHNbaV0tPnVzY3JlZW4pOworICAgICAgICAgICAgICAgICAgICAgLyogQ3JlYXRlIHRoZSBhdG9t IG9mIHRoZSBvdXRwdXQgdGhhdCBtYXkgY29udGFpbiB0aGUgYXNzb2NpYXRlZCBJQ0MgcHJvZmls ZSAqLworICAgICAgICAgICAgICAgICAgICAgaWYgKChkaXNwc1tuZGlzcHNdLT5pY2Nfb3V0X2F0 b20gPSBYSW50ZXJuQXRvbShteWRpc3BsYXksICJfSUNDX1BST0ZJTEUiLCBGYWxzZSkpID09IE5v bmUpCistICAgICAgICAgICAgICAgICAgICAgICAgZXJyb3IoIlVuYWJsZSB0byBpbnRlcm4gYXRv bSAnJXMnIiwiX0lDQ19QUk9GSUxFIik7CisrICAgICAgICAgICAgICAgICAgICAgICAgZnByaW50 ZihzdGRlcnIsICJVbmFibGUgdG8gaW50ZXJuIGF0b20gJyVzJyIsIl9JQ0NfUFJPRklMRSIpOwog IAotIAkJCWlmICgoZGlzcHNbaV0tPmljY19hdG9tID0gWEludGVybkF0b20obXlkaXNwbGF5LCBk ZXNjMSwgRmFsc2UpKSA9PSBOb25lKQotLQkJCQllcnJvcigiVW5hYmxlIHRvIGludGVybiBhdG9t ICclcyciLGRlc2MxKTsKLSsJCQkJZnByaW50ZihzdGRlcnIsICJVbmFibGUgdG8gaW50ZXJuIGF0 b20gJyVzJyIsZGVzYzEpOworICAgICAgICAgICAgICAgICAgICAgLyogR3JhYiB0aGUgRURJRCBm cm9tIHRoZSBvdXRwdXQgKi8KKyAgICAgICAgICAgICAgICAgICAgIHsKK0BAIC0xMDA3LDcgKzEw MDcsNyBAQAorICAgICAgICAgICAgICAgICBzcHJpbnRmKGRlc2MxLCAiX0lDQ19QUk9GSUxFXyVk IixkaXNwc1tpXS0+dXNjcmVlbik7CiAgCi0gCQkJLyogU2VlIGlmIHdlIGNhbiBsb2NhdGUgdGhl IEVESUQgb2YgdGhlIG1vbml0b3IgZm9yIHRoaXMgc2NyZWVuICovCi0gCQkJZm9yIChqID0gMDsg aiA8IDI7IGorKykgeyAKKyAgICAgICAgICAgICBpZiAoKGRpc3BzW2ldLT5pY2NfYXRvbSA9IFhJ bnRlcm5BdG9tKG15ZGlzcGxheSwgZGVzYzEsIEZhbHNlKSkgPT0gTm9uZSkKKy0gICAgICAgICAg ICAgICAgZXJyb3IoIlVuYWJsZSB0byBpbnRlcm4gYXRvbSAnJXMnIixkZXNjMSk7CisrICAgICAg ICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiVW5hYmxlIHRvIGludGVybiBhdG9tICclcyciLGRl c2MxKTsKKyAKKyAgICAgICAgICAgICAvKiBTZWUgaWYgd2UgY2FuIGxvY2F0ZSB0aGUgRURJRCBv ZiB0aGUgbW9uaXRvciBmb3IgdGhpcyBzY3JlZW4gKi8KKyAgICAgICAgICAgICBmb3IgKGogPSAw OyBqIDwgMjsgaisrKSB7CmRpZmYgLS1naXQgYS9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy9m aXgtZ2V0dGV4dC5wYXRjaCBiL3NyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2ZpeC1nZXR0ZXh0 LnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uODIzNmRjYTg1 N2MxCi0tLSAvZGV2L251bGwKKysrIGIvc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvZml4LWdl dHRleHQucGF0Y2gKQEAgLTAsMCArMSwxMyBAQAorImNvZGVzZXQiIGluIGdldHRleHQudHJhbnNs YXRpb24oKSBpcyBkZXByZWNhdGVkIHdpdGggcHl0aG9uIDMuMTEKKworLS0tIGEvRGlzcGxheUNB TC9kZWZhdWx0cGF0aHMucHkKKysrKyBiL0Rpc3BsYXlDQUwvZGVmYXVsdHBhdGhzLnB5CitAQCAt MjMxLDcgKzIzMSw3IEBACisgCisgICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgICBv YmoudHJhbnNsYXRpb24gPSBnZXR0ZXh0LnRyYW5zbGF0aW9uKAorLSAgICAgICAgICAgICAgICAg ICAgb2JqLkdFVFRFWFRfUEFDS0FHRSwgbG9jYWxlX2RpciwgY29kZXNldD0iVVRGLTgiCisrICAg ICAgICAgICAgICAgICAgICBvYmouR0VUVEVYVF9QQUNLQUdFLCBsb2NhbGVfZGlyCisgICAgICAg ICAgICAgICAgICkKKyAgICAgICAgICAgICBleGNlcHQgSU9FcnJvciBhcyBleGNlcHRpb246Cisg ICAgICAgICAgICAgICAgIHByaW50KCJYREc6IiwgZXhjZXB0aW9uKQpkaWZmIC0tZ2l0IGEvc3Jj cGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvZml4LWhhcmRjb2RlZC1pbXBvcnQucGF0Y2ggYi9zcmNw a2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy9maXgtaGFyZGNvZGVkLWltcG9ydC5wYXRjaApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLmUzMjdjYzUxMmZjNAotLS0gL2Rldi9u dWxsCisrKyBiL3NyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2ZpeC1oYXJkY29kZWQtaW1wb3J0 LnBhdGNoCkBAIC0wLDAgKzEsMTggQEAKKy0tLSBhL0Rpc3BsYXlDQUwvUmVhbERpc3BsYXlTaXpl TU0ucHkKKysrKyBiL0Rpc3BsYXlDQUwvUmVhbERpc3BsYXlTaXplTU0ucHkKK0BAIC0xNywxNCAr MTcsNyBAQAorICAgICAgICAgIyBUT0RPOiBJbnRlbCB2cyBBUk0gKEFwcGxlIFNpbGljb24pIGRp c3RpbmN0aW9uCisgICAgICAgICBmcm9tIERpc3BsYXlDQUwubGliNjQuUmVhbERpc3BsYXlTaXpl TU0gaW1wb3J0ICoKKyBlbHNlOgorLSAgICAjIGVsaWYgc3lzLnBsYXRmb3JtID09ICJ3aW4zMiI6 CistICAgICMgV2luZG93cyBoYXZlIHNlcGFyYXRlIGZpbGVzCistICAgIGlmIHN5cy52ZXJzaW9u X2luZm9bOjJdID09ICgzLCA4KToKKy0gICAgICAgIGZyb20gRGlzcGxheUNBTC5saWI2NC5weXRo b24zOC5SZWFsRGlzcGxheVNpemVNTSBpbXBvcnQgKgorLSAgICBlbGlmIHN5cy52ZXJzaW9uX2lu Zm9bOjJdID09ICgzLCA5KToKKy0gICAgICAgIGZyb20gRGlzcGxheUNBTC5saWI2NC5weXRob24z OS5SZWFsRGlzcGxheVNpemVNTSBpbXBvcnQgKgorLSAgICBlbGlmIHN5cy52ZXJzaW9uX2luZm9b OjJdID09ICgzLCAxMCk6CistICAgICAgICBmcm9tIERpc3BsYXlDQUwubGliNjQucHl0aG9uMzEw LlJlYWxEaXNwbGF5U2l6ZU1NIGltcG9ydCAqCisrICAgIGZyb20gRGlzcGxheUNBTC5saWI2NC5w eXRob25AUFlfVkVSQC5SZWFsRGlzcGxheVNpemVNTSBpbXBvcnQgKgorICMgZWxzZToKKyAjICAg ICBwYXNzCisgCmRpZmYgLS1naXQgYS9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy9maXgtc2V0 dXB0b29scy5wYXRjaCBiL3NyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2ZpeC1zZXR1cHRvb2xz LnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uNDdlZjBlYTJm NmM5Ci0tLSAvZGV2L251bGwKKysrIGIvc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvZml4LXNl dHVwdG9vbHMucGF0Y2gKQEAgLTAsMCArMSw5NSBAQAorc2V0dXB0b29scyBmb3Igc29tZSByZWFz b24gaXMgdXNlZCBhcyBhIHZhcmlhYmxlIGFuZCBhIG1vZHVsZS4KKworSW5pdGlhbGx5IHRoaXMg bGVhZHMgdG8gInNldHVwdG9vbHMuZmluZGFsbCIgbm90IGJlaW5nIHJlY29nbml6ZWQgYXMKK2Eg Y29tbWFuZCByZWxhdGVkIHRvIHRoZSBtb2R1bGUgYXQgYWxsLgorCitBbnkgdXNlIG9mIG1vZHVs ZSBuYW1lIGluIGNvbmRpdGlvbmFsIHN0YXRlbWVudHMgYWxzbyBsZWFkcyB0byBlcnJvciwKK2hl bmNlIHNpbXBsZSBzb2x1dGlvbjogcmVuYW1lIHRoZSB2YXJpYWJsZS4KKworLS0tIGEvRGlzcGxh eUNBTC9zZXR1cC5weQorKysrIGIvRGlzcGxheUNBTC9zZXR1cC5weQorQEAgLTQ1Myw3ICs0NTMs NyBAQAorICAgICBwcmVmaXggPSAiIgorICAgICByZWNvcmRmaWxlX25hbWUgPSBOb25lICAjIHJl Y29yZCBpbnN0YWxsZWQgZmlsZXMgdG8gdGhpcyBmaWxlCisgICAgIHNkaXN0ID0gInNkaXN0IiBp biBzeXMuYXJndlsxOl0KKy0gICAgc2V0dXB0b29scyA9IE5vbmUKKysgICAgc2V0b29scyA9IE5v bmUKKyAgICAgc2tpcF9wb3N0aW5zdGFsbCA9ICItLXNraXAtcG9zdGluc3RhbGwiIGluIHN5cy5h cmd2WzE6XQorICAgICB1c2VfZGlzdHV0aWxzID0gbm90IGJkaXN0X2JiZnJlZXplIGFuZCBub3Qg ZG9fcHkyYXBwCisgICAgIHVzZV9zZXR1cHRvb2xzID0gKAorQEAgLTQ4MCw3ICs0ODAsNyBAQAor ICAgICAgICAgICAgIGltcG9ydCBzZXR1cHRvb2xzCisgICAgICAgICAgICAgZnJvbSBzZXR1cHRv b2xzIGltcG9ydCBzZXR1cCwgRXh0ZW5zaW9uCisgCistICAgICAgICAgICAgc2V0dXB0b29scyA9 IFRydWUKKysgICAgICAgICAgICBzZXRvb2xzID0gVHJ1ZQorICAgICAgICAgICAgIHByaW50KCJ1 c2luZyBzZXR1cHRvb2xzIikKKyAgICAgICAgICAgICBjdXJyZW50X2ZpbmRhbGwgPSBzZXR1cHRv b2xzLmZpbmRhbGwKKyAgICAgICAgIGV4Y2VwdCBJbXBvcnRFcnJvcjoKK0BAIC01MDksNyArNTA5 LDcgQEAKKyAKKyAgICAgICAgIGRpc3R1dGlscy5maWxlbGlzdC5maW5kYWxsID0gZmluZGFsbAor IAorLSAgICBpZiBub3Qgc2V0dXB0b29sczoKKysgICAgaWYgbm90IHNldG9vbHM6CisgICAgICAg ICBmcm9tIGRpc3R1dGlscy5jb3JlIGltcG9ydCBzZXR1cCwgRXh0ZW5zaW9uCisgCisgICAgICAg ICBwcmludCgidXNpbmcgZGlzdHV0aWxzIikKK0BAIC05NDUsNyArOTQ1LDcgQEAKKyAgICAgZXh0 X21vZHVsZXMgPSBbUmVhbERpc3BsYXlTaXplTU1dCisgCisgICAgIHJlcXVpcmVzID0gW10KKy0g ICAgaWYgbm90IHNldHVwdG9vbHMgb3Igc3lzLnBsYXRmb3JtICE9ICJ3aW4zMiI6CisrICAgIGlm IG5vdCBzZXRvb2xzIG9yIHN5cy5wbGF0Zm9ybSAhPSAid2luMzIiOgorICAgICAgICAgIyB3eFB5 dGhvbiB3aW5kb3dzIGluc3RhbGxlciBkb2Vzbid0IGFkZCBlZ2ctaW5mbyBlbnRyeSwgc28KKyAg ICAgICAgICMgYSBkZXBlbmRlbmN5IGNoZWNrIGZyb20gcGtnX3Jlc291cmNlcyB3b3VsZCBhbHdh eXMgZmFpbAorICAgICAgICAgcmVxdWlyZXMuYXBwZW5kKCJ3eFB5dGhvbiAoPj0gJXMpIiAlICIu Ii5qb2luKHN0cihuKSBmb3IgbiBpbiB3eF9taW52ZXJzaW9uKSkKK0BAIC0xMDIxLDcgKzEwMjEs NyBAQAorICAgICAgICAgInZlcnNpb24iOiBtc2l2ZXJzaW9uIGlmICJiZGlzdF9tc2kiIGluIHN5 cy5hcmd2WzE6XSBlbHNlIHZlcnNpb24sCisgICAgIH0KKyAKKy0gICAgaWYgc2V0dXB0b29sczoK KysgICAgaWYgc2V0b29sczoKKyAgICAgICAgIGF0dHJzWyJlbnRyeV9wb2ludHMiXSA9IHsKKyAg ICAgICAgICAgICAiZ3VpX3NjcmlwdHMiOiBbCisgICAgICAgICAgICAgICAgICIlcyA9ICVzLm1h aW46bWFpbiVzIgorQEAgLTEyNzgsNyArMTI3OCw3IEBACisgICAgICAgICAgICAgYXR0cnNbIm9w dGlvbnMiXVsicHkyZXhlIl0udXBkYXRlKAorICAgICAgICAgICAgICAgICB7ImJ1bmRsZV9maWxl cyI6IDMsICJjb21wcmVzc2VkIjogMCwgIm9wdGltaXplIjogMCwgInNraXBfYXJjaGl2ZSI6IDF9 CisgICAgICAgICAgICAgKQorLSAgICAgICAgaWYgc2V0dXB0b29sczoKKysgICAgICAgIGlmIHNl dG9vbHM6CisgICAgICAgICAgICAgYXR0cnNbInNldHVwX3JlcXVpcmVzIl0gPSBbInB5MmV4ZSJd CisgICAgICAgICBhdHRyc1siemlwZmlsZSJdID0gb3MucGF0aC5qb2luKCJsaWIiLCAibGlicmFy eS56aXAiKQorIAorQEAgLTEzMjgsMTAgKzEzMjgsMTAgQEAKKyAgICAgICAgICMgc2l0ZS1wYWNr YWdlcyAob24gTWFjIGFuZCBXaW5kb3dzKSBhbmQgd2hlbiB3ZSB3YW50IHRvIG1ha2UgdGhlbQor ICAgICAgICAgIyBhYnNvbHV0ZSAoTGludXgpCisgICAgICAgICBsaW51eCA9IHN5cy5wbGF0Zm9y bSBub3QgaW4gKCJkYXJ3aW4iLCAid2luMzIiKSBhbmQgKAorLSAgICAgICAgICAgIG5vdCBjbWQu cm9vdCBhbmQgc2V0dXB0b29scworKyAgICAgICAgICAgIG5vdCBjbWQucm9vdCBhbmQgc2V0b29s cworICAgICAgICAgKQorICAgICAgICAgZGFyX3dpbiA9ICgKKy0gICAgICAgICAgICBzeXMucGxh dGZvcm0gaW4gKCJkYXJ3aW4iLCAid2luMzIiKSBhbmQgKGNtZC5yb290IG9yIG5vdCBzZXR1cHRv b2xzKQorKyAgICAgICAgICAgIHN5cy5wbGF0Zm9ybSBpbiAoImRhcndpbiIsICJ3aW4zMiIpIGFu ZCAoY21kLnJvb3Qgb3Igbm90IHNldG9vbHMpCisgICAgICAgICApIG9yIGJkaXN0X3dpbgorICAg ICAgICAgaWYgKAorICAgICAgICAgICAgIG5vdCBkb191bmluc3RhbGwKK0BAIC0xMzgwLDcgKzEz ODAsNyBAQAorICAgICAgICAgICAgICMgbG9naWMgdG8gZmluZCB0aGVtCisgICAgICAgICAgICAg cGF0aHMgPSBzYWZlX2dsb2Iob3MucGF0aC5qb2luKGNtZC5pbnN0YWxsX3NjcmlwdHMsIG5hbWUp KQorICAgICAgICAgICAgIGlmIHN5cy5wbGF0Zm9ybSA9PSAid2luMzIiOgorLSAgICAgICAgICAg ICAgICBpZiBzZXR1cHRvb2xzOgorKyAgICAgICAgICAgICAgICBpZiBzZXRvb2xzOgorICAgICAg ICAgICAgICAgICAgICAgcGF0aHMgKz0gc2FmZV9nbG9iKG9zLnBhdGguam9pbihjbWQuaW5zdGFs bF9zY3JpcHRzLCBmIntuYW1lfS5leGUiKSkKKyAgICAgICAgICAgICAgICAgICAgIHBhdGhzICs9 IHNhZmVfZ2xvYigKKyAgICAgICAgICAgICAgICAgICAgICAgICBvcy5wYXRoLmpvaW4oY21kLmlu c3RhbGxfc2NyaXB0cywgZiJ7bmFtZX0tc2NyaXB0LnB5IikKK0BAIC0xNTg3LDcgKzE1ODcsNyBA QAorICAgICAgICAgbWFuaWZlc3RfaW4uYXBwZW5kKCJpbmNsdWRlICIgKyBvcy5wYXRoLmpvaW4o InRlc3RzIiwgIioiKSkKKyAgICAgICAgIG1hbmlmZXN0X2luLmFwcGVuZCgicmVjdXJzaXZlLWlu Y2x1ZGUgdGhlbWUgKiIpCisgICAgICAgICBtYW5pZmVzdF9pbi5hcHBlbmQoInJlY3Vyc2l2ZS1p bmNsdWRlIHV0aWwgKi5jbWQgKi5weSAqLnNoIikKKy0gICAgICAgIGlmIHN5cy5wbGF0Zm9ybSA9 PSAid2luMzIiIGFuZCBub3Qgc2V0dXB0b29sczoKKysgICAgICAgIGlmIHN5cy5wbGF0Zm9ybSA9 PSAid2luMzIiIGFuZCBub3Qgc2V0b29sczoKKyAgICAgICAgICAgICAjIE9ubHkgbmVlZGVkIHVu ZGVyIFdpbmRvd3MKKyAgICAgICAgICAgICBtYW5pZmVzdF9pbi5hcHBlbmQoImdsb2JhbC1leGNs dWRlIC5zdm4vKiIpCisgICAgICAgICBtYW5pZmVzdF9pbi5hcHBlbmQoImdsb2JhbC1leGNsdWRl ICp+IikKZGlmZiAtLWdpdCBhL3NyY3BrZ3MvZGlzcGNhbEdVSS9wYXRjaGVzL2ZpeC12ZXJzaW9u LnBhdGNoIGIvc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvZml4LXZlcnNpb24ucGF0Y2gKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi5hZTA3MDliMmI2OGMKLS0tIC9k ZXYvbnVsbAorKysgYi9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy9maXgtdmVyc2lvbi5wYXRj aApAQCAtMCwwICsxLDExMSBAQAorc2V0dXAucHkgdXNlcyBwYWNrYWdlIHZlcnNpb24gcHJvdmlk ZWQgdGhhdCB0aGUgYnVpbGRkaXIgaXMgYSBnaXQKK3JlcG9zaXRvcnkgYW5kIGdpdCBpcyBwcmVz ZW50IGluIGhvc3RtYWtlZGVwZW5kcy4KKworT3RoZXJ3aXNlIDAuMC4wIGlzIHN1cHBsaWVkIGFz IHRoZSB2ZXJzaW9uLgorCistLS0gYS9zZXR1cC5weQorKysrIGIvc2V0dXAucHkKK0BAIC00NDUs NzEgKzQ0NSw0MCBAQAorIAorICAgICBmcm9tIERpc3BsYXlDQUwudXRpbF9vcyBpbXBvcnQgd2hp Y2gKKyAKKy0gICAgaWYgKAorLSAgICAgICAgUGF0aChweWRpciwgIi5naXQiKS5pc19kaXIoKQor LSAgICAgICAgYW5kICh3aGljaCgiZ2l0Iikgb3Igd2hpY2goImdpdC5leGUiKSkKKy0gICAgICAg IGFuZCAobm90IHN5cy5hcmd2WzE6XSBvciAobGVuKG5vbl9idWlsZF9hcmdzKSA8IGxlbihzeXMu YXJndlsxOl0pIGFuZCBub3QgaGVscCkpCistICAgICk6CistICAgICAgICBwcmludCgiVHJ5aW5n IHRvIGdldCBnaXQgdmVyc2lvbiBpbmZvcm1hdGlvbi4uLiIpCistICAgICAgICBnaXRfdmVyc2lv biA9IE5vbmUKKy0KKy0gICAgICAgIHRyeToKKy0gICAgICAgICAgICBwID0gc3VicHJvY2Vzcy5Q b3BlbigKKy0gICAgICAgICAgICAgICAgWyJnaXQiLCAicmV2LXBhcnNlIiwgIi0tc2hvcnQiLCAi SEVBRCJdLAorLSAgICAgICAgICAgICAgICBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFLAorLSAgICAg ICAgICAgICAgICBjd2Q9cHlkaXIsCistICAgICAgICAgICAgKQorLSAgICAgICAgZXhjZXB0IEV4 Y2VwdGlvbiBhcyBleGNlcHRpb246CistICAgICAgICAgICAgcHJpbnQoIi4uLmZhaWxlZDoiLCBl eGNlcHRpb24pCistICAgICAgICBlbHNlOgorLSAgICAgICAgICAgIGdpdF92ZXJzaW9uID0gcC5j b21tdW5pY2F0ZSgpWzBdLnN0cmlwKCkuZGVjb2RlKCkKKy0gICAgICAgICAgICB2ZXJzaW9uX2Jh c2VfZmlsZV9wYXRoID0gUGF0aChweWRpciwgIlZFUlNJT05fQkFTRSIpCistICAgICAgICAgICAg dmVyc2lvbl9iYXNlID0gIjAuMC4wIi5zcGxpdCgiLiIpCistCistICAgICAgICAgICAgaWYgdmVy c2lvbl9iYXNlX2ZpbGVfcGF0aC5pc19maWxlKCk6CistICAgICAgICAgICAgICAgIHdpdGggb3Bl bih2ZXJzaW9uX2Jhc2VfZmlsZV9wYXRoKSBhcyB2ZXJzaW9uX2Jhc2VfZmlsZToKKy0gICAgICAg ICAgICAgICAgICAgIHZlcnNpb25fYmFzZSA9IHZlcnNpb25fYmFzZV9maWxlLnJlYWQoKS5zdHJp cCgpLnNwbGl0KCIuIikKKy0KKy0gICAgICAgIHByaW50KCJUcnlpbmcgdG8gZ2V0IGdpdCBpbmZv cm1hdGlvbi4uLiIpCistICAgICAgICBsYXN0bW9kID0gIiIKKy0gICAgICAgIHRpbWVzdGFtcCA9 IE5vbmUKKy0gICAgICAgIG10aW1lID0gMAorLQorLSAgICAgICAgdHJ5OgorLSAgICAgICAgICAg IHAgPSBzdWJwcm9jZXNzLlBvcGVuKAorLSAgICAgICAgICAgICAgICBbImdpdCIsICJsb2ciLCAi LTEiLCAiLS1mb3JtYXQ9JWN0Il0sIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUsIGN3ZD1weWRpcgor KyAgICB2ZXJzaW9uX2Jhc2VfZmlsZV9wYXRoID0gUGF0aChweWRpciwgIlZFUlNJT05fQkFTRSIp CisrCisrICAgIHdpdGggb3Blbih2ZXJzaW9uX2Jhc2VfZmlsZV9wYXRoKSBhcyB2ZXJzaW9uX2Jh c2VfZmlsZToKKysgICAgICAgIHZlcnNpb25fYmFzZSA9IHZlcnNpb25fYmFzZV9maWxlLnJlYWQo KS5zdHJpcCgpLnNwbGl0KCIuIikKKysKKysgICAgbGFzdG1vZCA9ICIiCisrICAgIHRpbWVzdGFt cCA9IE5vbmUKKysgICAgbXRpbWUgPSAwCisrICAgIHRpbWVzdGFtcCA9IHRpbWUuZ210aW1lKG10 aW1lKQorKworKyAgICBpZiB0aW1lc3RhbXA6CisrICAgICAgICBsYXN0bW9kID0gZiJ7c3RyZnRp bWUoJyVZLSVtLSVkVCVIOiVNOiVTJywgdGltZXN0YW1wKX1aIgorKworKyAgICBpZiBub3QgZHJ5 X3J1bjoKKysgICAgICAgIHByaW50KCJHZW5lcmF0aW5nIF9fdmVyc2lvbl9fLnB5IikKKysKKysg ICAgICAgIHdpdGggb3BlbihQYXRoKHB5ZGlyLCAiRGlzcGxheUNBTCIsICJfX3ZlcnNpb25fXy5w eSIpLCAidyIpIGFzIHZlcnNpb25weToKKysgICAgICAgICAgICB2ZXJzaW9ucHkud3JpdGUoIiMg Z2VuZXJhdGVkIGJ5IHNldHVwLnB5XG5cbiIpCisrICAgICAgICAgICAgYnVpbGRfdGltZSA9IHRp bWUudGltZSgpCisrICAgICAgICAgICAgdmVyc2lvbnB5LndyaXRlKAorKyAgICAgICAgICAgICAg ICBmIkJVSUxEX0RBVEUgPSAiCisrICAgICAgICAgICAgICAgIGYiXCJ7c3RyZnRpbWUoJyVZLSVt LSVkVCVIOiVNOiVTJywgZ210aW1lKGJ1aWxkX3RpbWUpKX1aXCJcbiIKKyAgICAgICAgICAgICAp CistICAgICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGV4Y2VwdGlvbjoKKy0gICAgICAgICAgICBw cmludCgiLi4uZmFpbGVkOiIsIGV4Y2VwdGlvbikKKy0gICAgICAgIGVsc2U6CistICAgICAgICAg ICAgbXRpbWUgPSBpbnQocC5jb21tdW5pY2F0ZSgpWzBdLnN0cmlwKCkuZGVjb2RlKCkpCistICAg ICAgICAgICAgdGltZXN0YW1wID0gdGltZS5nbXRpbWUobXRpbWUpCistCistICAgICAgICBpZiB0 aW1lc3RhbXA6CistICAgICAgICAgICAgbGFzdG1vZCA9IGYie3N0cmZ0aW1lKCclWS0lbS0lZFQl SDolTTolUycsIHRpbWVzdGFtcCl9WiIKKy0KKy0gICAgICAgIGlmIG5vdCBkcnlfcnVuOgorLSAg ICAgICAgICAgIHByaW50KCJHZW5lcmF0aW5nIF9fdmVyc2lvbl9fLnB5IikKKy0KKy0gICAgICAg ICAgICB3aXRoIG9wZW4oUGF0aChweWRpciwgIkRpc3BsYXlDQUwiLCAiX192ZXJzaW9uX18ucHki KSwgInciKSBhcyB2ZXJzaW9ucHk6CistICAgICAgICAgICAgICAgIHZlcnNpb25weS53cml0ZSgi IyBnZW5lcmF0ZWQgYnkgc2V0dXAucHlcblxuIikKKy0gICAgICAgICAgICAgICAgYnVpbGRfdGlt ZSA9IHRpbWUudGltZSgpCistICAgICAgICAgICAgICAgIHZlcnNpb25weS53cml0ZSgKKy0gICAg ICAgICAgICAgICAgICAgIGYiQlVJTERfREFURSA9ICIKKy0gICAgICAgICAgICAgICAgICAgIGYi XCJ7c3RyZnRpbWUoJyVZLSVtLSVkVCVIOiVNOiVTJywgZ210aW1lKGJ1aWxkX3RpbWUpKX1aXCJc biIKKy0gICAgICAgICAgICAgICAgKQorLQorLSAgICAgICAgICAgICAgICBpZiBsYXN0bW9kOgor LSAgICAgICAgICAgICAgICAgICAgdmVyc2lvbnB5LndyaXRlKGYiTEFTVE1PRCA9IHtsYXN0bW9k IXJ9XG4iKQorLQorLSAgICAgICAgICAgICAgICBpZiBnaXRfdmVyc2lvbjoKKy0gICAgICAgICAg ICAgICAgICAgIHByaW50KCJWZXJzaW9uIiwgIi4iLmpvaW4odmVyc2lvbl9iYXNlKSkKKy0gICAg ICAgICAgICAgICAgICAgIHZlcnNpb25weS53cml0ZSgiVkVSU0lPTiA9ICglcylcbiIgJSAiLCAi LmpvaW4odmVyc2lvbl9iYXNlKSkKKy0gICAgICAgICAgICAgICAgICAgIHZlcnNpb25weS53cml0 ZSgiVkVSU0lPTl9CQVNFID0gKCVzKVxuIiAlICIsICIuam9pbih2ZXJzaW9uX2Jhc2UpKQorLSAg ICAgICAgICAgICAgICAgICAgdmVyc2lvbnB5LndyaXRlKCJWRVJTSU9OX1NUUklORyA9ICVyXG4i ICUgIi4iLmpvaW4odmVyc2lvbl9iYXNlKSkKKyAKKy0gICAgICAgICAgICAgICAgICAgIHdpdGgg b3BlbihQYXRoKHB5ZGlyLCAiVkVSU0lPTiIpLCAidyIpIGFzIHZlcnNpb250eHQ6CistICAgICAg ICAgICAgICAgICAgICAgICAgdmVyc2lvbnR4dC53cml0ZSgiLiIuam9pbih2ZXJzaW9uX2Jhc2Up KQorKyAgICAgICAgICAgIGlmIGxhc3Rtb2Q6CisrICAgICAgICAgICAgICAgIHZlcnNpb25weS53 cml0ZShmIkxBU1RNT0QgPSB7bGFzdG1vZCFyfVxuIikKKysKKysgICAgICAgICAgICBwcmludCgi VmVyc2lvbiIsICIuIi5qb2luKHZlcnNpb25fYmFzZSkpCisrICAgICAgICAgICAgdmVyc2lvbnB5 LndyaXRlKCJWRVJTSU9OID0gKCVzKVxuIiAlICIsICIuam9pbih2ZXJzaW9uX2Jhc2UpKQorKyAg ICAgICAgICAgIHZlcnNpb25weS53cml0ZSgiVkVSU0lPTl9CQVNFID0gKCVzKVxuIiAlICIsICIu am9pbih2ZXJzaW9uX2Jhc2UpKQorKyAgICAgICAgICAgIHZlcnNpb25weS53cml0ZSgiVkVSU0lP Tl9TVFJJTkcgPSAlclxuIiAlICIuIi5qb2luKHZlcnNpb25fYmFzZSkpCisrCisrICAgICAgICAg ICAgd2l0aCBvcGVuKFBhdGgocHlkaXIsICJWRVJTSU9OIiksICJ3IikgYXMgdmVyc2lvbnR4dDoK KysgICAgICAgICAgICAgICAgdmVyc2lvbnR4dC53cml0ZSgiLiIuam9pbih2ZXJzaW9uX2Jhc2Up KQorIAorICAgICBiYWNrdXBfc2V0dXBfcGF0aCA9IFBhdGgocHlkaXIsICJzZXR1cC5jZmcuYmFj a3VwIikKKyAgICAgc2V0dXBfcGF0aCA9IFBhdGgocHlkaXIsICJzZXR1cC5jZmciKQpkaWZmIC0t Z2l0IGEvc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvdXBkYXRlLWNoZWNrLnBhdGNoIGIvc3Jj cGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvdXBkYXRlLWNoZWNrLnBhdGNoCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uMzgyOTQzYTY3MjRlCi0tLSAvZGV2L251bGwKKysr IGIvc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNoZXMvdXBkYXRlLWNoZWNrLnBhdGNoCkBAIC0wLDAg KzEsOTAgQEAKK1F1aXRlIGEgY3J1ZGUgYXR0ZW1wdCB0byByZW1vdmUgdXBkYXRlIGNoZWNrcywg YnV0IGl0IHNob3VsZCB3b3JrLgorCitVcGRhdGUgY2hlY2tzIGFsc28gdXNlZCB0byB0cmlnZ2Vy IHBvcHVwIGRvbmF0aW9uIHdpbmRvdyBhdCBzdGFydHVwLAorYnV0IG5vdCBhbnltb3JlIHdpdGgg dGhlc2UgcGF0Y2hlcy4KKworLS0tIGEvRGlzcGxheUNBTC9kaXNwbGF5X2NhbC5weQorKysrIGIv RGlzcGxheUNBTC9kaXNwbGF5X2NhbC5weQorQEAgLTMxMTksMTYgKzMxMTksNiBAQAorICAgICAg ICAgc2VsZi5CaW5kKHd4LkVWVF9NRU5VLCBzZWxmLmhlbHBfc3VwcG9ydF9oYW5kbGVyLCBtZW51 aXRlbSkKKyAgICAgICAgIG1lbnVpdGVtID0gaGVscC5GaW5kSXRlbUJ5SWQoaGVscC5GaW5kSXRl bSgiYnVnX3JlcG9ydCIpKQorICAgICAgICAgc2VsZi5CaW5kKHd4LkVWVF9NRU5VLCBzZWxmLmJ1 Z19yZXBvcnRfaGFuZGxlciwgbWVudWl0ZW0pCistICAgICAgICBzZWxmLm1lbnVpdGVtX2FwcF9h dXRvX3VwZGF0ZV9jaGVjayA9IGhlbHAuRmluZEl0ZW1CeUlkKAorLSAgICAgICAgICAgIGhlbHAu RmluZEl0ZW0oInVwZGF0ZV9jaGVjay5vbnN0YXJ0dXAiKQorLSAgICAgICAgKQorLSAgICAgICAg c2VsZi5CaW5kKAorLSAgICAgICAgICAgIHd4LkVWVF9NRU5VLAorLSAgICAgICAgICAgIHNlbGYu YXBwX2F1dG9fdXBkYXRlX2NoZWNrX2hhbmRsZXIsCistICAgICAgICAgICAgc2VsZi5tZW51aXRl bV9hcHBfYXV0b191cGRhdGVfY2hlY2ssCistICAgICAgICApCistICAgICAgICBtZW51aXRlbSA9 IGhlbHAuRmluZEl0ZW1CeUlkKGhlbHAuRmluZEl0ZW0oInVwZGF0ZV9jaGVjayIpKQorLSAgICAg ICAgc2VsZi5CaW5kKHd4LkVWVF9NRU5VLCBzZWxmLmFwcF91cGRhdGVfY2hlY2tfaGFuZGxlciwg bWVudWl0ZW0pCisgCisgICAgICAgICBpZiBzeXMucGxhdGZvcm0gPT0gImRhcndpbiI6CisgICAg ICAgICAgICAgd3guR2V0QXBwKCkuU2V0TWFjQWJvdXRNZW51SXRlbUlkKHNlbGYubWVudWl0ZW1f YWJvdXQuR2V0SWQoKSkKK0BAIC0zMjU3LDcgKzMyNDcsNiBAQAorICAgICAgICAgc2VsZi5tZW51 aXRlbV9zaG93X2xvZy5DaGVjayhib29sKGdldGNmZygibG9nLnNob3ciKSkpCisgICAgICAgICBz ZWxmLm1lbnVpdGVtX2xvZ19hdXRvc2hvdy5FbmFibGUobm90IGJvb2woZ2V0Y2ZnKCJsb2cuc2hv dyIpKSkKKyAgICAgICAgIHNlbGYubWVudWl0ZW1fbG9nX2F1dG9zaG93LkNoZWNrKGJvb2woZ2V0 Y2ZnKCJsb2cuYXV0b3Nob3ciKSkpCistICAgICAgICBzZWxmLm1lbnVpdGVtX2FwcF9hdXRvX3Vw ZGF0ZV9jaGVjay5DaGVjayhib29sKGdldGNmZygidXBkYXRlX2NoZWNrIikpKQorIAorICAgICBk ZWYgaW5pdF9jb250cm9scyhzZWxmKToKKyAgICAgICAgICIiIkluaXRpYWxpemUgdGhlIG1haW4g d2luZG93IGNvbnRyb2xzIGFuZCB0aGVpciBldmVudCBoYW5kbGVycy4iIiIKK0BAIC00MDQ3LDcg KzQwMzYsNiBAQAorICAgICAgICAgICAgICJ1bnRldGhlcmVkLm1heF9kZWx0YS5jaHJvbWEiLAor ICAgICAgICAgICAgICJ1bnRldGhlcmVkLm1pbl9kZWx0YSIsCisgICAgICAgICAgICAgInVudGV0 aGVyZWQubWluX2RlbHRhLmxpZ2h0bmVzcyIsCistICAgICAgICAgICAgInVwZGF0ZV9jaGVjayIs CisgICAgICAgICAgICAgIndlYnNlcnZlci5wb3J0bnVtYmVyIiwKKyAgICAgICAgICAgICAid2hp dGVwb2ludC52aXN1YWxfZWRpdG9yLmJnX3YiLAorICAgICAgICAgICAgICJ3aGl0ZXBvaW50LnZp c3VhbF9lZGl0b3IuYiIsCitAQCAtMTk0NzQsMTkgKzE5NDYyLDYgQEAKKyAgICAgICAgIGFwcC5m cmFtZS5TaG93KCkKKyAgICAgICAgIGFwcC5wcm9jZXNzX2FyZ3YoMSkKKyAgICAgICAgIHd4LkNh bGxBZnRlcihhcHAuZnJhbWUuUmFpc2UpCistICAgICAgICAjIENoZWNrIGZvciB1cGRhdGVzIGlm IGNvbmZpZ3VyZWQKKy0gICAgICAgIGlmIGdldGNmZygidXBkYXRlX2NoZWNrIik6CistICAgICAg ICAgICAgIyBHaXZlIHRpbWUgZm9yIHRoZSBtYWluIHdpbmRvdyB0byBnYWluIGZvY3VzIGJlZm9y ZSBjaGVja2luZyBmb3IKKy0gICAgICAgICAgICAjIHVwZGF0ZSwgb3RoZXJ3aXNlIHRoZSBtYWlu IHdpbmRvdyBtYXkgc3RlYWwgdGhlIHVwZGF0ZQorLSAgICAgICAgICAgICMgY29uZmlybWF0aW9u IGRpYWxvZydzIGZvY3VzIHdoaWNoIGxvb2tzIHdlaXJkCistICAgICAgICAgICAgd3guQ2FsbEFm dGVyKGFwcC5mcmFtZS5hcHBfdXBkYXRlX2NoZWNrX2hhbmRsZXIsIE5vbmUsIHNpbGVudD1UcnVl KQorLSAgICAgICAgZWxzZToKKy0gICAgICAgICAgICAjIENoZWNrIGlmIHdlIG5lZWQgdG8gcnVu IGluc3RydW1lbnQgc2V0dXAKKy0gICAgICAgICAgICB3eC5DYWxsQWZ0ZXIoCistICAgICAgICAg ICAgICAgIGFwcC5mcmFtZS5jaGVja19pbnN0cnVtZW50X3NldHVwLAorLSAgICAgICAgICAgICAg ICBjaGVja19kb25hdGlvbiwKKy0gICAgICAgICAgICAgICAgKGFwcC5mcmFtZSwgVkVSU0lPTiA+ IFZFUlNJT05fQkFTRSksCistICAgICAgICAgICAgKQorICAgICAgICAgIyBJZiByZXNvdXJjZXMg YXJlIG1pc3NpbmcsIFhSQyBzaG93cyBhbiBlcnJvciBkaWFsb2cgd2hpY2ggaW1tZWRpYXRlbHkK KyAgICAgICAgICMgZ2V0cyBoaWRkZW4gd2hlbiB3ZSBjbG9zZSBvdXJzZWx2ZXMgYmVjYXVzZSB3 ZSBhcmUgdGhlIHBhcmVudC4KKyAgICAgICAgICMgSGlkZSBpbnN0ZWFkLgorLS0tIGEvRGlzcGxh eUNBTC93b3JrZXIucHkKKysrKyBiL0Rpc3BsYXlDQUwvd29ya2VyLnB5CitAQCAtMTYxMCwxMCAr MTYxMCw2IEBACisgICAgICAgICBkbGdfcmVzdWx0ID0gZGxnLlNob3dNb2RhbCgpCisgICAgICAg ICBkbGcuRGVzdHJveSgpCisgICAgICAgICBpZiBkbGdfcmVzdWx0ID09IHd4LklEX09LOgorLSAg ICAgICAgICAgICMgRG93bmxvYWQgQXJneWxsIENNUworLSAgICAgICAgICAgIGZyb20gRGlzcGxh eUNBTC5kaXNwbGF5X2NhbCBpbXBvcnQgYXBwX3VwZGF0ZV9jaGVjaworLQorLSAgICAgICAgICAg IGFwcF91cGRhdGVfY2hlY2socGFyZW50LCBzaWxlbnQsIGFyZ3lsbD1UcnVlKQorICAgICAgICAg ICAgIHJldHVybiBGYWxzZQorICAgICAgICAgZWxpZiBkbGdfcmVzdWx0ID09IHd4LklEX0NBTkNF TDoKKyAgICAgICAgICAgICBpZiBjYWxsYWZ0ZXI6CistLS0gYS9EaXNwbGF5Q0FML3hyYy9tYWlu bWVudS54cmMKKysrKyBiL0Rpc3BsYXlDQUwveHJjL21haW5tZW51LnhyYworQEAgLTIzMSwxNCAr MjMxLDYgQEAKKyAgICAgICAgIDxsYWJlbD5idWdfcmVwb3J0PC9sYWJlbD4KKyAgICAgICA8L29i amVjdD4KKyAgICAgICA8b2JqZWN0IGNsYXNzPSJzZXBhcmF0b3IiLz4KKy0gICAgICA8b2JqZWN0 IGNsYXNzPSJ3eE1lbnVJdGVtIiBuYW1lPSJ1cGRhdGVfY2hlY2sub25zdGFydHVwIj4KKy0gICAg ICAgIDxsYWJlbD51cGRhdGVfY2hlY2sub25zdGFydHVwPC9sYWJlbD4KKy0gICAgICAgIDxjaGVj a2FibGU+MTwvY2hlY2thYmxlPgorLSAgICAgIDwvb2JqZWN0PgorLSAgICAgIDxvYmplY3QgY2xh c3M9Ind4TWVudUl0ZW0iIG5hbWU9InVwZGF0ZV9jaGVjayI+CistICAgICAgICA8bGFiZWw+dXBk YXRlX2NoZWNrPC9sYWJlbD4KKy0gICAgICA8L29iamVjdD4KKy0gICAgICA8b2JqZWN0IGNsYXNz PSJzZXBhcmF0b3IiLz4KKyAgICAgICA8bGFiZWw+bWVudS5oZWxwPC9sYWJlbD4KKyAgICAgPC9v YmplY3Q+CisgICA8L29iamVjdD4KZGlmZiAtLWdpdCBhL3NyY3BrZ3MvZGlzcGNhbEdVSS9wYXRj aGVzL3hkZy1hdXRvc3RhcnQucGF0Y2ggYi9zcmNwa2dzL2Rpc3BjYWxHVUkvcGF0Y2hlcy94ZGct YXV0b3N0YXJ0LnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4u N2Y5NWUwNzUyMWYyCi0tLSAvZGV2L251bGwKKysrIGIvc3JjcGtncy9kaXNwY2FsR1VJL3BhdGNo ZXMveGRnLWF1dG9zdGFydC5wYXRjaApAQCAtMCwwICsxLDE2IEBACitUcmllcyB0byBpbnN0YWxs IGEgZGVza3RvcCBmaWxlIGluIC91c3Ivc2hhcmUvdG1wIGluc3RlYWQgb2YKKy9ldGMveGRnL2F1 dG9zdGFydC4KKworLS0tIGEvRGlzcGxheUNBTC9zZXR1cC5weQorKysrIGIvRGlzcGxheUNBTC9z ZXR1cC5weQorQEAgLTcwOSw5ICs3MDksNyBAQAorICAgICAgICAgICAgICkKKyAgICAgICAgICAg ICBkYXRhX2ZpbGVzLmFwcGVuZCgKKyAgICAgICAgICAgICAgICAgKAorLSAgICAgICAgICAgICAg ICAgICAgYXV0b3N0YXJ0CistICAgICAgICAgICAgICAgICAgICBpZiBvcy5nZXRldWlkKCkgPT0g MCBvciBwcmVmaXguc3RhcnRzd2l0aCgiLyIpCistICAgICAgICAgICAgICAgICAgICBlbHNlIGF1 dG9zdGFydF9ob21lLAorKyAgICAgICAgICAgICAgICAgICAgYXV0b3N0YXJ0LAorICAgICAgICAg ICAgICAgICAgICAgWworICAgICAgICAgICAgICAgICAgICAgICAgIG9zLnBhdGguam9pbigKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcHlkaXIsCmRpZmYgLS1naXQgYS9zcmNwa2dzL2Rp c3BjYWxHVUkvdGVtcGxhdGUgYi9zcmNwa2dzL2Rpc3BjYWxHVUkvdGVtcGxhdGUKaW5kZXggMDUw ODZiOTdlNWEyLi5iNjg0NjVmY2MzYWQgMTAwNjQ0Ci0tLSBhL3NyY3BrZ3MvZGlzcGNhbEdVSS90 ZW1wbGF0ZQorKysgYi9zcmNwa2dzL2Rpc3BjYWxHVUkvdGVtcGxhdGUKQEAgLTEsMjUgKzEsMzQg QEAKICMgVGVtcGxhdGUgZmlsZSBmb3IgJ2Rpc3BjYWxHVUknCiBwa2duYW1lPWRpc3BjYWxHVUkK LXZlcnNpb249My44LjkuMwotcmV2aXNpb249NQotX25hbWU9IkRpc3BsYXlDQUwiCi1idWlsZF9z dHlsZT1weXRob24yLW1vZHVsZQotaG9zdG1ha2VkZXBlbmRzPSJweXRob24iCi1tYWtlZGVwZW5k cz0icHl0aG9uLWRldmVsIGxpYlh4Zjg2dm0tZGV2ZWwgbGliWGluZXJhbWEtZGV2ZWwgbGliWHJh bmRyLWRldmVsIgotZGVwZW5kcz0icHl0aG9uLWRidXMgcHl0aG9uLW51bXB5IHd4UHl0aG9uIGFy Z3lsbGNtcyIKK3ZlcnNpb249My45LjgKK3JldmlzaW9uPTEKK2J1aWxkX3N0eWxlPXB5dGhvbjMt cGVwNTE3Citob3N0bWFrZWRlcGVuZHM9InB5dGhvbjMtc2V0dXB0b29scyBweXRob24zLXdoZWVs IgorbWFrZWRlcGVuZHM9InB5dGhvbjMtZGV2ZWwgbGliWHhmODZ2bS1kZXZlbCBsaWJYaW5lcmFt YS1kZXZlbCBsaWJYcmFuZHItZGV2ZWwiCitkZXBlbmRzPSJweXRob24zLWRpc3RybyBweXRob24z LWRidXMgcHl0aG9uMy1udW1weSBweXRob24zLVBpbGxvdworIHB5dGhvbjMtY2hyb21lY2FzdCBw eXRob24zLXNlbmQydHJhc2ggd3hQeXRob240IHB5dGhvbjMtemVyb2NvbmYKKyBweXRob24zLWNl cnRpZmkgYXJneWxsY21zIgogc2hvcnRfZGVzYz0iRGlzcGxheSBDYWxpYnJhdGlvbiBhbmQgQ2hh cmFjdGVyaXphdGlvbiIKIG1haW50YWluZXI9ImxlbW1pIDxsZW1taUBuZXJkMm5lcmQub3JnPiIK IGxpY2Vuc2U9IkdQTC0zLjAtb3ItbGF0ZXIiCi1ob21lcGFnZT0iaHR0cHM6Ly9kaXNwbGF5Y2Fs Lm5ldC8iCi1jaGFuZ2Vsb2c9Imh0dHBzOi8vZGlzcGxheWNhbC5uZXQvQ0hBTkdFUy5odG1sIgot ZGlzdGZpbGVzPSIke1NPVVJDRUZPUkdFX1NJVEV9L2Rpc3BjYWxndWkvJHtfbmFtZX0tJHt2ZXJz aW9ufS50YXIuZ3oiCi1jaGVja3N1bT03YzM0ZGZiZDlmNjZmMjRmMWQ0Yzg4ZGU0YTVhMGRlNjg4 YWFkNzE5ZjA5NTg3NGI2MjU5NjM3ZDMwODkzYmVhCitob21lcGFnZT0iaHR0cHM6Ly9naXRodWIu Y29tL2VveWlsbWF6L2Rpc3BsYXljYWwtcHkzIgorY2hhbmdlbG9nPSJodHRwczovL2dpdGh1Yi5j b20vZW95aWxtYXovZGlzcGxheWNhbC1weTMvcmVsZWFzZXMvdGFnLyR7dmVyc2lvbn0iCitkaXN0 ZmlsZXM9Imh0dHBzOi8vZ2l0aHViLmNvbS9lb3lpbG1hei9kaXNwbGF5Y2FsLXB5My9hcmNoaXZl LyR7dmVyc2lvbn0udGFyLmd6IgorY2hlY2tzdW09YTllOGJiYTAyZjliZGY4ZGY1MDZmMGRjYmJl YTRlYWU0ODc5NTAwMWNiODFlYTU5NjhmYmZjNDFmNGI3MmUxZAorIyByZXF1aXJlcyBydW5uaW5n IFgxMSBzZXJ2ZXIgYW5kIGRidXMtZGFlbW9uCittYWtlX2NoZWNrPW5vCisKK3Bvc3RfcGF0Y2go KSB7CisJIyBzZXQgdGhlIGhhcmRjb2RlZCB2ZXJzaW9uIG9mIHB5dGhvbiAzIHRvIHRoZSBsYXRl c3Qgb25lCisJc2VkIC1pICJzfF5cKHB5X21heHZlcnNpb24gPVwpLip8XDEgKCR7cHkzX3ZlciUu Kn0sICR7cHkzX3ZlciMqLn0pfCIgRGlzcGxheUNBTC9tZXRhLnB5CisKKwlzZWQgLWkgInN8QFBZ X1ZFUkB8JHtweTNfdmVyLy4vfXxnIiBEaXNwbGF5Q0FML1JlYWxEaXNwbGF5U2l6ZU1NLnB5Cit9 CiAKIHByZV9jb25maWd1cmUoKSB7CiAJc2VkIC1pICdzfE1pbWVUeXBlPW1vZGVsL3ZybWw7eC13 b3JsZC94LXZybWw7fE1pbWVUeXBlPW1vZGVsL3ZybWw7fCcgbWlzYy9kaXNwbGF5Y2FsLXZybWwt dG8teDNkLWNvbnZlcnRlci5kZXNrdG9wCiB9CiAKLXBvc3RfaW5zdGFsbCgpIHsKLQlmaW5kICR7 REVTVERJUn0vdXNyLyAtZXhlYyBjaG1vZCBhK3IgXHtcfSArCi0JZmluZCAke0RFU1RESVJ9L3Vz ci8gLXR5cGUgZCAtZXhlYyBjaG1vZCBhK3ggXHtcfSArCitkb19pbnN0YWxsKCkgeworCXB5dGhv bjMgLW0gaW5zdGFsbGVyIC0tZGVzdGRpciAke0RFU1RESVJ9IGRpc3QvKi53aGwKIH0K --===============1653642577793935146==--