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: Enhance #2237486 Implement preedit color in Plasma Wayland Date: Sun, 31 May 2026 02:08:19 GMT Message-ID: <178019329916.1.1819130869051867292.rpms-ibus-ec611b250cb7@fedoraproject.org> List-ID: X-Git-Repo: rpms/ibus X-Git-Branch: autotool X-Git-Rev: ec611b250cb7f9254671c46fd665846f227f1996 ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvaWJ1cwogICAgICAgICAgICBCcmFuY2ggOiBhdXRvdG9vbAogICAgICAgICAg ICBDb21taXQgOiBlYzYxMWIyNTBjYjdmOTI1NDY3MWM0NmZkNjY1ODQ2ZjIyN2YxOTk2CiAgICAg ICAgICAgIEF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgogICAg ICAgICAgICBEYXRlICAgOiAyMDIzLTA5LTMwVDEyOjM3OjQxKzA5OjAwCiAgICAgICAgICAgIFN0 YXRzICA6ICsxNTIvLTM3IGluIDMgZmlsZShzKQogICAgICAgICAgICBVUkwgICAgOiBodHRwczov L3NyYy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL2lidXMvYy9lYzYxMWIyNTBjYjdmOTI1NDY3MWM0 NmZkNjY1ODQ2ZjIyN2YxOTk2P2JyYW5jaD1hdXRvdG9vbAoKICAgICAgICAgICAgTG9nOgogICAg ICAgICAgICBFbmhhbmNlICMyMjM3NDg2IEltcGxlbWVudCBwcmVlZGl0IGNvbG9yIGluIFBsYXNt YSBXYXlsYW5kCgotIFBhcnQtb2YgIzIyNDA0OTAgRWFjdXRlIHdpdGggQ2Fwc0xvY2sgaW4gUGxh c21hIFdheWxhbmQgb25seQotIFJldmVydCBkbmY1IHRvIGRuZiBpbiBhdXRvZ2VuCi0gVGVzdCBm aXggIzIyMzk2MzMgZ19saXN0X3JlbW92ZSgpIGluIGlidXMtcG9ydGFsIFNJR1NFR1YKCi0tLQpk aWZmIC0tZ2l0IGEvaWJ1cy0xMzg1MzQ5LXNlZ3YtYnVzLXByb3h5LnBhdGNoIGIvaWJ1cy0xMzg1 MzQ5LXNlZ3YtYnVzLXByb3h5LnBhdGNoCmluZGV4IGE1M2I3OGMuLjcyNTRkN2QgMTAwNjQ0Ci0t LSBhL2lidXMtMTM4NTM0OS1zZWd2LWJ1cy1wcm94eS5wYXRjaAorKysgYi9pYnVzLTEzODUzNDkt c2Vndi1idXMtcHJveHkucGF0Y2gKQEAgLTEsNiArMSw2IEBACi1Gcm9tIGRiMTU4Mzg5MjUxZDkz NjA1MThhYmNiZGQxNzcwZDBlODJkYmI4NTUgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9t IDY4OTk2ZTE0MzBlMzQ3OGJkYTEyMDFkOGUzMWE4MjY3OWIyNjU5YTQgTW9uIFNlcCAxNyAwMDow MDowMCAyMDAxCiBGcm9tOiBmdWppd2FyYXQgPHRha2FvLmZ1aml3YXJhMUBnbWFpbC5jb20+Ci1E YXRlOiBTdW4sIDkgSnVsIDIwMjMgMTk6MDQ6NDQgKzA5MDAKK0RhdGU6IFNhdCwgMzAgU2VwIDIw MjMgMTE6NTA6MTQgKzA5MDAKIFN1YmplY3Q6IFtQQVRDSF0gRml4IFNFR1YgaW4gYnVzX3BhbmVs X3Byb3h5X2ZvY3VzX2luKCkKIAogcmhieiMxMzUwMjkxIFNFR1YgaW4gQlVTX0lTX0NPTk5FQ1RJ T04oc2tpcF9jb25uZWN0aW9uKSBpbgpAQCAtMzksNyArMzksMTEgQEAgcmhieiMxNzk3MTIwIFNF R1YgaW4gYXNzZXJ0KGJ1cy5pc19jb25uZWN0ZWQoKSkgaW4gcGFuZWxfYmluZGluZ19jb25zdHJ1 Y3QoKQogQ2hlY2sgbV9pYnVzIGluIGV4dGVuc2lvbi52YWxhOmJ1c19uYW1lX2FjcXVpcmVkX2Ni KCkKIAogcmhieiMyMTUxMzQ0IFNFR1Ygd2l0aCBwb3J0YWxfY29udGV4dC0+b3duZXIgaW4gbmFt ZV9vd25lcl9jaGFuZ2VkKCkKLU1heWJlIGdfb2JqZWN0X3VucmVmKCkgaXMgY2FsbGVkIGJ1dCBu b3QgZmluYWx6ZWQgeWV0LgorTWF5YmUgZ19vYmplY3RfdW5yZWYoKSBpcyBjYWxsZWQgYnV0IG5v dCBmaW5hbGl6ZWQgeWV0LgorCityaGJ6IzIyMzk2MzMgU0VHViB3aXRoIGdfb2JqZWN0X3VucmVm KCkgaW4KK2lidXNfcG9ydGFsX2NvbnRleHRfaGFuZGxlX2Rlc3Ryb3koKQorQ29ubmVjdCAiaGFu ZGxlLWRlc3Ryb3kiIHNpZ25hbCBhZnRlciBnX2xpc3RfcHJlcGVuZCgpLgogCiBCVUc9cmhieiMx MzUwMjkxCiBCVUc9cmhieiMxNjAxNTc3CkBAIC01MSwxNiArNTUsMTcgQEAgQlVHPXJoYnojMTc2 Nzk3NgogQlVHPXJoYnojMTc5NzEyMAogQlVHPXJoYnojMjE1MTM0NAogQlVHPXJoYnojMjE5NTg5 NQorQlVHPXJoYnojMjIzOTYzMwogLS0tCiAgYnVzL2RidXNpbXBsLmMgICAgICAgICB8IDQ3ICsr KysrKysrKysrKysrKysrKysrKysrKy0tLQogIGJ1cy9lbmdpbmVwcm94eS5jICAgICAgfCA0NCAr KysrKysrKysrKysrKysrKysrLS0tLS0tCiAgYnVzL3BhbmVscHJveHkuYyAgICAgICB8ICA5ICsr KysrLQogIGNsaWVudC94MTEvbWFpbi5jICAgICAgfCA1NiArKysrKysrKysrKysrKysrKysrKysr KysrKysrLS0tLQotIHBvcnRhbC9wb3J0YWwuYyAgICAgICAgfCAxMSArKysrKysrCisgcG9ydGFs L3BvcnRhbC5jICAgICAgICB8IDI1ICsrKysrKysrKysrKy0tLQogIHNyYy9pYnVzYnVzLmMgICAg ICAgICAgfCAgNiArKysrCiAgdWkvZ3RrMy9leHRlbnNpb24udmFsYSB8ICA0ICsrKwogIHVpL2d0 azMvc3dpdGNoZXIudmFsYSAgfCA3MyArKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLS0tLS0KLSA4IGZpbGVzIGNoYW5nZWQsIDE5OSBpbnNlcnRpb25zKCspLCA1MSBkZWxldGlv bnMoLSkKKyA4IGZpbGVzIGNoYW5nZWQsIDIwOCBpbnNlcnRpb25zKCspLCA1NiBkZWxldGlvbnMo LSkKIAogZGlmZiAtLWdpdCBhL2J1cy9kYnVzaW1wbC5jIGIvYnVzL2RidXNpbXBsLmMKIGluZGV4 IDU5Nzg3YTgwLi5hZjJmYmRlMiAxMDA2NDQKQEAgLTQ0Niw3ICs0NTEsNyBAQCBpbmRleCBiN2Vi NTk2MS4uMzA3NWQ1ZDAgMTAwNjQ0CiAgCiAgc3RhdGljIHZvaWQKIGRpZmYgLS1naXQgYS9wb3J0 YWwvcG9ydGFsLmMgYi9wb3J0YWwvcG9ydGFsLmMKLWluZGV4IGMyZTRmYzdmLi5hMzQ3ZmU2YSAx MDA2NDQKK2luZGV4IGMyZTRmYzdmLi43NmVmNGYwYSAxMDA2NDQKIC0tLSBhL3BvcnRhbC9wb3J0 YWwuYwogKysrIGIvcG9ydGFsL3BvcnRhbC5jCiBAQCAtOTAsNiArOTAsMTEgQEAgc3RhdGljIHZv aWQgcG9ydGFsX2NvbnRleHRfZ19zaWduYWwgKEdEQnVzUHJveHkgICAgICAgICpwcm94eSwKQEAg LTQ2MSw3ICs0NjYsMzcgQEAgaW5kZXggYzJlNGZjN2YuLmEzNDdmZTZhIDEwMDY0NAogIEdfREVG SU5FX1RZUEVfV0lUSF9DT0RFIChJQnVzUG9ydGFsQ29udGV4dCwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgaWJ1c19wb3J0YWxfY29udGV4dCwKICAgICAgICAgICAgICAgICAgICAgICAgICAg SUJVU19EQlVTX1RZUEVfSU5QVVRfQ09OVEVYVF9TS0VMRVRPTiwKLUBAIC02MjQsNiArNjI5LDEy IEBAIG5hbWVfb3duZXJfY2hhbmdlZCAoR0RCdXNDb25uZWN0aW9uICpjb25uZWN0aW9uLAorQEAg LTQ0OSwxMSArNDU0LDYgQEAgaWJ1c19wb3J0YWxfY29udGV4dF9uZXcgKElCdXNJbnB1dENvbnRl eHQgKmNvbnRleHQsCisgICAgICAgICAgICAgZ19zdHJkdXBfcHJpbnRmIChJQlVTX1BBVEhfSU5Q VVRfQ09OVEVYVCwgcG9ydGFsX2NvbnRleHQtPmlkKTsKKyAgICAgcG9ydGFsX2NvbnRleHQtPnNl cnZpY2UgPSBpYnVzX2RidXNfc2VydmljZV9za2VsZXRvbl9uZXcgKCk7CisgCistICAgIGdfc2ln bmFsX2Nvbm5lY3QgKHBvcnRhbF9jb250ZXh0LT5zZXJ2aWNlLAorLSAgICAgICAgICAgICAgICAg ICAgICAiaGFuZGxlLWRlc3Ryb3kiLAorLSAgICAgICAgICAgICAgICAgICAgICBHX0NBTExCQUNL IChpYnVzX3BvcnRhbF9jb250ZXh0X2hhbmRsZV9kZXN0cm95KSwKKy0gICAgICAgICAgICAgICAg ICAgICAgcG9ydGFsX2NvbnRleHQpOworLQorICAgICBpZiAoIWdfZGJ1c19pbnRlcmZhY2Vfc2tl bGV0b25fZXhwb3J0ICgKKyAgICAgICAgICAgICAgICAgR19EQlVTX0lOVEVSRkFDRV9TS0VMRVRP TiAocG9ydGFsX2NvbnRleHQtPnNlcnZpY2UpLAorICAgICAgICAgICAgICAgICBjb25uZWN0aW9u LCBwb3J0YWxfY29udGV4dC0+b2JqZWN0X3BhdGgsCitAQCAtNDY2LDggKzQ2NiwxNyBAQCBpYnVz X3BvcnRhbF9jb250ZXh0X25ldyAoSUJ1c0lucHV0Q29udGV4dCAqY29udGV4dCwKKyAgICAgICAg IHJldHVybiBOVUxMOworICAgICB9CisgCisrICAgIC8qIHJoYnojMjIzOTYzMyBnX2xpc3RfcHJl cGVuZCgpIG5lZWRzIHRvIGJlIGNhbGxzZWQgYmVmb3JlCisrICAgICAqIGlidXNfcG9ydGFsX2Nv bnRleHRfaGFuZGxlX2Rlc3Ryb3koKSBpcyBjb25uZWN0ZWQKKysgICAgICogZm9yIGdfbGlzdF9y ZW1vdmUoKSBpbiBpYnVzX3BvcnRhbF9jb250ZXh0X2ZpbmFsaXplKCkuCisrICAgICAqLworICAg ICBhbGxfY29udGV4dHMgPSBnX2xpc3RfcHJlcGVuZCAoYWxsX2NvbnRleHRzLCBwb3J0YWxfY29u dGV4dCk7CisgCisrICAgIGdfc2lnbmFsX2Nvbm5lY3QgKHBvcnRhbF9jb250ZXh0LT5zZXJ2aWNl LAorKyAgICAgICAgICAgICAgICAgICAgICAiaGFuZGxlLWRlc3Ryb3kiLAorKyAgICAgICAgICAg ICAgICAgICAgICBHX0NBTExCQUNLIChpYnVzX3BvcnRhbF9jb250ZXh0X2hhbmRsZV9kZXN0cm95 KSwKKysgICAgICAgICAgICAgICAgICAgICAgcG9ydGFsX2NvbnRleHQpOworKworICAgICByZXR1 cm4gcG9ydGFsX2NvbnRleHQ7CisgfQorIAorQEAgLTYyNCw2ICs2MzMsMTIgQEAgbmFtZV9vd25l cl9jaGFuZ2VkIChHREJ1c0Nvbm5lY3Rpb24gKmNvbm5lY3Rpb24sCiAgICAgICAgICAgICAgSUJ1 c1BvcnRhbENvbnRleHQgKnBvcnRhbF9jb250ZXh0ID0gbC0+ZGF0YTsKICAgICAgICAgICAgICBu ZXh0ID0gbC0+bmV4dDsKICAKQEAgLTQ3NSwxMCArNTEwLDEwIEBAIGluZGV4IGMyZTRmYzdmLi5h MzQ3ZmU2YSAxMDA2NDQKICAgICAgICAgICAgICAgICAgZ19vYmplY3RfdW5yZWYgKHBvcnRhbF9j b250ZXh0KTsKICAgICAgICAgICAgICB9CiBkaWZmIC0tZ2l0IGEvc3JjL2lidXNidXMuYyBiL3Ny Yy9pYnVzYnVzLmMKLWluZGV4IDQ3NDAwY2I4Li5jOWZiZTQ5MiAxMDA2NDQKK2luZGV4IDBlNmQ2 N2YxLi5mY2M3NDJiNiAxMDA2NDQKIC0tLSBhL3NyYy9pYnVzYnVzLmMKICsrKyBiL3NyYy9pYnVz YnVzLmMKLUBAIC03MDgsNiArNzA4LDEyIEBAIGlidXNfYnVzX2Rlc3Ryb3kgKElCdXNPYmplY3Qg Km9iamVjdCkKK0BAIC03NDIsNiArNzQyLDEyIEBAIGlidXNfYnVzX2Rlc3Ryb3kgKElCdXNPYmpl Y3QgKm9iamVjdCkKICAgICAgX2J1cyA9IE5VTEw7CiAgCiAgICAgIGlmIChidXMtPnByaXYtPm1v bml0b3IpIHsKQEAgLTUwNywxMCArNTQyLDEwIEBAIGluZGV4IGE2ZjJlOGU2Li5iN2EwNDA4MSAx MDA2NDQKICAgICAgICAgIG1fcGFuZWwubG9hZF9zZXR0aW5ncygpOwogICAgICB9CiBkaWZmIC0t Z2l0IGEvdWkvZ3RrMy9zd2l0Y2hlci52YWxhIGIvdWkvZ3RrMy9zd2l0Y2hlci52YWxhCi1pbmRl eCA5NDAwZTliYS4uMmVjYmRhYzEgMTAwNjQ0CitpbmRleCBlM2ZhYjhkOS4uYTgyNzA5NGYgMTAw NjQ0CiAtLS0gYS91aS9ndGszL3N3aXRjaGVyLnZhbGEKICsrKyBiL3VpL2d0azMvc3dpdGNoZXIu dmFsYQotQEAgLTE0MCw4ICsxNDAsOCBAQCBjbGFzcyBTd2l0Y2hlciA6IEd0ay5XaW5kb3cgewor QEAgLTE3Niw4ICsxNzYsOCBAQCBjbGFzcyBTd2l0Y2hlciA6IEd0ay5XaW5kb3cgewogICAgICAg ICAgICAgICAgICAgICBJQnVzLkVuZ2luZURlc2NbXSBlbmdpbmVzLAogICAgICAgICAgICAgICAg ICAgICBpbnQgICAgICAgICAgICAgICBpbmRleCwKICAgICAgICAgICAgICAgICAgICAgc3RyaW5n ICAgICAgICAgICAgaW5wdXRfY29udGV4dF9wYXRoKSB7CkBAIC01MjEsNyArNTU2LDcgQEAgaW5k ZXggOTQwMGU5YmEuLjJlY2JkYWMxIDEwMDY0NAogIAogICAgICAgICAgaWYgKG1faXNfcnVubmlu ZykKICAgICAgICAgICAgICByZXR1cm4gaW5kZXg7Ci1AQCAtMjAwLDE2ICsyMDAsMTggQEAgY2xh c3MgU3dpdGNoZXIgOiBHdGsuV2luZG93IHsKK0BAIC0yMzYsMTYgKzIzNiwxOCBAQCBjbGFzcyBT d2l0Y2hlciA6IEd0ay5XaW5kb3cgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIG51bGws CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXZlbnQsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbnVsbCk7CkBAIC01NDksNyArNTg0LDcgQEAgaW5kZXggOTQwMGU5YmEuLjJlY2Jk YWMxIDEwMDY0NAogICNlbHNlCiAgICAgICAgICBHZGsuRGV2aWNlIGRldmljZSA9IGV2ZW50Lmdl dF9kZXZpY2UoKTsKICAgICAgICAgIGlmIChkZXZpY2UgPT0gbnVsbCkgewotQEAgLTI0NSwzMCAr MjQ3LDQxIEBAIGNsYXNzIFN3aXRjaGVyIDogR3RrLldpbmRvdyB7CitAQCAtMjgxLDMwICsyODMs NDEgQEAgY2xhc3MgU3dpdGNoZXIgOiBHdGsuV2luZG93IHsKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgR2RrLkV2ZW50TWFzay5LRVlfUkVMRUFTRV9NQVNLLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBudWxsLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBHZGsuQ1VSUkVOVF9USU1FKTsKCmRpZmYgLS1naXQgYS9pYnVzLUhFQUQucGF0Y2ggYi9pYnVz LUhFQUQucGF0Y2gKaW5kZXggZDk4NmNiNC4uZGI3MWQ5YiAxMDA2NDQKLS0tIGEvaWJ1cy1IRUFE LnBhdGNoCisrKyBiL2lidXMtSEVBRC5wYXRjaApAQCAtMSw2ICsxLDM2IEBACi1Gcm9tIGFmNTQ3 MWJlYjc4NGRkYTYyNmViMjcyZjg1MmYyNzlmMWE2MWViYjkgTW9uIFNlcCAxNyAwMDowMDowMCAy MDAxCitGcm9tIGY0NGU0ZTM1Y2Y0NzdiYmQ3NTdkZDZhNmM2NTdhODY5OWViNDFjYTYgTW9uIFNl cCAxNyAwMDowMDowMCAyMDAxCiBGcm9tOiBmdWppd2FyYXQgPHRha2FvLmZ1aml3YXJhMUBnbWFp bC5jb20+Ci1EYXRlOiBUaHUsIDcgU2VwIDIwMjMgMTM6NDY6MjkgKzA5MDAKK0RhdGU6IFNhdCwg MzAgU2VwIDIwMjMgMDk6NDg6MDcgKzA5MDAKK1N1YmplY3Q6IFtQQVRDSF0gYXV0b2dlbjogUmV2 ZXJ0IERORiBmb3IgRmVkb3JhIDM5CisKK1NlZW1zIERORjUgaXMgZGVsZXRlZCBieSBkZWZhdWx0 LgorCitGaXhlczogaHR0cHM6Ly9naXRodWIuY29tL2lidXMvaWJ1cy9jb21taXQvZjA1YzEyZAor CitCVUc9aHR0cHM6Ly9naXRodWIuY29tL2lidXMvaWJ1cy9wdWxsLzI1NjkKKy0tLQorIGF1dG9n ZW4uc2ggICAgICAgICAgICAgICAgIHwgMiArLQorIDIgZmlsZXMgY2hhbmdlZCwgMiBpbnNlcnRp b25zKCspLCA1IGRlbGV0aW9ucygtKQorCitkaWZmIC0tZ2l0IGEvYXV0b2dlbi5zaCBiL2F1dG9n ZW4uc2gKK2luZGV4IDA1NjgyZjQ3Li5kNmY4Zjk4MyAxMDA3NTUKKy0tLSBhL2F1dG9nZW4uc2gK KysrKyBiL2F1dG9nZW4uc2gKK0BAIC00Nyw3ICs0Nyw3IEBAIGNkICIkc3JjZGlyIgorICAgICAg ICAgcnBtIC1xICRGRURPUkFfUEtHMSB8fCBleGl0IDEKKyAgICAgICAgIHJwbSAtcSAkRkVET1JB X1BLRzIgfHwgZXhpdCAxCisgICAgICAgICBycG0gLXEgJEZFRE9SQV9QS0czIHx8IGV4aXQgMQor LSAgICAgICAgKGdyZXAgLXFFICczN3wzOCcgL2V0Yy9mZWRvcmEtcmVsZWFzZSkgJiYgRE5GPWRu ZiB8fCBETkY9ZG5mNQorKyAgICAgICAgRE5GPWRuZgorICAgICAgICAgJERORiB1cGRhdGUgLS1h c3N1bWVubyAkRkVET1JBX1BLRzEgfHwgZXhpdCAxCisgICAgICAgICAkRE5GIHVwZGF0ZSAtLWFz c3VtZW5vICRGRURPUkFfUEtHMiB8fCBleGl0IDEKKyAgICAgICAgICRETkYgdXBkYXRlIC0tYXNz dW1lbm8gJEZFRE9SQV9QS0czIHx8IGV4aXQgMQorLS0gCisyLjQxLjAKKworRnJvbSBkYjgyOWY0 YWVlMzk5ZTU0NzJiZDU1ZGM2MzBhOTQ0MjVlNzJiYWNkIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAw MQorRnJvbTogZnVqaXdhcmF0IDx0YWthby5mdWppd2FyYTFAZ21haWwuY29tPgorRGF0ZTogU2F0 LCAzMCBTZXAgMjAyMyAwOTo1MTo0MyArMDkwMAogU3ViamVjdDogW1BBVENIXSBjbGllbnQvd2F5 bGFuZDogSW1wbGVtZW50IHByZWVkaXQgY29sb3IgaW4gUGxhc21hIFdheWxhbmQKIAogV2F5bGFu ZCBpbnB1dC1tZXRob2QgcHJvdG9jb2wgdmVyc2lvbiAxIHN1cHBvcnRzIHRoZSBwcmVlZGl0IHN0 eWxlCkBAIC0xOCwxMCArNDgsMTAgQEAgUmYuIGh0dHBzOi8vZ2l0aHViLmNvbS9pYnVzL2lidXMv d2lraS9XYXlsYW5kLUNvbG9ycwogQlVHPXJoYnojMjIzNzQ4NgogLS0tCiAgY2xpZW50L3dheWxh bmQvTWFrZWZpbGUuYW0gICAgICAgICAgICAgICAgICAgIHwgICAxICsKLSBjbGllbnQvd2F5bGFu ZC9pYnVzd2F5bGFuZGltLmMgICAgICAgICAgICAgICAgfCAxNzUgKysrLQorIGNsaWVudC93YXls YW5kL2lidXN3YXlsYW5kaW0uYyAgICAgICAgICAgICAgICB8IDE3NiArKystCiAgLi4uL3RleHQt aW5wdXQtdW5zdGFibGUtdjEtY2xpZW50LXByb3RvY29sLmggIHwgODQ3ICsrKysrKysrKysrKysr KysrKwogIHNyYy9pYnVzYXR0cmlidXRlLmggICAgICAgICAgICAgICAgICAgICAgICAgICB8ICA1 MiArLQotIDQgZmlsZXMgY2hhbmdlZCwgMTA3MiBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygt KQorIDQgZmlsZXMgY2hhbmdlZCwgMTA3MyBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQog IGNyZWF0ZSBtb2RlIDEwMDY0NCBjbGllbnQvd2F5bGFuZC90ZXh0LWlucHV0LXVuc3RhYmxlLXYx LWNsaWVudC1wcm90b2NvbC5oCiAKIGRpZmYgLS1naXQgYS9jbGllbnQvd2F5bGFuZC9NYWtlZmls ZS5hbSBiL2NsaWVudC93YXlsYW5kL01ha2VmaWxlLmFtCkBAIC0zNyw3ICs2Nyw3IEBAIGluZGV4 IDdlOGQxOGFmLi45NGUzNTdiNCAxMDA2NDQKICAKICBpYnVzX3dheWxhbmRfU09VUkNFUyA9IFwK IGRpZmYgLS1naXQgYS9jbGllbnQvd2F5bGFuZC9pYnVzd2F5bGFuZGltLmMgYi9jbGllbnQvd2F5 bGFuZC9pYnVzd2F5bGFuZGltLmMKLWluZGV4IGZmYzIwZGUxLi5iZjMyMWE3MSAxMDA2NDQKK2lu ZGV4IGZmYzIwZGUxLi4zNzk2NmRkNiAxMDA2NDQKIC0tLSBhL2NsaWVudC93YXlsYW5kL2lidXN3 YXlsYW5kaW0uYwogKysrIGIvY2xpZW50L3dheWxhbmQvaWJ1c3dheWxhbmRpbS5jCiBAQCAtMzIs NiArMzIsNyBAQApAQCAtNTYsNyArODYsNyBAQCBpbmRleCBmZmMyMGRlMS4uYmYzMjFhNzEgMTAw NjQ0CiAgICAgIElCdXNNb2RpZmllclR5cGUgbW9kaWZpZXJzOwogIAogICAgICBzdHJ1Y3QgeGti X2NvbnRleHQgKnhrYl9jb250ZXh0OwotQEAgLTI2NiwxMiArMjY4LDE3NSBAQCBfY29udGV4dF9m b3J3YXJkX2tleV9ldmVudF9jYiAoSUJ1c0lucHV0Q29udGV4dCAqY29udGV4dCwKK0BAIC0yNjYs MTIgKzI2OCwxNzYgQEAgX2NvbnRleHRfZm9yd2FyZF9rZXlfZXZlbnRfY2IgKElCdXNJbnB1dENv bnRleHQgKmNvbnRleHQsCiAgfQogIAogIApAQCAtMTg4LDcgKzIxOCw2IEBAIGluZGV4IGZmYzIw ZGUxLi5iZjMyMWE3MSAxMDA2NDQKICsgICAgICAgIHVpbnQzMl90IHdob2xlX3N0YXJ0ID0gMDsK ICsgICAgICAgIHVpbnQzMl90IHdob2xlX2VuZCA9IHN0cmxlbiAoc3RyKTsKICsgICAgICAgIHVp bnQzMl90IHN0YXJ0LCBlbmQ7Ci0rICAgICAgICBnYm9vbGVhbiBkcmF3biA9IEZBTFNFOwogKyAg ICAgICAgZm9yIChpID0gMDsgOyBpKyspIHsKICsgICAgICAgICAgICBJQnVzQXR0cmlidXRlICph dHRyID0gaWJ1c19hdHRyX2xpc3RfZ2V0IChhdHRycywgaSk7CiArICAgICAgICAgICAgaWYgKCFh dHRyKQpAQCAtMjAyLDE3ICsyMzEsMTkgQEAgaW5kZXggZmZjMjBkZTEuLmJmMzIxYTcxIDEwMDY0 NAogKyAgICAgICAgICAgIH0gZWxzZSBpZiAoc3RybGVuIChzdHIpID09IGVuZCkgewogKyAgICAg ICAgICAgICAgICB3aG9sZV9lbmQgPSBzdGFydDsKICsgICAgICAgICAgICB9IGVsc2UgewotKyAg ICAgICAgICAgICAgICB3aG9sZV9zdGFydCA9IHN0YXJ0OwotKyAgICAgICAgICAgICAgICB3aG9s ZV9lbmQgPSBlbmQ7Ci0rICAgICAgICAgICAgICAgIHp3cF9pbnB1dF9tZXRob2RfY29udGV4dF92 MV9wcmVlZGl0X3N0eWxpbmcgKAotKyAgICAgICAgICAgICAgICAgICAgICAgIHByaXYtPmNvbnRl eHQsCi0rICAgICAgICAgICAgICAgICAgICAgICAgd2hvbGVfc3RhcnQsCi0rICAgICAgICAgICAg ICAgICAgICAgICAgd2hvbGVfZW5kIC0gd2hvbGVfc3RhcnQsCi0rICAgICAgICAgICAgICAgICAg ICAgICAgd2hvbGVfd3N0eWxlKTsKLSsgICAgICAgICAgICAgICAgZHJhd24gPSBUUlVFOworKyAg ICAgICAgICAgICAgICB3aG9sZV9lbmQgPSBzdGFydDsKKysgICAgICAgICAgICAgICAgaWYgKHdo b2xlX3N0YXJ0IDwgd2hvbGVfZW5kKSB7CisrICAgICAgICAgICAgICAgICAgICB6d3BfaW5wdXRf bWV0aG9kX2NvbnRleHRfdjFfcHJlZWRpdF9zdHlsaW5nICgKKysgICAgICAgICAgICAgICAgICAg ICAgICAgICAgcHJpdi0+Y29udGV4dCwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgd2hv bGVfc3RhcnQsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgIHdob2xlX2VuZCAtIHdob2xl X3N0YXJ0LAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB3aG9sZV93c3R5bGUpOworKyAg ICAgICAgICAgICAgICB9CisrICAgICAgICAgICAgICAgIHdob2xlX3N0YXJ0ID0gZW5kOworKyAg ICAgICAgICAgICAgICB3aG9sZV9lbmQgPSBzdHJsZW4gKHN0cik7CiArICAgICAgICAgICAgfQog KyAgICAgICAgfQotKyAgICAgICAgaWYgKCFkcmF3bikgeworKyAgICAgICAgaWYgKHdob2xlX3N0 YXJ0IDwgd2hvbGVfZW5kKSB7CiArICAgICAgICAgICAgendwX2lucHV0X21ldGhvZF9jb250ZXh0 X3YxX3ByZWVkaXRfc3R5bGluZyAoCiArICAgICAgICAgICAgICAgIHByaXYtPmNvbnRleHQsCiAr ICAgICAgICAgICAgICAgIHdob2xlX3N0YXJ0LApAQCAtMjMyLDcgKzI2Myw3IEBAIGluZGV4IGZm YzIwZGUxLi5iZjMyMWE3MSAxMDA2NDQKICAgICAgZ19yZXR1cm5faWZfZmFpbCAoSUJVU19JU19X QVlMQU5EX0lNICh3bGltKSk7CiAgICAgIHByaXYgPSBpYnVzX3dheWxhbmRfaW1fZ2V0X2luc3Rh bmNlX3ByaXZhdGUgKHdsaW0pOwogICAgICAvKiBDVVJTT1IgaXMgYnl0ZSBvZmZzZXQuICAqLwot QEAgLTI4MiwxMCArNDQ3LDEzIEBAIF9jb250ZXh0X3Nob3dfcHJlZWRpdF90ZXh0X2NiIChJQnVz SW5wdXRDb250ZXh0ICpjb250ZXh0LAorQEAgLTI4MiwxMCArNDQ4LDEzIEBAIF9jb250ZXh0X3No b3dfcHJlZWRpdF90ZXh0X2NiIChJQnVzSW5wdXRDb250ZXh0ICpjb250ZXh0LAogIAogICAgICB6 d3BfaW5wdXRfbWV0aG9kX2NvbnRleHRfdjFfcHJlZWRpdF9jdXJzb3IgKHByaXYtPmNvbnRleHQs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3Vyc29y KTsKQEAgLTI0Nyw3ICsyNzgsNyBAQCBpbmRleCBmZmMyMGRlMS4uYmYzMjFhNzEgMTAwNjQ0CiAg fQogIAogIAotQEAgLTMwOCw2ICs0NzYsNyBAQCBfY29udGV4dF91cGRhdGVfcHJlZWRpdF90ZXh0 X2NiIChJQnVzSW5wdXRDb250ZXh0ICpjb250ZXh0LAorQEAgLTMwOCw2ICs0NzcsNyBAQCBfY29u dGV4dF91cGRhdGVfcHJlZWRpdF90ZXh0X2NiIChJQnVzSW5wdXRDb250ZXh0ICpjb250ZXh0LAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIElCdXNUZXh0ICAgICAgICAgKnRleHQs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2ludCAgICAgICAgICAgICAgY3Vy c29yX3BvcywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnYm9vbGVhbiAgICAg ICAgICB2aXNpYmxlLApAQCAtMjU1LDcgKzI4Niw3IEBAIGluZGV4IGZmYzIwZGUxLi5iZjMyMWE3 MSAxMDA2NDQKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJQnVzV2F5bGFuZElN ICAgICp3bGltKQogIHsKICAgICAgSUJ1c1dheWxhbmRJTVByaXZhdGUgKnByaXY7Ci1AQCAtMzE3 LDYgKzQ4Niw3IEBAIF9jb250ZXh0X3VwZGF0ZV9wcmVlZGl0X3RleHRfY2IgKElCdXNJbnB1dENv bnRleHQgKmNvbnRleHQsCitAQCAtMzE3LDYgKzQ4Nyw3IEBAIF9jb250ZXh0X3VwZGF0ZV9wcmVl ZGl0X3RleHRfY2IgKElCdXNJbnB1dENvbnRleHQgKmNvbnRleHQsCiAgICAgICAgICBnX29iamVj dF91bnJlZiAocHJpdi0+cHJlZWRpdF90ZXh0KTsKICAgICAgcHJpdi0+cHJlZWRpdF90ZXh0ID0g Z19vYmplY3RfcmVmX3NpbmsgKHRleHQpOwogICAgICBwcml2LT5wcmVlZGl0X2N1cnNvcl9wb3Mg PSBjdXJzb3JfcG9zOwpAQCAtMjYzLDcgKzI5NCw3IEBAIGluZGV4IGZmYzIwZGUxLi5iZjMyMWE3 MSAxMDA2NDQKICAKICAgICAgaWYgKHZpc2libGUpCiAgICAgICAgICBfY29udGV4dF9zaG93X3By ZWVkaXRfdGV4dF9jYiAoY29udGV4dCwgd2xpbSk7Ci1AQCAtOTc3LDcgKzExNDcsNyBAQCBfY3Jl YXRlX2lucHV0X2NvbnRleHRfZG9uZSAoR09iamVjdCAgICAgICpvYmplY3QsCitAQCAtOTc3LDcg KzExNDgsNyBAQCBfY3JlYXRlX2lucHV0X2NvbnRleHRfZG9uZSAoR09iamVjdCAgICAgICpvYmpl Y3QsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBHX0NBTExCQUNLIChfY29udGV4dF9mb3J3 YXJkX2tleV9ldmVudF9jYiksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICB3bGltKTsKICAK QEAgLTI3Miw3ICszMDMsNyBAQCBpbmRleCBmZmMyMGRlMS4uYmYzMjFhNzEgMTAwNjQ0CiAgICAg ICAgICAgICAgICAgICAgICAgICAgICBHX0NBTExCQUNLIChfY29udGV4dF91cGRhdGVfcHJlZWRp dF90ZXh0X2NiKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgIHdsaW0pOwogICAgICAgICAg Z19zaWduYWxfY29ubmVjdCAocHJpdi0+aWJ1c2NvbnRleHQsICJzaG93LXByZWVkaXQtdGV4dCIs Ci1AQCAtOTk0LDYgKzExNjQsNyBAQCBfY3JlYXRlX2lucHV0X2NvbnRleHRfZG9uZSAoR09iamVj dCAgICAgICpvYmplY3QsCitAQCAtOTk0LDYgKzExNjUsNyBAQCBfY3JlYXRlX2lucHV0X2NvbnRl eHRfZG9uZSAoR09iamVjdCAgICAgICpvYmplY3QsCiAgICAgICAgICAgICAgY2FwYWJpbGl0aWVz IHw9IElCVVNfQ0FQX1NZTkNfUFJPQ0VTU19LRVlfVjI7CiAgICAgICAgICBpYnVzX2lucHV0X2Nv bnRleHRfc2V0X2NhcGFiaWxpdGllcyAocHJpdi0+aWJ1c2NvbnRleHQsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2FwYWJpbGl0aWVzKTsKQEAgLTExMzQs NyArMTE2NSw3IEBAIGluZGV4IDAwMDAwMDAwLi43MTA2OWVjNwogKwogKyNlbmRpZgogZGlmZiAt LWdpdCBhL3NyYy9pYnVzYXR0cmlidXRlLmggYi9zcmMvaWJ1c2F0dHJpYnV0ZS5oCi1pbmRleCBm ZTRjYWI0NS4uNWNmYzM2ZjcgMTAwNjQ0CitpbmRleCBmZTRjYWI0NS4uMTAxOTA5MjEgMTAwNjQ0 CiAtLS0gYS9zcmMvaWJ1c2F0dHJpYnV0ZS5oCiArKysgYi9zcmMvaWJ1c2F0dHJpYnV0ZS5oCiBA QCAtMiw3ICsyLDggQEAKQEAgLTExNzcsNyArMTIwOCw3IEBAIGluZGV4IGZlNGNhYjQ1Li41Y2Zj MzZmNyAxMDA2NDQKICsgKiBASUJVU19BVFRSX1BSRUVESVRfRVJST1JfQ09NUE9TRTogQSB3cm9u ZyBjb21wb3NlIGtleSBjb3VsZCBiZSBhbiBlcnJvcgogKyAqICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBjb2xvci4gKFR5cGluZy1ib29zdGVyKQogKyAqCi0rICogVHlwZSBvZiBQ cmUtZWRpdCBzdHlsZSBhcyB0aGUgc2VtYXRpYyBuYW1lLgorKyAqIFR5cGUgb2YgUHJlLWVkaXQg c3R5bGUgYXMgdGhlIHNlbWFudGljIG5hbWUuCiArICogVGhlIFdheWxhbmQgc3BlY3MgcHJlZmVy cyB0byBleHByZXNzIHRoZSBzZW1hbnRpYyB2YWx1ZXMgcmF0aGVyIHRoYW4gUkdCCiArICogdmFs dWVzIGFuZCB0ZXh0LWlucHV0IHByb3RvY29sIHZlcnNpb24gMSBkZWZpbmVzIHNvbWUgdmFsdWVz OgogKyAqIGh0dHBzOi8vZ2l0bGFiLmZyZWVkZXNrdG9wLm9yZy93YXlsYW5kL3dheWxhbmQtcHJv dG9jb2xzLy0vYmxvYi9tYWluL3Vuc3RhYmxlL3RleHQtaW5wdXQvdGV4dC1pbnB1dC11bnN0YWJs ZS12MS54bWw/cmVmX3R5cGU9aGVhZHMjTDI1MQpAQCAtMTIwNiwzICsxMjM3LDQ2IEBAIGluZGV4 IGZlNGNhYjQ1Li41Y2ZjMzZmNyAxMDA2NDQKIC0tIAogMi40MS4wCiAKK0Zyb20gNzQzMWFjMjVi YmJiZTBkODhlZWM2YTI0MWQ3YTM1OTIxYzczYmQwMSBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEK K0Zyb206IGZ1aml3YXJhdCA8dGFrYW8uZnVqaXdhcmExQGdtYWlsLmNvbT4KK0RhdGU6IEZyaSwg MjkgU2VwIDIwMjMgMjI6NTc6MjcgKzA5MDAKK1N1YmplY3Q6IFtQQVRDSF0gY2xpZW50L3dheWxh bmQ6IFRyYW5zbGF0ZSBrZXljb2RlcyB3aXRoIENhcHNMb2NrCisKK0ZpeCBDYXBzTG9jayBhbmQg c29tZSBMYXRpbiBjaGFyYWN0ZXJzIHdpdGggZnIoYXplcnR5KSBsYXlvdXQgaW4KK1BsYXNtYSBX YXlsYW5kLgorCitCVUc9aHR0cHM6Ly9naXRodWIuY29tL2lidXMvaWJ1cy9wdWxsLzI1NjgKKy0t LQorIGNsaWVudC93YXlsYW5kL2lidXN3YXlsYW5kaW0uYyB8IDkgKy0tLS0tLS0tCisgMSBmaWxl IGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCA4IGRlbGV0aW9ucygtKQorCitkaWZmIC0tZ2l0IGEv Y2xpZW50L3dheWxhbmQvaWJ1c3dheWxhbmRpbS5jIGIvY2xpZW50L3dheWxhbmQvaWJ1c3dheWxh bmRpbS5jCitpbmRleCBmZmMyMGRlMS4uZTNhYWUzZDQgMTAwNjQ0CistLS0gYS9jbGllbnQvd2F5 bGFuZC9pYnVzd2F5bGFuZGltLmMKKysrKyBiL2NsaWVudC93YXlsYW5kL2lidXN3YXlsYW5kaW0u YworQEAgLTg0MCw4ICs4NDAsNiBAQCBpbnB1dF9tZXRob2Rfa2V5Ym9hcmRfa2V5ICh2b2lkICAg ICAgICAgICAgICAgKmRhdGEsCisgICAgIElCdXNXYXlsYW5kSU1Qcml2YXRlICpwcml2OworICAg ICBJQnVzV2F5bGFuZEtleUV2ZW50IGV2ZW50ID0geyAwLCB9OworICAgICB1aW50MzJfdCBjb2Rl OworLSAgICB1aW50MzJfdCBudW1fc3ltczsKKy0gICAgY29uc3QgeGtiX2tleXN5bV90ICpzeW1z OworIAorICAgICBnX3JldHVybl9pZl9mYWlsIChJQlVTX0lTX1dBWUxBTkRfSU0gKHdsaW0pKTsK KyAgICAgcHJpdiA9IGlidXNfd2F5bGFuZF9pbV9nZXRfaW5zdGFuY2VfcHJpdmF0ZSAod2xpbSk7 CitAQCAtODYyLDEyICs4NjAsNyBAQCBpbnB1dF9tZXRob2Rfa2V5Ym9hcmRfa2V5ICh2b2lkICAg ICAgICAgICAgICAgKmRhdGEsCisgICAgIGV2ZW50LmtleSA9IGtleTsKKyAgICAgZXZlbnQuc3Rh dGUgPSBzdGF0ZTsKKyAgICAgY29kZSA9IGtleSArIDg7CistICAgIG51bV9zeW1zID0geGtiX2tl eV9nZXRfc3ltcyAocHJpdi0+c3RhdGUsIGNvZGUsICZzeW1zKTsKKy0KKy0gICAgZXZlbnQuc3lt ID0gWEtCX0tFWV9Ob1N5bWJvbDsKKy0gICAgaWYgKG51bV9zeW1zID09IDEpCistICAgICAgICBl dmVudC5zeW0gPSBzeW1zWzBdOworLQorKyAgICBldmVudC5zeW0gPSB4a2Jfc3RhdGVfa2V5X2dl dF9vbmVfc3ltIChwcml2LT5zdGF0ZSwgY29kZSk7CisgICAgIGV2ZW50Lm1vZGlmaWVycyA9IHBy aXYtPm1vZGlmaWVyczsKKyAgICAgaWYgKHN0YXRlID09IFdMX0tFWUJPQVJEX0tFWV9TVEFURV9S RUxFQVNFRCkKKyAgICAgICAgIGV2ZW50Lm1vZGlmaWVycyB8PSBJQlVTX1JFTEVBU0VfTUFTSzsK Ky0tIAorMi40MS4wCisKCmRpZmYgLS1naXQgYS9pYnVzLnNwZWMgYi9pYnVzLnNwZWMKaW5kZXgg NmRlOGQ4NC4uYTE3OWU2NyAxMDA2NDQKLS0tIGEvaWJ1cy5zcGVjCisrKyBiL2lidXMuc3BlYwpA QCAtNTgsNyArNTgsNyBAQAogCiBOYW1lOiAgICAgICAgICAgaWJ1cwogVmVyc2lvbjogICAgICAg IDEuNS4yOX5yYzEKLVJlbGVhc2U6ICAgICAgICAzJXs/ZGlzdH0KK1JlbGVhc2U6ICAgICAgICA0 JXs/ZGlzdH0KIFN1bW1hcnk6ICAgICAgICBJbnRlbGxpZ2VudCBJbnB1dCBCdXMgZm9yIExpbnV4 IE9TCiBMaWNlbnNlOiAgICAgICAgTEdQTC0yLjEtb3ItbGF0ZXIKIFVSTDogICAgICAgICAgICBo dHRwczovL2dpdGh1Yi5jb20vaWJ1cy8lbmFtZS93aWtpCkBAIC01NzksNiArNTc5LDEyIEBAIGRj b25mIHVwZGF0ZSB8fCA6CiAle19kYXRhZGlyfS9pbnN0YWxsZWQtdGVzdHMvaWJ1cwogCiAlY2hh bmdlbG9nCisqIFNhdCBTZXAgMzAgMjAyMyBUYWthbyBGdWppd2FyYSA8dGZ1aml3YXJAcmVkaGF0 LmNvbT4gLSAxLjUuMjl+cmMxLTMKKy0gRW5oYW5jZSAjMjIzNzQ4NiBJbXBsZW1lbnQgcHJlZWRp dCBjb2xvciBpbiBQbGFzbWEgV2F5bGFuZAorLSBQYXJ0LW9mICMyMjQwNDkwIEVhY3V0ZSB3aXRo IENhcHNMb2NrIGluIFBsYXNtYSBXYXlsYW5kIG9ubHkKKy0gUmV2ZXJ0IGRuZjUgdG8gZG5mIGlu IGF1dG9nZW4KKy0gVGVzdCBmaXggIzIyMzk2MzMgZ19saXN0X3JlbW92ZSgpIGluIGlidXMtcG9y dGFsIFNJR1NFR1YKKwogKiBUaHUgU2VwIDA3IDIwMjMgVGFrYW8gRnVqaXdhcmEgPHRmdWppd2Fy QHJlZGhhdC5jb20+IC0gMS41LjI5fnJjMS0zCiAtIFJlc29sdmVzICMyMjM3NDg2IEltcGxlbWVu dCBwcmVlZGl0IGNvbG9yIGluIFBsYXNtYSBXYXlsYW5kCiAK