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: Fixed ibus-setup on C locale Date: Sun, 31 May 2026 02:05:34 GMT Message-ID: <178019313425.1.14272946620411283594.rpms-ibus-7bcb691d2732@fedoraproject.org> List-ID: X-Git-Repo: rpms/ibus X-Git-Branch: autotool X-Git-Rev: 7bcb691d2732572c3cee283eab5268d3e74c4fe5 ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvaWJ1cwogICAgICAgICAgICBCcmFuY2ggOiBhdXRvdG9vbAogICAgICAgICAg ICBDb21taXQgOiA3YmNiNjkxZDI3MzI1NzJjM2NlZTI4M2VhYjUyNjhkM2U3NGM0ZmU1CiAgICAg ICAgICAgIEF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgogICAg ICAgICAgICBEYXRlICAgOiAyMDEyLTAyLTA3VDIwOjQyOjE0KzA5OjAwCiAgICAgICAgICAgIFN0 YXRzICA6ICsxMzIvLTQxIGluIDQgZmlsZShzKQogICAgICAgICAgICBVUkwgICAgOiBodHRwczov L3NyYy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL2lidXMvYy83YmNiNjkxZDI3MzI1NzJjM2NlZTI4 M2VhYjUyNjhkM2U3NGM0ZmU1P2JyYW5jaD1hdXRvdG9vbAoKICAgICAgICAgICAgTG9nOgogICAg ICAgICAgICBGaXhlZCBpYnVzLXNldHVwIG9uIEMgbG9jYWxlCgotIEZpeGVkIHRvIHNob3cgbm8g cmVnaXN0ZXJlZCBlbmdpbmVzIGZyb20gZy1jLWMuCi0gRW5hYmxlZCBBbHRfUiBrZXliaW5kaW5n IG9uIGtvIGxvY2FsZXMgZm9yIGlidXMgZ3RrIG9ubHkuCgotLS0KZGlmZiAtLWdpdCBhL2lidXMt NTQxNDkyLXhrYi5wYXRjaCBiL2lidXMtNTQxNDkyLXhrYi5wYXRjaAppbmRleCA4ZDQ5NjQxLi5k YWUwYWZhIDEwMDY0NAotLS0gYS9pYnVzLTU0MTQ5Mi14a2IucGF0Y2gKKysrIGIvaWJ1cy01NDE0 OTIteGtiLnBhdGNoCkBAIC0xLDYgKzEsNiBAQAotRnJvbSAyYWVhOTliNTg3MmM3NDFjNDEzZTk5 NWE1MGY5YWMwODQyZjNhZjk2IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbSA2MjlkMGE1 MzgzYjNkNDJkN2NhZDk4MGJjNWVmZTAxODY3YTAxMzU5IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAw MQogRnJvbTogZnVqaXdhcmF0IDx0YWthby5mdWppd2FyYTFAZ21haWwuY29tPgotRGF0ZTogRnJp LCAzIEZlYiAyMDEyIDEyOjEyOjI5ICswOTAwCitEYXRlOiBUdWUsIDcgRmViIDIwMTIgMjA6MTM6 NTkgKzA5MDAKIFN1YmplY3Q6IFtQQVRDSF0gQWRkIGlidXMteGtiIGFuZCBsaWJnbm9tZWtiZC4K IAogLS0tCkBAIC0xNSw3ICsxNSw4IEBAIFN1YmplY3Q6IFtQQVRDSF0gQWRkIGlidXMteGtiIGFu ZCBsaWJnbm9tZWtiZC4KICBlbmdpbmUveGtibGliLmMgICAgICAgICAgICAgICAgICAgIHwgIDMy NyArKysrKysrKysrKysrKysrKysrKysrCiAgZW5naW5lL3hrYmxpYi5oICAgICAgICAgICAgICAg ICAgICB8ICAgNDEgKysrCiAgaWJ1cy0xLjAucGMuaW4gICAgICAgICAgICAgICAgICAgICB8ICAg IDQgKwotIHNldHVwL21haW4ucHkgICAgICAgICAgICAgICAgICAgICAgfCAgIDI5ICsrLQorIHNl dHVwL2VuZ2luZWNvbWJvYm94LnB5ICAgICAgICAgICAgfCAgICA2ICstCisgc2V0dXAvbWFpbi5w eSAgICAgICAgICAgICAgICAgICAgICB8ICAgMzEgKystCiAgc3JjL01ha2VmaWxlLmFtICAgICAg ICAgICAgICAgICAgICB8ICAgIDUgKwogIHNyYy9pYnVzLmggICAgICAgICAgICAgICAgICAgICAg ICAgfCAgICAxICsKICBzcmMvaWJ1c3hrYnhtbC5jICAgICAgICAgICAgICAgICAgIHwgIDQ1NCAr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysKQEAgLTI0LDkgKzI1LDkgQEAgU3ViamVjdDog W1BBVENIXSBBZGQgaWJ1cy14a2IgYW5kIGxpYmdub21la2JkLgogIHVpL2d0azMvTWFrZWZpbGUu YW0gICAgICAgICAgICAgICAgfCAgIDQ3ICsrKysKICB1aS9ndGszL2drYmRsYXlvdXQudmFsYS5m YWxzZSAgICAgIHwgICA2MyArKysrKwogIHVpL2d0azMvZ2tiZGxheW91dC52YWxhLnRydWUgICAg ICAgfCAgMTExICsrKysrKysrCi0gdWkvZ3RrMy9wYW5lbC52YWxhICAgICAgICAgICAgICAgICB8 ICAyMTEgKysrKysrKysrKysrKystCisgdWkvZ3RrMy9wYW5lbC52YWxhICAgICAgICAgICAgICAg ICB8ICAyNzQgKysrKysrKysrKysrKysrKystLQogIHVpL2d0azMveGtibGF5b3V0LnZhbGEgICAg ICAgICAgICAgfCAgNDY2ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKLSAyMiBmaWxl cyBjaGFuZ2VkLCAyMzIxIGluc2VydGlvbnMoKyksIDU0NyBkZWxldGlvbnMoLSkKKyAyMyBmaWxl cyBjaGFuZ2VkLCAyMzgxIGluc2VydGlvbnMoKyksIDU1OCBkZWxldGlvbnMoLSkKICBjcmVhdGUg bW9kZSAxMDA2NDQgZW5naW5lL2lidXMteGtiLW1haW4uYwogIGNyZWF0ZSBtb2RlIDEwMDY0NCBl bmdpbmUveGtibGliLmMKICBjcmVhdGUgbW9kZSAxMDA2NDQgZW5naW5lL3hrYmxpYi5oCkBAIC0x NDY0LDExICsxNDY1LDI4IEBAIGluZGV4IDlmNTkzYWIuLjY2YjkwMmEgMTAwNjQ0CiAgCiAgTmFt ZTogSUJ1cwogIERlc2NyaXB0aW9uOiBJQnVzIExpYnJhcnkKK2RpZmYgLS1naXQgYS9zZXR1cC9l bmdpbmVjb21ib2JveC5weSBiL3NldHVwL2VuZ2luZWNvbWJvYm94LnB5CitpbmRleCA4ZDE0MjRi Li4wYWM3MzY4IDEwMDY0NAorLS0tIGEvc2V0dXAvZW5naW5lY29tYm9ib3gucHkKKysrKyBiL3Nl dHVwL2VuZ2luZWNvbWJvYm94LnB5CitAQCAtNzUsNyArNzUsMTEgQEAgY2xhc3MgRW5naW5lQ29t Ym9Cb3goR3RrLkNvbWJvQm94KToKKyAKKyAgICAgICAgIGtleXMgPSBsYW5ncy5rZXlzKCkKKyAg ICAgICAgIGtleXMuc29ydChsb2NhbGUuc3RyY29sbCkKKy0gICAgICAgIGN1cnJlbnRfbGFuZyA9 IElCdXMuZ2V0X2xhbmd1YWdlX25hbWUobG9jYWxlLmdldGxvY2FsZSgpWzBdKQorKyAgICAgICAg bG9jID0gbG9jYWxlLmdldGxvY2FsZSgpWzBdCisrICAgICAgICAjIE5vbmUgb24gQyBsb2NhbGUK KysgICAgICAgIGlmIGxvYyA9PSBOb25lOgorKyAgICAgICAgICAgIGxvYyA9ICdlbl9VUycKKysg ICAgICAgIGN1cnJlbnRfbGFuZyA9IElCdXMuZ2V0X2xhbmd1YWdlX25hbWUobG9jKQorICAgICAg ICAgIyBtb3ZlIGN1cnJlbnQgbGFuZ3VhZ2UgdG8gdGhlIGZpcnN0IHBsYWNlCisgICAgICAgICBp ZiBjdXJyZW50X2xhbmcgaW4ga2V5czoKKyAgICAgICAgICAgICBrZXlzLnJlbW92ZShjdXJyZW50 X2xhbmcpCiBkaWZmIC0tZ2l0IGEvc2V0dXAvbWFpbi5weSBiL3NldHVwL21haW4ucHkKLWluZGV4 IDdjZDNlMzcuLjQ3YTM0ZTMgMTAwNjQ0CitpbmRleCA3Y2QzZTM3Li5iYmM1NDIyIDEwMDY0NAog LS0tIGEvc2V0dXAvbWFpbi5weQogKysrIGIvc2V0dXAvbWFpbi5weQotQEAgLTE4Miw3ICsxODIs MjAgQEAgY2xhc3MgU2V0dXAob2JqZWN0KToKK0BAIC0xODIsMTIgKzE4MiwyNSBAQCBjbGFzcyBT ZXR1cChvYmplY3QpOgogICAgICAgICAgICAgICAgICBzZWxmLl9fY2hlY2tidXR0b25fdXNlX2ds b2JhbF9lbmdpbmVfdG9nZ2xlZF9jYikKICAKICAgICAgICAgICMgaW5pdCBlbmdpbmUgcGFnZQpA QCAtMTQ5MCw2ICsxNTA4LDEyIEBAIGluZGV4IDdjZDNlMzcuLjQ3YTM0ZTMgMTAwNjQ0CiAgICAg ICAgICBzZWxmLl9fY29tYm9ib3ggPSBzZWxmLl9fYnVpbGRlci5nZXRfb2JqZWN0KCJjb21ib2Jv eF9lbmdpbmVzIikKICAgICAgICAgIHNlbGYuX19jb21ib2JveC5zZXRfZW5naW5lcyhzZWxmLl9f ZW5naW5lcykKICAKKyAgICAgICAgIHRtcF9kaWN0ID0ge30KKy0gICAgICAgIGZvciBlIGluIHNl bGYuX19lbmdpbmVzOgorKyAgICAgICAgZm9yIGUgaW4gc2VsZi5fX2J1cy5saXN0X2VuZ2luZXMo KToKKyAgICAgICAgICAgICB0bXBfZGljdFtlLmdldF9uYW1lKCldID0gZQorICAgICAgICAgZW5n aW5lX25hbWVzID0gdmFsdWVzLmdldCgicHJlbG9hZF9lbmdpbmVzIiwgW10pCisgICAgICAgICBl bmdpbmVzID0gW3RtcF9kaWN0W25hbWVdIGZvciBuYW1lIGluIGVuZ2luZV9uYW1lcyBpZiBuYW1l IGluIHRtcF9kaWN0XQogQEAgLTI1NCw3ICsyNjcsNyBAQCBjbGFzcyBTZXR1cChvYmplY3QpOgog ICAgICAgICAgICAgIGFyZ3MgPSBzZXR1cC5zcGxpdCgpCiAgICAgICAgICAgICAgYXJncy5pbnNl cnQoMSwgcGF0aC5iYXNlbmFtZShhcmdzWzBdKSkKQEAgLTI0OTEsMTAgKzI1MTUsMTAgQEAgaW5k ZXggMDAwMDAwMC4uYWRhY2Q4MQogKyAgICAqLwogK30KIGRpZmYgLS1naXQgYS91aS9ndGszL3Bh bmVsLnZhbGEgYi91aS9ndGszL3BhbmVsLnZhbGEKLWluZGV4IGU4NTFiMjQuLjU4NDdmZDAgMTAw NjQ0CitpbmRleCBlODUxYjI0Li43YzViNGVkIDEwMDY0NAogLS0tIGEvdWkvZ3RrMy9wYW5lbC52 YWxhCiArKysgYi91aS9ndGszL3BhbmVsLnZhbGEKLUBAIC00MCw2ICs0MCwxMyBAQCBjbGFzcyBQ YW5lbCA6IElCdXMuUGFuZWxTZXJ2aWNlIHsKK0BAIC00MCw4ICs0MCwxNiBAQCBjbGFzcyBQYW5l bCA6IElCdXMuUGFuZWxTZXJ2aWNlIHsKICAgICAgcHJpdmF0ZSBQcm9wZXJ0eU1hbmFnZXIgbV9w cm9wZXJ0eV9tYW5hZ2VyOwogICAgICBwcml2YXRlIEdMaWIuUGlkIG1fc2V0dXBfcGlkID0gMDsK ICAgICAgcHJpdmF0ZSBHdGsuQWJvdXREaWFsb2cgbV9hYm91dF9kaWFsb2c7CkBAIC0yNTA3LDEx ICsyNTMxLDM2IEBAIGluZGV4IGU4NTFiMjQuLjU4NDdmZDAgMTAwNjQ0CiArICAgIHByaXZhdGUg R0xpYi5UaW1lciBtX2NoYW5nZWRfbGF5b3V0X3RpbWVyOwogICAgICBwcml2YXRlIGNvbnN0IHN0 cmluZyBBQ0NFTEVSQVRPUl9TV0lUQ0hfSU1FX0ZPUkVXQVJEID0gIjxDb250cm9sPnNwYWNlIjsK ICAgICAgcHJpdmF0ZSBjb25zdCBzdHJpbmcgQUNDRUxFUkFUT1JfU1dJVENIX0lNRV9CQUNLV0FS RCA9ICI8Q29udHJvbD48U2hpZnQ+c3BhY2UiOworKyAgICBwcml2YXRlIHN0cmluZ1tdIEFDQ0VM RVJBVE9SX0lNRV9IT1RLRVlTID0ge307CisgCisgICAgIHB1YmxpYyBQYW5lbChJQnVzLkJ1cyBi dXMpIHsKKyAgICAgICAgIEdMaWIuYXNzZXJ0KGJ1cy5pc19jb25uZWN0ZWQoKSk7CitAQCAtNjMs MTMgKzcxLDYgQEAgY2xhc3MgUGFuZWwgOiBJQnVzLlBhbmVsU2VydmljZSB7CisgCisgICAgICAg ICBtX3N3aXRjaGVyID0gbmV3IFN3aXRjaGVyKCk7CisgCistICAgICAgICB2YXIga2V5YmluZGlu Z19tYW5hZ2VyID0gS2V5YmluZGluZ01hbmFnZXIuZ2V0X2luc3RhbmNlKCk7CistICAgICAgICBr ZXliaW5kaW5nX21hbmFnZXIuYmluZChBQ0NFTEVSQVRPUl9TV0lUQ0hfSU1FX0ZPUkVXQVJELAor LSAgICAgICAgICAgICAgICAoZSkgPT4gaGFuZGxlX2VuZ2luZV9zd2l0Y2goZSwgZmFsc2UpKTsK Ky0KKy0gICAgICAgIGtleWJpbmRpbmdfbWFuYWdlci5iaW5kKEFDQ0VMRVJBVE9SX1NXSVRDSF9J TUVfQkFDS1dBUkQsCistICAgICAgICAgICAgICAgIChlKSA9PiBoYW5kbGVfZW5naW5lX3N3aXRj aChlLCB0cnVlKSk7CistCisgICAgICAgICBtX3Byb3BlcnR5X21hbmFnZXIgPSBuZXcgUHJvcGVy dHlNYW5hZ2VyKCk7CisgICAgICAgICBtX3Byb3BlcnR5X21hbmFnZXIucHJvcGVydHlfYWN0aXZh dGUuY29ubmVjdCgoaywgcykgPT4geworICAgICAgICAgICAgIHByb3BlcnR5X2FjdGl2YXRlKGss IHMpOworQEAgLTgwLDggKzgxLDY2IEBAIGNsYXNzIFBhbmVsIDogSUJ1cy5QYW5lbFNlcnZpY2Ug ewogIAotQEAgLTgyLDYgKzg5LDE0IEBAIGNsYXNzIFBhbmVsIDogSUJ1cy5QYW5lbFNlcnZpY2Ug eworICAgICB+UGFuZWwoKSB7CiAgICAgICAgICB2YXIga2V5YmluZGluZ19tYW5hZ2VyID0gS2V5 YmluZGluZ01hbmFnZXIuZ2V0X2luc3RhbmNlKCk7Ci0gICAgICAgICBrZXliaW5kaW5nX21hbmFn ZXIudW5iaW5kKEFDQ0VMRVJBVE9SX1NXSVRDSF9JTUVfRk9SRVdBUkQpOwotICAgICAgICAga2V5 YmluZGluZ19tYW5hZ2VyLnVuYmluZChBQ0NFTEVSQVRPUl9TV0lUQ0hfSU1FX0JBQ0tXQVJEKTsK Ky0gICAgICAgIGtleWJpbmRpbmdfbWFuYWdlci51bmJpbmQoQUNDRUxFUkFUT1JfU1dJVENIX0lN RV9GT1JFV0FSRCk7CistICAgICAgICBrZXliaW5kaW5nX21hbmFnZXIudW5iaW5kKEFDQ0VMRVJB VE9SX1NXSVRDSF9JTUVfQkFDS1dBUkQpOworKyAgICAgICAgZm9yZWFjaCAoc3RyaW5nIGtleWJp bmRpbmcgaW4gQUNDRUxFUkFUT1JfSU1FX0hPVEtFWVMpIHsKKysgICAgICAgICAgICBrZXliaW5k aW5nX21hbmFnZXIudW5iaW5kKGtleWJpbmRpbmcpOworKyAgICAgICAgICAgIGlmIChrZXliaW5k aW5nID09IEFDQ0VMRVJBVE9SX1NXSVRDSF9JTUVfRk9SRVdBUkQpIHsKKysgICAgICAgICAgICAg ICAga2V5YmluZGluZ19tYW5hZ2VyLnVuYmluZChBQ0NFTEVSQVRPUl9TV0lUQ0hfSU1FX0JBQ0tX QVJEKTsKKysgICAgICAgICAgICB9CisrICAgICAgICB9CiArCiArICAgICAgICBpZiAoSEFWRV9J QlVTX0dLQkQgJiYgbV9na2JkbGF5b3V0ICE9IG51bGwpIHsKICsgICAgICAgICAgICBtX2drYmRs YXlvdXQuY2hhbmdlZC5kaXNjb25uZWN0KGdrYmRsYXlvdXRfY2hhbmdlZF9jYik7CkBAIC0yNTIw LDE4ICsyNTY5LDY3IEBAIGluZGV4IGU4NTFiMjQuLjU4NDdmZDAgMTAwNjQ0CiArICAgICAgICB9 CiArCiArICAgICAgICBtX3hrYmxheW91dCA9IG51bGw7CisrICAgIH0KKysKKysgICAgLy8gVG9E bzogQ3VzdG9taXplIHRoZSBpbnB1dCBtZXRob2Qgd2l0aCBpYnVzLXNldHVwCisrICAgIHByaXZh dGUgdm9pZCBzZXRfa2V5YmluZGluZygpIHsKKysgICAgICAgIHN0cmluZyBsb2NhbGUgPSBHTGli LkludGwuc2V0bG9jYWxlKEdMaWIuTG9jYWxlQ2F0ZWdvcnkuQUxMLAorKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbnVsbCk7CisrICAgICAgICBpZiAobG9jYWxl ID09IG51bGwpIHsKKysgICAgICAgICAgICBsb2NhbGUgPSAiQyI7CisrICAgICAgICB9CisrCisr ICAgICAgICBBQ0NFTEVSQVRPUl9JTUVfSE9US0VZUyArPSBBQ0NFTEVSQVRPUl9TV0lUQ0hfSU1F X0ZPUkVXQVJEOworKworKyAgICAgICAgaWYgKG1fY29uZmlnICE9IG51bGwpIHsKKysgICAgICAg ICAgICBHTGliLlZhcmlhbnQgdmFyaWFudCA9IG1fY29uZmlnLmdldF92YWx1ZSgiZ2VuZXJhbC9o b3RrZXkiLAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICJ0cmlnZ2VyX2FjY2VsIik7CisrICAgICAgICAgICAgaWYgKHZhcmlhbnQgIT0gbnVs bCkgeworKyAgICAgICAgICAgICAgICBBQ0NFTEVSQVRPUl9JTUVfSE9US0VZUyA9IHt9OworKyAg ICAgICAgICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IHZhcmlhbnQubl9jaGlsZHJlbigpOyBp KyspIHsKKysgICAgICAgICAgICAgICAgICAgIEFDQ0VMRVJBVE9SX0lNRV9IT1RLRVlTICs9IHZh cmlhbnQuZ2V0X2NoaWxkX3ZhbHVlKGkpLmR1cF9zdHJpbmcoKTsKKysgICAgICAgICAgICAgICAg fQorKyAgICAgICAgICAgIH0KKysgICAgICAgIH0KKysKKysgICAgICAgIGlmIChBQ0NFTEVSQVRP Ul9JTUVfSE9US0VZUy5sZW5ndGggPT0gMSAmJgorKyAgICAgICAgICAgIEFDQ0VMRVJBVE9SX0lN RV9IT1RLRVlTWzBdID09IEFDQ0VMRVJBVE9SX1NXSVRDSF9JTUVfRk9SRVdBUkQpIHsKKysgICAg ICAgICAgICAvLyBGSVhNRTogV2hlbiB1cyBrZXlib2FyZCBpcyB1c2VkLCBaZW5rYWt1X0hhbmth a3UgZG9lcyBub3Qgd29yay4KKysgICAgICAgICAgICAvKgorKyAgICAgICAgICAgIGlmIChsb2Nh bGVbMDoyXSA9PSAiamEiKSB7CisrICAgICAgICAgICAgICAgIEFDQ0VMRVJBVE9SX0lNRV9IT1RL RVlTICs9ICJaZW5rYWt1X0hhbmtha3UiOworKyAgICAgICAgICAgIH0KKysgICAgICAgICAgICAq LworKyAgICAgICAgICAgIGlmIChsb2NhbGVbMDoyXSA9PSAia28iKSB7CisrICAgICAgICAgICAg ICAgIEFDQ0VMRVJBVE9SX0lNRV9IT1RLRVlTICs9ICJIYW5ndWwiOworKyAgICAgICAgICAgICAg ICBBQ0NFTEVSQVRPUl9JTUVfSE9US0VZUyArPSAiQWx0X1IiOworKyAgICAgICAgICAgIH0KKysg ICAgICAgIH0KKysKKysgICAgICAgIHZhciBrZXliaW5kaW5nX21hbmFnZXIgPSBLZXliaW5kaW5n TWFuYWdlci5nZXRfaW5zdGFuY2UoKTsKKysgICAgICAgIGZvcmVhY2ggKHN0cmluZyBrZXliaW5k aW5nIGluIEFDQ0VMRVJBVE9SX0lNRV9IT1RLRVlTKSB7CisrICAgICAgICAgICAga2V5YmluZGlu Z19tYW5hZ2VyLmJpbmQoa2V5YmluZGluZywKKysgICAgICAgICAgICAgICAgKGUpID0+IGhhbmRs ZV9lbmdpbmVfc3dpdGNoKGUsIGZhbHNlKSk7CisrICAgICAgICAgICAgaWYgKGtleWJpbmRpbmcg PT0gQUNDRUxFUkFUT1JfU1dJVENIX0lNRV9GT1JFV0FSRCkgeworKyAgICAgICAgICAgICAgICBr ZXliaW5kaW5nX21hbmFnZXIuYmluZChBQ0NFTEVSQVRPUl9TV0lUQ0hfSU1FX0JBQ0tXQVJELAor KyAgICAgICAgICAgICAgICAgICAgKGUpID0+IGhhbmRsZV9lbmdpbmVfc3dpdGNoKGUsIHRydWUp KTsKKysgICAgICAgICAgICB9CisrICAgICAgICB9CiAgICAgIH0KICAKICAgICAgcHVibGljIHZv aWQgc2V0X2NvbmZpZyhJQnVzLkNvbmZpZyBjb25maWcpIHsKLUBAIC05Myw2ICsxMDgsNyBAQCBj bGFzcyBQYW5lbCA6IElCdXMuUGFuZWxTZXJ2aWNlIHsKK0BAIC05MSw4ICsxNTAsMTAgQEAgY2xh c3MgUGFuZWwgOiBJQnVzLlBhbmVsU2VydmljZSB7CisgICAgICAgICB9CisgCiAgICAgICAgICBt X2NvbmZpZyA9IGNvbmZpZzsKKysgICAgICAgIHNldF9rZXliaW5kaW5nKCk7CiAgICAgICAgICBp ZiAobV9jb25maWcgIT0gbnVsbCkgewogICAgICAgICAgICAgIG1fY29uZmlnLnZhbHVlX2NoYW5n ZWQuY29ubmVjdChjb25maWdfdmFsdWVfY2hhbmdlZF9jYik7CiArICAgICAgICAgICAgaW5pdF9l bmdpbmVzX29yZGVyKCk7CiAgICAgICAgICAgICAgdXBkYXRlX2VuZ2luZXMobV9jb25maWcuZ2V0 X3ZhbHVlKCJnZW5lcmFsIiwgInByZWxvYWRfZW5naW5lcyIpLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG1fY29uZmlnLmdldF92YWx1ZSgiZ2VuZXJhbCIsICJlbmdpbmVzX29yZGVyIikp OwogICAgICAgICAgfSBlbHNlIHsKLUBAIC0xMDAsNiArMTE2LDE5MSBAQCBjbGFzcyBQYW5lbCA6 IElCdXMuUGFuZWxTZXJ2aWNlIHsKK0BAIC0xMDAsNiArMTYxLDE5MSBAQCBjbGFzcyBQYW5lbCA6 IElCdXMuUGFuZWxTZXJ2aWNlIHsKICAgICAgICAgIH0KICAgICAgfQogIApAQCAtMjcyMyw3ICsy ODIxLDcgQEAgaW5kZXggZTg1MWIyNC4uNTg0N2ZkMCAxMDA2NDQKICAgICAgcHJpdmF0ZSB2b2lk IHN3aXRjaF9lbmdpbmUoaW50IGksIGJvb2wgZm9yY2UgPSBmYWxzZSkgewogICAgICAgICAgR0xp Yi5hc3NlcnQoaSA+PSAwICYmIGkgPCBtX2VuZ2luZXMubGVuZ3RoKTsKICAKLUBAIC0xMTksMTUg KzMyMCw3IEBAIGNsYXNzIFBhbmVsIDogSUJ1cy5QYW5lbFNlcnZpY2UgeworQEAgLTExOSwxNSAr MzY1LDcgQEAgY2xhc3MgUGFuZWwgOiBJQnVzLlBhbmVsU2VydmljZSB7CiAgICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICAgfQogICAgICAgICAgLy8gc2V0IHhrYiBsYXlvdXQKCmRpZmYgLS1n aXQgYS9pYnVzLXh4LXNldHVwLWZyZXF1ZW50LWxhbmcucGF0Y2ggYi9pYnVzLXh4LXNldHVwLWZy ZXF1ZW50LWxhbmcucGF0Y2gKaW5kZXggYzkwNGZhZi4uNGE2YWRiYyAxMDA2NDQKLS0tIGEvaWJ1 cy14eC1zZXR1cC1mcmVxdWVudC1sYW5nLnBhdGNoCisrKyBiL2lidXMteHgtc2V0dXAtZnJlcXVl bnQtbGFuZy5wYXRjaApAQCAtMSw2ICsxLDYgQEAKLUZyb20gNmU5Y2RjN2Q1YjEwY2IwNDNlODcw OTY3MGVhNWFkNDg3YWIzZDkzNyBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb20gNzIzNzIx YmQxNWViODBkYTlmNzM1YWM0ZmViYTRmMjUzMDZiYTk2NSBNb24gU2VwIDE3IDAwOjAwOjAwIDIw MDEKIEZyb206IGZ1aml3YXJhdCA8dGFrYW8uZnVqaXdhcmExQGdtYWlsLmNvbT4KLURhdGU6IEZy aSwgMyBGZWIgMjAxMiAxOToyMDoyNyArMDkwMAorRGF0ZTogVHVlLCA3IEZlYiAyMDEyIDIwOjE1 OjE4ICswOTAwCiBTdWJqZWN0OiBbUEFUQ0hdIEVuYWJsZSBpYnVzLXNldHVwIHRvIHNob3cgdGhl IGZyZXF1ZW50bHkgdXNlZCBsYW5ndWFnZXMgb25seQogIGluIElNRSBsaXN0LgogCkBAIC0xOTAs NyArMTkwLDcgQEAgaW5kZXggMzRkZTliNC4uYmY1MDY0NSAxMDA2NDQKICAgICAgICA8YXBwbHl0 bz4vZGVza3RvcC9pYnVzL3BhbmVsL2N1c3RvbV9mb250PC9hcHBseXRvPgogICAgICAgIDxvd25l cj5pYnVzPC9vd25lcj4KIGRpZmYgLS1naXQgYS9zZXR1cC9lbmdpbmVjb21ib2JveC5weSBiL3Nl dHVwL2VuZ2luZWNvbWJvYm94LnB5Ci1pbmRleCA4ZDE0MjRiLi45ZmJlNDc2IDEwMDY0NAoraW5k ZXggMGFjNzM2OC4uOWFmMjY1MSAxMDA2NDQKIC0tLSBhL3NldHVwL2VuZ2luZWNvbWJvYm94LnB5 CiArKysgYi9zZXR1cC9lbmdpbmVjb21ib2JveC5weQogQEAgLTQ1LDYgKzQ1LDkgQEAgY2xhc3Mg RW5naW5lQ29tYm9Cb3goR3RrLkNvbWJvQm94KToKQEAgLTI2Nyw4ICsyNjcsOCBAQCBpbmRleCA4 ZDE0MjRiLi45ZmJlNDc2IDEwMDY0NAogKyAgICBkZWYgX19tb2RlbF9hcHBlbmRfbGFuZ3Moc2Vs ZiwgbW9kZWwsIGxhbmdzLCB2aXNpYmxlKToKICAgICAgICAgIGtleXMgPSBsYW5ncy5rZXlzKCkK ICAgICAgICAgIGtleXMuc29ydChsb2NhbGUuc3RyY29sbCkKLSAgICAgICAgIGN1cnJlbnRfbGFu ZyA9IElCdXMuZ2V0X2xhbmd1YWdlX25hbWUobG9jYWxlLmdldGxvY2FsZSgpWzBdKQotQEAgLTg2 LDI5ICsxMTksODYgQEAgY2xhc3MgRW5naW5lQ29tYm9Cb3goR3RrLkNvbWJvQm94KToKKyAgICAg ICAgIGxvYyA9IGxvY2FsZS5nZXRsb2NhbGUoKVswXQorQEAgLTkwLDI5ICsxMjMsODYgQEAgY2xh c3MgRW5naW5lQ29tYm9Cb3goR3RrLkNvbWJvQm94KToKICAgICAgICAgICAgICBrZXlzLnJlbW92 ZShJQnVzLmdldF9sYW5ndWFnZV9uYW1lKCJPdGhlciIpKQogICAgICAgICAgICAgIGtleXMgKz0g W0lCdXMuZ2V0X2xhbmd1YWdlX25hbWUoIk90aGVyIildCiAgICAgICAgICBmb3IgbCBpbiBrZXlz OgpAQCAtMzEwLDggKzMxMCw3IEBAIGluZGV4IDhkMTQyNGIuLjlmYmU0NzYgMTAwNjQ0CiArICAg ICAgICBzZWxmLl9fbW9kZWxfYXBwZW5kX2xhbmdzKHNlbGYuX19tb2RlbCwgbGFuZywgVHJ1ZSkK ICsgICAgICAgIGl0ZXIxID0gc2VsZi5fX21vZGVsLmFwcGVuZChOb25lKQogKyAgICAgICAgc2Vs Zi5fX21vZGVsLnNldChpdGVyMSwgMCwgLTEpCi0gCi0tICAgICAgICBzZWxmLnNldF9tb2RlbChz ZWxmLl9fbW9kZWwpCisrCiArICAgICAgICBzZWxmLl9fYWxsX21vZGVsID0gR3RrLlRyZWVTdG9y ZShvYmplY3QpCiArICAgICAgICBpdGVyMSA9IHNlbGYuX19hbGxfbW9kZWwuYXBwZW5kKE5vbmUp CiArICAgICAgICBzZWxmLl9fYWxsX21vZGVsLnNldChpdGVyMSwgMCwgMCkKQEAgLTMyMSw3ICsz MjAsOCBAQCBpbmRleCA4ZDE0MjRiLi45ZmJlNDc2IDEwMDY0NAogKyAgICAgICAgc2VsZi5fX21v ZGVsX2FwcGVuZF9sYW5ncyhzZWxmLl9fYWxsX21vZGVsLCBzdWJfbGFuZywgRmFsc2UpCiArCiAr ICAgICAgICBzZWxmLl9fdG9nZ2xlX3N1Yl9sYW5nKCkKLSsKKyAKKy0gICAgICAgIHNlbGYuc2V0 X21vZGVsKHNlbGYuX19tb2RlbCkKICsgICAgZGVmIF9fdG9nZ2xlX3N1Yl9sYW5nKHNlbGYpOgog KyAgICAgICAgc2VsZi5zZXRfbW9kZWwoTm9uZSkKICsgICAgICAgIGlmIHNlbGYuX19zaG93X3N1 Yl9sYW5nOgpAQCAtMzYzLDcgKzM2Myw3IEBAIGluZGV4IDhkMTQyNGIuLjlmYmU0NzYgMTAwNjQ0 CiAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgIHJlbmRlcmVyLnNldF9wcm9wZXJ0eSgidmlz aWJsZSIsIFRydWUpCiAgICAgICAgICAgICAgcmVuZGVyZXIuc2V0X3Byb3BlcnR5KCJzZW5zaXRp dmUiLCBUcnVlKQotQEAgLTEyMSw3ICsyMTEsOCBAQCBjbGFzcyBFbmdpbmVDb21ib0JveChHdGsu Q29tYm9Cb3gpOgorQEAgLTEyNSw3ICsyMTUsOCBAQCBjbGFzcyBFbmdpbmVDb21ib0JveChHdGsu Q29tYm9Cb3gpOgogICAgICAgICAgICAgIHJlbmRlcmVyLnNldF9wcm9wZXJ0eSgicGl4YnVmIiwg cGl4YnVmKQogIAogICAgICBkZWYgX19uYW1lX2NlbGxfZGF0YV9jYihzZWxmLCBjZWxsbGF5b3V0 LCByZW5kZXJlciwgbW9kZWwsIGl0ZXIsIGRhdGEpOgpAQCAtMzczLDcgKzM3Myw3IEBAIGluZGV4 IDhkMTQyNGIuLjlmYmU0NzYgMTAwNjQ0CiAgCiAgICAgICAgICBpZiBpc2luc3RhbmNlIChlbmdp bmUsIHN0cikgb3IgaXNpbnN0YW5jZSAoZW5naW5lLCB1bmljb2RlKToKICAgICAgICAgICAgICBy ZW5kZXJlci5zZXRfcHJvcGVydHkoInNlbnNpdGl2ZSIsIEZhbHNlKQotQEAgLTEyOSw4ICsyMjAs MTUgQEAgY2xhc3MgRW5naW5lQ29tYm9Cb3goR3RrLkNvbWJvQm94KToKK0BAIC0xMzMsOCArMjI0 LDE1IEBAIGNsYXNzIEVuZ2luZUNvbWJvQm94KEd0ay5Db21ib0JveCk6CiAgICAgICAgICAgICAg cmVuZGVyZXIuc2V0X3Byb3BlcnR5KCJ3ZWlnaHQiLCBQYW5nby5XZWlnaHQuTk9STUFMKQogICAg ICAgICAgZWxpZiBpc2luc3RhbmNlKGVuZ2luZSwgaW50KToKICAgICAgICAgICAgICByZW5kZXJl ci5zZXRfcHJvcGVydHkoInNlbnNpdGl2ZSIsIFRydWUpCkBAIC0zOTEsNyArMzkxLDcgQEAgaW5k ZXggOGQxNDI0Yi4uOWZiZTQ3NiAxMDA2NDQKICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAg cmVuZGVyZXIuc2V0X3Byb3BlcnR5KCJzZW5zaXRpdmUiLCBUcnVlKQogICAgICAgICAgICAgIHJl bmRlcmVyLnNldF9wcm9wZXJ0eSgidGV4dCIsIGVuZ2luZS5nZXRfbG9uZ25hbWUoKSkKLUBAIC0x NDYsMTAgKzI0NCwxOCBAQCBjbGFzcyBFbmdpbmVDb21ib0JveChHdGsuQ29tYm9Cb3gpOgorQEAg LTE1MCwxMCArMjQ4LDE4IEBAIGNsYXNzIEVuZ2luZUNvbWJvQm94KEd0ay5Db21ib0JveCk6CiAg ICAgICAgICAgICAgaWYgaSA9PSAwIG9yIGkgPT0gLTE6CiAgICAgICAgICAgICAgICAgIHJldHVy biBOb25lCiAgICAgICAgICAgICAgaXRlciA9IHNlbGYuZ2V0X2FjdGl2ZV9pdGVyKCkKQEAgLTQx Miw3ICs0MTIsNyBAQCBpbmRleCA4ZDE0MjRiLi45ZmJlNDc2IDEwMDY0NAogICAgICAgICAgcmV0 dXJuIHNlbGYuZ2V0X3Byb3BlcnR5KCJhY3RpdmUtZW5naW5lIikKICAKIGRpZmYgLS1naXQgYS9z ZXR1cC9tYWluLnB5IGIvc2V0dXAvbWFpbi5weQotaW5kZXggNDdhMzRlMy4uMTZiZmVlYSAxMDA2 NDQKK2luZGV4IGJiYzU0MjIuLjk0NTZlMDEgMTAwNjQ0CiAtLS0gYS9zZXR1cC9tYWluLnB5CiAr KysgYi9zZXR1cC9tYWluLnB5CiBAQCAtMTk3LDYgKzE5Nyw3IEBAIGNsYXNzIFNldHVwKG9iamVj dCk6CgpkaWZmIC0tZ2l0IGEvaWJ1cy5zcGVjIGIvaWJ1cy5zcGVjCmluZGV4IDY1OWNmNDAuLjJj YjlhNzIgMTAwNjQ0Ci0tLSBhL2lidXMuc3BlYworKysgYi9pYnVzLnNwZWMKQEAgLTIzLDcgKzIz LDcgQEAKIAogTmFtZTogICAgICAgaWJ1cwogVmVyc2lvbjogICAgMS40Ljk5LjIwMTIwMjAzCi1S ZWxlYXNlOiAgICAxJXs/ZGlzdH0KK1JlbGVhc2U6ICAgIDIlez9kaXN0fQogU3VtbWFyeTogICAg SW50ZWxsaWdlbnQgSW5wdXQgQnVzIGZvciBMaW51eCBPUwogTGljZW5zZTogICAgTEdQTHYyKwog R3JvdXA6ICAgICAgU3lzdGVtIEVudmlyb25tZW50L0xpYnJhcmllcwpAQCAtMzMsOSArMzMsNiBA QCBTb3VyY2UwOiAgICBodHRwOi8vZnVqaXdhcmEuZmVkb3JhcGVvcGxlLm9yZy9pYnVzL2dub21l LXNoZWxsLyV7bmFtZX0tJXt2ZXJzaW9ufQogU291cmNlMTogICAgeGlucHV0LWlidXMKICVpZiAl aGF2ZV9nanNmaWxlCiBTb3VyY2UyOiAgICBodHRwOi8vZnVqaXdhcmEuZmVkb3JhcGVvcGxlLm9y Zy9pYnVzL2dub21lLXNoZWxsL2lidXMtZ2pzLSV7aWJ1c19nanNfdmVyc2lvbn0udGFyLmd6Ci0j IFdvcmthcm91bmQgZm9yIGdsaWIyIGJ1ZzoKLSMgaHR0cHM6Ly9idWd6aWxsYS5nbm9tZS5vcmcv c2hvd19idWcuY2dpP2lkPTY2OTI1MwotU291cmNlMzogICAgaWJ1cy1nc2V0dGluZ3MtZGIKICVl bmRpZgogUGF0Y2gwOiAgICAgaWJ1cy1IRUFELnBhdGNoCiBQYXRjaDE6ICAgICBpYnVzLTU0MTQ5 Mi14a2IucGF0Y2gKQEAgLTI1MiwxNCArMjQ5LDYgQEAgYXV0b21ha2UgLWEgLWMgLWYKICAgICAt LWVuYWJsZS1weXRob24tbGlicmFyeSBcCiAgICAgLS1lbmFibGUtaW50cm9zcGVjdGlvbgogCi0j IFdvcmthcm91bmQgZm9yIGdsaWIyIGJ1ZzoKLSMgaHR0cHM6Ly9idWd6aWxsYS5nbm9tZS5vcmcv c2hvd19idWcuY2dpP2lkPTY2OTI1MwotY2QgZGF0YS9kY29uZgotbWFrZSBvcmcuZnJlZWRlc2t0 b3AuaWJ1cy5nc2NoZW1hLnZhbGlkCi1ta2RpciBkYgotY3AgJVNPVVJDRTMgZGIvaWJ1cwotY2Qg Li4vLi4KLQogIyBtYWtlIC1DIHBvIHVwZGF0ZS1nbW8KIG1ha2UgJXs/X3NtcF9tZmxhZ3N9IFwK ICAgUEtHX0NPTkZJR19QQVRIPS4uOi91c3IvbGliNjQvcGtnY29uZmlnOi91c3IvbGliL3BrZ2Nv bmZpZwpAQCAtNDU3LDcgKzQ0NiwxMiBAQCBmaQogJXtfZGF0YWRpcn0vZ3RrLWRvYy9odG1sLyoK IAogJWNoYW5nZWxvZwotKiBGcmkgRmViIDAzIDIwMjEgVGFrYW8gRnVqaXdhcmEgPHRmdWppd2Fy QHJlZGhhdC5jb20+IC0gMS40Ljk5LjIwMTIwMjAzLTEKKyogVHVlIEZlYiAwNyAyMDEyIFRha2Fv IEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPiAtIDEuNC45OS4yMDEyMDIwMy0yCistIEZp eGVkIGlidXMtc2V0dXAgb24gQyBsb2NhbGUKKy0gRml4ZWQgdG8gc2hvdyBubyByZWdpc3RlcmVk IGVuZ2luZXMgZnJvbSBnLWMtYy4KKy0gRW5hYmxlZCBBbHRfUiBrZXliaW5kaW5nIG9uIGtvIGxv Y2FsZXMgZm9yIGlidXMgZ3RrIG9ubHkuCisKKyogRnJpIEZlYiAwMyAyMDEyIFRha2FvIEZ1aml3 YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPiAtIDEuNC45OS4yMDEyMDIwMy0xCiAtIFVwZGF0ZWQg dG8gMS40Ljk5LjIwMTIwMjAzCiAtIFJlbW92ZWQgaWJ1cy14eC1icmlkZ2UtaG90a2V5LnBhdGNo CiAtIFVwZGF0ZWQgaWJ1cy01NDE0OTIteGtiLnBhdGNoIHRvIHVzZSBsaWJnbm9tZWtiZC4KCmRp ZmYgLS1naXQgYS9zb3VyY2VzIGIvc291cmNlcwppbmRleCA2MDlmNmU1Li5kYjYyODI3IDEwMDY0 NAotLS0gYS9zb3VyY2VzCisrKyBiL3NvdXJjZXMKQEAgLTEsNCArMSwzIEBACiA2NzUxMzZiYmEw YjA0YzkyMmNjYTQ0ZWVjZDBiYzQyMSAgaWJ1cy0xLjQuOTkuMjAxMjAyMDMudGFyLmd6CiA4Yzcx M2U0N2Q0MDM0ODJjZGQ4Yjg1MWRkYTNkMDcxMyAgaWJ1cy1nanMtMy4zLjMuMjAxMjAyMDMudGFy Lmd6CiAyZDJhZDU4ZTNlNDE0MjlkYmQ4ODNiYTdlNTAxYzliMiAgaWJ1cy1nanMtMy4yLjEuMjAx MTEyMzAudGFyLmd6Ci1kYmRmNjAzZjY4OTdkZjhiODk0OTYwMjQ5Y2YyMTkwOSAgaWJ1cy1nc2V0 dGluZ3MtZGIK