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: Implement new process_key_event for ibus-x11 Date: Sun, 31 May 2026 02:08:00 GMT Message-ID: <178019328086.1.12971573730071995190.rpms-ibus-82f34afdef47@fedoraproject.org> List-ID: X-Git-Repo: rpms/ibus X-Git-Branch: autotool X-Git-Rev: 82f34afdef475e28efbac46e42eff79304dcf36d QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvaWJ1cwpCcmFuY2gg OiBhdXRvdG9vbApDb21taXQgOiA4MmYzNGFmZGVmNDc1ZTI4ZWZiYWM0NmU0MmVmZjc5MzA0ZGNm MzZkCkF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgpEYXRlICAg OiAyMDIyLTExLTI0VDE3OjU5OjAzKzA5OjAwClN0YXRzICA6ICs0MzYvLTEgaW4gMiBmaWxlKHMp ClVSTCAgICA6IGh0dHBzOi8vc3JjLmZlZG9yYXByb2plY3Qub3JnL3JwbXMvaWJ1cy9jLzgyZjM0 YWZkZWY0NzVlMjhlZmJhYzQ2ZTQyZWZmNzkzMDRkY2YzNmQ/YnJhbmNoPWF1dG90b29sCgpMb2c6 CkltcGxlbWVudCBuZXcgcHJvY2Vzc19rZXlfZXZlbnQgZm9yIGlidXMteDExCgotLS0KZGlmZiAt LWdpdCBhL2lidXMtSEVBRC5wYXRjaCBiL2lidXMtSEVBRC5wYXRjaAppbmRleCA5ZjU3YTBkLi5j OTUyNDBlIDEwMDY0NAotLS0gYS9pYnVzLUhFQUQucGF0Y2gKKysrIGIvaWJ1cy1IRUFELnBhdGNo CkBAIC0zMTgsMyArMzE4LDQzNSBAQCBpbmRleCBhNDUyOWM4OC4uOTQwMGU5YmEgMTAwNjQ0CiAt LSAKIDIuMzcuMwogCitGcm9tIDUwNmFjOTk5M2Q1MTY2MTk2YjdjNGU5YmZhOWZiMGY5ZDM3OTJm ZmEgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiBmdWppd2FyYXQgPHRha2FvLmZ1aml3 YXJhMUBnbWFpbC5jb20+CitEYXRlOiBUaHUsIDEwIE5vdiAyMDIyIDE4OjM4OjA1ICswOTAwCitT dWJqZWN0OiBbUEFUQ0hdIGNsaWVudC94MTE6IEltcGxlbWVudCBuZXcgcHJvY2Vzc19rZXlfZXZl bnQgZm9yIGlidXMteDExCisKK1RoZSBuZXcgcHJvY2Vzc19rZXlfZXZlbnQgaXMgcG9ydGVkIGZy b20gR1RLNCB0byBYMTEgYmVjYXVzZQoraGFuZ3VsIG1haW50YWluZXJzIHdpc2ggdG8gZGVsZXRl IGZvcndhcmRfa2V5X2V2ZW50IGFzIG11Y2ggYXMgcG9zc2libGUKK2FuZCBjdXJyZW50bHkgd2Ug Y291bGQgYXBwbHkgZm9yd2FyZF9rZXlfZXZlbnQgdG8gdGhlIHN5bmMgbW9kZSBvbmx5CithbmQg dGhlIG5ldyBwcm9jZXNzX2tleV9ldmVudCBpcyBhIG5ldyBhc3luYyBrZXkgZXZlbnQgcHJvY2Vz cyBpbiBYMTEKK2FuZCBoYW5ndWwgbWlnaHQgZGlzYWJsZSBmb3J3YXJkX2tleV9ldmVudCBieSBk ZWZhdWx0LgorCitOb3cgdGhlIGRlZmluaXRpb24gb2YgSUJVU19DQVBfU1lOQ19QUk9DRVNTX0tF WV9WMiBjYXBhYmlsaXR5IGlzIGNoYW5nZWQKK3RvIHNldCBvbmx5IGlmIHRoZSBzeW5jIG1vZGUu CisKK0Fsc28gc3dpdGNoIGEgaGVhdnkgR01haW5Mb29wIHRvIHRoZSBsaWdodCBHU291cmNlLgor CitGaXhlczogaHR0cHM6Ly9naXRodWIuY29tL2lidXMvaWJ1cy9jb21taXQvYzk1N2M1ZgorLS0t CisgY2xpZW50L2d0azIvaWJ1c2ltY29udGV4dC5jIHwgIDYxICsrKysrKysrKystLS0tCisgY2xp ZW50L3gxMS9tYWluLmMgICAgICAgICAgIHwgMTU3ICsrKysrKysrKysrKysrKysrKysrKysrKysr KysrKystLS0tLQorIHNyYy9pYnVzdHlwZXMuaCAgICAgICAgICAgICB8ICAgMSArCisgMyBmaWxl cyBjaGFuZ2VkLCAxODQgaW5zZXJ0aW9ucygrKSwgMzUgZGVsZXRpb25zKC0pCisKK2RpZmYgLS1n aXQgYS9jbGllbnQvZ3RrMi9pYnVzaW1jb250ZXh0LmMgYi9jbGllbnQvZ3RrMi9pYnVzaW1jb250 ZXh0LmMKK2luZGV4IDZlMzM4MTU3Li4xZjM3MjNlNiAxMDA2NDQKKy0tLSBhL2NsaWVudC9ndGsy L2lidXNpbWNvbnRleHQuYworKysrIGIvY2xpZW50L2d0azIvaWJ1c2ltY29udGV4dC5jCitAQCAt MzgyLDggKzM4Miw5IEBAIHR5cGVkZWYgc3RydWN0IHsKKyB9IFByb2Nlc3NLZXlFdmVudERhdGE7 CisgCisgdHlwZWRlZiBzdHJ1Y3QgeworLSAgICBHTWFpbkxvb3AgKmxvb3A7CistICAgIGdib29s ZWFuICAgIHJldHZhbDsKKysgICAgaW50ICAgICAgIGNvdW50OworKyAgICBndWludCAgICAgY291 bnRfY2JfaWQ7CisrICAgIGdib29sZWFuICByZXR2YWw7CisgfSBQcm9jZXNzS2V5RXZlbnRSZXBs eURhdGE7CisgCisgc3RhdGljIHZvaWQKK0BAIC00NTMsNyArNDU0LDIzIEBAIF9wcm9jZXNzX2tl eV9ldmVudF9yZXBseV9kb25lIChHT2JqZWN0ICAgICAgKm9iamVjdCwKKyAgICAgfQorICAgICBn X3JldHVybl9pZl9mYWlsIChkYXRhKTsKKyAgICAgZGF0YS0+cmV0dmFsID0gcmV0dmFsOworLSAg ICBnX21haW5fbG9vcF9xdWl0IChkYXRhLT5sb29wKTsKKysgICAgZGF0YS0+Y291bnQgPSAwOwor KyAgICBnX3NvdXJjZV9yZW1vdmUgKGRhdGEtPmNvdW50X2NiX2lkKTsKKyt9CisrCisrc3RhdGlj IGdib29sZWFuCisrX3Byb2Nlc3Nfa2V5X2V2ZW50X2NvdW50X2NiIChncG9pbnRlciB1c2VyX2Rh dGEpCisreworKyAgICBQcm9jZXNzS2V5RXZlbnRSZXBseURhdGEgKmRhdGEgPSAoUHJvY2Vzc0tl eUV2ZW50UmVwbHlEYXRhICopdXNlcl9kYXRhOworKyAgICBnX3JldHVybl92YWxfaWZfZmFpbCAo ZGF0YSwgR19TT1VSQ0VfUkVNT1ZFKTsKKysgICAgaWYgKCFkYXRhLT5jb3VudCkKKysgICAgICAg IHJldHVybiBHX1NPVVJDRV9SRU1PVkU7CisrICAgIC8qIFdhaXQgZm9yIGFib3V0IDEwIHNlY3Mu ICovCisrICAgIGlmIChkYXRhLT5jb3VudCsrID09IDEwMDAwKSB7CisrICAgICAgICBkYXRhLT5j b3VudCA9IDA7CisrICAgICAgICByZXR1cm4gR19TT1VSQ0VfUkVNT1ZFOworKyAgICB9CisrICAg IHJldHVybiBHX1NPVVJDRV9DT05USU5VRTsKKyB9CisgCisgc3RhdGljIGdib29sZWFuCitAQCAt NDk2LDEwICs1MTMsMTAgQEAgX3Byb2Nlc3Nfa2V5X2V2ZW50IChJQnVzSW5wdXRDb250ZXh0ICpj b250ZXh0LAorICAgICAgICAgYnJlYWs7CisgICAgIH0KKyAgICAgY2FzZSAyOiB7CistICAgICAg ICBHTWFpbkxvb3AgKmxvb3AgPSBnX21haW5fbG9vcF9uZXcgKE5VTEwsIFRSVUUpOworKyAgICAg ICAgR1NvdXJjZSAqc291cmNlID0gZ190aW1lb3V0X3NvdXJjZV9uZXcgKDEpOworICAgICAgICAg UHJvY2Vzc0tleUV2ZW50UmVwbHlEYXRhICpkYXRhID0gTlVMTDsKKyAKKy0gICAgICAgIGlmIChs b29wKQorKyAgICAgICAgaWYgKHNvdXJjZSkKKyAgICAgICAgICAgICBkYXRhID0gZ19zbGljZV9u ZXcwIChQcm9jZXNzS2V5RXZlbnRSZXBseURhdGEpOworICAgICAgICAgaWYgKCFkYXRhKSB7Cisg ICAgICAgICAgICAgZ193YXJuaW5nICgiQ2Fubm90IHdhaXQgZm9yIHRoZSByZXBseSBvZiB0aGUg cHJvY2VzcyBrZXkgZXZlbnQuIik7CitAQCAtNTA3LDExICs1MjQsMTQgQEAgX3Byb2Nlc3Nfa2V5 X2V2ZW50IChJQnVzSW5wdXRDb250ZXh0ICpjb250ZXh0LAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAga2V5dmFsLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAga2V5Y29k ZSAtIDgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBzdGF0ZSk7CistICAgICAgICAgICAgaWYgKGxvb3ApCistICAgICAgICAgICAg ICAgIGdfbWFpbl9sb29wX3F1aXQgKGxvb3ApOworKyAgICAgICAgICAgIGlmIChzb3VyY2UpCisr ICAgICAgICAgICAgICAgIGdfc291cmNlX2Rlc3Ryb3kgKHNvdXJjZSk7CisgICAgICAgICAgICAg YnJlYWs7CisgICAgICAgICB9CistICAgICAgICBkYXRhLT5sb29wID0gbG9vcDsKKysgICAgICAg IGRhdGEtPmNvdW50ID0gMTsKKysgICAgICAgIGdfc291cmNlX2F0dGFjaCAoc291cmNlLCBOVUxM KTsKKysgICAgICAgIGdfc291cmNlX3VucmVmIChzb3VyY2UpOworKyAgICAgICAgZGF0YS0+Y291 bnRfY2JfaWQgPSBnX3NvdXJjZV9nZXRfaWQgKHNvdXJjZSk7CisgICAgICAgICBpYnVzX2lucHV0 X2NvbnRleHRfcHJvY2Vzc19rZXlfZXZlbnRfYXN5bmMgKGNvbnRleHQsCisgICAgICAgICAgICAg a2V5dmFsLAorICAgICAgICAgICAgIGtleWNvZGUgLSA4LAorQEAgLTUyMCw3ICs1NDAsMTQgQEAg X3Byb2Nlc3Nfa2V5X2V2ZW50IChJQnVzSW5wdXRDb250ZXh0ICpjb250ZXh0LAorICAgICAgICAg ICAgIE5VTEwsCisgICAgICAgICAgICAgX3Byb2Nlc3Nfa2V5X2V2ZW50X3JlcGx5X2RvbmUsCisg ICAgICAgICAgICAgZGF0YSk7CistICAgICAgICBnX21haW5fbG9vcF9ydW4gKGxvb3ApOworKyAg ICAgICAgZ19zb3VyY2Vfc2V0X2NhbGxiYWNrIChzb3VyY2UsIF9wcm9jZXNzX2tleV9ldmVudF9j b3VudF9jYiwgZGF0YSwgTlVMTCk7CisrICAgICAgICB3aGlsZSAoZGF0YS0+Y291bnQpCisrICAg ICAgICAgICAgZ19tYWluX2NvbnRleHRfaXRlcmF0aW9uIChOVUxMLCBUUlVFKTsKKysgICAgICAg IGlmIChzb3VyY2UtPnJlZl9jb3VudCA+IDApIHsKKysgICAgICAgICAgICAvKiBnX3NvdXJjZV9n ZXRfaWQoKSBjb3VsZCBjYXVzZXMgYSBTRUdWICovCisrICAgICAgICAgICAgZ19pbmZvICgiQnJv a2VuIEdTb3VyY2UucmVmX2NvdW50IGFuZCBtYXliZSBhIHRpbWluZyBpc3N1ZSBpbiAlcC4iLAor KyAgICAgICAgICAgICAgICAgICAgc291cmNlKTsKKysgICAgICAgIH0KKyAgICAgICAgIHJldHZh bCA9IGRhdGEtPnJldHZhbDsKKyAgICAgICAgIGdfc2xpY2VfZnJlZSAoUHJvY2Vzc0tleUV2ZW50 UmVwbHlEYXRhLCBkYXRhKTsKKyAgICAgICAgIGJyZWFrOworQEAgLTk5NCw4ICsxMDIxLDggQEAg aWJ1c19pbV9jb250ZXh0X2luaXQgKEdPYmplY3QgKm9iaikKKyAjZWxzZQorICAgICBpYnVzaW1j b250ZXh0LT5jYXBzID0gSUJVU19DQVBfUFJFRURJVF9URVhUIHwgSUJVU19DQVBfRk9DVVM7Cisg I2VuZGlmCistICAgIGlmIChfdXNlX3N5bmNfbW9kZSAhPSAxKQorLSAgICAgICAgaWJ1c2ltY29u dGV4dC0+Y2FwcyB8PSBJQlVTX0NBUF9TWU5DX1BST0NFU1NfS0VZOworKyAgICBpZiAoX3VzZV9z eW5jX21vZGUgPT0gMSkKKysgICAgICAgIGlidXNpbWNvbnRleHQtPmNhcHMgfD0gSUJVU19DQVBf U1lOQ19QUk9DRVNTX0tFWV9WMjsKKyAKKyAgICAgaWJ1c2ltY29udGV4dC0+ZXZlbnRzX3F1ZXVl ID0gZ19xdWV1ZV9uZXcgKCk7CisgCitAQCAtMTMzOCw3ICsxMzY1LDcgQEAgaWJ1c19pbV9jb250 ZXh0X3Jlc2V0IChHdGtJTUNvbnRleHQgKmNvbnRleHQpCisgICAgICAgICAgKiBJQnVzIHVzZXMg YnV0dG9uLXByZXNzLWV2ZW50IGluc3RlYWQgdW50aWwgR1RLIGlzIGZpeGVkLgorICAgICAgICAg ICogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2d0ay9pc3N1ZXMvMTUzNAorICAgICAg ICAgICovCistICAgICAgICBpZiAoX3VzZV9zeW5jX21vZGUgPT0gMSkKKysgICAgICAgIGlmIChf dXNlX3N5bmNfbW9kZSAhPSAwKQorICAgICAgICAgICAgIGlidXNfaW1fY29udGV4dF9jbGVhcl9w cmVlZGl0X3RleHQgKGlidXNpbWNvbnRleHQpOworICAgICAgICAgaWJ1c19pbnB1dF9jb250ZXh0 X3Jlc2V0IChpYnVzaW1jb250ZXh0LT5pYnVzY29udGV4dCk7CisgICAgIH0KK0BAIC0xNDUzLDcg KzE0ODAsNyBAQCBpYnVzX2ltX2NvbnRleHRfc2V0X2NsaWVudF93aW5kb3cgKEd0a0lNQ29udGV4 dCAqY29udGV4dCwKKyAKKyAgICAgaWYgKGlidXNpbWNvbnRleHQtPmNsaWVudF93aW5kb3cpIHsK KyAjaWYgIUdUS19DSEVDS19WRVJTSU9OICgzLCA5OCwgNCkKKy0gICAgICAgIGlmIChpYnVzaW1j b250ZXh0LT51c2VfYnV0dG9uX3ByZXNzX2V2ZW50ICYmIF91c2Vfc3luY19tb2RlICE9IDEpCisr ICAgICAgICBpZiAoaWJ1c2ltY29udGV4dC0+dXNlX2J1dHRvbl9wcmVzc19ldmVudCAmJiBfdXNl X3N5bmNfbW9kZSA9PSAwKQorICAgICAgICAgICAgIF9jb25uZWN0X2J1dHRvbl9wcmVzc19ldmVu dCAoaWJ1c2ltY29udGV4dCwgRkFMU0UpOworICNlbmRpZgorICAgICAgICAgZ19vYmplY3RfdW5y ZWYgKGlidXNpbWNvbnRleHQtPmNsaWVudF93aW5kb3cpOworQEAgLTE0NjMsNyArMTQ5MCw3IEBA IGlidXNfaW1fY29udGV4dF9zZXRfY2xpZW50X3dpbmRvdyAoR3RrSU1Db250ZXh0ICpjb250ZXh0 LAorICAgICBpZiAoY2xpZW50ICE9IE5VTEwpIHsKKyAgICAgICAgIGlidXNpbWNvbnRleHQtPmNs aWVudF93aW5kb3cgPSBnX29iamVjdF9yZWYgKGNsaWVudCk7CisgI2lmICFHVEtfQ0hFQ0tfVkVS U0lPTiAoMywgOTgsIDQpCistICAgICAgICBpZiAoIWlidXNpbWNvbnRleHQtPnVzZV9idXR0b25f cHJlc3NfZXZlbnQgJiYgX3VzZV9zeW5jX21vZGUgIT0gMSkKKysgICAgICAgIGlmICghaWJ1c2lt Y29udGV4dC0+dXNlX2J1dHRvbl9wcmVzc19ldmVudCAmJiBfdXNlX3N5bmNfbW9kZSA9PSAwKQor ICAgICAgICAgICAgIF9jb25uZWN0X2J1dHRvbl9wcmVzc19ldmVudCAoaWJ1c2ltY29udGV4dCwg VFJVRSk7CisgI2VuZGlmCisgICAgIH0KK0BAIC0yMDg1LDcgKzIxMTIsNyBAQCBfaWJ1c19jb250 ZXh0X3VwZGF0ZV9wcmVlZGl0X3RleHRfY2IgKElCdXNJbnB1dENvbnRleHQgICppYnVzY29udGV4 dCwKKyAjaWYgIUdUS19DSEVDS19WRVJTSU9OICgzLCA5OCwgNCkKKyAgICAgaWYgKCFpYnVzaW1j b250ZXh0LT51c2VfYnV0dG9uX3ByZXNzX2V2ZW50ICYmCisgICAgICAgICBtb2RlID09IElCVVNf RU5HSU5FX1BSRUVESVRfQ09NTUlUICYmCistICAgICAgICBfdXNlX3N5bmNfbW9kZSAhPSAxKSB7 CisrICAgICAgICBfdXNlX3N5bmNfbW9kZSA9PSAwKSB7CisgICAgICAgICBpZiAoaWJ1c2ltY29u dGV4dC0+Y2xpZW50X3dpbmRvdykgeworICAgICAgICAgICAgIF9jb25uZWN0X2J1dHRvbl9wcmVz c19ldmVudCAoaWJ1c2ltY29udGV4dCwgVFJVRSk7CisgICAgICAgICB9CitAQCAtMjQ1OSw4ICsy NDg2LDggQEAgX2NyZWF0ZV9mYWtlX2lucHV0X2NvbnRleHRfZG9uZSAoSUJ1c0J1cyAgICAgICAq YnVzLAorICAgICAgICAgICAgICAgICAgICAgICBOVUxMKTsKKyAKKyAgICAgZ3VpbnQzMiBjYXBz ID0gSUJVU19DQVBfUFJFRURJVF9URVhUIHwgSUJVU19DQVBfRk9DVVMgfCBJQlVTX0NBUF9TVVJS T1VORElOR19URVhUOworLSAgICBpZiAoX3VzZV9zeW5jX21vZGUgIT0gMSkKKy0gICAgICAgIGNh cHMgfD0gSUJVU19DQVBfU1lOQ19QUk9DRVNTX0tFWTsKKysgICAgaWYgKF91c2Vfc3luY19tb2Rl ID09IDEpCisrICAgICAgICBjYXBzIHw9IElCVVNfQ0FQX1NZTkNfUFJPQ0VTU19LRVlfVjI7Cisg ICAgIGlidXNfaW5wdXRfY29udGV4dF9zZXRfY2FwYWJpbGl0aWVzIChfZmFrZV9jb250ZXh0LCBj YXBzKTsKKyAKKyAgICAgLyogZm9jdXMgaW4vb3V0IHRoZSBmYWtlIGNvbnRleHQgKi8KK2RpZmYg LS1naXQgYS9jbGllbnQveDExL21haW4uYyBiL2NsaWVudC94MTEvbWFpbi5jCitpbmRleCA2MDU3 Y2MwMy4uOTA1ZmQyNTEgMTAwNjQ0CistLS0gYS9jbGllbnQveDExL21haW4uYworKysrIGIvY2xp ZW50L3gxMS9tYWluLmMKK0BAIC0xMjQsNyArMTI0LDcgQEAgc3RhdGljIGdpbnQgICAgIGdfZGVi dWdfbGV2ZWwgPSAwOworIAorIHN0YXRpYyBJQnVzQnVzICpfYnVzID0gTlVMTDsKKyAKKy1zdGF0 aWMgZ2Jvb2xlYW4gX3VzZV9zeW5jX21vZGUgPSBUUlVFOworK3N0YXRpYyBjaGFyIF91c2Vfc3lu Y19tb2RlID0gMjsKKyAKKyBzdGF0aWMgdm9pZAorIF94aW1fcHJlZWRpdF9zdGFydCAoWElNUyB4 aW1zLCBjb25zdCBYMTFJQyAqeDExaWMpCitAQCAtMzMxLDYgKzMzMSw3IEBAIHhpbV9jcmVhdGVf aWMgKFhJTVMgeGltcywgSU1DaGFuZ2VJQ1N0cnVjdCAqY2FsbF9kYXRhKQorIHsKKyAgICAgc3Rh dGljIGludCBiYXNlX2ljaWQgPSAxOworICAgICBYMTFJQyAqeDExaWM7CisrICAgIGd1aW50MzIg Y2FwYWJpbGl0aWVzID0gSUJVU19DQVBfRk9DVVM7CisgCisgICAgIGNhbGxfZGF0YS0+aWNpZCA9 IGJhc2VfaWNpZCArKzsKKyAKK0BAIC0zNzUsMTIgKzM3NiwxMSBAQCB4aW1fY3JlYXRlX2ljIChY SU1TIHhpbXMsIElNQ2hhbmdlSUNTdHJ1Y3QgKmNhbGxfZGF0YSkKKyAgICAgICAgICAgICAgICAg ICAgICAgICBHX0NBTExCQUNLIChfY29udGV4dF9kaXNhYmxlZF9jYiksIHgxMWljKTsKKyAKKyAK Ky0gICAgaWYgKHgxMWljLT5pbnB1dF9zdHlsZSAmIFhJTVByZWVkaXRDYWxsYmFja3MpIHsKKy0g ICAgICAgIGlidXNfaW5wdXRfY29udGV4dF9zZXRfY2FwYWJpbGl0aWVzICh4MTFpYy0+Y29udGV4 dCwgSUJVU19DQVBfRk9DVVMgfCBJQlVTX0NBUF9QUkVFRElUX1RFWFQpOworLSAgICB9CistICAg IGVsc2UgeworLSAgICAgICAgaWJ1c19pbnB1dF9jb250ZXh0X3NldF9jYXBhYmlsaXRpZXMgKHgx MWljLT5jb250ZXh0LCBJQlVTX0NBUF9GT0NVUyk7CistICAgIH0KKysgICAgaWYgKHgxMWljLT5p bnB1dF9zdHlsZSAmIFhJTVByZWVkaXRDYWxsYmFja3MpCisrICAgICAgICBjYXBhYmlsaXRpZXMg fD0gSUJVU19DQVBfUFJFRURJVF9URVhUOworKyAgICBpZiAoX3VzZV9zeW5jX21vZGUgPT0gMSkK KysgICAgICAgIGNhcGFiaWxpdGllcyB8PSBJQlVTX0NBUF9TWU5DX1BST0NFU1NfS0VZX1YyOwor KyAgICBpYnVzX2lucHV0X2NvbnRleHRfc2V0X2NhcGFiaWxpdGllcyAoeDExaWMtPmNvbnRleHQs IGNhcGFiaWxpdGllcyk7CisgCisgICAgIGdfaGFzaF90YWJsZV9pbnNlcnQgKF94MTFfaWNfdGFi bGUsCisgICAgICAgICAgICAgICAgICAgICAgICAgIEdJTlRfVE9fUE9JTlRFUiAoeDExaWMtPmlj aWQpLCAoZ3BvaW50ZXIpeDExaWMpOworQEAgLTQ2MSw2ICs0NjEsMTMgQEAgeGltX3Vuc2V0X2lj X2ZvY3VzIChYSU1TIHhpbXMsIElNQ2hhbmdlRm9jdXNTdHJ1Y3QgKmNhbGxfZGF0YSkKKyAKKyB9 CisgCisrdHlwZWRlZiBzdHJ1Y3QgeworKyAgICBJTUZvcndhcmRFdmVudFN0cnVjdCAqcGZlOwor KyAgICBpbnQgICAgICAgICAgICAgICAgICAgY291bnQ7CisrICAgIGd1aW50ICAgICAgICAgICAg ICAgICBjb3VudF9jYl9pZDsKKysgICAgZ2Jvb2xlYW4gICAgICAgICAgICAgIHJldHZhbDsKKyt9 IFByb2Nlc3NLZXlFdmVudFJlcGx5RGF0YTsKKysKKyBzdGF0aWMgdm9pZAorIF9wcm9jZXNzX2tl eV9ldmVudF9kb25lIChHT2JqZWN0ICAgICAgKm9iamVjdCwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgR0FzeW5jUmVzdWx0ICpyZXMsCitAQCAtNDkzLDYgKzUwMCw0MyBAQCBfcHJvY2Vzc19r ZXlfZXZlbnRfZG9uZSAoR09iamVjdCAgICAgICpvYmplY3QsCisgICAgIGdfc2xpY2VfZnJlZSAo SU1Gb3J3YXJkRXZlbnRTdHJ1Y3QsIHBmZSk7CisgfQorIAorK3N0YXRpYyB2b2lkCisrX3Byb2Nl c3Nfa2V5X2V2ZW50X3JlcGx5X2RvbmUgKEdPYmplY3QgICAgICAqb2JqZWN0LAorKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBHQXN5bmNSZXN1bHQgKnJlcywKKysgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZ3BvaW50ZXIgICAgICB1c2VyX2RhdGEpCisreworKyAgICBJQnVz SW5wdXRDb250ZXh0ICpjb250ZXh0ID0gKElCdXNJbnB1dENvbnRleHQgKilvYmplY3Q7CisrICAg IFByb2Nlc3NLZXlFdmVudFJlcGx5RGF0YSAqZGF0YSA9IChQcm9jZXNzS2V5RXZlbnRSZXBseURh dGEgKil1c2VyX2RhdGE7CisrICAgIEdFcnJvciAqZXJyb3IgPSBOVUxMOworKyAgICBnYm9vbGVh biByZXR2YWwgPSBpYnVzX2lucHV0X2NvbnRleHRfcHJvY2Vzc19rZXlfZXZlbnRfYXN5bmNfZmlu aXNoICgKKysgICAgICAgICAgICBjb250ZXh0LAorKyAgICAgICAgICAgIHJlcywKKysgICAgICAg ICAgICAmZXJyb3IpOworKyAgICBpZiAoZXJyb3IgIT0gTlVMTCkgeworKyAgICAgICAgZ193YXJu aW5nICgiUHJvY2VzcyBLZXkgRXZlbnQgZmFpbGVkOiAlcy4iLCBlcnJvci0+bWVzc2FnZSk7Cisr ICAgICAgICBnX2Vycm9yX2ZyZWUgKGVycm9yKTsKKysgICAgfQorKyAgICBnX3JldHVybl9pZl9m YWlsIChkYXRhKTsKKysgICAgZGF0YS0+cmV0dmFsID0gcmV0dmFsOworKyAgICBkYXRhLT5jb3Vu dCA9IDA7CisrICAgIGdfc291cmNlX3JlbW92ZSAoZGF0YS0+Y291bnRfY2JfaWQpOworK30KKysK KytzdGF0aWMgZ2Jvb2xlYW4KKytfcHJvY2Vzc19rZXlfZXZlbnRfY291bnRfY2IgKGdwb2ludGVy IHVzZXJfZGF0YSkKKyt7CisrICAgIFByb2Nlc3NLZXlFdmVudFJlcGx5RGF0YSAqZGF0YSA9IChQ cm9jZXNzS2V5RXZlbnRSZXBseURhdGEgKil1c2VyX2RhdGE7CisrICAgIGdfcmV0dXJuX3ZhbF9p Zl9mYWlsIChkYXRhLCBHX1NPVVJDRV9SRU1PVkUpOworKyAgICBpZiAoIWRhdGEtPmNvdW50KQor KyAgICAgICAgcmV0dXJuIEdfU09VUkNFX1JFTU9WRTsKKysgICAgLyogV2FpdCBmb3IgYWJvdXQg MTAgc2Vjcy4gKi8KKysgICAgaWYgKGRhdGEtPmNvdW50KysgPT0gMTAwMDApIHsKKysgICAgICAg IGRhdGEtPmNvdW50ID0gMDsKKysgICAgICAgIHJldHVybiBHX1NPVVJDRV9SRU1PVkU7CisrICAg IH0KKysgICAgcmV0dXJuIEdfU09VUkNFX0NPTlRJTlVFOworK30KKysKKyBzdGF0aWMgaW50Cisg eGltX2ZvcndhcmRfZXZlbnQgKFhJTVMgeGltcywgSU1Gb3J3YXJkRXZlbnRTdHJ1Y3QgKmNhbGxf ZGF0YSkKKyB7CitAQCAtNTIwLDE0ICs1NjQsMTUgQEAgeGltX2ZvcndhcmRfZXZlbnQgKFhJTVMg eGltcywgSU1Gb3J3YXJkRXZlbnRTdHJ1Y3QgKmNhbGxfZGF0YSkKKyAgICAgICAgIGV2ZW50LnN0 YXRlIHw9IElCVVNfUkVMRUFTRV9NQVNLOworICAgICB9CisgCistICAgIGlmIChfdXNlX3N5bmNf bW9kZSkgeworKyAgICBzd2l0Y2ggKF91c2Vfc3luY19tb2RlKSB7CisrICAgIGNhc2UgMTogewor ICAgICAgICAgcmV0dmFsID0gaWJ1c19pbnB1dF9jb250ZXh0X3Byb2Nlc3Nfa2V5X2V2ZW50ICgK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHgxMWljLT5jb250ZXh0LAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXZlbnQua2V5dmFsLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXZlbnQuaGFyZHdhcmVfa2V5Y29k ZSAtIDgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBldmVudC5zdGF0 ZSk7CisgICAgICAgICBpZiAocmV0dmFsKSB7CistICAgICAgICAgICAgaWYgKCEgeDExaWMtPmhh c19wcmVlZGl0X2FyZWEpIHsKKysgICAgICAgICAgICBpZiAoIXgxMWljLT5oYXNfcHJlZWRpdF9h cmVhKSB7CisgICAgICAgICAgICAgICAgIF94aW1fc2V0X2N1cnNvcl9sb2NhdGlvbiAoeDExaWMp OworICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICByZXR1cm4gMTsKK0BAIC01NDYsOCArNTkx LDgwIEBAIHhpbV9mb3J3YXJkX2V2ZW50IChYSU1TIHhpbXMsIElNRm9yd2FyZEV2ZW50U3RydWN0 ICpjYWxsX2RhdGEpCisgICAgICAgICBJTUZvcndhcmRFdmVudCAoX3hpbXMsIChYUG9pbnRlcikg JmZlKTsKKyAKKyAgICAgICAgIHJldHZhbCA9IDE7CisrICAgICAgICBicmVhazsKKyAgICAgfQor LSAgICBlbHNlIHsKKysgICAgY2FzZSAyOiB7CisrICAgICAgICBHU291cmNlICpzb3VyY2UgPSBn X3RpbWVvdXRfc291cmNlX25ldyAoMSk7CisrICAgICAgICBQcm9jZXNzS2V5RXZlbnRSZXBseURh dGEgKmRhdGEgPSBOVUxMOworKyAgICAgICAgSU1Gb3J3YXJkRXZlbnRTdHJ1Y3QgZmU7CisrCisr ICAgICAgICBpZiAoc291cmNlKQorKyAgICAgICAgICAgIGRhdGEgPSBnX3NsaWNlX25ldzAgKFBy b2Nlc3NLZXlFdmVudFJlcGx5RGF0YSk7CisrICAgICAgICBpZiAoIWRhdGEpIHsKKysgICAgICAg ICAgICBnX3dhcm5pbmcgKCJDYW5ub3Qgd2FpdCBmb3IgdGhlIHJlcGx5IG9mIHRoZSBwcm9jZXNz IGtleSBldmVudC4iKTsKKysgICAgICAgICAgICByZXR2YWwgPSBpYnVzX2lucHV0X2NvbnRleHRf cHJvY2Vzc19rZXlfZXZlbnQgKAorKyAgICAgICAgICAgICAgICAgICAgeDExaWMtPmNvbnRleHQs CisrICAgICAgICAgICAgICAgICAgICBldmVudC5rZXl2YWwsCisrICAgICAgICAgICAgICAgICAg ICBldmVudC5oYXJkd2FyZV9rZXljb2RlIC0gOCwKKysgICAgICAgICAgICAgICAgICAgIGV2ZW50 LnN0YXRlKTsKKysgICAgICAgICAgICBpZiAoc291cmNlKQorKyAgICAgICAgICAgICAgICBnX3Nv dXJjZV9kZXN0cm95IChzb3VyY2UpOworKyAgICAgICAgfSBlbHNlIHsKKysgICAgICAgICAgICBD QVJEMTYgY29ubmVjdF9pZCA9IHgxMWljLT5jb25uZWN0X2lkOworKyAgICAgICAgICAgIGRhdGEt PmNvdW50ID0gMTsKKysgICAgICAgICAgICBnX3NvdXJjZV9hdHRhY2ggKHNvdXJjZSwgTlVMTCk7 CisrICAgICAgICAgICAgZ19zb3VyY2VfdW5yZWYgKHNvdXJjZSk7CisrICAgICAgICAgICAgZGF0 YS0+Y291bnRfY2JfaWQgPSBnX3NvdXJjZV9nZXRfaWQgKHNvdXJjZSk7CisrICAgICAgICAgICAg aWJ1c19pbnB1dF9jb250ZXh0X3Byb2Nlc3Nfa2V5X2V2ZW50X2FzeW5jICgKKysgICAgICAgICAg ICAgICAgICAgIHgxMWljLT5jb250ZXh0LAorKyAgICAgICAgICAgICAgICAgICAgZXZlbnQua2V5 dmFsLAorKyAgICAgICAgICAgICAgICAgICAgZXZlbnQuaGFyZHdhcmVfa2V5Y29kZSAtIDgsCisr ICAgICAgICAgICAgICAgICAgICBldmVudC5zdGF0ZSwKKysgICAgICAgICAgICAgICAgICAgIC0x LAorKyAgICAgICAgICAgICAgICAgICAgTlVMTCwKKysgICAgICAgICAgICAgICAgICAgIF9wcm9j ZXNzX2tleV9ldmVudF9yZXBseV9kb25lLAorKyAgICAgICAgICAgICAgICAgICAgZGF0YSk7Cisr ICAgICAgICAgICAgZ19zb3VyY2Vfc2V0X2NhbGxiYWNrIChzb3VyY2UsIF9wcm9jZXNzX2tleV9l dmVudF9jb3VudF9jYiwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRhdGEs IE5VTEwpOworKyAgICAgICAgICAgIHdoaWxlIChkYXRhLT5jb3VudCkKKysgICAgICAgICAgICAg ICAgZ19tYWluX2NvbnRleHRfaXRlcmF0aW9uIChOVUxMLCBUUlVFKTsKKysgICAgICAgICAgICBp ZiAoc291cmNlLT5yZWZfY291bnQgPiAwKSB7CisrICAgICAgICAgICAgICAgIC8qIGdfc291cmNl X2dldF9pZCgpIGNvdWxkIGNhdXNlcyBhIFNFR1YgKi8KKysgICAgICAgICAgICAgICAgZ19pbmZv ICgiQnJva2VuIEdTb3VyY2UucmVmX2NvdW50IGFuZCBtYXliZSBhIHRpbWluZyAiCisrICAgICAg ICAgICAgICAgICAgICAgICAgImlzc3VlIGluICVwLiIsIHNvdXJjZSk7CisrICAgICAgICAgICAg fQorKyAgICAgICAgICAgIHJldHZhbCA9IGRhdGEtPnJldHZhbDsKKysgICAgICAgICAgICBnX3Ns aWNlX2ZyZWUgKFByb2Nlc3NLZXlFdmVudFJlcGx5RGF0YSwgZGF0YSk7CisrCisrICAgICAgICAg ICAgaWYgKGdfaGFzaF90YWJsZV9sb29rdXAgKF9jb25uZWN0aW9ucywKKysgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgR0lOVF9UT19QT0lOVEVSICgoZ2ludCljb25uZWN0X2lk KSkKKysgICAgICAgICAgICAgICAgPT0gTlVMTCkgeworKyAgICAgICAgICAgICAgICByZXR1cm4g MTsKKysgICAgICAgICAgICB9CisrICAgICAgICB9CisrCisrICAgICAgICBpZiAocmV0dmFsKSB7 CisrICAgICAgICAgICAgaWYgKCEgeDExaWMtPmhhc19wcmVlZGl0X2FyZWEpIHsKKysgICAgICAg ICAgICAgICAgX3hpbV9zZXRfY3Vyc29yX2xvY2F0aW9uICh4MTFpYyk7CisrICAgICAgICAgICAg fQorKyAgICAgICAgICAgIHJldHVybiAxOworKyAgICAgICAgfQorKworKyAgICAgICAgbWVtc2V0 ICgmZmUsIDAsIHNpemVvZiAoZmUpKTsKKysKKysgICAgICAgIGZlLm1ham9yX2NvZGUgPSBYSU1f Rk9SV0FSRF9FVkVOVDsKKysgICAgICAgIGZlLmljaWQgPSB4MTFpYy0+aWNpZDsKKysgICAgICAg IGZlLmNvbm5lY3RfaWQgPSB4MTFpYy0+Y29ubmVjdF9pZDsKKysgICAgICAgIGZlLnN5bmNfYml0 ID0gMDsKKysgICAgICAgIGZlLnNlcmlhbF9udW1iZXIgPSAwTDsKKysgICAgICAgIGZlLmV2ZW50 ID0gY2FsbF9kYXRhLT5ldmVudDsKKysKKysgICAgICAgIElNRm9yd2FyZEV2ZW50IChfeGltcywg KFhQb2ludGVyKSAmZmUpOworKworKyAgICAgICAgcmV0dmFsID0gMTsKKysgICAgICAgIGJyZWFr OworKyAgICB9CisrICAgIGRlZmF1bHQ6IHsKKyAgICAgICAgIElNRm9yd2FyZEV2ZW50U3RydWN0 ICpwZmU7CisgCisgICAgICAgICBwZmUgPSBnX3NsaWNlX25ldzAgKElNRm9yd2FyZEV2ZW50U3Ry dWN0KTsKK0BAIC01NjksNiArNjg2LDcgQEAgeGltX2ZvcndhcmRfZXZlbnQgKFhJTVMgeGltcywg SU1Gb3J3YXJkRXZlbnRTdHJ1Y3QgKmNhbGxfZGF0YSkKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHBmZSk7CisgICAgICAgICByZXR2YWwgPSAxOworICAgICB9CisrICAg IH0KKyAgICAgcmV0dXJuIHJldHZhbDsKKyB9CisgCitAQCAtMTAyNiwyMyArMTE0NCwyNiBAQCBf Y29udGV4dF9kaXNhYmxlZF9jYiAoSUJ1c0lucHV0Q29udGV4dCAqY29udGV4dCwKKyAgICAgX3hp bV9wcmVlZGl0X2VuZCAoX3hpbXMsIHgxMWljKTsKKyB9CisgCistc3RhdGljIGdib29sZWFuCist X2dldF9ib29sZWFuX2Vudihjb25zdCBnY2hhciAqbmFtZSwKKy0gICAgICAgICAgICAgICAgIGdi b29sZWFuICAgICBkZWZ2YWwpCisrc3RhdGljIGNoYXIKKytfZ2V0X2NoYXJfZW52IChjb25zdCBn Y2hhciAqbmFtZSwKKysgICAgICAgICAgICAgICBjaGFyICAgICAgICAgZGVmdmFsKQorIHsKKyAg ICAgY29uc3QgZ2NoYXIgKnZhbHVlID0gZ19nZXRlbnYgKG5hbWUpOworIAorICAgICBpZiAodmFs dWUgPT0gTlVMTCkKKy0gICAgICByZXR1cm4gZGVmdmFsOworKyAgICAgICAgcmV0dXJuIGRlZnZh bDsKKyAKKyAgICAgaWYgKGdfc3RyY21wMCAodmFsdWUsICIiKSA9PSAwIHx8CisgICAgICAgICBn X3N0cmNtcDAgKHZhbHVlLCAiMCIpID09IDAgfHwKKyAgICAgICAgIGdfc3RyY21wMCAodmFsdWUs ICJmYWxzZSIpID09IDAgfHwKKyAgICAgICAgIGdfc3RyY21wMCAodmFsdWUsICJGYWxzZSIpID09 IDAgfHwKKy0gICAgICAgIGdfc3RyY21wMCAodmFsdWUsICJGQUxTRSIpID09IDApCistICAgICAg cmV0dXJuIEZBTFNFOworKyAgICAgICAgZ19zdHJjbXAwICh2YWx1ZSwgIkZBTFNFIikgPT0gMCkg eworKyAgICAgICAgcmV0dXJuIDA7CisrICAgIH0gZWxzZSBpZiAoIWdfc3RyY21wMCAodmFsdWUs ICIyIikpIHsKKysgICAgICAgIHJldHVybiAyOworKyAgICB9CisgCistICAgIHJldHVybiBUUlVF OworKyAgICByZXR1cm4gMTsKKyB9CisgCisgc3RhdGljIHZvaWQKK0BAIC0xMDU5LDcgKzExODAs NyBAQCBfaW5pdF9pYnVzICh2b2lkKQorICAgICAgICAgICAgICAgICAgICAgICAgIEdfQ0FMTEJB Q0sgKF9idXNfZGlzY29ubmVjdGVkX2NiKSwgTlVMTCk7CisgCisgICAgIC8qIGh0dHBzOi8vZ2l0 aHViLmNvbS9pYnVzL2lidXMvaXNzdWVzLzE3MTMgKi8KKy0gICAgX3VzZV9zeW5jX21vZGUgPSBf Z2V0X2Jvb2xlYW5fZW52ICgiSUJVU19FTkFCTEVfU1lOQ19NT0RFIiwgVFJVRSk7CisrICAgIF91 c2Vfc3luY19tb2RlID0gX2dldF9jaGFyX2VudiAoIklCVVNfRU5BQkxFX1NZTkNfTU9ERSIsIDIp OworIH0KKyAKKyBzdGF0aWMgdm9pZAorZGlmZiAtLWdpdCBhL3NyYy9pYnVzdHlwZXMuaCBiL3Ny Yy9pYnVzdHlwZXMuaAoraW5kZXggYThlZWUzMTkuLmJhMmEwMDEwIDEwMDY0NAorLS0tIGEvc3Jj L2lidXN0eXBlcy5oCisrKysgYi9zcmMvaWJ1c3R5cGVzLmgKK0BAIC0xMjQsNiArMTI0LDcgQEAg dHlwZWRlZiBlbnVtIHsKKyAgICAgSUJVU19DQVBfU1VSUk9VTkRJTkdfVEVYVCAgID0gMSA8PCA1 LAorICAgICBJQlVTX0NBUF9PU0sgICAgICAgICAgICAgICAgPSAxIDw8IDYsCisgICAgIElCVVNf Q0FQX1NZTkNfUFJPQ0VTU19LRVkgICA9IDEgPDwgNywKKysgICAgSUJVU19DQVBfU1lOQ19QUk9D RVNTX0tFWV9WMiA9IElCVVNfQ0FQX1NZTkNfUFJPQ0VTU19LRVksCisgfSBJQnVzQ2FwYWJpbGl0 ZTsKKyAKKyAvKioKKy0tIAorMi4zNy4zCisKCmRpZmYgLS1naXQgYS9pYnVzLnNwZWMgYi9pYnVz LnNwZWMKaW5kZXggMDFlMWQ0OS4uOTJkYmM3NSAxMDA2NDQKLS0tIGEvaWJ1cy5zcGVjCisrKyBi L2lidXMuc3BlYwpAQCAtMzksNyArMzksNyBAQAogCiBOYW1lOiAgICAgICAgICAgaWJ1cwogVmVy c2lvbjogICAgICAgIDEuNS4yNwotUmVsZWFzZTogICAgICAgIDUlez9kaXN0fQorUmVsZWFzZTog ICAgICAgIDYlez9kaXN0fQogU3VtbWFyeTogICAgICAgIEludGVsbGlnZW50IElucHV0IEJ1cyBm b3IgTGludXggT1MKIExpY2Vuc2U6ICAgICAgICBMR1BMLTIuMC1vci1sYXRlcgogVVJMOiAgICAg ICAgICAgIGh0dHBzOi8vZ2l0aHViLmNvbS9pYnVzLyVuYW1lL3dpa2kKQEAgLTUyMyw2ICs1MjMs OSBAQCBkY29uZiB1cGRhdGUgfHwgOgogJXtfZGF0YWRpcn0vaW5zdGFsbGVkLXRlc3RzL2lidXMK IAogJWNoYW5nZWxvZworKiBUaHUgTm92IDI0IDIwMjIgVGFrYW8gRnVqaXdhcmEgPHRmdWppd2Fy QHJlZGhhdC5jb20+IC0gMS41LjI3LTYKKy0gIEltcGxlbWVudCBuZXcgcHJvY2Vzc19rZXlfZXZl bnQgZm9yIGlidXMteDExCisKICogV2VkIE5vdiAxNiAyMDIyIFRha2FvIEZ1aml3YXJhIDx0ZnVq aXdhckByZWRoYXQuY29tPiAtIDEuNS4yNy01CiAtIE1pZ3JhdGUgbGljZW5zZSB0YWcgdG8gU1BE WAogCg==