From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 From: Takao Fujiwara To: git-commits@fedoraproject.org Subject: [rpms/ibus] autotool: Resolve #2188800 Error handling with display == null Date: Sun, 31 May 2026 02:08:21 GMT Message-ID: <178019330152.1.11956496626351928539.rpms-ibus-31e3c61bbd9c@fedoraproject.org> List-ID: X-Git-Repo: rpms/ibus X-Git-Branch: autotool X-Git-Rev: 31e3c61bbd9cb906e9029b3f21a1b026b13d0b72 ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvaWJ1cwogICAgICAgICAgICBCcmFuY2ggOiBhdXRvdG9vbAogICAgICAgICAg ICBDb21taXQgOiAzMWUzYzYxYmJkOWNiOTA2ZTkwMjliM2YyMWExYjAyNmIxM2QwYjcyCiAgICAg ICAgICAgIEF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgogICAg ICAgICAgICBEYXRlICAgOiAyMDIzLTExLTI1VDE0OjExOjI2KzA5OjAwCiAgICAgICAgICAgIFN0 YXRzICA6ICsxMTQvLTE0IGluIDIgZmlsZShzKQogICAgICAgICAgICBVUkwgICAgOiBodHRwczov L3NyYy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL2lidXMvYy8zMWUzYzYxYmJkOWNiOTA2ZTkwMjli M2YyMWExYjAyNmIxM2QwYjcyP2JyYW5jaD1hdXRvdG9vbAoKICAgICAgICAgICAgTG9nOgogICAg ICAgICAgICBSZXNvbHZlICMyMTg4ODAwIEVycm9yIGhhbmRsaW5nIHdpdGggZGlzcGxheSA9PSBu dWxsCgotIEVuaGFuY2UgIzIyMzc0ODYgSW1wbGVtZW50IHByZWVkaXQgY29sb3IgaW4gUGxhc21h IFdheWxhbmQKCi0tLQpkaWZmIC0tZ2l0IGEvaWJ1cy1IRUFELnBhdGNoIGIvaWJ1cy1IRUFELnBh dGNoCmluZGV4IDQ0ODE4NTQuLjE1NzU5YjcgMTAwNjQ0Ci0tLSBhL2lidXMtSEVBRC5wYXRjaAor KysgYi9pYnVzLUhFQUQucGF0Y2gKQEAgLTEsNiArMSw2IEBACi1Gcm9tIGRiODI5ZjRhZWUzOTll NTQ3MmJkNTVkYzYzMGE5NDQyNWU3MmJhY2QgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9t IDU5OTQ0ZGRiZmU5MTVmMTk1ZTc1N2M1MDkyNDZiNTk3MDQ4MTE2Y2YgTW9uIFNlcCAxNyAwMDow MDowMCAyMDAxCiBGcm9tOiBmdWppd2FyYXQgPHRha2FvLmZ1aml3YXJhMUBnbWFpbC5jb20+Ci1E YXRlOiBTYXQsIDMwIFNlcCAyMDIzIDA5OjUxOjQzICswOTAwCitEYXRlOiBTYXQsIDI1IE5vdiAy MDIzIDEzOjQyOjMxICswOTAwCiBTdWJqZWN0OiBbUEFUQ0hdIGNsaWVudC93YXlsYW5kOiBJbXBs ZW1lbnQgcHJlZWRpdCBjb2xvciBpbiBQbGFzbWEgV2F5bGFuZAogCiBXYXlsYW5kIGlucHV0LW1l dGhvZCBwcm90b2NvbCB2ZXJzaW9uIDEgc3VwcG9ydHMgdGhlIHByZWVkaXQgc3R5bGUKQEAgLTE4 LDEwICsxOCwxMCBAQCBSZi4gaHR0cHM6Ly9naXRodWIuY29tL2lidXMvaWJ1cy93aWtpL1dheWxh bmQtQ29sb3JzCiBCVUc9cmhieiMyMjM3NDg2CiAtLS0KICBjbGllbnQvd2F5bGFuZC9NYWtlZmls ZS5hbSAgICAgICAgICAgICAgICAgICAgfCAgIDEgKwotIGNsaWVudC93YXlsYW5kL2lidXN3YXls YW5kaW0uYyAgICAgICAgICAgICAgICB8IDE3NiArKystCisgY2xpZW50L3dheWxhbmQvaWJ1c3dh eWxhbmRpbS5jICAgICAgICAgICAgICAgIHwgMjA0ICsrKystCiAgLi4uL3RleHQtaW5wdXQtdW5z dGFibGUtdjEtY2xpZW50LXByb3RvY29sLmggIHwgODQ3ICsrKysrKysrKysrKysrKysrKwogIHNy Yy9pYnVzYXR0cmlidXRlLmggICAgICAgICAgICAgICAgICAgICAgICAgICB8ICA1MiArLQotIDQg ZmlsZXMgY2hhbmdlZCwgMTA3MyBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQorIDQgZmls ZXMgY2hhbmdlZCwgMTEwMSBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQogIGNyZWF0ZSBt b2RlIDEwMDY0NCBjbGllbnQvd2F5bGFuZC90ZXh0LWlucHV0LXVuc3RhYmxlLXYxLWNsaWVudC1w cm90b2NvbC5oCiAKIGRpZmYgLS1naXQgYS9jbGllbnQvd2F5bGFuZC9NYWtlZmlsZS5hbSBiL2Ns aWVudC93YXlsYW5kL01ha2VmaWxlLmFtCkBAIC0zNyw3ICszNyw3IEBAIGluZGV4IDdlOGQxOGFm Li45NGUzNTdiNCAxMDA2NDQKICAKICBpYnVzX3dheWxhbmRfU09VUkNFUyA9IFwKIGRpZmYgLS1n aXQgYS9jbGllbnQvd2F5bGFuZC9pYnVzd2F5bGFuZGltLmMgYi9jbGllbnQvd2F5bGFuZC9pYnVz d2F5bGFuZGltLmMKLWluZGV4IGZmYzIwZGUxLi4zNzk2NmRkNiAxMDA2NDQKK2luZGV4IDhmOTM4 Mjg4Li45ZThmNjUxZSAxMDA2NDQKIC0tLSBhL2NsaWVudC93YXlsYW5kL2lidXN3YXlsYW5kaW0u YwogKysrIGIvY2xpZW50L3dheWxhbmQvaWJ1c3dheWxhbmRpbS5jCiBAQCAtMzIsNiArMzIsNyBA QApAQCAtNTYsNyArNTYsNyBAQCBpbmRleCBmZmMyMGRlMS4uMzc5NjZkZDYgMTAwNjQ0CiAgICAg IElCdXNNb2RpZmllclR5cGUgbW9kaWZpZXJzOwogIAogICAgICBzdHJ1Y3QgeGtiX2NvbnRleHQg KnhrYl9jb250ZXh0OwotQEAgLTI2NiwxMiArMjY4LDE3NiBAQCBfY29udGV4dF9mb3J3YXJkX2tl eV9ldmVudF9jYiAoSUJ1c0lucHV0Q29udGV4dCAqY29udGV4dCwKK0BAIC0yNjYsMTIgKzI2OCwy MDQgQEAgX2NvbnRleHRfZm9yd2FyZF9rZXlfZXZlbnRfY2IgKElCdXNJbnB1dENvbnRleHQgKmNv bnRleHQsCiAgfQogIAogIApAQCAtNzcsNiArNzcsOCBAQCBpbmRleCBmZmMyMGRlMS4uMzc5NjZk ZDYgMTAwNjQ0CiArICAgIGd1aW50IGk7CiArICAgIGNvbnN0IGNoYXIgKnN0cjsKICsgICAgdWlu dDMyX3Qgd2hvbGVfd3N0eWxlID0gWldQX1RFWFRfSU5QVVRfVjFfUFJFRURJVF9TVFlMRV9ERUZB VUxUOworKyAgICB1aW50MzJfdCBwcmV2X3N0YXJ0ID0gMDsKKysgICAgdWludDMyX3QgcHJldl9l bmQgPSAwOwogKwogKyAgICBnX3JldHVybl9pZl9mYWlsIChJQlVTX0lTX1dBWUxBTkRfSU0gKHds aW0pKTsKICsgICAgcHJpdiA9IGlidXNfd2F5bGFuZF9pbV9nZXRfaW5zdGFuY2VfcHJpdmF0ZSAo d2xpbSk7CkBAIC0xNzUsMTQgKzE3Nyw0MCBAQCBpbmRleCBmZmMyMGRlMS4uMzc5NjZkZDYgMTAw NjQ0CiArICAgICAgICAgICAgd2hvbGVfd3N0eWxlID0gd3N0eWxlOwogKyAgICAgICAgICAgIGNv bnRpbnVlOwogKyAgICAgICAgfQotKyAgICAgICAgaWYgKHN0YXJ0ID4gZW5kKSB7Ci0rICAgICAg ICAgICAgZ193YXJuaW5nICgiV3Jvbmcgc3RhcnQgJWQgYW5kIGVuZCAlZCBmb3IgJXMiLCBzdGFy dCwgZW5kLCBzdHIpOworKyAgICAgICAgaWYgKGVuZCA8IHByZXZfc3RhcnQpIHsKKysgICAgICAg ICAgICBpZiAocHJpdi0+bG9nKSB7CisrICAgICAgICAgICAgICAgIGZwcmludGYgKHByaXYtPmxv ZywKKysgICAgICAgICAgICAgICAgICAgICAgICAgIlJldmVyc2Ugb3JkZXIgaXMgbm90IHN1cHBv cnRlZCBpbiBlbmQgJWQgZm9yICVzICIKKysgICAgICAgICAgICAgICAgICAgICAgICAgImFnYWlu c3Qgc3RhcnQgJWQuXG4iLCBlbmQsIHN0ciwgcHJldl9zdGFydCk7CisrICAgICAgICAgICAgICAg IGZmbHVzaCAocHJpdi0+bG9nKTsKKysgICAgICAgICAgICB9CisrICAgICAgICAgICAgY29udGlu dWU7CisrICAgICAgICB9CisrICAgICAgICBpZiAocHJldl9lbmQgPiBlbmQpIHsKKysgICAgICAg ICAgICBpZiAocHJpdi0+bG9nKSB7CisrICAgICAgICAgICAgICAgIGZwcmludGYgKHByaXYtPmxv ZywKKysgICAgICAgICAgICAgICAgICAgICAgICAgIk5lc3RlZCBzdHlsZXMgYXJlIG5vdCBzdXBw b3J0ZWQgaW4gZW5kICVkIGZvciAlcyAiCisrICAgICAgICAgICAgICAgICAgICAgICAgICJhZ2Fp bnN0IGVuZCAlZC5cbiIsIGVuZCwgc3RyLCBwcmV2X2VuZCk7CisrICAgICAgICAgICAgICAgIGZm bHVzaCAocHJpdi0+bG9nKTsKKysgICAgICAgICAgICB9CisrICAgICAgICAgICAgY29udGludWU7 CisrICAgICAgICB9CisrICAgICAgICBpZiAocHJldl9lbmQgPiBzdGFydCAmJiBwcmV2X3N0YXJ0 ID49IHN0YXJ0KQorKyAgICAgICAgICAgIHN0YXJ0ID0gcHJldl9lbmQ7CisrICAgICAgICBpZiAo c3RhcnQgPj0gZW5kKSB7CisrICAgICAgICAgICAgaWYgKHByaXYtPmxvZykgeworKyAgICAgICAg ICAgICAgICBmcHJpbnRmIChwcml2LT5sb2csICJXcm9uZyBzdGFydCAlZCBhbmQgZW5kICVkIGZv ciAlcy5cbiIsCisrICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXJ0LCBlbmQsIHN0cik7Cisr ICAgICAgICAgICAgICAgIGZmbHVzaCAocHJpdi0+bG9nKTsKKysgICAgICAgICAgICB9CiArICAg ICAgICAgICAgcmV0dXJuOwogKyAgICAgICAgfQogKyAgICAgICAgendwX2lucHV0X21ldGhvZF9j b250ZXh0X3YxX3ByZWVkaXRfc3R5bGluZyAocHJpdi0+Y29udGV4dCwKICsgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXJ0LAogKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZW5kIC0gc3RhcnQs CiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB3 c3R5bGUpOworKyAgICAgICAgcHJldl9zdGFydCA9IHN0YXJ0OworKyAgICAgICAgcHJldl9lbmQg PSBlbmQ7CiArICAgIH0KICsgICAgaWYgKHdob2xlX3dzdHlsZSAhPSBaV1BfVEVYVF9JTlBVVF9W MV9QUkVFRElUX1NUWUxFX0RFRkFVTFQpIHsKICsgICAgICAgIHVpbnQzMl90IHdob2xlX3N0YXJ0 ID0gMDsKQEAgLTIzMyw3ICsyNjEsNyBAQCBpbmRleCBmZmMyMGRlMS4uMzc5NjZkZDYgMTAwNjQ0 CiAgICAgIGdfcmV0dXJuX2lmX2ZhaWwgKElCVVNfSVNfV0FZTEFORF9JTSAod2xpbSkpOwogICAg ICBwcml2ID0gaWJ1c193YXlsYW5kX2ltX2dldF9pbnN0YW5jZV9wcml2YXRlICh3bGltKTsKICAg ICAgLyogQ1VSU09SIGlzIGJ5dGUgb2Zmc2V0LiAgKi8KLUBAIC0yODIsMTAgKzQ0OCwxMyBAQCBf Y29udGV4dF9zaG93X3ByZWVkaXRfdGV4dF9jYiAoSUJ1c0lucHV0Q29udGV4dCAqY29udGV4dCwK K0BAIC0yODIsMTAgKzQ3NiwxMyBAQCBfY29udGV4dF9zaG93X3ByZWVkaXRfdGV4dF9jYiAoSUJ1 c0lucHV0Q29udGV4dCAqY29udGV4dCwKICAKICAgICAgendwX2lucHV0X21ldGhvZF9jb250ZXh0 X3YxX3ByZWVkaXRfY3Vyc29yIChwcml2LT5jb250ZXh0LAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGN1cnNvcik7CkBAIC0yNDgsNyArMjc2LDcgQEAg aW5kZXggZmZjMjBkZTEuLjM3OTY2ZGQ2IDEwMDY0NAogIH0KICAKICAKLUBAIC0zMDgsNiArNDc3 LDcgQEAgX2NvbnRleHRfdXBkYXRlX3ByZWVkaXRfdGV4dF9jYiAoSUJ1c0lucHV0Q29udGV4dCAq Y29udGV4dCwKK0BAIC0zMDgsNiArNTA1LDcgQEAgX2NvbnRleHRfdXBkYXRlX3ByZWVkaXRfdGV4 dF9jYiAoSUJ1c0lucHV0Q29udGV4dCAqY29udGV4dCwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBJQnVzVGV4dCAgICAgICAgICp0ZXh0LAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGdpbnQgICAgICAgICAgICAgIGN1cnNvcl9wb3MsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZ2Jvb2xlYW4gICAgICAgICAgdmlzaWJsZSwKQEAgLTI1Niw3 ICsyODQsNyBAQCBpbmRleCBmZmMyMGRlMS4uMzc5NjZkZDYgMTAwNjQ0CiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgSUJ1c1dheWxhbmRJTSAgICAqd2xpbSkKICB7CiAgICAgIElC dXNXYXlsYW5kSU1Qcml2YXRlICpwcml2OwotQEAgLTMxNyw2ICs0ODcsNyBAQCBfY29udGV4dF91 cGRhdGVfcHJlZWRpdF90ZXh0X2NiIChJQnVzSW5wdXRDb250ZXh0ICpjb250ZXh0LAorQEAgLTMx Nyw2ICs1MTUsNyBAQCBfY29udGV4dF91cGRhdGVfcHJlZWRpdF90ZXh0X2NiIChJQnVzSW5wdXRD b250ZXh0ICpjb250ZXh0LAogICAgICAgICAgZ19vYmplY3RfdW5yZWYgKHByaXYtPnByZWVkaXRf dGV4dCk7CiAgICAgIHByaXYtPnByZWVkaXRfdGV4dCA9IGdfb2JqZWN0X3JlZl9zaW5rICh0ZXh0 KTsKICAgICAgcHJpdi0+cHJlZWRpdF9jdXJzb3JfcG9zID0gY3Vyc29yX3BvczsKQEAgLTI2NCw3 ICsyOTIsNyBAQCBpbmRleCBmZmMyMGRlMS4uMzc5NjZkZDYgMTAwNjQ0CiAgCiAgICAgIGlmICh2 aXNpYmxlKQogICAgICAgICAgX2NvbnRleHRfc2hvd19wcmVlZGl0X3RleHRfY2IgKGNvbnRleHQs IHdsaW0pOwotQEAgLTk3Nyw3ICsxMTQ4LDcgQEAgX2NyZWF0ZV9pbnB1dF9jb250ZXh0X2RvbmUg KEdPYmplY3QgICAgICAqb2JqZWN0LAorQEAgLTk3MSw3ICsxMTcwLDcgQEAgX2NyZWF0ZV9pbnB1 dF9jb250ZXh0X2RvbmUgKEdPYmplY3QgICAgICAqb2JqZWN0LAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgR19DQUxMQkFDSyAoX2NvbnRleHRfZm9yd2FyZF9rZXlfZXZlbnRfY2IpLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgd2xpbSk7CiAgCkBAIC0yNzMsNyArMzAxLDcgQEAgaW5k ZXggZmZjMjBkZTEuLjM3OTY2ZGQ2IDEwMDY0NAogICAgICAgICAgICAgICAgICAgICAgICAgICAg R19DQUxMQkFDSyAoX2NvbnRleHRfdXBkYXRlX3ByZWVkaXRfdGV4dF9jYiksCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICB3bGltKTsKICAgICAgICAgIGdfc2lnbmFsX2Nvbm5lY3QgKHByaXYt PmlidXNjb250ZXh0LCAic2hvdy1wcmVlZGl0LXRleHQiLAotQEAgLTk5NCw2ICsxMTY1LDcgQEAg X2NyZWF0ZV9pbnB1dF9jb250ZXh0X2RvbmUgKEdPYmplY3QgICAgICAqb2JqZWN0LAorQEAgLTk4 OCw2ICsxMTg3LDcgQEAgX2NyZWF0ZV9pbnB1dF9jb250ZXh0X2RvbmUgKEdPYmplY3QgICAgICAq b2JqZWN0LAogICAgICAgICAgICAgIGNhcGFiaWxpdGllcyB8PSBJQlVTX0NBUF9TWU5DX1BST0NF U1NfS0VZX1YyOwogICAgICAgICAgaWJ1c19pbnB1dF9jb250ZXh0X3NldF9jYXBhYmlsaXRpZXMg KHByaXYtPmlidXNjb250ZXh0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNhcGFiaWxpdGllcyk7CkBAIC0xMjQwLDMgKzEyNjgsNzEgQEAgaW5kZXggYjVh NDRkYTAuLmNmYzA4YzIwIDEwMDY0NAogLS0gCiAyLjQxLjAKIAorRnJvbSAwYTdhNGQxZGZhNTgw ZGZjYzY1ZDc2YTY5N2Y0MDA5NDA4NWU1NWEyIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJv bTogZnVqaXdhcmF0IDx0YWthby5mdWppd2FyYTFAZ21haWwuY29tPgorRGF0ZTogU2F0LCAyNSBO b3YgMjAyMyAxMzo0MjowNyArMDkwMAorU3ViamVjdDogW1BBVENIXSB1aS9ndGszOiBFcnJvciBo YW5kbGluZyB3aXRoIGRpc3BsYXkgPT0gbnVsbAorCitCVUc9cmhieiMyMTg4ODAwCistLS0KKyB1 aS9ndGszL2JpbmRpbmdjb21tb24udmFsYSB8ICA2ICsrKysrLQorIHVpL2d0azMvcGFuZWwudmFs YSAgICAgICAgIHwgMTQgKysrKysrKysrKy0tLS0KKyAyIGZpbGVzIGNoYW5nZWQsIDE1IGluc2Vy dGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCisKK2RpZmYgLS1naXQgYS91aS9ndGszL2JpbmRpbmdj b21tb24udmFsYSBiL3VpL2d0azMvYmluZGluZ2NvbW1vbi52YWxhCitpbmRleCBkYTMyNGY3MC4u NTg4YmUxN2EgMTAwNjQ0CistLS0gYS91aS9ndGszL2JpbmRpbmdjb21tb24udmFsYQorKysrIGIv dWkvZ3RrMy9iaW5kaW5nY29tbW9uLnZhbGEKK0BAIC0yNjMsMTAgKzI2MywxNCBAQCBjbGFzcyBC aW5kaW5nQ29tbW9uIHsKKyAgICAgICAgIHJldHVybiBtX2RlZmF1bHRfaXNfeGRpc3BsYXk7Cisg ICAgIH0KKyAKKy0gICAgcHVibGljIHN0YXRpYyBHZGsuWDExLkRpc3BsYXkgZ2V0X3hkaXNwbGF5 KCkgeworKyAgICBwdWJsaWMgc3RhdGljIEdkay5YMTEuRGlzcGxheT8gZ2V0X3hkaXNwbGF5KCkg eworICAgICAgICAgaWYgKG1feGRpc3BsYXkgIT0gbnVsbCkKKyAgICAgICAgICAgICByZXR1cm4g bV94ZGlzcGxheTsKKyAgICAgICAgIHZhciBkaXNwbGF5ID0gR2RrLkRpc3BsYXkuZ2V0X2RlZmF1 bHQoKTsKKysgICAgICAgIGlmIChkaXNwbGF5ID09IG51bGwpIHsKKysgICAgICAgICAgICBlcnJv cigiWW91IHNob3VsZCBvcGVuIGEgZGlzcGxheSBmb3IgSUJ1cyBwYW5lbC4iKTsKKysgICAgICAg ICAgICByZXR1cm4gbnVsbDsKKysgICAgICAgIH0KKyAgICAgICAgIFR5cGUgaW5zdGFuY2VfdHlw ZSA9IGRpc3BsYXkuZ2V0X3R5cGUoKTsKKyAgICAgICAgIFR5cGUgeDExX3R5cGUgPSB0eXBlb2Yo R2RrLlgxMS5EaXNwbGF5KTsKKyAgICAgICAgIGlmIChpbnN0YW5jZV90eXBlLmlzX2EoeDExX3R5 cGUpKSB7CitkaWZmIC0tZ2l0IGEvdWkvZ3RrMy9wYW5lbC52YWxhIGIvdWkvZ3RrMy9wYW5lbC52 YWxhCitpbmRleCBmMWJiZDcyMC4uNzgzZWM4NDIgMTAwNjQ0CistLS0gYS91aS9ndGszL3BhbmVs LnZhbGEKKysrKyBiL3VpL2d0azMvcGFuZWwudmFsYQorQEAgLTE0MjIsOSArMTQyMiwxMiBAQCBj bGFzcyBQYW5lbCA6IElCdXMuUGFuZWxTZXJ2aWNlIHsKKyAKKyAgICAgICAgIEdkay5EaXNwbGF5 IGRpc3BsYXlfYmFja3VwID0gbnVsbDsKKyAgICAgICAgIGlmICh1c2VfeDExICYmICFCaW5kaW5n Q29tbW9uLmRlZmF1bHRfaXNfeGRpc3BsYXkoKSkgeworKyAgICAgICAgICAgIHZhciBkaXNwbGF5 ID0gQmluZGluZ0NvbW1vbi5nZXRfeGRpc3BsYXkoKTsKKyAgICAgICAgICAgICBkaXNwbGF5X2Jh Y2t1cCA9IEdkay5EaXNwbGF5LmdldF9kZWZhdWx0KCk7CistICAgICAgICAgICAgR2RrLkRpc3Bs YXlNYW5hZ2VyLmdldCgpLnNldF9kZWZhdWx0X2Rpc3BsYXkoCistICAgICAgICAgICAgICAgICAg ICAoR2RrLkRpc3BsYXkpQmluZGluZ0NvbW1vbi5nZXRfeGRpc3BsYXkoKSk7CisrICAgICAgICAg ICAgaWYgKGRpc3BsYXkgIT0gbnVsbCkgeworKyAgICAgICAgICAgICAgICBHZGsuRGlzcGxheU1h bmFnZXIuZ2V0KCkuc2V0X2RlZmF1bHRfZGlzcGxheSgKKysgICAgICAgICAgICAgICAgICAgICAg ICAoR2RrLkRpc3BsYXkpZGlzcGxheSk7CisrICAgICAgICAgICAgfQorICAgICAgICAgfQorIAor ICAgICAgICAgLy8gU2hvdyBzeXN0ZW0gbWVudQorQEAgLTE0NzYsOSArMTQ3OSwxMiBAQCBjbGFz cyBQYW5lbCA6IElCdXMuUGFuZWxTZXJ2aWNlIHsKKyAgICAgcHJpdmF0ZSBHdGsuTWVudSBjcmVh dGVfYWN0aXZhdGVfbWVudShib29sIHVzZV94MTEgPSBmYWxzZSkgeworICAgICAgICAgR2RrLkRp c3BsYXkgZGlzcGxheV9iYWNrdXAgPSBudWxsOworICAgICAgICAgaWYgKHVzZV94MTEgJiYgIUJp bmRpbmdDb21tb24uZGVmYXVsdF9pc194ZGlzcGxheSgpKSB7CisrICAgICAgICAgICAgdmFyIGRp c3BsYXkgPSBCaW5kaW5nQ29tbW9uLmdldF94ZGlzcGxheSgpOworICAgICAgICAgICAgIGRpc3Bs YXlfYmFja3VwID0gR2RrLkRpc3BsYXkuZ2V0X2RlZmF1bHQoKTsKKy0gICAgICAgICAgICBHZGsu RGlzcGxheU1hbmFnZXIuZ2V0KCkuc2V0X2RlZmF1bHRfZGlzcGxheSgKKy0gICAgICAgICAgICAg ICAgICAgIChHZGsuRGlzcGxheSlCaW5kaW5nQ29tbW9uLmdldF94ZGlzcGxheSgpKTsKKysgICAg ICAgICAgICBpZiAoZGlzcGxheSAhPSBudWxsKSB7CisrICAgICAgICAgICAgICAgIEdkay5EaXNw bGF5TWFuYWdlci5nZXQoKS5zZXRfZGVmYXVsdF9kaXNwbGF5KAorKyAgICAgICAgICAgICAgICAg ICAgICAgIChHZGsuRGlzcGxheSlkaXNwbGF5KTsKKysgICAgICAgICAgICB9CisgICAgICAgICB9 CisgICAgICAgICBtX2ltZV9tZW51ID0gbmV3IEd0ay5NZW51KCk7CisgCistLSAKKzIuNDEuMAor CgpkaWZmIC0tZ2l0IGEvaWJ1cy5zcGVjIGIvaWJ1cy5zcGVjCmluZGV4IGNkN2RiYjUuLmI5MTBi NmMgMTAwNjQ0Ci0tLSBhL2lidXMuc3BlYworKysgYi9pYnVzLnNwZWMKQEAgLTU4LDcgKzU4LDcg QEAKIAogTmFtZTogICAgICAgICAgIGlidXMKIFZlcnNpb246ICAgICAgICAxLjUuMjl+cmMyCi1S ZWxlYXNlOiAgICAgICAgMiV7P2Rpc3R9CitSZWxlYXNlOiAgICAgICAgMyV7P2Rpc3R9CiBTdW1t YXJ5OiAgICAgICAgSW50ZWxsaWdlbnQgSW5wdXQgQnVzIGZvciBMaW51eCBPUwogTGljZW5zZTog ICAgICAgIExHUEwtMi4xLW9yLWxhdGVyCiBVUkw6ICAgICAgICAgICAgaHR0cHM6Ly9naXRodWIu Y29tL2lidXMvJW5hbWUvd2lraQpAQCAtNTgwLDYgKzU4MCwxMCBAQCBkY29uZiB1cGRhdGUgfHwg OgogJXtfZGF0YWRpcn0vaW5zdGFsbGVkLXRlc3RzL2lidXMKIAogJWNoYW5nZWxvZworKiBTYXQg Tm92IDI1IDIwMjMgVGFrYW8gRnVqaXdhcmEgPHRmdWppd2FyQHJlZGhhdC5jb20+IC0gMS41LjI5 fnJjMi0zCistIFJlc29sdmUgIzIxODg4MDAgRXJyb3IgaGFuZGxpbmcgd2l0aCBkaXNwbGF5ID09 IG51bGwKKy0gRW5oYW5jZSAjMjIzNzQ4NiBJbXBsZW1lbnQgcHJlZWRpdCBjb2xvciBpbiBQbGFz bWEgV2F5bGFuZAorCiAqIFdlZCBOb3YgMTUgMjAyMyBUYWthbyBGdWppd2FyYSA8dGZ1aml3YXJA cmVkaGF0LmNvbT4gLSAxLjUuMjl+cmMyLTIKIC0gQ2FsbCBzdHJkdXAoKSBhZnRlciBnX3JldHVy bl9pZl9mYWlsKCkgaW4gaW0taWJ1cy5zbwogCg==