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 Bug 1380675 - Emoji leaves the candidates of @laugh when @laughing Date: Sun, 31 May 2026 02:06:27 GMT Message-ID: <178019318735.1.4497617594871274177.rpms-ibus-bea250b789d0@fedoraproject.org> List-ID: X-Git-Repo: rpms/ibus X-Git-Branch: autotool X-Git-Rev: bea250b789d0bcde0a710d3cf355365201010910 ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvaWJ1cwogICAgICAgICAgICBCcmFuY2ggOiBhdXRvdG9vbAogICAgICAgICAg ICBDb21taXQgOiBiZWEyNTBiNzg5ZDBiY2RlMGE3MTBkM2NmMzU1MzY1MjAxMDEwOTEwCiAgICAg ICAgICAgIEF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgogICAg ICAgICAgICBEYXRlICAgOiAyMDE2LTEwLTA2VDE2OjI2OjI2KzA5OjAwCiAgICAgICAgICAgIFN0 YXRzICA6ICsyODcvLTEgaW4gMiBmaWxlKHMpCiAgICAgICAgICAgIFVSTCAgICA6IGh0dHBzOi8v c3JjLmZlZG9yYXByb2plY3Qub3JnL3JwbXMvaWJ1cy9jL2JlYTI1MGI3ODlkMGJjZGUwYTcxMGQz Y2YzNTUzNjUyMDEwMTA5MTA/YnJhbmNoPWF1dG90b29sCgogICAgICAgICAgICBMb2c6CiAgICAg ICAgICAgIC0gRml4ZWQgQnVnIDEzODA2NzUgLSBFbW9qaSBsZWF2ZXMgdGhlIGNhbmRpZGF0ZXMg b2YgQGxhdWdoIHdoZW4gQGxhdWdoaW5nCi0gRml4ZWQgQnVnIDEzODA2OTAgLSBVc2VyIGlzIG5v dCBhYmxlIHRvIHNlbGVjdCBlbW9qaXMgZnJvbSBkaWdpdCBrZXlzCi0gRml4ZWQgQnVnIDEzODA2 OTEgLSBQYWdlVXAgUGFnZURvd24gYnV0dG9ucyBvbiBlbW9qaSBsb29rdXAgbm90IHdvcmtpbmcK Ci0tLQpkaWZmIC0tZ2l0IGEvaWJ1cy1IRUFELnBhdGNoIGIvaWJ1cy1IRUFELnBhdGNoCmluZGV4 IGVkMGRhZmEuLmQwOGIyMTggMTAwNjQ0Ci0tLSBhL2lidXMtSEVBRC5wYXRjaAorKysgYi9pYnVz LUhFQUQucGF0Y2gKQEAgLTExMSwzICsxMTEsMjg0IEBAIGluZGV4IDZkNWZkODEuLmVhOTYwYjgg MTAwNjQ0CiAtLSAKIDIuNy40CiAKK0Zyb20gZTc5NWVkYTFhM2IwNTRlNmZkYzkyMWJmZTA0Yzgz NzMzNzYxOTA1ZiBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206IGZ1aml3YXJhdCA8dGFr YW8uZnVqaXdhcmExQGdtYWlsLmNvbT4KK0RhdGU6IFRodSwgNiBPY3QgMjAxNiAxNToyODoyNCAr MDkwMAorU3ViamVjdDogW1BBVENIIDEvM10gc3JjOiBIaWRlIGxvb2t1cCB0YWJsZSBpZiBlbW9q aSBhbm5vdGF0aW9uIGRvZXMgbm90IGhpdAorCitJZiBlbW9qaSBhbm5vdGF0aW9uIGhpdHMgImFh YSIgYnV0IG5vdCAiYWFhYiIsIGhpZGUgdGhlIGxvb2t1cAord2luZG93IHdpdGggImFhYWIiLgor QWxzbyBoaWRlIHRoZSBsb29rdXAgd2luZG93IHdpdGggRXNjYXBlIGtleS4KKworQlVHPXJoYnoj MTM4MDY3NQorCitSZXZpZXcgVVJMOiBodHRwczovL2NvZGVyZXZpZXcuYXBwc3BvdC5jb20vMzA3 NDAwMDQzCistLS0KKyBzcmMvaWJ1c2VuZ2luZXNpbXBsZS5jIHwgMTQgKysrKysrKysrKysrLS0K KyAxIGZpbGUgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKKworZGlm ZiAtLWdpdCBhL3NyYy9pYnVzZW5naW5lc2ltcGxlLmMgYi9zcmMvaWJ1c2VuZ2luZXNpbXBsZS5j CitpbmRleCA4ZWZlNWE5Li5iMjJiMDZmIDEwMDY0NAorLS0tIGEvc3JjL2lidXNlbmdpbmVzaW1w bGUuYworKysrIGIvc3JjL2lidXNlbmdpbmVzaW1wbGUuYworQEAgLTEwMTgsNiArMTAxOCwxMCBA QCBpYnVzX2VuZ2luZV9zaW1wbGVfcHJvY2Vzc19rZXlfZXZlbnQgKElCdXNFbmdpbmUgKmVuZ2lu ZSwKKyAgICAgICAgIH0KKyAgICAgICAgIGVsc2UgaWYgKGlzX2VzY2FwZSkgeworICAgICAgICAg ICAgIGlidXNfZW5naW5lX3NpbXBsZV9yZXNldCAoZW5naW5lKTsKKysgICAgICAgICAgICBpZiAo cHJpdi0+bG9va3VwX3RhYmxlICE9IE5VTEwgJiYgcHJpdi0+bG9va3VwX3RhYmxlX3Zpc2libGUp IHsKKysgICAgICAgICAgICAgICAgcHJpdi0+bG9va3VwX3RhYmxlX3Zpc2libGUgPSBGQUxTRTsK KysgICAgICAgICAgICAgICAgaWJ1c19lbmdpbmVfc2ltcGxlX3VwZGF0ZV9sb29rdXBfYW5kX2F1 eF90YWJsZSAoc2ltcGxlKTsKKysgICAgICAgICAgICB9CisgICAgICAgICAgICAgcmV0dXJuIFRS VUU7CisgICAgICAgICB9CisgCitAQCAtMTE2NSw2ICsxMTY5LDEwIEBAIGlidXNfZW5naW5lX3Np bXBsZV9wcm9jZXNzX2tleV9ldmVudCAoSUJ1c0VuZ2luZSAqZW5naW5lLAorICAgICAgICAgfQor ICAgICAgICAgZWxzZSBpZiAoaXNfZXNjYXBlKSB7CisgICAgICAgICAgICAgaWJ1c19lbmdpbmVf c2ltcGxlX3Jlc2V0IChlbmdpbmUpOworKyAgICAgICAgICAgIGlmIChwcml2LT5sb29rdXBfdGFi bGUgIT0gTlVMTCAmJiBwcml2LT5sb29rdXBfdGFibGVfdmlzaWJsZSkgeworKyAgICAgICAgICAg ICAgICBwcml2LT5sb29rdXBfdGFibGVfdmlzaWJsZSA9IEZBTFNFOworKyAgICAgICAgICAgICAg ICBpYnVzX2VuZ2luZV9zaW1wbGVfdXBkYXRlX2xvb2t1cF9hbmRfYXV4X3RhYmxlIChzaW1wbGUp OworKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgICByZXR1cm4gVFJVRTsKKyAgICAgICAgIH0K KyAgICAgfSBlbHNlIHsKK0BAIC0xMjQzLDggKzEyNTEsMTAgQEAgaWJ1c19lbmdpbmVfc2ltcGxl X3Byb2Nlc3Nfa2V5X2V2ZW50IChJQnVzRW5naW5lICplbmdpbmUsCisgICAgICAgICAgICAgICAg ICAgICAgICAgcHJpdi0+bG9va3VwX3RhYmxlX3Zpc2libGUgPSBGQUxTRTsKKyAgICAgICAgICAg ICAgICAgICAgICAgICB1cGRhdGVfbG9va3VwX3RhYmxlID0gVFJVRTsKKyAgICAgICAgICAgICAg ICAgICAgIH0KKy0gICAgICAgICAgICAgICAgfQorLSAgICAgICAgICAgICAgICBlbHNlIGlmIChj aGVja19lbW9qaV90YWJsZSAoc2ltcGxlLCBuX2NvbXBvc2UsIC0xKSkgeworKyAgICAgICAgICAg ICAgICB9IGVsc2UgaWYgKGNoZWNrX2Vtb2ppX3RhYmxlIChzaW1wbGUsIG5fY29tcG9zZSwgLTEp KSB7CisrICAgICAgICAgICAgICAgICAgICB1cGRhdGVfbG9va3VwX3RhYmxlID0gVFJVRTsKKysg ICAgICAgICAgICAgICAgfSBlbHNlIHsKKysgICAgICAgICAgICAgICAgICAgIHByaXYtPmxvb2t1 cF90YWJsZV92aXNpYmxlID0gRkFMU0U7CisgICAgICAgICAgICAgICAgICAgICB1cGRhdGVfbG9v a3VwX3RhYmxlID0gVFJVRTsKKyAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgIH0KKy0t IAorMi43LjQKKworRnJvbSA0ZDg2ZTU5ZDAyNDVkZjZkM2E2YWExYTMyY2RmNzcwMmI2ZGM3ZjBk IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTogZnVqaXdhcmF0IDx0YWthby5mdWppd2Fy YTFAZ21haWwuY29tPgorRGF0ZTogVGh1LCA2IE9jdCAyMDE2IDE1OjM1OjAzICswOTAwCitTdWJq ZWN0OiBbUEFUQ0ggMi8zXSBzcmM6IEVuYWJsZSB0byB0eXBlIGRpZ2l0IHRvIGNvbW1pdCBlbW9q aSBvbiBsb29rdXAKKyB3aW5kb3cKKworRW5hYmxlcyB0byBjb21taXQgYW4gZW1vamkgb24gdGhl IGxvb2t1cCB3aW5kb3cgYnkgYSBkaWdpdCBrZXkuCitCZWZvcmUgdGhpcyBwYXRjaCwgQ3RybC1T aGlmdC1VLCAiMTEiIHNob3dzIGVtb2ppcyBvZiAxMSBjbG9jay4KK0FmdGVyIHRoaXMgcGF0Y2gs IEN0cmwtU2hpZnQtVSwgIjExIiBjb21taXRzIGFuIGVtb2ppIG9mIDEgY2xvY2suCitQcm9iYWJs eSBDdHJsLVNoaWZ0LVUsICJjbG9jayIgY2FuIGJlIGEgd29ya2Fyb3VuZC4KKworQlVHPXJoYnoj MTM4MDY5MAorUj1TaGF3bi5QLkh1YW5nQGdtYWlsLmNvbQorCitSZXZpZXcgVVJMOiBodHRwczov L2NvZGVyZXZpZXcuYXBwc3BvdC5jb20vMzA5NjQwMDQzCistLS0KKyBzcmMvaWJ1c2VuZ2luZXNp bXBsZS5jIHwgODAgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrLS0KKyAxIGZpbGUgY2hhbmdlZCwgNzggaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkK KworZGlmZiAtLWdpdCBhL3NyYy9pYnVzZW5naW5lc2ltcGxlLmMgYi9zcmMvaWJ1c2VuZ2luZXNp bXBsZS5jCitpbmRleCBiMjJiMDZmLi4yM2UxYzlkIDEwMDY0NAorLS0tIGEvc3JjL2lidXNlbmdp bmVzaW1wbGUuYworKysrIGIvc3JjL2lidXNlbmdpbmVzaW1wbGUuYworQEAgLTkwMSw2ICs5MDEs NjYgQEAgaWJ1c19lbmdpbmVfc2ltcGxlX3VwZGF0ZV9sb29rdXBfYW5kX2F1eF90YWJsZSAoSUJ1 c0VuZ2luZVNpbXBsZSAqc2ltcGxlKQorIH0KKyAKKyBzdGF0aWMgZ2Jvb2xlYW4KKytpYnVzX2Vu Z2luZV9zaW1wbGVfaWZfaW5fcmFuZ2Vfb2ZfbG9va3VwX3RhYmxlIChJQnVzRW5naW5lU2ltcGxl ICpzaW1wbGUsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZ3VpbnQgICAgICAgICAgICAga2V5dmFsKQorK3sKKysgICAgSUJ1c0VuZ2luZVNpbXBsZVBy aXZhdGUgKnByaXY7CisrICAgIGludCBpbmRleCwgY2FuZGlkYXRlcywgY3Vyc29yX3BvcywgY3Vy c29yX2luX3BhZ2UsIHBhZ2Vfc2l6ZTsKKysKKysgICAgcHJpdiA9IHNpbXBsZS0+cHJpdjsKKysK KysgICAgaWYgKHByaXYtPmxvb2t1cF90YWJsZSA9PSBOVUxMIHx8ICFwcml2LT5sb29rdXBfdGFi bGVfdmlzaWJsZSkKKysgICAgICAgIHJldHVybiBGQUxTRTsKKysgICAgaWYgKGtleXZhbCA8IElC VVNfS0VZXzAgfHwga2V5dmFsID4gSUJVU19LRVlfOSkKKysgICAgICAgIHJldHVybiBGQUxTRTsK KysgICAgaWYgKGtleXZhbCA9PSBJQlVTX0tFWV8wKQorKyAgICAgICAga2V5dmFsID0gSUJVU19L RVlfOSArIDE7CisrICAgIGluZGV4ID0ga2V5dmFsIC0gSUJVU19LRVlfMTsKKysgICAgY2FuZGlk YXRlcyA9CisrICAgICAgICAgICAgaWJ1c19sb29rdXBfdGFibGVfZ2V0X251bWJlcl9vZl9jYW5k aWRhdGVzIChwcml2LT5sb29rdXBfdGFibGUpOworKyAgICBjdXJzb3JfcG9zID0gaWJ1c19sb29r dXBfdGFibGVfZ2V0X2N1cnNvcl9wb3MgKHByaXYtPmxvb2t1cF90YWJsZSk7CisrICAgIGN1cnNv cl9pbl9wYWdlID0gaWJ1c19sb29rdXBfdGFibGVfZ2V0X2N1cnNvcl9pbl9wYWdlIChwcml2LT5s b29rdXBfdGFibGUpOworKyAgICBwYWdlX3NpemUgPSBpYnVzX2xvb2t1cF90YWJsZV9nZXRfcGFn ZV9zaXplIChwcml2LT5sb29rdXBfdGFibGUpOworKyAgICBpZiAoaW5kZXggPiAoKGNhbmRpZGF0 ZXMgLSAoY3Vyc29yX3BvcyAtIGN1cnNvcl9pbl9wYWdlKSkgJSBwYWdlX3NpemUpKQorKyAgICAg ICAgcmV0dXJuIEZBTFNFOworKyAgICByZXR1cm4gVFJVRTsKKyt9CisrCisrc3RhdGljIHZvaWQK KytpYnVzX2VuZ2luZV9zaW1wbGVfc2V0X251bWJlcl9vbl9sb29rdXBfdGFibGUgKElCdXNFbmdp bmVTaW1wbGUgKnNpbXBsZSwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGd1aW50ICAgICAgICAgICAgIGtleXZhbCwKKysgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCAgICAgICAgICAgICAgIG5fY29tcG9zZSkK Kyt7CisrICAgIElCdXNFbmdpbmVTaW1wbGVQcml2YXRlICpwcml2OworKyAgICBpbnQgaW5kZXgs IGN1cnNvcl9wb3MsIGN1cnNvcl9pbl9wYWdlLCByZWFsX2luZGV4OworKworKyAgICBwcml2ID0g c2ltcGxlLT5wcml2OworKworKyAgICBpZiAoa2V5dmFsID09IElCVVNfS0VZXzApCisrICAgICAg ICBrZXl2YWwgPSBJQlVTX0tFWV85ICsgMTsKKysgICAgaW5kZXggPSBrZXl2YWwgLSBJQlVTX0tF WV8xOworKyAgICBjdXJzb3JfcG9zID0gaWJ1c19sb29rdXBfdGFibGVfZ2V0X2N1cnNvcl9wb3Mg KHByaXYtPmxvb2t1cF90YWJsZSk7CisrICAgIGN1cnNvcl9pbl9wYWdlID0gaWJ1c19sb29rdXBf dGFibGVfZ2V0X2N1cnNvcl9pbl9wYWdlIChwcml2LT5sb29rdXBfdGFibGUpOworKyAgICByZWFs X2luZGV4ID0gY3Vyc29yX3BvcyAtIGN1cnNvcl9pbl9wYWdlICsgaW5kZXg7CisrCisrICAgIGli dXNfbG9va3VwX3RhYmxlX3NldF9jdXJzb3JfcG9zIChwcml2LT5sb29rdXBfdGFibGUsIHJlYWxf aW5kZXgpOworKyAgICBjaGVja19lbW9qaV90YWJsZSAoc2ltcGxlLCBuX2NvbXBvc2UsIHJlYWxf aW5kZXgpOworKyAgICBwcml2LT5sb29rdXBfdGFibGVfdmlzaWJsZSA9IEZBTFNFOworKyAgICBp YnVzX2VuZ2luZV9zaW1wbGVfdXBkYXRlX2xvb2t1cF9hbmRfYXV4X3RhYmxlIChzaW1wbGUpOwor KworKyAgICBpZiAocHJpdi0+dGVudGF0aXZlX2Vtb2ppICYmICpwcml2LT50ZW50YXRpdmVfZW1v amkpIHsKKysgICAgICAgIGlidXNfZW5naW5lX3NpbXBsZV9jb21taXRfc3RyIChzaW1wbGUsIHBy aXYtPnRlbnRhdGl2ZV9lbW9qaSk7CisrICAgICAgICBwcml2LT5jb21wb3NlX2J1ZmZlclswXSA9 IDA7CisrICAgIH0gZWxzZSB7CisrICAgICAgICBnX2NsZWFyX3BvaW50ZXIgKCZwcml2LT50ZW50 YXRpdmVfZW1vamksIGdfZnJlZSk7CisrICAgICAgICBwcml2LT5pbl9lbW9qaV9zZXF1ZW5jZSA9 IEZBTFNFOworKyAgICAgICAgcHJpdi0+Y29tcG9zZV9idWZmZXJbMF0gPSAwOworKyAgICB9Cisr CisrICAgIGlidXNfZW5naW5lX3NpbXBsZV91cGRhdGVfcHJlZWRpdF90ZXh0IChzaW1wbGUpOwor K30KKysKKytzdGF0aWMgZ2Jvb2xlYW4KKyBpYnVzX2VuZ2luZV9zaW1wbGVfcHJvY2Vzc19rZXlf ZXZlbnQgKElCdXNFbmdpbmUgKmVuZ2luZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGd1aW50ICAgICAgIGtleXZhbCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGd1aW50ICAgICAgIGtleWNvZGUsCitAQCAtMTE2Miw3ICsxMjIyLDE1IEBA IGlidXNfZW5naW5lX3NpbXBsZV9wcm9jZXNzX2tleV9ldmVudCAoSUJ1c0VuZ2luZSAqZW5naW5l LAorICAgICAgICAgfQorICAgICB9IGVsc2UgaWYgKHByaXYtPmluX2Vtb2ppX3NlcXVlbmNlKSB7 CisgICAgICAgICBpZiAocHJpbnRhYmxlX2tleXZhbCkgeworLSAgICAgICAgICAgIHByaXYtPmNv bXBvc2VfYnVmZmVyW25fY29tcG9zZSsrXSA9IHByaW50YWJsZV9rZXl2YWw7CisrICAgICAgICAg ICAgaWYgKCFpYnVzX2VuZ2luZV9zaW1wbGVfaWZfaW5fcmFuZ2Vfb2ZfbG9va3VwX3RhYmxlIChz aW1wbGUsCisrICAgICAgICAgICAgICAgICAgICAgICAgcHJpbnRhYmxlX2tleXZhbCkpIHsKKysg ICAgICAgICAgICAgICAgLyogZGlnaXQga2V5dmFsIGNhbiBiZSBhbiBpbmRleCBvbiB0aGUgY3Vy cmVudCBsb29rdXAgdGFibGUKKysgICAgICAgICAgICAgICAgICogYnV0IGl0IGFsc28gY2FuIGJl IGEgcGFydCBvZiBhbiBlbW9qaSBhbm5vdGF0aW9uLgorKyAgICAgICAgICAgICAgICAgKiBFLmcu ICIxIiBhbmQgIjIiIGFyZSAgaW5kZXhlcyBvZiBlbW9qaSAiMSIuCisrICAgICAgICAgICAgICAg ICAqICIxMDAiIGlzIGFuIGFubm90YXRpb24gb2YgdGhlIGVtb2ppICIxMDAiLgorKyAgICAgICAg ICAgICAgICAgKi8KKysgICAgICAgICAgICAgICAgcHJpdi0+Y29tcG9zZV9idWZmZXJbbl9jb21w b3NlKytdID0gcHJpbnRhYmxlX2tleXZhbDsKKysgICAgICAgICAgICB9CisgICAgICAgICB9Cisg ICAgICAgICBlbHNlIGlmIChpc19zcGFjZSAmJiAobW9kaWZpZXJzICYgSUJVU19TSElGVF9NQVNL KSkgeworICAgICAgICAgICAgIHByaXYtPmNvbXBvc2VfYnVmZmVyW25fY29tcG9zZSsrXSA9IElC VVNfS0VZX3NwYWNlOworQEAgLTEyNDMsNyArMTMxMSwxNSBAQCBpYnVzX2VuZ2luZV9zaW1wbGVf cHJvY2Vzc19rZXlfZXZlbnQgKElCdXNFbmdpbmUgKmVuZ2luZSwKKyAgICAgICAgICAgICB9Cisg CisgICAgICAgICAgICAgaWYgKCF1cGRhdGVfbG9va3VwX3RhYmxlKSB7CistICAgICAgICAgICAg ICAgIGlmIChpc19oZXhfZW5kICYmICFpc19zcGFjZSkgeworKyAgICAgICAgICAgICAgICBpZiAo aWJ1c19lbmdpbmVfc2ltcGxlX2lmX2luX3JhbmdlX29mX2xvb2t1cF90YWJsZSAoc2ltcGxlLAor KyAgICAgICAgICAgICAgICAgICAgICAgICAgICBrZXl2YWwpKSB7CisrICAgICAgICAgICAgICAg ICAgICAgICAgaWJ1c19lbmdpbmVfc2ltcGxlX3NldF9udW1iZXJfb25fbG9va3VwX3RhYmxlICgK KysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNpbXBsZSwKKysgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGtleXZhbCwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIG5fY29tcG9zZSk7CisrICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFRSVUU7Cisr ICAgICAgICAgICAgICAgIH0KKysgICAgICAgICAgICAgICAgZWxzZSBpZiAoaXNfaGV4X2VuZCAm JiAhaXNfc3BhY2UpIHsKKyAgICAgICAgICAgICAgICAgICAgIGlmIChwcml2LT5sb29rdXBfdGFi bGUpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgaW5kZXggPSAoaW50KSBpYnVzX2xv b2t1cF90YWJsZV9nZXRfY3Vyc29yX3BvcyAoCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBwcml2LT5sb29rdXBfdGFibGUpOworLS0gCisyLjcuNAorCitGcm9tIGZhZjVlM2M1NmQ3 NDZkMmYxNzE2MThkNTUyY2ZmOTE0OWJiMWQ5NTIgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitG cm9tOiBmdWppd2FyYXQgPHRha2FvLmZ1aml3YXJhMUBnbWFpbC5jb20+CitEYXRlOiBUaHUsIDYg T2N0IDIwMTYgMTU6Mzc6MjUgKzA5MDAKK1N1YmplY3Q6IFtQQVRDSCAzLzNdIHNyYzogRW5hYmxl IFBhZ2VVcCwgUGFnZURvd24sIENhbmRpZGF0ZUNsaWNrIGJ1dHRvbnMgd2l0aAorIGVtb2ppIGxv b2t1cAorCitCVUc9cmhieiMxMzgwNjkxCisKK1JldmlldyBVUkw6IGh0dHBzOi8vY29kZXJldmll dy5hcHBzcG90LmNvbS8zMTI3NjAwNDMKKy0tLQorIHNyYy9pYnVzZW5naW5lc2ltcGxlLmMgfCA1 NSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKworIDEg ZmlsZSBjaGFuZ2VkLCA1NSBpbnNlcnRpb25zKCspCisKK2RpZmYgLS1naXQgYS9zcmMvaWJ1c2Vu Z2luZXNpbXBsZS5jIGIvc3JjL2lidXNlbmdpbmVzaW1wbGUuYworaW5kZXggMjNlMWM5ZC4uNjVj MzNhMCAxMDA2NDQKKy0tLSBhL3NyYy9pYnVzZW5naW5lc2ltcGxlLmMKKysrKyBiL3NyYy9pYnVz ZW5naW5lc2ltcGxlLmMKK0BAIC0xMDcsNiArMTA3LDEzIEBAIHN0YXRpYyBnYm9vbGVhbiBpYnVz X2VuZ2luZV9zaW1wbGVfcHJvY2Vzc19rZXlfZXZlbnQKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZ3VpbnQgICAgICAgICAgICAgICBrZXl2YWwsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGd1aW50ICAg ICAgICAgICAgICAga2V5Y29kZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZ3VpbnQgICAgICAgICAgICAgICBtb2RpZmllcnMpOworK3N0YXRpYyB2 b2lkICAgICBpYnVzX2VuZ2luZV9zaW1wbGVfcGFnZV9kb3duICAgKElCdXNFbmdpbmUgICAgICAg ICAgKmVuZ2luZSk7Cisrc3RhdGljIHZvaWQgICAgIGlidXNfZW5naW5lX3NpbXBsZV9wYWdlX3Vw ICAgICAoSUJ1c0VuZ2luZSAgICAgICAgICAqZW5naW5lKTsKKytzdGF0aWMgdm9pZCAgICAgaWJ1 c19lbmdpbmVfc2ltcGxlX2NhbmRpZGF0ZV9jbGlja2VkCisrICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAoSUJ1c0VuZ2luZSAgICAgICAgICAqZW5naW5lLAor KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGd1aW50ICAg ICAgICAgICAgICAgIGluZGV4LAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGd1aW50ICAgICAgICAgICAgICAgIGJ1dHRvbiwKKysgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBndWludCAgICAgICAgICAgICAgICBz dGF0ZSk7Cisgc3RhdGljIHZvaWQgICAgIGlidXNfZW5naW5lX3NpbXBsZV9jb21taXRfY2hhciAo SUJ1c0VuZ2luZVNpbXBsZSAgICAqc2ltcGxlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGd1bmljaGFyICAgICAgICAgICAgIGNoKTsKKyBzdGF0aWMg dm9pZCAgICAgaWJ1c19lbmdpbmVfc2ltcGxlX2NvbW1pdF9zdHIgIChJQnVzRW5naW5lU2ltcGxl ICAgICpzaW1wbGUsCitAQCAtMTI4LDYgKzEzNSwxMCBAQCBpYnVzX2VuZ2luZV9zaW1wbGVfY2xh c3NfaW5pdCAoSUJ1c0VuZ2luZVNpbXBsZUNsYXNzICpjbGFzcykKKyAgICAgZW5naW5lX2NsYXNz LT5yZXNldCAgICAgPSBpYnVzX2VuZ2luZV9zaW1wbGVfcmVzZXQ7CisgICAgIGVuZ2luZV9jbGFz cy0+cHJvY2Vzc19rZXlfZXZlbnQKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPSBpYnVz X2VuZ2luZV9zaW1wbGVfcHJvY2Vzc19rZXlfZXZlbnQ7CisrICAgIGVuZ2luZV9jbGFzcy0+cGFn ZV9kb3duID0gaWJ1c19lbmdpbmVfc2ltcGxlX3BhZ2VfZG93bjsKKysgICAgZW5naW5lX2NsYXNz LT5wYWdlX3VwICAgPSBpYnVzX2VuZ2luZV9zaW1wbGVfcGFnZV91cDsKKysgICAgZW5naW5lX2Ns YXNzLT5jYW5kaWRhdGVfY2xpY2tlZAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICA9IGli dXNfZW5naW5lX3NpbXBsZV9jYW5kaWRhdGVfY2xpY2tlZDsKKyAKKyAgICAgZ190eXBlX2NsYXNz X2FkZF9wcml2YXRlIChjbGFzcywgc2l6ZW9mIChJQnVzRW5naW5lU2ltcGxlUHJpdmF0ZSkpOwor IH0KK0BAIC0xMzk1LDYgKzE0MDYsNTAgQEAgaWJ1c19lbmdpbmVfc2ltcGxlX3Byb2Nlc3Nfa2V5 X2V2ZW50IChJQnVzRW5naW5lICplbmdpbmUsCisgICAgIHJldHVybiBub19zZXF1ZW5jZV9tYXRj aGVzIChzaW1wbGUsIG5fY29tcG9zZSwga2V5dmFsLCBrZXljb2RlLCBtb2RpZmllcnMpOworIH0K KyAKKytzdGF0aWMgdm9pZAorK2lidXNfZW5naW5lX3NpbXBsZV9wYWdlX2Rvd24gKElCdXNFbmdp bmUgKmVuZ2luZSkKKyt7CisrICAgIElCdXNFbmdpbmVTaW1wbGUgKnNpbXBsZSA9IChJQnVzRW5n aW5lU2ltcGxlICopZW5naW5lOworKyAgICBJQnVzRW5naW5lU2ltcGxlUHJpdmF0ZSAqcHJpdiA9 IHNpbXBsZS0+cHJpdjsKKysgICAgaWYgKHByaXYtPmxvb2t1cF90YWJsZSA9PSBOVUxMKQorKyAg ICAgICAgcmV0dXJuOworKyAgICBpYnVzX2xvb2t1cF90YWJsZV9wYWdlX2Rvd24gKHByaXYtPmxv b2t1cF90YWJsZSk7CisrICAgIGlidXNfZW5naW5lX3NpbXBsZV91cGRhdGVfbG9va3VwX2FuZF9h dXhfdGFibGUgKHNpbXBsZSk7CisrfQorKworK3N0YXRpYyB2b2lkCisraWJ1c19lbmdpbmVfc2lt cGxlX3BhZ2VfdXAgKElCdXNFbmdpbmUgKmVuZ2luZSkKKyt7CisrICAgIElCdXNFbmdpbmVTaW1w bGUgKnNpbXBsZSA9IChJQnVzRW5naW5lU2ltcGxlICopZW5naW5lOworKyAgICBJQnVzRW5naW5l U2ltcGxlUHJpdmF0ZSAqcHJpdiA9IHNpbXBsZS0+cHJpdjsKKysgICAgaWYgKHByaXYtPmxvb2t1 cF90YWJsZSA9PSBOVUxMKQorKyAgICAgICAgcmV0dXJuOworKyAgICBpYnVzX2xvb2t1cF90YWJs ZV9wYWdlX3VwIChwcml2LT5sb29rdXBfdGFibGUpOworKyAgICBpYnVzX2VuZ2luZV9zaW1wbGVf dXBkYXRlX2xvb2t1cF9hbmRfYXV4X3RhYmxlIChzaW1wbGUpOworK30KKysKKytzdGF0aWMgdm9p ZAorK2lidXNfZW5naW5lX3NpbXBsZV9jYW5kaWRhdGVfY2xpY2tlZCAoSUJ1c0VuZ2luZSAqZW5n aW5lLAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ3VpbnQgICAgICAg aW5kZXgsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBndWludCAgICAg ICBidXR0b24sCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBndWludCAg ICAgICBzdGF0ZSkKKyt7CisrICAgIElCdXNFbmdpbmVTaW1wbGUgKnNpbXBsZSA9IChJQnVzRW5n aW5lU2ltcGxlICopZW5naW5lOworKyAgICBJQnVzRW5naW5lU2ltcGxlUHJpdmF0ZSAqcHJpdiA9 IHNpbXBsZS0+cHJpdjsKKysgICAgZ3VpbnQga2V5dmFsOworKyAgICBnaW50IG5fY29tcG9zZSA9 IDA7CisrCisrICAgIGlmIChwcml2LT5sb29rdXBfdGFibGUgPT0gTlVMTCB8fCAhcHJpdi0+bG9v a3VwX3RhYmxlX3Zpc2libGUpCisrICAgICAgICByZXR1cm47CisrICAgIGlmIChpbmRleCA9PSA5 KQorKyAgICAgICAga2V5dmFsID0gSUJVU19LRVlfMDsKKysgICAgZWxzZQorKyAgICAgICAga2V5 dmFsID0gSUJVU19LRVlfMSArIGluZGV4OworKyAgICB3aGlsZSAocHJpdi0+Y29tcG9zZV9idWZm ZXJbbl9jb21wb3NlXSAhPSAwKQorKyAgICAgICAgbl9jb21wb3NlKys7CisrICAgIGlidXNfZW5n aW5lX3NpbXBsZV9zZXRfbnVtYmVyX29uX2xvb2t1cF90YWJsZSAoc2ltcGxlLCBrZXl2YWwsIG5f Y29tcG9zZSk7CisrfQorKworIHZvaWQKKyBpYnVzX2VuZ2luZV9zaW1wbGVfYWRkX3RhYmxlIChJ QnVzRW5naW5lU2ltcGxlICpzaW1wbGUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3QgZ3VpbnQxNiAgICAqZGF0YSwKKy0tIAorMi43LjQKKwoKZGlmZiAtLWdpdCBhL2lidXMu c3BlYyBiL2lidXMuc3BlYwppbmRleCBjZjg1ZmQ0Li5kM2JkMTliIDEwMDY0NAotLS0gYS9pYnVz LnNwZWMKKysrIGIvaWJ1cy5zcGVjCkBAIC0yOCw3ICsyOCw3IEBACiAKIE5hbWU6ICAgICAgICAg ICBpYnVzCiBWZXJzaW9uOiAgICAgICAgMS41LjE0Ci1SZWxlYXNlOiAgICAgICAgMiV7P2Rpc3R9 CitSZWxlYXNlOiAgICAgICAgMyV7P2Rpc3R9CiBTdW1tYXJ5OiAgICAgICAgSW50ZWxsaWdlbnQg SW5wdXQgQnVzIGZvciBMaW51eCBPUwogTGljZW5zZTogICAgICAgIExHUEx2MisKIEdyb3VwOiAg ICAgICAgICBTeXN0ZW0gRW52aXJvbm1lbnQvTGlicmFyaWVzCkBAIC00MjQsNiArNDI0LDExIEBA IGd0ay1xdWVyeS1pbW1vZHVsZXMtMy4wLSV7X19pc2FfYml0c30gLS11cGRhdGUtY2FjaGUgJj4g L2Rldi9udWxsIHx8IDoKICV7X2RhdGFkaXJ9L2d0ay1kb2MvaHRtbC8qCiAKICVjaGFuZ2Vsb2cK KyogVGh1IE9jdCAwNiAyMDE2IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPiAt IDEuNS4xNC0zCistIEZpeGVkIEJ1ZyAxMzgwNjc1IC0gRW1vamkgbGVhdmVzIHRoZSBjYW5kaWRh dGVzIG9mIEBsYXVnaCB3aGVuIEBsYXVnaGluZworLSBGaXhlZCBCdWcgMTM4MDY5MCAtIFVzZXIg aXMgbm90IGFibGUgdG8gc2VsZWN0IGVtb2ppcyBmcm9tIGRpZ2l0IGtleXMKKy0gRml4ZWQgQnVn IDEzODA2OTEgLSBQYWdlVXAgUGFnZURvd24gYnV0dG9ucyBvbiBlbW9qaSBsb29rdXAgbm90IHdv cmtpbmcKKwogKiBGcmkgU2VwIDA5IDIwMTYgVGFrYW8gRnVqaXdhcmEgPHRmdWppd2FyQHJlZGhh dC5jb20+IC0gMS41LjE0LTIKIC0gRml4ZWQgcmFkaW8gYnV0dG9uIG9uIFByb3BlcnR5UGFuZWwu CiAtIFVwZGF0ZWQgdHJhbnNsYXRpb25zLgo=