78263 2012-02-09 12:02:18 -0800 Rename ports.WebKitPort to DeprecatedPort and make it stop being all class methods 2012-02-09 12:11:31 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eric eric abarth ojan webkit.review.bot oldest_to_newest 553390 0 eric 2012-02-09 12:02:18 -0800 Rename ports.WebKitPort to DeprecatedPort and make it stop being all class methods 553392 1 126344 eric 2012-02-09 12:02:46 -0800 Created attachment 126344 Patch 553396 2 126344 abarth 2012-02-09 12:07:27 -0800 Comment on attachment 126344 Patch I would have called these things DeprecatedMacPort, but this is fine too. 553398 3 eric 2012-02-09 12:11:31 -0800 Committed r107271: <http://trac.webkit.org/changeset/107271> 126344 2012-02-09 12:02:46 -0800 2012-02-09 12:07:57 -0800 Patch bug-78263-20120209120245.patch text/plain 23656 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3MjYwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTZlZDRlOTVkOTdmYjNkNmU4ZTYxZjU2ZjhhM2JjNjgw Y2EyNzVkMC4uOTQxODg2NGY5MjRiYTQ3ODBkNjM1ZTkwZjlkNTMzNWE3ZjIxMjI5NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYx IEBACisyMDEyLTAyLTA5ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAg ICBSZW5hbWUgcG9ydHMuV2ViS2l0UG9ydCB0byBEZXByZWNhdGVkUG9ydCBhbmQgbWFrZSBpdCBz dG9wIGJlaW5nIGFsbCBjbGFzcyBtZXRob2RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03ODI2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRz LnB5OgorICAgICAgICAoRGVwcmVjYXRlZFBvcnQpOgorICAgICAgICAoRGVwcmVjYXRlZFBvcnQu bmFtZSk6CisgICAgICAgIChEZXByZWNhdGVkUG9ydC5mbGFnKToKKyAgICAgICAgKERlcHJlY2F0 ZWRQb3J0LnNjcmlwdF9wYXRoKToKKyAgICAgICAgKERlcHJlY2F0ZWRQb3J0LnNjcmlwdF9zaGVs bF9jb21tYW5kKToKKyAgICAgICAgKERlcHJlY2F0ZWRQb3J0LnBvcnQpOgorICAgICAgICAoRGVw cmVjYXRlZFBvcnQubWFrZUFyZ3MpOgorICAgICAgICAoRGVwcmVjYXRlZFBvcnQudXBkYXRlX3dl YmtpdF9jb21tYW5kKToKKyAgICAgICAgKERlcHJlY2F0ZWRQb3J0LmNoZWNrX3dlYmtpdF9zdHls ZV9jb21tYW5kKToKKyAgICAgICAgKERlcHJlY2F0ZWRQb3J0LnByZXBhcmVfY2hhbmdlbG9nX2Nv bW1hbmQpOgorICAgICAgICAoRGVwcmVjYXRlZFBvcnQuYnVpbGRfd2Via2l0X2NvbW1hbmQpOgor ICAgICAgICAoRGVwcmVjYXRlZFBvcnQucnVuX2phdmFzY3JpcHRjb3JlX3Rlc3RzX2NvbW1hbmQp OgorICAgICAgICAoRGVwcmVjYXRlZFBvcnQucnVuX3dlYmtpdF91bml0X3Rlc3RzX2NvbW1hbmQp OgorICAgICAgICAoRGVwcmVjYXRlZFBvcnQucnVuX3dlYmtpdF90ZXN0c19jb21tYW5kKToKKyAg ICAgICAgKERlcHJlY2F0ZWRQb3J0LnJ1bl9weXRob25fdW5pdHRlc3RzX2NvbW1hbmQpOgorICAg ICAgICAoRGVwcmVjYXRlZFBvcnQucnVuX3BlcmxfdW5pdHRlc3RzX2NvbW1hbmQpOgorICAgICAg ICAoRGVwcmVjYXRlZFBvcnQubGF5b3V0X3Rlc3RzX3Jlc3VsdHNfcGF0aCk6CisgICAgICAgIChN YWNQb3J0KToKKyAgICAgICAgKFdpblBvcnQpOgorICAgICAgICAoR3RrUG9ydCk6CisgICAgICAg IChHdGtQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKToKKyAgICAgICAgKEd0a1BvcnQucnVuX3dl YmtpdF90ZXN0c19jb21tYW5kKToKKyAgICAgICAgKFF0UG9ydCk6CisgICAgICAgIChRdFBvcnQu YnVpbGRfd2Via2l0X2NvbW1hbmQpOgorICAgICAgICAoRWZsUG9ydCk6CisgICAgICAgIChFZmxQ b3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKToKKyAgICAgICAgKENocm9taXVtUG9ydCk6CisgICAg ICAgIChDaHJvbWl1bVBvcnQudXBkYXRlX3dlYmtpdF9jb21tYW5kKToKKyAgICAgICAgKENocm9t aXVtUG9ydC5idWlsZF93ZWJraXRfY29tbWFuZCk6CisgICAgICAgIChDaHJvbWl1bVBvcnQucnVu X3dlYmtpdF90ZXN0c19jb21tYW5kKToKKyAgICAgICAgKENocm9taXVtUG9ydC5ydW5famF2YXNj cmlwdGNvcmVfdGVzdHNfY29tbWFuZCk6CisgICAgICAgIChDaHJvbWl1bVhWRkJQb3J0KToKKyAg ICAgICAgKENocm9taXVtWFZGQlBvcnQucnVuX3dlYmtpdF90ZXN0c19jb21tYW5kKToKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHNfdW5pdHRlc3QucHk6Cisg ICAgICAgIChEZXByZWNhdGVkUG9ydFRlc3QpOgorICAgICAgICAoRGVwcmVjYXRlZFBvcnRUZXN0 LnRlc3RfbWFjX3BvcnQpOgorICAgICAgICAoRGVwcmVjYXRlZFBvcnRUZXN0LnRlc3RfZ3RrX3Bv cnQpOgorICAgICAgICAoRGVwcmVjYXRlZFBvcnRUZXN0LnRlc3RfcXRfcG9ydCk6CisgICAgICAg IChEZXByZWNhdGVkUG9ydFRlc3QudGVzdF9jaHJvbWl1bV9wb3J0KToKKyAgICAgICAgKERlcHJl Y2F0ZWRQb3J0VGVzdC50ZXN0X2Nocm9taXVtX3h2ZmJfcG9ydCk6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Vhcmx5d2FybmluZ3N5c3RlbS5weToKKyAgICAgICAg KEFic3RyYWN0RWFybHlXYXJuaW5nU3lzdGVtLl9faW5pdF9fKToKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvc2hlcmlmZmJvdC5weToKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3Rvb2wvbWFpbi5weToKKyAgICAgICAgKFdlYktpdFBhdGNoKToKKyAgICAgICAg KFdlYktpdFBhdGNoLmhhbmRsZV9nbG9iYWxfb3B0aW9ucyk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS90b29sL3N0ZXBzL2Fic3RyYWN0c3RlcC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3Rvb2wvc3RlcHMvc3RlcHNfdW5pdHRlc3QucHk6CisgICAgICAgIChTdGVwc1Rlc3Qu dGVzdF9ydW50ZXN0c19hcmdzKToKKwogMjAxMi0wMi0wOSAgSm9jaGVuIEVpc2luZ2VyICA8am9j aGVuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIGFsd2F5cyBpbml0aWFsaXpl IG1ha2VBcmdzIGluIGJ1aWxkQ2hyb21pdW1OaW5qYQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vY29uZmlnL3BvcnRzLnB5CmluZGV4IDAyYzFmNWI1NTk4YWE4OTM0ODcxOWVkNGRm ODcxODlkMmY3MTM0ZDYuLjRiM2Q5MGExYTdjMTcyNDM4MmZhODI5ZWEyM2NhNWQ5NmFjMjRjNjkg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHMucHkKQEAg LTM1LDE3ICszNSwyNCBAQCBpbXBvcnQgc3lzCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0u ZXhlY3V0aXZlIGltcG9ydCBFeGVjdXRpdmUKIAogCi1jbGFzcyBXZWJLaXRQb3J0KG9iamVjdCk6 CitjbGFzcyBEZXByZWNhdGVkUG9ydChvYmplY3QpOgogICAgIHJlc3VsdHNfZGlyZWN0b3J5ID0g Ii90bXAvbGF5b3V0LXRlc3QtcmVzdWx0cyIKIAorICAgICMgRklYTUU6IFRoaXMgaXMgb25seSB1 c2VkIGJ5IEJvdEluZm8uCisgICAgZGVmIG5hbWUoc2VsZik6CisgICAgICAgIHJldHVybiBzZWxm Ll9fY2xhc3NfXworCisgICAgZGVmIGZsYWcoc2VsZik6CisgICAgICAgIGlmIHNlbGYucG9ydF9m bGFnX25hbWU6CisgICAgICAgICAgICByZXR1cm4gIi0tcG9ydD0lcyIgJSBzZWxmLnBvcnRfZmxh Z19uYW1lCisgICAgICAgIHJldHVybiBOb25lCisKICAgICAjIFdlIG1pZ2h0IG5lZWQgdG8gcGFz cyBzY20gaW50byB0aGlzIGZ1bmN0aW9uIGZvciBzY20uY2hlY2tvdXRfcm9vdAotICAgIEBjbGFz c21ldGhvZAotICAgIGRlZiBzY3JpcHRfcGF0aChjbHMsIHNjcmlwdF9uYW1lKToKKyAgICBkZWYg c2NyaXB0X3BhdGgoc2VsZiwgc2NyaXB0X25hbWUpOgogICAgICAgICByZXR1cm4gb3MucGF0aC5q b2luKCJUb29scyIsICJTY3JpcHRzIiwgc2NyaXB0X25hbWUpCiAKLSAgICBAY2xhc3NtZXRob2QK LSAgICBkZWYgc2NyaXB0X3NoZWxsX2NvbW1hbmQoY2xzLCBzY3JpcHRfbmFtZSk6Ci0gICAgICAg IHNjcmlwdF9wYXRoID0gY2xzLnNjcmlwdF9wYXRoKHNjcmlwdF9uYW1lKQorICAgIGRlZiBzY3Jp cHRfc2hlbGxfY29tbWFuZChzZWxmLCBzY3JpcHRfbmFtZSk6CisgICAgICAgIHNjcmlwdF9wYXRo ID0gc2VsZi5zY3JpcHRfcGF0aChzY3JpcHRfbmFtZSkKICAgICAgICAgcmV0dXJuIEV4ZWN1dGl2 ZS5zaGVsbF9jb21tYW5kX2Zvcl9zY3JpcHQoc2NyaXB0X3BhdGgpCiAKICAgICBAc3RhdGljbWV0 aG9kCkBAIC02NCwyMDYgKzcxLDEyNCBAQCBjbGFzcyBXZWJLaXRQb3J0KG9iamVjdCk6CiAgICAg ICAgICAgICAiRGFyd2luIjogTWFjUG9ydCwKICAgICAgICAgfQogICAgICAgICAjIERvIHdlIHJl YWxseSBuZWVkIE1hY1BvcnQgYXMgdGhlIHVsdGltYXRlIGRlZmF1bHQ/Ci0gICAgICAgIHJldHVy biBwb3J0cy5nZXQocG9ydF9uYW1lLCBkZWZhdWx0X3BvcnQuZ2V0KHBsYXRmb3JtLnN5c3RlbSgp LCBNYWNQb3J0KSkKKyAgICAgICAgcmV0dXJuIHBvcnRzLmdldChwb3J0X25hbWUsIGRlZmF1bHRf cG9ydC5nZXQocGxhdGZvcm0uc3lzdGVtKCksIE1hY1BvcnQpKSgpCiAKLSAgICBAc3RhdGljbWV0 aG9kCi0gICAgZGVmIG1ha2VBcmdzKCk6CisgICAgZGVmIG1ha2VBcmdzKHNlbGYpOgorICAgICAg ICAjIEZJWE1FOiBUaGlzIHNob3VsZG4ndCB1c2UgYSBzdGF0aWMgRXhlY3V0aXZlKCkuCiAgICAg ICAgIGFyZ3MgPSAnLS1tYWtlYXJncz0iLWolcyInICUgRXhlY3V0aXZlKCkuY3B1X2NvdW50KCkK ICAgICAgICAgaWYgb3MuZW52aXJvbi5oYXNfa2V5KCdNQUtFRkxBR1MnKToKICAgICAgICAgICAg IGFyZ3MgPSAnLS1tYWtlYXJncz0iJXMiJyAlIG9zLmVudmlyb25bJ01BS0VGTEFHUyddCiAgICAg ICAgIHJldHVybiBhcmdzCiAKLSAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgbmFtZShjbHMpOgot ICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yKCJzdWJjbGFzc2VzIG11c3QgaW1wbGVt ZW50IikKLQotICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBmbGFnKGNscyk6Ci0gICAgICAgIHJh aXNlIE5vdEltcGxlbWVudGVkRXJyb3IoInN1YmNsYXNzZXMgbXVzdCBpbXBsZW1lbnQiKQotCi0g ICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIHVwZGF0ZV93ZWJraXRfY29tbWFuZChjbHMsIG5vbl9p bnRlcmFjdGl2ZT1GYWxzZSk6Ci0gICAgICAgIHJldHVybiBjbHMuc2NyaXB0X3NoZWxsX2NvbW1h bmQoInVwZGF0ZS13ZWJraXQiKQorICAgIGRlZiB1cGRhdGVfd2Via2l0X2NvbW1hbmQoc2VsZiwg bm9uX2ludGVyYWN0aXZlPUZhbHNlKToKKyAgICAgICAgcmV0dXJuIHNlbGYuc2NyaXB0X3NoZWxs X2NvbW1hbmQoInVwZGF0ZS13ZWJraXQiKQogCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIGNo ZWNrX3dlYmtpdF9zdHlsZV9jb21tYW5kKGNscyk6Ci0gICAgICAgIHJldHVybiBjbHMuc2NyaXB0 X3NoZWxsX2NvbW1hbmQoImNoZWNrLXdlYmtpdC1zdHlsZSIpCisgICAgZGVmIGNoZWNrX3dlYmtp dF9zdHlsZV9jb21tYW5kKHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi5zY3JpcHRfc2hlbGxf Y29tbWFuZCgiY2hlY2std2Via2l0LXN0eWxlIikKIAotICAgIEBjbGFzc21ldGhvZAotICAgIGRl ZiBwcmVwYXJlX2NoYW5nZWxvZ19jb21tYW5kKGNscyk6Ci0gICAgICAgIHJldHVybiBjbHMuc2Ny aXB0X3NoZWxsX2NvbW1hbmQoInByZXBhcmUtQ2hhbmdlTG9nIikKKyAgICBkZWYgcHJlcGFyZV9j aGFuZ2Vsb2dfY29tbWFuZChzZWxmKToKKyAgICAgICAgcmV0dXJuIHNlbGYuc2NyaXB0X3NoZWxs X2NvbW1hbmQoInByZXBhcmUtQ2hhbmdlTG9nIikKIAotICAgIEBjbGFzc21ldGhvZAotICAgIGRl ZiBidWlsZF93ZWJraXRfY29tbWFuZChjbHMsIGJ1aWxkX3N0eWxlPU5vbmUpOgotICAgICAgICBj b21tYW5kID0gY2xzLnNjcmlwdF9zaGVsbF9jb21tYW5kKCJidWlsZC13ZWJraXQiKQorICAgIGRl ZiBidWlsZF93ZWJraXRfY29tbWFuZChzZWxmLCBidWlsZF9zdHlsZT1Ob25lKToKKyAgICAgICAg Y29tbWFuZCA9IHNlbGYuc2NyaXB0X3NoZWxsX2NvbW1hbmQoImJ1aWxkLXdlYmtpdCIpCiAgICAg ICAgIGlmIGJ1aWxkX3N0eWxlID09ICJkZWJ1ZyI6CiAgICAgICAgICAgICBjb21tYW5kLmFwcGVu ZCgiLS1kZWJ1ZyIpCiAgICAgICAgIGlmIGJ1aWxkX3N0eWxlID09ICJyZWxlYXNlIjoKICAgICAg ICAgICAgIGNvbW1hbmQuYXBwZW5kKCItLXJlbGVhc2UiKQogICAgICAgICByZXR1cm4gY29tbWFu ZAogCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIHJ1bl9qYXZhc2NyaXB0Y29yZV90ZXN0c19j b21tYW5kKGNscyk6Ci0gICAgICAgIHJldHVybiBjbHMuc2NyaXB0X3NoZWxsX2NvbW1hbmQoInJ1 bi1qYXZhc2NyaXB0Y29yZS10ZXN0cyIpCisgICAgZGVmIHJ1bl9qYXZhc2NyaXB0Y29yZV90ZXN0 c19jb21tYW5kKHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi5zY3JpcHRfc2hlbGxfY29tbWFu ZCgicnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzIikKIAotICAgIEBjbGFzc21ldGhvZAotICAgIGRl ZiBydW5fd2Via2l0X3VuaXRfdGVzdHNfY29tbWFuZChjbHMpOgorICAgIGRlZiBydW5fd2Via2l0 X3VuaXRfdGVzdHNfY29tbWFuZChzZWxmKToKICAgICAgICAgcmV0dXJuIE5vbmUKIAotICAgIEBj bGFzc21ldGhvZAotICAgIGRlZiBydW5fd2Via2l0X3Rlc3RzX2NvbW1hbmQoY2xzKToKLSAgICAg ICAgcmV0dXJuIGNscy5zY3JpcHRfc2hlbGxfY29tbWFuZCgicnVuLXdlYmtpdC10ZXN0cyIpCi0K LSAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgcnVuX3B5dGhvbl91bml0dGVzdHNfY29tbWFuZChj bHMpOgotICAgICAgICByZXR1cm4gY2xzLnNjcmlwdF9zaGVsbF9jb21tYW5kKCJ0ZXN0LXdlYmtp dHB5IikKLQotICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBydW5fcGVybF91bml0dGVzdHNfY29t bWFuZChjbHMpOgotICAgICAgICByZXR1cm4gY2xzLnNjcmlwdF9zaGVsbF9jb21tYW5kKCJ0ZXN0 LXdlYmtpdHBlcmwiKQotCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIGxheW91dF90ZXN0c19y ZXN1bHRzX3BhdGgoY2xzKToKLSAgICAgICAgcmV0dXJuIG9zLnBhdGguam9pbihjbHMucmVzdWx0 c19kaXJlY3RvcnksICJmdWxsX3Jlc3VsdHMuanNvbiIpCi0KLQotY2xhc3MgTWFjUG9ydChXZWJL aXRQb3J0KToKKyAgICBkZWYgcnVuX3dlYmtpdF90ZXN0c19jb21tYW5kKHNlbGYpOgorICAgICAg ICByZXR1cm4gc2VsZi5zY3JpcHRfc2hlbGxfY29tbWFuZCgicnVuLXdlYmtpdC10ZXN0cyIpCiAK LSAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgbmFtZShjbHMpOgotICAgICAgICByZXR1cm4gIk1h YyIKKyAgICBkZWYgcnVuX3B5dGhvbl91bml0dGVzdHNfY29tbWFuZChzZWxmKToKKyAgICAgICAg cmV0dXJuIHNlbGYuc2NyaXB0X3NoZWxsX2NvbW1hbmQoInRlc3Qtd2Via2l0cHkiKQogCi0gICAg QGNsYXNzbWV0aG9kCi0gICAgZGVmIGZsYWcoY2xzKToKLSAgICAgICAgcmV0dXJuICItLXBvcnQ9 bWFjIgorICAgIGRlZiBydW5fcGVybF91bml0dGVzdHNfY29tbWFuZChzZWxmKToKKyAgICAgICAg cmV0dXJuIHNlbGYuc2NyaXB0X3NoZWxsX2NvbW1hbmQoInRlc3Qtd2Via2l0cGVybCIpCiAKLSAg ICBAY2xhc3NtZXRob2QKLSAgICBkZWYgX3N5c3RlbV92ZXJzaW9uKGNscyk6Ci0gICAgICAgIHZl cnNpb25fc3RyaW5nID0gcGxhdGZvcm0ubWFjX3ZlcigpWzBdICAjIGUuZy4gIjEwLjUuNiIKLSAg ICAgICAgdmVyc2lvbl90dXBsZSA9IHZlcnNpb25fc3RyaW5nLnNwbGl0KCcuJykKLSAgICAgICAg cmV0dXJuIG1hcChpbnQsIHZlcnNpb25fdHVwbGUpCisgICAgZGVmIGxheW91dF90ZXN0c19yZXN1 bHRzX3BhdGgoc2VsZik6CisgICAgICAgIHJldHVybiBvcy5wYXRoLmpvaW4oc2VsZi5yZXN1bHRz X2RpcmVjdG9yeSwgImZ1bGxfcmVzdWx0cy5qc29uIikKIAotICAgIEBjbGFzc21ldGhvZAotICAg IGRlZiBpc19sZW9wYXJkKGNscyk6Ci0gICAgICAgIHJldHVybiB0dXBsZShjbHMuX3N5c3RlbV92 ZXJzaW9uKClbOjJdKSA9PSAoMTAsIDUpCiAKK2NsYXNzIE1hY1BvcnQoRGVwcmVjYXRlZFBvcnQp OgorICAgIHBvcnRfZmxhZ19uYW1lID0gIm1hYyIKIAotY2xhc3MgV2luUG9ydChXZWJLaXRQb3J0 KToKIAotICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBuYW1lKGNscyk6Ci0gICAgICAgIHJldHVy biAiV2luIgorY2xhc3MgV2luUG9ydChEZXByZWNhdGVkUG9ydCk6CisgICAgcG9ydF9mbGFnX25h bWUgPSAid2luIgogCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIGZsYWcoY2xzKToKLSAgICAg ICAgIyBGSVhNRTogVGhpcyBpcyBsYW1lLiAgV2Ugc2hvdWxkIGF1dG9nZW5lcmF0ZSB0aGlzIGZy b20gYSBjb2RlbmFtZSBvciBzb21ldGhpbmcuCi0gICAgICAgIHJldHVybiAiLS1wb3J0PXdpbiIK IAorY2xhc3MgR3RrUG9ydChEZXByZWNhdGVkUG9ydCk6CisgICAgcG9ydF9mbGFnX25hbWUgPSAi Z3RrIgogCi1jbGFzcyBHdGtQb3J0KFdlYktpdFBvcnQpOgotCi0gICAgQGNsYXNzbWV0aG9kCi0g ICAgZGVmIG5hbWUoY2xzKToKLSAgICAgICAgcmV0dXJuICJHdGsiCi0KLSAgICBAY2xhc3NtZXRo b2QKLSAgICBkZWYgZmxhZyhjbHMpOgotICAgICAgICByZXR1cm4gIi0tcG9ydD1ndGsiCi0KLSAg ICBAY2xhc3NtZXRob2QKLSAgICBkZWYgYnVpbGRfd2Via2l0X2NvbW1hbmQoY2xzLCBidWlsZF9z dHlsZT1Ob25lKToKLSAgICAgICAgY29tbWFuZCA9IFdlYktpdFBvcnQuYnVpbGRfd2Via2l0X2Nv bW1hbmQoYnVpbGRfc3R5bGU9YnVpbGRfc3R5bGUpCisgICAgZGVmIGJ1aWxkX3dlYmtpdF9jb21t YW5kKHNlbGYsIGJ1aWxkX3N0eWxlPU5vbmUpOgorICAgICAgICBjb21tYW5kID0gc3VwZXIoR3Rr UG9ydCwgc2VsZikuYnVpbGRfd2Via2l0X2NvbW1hbmQoYnVpbGRfc3R5bGU9YnVpbGRfc3R5bGUp CiAgICAgICAgIGNvbW1hbmQuYXBwZW5kKCItLWd0ayIpCiAgICAgICAgIGNvbW1hbmQuYXBwZW5k KCItLXVwZGF0ZS1ndGsiKQotICAgICAgICBjb21tYW5kLmFwcGVuZChXZWJLaXRQb3J0Lm1ha2VB cmdzKCkpCisgICAgICAgIGNvbW1hbmQuYXBwZW5kKHN1cGVyKEd0a1BvcnQsIHNlbGYpLm1ha2VB cmdzKCkpCiAgICAgICAgIHJldHVybiBjb21tYW5kCiAKLSAgICBAY2xhc3NtZXRob2QKLSAgICBk ZWYgcnVuX3dlYmtpdF90ZXN0c19jb21tYW5kKGNscyk6Ci0gICAgICAgIGNvbW1hbmQgPSBXZWJL aXRQb3J0LnJ1bl93ZWJraXRfdGVzdHNfY29tbWFuZCgpCisgICAgZGVmIHJ1bl93ZWJraXRfdGVz dHNfY29tbWFuZChzZWxmKToKKyAgICAgICAgY29tbWFuZCA9IHN1cGVyKEd0a1BvcnQsIHNlbGYp LnJ1bl93ZWJraXRfdGVzdHNfY29tbWFuZCgpCiAgICAgICAgIGNvbW1hbmQuYXBwZW5kKCItLWd0 ayIpCiAgICAgICAgIHJldHVybiBjb21tYW5kCiAKIAotY2xhc3MgUXRQb3J0KFdlYktpdFBvcnQp OgotCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIG5hbWUoY2xzKToKLSAgICAgICAgcmV0dXJu ICJRdCIKLQotICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBmbGFnKGNscyk6Ci0gICAgICAgIHJl dHVybiAiLS1wb3J0PXF0IgorY2xhc3MgUXRQb3J0KERlcHJlY2F0ZWRQb3J0KToKKyAgICBwb3J0 X2ZsYWdfbmFtZSA9ICJxdCIKIAotICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBidWlsZF93ZWJr aXRfY29tbWFuZChjbHMsIGJ1aWxkX3N0eWxlPU5vbmUpOgotICAgICAgICBjb21tYW5kID0gV2Vi S2l0UG9ydC5idWlsZF93ZWJraXRfY29tbWFuZChidWlsZF9zdHlsZT1idWlsZF9zdHlsZSkKKyAg ICBkZWYgYnVpbGRfd2Via2l0X2NvbW1hbmQoc2VsZiwgYnVpbGRfc3R5bGU9Tm9uZSk6CisgICAg ICAgIGNvbW1hbmQgPSBzdXBlcihRdFBvcnQsIHNlbGYpLmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1 aWxkX3N0eWxlPWJ1aWxkX3N0eWxlKQogICAgICAgICBjb21tYW5kLmFwcGVuZCgiLS1xdCIpCi0g ICAgICAgIGNvbW1hbmQuYXBwZW5kKFdlYktpdFBvcnQubWFrZUFyZ3MoKSkKKyAgICAgICAgY29t bWFuZC5hcHBlbmQoc3VwZXIoUXRQb3J0LCBzZWxmKS5tYWtlQXJncygpKQogICAgICAgICByZXR1 cm4gY29tbWFuZAogCiAKLWNsYXNzIEVmbFBvcnQoV2ViS2l0UG9ydCk6CitjbGFzcyBFZmxQb3J0 KERlcHJlY2F0ZWRQb3J0KToKKyAgICBwb3J0X2ZsYWdfbmFtZSA9ICJlZmwiCiAKLSAgICBAY2xh c3NtZXRob2QKLSAgICBkZWYgbmFtZShjbHMpOgotICAgICAgICByZXR1cm4gIkVmbCIKLQotICAg IEBjbGFzc21ldGhvZAotICAgIGRlZiBmbGFnKGNscyk6Ci0gICAgICAgIHJldHVybiAiLS1wb3J0 PWVmbCIKLQotICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBidWlsZF93ZWJraXRfY29tbWFuZChj bHMsIGJ1aWxkX3N0eWxlPU5vbmUpOgotICAgICAgICBjb21tYW5kID0gV2ViS2l0UG9ydC5idWls ZF93ZWJraXRfY29tbWFuZChidWlsZF9zdHlsZT1idWlsZF9zdHlsZSkKKyAgICBkZWYgYnVpbGRf d2Via2l0X2NvbW1hbmQoc2VsZiwgYnVpbGRfc3R5bGU9Tm9uZSk6CisgICAgICAgIGNvbW1hbmQg PSBzdXBlcihFZmxQb3J0LCBzZWxmKS5idWlsZF93ZWJraXRfY29tbWFuZChidWlsZF9zdHlsZT1i dWlsZF9zdHlsZSkKICAgICAgICAgY29tbWFuZC5hcHBlbmQoIi0tZWZsIikKLSAgICAgICAgY29t bWFuZC5hcHBlbmQoV2ViS2l0UG9ydC5tYWtlQXJncygpKQorICAgICAgICBjb21tYW5kLmFwcGVu ZChzdXBlcihFZmxQb3J0LCBzZWxmKS5tYWtlQXJncygpKQogICAgICAgICByZXR1cm4gY29tbWFu ZAogCiAKLWNsYXNzIENocm9taXVtUG9ydChXZWJLaXRQb3J0KToKLQotICAgIEBjbGFzc21ldGhv ZAotICAgIGRlZiBuYW1lKGNscyk6Ci0gICAgICAgIHJldHVybiAiQ2hyb21pdW0iCitjbGFzcyBD aHJvbWl1bVBvcnQoRGVwcmVjYXRlZFBvcnQpOgorICAgIHBvcnRfZmxhZ19uYW1lID0gImNocm9t aXVtIgogCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIGZsYWcoY2xzKToKLSAgICAgICAgcmV0 dXJuICItLXBvcnQ9Y2hyb21pdW0iCi0KLSAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgdXBkYXRl X3dlYmtpdF9jb21tYW5kKGNscywgbm9uX2ludGVyYWN0aXZlPUZhbHNlKToKLSAgICAgICAgY29t bWFuZCA9IFdlYktpdFBvcnQudXBkYXRlX3dlYmtpdF9jb21tYW5kKG5vbl9pbnRlcmFjdGl2ZT1u b25faW50ZXJhY3RpdmUpCisgICAgZGVmIHVwZGF0ZV93ZWJraXRfY29tbWFuZChzZWxmLCBub25f aW50ZXJhY3RpdmU9RmFsc2UpOgorICAgICAgICBjb21tYW5kID0gc3VwZXIoQ2hyb21pdW1Qb3J0 LCBzZWxmKS51cGRhdGVfd2Via2l0X2NvbW1hbmQobm9uX2ludGVyYWN0aXZlPW5vbl9pbnRlcmFj dGl2ZSkKICAgICAgICAgY29tbWFuZC5hcHBlbmQoIi0tY2hyb21pdW0iKQogICAgICAgICBpZiBu b25faW50ZXJhY3RpdmU6CiAgICAgICAgICAgICBjb21tYW5kLmFwcGVuZCgiLS1mb3JjZS11cGRh dGUiKQogICAgICAgICByZXR1cm4gY29tbWFuZAogCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVm IGJ1aWxkX3dlYmtpdF9jb21tYW5kKGNscywgYnVpbGRfc3R5bGU9Tm9uZSk6Ci0gICAgICAgIGNv bW1hbmQgPSBXZWJLaXRQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPWJ1aWxk X3N0eWxlKQorICAgIGRlZiBidWlsZF93ZWJraXRfY29tbWFuZChzZWxmLCBidWlsZF9zdHlsZT1O b25lKToKKyAgICAgICAgY29tbWFuZCA9IHN1cGVyKENocm9taXVtUG9ydCwgc2VsZikuYnVpbGRf d2Via2l0X2NvbW1hbmQoYnVpbGRfc3R5bGU9YnVpbGRfc3R5bGUpCiAgICAgICAgIGNvbW1hbmQu YXBwZW5kKCItLWNocm9taXVtIikKICAgICAgICAgY29tbWFuZC5hcHBlbmQoIi0tdXBkYXRlLWNo cm9taXVtIikKICAgICAgICAgcmV0dXJuIGNvbW1hbmQKIAotICAgIEBjbGFzc21ldGhvZAotICAg IGRlZiBydW5fd2Via2l0X3Rlc3RzX2NvbW1hbmQoY2xzKToKLSAgICAgICAgY29tbWFuZCA9IGNs cy5zY3JpcHRfc2hlbGxfY29tbWFuZCgibmV3LXJ1bi13ZWJraXQtdGVzdHMiKQorICAgIGRlZiBy dW5fd2Via2l0X3Rlc3RzX2NvbW1hbmQoc2VsZik6CisgICAgICAgICMgTm90ZTogVGhpcyBjb3Vs ZCBiZSBydW4td2Via2l0LXRlc3RzIG5vdy4KKyAgICAgICAgY29tbWFuZCA9IHNlbGYuc2NyaXB0 X3NoZWxsX2NvbW1hbmQoIm5ldy1ydW4td2Via2l0LXRlc3RzIikKICAgICAgICAgY29tbWFuZC5h cHBlbmQoIi0tY2hyb21pdW0iKQogICAgICAgICBjb21tYW5kLmFwcGVuZCgiLS1za2lwLWZhaWxp bmctdGVzdHMiKQogICAgICAgICByZXR1cm4gY29tbWFuZAogCi0gICAgQGNsYXNzbWV0aG9kCi0g ICAgZGVmIHJ1bl9qYXZhc2NyaXB0Y29yZV90ZXN0c19jb21tYW5kKGNscyk6CisgICAgZGVmIHJ1 bl9qYXZhc2NyaXB0Y29yZV90ZXN0c19jb21tYW5kKHNlbGYpOgogICAgICAgICByZXR1cm4gTm9u ZQogCiAKIGNsYXNzIENocm9taXVtWFZGQlBvcnQoQ2hyb21pdW1Qb3J0KToKKyAgICBwb3J0X2Zs YWdfbmFtZSA9ICJjaHJvbWl1bS14dmZiIgogCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIGZs YWcoY2xzKToKLSAgICAgICAgcmV0dXJuICItLXBvcnQ9Y2hyb21pdW0teHZmYiIKLQotICAgIEBj bGFzc21ldGhvZAotICAgIGRlZiBydW5fd2Via2l0X3Rlc3RzX2NvbW1hbmQoY2xzKToKLSAgICAg ICAgcmV0dXJuIFsieHZmYi1ydW4iXSArIENocm9taXVtUG9ydC5ydW5fd2Via2l0X3Rlc3RzX2Nv bW1hbmQoKQorICAgIGRlZiBydW5fd2Via2l0X3Rlc3RzX2NvbW1hbmQoc2VsZik6CisgICAgICAg IHJldHVybiBbInh2ZmItcnVuIl0gKyBzdXBlcihDaHJvbWl1bVhWRkJQb3J0LCBzZWxmKS5ydW5f d2Via2l0X3Rlc3RzX2NvbW1hbmQoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vY29uZmlnL3BvcnRzX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vY29uZmlnL3BvcnRzX3VuaXR0ZXN0LnB5CmluZGV4IDA1MzI1MTJhYTliOTEwYWYw NDk3OGQwNTU0ODliMWUzYWRkN2ZjN2YuLmUwYjc3YzgyZWU4YmFiMWVlYzBiNjRmOTNmOWJmMDI0 MTdhYjQzZmMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZp Zy9wb3J0c191bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j b25maWcvcG9ydHNfdW5pdHRlc3QucHkKQEAgLTMyLDQ1ICszMiwzNiBAQCBpbXBvcnQgdW5pdHRl c3QKIGZyb20gd2Via2l0cHkuY29tbW9uLmNvbmZpZy5wb3J0cyBpbXBvcnQgKgogCiAKLWNsYXNz IFdlYktpdFBvcnRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKK2NsYXNzIERlcHJlY2F0ZWRQb3J0 VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIHRlc3RfbWFjX3BvcnQoc2VsZik6Ci0g ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKE1hY1BvcnQubmFtZSgpLCAiTWFjIikKLSAgICAgICAg c2VsZi5hc3NlcnRFcXVhbHMoTWFjUG9ydC5mbGFnKCksICItLXBvcnQ9bWFjIikKLSAgICAgICAg c2VsZi5hc3NlcnRFcXVhbHMoTWFjUG9ydC5ydW5fd2Via2l0X3Rlc3RzX2NvbW1hbmQoKSwgV2Vi S2l0UG9ydC5zY3JpcHRfc2hlbGxfY29tbWFuZCgicnVuLXdlYmtpdC10ZXN0cyIpKQotICAgICAg ICBzZWxmLmFzc2VydEVxdWFscyhNYWNQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKCksIFdlYktp dFBvcnQuc2NyaXB0X3NoZWxsX2NvbW1hbmQoImJ1aWxkLXdlYmtpdCIpKQotICAgICAgICBzZWxm LmFzc2VydEVxdWFscyhNYWNQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPSJk ZWJ1ZyIpLCBXZWJLaXRQb3J0LnNjcmlwdF9zaGVsbF9jb21tYW5kKCJidWlsZC13ZWJraXQiKSAr IFsiLS1kZWJ1ZyJdKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhNYWNQb3J0LmJ1aWxkX3dl YmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPSJyZWxlYXNlIiksIFdlYktpdFBvcnQuc2NyaXB0X3No ZWxsX2NvbW1hbmQoImJ1aWxkLXdlYmtpdCIpICsgWyItLXJlbGVhc2UiXSkKLQotICAgICAgICBj bGFzcyBUZXN0SXNMZW9wYXJkKE1hY1BvcnQpOgotICAgICAgICAgICAgQGNsYXNzbWV0aG9kCi0g ICAgICAgICAgICBkZWYgX3N5c3RlbV92ZXJzaW9uKGNscyk6Ci0gICAgICAgICAgICAgICAgcmV0 dXJuIFsxMCwgNV0KLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKFRlc3RJc0xlb3BhcmQuaXNfbGVv cGFyZCgpKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhNYWNQb3J0KCkuZmxhZygpLCAiLS1w b3J0PW1hYyIpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKE1hY1BvcnQoKS5ydW5fd2Via2l0 X3Rlc3RzX2NvbW1hbmQoKSwgRGVwcmVjYXRlZFBvcnQoKS5zY3JpcHRfc2hlbGxfY29tbWFuZCgi cnVuLXdlYmtpdC10ZXN0cyIpKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhNYWNQb3J0KCku YnVpbGRfd2Via2l0X2NvbW1hbmQoKSwgRGVwcmVjYXRlZFBvcnQoKS5zY3JpcHRfc2hlbGxfY29t bWFuZCgiYnVpbGQtd2Via2l0IikpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKE1hY1BvcnQo KS5idWlsZF93ZWJraXRfY29tbWFuZChidWlsZF9zdHlsZT0iZGVidWciKSwgRGVwcmVjYXRlZFBv cnQoKS5zY3JpcHRfc2hlbGxfY29tbWFuZCgiYnVpbGQtd2Via2l0IikgKyBbIi0tZGVidWciXSkK KyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoTWFjUG9ydCgpLmJ1aWxkX3dlYmtpdF9jb21tYW5k KGJ1aWxkX3N0eWxlPSJyZWxlYXNlIiksIERlcHJlY2F0ZWRQb3J0KCkuc2NyaXB0X3NoZWxsX2Nv bW1hbmQoImJ1aWxkLXdlYmtpdCIpICsgWyItLXJlbGVhc2UiXSkKIAogICAgIGRlZiB0ZXN0X2d0 a19wb3J0KHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhHdGtQb3J0Lm5hbWUoKSwg Ikd0ayIpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKEd0a1BvcnQuZmxhZygpLCAiLS1wb3J0 PWd0ayIpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKEd0a1BvcnQucnVuX3dlYmtpdF90ZXN0 c19jb21tYW5kKCksIFdlYktpdFBvcnQuc2NyaXB0X3NoZWxsX2NvbW1hbmQoInJ1bi13ZWJraXQt dGVzdHMiKSArIFsiLS1ndGsiXSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoR3RrUG9ydC5i dWlsZF93ZWJraXRfY29tbWFuZCgpLCBXZWJLaXRQb3J0LnNjcmlwdF9zaGVsbF9jb21tYW5kKCJi dWlsZC13ZWJraXQiKSArIFsiLS1ndGsiLCAiLS11cGRhdGUtZ3RrIiwgV2ViS2l0UG9ydC5tYWtl QXJncygpXSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoR3RrUG9ydC5idWlsZF93ZWJraXRf Y29tbWFuZChidWlsZF9zdHlsZT0iZGVidWciKSwgV2ViS2l0UG9ydC5zY3JpcHRfc2hlbGxfY29t bWFuZCgiYnVpbGQtd2Via2l0IikgKyBbIi0tZGVidWciLCAiLS1ndGsiLCAiLS11cGRhdGUtZ3Rr IiwgV2ViS2l0UG9ydC5tYWtlQXJncygpXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoR3Rr UG9ydCgpLmZsYWcoKSwgIi0tcG9ydD1ndGsiKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhH dGtQb3J0KCkucnVuX3dlYmtpdF90ZXN0c19jb21tYW5kKCksIERlcHJlY2F0ZWRQb3J0KCkuc2Ny aXB0X3NoZWxsX2NvbW1hbmQoInJ1bi13ZWJraXQtdGVzdHMiKSArIFsiLS1ndGsiXSkKKyAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbHMoR3RrUG9ydCgpLmJ1aWxkX3dlYmtpdF9jb21tYW5kKCksIERl cHJlY2F0ZWRQb3J0KCkuc2NyaXB0X3NoZWxsX2NvbW1hbmQoImJ1aWxkLXdlYmtpdCIpICsgWyIt LWd0ayIsICItLXVwZGF0ZS1ndGsiLCBEZXByZWNhdGVkUG9ydCgpLm1ha2VBcmdzKCldKQorICAg ICAgICBzZWxmLmFzc2VydEVxdWFscyhHdGtQb3J0KCkuYnVpbGRfd2Via2l0X2NvbW1hbmQoYnVp bGRfc3R5bGU9ImRlYnVnIiksIERlcHJlY2F0ZWRQb3J0KCkuc2NyaXB0X3NoZWxsX2NvbW1hbmQo ImJ1aWxkLXdlYmtpdCIpICsgWyItLWRlYnVnIiwgIi0tZ3RrIiwgIi0tdXBkYXRlLWd0ayIsIERl cHJlY2F0ZWRQb3J0KCkubWFrZUFyZ3MoKV0pCiAKICAgICBkZWYgdGVzdF9xdF9wb3J0KHNlbGYp OgotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhRdFBvcnQubmFtZSgpLCAiUXQiKQotICAgICAg ICBzZWxmLmFzc2VydEVxdWFscyhRdFBvcnQuZmxhZygpLCAiLS1wb3J0PXF0IikKLSAgICAgICAg c2VsZi5hc3NlcnRFcXVhbHMoUXRQb3J0LnJ1bl93ZWJraXRfdGVzdHNfY29tbWFuZCgpLCBXZWJL aXRQb3J0LnNjcmlwdF9zaGVsbF9jb21tYW5kKCJydW4td2Via2l0LXRlc3RzIikpCi0gICAgICAg IHNlbGYuYXNzZXJ0RXF1YWxzKFF0UG9ydC5idWlsZF93ZWJraXRfY29tbWFuZCgpLCBXZWJLaXRQ b3J0LnNjcmlwdF9zaGVsbF9jb21tYW5kKCJidWlsZC13ZWJraXQiKSArIFsiLS1xdCIsIFdlYktp dFBvcnQubWFrZUFyZ3MoKV0pCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKFF0UG9ydC5idWls ZF93ZWJraXRfY29tbWFuZChidWlsZF9zdHlsZT0iZGVidWciKSwgV2ViS2l0UG9ydC5zY3JpcHRf c2hlbGxfY29tbWFuZCgiYnVpbGQtd2Via2l0IikgKyBbIi0tZGVidWciLCAiLS1xdCIsIFdlYktp dFBvcnQubWFrZUFyZ3MoKV0pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKFF0UG9ydCgpLmZs YWcoKSwgIi0tcG9ydD1xdCIpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKFF0UG9ydCgpLnJ1 bl93ZWJraXRfdGVzdHNfY29tbWFuZCgpLCBEZXByZWNhdGVkUG9ydCgpLnNjcmlwdF9zaGVsbF9j b21tYW5kKCJydW4td2Via2l0LXRlc3RzIikpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKFF0 UG9ydCgpLmJ1aWxkX3dlYmtpdF9jb21tYW5kKCksIERlcHJlY2F0ZWRQb3J0KCkuc2NyaXB0X3No ZWxsX2NvbW1hbmQoImJ1aWxkLXdlYmtpdCIpICsgWyItLXF0IiwgRGVwcmVjYXRlZFBvcnQoKS5t YWtlQXJncygpXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoUXRQb3J0KCkuYnVpbGRfd2Vi a2l0X2NvbW1hbmQoYnVpbGRfc3R5bGU9ImRlYnVnIiksIERlcHJlY2F0ZWRQb3J0KCkuc2NyaXB0 X3NoZWxsX2NvbW1hbmQoImJ1aWxkLXdlYmtpdCIpICsgWyItLWRlYnVnIiwgIi0tcXQiLCBEZXBy ZWNhdGVkUG9ydCgpLm1ha2VBcmdzKCldKQogCiAgICAgZGVmIHRlc3RfY2hyb21pdW1fcG9ydChz ZWxmKToKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoQ2hyb21pdW1Qb3J0Lm5hbWUoKSwgIkNo cm9taXVtIikKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoQ2hyb21pdW1Qb3J0LmZsYWcoKSwg Ii0tcG9ydD1jaHJvbWl1bSIpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKENocm9taXVtUG9y dC5ydW5fd2Via2l0X3Rlc3RzX2NvbW1hbmQoKSwgV2ViS2l0UG9ydC5zY3JpcHRfc2hlbGxfY29t bWFuZCgibmV3LXJ1bi13ZWJraXQtdGVzdHMiKSArIFsiLS1jaHJvbWl1bSIsICItLXNraXAtZmFp bGluZy10ZXN0cyJdKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhDaHJvbWl1bVBvcnQuYnVp bGRfd2Via2l0X2NvbW1hbmQoKSwgV2ViS2l0UG9ydC5zY3JpcHRfc2hlbGxfY29tbWFuZCgiYnVp bGQtd2Via2l0IikgKyBbIi0tY2hyb21pdW0iLCAiLS11cGRhdGUtY2hyb21pdW0iXSkKLSAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbHMoQ2hyb21pdW1Qb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1 aWxkX3N0eWxlPSJkZWJ1ZyIpLCBXZWJLaXRQb3J0LnNjcmlwdF9zaGVsbF9jb21tYW5kKCJidWls ZC13ZWJraXQiKSArIFsiLS1kZWJ1ZyIsICItLWNocm9taXVtIiwgIi0tdXBkYXRlLWNocm9taXVt Il0pCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKENocm9taXVtUG9ydC51cGRhdGVfd2Via2l0 X2NvbW1hbmQoKSwgV2ViS2l0UG9ydC5zY3JpcHRfc2hlbGxfY29tbWFuZCgidXBkYXRlLXdlYmtp dCIpICsgWyItLWNocm9taXVtIl0pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKENocm9taXVt UG9ydCgpLmZsYWcoKSwgIi0tcG9ydD1jaHJvbWl1bSIpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWxzKENocm9taXVtUG9ydCgpLnJ1bl93ZWJraXRfdGVzdHNfY29tbWFuZCgpLCBEZXByZWNhdGVk UG9ydCgpLnNjcmlwdF9zaGVsbF9jb21tYW5kKCJuZXctcnVuLXdlYmtpdC10ZXN0cyIpICsgWyIt LWNocm9taXVtIiwgIi0tc2tpcC1mYWlsaW5nLXRlc3RzIl0pCisgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWxzKENocm9taXVtUG9ydCgpLmJ1aWxkX3dlYmtpdF9jb21tYW5kKCksIERlcHJlY2F0ZWRQ b3J0KCkuc2NyaXB0X3NoZWxsX2NvbW1hbmQoImJ1aWxkLXdlYmtpdCIpICsgWyItLWNocm9taXVt IiwgIi0tdXBkYXRlLWNocm9taXVtIl0pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKENocm9t aXVtUG9ydCgpLmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPSJkZWJ1ZyIpLCBEZXBy ZWNhdGVkUG9ydCgpLnNjcmlwdF9zaGVsbF9jb21tYW5kKCJidWlsZC13ZWJraXQiKSArIFsiLS1k ZWJ1ZyIsICItLWNocm9taXVtIiwgIi0tdXBkYXRlLWNocm9taXVtIl0pCisgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWxzKENocm9taXVtUG9ydCgpLnVwZGF0ZV93ZWJraXRfY29tbWFuZCgpLCBEZXBy ZWNhdGVkUG9ydCgpLnNjcmlwdF9zaGVsbF9jb21tYW5kKCJ1cGRhdGUtd2Via2l0IikgKyBbIi0t Y2hyb21pdW0iXSkKIAogICAgIGRlZiB0ZXN0X2Nocm9taXVtX3h2ZmJfcG9ydChzZWxmKToKLSAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoQ2hyb21pdW1YVkZCUG9ydC5ydW5fd2Via2l0X3Rlc3Rz X2NvbW1hbmQoKSwgWyd4dmZiLXJ1biddICsgV2ViS2l0UG9ydC5zY3JpcHRfc2hlbGxfY29tbWFu ZCgnbmV3LXJ1bi13ZWJraXQtdGVzdHMnKSArIFsnLS1jaHJvbWl1bScsICctLXNraXAtZmFpbGlu Zy10ZXN0cyddKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhDaHJvbWl1bVhWRkJQb3J0KCku cnVuX3dlYmtpdF90ZXN0c19jb21tYW5kKCksIFsneHZmYi1ydW4nXSArIERlcHJlY2F0ZWRQb3J0 KCkuc2NyaXB0X3NoZWxsX2NvbW1hbmQoJ25ldy1ydW4td2Via2l0LXRlc3RzJykgKyBbJy0tY2hy b21pdW0nLCAnLS1za2lwLWZhaWxpbmctdGVzdHMnXSkKKwogCiBpZiBfX25hbWVfXyA9PSAnX19t YWluX18nOgogICAgIHVuaXR0ZXN0Lm1haW4oKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS90b29sL2NvbW1hbmRzL2Vhcmx5d2FybmluZ3N5c3RlbS5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0ZW0ucHkKaW5kZXggY2Jm NGNlNmQyNWJlNzY5YzVmODI3ZjgxMWYwOWM1YzJjOWM5MWZlMS4uNThhYTZhODYxYWUxOWFhY2Q2 ZDllNzIyMTBjODBiYjI5YmIzYzZjOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL2NvbW1hbmRzL2Vhcmx5d2FybmluZ3N5c3RlbS5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZWFybHl3YXJuaW5nc3lzdGVtLnB5CkBAIC0yNyw3ICsy Nyw3IEBACiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKIGZyb20gd2Via2l0cHkuY29tbW9uLmNvbmZpZy5jb21t aXR0ZXJzIGltcG9ydCBDb21taXR0ZXJMaXN0Ci1mcm9tIHdlYmtpdHB5LmNvbW1vbi5jb25maWcu cG9ydHMgaW1wb3J0IFdlYktpdFBvcnQKK2Zyb20gd2Via2l0cHkuY29tbW9uLmNvbmZpZy5wb3J0 cyBpbXBvcnQgRGVwcmVjYXRlZFBvcnQKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5kZXBy ZWNhdGVkX2xvZ2dpbmcgaW1wb3J0IGVycm9yLCBsb2cKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5 c3RlbS5leGVjdXRpdmUgaW1wb3J0IFNjcmlwdEVycm9yCiBmcm9tIHdlYmtpdHB5LnRvb2wuYm90 LmV4cGVjdGVkZmFpbHVyZXMgaW1wb3J0IEV4cGVjdGVkRmFpbHVyZXMKQEAgLTQ0LDcgKzQ0LDcg QEAgY2xhc3MgQWJzdHJhY3RFYXJseVdhcm5pbmdTeXN0ZW0oQWJzdHJhY3RSZXZpZXdRdWV1ZSwg RWFybHlXYXJuaW5nU3lzdGVtVGFza0RlbGUKIAogICAgIGRlZiBfX2luaXRfXyhzZWxmKToKICAg ICAgICAgQWJzdHJhY3RSZXZpZXdRdWV1ZS5fX2luaXRfXyhzZWxmKQotICAgICAgICBzZWxmLnBv cnQgPSBXZWJLaXRQb3J0LnBvcnQoc2VsZi5wb3J0X25hbWUpCisgICAgICAgIHNlbGYucG9ydCA9 IERlcHJlY2F0ZWRQb3J0LnBvcnQoc2VsZi5wb3J0X25hbWUpCiAKICAgICBkZWYgc2hvdWxkX3By b2NlZWRfd2l0aF93b3JrX2l0ZW0oc2VsZiwgcGF0Y2gpOgogICAgICAgICByZXR1cm4gVHJ1ZQpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3NoZXJpZmZi b3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvc2hlcmlmZmJvdC5w eQppbmRleCA1NDczMDllODhhMDdlOGQ1OTJmZWQ1YmM1MjMxNjJlODUxY2Y2YjQ5Li44N2IzYWEz NTkxZDk5YTU3MDZiMzBkNjRhMDk3Yjg4ZDFmZDU1YjIwIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvc2hlcmlmZmJvdC5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvc2hlcmlmZmJvdC5weQpAQCAtMjksNyArMjksNiBA QAogaW1wb3J0IG9zCiAKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5kZXByZWNhdGVkX2xv Z2dpbmcgaW1wb3J0IGxvZwotZnJvbSB3ZWJraXRweS5jb21tb24uY29uZmlnLnBvcnRzIGltcG9y dCBXZWJLaXRQb3J0CiBmcm9tIHdlYmtpdHB5LnRvb2wuYm90LnNoZXJpZmYgaW1wb3J0IFNoZXJp ZmYKIGZyb20gd2Via2l0cHkudG9vbC5ib3Quc2hlcmlmZmlyY2JvdCBpbXBvcnQgU2hlcmlmZklS Q0JvdAogZnJvbSB3ZWJraXRweS50b29sLmNvbW1hbmRzLnF1ZXVlcyBpbXBvcnQgQWJzdHJhY3RR dWV1ZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL21haW4ucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbWFpbi5weQppbmRleCBkNmE4NTViZDFmZWM5ZGQz MDVjNWZlNmU2ZGQzOGM0MGNjOWI2MmY1Li5kMWZkZTc0YjgxZmU4ZjMwNmRjYmYxODU1M2U2MDZm ZjAwNzdjODZiIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbWFpbi5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbWFpbi5weQpAQCAtMzMsNyArMzMs NyBAQCBmcm9tIG9wdHBhcnNlIGltcG9ydCBtYWtlX29wdGlvbgogaW1wb3J0IG9zCiBpbXBvcnQg dGhyZWFkaW5nCiAKLWZyb20gd2Via2l0cHkuY29tbW9uLmNvbmZpZy5wb3J0cyBpbXBvcnQgV2Vi S2l0UG9ydAorZnJvbSB3ZWJraXRweS5jb21tb24uY29uZmlnLnBvcnRzIGltcG9ydCBEZXByZWNh dGVkUG9ydAogZnJvbSB3ZWJraXRweS5jb21tb24uaG9zdCBpbXBvcnQgSG9zdAogZnJvbSB3ZWJr aXRweS5jb21tb24ubmV0LmlyYyBpbXBvcnQgaXJjcHJveHkKIGZyb20gd2Via2l0cHkuY29tbW9u Lm5ldC5zdGF0dXNzZXJ2ZXIgaW1wb3J0IFN0YXR1c1NlcnZlcgpAQCAtNjEsNiArNjEsNyBAQCBj bGFzcyBXZWJLaXRQYXRjaChNdWx0aUNvbW1hbmRUb29sLCBIb3N0KToKICAgICAgICAgc2VsZi5f aXJjID0gTm9uZQogICAgICAgICBzZWxmLl9kZXByZWNhdGVkX3BvcnQgPSBOb25lCiAKKyAgICAj IEZJWE1FOiBSZW5hbWUgdGhpcyBkZXByZWNhdGVkX3BvcnQoKQogICAgIGRlZiBwb3J0KHNlbGYp OgogICAgICAgICByZXR1cm4gc2VsZi5fZGVwcmVjYXRlZF9wb3J0CiAKQEAgLTk4LDcgKzk5LDcg QEAgY2xhc3MgV2ViS2l0UGF0Y2goTXVsdGlDb21tYW5kVG9vbCwgSG9zdCk6CiAgICAgICAgIGlm IG9wdGlvbnMuaXJjX3Bhc3N3b3JkOgogICAgICAgICAgICAgc2VsZi5pcmNfcGFzc3dvcmQgPSBv cHRpb25zLmlyY19wYXNzd29yZAogICAgICAgICAjIElmIG9wdGlvbnMucG9ydCBpcyBOb25lLCB3 ZSdsbCBnZXQgdGhlIGRlZmF1bHQgcG9ydCBmb3IgdGhpcyBwbGF0Zm9ybS4KLSAgICAgICAgc2Vs Zi5fZGVwcmVjYXRlZF9wb3J0ID0gV2ViS2l0UG9ydC5wb3J0KG9wdGlvbnMucG9ydCkKKyAgICAg ICAgc2VsZi5fZGVwcmVjYXRlZF9wb3J0ID0gRGVwcmVjYXRlZFBvcnQucG9ydChvcHRpb25zLnBv cnQpCiAKICAgICBkZWYgc2hvdWxkX2V4ZWN1dGVfY29tbWFuZChzZWxmLCBjb21tYW5kKToKICAg ICAgICAgaWYgY29tbWFuZC5yZXF1aXJlc19sb2NhbF9jb21taXRzIGFuZCBub3Qgc2VsZi5zY20o KS5zdXBwb3J0c19sb2NhbF9jb21taXRzKCk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3Rvb2wvc3RlcHMvYWJzdHJhY3RzdGVwLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL3N0ZXBzL2Fic3RyYWN0c3RlcC5weQppbmRleCBkYjBjMGQ1YTg3MGNhNzUwMzJjYTgz NWY1OWUzMDlhYzhiMTZmNWFjLi4yYTVmZWE2MjhjMTk1NDk5ZDdiNWRiMzcwZjcwMDFiOWYyNDYx NmU4IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvYWJzdHJh Y3RzdGVwLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9hYnN0cmFj dHN0ZXAucHkKQEAgLTI5LDcgKzI5LDYgQEAKIGltcG9ydCBzeXMKIAogZnJvbSB3ZWJraXRweS5j b21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBpbXBvcnQgU2NyaXB0RXJyb3IKLWZyb20gd2Via2l0cHku Y29tbW9uLmNvbmZpZy5wb3J0cyBpbXBvcnQgV2ViS2l0UG9ydAogZnJvbSB3ZWJraXRweS50b29s LnN0ZXBzLm9wdGlvbnMgaW1wb3J0IE9wdGlvbnMKIAogCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvc3RlcHNfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvc3RlcHMvc3RlcHNfdW5pdHRlc3QucHkKaW5kZXggNjUzYWE4ZDIwMzcy MGIwYzBkYzk2NzY3N2ZjMTkxYTFkOTdjODRiYi4uOTlmMTc0OTMyZmVlODkyMmNiNTkyOGE4Zjll NmUzZWE3ODQ5YWFjMSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0 ZXBzL3N0ZXBzX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9z dGVwcy9zdGVwc191bml0dGVzdC5weQpAQCAtMjksNyArMjksNyBAQAogaW1wb3J0IHVuaXR0ZXN0 CiAKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5vdXRwdXRjYXB0dXJlIGltcG9ydCBPdXRw dXRDYXB0dXJlCi1mcm9tIHdlYmtpdHB5LmNvbW1vbi5jb25maWcucG9ydHMgaW1wb3J0IFdlYktp dFBvcnQKK2Zyb20gd2Via2l0cHkuY29tbW9uLmNvbmZpZy5wb3J0cyBpbXBvcnQgRGVwcmVjYXRl ZFBvcnQKIGZyb20gd2Via2l0cHkudG9vbC5tb2NrdG9vbCBpbXBvcnQgTW9ja09wdGlvbnMsIE1v Y2tUb29sCiAKIGZyb20gd2Via2l0cHkudG9vbCBpbXBvcnQgc3RlcHMKQEAgLTEwMCw4ICsxMDAs NyBAQCBjbGFzcyBTdGVwc1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBtb2NrX29w dGlvbnMubm9uX2ludGVyYWN0aXZlID0gRmFsc2UKICAgICAgICAgc3RlcCA9IHN0ZXBzLlJ1blRl c3RzKE1vY2tUb29sKGxvZ19leGVjdXRpdmU9VHJ1ZSksIG1vY2tfb3B0aW9ucykKICAgICAgICAg IyBGSVhNRTogV2Ugc2hvdWxkbid0IHVzZSBhIHJlYWwgcG9ydC1vYmplY3QgaGVyZSwgYnV0IHRo ZXJlIGlzIHRvbyBtdWNoIHRvIG1vY2sgYXQgdGhlIG1vbWVudC4KLSAgICAgICAgbW9ja19wb3J0 ID0gV2ViS2l0UG9ydCgpCi0gICAgICAgIG1vY2tfcG9ydC5uYW1lID0gbGFtYmRhOiAiTWFjIgor ICAgICAgICBtb2NrX3BvcnQgPSBEZXByZWNhdGVkUG9ydCgpCiAgICAgICAgIHRvb2wgPSBNb2Nr VG9vbChsb2dfZXhlY3V0aXZlPVRydWUpCiAgICAgICAgIHRvb2wucG9ydCA9IGxhbWJkYTogbW9j a19wb3J0CiAgICAgICAgIHN0ZXAgPSBzdGVwcy5SdW5UZXN0cyh0b29sLCBtb2NrX29wdGlvbnMp Cg==