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: Fix time lag of CandidatePanel in X11 Date: Sun, 31 May 2026 02:08:53 GMT Message-ID: <178019333330.1.10588371538648694618.rpms-ibus-b17b2c5349ed@fedoraproject.org> List-ID: X-Git-Repo: rpms/ibus X-Git-Branch: autotool X-Git-Rev: b17b2c5349ed16e3b5b7fc67ad7ec3b137102f32 ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvaWJ1cwogICAgICAgICAgICBCcmFuY2ggOiBhdXRvdG9vbAogICAgICAgICAg ICBDb21taXQgOiBiMTdiMmM1MzQ5ZWQxNmUzYjViN2ZjNjdhZDdlYzNiMTM3MTAyZjMyCiAgICAg ICAgICAgIEF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgogICAg ICAgICAgICBEYXRlICAgOiAyMDI1LTAzLTE0VDIxOjQ3OjI4KzA5OjAwCiAgICAgICAgICAgIFN0 YXRzICA6ICs0MTkvLTEgaW4gMiBmaWxlKHMpCiAgICAgICAgICAgIFVSTCAgICA6IGh0dHBzOi8v c3JjLmZlZG9yYXByb2plY3Qub3JnL3JwbXMvaWJ1cy9jL2IxN2IyYzUzNDllZDE2ZTNiNWI3ZmM2 N2FkN2VjM2IxMzcxMDJmMzI/YnJhbmNoPWF1dG90b29sCgogICAgICAgICAgICBMb2c6CiAgICAg ICAgICAgIEZpeCB0aW1lIGxhZyBvZiBDYW5kaWRhdGVQYW5lbCBpbiBYMTEKCkZpeCBpbmZpbml0 ZSBSZXR1cm4ga2V5IGluIHh0ZXJtIHdpdGggV2F5YWxuZCBpbnB1dC1tZXRob2QgcHJvdG9jb2wg VjIKCi0tLQpkaWZmIC0tZ2l0IGEvaWJ1cy1IRUFELnBhdGNoIGIvaWJ1cy1IRUFELnBhdGNoCmlu ZGV4IDMxMDczOWMuLmVhZGEzZmMgMTAwNjQ0Ci0tLSBhL2lidXMtSEVBRC5wYXRjaAorKysgYi9p YnVzLUhFQUQucGF0Y2gKQEAgLTEyNywzICsxMjcsNDE2IEBAIGluZGV4IDIwZjg5Y2VmLi5mYTE1 ZDJlNyAxMDA2NDQKIC0tIAogMi40Ny4wCiAKK0Zyb20gNTc5NzE1MDg5MjMxN2EzMGUzNzc1NmVl NjJhZTRmZDY0NDcwMGRmYyBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206IGZ1aml3YXJh dCA8dGFrYW8uZnVqaXdhcmExQGdtYWlsLmNvbT4KK0RhdGU6IEZyaSwgMTQgTWFyIDIwMjUgMjE6 MDA6MzggKzA5MDAKK1N1YmplY3Q6IFtQQVRDSF0gdWkvZ3RrMzogRml4IHRpbWUgbGFnIG9mIENh bmRpZGF0ZVBhbmVsIGluIFgxMQorCitUaGUgdGltZWQgYHNldF9sb29rdXBfdGFibGUoKWAgaXMg YSB3b3JrYXJvdW5kIHdpdGggdGhlIFdheWxhbmQKK2lucHV0LW1ldGhvZCBwcm90b2NvbCB1bmRl ciB0aGUgY29uc3RydWN0aW9uIHRvIHN0b3AgdGhlIG1hbnkgRC1CdXMKK21ldGhvZHMgYnV0IGl0 IHNob3VsZCBub3QgYWZmZWN0IFhvcmcgVUkgYXQgbGVhc3QuCisKK05vdyBgbV9pc193YXlsYW5k IGZsYWdgIGlzIGluaGVyaXRlZCB0byB0aGUgQ2FuZGlkYXRlUGFuZWwgYW5kIFN3aXRjaGVyCith bmQgYWRkIGBtX2ZpcnN0X3NldF9sb29rdXBfdGFibGVgIGZsYWcgbmV3bHkgdG8gZW5oYW5jZSB0 aGUgbGFnCit3aXRoIHRoZSBXYXlsYW5kIGlucHV0LW1ldGhvZCBwcm90b2NvbC4KKworQWxzbyBm aXggY29tcGlsZSB3YXJuaW5ncyB3aXRoIGB2YWxhY2AgaW4gYHhrYmxheW91dC52YWxhYC4KKwor Rml4ZXM6IGh0dHBzOi8vZ2l0aHViLmNvbS9pYnVzL2lidXMvY29tbWl0L2Q1ZTZlNzEKK0JVRz1o dHRwczovL2dpdGh1Yi5jb20vaWJ1cy9pYnVzL2lzc3Vlcy8yNzQwCistLS0KKyB1aS9ndGszL2Nh bmRpZGF0ZXBhbmVsLnZhbGEgfCA2MyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0t LS0tCisgdWkvZ3RrMy9wYW5lbC52YWxhICAgICAgICAgIHwgIDUgKy0tCisgdWkvZ3RrMy9zd2l0 Y2hlci52YWxhICAgICAgIHwgMjUgKysrKysrKystLS0tLS0tCisgdWkvZ3RrMy94a2JsYXlvdXQu dmFsYSAgICAgIHwgMzQgKysrKysrKysrKy0tLS0tLS0tLS0KKyA0IGZpbGVzIGNoYW5nZWQsIDkw IGluc2VydGlvbnMoKyksIDM3IGRlbGV0aW9ucygtKQorCitkaWZmIC0tZ2l0IGEvdWkvZ3RrMy9j YW5kaWRhdGVwYW5lbC52YWxhIGIvdWkvZ3RrMy9jYW5kaWRhdGVwYW5lbC52YWxhCitpbmRleCBm MjQ0NzcwMy4uNWJhOGNmMzYgMTAwNjQ0CistLS0gYS91aS9ndGszL2NhbmRpZGF0ZXBhbmVsLnZh bGEKKysrKyBiL3VpL2d0azMvY2FuZGlkYXRlcGFuZWwudmFsYQorQEAgLTM2LDkgKzM2LDEwIEBA IHB1YmxpYyBjbGFzcyBDYW5kaWRhdGVQYW5lbCA6IEd0ay5Cb3h7CisgCisgICAgIHByaXZhdGUg UGFuZ28uQXR0cmlidXRlIG1fbGFuZ3VhZ2VfYXR0cmlidXRlOworICAgICBwcml2YXRlIHVpbnQg bV91cGRhdGVfaWQ7CisrICAgIHByaXZhdGUgYm9vbCBtX2lzX3dheWxhbmQ7CisrICAgIHByaXZh dGUgYm9vbCBtX25vX3dheWxhbmRfcGFuZWw7CisgCisgI2lmIFVTRV9HREtfV0FZTEFORAorLSAg ICBwcml2YXRlIGJvb2wgbV9ub193YXlsYW5kX3BhbmVsOworICAgICBwcml2YXRlIGJvb2wgbV9o aWRlX2FmdGVyX3Nob3c7CisgICAgIHByaXZhdGUgdWludCBtX3ByZXZfcGFnZV9zaXplOworICAg ICBwcml2YXRlIHVpbnQgbV9wcmV2X25jYW5kaWRhdGVzOworQEAgLTQ4LDYgKzQ5LDcgQEAgcHVi bGljIGNsYXNzIENhbmRpZGF0ZVBhbmVsIDogR3RrLkJveHsKKyAgICAgcHJpdmF0ZSB1aW50IG1f c2V0X3ByZWVkaXRfdGV4dF9pZDsKKyAgICAgcHJpdmF0ZSB1aW50IG1fc2V0X2F1eGlsaWFyeV90 ZXh0X2lkOworICAgICBwcml2YXRlIHVpbnQgbV9zZXRfbG9va3VwX3RhYmxlX2lkOworKyAgICBw cml2YXRlIGJvb2wgbV9maXJzdF9zZXRfbG9va3VwX3RhYmxlOworICNlbmRpZgorIAorICAgICBw dWJsaWMgc2lnbmFsIHZvaWQgY3Vyc29yX3VwKCk7CitAQCAtNjQsNyArNjYsOCBAQCBwdWJsaWMg Y2xhc3MgQ2FuZGlkYXRlUGFuZWwgOiBHdGsuQm94eworICAgICBwdWJsaWMgc2lnbmFsIHZvaWQg cmVhbGl6ZV9zdXJmYWNlKHZvaWQgKnN1cmZhY2UpOworICNlbmRpZgorIAorLSAgICBwdWJsaWMg Q2FuZGlkYXRlUGFuZWwoYm9vbCBub193YXlsYW5kX3BhbmVsKSB7CisrICAgIHB1YmxpYyBDYW5k aWRhdGVQYW5lbChib29sIGlzX3dheWxhbmQsCisrICAgICAgICAgICAgICAgICAgICAgICAgICBi b29sIG5vX3dheWxhbmRfcGFuZWwpIHsKKyAgICAgICAgIC8vIENhbGwgYmFzZSBjbGFzcyBjb25z dHJ1Y3RvcgorICAgICAgICAgR0xpYi5PYmplY3QoCisgICAgICAgICAgICAgbmFtZSA6ICJJQnVz Q2FuZGlkYXRlIiwKK0BAIC03Miw5ICs3NSw4IEBAIHB1YmxpYyBjbGFzcyBDYW5kaWRhdGVQYW5l bCA6IEd0ay5Cb3h7CisgICAgICAgICAgICAgdmlzaWJsZTogdHJ1ZQorICAgICAgICAgKTsKKyAK Ky0jaWYgVVNFX0dES19XQVlMQU5ECisrICAgICAgICBtX2lzX3dheWxhbmQgPSBpc193YXlsYW5k OworICAgICAgICAgbV9ub193YXlsYW5kX3BhbmVsID0gbm9fd2F5bGFuZF9wYW5lbDsKKy0jZW5k aWYKKyAgICAgICAgIG1fdG9wbGV2ZWwgPSBuZXcgR3RrLldpbmRvdyhHdGsuV2luZG93VHlwZS5Q T1BVUCk7CisgICAgICAgICBtX3RvcGxldmVsLmFkZF9ldmVudHMoR2RrLkV2ZW50TWFzay5CVVRU T05fUFJFU1NfTUFTSyk7CisgICAgICAgICBtX3RvcGxldmVsLmJ1dHRvbl9wcmVzc19ldmVudC5j b25uZWN0KCh3LCBlKSA9PiB7CitAQCAtODcsNyArODksNyBAQCBwdWJsaWMgY2xhc3MgQ2FuZGlk YXRlUGFuZWwgOiBHdGsuQm94eworICAgICAgICAgICAgIGFkanVzdF93aW5kb3dfcG9zaXRpb24o dyk7CisgICAgICAgICB9KTsKKyAjaWYgVVNFX0dES19XQVlMQU5ECistICAgICAgICBpZiAoIUJp bmRpbmdDb21tb24uZGVmYXVsdF9pc194ZGlzcGxheSgpKSB7CisrICAgICAgICBpZiAobV9pc193 YXlsYW5kKSB7CisgICAgICAgICAgICAgbV90b3BsZXZlbC5yZWFsaXplLmNvbm5lY3QoKHcpID0+ IHsKKyAgICAgICAgICAgICAgICAgcmVhbGl6ZV93aW5kb3codHJ1ZSk7CisgICAgICAgICAgICAg fSk7CitAQCAtMjAxLDYgKzIwMywxMCBAQCBwdWJsaWMgY2xhc3MgQ2FuZGlkYXRlUGFuZWwgOiBH dGsuQm94eworICAgICB9CisgCisgICAgIHB1YmxpYyB2b2lkIHNldF9wcmVlZGl0X3RleHQoSUJ1 cy5UZXh0PyB0ZXh0LCB1aW50IGN1cnNvcikgeworKyAgICAgICAgaWYgKCFtX2lzX3dheWxhbmQp IHsKKysgICAgICAgICAgICBzZXRfcHJlZWRpdF90ZXh0X3JlYWwodGV4dCwgY3Vyc29yKTsKKysg ICAgICAgICAgICByZXR1cm47CisrICAgICAgICB9CisgI2lmIFVTRV9HREtfV0FZTEFORAorICAg ICAgICAgaWYgKG1fc2V0X3ByZWVkaXRfdGV4dF9pZCA+IDApCisgICAgICAgICAgICAgR0xpYi5T b3VyY2UucmVtb3ZlKG1fc2V0X3ByZWVkaXRfdGV4dF9pZCk7CitAQCAtMjM4LDYgKzI0NCwxMCBA QCBwdWJsaWMgY2xhc3MgQ2FuZGlkYXRlUGFuZWwgOiBHdGsuQm94eworICAgICB9CisgCisgICAg IHB1YmxpYyB2b2lkIHNldF9hdXhpbGlhcnlfdGV4dChJQnVzLlRleHQ/IHRleHQpIHsKKysgICAg ICAgIGlmICghbV9pc193YXlsYW5kKSB7CisrICAgICAgICAgICAgc2V0X2F1eGlsaWFyeV90ZXh0 X3JlYWwodGV4dCk7CisrICAgICAgICAgICAgcmV0dXJuOworKyAgICAgICAgfQorICNpZiBVU0Vf R0RLX1dBWUxBTkQKKyAgICAgICAgIGlmIChtX3NldF9hdXhpbGlhcnlfdGV4dF9pZCA+IDApCisg ICAgICAgICAgICAgR0xpYi5Tb3VyY2UucmVtb3ZlKG1fc2V0X2F1eGlsaWFyeV90ZXh0X2lkKTsK K0BAIC0yNjksNiArMjc5LDEwIEBAIHB1YmxpYyBjbGFzcyBDYW5kaWRhdGVQYW5lbCA6IEd0ay5C b3h7CisgICAgIH0KKyAKKyAgICAgcHVibGljIHZvaWQgc2V0X2xvb2t1cF90YWJsZShJQnVzLkxv b2t1cFRhYmxlPyB0YWJsZSkgeworKyAgICAgICAgaWYgKCFtX2lzX3dheWxhbmQpIHsKKysgICAg ICAgICAgICBzZXRfbG9va3VwX3RhYmxlX3JlYWwodGFibGUpOworKyAgICAgICAgICAgIHJldHVy bjsKKysgICAgICAgIH0KKyAjaWYgVVNFX0dES19XQVlMQU5ECisgICAgICAgICBpZiAobV9zZXRf bG9va3VwX3RhYmxlX2lkID4gMCkgeworICAgICAgICAgICAgIGlmICh0YWJsZSA9PSBudWxsIHx8 CitAQCAtMjgyLDE0ICsyOTYsMjUgQEAgcHVibGljIGNsYXNzIENhbmRpZGF0ZVBhbmVsIDogR3Rr LkJveHsKKyAgICAgICAgICAgICB9CisgICAgICAgICB9CisgICAgICAgICBpZiAodGFibGUgIT0g bnVsbCkgeworKyAgICAgICAgICAgIGlmIChtX3ByZXZfbmNhbmRpZGF0ZXMgPT0gMCkKKysgICAg ICAgICAgICAgICAgbV9maXJzdF9zZXRfbG9va3VwX3RhYmxlID0gdHJ1ZTsKKyAgICAgICAgICAg ICBtX3ByZXZfcGFnZV9zaXplID0gdGFibGUuZ2V0X3BhZ2Vfc2l6ZSgpOworICAgICAgICAgICAg IG1fcHJldl9uY2FuZGlkYXRlcyA9IHRhYmxlLmdldF9udW1iZXJfb2ZfY2FuZGlkYXRlcygpOwor ICAgICAgICAgICAgIG1fcHJldl9jdXJzb3IgPSB0YWJsZS5nZXRfY3Vyc29yX3BvcygpOworICAg ICAgICAgICAgIG1fcHJldl9jdXJzb3JfaW5fcGFnZSA9IHRhYmxlLmdldF9jdXJzb3JfaW5fcGFn ZSgpOworICAgICAgICAgICAgIG1fcHJldl9zaG93X2N1cnNvciA9IHRhYmxlLmlzX2N1cnNvcl92 aXNpYmxlKCk7CisrICAgICAgICB9IGVsc2UgeworKyAgICAgICAgICAgIG1fcHJldl9wYWdlX3Np emUgPSBtX3ByZXZfbmNhbmRpZGF0ZXMgPSBtX3ByZXZfY3Vyc29yID0KKysgICAgICAgICAgICAg ICAgICAgIG1fcHJldl9jdXJzb3JfaW5fcGFnZSA9IDA7CisrICAgICAgICAgICAgbV9wcmV2X3No b3dfY3Vyc29yID0gZmFsc2U7CisgICAgICAgICB9CisgICAgICAgICAvLyBGSVhNRTogVG9vIG1h bnkgUHJlZWRpdFRleHQgRC1CdXMgc2lnbmFsIGhhcHBlbnMgaW4gV2F5bGFuZC4KKyAgICAgICAg IG1fc2V0X2xvb2t1cF90YWJsZV9pZCA9IFRpbWVvdXQuYWRkKDEwMCwKKysgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBJZiBtX3NldF9sb29rdXBf dGFibGVfaWQKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8v ID09IDAsIGRlbGV0ZSB0aGUgcXVldWVkIHRpbWVkCisrICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAvLyBjYWxsYmFja3MgdG8gYXZvaWQgdGhlIGxhc3QKKysgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIHJldmVyc2UgY3Vyc29y IG1vdmUgYWZ0ZXIgdGhlCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAvLyBrZXkgcmVsZWFzZS4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICgpID0+IHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBtX3NldF9sb29rdXBfdGFibGVfaWQgPSAwOworICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNldF9sb29rdXBfdGFibGVfcmVhbCh0YWJs ZSk7CitAQCAtMzUzLDkgKzM3OCwzMyBAQCBwdWJsaWMgY2xhc3MgQ2FuZGlkYXRlUGFuZWwgOiBH dGsuQm94eworICAgICB9CisgCisgICAgIHByaXZhdGUgdm9pZCB1cGRhdGUoKSB7CisrICAgICAg ICBpZiAoIW1faXNfd2F5bGFuZCkgeworKyAgICAgICAgICAgIHVwZGF0ZV9yZWFsKCk7CisrICAg ICAgICAgICAgcmV0dXJuOworKyAgICAgICAgfQorKyNpZiBVU0VfR0RLX1dBWUxBTkQKKysgICAg ICAgIC8vIFNob3cgdGhlIGZpcnN0IGxvb2t1cCB0YWJsZSBpbW1lZGlhdGVseSB3aXRoIHRoZSBX YXlsYW5kCisrICAgICAgICAvLyBpbnB1dC1tZXRob2QgcHJvdG9jb2wgYmVjYXVzZSBrZWVwaW5n IHByZXNzaW5nIHRoZSBzcGFjZSBrZXkKKysgICAgICAgIC8vIGNhdXNlcyBtYW55IHVwZGF0ZSgp IGFuZCB0aGUgdGltZWQgdXBkYXRlX3JlYWwoKSBpcyBub3QgY2FsbGVkCisrICAgICAgICAvLyB1 bnRpbCB0aGUgc3BhY2Uga2V5IGlzIHJlbGVhc2VkLgorKyAgICAgICAgaWYgKG1fZmlyc3Rfc2V0 X2xvb2t1cF90YWJsZSkgeworKyAgICAgICAgICAgIG1fZmlyc3Rfc2V0X2xvb2t1cF90YWJsZSA9 IGZhbHNlOworKyAgICAgICAgICAgIGlmIChtX3VwZGF0ZV9pZCA+IDApIHsKKysgICAgICAgICAg ICAgICAgR0xpYi5Tb3VyY2UucmVtb3ZlKG1fdXBkYXRlX2lkKTsKKysgICAgICAgICAgICAgICAg bV91cGRhdGVfaWQgPSAwOworKyAgICAgICAgICAgIH0KKysgICAgICAgICAgICB1cGRhdGVfcmVh bCgpOworKyAgICAgICAgICAgIHJldHVybjsKKysgICAgICAgIH0KKysjZW5kaWYKKyAgICAgICAg IGlmIChtX3VwZGF0ZV9pZCA+IDApCisgICAgICAgICAgICAgR0xpYi5Tb3VyY2UucmVtb3ZlKG1f dXBkYXRlX2lkKTsKKy0gICAgICAgIC8vIHNldF9sb29rdXBfdGFibGUoKSBhbmQgc2V0X3ByZWVk aXRfdGV4dCgpIGhhcHBlbnMgc2VxdWVudGlhbGx5LgorKyAgICAgICAgLy8gLSBzZXRfbG9va3Vw X3RhYmxlKCkgYW5kIHNldF9wcmVlZGl0X3RleHQoKSBoYXBwZW5zIHNlcXVlbnRpYWxseS4KKysg ICAgICAgIC8vIC0gSGlkZSBDYW5kaWRhdGVQYW5lbCBhZnRlciBhIGNhbmRpZGF0ZSBpcyBjb21t aXR0ZWQgd2l0aCBFbW9qaWVyCisrICAgICAgICAvLyBhbmQgeHRlcm0gd2l0aG91dCB0aGUgV2F5 bGFuZCBwYW5lbCBpbiB0aGUgV2F5bGFuZCBpbnB1dC1tZXRob2QgVjIuCisrICAgICAgICAvLyAt IERvbid0IHNob3cgdGhlIGhpZGRlbiBsb29rdXAgdGFibGUgdW5leHBlY3RlZGx5IGFnYWluIGFm dGVyCisrICAgICAgICAvLyBhIGNhbmRpZGF0ZSBpcyBjb21taXR0ZWQgd2l0aCB0aGUgV2F5bGFu ZCBhcHBsaWNhdGlvbnMgaW4gdGhlCisrICAgICAgICAvLyBXYXlsYW5kIGlucHV0LW1ldGhvZCBW Mi4KKyAgICAgICAgIG1fdXBkYXRlX2lkID0gVGltZW91dC5hZGQoMTAwLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAoKSA9PiB7CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBtX3VwZGF0ZV9pZCA9IDA7CitAQCAtNDM2LDcgKzQ4NSw3IEBAIHB1Ymxp YyBjbGFzcyBDYW5kaWRhdGVQYW5lbCA6IEd0ay5Cb3h7CisgCisgICAgIHB1YmxpYyBuZXcgdm9p ZCBoaWRlKCkgeworICNpZiBVU0VfR0RLX1dBWUxBTkQKKy0gICAgICAgIGlmICghQmluZGluZ0Nv bW1vbi5kZWZhdWx0X2lzX3hkaXNwbGF5KCkpCisrICAgICAgICBpZiAobV9pc193YXlsYW5kKQor ICAgICAgICAgICAgIHJlYWxpemVfc3VyZmFjZShudWxsKTsKKyAjZW5kaWYKKyAgICAgICAgIG1f dG9wbGV2ZWwuaGlkZSgpOworZGlmZiAtLWdpdCBhL3VpL2d0azMvcGFuZWwudmFsYSBiL3VpL2d0 azMvcGFuZWwudmFsYQoraW5kZXggMTg2YjNhYzkuLmU0MmExNjZlIDEwMDY0NAorLS0tIGEvdWkv Z3RrMy9wYW5lbC52YWxhCisrKysgYi91aS9ndGszL3BhbmVsLnZhbGEKK0BAIC0xNzMsNyArMTcz LDggQEAgY2xhc3MgUGFuZWwgOiBJQnVzLlBhbmVsU2VydmljZSB7CisgICAgIH0KKyAKKyAgICAg cHJpdmF0ZSBDYW5kaWRhdGVQYW5lbCBjYW5kaWRhdGVfcGFuZWxfbmV3KGJvb2wgbm9fd2F5bGFu ZF9wYW5lbCkgeworLSAgICAgICAgQ2FuZGlkYXRlUGFuZWwgY2FuZGlkYXRlX3BhbmVsID0gbmV3 IENhbmRpZGF0ZVBhbmVsKG5vX3dheWxhbmRfcGFuZWwpOworKyAgICAgICAgQ2FuZGlkYXRlUGFu ZWwgY2FuZGlkYXRlX3BhbmVsID0gbmV3IENhbmRpZGF0ZVBhbmVsKG1faXNfd2F5bGFuZCwKKysg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBub193YXlsYW5kX3BhbmVsKTsKKyAgICAgICAgIGNhbmRpZGF0ZV9wYW5lbC5wYWdlX3VwLmNv bm5lY3QoKHcpID0+IHRoaXMucGFnZV91cCgpKTsKKyAgICAgICAgIGNhbmRpZGF0ZV9wYW5lbC5w YWdlX2Rvd24uY29ubmVjdCgodykgPT4gdGhpcy5wYWdlX2Rvd24oKSk7CisgICAgICAgICBjYW5k aWRhdGVfcGFuZWwuY3Vyc29yX3VwLmNvbm5lY3QoKHcpID0+IHRoaXMuY3Vyc29yX3VwKCkpOwor QEAgLTE5MCw3ICsxOTEsNyBAQCBjbGFzcyBQYW5lbCA6IElCdXMuUGFuZWxTZXJ2aWNlIHsKKyAg ICAgfQorIAorICAgICBwcml2YXRlIFN3aXRjaGVyIHN3aXRjaGVyX25ldyhib29sIG5vX3dheWxh bmRfcGFuZWwpIHsKKy0gICAgICAgIFN3aXRjaGVyIHN3aXRjaGVyID0gbmV3IFN3aXRjaGVyKG5v X3dheWxhbmRfcGFuZWwpOworKyAgICAgICAgU3dpdGNoZXIgc3dpdGNoZXIgPSBuZXcgU3dpdGNo ZXIobV9pc193YXlsYW5kLCBub193YXlsYW5kX3BhbmVsKTsKKyAjaWYgVVNFX0dES19XQVlMQU5E CisgICAgICAgICBzd2l0Y2hlci5yZWFsaXplX3N1cmZhY2UuY29ubmVjdCgKKyAgICAgICAgICAg ICAgICAgKHcsIHMpID0+IHRoaXMucmVhbGl6ZV9zdXJmYWNlKHMpKTsKK2RpZmYgLS1naXQgYS91 aS9ndGszL3N3aXRjaGVyLnZhbGEgYi91aS9ndGszL3N3aXRjaGVyLnZhbGEKK2luZGV4IDEzZWVi NDgxLi45OWEyZmEwYiAxMDA2NDQKKy0tLSBhL3VpL2d0azMvc3dpdGNoZXIudmFsYQorKysrIGIv dWkvZ3RrMy9zd2l0Y2hlci52YWxhCitAQCAtOTYsNiArOTYsNyBAQCBjbGFzcyBTd2l0Y2hlciA6 IEd0ay5XaW5kb3cgeworICAgICBwcml2YXRlIGRvdWJsZSBtX21vdXNlX2luaXRfeDsKKyAgICAg cHJpdmF0ZSBkb3VibGUgbV9tb3VzZV9pbml0X3k7CisgICAgIHByaXZhdGUgYm9vbCAgIG1fbW91 c2VfbW92ZWQ7CisrICAgIHByaXZhdGUgYm9vbCAgIG1faXNfd2F5bGFuZDsKKyAgICAgcHJpdmF0 ZSBib29sICAgbV9ub193YXlsYW5kX3BhbmVsOworICAgICBwcml2YXRlIEdMaWIuSGFzaFRhYmxl PHN0cmluZywgc3RyaW5nPiBtX3hrYl9sYW5ndWFnZXMgPQorICAgICAgICAgICAgIG5ldyBHTGli Lkhhc2hUYWJsZTxzdHJpbmcsIHN0cmluZz4oR0xpYi5zdHJfaGFzaCwKK0BAIC0xMDYsMTYgKzEw NywxOSBAQCBjbGFzcyBTd2l0Y2hlciA6IEd0ay5XaW5kb3cgeworICAgICBwdWJsaWMgc2lnbmFs IHZvaWQgcmVhbGl6ZV9zdXJmYWNlKHZvaWQgKnN1cmZhY2UpOworICNlbmRpZgorIAorLSAgICBw dWJsaWMgU3dpdGNoZXIoYm9vbCBub193YXlsYW5kX3BhbmVsKSB7CisrICAgIHB1YmxpYyBTd2l0 Y2hlcihib29sIGlzX3dheWxhbmQsCisrICAgICAgICAgICAgICAgICAgICBib29sIG5vX3dheWxh bmRfcGFuZWwpIHsKKyAgICAgICAgIEdMaWIuT2JqZWN0KAorICAgICAgICAgICAgIHR5cGUgOiBH dGsuV2luZG93VHlwZS5QT1BVUCwKKy0gICAgICAgICAgICBldmVudHMgOiBHZGsuRXZlbnRNYXNr LktFWV9QUkVTU19NQVNLIHwgR2RrLkV2ZW50TWFzay5LRVlfUkVMRUFTRV9NQVNLLAorKyAgICAg ICAgICAgIGV2ZW50cyA6IEdkay5FdmVudE1hc2suS0VZX1BSRVNTX01BU0sgfAorKyAgICAgICAg ICAgICAgICAgICAgIEdkay5FdmVudE1hc2suS0VZX1JFTEVBU0VfTUFTSywKKyAgICAgICAgICAg ICB3aW5kb3dfcG9zaXRpb24gOiBHdGsuV2luZG93UG9zaXRpb24uQ0VOVEVSLAorICAgICAgICAg ICAgIGFjY2VwdF9mb2N1cyA6IHRydWUsCisgICAgICAgICAgICAgZGVjb3JhdGVkIDogZmFsc2Us CisgICAgICAgICAgICAgbW9kYWwgOiB0cnVlLAorICAgICAgICAgICAgIGZvY3VzX3Zpc2libGUg OiB0cnVlCisgICAgICAgICApOworKyAgICAgICAgbV9pc193YXlsYW5kID0gaXNfd2F5bGFuZDsK KyAgICAgICAgIG1fbm9fd2F5bGFuZF9wYW5lbCA9IG5vX3dheWxhbmRfcGFuZWw7CisgICAgICAg ICBHdGsuQm94IHZib3ggPSBuZXcgR3RrLkJveChHdGsuT3JpZW50YXRpb24uVkVSVElDQUwsIDAp OworICAgICAgICAgYWRkKHZib3gpOworQEAgLTEzOSw3ICsxNDMsNyBAQCBjbGFzcyBTd2l0Y2hl ciA6IEd0ay5XaW5kb3cgeworICAgICAgICAgdmJveC5wYWNrX2VuZChtX2xhYmVsLCBmYWxzZSwg ZmFsc2UsIDApOworIAorICNpZiBVU0VfR0RLX1dBWUxBTkQKKy0gICAgICAgIGlmICghQmluZGlu Z0NvbW1vbi5kZWZhdWx0X2lzX3hkaXNwbGF5KCkpIHsKKysgICAgICAgIGlmIChtX2lzX3dheWxh bmQpIHsKKyAgICAgICAgICAgICB0aGlzLnJlYWxpemUuY29ubmVjdCgodykgPT4geworICAgICAg ICAgICAgICAgICByZWFsaXplX3dpbmRvdyh0cnVlKTsKKyAgICAgICAgICAgICB9KTsKK0BAIC0z ODEsMTIgKzM4NSw4IEBAIGNsYXNzIFN3aXRjaGVyIDogR3RrLldpbmRvdyB7CisgICAgICAgICAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAg ICAgICAgbV9tb3VzZV9tb3ZlZCA9IHRydWU7CistI2lmIFVTRV9HREtfV0FZTEFORAorLSAgICAg ICAgICAgICAgICBpZiAoQmluZGluZ0NvbW1vbi5kZWZhdWx0X2lzX3hkaXNwbGF5KCkpCisrICAg ICAgICAgICAgICAgIGlmICghbV9pc193YXlsYW5kKQorICAgICAgICAgICAgICAgICAgICAgYnV0 dG9uLmdyYWJfZm9jdXMoKTsKKy0jZWxzZQorLSAgICAgICAgICAgICAgICBidXR0b24uZ3JhYl9m b2N1cygpOworLSNlbmRpZgorICAgICAgICAgICAgICAgICBtX3NlbGVjdGVkX2VuZ2luZSA9IGlu ZGV4OworICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICAgfSk7CitA QCAtNTcxLDcgKzU3MSw3IEBAIGNsYXNzIFN3aXRjaGVyIDogR3RrLldpbmRvdyB7CisgICAgICAg ICAvLyBpZiBlLnR5cGUgPT0gR2RrLkV2ZW50VHlwZS5LRVlfUkVMRUFTRSwgbV9sb29wIGlzIGFs cmVhZHkgbnVsbC4KKyAgICAgICAgIC8vIG1fbG9vcCBpcyBhbHdheXMgbnVsbCBpbiBXYXlsYW5k IGJ1dCB0aGlzIHNpZ25hbCBpcyBub3QgZW1pdHRlZAorICAgICAgICAgLy8gd2hlbiB0aGUgV2F5 bGFuZCBwYW5lbCBwcm90b2NvbCBpcyBlbmFibGVkLgorLSAgICAgICAgaWYgKG1fbG9vcCA9PSBu dWxsICYmICFtX25vX3dheWxhbmRfcGFuZWwpCisrICAgICAgICBpZiAobV9sb29wID09IG51bGwg JiYgIW1faXNfd2F5bGFuZCkKKyAgICAgICAgICAgICByZXR1cm4gR2RrLkVWRU5UX1BST1BBR0FU RTsKKyAKKyAgICAgICAgIGlmIChtX3BvcHVwX2RlbGF5X3RpbWUgPiAwKSB7CitAQCAtNTgyLDkg KzU4Miw5IEBAIGNsYXNzIFN3aXRjaGVyIDogR3RrLldpbmRvdyB7CisgICAgICAgICB9CisgCisg ICAgICAgICBtX3Jlc3VsdCA9IChpbnQpbV9zZWxlY3RlZF9lbmdpbmU7CistICAgICAgICBpZiAo IW1fbm9fd2F5bGFuZF9wYW5lbCkgeworKyAgICAgICAgaWYgKCFtX2lzX3dheWxhbmQpIHsKKyAg ICAgICAgICAgICBtX2xvb3AucXVpdCgpOworLSAgICAgICAgfSBlbHNlIHsKKysgICAgICAgIH0g ZWxzZSBpZiAobV9ub193YXlsYW5kX3BhbmVsKSB7CisgICAgICAgICAgICAgLy8gU3dpdGNoZXIg d2l0aG91dCB0aGUgV2F5bGFuZCBwYW5lbCBwcm90b2NvbCBjYW4gcmV0dXJuCisgICAgICAgICAg ICAgLy8gdGhlIG1fcmVzdWx0X2VuZ2luZSBpbW1lZGlhdGVseSBpbiBXYXlsYW5kIHdpdGhvdXQg d2FpdGluZworICAgICAgICAgICAgIC8vIGZvciB0aGUgZm9jdXMtaW4gZXZlbnQgZHVlIHRvIGEg dmlydHVhbCBpbnB1dCBjb250ZXh0IGluCitAQCAtNTkyLDYgKzU5Miw5IEBAIGNsYXNzIFN3aXRj aGVyIDogR3RrLldpbmRvdyB7CisgICAgICAgICAgICAgR0xpYi5hc3NlcnQobV9yZXN1bHQgPCBt X2VuZ2luZXMubGVuZ3RoKTsKKyAgICAgICAgICAgICBtX3Jlc3VsdF9lbmdpbmUgPSBtX2VuZ2lu ZXNbbV9yZXN1bHRdOworICAgICAgICAgICAgIGhpZGUoKTsKKysgICAgICAgIH0gZWxzZSB7Cisr ICAgICAgICAgICAgLy8gU3dpdGNoZXIgc2hvdWxkIG5vdCBnZXQgZm9jdXMgd2l0aCB0aGUgV2F5 bGFuZCBwYW5lbCBwcm90b2NvbC4KKysgICAgICAgICAgICBHTGliLmFzc2VydF9ub3RfcmVhY2hl ZCgpOworICAgICAgICAgfQorICAgICAgICAgcmV0dXJuIEdkay5FVkVOVF9TVE9QOworICAgICB9 CitkaWZmIC0tZ2l0IGEvdWkvZ3RrMy94a2JsYXlvdXQudmFsYSBiL3VpL2d0azMveGtibGF5b3V0 LnZhbGEKK2luZGV4IDg3NDkyMGVlLi41OTg0MzFjMyAxMDA2NDQKKy0tLSBhL3VpL2d0azMveGti bGF5b3V0LnZhbGEKKysrKyBiL3VpL2d0azMveGtibGF5b3V0LnZhbGEKK0BAIC00OCw2ICs0OCwx MSBAQCBjbGFzcyBYS0JMYXlvdXQKKyAgICAgcHVibGljIHZvaWQgZ2V0X2xheW91dChvdXQgc3Ry aW5nIGxheW91dCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBvdXQgc3RyaW5nIHZhcmlh bnQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3V0IHN0cmluZyBvcHRpb24pIHsKKysg ICAgICAgIGxheW91dCA9ICIiOworKyAgICAgICAgdmFyaWFudCA9ICIiOworKyAgICAgICAgdmFy IG8gPSBFbnZpcm9ubWVudC5nZXRfdmFyaWFibGUoIlhLQl9ERUZBVUxUX09QVElPTlMiKTsKKysg ICAgICAgIG9wdGlvbiA9IG8gIT0gbnVsbCA/IG8gOiAiIjsKKysKKyAgICAgICAgIHNlYXJjaF9n ZXRfbGF5b3V0X3Byb2dyYW0oKTsKKyAgICAgICAgIGlmIChtX2dldF9sYXlvdXRfYXJnc1swXSA9 PSBudWxsKSB7CisgICAgICAgICAgICAgd2FybmluZygiTm90IGZvdW5kIGxvY2FsZWN0bCBvciBz ZXR4a2JtYXAgY29tbWFuZCBpbiBQQVRIIik7CitAQCAtNjAsMTEgKzY1LDYgQEAgY2xhc3MgWEtC TGF5b3V0CisgICAgICAgICBzdHJpbmcgc3RhbmRhcmRfZXJyb3IgPSBudWxsOworICAgICAgICAg aW50IGV4aXRfc3RhdHVzID0gMDsKKyAKKy0gICAgICAgIGxheW91dCA9ICIiOworLSAgICAgICAg dmFyaWFudCA9ICIiOworLSAgICAgICAgdmFyIG8gPSBFbnZpcm9ubWVudC5nZXRfdmFyaWFibGUo IlhLQl9ERUZBVUxUX09QVElPTlMiKTsKKy0gICAgICAgIG9wdGlvbiA9IG8gIT0gbnVsbCA/IG8g OiAiIjsKKy0KKyAgICAgICAgIHRyeSB7CisgICAgICAgICAgICAgR0xpYi5Qcm9jZXNzLnNwYXdu X3N5bmMobnVsbCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBleGVjX2Nv bW1hbmQsCitAQCAtODQsMTQgKzg0LDE0IEBAIGNsYXNzIFhLQkxheW91dAorIAorICAgICAgICAg aWYgKGV4ZWNfY29tbWFuZFswXSA9PSAibG9jYWxlY3RsIikgeworICAgICAgICAgICAgIHBhcnNl X2xvY2FsZWN0bF9zdGF0dXNfc3RyKHN0YW5kYXJkX291dHB1dCwKKy0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBvdXQgbGF5b3V0LAorLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIG91dCB2YXJpYW50LAorLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG91dCBvcHRpb24pOworKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHJlZiBsYXlvdXQsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgcmVmIHZhcmlhbnQsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcmVmIG9wdGlvbik7CisgICAgICAgICB9IGVsc2UgaWYgKGV4ZWNfY29tbWFuZFswXSA9 PSBYS0JfQ09NTUFORCkgeworICAgICAgICAgICAgIHBhcnNlX3hrYm1hcF9xdWVyeV9zdHIoc3Rh bmRhcmRfb3V0cHV0LAorLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3V0IGxh eW91dCwKKy0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG91dCB2YXJpYW50LAor LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3V0IG9wdGlvbik7CisrICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWYgbGF5b3V0LAorKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcmVmIHZhcmlhbnQsCisrICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICByZWYgb3B0aW9uKTsKKyAgICAgICAgIH0KKyAgICAgfQorIAorQEAgLTEx Myw5ICsxMTMsOSBAQCBjbGFzcyBYS0JMYXlvdXQKKyAKKyAKKyAgICAgcHJpdmF0ZSB2b2lkIHBh cnNlX2xvY2FsZWN0bF9zdGF0dXNfc3RyKHN0cmluZyBzdGFuZGFyZF9vdXRwdXQsCistICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvdXQgc3RyaW5nIGxheW91dCwK Ky0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG91dCBzdHJpbmcg dmFyaWFudCwKKy0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG91 dCBzdHJpbmcgb3B0aW9uKSB7CisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICByZWYgc3RyaW5nIGxheW91dCwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHJlZiBzdHJpbmcgdmFyaWFudCwKKysgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHJlZiBzdHJpbmcgb3B0aW9uKSB7CisgICAgICAgICBm b3JlYWNoIChzdHJpbmcgbGluZSBpbiBzdGFuZGFyZF9vdXRwdXQuc3BsaXQoIlxuIikpIHsKKyAg ICAgICAgICAgICBjb25zdCBzdHJpbmdbXSBlbGVtZW50cyA9IHsgIlgxMSBMYXlvdXQ6IiwgIlgx MSBWYXJpYW50OiIgfTsKKyAgICAgICAgICAgICBmb3JlYWNoICh1bm93bmVkIHN0cmluZyBlbGVt ZW50IGluIGVsZW1lbnRzKSB7CitAQCAtMTM2LDkgKzEzNiw5IEBAIGNsYXNzIFhLQkxheW91dAor IAorIAorICAgICBwcml2YXRlIHZvaWQgcGFyc2VfeGtibWFwX3F1ZXJ5X3N0cihzdHJpbmcgc3Rh bmRhcmRfb3V0cHV0LAorLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBv dXQgc3RyaW5nIGxheW91dCwKKy0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgb3V0IHN0cmluZyB2YXJpYW50LAorLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBvdXQgc3RyaW5nIG9wdGlvbikgeworKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICByZWYgc3RyaW5nIGxheW91dCwKKysgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgcmVmIHN0cmluZyB2YXJpYW50LAorKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICByZWYgc3RyaW5nIG9wdGlvbikgeworICAgICAgICAgZm9y ZWFjaCAoc3RyaW5nIGxpbmUgaW4gc3RhbmRhcmRfb3V0cHV0LnNwbGl0KCJcbiIpKSB7CisgICAg ICAgICAgICAgY29uc3Qgc3RyaW5nW10gZWxlbWVudHMgPSB7ICJsYXlvdXQ6IiwgInZhcmlhbnQ6 IiwgIm9wdGlvbnM6IiB9OworICAgICAgICAgICAgIGZvcmVhY2ggKHVub3duZWQgc3RyaW5nIGVs ZW1lbnQgaW4gZWxlbWVudHMpIHsKKy0tIAorMi40Ny4wCisKK0Zyb20gMWQ1NmQ3N2IxOWRhZjVj OGQ2ZjNlZTg3YTA3MTJhZTU5MDQyOTNmNCBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206 IGZ1aml3YXJhdCA8dGFrYW8uZnVqaXdhcmExQGdtYWlsLmNvbT4KK0RhdGU6IEZyaSwgMTQgTWFy IDIwMjUgMjE6MDA6NTIgKzA5MDAKK1N1YmplY3Q6IFtQQVRDSF0gY2xpZW50L3dheWxhbmQ6IEZp eCBpbmZpbml0ZSBSZXR1cm4ga2V5IGluIHh0ZXJtCisKK0N1cnJlbnRseSB0aGUgcmVwZWF0aW5n IGtleSBmZWF0dXJlIG9mIElCdXMgaXMgZGlzYWJsZWQgd2hlbiB0aGUgZm9jdXMKK2lzIGNoYW5n ZWQgYnV0IHRoZSBmZWF0dXJlIG9mIHRoZSBXYXlsYW5kIGNvbXBvc2l0b3Igc3RpbGwgaGFwcGVu cyBpbgordGhlIFN3YXkgZGVza3RvcCBzZXNzaW9uIHdoZW4gaW52b2tlIHh0ZXJtIGJ5IG1hbnVh bCBpbiBmb290LgorSSB0aGluayBTd2F5IHNob3VsZCBzdG9wIHRoZSByZXBlYXRpbmcga2V5IGZl YXR1cmUgd2hlbiB0aGUgZm9jdXMgaXMKK2NoYW5nZWQgZnJvbSB0aGUgV2F5bGFuZCBhcHBsaWNh dGlvbiB0byB0aGUgbm9uLVdheWxhbmQgYXBwbGljYXRpb24uCisKK0kgYWRkIGEgd29ya2Fyb3Vu ZCB0byBjYWxsIGB6d3BfdmlydHVhbF9rZXlib2FyZF92MV9rZXkoKWAgd2l0aAordGhlIGBXTF9L RVlCT0FSRF9LRVlfU1RBVEVfUkVMRUFTRURgIGZsYWcgdG8gc3RvcCB0aGUgZmVhdHVyZSBvZgor dGhlIFN3YXkgY29tcG9zaXRvciBhZnRlciB0aGUgSUJ1cyByZXBlYXRpbmcga2V5IHRpbWVvdXQu CistLS0KKyBjbGllbnQvd2F5bGFuZC9pYnVzd2F5bGFuZGltLmMgfCAxMSArKysrKysrKysrKwor IDEgZmlsZSBjaGFuZ2VkLCAxMSBpbnNlcnRpb25zKCspCisKK2RpZmYgLS1naXQgYS9jbGllbnQv d2F5bGFuZC9pYnVzd2F5bGFuZGltLmMgYi9jbGllbnQvd2F5bGFuZC9pYnVzd2F5bGFuZGltLmMK K2luZGV4IGJhMzkyYzZiLi4zNTZjZWMzMSAxMDA2NDQKKy0tLSBhL2NsaWVudC93YXlsYW5kL2li dXN3YXlsYW5kaW0uYworKysrIGIvY2xpZW50L3dheWxhbmQvaWJ1c3dheWxhbmRpbS5jCitAQCAt MTMzMiw2ICsxMzMyLDE3IEBAIF9wcm9jZXNzX2tleV9ldmVudF9yZXBlYXRfZGVsYXlfY2IgKGdw b2ludGVyIHVzZXJfZGF0YSkKKyAgICAgLyogVGhlIGtleSByZWxlYXNlIGV2ZW50IHdhcyBzZW50 IHRvIG5vbi1XYXlsYW5kIGFwcHMgbGlrZXMgeHRlcm0uICovCisgICAgIGlmICghcHJpdi0+aWJ1 c2NvbnRleHQpIHsKKyAgICAgICAgIGV2ZW50LT5jb3VudF9jYl9pZCA9IDA7CisrICAgICAgICAv KiBTdG9wIHRoZSBpbmZpbml0ZSBSZXR1cm4ga2V5cyBpbiBub24tV2F5bGFuZCBhcHBzIGxpa2Vz IHh0ZXJtIGluCisrICAgICAgICAgKiB0aGUgU3dheSBkZXNrdG9wIHNlc3Npb24uCisrICAgICAg ICAgKiBCdXQgcHJpdi0+Y29udGV4dCBpbiBOVUxMIGluIHRoZSBXYXlsYW5kIGlucHV0LW1ldGhv ZCBWMSBoZXJlLgorKyAgICAgICAgICovCisrICAgICAgICBpZiAocHJpdi0+dmVyc2lvbiAhPSBJ TlBVVF9NRVRIT0RfVjEpIHsKKysgICAgICAgICAgICBpYnVzX3dheWxhbmRfaW1fa2V5KGV2ZW50 LT53bGltLAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXZlbnQtPnNlcmlhbCwK KysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV2ZW50LT50aW1lICsgcHJpdi0+cmVw ZWF0X2RlbGF5LAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXZlbnQtPmtleSwK KysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdMX0tFWUJPQVJEX0tFWV9TVEFURV9S RUxFQVNFRCk7CisrICAgICAgICB9CisgICAgICAgICByZXR1cm4gR19TT1VSQ0VfUkVNT1ZFOwor ICAgICB9CisgICAgIC8qIFRoZSBmb2N1cyBpcyBjaGFuZ2VkLiAqLworLS0gCisyLjQ3LjAKKwoK ZGlmZiAtLWdpdCBhL2lidXMuc3BlYyBiL2lidXMuc3BlYwppbmRleCA1Y2FhNDJkLi5iMWJhMzhk IDEwMDY0NAotLS0gYS9pYnVzLnNwZWMKKysrIGIvaWJ1cy5zcGVjCkBAIC02Myw3ICs2Myw3IEBA CiBOYW1lOiAgICAgICAgICAgaWJ1cwogVmVyc2lvbjogICAgICAgIDEuNS4zMn5yYzEKICMgaHR0 cHM6Ly9naXRodWIuY29tL2ZlZG9yYS1pbmZyYS9ycG1hdXRvc3BlYy9pc3N1ZXMvMTAxCi1SZWxl YXNlOiAgICAgICAgMyV7P2Rpc3R9CitSZWxlYXNlOiAgICAgICAgNCV7P2Rpc3R9CiBTdW1tYXJ5 OiAgICAgICAgSW50ZWxsaWdlbnQgSW5wdXQgQnVzIGZvciBMaW51eCBPUwogTGljZW5zZTogICAg ICAgIExHUEwtMi4xLW9yLWxhdGVyCiBVUkw6ICAgICAgICAgICAgaHR0cHM6Ly9naXRodWIuY29t L2lidXMvJW5hbWUvd2lraQpAQCAtMzg2LDYgKzM4Niw3IEBAIGZpCiAgICAgLS1lbmFibGUtaW50 cm9zcGVjdGlvbiBcCiAgICAgLS1lbmFibGUtaW5zdGFsbC10ZXN0cyBcCiAgICAgJXtuaWx9Citt YWtlIC1DIHVpL2d0azMgbWFpbnRhaW5lci1jbGVhbi1nZW5lcmljCiAKICVtYWtlX2J1aWxkCiAK QEAgLTYzOCw2ICs2MzksMTAgQEAgZGNvbmYgdXBkYXRlIHx8IDoKICV7X2RhdGFkaXJ9L2luc3Rh bGxlZC10ZXN0cy9pYnVzCiAKICVjaGFuZ2Vsb2cKKyogRnJpIE1hciAxNCAyMDI1IFRha2FvIEZ1 aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPiAtIDEuNS4zMn5yYzEtNAorLSBGaXggdGltZSBs YWcgb2YgQ2FuZGlkYXRlUGFuZWwgaW4gWDExCistIEZpeCBpbmZpbml0ZSBSZXR1cm4ga2V5IGlu IHh0ZXJtIHdpdGggV2F5YWxuZCBpbnB1dC1tZXRob2QgcHJvdG9jb2wgVjIKKwogKiBTdW4gTWFy IDA5IDIwMjUgVGFrYW8gRnVqaXdhcmEgPHRmdWppd2FyQHJlZGhhdC5jb20+IC0gMS41LjMyfnJj MS0zCiAtIFNlbmQgUmVxdWlyZVN1cnJvdW5kaW5nVGV4dCBtZXRob2Qgd2l0aCBlbmdpbmUgYWN0 aXZlLXN1cnJvdW5kaW5nLXRleHQgcHJvcGVydHkKIAo=