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: Peng Huang <phuang@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/ibus] autotool: Update ibus-HEAD.patch to fix some bugs
Date: Sun, 31 May 2026 02:04:18 GMT
Message-ID: <178019305864.1.3349034867968707831.rpms-ibus-9e5ddf12f311@fedoraproject.org>
List-ID: <git-commits.fedoraproject.org>
X-Git-Repo: rpms/ibus
X-Git-Branch: autotool
X-Git-Rev: 9e5ddf12f311c80b6b940e70a883aad0bc738a85

QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvaWJ1cwpCcmFuY2gg
OiBhdXRvdG9vbApDb21taXQgOiA5ZTVkZGYxMmYzMTFjODBiNmI5NDBlNzBhODgzYWFkMGJjNzM4
YTg1CkF1dGhvciA6IFBlbmcgSHVhbmcgPHBodWFuZ0BmZWRvcmFwcm9qZWN0Lm9yZz4KRGF0ZSAg
IDogMjAwOS0wNC0xNVQwMDowNDowNSswMDowMApTdGF0cyAgOiArMjg2Ly0xIGluIDIgZmlsZShz
KQpVUkwgICAgOiBodHRwczovL3NyYy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL2lidXMvYy85ZTVk
ZGYxMmYzMTFjODBiNmI5NDBlNzBhODgzYWFkMGJjNzM4YTg1P2JyYW5jaD1hdXRvdG9vbAoKTG9n
OgpVcGRhdGUgaWJ1cy1IRUFELnBhdGNoIHRvIGZpeCBzb21lIGJ1Z3MKCi0tLQpkaWZmIC0tZ2l0
IGEvaWJ1cy1IRUFELnBhdGNoIGIvaWJ1cy1IRUFELnBhdGNoCmluZGV4IGY1NGFjNzMuLjgyNTAw
MDEgMTAwNjQ0Ci0tLSBhL2lidXMtSEVBRC5wYXRjaAorKysgYi9pYnVzLUhFQUQucGF0Y2gKQEAg
LTE3LDYgKzE3LDEyMSBAQCBpbmRleCA3MjQ1YmQzLi40MjVkZDg2IDEwMDY0NAogIAogICAgICBp
ZiAoIXJldHZhbCkgewogICAgICAgICAgZ19wcmludGVyciAoIkNhbiBub3QgbGlzdGVuIG9uICVz
ISBQbGVhc2UgdHJ5IHJlbW92ZSBkaXJlY3RvcnkgJXMgYW5kIHJ1biBhZ2Fpbi4iLCBhZGRyZXNz
LCBwYXRoKTsKK2RpZmYgLS1naXQgYS9jbGllbnQvZ3RrMi9pYnVzaW1jb250ZXh0LmMgYi9jbGll
bnQvZ3RrMi9pYnVzaW1jb250ZXh0LmMKK2luZGV4IDVkYTRkZWMuLjE2OGU0NWEgMTAwNjQ0Cist
LS0gYS9jbGllbnQvZ3RrMi9pYnVzaW1jb250ZXh0LmMKKysrKyBiL2NsaWVudC9ndGsyL2lidXNp
bWNvbnRleHQuYworQEAgLTE5MCwxNCArMTkwLDIwIEBAIF9rZXlfc25vb3Blcl9jYiAoR3RrV2lk
Z2V0ICAgKndpZGdldCwKKyAgICAgSUJ1c0lNQ29udGV4dCAqaWJ1c2ltY29udGV4dDsKKyAgICAg
aWJ1c2ltY29udGV4dCA9IChJQnVzSU1Db250ZXh0ICopIF9mb2N1c19pbV9jb250ZXh0OworIAor
LSAgICBpZiAoIV91c2Vfa2V5X3Nub29wZXIpCisrICAgIGlmIChHX1VOTElLRUxZICghX3VzZV9r
ZXlfc25vb3BlcikpCisgICAgICAgICByZXR1cm4gcmV0dmFsOworIAorICAgICBpZiAoaWJ1c2lt
Y29udGV4dCA9PSBOVUxMKQorLSAgICAgICAgcmV0dXJuIHJldHZhbDsKKysgICAgICAgIHJldHVy
biBGQUxTRTsKKyAKKy0gICAgaWYgKGlidXNpbWNvbnRleHQtPmlidXNjb250ZXh0ID09IE5VTEwg
fHwgaWJ1c2ltY29udGV4dC0+aGFzX2ZvY3VzID09IEZBTFNFKQorLSAgICAgICAgcmV0dXJuIHJl
dHZhbDsKKysgICAgaWYgKEdfVU5MSUtFTFkgKGlidXNpbWNvbnRleHQtPmlidXNjb250ZXh0ID09
IE5VTEwgfHwgaWJ1c2ltY29udGV4dC0+aGFzX2ZvY3VzID09IEZBTFNFKSkKKysgICAgICAgIHJl
dHVybiBGQUxTRTsKKysKKysgICAgaWYgKEdfVU5MSUtFTFkgKGV2ZW50LT5zdGF0ZSAmIElCVVNf
SEFORExFRF9NQVNLKSkKKysgICAgICAgIHJldHVybiBUUlVFOworKworKyAgICBpZiAoR19VTkxJ
S0VMWSAoZXZlbnQtPnN0YXRlICYgSUJVU19JR05PUkVEX01BU0spKQorKyAgICAgICAgcmV0dXJu
IEZBTFNFOworIAorICAgICBzd2l0Y2ggKGV2ZW50LT50eXBlKSB7CisgICAgIGNhc2UgR0RLX0tF
WV9SRUxFQVNFOgorQEAgLTIxMiw2ICsyMTgsMTQgQEAgX2tleV9zbm9vcGVyX2NiIChHdGtXaWRn
ZXQgICAqd2lkZ2V0LAorICAgICAgICAgYnJlYWs7CisgICAgIGRlZmF1bHQ6CisgICAgICAgICBy
ZXR2YWwgPSBGQUxTRTsKKysgICAgICAgIGJyZWFrOworKyAgICB9CisrCisrICAgIGlmIChyZXR2
YWwpIHsKKysgICAgICAgIGV2ZW50LT5zdGF0ZSB8PSBJQlVTX0hBTkRMRURfTUFTSzsKKysgICAg
fQorKyAgICBlbHNlIHsKKysgICAgICAgIGV2ZW50LT5zdGF0ZSB8PSBJQlVTX0lHTk9SRURfTUFT
SzsKKyAgICAgfQorIAorICAgICByZXR1cm4gcmV0dmFsOworQEAgLTM4MywxMSArMzk3LDE4IEBA
IGlidXNfaW1fY29udGV4dF9maWx0ZXJfa2V5cHJlc3MgKEd0a0lNQ29udGV4dCAqY29udGV4dCwK
KyAKKyAgICAgSUJ1c0lNQ29udGV4dCAqaWJ1c2ltY29udGV4dCA9IChJQnVzSU1Db250ZXh0ICop
IGNvbnRleHQ7CisgCistICAgIGlmIChpYnVzaW1jb250ZXh0LT5pYnVzY29udGV4dCAmJiBpYnVz
aW1jb250ZXh0LT5oYXNfZm9jdXMpIHsKKysgICAgaWYgKEdfTElLRUxZIChpYnVzaW1jb250ZXh0
LT5pYnVzY29udGV4dCAmJiBpYnVzaW1jb250ZXh0LT5oYXNfZm9jdXMpKSB7CisgICAgICAgICAv
KiBJZiBjb250ZXh0IGRvZXMgbm90IGhhdmUgZm9jdXMsIGlidXMgd2lsbCBwcm9jZXNzIGtleSBl
dmVudCBpbiBzeW5jIG1vZGUuCisgICAgICAgICAgKiBJdCBpcyBhIHdvcmthcm91bmQgZm9yIGlu
Y3JlYXNlIHNlYXJjaCBpbiB0cmVldmlldy4KKyAgICAgICAgICAqLworLSAgICAgICAgZ2Jvb2xl
YW4gcmV0dmFsOworKyAgICAgICAgZ2Jvb2xlYW4gcmV0dmFsID0gRkFMU0U7CisrCisrICAgICAg
ICBpZiAoZXZlbnQtPnN0YXRlICYgSUJVU19IQU5ETEVEX01BU0spCisrICAgICAgICAgICAgcmV0
dXJuIFRSVUU7CisrCisrICAgICAgICBpZiAoZXZlbnQtPnN0YXRlICYgSUJVU19JR05PUkVEX01B
U0spCisrICAgICAgICAgICAgcmV0dXJuIGd0a19pbV9jb250ZXh0X2ZpbHRlcl9rZXlwcmVzcyAo
aWJ1c2ltY29udGV4dC0+c2xhdmUsIGV2ZW50KTsKKysKKyAgICAgICAgIHN3aXRjaCAoZXZlbnQt
PnR5cGUpIHsKKyAgICAgICAgIGNhc2UgR0RLX0tFWV9SRUxFQVNFOgorICAgICAgICAgICAgIHJl
dHZhbCA9IGlidXNfaW5wdXRfY29udGV4dF9wcm9jZXNzX2tleV9ldmVudCAoaWJ1c2ltY29udGV4
dC0+aWJ1c2NvbnRleHQsCitAQCAtNDA0LDkgKzQyNSwxMyBAQCBpYnVzX2ltX2NvbnRleHRfZmls
dGVyX2tleXByZXNzIChHdGtJTUNvbnRleHQgKmNvbnRleHQsCisgICAgICAgICB9CisgCisgICAg
ICAgICBpZiAocmV0dmFsKSB7CisrICAgICAgICAgICAgZXZlbnQtPnN0YXRlIHw9IElCVVNfSEFO
RExFRF9NQVNLOworICAgICAgICAgICAgIHJldHVybiBUUlVFOworICAgICAgICAgfQorLSAgICAg
ICAgcmV0dXJuIGd0a19pbV9jb250ZXh0X2ZpbHRlcl9rZXlwcmVzcyAoaWJ1c2ltY29udGV4dC0+
c2xhdmUsIGV2ZW50KTsKKysgICAgICAgIGVsc2UgeworKyAgICAgICAgICAgIGV2ZW50LT5zdGF0
ZSB8PSBJQlVTX0lHTk9SRURfTUFTSzsKKysgICAgICAgICAgICByZXR1cm4gZ3RrX2ltX2NvbnRl
eHRfZmlsdGVyX2tleXByZXNzIChpYnVzaW1jb250ZXh0LT5zbGF2ZSwgZXZlbnQpOworKyAgICAg
ICAgfQorICAgICB9CisgICAgIGVsc2UgeworICAgICAgICAgcmV0dXJuIGd0a19pbV9jb250ZXh0
X2ZpbHRlcl9rZXlwcmVzcyAoaWJ1c2ltY29udGV4dC0+c2xhdmUsIGV2ZW50KTsKK2RpZmYgLS1n
aXQgYS9kYXRhL2lidXMuc2NoZW1hcy5pbiBiL2RhdGEvaWJ1cy5zY2hlbWFzLmluCitpbmRleCBi
ZTRiOTgwLi5hOTc2ZWVjIDEwMDY0NAorLS0tIGEvZGF0YS9pYnVzLnNjaGVtYXMuaW4KKysrKyBi
L2RhdGEvaWJ1cy5zY2hlbWFzLmluCitAQCAtMTgsNyArMTgsNyBAQAorICAgICAgIDxvd25lcj5p
YnVzPC9vd25lcj4KKyAgICAgICA8dHlwZT5saXN0PC90eXBlPgorICAgICAgIDxsaXN0X3R5cGU+
c3RyaW5nPC9saXN0X3R5cGU+CistICAgICAgPGRlZmF1bHQ+W0NvbnRyb2wrc3BhY2UsWmVua2Fr
dV9IYW5rYWt1LEFsdCtaZW5rYWt1X0hhbmtha3UsQWx0K2dyYXZlLEhhbmd1bF08L2RlZmF1bHQ+
CisrICAgICAgPGRlZmF1bHQ+W0NvbnRyb2wrc3BhY2UsWmVua2FrdV9IYW5rYWt1LEFsdCtaZW5r
YWt1X0hhbmtha3UsQWx0K2dyYXZlLEhhbmd1bCxBbHQrUmVsZWFzZStBbHRfUl08L2RlZmF1bHQ+
CisgICAgICAgPGxvY2FsZSBuYW1lPSJDIj4KKyAgICAgICAgIDxzaG9ydD5UcmlnZ2VyIEhvdGtl
eTwvc2hvcnQ+CisgCSAgICA8bG9uZz5UcmlnZ2VyIGhvdGtleSBmb3IgZW5hYmxlIG9yIGRpc2Fi
bGUgaW5wdXQgY29udGV4dDwvbG9uZz4KK2RpZmYgLS1naXQgYS9pYnVzL21vZGlmaWVyLnB5IGIv
aWJ1cy9tb2RpZmllci5weQoraW5kZXggN2Y2YWZhZC4uNTZkOGJlOSAxMDA2NDQKKy0tLSBhL2li
dXMvbW9kaWZpZXIucHkKKysrKyBiL2lidXMvbW9kaWZpZXIucHkKK0BAIC0zMywxMSArMzMsMTUg
QEAgQlVUVE9OMl9NQVNLID0gMSA8PCA5CisgQlVUVE9OM19NQVNLID0gMSA8PCAxMAorIEJVVFRP
TjRfTUFTSyA9IDEgPDwgMTEKKyBCVVRUT041X01BU0sgPSAxIDw8IDEyCistICAKKysKKytIQU5E
TEVEX01BU0sgPSAxIDw8IDI0CisrSUdOT1JFRF9NQVNLID0gMSA8PCAyNQorK0ZPUldBUkRfTUFT
SyA9IDEgPDwgMjUKKysKKyBTVVBFUl9NQVNLID0gMSA8PCAyNgorIEhZUEVSX01BU0sgPSAxIDw8
IDI3CisgTUVUQV9NQVNLID0gMSA8PCAyOAorLSAgCisrCisgUkVMRUFTRV9NQVNLID0gMSA8PCAz
MAorIAorIE1PRElGSUVSX01BU0sgPSAweDVjMDAxZmZmCiBkaWZmIC0tZ2l0IGEvcG8vYXMucG8g
Yi9wby9hcy5wbwogaW5kZXggOGUzM2NhMi4uOWI4MTY2OSAxMDA2NDQKIC0tLSBhL3BvL2FzLnBv
CkBAIC00MTYsMyArNTMxLDE2NiBAQCBpbmRleCA4ZTMzY2EyLi45YjgxNjY5IDEwMDY0NAogIAog
KyN+IG1zZ2lkICJwcmV2IGVuZ2luZSIKICsjfiBtc2dzdHIgIuCmhuCml+CnsCDgppXgprLgppjg
p7AiCitkaWZmIC0tZ2l0IGEvcG8vdGUucG8gYi9wby90ZS5wbworaW5kZXggM2I4YzBkYS4uOWM2
NWFmZCAxMDA2NDQKKy0tLSBhL3BvL3RlLnBvCisrKysgYi9wby90ZS5wbworQEAgLTEsMjEgKzEs
MjEgQEAKKy0jIHRyYW5zbGF0aW9uIG9mIGlidXMubWFzdGVyLmlidXMucG8gdG8gVGVsdWd1Cisr
IyB0cmFuc2xhdGlvbiBvZiBpYnVzLm1hc3Rlci50ZS5wbyB0byBUZWx1Z3UKKyAjIENvcHlyaWdo
dCAoQykgWUVBUiBUSEUgUEFDS0FHRSdTIENPUFlSSUdIVCBIT0xERVIKKyAjIFRoaXMgZmlsZSBp
cyBkaXN0cmlidXRlZCB1bmRlciB0aGUgc2FtZSBsaWNlbnNlIGFzIHRoZSBQQUNLQUdFIHBhY2th
Z2UuCisgIworICMgS3Jpc2huYSBCYWJ1IEsgPGtrcm90aGFwQHJlZGhhdC5jb20+LCAyMDA5Lgor
IG1zZ2lkICIiCisgbXNnc3RyICIiCistIlByb2plY3QtSWQtVmVyc2lvbjogaWJ1cy5tYXN0ZXIu
aWJ1c1xuIgorKyJQcm9qZWN0LUlkLVZlcnNpb246IGlidXMubWFzdGVyLnRlXG4iCisgIlJlcG9y
dC1Nc2dpZC1CdWdzLVRvOiBcbiIKKy0iUE9ULUNyZWF0aW9uLURhdGU6IDIwMDktMDQtMDcgMTU6
MzgrMDgwMFxuIgorLSJQTy1SZXZpc2lvbi1EYXRlOiAyMDA5LTA0LTA3IDAwOjM5KzA1MzBcbiIK
KysiUE9ULUNyZWF0aW9uLURhdGU6IDIwMDktMDQtMDYgMTE6NDUrMDgwMFxuIgorKyJQTy1SZXZp
c2lvbi1EYXRlOiAyMDA5LTA0LTE0IDE1OjA0KzA1MzBcbiIKKyAiTGFzdC1UcmFuc2xhdG9yOiBL
cmlzaG5hIEJhYnUgSyA8a2tyb3RoYXBAcmVkaGF0LmNvbT5cbiIKKyAiTGFuZ3VhZ2UtVGVhbTog
VGVsdWd1IDxlbkBsaS5vcmc+XG4iCisgIk1JTUUtVmVyc2lvbjogMS4wXG4iCisgIkNvbnRlbnQt
VHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD1VVEYtOFxuIgorICJDb250ZW50LVRyYW5zZmVyLUVu
Y29kaW5nOiA4Yml0XG4iCisgIlgtR2VuZXJhdG9yOiBLQmFiZWwgMS4xMS40XG4iCistIlBsdXJh
bC1Gb3JtczogbnBsdXJhbHM9MjsgcGx1cmFsPShuIT0xKTtcbiIKKysiUGx1cmFsLUZvcm1zOiBu
cGx1cmFscz0yOyBwbHVyYWw9KG4hPTEpO1xuXG4iCisgIlxuIgorIAorICM6IC4uL2J1cy9pYnVz
LmRlc2t0b3AuaW4uaDoxCitAQCAtNDksMjMgKzQ5LDIwIEBAIG1zZ3N0ciAi4LCV4LGD4LC34LGN
4LCj4LCs4LC+4LCs4LGBIOCwleCxhiA8a2tyb3RoYXBAcmVkaGF0LmNvbT4gMjAwOS4iCisgCisg
Iy4gY3JlYXRlIGlucHV0IG1ldGhvZHMgbWVudQorICM6IC4uL3VpL2d0ay9sYW5ndWFnZWJhci5w
eTo4NAorLSMsIGZ1enp5CisgbXNnaWQgIlN3aXRjaCBpbnB1dCBtZXRob2QiCistbXNnc3RyICLg
sI7gsJ/gsYHgsLXgsILgsJ/gsL8g4LCH4LCo4LGN4LCq4LGB4LCf4LGNIOCwquCwpuCxjeCwpuCw
pOCwv+CwsuCxh+CwpuCxgSIKKyttc2dzdHIgIuCwh+CwqOCxjeCwquCxgeCwn+CxjSDgsKrgsKbg
sY3gsKbgsKTgsL8g4LCu4LC+4LCw4LGN4LCa4LGB4LCu4LGBIgorIAorICM6IC4uL3NldHVwL21h
aW4ucHk6MTAzCisgbXNnaWQgInRyaWdnZXIiCisgbXNnc3RyICLgsKzgsL/gsLggKOCwn+CxjeCw
sOCwv+Cwl+CxjeCwl+CwsOCxjSkiCisgCisgIzogLi4vc2V0dXAvbWFpbi5weToxMTMKKy0jLCBm
dXp6eQorIG1zZ2lkICJuZXh0IGlucHV0IG1ldGhvZCIKKy1tc2dzdHIgIuCwpOCwsOCxgeCwteCw
vuCwpOCwvyDgsIfgsKjgsY3gsKrgsYHgsJ/gsY0g4LCq4LCm4LGN4LCm4LCk4LC/OiIKKyttc2dz
dHIgIuCwpOCwsOCxgeCwteCwvuCwpOCwvyDgsIfgsKjgsY3gsKrgsYHgsJ/gsY0g4LCq4LCm4LGN
4LCm4LCk4LC/IgorIAorICM6IC4uL3NldHVwL21haW4ucHk6MTIzCistIywgZnV6enkKKyBtc2dp
ZCAicHJldmlvdXMgaW5wdXQgbWV0aG9kIgorLW1zZ3N0ciAi4LCu4LGB4LCo4LGB4LCq4LCf4LC/
IOCwh+CwqOCxjeCwquCxgeCwn+CxjSDgsKrgsKbgsY3gsKbgsKTgsL86IgorK21zZ3N0ciAi4LCu
4LGB4LCo4LGB4LCq4LCf4LC/IOCwh+CwqOCxjeCwquCxgeCwn+CxjSDgsKrgsKbgsY3gsKbgsKTg
sL8iCisgCisgIzogLi4vc2V0dXAvbWFpbi5weToyMDQKKyBtc2dpZCAiSUJ1cyBkYWVtb24gaXMg
bm90IHN0YXJ0ZWQuIERvIHlvdSB3YW50IHRvIHN0YXJ0IGl0IG5vdz8iCitAQCAtMjAxLDcgKzE5
OCw2IEBAIG1zZ2lkICJOZXh0IGlucHV0IG1ldGhvZDoiCisgbXNnc3RyICLgsKTgsLDgsYHgsLXg
sL7gsKTgsL8g4LCH4LCo4LGN4LCq4LGB4LCf4LGNIOCwquCwpuCxjeCwpuCwpOCwvzoiCisgCisg
IzogLi4vc2V0dXAvc2V0dXAuZ2xhZGUuaDoyNQorLSMsIGZ1enp5CisgbXNnaWQgIlByZXZpb3Vz
IGlucHV0IG1ldGhvZDoiCisgbXNnc3RyICLgsK7gsYHgsKjgsYHgsKrgsJ/gsL8g4LCH4LCo4LGN
4LCq4LGB4LCf4LGNIOCwquCwpuCxjeCwpuCwpOCwvzoiCisgCitAQCAtMjg1LDE0ICsyODEsNyBA
QCBtc2dzdHIgIuCwruCwsuCwmuCxgeCwleCxiuCwqOCwv+CwqCDgsKvgsL7gsILgsJ/gsYEg4LC1
4LGB4LCq4LCv4LGL4LCX4LC/4LCC4LCaCisgbXNnaWQgIlVzZSBjdXN0b20gZm9udCBuYW1lIGZv
ciBsYW5ndWFnZSBwYW5lbCIKKyBtc2dzdHIgIuCwreCwvuCwt+CwviDgsKrgsY3gsK/gsL7gsKjg
sLLgsY0g4LCV4LGK4LCw4LCV4LGBIOCwruCwsuCwmuCxgeCwleCxiuCwqOCwv+CwqCDgsKvgsL7g
sILgsJ/gsY0g4LCo4LC+4LCu4LCu4LGBIOCwteCxgeCwquCwr+Cxi+Cwl+Cwv+CwguCwmuCxgeCw
ruCxgSIKKyAKKy0jfiBtc2dpZCAiU3dpdGNoIGVuZ2luZSIKKy0jfiBtc2dzdHIgIuCwh+CwguCw
nOCwqOCxjeKAjOCwqOCxgSDgsK7gsL7gsLDgsY3gsJrgsYHgsK7gsYEiCistCistI34gbXNnaWQg
Im5leHQgZW5naW5lIgorLSN+IG1zZ3N0ciAi4LCk4LCw4LGB4LC14LC+4LCk4LC/IOCwr+Cwv+Cw
guCwnOCwqOCxjSIKKy0KKy0jfiBtc2dpZCAicHJldiBlbmdpbmUiCistI34gbXNnc3RyICLgsK7g
sYHgsKjgsYHgsKrgsJ/gsL8g4LCv4LC/4LCC4LCc4LCo4LGNIgorKyM6IC4uL2RhdGEvaWJ1cy5z
Y2hlbWFzLmluLmg6MTcKKyttc2dpZCAiW0NvbnRyb2wrc3BhY2VdIgorK21zZ3N0ciAiW0NvbnRy
b2wrc3BhY2VdIgorIAorLSN+IG1zZ2lkICJbQ29udHJvbCtzcGFjZV0iCistI34gbXNnc3RyICJb
Q29udHJvbCtzcGFjZV0iCitkaWZmIC0tZ2l0IGEvc2V0dXAva2V5Ym9hcmRzaG9ydGN1dC5weSBi
L3NldHVwL2tleWJvYXJkc2hvcnRjdXQucHkKK2luZGV4IGE5ZTIyMzMuLmY5NTQzNDMgMTAwNjQ0
CistLS0gYS9zZXR1cC9rZXlib2FyZHNob3J0Y3V0LnB5CisrKysgYi9zZXR1cC9rZXlib2FyZHNo
b3J0Y3V0LnB5CitAQCAtMjcsNiArMjcsNyBAQCBfX2FsbF9fID0gKAorIGltcG9ydCBnb2JqZWN0
CisgaW1wb3J0IGd0aworIGZyb20gZ3RrIGltcG9ydCBnZGsKKytmcm9tIGd0ayBpbXBvcnQga2V5
c3ltcworIAorIGZyb20gZ2V0dGV4dCBpbXBvcnQgZGdldHRleHQKKyBfICA9IGxhbWJkYSBhIDog
ZGdldHRleHQoImlidXMiLCBhKQorQEAgLTIxNyw4ICsyMTgsMjkgQEAgY2xhc3MgS2V5Ym9hcmRT
aG9ydGN1dFNlbGVjdGlvbihndGsuVkJveCk6CisgICAgICAgICBpZiBpZCAhPSBndGsuUkVTUE9O
U0VfT0sgb3Igbm90IG91dDoKKyAgICAgICAgICAgICByZXR1cm4KKyAgICAgICAgIGtleWV2ZW50
ID0gb3V0WzBdCisrICAgICAgICBzdGF0ZSA9IGtleWV2ZW50LnN0YXRlICYgKGdkay5DT05UUk9M
X01BU0sgfCBcCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdkay5TSElGVF9N
QVNLICAgfCBcCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdkay5NT0QxX01B
U0sgICAgfCBcCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdkay5NRVRBX01B
U0sgICAgfCBcCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdkay5TVVBFUl9N
QVNLICAgfCBcCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdkay5IWVBFUl9N
QVNLKQorKyAgICAgICAgaWYgc3RhdGUgPT0gMDoKKysgICAgICAgICAgICBzdGF0ZSA9IHN0YXRl
IHwgZ2RrLlJFTEVBU0VfTUFTSworKyAgICAgICAgZWxpZiBrZXlldmVudC5rZXl2YWwgaW4gKGtl
eXN5bXMuQ29udHJvbF9MLCBrZXlzeW1zLkNvbnRyb2xfUikgYW5kIHN0YXRlID09IGdkay5DT05U
Uk9MX01BU0s6CisrICAgICAgICAgICAgc3RhdGUgPSBzdGF0ZSB8IGdkay5SRUxFQVNFX01BU0sK
KysgICAgICAgIGVsaWYga2V5ZXZlbnQua2V5dmFsIGluIChrZXlzeW1zLlNoaWZ0X0wsIGtleXN5
bXMuU2hpZnRfUikgYW5kIHN0YXRlID09IGdkay5TSElGVF9NQVNLOgorKyAgICAgICAgICAgIHN0
YXRlID0gc3RhdGUgfCBnZGsuUkVMRUFTRV9NQVNLCisrICAgICAgICBlbGlmIGtleWV2ZW50Lmtl
eXZhbCBpbiAoa2V5c3ltcy5BbHRfTCwga2V5c3ltcy5BbHRfUikgYW5kIHN0YXRlID09IGdkay5N
T0QxX01BU0s6CisrICAgICAgICAgICAgc3RhdGUgPSBzdGF0ZSB8IGdkay5SRUxFQVNFX01BU0sK
KysgICAgICAgIGVsaWYga2V5ZXZlbnQua2V5dmFsIGluIChrZXlzeW1zLk1ldGFfTCwga2V5c3lt
cy5NZXRhX1IpIGFuZCBzdGF0ZSA9PSBnZGsuTUVUQV9NQVNLOgorKyAgICAgICAgICAgIHN0YXRl
ID0gc3RhdGUgfCBnZGsuUkVMRUFTRV9NQVNLCisrICAgICAgICBlbGlmIGtleWV2ZW50LmtleXZh
bCBpbiAoa2V5c3ltcy5TdXBlcl9MLCBrZXlzeW1zLlN1cGVyX1IpIGFuZCBzdGF0ZSA9PSBnZGsu
U1VQRVJfTUFTSzoKKysgICAgICAgICAgICBzdGF0ZSA9IHN0YXRlIHwgZ2RrLlJFTEVBU0VfTUFT
SworKyAgICAgICAgZWxpZiBrZXlldmVudC5rZXl2YWwgaW4gKGtleXN5bXMuSHlwZXJfTCwga2V5
c3ltcy5IeXBlcl9SKSBhbmQgc3RhdGUgPT0gZ2RrLkhZUEVSX01BU0s6CisrICAgICAgICAgICAg
c3RhdGUgPSBzdGF0ZSB8IGdkay5SRUxFQVNFX01BU0sKKysKKyAgICAgICAgIGZvciBuYW1lLCBi
dXR0b24sIG1hc2sgaW4gc2VsZi5fX21vZGlmaWVyX2J1dHRvbnM6CistICAgICAgICAgICAgaWYg
a2V5ZXZlbnQuc3RhdGUgJiBtYXNrOgorKyAgICAgICAgICAgIGlmIHN0YXRlICYgbWFzazoKKyAg
ICAgICAgICAgICAgICAgYnV0dG9uLnNldF9hY3RpdmUoVHJ1ZSkKKyAgICAgICAgICAgICBlbHNl
OgorICAgICAgICAgICAgICAgICBidXR0b24uc2V0X2FjdGl2ZShGYWxzZSkKK2RpZmYgLS1naXQg
YS9zcmMvaWJ1c2lucHV0Y29udGV4dC5jIGIvc3JjL2lidXNpbnB1dGNvbnRleHQuYworaW5kZXgg
OTU3NTRjZi4uNTI1NDdmZiAxMDA2NDQKKy0tLSBhL3NyYy9pYnVzaW5wdXRjb250ZXh0LmMKKysr
KyBiL3NyYy9pYnVzaW5wdXRjb250ZXh0LmMKK0BAIC01NTMsNyArNTUzLDEwIEBAIGlidXNfaW5w
dXRfY29udGV4dF9wcm9jZXNzX2tleV9ldmVudCAoSUJ1c0lucHV0Q29udGV4dCAqY29udGV4dCwK
KyAgICAgSUJ1c0Vycm9yICplcnJvciA9IE5VTEw7CisgICAgIGdib29sZWFuIHJldHZhbDsKKyAK
Ky0gICAgaWYgKHN0YXRlICYgSUJVU19GT1JXQVJEX01BU0spCisrICAgIGlmIChzdGF0ZSAmIElC
VVNfSEFORExFRF9NQVNLKQorKyAgICAgICAgcmV0dXJuIFRSVUU7CisrCisrICAgIGlmIChzdGF0
ZSAmIElCVVNfSUdOT1JFRF9NQVNLKQorICAgICAgICAgcmV0dXJuIEZBTFNFOworIAorICAgICBy
ZXR2YWwgPSBpYnVzX3Byb3h5X2NhbGxfd2l0aF9yZXBseSAoKElCdXNQcm94eSAqKSBjb250ZXh0
LAorZGlmZiAtLWdpdCBhL3NyYy9pYnVzdHlwZXMuaCBiL3NyYy9pYnVzdHlwZXMuaAoraW5kZXgg
ZDJmMTViYS4uMmY3YzBiZiAxMDA2NDQKKy0tLSBhL3NyYy9pYnVzdHlwZXMuaAorKysrIGIvc3Jj
L2lidXN0eXBlcy5oCitAQCAtNjksMTEgKzY5LDEzIEBAIHR5cGVkZWYgZW51bQorICAgICBJQlVT
X0JVVFRPTjVfTUFTSyAgPSAxIDw8IDEyLAorIAorICAgICAvKiBUaGUgbmV4dCBmZXcgbW9kaWZp
ZXJzIGFyZSB1c2VkIGJ5IFhLQiwgc28gd2Ugc2tpcCB0byB0aGUgZW5kLgorLSAgICAgKiBCaXRz
IDE1IC0gMjQgYXJlIGN1cnJlbnRseSB1bnVzZWQuIEJpdCAyOSBpcyB1c2VkIGludGVybmFsbHku
CisrICAgICAqIEJpdHMgMTUgLSAyMyBhcmUgY3VycmVudGx5IHVudXNlZC4gQml0IDI5IGlzIHVz
ZWQgaW50ZXJuYWxseS4KKyAgICAgICovCisgCistICAgIC8qIGZvcndhcmQgbWFzayAqLworKyAg
ICAvKiBpYnVzIG1hc2sgKi8KKysgICAgSUJVU19IQU5ETEVEX01BU0sgID0gMSA8PCAyNCwKKyAg
ICAgSUJVU19GT1JXQVJEX01BU0sgID0gMSA8PCAyNSwKKysgICAgSUJVU19JR05PUkVEX01BU0sg
ID0gSUJVU19GT1JXQVJEX01BU0ssCisgCisgICAgIElCVVNfU1VQRVJfTUFTSyAgICA9IDEgPDwg
MjYsCisgICAgIElCVVNfSFlQRVJfTUFTSyAgICA9IDEgPDwgMjcsCgpkaWZmIC0tZ2l0IGEvaWJ1
cy5zcGVjIGIvaWJ1cy5zcGVjCmluZGV4IDNjZjFiNTEuLmU1MWZkM2UgMTAwNjQ0Ci0tLSBhL2li
dXMuc3BlYworKysgYi9pYnVzLnNwZWMKQEAgLTgsNyArOCw3IEBACiAKIE5hbWU6ICAgICAgIGli
dXMKIFZlcnNpb246ICAgIDEuMS4wLjIwMDkwNDEzCi1SZWxlYXNlOiAgICAyJXs/ZGlzdH0KK1Jl
bGVhc2U6ICAgIDMlez9kaXN0fQogU3VtbWFyeTogICAgSW50ZWxsaWdlbnQgSW5wdXQgQnVzIGZv
ciBMaW51eCBPUwogTGljZW5zZTogICAgTEdQTHYyKwogR3JvdXA6ICAgICAgU3lzdGVtIEVudmly
b25tZW50L0xpYnJhcmllcwpAQCAtMjE3LDYgKzIxNywxMyBAQCBmaQogJXtfbGliZGlyfS9wa2dj
b25maWcvKgogCiAlY2hhbmdlbG9nCisqIFdlZCBBcHIgMTUgMjAwOSBIdWFuZyBQZW5nIDxzaGF3
bi5wLmh1YW5nQGdtYWlsLmNvbT4gLSAxLjEuMC4yMDA5MDQxMy0zCistIFVwZGF0ZSBpYnVzLUhF
QUQucGF0Y2guCistIEZpeCBidWcgNDk1NDMxIC0gIGlidXMgUmVsZWFzZSBtb2RpZmllciBkb2Vz
bid0IHdvcmsgd2l0aCBBbHQKKy0gRml4IGJ1ZyA0OTQ0NDUgLSAgaWJ1cy1oYW5ndWwgbWlzc2lu
ZyBIYW5ndWwgSGFuL0VuIG1vZGUKKyAgKGFuZCBBbHRfUityZWxlYXNlIGhvdGtleSkKKy0gVXBk
YXRlIHRlLnBvCisKICogVHVlIEFwciAxNCAyMDA5IEh1YW5nIFBlbmcgPHNoYXduLnAuaHVhbmdA
Z21haWwuY29tPiAtIDEuMS4wLjIwMDkwNDEzLTIKIC0gVXBkYXRlIGlidXMtSEVBRC5wYXRjaC4K
IC0gQ2hhbmdlIHRoZSBtb2RlIG9mIC90bXAvaWJ1cy0kVVNFUiB0byAwNzAwIHRvIGltcHJvdmUg
c2VjdXJpdHkK