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: A few patches mostly for `pre-push-check` Date: Mon, 10 Aug 2026 21:44:34 GMT Message-ID: <178639827417.1.8973643159217975930.rpms-rpkg-2f3c6a1fcb58@fedoraproject.org> List-ID: X-Git-Repo: rpms/rpkg X-Git-Branch: 1.70-1 X-Git-Rev: 2f3c6a1fcb5892acc0800ba14b0798f6bd545979 ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvcnBrZwogICAgICAgICAgICBCcmFuY2ggOiAxLjcwLTEKICAgICAgICAgICAg Q29tbWl0IDogMmYzYzZhMWZjYjU4OTJhY2MwODAwYmExNGIwNzk4ZjZiZDU0NTk3OQogICAgICAg ICAgICBBdXRob3IgOiBPbmTFmWVqIE5vc2VrIDxvbm9zZWtAcmVkaGF0LmNvbT4KICAgICAgICAg ICAgRGF0ZSAgIDogMjAyMy0wNC0xOFQyMDoxMTozNSswMDowMAogICAgICAgICAgICBTdGF0cyAg OiArNDI0Ly0xIGluIDcgZmlsZShzKQogICAgICAgICAgICBVUkwgICAgOiBodHRwczovL3NyYy5m ZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL3Jwa2cvYy8yZjNjNmExZmNiNTg5MmFjYzA4MDBiYTE0YjA3 OThmNmJkNTQ1OTc5P2JyYW5jaD0xLjcwLTEKCiAgICAgICAgICAgIExvZzoKICAgICAgICAgICAg QSBmZXcgcGF0Y2hlcyBtb3N0bHkgZm9yIGBwcmUtcHVzaC1jaGVja2AKCi0gUGF0Y2g6IFByZS1w dXNoIGhvb2sgd29uJ3QgY2hlY2sgcHJpdmF0ZSBicmFuY2hlcwotIFBhdGNoOiBDb25maWcgZmls ZSBvcHRpb24gdG8gc2tpcCB0aGUgaG9vayBzY3JpcHQgY3JlYXRpb24KLSBQYXRjaDogQWxsb3cg ZW1wdHkgY29tbWl0cyB3aGVuIGB1c2VzX3JwbWF1dG9zcGVjYAotIFBhdGNoOiBDaGVjayByZW1v dGUgZmlsZSB3aXRoIGNvcnJlY3QgaGFzaAotIFBhdGNoOiBJZ25vcmUgbWlzc2luZyBzcGVjIGZp bGUgaW4gcHJlLXB1c2ggaG9vawotIFBhdGNoOiBpbXBvcnRfc3JwbTogYWxsb3cgcHJlLWdlbmVy YXRlZCBzcnBtcwoKU2lnbmVkLW9mZi1ieTogT25kxZllaiBOb3NlayA8b25vc2VrQHJlZGhhdC5j b20+CgotLS0KZGlmZiAtLWdpdCBhLzAwMTQtaW1wb3J0X3NycG0tYWxsb3ctcHJlLWdlbmVyYXRl ZC1zcnBtcy5wYXRjaCBiLzAwMTQtaW1wb3J0X3NycG0tYWxsb3ctcHJlLWdlbmVyYXRlZC1zcnBt cy5wYXRjaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mNTk2MjY1Ci0tLSAv ZGV2L251bGwKKysrIGIvMDAxNC1pbXBvcnRfc3JwbS1hbGxvdy1wcmUtZ2VuZXJhdGVkLXNycG1z LnBhdGNoCkBAIC0wLDAgKzEsMTA1IEBACitGcm9tIGQ4N2NiMzdmYTJmZWEyZWQ1MzViOTA4NWEx ZjRjNjA3MDgzZTFjMmUgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiBPbmRyZWogTm9z ZWsgPG9ub3Nla0ByZWRoYXQuY29tPgorRGF0ZTogVHVlLCA0IEFwciAyMDIzIDAxOjQwOjIzICsw MjAwCitTdWJqZWN0OiBbUEFUQ0ggMS82XSBpbXBvcnRfc3JwbTogYWxsb3cgcHJlLWdlbmVyYXRl ZCBzcnBtcworCitXaGVuIGFjdGl2ZSwgZG8gbm90IGNhcmUgc3BlY2ZpbGUgaW4gdGhlIHNycG0g aXMgcHJvY2Vzc2VkIGJ5CitycG1hdXRvc3BlYy4gQ2FuIGJlIGFjdGl2YXRlZCBvbmx5IGRpcmVj dGx5IHZpYSBweXJwa2cgJ0NvbW1hbmRzJworb2JqZWN0LgorCitSZWxhdGVzOiBodHRwczovL2dp dGh1Yi5jb20vZmVkb3JhLWNvcHIvY29wci9pc3N1ZXMvMjMxNworRml4ZXM6ICM2NTUKK1JIRUxD TVAtMTEwODUKKworU2lnbmVkLW9mZi1ieTogT25kcmVqIE5vc2VrIDxvbm9zZWtAcmVkaGF0LmNv bT4KKy0tLQorIHB5cnBrZy9fX2luaXRfXy5weSB8ICA2ICsrKysrLQorIHRlc3RzL3Rlc3RfY2xp LnB5ICB8IDQxICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCisgMiBm aWxlcyBjaGFuZ2VkLCA0NiBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCisKK2RpZmYgLS1n aXQgYS9weXJwa2cvX19pbml0X18ucHkgYi9weXJwa2cvX19pbml0X18ucHkKK2luZGV4IDk5OTY0 MDIuLmVjYjk5YzkgMTAwNjQ0CistLS0gYS9weXJwa2cvX19pbml0X18ucHkKKysrKyBiL3B5cnBr Zy9fX2luaXRfXy5weQorQEAgLTExMCw3ICsxMTAsNyBAQCBjbGFzcyBDb21tYW5kcyhvYmplY3Qp OgorICAgICAgICAgICAgICAgICAgYnVpbGRfY2xpZW50LCB1c2VyPU5vbmUsCisgICAgICAgICAg ICAgICAgICBkaXN0PU5vbmUsIHRhcmdldD1Ob25lLCBxdWlldD1GYWxzZSwKKyAgICAgICAgICAg ICAgICAgIGRpc3RnaXRfbmFtZXNwYWNlZD1GYWxzZSwgcmVhbG1zPU5vbmUsIGxvb2thc2lkZV9u YW1lc3BhY2VkPUZhbHNlLAorLSAgICAgICAgICAgICAgICAgZ2l0X2V4Y2x1ZGVzPU5vbmUsIHJl c3VsdHNfZGlyPSdyb290Jyk6CisrICAgICAgICAgICAgICAgICBnaXRfZXhjbHVkZXM9Tm9uZSwg cmVzdWx0c19kaXI9J3Jvb3QnLCBhbGxvd19wcmVfZ2VuZXJhdGVkX3NycG09RmFsc2UpOgorICAg ICAgICAgIiIiSW5pdCB0aGUgb2JqZWN0IGFuZCBzb21lIGNvbmZpZ3VyYXRpb24gZGV0YWlscy4i IiIKKyAKKyAgICAgICAgICMgUGF0aCB0byBvcGVyYXRlIG9uLCBtb3N0IG9mdGVuIHB3ZAorQEAg LTIzOSw2ICsyMzksOSBAQCBjbGFzcyBDb21tYW5kcyhvYmplY3QpOgorICAgICAgICAgIyBMYXlv dXQgc2V0dXAKKyAgICAgICAgIHNlbGYubGF5b3V0ID0gbGF5b3V0LmJ1aWxkKHNlbGYucGF0aCwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdyZXN1bHRzZGlyJyBpZiBzZWxm LnJlc3VsdHNfZGlyID09ICdzdWJkaXInIGVsc2UgTm9uZSkKKysgICAgICAgICMgQSBDb25maWd1 cmF0aW9uIHZhbHVlIHVzZWQgaW4gJ2ltcG9ydF9zcnBtJyBjb21tYW5kIChjb21lcyBmcm9tIHRo ZSBDb3ByIHRlYW0pCisrICAgICAgICAjIElmIHByZS1nZW5lcmF0ZWQgc3JwbXMgYXJlIGFsbG93 ZWQsIGRvbid0IGNhcmUgc3BlY2ZpbGUgaXMgcHJvY2Vzc2VkIGJ5IHJwbWF1dG9zcGVjCisrICAg ICAgICBzZWxmLmFsbG93X3ByZV9nZW5lcmF0ZWRfc3JwbSA9IGFsbG93X3ByZV9nZW5lcmF0ZWRf c3JwbQorIAorICAgICAjIERlZmluZSBwcm9wZXJ0aWVzIGhlcmUKKyAgICAgIyBQcm9wZXJ0aWVz IGFsbG93IHVzIHRvICJsYXp5IGxvYWQiIHZhcmlvdXMgYXR0cmlidXRlcywgd2hpY2ggYWxzbyBt ZWFucworQEAgLTE0NzEsNiArMTQ3NCw3IEBAIGNsYXNzIENvbW1hbmRzKG9iamVjdCk6CisgICAg ICAgICAgICAgICAgICMgdGhlIGRpc3QtZ2l0IHJlcG8gd2l0aG91dCBhbnkgc3BlY2ZpbGVzIC0g cmlnaHQgYWZ0ZXIgaW5pdGlhbGl6YXRpb24pIHdlIGFyZQorICAgICAgICAgICAgICAgICAjIG5v dCBhYmxlIGRldGVybWluZSB3aGljaCB0aGUgbWFpbiBzcGVjZmlsZSBpcy4KKyAgICAgICAgICAg ICAgICAgaWYgZmlsZS5lbmRzd2l0aCgnLnNwZWMnKSBhbmQgbm90IGZpbGUuc3RhcnRzd2l0aCgn LicpIFwKKysgICAgICAgICAgICAgICAgICAgICAgICBhbmQgbm90IHNlbGYuYWxsb3dfcHJlX2dl bmVyYXRlZF9zcnBtIFwKKyAgICAgICAgICAgICAgICAgICAgICAgICBhbmQgc3BlY19maWxlX3By b2Nlc3NlZF9ieV9ycG1hdXRvc3BlYyhmaWxlLCB0YXJnZXRfZGlyKToKKyAgICAgICAgICAgICAg ICAgICAgIHJhaXNlIHJwa2dFcnJvcignU1JQTSB3YXMgcHJvY2Vzc2VkIGJ5IHJwbWF1dG9zcGVj ICcKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnKHNwZWNmaWxlICJ7fSIg d2FzIGFuYWx5emVkKScuZm9ybWF0KGZpbGUpKQorZGlmZiAtLWdpdCBhL3Rlc3RzL3Rlc3RfY2xp LnB5IGIvdGVzdHMvdGVzdF9jbGkucHkKK2luZGV4IDg2OGFkMWYuLjAyNjIwZWYgMTAwNjQ0Cist LS0gYS90ZXN0cy90ZXN0X2NsaS5weQorKysrIGIvdGVzdHMvdGVzdF9jbGkucHkKK0BAIC0xNzg0 LDYgKzE3ODQsNDcgQEAgY2xhc3MgVGVzdEltcG9ydFNycG0oTG9va2FzaWRlQ2FjaGVNb2NrLCBD bGlUZXN0Q2FzZSk6CisgICAgICAgICBzZWxmLmFzc2VydEZpbGVzRXhpc3QoWydwYWNrYWdlLnJw bWxpbnRyYyddLCBzZWFyY2hfZGlyPXNlbGYuY2hhb3NfcmVwbykKKyAgICAgICAgIHNlbGYuYXNz ZXJ0RmlsZXNOb3RFeGlzdChbJ3RoZV9maWxlX2lzX25vdF9pbl9yZXNlcnZlZC55YW1sJ10sIHNl YXJjaF9kaXI9c2VsZi5jaGFvc19yZXBvKQorIAorKyAgICBAcGF0Y2goJ3B5cnBrZy5zcGVjX2Zp bGVfcHJvY2Vzc2VkX2J5X3JwbWF1dG9zcGVjJykKKysgICAgZGVmIHRlc3RfaW1wb3J0X3NycG1f bm90X3Byb2Nlc3NlZF9ieV9ycG1hdXRvc3BlYyhzZWxmLCBycG1hdXRvc3BlY19wcm9jZXNzZWQp OgorKyAgICAgICAgY2xpX2NtZCA9IFsncnBrZycsICctLXBhdGgnLCBzZWxmLmNoYW9zX3JlcG8s ICctLW5hbWUnLCAnZG9jcGtnJywKKysgICAgICAgICAgICAgICAgICAgJ2ltcG9ydCcsICctLXNr aXAtZGlmZnMnLCBzZWxmLnNycG1fZmlsZV0KKysKKysgICAgICAgIHJwbWF1dG9zcGVjX3Byb2Nl c3NlZC5yZXR1cm5fdmFsdWUgPSBGYWxzZQorKyAgICAgICAgd2l0aCBwYXRjaCgnc3lzLmFyZ3Yn LCBuZXc9Y2xpX2NtZCk6CisrICAgICAgICAgICAgY2xpID0gc2VsZi5uZXdfY2xpKCkKKysgICAg ICAgICAgICB3aXRoIHBhdGNoKCdweXJwa2cubG9va2FzaWRlLkNHSUxvb2thc2lkZUNhY2hlLnVw bG9hZCcsIHNlbGYubG9va2FzaWRlY2FjaGVfdXBsb2FkKToKKysgICAgICAgICAgICAgICAgY2xp LmltcG9ydF9zcnBtKCkgICMgbm8gZXhjZXB0aW9uIHNob3VsZCBiZSByYWlzZWQKKysgICAgICAg ICAgICBycG1hdXRvc3BlY19wcm9jZXNzZWQuYXNzZXJ0X2NhbGxlZF9vbmNlKCkKKysKKysgICAg QHBhdGNoKCdweXJwa2cuc3BlY19maWxlX3Byb2Nlc3NlZF9ieV9ycG1hdXRvc3BlYycpCisrICAg IGRlZiB0ZXN0X2ltcG9ydF9zcnBtX3Byb2Nlc3NlZF9ieV9ycG1hdXRvc3BlYyhzZWxmLCBycG1h dXRvc3BlY19wcm9jZXNzZWQpOgorKyAgICAgICAgY2xpX2NtZCA9IFsncnBrZycsICctLXBhdGgn LCBzZWxmLmNoYW9zX3JlcG8sICctLW5hbWUnLCAnZG9jcGtnJywKKysgICAgICAgICAgICAgICAg ICAgJ2ltcG9ydCcsICctLXNraXAtZGlmZnMnLCBzZWxmLnNycG1fZmlsZV0KKysKKysgICAgICAg IHJwbWF1dG9zcGVjX3Byb2Nlc3NlZC5yZXR1cm5fdmFsdWUgPSBUcnVlCisrICAgICAgICB3aXRo IHBhdGNoKCdzeXMuYXJndicsIG5ldz1jbGlfY21kKToKKysgICAgICAgICAgICBjbGkgPSBzZWxm Lm5ld19jbGkoKQorKyAgICAgICAgICAgIHdpdGggcGF0Y2goJ3B5cnBrZy5sb29rYXNpZGUuQ0dJ TG9va2FzaWRlQ2FjaGUudXBsb2FkJywgc2VsZi5sb29rYXNpZGVjYWNoZV91cGxvYWQpOgorKyAg ICAgICAgICAgICAgICBzaXguYXNzZXJ0UmFpc2VzUmVnZXgoCisrICAgICAgICAgICAgICAgICAg ICBzZWxmLAorKyAgICAgICAgICAgICAgICAgICAgcnBrZ0Vycm9yLAorKyAgICAgICAgICAgICAg ICAgICAgJ1NSUE0gd2FzIHByb2Nlc3NlZCBieSBycG1hdXRvc3BlYycsCisrICAgICAgICAgICAg ICAgICAgICBjbGkuaW1wb3J0X3NycG0pCisrICAgICAgICAgICAgcnBtYXV0b3NwZWNfcHJvY2Vz c2VkLmFzc2VydF9jYWxsZWRfb25jZSgpCisrCisrICAgIEBwYXRjaCgncHlycGtnLnNwZWNfZmls ZV9wcm9jZXNzZWRfYnlfcnBtYXV0b3NwZWMnKQorKyAgICBkZWYgdGVzdF9pbXBvcnRfc3JwbV9w cm9jZXNzZWRfYnlfcnBtYXV0b3NwZWNfYWxsb3dlZChzZWxmLCBycG1hdXRvc3BlY19wcm9jZXNz ZWQpOgorKyAgICAgICAgY2xpX2NtZCA9IFsncnBrZycsICctLXBhdGgnLCBzZWxmLmNoYW9zX3Jl cG8sICctLW5hbWUnLCAnZG9jcGtnJywKKysgICAgICAgICAgICAgICAgICAgJ2ltcG9ydCcsICct LXNraXAtZGlmZnMnLCBzZWxmLnNycG1fZmlsZV0KKysKKysgICAgICAgIHJwbWF1dG9zcGVjX3By b2Nlc3NlZC5yZXR1cm5fdmFsdWUgPSBUcnVlCisrICAgICAgICB3aXRoIHBhdGNoKCdzeXMuYXJn dicsIG5ldz1jbGlfY21kKToKKysgICAgICAgICAgICBjbGkgPSBzZWxmLm5ld19jbGkoKQorKyAg ICAgICAgICAgIGNsaS5jbWQuYWxsb3dfcHJlX2dlbmVyYXRlZF9zcnBtID0gVHJ1ZQorKyAgICAg ICAgICAgIHdpdGggcGF0Y2goJ3B5cnBrZy5sb29rYXNpZGUuQ0dJTG9va2FzaWRlQ2FjaGUudXBs b2FkJywgc2VsZi5sb29rYXNpZGVjYWNoZV91cGxvYWQpOgorKyAgICAgICAgICAgICAgICBjbGku aW1wb3J0X3NycG0oKSAgIyBubyBleGNlcHRpb24gc2hvdWxkIGJlIHJhaXNlZAorKyAgICAgICAg ICAgIHJwbWF1dG9zcGVjX3Byb2Nlc3NlZC5hc3NlcnRfbm90X2NhbGxlZCgpCisrCisgCisgY2xh c3MgVGVzdE1vY2tidWlsZChDbGlUZXN0Q2FzZSk6CisgICAgICIiIlRlc3QgbW9ja2J1aWxkIGNv bW1hbmQiIiIKKy0tIAorMi4zOS4yCisKCmRpZmYgLS1naXQgYS8wMDE1LUlnbm9yZS1taXNzaW5n LXNwZWMtZmlsZS1pbi1wcmUtcHVzaC1ob29rLnBhdGNoIGIvMDAxNS1JZ25vcmUtbWlzc2luZy1z cGVjLWZpbGUtaW4tcHJlLXB1c2gtaG9vay5wYXRjaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwLi5iMzI4MzNjCi0tLSAvZGV2L251bGwKKysrIGIvMDAxNS1JZ25vcmUtbWlzc2lu Zy1zcGVjLWZpbGUtaW4tcHJlLXB1c2gtaG9vay5wYXRjaApAQCAtMCwwICsxLDM3IEBACitGcm9t IDNlYmZlYWUyMGM3NGRlMGNhNGIyNmIyMjEzNWUxOTk2MjY1ZWE0Y2UgTW9uIFNlcCAxNyAwMDow MDowMCAyMDAxCitGcm9tOiA9P1VURi04P3E/THVib209QzM9QURyPTIwU2VkbD1DMz1BMT1DNT05 OT89IDxsc2VkbGFyQHJlZGhhdC5jb20+CitEYXRlOiBXZWQsIDUgQXByIDIwMjMgMTE6NDE6MjMg KzAyMDAKK1N1YmplY3Q6IFtQQVRDSCAyLzZdIElnbm9yZSBtaXNzaW5nIHNwZWMgZmlsZSBpbiBw cmUtcHVzaCBob29rCitNSU1FLVZlcnNpb246IDEuMAorQ29udGVudC1UeXBlOiB0ZXh0L3BsYWlu OyBjaGFyc2V0PVVURi04CitDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiA4Yml0CisKK0ZvciBt b2R1bGVzIG9yIGNvbnRhaW5lcnMgdGhlcmUgd2lsbCBiZSBubyBzcGVjIGZpbGUsIGFuZCB0aGVy ZSBpcworbm90aGluZyB0byBibG9jayB0aGUgcHVzaCBvbi4KKworU2lnbmVkLW9mZi1ieTogTHVi b23DrXIgU2VkbMOhxZkgPGxzZWRsYXJAcmVkaGF0LmNvbT4KKy0tLQorIHB5cnBrZy9fX2luaXRf Xy5weSB8IDcgKysrKysrLQorIDEgZmlsZSBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDEgZGVs ZXRpb24oLSkKKworZGlmZiAtLWdpdCBhL3B5cnBrZy9fX2luaXRfXy5weSBiL3B5cnBrZy9fX2lu aXRfXy5weQoraW5kZXggZWNiOTljOS4uZDNhN2ExYyAxMDA2NDQKKy0tLSBhL3B5cnBrZy9fX2lu aXRfXy5weQorKysrIGIvcHlycGtnL19faW5pdF9fLnB5CitAQCAtNDQ3MSw3ICs0NDcxLDEyIEBA IGNsYXNzIENvbW1hbmRzKG9iamVjdCk6CisgICAgICAgICAgICAgIyBBc3N1bWUsIHRoYXQgc3Bl Y2ZpbGUgbmFtZXMgYXJlIHNhbWUgaW4gdGhlIGFjdGl2ZSBicmFuY2gKKyAgICAgICAgICAgICAj IGFuZCBpbiB0aGUgcHVzaGVkIGJyYW5jaCAoZ2l0IGNoZWNrb3V0IGYzNyAmJiBnaXQgcHVzaCBv cmlnaW4gcmF3aGlkZSkKKyAgICAgICAgICAgICAjIGluIHRoaXMgY2FzZSAnZjM3JyBpcyBhY3Rp dmUgYnJhbmNoIGFuZCAncmF3aGlkZScgaXMgcHVzaGVkIGJyYW5jaC4KKy0gICAgICAgICAgICBz cGVjZmlsZV9wYXRoX2Fic29sdXRlID0gb3MucGF0aC5qb2luKHNlbGYubGF5b3V0LnNwZWNkaXIs IHNlbGYuc3BlYykKKysgICAgICAgICAgICB0cnk6CisrICAgICAgICAgICAgICAgIHNwZWNmaWxl X3BhdGhfYWJzb2x1dGUgPSBvcy5wYXRoLmpvaW4oc2VsZi5sYXlvdXQuc3BlY2Rpciwgc2VsZi5z cGVjKQorKyAgICAgICAgICAgIGV4Y2VwdCBycGtnRXJyb3I6CisrICAgICAgICAgICAgICAgICMg Tm8gc3BlY2ZpbGUgZm91bmQsIG5vdGhpbmcgdG8gY2hlY2sKKysgICAgICAgICAgICAgICAgcmV0 dXJuCisrCisgICAgICAgICAgICAgIyBjb252ZXJ0IHRvIHJlbGF0aXZlIHBhdGgKKyAgICAgICAg ICAgICBzcGVjZmlsZV9wYXRoID0gb3MucGF0aC5yZWxwYXRoKHNwZWNmaWxlX3BhdGhfYWJzb2x1 dGUsIHN0YXJ0PXNlbGYucGF0aCkKKyAgICAgICAgICAgICBjbWQgPSBbJ3NwZWN0b29sJywgJy1s Jywgb3MucGF0aC5qb2luKGNsb25lX2Rpciwgc3BlY2ZpbGVfcGF0aCldCistLSAKKzIuMzkuMgor CgpkaWZmIC0tZ2l0IGEvMDAxNi1DaGVjay1yZW1vdGUtZmlsZS13aXRoLWNvcnJlY3QtaGFzaC5w YXRjaCBiLzAwMTYtQ2hlY2stcmVtb3RlLWZpbGUtd2l0aC1jb3JyZWN0LWhhc2gucGF0Y2gKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOWJmOWVhYwotLS0gL2Rldi9udWxsCisr KyBiLzAwMTYtQ2hlY2stcmVtb3RlLWZpbGUtd2l0aC1jb3JyZWN0LWhhc2gucGF0Y2gKQEAgLTAs MCArMSw2MSBAQAorRnJvbSA0YmQ0YWIxODIzYTdkNGJjMjE4YjgwNTdiN2YwMDgwOGZhYmY3NjQ4 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTogPT9VVEYtOD9xP0x1Ym9tPUMzPUFEcj0y MFNlZGw9QzM9QTE9QzU9OTk/PSA8bHNlZGxhckByZWRoYXQuY29tPgorRGF0ZTogV2VkLCA1IEFw ciAyMDIzIDA5OjM0OjMzICswMjAwCitTdWJqZWN0OiBbUEFUQ0ggMy82XSBDaGVjayByZW1vdGUg ZmlsZSB3aXRoIGNvcnJlY3QgaGFzaAorTUlNRS1WZXJzaW9uOiAxLjAKK0NvbnRlbnQtVHlwZTog dGV4dC9wbGFpbjsgY2hhcnNldD1VVEYtOAorQ29udGVudC1UcmFuc2Zlci1FbmNvZGluZzogOGJp dAorCitUaGUgY29uZmlndXJlZCBoYXNodHlwZSBkb2Vzbid0IGhhdmUgdG8gYWN0dWFsbHkgYmUg dXNlZC4gVGhlcmUgY2FuIGJlCitvbGQgcmVwb3MgdGhhdCBzdGlsbCB1c2UgbWQ1LgorCitKSVJB OiBSSEVMQ01QLTExNTA4CitTaWduZWQtb2ZmLWJ5OiBMdWJvbcOtciBTZWRsw6HFmSA8bHNlZGxh ckByZWRoYXQuY29tPgorLS0tCisgcHlycGtnL19faW5pdF9fLnB5ICB8IDMgKystCisgcHlycGtn L2xvb2thc2lkZS5weSB8IDUgKysrLS0KKyAyIGZpbGVzIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygr KSwgMyBkZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBhL3B5cnBrZy9fX2luaXRfXy5weSBiL3B5 cnBrZy9fX2luaXRfXy5weQoraW5kZXggZDNhN2ExYy4uMGI5YTg2OSAxMDA2NDQKKy0tLSBhL3B5 cnBrZy9fX2luaXRfXy5weQorKysrIGIvcHlycGtnL19faW5pdF9fLnB5CitAQCAtNDU0OCw3ICs0 NTQ4LDggQEAgY2xhc3MgQ29tbWFuZHMob2JqZWN0KToKKyAgICAgICAgICAgICBmaWxlX2V4aXN0 c19pbl9sb29rYXNpZGUgPSBzZWxmLmxvb2thc2lkZWNhY2hlLnJlbW90ZV9maWxlX2V4aXN0c19o ZWFkKAorICAgICAgICAgICAgICAgICBzZWxmLm5zX3JlcG9fbmFtZSBpZiBzZWxmLmxvb2thc2lk ZV9uYW1lc3BhY2VkIGVsc2Ugc2VsZi5yZXBvX25hbWUsCisgICAgICAgICAgICAgICAgIGZpbGVu YW1lLAorLSAgICAgICAgICAgICAgICBoYXNoKQorKyAgICAgICAgICAgICAgICBoYXNoLAorKyAg ICAgICAgICAgICAgICBoYXNodHlwZT1lbnRyeS5oYXNodHlwZSkKKyAgICAgICAgICAgICBpZiBu b3QgZmlsZV9leGlzdHNfaW5fbG9va2FzaWRlOgorICAgICAgICAgICAgICAgICBzZWxmLmxvZy5l cnJvcignU291cmNlIGZpbGUgKG9yIHRhcmJhbGwpIFwne31cJyB3YXNuXCd0IHVwbG9hZGVkIHRv IHRoZSBsb29rYXNpZGUgJworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnY2FjaGUu IFB1c2ggb3BlcmF0aW9uIHdhcyBjYW5jZWxsZWQuJy5mb3JtYXQoZmlsZW5hbWUpKQorZGlmZiAt LWdpdCBhL3B5cnBrZy9sb29rYXNpZGUucHkgYi9weXJwa2cvbG9va2FzaWRlLnB5CitpbmRleCBl Y2JmMTJiLi4zZWZjZDg4IDEwMDY0NAorLS0tIGEvcHlycGtnL2xvb2thc2lkZS5weQorKysrIGIv cHlycGtnL2xvb2thc2lkZS5weQorQEAgLTIwMCw3ICsyMDAsNyBAQCBjbGFzcyBDR0lMb29rYXNp ZGVDYWNoZShvYmplY3QpOgorICAgICAgICAgaWYgbm90IHNlbGYuZmlsZV9pc192YWxpZChvdXRm aWxlLCBoYXNoLCBoYXNodHlwZT1oYXNodHlwZSk6CisgICAgICAgICAgICAgcmFpc2UgRG93bmxv YWRFcnJvcignJXMgZmFpbGVkIGNoZWNrc3VtJyAlIGZpbGVuYW1lKQorIAorLSAgICBkZWYgcmVt b3RlX2ZpbGVfZXhpc3RzX2hlYWQoc2VsZiwgbmFtZSwgZmlsZW5hbWUsIGhhc2gpOgorKyAgICBk ZWYgcmVtb3RlX2ZpbGVfZXhpc3RzX2hlYWQoc2VsZiwgbmFtZSwgZmlsZW5hbWUsIGhhc2gsIGhh c2h0eXBlKToKKyAgICAgICAgICIiIlZlcmlmeSB3aGV0aGVyIGEgZmlsZSBleGlzdHMgb24gdGhl IGxvb2thc2lkZSBjYWNoZS4KKyAgICAgICAgIFVzZXMgYSBIVFRQIEhFQUQgcmVxdWVzdCBhbmQg ZG9lc24ndCByZXF1aXJlIGF1dGhlbnRpY2F0aW9uLgorIAorQEAgLTIwOSwxMCArMjA5LDExIEBA IGNsYXNzIENHSUxvb2thc2lkZUNhY2hlKG9iamVjdCk6CisgICAgICAgICAgICAgdGhlIHNlcnZl ciBzaWRlIGV4cGVjdHMpLgorICAgICAgICAgOnBhcmFtIHN0ciBmaWxlbmFtZTogVGhlIG5hbWUg b2YgdGhlIGZpbGUgdG8gY2hlY2sgZm9yLgorICAgICAgICAgOnBhcmFtIHN0ciBoYXNoOiBUaGUg a25vd24gZ29vZCBoYXNoIG9mIHRoZSBmaWxlLgorKyAgICAgICAgOnBhcmFtIHN0ciBoYXNodHlw ZTogVGhlIHR5cGUgb2YgaGFzaAorICAgICAgICAgIiIiCisgCisgICAgICAgICB1cmxlZF9maWxl ID0gdXJsbGliLnBhcnNlLnF1b3RlKGZpbGVuYW1lKQorLSAgICAgICAgdXJsID0gc2VsZi5nZXRf ZG93bmxvYWRfdXJsKG5hbWUsIHVybGVkX2ZpbGUsIGhhc2gsIHNlbGYuaGFzaHR5cGUpCisrICAg ICAgICB1cmwgPSBzZWxmLmdldF9kb3dubG9hZF91cmwobmFtZSwgdXJsZWRfZmlsZSwgaGFzaCwg aGFzaHR5cGUgb3Igc2VsZi5oYXNodHlwZSkKKyAKKyAgICAgICAgIGMgPSBweWN1cmwuQ3VybCgp CisgICAgICAgICBjLnNldG9wdChweWN1cmwuVVJMLCB1cmwpCistLSAKKzIuMzkuMgorCgpkaWZm IC0tZ2l0IGEvMDAxNy1BbGxvdy1lbXB0eS1jb21taXRzLXdoZW4tdXNlc19ycG1hdXRvc3BlYy5w YXRjaCBiLzAwMTctQWxsb3ctZW1wdHktY29tbWl0cy13aGVuLXVzZXNfcnBtYXV0b3NwZWMucGF0 Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNDQ4Y2JjOQotLS0gL2Rldi9u dWxsCisrKyBiLzAwMTctQWxsb3ctZW1wdHktY29tbWl0cy13aGVuLXVzZXNfcnBtYXV0b3NwZWMu cGF0Y2gKQEAgLTAsMCArMSwzNSBAQAorRnJvbSBkMmM2M2MzMjMwNjczMjY5NWI3ZmU1ZjlkZGEz ZGVlY2I3ODk5ZjRmIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTogSmlyaSBLeWpvdnNr eSA8ajEua3lqb3Zza3lAZ21haWwuY29tPgorRGF0ZTogU2F0LCAxNSBBcHIgMjAyMyAxMzo0Njoy MSArMDIwMAorU3ViamVjdDogW1BBVENIIDQvNl0gQWxsb3cgZW1wdHkgY29tbWl0cyB3aGVuIGB1 c2VzX3JwbWF1dG9zcGVjYAorCitUbyBhdm9pZCBzaXR1YXRpb25zIHdoZXJlIHRoZSBjb21tYW5k IGBjb21taXRgIGJ5IGRlZmF1bHQgZG9lcworY29tbWl0IHdoZW4gbm8gY2hhbmdlIGluIHJlcG8g aXMgcHJlc2VudC4KKworRml4ZXM6ICM2NzcKK0pJUkE6IFJIRUxDTVAtMTE0ODkKK01lcmdlczog aHR0cHM6Ly9wYWd1cmUuaW8vcnBrZy9wdWxsLXJlcXVlc3QvNjg4CisKK1NpZ25lZC1vZmYtYnk6 IEppcmkgS3lqb3Zza3kgPGoxLmt5am92c2t5QGdtYWlsLmNvbT4KKy0tLQorIHB5cnBrZy9fX2lu aXRfXy5weSB8IDQgKysrLQorIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDEgZGVs ZXRpb24oLSkKKworZGlmZiAtLWdpdCBhL3B5cnBrZy9fX2luaXRfXy5weSBiL3B5cnBrZy9fX2lu aXRfXy5weQoraW5kZXggMGI5YTg2OS4uMTg3Nzk2ZSAxMDA2NDQKKy0tLSBhL3B5cnBrZy9fX2lu aXRfXy5weQorKysrIGIvcHlycGtnL19faW5pdF9fLnB5CitAQCAtMTg2Nyw3ICsxODY3LDkgQEAg Y2xhc3MgQ29tbWFuZHMob2JqZWN0KToKKyAKKyAgICAgICAgICMgY29uc3RydWN0IHRoZSBnaXQg Y29tbWFuZAorICAgICAgICAgIyBXZSBkbyB0aGlzIHZpYSBzdWJwcm9jZXNzIGJlY2F1c2UgdGhl IGdpdCBtb2R1bGUgaXMgdGVycmlibGUuCistICAgICAgICBjbWQgPSBbJ2dpdCcsICdjb21taXQn LCAnLS1hbGxvdy1lbXB0eSddCisrICAgICAgICBjbWQgPSBbJ2dpdCcsICdjb21taXQnXQorKyAg ICAgICAgaWYgbm90IHNlbGYuaXNfcmV0aXJlZCgpIGFuZCBzZWxmLnVzZXNfcnBtYXV0b3NwZWM6 CisrICAgICAgICAgICAgY21kLmFwcGVuZCgnLS1hbGxvdy1lbXB0eScpCisgICAgICAgICBpZiBz aWdub2ZmOgorICAgICAgICAgICAgIGNtZC5hcHBlbmQoJy1zJykKKyAgICAgICAgIGlmIHNlbGYu cXVpZXQ6CistLSAKKzIuMzkuMgorCgpkaWZmIC0tZ2l0IGEvMDAxOC1Db25maWctZmlsZS1vcHRp b24tdG8tc2tpcC10aGUtaG9vay1zY3JpcHQtY3JlYXRpb24ucGF0Y2ggYi8wMDE4LUNvbmZpZy1m aWxlLW9wdGlvbi10by1za2lwLXRoZS1ob29rLXNjcmlwdC1jcmVhdGlvbi5wYXRjaApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mYTlhYTAxCi0tLSAvZGV2L251bGwKKysrIGIv MDAxOC1Db25maWctZmlsZS1vcHRpb24tdG8tc2tpcC10aGUtaG9vay1zY3JpcHQtY3JlYXRpb24u cGF0Y2gKQEAgLTAsMCArMSwxMjYgQEAKK0Zyb20gYjQ4ZWI1MDJkMzMwZWM3YTU0MzgwNWQ3ZjE4 NWVhMjcwZGY3NWI5MCBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206IE9uZHJlaiBOb3Nl ayA8b25vc2VrQHJlZGhhdC5jb20+CitEYXRlOiBXZWQsIDEyIEFwciAyMDIzIDAwOjQyOjA0ICsw MjAwCitTdWJqZWN0OiBbUEFUQ0ggNS82XSBDb25maWcgZmlsZSBvcHRpb24gdG8gc2tpcCB0aGUg aG9vayBzY3JpcHQgY3JlYXRpb24KKworQSBuZXcgb3B0aW9uIG5hbWVkICJza2lwX2hvb2tzIiBj YW4gYmUgYWRkZWQgdG8gdGhlIGNvbmZpZyBmaWxlCisoaW50byB0aGUgbWFpbiBzZWN0aW9uKS4g SXQgYWNjZXB0cyBib29sZWFuIHZhbHVlcyBhbmQgd2hlbgordGhlIG9wdGlvbiBpcyBwcmVzZW50 IGFuZCBzZXQsIGl0IHByZXZlbnRzIGNyZWF0aW5nIHRoZSBwcmUtcHVzaAoraG9vayBzY3JpcHQg ZHVyaW5nIGNsb25pbmcgYSBkaXN0LWdpdCByZXBvc2l0b3J5LgorCitGaXhlczogaHR0cHM6Ly9w YWd1cmUuaW8vZmVkcGtnL2lzc3VlLzUxNQorSklSQTogUkhFTENNUC0xMTQ5MQorCitTaWduZWQt b2ZmLWJ5OiBPbmRyZWogTm9zZWsgPG9ub3Nla0ByZWRoYXQuY29tPgorLS0tCisgcHlycGtnL19f aW5pdF9fLnB5IHwgMTQgKysrKysrKysrKy0tLS0KKyBweXJwa2cvY2xpLnB5ICAgICAgfCAxMyAr KysrKysrKysrKy0tCisgMiBmaWxlcyBjaGFuZ2VkLCAyMSBpbnNlcnRpb25zKCspLCA2IGRlbGV0 aW9ucygtKQorCitkaWZmIC0tZ2l0IGEvcHlycGtnL19faW5pdF9fLnB5IGIvcHlycGtnL19faW5p dF9fLnB5CitpbmRleCAxODc3OTZlLi43ZmRkZmY3IDEwMDY0NAorLS0tIGEvcHlycGtnL19faW5p dF9fLnB5CisrKysgYi9weXJwa2cvX19pbml0X18ucHkKK0BAIC0xNTcxLDcgKzE1NzEsNyBAQCBj bGFzcyBDb21tYW5kcyhvYmplY3QpOgorIAorICAgICBkZWYgY2xvbmUoc2VsZiwgcmVwbywgcGF0 aD1Ob25lLCBicmFuY2g9Tm9uZSwgYmFyZV9kaXI9Tm9uZSwKKyAgICAgICAgICAgICAgIGFub249 RmFsc2UsIHRhcmdldD1Ob25lLCBkZXB0aD1Ob25lLCBleHRyYV9hcmdzPU5vbmUsCistICAgICAg ICAgICAgICBjb25maWdfcGF0aD1Ob25lKToKKysgICAgICAgICAgICAgIGNvbmZpZ19wYXRoPU5v bmUsIHNraXBfaG9va3M9Tm9uZSk6CisgICAgICAgICAiIiJDbG9uZSBhIHJlcG8sIG9wdGlvbmFs bHkgY2hlY2sgb3V0IGEgc3BlY2lmaWMgYnJhbmNoLgorIAorICAgICAgICAgOnBhcmFtIHN0ciBy ZXBvOiB0aGUgbmFtZSBvZiB0aGUgcmVwb3NpdG9yeSB0byBjbG9uZS4KK0BAIC0xNTg5LDYgKzE1 ODksNyBAQCBjbGFzcyBDb21tYW5kcyhvYmplY3QpOgorICAgICAgICAgOnBhcmFtIGxpc3QgZXh0 cmFfYXJnczogYWRkaXRpb25hbCBhcmd1bWVudHMgdGhhdCBhcmUgcGFzc2VkIHRvCisgICAgICAg ICAgICAgdGhlIGNsb25lIGNvbW1hbmQuCisgICAgICAgICA6cGFyYW0gc3RyIGNvbmZpZ19wYXRo OiBwYXRoIHRvIHRoZSBnbG9iYWwgY29uZmlnIGZpbGUKKysgICAgICAgIDpwYXJhbSBib29sIHNr aXBfaG9va3M6IHNraXAgY3JlYXRpb24gcHJlLXB1c2ggaG9vayBzY3JpcHQKKyAgICAgICAgICIi IgorIAorICAgICAgICAgaWYgbm90IHBhdGg6CitAQCAtMTY0NCw3ICsxNjQ1LDggQEAgY2xhc3Mg Q29tbWFuZHMob2JqZWN0KToKKyAKKyAgICAgICAgIGlmIG5vdCBiYXJlX2RpcjoKKyAgICAgICAg ICAgICBzZWxmLl9hZGRfZ2l0X2V4Y2x1ZGVzKG9zLnBhdGguam9pbihwYXRoLCBnaXRfZGlyKSkK Ky0gICAgICAgICAgICBzZWxmLl9hZGRfZ2l0X3ByZV9wdXNoX2hvb2sob3MucGF0aC5qb2luKHBh dGgsIGdpdF9kaXIpLCBjb25maWdfcGF0aCkKKysgICAgICAgICAgICBpZiBub3Qgc2tpcF9ob29r czoKKysgICAgICAgICAgICAgICAgc2VsZi5fYWRkX2dpdF9wcmVfcHVzaF9ob29rKG9zLnBhdGgu am9pbihwYXRoLCBnaXRfZGlyKSwgY29uZmlnX3BhdGgpCisgCisgICAgICAgICByZXR1cm4KKyAK K0BAIC0xNjYwLDcgKzE2NjIsNyBAQCBjbGFzcyBDb21tYW5kcyhvYmplY3QpOgorICAgICAgICAg cmV0dXJuIHJlcG8KKyAKKyAgICAgZGVmIGNsb25lX3dpdGhfZGlycyhzZWxmLCByZXBvLCBhbm9u PUZhbHNlLCB0YXJnZXQ9Tm9uZSwgZGVwdGg9Tm9uZSwKKy0gICAgICAgICAgICAgICAgICAgICAg ICBleHRyYV9hcmdzPU5vbmUsIGNvbmZpZ19wYXRoPU5vbmUpOgorKyAgICAgICAgICAgICAgICAg ICAgICAgIGV4dHJhX2FyZ3M9Tm9uZSwgY29uZmlnX3BhdGg9Tm9uZSwgc2tpcF9ob29rcz1Ob25l KToKKyAgICAgICAgICIiIkNsb25lIGEgcmVwbyBvbGQgc3R5bGUgd2l0aCBzdWJkaXJzIGZvciBl YWNoIGJyYW5jaC4KKyAKKyAgICAgICAgIDpwYXJhbSBzdHIgcmVwbzogbmFtZSBvZiB0aGUgcmVw b3NpdG9yeSB0byBjbG9uZS4KK0BAIC0xNjczLDYgKzE2NzUsNyBAQCBjbGFzcyBDb21tYW5kcyhv YmplY3QpOgorICAgICAgICAgOnBhcmFtIGxpc3QgZXh0cmFfYXJnczogYWRkaXRpb25hbCBhcmd1 bWVudHMgdGhhdCBhcmUgcGFzc2VkIHRvCisgICAgICAgICAgICAgdGhlIGNsb25lIGNvbW1hbmQu CisgICAgICAgICA6cGFyYW0gc3RyIGNvbmZpZ19wYXRoOiBwYXRoIHRvIHRoZSBnbG9iYWwgY29u ZmlnIGZpbGUKKysgICAgICAgIDpwYXJhbSBib29sIHNraXBfaG9va3M6IHNraXAgY3JlYXRpb24g cHJlLXB1c2ggaG9vayBzY3JpcHQKKyAgICAgICAgICIiIgorIAorICAgICAgICAgc2VsZi5fcHVz aF91cmwgPSBOb25lCitAQCAtMTczMSw3ICsxNzM0LDggQEAgY2xhc3MgQ29tbWFuZHMob2JqZWN0 KToKKyAKKyAgICAgICAgICAgICAgICAgIyBBZGQgZXhjbHVkZXMKKyAgICAgICAgICAgICAgICAg c2VsZi5fYWRkX2dpdF9leGNsdWRlcyhicmFuY2hfcGF0aCkKKy0gICAgICAgICAgICAgICAgc2Vs Zi5fYWRkX2dpdF9wcmVfcHVzaF9ob29rKGJyYW5jaF9wYXRoLCBjb25maWdfcGF0aCkKKysgICAg ICAgICAgICAgICAgaWYgbm90IHNraXBfaG9va3M6CisrICAgICAgICAgICAgICAgICAgICBzZWxm Ll9hZGRfZ2l0X3ByZV9wdXNoX2hvb2soYnJhbmNoX3BhdGgsIGNvbmZpZ19wYXRoKQorICAgICAg ICAgICAgIGV4Y2VwdCAoZ2l0LkdpdENvbW1hbmRFcnJvciwgT1NFcnJvcikgYXMgZToKKyAgICAg ICAgICAgICAgICAgcmFpc2UgcnBrZ0Vycm9yKCdDb3VsZCBub3QgbG9jYWxseSBjbG9uZSAlcyBm cm9tICVzOiAlcycKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICUgKGJyYW5jaCwg cmVwb19wYXRoLCBlKSkKK0BAIC0xODIwLDYgKzE4MjQsOCBAQCBjbGFzcyBDb21tYW5kcyhvYmpl Y3QpOgorICAgICAgICAgICAgICMgVGhpcyBmaWxlIHdhcyBnZW5lcmF0ZWQgYnkgezB9IHdoZW4g Y2xvbmluZyB0aGUgcmVwb3NpdG9yeS4KKyAgICAgICAgICAgICAjIFlvdSBjYW4gZWRpdCBpdCB0 byB5b3VyIGxpa2luZyBvciBkZWxldGUgY29tcGxldGVseS4gSXQgd2lsbCBub3QKKyAgICAgICAg ICAgICAjIGJlIHJlY3JlYXRlZC4KKysgICAgICAgICAgICAjIENyZWF0aW5nIHRoaXMgZmlsZSBj YW4gYmUgYWxzbyBwcmV2ZW50ZWQgYnkgYWRkaW5nIGFuIG9wdGlvbgorKyAgICAgICAgICAgICMg InNraXBfaG9va3MgPSBUcnVlIiBpbnRvIHRoZSB7MH0ncyBjb25maWcgZmlsZTsgW3swfV0gc2Vj dGlvbi4KKyAKKyAgICAgICAgICAgICBfcmVtb3RlPSIkMSIKKyAgICAgICAgICAgICBfdXJsPSIk MiIKK2RpZmYgLS1naXQgYS9weXJwa2cvY2xpLnB5IGIvcHlycGtnL2NsaS5weQoraW5kZXggM2Q4 Y2UzMy4uYTFmM2Y0NCAxMDA2NDQKKy0tLSBhL3B5cnBrZy9jbGkucHkKKysrKyBiL3B5cnBrZy9j bGkucHkKK0BAIC0yMTc3LDEzICsyMTc3LDIxIEBAIGNsYXNzIGNsaUNsaWVudChvYmplY3QpOgor ICAgICAgICAgICAgIHNlbGYubG9nLndhcm5pbmcoIlJlcG8gbmFtZSBzaG91bGQndCBjb250YWlu ICcuZ2l0JyBzdWZmaXguICIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJDb3JyZWN0 aW5nIHRoZSByZXBvIG5hbWU6ICclcyciICUgcmVwbykKKyAKKysgICAgICAgIHNraXBfaG9va3Mg PSBOb25lCisrICAgICAgICBpZiBzZWxmLmNvbmZpZy5oYXNfb3B0aW9uKHNlbGYubmFtZSwgInNr aXBfaG9va3MiKToKKysgICAgICAgICAgICB0cnk6CisrICAgICAgICAgICAgICAgIHNraXBfaG9v a3MgPSBzZWxmLmNvbmZpZy5nZXRib29sZWFuKHNlbGYubmFtZSwgInNraXBfaG9va3MiKQorKyAg ICAgICAgICAgIGV4Y2VwdCBWYWx1ZUVycm9yOgorKyAgICAgICAgICAgICAgICBzZWxmLmxvZy5l cnJvcigiRXJyb3I6IGNvbmZpZyBmaWxlIG9wdGlvbiAnc2tpcF9ob29rcyciKQorKyAgICAgICAg ICAgICAgICByYWlzZQorICAgICAgICAgaWYgc2VsZi5hcmdzLmJyYW5jaGVzOgorICAgICAgICAg ICAgIHNlbGYuY21kLmNsb25lX3dpdGhfZGlycyhzZWxmLmFyZ3MucmVwb1swXSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYW5vbj1zZWxmLmFyZ3MuYW5vbnltb3VzLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0YXJnZXQ9c2VsZi5hcmdzLmNs b25lX3RhcmdldCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGVwdGg9 c2VsZi5hcmdzLmRlcHRoLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBl eHRyYV9hcmdzPXNlbGYuZXh0cmFfYXJncywKKy0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgY29uZmlnX3BhdGg9c2VsZi5hcmdzLmNvbmZpZykKKysgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29uZmlnX3BhdGg9c2VsZi5hcmdzLmNvbmZpZywKKysgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2tpcF9ob29rcz1za2lwX2hvb2tzKQor ICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICBzZWxmLmNtZC5jbG9uZShzZWxmLmFyZ3MucmVw b1swXSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmFuY2g9c2VsZi5hcmdzLmJyYW5j aCwKK0BAIC0yMTkxLDcgKzIxOTksOCBAQCBjbGFzcyBjbGlDbGllbnQob2JqZWN0KToKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICB0YXJnZXQ9c2VsZi5hcmdzLmNsb25lX3RhcmdldCwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBkZXB0aD1zZWxmLmFyZ3MuZGVwdGgsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZXh0cmFfYXJncz1zZWxmLmV4dHJhX2FyZ3MsCistICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29uZmlnX3BhdGg9c2VsZi5hcmdzLmNvbmZpZykKKysgICAg ICAgICAgICAgICAgICAgICAgICAgICBjb25maWdfcGF0aD1zZWxmLmFyZ3MuY29uZmlnLAorKyAg ICAgICAgICAgICAgICAgICAgICAgICAgIHNraXBfaG9va3M9c2tpcF9ob29rcykKKyAKKyAgICAg ZGVmIGNvbW1pdChzZWxmKToKKyAgICAgICAgIGlmIHNlbGYuYXJncy53aXRoX2NoYW5nZWxvZyBh bmQgbm90IHNlbGYuYXJncy5tZXNzYWdlOgorLS0gCisyLjM5LjIKKwoKZGlmZiAtLWdpdCBhLzAw MTktUHJlLXB1c2gtaG9vay13b24tdC1jaGVjay1wcml2YXRlLWJyYW5jaGVzLnBhdGNoIGIvMDAx OS1QcmUtcHVzaC1ob29rLXdvbi10LWNoZWNrLXByaXZhdGUtYnJhbmNoZXMucGF0Y2gKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMzdhN2M1MgotLS0gL2Rldi9udWxsCisrKyBi LzAwMTktUHJlLXB1c2gtaG9vay13b24tdC1jaGVjay1wcml2YXRlLWJyYW5jaGVzLnBhdGNoCkBA IC0wLDAgKzEsNDUgQEAKK0Zyb20gNDU1M2RhMzY0ZDdkOGE5NzRhYjBjMDg4MzRlZTBhNTQzMjBk YTJjYiBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206IE9uZHJlaiBOb3NlayA8b25vc2Vr QHJlZGhhdC5jb20+CitEYXRlOiBUdWUsIDE4IEFwciAyMDIzIDE2OjA2OjQzICswMjAwCitTdWJq ZWN0OiBbUEFUQ0ggNi82XSBQcmUtcHVzaCBob29rIHdvbid0IGNoZWNrIHByaXZhdGUgYnJhbmNo ZXMKKworVGhlIHByZS1wdXNoIGhvb2sgc2NyaXB0IHdhcyBmYWlsaW5nIHRoZSB3aGVuIHVzZXIg dHJpZWQgdG8gcHVzaAorYSBwcml2YXRlIGJyYW5jaC4gSXQgcmVxdWlyZWQgdXNpbmcgdGhlIC0t cmVsZWFzZSBhcmd1bWVudCB3aXRoCit0aGUgcHJlLXB1c2gtY2hlY2sgY29tbWFuZCBhbmQgcGFz c2luZyBhZGRpdGlvbmFsIGFyZ3VtZW50cyBpbnRvCit0aGUgaG9vayBzY3JpcHQuIFRoYXQgd2Fz IGZvdW5kIHVucmVsaWFibGUgYW5kIHByaXZhdGUgYnJhbmNoZXMKK3dvbid0IGJlIGNoZWNrZWQu CisKK0ZpeGVzOiAjNjgzCitKSVJBOiBSSEVMQ01QLTExNTI4CisKK1NpZ25lZC1vZmYtYnk6IE9u ZHJlaiBOb3NlayA8b25vc2VrQHJlZGhhdC5jb20+CistLS0KKyBweXJwa2cvX19pbml0X18ucHkg fCAxMiArKysrKysrKystLS0KKyAxIGZpbGUgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCspLCAzIGRl bGV0aW9ucygtKQorCitkaWZmIC0tZ2l0IGEvcHlycGtnL19faW5pdF9fLnB5IGIvcHlycGtnL19f aW5pdF9fLnB5CitpbmRleCA3ZmRkZmY3Li4zZjkzNGQzIDEwMDY0NAorLS0tIGEvcHlycGtnL19f aW5pdF9fLnB5CisrKysgYi9weXJwa2cvX19pbml0X18ucHkKK0BAIC00NDg5LDkgKzQ0ODksMTUg QEAgY2xhc3MgQ29tbWFuZHMob2JqZWN0KToKKyAgICAgICAgICAgICBzcGVjZmlsZV9wYXRoID0g b3MucGF0aC5yZWxwYXRoKHNwZWNmaWxlX3BhdGhfYWJzb2x1dGUsIHN0YXJ0PXNlbGYucGF0aCkK KyAgICAgICAgICAgICBjbWQgPSBbJ3NwZWN0b29sJywgJy1sJywgb3MucGF0aC5qb2luKGNsb25l X2Rpciwgc3BlY2ZpbGVfcGF0aCldCisgICAgICAgICAgICAgIyBleHRyYWN0IGp1c3QgJy0tZGVm aW5lJyBhcmd1bWVudHMgZnJvbSBycG1kZWZpbmVzCistICAgICAgICAgICAgZm9yIG9wdCwgdmFs IGluIHppcChzZWxmLnJwbWRlZmluZXNbMDo6Ml0sIHNlbGYucnBtZGVmaW5lc1sxOjoyXSk6Cist ICAgICAgICAgICAgICAgIGlmIG9wdCA9PSAnLS1kZWZpbmUnOgorLSAgICAgICAgICAgICAgICAg ICAgY21kLmV4dGVuZCgob3B0LCB2YWwpKQorKyAgICAgICAgICAgIHRyeToKKysgICAgICAgICAg ICAgICAgZm9yIG9wdCwgdmFsIGluIHppcChzZWxmLnJwbWRlZmluZXNbMDo6Ml0sIHNlbGYucnBt ZGVmaW5lc1sxOjoyXSk6CisrICAgICAgICAgICAgICAgICAgICBpZiBvcHQgPT0gJy0tZGVmaW5l JzoKKysgICAgICAgICAgICAgICAgICAgICAgICBjbWQuZXh0ZW5kKChvcHQsIHZhbCkpCisrICAg ICAgICAgICAgZXhjZXB0IHJwa2dFcnJvcjoKKysgICAgICAgICAgICAgICAgIyB0aGlzIGV4Y2Vw dGlvbiB3YXMgY2F1c2VkIHByb2JhYmx5IGJ5IHVzaW5nIGEgcHJpdmF0ZSBicmFuY2gKKysgICAg ICAgICAgICAgICAgc2VsZi5sb2cud2FybmluZygnVGhlIHByZS1wdXNoIHNjcmlwdCBjYW5cJ3Qg Y2hlY2sgcHJpdmF0ZSBicmFuY2hlcy4gJworKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICdQdXNoIG9wZXJhdGlvbiBjb250aW51ZXMuJykKKysgICAgICAgICAgICAgICAgcmV0dXJu CisgICAgICAgICAgICAgcmV0LCBzdGRvdXQsIF8gPSBzZWxmLl9ydW5fY29tbWFuZChjbWQsIGN3 ZD1jbG9uZV9kaXIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICByZXR1cm5fdGV4dD1UcnVlLCByZXR1cm5fc3Rkb3V0PVRydWUpCisgICAgICAgICAgICAg aWYgcmV0ICE9IDA6CistLSAKKzIuMzkuMgorCgpkaWZmIC0tZ2l0IGEvcnBrZy5zcGVjIGIvcnBr Zy5zcGVjCmluZGV4IDI5MGUzNDUuLjYwZDk5ZDEgMTAwNjQ0Ci0tLSBhL3Jwa2cuc3BlYworKysg Yi9ycGtnLnNwZWMKQEAgLTEsNiArMSw2IEBACiBOYW1lOiAgICAgICAgICAgcnBrZwogVmVyc2lv bjogICAgICAgIDEuNjYKLVJlbGVhc2U6ICAgICAgICA1JXs/ZGlzdH0KK1JlbGVhc2U6ICAgICAg ICA2JXs/ZGlzdH0KIAogU3VtbWFyeTogICAgICAgIFB5dGhvbiBsaWJyYXJ5IGZvciBpbnRlcmFj dGluZyB3aXRoIHJwbStnaXQKIExpY2Vuc2U6ICAgICAgICBHUEx2MisgYW5kIExHUEx2MgpAQCAt NDcsNiArNDcsMTIgQEAgUGF0Y2gxMDogICAgICAgIDAwMTAtcHJlLXB1c2gtY2hlY2staGF2ZS10 by11c2Utc3BlY3Rvb2wtd2l0aC1kZWZpbmUucGF0Y2gKIFBhdGNoMTE6ICAgICAgICAwMDExLUEt SEVBRC1xdWVyeS1pbnRvLWEtbG9va2FzaWRlLWNhY2hlLnBhdGNoCiBQYXRjaDEyOiAgICAgICAg MDAxMi1wcmUtcHVzaC1ob29rLXNjcmlwdC1jb250YWlucy1hLXVzZXItcy1jb25maWcucGF0Y2gK IFBhdGNoMTM6ICAgICAgICAwMDEzLUZpeC11bml0dGVzdHMtZm9yLWNsb25lLWFuZC1wcmUtcHVz aC1ob29rLXNjcmlwdC5wYXRjaAorUGF0Y2gxNDogICAgICAgIDAwMTQtaW1wb3J0X3NycG0tYWxs b3ctcHJlLWdlbmVyYXRlZC1zcnBtcy5wYXRjaAorUGF0Y2gxNTogICAgICAgIDAwMTUtSWdub3Jl LW1pc3Npbmctc3BlYy1maWxlLWluLXByZS1wdXNoLWhvb2sucGF0Y2gKK1BhdGNoMTY6ICAgICAg ICAwMDE2LUNoZWNrLXJlbW90ZS1maWxlLXdpdGgtY29ycmVjdC1oYXNoLnBhdGNoCitQYXRjaDE3 OiAgICAgICAgMDAxNy1BbGxvdy1lbXB0eS1jb21taXRzLXdoZW4tdXNlc19ycG1hdXRvc3BlYy5w YXRjaAorUGF0Y2gxODogICAgICAgIDAwMTgtQ29uZmlnLWZpbGUtb3B0aW9uLXRvLXNraXAtdGhl LWhvb2stc2NyaXB0LWNyZWF0aW9uLnBhdGNoCitQYXRjaDE5OiAgICAgICAgMDAxOS1QcmUtcHVz aC1ob29rLXdvbi10LWNoZWNrLXByaXZhdGUtYnJhbmNoZXMucGF0Y2gKIAogJWRlc2NyaXB0aW9u CiBQeXRob24gbGlicmFyeSBmb3IgaW50ZXJhY3Rpbmcgd2l0aCBycG0rZ2l0CkBAIC0yNjMsNiAr MjY5LDE0IEBAIGV4YW1wbGVfY2xpX2Rpcj0kUlBNX0JVSUxEX1JPT1Qle19kYXRhZGlyfS8le25h bWV9L2V4YW1wbGVzL2NsaQogCiAKICVjaGFuZ2Vsb2cKKyogVHVlIEFwciAxOCAyMDIzIE9uZMWZ ZWogTm9zZWsgPG9ub3Nla0ByZWRoYXQuY29tPiAtIDEuNjYtNgorLSBQYXRjaDogUHJlLXB1c2gg aG9vayB3b24ndCBjaGVjayBwcml2YXRlIGJyYW5jaGVzCistIFBhdGNoOiBDb25maWcgZmlsZSBv cHRpb24gdG8gc2tpcCB0aGUgaG9vayBzY3JpcHQgY3JlYXRpb24KKy0gUGF0Y2g6IEFsbG93IGVt cHR5IGNvbW1pdHMgd2hlbiBgdXNlc19ycG1hdXRvc3BlY2AKKy0gUGF0Y2g6IENoZWNrIHJlbW90 ZSBmaWxlIHdpdGggY29ycmVjdCBoYXNoCistIFBhdGNoOiBJZ25vcmUgbWlzc2luZyBzcGVjIGZp bGUgaW4gcHJlLXB1c2ggaG9vaworLSBQYXRjaDogaW1wb3J0X3NycG06IGFsbG93IHByZS1nZW5l cmF0ZWQgc3JwbXMKKwogKiBTYXQgQXByIDEgMjAyMyBPbmTFmWVqIE5vc2VrIDxvbm9zZWtAcmVk aGF0LmNvbT4gLSAxLjY2LTUKIC0gUGF0Y2g6IEZpeCB1bml0dGVzdHMgZm9yIGBjbG9uZWAgYW5k IHByZS1wdXNoIGhvb2sgc2NyaXB0CiAtIFBhdGNoOiBwcmUtcHVzaCBob29rIHNjcmlwdCBjb250 YWlucyBhIHVzZXIncyBjb25maWcK