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 <tfujiwar@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/ibus] autotool: Bug 1876877 - Fix to pull the correct language with no iso639 variants
Date: Sun, 31 May 2026 02:07:29 GMT
Message-ID: <178019324909.1.12056950970695060281.rpms-ibus-36d4212fc26d@fedoraproject.org>
List-ID: <git-commits.fedoraproject.org>
X-Git-Repo: rpms/ibus
X-Git-Branch: autotool
X-Git-Rev: 36d4212fc26def2c067e83577e0c65db46fdc036

ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl
cG8gICA6IHJwbXMvaWJ1cwogICAgICAgICAgICBCcmFuY2ggOiBhdXRvdG9vbAogICAgICAgICAg
ICBDb21taXQgOiAzNmQ0MjEyZmMyNmRlZjJjMDY3ZTgzNTc3ZTBjNjVkYjQ2ZmRjMDM2CiAgICAg
ICAgICAgIEF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgogICAg
ICAgICAgICBEYXRlICAgOiAyMDIwLTA5LTA5VDE5OjI1OjUxKzA5OjAwCiAgICAgICAgICAgIFN0
YXRzICA6ICsyOTYvLTMgaW4gNCBmaWxlKHMpCiAgICAgICAgICAgIFVSTCAgICA6IGh0dHBzOi8v
c3JjLmZlZG9yYXByb2plY3Qub3JnL3JwbXMvaWJ1cy9jLzM2ZDQyMTJmYzI2ZGVmMmMwNjdlODM1
NzdlMGM2NWRiNDZmZGMwMzY/YnJhbmNoPWF1dG90b29sCgogICAgICAgICAgICBMb2c6CiAgICAg
ICAgICAgIEJ1ZyAxODc2ODc3IC0gRml4IHRvIHB1bGwgdGhlIGNvcnJlY3QgbGFuZ3VhZ2Ugd2l0
aCBubyBpc282MzkgdmFyaWFudHMKCi0gQWNjZXB0IHhkaWdpdHMgb25seSBmb3IgVW5pY29kZSB0
eXBpbmcKCi0tLQpkaWZmIC0tZ2l0IGEvLmdpdGlnbm9yZSBiLy5naXRpZ25vcmUKaW5kZXggODFh
YTY4Zi4uZmRhMTMxNCAxMDA2NDQKLS0tIGEvLmdpdGlnbm9yZQorKysgYi8uZ2l0aWdub3JlCkBA
IC01NywzICs1Nyw0IEBAIGlidXMtMS4zLjYudGFyLmd6CiAvaWJ1cy0xLjUuMjEudGFyLmd6CiAv
aWJ1cy0xLjUuMjIudGFyLmd6CiAvaWJ1cy1zaW1wbGUtMS41LjIyLjIwMjAwODI3LnhtbC5negor
L2lidXMtc2ltcGxlLTEuNS4yMi4yMDIwMDkwOS54bWwuZ3oKCmRpZmYgLS1naXQgYS9pYnVzLUhF
QUQucGF0Y2ggYi9pYnVzLUhFQUQucGF0Y2gKaW5kZXggOGFlYmM4NS4uYTBmNmUzYSAxMDA2NDQK
LS0tIGEvaWJ1cy1IRUFELnBhdGNoCisrKyBiL2lidXMtSEVBRC5wYXRjaApAQCAtMjM2OCwzICsy
MzY4LDI5MSBAQCBpbmRleCAxMWJjYzZjMi4uYTZlNDE5NGIgMTAwNzU1CiAtLSAKIDIuMjQuMQog
CitGcm9tIDAwYWRlYTZkMTY5MzllMmRhMzVlZGU3ZjJlY2YzZmUwYTIxNTZmYTYgTW9uIFNlcCAx
NyAwMDowMDowMCAyMDAxCitGcm9tOiAibnRmcy5oYXJkIiA8bnRmcy5oYXJkQGdtYWlsLmNvbT4K
K0RhdGU6IFRodSwgMyBTZXAgMjAyMCAxNDo1OTozNSArMDkwMAorU3ViamVjdDogW1BBVENIXSBG
aXggZm9yIHNldmVyYWwgZXJyb3Igc3BvdHRlZCBieSBzdGF0aWMgYW5hbHl6ZXIKKworLSBpYnVz
Y29tcG9zZXRhYmxlLmMsIGlidXN4bWwuYzoKK0NoZWNrIHNpemUgYmVmb3JlIG1lbW9yeSBhY2Nl
c3MKKworLSBpbnB1dGNvbnRleHQuYzoKK1VzZSBsb2dpY2FsIG9wZXJhdG9yIGZvciBib29sIHR5
cGUgdmFyaWFibGVzCisKKy0gY29uZmlnLmM6CitFeHRyYSBicmVhayByZW1vdmVkCisKK0JVRz1o
dHRwczovL2dpdGh1Yi5jb20vaWJ1cy9pYnVzL3B1bGwvMjI0MgorLS0tCisgYnVzL2lucHV0Y29u
dGV4dC5jICAgICB8IDYgKysrLS0tCisgc3JjL2lidXNjb21wb3NldGFibGUuYyB8IDIgKy0KKyBz
cmMvaWJ1c3htbC5jICAgICAgICAgIHwgMiArLQorIDQgZmlsZXMgY2hhbmdlZCwgNSBpbnNlcnRp
b25zKCspLCA2IGRlbGV0aW9ucygtKQorCitkaWZmIC0tZ2l0IGEvYnVzL2lucHV0Y29udGV4dC5j
IGIvYnVzL2lucHV0Y29udGV4dC5jCitpbmRleCBjZWVhNGI2MC4uOGQ4NGZkMDUgMTAwNjQ0Cist
LS0gYS9idXMvaW5wdXRjb250ZXh0LmMKKysrKyBiL2J1cy9pbnB1dGNvbnRleHQuYworQEAgLTI4
NDIsMTEgKzI4NDIsMTEgQEAgYnVzX2lucHV0X2NvbnRleHRfdXBkYXRlX3ByZWVkaXRfdGV4dCAo
QnVzSW5wdXRDb250ZXh0ICpjb250ZXh0LAorICAgICBjb250ZXh0LT5wcmVlZGl0X3RleHQgPSAo
SUJ1c1RleHQgKikgZ19vYmplY3RfcmVmX3NpbmsgKHRleHQgPyB0ZXh0IDoKKyAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0ZXh0X2Vt
cHR5KTsKKyAgICAgY29udGV4dC0+cHJlZWRpdF9jdXJzb3JfcG9zID0gY3Vyc29yX3BvczsKKy0g
ICAgaWYgKHVzZV9leHRlbnNpb24pCisrICAgIGlmICh1c2VfZXh0ZW5zaW9uKSB7CisgICAgICAg
ICBjb250ZXh0LT5wcmVlZGl0X3Zpc2libGUgPSB2aXNpYmxlOworLSAgICBpZiAodXNlX2V4dGVu
c2lvbikKKyAgICAgICAgIGNvbnRleHQtPnByZWVkaXRfbW9kZSA9IG1vZGU7CistICAgIGV4dGVu
c2lvbl92aXNpYmxlID0gY29udGV4dC0+cHJlZWRpdF92aXNpYmxlIHwKKysgICAgfQorKyAgICBl
eHRlbnNpb25fdmlzaWJsZSA9IGNvbnRleHQtPnByZWVkaXRfdmlzaWJsZSB8fAorICAgICAgICAg
ICAgICAgICAgICAgICAgIChjb250ZXh0LT5lbW9qaV9leHRlbnNpb24gIT0gTlVMTCk7CisgCisg
ICAgIGlmICh1c2VfZXh0ZW5zaW9uICYmIGNvbnRleHQtPmVtb2ppX2V4dGVuc2lvbikgeworZGlm
ZiAtLWdpdCBhL3NyYy9pYnVzY29tcG9zZXRhYmxlLmMgYi9zcmMvaWJ1c2NvbXBvc2V0YWJsZS5j
CitpbmRleCBjNTBiZTJiMy4uZWYyMDQ2OWMgMTAwNjQ0CistLS0gYS9zcmMvaWJ1c2NvbXBvc2V0
YWJsZS5jCisrKysgYi9zcmMvaWJ1c2NvbXBvc2V0YWJsZS5jCitAQCAtMzgyLDcgKzM4Miw3IEBA
IGlidXNfY29tcG9zZV9saXN0X2NoZWNrX2R1cGxpY2F0ZWQgKEdMaXN0ICpjb21wb3NlX2xpc3Qs
CisgICAgICAgICAgICAgCisgICAgICAgICAgICAgaWYgKG5fb3V0cHV0cyA9PSB1bmljaGFyX2xl
bmd0aCAob3V0cHV0X2NoYXJzKSkgeworICAgICAgICAgICAgICAgICBpbnQgaiA9IDA7CistICAg
ICAgICAgICAgICAgIHdoaWxlIChjb21wb3NlX2RhdGEtPnZhbHVlc1tqXSAmJiBqIDwgbl9vdXRw
dXRzKSB7CisrICAgICAgICAgICAgICAgIHdoaWxlIChqIDwgbl9vdXRwdXRzICYmIGNvbXBvc2Vf
ZGF0YS0+dmFsdWVzW2pdKSB7CisgICAgICAgICAgICAgICAgICAgICBpZiAoY29tcG9zZV9kYXRh
LT52YWx1ZXNbal0gIT0gb3V0cHV0X2NoYXJzW2pdKQorICAgICAgICAgICAgICAgICAgICAgICAg
IGJyZWFrOworICAgICAgICAgICAgICAgICAgICAgKytqOworZGlmZiAtLWdpdCBhL3NyYy9pYnVz
eG1sLmMgYi9zcmMvaWJ1c3htbC5jCitpbmRleCAyNjZhODIwNy4uYjZkMGZlYjggMTAwNjQ0Cist
LS0gYS9zcmMvaWJ1c3htbC5jCisrKysgYi9zcmMvaWJ1c3htbC5jCitAQCAtMTQ4LDcgKzE0OCw3
IEBAIF9pc19zcGFjZSAoY29uc3QgZ2NoYXIgKnRleHQsCisgeworICAgICBnc2l6ZSBpID0gMDsK
KyAKKy0gICAgZm9yIChpID0gMDsgdGV4dFtpXSAhPSAnXDAnICYmIGkgPCB0ZXh0X2xlbjsgaSsr
KSB7CisrICAgIGZvciAoaSA9IDA7IGkgPCB0ZXh0X2xlbiAmJiB0ZXh0W2ldICE9ICdcMCc7IGkr
KykgeworICAgICAgICAgc3dpdGNoICh0ZXh0W2ldKSB7CisgICAgICAgICBjYXNlICdcdCc6Cisg
ICAgICAgICBjYXNlICcgJzoKKy0tIAorMi4yNC4xCisKK0Zyb20gN2NhZWFkMTBkMzY5OGVmMWVj
YWE5N2U2ZTEyMmUyN2E3MjBkNjEyZSBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206IGZ1
aml3YXJhdCA8dGFrYW8uZnVqaXdhcmExQGdtYWlsLmNvbT4KK0RhdGU6IFRodSwgMyBTZXAgMjAy
MCAyMToyMTozMSArMDkwMAorU3ViamVjdDogW1BBVENIXSBGaXggc3RyaW5nIGZvcm1hdHMgaW4g
dHJhbnNsYXRhYmxlIHN0cmluZ3MKKworLS0tCisgZGF0YS9kY29uZi9vcmcuZnJlZWRlc2t0b3Au
aWJ1cy5nc2NoZW1hLnhtbCB8ICAyICstCisgc2V0dXAvZW5naW5ldHJlZXZpZXcucHkgICAgICAg
ICAgICAgICAgICAgICB8ICA2ICsrKy0tLQorIHNldHVwL21haW4ucHkgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgfCAgNiArKystLS0KKyB0b29scy9tYWluLnZhbGEgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgIHwgIDQgKystLQorIDYgZmlsZXMgY2hhbmdlZCwgMTYgaW5zZXJ0aW9u
cygrKSwgMTYgZGVsZXRpb25zKC0pCisKK2RpZmYgLS1naXQgYS9kYXRhL2Rjb25mL29yZy5mcmVl
ZGVza3RvcC5pYnVzLmdzY2hlbWEueG1sIGIvZGF0YS9kY29uZi9vcmcuZnJlZWRlc2t0b3AuaWJ1
cy5nc2NoZW1hLnhtbAoraW5kZXggMTFhMTc5YTYuLmE3OWU5Mjk2IDEwMDY0NAorLS0tIGEvZGF0
YS9kY29uZi9vcmcuZnJlZWRlc2t0b3AuaWJ1cy5nc2NoZW1hLnhtbAorKysrIGIvZGF0YS9kY29u
Zi9vcmcuZnJlZWRlc2t0b3AuaWJ1cy5nc2NoZW1hLnhtbAorQEAgLTE5NSw3ICsxOTUsNyBAQAor
ICAgICA8a2V5IG5hbWU9ImxhbmciIHR5cGU9InMiPgorICAgICAgIDxkZWZhdWx0Pidlbic8L2Rl
ZmF1bHQ+CisgICAgICAgPHN1bW1hcnk+RGVmYXVsdCBsYW5ndWFnZSBmb3IgZW1vamkgZGljdGlv
bmFyeTwvc3VtbWFyeT4KKy0gICAgICA8ZGVzY3JpcHRpb24+Q2hvb3NlIGEgZGVmYXVsdCBsYW5n
dWFnZSBvZiBlbW9qaSBkaWN0aW9uYXJpZXMgb24gdGhlIGVtb2ppIGRpYWxvZy4gVGhlIHZhbHVl
ICRsYW5nIGlzIGFwcGxpZWQgdG8gL3Vzci9zaGFyZS9pYnVzL2RpY3RzL2Vtb2ppLSRsYW5nLmRp
Y3Q8L2Rlc2NyaXB0aW9uPgorKyAgICAgIDxkZXNjcmlwdGlvbj5DaG9vc2UgYSBkZWZhdWx0IGxh
bmd1YWdlIG9mIGVtb2ppIGRpY3Rpb25hcmllcyBvbiB0aGUgZW1vamkgZGlhbG9nLiBUaGUgdmFs
dWUgJGxhbmcgaXMgYXBwbGllZCB0byAvdXNyL3NoYXJlL2lidXMvZGljdHMvZW1vamktJGxhbmcu
ZGljdCAuPC9kZXNjcmlwdGlvbj4KKyAgICAgPC9rZXk+CisgICAgIDxrZXkgbmFtZT0iZmF2b3Jp
dGVzIiB0eXBlPSJhcyI+CisgICAgICAgPGRlZmF1bHQ+W108L2RlZmF1bHQ+CitkaWZmIC0tZ2l0
IGEvc2V0dXAvZW5naW5ldHJlZXZpZXcucHkgYi9zZXR1cC9lbmdpbmV0cmVldmlldy5weQoraW5k
ZXggYWVhODQ1OTMuLjg1MzRkZTVlIDEwMDY0NAorLS0tIGEvc2V0dXAvZW5naW5ldHJlZXZpZXcu
cHkKKysrKyBiL3NldHVwL2VuZ2luZXRyZWV2aWV3LnB5CitAQCAtMyw4ICszLDggQEAKKyAjIGli
dXMgLSBUaGUgSW5wdXQgQnVzCisgIworICMgQ29weXJpZ2h0IChjKSAyMDA3LTIwMTUgUGVuZyBI
dWFuZyA8c2hhd24ucC5odWFuZ0BnbWFpbC5jb20+CistIyBDb3B5cmlnaHQgKGMpIDIwMTQtMjAx
OCBUYWthbyBGdWppd2FyYSA8dGFrYW8uZnVqaXdhcmExQGdtYWlsLmNvbT4KKy0jIENvcHlyaWdo
dCAoYykgMjAwNy0yMDE4IFJlZCBIYXQsIEluYy4KKysjIENvcHlyaWdodCAoYykgMjAxNC0yMDIw
IFRha2FvIEZ1aml3YXJhIDx0YWthby5mdWppd2FyYTFAZ21haWwuY29tPgorKyMgQ29weXJpZ2h0
IChjKSAyMDA3LTIwMjAgUmVkIEhhdCwgSW5jLgorICMKKyAjIFRoaXMgbGlicmFyeSBpcyBmcmVl
IHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKKyAjIG1vZGlmeSBpdCB1
bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMKK0BAIC05Myw3
ICs5Myw3IEBAIGNsYXNzIEVuZ2luZVRyZWVWaWV3KEd0ay5UcmVlVmlldyk6CisgICAgICAgICBy
ZW5kZXJlci5zZXRfcHJvcGVydHkoImhhcy1lbnRyeSIsIEZhbHNlKQorICAgICAgICAgcmVuZGVy
ZXIuc2V0X3Byb3BlcnR5KCJlZGl0YWJsZSIsIFRydWUpCisgCistICAgICAgICBjb2x1bW4gPSBH
dGsuVHJlZVZpZXdDb2x1bW4oXygiS2JkIikpCisrICAgICAgICBjb2x1bW4gPSBHdGsuVHJlZVZp
ZXdDb2x1bW4oIktiZCIpCisgICAgICAgICBjb2x1bW4uc2V0X2V4cGFuZChGYWxzZSkKKyAgICAg
ICAgIGNvbHVtbi5zZXRfZml4ZWRfd2lkdGgoMzIpCisgICAgICAgICBjb2x1bW4uc2V0X3Npemlu
ZyhHdGsuVHJlZVZpZXdDb2x1bW5TaXppbmcuRklYRUQpCitkaWZmIC0tZ2l0IGEvc2V0dXAvbWFp
bi5weSBiL3NldHVwL21haW4ucHkKK2luZGV4IDhjOGQ3YTQ3Li42NzNjOGNkZSAxMDA2NDQKKy0t
LSBhL3NldHVwL21haW4ucHkKKysrKyBiL3NldHVwL21haW4ucHkKK0BAIC00LDggKzQsOCBAQAor
ICMgaWJ1cyAtIFRoZSBJbnB1dCBCdXMKKyAjCisgIyBDb3B5cmlnaHQgKGMpIDIwMDctMjAxNiBQ
ZW5nIEh1YW5nIDxzaGF3bi5wLmh1YW5nQGdtYWlsLmNvbT4KKy0jIENvcHlyaWdodCAoYykgMjAx
MC0yMDE4IFRha2FvIEZ1aml3YXJhIDx0YWthby5mdWppd2FyYTFAZ21haWwuY29tPgorLSMgQ29w
eXJpZ2h0IChjKSAyMDA3LTIwMTYgUmVkIEhhdCwgSW5jLgorKyMgQ29weXJpZ2h0IChjKSAyMDEw
LTIwMjAgVGFrYW8gRnVqaXdhcmEgPHRha2FvLmZ1aml3YXJhMUBnbWFpbC5jb20+CisrIyBDb3B5
cmlnaHQgKGMpIDIwMDctMjAyMCBSZWQgSGF0LCBJbmMuCisgIworICMgVGhpcyBsaWJyYXJ5IGlz
IGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgorICMgbW9kaWZ5
IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExlc3NlciBHZW5lcmFsIFB1YmxpYworQEAg
LTU0Nyw3ICs1NDcsNyBAQCBjbGFzcyBTZXR1cChvYmplY3QpOgorICAgICAgICAgICAgIHNlbGYu
X19mbHVzaF9ndGtfZXZlbnRzKCkKKyAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgIyBUcmFu
c2xhdG9yczogJWQgPT0gNSBjdXJyZW50bHkKKy0gICAgICAgICAgICBtZXNzYWdlID0gXygiSUJ1
cyBkYWVtb24gY291bGQgbm90IGJlIHN0YXJ0ZWQgaW4gJWQgc2Vjb25kcyIpCisrICAgICAgICAg
ICAgbWVzc2FnZSA9IF8oIklCdXMgZGFlbW9uIGNvdWxkIG5vdCBiZSBzdGFydGVkIGluICVkIHNl
Y29uZHMuIikKKyAgICAgICAgICAgICBkbGcgPSBHdGsuTWVzc2FnZURpYWxvZyhtZXNzYWdlX3R5
cGUgPSBHdGsuTWVzc2FnZVR5cGUuSU5GTywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICBidXR0b25zID0gR3RrLkJ1dHRvbnNUeXBlLk9LLAorICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgIHRleHQgPSBtZXNzYWdlICUgdGltZW91dCkKK2RpZmYgLS1naXQg
YS90b29scy9tYWluLnZhbGEgYi90b29scy9tYWluLnZhbGEKK2luZGV4IGJmOWMwZmM5Li4yNmU3
ZmQ4OCAxMDA2NDQKKy0tLSBhL3Rvb2xzL21haW4udmFsYQorKysrIGIvdG9vbHMvbWFpbi52YWxh
CitAQCAtMyw3ICszLDcgQEAKKyAgKiBpYnVzIC0gVGhlIElucHV0IEJ1cworICAqCisgICogQ29w
eXJpZ2h0KGMpIDIwMTMgUGVuZyBIdWFuZyA8c2hhd24ucC5odWFuZ0BnbWFpbC5jb20+CistICog
Q29weXJpZ2h0KGMpIDIwMTUtMjAxOCBUYWthbyBGdWppd2FyYSA8dGFrYW8uZnVqaXdhcmExQGdt
YWlsLmNvbT4KKysgKiBDb3B5cmlnaHQoYykgMjAxNS0yMDIwIFRha2FvIEZ1aml3YXJhIDx0YWth
by5mdWppd2FyYTFAZ21haWwuY29tPgorICAqCisgICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29m
dHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgorICAqIG1vZGlmeSBpdCB1bmRl
ciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMKK0BAIC00NTMsNyAr
NDUzLDcgQEAgY29uc3QgQ29tbWFuZEVudHJ5IGNvbW1hbmRzW10gID0geworICAgICB7ICJyZWFk
LWNvbmZpZyIsIE5fKCJTaG93IHRoZSBjb25maWd1cmF0aW9uIHZhbHVlcyIpLCByZWFkX2NvbmZp
ZyB9LAorICAgICB7ICJyZXNldC1jb25maWciLCBOXygiUmVzZXQgdGhlIGNvbmZpZ3VyYXRpb24g
dmFsdWVzIiksIHJlc2V0X2NvbmZpZyB9LAorICNpZiBFTU9KSV9ESUNUCistICAgIHsgImVtb2pp
IiwgTl8oIlNhdmUgZW1vamkgb24gZGlhbG9nIHRvIGNsaXBib2FyZCAiKSwgZW1vamlfZGlhbG9n
IH0sCisrICAgIHsgImVtb2ppIiwgTl8oIlNhdmUgZW1vamkgb24gZGlhbG9nIHRvIGNsaXBib2Fy
ZCIpLCBlbW9qaV9kaWFsb2cgfSwKKyAjZW5kaWYKKyAgICAgeyAiaGVscCIsIE5fKCJTaG93IHRo
aXMgaW5mb3JtYXRpb24iKSwgcHJpbnRfaGVscCB9CisgfTsKKy0tIAorMi4yNC4xCisKK0Zyb20g
YTQ0MDk0MmE2MmM0NjU3ODM3N2E4Njc5YzQ4MTQ2ZjU5N2UzMzhhNCBNb24gU2VwIDE3IDAwOjAw
OjAwIDIwMDEKK0Zyb206IGZ1aml3YXJhdCA8dGFrYW8uZnVqaXdhcmExQGdtYWlsLmNvbT4KK0Rh
dGU6IFdlZCwgOSBTZXAgMjAyMCAxODozNjoxOCArMDkwMAorU3ViamVjdDogW1BBVENIXSB1aS9n
dGszOiBBY2NlcHQgeGRpZ2l0cyBvbmx5IGZvciBVbmljb2RlIHR5cGluZworCitDdHJsLVNoaWZ0
LXUgYmVoYXZpb3Igbm93IGZvbGxvd3MgR1RLJ3Mgb25lLgorCitCVUc9aHR0cHM6Ly9naXRodWIu
Y29tL2lidXMvaWJ1cy9pc3N1ZXMvMjI0OQorLS0tCisgdWkvZ3RrMy9wYW5lbGJpbmRpbmcudmFs
YSB8IDggKysrKystLS0KKyAxIGZpbGUgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCspLCAzIGRlbGV0
aW9ucygtKQorCitkaWZmIC0tZ2l0IGEvdWkvZ3RrMy9wYW5lbGJpbmRpbmcudmFsYSBiL3VpL2d0
azMvcGFuZWxiaW5kaW5nLnZhbGEKK2luZGV4IDAxYzQzYjBkLi44NjEyNTViMSAxMDA2NDQKKy0t
LSBhL3VpL2d0azMvcGFuZWxiaW5kaW5nLnZhbGEKKysrKyBiL3VpL2d0azMvcGFuZWxiaW5kaW5n
LnZhbGEKK0BAIC0zLDcgKzMsNyBAQAorICAqIGlidXMgLSBUaGUgSW5wdXQgQnVzCisgICoKKyAg
KiBDb3B5cmlnaHQoYykgMjAxOCBQZW5nIEh1YW5nIDxzaGF3bi5wLmh1YW5nQGdtYWlsLmNvbT4K
Ky0gKiBDb3B5cmlnaHQoYykgMjAxOCBUYWthbyBGdWp3aWFyYSA8dGFrYW8uZnVqaXdhcmExQGdt
YWlsLmNvbT4KKysgKiBDb3B5cmlnaHQoYykgMjAxOC0yMDIwIFRha2FvIEZ1andpYXJhIDx0YWth
by5mdWppd2FyYTFAZ21haWwuY29tPgorICAqCisgICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29m
dHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgorICAqIG1vZGlmeSBpdCB1bmRl
ciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMKK0BAIC0xOTAsNyAr
MTkwLDcgQEAgY2xhc3MgUHJlZWRpdCA6IEd0ay5XaW5kb3cgeworIAorICAgICBwdWJsaWMgSUJ1
cy5UZXh0IGdldF9jb21taXRfdGV4dCgpIHsKKyAgICAgICAgIHN0cmluZyBleHRlbnNpb25fdGV4
dCA9IG1fZXh0ZW5zaW9uX3ByZWVkaXRfZW1vamkuZ2V0X3RleHQoKTsKKy0gICAgICAgIGlmIChl
eHRlbnNpb25fdGV4dC5sZW5ndGggPT0gMCkKKysgICAgICAgIGlmIChleHRlbnNpb25fdGV4dC5s
ZW5ndGggPT0gMCAmJiBtX3ByZWZpeCAhPSAidSIpCisgICAgICAgICAgICAgZXh0ZW5zaW9uX3Rl
eHQgPSBtX2V4dGVuc2lvbl9wcmVlZGl0X3RleHQuZ2V0X3RleHQoKTsKKyAgICAgICAgIHJldHVy
biBuZXcgSUJ1cy5UZXh0LmZyb21fc3RyaW5nKGV4dGVuc2lvbl90ZXh0KTsKKyAgICAgfQorQEAg
LTU1Niw4ICs1NTYsMTAgQEAgY2xhc3MgUGFuZWxCaW5kaW5nIDogSUJ1cy5QYW5lbFNlcnZpY2Ug
eworIAorICAgICBwcml2YXRlIGJvb2wga2V5X3ByZXNzX2tleXZhbCh1aW50IGtleXZhbCkgewor
ICAgICAgICAgdW5pY2hhciBjaCA9IElCdXMua2V5dmFsX3RvX3VuaWNvZGUoa2V5dmFsKTsKKysg
ICAgICAgIGlmIChtX2V4dGVuc2lvbl9uYW1lID09ICJ1bmljb2RlIiAmJiAhY2guaXN4ZGlnaXQo
KSkKKysgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICBpZiAoY2guaXNjbnRybCgp
KQorLSAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisrICAgICAgICAgICAgcmV0dXJuIGZh
bHNlOworICAgICAgICAgc3RyaW5nIHN0ciA9IGNoLnRvX3N0cmluZygpOworICAgICAgICAgbV9w
cmVlZGl0LmFwcGVuZF90ZXh0KHN0cik7CisgICAgICAgICBzdHJpbmcgYW5ub3RhdGlvbiA9IG1f
cHJlZWRpdC5nZXRfdGV4dCgpOworLS0gCisyLjI0LjEKKworRnJvbSAzYWE2NzBlOWY4MzE5ZmUw
NjRjZTdjNDVjZTU2MzA0Y2E1YWY5NGRjIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTog
ZnVqaXdhcmF0IDx0YWthby5mdWppd2FyYTFAZ21haWwuY29tPgorRGF0ZTogV2VkLCA5IFNlcCAy
MDIwIDE4OjQyOjEwICswOTAwCitTdWJqZWN0OiBbUEFUQ0hdIGVuZ2luZTogRml4IHRvIHB1bGwg
dGhlIGNvcnJlY3QgbGFuZ3VhZ2Ugd2l0aCBubyBpc282MzkKKyB2YXJpYW50cworCitTb21lIHZh
cmlhbnRzIGhhdmUgaXNvNjM5IGJ1dCBvdGhlcnMgZG8gbm90IGluIGV2ZGV2LnhtbCBhbmQKK2dl
bnNpbXBsZS5weSBoYXZlIHRvIGZhbGxiYWNrIHRvIHRoZSBsYXlvdXQgaXNvNjM5LgorCitCVUc9
cmhieiMxODc2ODc3CistLS0KKyBlbmdpbmUvZ2Vuc2ltcGxlLnB5IHwgMTkgKysrKysrKysrKysr
KysrKystLQorIDEgZmlsZSBjaGFuZ2VkLCAxNyBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygt
KQorCitkaWZmIC0tZ2l0IGEvZW5naW5lL2dlbnNpbXBsZS5weSBiL2VuZ2luZS9nZW5zaW1wbGUu
cHkKK2luZGV4IDE4ZjdkYzhjLi5kZTZkN2ZmNSAxMDA3NTUKKy0tLSBhL2VuZ2luZS9nZW5zaW1w
bGUucHkKKysrKyBiL2VuZ2luZS9nZW5zaW1wbGUucHkKK0BAIC05MCw2ICs5MCw3IEBAIGNsYXNz
IEV2ZGV2WE1MKFhNTEZpbHRlckJhc2UpOgorICAgICAgICAgc2VsZi5fX2Rlc2NyaXB0aW9uID0g
JycKKyAgICAgICAgIHNlbGYuX192YXJpYW50ID0gJycKKyAgICAgICAgIHNlbGYuX19saXN0X2lz
bzYzOSA9IFtdCisrICAgICAgICBzZWxmLl9fbGlzdF9pc282MzlfZm9yX3ZhcmlhbnQgPSBbXQor
ICAgICBkZWYgc3RhcnREb2N1bWVudChzZWxmKToKKyAgICAgICAgIGlmIHNlbGYuX19kb3duc3Ry
ZWFtOgorICAgICAgICAgICAgIHNlbGYuX19kb3duc3RyZWFtLnN0YXJ0RG9jdW1lbnQoKQorQEAg
LTEwNiw3ICsxMDcsMTAgQEAgY2xhc3MgRXZkZXZYTUwoWE1MRmlsdGVyQmFzZSk6CisgICAgICAg
ICBlbGlmIG5hbWUgPT0gJ2NvbmZpZ0l0ZW0nOgorICAgICAgICAgICAgIHNlbGYuX19pc19jb25m
aWdfaXRlbSA9IFRydWUKKyAgICAgICAgIGVsaWYgbmFtZSA9PSAnbGFuZ3VhZ2VMaXN0JzoKKy0g
ICAgICAgICAgICBzZWxmLl9fbGlzdF9pc282MzkgPSBbXQorKyAgICAgICAgICAgIGlmIHNlbGYu
X19pc192YXJpYW50IGFuZCBzZWxmLl9faXNfY29uZmlnX2l0ZW06CisrICAgICAgICAgICAgICAg
IHNlbGYuX19saXN0X2lzbzYzOV9mb3JfdmFyaWFudCA9IFtdCisrICAgICAgICAgICAgZWxpZiBz
ZWxmLl9faXNfbGF5b3V0IGFuZCBzZWxmLl9faXNfY29uZmlnX2l0ZW06CisrICAgICAgICAgICAg
ICAgIHNlbGYuX19saXN0X2lzbzYzOSA9IFtdCisgICAgICAgICBlbGlmIG5hbWUgPT0gJ2lzbzYz
OUlkJzoKKyAgICAgICAgICAgICBzZWxmLl9faXNfaXNvNjM5ID0gVHJ1ZQorICAgICAgICAgZWxp
ZiBuYW1lID09ICd2YXJpYW50JzoKK0BAIC0xMjksNiArMTMzLDcgQEAgY2xhc3MgRXZkZXZYTUwo
WE1MRmlsdGVyQmFzZSk6CisgICAgICAgICAgICAgc2VsZi5fX2lzX2lzbzYzOSA9IEZhbHNlCisg
ICAgICAgICBlbGlmIG5hbWUgPT0gJ3ZhcmlhbnQnOgorICAgICAgICAgICAgIHNlbGYuX19pc192
YXJpYW50ID0gRmFsc2UKKysgICAgICAgICAgICBzZWxmLl9fbGlzdF9pc282MzlfZm9yX3Zhcmlh
bnQgPSBbXQorICAgICAgICAgZWxpZiBuYW1lID09ICduYW1lJzoKKyAgICAgICAgICAgICBzZWxm
Ll9faXNfbmFtZSA9IEZhbHNlCisgICAgIGRlZiBjaGFyYWN0ZXJzKHNlbGYsIHRleHQpOgorQEAg
LTE0MCwxMSArMTQ1LDIxIEBAIGNsYXNzIEV2ZGV2WE1MKFhNTEZpbHRlckJhc2UpOgorICAgICAg
ICAgICAgIGVsaWYgc2VsZi5fX2lzX2xheW91dCBhbmQgc2VsZi5fX2lzX2NvbmZpZ19pdGVtOgor
ICAgICAgICAgICAgICAgICBzZWxmLl9fbGF5b3V0ID0gdGV4dAorICAgICAgICAgZWxpZiBzZWxm
Ll9faXNfaXNvNjM5OgorKyAgICAgICAgICAgIGlmIHNlbGYuX19pc192YXJpYW50IGFuZCBzZWxm
Ll9faXNfY29uZmlnX2l0ZW06CisrICAgICAgICAgICAgICAgIHNlbGYuX19saXN0X2lzbzYzOV9m
b3JfdmFyaWFudC5hcHBlbmQodGV4dCkKKysgICAgICAgICAgICBlbGlmIHNlbGYuX19pc19sYXlv
dXQgYW5kIHNlbGYuX19pc19jb25maWdfaXRlbToKKyAgICAgICAgICAgICAgICAgc2VsZi5fX2xp
c3RfaXNvNjM5LmFwcGVuZCh0ZXh0KQorICAgICBkZWYgc2F2ZShzZWxmKToKKyAgICAgICAgIGlm
IG5vdCBzZWxmLl9fZG93bnN0cmVhbToKKyAgICAgICAgICAgICByZXR1cm4KKy0gICAgICAgIGZv
ciBpc28gaW4gc2VsZi5fX2xpc3RfaXNvNjM5OgorKyAgICAgICAgbGlzdF9pc282MzkgPSBbXQor
KyAgICAgICAgaWYgc2VsZi5fX2lzX3ZhcmlhbnQgYW5kIHNlbGYuX19pc19jb25maWdfaXRlbToK
KysgICAgICAgICAgICBsaXN0X2lzbzYzOSA9IHNlbGYuX19saXN0X2lzbzYzOV9mb3JfdmFyaWFu
dAorKyAgICAgICAgICAgIGlmIGxlbihsaXN0X2lzbzYzOSkgPT0gMDoKKysgICAgICAgICAgICAg
ICAgbGlzdF9pc282MzkgPSBzZWxmLl9fbGlzdF9pc282MzkKKysgICAgICAgIGVsaWYgc2VsZi5f
X2lzX2xheW91dCBhbmQgc2VsZi5fX2lzX2NvbmZpZ19pdGVtOgorKyAgICAgICAgICAgIGxpc3Rf
aXNvNjM5ID0gc2VsZi5fX2xpc3RfaXNvNjM5CisrICAgICAgICBmb3IgaXNvIGluIGxpc3RfaXNv
NjM5OgorICAgICAgICAgICAgIGRvX2RlbnkgPSBGYWxzZQorICAgICAgICAgICAgIGZvciBbeGti
LCBsYXlvdXQsIHZhcmlhbnQsIGxhbmddIGluIHNlbGYuX19kZW55bGlzdDoKKyAgICAgICAgICAg
ICAgICAgaWYgeGtiID09ICd4a2InIFwKKy0tIAorMi4yNC4xCisKCmRpZmYgLS1naXQgYS9pYnVz
LnNwZWMgYi9pYnVzLnNwZWMKaW5kZXggNTM4MDllNi4uZGYwZjVlMyAxMDA2NDQKLS0tIGEvaWJ1
cy5zcGVjCisrKyBiL2lidXMuc3BlYwpAQCAtMjYsMTQgKzI2LDE0IEBACiAKIE5hbWU6ICAgICAg
ICAgICBpYnVzCiBWZXJzaW9uOiAgICAgICAgMS41LjIyCi1SZWxlYXNlOiAgICAgICAgMTUlez9k
aXN0fQorUmVsZWFzZTogICAgICAgIDE2JXs/ZGlzdH0KIFN1bW1hcnk6ICAgICAgICBJbnRlbGxp
Z2VudCBJbnB1dCBCdXMgZm9yIExpbnV4IE9TCiBMaWNlbnNlOiAgICAgICAgTEdQTHYyKwogVVJM
OiAgICAgICAgICAgIGh0dHBzOi8vZ2l0aHViLmNvbS9pYnVzLyVuYW1lL3dpa2kKIFNvdXJjZTA6
ICAgICAgICBodHRwczovL2dpdGh1Yi5jb20vaWJ1cy8lbmFtZS9yZWxlYXNlcy9kb3dubG9hZC8l
e3ZlcnNpb259LyV7bmFtZX0tJXt2ZXJzaW9ufS50YXIuZ3oKIFNvdXJjZTE6ICAgICAgICAle25h
bWV9LXhpbnB1dAogU291cmNlMjogICAgICAgICV7bmFtZX0uY29uZi41Ci1Tb3VyY2UzOiAgICAg
ICAgaHR0cHM6Ly9mdWppd2FyYS5mZWRvcmFwZW9wbGUub3JnL2lidXMvcG8vJXtuYW1lfS1zaW1w
bGUtMS41LjIyLjIwMjAwODI3LnhtbC5negorU291cmNlMzogICAgICAgIGh0dHBzOi8vZnVqaXdh
cmEuZmVkb3JhcGVvcGxlLm9yZy9pYnVzL3BvLyV7bmFtZX0tc2ltcGxlLTEuNS4yMi4yMDIwMDkw
OS54bWwuZ3oKIFNvdXJjZTQ6ICAgICAgICBodHRwczovL2Z1aml3YXJhLmZlZG9yYXBlb3BsZS5v
cmcvaWJ1cy9wby8le25hbWV9LXBvLTEuNS4yMi0yMDIwMDgyNy50YXIuZ3oKICMgUGF0Y2gwOiAg
ICAgICAgICUle25hbWV9LUhFQUQucGF0Y2gKIFBhdGNoMDogICAgICAgICAle25hbWV9LUhFQUQu
cGF0Y2gKQEAgLTQ2MSw2ICs0NjEsMTAgQEAgZGNvbmYgdXBkYXRlIHx8IDoKICV7X2RhdGFkaXJ9
L2luc3RhbGxlZC10ZXN0cy9pYnVzCiAKICVjaGFuZ2Vsb2cKKyogV2VkIFNlcCAwOSAyMDIwIFRh
a2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPiAtIDEuNS4yMi0xNgorLSBCdWcgMTg3
Njg3NyAtIEZpeCB0byBwdWxsIHRoZSBjb3JyZWN0IGxhbmd1YWdlIHdpdGggbm8gaXNvNjM5IHZh
cmlhbnRzCistIEFjY2VwdCB4ZGlnaXRzIG9ubHkgZm9yIFVuaWNvZGUgdHlwaW5nCisKICogVGh1
IEF1ZyAyNyAyMDIwIFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPiAtIDEuNS4y
Mi0xNQogLSBSZW5hbWUgc2ltcGxlLnhtbCB0byBzaW1wbGUueG1sLmluCiAKCmRpZmYgLS1naXQg
YS9zb3VyY2VzIGIvc291cmNlcwppbmRleCAwNDY4YTU2Li40M2ZlZTlmIDEwMDY0NAotLS0gYS9z
b3VyY2VzCisrKyBiL3NvdXJjZXMKQEAgLTEsMyArMSwzIEBACiBTSEE1MTIgKGlidXMtMS41LjIy
LnRhci5neikgPSAwYWJlODlhY2M2ZGE4Y2VhNDg0YTZiOWY4MDdjMDhlOTQ4NjkwNzJmMzc0Zjll
OGY0NTQxYTQyNjYzNmY4MThmMWMzY2I4YjkyMzdmOTcyNDU3NzFmOWU0YmYxOTE4NDk4M2Q4YWM5
MjQxNzdkYzQ4MjRjYTZlOGI1MzA0NDI1ZAotU0hBNTEyIChpYnVzLXNpbXBsZS0xLjUuMjIuMjAy
MDA4MjcueG1sLmd6KSA9IGQ5N2EwMjI4NTA3NzQxZGRiYjA2YjE3NjkwNjk0ZGI5MDBjMGQ5ODNl
MDBjODZiZWQwNTM3YTgyNWQ5MGQ5NTFmZjEyODdmM2Y3ZTcyYTcwNjg1NmVjYjExYzIxNzIwNzBk
OWViOTE2OGY5ZTBhNGVjMjhiNjc4Mzg2MmU3NDJiCitTSEE1MTIgKGlidXMtc2ltcGxlLTEuNS4y
Mi4yMDIwMDkwOS54bWwuZ3opID0gYmZhODA5YjcwZGM1NWYyOTNiOWM3NjZiOGRmYmI4ZDc1ZWY2
NmMwNTVhNjYzNGQ0MmU4Yjc2ZGY3YmJiYWQyNDFiYTZhNmVmMGMzOGViNDUzYWM1NDc3MjViNjM2
OGFhMGNjYzNlMWJlYTQ1Y2I1Zjg0M2YyNTU2MzBlOTE5ZDkKIFNIQTUxMiAoaWJ1cy1wby0xLjUu
MjItMjAyMDA4MjcudGFyLmd6KSA9IDg3YmNhZGUwMTY2NzQ0ZTE4NmFmODE3NDdkNWYzYzM4ZTIy
M2E4NWY2YmVmODU5ZjcxNGE4ZGM5OTEyNzg5ZGVmMmJjNDFjNjdiNzhhMjc0MzQ1NWJlM2M1M2Rm
MzE5NTNjYTM4MmYwZDIzYWMxMTVhMGE0MmRlZWE3Njc1ZGUzCg==