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: =?utf-8?b?T25kxZllaiBOb3NlayA8b25vc2VrQHJlZGhhdC5jb20+?=
To: git-commits@fedoraproject.org
Subject: [rpms/rpkg] 1.70-1: Backporting some fixes and features
Date: Mon, 10 Aug 2026 21:44:04 GMT
Message-ID: <178639824440.1.15998673192666599024.rpms-rpkg-b725d6929774@fedoraproject.org>
List-ID: <git-commits.fedoraproject.org>
X-Git-Repo: rpms/rpkg
X-Git-Branch: 1.70-1
X-Git-Rev: b725d6929774a361b92c14378d5b0ae75feece06

ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl
cG8gICA6IHJwbXMvcnBrZwogICAgICAgICAgICBCcmFuY2ggOiAxLjcwLTEKICAgICAgICAgICAg
Q29tbWl0IDogYjcyNWQ2OTI5Nzc0YTM2MWI5MmMxNDM3OGQ1YjBhZTc1ZmVlY2UwNgogICAgICAg
ICAgICBBdXRob3IgOiBPbmTFmWVqIE5vc2VrIDxvbm9zZWtAcmVkaGF0LmNvbT4KICAgICAgICAg
ICAgRGF0ZSAgIDogMjAxOS0wNS0yN1QxMTo1NTozMyswMDowMAogICAgICAgICAgICBTdGF0cyAg
OiArMzI4Ly0xIGluIDQgZmlsZShzKQogICAgICAgICAgICBVUkwgICAgOiBodHRwczovL3NyYy5m
ZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL3Jwa2cvYy9iNzI1ZDY5Mjk3NzRhMzYxYjkyYzE0Mzc4ZDVi
MGFlNzVmZWVjZTA2P2JyYW5jaD0xLjcwLTEKCiAgICAgICAgICAgIExvZzoKICAgICAgICAgICAg
QmFja3BvcnRpbmcgc29tZSBmaXhlcyBhbmQgZmVhdHVyZXMKCi0gQ3VzdG9tIGhhbmRsZXIgZm9y
IGtvamkgd2F0Y2hfdGFza3MKLSBTaG93IG52ciBpbiBjb250YWluZXItYnVpbGQKLSBEaWZmZXJl
bnQgaW1wb3J0IC0tb2ZmbGluZSBjb21tYW5kIGJlaGF2aW9yCgpTaWduZWQtb2ZmLWJ5OiBPbmTF
mWVqIE5vc2VrIDxvbm9zZWtAcmVkaGF0LmNvbT4KCi0tLQpkaWZmIC0tZ2l0IGEvMDAwMi1DdXN0
b20taGFuZGxlci1mb3Ita29qaS13YXRjaF90YXNrcy5wYXRjaCBiLzAwMDItQ3VzdG9tLWhhbmRs
ZXItZm9yLWtvamktd2F0Y2hfdGFza3MucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg
MDAwMDAwMC4uOWU0YzJkMgotLS0gL2Rldi9udWxsCisrKyBiLzAwMDItQ3VzdG9tLWhhbmRsZXIt
Zm9yLWtvamktd2F0Y2hfdGFza3MucGF0Y2gKQEAgLTAsMCArMSwxMjEgQEAKK0Zyb20gOTEwZWQ1
MDQ1NmVhNDE5OTU5ODlkNTlhNWE0Njk3OTliYThkNGU1YiBNb24gU2VwIDE3IDAwOjAwOjAwIDIw
MDEKK0Zyb206IE9uZHJlaiBOb3NlayA8b25vc2VrQHJlZGhhdC5jb20+CitEYXRlOiBXZWQsIDE1
IE1heSAyMDE5IDE4OjUzOjMwICswMjAwCitTdWJqZWN0OiBbUEFUQ0hdIEN1c3RvbSBoYW5kbGVy
IGZvciBrb2ppIHdhdGNoX3Rhc2tzCisKK091dHB1dCB0ZXh0IGR1cmluZyByaHBrZy9mZWRwa2cg
YnVpbGQgcHJvY2VzcyBzdGF0ZXMgdGhhdCB0aGVyZQoraXMgYSAnd2F0Y2hfdGFzaycgc3ViY29t
bWFuZC4gV2hlbiAna29qaV9jbGknIGxpYnJhcnkgaXMgaW1wb3J0ZWQKK2luIHJocGtnL2ZlZHBr
ZyB0b29sLCBpdCBzaG93cyB0aGF0IGNvbW1hbmQgaXMgbmFtZWQKKydyaHBrZy9mZWRwa2cgd2F0
Y2hfdGFzaycgaW5zdGVhZCBvZiAnYnJldy9rb2ppIHdhdGNoX3Rhc2snLiBDdXN0b20KK2hhbmRs
ZXIgcmVwbGFjZXMgdGhlIGludGVybmFsIG9uZSBpbnNpZGUga29qaV9jbGkgbGlicmFyeS4KK0Fk
ZGl0aW9uYWwgZml4IGluIHJocGtnIGlzIG5lZWRlZCBhZnRlciB0aGlzIGNoYW5nZSBpcyByZWxl
YXNlZC4KKworUmVsYXRlczogcmhieiMxNTcwOTIxCitSZWxhdGVzOiBDT01QT1NFLTI4MDkKKwor
U2lnbmVkLW9mZi1ieTogT25kcmVqIE5vc2VrIDxvbm9zZWtAcmVkaGF0LmNvbT4KKy0tLQorIHB5
cnBrZy9jbGkucHkgICAgIHwgIDYgKysrKystCisgcHlycGtnL3V0aWxzLnB5ICAgfCAyMSArKysr
KysrKysrKysrKysrKysrKysKKyB0ZXN0cy90ZXN0X2NsaS5weSB8IDM5ICsrKysrKysrKysrKysr
KysrKysrKystLS0tLS0tLS0tLS0tLS0tLQorIDMgZmlsZXMgY2hhbmdlZCwgNDggaW5zZXJ0aW9u
cygrKSwgMTggZGVsZXRpb25zKC0pCisKK2RpZmYgLS1naXQgYS9weXJwa2cvY2xpLnB5IGIvcHly
cGtnL2NsaS5weQoraW5kZXggN2I4M2E0NC4uNzJiZTFjZiAxMDA2NDQKKy0tLSBhL3B5cnBrZy9j
bGkucHkKKysrKyBiL3B5cnBrZy9jbGkucHkKK0BAIC0xNjY3LDcgKzE2NjcsMTEgQEAgc2VlIEFQ
SSBLRVkgc2VjdGlvbiBvZiBjb3ByLWNsaSgxKSBtYW4gcGFnZS4KKyAgICAgICAgIGlmIHNlbGYu
YXJncy5kcnlfcnVuOgorICAgICAgICAgICAgIHNlbGYubG9nLmluZm8oJ0RSWS1SVU46IFdhdGNo
IHRhc2tzOiAlcycsIHRhc2tfaWRzKQorICAgICAgICAgZWxzZToKKy0gICAgICAgICAgICByZXR1
cm4ga29qaV9jbGkubGliLndhdGNoX3Rhc2tzKHNlbGYuY21kLmtvamlzZXNzaW9uLCB0YXNrX2lk
cykKKysgICAgICAgICAgICByZXR1cm4ga29qaV9jbGkubGliLndhdGNoX3Rhc2tzKAorKyAgICAg
ICAgICAgICAgICBzZWxmLmNtZC5rb2ppc2Vzc2lvbiwKKysgICAgICAgICAgICAgICAgdGFza19p
ZHMsCisrICAgICAgICAgICAgICAgIGtpX2hhbmRsZXI9dXRpbHMubWFrZV9rb2ppX3dhdGNoX3Rh
c2tzX2hhbmRsZXIoc2VsZi5jbWQuYnVpbGRfY2xpZW50KQorKyAgICAgICAgICAgICkKKyAKKyAg
ICAgZGVmIGV4dHJhY3RfZ3JlZW53YXZlX3VybChzZWxmKToKKyAgICAgICAgIGdyZWVud2F2ZV91
cmwgPSBOb25lCitkaWZmIC0tZ2l0IGEvcHlycGtnL3V0aWxzLnB5IGIvcHlycGtnL3V0aWxzLnB5
CitpbmRleCAyMjY4ZTZmLi4zN2EzOWUyIDEwMDY0NAorLS0tIGEvcHlycGtnL3V0aWxzLnB5Cisr
KysgYi9weXJwa2cvdXRpbHMucHkKK0BAIC0xMjgsMyArMTI4LDI0IEBAIGRlZiB2YWxpZGF0ZV9t
b2R1bGVfYnVpbGRfb3B0aW9uYWwob3B0aW9uYWxfYXJnKToKKyAgICAgICAgICAgICAnVGhlICJ7
MH0iIG9wdGlvbmFsIGFyZ3VtZW50IGlzIHJlc2VydmVkIHRvIGJ1aWx0LWluIGFyZ3VtZW50cycu
Zm9ybWF0KGtleSkpCisgCisgICAgIHJldHVybiAoa2V5LCB2YWx1ZSkKKysKKysKKytkZWYgbWFr
ZV9rb2ppX3dhdGNoX3Rhc2tzX2hhbmRsZXIocHJvZ25hbWUpOgorKyAgICBkZWYga29qaV93YXRj
aF90YXNrc19oYW5kbGVyKF8sIHRhc2tzLCBxdWlldCk6CisrICAgICAgICAiIiIKKysgICAgICAg
IERpc3BsYXlzIGluZm9ybWF0aW9uIGFib3V0IHJ1bm5pbmcgdGFza3MgYW5kIHNheXMgaG93IHRv
IHdhdGNoIHRoZW0uCisrICAgICAgICBVbmxpa2UgdGhlIGRlZmF1bHQgdmVyc2lvbiBhdCBrb2pp
IGxpYnJhcnkgaXQgb3ZlcnJpZGVzIHByb2duYW1lCisrICAgICAgICB0byBzaG93IGJyZXcsIGtv
amkgb3Igb3RoZXIgYnVpbGQgY2xpZW50LgorKyAgICAgICAgIiIiCisrICAgICAgICBpZiBub3Qg
cXVpZXQ6CisrICAgICAgICAgICAgdGxpc3QgPSBbJyVzOiAlcycgJSAodC5zdHIoKSwgdC5kaXNw
bGF5X3N0YXRlKHQuaW5mbykpCisrICAgICAgICAgICAgICAgICAgICAgZm9yIHQgaW4gdGFza3Mu
dmFsdWVzKCkgaWYgbm90IHQuaXNfZG9uZSgpXQorKyAgICAgICAgICAgIHByaW50KCIiIlRhc2tz
IHN0aWxsIHJ1bm5pbmcuIFlvdSBjYW4gY29udGludWUgdG8gd2F0Y2ggd2l0aCB0aGUgJyVzIHdh
dGNoLXRhc2snIGNvbW1hbmQuCisrUnVubmluZyBUYXNrczogJXMiIiIgJSAocHJvZ25hbWUsICdc
bicuam9pbih0bGlzdCkpKQorKworKyAgICAjIFNhdmUgcmVmZXJlbmNlIG9mIHRoZSBoYW5kbGVy
IGR1cmluZyBmaXJzdCB0aW1lIHVzZS4KKysgICAgIyBJdCBndWFyYW50ZWVzIHRoYXQgdGhlIHNh
bWUgb2JqZWN0IGlzIGFsd2F5cyByZXR1cm5lZCAoaXQgYWxsb3dzIHVuaXR0ZXN0IHRvIHBhc3Mp
LgorKyAgICBnbG9iYWwgaGFuZGxlcl9yZWZlcmVuY2UKKysgICAgaWYgJ2hhbmRsZXJfcmVmZXJl
bmNlJyBub3QgaW4gZ2xvYmFscygpOgorKyAgICAgICAgaGFuZGxlcl9yZWZlcmVuY2UgPSBrb2pp
X3dhdGNoX3Rhc2tzX2hhbmRsZXIKKysgICAgcmV0dXJuIGhhbmRsZXJfcmVmZXJlbmNlCitkaWZm
IC0tZ2l0IGEvdGVzdHMvdGVzdF9jbGkucHkgYi90ZXN0cy90ZXN0X2NsaS5weQoraW5kZXggNzg1
ZTEwMy4uYjNlMDcxOCAxMDA2NDQKKy0tLSBhL3Rlc3RzL3Rlc3RfY2xpLnB5CisrKysgYi90ZXN0
cy90ZXN0X2NsaS5weQorQEAgLTMyMzUsMjMgKzMyMzUsMjggQEAgY2xhc3MgVGVzdEJ1aWxkUGFj
a2FnZShGYWtlS29qaUNyZWRzLCBDbGlUZXN0Q2FzZSk6CisgICAgICAgICBtb2NrX2J1aWxkX2Fw
aSA9IE5vbmUKKyAKKyAgICAgICAgIHdpdGggcGF0Y2goJ2tvamlfY2xpLmxpYi53YXRjaF90YXNr
cycpIGFzIHdhdGNoX3Rhc2tzOgorLSAgICAgICAgICAgIHdpdGggcGF0Y2goJ3N5cy5hcmd2Jywg
bmV3PWNsaV9jbWQpOgorLSAgICAgICAgICAgICAgICBjbGkgPSBzZWxmLm5ld19jbGkoY2ZnPWNv
bmZpZ19maWxlKQorLSAgICAgICAgICAgICAgICBpZiBzdWJfY29tbWFuZCA9PSAnYnVpbGQnOgor
LSAgICAgICAgICAgICAgICAgICAgbW9ja19idWlsZF9hcGkgPSBzZXNzaW9uLmJ1aWxkCistICAg
ICAgICAgICAgICAgICAgICBjbGkuYnVpbGQoKQorLSAgICAgICAgICAgICAgICBlbGlmIHN1Yl9j
b21tYW5kID09ICdzY3JhdGNoLWJ1aWxkJzoKKy0gICAgICAgICAgICAgICAgICAgIG1vY2tfYnVp
bGRfYXBpID0gc2Vzc2lvbi5idWlsZAorLSAgICAgICAgICAgICAgICAgICAgY2xpLnNjcmF0Y2hf
YnVpbGQoKQorLSAgICAgICAgICAgICAgICBlbGlmIHN1Yl9jb21tYW5kID09ICdjaGFpbi1idWls
ZCc6CistICAgICAgICAgICAgICAgICAgICBtb2NrX2J1aWxkX2FwaSA9IHNlc3Npb24uY2hhaW5C
dWlsZAorLSAgICAgICAgICAgICAgICAgICAgY2xpLmNoYWluYnVpbGQoKQorLQorLSAgICAgICAg
ICAgIGlmICctLW5vd2FpdCcgaW4gY2xpX2NtZDoKKy0gICAgICAgICAgICAgICAgd2F0Y2hfdGFz
a3MuYXNzZXJ0X25vdF9jYWxsZWQoKQorLSAgICAgICAgICAgIGVsc2U6CistICAgICAgICAgICAg
ICAgIHdhdGNoX3Rhc2tzLmFzc2VydF9jYWxsZWRfb25jZV93aXRoKAorLSAgICAgICAgICAgICAg
ICAgICAgc2Vzc2lvbiwgW21vY2tfYnVpbGRfYXBpLnJldHVybl92YWx1ZV0pCisrICAgICAgICAg
ICAgd2l0aCBwYXRjaCgncHlycGtnLnV0aWxzLm1ha2Vfa29qaV93YXRjaF90YXNrc19oYW5kbGVy
JykgYXMgbW9ja19raToKKysgICAgICAgICAgICAgICAgd2l0aCBwYXRjaCgnc3lzLmFyZ3YnLCBu
ZXc9Y2xpX2NtZCk6CisrICAgICAgICAgICAgICAgICAgICBjbGkgPSBzZWxmLm5ld19jbGkoY2Zn
PWNvbmZpZ19maWxlKQorKyAgICAgICAgICAgICAgICAgICAgaWYgc3ViX2NvbW1hbmQgPT0gJ2J1
aWxkJzoKKysgICAgICAgICAgICAgICAgICAgICAgICBtb2NrX2J1aWxkX2FwaSA9IHNlc3Npb24u
YnVpbGQKKysgICAgICAgICAgICAgICAgICAgICAgICBjbGkuYnVpbGQoKQorKyAgICAgICAgICAg
ICAgICAgICAgZWxpZiBzdWJfY29tbWFuZCA9PSAnc2NyYXRjaC1idWlsZCc6CisrICAgICAgICAg
ICAgICAgICAgICAgICAgbW9ja19idWlsZF9hcGkgPSBzZXNzaW9uLmJ1aWxkCisrICAgICAgICAg
ICAgICAgICAgICAgICAgY2xpLnNjcmF0Y2hfYnVpbGQoKQorKyAgICAgICAgICAgICAgICAgICAg
ZWxpZiBzdWJfY29tbWFuZCA9PSAnY2hhaW4tYnVpbGQnOgorKyAgICAgICAgICAgICAgICAgICAg
ICAgIG1vY2tfYnVpbGRfYXBpID0gc2Vzc2lvbi5jaGFpbkJ1aWxkCisrICAgICAgICAgICAgICAg
ICAgICAgICAgY2xpLmNoYWluYnVpbGQoKQorKworKyAgICAgICAgICAgICAgICBpZiAnLS1ub3dh
aXQnIGluIGNsaV9jbWQ6CisrICAgICAgICAgICAgICAgICAgICB3YXRjaF90YXNrcy5hc3NlcnRf
bm90X2NhbGxlZCgpCisrICAgICAgICAgICAgICAgIGVsc2U6CisrICAgICAgICAgICAgICAgICAg
ICB3YXRjaF90YXNrcy5hc3NlcnRfY2FsbGVkX29uY2Vfd2l0aCgKKysgICAgICAgICAgICAgICAg
ICAgICAgICBzZXNzaW9uLAorKyAgICAgICAgICAgICAgICAgICAgICAgIFttb2NrX2J1aWxkX2Fw
aS5yZXR1cm5fdmFsdWVdLAorKyAgICAgICAgICAgICAgICAgICAgICAgIGtpX2hhbmRsZXI9bW9j
a19raS5yZXR1cm5fdmFsdWUKKysgICAgICAgICAgICAgICAgICAgICkKKysgICAgICAgICAgICAg
ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobW9ja19raS5jYWxsX2FyZ3MsICgoImtvamkiLCksKSkK
KyAKKyAgICAgICAgIG1vY2tfYnVpbGRfYXBpLmFzc2VydF9jYWxsZWRfb25jZSgpCisgCistLSAK
KzIuMjAuMQorCgpkaWZmIC0tZ2l0IGEvMDAwMy1TaG93LW52ci1pbi1jb250YWluZXItYnVpbGQu
cGF0Y2ggYi8wMDAzLVNob3ctbnZyLWluLWNvbnRhaW5lci1idWlsZC5wYXRjaApuZXcgZmlsZSBt
b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kN2E2YmFlCi0tLSAvZGV2L251bGwKKysrIGIvMDAw
My1TaG93LW52ci1pbi1jb250YWluZXItYnVpbGQucGF0Y2gKQEAgLTAsMCArMSw3NSBAQAorRnJv
bSA3Y2VmMjlkODQzZmFiY2U1YWJhYjMxNzMwM2U5MDE2YzkxNDE0OTEzIE1vbiBTZXAgMTcgMDA6
MDA6MDAgMjAwMQorRnJvbTogT25kcmVqIE5vc2VrIDxvbm9zZWtAcmVkaGF0LmNvbT4KK0RhdGU6
IEZyaSwgMjQgTWF5IDIwMTkgMTE6MjE6MzQgKzAyMDAKK1N1YmplY3Q6IFtQQVRDSF0gU2hvdyBu
dnIgaW4gY29udGFpbmVyLWJ1aWxkCisKK0pJUkE6IENPTVBPU0UtMzQ4MQorCitTaWduZWQtb2Zm
LWJ5OiBPbmRyZWogTm9zZWsgPG9ub3Nla0ByZWRoYXQuY29tPgorLS0tCisgcHlycGtnL19faW5p
dF9fLnB5IHwgNDIgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tCisg
MSBmaWxlIGNoYW5nZWQsIDM0IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCisKK2RpZmYg
LS1naXQgYS9weXJwa2cvX19pbml0X18ucHkgYi9weXJwa2cvX19pbml0X18ucHkKK2luZGV4IDI5
MWI5YWMuLjAzNDg0MjAgMTAwNjQ0CistLS0gYS9weXJwa2cvX19pbml0X18ucHkKKysrKyBiL3B5
cnBrZy9fX2luaXRfXy5weQorQEAgLTMwMzYsNiArMzAzNiwzOSBAQCBjbGFzcyBDb21tYW5kcyhv
YmplY3QpOgorICAgICAgICAgIyBSdW4gdGhlIGNvbW1hbmQKKyAgICAgICAgIHNlbGYuX3J1bl9j
b21tYW5kKGNtZCwgc2hlbGw9VHJ1ZSkKKyAKKysgICAgZGVmIF9wcm9jZXNzX2tvamlfdGFza19y
ZXN1bHQoc2VsZiwgdGFza19pZCk6CisrICAgICAgICAiIiIKKysgICAgICAgIFBhcnNlIGFuZCBt
b2RpZnkgb3V0cHV0IGZyb20gYnJldy9rb2ppIGNvbnRhaW5pbmcgaW5mb3JtYXRpb24gYWJvdXQK
KysgICAgICAgIHRhc2sgKGFuZCBldmVudHVhbGx5IGJ1aWxkcykuCisrCisrICAgICAgICA6cGFy
YW0gaW50IHRhc2tfaWQ6IGlkIG9mIHRoZSBjdXJyZW50IHRhc2sKKysgICAgICAgIDpyZXR1cm46
IHJlY29yZCBjb250YWluaW5nIGluZm9ybWF0aW9uIGFib3V0IHJlcG9zaXRvcmllcywgYnVpbGRz
IGFuZCBudnJzCisrICAgICAgICA6cnR5cGU6IGRpY3Qoc3RyLCBzdHIpCisrICAgICAgICAiIiIK
KysgICAgICAgIGtvamlfcmVzdWx0ID0gc2VsZi5rb2ppc2Vzc2lvbi5nZXRUYXNrUmVzdWx0KHRh
c2tfaWQpCisrICAgICAgICBpZiBub3Qga29qaV9yZXN1bHQ6CisrICAgICAgICAgICAgcmFpc2Ug
cnBrZ0Vycm9yKCdVbmtub3duIHRhc2s6ICVzJyAlIHRhc2tfaWQpCisrICAgICAgICBrb2ppX2J1
aWxkcyA9IGtvamlfcmVzdWx0LmdldCgia29qaV9idWlsZHMiLCBbXSkKKysgICAgICAgIGtvamlf
cmVzdWx0WyJrb2ppX2J1aWxkcyJdID0gW10KKysKKysgICAgICAgIGZvciBidWlsZF9pZCBpbiBr
b2ppX2J1aWxkczoKKysgICAgICAgICAgICB0cnk6CisrICAgICAgICAgICAgICAgIGJ1aWxkX2lk
ID0gaW50KGJ1aWxkX2lkKQorKyAgICAgICAgICAgIGV4Y2VwdCBWYWx1ZUVycm9yOgorKyAgICAg
ICAgICAgICAgICByYWlzZSBycGtnRXJyb3IoIkNhbiBub3QgY29udmVydCAnYnVpbGRfaWQnIHRv
IGludGVnZXI6ICVzIiAlIGJ1aWxkX2lkKQorKworKyAgICAgICAgICAgIGJkYXRhID0gc2VsZi5r
b2ppc2Vzc2lvbi5nZXRCdWlsZChidWlsZF9pZCkKKysgICAgICAgICAgICBpZiBub3QgYmRhdGE6
CisrICAgICAgICAgICAgICAgIHJhaXNlIHJwa2dFcnJvcignVW5rbm93biBidWlsZDogJXMnICUg
YnVpbGRfaWQpCisrICAgICAgICAgICAgbnZyID0gYmRhdGEuZ2V0KCJudnIiKQorKyAgICAgICAg
ICAgIGlmIG52cjoKKysgICAgICAgICAgICAgICAga29qaV9yZXN1bHQuc2V0ZGVmYXVsdCgibnZy
cyIsIFtdKS5hcHBlbmQobnZyKQorKworKyAgICAgICAgICAgIGtvamlfcmVzdWx0WyJrb2ppX2J1
aWxkcyJdLmFwcGVuZCgKKysgICAgICAgICAgICAgICAgIiVzL2J1aWxkaW5mbz9idWlsZElEPSVk
IiAlIChzZWxmLmtvaml3ZWJ1cmwsIGJ1aWxkX2lkKSkKKysKKysgICAgICAgIHJldHVybiBrb2pp
X3Jlc3VsdAorKworICAgICBkZWYgY29udGFpbmVyX2J1aWxkX2tvamkoc2VsZiwgdGFyZ2V0X292
ZXJyaWRlPUZhbHNlLCBvcHRzPXt9LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAga29q
aWNvbmZpZz1Ob25lLCBrb2ppcHJvZmlsZT1Ob25lLAorICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgYnVpbGRfY2xpZW50PU5vbmUsCitAQCAtMzEwNSwxNCArMzEzOCw3IEBAIGNsYXNzIENv
bW1hbmRzKG9iamVjdCk6CisgICAgICAgICAgICAgaWYgbm90IG5vd2FpdDoKKyAgICAgICAgICAg
ICAgICAgcnYgPSBrb2ppX3Rhc2tfd2F0Y2hlcihzZWxmLmtvamlzZXNzaW9uLCBbdGFza19pZF0p
CisgICAgICAgICAgICAgICAgIGlmIHJ2ID09IDA6CistICAgICAgICAgICAgICAgICAgICByZXN1
bHQgPSBzZWxmLmtvamlzZXNzaW9uLmdldFRhc2tSZXN1bHQodGFza19pZCkKKy0gICAgICAgICAg
ICAgICAgICAgIHRyeToKKy0gICAgICAgICAgICAgICAgICAgICAgICByZXN1bHRbImtvamlfYnVp
bGRzIl0gPSBbCistICAgICAgICAgICAgICAgICAgICAgICAgICAgICIlcy9idWlsZGluZm8/YnVp
bGRJRD0lcyIgJSAoc2VsZi5rb2ppd2VidXJsLAorLSAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJ1aWxkX2lkKQorLSAgICAgICAgICAgICAg
ICAgICAgICAgICAgICBmb3IgYnVpbGRfaWQgaW4gcmVzdWx0LmdldCgia29qaV9idWlsZHMiLCBb
XSldCistICAgICAgICAgICAgICAgICAgICBleGNlcHQgVHlwZUVycm9yOgorLSAgICAgICAgICAg
ICAgICAgICAgICAgIHBhc3MKKysgICAgICAgICAgICAgICAgICAgIHJlc3VsdCA9IHNlbGYuX3By
b2Nlc3Nfa29qaV90YXNrX3Jlc3VsdCh0YXNrX2lkKQorICAgICAgICAgICAgICAgICAgICAgbG9n
X3Jlc3VsdChzZWxmLmxvZy5pbmZvLCByZXN1bHQpCisgCisgICAgICAgICBmaW5hbGx5OgorLS0g
CisyLjIwLjEKKwoKZGlmZiAtLWdpdCBhLzAwMDQtRGlmZmVyZW50LWltcG9ydC1vZmZsaW5lLWNv
bW1hbmQtYmVoYXZpb3IucGF0Y2ggYi8wMDA0LURpZmZlcmVudC1pbXBvcnQtb2ZmbGluZS1jb21t
YW5kLWJlaGF2aW9yLnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmIx
N2RhNWIKLS0tIC9kZXYvbnVsbAorKysgYi8wMDA0LURpZmZlcmVudC1pbXBvcnQtb2ZmbGluZS1j
b21tYW5kLWJlaGF2aW9yLnBhdGNoCkBAIC0wLDAgKzEsMTIzIEBACitGcm9tIDgxMGIyZjdlZmRh
NjViYTM2OWYxYmI4NjVmMjVkMzUxOTE1ZGIxYWIgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitG
cm9tOiBPbmRyZWogTm9zZWsgPG9ub3Nla0ByZWRoYXQuY29tPgorRGF0ZTogRnJpLCAyNCBNYXkg
MjAxOSAxNzo0MzowMSArMDIwMAorU3ViamVjdDogW1BBVENIXSBEaWZmZXJlbnQgaW1wb3J0IC0t
b2ZmbGluZSBjb21tYW5kIGJlaGF2aW9yCisKK2AqcGtnIGltcG9ydCAtLW9mZmxpbmVgIGRpZG4n
dCB1cGRhdGUgJ3NvdXJjZScgYW5kICcuZ2l0aWdub3JlJyBmaWxlcy4KK01vZGlmaWVkIGluY29y
cmVjdCBvdXRwdXQgYWJvdXQgdXBsb2FkZWQgc291cmNlcy4gT2ZmbGluZSBtb2RlIG5vdyBkb2Vz
CitldmVyeXRoaW5nIGJ1dCB1cGxvYWRpbmcgc291cmNlcyBpbnRvIGxvb2thc2lkZSBjYWNoZS4K
KworSklSQTogQ09NUE9TRS0zNTU4CitGaXhlczogIzQ0NQorUmVzb2x2ZXM6IHJoYnojMTE3NTI2
MgorCitTaWduZWQtb2ZmLWJ5OiBPbmRyZWogTm9zZWsgPG9ub3Nla0ByZWRoYXQuY29tPgorLS0t
CisgcHlycGtnL19faW5pdF9fLnB5ICB8ICA1ICsrKy0tCisgcHlycGtnL2NsaS5weSAgICAgICB8
IDE1ICsrKysrKysrKysrLS0tLQorIHB5cnBrZy9sb29rYXNpZGUucHkgfCAgOCArKysrKysrLQor
IHRlc3RzL3Rlc3RfY2xpLnB5ICAgfCAgMiArLQorIDQgZmlsZXMgY2hhbmdlZCwgMjIgaW5zZXJ0
aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBhL3B5cnBrZy9fX2luaXRfXy5w
eSBiL3B5cnBrZy9fX2luaXRfXy5weQoraW5kZXggMDM0ODQyMC4uMWY2MTA4MiAxMDA2NDQKKy0t
LSBhL3B5cnBrZy9fX2luaXRfXy5weQorKysrIGIvcHlycGtnL19faW5pdF9fLnB5CitAQCAtMjgx
OCw3ICsyODE4LDcgQEAgY2xhc3MgQ29tbWFuZHMob2JqZWN0KToKKyAgICAgICAgICAgICBzZWxm
LmxvZy5kZWJ1ZygnQ2xlYW5pbmcgdXAgbW9jayB0ZW1wb3JhcnkgY29uZmlnIGRpcmVjdG9yeTog
JXMnLCBjb25maWdfZGlyKQorICAgICAgICAgICAgIHNlbGYuX2NsZWFudXBfdG1wX2Rpcihjb25m
aWdfZGlyKQorIAorLSAgICBkZWYgdXBsb2FkKHNlbGYsIGZpbGVzLCByZXBsYWNlPUZhbHNlKToK
KysgICAgZGVmIHVwbG9hZChzZWxmLCBmaWxlcywgcmVwbGFjZT1GYWxzZSwgb2ZmbGluZT1GYWxz
ZSk6CisgICAgICAgICAiIiJVcGxvYWQgc291cmNlIGZpbGUocykgaW4gdGhlIGxvb2thc2lkZSBj
YWNoZQorIAorICAgICAgICAgQm90aCBmaWxlIGBzb3VyY2VzYCBhbmQgYC5naXRpZ25vcmVgIHdp
bGwgYmUgdXBkYXRlZCB3aXRoIHVwbG9hZGVkCitAQCAtMjgyNyw2ICsyODI3LDcgQEAgY2xhc3Mg
Q29tbWFuZHMob2JqZWN0KToKKyAgICAgICAgIDpwYXJhbSBpdGVyYWJsZSBmaWxlczogYW4gaXRl
cmFibGUgb2YgZmlsZXMgdG8gdXBsb2FkLgorICAgICAgICAgOnBhcmFtIGJvb2wgcmVwbGFjZTog
b3B0aW9uYWxseSByZXBsYWNlIHRoZSBleGlzdGluZyB0cmFja2VkIHNvdXJjZXMuCisgICAgICAg
ICAgICAgRGVmYXVsdHMgdG8gYEZhbHNlYC4KKysgICAgICAgIDpwYXJhbSBib29sIG9mZmxpbmU6
IGRvIGFsbCB0aGUgc3RlcHMgZXhjZXB0IHVwbG9hZGluZyBpbnRvIGxvb2thc2lkZSBjYWNoZQor
ICAgICAgICAgOnJhaXNlcyBycGtnRXJyb3I6IGlmIGZhaWxlZCB0byBhZGQgYSBmaWxlIHRvIGZp
bGUgYHNvdXJjZXNgLgorICAgICAgICAgIiIiCisgCitAQCAtMjg1OSw3ICsyODYwLDcgQEAgY2xh
c3MgQ29tbWFuZHMob2JqZWN0KToKKyAgICAgICAgICAgICBnaXRpZ25vcmUuYWRkKCcvJXMnICUg
ZmlsZV9iYXNlbmFtZSkKKyAgICAgICAgICAgICBzZWxmLmxvb2thc2lkZWNhY2hlLnVwbG9hZCgK
KyAgICAgICAgICAgICAgICAgc2VsZi5uc19yZXBvX25hbWUgaWYgc2VsZi5sb29rYXNpZGVfbmFt
ZXNwYWNlZCBlbHNlIHNlbGYucmVwb19uYW1lLAorLSAgICAgICAgICAgICAgICBmLCBmaWxlX2hh
c2gpCisrICAgICAgICAgICAgICAgIGYsIGZpbGVfaGFzaCwgb2ZmbGluZT1vZmZsaW5lKQorIAor
ICAgICAgICAgc291cmNlc2Yud3JpdGUoKQorICAgICAgICAgZ2l0aWdub3JlLndyaXRlKCkKK2Rp
ZmYgLS1naXQgYS9weXJwa2cvY2xpLnB5IGIvcHlycGtnL2NsaS5weQoraW5kZXggNzJiZTFjZi4u
ZWIwZjQ5OSAxMDA2NDQKKy0tLSBhL3B5cnBrZy9jbGkucHkKKysrKyBiL3B5cnBrZy9jbGkucHkK
K0BAIC0yMDI3LDEzICsyMDI3LDIwIEBAIHNlZSBBUEkgS0VZIHNlY3Rpb24gb2YgY29wci1jbGko
MSkgbWFuIHBhZ2UuCisgCisgICAgIGRlZiBpbXBvcnRfc3JwbShzZWxmKToKKyAgICAgICAgIHVw
bG9hZGZpbGVzID0gc2VsZi5jbWQuaW1wb3J0X3NycG0oc2VsZi5hcmdzLnNycG0pCistICAgICAg
ICBpZiB1cGxvYWRmaWxlcyBhbmQgbm90IHNlbGYuYXJncy5vZmZsaW5lOgorLSAgICAgICAgICAg
IHNlbGYuY21kLnVwbG9hZCh1cGxvYWRmaWxlcywgcmVwbGFjZT1UcnVlKQorKyAgICAgICAgaWYg
dXBsb2FkZmlsZXM6CisrICAgICAgICAgICAgc2VsZi5jbWQudXBsb2FkKHVwbG9hZGZpbGVzLCBy
ZXBsYWNlPVRydWUsIG9mZmxpbmU9c2VsZi5hcmdzLm9mZmxpbmUpCisgICAgICAgICBpZiBub3Qg
c2VsZi5hcmdzLnNraXBfZGlmZnM6CisgICAgICAgICAgICAgc2VsZi5jbWQuZGlmZihjYWNoZWQ9
VHJ1ZSkKKyAgICAgICAgIHNlbGYubG9nLmluZm8oJy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tJykKKy0gICAgICAgIHNlbGYubG9nLmluZm8oIk5ldyBjb250ZW50
IHN0YWdlZCBhbmQgbmV3IHNvdXJjZXMgdXBsb2FkZWQuIikKKy0gICAgICAgIHNlbGYubG9nLmlu
Zm8oIkNvbW1pdCBpZiBoYXBweSBvciByZXZlcnQgd2l0aDogZ2l0IHJlc2V0IC0taGFyZCBIRUFE
IikKKysgICAgICAgIGlmIHVwbG9hZGZpbGVzIGFuZCBzZWxmLmFyZ3Mub2ZmbGluZToKKysgICAg
ICAgICAgICBzZWxmLmxvZy5pbmZvKCJOZXcgY29udGVudCBzdGFnZWQgd2l0aG91dCB1cGxvYWRp
bmcgc291cmNlcy4iKQorKyAgICAgICAgICAgIHNlbGYubG9nLmluZm8oIkNvbW1pdCBhbmQgdXBs
b2FkICglcyB1cGxvYWQgPHNvdXJjZT4pIGlmIGhhcHB5IG9yIHJldmVydCB3aXRoOiAiCisrICAg
ICAgICAgICAgICAgICAgICAgICAgICAiJ2dpdCByZXNldCAtLWhhcmQgSEVBRCcgKHdhcm5pbmc6
IGl0IHJldmVydHMgYWxzbyBldmVudHVhbCB1c2VyICIKKysgICAgICAgICAgICAgICAgICAgICAg
ICAgICJjaGFuZ2VzKS4iICUgKHNlbGYuX25hbWUsKSkKKysgICAgICAgIGVsc2U6CisrICAgICAg
ICAgICAgc2VsZi5sb2cuaW5mbygiTmV3IGNvbnRlbnQgc3RhZ2VkIGFuZCBuZXcgc291cmNlcyB1
cGxvYWRlZC4iKQorKyAgICAgICAgICAgIHNlbGYubG9nLmluZm8oIkNvbW1pdCBpZiBoYXBweSBv
ciByZXZlcnQgd2l0aDogJ2dpdCByZXNldCAtLWhhcmQgSEVBRCcgKHdhcm5pbmc6ICIKKysgICAg
ICAgICAgICAgICAgICAgICAgICAgICJpdCByZXZlcnRzIGFsc28gZXZlbnR1YWwgdXNlciBjaGFu
Z2VzKS4iKQorIAorICAgICBkZWYgaW5zdGFsbChzZWxmKToKKyAgICAgICAgIHNlbGYuc291cmNl
cygpCitkaWZmIC0tZ2l0IGEvcHlycGtnL2xvb2thc2lkZS5weSBiL3B5cnBrZy9sb29rYXNpZGUu
cHkKK2luZGV4IGQyOGMxZDkuLmVkZTgxZWEgMTAwNjQ0CistLS0gYS9weXJwa2cvbG9va2FzaWRl
LnB5CisrKysgYi9weXJwa2cvbG9va2FzaWRlLnB5CitAQCAtMjY5LDcgKzI2OSw3IEBAIGNsYXNz
IENHSUxvb2thc2lkZUNhY2hlKG9iamVjdCk6CisgICAgICAgICByYWlzZSBVcGxvYWRFcnJvcign
RXJyb3IgY2hlY2tpbmcgZm9yICVzIGF0ICVzJworICAgICAgICAgICAgICAgICAgICAgICAgICAg
JSAoZmlsZW5hbWUsIHNlbGYudXBsb2FkX3VybCkpCisgCistICAgIGRlZiB1cGxvYWQoc2VsZiwg
bmFtZSwgZmlsZXBhdGgsIGhhc2gpOgorKyAgICBkZWYgdXBsb2FkKHNlbGYsIG5hbWUsIGZpbGVw
YXRoLCBoYXNoLCBvZmZsaW5lPUZhbHNlKToKKyAgICAgICAgICIiIlVwbG9hZCBhIHNvdXJjZSBm
aWxlCisgCisgICAgICAgICA6cGFyYW0gc3RyIG5hbWU6IFRoZSBuYW1lIG9mIHRoZSBtb2R1bGUu
ICh1c3VhbGx5IHRoZSBuYW1lIG9mIHRoZSBTUlBNKQorQEAgLTI3Nyw3ICsyNzcsMTMgQEAgY2xh
c3MgQ0dJTG9va2FzaWRlQ2FjaGUob2JqZWN0KToKKyAgICAgICAgICAgICBzZXJ2ZXIgc2lkZSBl
eHBlY3RzKS4KKyAgICAgICAgIDpwYXJhbSBzdHIgZmlsZXBhdGg6IFRoZSBmdWxsIHBhdGggdG8g
dGhlIGZpbGUgdG8gdXBsb2FkLgorICAgICAgICAgOnBhcmFtIHN0ciBoYXNoOiBUaGUga25vd24g
Z29vZCBoYXNoIG9mIHRoZSBmaWxlLgorKyAgICAgICAgOnBhcmFtIGJvb2wgb2ZmbGluZTogTWV0
aG9kIHByaW50cyBhIG1lc3NhZ2UgYWJvdXQgZGlzYWJsZWQgdXBsb2FkIGFuZCBkb2VzIHJldHVy
bi4KKyAgICAgICAgICIiIgorKyAgICAgICAgaWYgb2ZmbGluZToKKysgICAgICAgICAgICBzZWxm
LmxvZy5pbmZvKCJVcGxvYWRpbmc6ICVzIiwgZmlsZXBhdGgpCisrICAgICAgICAgICAgc2VsZi5s
b2cuaW5mbygiKlVwbG9hZCBkaXNhYmxlZCoiKQorKyAgICAgICAgICAgIHJldHVybgorKworICAg
ICAgICAgZmlsZW5hbWUgPSBvcy5wYXRoLmJhc2VuYW1lKGZpbGVwYXRoKQorIAorICAgICAgICAg
IyBBcyBpbiByZW1vdGVfZmlsZV9leGlzdHMsIHdlIG5lZWQgdG8gY29udmVydCB1bmljb2RlIHN0
cmluZ3MgdG8gc3RyCitkaWZmIC0tZ2l0IGEvdGVzdHMvdGVzdF9jbGkucHkgYi90ZXN0cy90ZXN0
X2NsaS5weQoraW5kZXggYjNlMDcxOC4uZWU5MjM4OSAxMDA2NDQKKy0tLSBhL3Rlc3RzL3Rlc3Rf
Y2xpLnB5CisrKysgYi90ZXN0cy90ZXN0X2NsaS5weQorQEAgLTExNjMsNyArMTE2Myw3IEBAIGNs
YXNzIExvb2thc2lkZUNhY2hlTW9jayhvYmplY3QpOgorICAgICBkZWYgZGVzdHJveV9sb29rYXNp
ZGVfY2FjaGUoc2VsZik6CisgICAgICAgICBzaHV0aWwucm10cmVlKHNlbGYubG9va2FzaWRlY2Fj
aGVfc3RvcmFnZSkKKyAKKy0gICAgZGVmIGxvb2thc2lkZWNhY2hlX3VwbG9hZChzZWxmLCByZXBv
X25hbWUsIGZpbGVwYXRoLCBoYXNoKToKKysgICAgZGVmIGxvb2thc2lkZWNhY2hlX3VwbG9hZChz
ZWxmLCByZXBvX25hbWUsIGZpbGVwYXRoLCBoYXNoLCBvZmZsaW5lKToKKyAgICAgICAgIGZpbGVu
YW1lID0gb3MucGF0aC5iYXNlbmFtZShmaWxlcGF0aCkKKyAgICAgICAgIHN0b3JhZ2VfZmlsZW5h
bWUgPSBvcy5wYXRoLmpvaW4oc2VsZi5sb29rYXNpZGVjYWNoZV9zdG9yYWdlLCBmaWxlbmFtZSkK
KyAgICAgICAgIHdpdGggb3BlbihzdG9yYWdlX2ZpbGVuYW1lLCAnd2InKSBhcyBmb3V0OgorLS0g
CisyLjIwLjEKKwoKZGlmZiAtLWdpdCBhL3Jwa2cuc3BlYyBiL3Jwa2cuc3BlYwppbmRleCA1ZDYx
ODBhLi44Mzk5ZjkzIDEwMDY0NAotLS0gYS9ycGtnLnNwZWMKKysrIGIvcnBrZy5zcGVjCkBAIC00
LDcgKzQsNyBAQAogCiBOYW1lOiAgICAgICAgICAgcnBrZwogVmVyc2lvbjogICAgICAgIDEuNTgK
LVJlbGVhc2U6ICAgICAgICAyJXs/ZGlzdH0KK1JlbGVhc2U6ICAgICAgICAzJXs/ZGlzdH0KIAog
U3VtbWFyeTogICAgICAgIFB5dGhvbiBsaWJyYXJ5IGZvciBpbnRlcmFjdGluZyB3aXRoIHJwbStn
aXQKIExpY2Vuc2U6ICAgICAgICBHUEx2MisgYW5kIExHUEx2MgpAQCAtMjIsNiArMjIsOSBAQCBT
b3VyY2UwOiAgICAgICAgaHR0cHM6Ly9wYWd1cmUuaW8vcmVsZWFzZXMvcnBrZy8le25hbWV9LSV7
dmVyc2lvbn0udGFyLmd6CiAjIHJlbW92ZSBycG0tcHktaW5zdGFsbGVyIGZvciBub3cuCiBQYXRj
aDA6ICAgICAgICAgcmVtb3ZlLWtvamktYW5kLXJwbS1weS1pbnN0YWxsZXItZnJvbS1yZXF1aXJl
cy5wYXRjaAogUGF0Y2gxOiAgICAgICAgIDAwMDEtRml4LWNsb25lLWJyYW5jaGVzLnBhdGNoCitQ
YXRjaDI6ICAgICAgICAgMDAwMi1DdXN0b20taGFuZGxlci1mb3Ita29qaS13YXRjaF90YXNrcy5w
YXRjaAorUGF0Y2gzOiAgICAgICAgIDAwMDMtU2hvdy1udnItaW4tY29udGFpbmVyLWJ1aWxkLnBh
dGNoCitQYXRjaDQ6ICAgICAgICAgMDAwNC1EaWZmZXJlbnQtaW1wb3J0LW9mZmxpbmUtY29tbWFu
ZC1iZWhhdmlvci5wYXRjaAogCiAlaWYgMCV7P2ZlZG9yYX0gfHwgMCV7P3JoZWx9ID4gNwogIyBF
bmFibGUgcHl0aG9uMyBidWlsZCBieSBkZWZhdWx0CkBAIC0yNjIsNiArMjY1LDExIEBAIG5vc2V0
ZXN0cyB0ZXN0cwogCiAKICVjaGFuZ2Vsb2cKKyogTW9uIE1heSAyNyAyMDE5IE9uZMWZZWogTm9z
ZWsgPG9ub3Nla0ByZWRoYXQuY29tPiAtIDEuNTgtMworLSBCYWNrcG9ydDogQ3VzdG9tIGhhbmRs
ZXIgZm9yIGtvamkgd2F0Y2hfdGFza3MKKy0gQmFja3BvcnQ6IFNob3cgbnZyIGluIGNvbnRhaW5l
ci1idWlsZAorLSBCYWNrcG9ydDogRGlmZmVyZW50IGltcG9ydCAtLW9mZmxpbmUgY29tbWFuZCBi
ZWhhdmlvcgorCiAqIFRodSBNYXkgMDkgMjAxOSBPbmRyZWogTm9zZWsgPG9ub3Nla0ByZWRoYXQu
Y29tPiAtIDEuNTgtMgogLSBCYWNrcG9ydDogZml4ZWQgJ2Nsb25lIC0tYnJhbmNoJyBjb21tYW5k
CiAK