From: Wei Liu Subject: [PATCH v4 6/8] pygrub: make python scripts work with 2.6 and up Date: Mon, 11 Mar 2019 18:01:35 +0000 Message-ID: <20190311180137.7805-7-wei.liu2@citrix.com> References: <20190311180137.7805-1-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1h3PFG-0000Xs-Hx for xen-devel@lists.xenproject.org; Mon, 11 Mar 2019 18:01:50 +0000 In-Reply-To: <20190311180137.7805-1-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: George Dunlap , Andrew Cooper , Wei Liu , Ian Jackson , Anthony PERARD List-Id: xen-devel@lists.xenproject.org UnVuIDJ0bzMgYW5kIHBpY2sgdGhlIHNlbnNpYmxlIHN1Z2dlc3Rpb25zLgoKSW1wb3J0IHByaW50 X2Z1bmN0aW9uIGFuZCBhYnNvbHV0ZV9pbXBvcnQgc28gMi42IGNhbiB3b3JrLgoKVGhlcmUgaGFz IG5ldmVyIGJlZW4gYSBjdXJzZXMud3JhcHBlciBtb2R1bGUgYWNjb3JkaW5nIHRvIDIueCBhbmQg My54CmRvYywgb25seSBhIGZ1bmN0aW9uLCBzbyAiaW1wb3J0IGN1cnNlcy53cmFwcGVyIiBpcyBu b3QgY29ycmVjdC4gSXQKaGFwcGVuZWQgdG8gd29yayBiZWNhdXNlIDIueCBpbXBsZW1lbnRlZCBh ICh1bmRvY3VtZW50ZWQpIG1vZHVsZS4KCldlIG9ubHkgbmVlZCB0byBpbXBvcnQgY3Vyc2VzIHRv IG1ha2UgY3Vyc2VzLndyYXBwZXIgYXZhaWxhYmxlIHRvCnB5Z3J1Yi4KClNpZ25lZC1vZmYtYnk6 IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+ClJldmlld2VkLWJ5OiBBbmRyZXcgQ29vcGVy IDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgotLS0KIHRvb2xzL3B5Z3J1Yi9zcmMvRXh0TGlu dXhDb25mLnB5IHwgMTkgKysrKysrLS0tLS0KIHRvb2xzL3B5Z3J1Yi9zcmMvR3J1YkNvbmYucHkg ICAgIHwgMzkgKysrKysrKysrKysrLS0tLS0tLS0tLQogdG9vbHMvcHlncnViL3NyYy9MaWxvQ29u Zi5weSAgICAgfCAxOSArKysrKystLS0tLQogdG9vbHMvcHlncnViL3NyYy9weWdydWIgICAgICAg ICAgfCA3MSArKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiA0IGZpbGVz IGNoYW5nZWQsIDc4IGluc2VydGlvbnMoKyksIDcwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L3Rvb2xzL3B5Z3J1Yi9zcmMvRXh0TGludXhDb25mLnB5IGIvdG9vbHMvcHlncnViL3NyYy9FeHRM aW51eENvbmYucHkKaW5kZXggZDE3ODliZjAyMC4uOWZkNjM1YjljZiAxMDA2NDQKLS0tIGEvdG9v bHMvcHlncnViL3NyYy9FeHRMaW51eENvbmYucHkKKysrIGIvdG9vbHMvcHlncnViL3NyYy9FeHRM aW51eENvbmYucHkKQEAgLTEwLDkgKzEwLDExIEBACiAjIGFsb25nIHdpdGggdGhpcyBwcm9ncmFt OyBJZiBub3QsIHNlZSA8aHR0cDovL3d3dy5nbnUub3JnL2xpY2Vuc2VzLz4uCiAjCiAKK2Zyb20g X19mdXR1cmVfXyBpbXBvcnQgcHJpbnRfZnVuY3Rpb24sIGFic29sdXRlX2ltcG9ydAorCiBpbXBv cnQgc3lzLCByZSwgb3MKIGltcG9ydCBsb2dnaW5nCi1pbXBvcnQgR3J1YkNvbmYKK2Zyb20gLiBp bXBvcnQgR3J1YkNvbmYKIAogY2xhc3MgRXh0TGludXhJbWFnZShvYmplY3QpOgogICAgIGRlZiBf X2luaXRfXyhzZWxmLCBsaW5lcywgcGF0aCk6CkBAIC0zMiw3ICszNCw4IEBAIGNsYXNzIEV4dExp bnV4SW1hZ2Uob2JqZWN0KToKICAgICAgICAgc2VsZi5saW5lcyA9IFtdCiAgICAgICAgIHNlbGYu cGF0aCA9IHBhdGgKICAgICAgICAgc2VsZi5yb290ID0gIiIKLSAgICAgICAgbWFwKHNlbGYuc2V0 X2Zyb21fbGluZSwgbGluZXMpCisgICAgICAgIGZvciBsaW5lIGluIGxpbmVzOgorICAgICAgICAg ICAgc2VsZi5zZXRfZnJvbV9saW5lKGxpbmUpCiAKICAgICBkZWYgc2V0X2Zyb21fbGluZShzZWxm LCBsaW5lLCByZXBsYWNlID0gTm9uZSk6CiAgICAgICAgIChjb20sIGFyZykgPSBHcnViQ29uZi5n cnViX2V4YWN0X3NwbGl0KGxpbmUsIDIpCkBAIC02Nyw3ICs3MCw3IEBAIGNsYXNzIEV4dExpbnV4 SW1hZ2Uob2JqZWN0KToKICAgICAgICAgICAgICAgICAgICAgICAgIHNldGF0dHIoc2VsZiwgImlu aXRyZCIsIGEucmVwbGFjZSgiaW5pdHJkPSIsICIiKSkKICAgICAgICAgICAgICAgICAgICAgICAg IGFyZyA9IGFyZy5yZXBsYWNlKGEsICIiKQogCi0gICAgICAgIGlmIGNvbSBpcyBub3QgTm9uZSBh bmQgc2VsZi5jb21tYW5kcy5oYXNfa2V5KGNvbSk6CisgICAgICAgIGlmIGNvbSBpcyBub3QgTm9u ZSBhbmQgY29tIGluIHNlbGYuY29tbWFuZHM6CiAgICAgICAgICAgICBpZiBzZWxmLmNvbW1hbmRz W2NvbV0gaXMgbm90IE5vbmU6CiAgICAgICAgICAgICAgICAgc2V0YXR0cihzZWxmLCBzZWxmLmNv bW1hbmRzW2NvbV0sIHJlLnN1YignXiIoLispIiQnLCByIlwxIiwgYXJnLnN0cmlwKCkpKQogICAg ICAgICAgICAgZWxzZToKQEAgLTEzNiw3ICsxMzksNyBAQCBjbGFzcyBFeHRMaW51eENvbmZpZ0Zp bGUob2JqZWN0KToKICAgICBkZWYgcGFyc2Uoc2VsZiwgYnVmID0gTm9uZSk6CiAgICAgICAgIGlm IGJ1ZiBpcyBOb25lOgogICAgICAgICAgICAgaWYgc2VsZi5maWxlbmFtZSBpcyBOb25lOgotICAg ICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IsICJObyBjb25maWcgZmlsZSBkZWZpbmVkIHRv IHBhcnNlISIKKyAgICAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCJObyBjb25maWcgZmls ZSBkZWZpbmVkIHRvIHBhcnNlISIpCiAKICAgICAgICAgICAgIGYgPSBvcGVuKHNlbGYuZmlsZW5h bWUsICdyJykKICAgICAgICAgICAgIGxpbmVzID0gZi5yZWFkbGluZXMoKQpAQCAtMTY3LDcgKzE3 MCw3IEBAIGNsYXNzIEV4dExpbnV4Q29uZmlnRmlsZShvYmplY3QpOgogCiAgICAgICAgICAgICAo Y29tLCBhcmcpID0gR3J1YkNvbmYuZ3J1Yl9leGFjdF9zcGxpdChsLCAyKQogICAgICAgICAgICAg Y29tID0gY29tLmxvd2VyKCkKLSAgICAgICAgICAgIGlmIHNlbGYuY29tbWFuZHMuaGFzX2tleShj b20pOgorICAgICAgICAgICAgaWYgY29tIGluIHNlbGYuY29tbWFuZHM6CiAgICAgICAgICAgICAg ICAgaWYgc2VsZi5jb21tYW5kc1tjb21dIGlzIG5vdCBOb25lOgogICAgICAgICAgICAgICAgICAg ICBzZXRhdHRyKHNlbGYsIHNlbGYuY29tbWFuZHNbY29tXSwgYXJnLnN0cmlwKCkpCiAgICAgICAg ICAgICAgICAgZWxzZToKQEAgLTIwNyw4ICsyMTAsOCBAQCBjbGFzcyBFeHRMaW51eENvbmZpZ0Zp bGUob2JqZWN0KToKICAgICAgICAgCiBpZiBfX25hbWVfXyA9PSAiX19tYWluX18iOgogICAgIGlm IGxlbihzeXMuYXJndikgPCAyOgotICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IsICJOZWVkIGEg Y29uZmlndXJhdGlvbiBmaWxlIHRvIHJlYWQiCisgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcigi TmVlZCBhIGNvbmZpZ3VyYXRpb24gZmlsZSB0byByZWFkIikKICAgICBnID0gRXh0TGludXhDb25m aWdGaWxlKHN5cy5hcmd2WzFdKQogICAgIGZvciBpIGluIGcuaW1hZ2VzOgotICAgICAgICBwcmlu dCBpCi0gICAgcHJpbnQgZy5kZWZhdWx0CisgICAgICAgIHByaW50KGkpCisgICAgcHJpbnQoZy5k ZWZhdWx0KQpkaWZmIC0tZ2l0IGEvdG9vbHMvcHlncnViL3NyYy9HcnViQ29uZi5weSBiL3Rvb2xz L3B5Z3J1Yi9zcmMvR3J1YkNvbmYucHkKaW5kZXggZGM4MTBkNTVjYi4uZjhkMzc5OWRjMCAxMDA2 NDQKLS0tIGEvdG9vbHMvcHlncnViL3NyYy9HcnViQ29uZi5weQorKysgYi90b29scy9weWdydWIv c3JjL0dydWJDb25mLnB5CkBAIC0xMiw2ICsxMiw4IEBACiAjIGFsb25nIHdpdGggdGhpcyBwcm9n cmFtOyBJZiBub3QsIHNlZSA8aHR0cDovL3d3dy5nbnUub3JnL2xpY2Vuc2VzLz4uCiAjCiAKK2Zy b20gX19mdXR1cmVfXyBpbXBvcnQgcHJpbnRfZnVuY3Rpb24sIGFic29sdXRlX2ltcG9ydAorCiBp bXBvcnQgb3MsIHN5cwogaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCByZQpAQCAtNDQsNyArNDYsNyBA QCBkZWYgZ2V0X3BhdGgocyk6CiAgICAgICAgIHJldHVybiAoTm9uZSwgcykKICAgICBpZHggPSBz LmZpbmQoJyknKQogICAgIGlmIGlkeCA9PSAtMToKLSAgICAgICAgcmFpc2UgVmFsdWVFcnJvciwg IlVuYWJsZSB0byBmaW5kIG1hdGNoaW5nICcpJyIKKyAgICAgICAgcmFpc2UgVmFsdWVFcnJvcigi VW5hYmxlIHRvIGZpbmQgbWF0Y2hpbmcgJyknIikKICAgICBkID0gc1s6aWR4XQogICAgIHJldHVy biAoR3J1YkRpc2tQYXJ0KGQpLCBzW2lkeCArIDE6XSkKIApAQCAtMTAwLDcgKzEwMiw4IEBAIGNs YXNzIF9HcnViSW1hZ2Uob2JqZWN0KToKICAgICAgICAgICAgICAgICAiICBpbml0cmQ6ICVzXG4i ICUoc2VsZi50aXRsZSwgc2VsZi5yb290LCBzZWxmLmtlcm5lbCwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgc2VsZi5hcmdzLCBzZWxmLmluaXRyZCkpCiAgICAgZGVmIF9wYXJz ZShzZWxmLCBsaW5lcyk6Ci0gICAgICAgIG1hcChzZWxmLnNldF9mcm9tX2xpbmUsIGxpbmVzKQor ICAgICAgICBmb3IgbGluZSBpbiBsaW5lczoKKyAgICAgICAgICAgIHNlbGYuc2V0X2Zyb21fbGlu ZShsaW5lKQogCiAgICAgZGVmIHJlc2V0KHNlbGYsIGxpbmVzKToKICAgICAgICAgc2VsZi5fcm9v dCA9IHNlbGYuX2luaXRyZCA9IHNlbGYuX2tlcm5lbCA9IHNlbGYuX2FyZ3MgPSBOb25lCkBAIC0x NDEsNyArMTQ0LDcgQEAgY2xhc3MgR3J1YkltYWdlKF9HcnViSW1hZ2UpOgogICAgIGRlZiBzZXRf ZnJvbV9saW5lKHNlbGYsIGxpbmUsIHJlcGxhY2UgPSBOb25lKToKICAgICAgICAgKGNvbSwgYXJn KSA9IGdydWJfZXhhY3Rfc3BsaXQobGluZSwgMikKIAotICAgICAgICBpZiBzZWxmLmNvbW1hbmRz Lmhhc19rZXkoY29tKToKKyAgICAgICAgaWYgY29tIGluIHNlbGYuY29tbWFuZHM6CiAgICAgICAg ICAgICBpZiBzZWxmLmNvbW1hbmRzW2NvbV0gaXMgbm90IE5vbmU6CiAgICAgICAgICAgICAgICAg c2V0YXR0cihzZWxmLCBzZWxmLmNvbW1hbmRzW2NvbV0sIGFyZy5zdHJpcCgpKQogICAgICAgICAg ICAgZWxzZToKQEAgLTE3Nyw3ICsxODAsNyBAQCBjbGFzcyBfR3J1YkNvbmZpZ0ZpbGUob2JqZWN0 KToKICAgICAgICAgICAgIHNlbGYucGFyc2UoKQogCiAgICAgZGVmIHBhcnNlKHNlbGYsIGJ1ZiA9 IE5vbmUpOgotICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IsICJ1bmltcGxlbWVudGVkIHBhcnNl IGZ1bmN0aW9uIiAgIAorICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IoInVuaW1wbGVtZW50ZWQg cGFyc2UgZnVuY3Rpb24iKQogCiAgICAgZGVmIGhhc1Bhc3N3b3JkQWNjZXNzKHNlbGYpOgogICAg ICAgICByZXR1cm4gc2VsZi5wYXNzd29yZEFjY2VzcwpAQCAtMjAxLDcgKzIwNCw3IEBAIGNsYXNz IF9HcnViQ29uZmlnRmlsZShvYmplY3QpOgogICAgICAgICAgICAgICAgIGltcG9ydCBjcnlwdAog ICAgICAgICAgICAgICAgIGlmIGNyeXB0LmNyeXB0KHBhc3N3b3JkLCBwd2RbMV0pID09IHB3ZFsx XToKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFRydWUKLSAgICAgICAgICAgIGV4Y2VwdCBF eGNlcHRpb24sIGU6CisgICAgICAgICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6CiAgICAgICAg ICAgICAgICAgc2VsZi5wYXNzRXhjID0gIkNhbid0IHZlcmlmeSBwYXNzd29yZDogJXMiICUgc3Ry KGUpCiAgICAgICAgICAgICAgICAgcmV0dXJuIEZhbHNlCiAKQEAgLTIxMyw3ICsyMTYsNyBAQCBj bGFzcyBfR3J1YkNvbmZpZ0ZpbGUob2JqZWN0KToKIAogICAgIGRlZiBzZXQoc2VsZiwgbGluZSk6 CiAgICAgICAgIChjb20sIGFyZykgPSBncnViX2V4YWN0X3NwbGl0KGxpbmUsIDIpCi0gICAgICAg IGlmIHNlbGYuY29tbWFuZHMuaGFzX2tleShjb20pOgorICAgICAgICBpZiBjb20gaW4gc2VsZi5j b21tYW5kczoKICAgICAgICAgICAgIGlmIHNlbGYuY29tbWFuZHNbY29tXSBpcyBub3QgTm9uZToK ICAgICAgICAgICAgICAgICBzZXRhdHRyKHNlbGYsIHNlbGYuY29tbWFuZHNbY29tXSwgYXJnLnN0 cmlwKCkpCiAgICAgICAgICAgICBlbHNlOgpAQCAtMjMzLDcgKzIzNiw3IEBAIGNsYXNzIF9HcnVi Q29uZmlnRmlsZShvYmplY3QpOgogICAgICAgICAgICAgc2VsZi5fZGVmYXVsdCA9IHZhbAogCiAg ICAgICAgIGlmIHNlbGYuX2RlZmF1bHQgPCAwOgotICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJv ciwgImRlZmF1bHQgbXVzdCBiZSBwb3NpdGl2ZSBudW1iZXIiCisgICAgICAgICAgICByYWlzZSBW YWx1ZUVycm9yKCJkZWZhdWx0IG11c3QgYmUgcG9zaXRpdmUgbnVtYmVyIikKICAgICBkZWZhdWx0 ID0gcHJvcGVydHkoX2dldF9kZWZhdWx0LCBfc2V0X2RlZmF1bHQpCiAKICAgICBkZWYgc2V0X3Nw bGFzaChzZWxmLCB2YWwpOgpAQCAtMjY1LDcgKzI2OCw3IEBAIGNsYXNzIEdydWJDb25maWdGaWxl KF9HcnViQ29uZmlnRmlsZSk6CiAgICAgZGVmIHBhcnNlKHNlbGYsIGJ1ZiA9IE5vbmUpOgogICAg ICAgICBpZiBidWYgaXMgTm9uZToKICAgICAgICAgICAgIGlmIHNlbGYuZmlsZW5hbWUgaXMgTm9u ZToKLSAgICAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yLCAiTm8gY29uZmlnIGZpbGUgZGVm aW5lZCB0byBwYXJzZSEiCisgICAgICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcigiTm8gY29u ZmlnIGZpbGUgZGVmaW5lZCB0byBwYXJzZSEiKQogCiAgICAgICAgICAgICBmID0gb3BlbihzZWxm LmZpbGVuYW1lLCAncicpCiAgICAgICAgICAgICBsaW5lcyA9IGYucmVhZGxpbmVzKCkKQEAgLTI5 Niw3ICsyOTksNyBAQCBjbGFzcyBHcnViQ29uZmlnRmlsZShfR3J1YkNvbmZpZ0ZpbGUpOgogICAg ICAgICAgICAgICAgIGNvbnRpbnVlCiAKICAgICAgICAgICAgIChjb20sIGFyZykgPSBncnViX2V4 YWN0X3NwbGl0KGwsIDIpCi0gICAgICAgICAgICBpZiBzZWxmLmNvbW1hbmRzLmhhc19rZXkoY29t KToKKyAgICAgICAgICAgIGlmIGNvbSBpbiBzZWxmLmNvbW1hbmRzOgogICAgICAgICAgICAgICAg IGlmIHNlbGYuY29tbWFuZHNbY29tXSBpcyBub3QgTm9uZToKICAgICAgICAgICAgICAgICAgICAg c2V0YXR0cihzZWxmLCBzZWxmLmNvbW1hbmRzW2NvbV0sIGFyZy5zdHJpcCgpKQogICAgICAgICAg ICAgICAgIGVsc2U6CkBAIC0zMjgsNyArMzMxLDcgQEAgY2xhc3MgR3J1YjJJbWFnZShfR3J1Yklt YWdlKToKICAgICAgICAgaWYgY29tID09ICJzZXQiOgogICAgICAgICAgICAgKGNvbSxhcmcpID0g Z3J1YjJfaGFuZGxlX3NldChhcmcpCiAgICAgICAgICAgICAKLSAgICAgICAgaWYgc2VsZi5jb21t YW5kcy5oYXNfa2V5KGNvbSk6CisgICAgICAgIGlmIGNvbSBpbiBzZWxmLmNvbW1hbmRzOgogICAg ICAgICAgICAgaWYgc2VsZi5jb21tYW5kc1tjb21dIGlzIG5vdCBOb25lOgogICAgICAgICAgICAg ICAgIHNldGF0dHIoc2VsZiwgc2VsZi5jb21tYW5kc1tjb21dLCBhcmcuc3RyaXAoKSkKICAgICAg ICAgICAgIGVsc2U6CkBAIC0zNjQsNyArMzY3LDcgQEAgY2xhc3MgR3J1YjJDb25maWdGaWxlKF9H cnViQ29uZmlnRmlsZSk6CiAgICAgZGVmIHBhcnNlKHNlbGYsIGJ1ZiA9IE5vbmUpOgogICAgICAg ICBpZiBidWYgaXMgTm9uZToKICAgICAgICAgICAgIGlmIHNlbGYuZmlsZW5hbWUgaXMgTm9uZToK LSAgICAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yLCAiTm8gY29uZmlnIGZpbGUgZGVmaW5l ZCB0byBwYXJzZSEiCisgICAgICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcigiTm8gY29uZmln IGZpbGUgZGVmaW5lZCB0byBwYXJzZSEiKQogCiAgICAgICAgICAgICBmID0gb3BlbihzZWxmLmZp bGVuYW1lLCAncicpCiAgICAgICAgICAgICBsaW5lcyA9IGYucmVhZGxpbmVzKCkKQEAgLTM5OCw3 ICs0MDEsNyBAQCBjbGFzcyBHcnViMkNvbmZpZ0ZpbGUoX0dydWJDb25maWdGaWxlKToKICAgICAg ICAgICAgIHRpdGxlX21hdGNoID0gcmUubWF0Y2goJ15tZW51ZW50cnkgWyJcJ10oLio/KVsiXCdd ICguKil7JywgbCkKICAgICAgICAgICAgIGlmIHRpdGxlX21hdGNoOgogICAgICAgICAgICAgICAg IGlmIGltZyBpcyBub3QgTm9uZToKLSAgICAgICAgICAgICAgICAgICAgcmFpc2UgUnVudGltZUVy cm9yLCAic3ludGF4IGVycm9yOiBjYW5ub3QgbmVzdCBtZW51ZW50cnkgKCVkICVzKSIgJSAobGVu KGltZyksaW1nKQorICAgICAgICAgICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IoInN5bnRh eCBlcnJvcjogY2Fubm90IG5lc3QgbWVudWVudHJ5ICglZCAlcykiICUgKGxlbihpbWcpLGltZykp CiAgICAgICAgICAgICAgICAgaW1nID0gW10KICAgICAgICAgICAgICAgICB0aXRsZSA9IHRpdGxl X21hdGNoLmdyb3VwKDEpCiAgICAgICAgICAgICAgICAgY29udGludWUKQEAgLTQxMyw3ICs0MTYs NyBAQCBjbGFzcyBHcnViMkNvbmZpZ0ZpbGUoX0dydWJDb25maWdGaWxlKToKICAgICAgICAgICAg ICAgICAgICAgICAgIG1lbnVfbGV2ZWwgLT0gMQogICAgICAgICAgICAgICAgICAgICAgICAgY29u dGludWUKICAgICAgICAgICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICAgICAgICAg IHJhaXNlIFJ1bnRpbWVFcnJvciwgInN5bnRheCBlcnJvcjogY2xvc2luZyBicmFjZSB3aXRob3V0 IG1lbnVlbnRyeSIKKyAgICAgICAgICAgICAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcigi c3ludGF4IGVycm9yOiBjbG9zaW5nIGJyYWNlIHdpdGhvdXQgbWVudWVudHJ5IikKIAogICAgICAg ICAgICAgICAgIHNlbGYuYWRkX2ltYWdlKEdydWIySW1hZ2UodGl0bGUsIGltZykpCiAgICAgICAg ICAgICAgICAgaW1nID0gTm9uZQpAQCAtNDI4LDcgKzQzMSw3IEBAIGNsYXNzIEdydWIyQ29uZmln RmlsZShfR3J1YkNvbmZpZ0ZpbGUpOgogICAgICAgICAgICAgaWYgY29tID09ICJzZXQiOgogICAg ICAgICAgICAgICAgIChjb20sYXJnKSA9IGdydWIyX2hhbmRsZV9zZXQoYXJnKQogICAgICAgICAg ICAgICAgIAotICAgICAgICAgICAgaWYgc2VsZi5jb21tYW5kcy5oYXNfa2V5KGNvbSk6CisgICAg ICAgICAgICBpZiBjb20gaW4gc2VsZi5jb21tYW5kczoKICAgICAgICAgICAgICAgICBpZiBzZWxm LmNvbW1hbmRzW2NvbV0gaXMgbm90IE5vbmU6CiAgICAgICAgICAgICAgICAgICAgIGFyZ19zdHJp cCA9IGFyZy5zdHJpcCgpCiAgICAgICAgICAgICAgICAgICAgIGlmIGFyZ19zdHJpcCA9PSAiJHtz YXZlZF9lbnRyeX0iIG9yIGFyZ19zdHJpcCA9PSAiJHtuZXh0X2VudHJ5fSI6CkBAIC00NDMsNyAr NDQ2LDcgQEAgY2xhc3MgR3J1YjJDb25maWdGaWxlKF9HcnViQ29uZmlnRmlsZSk6CiAgICAgICAg ICAgICAgICAgbG9nZ2luZy53YXJuaW5nKCJVbmtub3duIGRpcmVjdGl2ZSAlcyIgJShjb20sKSkK ICAgICAgICAgICAgIAogICAgICAgICBpZiBpbWcgaXMgbm90IE5vbmU6Ci0gICAgICAgICAgICBy YWlzZSBSdW50aW1lRXJyb3IsICJzeW50YXggZXJyb3I6IGVuZCBvZiBmaWxlIHdpdGggb3BlbiBt ZW51ZW50cnkoJWQgJXMpIiAlIChsZW4oaW1nKSxpbWcpCisgICAgICAgICAgICByYWlzZSBSdW50 aW1lRXJyb3IoInN5bnRheCBlcnJvcjogZW5kIG9mIGZpbGUgd2l0aCBvcGVuIG1lbnVlbnRyeSgl ZCAlcykiICUgKGxlbihpbWcpLGltZykpCiAKICAgICAgICAgaWYgc2VsZi5oYXNQYXNzd29yZCgp OgogICAgICAgICAgICAgc2VsZi5zZXRQYXNzd29yZEFjY2VzcyhGYWxzZSkKQEAgLTQ2MiwxMiAr NDY1LDEyIEBAIGNsYXNzIEdydWIyQ29uZmlnRmlsZShfR3J1YkNvbmZpZ0ZpbGUpOgogICAgICAg ICAKIGlmIF9fbmFtZV9fID09ICJfX21haW5fXyI6CiAgICAgaWYgbGVuKHN5cy5hcmd2KSA8IDM6 Ci0gICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvciwgIk5lZWQgYSBncnViIHZlcnNpb24gKFwiZ3J1 YlwiIG9yIFwiZ3J1YjJcIikgYW5kIGEgZ3J1Yi5jb25mIG9yIGdydWIuY2ZnIHRvIHJlYWQiCisg ICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcignTmVlZCBhIGdydWIgdmVyc2lvbiAoImdydWIiIG9y ICJncnViMiIpIGFuZCBhIGdydWIuY29uZiBvciBncnViLmNmZyB0byByZWFkJykKICAgICBpZiBz eXMuYXJndlsxXSA9PSAiZ3J1YiI6CiAgICAgICAgIGcgPSBHcnViQ29uZmlnRmlsZShzeXMuYXJn dlsyXSkKICAgICBlbGlmIHN5cy5hcmd2WzFdID09ICJncnViMiI6CiAgICAgICAgIGcgPSBHcnVi MkNvbmZpZ0ZpbGUoc3lzLmFyZ3ZbMl0pCiAgICAgZWxzZToKLSAgICAgICAgcmFpc2UgUnVudGlt ZUVycm9yLCAiVW5rbm93biBjb25maWcgdHlwZSAlcyIgJSBzeXMuYXJndlsxXQorICAgICAgICBy YWlzZSBSdW50aW1lRXJyb3IoIlVua25vd24gY29uZmlnIHR5cGUgJXMiICUgc3lzLmFyZ3ZbMV0p CiAgICAgZm9yIGkgaW4gZy5pbWFnZXM6Ci0gICAgICAgIHByaW50IGkgIywgaS50aXRsZSwgaS5y b290LCBpLmtlcm5lbCwgaS5hcmdzLCBpLmluaXRyZAorICAgICAgICBwcmludChpKSAjLCBpLnRp dGxlLCBpLnJvb3QsIGkua2VybmVsLCBpLmFyZ3MsIGkuaW5pdHJkCmRpZmYgLS1naXQgYS90b29s cy9weWdydWIvc3JjL0xpbG9Db25mLnB5IGIvdG9vbHMvcHlncnViL3NyYy9MaWxvQ29uZi5weQpp bmRleCAyY2I2NDlmMTE1Li5lM2JmY2I1MjQ0IDEwMDY0NAotLS0gYS90b29scy9weWdydWIvc3Jj L0xpbG9Db25mLnB5CisrKyBiL3Rvb2xzL3B5Z3J1Yi9zcmMvTGlsb0NvbmYucHkKQEAgLTIsOSAr MiwxMSBAQAogI0xpbG9Db25mLnB5CiAjCiAKK2Zyb20gX19mdXR1cmVfXyBpbXBvcnQgcHJpbnRf ZnVuY3Rpb24sIGFic29sdXRlX2ltcG9ydAorCiBpbXBvcnQgc3lzLCByZSwgb3MKIGltcG9ydCBs b2dnaW5nCi1pbXBvcnQgR3J1YkNvbmYKK2Zyb20gLiBpbXBvcnQgR3J1YkNvbmYKIAogY2xhc3Mg TGlsb0ltYWdlKG9iamVjdCk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIGxpbmVzLCBwYXRoKToK QEAgLTI0LDEyICsyNiwxMyBAQCBjbGFzcyBMaWxvSW1hZ2Uob2JqZWN0KToKICAgICAgICAgc2Vs Zi5saW5lcyA9IFtdCiAgICAgICAgIHNlbGYucGF0aCA9IHBhdGgKICAgICAgICAgc2VsZi5yb290 ID0gIiIKLSAgICAgICAgbWFwKHNlbGYuc2V0X2Zyb21fbGluZSwgbGluZXMpCisgICAgICAgIGZv ciBsaW5lIGluIGxpbmVzOgorICAgICAgICAgICAgc2VsZi5zZXRfZnJvbV9saW5lKGxpbmUpCiAK ICAgICBkZWYgc2V0X2Zyb21fbGluZShzZWxmLCBsaW5lLCByZXBsYWNlID0gTm9uZSk6CiAgICAg ICAgIChjb20sIGFyZykgPSBHcnViQ29uZi5ncnViX2V4YWN0X3NwbGl0KGxpbmUsIDIpCiAKLSAg ICAgICAgaWYgc2VsZi5jb21tYW5kcy5oYXNfa2V5KGNvbSk6CisgICAgICAgIGlmIGNvbSBpbiBz ZWxmLmNvbW1hbmRzOgogICAgICAgICAgICAgaWYgc2VsZi5jb21tYW5kc1tjb21dIGlzIG5vdCBO b25lOgogICAgICAgICAgICAgICAgIHNldGF0dHIoc2VsZiwgc2VsZi5jb21tYW5kc1tjb21dLCBy ZS5zdWIoJ14iKC4rKSIkJywgciJcMSIsIGFyZy5zdHJpcCgpKSkKICAgICAgICAgICAgIGVsc2U6 CkBAIC05Nyw3ICsxMDAsNyBAQCBjbGFzcyBMaWxvQ29uZmlnRmlsZShvYmplY3QpOgogICAgIGRl ZiBwYXJzZShzZWxmLCBidWYgPSBOb25lKToKICAgICAgICAgaWYgYnVmIGlzIE5vbmU6CiAgICAg ICAgICAgICBpZiBzZWxmLmZpbGVuYW1lIGlzIE5vbmU6Ci0gICAgICAgICAgICAgICAgcmFpc2Ug VmFsdWVFcnJvciwgIk5vIGNvbmZpZyBmaWxlIGRlZmluZWQgdG8gcGFyc2UhIgorICAgICAgICAg ICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoIk5vIGNvbmZpZyBmaWxlIGRlZmluZWQgdG8gcGFyc2Uh IikKIAogICAgICAgICAgICAgZiA9IG9wZW4oc2VsZi5maWxlbmFtZSwgJ3InKQogICAgICAgICAg ICAgbGluZXMgPSBmLnJlYWRsaW5lcygpCkBAIC0xMjcsNyArMTMwLDcgQEAgY2xhc3MgTGlsb0Nv bmZpZ0ZpbGUob2JqZWN0KToKICAgICAgICAgICAgICAgICBjb250aW51ZQogCiAgICAgICAgICAg ICAoY29tLCBhcmcpID0gR3J1YkNvbmYuZ3J1Yl9leGFjdF9zcGxpdChsLCAyKQotICAgICAgICAg ICAgaWYgc2VsZi5jb21tYW5kcy5oYXNfa2V5KGNvbSk6CisgICAgICAgICAgICBpZiBjb20gaW4g c2VsZi5jb21tYW5kczoKICAgICAgICAgICAgICAgICBpZiBzZWxmLmNvbW1hbmRzW2NvbV0gaXMg bm90IE5vbmU6CiAgICAgICAgICAgICAgICAgICAgIHNldGF0dHIoc2VsZiwgc2VsZi5jb21tYW5k c1tjb21dLCBhcmcuc3RyaXAoKSkKICAgICAgICAgICAgICAgICBlbHNlOgpAQCAtMTcwLDggKzE3 Myw4IEBAIGNsYXNzIExpbG9Db25maWdGaWxlKG9iamVjdCk6CiAKIGlmIF9fbmFtZV9fID09ICJf X21haW5fXyI6CiAgICAgaWYgbGVuKHN5cy5hcmd2KSA8IDI6Ci0gICAgICAgIHJhaXNlIFJ1bnRp bWVFcnJvciwgIk5lZWQgYSBsaWxvLmNvbmYgdG8gcmVhZCIKKyAgICAgICAgcmFpc2UgUnVudGlt ZUVycm9yKCJOZWVkIGEgbGlsby5jb25mIHRvIHJlYWQiKQogICAgIGcgPSBMaWxvQ29uZmlnRmls ZShzeXMuYXJndlsxXSkKICAgICBmb3IgaSBpbiBnLmltYWdlczoKLSAgICAgICAgcHJpbnQgaSAj LCBpLnRpdGxlLCBpLnJvb3QsIGkua2VybmVsLCBpLmFyZ3MsIGkuaW5pdHJkCi0gICAgcHJpbnQg Zy5kZWZhdWx0CisgICAgICAgIHByaW50KGkpICMsIGkudGl0bGUsIGkucm9vdCwgaS5rZXJuZWws IGkuYXJncywgaS5pbml0cmQKKyAgICBwcmludChnLmRlZmF1bHQpCmRpZmYgLS1naXQgYS90b29s cy9weWdydWIvc3JjL3B5Z3J1YiBiL3Rvb2xzL3B5Z3J1Yi9zcmMvcHlncnViCmluZGV4IDExODli MWNhNDguLmRiZGNlMzE1YzYgMTAwNzU1Ci0tLSBhL3Rvb2xzL3B5Z3J1Yi9zcmMvcHlncnViCisr KyBiL3Rvb2xzL3B5Z3J1Yi9zcmMvcHlncnViCkBAIC0xMiwxMyArMTIsMTUgQEAKICMgYWxvbmcg d2l0aCB0aGlzIHByb2dyYW07IElmIG5vdCwgc2VlIDxodHRwOi8vd3d3LmdudS5vcmcvbGljZW5z ZXMvPi4KICMKIAorZnJvbSBfX2Z1dHVyZV9fIGltcG9ydCBwcmludF9mdW5jdGlvbgorCiBpbXBv cnQgb3MsIHN5cywgc3RyaW5nLCBzdHJ1Y3QsIHRlbXBmaWxlLCByZSwgdHJhY2ViYWNrLCBzdGF0 LCBlcnJubwogaW1wb3J0IGNvcHkKIGltcG9ydCBsb2dnaW5nCiBpbXBvcnQgcGxhdGZvcm0KIGlt cG9ydCB4ZW4ubG93bGV2ZWwueGMKIAotaW1wb3J0IGN1cnNlcywgX2N1cnNlcywgY3Vyc2VzLndy YXBwZXIsIGN1cnNlcy50ZXh0cGFkLCBjdXJzZXMuYXNjaWkKK2ltcG9ydCBjdXJzZXMsIF9jdXJz ZXMsIGN1cnNlcy50ZXh0cGFkLCBjdXJzZXMuYXNjaWkKIGltcG9ydCBnZXRvcHQKIAogaW1wb3J0 IHhlbmZzaW1hZ2UKQEAgLTc3LDcgKzc5LDcgQEAgZGVmIGdldF9zb2xhcmlzX3NsaWNlKGZpbGUs IG9mZnNldCk6CiAgICAgYnVmID0gb3MucmVhZChmZCwgNTEyKQogICAgIG9zLmNsb3NlKGZkKQog ICAgIGlmIHN0cnVjdC51bnBhY2soIjxIIiwgYnVmWzUwODo1MTBdKVswXSAhPSBES0xfTUFHSUM6 Ci0gICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvciwgIkludmFsaWQgZGlza2xhYmVsIG1hZ2ljIgor ICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IoIkludmFsaWQgZGlza2xhYmVsIG1hZ2ljIikKIAog ICAgIG5zbGljZXMgPSBzdHJ1Y3QudW5wYWNrKCI8SCIsIGJ1ZlszMDozMl0pWzBdCiAKQEAgLTg4 LDcgKzkwLDcgQEAgZGVmIGdldF9zb2xhcmlzX3NsaWNlKGZpbGUsIG9mZnNldCk6CiAgICAgICAg IGlmIHNsaWNldGFnID09IFZfUk9PVDoKICAgICAgICAgICAgIHJldHVybiBzbGljZXNlY3QgKiBT RUNUT1JfU0laRQogCi0gICAgcmFpc2UgUnVudGltZUVycm9yLCAiTm8gcm9vdCBzbGljZSBmb3Vu ZCIgICAgICAKKyAgICByYWlzZSBSdW50aW1lRXJyb3IoIk5vIHJvb3Qgc2xpY2UgZm91bmQiKQog CiBkZWYgZ2V0X2ZzX29mZnNldF9ncHQoZmlsZSk6CiAgICAgZmQgPSBvcy5vcGVuKGZpbGUsIG9z Lk9fUkRPTkxZKQpAQCAtNDIzLDIwICs0MjUsMTcgQEAgY2xhc3MgR3J1YjoKICAgICAgICAgd2Un cmUgYmVpbmcgZ2l2ZW4gYSByYXcgY29uZmlnIGZpbGUgcmF0aGVyIHRoYW4gYSBkaXNrIGltYWdl LiIiIgogICAgICAgICAKICAgICAgICAgaWYgbm90IG9zLmFjY2Vzcyhmbiwgb3MuUl9PSyk6Ci0g ICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IsICJVbmFibGUgdG8gYWNjZXNzICVzIiAlKGZu LCkKKyAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcigiVW5hYmxlIHRvIGFjY2VzcyAlcyIg JShmbiwpKQogCi0gICAgICAgIGNmZ19saXN0ID0gbWFwKGxhbWJkYSB4OiAoeCxncnViLkdydWJD b25mLkdydWIyQ29uZmlnRmlsZSksCi0gICAgICAgICAgICAgICAgICAgICAgIFsiL2Jvb3QvZ3J1 Yi9ncnViLmNmZyIsICIvZ3J1Yi9ncnViLmNmZyIsCi0gICAgICAgICAgICAgICAgICAgICAgICAi L2Jvb3QvZ3J1YjIvZ3J1Yi5jZmciLCAiL2dydWIyL2dydWIuY2ZnIl0pICsgXAotICAgICAgICAg ICAgICAgICAgIG1hcChsYW1iZGEgeDogKHgsZ3J1Yi5FeHRMaW51eENvbmYuRXh0TGludXhDb25m aWdGaWxlKSwKLSAgICAgICAgICAgICAgICAgICAgICAgWyIvYm9vdC9pc29saW51eC9pc29saW51 eC5jZmciLAorICAgICAgICBjZmdfbGlzdCA9IFsoeCxncnViLkdydWJDb25mLkdydWIyQ29uZmln RmlsZSkgZm9yIHggaW4gWyIvYm9vdC9ncnViL2dydWIuY2ZnIiwgIi9ncnViL2dydWIuY2ZnIiwK KyAgICAgICAgICAgICAgICAgICAgICAgICIvYm9vdC9ncnViMi9ncnViLmNmZyIsICIvZ3J1YjIv Z3J1Yi5jZmciXV0gKyBcCisgICAgICAgICAgICAgICAgICAgWyh4LGdydWIuRXh0TGludXhDb25m LkV4dExpbnV4Q29uZmlnRmlsZSkgZm9yIHggaW4gWyIvYm9vdC9pc29saW51eC9pc29saW51eC5j ZmciLAogICAgICAgICAgICAgICAgICAgICAgICAgIi9ib290L2V4dGxpbnV4L2V4dGxpbnV4LmNv bmYiLAogICAgICAgICAgICAgICAgICAgICAgICAgIi9ib290L2V4dGxpbnV4LmNvbmYiLAogICAg ICAgICAgICAgICAgICAgICAgICAgIi9leHRsaW51eC9leHRsaW51eC5jb25mIiwKLSAgICAgICAg ICAgICAgICAgICAgICAgICIvZXh0bGludXguY29uZiJdKSArIFwKLSAgICAgICAgICAgICAgICAg ICBtYXAobGFtYmRhIHg6ICh4LGdydWIuR3J1YkNvbmYuR3J1YkNvbmZpZ0ZpbGUpLAotICAgICAg ICAgICAgICAgICAgICAgICBbIi9ib290L2dydWIvbWVudS5sc3QiLCAiL2Jvb3QvZ3J1Yi9ncnVi LmNvbmYiLAotICAgICAgICAgICAgICAgICAgICAgICAgIi9ncnViL21lbnUubHN0IiwgIi9ncnVi L2dydWIuY29uZiJdKQorICAgICAgICAgICAgICAgICAgICAgICAgIi9leHRsaW51eC5jb25mIl1d ICsgXAorICAgICAgICAgICAgICAgICAgIFsoeCxncnViLkdydWJDb25mLkdydWJDb25maWdGaWxl KSBmb3IgeCBpbiBbIi9ib290L2dydWIvbWVudS5sc3QiLCAiL2Jvb3QvZ3J1Yi9ncnViLmNvbmYi LAorICAgICAgICAgICAgICAgICAgICAgICAgIi9ncnViL21lbnUubHN0IiwgIi9ncnViL2dydWIu Y29uZiJdXQogCiAgICAgICAgIGlmIG5vdCBmczoKICAgICAgICAgICAgICMgc2V0IHRoZSBjb25m aWcgZmlsZSBhbmQgcGFyc2UgaXQKQEAgLTQ0OCwxMiArNDQ3LDEyIEBAIGNsYXNzIEdydWI6CiAK ICAgICAgICAgZm9yIGYscGFyc2VyIGluIGNmZ19saXN0OgogICAgICAgICAgICAgaWYgZnMuZmls ZV9leGlzdHMoZik6Ci0gICAgICAgICAgICAgICAgcHJpbnQgPj5zeXMuc3RkZXJyLCAiVXNpbmcg JXMgdG8gcGFyc2UgJXMiICUgKHBhcnNlcixmKQorICAgICAgICAgICAgICAgIHByaW50KCJVc2lu ZyAlcyB0byBwYXJzZSAlcyIgJSAocGFyc2VyLGYpLCBmaWxlPXN5cy5zdGRlcnIpCiAgICAgICAg ICAgICAgICAgc2VsZi5jZiA9IHBhcnNlcigpCiAgICAgICAgICAgICAgICAgc2VsZi5jZi5maWxl bmFtZSA9IGYKICAgICAgICAgICAgICAgICBicmVhawogICAgICAgICBpZiBzZWxmLl9fZGljdF9f LmdldCgnY2YnLCBOb25lKSBpcyBOb25lOgotICAgICAgICAgICAgcmFpc2UgUnVudGltZUVycm9y LCAiY291bGRuJ3QgZmluZCBib290bG9hZGVyIGNvbmZpZyBmaWxlIGluIHRoZSBpbWFnZSBwcm92 aWRlZC4iCisgICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IoImNvdWxkbid0IGZpbmQgYm9v dGxvYWRlciBjb25maWcgZmlsZSBpbiB0aGUgaW1hZ2UgcHJvdmlkZWQuIikKICAgICAgICAgZiA9 IGZzLm9wZW5fZmlsZShzZWxmLmNmLmZpbGVuYW1lKQogICAgICAgICAjIGxpbWl0IHJlYWQgc2l6 ZSB0byBhdm9pZCBwYXRob2xvZ2ljYWwgY2FzZXMKICAgICAgICAgYnVmID0gZi5yZWFkKEZTX1JF QURfTUFYKQpAQCAtNjI4LDExICs2MjcsMTEgQEAgZGVmIHJ1bl9ncnViKGZpbGUsIGVudHJ5LCBm cywgY2ZnX2FyZ3MpOgogICAgIGlmIGxpc3RfZW50cmllczoKICAgICAgICAgZm9yIGkgaW4gcmFu Z2UobGVuKGcuY2YuaW1hZ2VzKSk6CiAgICAgICAgICAgICBpbWcgPSBnLmNmLmltYWdlc1tpXQot ICAgICAgICAgICAgcHJpbnQgInRpdGxlOiAlcyIgJSBpbWcudGl0bGUKLSAgICAgICAgICAgIHBy aW50ICIgIHJvb3Q6ICVzIiAlIGltZy5yb290Ci0gICAgICAgICAgICBwcmludCAiICBrZXJuZWw6 ICVzIiAlIGltZy5rZXJuZWxbMV0KLSAgICAgICAgICAgIHByaW50ICIgIGFyZ3M6ICVzIiAlIGlt Zy5hcmdzCi0gICAgICAgICAgICBwcmludCAiICBpbml0cmQ6ICVzIiAlIGltZy5pbml0cmRbMV0K KyAgICAgICAgICAgIHByaW50KCJ0aXRsZTogJXMiICUgaW1nLnRpdGxlKQorICAgICAgICAgICAg cHJpbnQoIiAgcm9vdDogJXMiICUgaW1nLnJvb3QpCisgICAgICAgICAgICBwcmludCgiICBrZXJu ZWw6ICVzIiAlIGltZy5rZXJuZWxbMV0pCisgICAgICAgICAgICBwcmludCgiICBhcmdzOiAlcyIg JSBpbWcuYXJncykKKyAgICAgICAgICAgIHByaW50KCIgIGluaXRyZDogJXMiICUgaW1nLmluaXRy ZFsxXSkKIAogICAgIGlmIGludGVyYWN0aXZlIGFuZCBub3QgbGlzdF9lbnRyaWVzOgogICAgICAg ICBjdXJzZXMud3JhcHBlcihydW5fbWFpbikKQEAgLTY0Niw3ICs2NDUsNyBAQCBkZWYgcnVuX2dy dWIoZmlsZSwgZW50cnksIGZzLCBjZmdfYXJncyk6CiAgICAgICAgICAgIHNlbCA9IGlkeAogCiAg ICAgaWYgc2VsID09IC0xOgotICAgICAgICBwcmludCAiTm8ga2VybmVsIGltYWdlIHNlbGVjdGVk ISIKKyAgICAgICAgcHJpbnQoIk5vIGtlcm5lbCBpbWFnZSBzZWxlY3RlZCEiKQogICAgICAgICBz eXMuZXhpdCgxKQogCiAgICAgdHJ5OgpAQCAtNzMxLDcgKzczMCw3IEBAIGRlZiBmb3JtYXRfc3hw KGtlcm5lbCwgcmFtZGlzaywgYXJncyk6CiBkZWYgZm9ybWF0X3NpbXBsZShrZXJuZWwsIHJhbWRp c2ssIGFyZ3MsIHNlcCk6CiAgICAgZm9yIGNoZWNrIGluIChrZXJuZWwsIHJhbWRpc2ssIGFyZ3Mp OgogICAgICAgICBpZiBjaGVjayBpcyBub3QgTm9uZSBhbmQgc2VwIGluIGNoZWNrOgotICAgICAg ICAgICAgcmFpc2UgUnVudGltZUVycm9yLCAic2ltcGxlIGZvcm1hdCBjYW5ub3QgcmVwcmVzZW50 IGRlbGltaXRlci1jb250YWluaW5nIHZhbHVlIgorICAgICAgICAgICAgcmFpc2UgUnVudGltZUVy cm9yKCJzaW1wbGUgZm9ybWF0IGNhbm5vdCByZXByZXNlbnQgZGVsaW1pdGVyLWNvbnRhaW5pbmcg dmFsdWUiKQogICAgIHMgPSAoImtlcm5lbCAlcyIgJSBrZXJuZWwpICsgc2VwCiAgICAgaWYgcmFt ZGlzazoKICAgICAgICAgcyArPSAoInJhbWRpc2sgJXMiICUgcmFtZGlzaykgKyBzZXAKQEAgLTc0 NCw3ICs3NDMsNyBAQCBpZiBfX25hbWVfXyA9PSAiX19tYWluX18iOgogICAgIHNlbCA9IE5vbmUK ICAgICAKICAgICBkZWYgdXNhZ2UoKToKLSAgICAgICAgcHJpbnQgPj4gc3lzLnN0ZGVyciwgIlVz YWdlOiAlcyBbLXF8LS1xdWlldF0gWy1pfC0taW50ZXJhY3RpdmVdIFstbHwtLWxpc3QtZW50cmll c10gWy1ufC0tbm90LXJlYWxseV0gWy0tb3V0cHV0PV0gWy0ta2VybmVsPV0gWy0tcmFtZGlzaz1d IFstLWFyZ3M9XSBbLS1lbnRyeT1dIFstLW91dHB1dC1kaXJlY3Rvcnk9XSBbLS1vdXRwdXQtZm9y bWF0PXN4cHxzaW1wbGV8c2ltcGxlMF0gWy0tb2Zmc2V0PV0gPGltYWdlPiIgJShzeXMuYXJndlsw XSwpCisgICAgICAgIHByaW50KCJVc2FnZTogJXMgWy1xfC0tcXVpZXRdIFstaXwtLWludGVyYWN0 aXZlXSBbLWx8LS1saXN0LWVudHJpZXNdIFstbnwtLW5vdC1yZWFsbHldIFstLW91dHB1dD1dIFst LWtlcm5lbD1dIFstLXJhbWRpc2s9XSBbLS1hcmdzPV0gWy0tZW50cnk9XSBbLS1vdXRwdXQtZGly ZWN0b3J5PV0gWy0tb3V0cHV0LWZvcm1hdD1zeHB8c2ltcGxlfHNpbXBsZTBdIFstLW9mZnNldD1d IDxpbWFnZT4iICUoc3lzLmFyZ3ZbMF0sKSwgZmlsZT1zeXMuc3RkZXJyKQogCiAgICAgZGVmIGNv cHlfZnJvbV9pbWFnZShmcywgZmlsZV90b19yZWFkLCBmaWxlX3R5cGUsIG91dHB1dF9kaXJlY3Rv cnksCiAgICAgICAgICAgICAgICAgICAgICAgICBub3RfcmVhbGx5KToKQEAgLTc1NSw4ICs3NTQs OCBAQCBpZiBfX25hbWVfXyA9PSAiX19tYWluX18iOgogICAgICAgICAgICAgICAgIHN5cy5leGl0 KCJUaGUgcmVxdWVzdGVkICVzIGZpbGUgZG9lcyBub3QgZXhpc3QiICUgZmlsZV90eXBlKQogICAg ICAgICB0cnk6CiAgICAgICAgICAgICBkYXRhZmlsZSA9IGZzLm9wZW5fZmlsZShmaWxlX3RvX3Jl YWQpCi0gICAgICAgIGV4Y2VwdCBFeGNlcHRpb24sIGU6Ci0gICAgICAgICAgICBwcmludCA+PnN5 cy5zdGRlcnIsIGUKKyAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgorICAgICAgICAgICAg cHJpbnQoZSwgZmlsZT1zeXMuc3RkZXJyKQogICAgICAgICAgICAgc3lzLmV4aXQoIkVycm9yIG9w ZW5pbmcgJXMgaW4gZ3Vlc3QiICUgZmlsZV90b19yZWFkKQogICAgICAgICAodGZkLCByZXQpID0g dGVtcGZpbGUubWtzdGVtcChwcmVmaXg9ImJvb3RfIitmaWxlX3R5cGUrIi4iLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaXI9b3V0cHV0X2RpcmVjdG9yeSkKQEAgLTc2 OSw4ICs3NjgsOCBAQCBpZiBfX25hbWVfXyA9PSAiX19tYWluX18iOgogICAgICAgICAgICAgICAg IHJldHVybiByZXQKICAgICAgICAgICAgIHRyeToKICAgICAgICAgICAgICAgICBvcy53cml0ZSh0 ZmQsIGRhdGEpCi0gICAgICAgICAgICBleGNlcHQgRXhjZXB0aW9uLCBlOgotICAgICAgICAgICAg ICAgIHByaW50ID4+c3lzLnN0ZGVyciwgZQorICAgICAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBh cyBlOgorICAgICAgICAgICAgICAgIHByaW50KGUsIGZpbGU9c3lzLnN0ZGVycikKICAgICAgICAg ICAgICAgICBvcy5jbG9zZSh0ZmQpCiAgICAgICAgICAgICAgICAgb3MudW5saW5rKHJldCkKICAg ICAgICAgICAgICAgICBkZWwgZGF0YWZpbGUKQEAgLTgzNCw3ICs4MzMsNyBAQCBpZiBfX25hbWVf XyA9PSAiX19tYWluX18iOgogICAgICAgICAgICAgdHJ5OgogICAgICAgICAgICAgICAgIHBhcnRf b2ZmcyA9IFsgaW50KGEpIF0KICAgICAgICAgICAgIGV4Y2VwdCBWYWx1ZUVycm9yOgotICAgICAg ICAgICAgICAgIHByaW50ICJvZmZzZXQgdmFsdWUgbXVzdCBiZSBhbiBpbnRlZ2VyIgorICAgICAg ICAgICAgICAgIHByaW50KCJvZmZzZXQgdmFsdWUgbXVzdCBiZSBhbiBpbnRlZ2VyIikKICAgICAg ICAgICAgICAgICB1c2FnZSgpCiAgICAgICAgICAgICAgICAgc3lzLmV4aXQoMSkKICAgICAgICAg ZWxpZiBvIGluICgiLS1lbnRyeSIsKToKQEAgLTg0NywxMyArODQ2LDEzIEBAIGlmIF9fbmFtZV9f ID09ICJfX21haW5fXyI6CiAgICAgICAgICAgICBkZWJ1ZyA9IFRydWUKICAgICAgICAgZWxpZiBv IGluICgiLS1vdXRwdXQtZm9ybWF0IiwpOgogICAgICAgICAgICAgaWYgYSBub3QgaW4gWyJzeHAi LCAic2ltcGxlIiwgInNpbXBsZTAiXToKLSAgICAgICAgICAgICAgICBwcmludCAidW5rbm93biBv dXRwdXQgZm9ybWF0ICVzIiAlIGEKKyAgICAgICAgICAgICAgICBwcmludCgidW5rbm93biBvdXRw dXQgZm9ybWF0ICVzIiAlIGEpCiAgICAgICAgICAgICAgICAgdXNhZ2UoKQogICAgICAgICAgICAg ICAgIHN5cy5leGl0KDEpCiAgICAgICAgICAgICBvdXRwdXRfZm9ybWF0ID0gYQogICAgICAgICBl bGlmIG8gaW4gKCItLW91dHB1dC1kaXJlY3RvcnkiLCk6CiAgICAgICAgICAgICBpZiBub3Qgb3Mu cGF0aC5pc2RpcihhKToKLSAgICAgICAgICAgICAgICBwcmludCAiJXMgaXMgbm90IGFuIGV4aXN0 aW5nIGRpcmVjdG9yeSIgJSBhCisgICAgICAgICAgICAgICAgcHJpbnQoIiVzIGlzIG5vdCBhbiBl eGlzdGluZyBkaXJlY3RvcnkiICUgYSkKICAgICAgICAgICAgICAgICBzeXMuZXhpdCgxKQogICAg ICAgICAgICAgb3V0cHV0X2RpcmVjdG9yeSA9IGEKIApAQCAtODYyLDggKzg2MSw4IEBAIGlmIF9f bmFtZV9fID09ICJfX21haW5fXyI6CiAKIAogICAgIHRyeToKLSAgICAgICAgb3MubWFrZWRpcnMo b3V0cHV0X2RpcmVjdG9yeSwgMDcwMCkKLSAgICBleGNlcHQgT1NFcnJvcixlOgorICAgICAgICBv cy5tYWtlZGlycyhvdXRwdXRfZGlyZWN0b3J5LCAwbzcwMCkKKyAgICBleGNlcHQgT1NFcnJvciBh cyBlOgogICAgICAgICBpZiAoZS5lcnJubyA9PSBlcnJuby5FRVhJU1QpIGFuZCBvcy5wYXRoLmlz ZGlyKG91dHB1dF9kaXJlY3RvcnkpOgogICAgICAgICAgICAgcGFzcwogICAgICAgICBlbHNlOgpA QCAtODc3LDEwICs4NzYsMTAgQEAgaWYgX19uYW1lX18gPT0gIl9fbWFpbl9fIjoKICAgICAjIGRl YnVnCiAgICAgaWYgaXNjb25maWc6CiAgICAgICAgIGNob3NlbmNmZyA9IHJ1bl9ncnViKGZpbGUs IGVudHJ5LCBmcywgaW5jZmdbImFyZ3MiXSkKLSAgICAgICAgcHJpbnQgIiAga2VybmVsOiAlcyIg JSBjaG9zZW5jZmdbImtlcm5lbCJdCisgICAgICAgIHByaW50KCIgIGtlcm5lbDogJXMiICUgY2hv c2VuY2ZnWyJrZXJuZWwiXSkKICAgICAgICAgaWYgY2hvc2VuY2ZnWyJyYW1kaXNrIl06Ci0gICAg ICAgICAgICBwcmludCAiICBpbml0cmQ6ICVzIiAlIGNob3NlbmNmZ1sicmFtZGlzayJdCi0gICAg ICAgIHByaW50ICIgIGFyZ3M6ICVzIiAlIGNob3NlbmNmZ1siYXJncyJdCisgICAgICAgICAgICBw cmludCgiICBpbml0cmQ6ICVzIiAlIGNob3NlbmNmZ1sicmFtZGlzayJdKQorICAgICAgICBwcmlu dCgiICBhcmdzOiAlcyIgJSBjaG9zZW5jZmdbImFyZ3MiXSkKICAgICAgICAgc3lzLmV4aXQoMCkK IAogICAgICMgaWYgYm9vdCBmaWxlc3lzdGVtIGlzIHNldCB0aGVuIHBhc3MgdG8gZnNpbWFnZS5v cGVuCkBAIC05MjYsNyArOTI1LDcgQEAgaWYgX19uYW1lX18gPT0gIl9fbWFpbl9fIjoKIAogICAg ICMgRGlkIGxvb3BpbmcgdGhyb3VnaCBwYXJ0aXRpb25zIGZpbmQgdXMgYSBrZXJuZWw/CiAgICAg aWYgZnMgaXMgTm9uZToKLSAgICAgICAgcmFpc2UgUnVudGltZUVycm9yLCAiVW5hYmxlIHRvIGZp bmQgcGFydGl0aW9uIGNvbnRhaW5pbmcga2VybmVsIgorICAgICAgICByYWlzZSBSdW50aW1lRXJy b3IoIlVuYWJsZSB0byBmaW5kIHBhcnRpdGlvbiBjb250YWluaW5nIGtlcm5lbCIpCiAKICAgICBi b290Y2ZnWyJrZXJuZWwiXSA9IGNvcHlfZnJvbV9pbWFnZShmcywgY2hvc2VuY2ZnWyJrZXJuZWwi XSwgImtlcm5lbCIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3V0 cHV0X2RpcmVjdG9yeSwgbm90X3JlYWxseSkKLS0gCjIuMTEuMAoKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVu LWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcv bWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=