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: Updated ibus-xx-bridge-hotkey.patch Date: Sun, 31 May 2026 02:05:14 GMT Message-ID: <178019311405.1.8023699178980771743.rpms-ibus-b4e3b48e01fb@fedoraproject.org> List-ID: X-Git-Repo: rpms/ibus X-Git-Branch: autotool X-Git-Rev: b4e3b48e01fb921ce29fd1d164057acac4545065 ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvaWJ1cwogICAgICAgICAgICBCcmFuY2ggOiBhdXRvdG9vbAogICAgICAgICAg ICBDb21taXQgOiBiNGUzYjQ4ZTAxZmI5MjFjZTI5ZmQxZDE2NDA1N2FjYWM0NTQ1MDY1CiAgICAg ICAgICAgIEF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgogICAg ICAgICAgICBEYXRlICAgOiAyMDExLTA3LTA1VDEyOjQwOjUzKzA5OjAwCiAgICAgICAgICAgIFN0 YXRzICA6ICsyNDEvLTY4IGluIDMgZmlsZShzKQogICAgICAgICAgICBVUkwgICAgOiBodHRwczov L3NyYy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL2lidXMvYy9iNGUzYjQ4ZTAxZmI5MjFjZTI5ZmQx ZDE2NDA1N2FjYWM0NTQ1MDY1P2JyYW5jaD1hdXRvdG9vbAoKICAgICAgICAgICAgTG9nOgogICAg ICAgICAgICBVcGRhdGVkIGlidXMteHgtYnJpZGdlLWhvdGtleS5wYXRjaAoKRml4ZWQgNzE4ODky LCA3MTg0NTMsIDcxODQ1MAoKLS0tCmRpZmYgLS1naXQgYS9pYnVzLUhFQUQucGF0Y2ggYi9pYnVz LUhFQUQucGF0Y2gKaW5kZXggNGJlODk2MC4uYTQ5MmExYSAxMDA2NDQKLS0tIGEvaWJ1cy1IRUFE LnBhdGNoCisrKyBiL2lidXMtSEVBRC5wYXRjaApAQCAtOTY3LDMgKzk2NywyOCBAQCBpbmRleCAy OWI4ZjFkLi42ZGEzNDJhIDEwMDY0NAogLS0gCiAxLjcuNC40CiAKK0Zyb20gYTI1MTg3YTMxNWU5 ZGZiYjM2YTNlNGE0ZjhlOTZmMThlMmNjNmUwZCBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zy b206IGZ1aml3YXJhdCA8dGFrYW8uZnVqaXdhcmExQGdtYWlsLmNvbT4KK0RhdGU6IFR1ZSwgNSBK dWwgMjAxMSAxMjoxNTo1NSArMDkwMAorU3ViamVjdDogW1BBVENIXSBGaXggU0VHViBpbiBpYnVz X2tleW1hcF9sb29rdXBfa2V5c3ltCisKKy0tLQorIGJ1cy9lbmdpbmVwcm94eS5jIHwgICAgMiAr LQorIDEgZmlsZXMgY2hhbmdlZCwgMSBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9ucygtKQorCitk aWZmIC0tZ2l0IGEvYnVzL2VuZ2luZXByb3h5LmMgYi9idXMvZW5naW5lcHJveHkuYworaW5kZXgg OTVlOWUwYi4uYTQ5ZDZmZCAxMDA2NDQKKy0tLSBhL2J1cy9lbmdpbmVwcm94eS5jCisrKysgYi9i dXMvZW5naW5lcHJveHkuYworQEAgLTkwNyw3ICs5MDcsNyBAQCBidXNfZW5naW5lX3Byb3h5X3By b2Nlc3Nfa2V5X2V2ZW50IChCdXNFbmdpbmVQcm94eSAgICAgICplbmdpbmUsCisgICAgICAgICBp ZiAoa2V5bWFwID09IE5VTEwpCisgICAgICAgICAgICAga2V5bWFwID0gQlVTX0RFRkFVTFRfS0VZ TUFQOworICAgICAgICAgaWYgKGtleW1hcCAhPSBOVUxMKSB7CistICAgICAgICAgICAgZ3VpbnQg dCA9IGlidXNfa2V5bWFwX2xvb2t1cF9rZXlzeW0gKGVuZ2luZS0+a2V5bWFwLCBrZXljb2RlLCBz dGF0ZSk7CisrICAgICAgICAgICAgZ3VpbnQgdCA9IGlidXNfa2V5bWFwX2xvb2t1cF9rZXlzeW0g KGtleW1hcCwga2V5Y29kZSwgc3RhdGUpOworICAgICAgICAgICAgIGlmICh0ICE9IElCVVNfVm9p ZFN5bWJvbCkgeworICAgICAgICAgICAgICAgICBrZXl2YWwgPSB0OworICAgICAgICAgICAgIH0K Ky0tIAorMS43LjUuNAorCgpkaWZmIC0tZ2l0IGEvaWJ1cy14eC1icmlkZ2UtaG90a2V5LnBhdGNo IGIvaWJ1cy14eC1icmlkZ2UtaG90a2V5LnBhdGNoCmluZGV4IGZiZTgyMWEuLjExMTE3MzUgMTAw NjQ0Ci0tLSBhL2lidXMteHgtYnJpZGdlLWhvdGtleS5wYXRjaAorKysgYi9pYnVzLXh4LWJyaWRn ZS1ob3RrZXkucGF0Y2gKQEAgLTEsMzIgKzEsMzEgQEAKLUZyb20gYmJmMTI0MzMyYjhiYTQzZjM2 OWJlODZiYTNhNjQxMWZlNjY1NTZkMSBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb20gMDI0 MmQ4OWVjOWQ0ZDNkOTJkMzM1ZTUwYjhhYTZjMTZmZjk1MDQzOCBNb24gU2VwIDE3IDAwOjAwOjAw IDIwMDEKIEZyb206IGZ1aml3YXJhdCA8dGFrYW8uZnVqaXdhcmExQGdtYWlsLmNvbT4KLURhdGU6 IFRodSwgMzAgSnVuIDIwMTEgMTE6NDY6MDIgKzA5MDAKK0RhdGU6IFR1ZSwgNSBKdWwgMjAxMSAx MjowMDozMSArMDkwMAogU3ViamVjdDogW1BBVENIXSBBZGQgYSBicmlkZ2UgaG90a2V5IHdoaWNo IHVzZSBwcmV2LW5leHQgZW5naW5lcyBpbnN0ZWFkCiAgb2Ygb24tb2ZmLgogCiAtLS0KLSBidXMv TWFrZWZpbGUuYW0gICAgICAgICAgICB8ICAgMjAgKystLQotIGJ1cy9pYnVzaW1wbC5jICAgICAg ICAgICAgIHwgIDI1NSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tCi0g YnVzL3JlZ2lzdHJ5LmMgICAgICAgICAgICAgfCAgIDM1ICsrKysrKwotIGNvbmZpZ3VyZS5hYyAg ICAgICAgICAgICAgIHwgICAzMSArKysrKworIGJ1cy9NYWtlZmlsZS5hbSAgICAgICAgICAgIHwg ICAyMCArKy0KKyBidXMvaWJ1c2ltcGwuYyAgICAgICAgICAgICB8ICAzNTYgKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0KKyBidXMvcmVnaXN0cnkuYyAgICAgICAg ICAgICB8ICAgMzUgKysrKysKKyBjb25maWd1cmUuYWMgICAgICAgICAgICAgICB8ICAgMzEgKysr KwogIGRhdGEvTWFrZWZpbGUuYW0gICAgICAgICAgIHwgICAgNiArLQotIGRhdGEvaWJ1cy5zY2hl bWFzLmluICAgICAgIHwgIDI4NiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLQotIGRhdGEvaWJ1cy5zY2hlbWFzLmluLmluICAgIHwgIDI4NiArKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKworIGRhdGEvaWJ1cy5zY2hlbWFzLmluICAg ICAgIHwgIDI4NiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorIGRhdGEvaWJ1 cy5zY2hlbWFzLmluLmluICAgIHwgIDI4NiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKwogIGlidXMvX2NvbmZpZy5weS5pbiAgICAgICAgIHwgICAgNiArCiAgaWJ1cy9pbnB1dGNv bnRleHQucHkgICAgICAgfCAgICA0ICsKICBzZXR1cC9lbmdpbmVjb21ib2JveC5weSAgICB8ICAg IDMgKwogIHNldHVwL2VuZ2luZXRyZWV2aWV3LnB5ICAgIHwgICAxNiArKy0KLSBzcmMvTWFrZWZp bGUuYW0gICAgICAgICAgICB8ICAgMTggKystLQorIHNyYy9NYWtlZmlsZS5hbSAgICAgICAgICAg IHwgICAxOCArKy0KICBzcmMvaWJ1c2J1cy5jICAgICAgICAgICAgICB8ICAgMTIgKysKICBzcmMv aWJ1c2J1cy5oICAgICAgICAgICAgICB8ICAgMTggKysrCi0gc3JjL2lidXNlbmdpbmVkZXNjLmMg ICAgICAgfCAgICA0ICsKICBzcmMvaWJ1c2hvdGtleS5jICAgICAgICAgICB8ICAgMTEgKysKICBz cmMvaWJ1c2hvdGtleS5oICAgICAgICAgICB8ICAgMTEgKysKLSB1aS9ndGsvcGFuZWwucHkgICAg ICAgICAgICB8ICAxNTcgKysrKysrKysrKysrKysrKysrKysrLS0tCisgdWkvZ3RrL3BhbmVsLnB5 ICAgICAgICAgICAgfCAgMTg5ICsrKysrKysrKysrKysrKysrKysrKy0tLQogIHhrYi9NYWtlZmls ZS5hbSAgICAgICAgICAgIHwgICAgMiArCi0geGtiL2lidXMtZW5naW5lLXhrYi1tYWluLmMgfCAg ICA4ICsrCisgeGtiL2lidXMtZW5naW5lLXhrYi1tYWluLmMgfCAgICA4ICsKICB4a2IveGtieG1s LmMgICAgICAgICAgICAgICB8ICAgIDggKy0KLSAyMSBmaWxlcyBjaGFuZ2VkLCA4MTAgaW5zZXJ0 aW9ucygrKSwgMzg3IGRlbGV0aW9ucygtKQorIDIwIGZpbGVzIGNoYW5nZWQsIDkzOCBpbnNlcnRp b25zKCspLCAzODggZGVsZXRpb25zKC0pCiAgZGVsZXRlIG1vZGUgMTAwNjQ0IGRhdGEvaWJ1cy5z Y2hlbWFzLmluCiAgY3JlYXRlIG1vZGUgMTAwNjQ0IGRhdGEvaWJ1cy5zY2hlbWFzLmluLmluCiAK QEAgLTYyLDcgKzYxLDcgQEAgaW5kZXggMDc0YjQ1Ni4uMGVmYWExYiAxMDA2NDQKICBBTV9MREFE RCA9ICAgICAgICAgICAgICAgICAgXAogIAlAR09CSkVDVDJfTElCU0AgICAgICAgICBcCiBkaWZm IC0tZ2l0IGEvYnVzL2lidXNpbXBsLmMgYi9idXMvaWJ1c2ltcGwuYwotaW5kZXggYjM1NmIyYy4u ZjNjYTMzMCAxMDA2NDQKK2luZGV4IGIzNTZiMmMuLmZmZWEzN2EgMTAwNjQ0CiAtLS0gYS9idXMv aWJ1c2ltcGwuYwogKysrIGIvYnVzL2lidXNpbXBsLmMKIEBAIC0yMCw2ICsyMCwxMCBAQApAQCAt ODcsNyArODYsMTYgQEAgaW5kZXggYjM1NmIyYy4uZjNjYTMzMCAxMDA2NDQKICB9OwogIAogIHN0 cnVjdCBfQnVzSUJ1c0ltcGxDbGFzcyB7Ci1AQCAtMjg1LDYgKzI5MywzMCBAQCBfcGFuZWxfZGVz dHJveV9jYiAoQnVzUGFuZWxQcm94eSAqcGFuZWwsCitAQCAtOTksNiArMTA3LDggQEAgZW51bSB7 Cisgc3RhdGljIGd1aW50ICAgICAgICAgICAgX3NpZ25hbHNbTEFTVF9TSUdOQUxdID0geyAwIH07 CisgKi8KKyAKKytzdGF0aWMgZ2NoYXIgICAgICAgICAgICpfYnJpZGdlX3RyaWdnZXJfa2V5cyA9 IE5VTEw7CisrCisgLyogZnVuY3Rpb25zIHByb3RvdHlwZSAqLworIHN0YXRpYyB2b2lkICAgICAg YnVzX2lidXNfaW1wbF9kZXN0cm95ICAgICAgICAgICAoQnVzSUJ1c0ltcGwgICAgICAgICppYnVz KTsKKyBzdGF0aWMgdm9pZCAgICAgIGJ1c19pYnVzX2ltcGxfc2VydmljZV9tZXRob2RfY2FsbAor QEAgLTI4NSw2ICsyOTUsMzAgQEAgX3BhbmVsX2Rlc3Ryb3lfY2IgKEJ1c1BhbmVsUHJveHkgKnBh bmVsLAogICAgICBnX29iamVjdF91bnJlZiAocGFuZWwpOwogIH0KICAKQEAgLTExOCw3ICsxMjYs NyBAQCBpbmRleCBiMzU2YjJjLi5mM2NhMzMwIDEwMDY0NAogIHN0YXRpYyB2b2lkCiAgX2NvbmZp Z19zZXRfdmFsdWVfZG9uZSAoR09iamVjdCAgICAgICpvYmplY3QsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgR0FzeW5jUmVzdWx0ICpyZXMsCi1AQCAtNDc1LDggKzUwNywyMSBAQCBfc2V0X3By ZWxvYWRfZW5naW5lcyAoQnVzSUJ1c0ltcGwgKmlidXMsCitAQCAtNDc1LDggKzUwOSwyMSBAQCBf c2V0X3ByZWxvYWRfZW5naW5lcyAoQnVzSUJ1c0ltcGwgKmlidXMsCiAgICAgICAgICBnX3Zhcmlh bnRfdW5yZWYgKHZhbHVlKTsKICAgICAgfQogIApAQCAtMTMzLDcgKzE0MSw3IEBAIGluZGV4IGIz NTZiMmMuLmYzY2EzMzAgMTAwNjQ0CiArICAgICAgICAgICAgZW5naW5lX2xpc3QgPSBnX2xpc3Rf aW5zZXJ0IChlbmdpbmVfbGlzdCwgZW5naW5lLCAxKTsKICsgICAgICAgIH0gZWxzZSB7CiArICAg ICAgICAgICAgZW5naW5lX2xpc3QgPSBnX2xpc3RfYXBwZW5kIChlbmdpbmVfbGlzdCwgZW5naW5l KTsKLSsgICAgICAgIH0KKysgICAgICAgfQogKyAgICAgICAgaWJ1cy0+ZW5naW5lX2xpc3QgPSBl bmdpbmVfbGlzdDsKICsgICAgfQogKyNlbmRpZgpAQCAtMTQxLDE3ICsxNDksNjMgQEAgaW5kZXgg YjM1NmIyYy4uZjNjYTMzMCAxMDA2NDQKICAKICAgICAgaWYgKGlidXMtPmVuZ2luZV9saXN0KSB7 CiAgICAgICAgICBCdXNDb21wb25lbnQgKmNvbXBvbmVudCA9IGJ1c19jb21wb25lbnRfZnJvbV9l bmdpbmVfZGVzYyAoKElCdXNFbmdpbmVEZXNjICopIGlidXMtPmVuZ2luZV9saXN0LT5kYXRhKTsK LUBAIC01NzMsNyArNjE4LDkgQEAgYnVzX2lidXNfaW1wbF9zZXRfdHJpZ2dlciAoQnVzSUJ1c0lt cGwgKgorQEAgLTU2Miw2ICs2MDksNDMgQEAgYnVzX2lidXNfaW1wbF9zZXRfaG90a2V5IChCdXNJ QnVzSW1wbCAqaQorIAorIH0KKyAKKysjaWYgVVNFX0JSSURHRV9IT1RLRVkKKytzdGF0aWMgdm9p ZAorK2J1c19pYnVzX2ltcGxfc2V0X2JyaWRnZV90cmlnZ2VyX2tleXMgKEJ1c0lCdXNJbXBsICpp YnVzLAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdRdWFyayAgICAg ICBob3RrZXksCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR1Zhcmlh bnQgICAgKnZhbHVlKQorK3sKKysgICAgZ19hc3NlcnQgKEJVU19JU19JQlVTX0lNUEwgKGlidXMp KTsKKysKKysgICAgaWJ1c19ob3RrZXlfcHJvZmlsZV9yZW1vdmVfaG90a2V5X2J5X2V2ZW50IChp YnVzLT5ob3RrZXlfcHJvZmlsZSwgaG90a2V5KTsKKysKKysgICAgaWYgKHZhbHVlID09IE5VTEwp IHsKKysgICAgICAgIHJldHVybjsKKysgICAgfQorKworKyAgICBHVmFyaWFudEl0ZXIgaXRlcjsK KysgICAgZ192YXJpYW50X2l0ZXJfaW5pdCAoJml0ZXIsIHZhbHVlKTsKKysgICAgY29uc3QgZ2No YXIgKnN0ciA9IE5VTEw7CisrCisrICAgIGdfZnJlZSAoX2JyaWRnZV90cmlnZ2VyX2tleXMpOwor KyAgICBfYnJpZGdlX3RyaWdnZXJfa2V5cyA9IE5VTEw7CisrCisrICAgIHdoaWxlIChnX3Zhcmlh bnRfaXRlcl9sb29wICgmaXRlciwiJnMiLCAmc3RyKSkgeworKyAgICAgICBpZiAoc3RyICE9IE5V TEwpIHsKKysgICAgICAgICAgIGdjaGFyICp0bXAgPU5VTEw7CisrCisrICAgICAgICAgICBpZiAo X2JyaWRnZV90cmlnZ2VyX2tleXMpIHsKKysgICAgICAgICAgICAgICB0bXAgPSBnX3N0cmR1cF9w cmludGYgKCIlcywlcyIsIF9icmlkZ2VfdHJpZ2dlcl9rZXlzLCBzdHIpOworKyAgICAgICAgICAg fSBlbHNlIHsKKysgICAgICAgICAgICAgICB0bXAgPSBnX3N0cmR1cCAoc3RyKTsKKysgICAgICAg ICAgIH0KKysgICAgICAgICAgIGdfZnJlZSAoX2JyaWRnZV90cmlnZ2VyX2tleXMpOworKyAgICAg ICAgICAgX2JyaWRnZV90cmlnZ2VyX2tleXMgPSB0bXA7CisrICAgICAgIH0KKysgICAgfQorK30K KysjZW5kaWYKKysKKyAvKioKKyAgKiBidXNfaWJ1c19pbXBsX3NldF90cmlnZ2VyOgorICAqCitA QCAtNTczLDcgKzY1NywxMSBAQCBidXNfaWJ1c19pbXBsX3NldF90cmlnZ2VyIChCdXNJQnVzSW1w bCAqCiAgewogICAgICBHUXVhcmsgaG90a2V5ID0gZ19xdWFya19mcm9tX3N0YXRpY19zdHJpbmcg KCJ0cmlnZ2VyIik7CiAgICAgIGlmICh2YWx1ZSAhPSBOVUxMKSB7Ci0rI2lmICFVU0VfQlJJREdF X0hPVEtFWQorKyNpZiBVU0VfQlJJREdFX0hPVEtFWQorKyAgICAgICAgYnVzX2lidXNfaW1wbF9z ZXRfYnJpZGdlX3RyaWdnZXJfa2V5cyAoaWJ1cywgaG90a2V5LCB2YWx1ZSk7CisrI2Vsc2UKICAg ICAgICAgIGJ1c19pYnVzX2ltcGxfc2V0X2hvdGtleSAoaWJ1cywgaG90a2V5LCB2YWx1ZSk7CiAr I2VuZGlmCiAgICAgIH0KICAjaWZuZGVmIE9TX0NIUk9NRU9TCiAgICAgIGVsc2UgewotQEAgLTEx ODIsMjggKzEyMjksMTEwIEBAIF9pYnVzX2dldF9hZGRyZXNzIChCdXNJQnVzSW1wbCAgICAgICAg ICAKK0BAIC0xMTgyLDI4ICsxMjcwLDExMCBAQCBfaWJ1c19nZXRfYWRkcmVzcyAoQnVzSUJ1c0lt cGwgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGdfdmFyaWFudF9uZXcgKCIocykiLCBidXNfc2VydmVyX2dldF9hZGRyZXNzICgpKSk7CiAgfQog IApAQCAtMjc5LDcgKzMzMyw3IEBAIGluZGV4IGIzNTZiMmMuLmYzY2EzMzAgMTAwNjQ0CiAgfQog IAogIC8qKgotQEAgLTEyMTYsNyArMTM0NSwzOSBAQCBfY29udGV4dF9yZXF1ZXN0X2VuZ2luZV9j YiAoQnVzSW5wdXRDb250CitAQCAtMTIxNiw3ICsxMzg2LDYxIEBAIF9jb250ZXh0X3JlcXVlc3Rf ZW5naW5lX2NiIChCdXNJbnB1dENvbnQKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgZ2NoYXIgICAgICplbmdpbmVfbmFtZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg QnVzSUJ1c0ltcGwgICAgICppYnVzKQogIHsKQEAgLTI5MiwyNCArMzQ2LDQ2IEBAIGluZGV4IGIz NTZiMmMuLmYzY2EzMzAgMTAwNjQ0CiArCiArI2lmIFVTRV9CUklER0VfSE9US0VZCiArICAgIElC dXNFbmdpbmVEZXNjICpjdXJyZW50X2Rlc2MgPSBOVUxMOworKwogKyAgICBpZiAoY29udGV4dCkg ewogKyAgICAgICAgQnVzRW5naW5lUHJveHkgKmVuZ2luZSA9IGJ1c19pbnB1dF9jb250ZXh0X2dl dF9lbmdpbmUgKGNvbnRleHQpOwogKyAgICAgICAgaWYgKGVuZ2luZSAhPSBOVUxMKSB7CiArICAg ICAgICAgICAgY3VycmVudF9kZXNjID0gYnVzX2VuZ2luZV9wcm94eV9nZXRfZGVzYyAoZW5naW5l KTsKICsgICAgICAgIH0KICsgICAgfQorKwogKyAgICBpZiAoY3VycmVudF9kZXNjKSB7CiArICAg ICAgICBpYnVzLT5wcmV2X2hvdGtleV9lbmdpbmUgPSBjdXJyZW50X2Rlc2M7CiArICAgIH0KKysK ICsgICAgaWYgKGN1cnJlbnRfZGVzYyAhPSBOVUxMICYmIGRlc2MgIT0gTlVMTCAmJgogKyAgICAg ICAgZ19zdHJjbXAwIChpYnVzX2VuZ2luZV9kZXNjX2dldF9uYW1lIChjdXJyZW50X2Rlc2MpLAog KyAgICAgICAgICAgICAgICAgICBpYnVzX2VuZ2luZV9kZXNjX2dldF9uYW1lIChkZXNjKSkgIT0g MCAmJgogKyAgICAgICAgZ19zdHJjbXAwIChpYnVzX2VuZ2luZV9kZXNjX2dldF9uYW1lIChkZXNj KSwKICsgICAgICAgICAgICAgICAgICAgREVGQVVMVF9CUklER0VfRU5HSU5FX05BTUUpID09IDAp IHsKLSsgICAgICAgIGNvbnN0IGdjaGFyICpob3RrZXlzID0gaWJ1c19lbmdpbmVfZGVzY19nZXRf aG90a2V5cyAoY3VycmVudF9kZXNjKTsKKysgICAgICAgIGNvbnN0IGdjaGFyICpob3RrZXlzID0g TlVMTDsKKysKKysgICAgICAgIC8qIElmIHRoZSB1c2VyIGN1c3RvbWl6ZWQgdGhlIHRyaWdnZXIg a2V5LCB0aGUgdHJpZ2dlciBrZXkgaXMgdXNlZCBmb3IKKysgICAgICAgICAqIGFueSBJQnVzIGVu Z2luZXMuICovCisrICAgICAgICBpZiAoX2JyaWRnZV90cmlnZ2VyX2tleXMgIT0gTlVMTCAmJgor KyAgICAgICAgICAgICpfYnJpZGdlX3RyaWdnZXJfa2V5cyAhPSAnXDAnICYmCisrICAgICAgICAg ICAgZ19zdHJjbXAwIChfYnJpZGdlX3RyaWdnZXJfa2V5cywgIkNvbnRyb2wrc3BhY2UiKSAhPSAw KSB7CisrCisrICAgICAgICAgICAgaG90a2V5cyA9IChjb25zdCBnY2hhciAqKSBfYnJpZGdlX3Ry aWdnZXJfa2V5czsKKysgICAgICAgIH0gZWxzZSB7CisrICAgICAgICAgICAgaG90a2V5cyA9IGli dXNfZW5naW5lX2Rlc2NfZ2V0X2hvdGtleXMgKGN1cnJlbnRfZGVzYyk7CisrICAgICAgICB9Cisr CisrICAgICAgICAvKiBJZiBlbmdpbmUgaG90a2V5cyBhcmUgbm90IGRlZmluZWQgaW4gdGhlIGNv bXBvc2UgeG1sIGZpbGUsIElCdXMgdHJpZ2dlcgorKyAgICAgICAgICoga2V5cyBhcmUgdXNlZC4g Ki8KICsgICAgICAgIGlmICghaG90a2V5cyB8fCAhKmhvdGtleXMpIHsKLSsgICAgICAgICAgICBo b3RrZXlzID0gIkNvbnRyb2wrc3BhY2UiOworKyAgICAgICAgICAgIGhvdGtleXMgPSAoY29uc3Qg Z2NoYXIgKikgX2JyaWRnZV90cmlnZ2VyX2tleXM7CisrICAgICAgICB9CisrCisrICAgICAgICBp ZiAoIWhvdGtleXMgfHwgISpob3RrZXlzKSB7CisrICAgICAgICAgICAgcmV0dXJuIGRlc2M7CiAr ICAgICAgICB9CisrCiArICAgICAgICBpYnVzX2hvdGtleV9wcm9maWxlX2ZvcmVhY2hfaG90a2V5 IChpYnVzLT5lbmdpbmVzX2hvdGtleV9wcm9maWxlLAogKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgX2ZvcmVhY2hfcmVtb3ZlX2VuZ2luZV9ob3RrZXksCiArICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmaWQpOwpAQCAtMzIwLDE5 ICszOTYsMjMgQEAgaW5kZXggYjM1NmIyYy4uZjNjYTMzMCAxMDA2NDQKICB9CiAgCiAgLyoqCi1A QCAtMjM1Nyw2ICsyNTE4LDExIEBAIGJ1c19pYnVzX2ltcGxfZmlsdGVyX2tleWJvYXJkX3Nob3J0 Y3V0cyAKLSAgICAgICAgICAqIHRoZSBzYW1lIGhvdGtleSwgdGhlbiB3ZSBzaG91bGQgc3dpdGNo IHRvIHRoZSBuZXh0IGVuZ2luZSB3aXRoIHRoZQotICAgICAgICAgICogc2FtZSBob3RrZXkgaW4g dGhlIGxpc3QuIE90aGVyd2lzZSwgd2UganVzdCBzd2l0Y2ggdG8gdGhlIGZpcnN0Ci0gICAgICAg ICAgKiBlbmdpbmUgaW4gdGhlIGxpc3QuICovCitAQCAtMjM1Myw2ICsyNTc3LDE1IEBAIGJ1c19p YnVzX2ltcGxfZmlsdGVyX2tleWJvYXJkX3Nob3J0Y3V0cyAKKyAKKyAgICAgICAgIGdfYXNzZXJ0 IChuZXdfZW5naW5lX2Rlc2MpOworIAogKyNpZiBVU0VfQlJJREdFX0hPVEtFWQotKyAgICAgICAg aWYgKGlidXMtPnByZXZfaG90a2V5X2VuZ2luZSkgeworKyAgICAgICAgLyogSWYgdGhlIHByZXZp b3VzIGVuZ2luZSBpcyBub3QgaW5jbHVkZWQgaW4gZW5naW5lX2xpc3QsCisrICAgICAgICAgKiB0 aGlzIGVuYWJsZXMgYSBuZXcgZW5naW5lIGluc3RlYWQgb2YgdG9nZ2xpbmcgdGhlIGVuZ2luZXMK KysgICAgICAgICAqIHNvIHNob3VsZCBub3QgZW5hYmxlIHRoZSBwcmV2aW91cyBlbmdpbmUuICov CisrICAgICAgICBpZiAoaWJ1cy0+cHJldl9ob3RrZXlfZW5naW5lICYmCisrICAgICAgICAgICAg Z19saXN0X2ZpbmQgKGVuZ2luZV9saXN0LCBpYnVzLT5wcmV2X2hvdGtleV9lbmdpbmUpICE9IE5V TEwpIHsKICsgICAgICAgICAgICBuZXdfZW5naW5lX2Rlc2MgPSBpYnVzLT5wcmV2X2hvdGtleV9l bmdpbmU7CiArICAgICAgICB9CiArI2Vsc2UKLSAgICAgICAgIEdMaXN0ICpwID0gZW5naW5lX2xp c3Q7Ci0gICAgICAgICBmb3IgKDsgcC0+bmV4dCAhPSBOVUxMOyBwID0gcC0+bmV4dCkgewotICAg ICAgICAgICAgIGlmIChjdXJyZW50X2VuZ2luZV9kZXNjID09IChJQnVzRW5naW5lRGVzYyAqKSBw LT5kYXRhKSB7Ci1AQCAtMjM2NCw4ICsyNTMwLDE2IEBAIGJ1c19pYnVzX2ltcGxfZmlsdGVyX2tl eWJvYXJkX3Nob3J0Y3V0cyAKKyAgICAgICAgIC8qIEZpbmQgb3V0IHdoYXQgZW5naW5lIHdlIHNo b3VsZCBzd2l0Y2ggdG8uIElmIHRoZSBjdXJyZW50IGVuZ2luZSBoYXMKKyAgICAgICAgICAqIHRo ZSBzYW1lIGhvdGtleSwgdGhlbiB3ZSBzaG91bGQgc3dpdGNoIHRvIHRoZSBuZXh0IGVuZ2luZSB3 aXRoIHRoZQorICAgICAgICAgICogc2FtZSBob3RrZXkgaW4gdGhlIGxpc3QuIE90aGVyd2lzZSwg d2UganVzdCBzd2l0Y2ggdG8gdGhlIGZpcnN0CitAQCAtMjM2NCw4ICsyNTk3LDMxIEBAIGJ1c19p YnVzX2ltcGxfZmlsdGVyX2tleWJvYXJkX3Nob3J0Y3V0cyAKICAgICAgICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgICAgICAgfQogICAgICAgICAgfQpAQCAtMzQzLDEzICs0MjMsMjggQEAgaW5k ZXggYjM1NmIyYy4uZjNjYTMzMCAxMDA2NDQKICsgICAgICAgICAgICBnX3N0cmNtcDAgKGlidXNf ZW5naW5lX2Rlc2NfZ2V0X25hbWUgKG5ld19lbmdpbmVfZGVzYyksCiArICAgICAgICAgICAgICAg ICAgICAgICBERUZBVUxUX0JSSURHRV9FTkdJTkVfTkFNRSkgPT0gMCkgewogKyAgICAgICAgICAg IGlidXMtPnByZXZfaG90a2V5X2VuZ2luZSA9IGN1cnJlbnRfZW5naW5lX2Rlc2M7CisrCisrICAg ICAgICAgICAgLyogSWYgdGhlIHByZXZpb3VzIGVuZ2luZSBpcyBub3QgaW5jbHVkZWQgaW4gZW5n aW5lX2xpc3QgYW5kCisrICAgICAgICAgICAgICogdGhlIGN1cnJlbnQgZW5naW5lIGlzIHRoZSBk ZWZ1YWx0IGJyaWRnZSBlbmdpbmUsCisrICAgICAgICAgICAgICogdGhlIGN1cnJlbnQgZW5naW5l IGlzIGFsc28gbm90IGluY2x1ZGVkIGluIGVuZ2luZV9saXN0LgorKyAgICAgICAgICAgICAqIFNv IHRoZSBlbmdpbmUgaXMgYWRkZWQgaGVyZS4gKi8KKysgICAgICAgICAgICBpZiAoZ19saXN0X2Zp bmQgKGVuZ2luZV9saXN0LCBjdXJyZW50X2VuZ2luZV9kZXNjKSA9PSBOVUxMICYmCisrICAgICAg ICAgICAgICAgIGdfc3RyY21wMCAoaWJ1c19lbmdpbmVfZGVzY19nZXRfbmFtZSAoY3VycmVudF9l bmdpbmVfZGVzYyksCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgREVGQVVMVF9CUklER0Vf RU5HSU5FX05BTUUpID09IDApIHsKKysgICAgICAgICAgICAgICAgZW5naW5lX2xpc3QgPSBnX2xp c3RfYXBwZW5kIChlbmdpbmVfbGlzdCwgY3VycmVudF9lbmdpbmVfZGVzYyk7CisrCisrICAgICAg ICAgICAgICAgIGdfaGFzaF90YWJsZV9zdGVhbCAoaWJ1cy0+aG90a2V5X3RvX2VuZ2luZXNfbWFw LAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdVSU5UX1RPX1BPSU5URVIg KGV2ZW50KSk7CisrICAgICAgICAgICAgICAgIGdfaGFzaF90YWJsZV9pbnNlcnQgKGlidXMtPmhv dGtleV90b19lbmdpbmVzX21hcCwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgR1VJTlRfVE9fUE9JTlRFUiAoZXZlbnQpLCBlbmdpbmVfbGlzdCk7CisrICAgICAgICAgICAg fQogKyNlbHNlCiAgICAgICAgICBpZiAoY3VycmVudF9lbmdpbmVfZGVzYyAhPSBuZXdfZW5naW5l X2Rlc2MpIHsKICsjZW5kaWYKICAgICAgICAgICAgICBidXNfaWJ1c19pbXBsX3NldF9jb250ZXh0 X2VuZ2luZV9mcm9tX2Rlc2MgKGlidXMsIGNvbnRleHQsIG5ld19lbmdpbmVfZGVzYyk7CiAgICAg ICAgICB9CiAgCi1AQCAtMjQ3MCwxNCArMjY0NCw2IEBAIHN0YXRpYyB2b2lkCitAQCAtMjQ3MCw1 OSArMjcyNiwzOSBAQCBzdGF0aWMgdm9pZAogIF9hZGRfZW5naW5lX2hvdGtleSAoSUJ1c0VuZ2lu ZURlc2MgKmVuZ2luZSwgQnVzSUJ1c0ltcGwgKmlidXMpCiAgewogICAgICBjb25zdCBnY2hhciAq aG90a2V5czsKQEAgLTM2NCwxMCArNDU5LDMyIEBAIGluZGV4IGIzNTZiMmMuLmYzY2EzMzAgMTAw NjQ0CiAgCiAgICAgIGlmICghZW5naW5lKSB7CiAgICAgICAgICByZXR1cm47Ci1AQCAtMjQ4OSw0 MCArMjY1NSw3IEBAIF9hZGRfZW5naW5lX2hvdGtleSAoSUJ1c0VuZ2luZURlc2MgKmVuZ2kKLSAg ICAgICAgIHJldHVybjsKICAgICAgfQogIAorKyNpZiBVU0VfQlJJREdFX0hPVEtFWQorKyAgICAv KiBJZiB0aGUgdXNlciBjdXN0b21pemVkIHRoZSB0cmlnZ2VyIGtleSwgdGhlIHRyaWdnZXIga2V5 IGlzIHVzZWQgZm9yCisrICAgICAqIGFueSBJQnVzIGVuZ2luZXMuICovCisrICAgIGlmIChfYnJp ZGdlX3RyaWdnZXJfa2V5cyAhPSBOVUxMICYmCisrICAgICAgICAqX2JyaWRnZV90cmlnZ2VyX2tl eXMgIT0gJ1wwJyAmJgorKyAgICAgICAgZ19zdHJjbXAwIChfYnJpZGdlX3RyaWdnZXJfa2V5cywg IkNvbnRyb2wrc3BhY2UiKSAhPSAwKSB7CisrCisrICAgICAgICBob3RrZXlzID0gKGNvbnN0IGdj aGFyICopIF9icmlkZ2VfdHJpZ2dlcl9rZXlzOworKyAgICB9IGVsc2UgeworKyAgICAgICAgaG90 a2V5cyA9IGlidXNfZW5naW5lX2Rlc2NfZ2V0X2hvdGtleXMgKGVuZ2luZSk7CisrICAgIH0KKysj ZWxzZQorICAgICBob3RrZXlzID0gaWJ1c19lbmdpbmVfZGVzY19nZXRfaG90a2V5cyAoZW5naW5l KTsKKysjZW5kaWYKKyAKKysjaWYgVVNFX0JSSURHRV9IT1RLRVkKKysgICAgLyogSWYgZW5naW5l IGhvdGtleXMgYXJlIG5vdCBkZWZpbmVkIGluIHRoZSBjb21wb3NlIHhtbCBmaWxlLCBJQnVzIHRy aWdnZXIKKysgICAgICoga2V5cyBhcmUgdXNlZC4gKi8KKyAgICAgaWYgKCFob3RrZXlzIHx8ICEq aG90a2V5cykgeworLSAgICAgICAgcmV0dXJuOworKyAgICAgICAgaG90a2V5cyA9IChjb25zdCBn Y2hhciAqKSBfYnJpZGdlX3RyaWdnZXJfa2V5czsKKyAgICAgfQorKyNlbmRpZgorIAogLSAgICBo b3RrZXlfbGlzdCA9IGdfc3Ryc3BsaXRfc2V0IChob3RrZXlzLCAiOywiLCAwKTsKIC0KIC0gICAg Zm9yIChwID0gaG90a2V5X2xpc3Q7IHAgJiYgKnA7ICsrcCkgewpAQCAtMzk5LDggKzUxNiwxMCBA QCBpbmRleCBiMzU2YjJjLi5mM2NhMzMwIDEwMDY0NAogLQogLSAgICAgICAgZ19oYXNoX3RhYmxl X2luc2VydCAoaWJ1cy0+aG90a2V5X3RvX2VuZ2luZXNfbWFwLAogLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgR1VJTlRfVE9fUE9JTlRFUiAoZXZlbnQpLCBlbmdpbmVfbGlzdCk7Ci0tICAg IH0KLS0KKysgICAgaWYgKCFob3RrZXlzIHx8ICEqaG90a2V5cykgeworKyAgICAgICAgcmV0dXJu OworICAgICB9CisgCiAtICAgIGdfc3RyZnJlZXYgKGhvdGtleV9saXN0KTsKICsgICAgX2FkZF9l bmdpbmVfaG90a2V5X3dpdGhfaG90a2V5cyAoZW5naW5lLCBpYnVzLCBob3RrZXlzKTsKICB9CkBA IC00NzMsNyArNTkyLDcgQEAgaW5kZXggYmM2NjgwZC4uZjQ3ZjcyNyAxMDA2NDQKICAKICBzdGF0 aWMgdm9pZAogZGlmZiAtLWdpdCBhL2NvbmZpZ3VyZS5hYyBiL2NvbmZpZ3VyZS5hYwotaW5kZXgg ODVlNWUzMC4uYTY5NzRkNCAxMDA2NDQKK2luZGV4IDg1ZTVlMzAuLjNhZGEyZjggMTAwNjQ0CiAt LS0gYS9jb25maWd1cmUuYWMKICsrKyBiL2NvbmZpZ3VyZS5hYwogQEAgLTQzOCw2ICs0MzgsMzQg QEAgZWxzZQpAQCAtNDkwLDcgKzYwOSw3IEBAIGluZGV4IDg1ZTVlMzAuLmE2OTc0ZDQgMTAwNjQ0 CiArCiAraWYgdGVzdCB4IiRlbmFibGVfYnJpZGdlX2hvdGtleSIgPSB4InllcyI7IHRoZW4KICsg ICAgVVNFX0JSSURHRV9IT1RLRVk9MQotKyAgICBUUklHR0VSX0hPVEtFWVM9IiIKKysgICAgVFJJ R0dFUl9IT1RLRVlTPSJDb250cm9sK3NwYWNlIgogK2Vsc2UKICsgICAgVVNFX0JSSURHRV9IT1RL RVk9MAogKyAgICBUUklHR0VSX0hPVEtFWVM9IkNvbnRyb2wrc3BhY2UsWmVua2FrdV9IYW5rYWt1 LEFsdCtLYW5qaSxBbHQrZ3JhdmUsSGFuZ3VsLEFsdCtSZWxlYXNlK0FsdF9SIgpAQCAtNzM3LDIy ICs4NTYsNiBAQCBpbmRleCA3N2QzOTE2Li5mNTYwNjcxIDEwMDY0NAogKwogIEdfRU5EX0RFQ0xT CiAgI2VuZGlmCi1kaWZmIC0tZ2l0IGEvc3JjL2lidXNlbmdpbmVkZXNjLmMgYi9zcmMvaWJ1c2Vu Z2luZWRlc2MuYwotaW5kZXggZmEzYTc2OC4uM2Q2MTAwZSAxMDA2NDQKLS0tLSBhL3NyYy9pYnVz ZW5naW5lZGVzYy5jCi0rKysgYi9zcmMvaWJ1c2VuZ2luZWRlc2MuYwotQEAgLTIzMiw3ICsyMzIs MTEgQEAgaWJ1c19lbmdpbmVfZGVzY19jbGFzc19pbml0IChJQnVzRW5naW5lRGVzY0NsYXNzICpj bGFzcykKLSAgICAgICAgICAgICAgICAgICAgIGdfcGFyYW1fc3BlY19zdHJpbmcgKCJob3RrZXlz IiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24gaG90a2V5cyIsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgIlRoZSBob3RrZXlzIG9mIGVuZ2luZSBkZXNjcmlwdGlvbiIs Ci0rI2lmIFVTRV9CUklER0VfSE9US0VZCi0rICAgICAgICAgICAgICAgICAgICAgICAgIkNvbnRy b2wrc3BhY2UiLAotKyNlbHNlCi0gICAgICAgICAgICAgICAgICAgICAgICAgIiIsCi0rI2VuZGlm Ci0gICAgICAgICAgICAgICAgICAgICAgICAgR19QQVJBTV9SRUFEV1JJVEUgfCBHX1BBUkFNX0NP TlNUUlVDVF9PTkxZKSk7Ci0gCi0gICAgIC8qKgogZGlmZiAtLWdpdCBhL3NyYy9pYnVzaG90a2V5 LmMgYi9zcmMvaWJ1c2hvdGtleS5jCiBpbmRleCAzMmY4MzM4Li5iZWY3ZGZjIDEwMDY0NAogLS0t IGEvc3JjL2lidXNob3RrZXkuYwpAQCAtNzk0LDEwICs4OTcsMTAgQEAgaW5kZXggOWEzNDFmNi4u OTJlYzZhZiAxMDA2NDQKICBHX0VORF9ERUNMUwogICNlbmRpZgogZGlmZiAtLWdpdCBhL3VpL2d0 ay9wYW5lbC5weSBiL3VpL2d0ay9wYW5lbC5weQotaW5kZXggZGU2NDkyMC4uNTgzOTIzOCAxMDA2 NDQKK2luZGV4IGRlNjQ5MjAuLjU1YWNkNWEgMTAwNjQ0CiAtLS0gYS91aS9ndGsvcGFuZWwucHkK ICsrKyBiL3VpL2d0ay9wYW5lbC5weQotQEAgLTEzMyw2ICsxMzMsMTQgQEAgY2xhc3MgUGFuZWwo aWJ1cy5QYW5lbEJhc2UpOgorQEAgLTEzMyw2ICsxMzMsMTUgQEAgY2xhc3MgUGFuZWwoaWJ1cy5Q YW5lbEJhc2UpOgogICAgICAgICAgIyBzZWxmLl9fYnVzLnJlcXVlc3RfbmFtZShpYnVzLnBhbmVs LklCVVNfU0VSVklDRV9QQU5FTCwgMCkKICAKICAgICAgICAgICMgaW5pdCB4a2IKQEAgLTgwOCwx MSArOTExLDEyIEBAIGluZGV4IGRlNjQ5MjAuLjU4MzkyMzggMTAwNjQ0CiArICAgICAgICBzZWxm Ll9fZGlzYWJsZWRfZW5naW5lc19pZCA9IC0xCiArICAgICAgICBzZWxmLl9fZGlzYWJsZWRfZW5n aW5lc19wcmV2X2lkID0gLTEKICsgICAgICAgIHNlbGYuX19kaXNhYmxlZF9lbmdpbmVzX3N3YXBw ZWQgPSAwCisrICAgICAgICBzZWxmLl9fc2hvdyA9IDAKICsKICAgICAgICAgIHNlbGYuX194a2Js YXlvdXQgPSBpYnVzLlhLQkxheW91dChzZWxmLl9fY29uZmlnKQogICAgICAgICAgdXNlX3hrYiA9 IHNlbGYuX19jb25maWcuZ2V0X3ZhbHVlKCJnZW5lcmFsIiwgInVzZV9zeXN0ZW1fa2V5Ym9hcmRf bGF5b3V0IiwgRmFsc2UpCiAgICAgICAgICBpZiBub3QgdXNlX3hrYjoKLUBAIC0xNDIsMTEgKzE1 MCwxOCBAQCBjbGFzcyBQYW5lbChpYnVzLlBhbmVsQmFzZSk6CitAQCAtMTQyLDExICsxNTEsMTgg QEAgY2xhc3MgUGFuZWwoaWJ1cy5QYW5lbEJhc2UpOgogICAgICAgICAgICAgIHZhbHVlID0gJ2Rl ZmF1bHQnCiAgICAgICAgICBpZiB2YWx1ZSAhPSAnZGVmYXVsdCc6CiAgICAgICAgICAgICAgc2Vs Zi5fX3hrYmxheW91dC5zZXRfZGVmYXVsdF9sYXlvdXQodmFsdWUpCkBAIC04MzEsNyArOTM1LDcg QEAgaW5kZXggZGU2NDkyMC4uNTgzOTIzOCAxMDA2NDQKICAKICAgICAgZGVmIHNldF9jdXJzb3Jf bG9jYXRpb24oc2VsZiwgeCwgeSwgdywgaCk6CiAgICAgICAgICBzZWxmLl9fY2FuZGlkYXRlX3Bh bmVsLnNldF9jdXJzb3JfbG9jYXRpb24oeCwgeSwgdywgaCkKLUBAIC0yMzMsMTIgKzI0OCw1NyBA QCBjbGFzcyBQYW5lbChpYnVzLlBhbmVsQmFzZSk6CitAQCAtMjMzLDEyICsyNDksNjkgQEAgY2xh c3MgUGFuZWwoaWJ1cy5QYW5lbEJhc2UpOgogICAgICBkZWYgX19zZXRfaW1fbmFtZShzZWxmLCBu YW1lKToKICAgICAgICAgIHNlbGYuX19sYW5ndWFnZV9iYXIuc2V0X2ltX25hbWUobmFtZSkKICAK QEAgLTg4MiwxNCArOTg2LDI3IEBAIGluZGV4IGRlNjQ5MjAuLjU4MzkyMzggMTAwNjQ0CiAgICAg ICAgICBzZWxmLnJlc2V0KCkKICAgICAgICAgIHNlbGYuX19mb2N1c19pYyA9IGlidXMuSW5wdXRD b250ZXh0KHNlbGYuX19idXMsIGljKQogICAgICAgICAgZW5hYmxlZCA9IHNlbGYuX19mb2N1c19p Yy5pc19lbmFibGVkKCkKLSAgICAgICAgIHNlbGYuX19sYW5ndWFnZV9iYXIuc2V0X2VuYWJsZWQo ZW5hYmxlZCkKKy0gICAgICAgIHNlbGYuX19sYW5ndWFnZV9iYXIuc2V0X2VuYWJsZWQoZW5hYmxl ZCkKICAKICsgICAgICAgIGlmIGlidXMudXNlX2JyaWRnZV9ob3RrZXkoKToKICsgICAgICAgICAg ICBzZWxmLl9fc2V0X2RlZmF1bHRfbGF5b3V0X2VuZ2luZSgpCisrICAgICAgICAgICAgaWYgc2Vs Zi5fX3Nob3cgIT0gMToKKysgICAgICAgICAgICAgICAgc2VsZi5fX2xhbmd1YWdlX2Jhci5zZXRf ZW5hYmxlZChlbmFibGVkKQorKyAgICAgICAgICAgIGVsaWYgZW5hYmxlZDoKKysgICAgICAgICAg ICAgICAgZW5naW5lID0gc2VsZi5fX2ZvY3VzX2ljLmdldF9lbmdpbmUoKQorKyAgICAgICAgICAg ICAgICBpZiBlbmdpbmUgIT0gTm9uZSBhbmQgXAorKyAgICAgICAgICAgICAgICAgICBlbmdpbmUu bmFtZSAhPSBpYnVzLkRFRkFVTFRfQlJJREdFX0VOR0lORV9OQU1FOgorKyAgICAgICAgICAgICAg ICAgICAgc2VsZi5fX2xhbmd1YWdlX2Jhci5zZXRfZW5hYmxlZChlbmFibGVkKQorKyAgICAgICAg ICAgICAgICBlbHNlOgorKyAgICAgICAgICAgICAgICAgICAgc2VsZi5fX2xhbmd1YWdlX2Jhci5z ZXRfZW5hYmxlZChGYWxzZSkKKysgICAgICAgICAgICBlbHNlOgorKyAgICAgICAgICAgICAgICBz ZWxmLl9fbGFuZ3VhZ2VfYmFyLnNldF9lbmFibGVkKEZhbHNlKQorKyAgICAgICAgZWxzZToKKysg ICAgICAgICAgICBzZWxmLl9fbGFuZ3VhZ2VfYmFyLnNldF9lbmFibGVkKGVuYWJsZWQpCiAgICAg ICAgICBpZiBub3QgZW5hYmxlZDoKICAgICAgICAgICAgICBzZWxmLl9fc2V0X2ltX2ljb24oSUNP Tl9LRVlCT0FSRCkKICAgICAgICAgICAgICBzZWxmLl9fc2V0X2ltX25hbWUoTm9uZSkKLUBAIC0y NTAsNyArMzEwLDcgQEAgY2xhc3MgUGFuZWwoaWJ1cy5QYW5lbEJhc2UpOgorQEAgLTI1MCw3ICsz MjMsNyBAQCBjbGFzcyBQYW5lbChpYnVzLlBhbmVsQmFzZSk6CiAgICAgICAgICAgICAgICAgIHNl bGYuX19zZXRfaW1faWNvbihlbmdpbmUuaWNvbikKICAgICAgICAgICAgICAgICAgc2VsZi5fX3Nl dF9pbV9uYW1lKGVuZ2luZS5sb25nbmFtZSkKICAgICAgICAgICAgICAgICAgaWYgc2VsZi5fX2J1 cy5nZXRfdXNlX3N5c19sYXlvdXQoKToKQEAgLTg5OCw3ICsxMDE1LDMwIEBAIGluZGV4IGRlNjQ5 MjAuLjU4MzkyMzggMTAwNjQ0CiAgICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICAg c2VsZi5fX3NldF9pbV9pY29uKElDT05fS0VZQk9BUkQpCiAgICAgICAgICAgICAgICAgIHNlbGYu X19zZXRfaW1fbmFtZShOb25lKQotQEAgLTI4Nyw3ICszNDcsNyBAQCBjbGFzcyBQYW5lbChpYnVz LlBhbmVsQmFzZSk6CitAQCAtMjczLDcgKzM0NiwyMSBAQCBjbGFzcyBQYW5lbChpYnVzLlBhbmVs QmFzZSk6CisgICAgICAgICAgICAgcmV0dXJuCisgCisgICAgICAgICBlbmFibGVkID0gc2VsZi5f X2ZvY3VzX2ljLmlzX2VuYWJsZWQoKQorLSAgICAgICAgc2VsZi5fX2xhbmd1YWdlX2Jhci5zZXRf ZW5hYmxlZChlbmFibGVkKQorKworKyAgICAgICAgaWYgaWJ1cy51c2VfYnJpZGdlX2hvdGtleSgp OgorKyAgICAgICAgICAgIGlmIHNlbGYuX19zaG93ICE9IDE6CisrICAgICAgICAgICAgICAgIHNl bGYuX19sYW5ndWFnZV9iYXIuc2V0X2VuYWJsZWQoZW5hYmxlZCkKKysgICAgICAgICAgICBlbGlm IGVuYWJsZWQ6CisrICAgICAgICAgICAgICAgIGVuZ2luZSA9IHNlbGYuX19mb2N1c19pYy5nZXRf ZW5naW5lKCkKKysgICAgICAgICAgICAgICAgaWYgZW5naW5lICE9IE5vbmUgYW5kIFwKKysgICAg ICAgICAgICAgICAgICAgZW5naW5lLm5hbWUgIT0gaWJ1cy5ERUZBVUxUX0JSSURHRV9FTkdJTkVf TkFNRToKKysgICAgICAgICAgICAgICAgICAgIHNlbGYuX19sYW5ndWFnZV9iYXIuc2V0X2VuYWJs ZWQoZW5hYmxlZCkKKysgICAgICAgICAgICAgICAgZWxzZToKKysgICAgICAgICAgICAgICAgICAg IHNlbGYuX19sYW5ndWFnZV9iYXIuc2V0X2VuYWJsZWQoRmFsc2UpCisrICAgICAgICAgICAgZWxz ZToKKysgICAgICAgICAgICAgICAgc2VsZi5fX2xhbmd1YWdlX2Jhci5zZXRfZW5hYmxlZChGYWxz ZSkKKysgICAgICAgIGVsc2U6CisrICAgICAgICAgICAgc2VsZi5fX2xhbmd1YWdlX2Jhci5zZXRf ZW5hYmxlZChlbmFibGVkKQorIAorICAgICAgICAgaWYgZW5hYmxlZCA9PSBGYWxzZToKKyAgICAg ICAgICAgICBzZWxmLnJlc2V0KCkKK0BAIC0yODcsNyArMzc0LDcgQEAgY2xhc3MgUGFuZWwoaWJ1 cy5QYW5lbEJhc2UpOgogICAgICAgICAgICAgICAgICBzZWxmLl9fc2V0X2ltX2ljb24oZW5naW5l Lmljb24pCiAgICAgICAgICAgICAgICAgIHNlbGYuX19zZXRfaW1fbmFtZShlbmdpbmUubG9uZ25h bWUpCiAgICAgICAgICAgICAgICAgIGlmIHNlbGYuX19idXMuZ2V0X3VzZV9zeXNfbGF5b3V0KCk6 CkBAIC05MDcsNyArMTA0NywxNSBAQCBpbmRleCBkZTY0OTIwLi41ODM5MjM4IDEwMDY0NAogICAg ICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgIHNlbGYuX19zZXRfaW1faWNvbihJQ09O X0tFWUJPQVJEKQogICAgICAgICAgICAgICAgICBzZWxmLl9fc2V0X2ltX25hbWUoTm9uZSkKLUBA IC00NDMsNiArNTAzLDIxIEBAIGNsYXNzIFBhbmVsKGlidXMuUGFuZWxCYXNlKToKK0BAIC0zMTUs NiArNDAyLDcgQEAgY2xhc3MgUGFuZWwoaWJ1cy5QYW5lbEJhc2UpOgorIAorICAgICBkZWYgX19j b25maWdfbG9hZF9zaG93KHNlbGYpOgorICAgICAgICAgc2hvdyA9IHNlbGYuX19jb25maWcuZ2V0 X3ZhbHVlKCJwYW5lbCIsICJzaG93IiwgMCkKKysgICAgICAgIHNlbGYuX19zaG93ID0gc2hvdwor ICAgICAgICAgc2VsZi5fX2xhbmd1YWdlX2Jhci5zZXRfc2hvdyhzaG93KQorIAorICAgICBkZWYg X19jb25maWdfbG9hZF9wb3NpdGlvbihzZWxmKToKK0BAIC00NDMsNiArNTMxLDIxIEBAIGNsYXNz IFBhbmVsKGlidXMuUGFuZWxCYXNlKToKICAgICAgIyAgICAgbWVudS5zZXRfdGFrZV9mb2N1cyhG YWxzZSkKICAgICAgIyAgICAgcmV0dXJuIG1lbnUKICAKQEAgLTkyOSw3ICsxMDc3LDcgQEAgaW5k ZXggZGU2NDkyMC4uNTgzOTIzOCAxMDA2NDQKICAgICAgZGVmIF9fY3JlYXRlX2ltX21lbnUoc2Vs Zik6CiAgICAgICAgICBlbmdpbmVzID0gc2VsZi5fX2J1cy5saXN0X2FjdGl2ZV9lbmdpbmVzKCkK ICAgICAgICAgIGN1cnJlbnRfZW5naW5lID0gXAotQEAgLTQ1MywyNSArNTI4LDMxIEBAIGNsYXNz IFBhbmVsKGlidXMuUGFuZWxCYXNlKToKK0BAIC00NTMsMjUgKzU1NiwzMSBAQCBjbGFzcyBQYW5l bChpYnVzLlBhbmVsQmFzZSk6CiAgICAgICAgICBzaXplID0gZ3RrLmljb25fc2l6ZV9sb29rdXAo Z3RrLklDT05fU0laRV9NRU5VKQogICAgICAgICAgbWVudSA9IGd0ay5NZW51KCkKICAgICAgICAg IGZvciBpLCBlbmdpbmUgaW4gZW51bWVyYXRlKGVuZ2luZXMpOgpAQCAtOTc0LDcgKzExMjIsNyBA QCBpbmRleCBkZTY0OTIwLi41ODM5MjM4IDEwMDY0NAogIAogICAgICAgICAgbWVudS5zaG93X2Fs bCgpCiAgICAgICAgICBtZW51LnNldF90YWtlX2ZvY3VzKEZhbHNlKQotQEAgLTUyMyw4ICs2MDQs MjUgQEAgY2xhc3MgUGFuZWwoaWJ1cy5QYW5lbEJhc2UpOgorQEAgLTUyMyw4ICs2MzIsMjUgQEAg Y2xhc3MgUGFuZWwoaWJ1cy5QYW5lbEJhc2UpOgogICAgICAgICAgaWYgbm90IHNlbGYuX19mb2N1 c19pYzoKICAgICAgICAgICAgICByZXR1cm4KICAgICAgICAgIGlmIGVuZ2luZToKQEAgLTEwMDEs NyArMTE0OSw3IEBAIGluZGV4IGRlNjQ5MjAuLjU4MzkyMzggMTAwNjQ0CiAgICAgICAgICAgICAg c2VsZi5fX2ZvY3VzX2ljLmRpc2FibGUoKQogIAogICAgICBkZWYgX19zeXNfbWVudV9pdGVtX2Fj dGl2YXRlX2NiKHNlbGYsIGl0ZW0sIGNvbW1hbmQpOgotQEAgLTU3MywxMSArNjcxLDM0IEBAIGNs YXNzIFBhbmVsKGlidXMuUGFuZWxCYXNlKToKK0BAIC01NzMsMTEgKzY5OSwzNCBAQCBjbGFzcyBQ YW5lbChpYnVzLlBhbmVsQmFzZSk6CiAgICAgICAgICBzZWxmLl9fc2V0dXBfcGlkID0gcGlkCiAg ICAgICAgICBnbGliLmNoaWxkX3dhdGNoX2FkZChzZWxmLl9fc2V0dXBfcGlkLCBzZWxmLl9fY2hp bGRfd2F0Y2hfY2IpCiAgCgpkaWZmIC0tZ2l0IGEvaWJ1cy5zcGVjIGIvaWJ1cy5zcGVjCmluZGV4 IGQ1ZDcyYTguLjdhOTE2MmMgMTAwNjQ0Ci0tLSBhL2lidXMuc3BlYworKysgYi9pYnVzLnNwZWMK QEAgLTEzLDcgKzEzLDcgQEAKIAogTmFtZTogICAgICAgaWJ1cwogVmVyc2lvbjogICAgMS4zLjk5 LjIwMTEwNDE5Ci1SZWxlYXNlOiAgICA3JXs/ZGlzdH0KK1JlbGVhc2U6ICAgIDglez9kaXN0fQog U3VtbWFyeTogICAgSW50ZWxsaWdlbnQgSW5wdXQgQnVzIGZvciBMaW51eCBPUwogTGljZW5zZTog ICAgTEdQTHYyKwogR3JvdXA6ICAgICAgU3lzdGVtIEVudmlyb25tZW50L0xpYnJhcmllcwpAQCAt MzU0LDcgKzM1NCw3IEBAIGZpCiAle19kYXRhZGlyfS9ndGstZG9jL2h0bWwvKgogCiAlY2hhbmdl bG9nCi0qIE1vbiBKdW4gMjAgMjAxMSBUYWthbyBGdWppd2FyYSA8dGZ1aml3YXJAcmVkaGF0LmNv bT4gLSAxLjMuOTkuMjAxMTA0MTktNworKiBNb24gSnVuIDIwIDIwMTEgVGFrYW8gRnVqaXdhcmEg PHRmdWppd2FyQHJlZGhhdC5jb20+IC0gMS4zLjk5LjIwMTEwNDE5LTgKIC0gVXBkYXRlZCBpYnVz LUhFQUQucGF0Y2ggZm9yIHVwc3RyZWFtLgogLSBSZW1vdmVkIGlidXMtNDM1ODgwLXN1cnJvdW5k aW5nLXRleHQucGF0Y2ggYXMgdXBzdHJlYW0uCiAtIEFkZGVkIGlidXMtNzExNjMyLWZlZG9yYS1m YWxsYmFjay1pY29uLnBhdGNoCg==