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: Some patches:
Date: Mon, 10 Aug 2026 21:44:30 GMT
Message-ID: <178639827047.1.5160680538100330401.rpms-rpkg-66220ebdda35@fedoraproject.org>
List-ID: <git-commits.fedoraproject.org>
X-Git-Repo: rpms/rpkg
X-Git-Branch: 1.70-1
X-Git-Rev: 66220ebdda358f01ebc592d5bd5ee4c6375ef8e8

ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl
cG8gICA6IHJwbXMvcnBrZwogICAgICAgICAgICBCcmFuY2ggOiAxLjcwLTEKICAgICAgICAgICAg
Q29tbWl0IDogNjYyMjBlYmRkYTM1OGYwMWViYzU5MmQ1YmQ1ZWU0YzYzNzVlZjhlOAogICAgICAg
ICAgICBBdXRob3IgOiBPbmTFmWVqIE5vc2VrIDxvbm9zZWtAcmVkaGF0LmNvbT4KICAgICAgICAg
ICAgRGF0ZSAgIDogMjAyMi0xMC0xMFQyMDowNDowNSswMDowMAogICAgICAgICAgICBTdGF0cyAg
OiArMjkzLy0xIGluIDMgZmlsZShzKQogICAgICAgICAgICBVUkwgICAgOiBodHRwczovL3NyYy5m
ZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL3Jwa2cvYy82NjIyMGViZGRhMzU4ZjAxZWJjNTkyZDViZDVl
ZTRjNjM3NWVmOGU4P2JyYW5jaD0xLjcwLTEKCiAgICAgICAgICAgIExvZzoKICAgICAgICAgICAg
U29tZSBwYXRjaGVzOgoKLSBGaXhlcyBmb3IgZXhwbG9kZWQgU1JQTSBsYXlvdXRzCi0gbW9ja2J1
aWxkOiBlc2NhcGUgcnBtIGNvbW1hbmQgdW5kZXIgbW9jawoKU2lnbmVkLW9mZi1ieTogT25kxZll
aiBOb3NlayA8b25vc2VrQHJlZGhhdC5jb20+CgotLS0KZGlmZiAtLWdpdCBhLzAwMDUtRml4ZXMt
Zm9yLWV4cGxvZGVkLVNSUE0tbGF5b3V0cy5wYXRjaCBiLzAwMDUtRml4ZXMtZm9yLWV4cGxvZGVk
LVNSUE0tbGF5b3V0cy5wYXRjaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5m
MmI1N2IzCi0tLSAvZGV2L251bGwKKysrIGIvMDAwNS1GaXhlcy1mb3ItZXhwbG9kZWQtU1JQTS1s
YXlvdXRzLnBhdGNoCkBAIC0wLDAgKzEsMjI3IEBACitGcm9tIGZjNGRjNjg4MmM4MDJlOWE4Yjdl
Y2UzMTAxMDMzY2I2NjI5MjhhZGYgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiBUcm95
IERhd3NvbiA8dGRhd3NvbkByZWRoYXQuY29tPgorRGF0ZTogRnJpLCAyMyBTZXAgMjAyMiAxNDoz
ODozNCAtMDcwMAorU3ViamVjdDogW1BBVENIIDEvMl0gRml4ZXMgZm9yIGV4cGxvZGVkIFNSUE0g
bGF5b3V0cworCitzb3VyY2VzX2ZpbGVuYW1lIGluY29ycmVjdGx5IHNldCB3aGVuIHVzaW5nIFNS
UE1MYXlvdXQuCisKK0ZpeGVzOiAjNjMzCitKSVJBOiBSSEVMQ01QLTk5OTIKK01lcmdlczogaHR0
cHM6Ly9wYWd1cmUuaW8vcnBrZy9wdWxsLXJlcXVlc3QvNjM0CisKK1NpZ25lZC1vZmYtYnk6IFRy
b3kgRGF3c29uIDx0ZGF3c29uQHJlZGhhdC5jb20+CistLS0KKyBweXJwa2cvX19pbml0X18ucHkg
ICAgfCAyMSArKysrKysrKysrKy0tLS0tLS0tLS0KKyBweXJwa2cvY2xpLnB5ICAgICAgICAgfCAg
MiArLQorIHB5cnBrZy9zb3VyY2VzLnB5ICAgICB8IDMwICsrKysrKysrKysrKysrKysrKysrKysr
KystLS0tLQorIHRlc3RzL3Rlc3RfY2xpLnB5ICAgICB8ICAyICstCisgdGVzdHMvdGVzdF9zb3Vy
Y2VzLnB5IHwgMzMgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCisgNSBmaWxlcyBj
aGFuZ2VkLCA3MSBpbnNlcnRpb25zKCspLCAxNyBkZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBh
L3B5cnBrZy9fX2luaXRfXy5weSBiL3B5cnBrZy9fX2luaXRfXy5weQoraW5kZXggMWI2YTBjNC4u
YTQwZmE1YSAxMDA2NDQKKy0tLSBhL3B5cnBrZy9fX2luaXRfXy5weQorKysrIGIvcHlycGtnL19f
aW5pdF9fLnB5CitAQCAtMTE1Myw3ICsxMTUzLDggQEAgY2xhc3MgQ29tbWFuZHMob2JqZWN0KToK
KyAgICAgZGVmIHNvdXJjZXNfZmlsZW5hbWUoc2VsZik6CisgICAgICAgICBpZiBzZWxmLmxheW91
dCBpcyBOb25lOgorICAgICAgICAgICAgIHJldHVybiBvcy5wYXRoLmpvaW4oc2VsZi5wYXRoLCAn
c291cmNlcycpCistICAgICAgICByZXR1cm4gb3MucGF0aC5qb2luKHNlbGYucGF0aCwgc2VsZi5s
YXlvdXQuc291cmNlc19maWxlX3RlbXBsYXRlKQorKyAgICAgICAgcmV0dXJuIG9zLnBhdGguam9p
bigKKysgICAgICAgICAgICBzZWxmLnBhdGgsIHNlbGYubGF5b3V0LnNvdXJjZXNfZmlsZV90ZW1w
bGF0ZS5yZXBsYWNlKCJ7MC5yZXBvX25hbWV9Iiwgc2VsZi5yZXBvX25hbWUpKQorIAorICAgICBA
cHJvcGVydHkKKyAgICAgZGVmIG9zYnNfY29uZmlnX2ZpbGVuYW1lKHNlbGYpOgorQEAgLTIxNjMs
OSArMjE2NCw5IEBAIGNsYXNzIENvbW1hbmRzKG9iamVjdCk6CisgICAgICAgICAgICAgc2VsZi5s
b2cuaW5mbygic291cmNlcyBmaWxlIGRvZXNuJ3QgZXhpc3QuIFNvdXJjZSBmaWxlcyBkb3dubG9h
ZCBza2lwcGVkLiIpCisgICAgICAgICAgICAgcmV0dXJuCisgCistICAgICAgICAjIERlZmF1bHQg
dG8gcHV0dGluZyB0aGUgZmlsZXMgd2hlcmUgdGhlIHJlcG9zaXRvcnkgaXMKKysgICAgICAgICMg
RGVmYXVsdCB0byBwdXR0aW5nIHRoZSBmaWxlcyBpbiB0aGUgbGF5b3V0IHNvdXJjZWRpcgorICAg
ICAgICAgaWYgbm90IG91dGRpcjoKKy0gICAgICAgICAgICBvdXRkaXIgPSBzZWxmLnBhdGgKKysg
ICAgICAgICAgICBvdXRkaXIgPSBzZWxmLmxheW91dC5zb3VyY2VkaXIKKyAKKyAgICAgICAgIHNv
dXJjZXNmID0gU291cmNlc0ZpbGUoc2VsZi5zb3VyY2VzX2ZpbGVuYW1lLCBzZWxmLnNvdXJjZV9l
bnRyeV90eXBlKQorIAorQEAgLTI1NzgsNyArMjU3OSw3IEBAIGNsYXNzIENvbW1hbmRzKG9iamVj
dCk6CisgICAgICAgICAgICAgY21kLmFwcGVuZCgnLS1ub2NoZWNrJykKKyAgICAgICAgIGlmIHNl
bGYucXVpZXQ6CisgICAgICAgICAgICAgY21kLmFwcGVuZCgnLS1xdWlldCcpCistICAgICAgICBj
bWQuZXh0ZW5kKFsnLWJjJywgb3MucGF0aC5qb2luKHNlbGYucGF0aCwgc2VsZi5zcGVjKV0pCisr
ICAgICAgICBjbWQuZXh0ZW5kKFsnLWJjJywgb3MucGF0aC5qb2luKHNlbGYubGF5b3V0LnNwZWNk
aXIsIHNlbGYuc3BlYyldKQorICAgICAgICAgIyBSdW4gdGhlIGNvbW1hbmQKKyAgICAgICAgIHNl
bGYuX3J1bl9jb21tYW5kKGNtZCkKKyAKK0BAIC0yNjU3LDcgKzI2NTgsNyBAQCBjbGFzcyBDb21t
YW5kcyhvYmplY3QpOgorICAgICAgICAgaWYgYnVpbGRyb290ZGlyOgorICAgICAgICAgICAgIGNt
ZC5leHRlbmQoWyItLWRlZmluZSIsICJfYnVpbGRyb290ZGlyIHswfSIuZm9ybWF0KAorICAgICAg
ICAgICAgICAgICBvcy5wYXRoLmFic3BhdGgoYnVpbGRyb290ZGlyKSldKQorLSAgICAgICAgY21k
LmV4dGVuZChbJy1iaScsIG9zLnBhdGguam9pbihzZWxmLnBhdGgsIHNlbGYuc3BlYyldKQorKyAg
ICAgICAgY21kLmV4dGVuZChbJy1iaScsIG9zLnBhdGguam9pbihzZWxmLmxheW91dC5zcGVjZGly
LCBzZWxmLnNwZWMpXSkKKyAgICAgICAgICMgUnVuIHRoZSBjb21tYW5kCisgICAgICAgICBzZWxm
Ll9ydW5fY29tbWFuZChjbWQpCisgICAgICAgICByZXR1cm4KK0BAIC0yNzk4LDcgKzI3OTksNyBA
QCBjbGFzcyBDb21tYW5kcyhvYmplY3QpOgorICAgICAgICAgaWYgbm90IGhhc2h0eXBlID09ICdz
aGEyNTYnOgorICAgICAgICAgICAgIGNtZC5leHRlbmQoWyItLWRlZmluZSIsICJfc291cmNlX2Zp
bGVkaWdlc3RfYWxnb3JpdGhtICVzIiAlIGhhc2h0eXBlLAorICAgICAgICAgICAgICAgICAgICAg
ICAgICItLWRlZmluZSIsICJfYmluYXJ5X2ZpbGVkaWdlc3RfYWxnb3JpdGhtICVzIiAlIGhhc2h0
eXBlXSkKKy0gICAgICAgIHNwZWNwYXRoID0gb3MucGF0aC5qb2luKHNlbGYucGF0aCwgc2VsZi5z
cGVjKQorKyAgICAgICAgc3BlY3BhdGggPSBvcy5wYXRoLmpvaW4oc2VsZi5sYXlvdXQuc3BlY2Rp
ciwgc2VsZi5zcGVjKQorICAgICAgICAgdG1wZGlyID0gTm9uZQorICAgICAgICAgdHJ5OgorICAg
ICAgICAgICAgIGlmIG5vdCBzZWxmLnVzZXNfcnBtYXV0b3NwZWMgb3Igbm90IHJwbWF1dG9zcGVj
X3Byb2Nlc3NfZGlzdGdpdDoKK0BAIC0zMTgwLDcgKzMxODEsNyBAQCBjbGFzcyBDb21tYW5kcyhv
YmplY3QpOgorICAgICAgICAgaWYgYnVpbGRyb290ZGlyOgorICAgICAgICAgICAgIGNtZC5leHRl
bmQoWyItLWRlZmluZSIsICJfYnVpbGRyb290ZGlyIHswfSIuZm9ybWF0KAorICAgICAgICAgICAg
ICAgICBvcy5wYXRoLmFic3BhdGgoYnVpbGRyb290ZGlyKSldKQorLSAgICAgICAgY21kLmV4dGVu
ZChbJy0tbm9kZXBzJywgJy1icCcsIG9zLnBhdGguam9pbihzZWxmLnBhdGgsIHNlbGYuc3BlYyld
KQorKyAgICAgICAgY21kLmV4dGVuZChbJy0tbm9kZXBzJywgJy1icCcsIG9zLnBhdGguam9pbihz
ZWxmLmxheW91dC5zcGVjZGlyLCBzZWxmLnNwZWMpXSkKKyAgICAgICAgICMgUnVuIHRoZSBjb21t
YW5kCisgICAgICAgICBzZWxmLl9ydW5fY29tbWFuZChjbWQpCisgCitAQCAtMzIzOCw3ICszMjM5
LDcgQEAgY2xhc3MgQ29tbWFuZHMob2JqZWN0KToKKyAgICAgICAgIGlmIG5vdCBoYXNodHlwZSA9
PSAnc2hhMjU2JzoKKyAgICAgICAgICAgICBjbWQuZXh0ZW5kKFsiLS1kZWZpbmUiLCAiX3NvdXJj
ZV9maWxlZGlnZXN0X2FsZ29yaXRobSAlcyIgJSBoYXNodHlwZSwKKyAgICAgICAgICAgICAgICAg
ICAgICAgICAiLS1kZWZpbmUiLCAiX2JpbmFyeV9maWxlZGlnZXN0X2FsZ29yaXRobSAlcyIgJSBo
YXNodHlwZV0pCistICAgICAgICBzcGVjcGF0aCA9IG9zLnBhdGguam9pbihzZWxmLnBhdGgsIHNl
bGYuc3BlYykKKysgICAgICAgIHNwZWNwYXRoID0gb3MucGF0aC5qb2luKHNlbGYubGF5b3V0LnNw
ZWNkaXIsIHNlbGYuc3BlYykKKyAgICAgICAgIHRtcGRpciA9IE5vbmUKKyAgICAgICAgIHRyeToK
KyAgICAgICAgICAgICBpZiBub3Qgc2VsZi51c2VzX3JwbWF1dG9zcGVjIG9yIG5vdCBycG1hdXRv
c3BlY19wcm9jZXNzX2Rpc3RnaXQ6CitAQCAtMzI2Miw3ICszMjYzLDcgQEAgY2xhc3MgQ29tbWFu
ZHMob2JqZWN0KToKKyAgICAgICAgICMgQ3JlYXRlIGEgbGlzdCBmb3IgdW51c2VkIHBhdGNoZXMK
KyAgICAgICAgIHVudXNlZCA9IFtdCisgICAgICAgICAjIEdldCB0aGUgY29udGVudCBvZiBzcGVj
IGludG8gbWVtb3J5IGZvciBmYXN0IHNlYXJjaGluZworLSAgICAgICAgd2l0aCBvcGVuKG9zLnBh
dGguam9pbihzZWxmLnBhdGgsIHNlbGYuc3BlYyksICdyJykgYXMgZjoKKysgICAgICAgIHdpdGgg
b3Blbihvcy5wYXRoLmpvaW4oc2VsZi5sYXlvdXQuc3BlY2Rpciwgc2VsZi5zcGVjKSwgJ3InKSBh
cyBmOgorICAgICAgICAgICAgIGRhdGEgPSBmLnJlYWQoKQorICAgICAgICAgaWYgc2l4LlBZMjoK
KyAgICAgICAgICAgICB0cnk6CitAQCAtMzM0MCw3ICszMzQxLDcgQEAgY2xhc3MgQ29tbWFuZHMo
b2JqZWN0KToKKyAgICAgICAgIGlmIGJ1aWxkcm9vdGRpcjoKKyAgICAgICAgICAgICBjbWQuZXh0
ZW5kKFsiLS1kZWZpbmUiLCAiX2J1aWxkcm9vdGRpciB7MH0iLmZvcm1hdCgKKyAgICAgICAgICAg
ICAgICAgb3MucGF0aC5hYnNwYXRoKGJ1aWxkcm9vdGRpcikpXSkKKy0gICAgICAgIGNtZC5leHRl
bmQoWyctYmwnLCBvcy5wYXRoLmpvaW4oc2VsZi5wYXRoLCBzZWxmLnNwZWMpXSkKKysgICAgICAg
IGNtZC5leHRlbmQoWyctYmwnLCBvcy5wYXRoLmpvaW4oc2VsZi5sYXlvdXQuc3BlY2Rpciwgc2Vs
Zi5zcGVjKV0pCisgICAgICAgICAjIFJ1biB0aGUgY29tbWFuZAorICAgICAgICAgc2VsZi5fcnVu
X2NvbW1hbmQoY21kKQorIAorZGlmZiAtLWdpdCBhL3B5cnBrZy9jbGkucHkgYi9weXJwa2cvY2xp
LnB5CitpbmRleCA5Njk0ZjE0Li5iMGExNmZiIDEwMDY0NAorLS0tIGEvcHlycGtnL2NsaS5weQor
KysrIGIvcHlycGtnL2NsaS5weQorQEAgLTE0ODQsNyArMTQ4NCw3IEBAIGNsYXNzIGNsaUNsaWVu
dChvYmplY3QpOgorICAgICAgICAgICAgICdzb3VyY2VzJywgaGVscD0nRG93bmxvYWQgc291cmNl
IGZpbGVzJywKKyAgICAgICAgICAgICBkZXNjcmlwdGlvbj0nRG93bmxvYWQgc291cmNlIGZpbGVz
JykKKyAgICAgICAgIHNvdXJjZXNfcGFyc2VyLmFkZF9hcmd1bWVudCgKKy0gICAgICAgICAgICAn
LS1vdXRkaXInLCBkZWZhdWx0PW9zLmN1cmRpciwKKysgICAgICAgICAgICAnLS1vdXRkaXInLAor
ICAgICAgICAgICAgIGhlbHA9J0RpcmVjdG9yeSB0byBkb3dubG9hZCBmaWxlcyBpbnRvIChkZWZh
dWx0cyB0byBwd2QpJykKKyAgICAgICAgIHNvdXJjZXNfcGFyc2VyLnNldF9kZWZhdWx0cyhjb21t
YW5kPXNlbGYuc291cmNlcykKKyAKK2RpZmYgLS1naXQgYS9weXJwa2cvc291cmNlcy5weSBiL3B5
cnBrZy9zb3VyY2VzLnB5CitpbmRleCA4NTg0NjFkLi5jZGQ1Mjc1IDEwMDY0NAorLS0tIGEvcHly
cGtnL3NvdXJjZXMucHkKKysrKyBiL3B5cnBrZy9zb3VyY2VzLnB5CitAQCAtNjcsMTUgKzY3LDM1
IEBAIGNsYXNzIFNvdXJjZXNGaWxlKG9iamVjdCk6CisgICAgICAgICAgICAgcmV0dXJuIHNlbGYu
ZW50cnlfdHlwZShtLmdyb3VwKCdoYXNodHlwZScpLCBtLmdyb3VwKCdmaWxlJyksCisgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtLmdyb3VwKCdoYXNoJykpCisgCistICAgICAg
ICAjIFRyeSBmYWxsaW5nIGJhY2sgb24gdGhlIG9sZCBmb3JtYXQKKysgICAgICAgICMgVHJ5IGZh
bGxpbmcgYmFjayBvbiB0aGUgb2xkIEZlZG9yYSBmb3JtYXQKKyAgICAgICAgIHRyeToKKyAgICAg
ICAgICAgICBoYXNoLCBmaWxlID0gc3RyaXBwZWQuc3BsaXQoJyAgJywgMSkKKyAKKyAgICAgICAg
IGV4Y2VwdCBWYWx1ZUVycm9yOgorLSAgICAgICAgICAgIHJhaXNlIE1hbGZvcm1lZExpbmVFcnJv
cigKKy0gICAgICAgICAgICAgICAgJ3NvdXJjZXMgaGFzIGludmFsaWQgY29udGVudDogezB9XG4n
CistICAgICAgICAgICAgICAgICdQbGVhc2Ugbm90ZSB0aGF0IHNvdXJjZXMgZmlsZSBtdXN0IG5v
dCBiZSBtb2RpZmllZCBtYW51YWxseS4nCistICAgICAgICAgICAgICAgIC5mb3JtYXQoc3RyaXBw
ZWQpKQorKyAgICAgICAgICAgICMgVHJ5IG9sZCBDZW50b3MgRm9ybWF0CisrICAgICAgICAgICAg
dHJ5OgorKyAgICAgICAgICAgICAgICBoYXNoLCBmaWxlX3BhdGggPSBzdHJpcHBlZC5zcGxpdCgn
ICcsIDEpCisrICAgICAgICAgICAgICAgIGlmIGxlbihoYXNoKSA9PSAxMjg6CisrICAgICAgICAg
ICAgICAgICAgICBoYXNodHlwZSA9ICdzaGE1MTInCisrICAgICAgICAgICAgICAgIGVsaWYgbGVu
KGhhc2gpID09IDY0OgorKyAgICAgICAgICAgICAgICAgICAgaGFzaHR5cGUgPSAnc2hhMjU2Jwor
KyAgICAgICAgICAgICAgICBlbGlmIGxlbihoYXNoKSA9PSA0MDoKKysgICAgICAgICAgICAgICAg
ICAgIGhhc2h0eXBlID0gJ3NoYTEnCisrICAgICAgICAgICAgICAgIGVsaWYgbGVuKGhhc2gpID09
IDMyOgorKyAgICAgICAgICAgICAgICAgICAgaGFzaHR5cGUgPSAnbWQ1JworKyAgICAgICAgICAg
ICAgICBlbHNlOgorKyAgICAgICAgICAgICAgICAgICAgcmFpc2UgTWFsZm9ybWVkTGluZUVycm9y
KAorKyAgICAgICAgICAgICAgICAgICAgICAgICdzb3VyY2VzIGhhcyBpbnZhbGlkIGNvbnRlbnQ6
IHswfVxuJworKyAgICAgICAgICAgICAgICAgICAgICAgICdQbGVhc2Ugbm90ZSB0aGF0IHNvdXJj
ZXMgZmlsZSBtdXN0IG5vdCBiZSBtb2RpZmllZCBtYW51YWxseS4nCisrICAgICAgICAgICAgICAg
ICAgICAgICAgLmZvcm1hdChzdHJpcHBlZCkpCisrICAgICAgICAgICAgICAgIGZpbGUgPSBvcy5w
YXRoLnNwbGl0KGZpbGVfcGF0aClbMV0KKysgICAgICAgICAgICAgICAgcmV0dXJuIHNlbGYuZW50
cnlfdHlwZShoYXNodHlwZSwgZmlsZSwgaGFzaCkKKysKKysgICAgICAgICAgICBleGNlcHQgVmFs
dWVFcnJvcjoKKysgICAgICAgICAgICAgICAgcmFpc2UgTWFsZm9ybWVkTGluZUVycm9yKAorKyAg
ICAgICAgICAgICAgICAgICAgJ3NvdXJjZXMgaGFzIGludmFsaWQgY29udGVudDogezB9XG4nCisr
ICAgICAgICAgICAgICAgICAgICAnUGxlYXNlIG5vdGUgdGhhdCBzb3VyY2VzIGZpbGUgbXVzdCBu
b3QgYmUgbW9kaWZpZWQgbWFudWFsbHkuJworKyAgICAgICAgICAgICAgICAgICAgLmZvcm1hdChz
dHJpcHBlZCkpCisgCisgICAgICAgICByZXR1cm4gc2VsZi5lbnRyeV90eXBlKCdtZDUnLCBmaWxl
LCBoYXNoKQorIAorZGlmZiAtLWdpdCBhL3Rlc3RzL3Rlc3RfY2xpLnB5IGIvdGVzdHMvdGVzdF9j
bGkucHkKK2luZGV4IDk3YWUwY2UuLmRkMTM5OWEgMTAwNjQ0CistLS0gYS90ZXN0cy90ZXN0X2Ns
aS5weQorKysrIGIvdGVzdHMvdGVzdF9jbGkucHkKK0BAIC0xNTc5LDcgKzE1NzksNyBAQCBjbGFz
cyBUZXN0U291cmNlcyhMb29rYXNpZGVDYWNoZU1vY2ssIENsaVRlc3RDYXNlKToKKyAgICAgICAg
ICMgTk9URTogd2l0aG91dCAtLW91dGRpciwgd2hhdGV2ZXIgdG8gcnVuIHNvdXJjZXMgY29tbWFu
ZCBpbiBwYWNrYWdlCisgICAgICAgICAjIHJlcG9zaXRvcnksIHNvdXJjZXMgZmlsZSBpcyBkb3du
bG9hZGVkIGludG8gY3VycmVudCB3b3JraW5nCisgICAgICAgICAjIGRpcmVjdG9yeS4gSXMgdGhp
cyBhIGJ1Zywgb3IgbmVlZCB0byBpbXByb3ZlPworLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKG9z
LnBhdGguZXhpc3RzKCdyZWFkbWUucGF0Y2gnKSkKKysgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShv
cy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4oc2VsZi5jbG9uZWRfcmVwb19wYXRoLCAncmVhZG1l
LnBhdGNoJykpKQorIAorICAgICBkZWYgdGVzdF9zb3VyY2VzX3RvX291dGRpcihzZWxmKToKKyAg
ICAgICAgIGNsaV9jbWQgPSBbJ3Jwa2cnLCAnLS1wYXRoJywgc2VsZi5jbG9uZWRfcmVwb19wYXRo
LAorZGlmZiAtLWdpdCBhL3Rlc3RzL3Rlc3Rfc291cmNlcy5weSBiL3Rlc3RzL3Rlc3Rfc291cmNl
cy5weQoraW5kZXggY2ZhY2M1MS4uZjA0MTM3MyAxMDA2NDQKKy0tLSBhL3Rlc3RzL3Rlc3Rfc291
cmNlcy5weQorKysrIGIvdGVzdHMvdGVzdF9zb3VyY2VzLnB5CitAQCAtNjYsNiArNjYsMzkgQEAg
Y2xhc3MgU291cmNlc0ZpbGVUZXN0Q2FzZSh1bml0dGVzdC5UZXN0Q2FzZSk6CisgICAgICAgICBz
ZWxmLmFzc2VydEVxdWFsKGVudHJ5LmZpbGUsICdhZmlsZScpCisgICAgICAgICBzZWxmLmFzc2Vy
dEVxdWFsKHN0cihlbnRyeSksIG5ld2xpbmUpCisgCisrICAgIGRlZiB0ZXN0X3BhcnNlX29sZF9z
dHlsZV9jZW50b3NfbGluZShzZWxmKToKKysgICAgICAgIHMgPSBzb3VyY2VzLlNvdXJjZXNGaWxl
KHNlbGYuc291cmNlc2ZpbGUsICdvbGQnKQorKworKyAgICAgICAgbXlfaGFzaCA9ICdhYmFiYWJh
YjAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxJworKyAgICAgICAgbXlfZmlsZSA9ICdT
VUJESVIvYWZpbGUnCisrCisrICAgICAgICBsaW5lID0gJ3swfSB7MX1cbicuZm9ybWF0KG15X2hh
c2gsIG15X2ZpbGUpCisrICAgICAgICBuZXdsaW5lID0gJ3swfSAgezF9XG4nLmZvcm1hdChteV9o
YXNoLCAnYWZpbGUnKQorKyAgICAgICAgZW50cnkgPSBzLnBhcnNlX2xpbmUobGluZSkKKysKKysg
ICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShpc2luc3RhbmNlKGVudHJ5LCBzb3VyY2VzLlNvdXJjZUZp
bGVFbnRyeSkpCisrICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGVudHJ5Lmhhc2h0eXBlLCAnc2hh
MScpCisrICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGVudHJ5Lmhhc2gsIG15X2hhc2gpCisrICAg
ICAgICBzZWxmLmFzc2VydEVxdWFsKGVudHJ5LmZpbGUsICdhZmlsZScpCisrICAgICAgICBzZWxm
LmFzc2VydEVxdWFsKHN0cihlbnRyeSksIG5ld2xpbmUpCisrCisrICAgIGRlZiB0ZXN0X21pZ3Jh
dGVfb2xkX3N0eWxlX2NlbnRvc19saW5lKHNlbGYpOgorKyAgICAgICAgcyA9IHNvdXJjZXMuU291
cmNlc0ZpbGUoc2VsZi5zb3VyY2VzZmlsZSwgJ2JzZCcpCisrCisrICAgICAgICBteV9oYXNoID0g
MTI4ICogJ3gnCisrICAgICAgICBteV9maWxlID0gJ1NVQkRJUi9hZmlsZScKKysKKysgICAgICAg
IGxpbmUgPSAnezB9IHsxfVxuJy5mb3JtYXQobXlfaGFzaCwgbXlfZmlsZSkKKysgICAgICAgIG5l
d2xpbmUgPSAnezB9ICB7MX1cbicuZm9ybWF0KG15X2hhc2gsICdhZmlsZScpCisrICAgICAgICBu
ZXdsaW5lID0gJ1NIQTUxMiAoYWZpbGUpID0gezB9XG4nLmZvcm1hdChteV9oYXNoKQorKyAgICAg
ICAgZW50cnkgPSBzLnBhcnNlX2xpbmUobGluZSkKKysKKysgICAgICAgIHNlbGYuYXNzZXJ0VHJ1
ZShpc2luc3RhbmNlKGVudHJ5LCBzb3VyY2VzLlNvdXJjZUZpbGVFbnRyeSkpCisrICAgICAgICBz
ZWxmLmFzc2VydEVxdWFsKGVudHJ5Lmhhc2h0eXBlLCAnc2hhNTEyJykKKysgICAgICAgIHNlbGYu
YXNzZXJ0RXF1YWwoZW50cnkuaGFzaCwgbXlfaGFzaCkKKysgICAgICAgIHNlbGYuYXNzZXJ0RXF1
YWwoZW50cnkuZmlsZSwgJ2FmaWxlJykKKysgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3RyKGVu
dHJ5KSwgbmV3bGluZSkKKysKKyAgICAgZGVmIHRlc3RfcGFyc2VfZW50cnlfbGluZShzZWxmKToK
KyAgICAgICAgIHMgPSBzb3VyY2VzLlNvdXJjZXNGaWxlKHNlbGYuc291cmNlc2ZpbGUsICdic2Qn
KQorIAorLS0gCisyLjM3LjMKKwoKZGlmZiAtLWdpdCBhLzAwMDYtbW9ja2J1aWxkLWVzY2FwZS1y
cG0tY29tbWFuZC11bmRlci1tb2NrLnBhdGNoIGIvMDAwNi1tb2NrYnVpbGQtZXNjYXBlLXJwbS1j
b21tYW5kLXVuZGVyLW1vY2sucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw
MC4uZTBkOTdlOQotLS0gL2Rldi9udWxsCisrKyBiLzAwMDYtbW9ja2J1aWxkLWVzY2FwZS1ycG0t
Y29tbWFuZC11bmRlci1tb2NrLnBhdGNoCkBAIC0wLDAgKzEsNTkgQEAKK0Zyb20gN2NlZmM1ZmUz
NWE1MTQ2MzdiMWIwYjY4ZTA0NGYwZGUwZDE4OGUyMiBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEK
K0Zyb206IE9uZHJlaiBOb3NlayA8b25vc2VrQHJlZGhhdC5jb20+CitEYXRlOiBXZWQsIDUgT2N0
IDIwMjIgMDM6NDU6MjIgKzAyMDAKK1N1YmplY3Q6IFtQQVRDSCAyLzJdIG1vY2tidWlsZDogZXNj
YXBlIHJwbSBjb21tYW5kIHVuZGVyIG1vY2sKKworQXJndW1lbnRzIG9mIHRoZSAncnBtJyBwYXJ0
IGFmdGVyICdtb2NrIC0tc2hlbGwnIG5lZWRzIHRvIGJlIGVzY2FwZWQuCitFeGFtcGxlOgorCisg
IG1vY2sgLXIgeHh4IC0tY2hyb290IC4uLiAtLXNoZWxsIHJwbSAtLWRlZmluZSAnX3NvdXJjZWRp
ciB4eHgnIC4uLgorCitKSVJBOiBSSEVMQ01QLTEwMTUwCitSZXNvbHZlczogcmhieiMyMTMwMzQ5
CisKK1NpZ25lZC1vZmYtYnk6IE9uZHJlaiBOb3NlayA8b25vc2VrQHJlZGhhdC5jb20+CistLS0K
KyBweXJwa2cvX19pbml0X18ucHkgfCA4ICsrKysrKy0tCisgMSBmaWxlIGNoYW5nZWQsIDYgaW5z
ZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBhL3B5cnBrZy9fX2luaXRf
Xy5weSBiL3B5cnBrZy9fX2luaXRfXy5weQoraW5kZXggYTQwZmE1YS4uMTU5NTM0NCAxMDA2NDQK
Ky0tLSBhL3B5cnBrZy9fX2luaXRfXy5weQorKysrIGIvcHlycGtnL19faW5pdF9fLnB5CitAQCAt
MjIsNiArMjIsNyBAQCBpbXBvcnQgb3MKKyBpbXBvcnQgcG9zaXhwYXRoCisgaW1wb3J0IHJhbmRv
bQorIGltcG9ydCByZQorK2ltcG9ydCBzaGxleAorIGltcG9ydCBzaHV0aWwKKyBpbXBvcnQgc3Vi
cHJvY2VzcworIGltcG9ydCBzeXMKK0BAIC00MywxMyArNDQsMTQgQEAgZnJvbSBzaXgubW92ZXMu
dXJsbGliLnBhcnNlIGltcG9ydCB1cmxqb2luCisgCisgZnJvbSBweXJwa2cgaW1wb3J0IGxheW91
dAorIGZyb20gcHlycGtnLmVycm9ycyBpbXBvcnQgKEFscmVhZHlVcGxvYWRlZEVycm9yLCBIYXNo
dHlwZU1peGluZ0Vycm9yLAorLSAgICAgICAgICAgICAgICAgICAgICAgICAgIFVua25vd25UYXJn
ZXRFcnJvciwgcnBrZ0F1dGhFcnJvciwgcnBrZ0Vycm9yLCBOb1NvdXJjZXNFcnJvcikKKysgICAg
ICAgICAgICAgICAgICAgICAgICAgICBOb1NvdXJjZXNFcnJvciwgVW5rbm93blRhcmdldEVycm9y
LCBycGtnQXV0aEVycm9yLAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgIHJwa2dFcnJvcikK
KyBmcm9tIHB5cnBrZy5sb29rYXNpZGUgaW1wb3J0IENHSUxvb2thc2lkZUNhY2hlCisgZnJvbSBw
eXJwa2cuc291cmNlcyBpbXBvcnQgU291cmNlc0ZpbGUKKyBmcm9tIHB5cnBrZy5zcGVjIGltcG9y
dCBTcGVjRmlsZQorIGZyb20gcHlycGtnLnV0aWxzIGltcG9ydCAoY2FjaGVkX3Byb3BlcnR5LCBl
eHRyYWN0X3NycG0sIGZpbmRfbWUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICBpc19maWxl
X3RyYWNrZWQsIGlzX2xvb2thc2lkZV9lbGlnaWJsZV9maWxlLAorLSAgICAgICAgICAgICAgICAg
ICAgICAgICAgc3BlY19maWxlX3Byb2Nlc3NlZF9ieV9ycG1hdXRvc3BlYywgbG9nX3Jlc3VsdCkK
KysgICAgICAgICAgICAgICAgICAgICAgICAgIGxvZ19yZXN1bHQsIHNwZWNfZmlsZV9wcm9jZXNz
ZWRfYnlfcnBtYXV0b3NwZWMpCisgCisgZnJvbSAuZ2l0aWdub3JlIGltcG9ydCBHaXRJZ25vcmUK
KyAKK0BAIC04MTMsNiArODE1LDggQEAgY2xhc3MgQ29tbWFuZHMob2JqZWN0KToKKyAgICAgICAg
ICMgbGlzdGluZyBmb3IgZWFjaCBzdWJwYWNrYWdlLiAgV2Ugb25seSBjYXJlIGFib3V0IHRoZSBm
aXJzdC4KKyAgICAgICAgIHJwbV9jbWQuZXh0ZW5kKFsiLXEiLCAiLS1xZiIsICI/PyV7TkFNRX0g
JXtFUE9DSH0gJXtWRVJTSU9OfSAle1JFTEVBU0V9Pz8iLAorICAgICAgICAgICAgICAgICAgICAg
ICAgICItLXNwZWNmaWxlIiwgIiVzIiAlIG9zLnBhdGguam9pbih0bXBfcm9vdCwgc2VsZi5zcGVj
KV0pCisrICAgICAgICAjIGVzY2FwZSB3aG9sZSAncnBtJyBjb21tYW5kIGJlY2F1c2UgaXQgd2ls
bCBiZSBleGVjdXRlZCB1bmRlciBtb2NrIGNvbW1hbmQKKysgICAgICAgIHJwbV9jbWQgPSBbc2hs
ZXgucXVvdGUoaXRlbSkgZm9yIGl0ZW0gaW4gcnBtX2NtZF0KKyAgICAgICAgIG1haW5fY21kID0g
Y21kICsgWyctLXNoZWxsJ10gKyBycG1fY21kIFwKKyAgICAgICAgICAgICArIFsnPiAnICsgb3Mu
cGF0aC5qb2luKHRtcF9yb290LCAnb3V0cHV0JyldCisgCistLSAKKzIuMzcuMworCgpkaWZmIC0t
Z2l0IGEvcnBrZy5zcGVjIGIvcnBrZy5zcGVjCmluZGV4IDIyM2YxMTYuLmI2ZjE1NTggMTAwNjQ0
Ci0tLSBhL3Jwa2cuc3BlYworKysgYi9ycGtnLnNwZWMKQEAgLTEsNiArMSw2IEBACiBOYW1lOiAg
ICAgICAgICAgcnBrZwogVmVyc2lvbjogICAgICAgIDEuNjUKLVJlbGVhc2U6ICAgICAgICAyJXs/
ZGlzdH0KK1JlbGVhc2U6ICAgICAgICAzJXs/ZGlzdH0KIAogU3VtbWFyeTogICAgICAgIFB5dGhv
biBsaWJyYXJ5IGZvciBpbnRlcmFjdGluZyB3aXRoIHJwbStnaXQKIExpY2Vuc2U6ICAgICAgICBH
UEx2MisgYW5kIExHUEx2MgpAQCAtMzgsNiArMzgsOCBAQCBQYXRjaDI6ICAgICAgICAgMDAwMi1S
ZW1vdmUtcHl0ZXN0LWNvdmVyYWdlLWV4ZWN1dGlvbi5wYXRjaAogUGF0Y2gzOiAgICAgICAgIDAw
MDMtUmVtb3ZlLUVudmlyb25tZW50LU1hcmtlcnMtc3ludGF4LnBhdGNoCiAlZW5kaWYKIFBhdGNo
NDogICAgICAgICAwMDA0LWZlZHBrZy1sb2NhbC1kb2VzLW5vdC1zaG93LXJwbWJ1aWxkLW91dHB1
dC5wYXRjaAorUGF0Y2g1OiAgICAgICAgIDAwMDUtRml4ZXMtZm9yLWV4cGxvZGVkLVNSUE0tbGF5
b3V0cy5wYXRjaAorUGF0Y2g2OiAgICAgICAgIDAwMDYtbW9ja2J1aWxkLWVzY2FwZS1ycG0tY29t
bWFuZC11bmRlci1tb2NrLnBhdGNoCiAKICVkZXNjcmlwdGlvbgogUHl0aG9uIGxpYnJhcnkgZm9y
IGludGVyYWN0aW5nIHdpdGggcnBtK2dpdApAQCAtMjUwLDYgKzI1MiwxMCBAQCBleGFtcGxlX2Ns
aV9kaXI9JFJQTV9CVUlMRF9ST09UJXtfZGF0YWRpcn0vJXtuYW1lfS9leGFtcGxlcy9jbGkKIAog
CiAlY2hhbmdlbG9nCisqIE1vbiBPY3QgMTAgMjAyMiBPbmTFmWVqIE5vc2VrIDxvbm9zZWtAcmVk
aGF0LmNvbT4gLSAxLjY1LTMKKy0gUGF0Y2g6IEZpeGVzIGZvciBleHBsb2RlZCBTUlBNIGxheW91
dHMKKy0gUGF0Y2g6IG1vY2tidWlsZDogZXNjYXBlIHJwbSBjb21tYW5kIHVuZGVyIG1vY2sKKwog
KiBXZWQgU2VwIDcgMjAyMiBPbmTFmWVqIE5vc2VrIDxvbm9zZWtAcmVkaGF0LmNvbT4gLSAxLjY1
LTIKIC0gUGF0Y2g6IGBmZWRwa2cgbG9jYWxgIGRvZXMgbm90IHNob3cgcnBtYnVpbGQgb3V0cHV0
CiAK