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: Resolves #2290842 Fix Super-space in Wayland Date: Sun, 31 May 2026 02:08:32 GMT Message-ID: <178019331272.1.18032548882244191064.rpms-ibus-77787d99c6cc@fedoraproject.org> List-ID: X-Git-Repo: rpms/ibus X-Git-Branch: autotool X-Git-Rev: 77787d99c6cc16e8dd0bd48cc63acc129bb09442 ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvaWJ1cwogICAgICAgICAgICBCcmFuY2ggOiBhdXRvdG9vbAogICAgICAgICAg ICBDb21taXQgOiA3Nzc4N2Q5OWM2Y2MxNmU4ZGQwYmQ0OGNjNjNhY2MxMjliYjA5NDQyCiAgICAg ICAgICAgIEF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgogICAg ICAgICAgICBEYXRlICAgOiAyMDI0LTA2LTA4VDEyOjE0OjU3KzA5OjAwCiAgICAgICAgICAgIFN0 YXRzICA6ICsyOTMvLTEgaW4gMiBmaWxlKHMpCiAgICAgICAgICAgIFVSTCAgICA6IGh0dHBzOi8v c3JjLmZlZG9yYXByb2plY3Qub3JnL3JwbXMvaWJ1cy9jLzc3Nzg3ZDk5YzZjYzE2ZThkZDBiZDQ4 Y2M2M2FjYzEyOWJiMDk0NDI/YnJhbmNoPWF1dG90b29sCgogICAgICAgICAgICBMb2c6CiAgICAg ICAgICAgIFJlc29sdmVzICMyMjkwODQyIEZpeCBTdXBlci1zcGFjZSBpbiBXYXlsYW5kCgotIEZp eCBjb21wb3NlIHNlcXVlbmNlcyBiZXlvbmQgVTEwMDAwCgotLS0KZGlmZiAtLWdpdCBhL2lidXMt SEVBRC5wYXRjaCBiL2lidXMtSEVBRC5wYXRjaAppbmRleCA3MmViZTA5Li4xMmY3ZTE5IDEwMDY0 NAotLS0gYS9pYnVzLUhFQUQucGF0Y2gKKysrIGIvaWJ1cy1IRUFELnBhdGNoCkBAIC03NDUsNiAr NzQ1LDcyIEBAIGluZGV4IGQ5MDc0NThlLi41MzRhOWQzNyAxMDA2NDQKIC0tIAogMi40NS4wCiAK K0Zyb20gYWVhMDM1YTk2MjYxZjljM2EzNmY1Y2Q5YzMwYjg0YjFkNzYwOTEwMyBNb24gU2VwIDE3 IDAwOjAwOjAwIDIwMDEKK0Zyb206IGZ1aml3YXJhdCA8dGFrYW8uZnVqaXdhcmExQGdtYWlsLmNv bT4KK0RhdGU6IFNhdCwgOCBKdW4gMjAyNCAxMDoyMzozMSArMDkwMAorU3ViamVjdDogW1BBVENI XSB1aS9ndGszOiBGaXggU3VwZXItc3BhY2UgaW4gV2F5bGFuZAorCitpYnVzX2J1c19zZXRfZ2xv YmFsX3Nob3J0Y3V0X2tleXNfYXN5bmMoKSB3YXMgbm90IGNhbGxlZCBpbiBQbGFzbWEKK1dheWxh bmQgYWZ0ZXIgIkZpeCB0byB1bnJlZiBHZGtEaXNwbGF5IGluIFdheWxhbmQiIHBhdGNoIGlzIGFw cGxpZWQuCitOb3cgaXQncyBjYWxsZWQgY29ycmVjdGx5IGFuZCB0aGUgZXZlbnQgaGFuZGxlciBp cyBkaXNhYmxlZCBpbnN0ZWFkLgorCitCVUc9cmhieiMyMjkwODQyCitCVUc9aHR0cHM6Ly9naXRo dWIuY29tL2lidXMvaWJ1cy9pc3N1ZXMvMjY0NAorRml4ZXM6IGh0dHBzOi8vZ2l0aHViLmNvbS9p YnVzL2lidXMvY29tbWl0LzYyN2U3Y2MKKy0tLQorIHVpL2d0azMva2V5YmluZGluZ21hbmFnZXIu dmFsYSB8IDkgKysrKystLS0tCisgdWkvZ3RrMy9wYW5lbC52YWxhICAgICAgICAgICAgIHwgNSAr Ky0tLQorIDIgZmlsZXMgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQor CitkaWZmIC0tZ2l0IGEvdWkvZ3RrMy9rZXliaW5kaW5nbWFuYWdlci52YWxhIGIvdWkvZ3RrMy9r ZXliaW5kaW5nbWFuYWdlci52YWxhCitpbmRleCA3MWI0YWNiMi4uZDRjNzYzNmEgMTAwNjQ0Cist LS0gYS91aS9ndGszL2tleWJpbmRpbmdtYW5hZ2VyLnZhbGEKKysrKyBiL3VpL2d0azMva2V5Ymlu ZGluZ21hbmFnZXIudmFsYQorQEAgLTYwLDggKzYwLDkgQEAgcHVibGljIGNsYXNzIEtleWJpbmRp bmdNYW5hZ2VyIDogR0xpYi5PYmplY3QgeworICAgICBwdWJsaWMgZGVsZWdhdGUgdm9pZCBLZXli aW5kaW5nSGFuZGxlckZ1bmMoR2RrLkV2ZW50IGV2ZW50KTsKKyAKKyAKKy0gICAgcHJpdmF0ZSAg S2V5YmluZGluZ01hbmFnZXIoKSB7CistICAgICAgICBHZGsuRXZlbnQuaGFuZGxlcl9zZXQoZXZl bnRfaGFuZGxlcik7CisrICAgIHByaXZhdGUgIEtleWJpbmRpbmdNYW5hZ2VyKGJvb2wgaXNfd2F5 bGFuZF9pbSkgeworKyAgICAgICAgaWYgKCFpc193YXlsYW5kX2ltKQorKyAgICAgICAgICAgIEdk ay5FdmVudC5oYW5kbGVyX3NldChldmVudF9oYW5kbGVyKTsKKyAgICAgfQorIAorICAgICAvKioK K0BAIC0xMDcsOSArMTA4LDkgQEAgcHVibGljIGNsYXNzIEtleWJpbmRpbmdNYW5hZ2VyIDogR0xp Yi5PYmplY3QgeworICAgICAgICAgICAgIG1fYmluZGluZ3MucmVtb3ZlIChiaW5kaW5nKTsKKyAg ICAgfQorIAorLSAgICBwdWJsaWMgc3RhdGljIEtleWJpbmRpbmdNYW5hZ2VyIGdldF9pbnN0YW5j ZSAoKSB7CisrICAgIHB1YmxpYyBzdGF0aWMgS2V5YmluZGluZ01hbmFnZXIgZ2V0X2luc3RhbmNl IChib29sIGlzX3dheWxhbmRfaW09ZmFsc2UpIHsKKyAgICAgICAgIGlmIChtX2luc3RhbmNlID09 IG51bGwpCistICAgICAgICAgICAgbV9pbnN0YW5jZSA9IG5ldyBLZXliaW5kaW5nTWFuYWdlciAo KTsKKysgICAgICAgICAgICBtX2luc3RhbmNlID0gbmV3IEtleWJpbmRpbmdNYW5hZ2VyIChpc193 YXlsYW5kX2ltKTsKKyAgICAgICAgIHJldHVybiBtX2luc3RhbmNlOworICAgICB9CisgCitkaWZm IC0tZ2l0IGEvdWkvZ3RrMy9wYW5lbC52YWxhIGIvdWkvZ3RrMy9wYW5lbC52YWxhCitpbmRleCA1 MzRhOWQzNy4uYjI0YzIzYWMgMTAwNjQ0CistLS0gYS91aS9ndGszL3BhbmVsLnZhbGEKKysrKyBi L3VpL2d0azMvcGFuZWwudmFsYQorQEAgLTQ0NiwxMSArNDQ2LDEwIEBAIGNsYXNzIFBhbmVsIDog SUJ1cy5QYW5lbFNlcnZpY2UgeworICAgICB9CisgCisgICAgIHByaXZhdGUgdm9pZCBiaW5kX3N3 aXRjaF9zaG9ydGN1dCgpIHsKKy0gICAgICAgIGlmIChtX2lzX3dheWxhbmRfaW0pCistICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICAgc3RyaW5nW10gYWNjZWxlcmF0b3JzID0gbV9zZXR0aW5n c19ob3RrZXkuZ2V0X3N0cnYoInRyaWdnZXJzIik7CisgCistICAgICAgICB2YXIga2V5YmluZGlu Z19tYW5hZ2VyID0gS2V5YmluZGluZ01hbmFnZXIuZ2V0X2luc3RhbmNlKCk7CisrICAgICAgICB2 YXIga2V5YmluZGluZ19tYW5hZ2VyID0KKysgICAgICAgICAgICAgICAgS2V5YmluZGluZ01hbmFn ZXIuZ2V0X2luc3RhbmNlKG1faXNfd2F5bGFuZF9pbSk7CisgCisgICAgICAgICBCaW5kaW5nQ29t bW9uLktleUV2ZW50RnVuY1R5cGUgZnR5cGUgPQorICAgICAgICAgICAgICAgICBCaW5kaW5nQ29t bW9uLktleUV2ZW50RnVuY1R5cGUuSU1FX1NXSVRDSEVSOworLS0gCisyLjQ1LjAKKwogRnJvbSBi ZTk0YjhkZGI0YzM3ZmU4MzY0Njg2MGEwOGM2MDBiOThlNjdmZTg0IE1vbiBTZXAgMTcgMDA6MDA6 MDAgMjAwMQogRnJvbTogZnVqaXdhcmF0IDx0YWthby5mdWppd2FyYTFAZ21haWwuY29tPgogRGF0 ZTogU2F0LCAyNSBNYXkgMjAyNCAxODoxMDozNiArMDkwMApAQCAtMTI5NiwzICsxMzYyLDIyNSBA QCBpbmRleCBhNTIxMDAwNC4uZmQxZDE1ZjcgMTAwNjQ0CiAtLSAKIDIuNDUuMAogCitGcm9tIDhk MzE0ZDc0OWY1YWI4M2ViNmRlMTg5ZmFiYTE4NDEwOGZiY2NkNjEgTW9uIFNlcCAxNyAwMDowMDow MCAyMDAxCitGcm9tOiBmdWppd2FyYXQgPHRha2FvLmZ1aml3YXJhMUBnbWFpbC5jb20+CitEYXRl OiBTYXQsIDggSnVuIDIwMjQgMTE6NDY6NTcgKzA5MDAKK1N1YmplY3Q6IFtQQVRDSCAxLzJdIHNy Yy9pYnVzY29tcG9zZXRhYmxlOiBGaXggVUZERDUga2V5IGZvciBjb21wb3NlIHNlcSB3aXRoIGZy KGJlcG9fYWZub3IpCisKK0FsdEdyLXQgd2l0aCBmcihiZXBvX2Fmbm9yKSBrZXltYXAgaGFzIG5v IGtleXN5bSBuYW1lIGJ1dCBjYW4gYmUKK3VzZWQgaW4gdGhlIGNvbXBvc2Uga2V5IHNlcXVlbmNl cy4KK01vc3QgVW5pY29kZSBmb3JtYXQgKFVYWFhYKSBzaG91bGQgYmUgc3VwcG9ydGVkIGluIHRo ZSBjb21wb3NlIHNlcXVlbmNlcworaW4gY2FzZSB0aGV5IGFyZSBub3QgdXNlZCBpbiBYS0Igb3B0 aW9ucyBleGNlcHQgZm9yICdQb2ludGVyXyonIFhLQiBvcHRpb24KK25hbWVzLgorQWxzbyByZWZh Y3RvciBjb21wb3NlIHNlcXVlbmNlcyB3aXRoIGVhY2ggcmFuZ2UgYmV5b25kIFUxMDAwMC4KK0Fs c28gdXBkYXRlIGlidXNfa2V5dmFsX25hbWUoKSBjYW4gb3V0cHV0IGtleXN5bSBuYW1lcyBiZXlv bmQgVTEwMDAwLgorCitCVUc9aHR0cHM6Ly9naXRodWIuY29tL2lidXMvaWJ1cy9pc3N1ZXMvMjY0 NgorRml4ZXM6IGh0dHBzOi8vZ2l0aHViLmNvbS9pYnVzL2lidXMvY29tbWl0L2FkODgzZGMKKy0t LQorIHNyYy9pYnVzY29tcG9zZXRhYmxlLmMgICAgICAgIHwgMzUgKysrKysrKysrKysrKysrKysr KysrKysrKysrKystLS0tLS0KKyBzcmMvaWJ1c2VuZ2luZXNpbXBsZXByaXZhdGUuaCB8ICAxICsK KyBzcmMvaWJ1c2tleW5hbWVzLmMgICAgICAgICAgICB8ICA3ICstLS0tLS0KKyBzcmMvdGVzdHMv aWJ1cy1jb21wb3NlLmJhc2ljICB8IDEwICsrKysrKysrKysKKyA0IGZpbGVzIGNoYW5nZWQsIDQx IGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQorCitkaWZmIC0tZ2l0IGEvc3JjL2lidXNj b21wb3NldGFibGUuYyBiL3NyYy9pYnVzY29tcG9zZXRhYmxlLmMKK2luZGV4IDlkNDM3N2E5Li4y Yzk3ZmQzYiAxMDA2NDQKKy0tLSBhL3NyYy9pYnVzY29tcG9zZXRhYmxlLmMKKysrKyBiL3NyYy9p YnVzY29tcG9zZXRhYmxlLmMKK0BAIC0xLDcgKzEsNyBAQAorIC8qIC0qLSBtb2RlOiBDOyBjLWJh c2ljLW9mZnNldDogNDsgaW5kZW50LXRhYnMtbW9kZTogbmlsOyAtKi0gKi8KKyAvKiBpYnVzIC0g VGhlIElucHV0IEJ1cworICAqIENvcHlyaWdodCAoQykgMjAxMy0yMDE0IFBlbmcgSHVhbmcgPHNo YXduLnAuaHVhbmdAZ21haWwuY29tPgorLSAqIENvcHlyaWdodCAoQykgMjAxMy0yMDIzIFRha2Fv IEZ1aml3YXJhIDx0YWthby5mdWppd2FyYTFAZ21haWwuY29tPgorKyAqIENvcHlyaWdodCAoQykg MjAxMy0yMDI0IFRha2FvIEZ1aml3YXJhIDx0YWthby5mdWppd2FyYTFAZ21haWwuY29tPgorICAq CisgICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRl IGl0IGFuZC9vcgorICAqIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMZXNz ZXIgR2VuZXJhbCBQdWJsaWMKK0BAIC0yMjIsNiArMjIyLDEyIEBAIHBhcnNlX2NvbXBvc2Vfc2Vx dWVuY2UgKElCdXNDb21wb3NlRGF0YSAqY29tcG9zZV9kYXRhLAorICAgICAgICAgICAgIGNvbXBv c2VfZGF0YS0+c2VxdWVuY2Vbbl0gPSBjb2RlcG9pbnQ7CisgICAgICAgICB9CisgCisrICAgICAg ICBpZiAoY29kZXBvaW50ID49IDB4MTAwMDApIHsKKysgICAgICAgICAgICBpZiAoIWlidXNfY29t cG9zZV9rZXlfZmxhZyAoMHhmZmZmICYgY29kZXBvaW50KSkgeworKyAgICAgICAgICAgICAgICBn X3dhcm5pbmcgKCJUaGUga2V5c3ltICVzID4gMHhmZmZmIGlzIG5vdCBzdXBwb3J0ZWQ6ICVzIiwK KysgICAgICAgICAgICAgICAgICAgICAgICAgICBtYXRjaCwgbGluZSk7CisrICAgICAgICAgICAg fQorKyAgICAgICAgfQorICAgICAgICAgaWYgKGNvZGVwb2ludCA9PSBJQlVTX0tFWV9Wb2lkU3lt Ym9sKSB7CisgICAgICAgICAgICAgZ193YXJuaW5nICgiQ291bGQgbm90IGdldCBjb2RlIHBvaW50 IG9mIGtleXN5bSAlczogJXMiLAorICAgICAgICAgICAgICAgICAgICAgICAgbWF0Y2gsIGxpbmUp OworQEAgLTYwMyw2ICs2MDksNyBAQCBpYnVzX2NvbXBvc2VfbGlzdF9jaGVja19kdXBsaWNhdGVk IChHTGlzdCAgKmNvbXBvc2VfbGlzdCwKKyAKKyAvKgorICAqIEFjdHVhbCB0eXBlZCBrZXlzeW1z IGhhdmUgYSBmbGFnIGFnYWluc3QgdGhlIGRlZmluaXRpb24uCisrICogaHR0cHM6Ly9naXRsYWIu ZnJlZWRlc2t0b3Aub3JnL3hvcmcvcHJvdG8veG9yZ3Byb3RvLy0vYmxvYi9tYXN0ZXIvaW5jbHVk ZS9YMTEva2V5c3ltZGVmLmg/cmVmX3R5cGU9aGVhZHMjTDgyCisgICogaHR0cHM6Ly9naXRsYWIu ZnJlZWRlc2t0b3Aub3JnL3hvcmcvbGliL2xpYngxMS8tL2Jsb2IvbWFzdGVyL25scy9lbl9VUy5V VEYtOC9Db21wb3NlLnByZSNMNDU1OQorICAqLworIGd1aW50CitAQCAtNjExLDExICs2MTgsMjcg QEAgaWJ1c19jb21wb3NlX2tleV9mbGFnIChndWludCBrZXkpCisgICAgIGNvbnN0IGNoYXIgKm5h bWU7CisgICAgIGlmIChrZXkgPD0gMHhmZikKKyAgICAgICAgIHJldHVybiAwOworKyAgICBzd2l0 Y2ggKGtleSkgeworKyAgICAvKiA8QW9nb25laz4gaXMgbm90IHVzZWQgaW4gVVRGLTggY29tcG9z ZSBzZXF1ZW5jZXMgYnV0IDxvaG9ybj4gaW4gRU4KKysgICAgICogY29tcG9zZSBmaWxlIGFuZCB2 biBrZXltYXAgaXMgYXNzdW1lZCBpbnN0ZWFkLgorKyAgICAgKi8KKysgICAgY2FzZSAweDFhMToK KysgICAgLyogPFphYm92ZWRvdD4gaXMgbm90IHVzZWQgaW4gVVRGLTggY29tcG9zZSBzZXF1ZW5j ZXMgYnV0IDxVaG9ybj4gaW4gRU4KKysgICAgICogY29tcG9zZSBmaWxlIGFuZCB2biBrZXltYXAg cyBhc3N1bWVkIGluc3RlYWQuCisrICAgICAqLworKyAgICBjYXNlIDB4MWFmOgorKyAgICAvKiA8 Y2Fyb24+IGlzIG5vdCB1c2VkIGluIFVURi04IGNvbXBvc2Ugc2VxdWVuY2VzIGJ1dCA8RVpIPiBp biBFTiBjb21wb3NlCisrICAgICAqIGZpbGUgYW5kIGZyKG5vZGVhZGtleXMpIGtleW1hcCBpcyBh c3N1bWVkIGluc3RlYWQuCisrICAgICAqLworKyAgICBjYXNlIDB4MWI3OgorKyAgICAgICAgcmV0 dXJuIDB4MTAwMDAwMDsKKysgICAgZGVmYXVsdDo7CisrICAgIH0KKyAgICAgbmFtZSA9IGlidXNf a2V5dmFsX25hbWUgKGtleSk7CisgICAgIC8qIElmIG5hbWUgaXMgbnVsbCwgdGhlIGtleSBzZXF1 ZW5jZSBpcyBleHByZXNzZWQgYXMgIjxVeHh4eD4iIGZvcm1hdCBpbgorICAgICAgKiB0aGUgQ29t cG9zZSBmaWxlIGFuZCB0aGUgdHlwZWQga2V5c3ltIGhhcyB0aGUgZmxhZy4KKyAgICAgICovCist ICAgIGlmICghbmFtZSkKKysgICAgaWYgKCFuYW1lIHx8IGdfc3RyX2hhc19wcmVmaXggKG5hbWUs ICIweCIpKQorICAgICAgICAgcmV0dXJuIDB4MTAwMDAwMDsKKyAgICAgLyogIjxQb2ludGVyX0Vu YWJsZUtleXM+IiBpcyBub3QgZGVzY3JpYmVkIGluIHRoZSBDb21wb3NlIGZpbGUgYnV0IDxVRkVG OT4KKyAgICAgICogaW4gdGhlIGZpbGUuCitAQCAtNjQ4LDggKzY3MSw4IEBAIGlidXNfY29tcG9z ZV9kYXRhX2NvbXBhcmUgKGdwb2ludGVyIGEsCisgICAgICAgICBndW5pY2hhciBjb2RlX2EgPSBj b21wb3NlX2RhdGFfYS0+c2VxdWVuY2VbaV07CisgICAgICAgICBndW5pY2hhciBjb2RlX2IgPSBj b21wb3NlX2RhdGFfYi0+c2VxdWVuY2VbaV07CisgCistICAgICAgICBjb2RlX2EgKz0gaWJ1c19j b21wb3NlX2tleV9mbGFnIChjb2RlX2EpOworLSAgICAgICAgY29kZV9iICs9IGlidXNfY29tcG9z ZV9rZXlfZmxhZyAoY29kZV9iKTsKKysgICAgICAgIGNvZGVfYSAmPSAweGZmZmY7CisrICAgICAg ICBjb2RlX2IgJj0gMHhmZmZmOworICAgICAgICAgaWYgKGNvZGVfYSAhPSBjb2RlX2IpCisgICAg ICAgICAgICAgcmV0dXJuIGNvZGVfYSAtIGNvZGVfYjsKKyAgICAgICAgIGlmIChjb2RlX2EgPT0g MCAmJiBjb2RlX2IgPT0gMCkKK0BAIC0xNTgxLDkgKzE2MDQsOSBAQCBjb21wYXJlX3NlcSAoY29u c3Qgdm9pZCAqa2V5LCBjb25zdCB2b2lkICp2YWx1ZSkKKyAgICAgICAgIGd1aW50IHNhdmVkX2tl eSA9IChndWludClzZXFbaV07CisgICAgICAgICBndWludCBmbGFnID0gaWJ1c19jb21wb3NlX2tl eV9mbGFnIChzYXZlZF9rZXkpOworICAgICAgICAgaWYgKHR5cGVkX2tleSA8IChzYXZlZF9rZXkg KyBmbGFnKSkKKy0gICAgICAgICAgICByZXR1cm4gLTE7CisrICAgICAgICAgICAgcmV0dXJuICgw eGZmZmYgJiB0eXBlZF9rZXkpIC0gc2F2ZWRfa2V5OworICAgICAgICAgZWxzZSBpZiAodHlwZWRf a2V5ID4gKHNhdmVkX2tleSArIGZsYWcpKQorLSAgICAgICAgICAgIHJldHVybiAxOworKyAgICAg ICAgICAgIHJldHVybiAoMHhmZmZmICYgdHlwZWRfa2V5KSAtIHNhdmVkX2tleTsKKyAKKyAgICAg ICAgIGkrKzsKKyAgICAgfQorZGlmZiAtLWdpdCBhL3NyYy9pYnVzZW5naW5lc2ltcGxlcHJpdmF0 ZS5oIGIvc3JjL2lidXNlbmdpbmVzaW1wbGVwcml2YXRlLmgKK2luZGV4IGZkNjAwODUzLi5hZTQy MzQyYiAxMDA2NDQKKy0tLSBhL3NyYy9pYnVzZW5naW5lc2ltcGxlcHJpdmF0ZS5oCisrKysgYi9z cmMvaWJ1c2VuZ2luZXNpbXBsZXByaXZhdGUuaAorQEAgLTQyLDYgKzQyLDcgQEAgc3RydWN0IF9J QnVzQ29tcG9zZVRhYmxlUHJpdmF0ZQorIH07CisgCisgCisrZ3VpbnQgICAgaWJ1c19jb21wb3Nl X2tleV9mbGFnICAgICAgKGd1aW50ICAgICAgICAgICAgICAgICAgICAgICBrZXkpOworIGdib29s ZWFuIGlidXNfY2hlY2tfYWxnb3JpdGhtaWNhbGx5IChjb25zdCBndWludCAgICAgICAgICAgICAg ICAqY29tcG9zZV9idWZmZXIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGludCAgICAgICAgICAgICAgICAgICAgICAgICBuX2NvbXBvc2UsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGd1bmljaGFyICAgICAgICAgICAgICAgICAgICpvdXRwdXQp OworZGlmZiAtLWdpdCBhL3NyYy9pYnVza2V5bmFtZXMuYyBiL3NyYy9pYnVza2V5bmFtZXMuYwor aW5kZXggNTQ0YzZhZGUuLjI5MjViZGVjIDEwMDY0NAorLS0tIGEvc3JjL2lidXNrZXluYW1lcy5j CisrKysgYi9zcmMvaWJ1c2tleW5hbWVzLmMKK0BAIC00NywxMiArNDcsNyBAQCBpYnVzX2tleXZh bF9uYW1lIChndWludCBrZXl2YWwpCisgICBzdGF0aWMgZ2NoYXIgYnVmWzEwMF07CisgICBnZGtf a2V5ICpmb3VuZDsKKyAKKy0gIC8qIENoZWNrIGZvciBkaXJlY3RseSBlbmNvZGVkIDI0LWJpdCBV Q1MgY2hhcmFjdGVyczogKi8KKy0gIGlmICgoa2V5dmFsICYgMHhmZjAwMDAwMCkgPT0gMHgwMTAw MDAwMCkKKy0gICAgeworLSAgICAgIGdfc3ByaW50ZiAoYnVmLCAiVSslLjA0WCIsIChrZXl2YWwg JiAweDAwZmZmZmZmKSk7CistICAgICAgcmV0dXJuIGJ1ZjsKKy0gICAgfQorKyAgLyogPG9ob3Ju PiB3aXRoIDB4MDEwMDAwMDAgaXMgc3VwcG9ydGVkIGluIGdka19rZXlzX2J5X2tleXZhbCAqLwor IAorICAgZm91bmQgPSBic2VhcmNoICgma2V5dmFsLCBnZGtfa2V5c19ieV9rZXl2YWwsCisgICAg ICAgICAgICAgICAgICAgIElCVVNfTlVNX0tFWVMsIHNpemVvZiAoZ2RrX2tleSksCitkaWZmIC0t Z2l0IGEvc3JjL3Rlc3RzL2lidXMtY29tcG9zZS5iYXNpYyBiL3NyYy90ZXN0cy9pYnVzLWNvbXBv c2UuYmFzaWMKK2luZGV4IDA3MzVkNGVhLi40ZThjYjlhYiAxMDA2NDQKKy0tLSBhL3NyYy90ZXN0 cy9pYnVzLWNvbXBvc2UuYmFzaWMKKysrKyBiL3NyYy90ZXN0cy9pYnVzLWNvbXBvc2UuYmFzaWMK K0BAIC04LDYgKzgsMTMgQEAKKyA8ZGVhZF9tYWNyb24+IDxVMDIyNz4gICAgICAgICAgICAgICAg ICAgICAgICAgICA6ICLHnyIgICBVMDFERQorIDxNdWx0aV9rZXk+IDxtYWNyb24+IDxVMDIyNz4g ICAgICAgICAgICAgICAgICAgIDogIsefIiAgIFUwMURFCisgPE11bHRpX2tleT4gPHVuZGVyc2Nv cmU+IDxVMDIyNz4gICAgICAgICAgICAgICAgOiAix58iICAgVTAxREUKKysjIEFsdEdyLXQsIFNo aWZ0LWFzdGVyaXNrIHdpdGggZnIoYmVwb19hZm5vcikga2V5bWFwIG91dHB1dHMKKysjIDxVRkRE NT4gPDA+CisrIyBTdXBwb3J0IFVuaWNvZGUga2V5c3ltcyBpbiBjYXNlIHRoZXkgYXJlIG5vdCB1 c2VkIGluIFhLQiBvcHRpb25zIGV4Y2VwdAorKyMgZm9yICdQb2ludGVyXyonIFhLQiBvcHRpb24g bmFtZXMuCisrPFVGREQ1PiA8MD4gOiAi4oGwIiBVMjA3MAorKyMKKysjIyMgTXVsdGlieXRlIGNo YXJzIHRlc3RzCisgIyBLaG1lciBkaWdyYXBocworICMgVGhpcyBjYXNlIHN3YXBzIFUxN2ZlIGFu ZCBVMTdmZiBpbiBlbi1VUworIDxVMTdmZT4gOiAi4Z624Z+GIgorQEAgLTIyLDMgKzI5LDYgQEAK KyAjIFRoaXMgY2FzZSBzd2FwcyBjX2ggYW5kIENfaCBpbiBlbi1VUworIDxjX2g+ICAgOiAiQ+KA mWgiCisgPENfaD4gICA6ICJj4oCZaCIKKysjIFNvbWUgPFUxMDAwMD4gYXJlIHN1cHBvcnRlZCBm b3IgbXVzaWNhbCBjb21wb3NlciBpbiBlbi1VUworKzxNdWx0aV9rZXk+IDxVMUQxNTc+IDxVMUQx NjU+ICAgICA6ICLwnYeSIiAgIFUxRDFEMiAjIE1VU0lDQUwgU1lNQk9MIFNRVUFSRSBCCisrCist LSAKKzIuNDUuMAorCitGcm9tIDkwOWRmZjRmZDUwZDg2NDkyZmI3ZjQyYTA5YmJkMDQ2MjVmYTYw ZjQgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiBXaXNtaWxsIDxkZXZAd2lzbWlsbC5l dT4KK0RhdGU6IFNhdCwgOCBKdW4gMjAyNCAxMTo0NzowMSArMDkwMAorU3ViamVjdDogW1BBVENI IDIvMl0gc3JjL3Rlc3RzL2lidXMtY29tcG9zZTogQWRkIHNvbWUgVW5pY29kZSBib3VuZGFyeSB0 ZXN0cworCitCVUc9aHR0cHM6Ly9naXRodWIuY29tL2lidXMvaWJ1cy9wdWxsLzI2NDkKKy0tLQor IHNyYy90ZXN0cy9pYnVzLWNvbXBvc2UuYmFzaWMgfCA4ICsrKysrKystCisgc3JjL3Rlc3RzL2li dXMtY29tcG9zZS5lbW9qaSB8IDQgKysrKworIDIgZmlsZXMgY2hhbmdlZCwgMTEgaW5zZXJ0aW9u cygrKSwgMSBkZWxldGlvbigtKQorCitkaWZmIC0tZ2l0IGEvc3JjL3Rlc3RzL2lidXMtY29tcG9z ZS5iYXNpYyBiL3NyYy90ZXN0cy9pYnVzLWNvbXBvc2UuYmFzaWMKK2luZGV4IDRlOGNiOWFiLi5k OTA0ZGJiNCAxMDA2NDQKKy0tLSBhL3NyYy90ZXN0cy9pYnVzLWNvbXBvc2UuYmFzaWMKKysrKyBi L3NyYy90ZXN0cy9pYnVzLWNvbXBvc2UuYmFzaWMKK0BAIC0zLDcgKzMsOSBAQAorIDxNdWx0aV9r ZXk+IDxxdW90ZWRibD4gPEN5cmlsbGljX3poZT4gICA6ICLTnCIgICBVMDREQworIDxNdWx0aV9r ZXk+IDxxdW90ZWRibD4gPEN5cmlsbGljX1pIRT4gICA6ICLTnSIgICBVMDRERAorICMKKy0jIFVu aWNvZGUgdGVzdHMgb2YgVXh4eHgKKysjIEEgVW5pY29kZSBrZXlzeW0gPFV4eHh4PiBoYXMgYSBy ZWFsIHZhbHVlIDB4MDEwMDAwMDAgKyB4eHh4LgorKyMgaHR0cHM6Ly9naXRsYWIuZnJlZWRlc2t0 b3Aub3JnL3hvcmcvcHJvdG8veG9yZ3Byb3RvLy0vYmxvYi9tYXN0ZXIvaW5jbHVkZS9YMTEva2V5 c3ltZGVmLmg/cmVmX3R5cGU9aGVhZHMjTDgyCisrIworICMgZW4tVVMgaXMgIsehIiBVMDFFMSBi dXQgdGhpcyBjYXNlIGlzICLHnyIgVTAxREUKKyA8ZGVhZF9tYWNyb24+IDxVMDIyNz4gICAgICAg ICAgICAgICAgICAgICAgICAgICA6ICLHnyIgICBVMDFERQorIDxNdWx0aV9rZXk+IDxtYWNyb24+ IDxVMDIyNz4gICAgICAgICAgICAgICAgICAgIDogIsefIiAgIFUwMURFCitAQCAtMTMsNiArMTUs MTAgQEAKKyAjIFN1cHBvcnQgVW5pY29kZSBrZXlzeW1zIGluIGNhc2UgdGhleSBhcmUgbm90IHVz ZWQgaW4gWEtCIG9wdGlvbnMgZXhjZXB0CisgIyBmb3IgJ1BvaW50ZXJfKicgWEtCIG9wdGlvbiBu YW1lcy4KKyA8VUZERDU+IDwwPiA6ICLigbAiIFUyMDcwCisrIyBvaG9ybiwgZ3JhdmUgd2l0aCB2 biBrZXltYXAKKysjIElCdXMgZG9lcyBub3QgZGlzdGluZ2lzaCBvaG9ybiBhbmQgQW9nb25lawor KzxvaG9ybj4gPGdyYXZlPiA6ICLhu5wiIFUxRURDCisrPFUwMUExPiA8Z3JhdmU+IDogIuG7nCIg VTFFREMKKyAjCisgIyMjIE11bHRpYnl0ZSBjaGFycyB0ZXN0cworICMgS2htZXIgZGlncmFwaHMK K2RpZmYgLS1naXQgYS9zcmMvdGVzdHMvaWJ1cy1jb21wb3NlLmVtb2ppIGIvc3JjL3Rlc3RzL2li dXMtY29tcG9zZS5lbW9qaQoraW5kZXggN2ZiZjgyY2YuLmZkZDU2MGY4IDEwMDY0NAorLS0tIGEv c3JjL3Rlc3RzL2lidXMtY29tcG9zZS5lbW9qaQorKysrIGIvc3JjL3Rlc3RzL2lidXMtY29tcG9z ZS5lbW9qaQorQEAgLTEsMyArMSw0IEBACisrIyBFbW9qaSB0ZXN0cworIDxNdWx0aV9rZXk+IDxN dWx0aV9rZXk+IDxsPiA8ZT4gPG8+ICAgICAgICAgICAgIDogIuKZjCIgIFUyNjRDICAgIyBMRU8K KyA8TXVsdGlfa2V5PiA8TXVsdGlfa2V5PiA8dj4gPGk+IDxyPiA8Zz4gPG8+ICAgICA6ICLimY0i ICBVMjY0RCAgICMgVklSR08KKyA8TXVsdGlfa2V5PiA8TXVsdGlfa2V5PiA8ST4gPG4+IDx0PiAg ICAgICAgICAgICA6ICLiiKsiCitAQCAtOSwzICsxMCw2IEBACisgPE11bHRpX2tleT4gPE11bHRp X2tleT4gPG8+IDxJPiA8bj4gPHQ+ICAgICAgICAgOiAi4oiuIgorIDxNdWx0aV9rZXk+IDxNdWx0 aV9rZXk+IDxvPiA8ST4gPEk+IDxuPiA8dD4gICAgIDogIuKIryIKKyA8TXVsdGlfa2V5PiA8TXVs dGlfa2V5PiA8bz4gPEk+IDxJPiA8ST4gPG4+IDx0PiA6ICLiiLAiCisrIyBVbmljb2RlIGJvdW5k YXJ5IHRlc3RzCisrPFUyODAwPiA8MD4gOiAiYSIKKys8YnJhaWxsZV9ibGFuaz4gPDA+IDogImEi CistLSAKKzIuNDUuMAorCgpkaWZmIC0tZ2l0IGEvaWJ1cy5zcGVjIGIvaWJ1cy5zcGVjCmluZGV4 IDRlYjM3YTkuLjkyZTY4NWQgMTAwNjQ0Ci0tLSBhL2lidXMuc3BlYworKysgYi9pYnVzLnNwZWMK QEAgLTYxLDcgKzYxLDcgQEAKIE5hbWU6ICAgICAgICAgICBpYnVzCiBWZXJzaW9uOiAgICAgICAg MS41LjMwCiAjIGh0dHBzOi8vZ2l0aHViLmNvbS9mZWRvcmEtaW5mcmEvcnBtYXV0b3NwZWMvaXNz dWVzLzEwMQotUmVsZWFzZTogICAgICAgIDQlez9kaXN0fQorUmVsZWFzZTogICAgICAgIDUlez9k aXN0fQogU3VtbWFyeTogICAgICAgIEludGVsbGlnZW50IElucHV0IEJ1cyBmb3IgTGludXggT1MK IExpY2Vuc2U6ICAgICAgICBMR1BMLTIuMS1vci1sYXRlcgogVVJMOiAgICAgICAgICAgIGh0dHBz Oi8vZ2l0aHViLmNvbS9pYnVzLyVuYW1lL3dpa2kKQEAgLTYyNSw2ICs2MjUsMTAgQEAgZGNvbmYg dXBkYXRlIHx8IDoKICV7X2RhdGFkaXJ9L2luc3RhbGxlZC10ZXN0cy9pYnVzCiAKICVjaGFuZ2Vs b2cKKyogU2F0IEp1biAwOCAyMDI0IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29t PiAtIDEuNS4zMC01CistIFJlc29sdmVzICMyMjkwODQyIEZpeCBTdXBlci1zcGFjZSBpbiBXYXls YW5kCistIEZpeCBjb21wb3NlIHNlcXVlbmNlcyBiZXlvbmQgVTEwMDAwCisKICogRnJpIEp1biAw NyAyMDI0IFB5dGhvbiBNYWludCA8cHl0aG9uLW1haW50QHJlZGhhdC5jb20+IC0gMS41LjMwLTQK IC0gUmVidWlsdCBmb3IgUHl0aG9uIDMuMTMKIAo=