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: Merge branch 'epel9' into rawhide Date: Mon, 10 Aug 2026 21:44:31 GMT Message-ID: <178639827184.1.7897087528870557752.rpms-rpkg-a5e0d4c6670f@fedoraproject.org> List-ID: X-Git-Repo: rpms/rpkg X-Git-Branch: 1.70-1 X-Git-Rev: a5e0d4c6670fa0ea42ea6f6aaa1a4c1f00424603 QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvcnBrZwpCcmFuY2gg OiAxLjcwLTEKQ29tbWl0IDogYTVlMGQ0YzY2NzBmYTBlYTQyZWE2ZjZhYWExYTRjMWYwMDQyNDYw MwpBdXRob3IgOiBPbmTFmWVqIE5vc2VrIDxvbm9zZWtAcmVkaGF0LmNvbT4KRGF0ZSAgIDogMjAy My0wMi0yMVQyMDozNjoyOCswMDowMApTdGF0cyAgOiArMzIvLTQwNiBpbiA2IGZpbGUocykKVVJM ICAgIDogaHR0cHM6Ly9zcmMuZmVkb3JhcHJvamVjdC5vcmcvcnBtcy9ycGtnL2MvYTVlMGQ0YzY2 NzBmYTBlYTQyZWE2ZjZhYWExYTRjMWYwMDQyNDYwMz9icmFuY2g9MS43MC0xCgpMb2c6Ck1lcmdl IGJyYW5jaCAnZXBlbDknIGludG8gcmF3aGlkZQoKLS0tCmRpZmYgLS1naXQgYS8uZ2l0aWdub3Jl IGIvLmdpdGlnbm9yZQppbmRleCA2MmFiYTYyLi5hMjkyNTdlIDEwMDY0NAotLS0gYS8uZ2l0aWdu b3JlCisrKyBiLy5naXRpZ25vcmUKQEAgLTYxLDMgKzYxLDQgQEAKIC9ycGtnLTEuNjMudGFyLmd6 CiAvcnBrZy0xLjY0LnRhci5negogL3Jwa2ctMS42NS50YXIuZ3oKKy9ycGtnLTEuNjYudGFyLmd6 CgpkaWZmIC0tZ2l0IGEvMDAwNC1mZWRwa2ctbG9jYWwtZG9lcy1ub3Qtc2hvdy1ycG1idWlsZC1v dXRwdXQucGF0Y2ggYi8wMDA0LWZlZHBrZy1sb2NhbC1kb2VzLW5vdC1zaG93LXJwbWJ1aWxkLW91 dHB1dC5wYXRjaApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMzBmM2U4ZS4uMDAwMDAw MAotLS0gYS8wMDA0LWZlZHBrZy1sb2NhbC1kb2VzLW5vdC1zaG93LXJwbWJ1aWxkLW91dHB1dC5w YXRjaAorKysgL2Rldi9udWxsCkBAIC0xLDExNCArMCwwIEBACi1Gcm9tIGZlZjk3MTVkNGFjYjY5 MGRmZjFjYzlmMDg1NDU3MjFkNjliZjIwOGQgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCi1Gcm9t OiBPbmRyZWogTm9zZWsgPG9ub3Nla0ByZWRoYXQuY29tPgotRGF0ZTogV2VkLCA3IFNlcCAyMDIy IDE5OjUzOjA1ICswMjAwCi1TdWJqZWN0OiBbUEFUQ0hdIGBmZWRwa2cgbG9jYWxgIGRvZXMgbm90 IHNob3cgcnBtYnVpbGQgb3V0cHV0Ci0KLXN1YnByb2Nlc3MuY29tbXVuaWNhdGUoKSBtZXRob2Qg ZGlkbid0IGFsbG93IGEgZGlyZWN0IHBpcGUgb3V0cHV0Ci10byB0aGUgc2hlbGwgYW5kIHRoZXJl Zm9yZSB3YXNuJ3Qgc2hvd24gdG8gdGhlIHVzZXIuIFN3aXRjaGVkIHRvCi1jaGVja19jYWxsIG1l dGhvZC4KLUFkZGl0aW9uYWxseSwgdGhlIGNvcnJlY3QgZXhpdCBjb2RlIGlzIHJldHVybmVkIHdo ZW4gdGhlIGZpcnN0IHBhcnQKLW9mIHRoZSBjb21tYW5kIGZhaWxzLgotCi1SZXNvbHZlczogcmhi eiMyMTI0ODA5Ci1KSVJBOiBSSEVMQ01QLTk5NjAKLQotU2lnbmVkLW9mZi1ieTogT25kcmVqIE5v c2VrIDxvbm9zZWtAcmVkaGF0LmNvbT4KLS0tLQotIHB5cnBrZy9fX2luaXRfXy5weSB8IDEyICsr KysrLS0tLS0tLQotIHRlc3RzL3Rlc3RfY2xpLnB5ICB8IDI2ICsrKysrKysrKysrKysrLS0tLS0t LS0tLS0tCi0gMiBmaWxlcyBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMo LSkKLQotZGlmZiAtLWdpdCBhL3B5cnBrZy9fX2luaXRfXy5weSBiL3B5cnBrZy9fX2luaXRfXy5w eQotaW5kZXggYTY3MmRkMi4uMWI2YTBjNCAxMDA2NDQKLS0tLSBhL3B5cnBrZy9fX2luaXRfXy5w eQotKysrIGIvcHlycGtnL19faW5pdF9fLnB5Ci1AQCAtMjgxOCwxNCArMjgxOCwxMiBAQCBjbGFz cyBDb21tYW5kcyhvYmplY3QpOgotICAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PXN1YnByb2Nl c3MuUElQRSwKLSAgICAgICAgICAgICAgICAgICAgIHN0ZGVycj1zdWJwcm9jZXNzLlNURE9VVAot ICAgICAgICAgICAgICAgICApCi0tICAgICAgICAgICAgICAgIHRlZSA9IHN1YnByb2Nlc3MuUG9w ZW4oCi0rICAgICAgICAgICAgICAgIHN1YnByb2Nlc3MuY2hlY2tfY2FsbCgKLSAgICAgICAgICAg ICAgICAgICAgICgidGVlIiwgbG9nZmlsZSksCi0tICAgICAgICAgICAgICAgICAgICBzdGRpbj1y cG1idWlsZC5zdGRvdXQsCi0tICAgICAgICAgICAgICAgICAgICBzdGRvdXQ9c3VicHJvY2Vzcy5Q SVBFKQotLSAgICAgICAgICAgICAgICBycG1idWlsZC5zdGRvdXQuY2xvc2UoKQotLSAgICAgICAg ICAgICAgICB0ZWUuY29tbXVuaWNhdGUoKQotLQotLSAgICAgICAgICAgIGV4Y2VwdCBzdWJwcm9j ZXNzLlN1YnByb2Nlc3NFcnJvcjoKLSsgICAgICAgICAgICAgICAgICAgIHN0ZGluPXJwbWJ1aWxk LnN0ZG91dCkKLSsgICAgICAgICAgICAgICAgcnBtYnVpbGQuY29tbXVuaWNhdGUoKSAgIyB3aXRo b3V0IHRoaXMsICdyZXR1cm5jb2RlJyBpcyBOb25lICg9dW5maW5pc2hlZCBwcm9jZXNzKQotKyAg ICAgICAgICAgICAgICBzeXMuZXhpdChycG1idWlsZC5yZXR1cm5jb2RlKQotKyAgICAgICAgICAg IGV4Y2VwdCBzdWJwcm9jZXNzLkNhbGxlZFByb2Nlc3NFcnJvcjoKLSAgICAgICAgICAgICAgICAg cmFpc2UgcnBrZ0Vycm9yKGRlYnVnX2NtZCkKLSAgICAgICAgIGZpbmFsbHk6Ci0gICAgICAgICAg ICAgc2VsZi5fY2xlYW51cF90bXBfZGlyKHRtcGRpcikKLWRpZmYgLS1naXQgYS90ZXN0cy90ZXN0 X2NsaS5weSBiL3Rlc3RzL3Rlc3RfY2xpLnB5Ci1pbmRleCAyNTRiZmFjLi45N2FlMGNlIDEwMDY0 NAotLS0tIGEvdGVzdHMvdGVzdF9jbGkucHkKLSsrKyBiL3Rlc3RzL3Rlc3RfY2xpLnB5Ci1AQCAt ODQ2LDEwICs4NDYsMTIgQEAgY2xhc3MgVGVzdExvY2FsKENsaVRlc3RDYXNlKToKLSAKLSAgICAg Y3JlYXRlX3JlcG9fcGVyX3Rlc3QgPSBGYWxzZQotIAotKyAgICBAcGF0Y2goJ3N5cy5leGl0JykK LSsgICAgQHBhdGNoKCdweXJwa2cuc3VicHJvY2Vzcy5jaGVja19jYWxsJykKLSAgICAgQHBhdGNo KCdzdWJwcm9jZXNzLlBvcGVuJykKLSAgICAgQHBhdGNoKCdweXJwa2cuQ29tbWFuZHMucmVsJykK LSAgICAgQHBhdGNoKCdweXJwa2cuQ29tbWFuZHMudmVyJykKLS0gICAgZGVmIHRlc3RfbG9jYWwo c2VsZiwgdmVyLCByZWwsIHBvcGVuKToKLSsgICAgZGVmIHRlc3RfbG9jYWwoc2VsZiwgdmVyLCBy ZWwsIHBvcGVuLCBjaGVja19jYWxsLCBzeXN0ZW1fZXhpdCk6Ci0gICAgICAgICBjbGlfY21kID0g WydycGtnJywgJy0tcGF0aCcsIHNlbGYuY2xvbmVkX3JlcG9fcGF0aCwgJy0tcmVsZWFzZScsICdy aGVsLTYnLCAnbG9jYWwnXQotIAotICAgICAgICAgcmVsLl9fc3RyX18gPSBNb2NrKCkKLUBAIC04 NjgsMjAgKzg3MCwyMSBAQCBjbGFzcyBUZXN0TG9jYWwoQ2xpVGVzdENhc2UpOgotICAgICAgICAg cG9wZW4uYXNzZXJ0X2hhc19jYWxscyhbCi0gICAgICAgICAgICAgIyBhdCB0aGUgYmVnaW5uaW5n IG9mIHRoaXMgbGlzdCwgdGhlcmUgYXJlIG90aGVyIGNhbGxzIGZyb20gbG9hZF9uYW1ldmVycmVs Ci0gICAgICAgICAgICAgY2FsbChycG1idWlsZCwgc3Rkb3V0PS0xLCBzdGRlcnI9LTIpLAotLSAg ICAgICAgICAgICMgSSBjYW4ndCBtYXRjaCB0aGlzIGNhbGwgLSBzdGRpbj1Nb2NrIGhhcyBpdCdz IGR5bmFtaWMgaWQuIFRoZXJlZm9yZSBhbnlfb3JlZGVyPVRydWUKLS0gICAgICAgICAgICAjIGNh bGwodGVlLCBzdGRpbj1Nb2NrKCksIHN0ZG91dD0tMSksICAjIGNoZWNrIGNhbGwgWy0zXSBzZXBh cmF0ZWx5Ci0tICAgICAgICAgICAgY2FsbCgpLnN0ZG91dC5jbG9zZSgpLAotICAgICAgICAgICAg IGNhbGwoKS5jb21tdW5pY2F0ZSgpLAotLSAgICAgICAgXSwgYW55X29yZGVyPVRydWUpCi0rICAg ICAgICBdLCBhbnlfb3JkZXI9RmFsc2UpCi0gCi0tICAgICAgICB0ZWVfY2FsbF9hcmcgPSBwb3Bl bi5tb2NrX2NhbGxzWy0zXQotKyAgICAgICAgdGVlX2NhbGxfYXJnID0gY2hlY2tfY2FsbC5tb2Nr X2NhbGxzWzBdCi0gICAgICAgICBpZiAnYXJncycgaW4gZGlyKHRlZV9jYWxsX2FyZyk6ICAjIGRv ZXNuJ3Qgd29yayBpbiA8PXB5MzYKLSAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHRlZSwg dGVlX2NhbGxfYXJnLmFyZ3NbMF0pCi0gCi0rICAgICAgICBzeXN0ZW1fZXhpdC5hc3NlcnRfY2Fs bGVkX29uY2UoKQotKwotKyAgICBAcGF0Y2goJ3N5cy5leGl0JykKLSsgICAgQHBhdGNoKCdweXJw a2cuc3VicHJvY2Vzcy5jaGVja19jYWxsJykKLSAgICAgQHBhdGNoKCdzdWJwcm9jZXNzLlBvcGVu JykKLSAgICAgQHBhdGNoKCdweXJwa2cuQ29tbWFuZHMucmVsJykKLSAgICAgQHBhdGNoKCdweXJw a2cuQ29tbWFuZHMudmVyJykKLS0gICAgZGVmIHRlc3RfbG9jYWxfd2l0aF9vcHRpb25zKHNlbGYs IHZlciwgcmVsLCBwb3Blbik6Ci0rICAgIGRlZiB0ZXN0X2xvY2FsX3dpdGhfb3B0aW9ucyhzZWxm LCB2ZXIsIHJlbCwgcG9wZW4sIGNoZWNrX2NhbGwsIHN5c3RlbV9leGl0KToKLSAgICAgICAgIGJ1 aWxkZGlyID0gb3MucGF0aC5qb2luKHNlbGYuY2xvbmVkX3JlcG9fcGF0aCwgJ3RoaXMtYnVpbGRk aXInKQotICAgICAgICAgYnVpbGRyb290ZGlyID0gb3MucGF0aC5qb2luKHNlbGYuY2xvbmVkX3Jl cG9fcGF0aCwgJ3RoaXMtYnVpbGRyb290ZGlyJykKLSAKLUBAIC05MTMsMTYgKzkxNiwxNSBAQCBj bGFzcyBUZXN0TG9jYWwoQ2xpVGVzdENhc2UpOgotICAgICAgICAgcG9wZW4uYXNzZXJ0X2hhc19j YWxscyhbCi0gICAgICAgICAgICAgIyBhdCB0aGUgYmVnaW5uaW5nIG9mIHRoaXMgbGlzdCwgdGhl cmUgYXJlIG90aGVyIGNhbGxzIGZyb20gbG9hZF9uYW1ldmVycmVsCi0gICAgICAgICAgICAgY2Fs bChycG1idWlsZCwgc3Rkb3V0PS0xLCBzdGRlcnI9LTIpLAotLSAgICAgICAgICAgICMgSSBjYW4n dCBtYXRjaCB0aGlzIGNhbGwgLSBzdGRpbj1Nb2NrIGhhcyBpdCdzIGR5bmFtaWMgaWQuIFRoZXJl Zm9yZSBhbnlfb3JlZGVyPVRydWUKLS0gICAgICAgICAgICAjIGNhbGwodGVlLCBzdGRpbj1Nb2Nr KCksIHN0ZG91dD0tMSksICAjIGNoZWNrIGNhbGwgWy0zXSBzZXBhcmF0ZWx5Ci0tICAgICAgICAg ICAgY2FsbCgpLnN0ZG91dC5jbG9zZSgpLAotICAgICAgICAgICAgIGNhbGwoKS5jb21tdW5pY2F0 ZSgpLAotLSAgICAgICAgXSwgYW55X29yZGVyPVRydWUpCi0rICAgICAgICBdLCBhbnlfb3JkZXI9 RmFsc2UpCi0gCi0tICAgICAgICB0ZWVfY2FsbF9hcmcgPSBwb3Blbi5tb2NrX2NhbGxzWy0zXQot KyAgICAgICAgdGVlX2NhbGxfYXJnID0gY2hlY2tfY2FsbC5tb2NrX2NhbGxzWzBdCi0gICAgICAg ICBpZiAnYXJncycgaW4gZGlyKHRlZV9jYWxsX2FyZyk6ICAjIGRvZXNuJ3Qgd29yayBpbiA8PXB5 MzYKLSAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHRlZSwgdGVlX2NhbGxfYXJnLmFyZ3Nb MF0pCi0gCi0rICAgICAgICBzeXN0ZW1fZXhpdC5hc3NlcnRfY2FsbGVkX29uY2UoKQotKwotIAot IGNsYXNzIFRlc3RWZXJpZnlGaWxlcyhDbGlUZXN0Q2FzZSk6Ci0gCi0tLSAKLTIuMzcuMgotCgpk aWZmIC0tZ2l0IGEvMDAwNS1GaXhlcy1mb3ItZXhwbG9kZWQtU1JQTS1sYXlvdXRzLnBhdGNoIGIv MDAwNS1GaXhlcy1mb3ItZXhwbG9kZWQtU1JQTS1sYXlvdXRzLnBhdGNoCmRlbGV0ZWQgZmlsZSBt b2RlIDEwMDY0NAppbmRleCBmMmI1N2IzLi4wMDAwMDAwCi0tLSBhLzAwMDUtRml4ZXMtZm9yLWV4 cGxvZGVkLVNSUE0tbGF5b3V0cy5wYXRjaAorKysgL2Rldi9udWxsCkBAIC0xLDIyNyArMCwwIEBA Ci1Gcm9tIGZjNGRjNjg4MmM4MDJlOWE4YjdlY2UzMTAxMDMzY2I2NjI5MjhhZGYgTW9uIFNlcCAx NyAwMDowMDowMCAyMDAxCi1Gcm9tOiBUcm95IERhd3NvbiA8dGRhd3NvbkByZWRoYXQuY29tPgot RGF0ZTogRnJpLCAyMyBTZXAgMjAyMiAxNDozODozNCAtMDcwMAotU3ViamVjdDogW1BBVENIIDEv Ml0gRml4ZXMgZm9yIGV4cGxvZGVkIFNSUE0gbGF5b3V0cwotCi1zb3VyY2VzX2ZpbGVuYW1lIGlu Y29ycmVjdGx5IHNldCB3aGVuIHVzaW5nIFNSUE1MYXlvdXQuCi0KLUZpeGVzOiAjNjMzCi1KSVJB OiBSSEVMQ01QLTk5OTIKLU1lcmdlczogaHR0cHM6Ly9wYWd1cmUuaW8vcnBrZy9wdWxsLXJlcXVl c3QvNjM0Ci0KLVNpZ25lZC1vZmYtYnk6IFRyb3kgRGF3c29uIDx0ZGF3c29uQHJlZGhhdC5jb20+ Ci0tLS0KLSBweXJwa2cvX19pbml0X18ucHkgICAgfCAyMSArKysrKysrKysrKy0tLS0tLS0tLS0K LSBweXJwa2cvY2xpLnB5ICAgICAgICAgfCAgMiArLQotIHB5cnBrZy9zb3VyY2VzLnB5ICAgICB8 IDMwICsrKysrKysrKysrKysrKysrKysrKysrKystLS0tLQotIHRlc3RzL3Rlc3RfY2xpLnB5ICAg ICB8ICAyICstCi0gdGVzdHMvdGVzdF9zb3VyY2VzLnB5IHwgMzMgKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrCi0gNSBmaWxlcyBjaGFuZ2VkLCA3MSBpbnNlcnRpb25zKCspLCAxNyBk ZWxldGlvbnMoLSkKLQotZGlmZiAtLWdpdCBhL3B5cnBrZy9fX2luaXRfXy5weSBiL3B5cnBrZy9f X2luaXRfXy5weQotaW5kZXggMWI2YTBjNC4uYTQwZmE1YSAxMDA2NDQKLS0tLSBhL3B5cnBrZy9f X2luaXRfXy5weQotKysrIGIvcHlycGtnL19faW5pdF9fLnB5Ci1AQCAtMTE1Myw3ICsxMTUzLDgg QEAgY2xhc3MgQ29tbWFuZHMob2JqZWN0KToKLSAgICAgZGVmIHNvdXJjZXNfZmlsZW5hbWUoc2Vs Zik6Ci0gICAgICAgICBpZiBzZWxmLmxheW91dCBpcyBOb25lOgotICAgICAgICAgICAgIHJldHVy biBvcy5wYXRoLmpvaW4oc2VsZi5wYXRoLCAnc291cmNlcycpCi0tICAgICAgICByZXR1cm4gb3Mu cGF0aC5qb2luKHNlbGYucGF0aCwgc2VsZi5sYXlvdXQuc291cmNlc19maWxlX3RlbXBsYXRlKQot KyAgICAgICAgcmV0dXJuIG9zLnBhdGguam9pbigKLSsgICAgICAgICAgICBzZWxmLnBhdGgsIHNl bGYubGF5b3V0LnNvdXJjZXNfZmlsZV90ZW1wbGF0ZS5yZXBsYWNlKCJ7MC5yZXBvX25hbWV9Iiwg c2VsZi5yZXBvX25hbWUpKQotIAotICAgICBAcHJvcGVydHkKLSAgICAgZGVmIG9zYnNfY29uZmln X2ZpbGVuYW1lKHNlbGYpOgotQEAgLTIxNjMsOSArMjE2NCw5IEBAIGNsYXNzIENvbW1hbmRzKG9i amVjdCk6Ci0gICAgICAgICAgICAgc2VsZi5sb2cuaW5mbygic291cmNlcyBmaWxlIGRvZXNuJ3Qg ZXhpc3QuIFNvdXJjZSBmaWxlcyBkb3dubG9hZCBza2lwcGVkLiIpCi0gICAgICAgICAgICAgcmV0 dXJuCi0gCi0tICAgICAgICAjIERlZmF1bHQgdG8gcHV0dGluZyB0aGUgZmlsZXMgd2hlcmUgdGhl IHJlcG9zaXRvcnkgaXMKLSsgICAgICAgICMgRGVmYXVsdCB0byBwdXR0aW5nIHRoZSBmaWxlcyBp biB0aGUgbGF5b3V0IHNvdXJjZWRpcgotICAgICAgICAgaWYgbm90IG91dGRpcjoKLS0gICAgICAg ICAgICBvdXRkaXIgPSBzZWxmLnBhdGgKLSsgICAgICAgICAgICBvdXRkaXIgPSBzZWxmLmxheW91 dC5zb3VyY2VkaXIKLSAKLSAgICAgICAgIHNvdXJjZXNmID0gU291cmNlc0ZpbGUoc2VsZi5zb3Vy Y2VzX2ZpbGVuYW1lLCBzZWxmLnNvdXJjZV9lbnRyeV90eXBlKQotIAotQEAgLTI1NzgsNyArMjU3 OSw3IEBAIGNsYXNzIENvbW1hbmRzKG9iamVjdCk6Ci0gICAgICAgICAgICAgY21kLmFwcGVuZCgn LS1ub2NoZWNrJykKLSAgICAgICAgIGlmIHNlbGYucXVpZXQ6Ci0gICAgICAgICAgICAgY21kLmFw cGVuZCgnLS1xdWlldCcpCi0tICAgICAgICBjbWQuZXh0ZW5kKFsnLWJjJywgb3MucGF0aC5qb2lu KHNlbGYucGF0aCwgc2VsZi5zcGVjKV0pCi0rICAgICAgICBjbWQuZXh0ZW5kKFsnLWJjJywgb3Mu cGF0aC5qb2luKHNlbGYubGF5b3V0LnNwZWNkaXIsIHNlbGYuc3BlYyldKQotICAgICAgICAgIyBS dW4gdGhlIGNvbW1hbmQKLSAgICAgICAgIHNlbGYuX3J1bl9jb21tYW5kKGNtZCkKLSAKLUBAIC0y NjU3LDcgKzI2NTgsNyBAQCBjbGFzcyBDb21tYW5kcyhvYmplY3QpOgotICAgICAgICAgaWYgYnVp bGRyb290ZGlyOgotICAgICAgICAgICAgIGNtZC5leHRlbmQoWyItLWRlZmluZSIsICJfYnVpbGRy b290ZGlyIHswfSIuZm9ybWF0KAotICAgICAgICAgICAgICAgICBvcy5wYXRoLmFic3BhdGgoYnVp bGRyb290ZGlyKSldKQotLSAgICAgICAgY21kLmV4dGVuZChbJy1iaScsIG9zLnBhdGguam9pbihz ZWxmLnBhdGgsIHNlbGYuc3BlYyldKQotKyAgICAgICAgY21kLmV4dGVuZChbJy1iaScsIG9zLnBh dGguam9pbihzZWxmLmxheW91dC5zcGVjZGlyLCBzZWxmLnNwZWMpXSkKLSAgICAgICAgICMgUnVu IHRoZSBjb21tYW5kCi0gICAgICAgICBzZWxmLl9ydW5fY29tbWFuZChjbWQpCi0gICAgICAgICBy ZXR1cm4KLUBAIC0yNzk4LDcgKzI3OTksNyBAQCBjbGFzcyBDb21tYW5kcyhvYmplY3QpOgotICAg ICAgICAgaWYgbm90IGhhc2h0eXBlID09ICdzaGEyNTYnOgotICAgICAgICAgICAgIGNtZC5leHRl bmQoWyItLWRlZmluZSIsICJfc291cmNlX2ZpbGVkaWdlc3RfYWxnb3JpdGhtICVzIiAlIGhhc2h0 eXBlLAotICAgICAgICAgICAgICAgICAgICAgICAgICItLWRlZmluZSIsICJfYmluYXJ5X2ZpbGVk aWdlc3RfYWxnb3JpdGhtICVzIiAlIGhhc2h0eXBlXSkKLS0gICAgICAgIHNwZWNwYXRoID0gb3Mu cGF0aC5qb2luKHNlbGYucGF0aCwgc2VsZi5zcGVjKQotKyAgICAgICAgc3BlY3BhdGggPSBvcy5w YXRoLmpvaW4oc2VsZi5sYXlvdXQuc3BlY2Rpciwgc2VsZi5zcGVjKQotICAgICAgICAgdG1wZGly ID0gTm9uZQotICAgICAgICAgdHJ5OgotICAgICAgICAgICAgIGlmIG5vdCBzZWxmLnVzZXNfcnBt YXV0b3NwZWMgb3Igbm90IHJwbWF1dG9zcGVjX3Byb2Nlc3NfZGlzdGdpdDoKLUBAIC0zMTgwLDcg KzMxODEsNyBAQCBjbGFzcyBDb21tYW5kcyhvYmplY3QpOgotICAgICAgICAgaWYgYnVpbGRyb290 ZGlyOgotICAgICAgICAgICAgIGNtZC5leHRlbmQoWyItLWRlZmluZSIsICJfYnVpbGRyb290ZGly IHswfSIuZm9ybWF0KAotICAgICAgICAgICAgICAgICBvcy5wYXRoLmFic3BhdGgoYnVpbGRyb290 ZGlyKSldKQotLSAgICAgICAgY21kLmV4dGVuZChbJy0tbm9kZXBzJywgJy1icCcsIG9zLnBhdGgu am9pbihzZWxmLnBhdGgsIHNlbGYuc3BlYyldKQotKyAgICAgICAgY21kLmV4dGVuZChbJy0tbm9k ZXBzJywgJy1icCcsIG9zLnBhdGguam9pbihzZWxmLmxheW91dC5zcGVjZGlyLCBzZWxmLnNwZWMp XSkKLSAgICAgICAgICMgUnVuIHRoZSBjb21tYW5kCi0gICAgICAgICBzZWxmLl9ydW5fY29tbWFu ZChjbWQpCi0gCi1AQCAtMzIzOCw3ICszMjM5LDcgQEAgY2xhc3MgQ29tbWFuZHMob2JqZWN0KToK LSAgICAgICAgIGlmIG5vdCBoYXNodHlwZSA9PSAnc2hhMjU2JzoKLSAgICAgICAgICAgICBjbWQu ZXh0ZW5kKFsiLS1kZWZpbmUiLCAiX3NvdXJjZV9maWxlZGlnZXN0X2FsZ29yaXRobSAlcyIgJSBo YXNodHlwZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAiLS1kZWZpbmUiLCAiX2JpbmFyeV9m aWxlZGlnZXN0X2FsZ29yaXRobSAlcyIgJSBoYXNodHlwZV0pCi0tICAgICAgICBzcGVjcGF0aCA9 IG9zLnBhdGguam9pbihzZWxmLnBhdGgsIHNlbGYuc3BlYykKLSsgICAgICAgIHNwZWNwYXRoID0g b3MucGF0aC5qb2luKHNlbGYubGF5b3V0LnNwZWNkaXIsIHNlbGYuc3BlYykKLSAgICAgICAgIHRt cGRpciA9IE5vbmUKLSAgICAgICAgIHRyeToKLSAgICAgICAgICAgICBpZiBub3Qgc2VsZi51c2Vz X3JwbWF1dG9zcGVjIG9yIG5vdCBycG1hdXRvc3BlY19wcm9jZXNzX2Rpc3RnaXQ6Ci1AQCAtMzI2 Miw3ICszMjYzLDcgQEAgY2xhc3MgQ29tbWFuZHMob2JqZWN0KToKLSAgICAgICAgICMgQ3JlYXRl IGEgbGlzdCBmb3IgdW51c2VkIHBhdGNoZXMKLSAgICAgICAgIHVudXNlZCA9IFtdCi0gICAgICAg ICAjIEdldCB0aGUgY29udGVudCBvZiBzcGVjIGludG8gbWVtb3J5IGZvciBmYXN0IHNlYXJjaGlu ZwotLSAgICAgICAgd2l0aCBvcGVuKG9zLnBhdGguam9pbihzZWxmLnBhdGgsIHNlbGYuc3BlYyks ICdyJykgYXMgZjoKLSsgICAgICAgIHdpdGggb3Blbihvcy5wYXRoLmpvaW4oc2VsZi5sYXlvdXQu c3BlY2Rpciwgc2VsZi5zcGVjKSwgJ3InKSBhcyBmOgotICAgICAgICAgICAgIGRhdGEgPSBmLnJl YWQoKQotICAgICAgICAgaWYgc2l4LlBZMjoKLSAgICAgICAgICAgICB0cnk6Ci1AQCAtMzM0MCw3 ICszMzQxLDcgQEAgY2xhc3MgQ29tbWFuZHMob2JqZWN0KToKLSAgICAgICAgIGlmIGJ1aWxkcm9v dGRpcjoKLSAgICAgICAgICAgICBjbWQuZXh0ZW5kKFsiLS1kZWZpbmUiLCAiX2J1aWxkcm9vdGRp ciB7MH0iLmZvcm1hdCgKLSAgICAgICAgICAgICAgICAgb3MucGF0aC5hYnNwYXRoKGJ1aWxkcm9v dGRpcikpXSkKLS0gICAgICAgIGNtZC5leHRlbmQoWyctYmwnLCBvcy5wYXRoLmpvaW4oc2VsZi5w YXRoLCBzZWxmLnNwZWMpXSkKLSsgICAgICAgIGNtZC5leHRlbmQoWyctYmwnLCBvcy5wYXRoLmpv aW4oc2VsZi5sYXlvdXQuc3BlY2Rpciwgc2VsZi5zcGVjKV0pCi0gICAgICAgICAjIFJ1biB0aGUg Y29tbWFuZAotICAgICAgICAgc2VsZi5fcnVuX2NvbW1hbmQoY21kKQotIAotZGlmZiAtLWdpdCBh L3B5cnBrZy9jbGkucHkgYi9weXJwa2cvY2xpLnB5Ci1pbmRleCA5Njk0ZjE0Li5iMGExNmZiIDEw MDY0NAotLS0tIGEvcHlycGtnL2NsaS5weQotKysrIGIvcHlycGtnL2NsaS5weQotQEAgLTE0ODQs NyArMTQ4NCw3IEBAIGNsYXNzIGNsaUNsaWVudChvYmplY3QpOgotICAgICAgICAgICAgICdzb3Vy Y2VzJywgaGVscD0nRG93bmxvYWQgc291cmNlIGZpbGVzJywKLSAgICAgICAgICAgICBkZXNjcmlw dGlvbj0nRG93bmxvYWQgc291cmNlIGZpbGVzJykKLSAgICAgICAgIHNvdXJjZXNfcGFyc2VyLmFk ZF9hcmd1bWVudCgKLS0gICAgICAgICAgICAnLS1vdXRkaXInLCBkZWZhdWx0PW9zLmN1cmRpciwK LSsgICAgICAgICAgICAnLS1vdXRkaXInLAotICAgICAgICAgICAgIGhlbHA9J0RpcmVjdG9yeSB0 byBkb3dubG9hZCBmaWxlcyBpbnRvIChkZWZhdWx0cyB0byBwd2QpJykKLSAgICAgICAgIHNvdXJj ZXNfcGFyc2VyLnNldF9kZWZhdWx0cyhjb21tYW5kPXNlbGYuc291cmNlcykKLSAKLWRpZmYgLS1n aXQgYS9weXJwa2cvc291cmNlcy5weSBiL3B5cnBrZy9zb3VyY2VzLnB5Ci1pbmRleCA4NTg0NjFk Li5jZGQ1Mjc1IDEwMDY0NAotLS0tIGEvcHlycGtnL3NvdXJjZXMucHkKLSsrKyBiL3B5cnBrZy9z b3VyY2VzLnB5Ci1AQCAtNjcsMTUgKzY3LDM1IEBAIGNsYXNzIFNvdXJjZXNGaWxlKG9iamVjdCk6 Ci0gICAgICAgICAgICAgcmV0dXJuIHNlbGYuZW50cnlfdHlwZShtLmdyb3VwKCdoYXNodHlwZScp LCBtLmdyb3VwKCdmaWxlJyksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBt Lmdyb3VwKCdoYXNoJykpCi0gCi0tICAgICAgICAjIFRyeSBmYWxsaW5nIGJhY2sgb24gdGhlIG9s ZCBmb3JtYXQKLSsgICAgICAgICMgVHJ5IGZhbGxpbmcgYmFjayBvbiB0aGUgb2xkIEZlZG9yYSBm b3JtYXQKLSAgICAgICAgIHRyeToKLSAgICAgICAgICAgICBoYXNoLCBmaWxlID0gc3RyaXBwZWQu c3BsaXQoJyAgJywgMSkKLSAKLSAgICAgICAgIGV4Y2VwdCBWYWx1ZUVycm9yOgotLSAgICAgICAg ICAgIHJhaXNlIE1hbGZvcm1lZExpbmVFcnJvcigKLS0gICAgICAgICAgICAgICAgJ3NvdXJjZXMg aGFzIGludmFsaWQgY29udGVudDogezB9XG4nCi0tICAgICAgICAgICAgICAgICdQbGVhc2Ugbm90 ZSB0aGF0IHNvdXJjZXMgZmlsZSBtdXN0IG5vdCBiZSBtb2RpZmllZCBtYW51YWxseS4nCi0tICAg ICAgICAgICAgICAgIC5mb3JtYXQoc3RyaXBwZWQpKQotKyAgICAgICAgICAgICMgVHJ5IG9sZCBD ZW50b3MgRm9ybWF0Ci0rICAgICAgICAgICAgdHJ5OgotKyAgICAgICAgICAgICAgICBoYXNoLCBm aWxlX3BhdGggPSBzdHJpcHBlZC5zcGxpdCgnICcsIDEpCi0rICAgICAgICAgICAgICAgIGlmIGxl bihoYXNoKSA9PSAxMjg6Ci0rICAgICAgICAgICAgICAgICAgICBoYXNodHlwZSA9ICdzaGE1MTIn Ci0rICAgICAgICAgICAgICAgIGVsaWYgbGVuKGhhc2gpID09IDY0OgotKyAgICAgICAgICAgICAg ICAgICAgaGFzaHR5cGUgPSAnc2hhMjU2JwotKyAgICAgICAgICAgICAgICBlbGlmIGxlbihoYXNo KSA9PSA0MDoKLSsgICAgICAgICAgICAgICAgICAgIGhhc2h0eXBlID0gJ3NoYTEnCi0rICAgICAg ICAgICAgICAgIGVsaWYgbGVuKGhhc2gpID09IDMyOgotKyAgICAgICAgICAgICAgICAgICAgaGFz aHR5cGUgPSAnbWQ1JwotKyAgICAgICAgICAgICAgICBlbHNlOgotKyAgICAgICAgICAgICAgICAg ICAgcmFpc2UgTWFsZm9ybWVkTGluZUVycm9yKAotKyAgICAgICAgICAgICAgICAgICAgICAgICdz b3VyY2VzIGhhcyBpbnZhbGlkIGNvbnRlbnQ6IHswfVxuJwotKyAgICAgICAgICAgICAgICAgICAg ICAgICdQbGVhc2Ugbm90ZSB0aGF0IHNvdXJjZXMgZmlsZSBtdXN0IG5vdCBiZSBtb2RpZmllZCBt YW51YWxseS4nCi0rICAgICAgICAgICAgICAgICAgICAgICAgLmZvcm1hdChzdHJpcHBlZCkpCi0r ICAgICAgICAgICAgICAgIGZpbGUgPSBvcy5wYXRoLnNwbGl0KGZpbGVfcGF0aClbMV0KLSsgICAg ICAgICAgICAgICAgcmV0dXJuIHNlbGYuZW50cnlfdHlwZShoYXNodHlwZSwgZmlsZSwgaGFzaCkK LSsKLSsgICAgICAgICAgICBleGNlcHQgVmFsdWVFcnJvcjoKLSsgICAgICAgICAgICAgICAgcmFp c2UgTWFsZm9ybWVkTGluZUVycm9yKAotKyAgICAgICAgICAgICAgICAgICAgJ3NvdXJjZXMgaGFz IGludmFsaWQgY29udGVudDogezB9XG4nCi0rICAgICAgICAgICAgICAgICAgICAnUGxlYXNlIG5v dGUgdGhhdCBzb3VyY2VzIGZpbGUgbXVzdCBub3QgYmUgbW9kaWZpZWQgbWFudWFsbHkuJwotKyAg ICAgICAgICAgICAgICAgICAgLmZvcm1hdChzdHJpcHBlZCkpCi0gCi0gICAgICAgICByZXR1cm4g c2VsZi5lbnRyeV90eXBlKCdtZDUnLCBmaWxlLCBoYXNoKQotIAotZGlmZiAtLWdpdCBhL3Rlc3Rz L3Rlc3RfY2xpLnB5IGIvdGVzdHMvdGVzdF9jbGkucHkKLWluZGV4IDk3YWUwY2UuLmRkMTM5OWEg MTAwNjQ0Ci0tLS0gYS90ZXN0cy90ZXN0X2NsaS5weQotKysrIGIvdGVzdHMvdGVzdF9jbGkucHkK LUBAIC0xNTc5LDcgKzE1NzksNyBAQCBjbGFzcyBUZXN0U291cmNlcyhMb29rYXNpZGVDYWNoZU1v Y2ssIENsaVRlc3RDYXNlKToKLSAgICAgICAgICMgTk9URTogd2l0aG91dCAtLW91dGRpciwgd2hh dGV2ZXIgdG8gcnVuIHNvdXJjZXMgY29tbWFuZCBpbiBwYWNrYWdlCi0gICAgICAgICAjIHJlcG9z aXRvcnksIHNvdXJjZXMgZmlsZSBpcyBkb3dubG9hZGVkIGludG8gY3VycmVudCB3b3JraW5nCi0g ICAgICAgICAjIGRpcmVjdG9yeS4gSXMgdGhpcyBhIGJ1Zywgb3IgbmVlZCB0byBpbXByb3ZlPwot LSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKG9zLnBhdGguZXhpc3RzKCdyZWFkbWUucGF0Y2gnKSkK LSsgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShvcy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4oc2Vs Zi5jbG9uZWRfcmVwb19wYXRoLCAncmVhZG1lLnBhdGNoJykpKQotIAotICAgICBkZWYgdGVzdF9z b3VyY2VzX3RvX291dGRpcihzZWxmKToKLSAgICAgICAgIGNsaV9jbWQgPSBbJ3Jwa2cnLCAnLS1w YXRoJywgc2VsZi5jbG9uZWRfcmVwb19wYXRoLAotZGlmZiAtLWdpdCBhL3Rlc3RzL3Rlc3Rfc291 cmNlcy5weSBiL3Rlc3RzL3Rlc3Rfc291cmNlcy5weQotaW5kZXggY2ZhY2M1MS4uZjA0MTM3MyAx MDA2NDQKLS0tLSBhL3Rlc3RzL3Rlc3Rfc291cmNlcy5weQotKysrIGIvdGVzdHMvdGVzdF9zb3Vy Y2VzLnB5Ci1AQCAtNjYsNiArNjYsMzkgQEAgY2xhc3MgU291cmNlc0ZpbGVUZXN0Q2FzZSh1bml0 dGVzdC5UZXN0Q2FzZSk6Ci0gICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGVudHJ5LmZpbGUsICdh ZmlsZScpCi0gICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHN0cihlbnRyeSksIG5ld2xpbmUpCi0g Ci0rICAgIGRlZiB0ZXN0X3BhcnNlX29sZF9zdHlsZV9jZW50b3NfbGluZShzZWxmKToKLSsgICAg ICAgIHMgPSBzb3VyY2VzLlNvdXJjZXNGaWxlKHNlbGYuc291cmNlc2ZpbGUsICdvbGQnKQotKwot KyAgICAgICAgbXlfaGFzaCA9ICdhYmFiYWJhYjAxMDEwMTAxMDEwMTAxMDEwMTAxMDEwMTAxMDEw MTAxJwotKyAgICAgICAgbXlfZmlsZSA9ICdTVUJESVIvYWZpbGUnCi0rCi0rICAgICAgICBsaW5l ID0gJ3swfSB7MX1cbicuZm9ybWF0KG15X2hhc2gsIG15X2ZpbGUpCi0rICAgICAgICBuZXdsaW5l ID0gJ3swfSAgezF9XG4nLmZvcm1hdChteV9oYXNoLCAnYWZpbGUnKQotKyAgICAgICAgZW50cnkg PSBzLnBhcnNlX2xpbmUobGluZSkKLSsKLSsgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShpc2luc3Rh bmNlKGVudHJ5LCBzb3VyY2VzLlNvdXJjZUZpbGVFbnRyeSkpCi0rICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKGVudHJ5Lmhhc2h0eXBlLCAnc2hhMScpCi0rICAgICAgICBzZWxmLmFzc2VydEVxdWFs KGVudHJ5Lmhhc2gsIG15X2hhc2gpCi0rICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGVudHJ5LmZp bGUsICdhZmlsZScpCi0rICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHN0cihlbnRyeSksIG5ld2xp bmUpCi0rCi0rICAgIGRlZiB0ZXN0X21pZ3JhdGVfb2xkX3N0eWxlX2NlbnRvc19saW5lKHNlbGYp OgotKyAgICAgICAgcyA9IHNvdXJjZXMuU291cmNlc0ZpbGUoc2VsZi5zb3VyY2VzZmlsZSwgJ2Jz ZCcpCi0rCi0rICAgICAgICBteV9oYXNoID0gMTI4ICogJ3gnCi0rICAgICAgICBteV9maWxlID0g J1NVQkRJUi9hZmlsZScKLSsKLSsgICAgICAgIGxpbmUgPSAnezB9IHsxfVxuJy5mb3JtYXQobXlf aGFzaCwgbXlfZmlsZSkKLSsgICAgICAgIG5ld2xpbmUgPSAnezB9ICB7MX1cbicuZm9ybWF0KG15 X2hhc2gsICdhZmlsZScpCi0rICAgICAgICBuZXdsaW5lID0gJ1NIQTUxMiAoYWZpbGUpID0gezB9 XG4nLmZvcm1hdChteV9oYXNoKQotKyAgICAgICAgZW50cnkgPSBzLnBhcnNlX2xpbmUobGluZSkK LSsKLSsgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShpc2luc3RhbmNlKGVudHJ5LCBzb3VyY2VzLlNv dXJjZUZpbGVFbnRyeSkpCi0rICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGVudHJ5Lmhhc2h0eXBl LCAnc2hhNTEyJykKLSsgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZW50cnkuaGFzaCwgbXlfaGFz aCkKLSsgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZW50cnkuZmlsZSwgJ2FmaWxlJykKLSsgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3RyKGVudHJ5KSwgbmV3bGluZSkKLSsKLSAgICAgZGVmIHRl c3RfcGFyc2VfZW50cnlfbGluZShzZWxmKToKLSAgICAgICAgIHMgPSBzb3VyY2VzLlNvdXJjZXNG aWxlKHNlbGYuc291cmNlc2ZpbGUsICdic2QnKQotIAotLS0gCi0yLjM3LjMKLQoKZGlmZiAtLWdp dCBhLzAwMDYtbW9ja2J1aWxkLWVzY2FwZS1ycG0tY29tbWFuZC11bmRlci1tb2NrLnBhdGNoIGIv MDAwNi1tb2NrYnVpbGQtZXNjYXBlLXJwbS1jb21tYW5kLXVuZGVyLW1vY2sucGF0Y2gKZGVsZXRl ZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGUwZDk3ZTkuLjAwMDAwMDAKLS0tIGEvMDAwNi1tb2Nr YnVpbGQtZXNjYXBlLXJwbS1jb21tYW5kLXVuZGVyLW1vY2sucGF0Y2gKKysrIC9kZXYvbnVsbApA QCAtMSw1OSArMCwwIEBACi1Gcm9tIDdjZWZjNWZlMzVhNTE0NjM3YjFiMGI2OGUwNDRmMGRlMGQx ODhlMjIgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCi1Gcm9tOiBPbmRyZWogTm9zZWsgPG9ub3Nl a0ByZWRoYXQuY29tPgotRGF0ZTogV2VkLCA1IE9jdCAyMDIyIDAzOjQ1OjIyICswMjAwCi1TdWJq ZWN0OiBbUEFUQ0ggMi8yXSBtb2NrYnVpbGQ6IGVzY2FwZSBycG0gY29tbWFuZCB1bmRlciBtb2Nr Ci0KLUFyZ3VtZW50cyBvZiB0aGUgJ3JwbScgcGFydCBhZnRlciAnbW9jayAtLXNoZWxsJyBuZWVk cyB0byBiZSBlc2NhcGVkLgotRXhhbXBsZToKLQotICBtb2NrIC1yIHh4eCAtLWNocm9vdCAuLi4g LS1zaGVsbCBycG0gLS1kZWZpbmUgJ19zb3VyY2VkaXIgeHh4JyAuLi4KLQotSklSQTogUkhFTENN UC0xMDE1MAotUmVzb2x2ZXM6IHJoYnojMjEzMDM0OQotCi1TaWduZWQtb2ZmLWJ5OiBPbmRyZWog Tm9zZWsgPG9ub3Nla0ByZWRoYXQuY29tPgotLS0tCi0gcHlycGtnL19faW5pdF9fLnB5IHwgOCAr KysrKystLQotIDEgZmlsZSBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0p Ci0KLWRpZmYgLS1naXQgYS9weXJwa2cvX19pbml0X18ucHkgYi9weXJwa2cvX19pbml0X18ucHkK LWluZGV4IGE0MGZhNWEuLjE1OTUzNDQgMTAwNjQ0Ci0tLS0gYS9weXJwa2cvX19pbml0X18ucHkK LSsrKyBiL3B5cnBrZy9fX2luaXRfXy5weQotQEAgLTIyLDYgKzIyLDcgQEAgaW1wb3J0IG9zCi0g aW1wb3J0IHBvc2l4cGF0aAotIGltcG9ydCByYW5kb20KLSBpbXBvcnQgcmUKLStpbXBvcnQgc2hs ZXgKLSBpbXBvcnQgc2h1dGlsCi0gaW1wb3J0IHN1YnByb2Nlc3MKLSBpbXBvcnQgc3lzCi1AQCAt NDMsMTMgKzQ0LDE0IEBAIGZyb20gc2l4Lm1vdmVzLnVybGxpYi5wYXJzZSBpbXBvcnQgdXJsam9p bgotIAotIGZyb20gcHlycGtnIGltcG9ydCBsYXlvdXQKLSBmcm9tIHB5cnBrZy5lcnJvcnMgaW1w b3J0IChBbHJlYWR5VXBsb2FkZWRFcnJvciwgSGFzaHR5cGVNaXhpbmdFcnJvciwKLS0gICAgICAg ICAgICAgICAgICAgICAgICAgICBVbmtub3duVGFyZ2V0RXJyb3IsIHJwa2dBdXRoRXJyb3IsIHJw a2dFcnJvciwgTm9Tb3VyY2VzRXJyb3IpCi0rICAgICAgICAgICAgICAgICAgICAgICAgICAgTm9T b3VyY2VzRXJyb3IsIFVua25vd25UYXJnZXRFcnJvciwgcnBrZ0F1dGhFcnJvciwKLSsgICAgICAg ICAgICAgICAgICAgICAgICAgICBycGtnRXJyb3IpCi0gZnJvbSBweXJwa2cubG9va2FzaWRlIGlt cG9ydCBDR0lMb29rYXNpZGVDYWNoZQotIGZyb20gcHlycGtnLnNvdXJjZXMgaW1wb3J0IFNvdXJj ZXNGaWxlCi0gZnJvbSBweXJwa2cuc3BlYyBpbXBvcnQgU3BlY0ZpbGUKLSBmcm9tIHB5cnBrZy51 dGlscyBpbXBvcnQgKGNhY2hlZF9wcm9wZXJ0eSwgZXh0cmFjdF9zcnBtLCBmaW5kX21lLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgaXNfZmlsZV90cmFja2VkLCBpc19sb29rYXNpZGVfZWxp Z2libGVfZmlsZSwKLS0gICAgICAgICAgICAgICAgICAgICAgICAgIHNwZWNfZmlsZV9wcm9jZXNz ZWRfYnlfcnBtYXV0b3NwZWMsIGxvZ19yZXN1bHQpCi0rICAgICAgICAgICAgICAgICAgICAgICAg ICBsb2dfcmVzdWx0LCBzcGVjX2ZpbGVfcHJvY2Vzc2VkX2J5X3JwbWF1dG9zcGVjKQotIAotIGZy b20gLmdpdGlnbm9yZSBpbXBvcnQgR2l0SWdub3JlCi0gCi1AQCAtODEzLDYgKzgxNSw4IEBAIGNs YXNzIENvbW1hbmRzKG9iamVjdCk6Ci0gICAgICAgICAjIGxpc3RpbmcgZm9yIGVhY2ggc3VicGFj a2FnZS4gIFdlIG9ubHkgY2FyZSBhYm91dCB0aGUgZmlyc3QuCi0gICAgICAgICBycG1fY21kLmV4 dGVuZChbIi1xIiwgIi0tcWYiLCAiPz8le05BTUV9ICV7RVBPQ0h9ICV7VkVSU0lPTn0gJXtSRUxF QVNFfT8/IiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAiLS1zcGVjZmlsZSIsICIlcyIgJSBv cy5wYXRoLmpvaW4odG1wX3Jvb3QsIHNlbGYuc3BlYyldKQotKyAgICAgICAgIyBlc2NhcGUgd2hv bGUgJ3JwbScgY29tbWFuZCBiZWNhdXNlIGl0IHdpbGwgYmUgZXhlY3V0ZWQgdW5kZXIgbW9jayBj b21tYW5kCi0rICAgICAgICBycG1fY21kID0gW3NobGV4LnF1b3RlKGl0ZW0pIGZvciBpdGVtIGlu IHJwbV9jbWRdCi0gICAgICAgICBtYWluX2NtZCA9IGNtZCArIFsnLS1zaGVsbCddICsgcnBtX2Nt ZCBcCi0gICAgICAgICAgICAgKyBbJz4gJyArIG9zLnBhdGguam9pbih0bXBfcm9vdCwgJ291dHB1 dCcpXQotIAotLS0gCi0yLjM3LjMKLQoKZGlmZiAtLWdpdCBhL3Jwa2cuc3BlYyBiL3Jwa2cuc3Bl YwppbmRleCBiNmYxNTU4Li4yZGUyZjQ3IDEwMDY0NAotLS0gYS9ycGtnLnNwZWMKKysrIGIvcnBr Zy5zcGVjCkBAIC0xLDYgKzEsNiBAQAogTmFtZTogICAgICAgICAgIHJwa2cKLVZlcnNpb246ICAg ICAgICAxLjY1Ci1SZWxlYXNlOiAgICAgICAgMyV7P2Rpc3R9CitWZXJzaW9uOiAgICAgICAgMS42 NgorUmVsZWFzZTogICAgICAgIDElez9kaXN0fQogCiBTdW1tYXJ5OiAgICAgICAgUHl0aG9uIGxp YnJhcnkgZm9yIGludGVyYWN0aW5nIHdpdGggcnBtK2dpdAogTGljZW5zZTogICAgICAgIEdQTHYy KyBhbmQgTEdQTHYyCkBAIC0zNyw5ICszNyw2IEBAIFBhdGNoMjogICAgICAgICAwMDAyLVJlbW92 ZS1weXRlc3QtY292ZXJhZ2UtZXhlY3V0aW9uLnBhdGNoCiAlaWYgMCV7P3dpdGhfcHl0aG9uMn0K IFBhdGNoMzogICAgICAgICAwMDAzLVJlbW92ZS1FbnZpcm9ubWVudC1NYXJrZXJzLXN5bnRheC5w YXRjaAogJWVuZGlmCi1QYXRjaDQ6ICAgICAgICAgMDAwNC1mZWRwa2ctbG9jYWwtZG9lcy1ub3Qt c2hvdy1ycG1idWlsZC1vdXRwdXQucGF0Y2gKLVBhdGNoNTogICAgICAgICAwMDA1LUZpeGVzLWZv ci1leHBsb2RlZC1TUlBNLWxheW91dHMucGF0Y2gKLVBhdGNoNjogICAgICAgICAwMDA2LW1vY2ti dWlsZC1lc2NhcGUtcnBtLWNvbW1hbmQtdW5kZXItbW9jay5wYXRjaAogCiAlZGVzY3JpcHRpb24K IFB5dGhvbiBsaWJyYXJ5IGZvciBpbnRlcmFjdGluZyB3aXRoIHJwbStnaXQKQEAgLTU0LDYgKzUx LDcgQEAgQnVpbGRSZXF1aXJlczogIHB5dGhvbjItZGV2ZWwKIAogIyBXZSBiciB0aGVzZSB0aGlu Z3MgZm9yIG1hbiBwYWdlIGdlbmVyYXRpb24gZHVlIHRvIGltcG9ydHMKIEJ1aWxkUmVxdWlyZXM6 ICBycG1saW50CitCdWlsZFJlcXVpcmVzOiAgcnBtZGV2dG9vbHMKIEJ1aWxkUmVxdWlyZXM6ICBw eXRob24yLWtvamkgPj0gMS4yMQogQnVpbGRSZXF1aXJlczogIHB5dGhvbjItY2Njb2x1dGlscwog QnVpbGRSZXF1aXJlczogIFB5WUFNTApAQCAtNzEsNiArNjksNyBAQCBSZXF1aXJlczogICAgICAg bW9jawogUmVxdWlyZXM6ICAgICAgIHJlZGhhdC1ycG0tY29uZmlnCiBSZXF1aXJlczogICAgICAg cnBtLWJ1aWxkCiBSZXF1aXJlczogICAgICAgcnBtbGludAorUmVxdWlyZXM6ICAgICAgIHJwbWRl dnRvb2xzCiBSZXF1aXJlczogICAgICAgcHl0aG9uMi1hcmdjb21wbGV0ZQogUmVxdWlyZXM6ICAg ICAgIHB5dGhvbjItY2Njb2x1dGlscwogUmVxdWlyZXM6ICAgICAgIHB5dGhvbjIta29qaSA+PSAx LjIxCkBAIC0xMjcsMTEgKzEyNiwxMyBAQCBCdWlsZFJlcXVpcmVzOiAgcHl0aG9uMy1zZXR1cHRv b2xzCiBCdWlsZFJlcXVpcmVzOiAgcHl0aG9uMy1weXRlc3QKIEJ1aWxkUmVxdWlyZXM6ICBweXRo b24zLVB5WUFNTAogQnVpbGRSZXF1aXJlczogIHJwbWxpbnQKK0J1aWxkUmVxdWlyZXM6ICBycG1k ZXZ0b29scwogCiBSZXF1aXJlczogICAgICAgbW9jawogUmVxdWlyZXM6ICAgICAgIHJlZGhhdC1y cG0tY29uZmlnCiBSZXF1aXJlczogICAgICAgcnBtLWJ1aWxkCiBSZXF1aXJlczogICAgICAgcnBt bGludAorUmVxdWlyZXM6ICAgICAgIHJwbWRldnRvb2xzCiAKIFJlcXVpcmVzOiAgICAgICBweXRo b24zLWFyZ2NvbXBsZXRlCiBSZXF1aXJlczogICAgICAgcHl0aG9uMy1HaXRQeXRob24gPj0gMC4y LjAKQEAgLTI1Miw2ICsyNTMsMzAgQEAgZXhhbXBsZV9jbGlfZGlyPSRSUE1fQlVJTERfUk9PVCV7 X2RhdGFkaXJ9LyV7bmFtZX0vZXhhbXBsZXMvY2xpCiAKIAogJWNoYW5nZWxvZworKiBNb24gRmVi IDIwIDIwMjMgT25kxZllaiBOb3NlayA8b25vc2VrQHJlZGhhdC5jb20+IC0gMS42Ni0xCistIGNv bnRhaW5lci1idWlsZDogZG9jdW1lbnQgLS1jb21wb3NlLWlkcyBvdmVycmlkZXMgYW55IG5ldyBj b21wb3NlcyAoa2RyZXllcikKKy0gVXNlIHNycG0gd2hlbiBzY3JhdGNoLWJ1aWxkaW5nIGZyb20g ZGlydHkgcmVwbyAtICM2NTIgKG90dG8ubGlsamFsYWFrc28pCistIENvZGUgY2xlYW51cCBpbiB0 ZXN0cy90ZXN0X2NsaS5weSAob3R0by5saWxqYWxhYWtzbykKKy0gUmVkdWNlIGluZGVudGF0aW9u IGluIGFzc2VydF9idWlsZCBoZWxwZXIgKG90dG8ubGlsamFsYWFrc28pCistIEFsbG93IGVtcHR5 IGNvbW1pdHMgLSA0OTQgKG1zdWNoeSkKKy0gQWxsb3cgZm9yY2luZyBkb3dubG9hZCBvZiBhbGwg c291cmNlcyAtICM2NTAgKG90dG8ubGlsamFsYWFrc28pCistIEFkZCB0ZXN0IGNhc2UgZm9yIG5v dCBkb3dubG9hZGluZyB1bnVzZWQgc291cmNlcyAob3R0by5saWxqYWxhYWtzbykKKy0gU3VwcG9y dCAncmVzdWx0c19kaXI9c3ViZGlyJyB3aGVuIGJ1aWxkaW5nIGZyb20gc3JwbSAtICM2NDgKKyAg KG90dG8ubGlsamFsYWFrc28pCistIFVzZSBsb2NhbCBicmFuY2ggbmFtZSBhcyByZWxlYXNlIHdo ZW4gdGhlcmUgaXMgbm8gcmVtb3RlIChvdHRvLmxpbGphbGFha3NvKQorLSBBbGxvdyBkb3duc3Ry ZWFtcyB0byBkZWZpbmUgYSBkZWZhdWx0IHJlbGVhc2UgKG90dG8ubGlsamFsYWFrc28pCistIFN3 aXRjaCBsb2FkX2JyYW5jaF9tZXJnZSB0byB1c2UgbXVsdGlwbGUgcmV0dXJuIChvdHRvLmxpbGph bGFha3NvKQorLSBVbml0dGVzdHMgZm9yICdnaXQgcHVzaCcgaG9vayBzY3JpcHQgKG9ub3NlaykK Ky0gQ2hlY2tpbmcgYSByZXBvIGNvbmZpZ3VyYXRpb24gYmVmb3JlICdnaXQgcHVzaCcgd2l0aCBh IGdpdCBob29rIHNjcmlwdCAtIDQ5MQorICAob25vc2VrKQorLSBGaXggc2tpcHBpbmcgTlZSIGNo ZWNrIHdpdGggYXV0b3JlbGVhc2UgKG5pbHMpCistIHB5cnBrZy5zcGVjLlNwZWNGaWxlOiBNb3Jl IGxlbmllbnQgcGFyc2VyIGZvciBTb3VyY2UvUGF0Y2ggbGluZXMgKGZ3ZWltZXIpCistIEZpeCBV UkwgaW4gQ0hBTkdFTE9HLnJzdCAodG16KQorLSBBZGQgSmVua2luc2ZpbGUgZm9yIENJIChvbm9z ZWspCistIG1vY2tidWlsZDogZXNjYXBlIHJwbSBjb21tYW5kIHVuZGVyIG1vY2sgLSByaGJ6IzIx MzAzNDkgKG9ub3NlaykKKy0gRml4ZXMgZm9yIGV4cGxvZGVkIFNSUE0gbGF5b3V0cyAtICM2MzMg KHRkYXdzb24pCistIGBmZWRwa2cgbG9jYWxgIGRvZXMgbm90IHNob3cgcnBtYnVpbGQgb3V0cHV0 IC0gcmhieiMyMTI0ODA5IChvbm9zZWspCisKICogTW9uIE9jdCAxMCAyMDIyIE9uZMWZZWogTm9z ZWsgPG9ub3Nla0ByZWRoYXQuY29tPiAtIDEuNjUtMwogLSBQYXRjaDogRml4ZXMgZm9yIGV4cGxv ZGVkIFNSUE0gbGF5b3V0cwogLSBQYXRjaDogbW9ja2J1aWxkOiBlc2NhcGUgcnBtIGNvbW1hbmQg dW5kZXIgbW9jawoKZGlmZiAtLWdpdCBhL3NvdXJjZXMgYi9zb3VyY2VzCmluZGV4IDc4ZGMyNzUu LmQ5OGIzZjkgMTAwNjQ0Ci0tLSBhL3NvdXJjZXMKKysrIGIvc291cmNlcwpAQCAtMSArMSBAQAot U0hBNTEyIChycGtnLTEuNjUudGFyLmd6KSA9IDZmOGI1YjBiMDc1YjBmNDJmZmE0ZjE0NTZjMWE2 YWI5ZTNlZmYxYzBiYmE4OWE5YmFkZWU0N2UyMjY3MDkyOGUxYzI3NjkxNDdiMjZhZWRlM2Q3OWUx N2RmNzgzMzQ0ZTNiNjgxZDY4NGRjOGQwMTFjNzdkNDM5Y2JkM2UyYjY1CitTSEE1MTIgKHJwa2ct MS42Ni50YXIuZ3opID0gMTRhNjk0NzE0NmNkNWE4ZjliYWEyZDNmYmEwYTM3YmIwZDdhYjViZDY5 ZTI5YzA0MjgyYzg4MmUxZjI0OTgzMWM4ZmFmNDQzZDRkZDk0YWRmZTFiZjM4NWY2NTI1Y2VmZWY4 NGIxMGQ0NGEzOTQ5ZDgxNWZkMjkzZDVmNWZjY2MK