60075 2011-05-03 15:45:49 -0700 Fix circular dependency in webkitpy 2011-05-04 03:44:34 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth abarth commit-queue dpranke eric oldest_to_newest 397471 0 abarth 2011-05-03 15:45:49 -0700 Fix circular dependency in webkitpy 397472 1 92151 abarth 2011-05-03 15:47:16 -0700 Created attachment 92151 Patch 397474 2 92151 eric 2011-05-03 15:48:36 -0700 Comment on attachment 92151 Patch Thanks! This is way better! 397780 3 92151 commit-queue 2011-05-04 03:44:29 -0700 Comment on attachment 92151 Patch Clearing flags on attachment: 92151 Committed r85727: <http://trac.webkit.org/changeset/85727> 397781 4 commit-queue 2011-05-04 03:44:34 -0700 All reviewed patches have been landed. Closing bug. 92151 2011-05-03 15:47:16 -0700 2011-05-04 03:44:29 -0700 Patch bug-60075-20110503154715.patch text/plain 18990 abarth SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDg1Njc3KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjYgQEAKKzIwMTEtMDUtMDMgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggY2lyY3Vs YXIgZGVwZW5kZW5jeSBpbiB3ZWJraXRweQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjAwNzUKKworICAgICAgICBUaGVzZSBmdW5jdGlvbnMgZG9uJ3Qg YmVsb25nIGluIGJ1Z3ppbGxhLnB5LiAgVGhleSBvbmx5IGV4aXN0IHRoZXJlCisgICAgICAgIGJl Y2F1c2UgdGhleSBhcmUgb2xkLiAgUmVhbGx5LCB0aGVzZSBmdW5jdGlvbnMgc2hvdWxkbid0IGJl IGZyZWUKKyAgICAgICAgZnVuY3Rpb25zIGF0IGFsbCwgYnV0IHRoYXQncyBhIHBhdGNoIGZvciBh bm90aGVyIGRheS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0 L2NoYW5nZWxvZy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291 dC9jaGFuZ2Vsb2dfdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21t b24vY2hlY2tvdXQvY2hlY2tvdXQucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21t b24vY29uZmlnL3VybHMucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0 L2J1Z3ppbGxhL19faW5pdF9fLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9u L25ldC9idWd6aWxsYS9idWd6aWxsYS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGFfdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jaGFuZ2Vsb2cucHk6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS90b29sL2JvdC9pcmNfY29tbWFuZC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3Rvb2wvYm90L3NoZXJpZmYucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90 b29sL2NvbW1hbmRzL3VwbG9hZC5weToKKwogMjAxMS0wNS0wMyAgRXJpYyBTZWlkZWwgIDxlcmlj QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBSb2Jlbi4KSW5kZXg6IFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoYW5nZWxvZy5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGFuZ2Vsb2cu cHkJKHJldmlzaW9uIDg1NjYyKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hl Y2tvdXQvY2hhbmdlbG9nLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zNCw5ICszNCw0MCBAQCBpbXBv cnQgb3MucGF0aAogaW1wb3J0IHJlCiBpbXBvcnQgdGV4dHdyYXAKIAotZnJvbSB3ZWJraXRweS5j b21tb24uc3lzdGVtLmRlcHJlY2F0ZWRfbG9nZ2luZyBpbXBvcnQgbG9nCiBmcm9tIHdlYmtpdHB5 LmNvbW1vbi5jb25maWcuY29tbWl0dGVycyBpbXBvcnQgQ29tbWl0dGVyTGlzdAotZnJvbSB3ZWJr aXRweS5jb21tb24ubmV0LmJ1Z3ppbGxhIGltcG9ydCBwYXJzZV9idWdfaWRfZnJvbV9jaGFuZ2Vs b2cKK2ltcG9ydCB3ZWJraXRweS5jb21tb24uY29uZmlnLnVybHMgYXMgY29uZmlnX3VybHMKK2Zy b20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5kZXByZWNhdGVkX2xvZ2dpbmcgaW1wb3J0IGxvZwor CisKKyMgRklYTUU6IHBhcnNlX2J1Z19pZCBzaG91bGQgbm90IGJlIGEgZnJlZSBmdW5jdGlvbi4K KyMgRklYTUU6IFdoZXJlIHNob3VsZCB0aGlzIGZ1bmN0aW9uIGxpdmUgaW4gdGhlIGRlcGVuZGVu Y3kgZ3JhcGg/CitkZWYgcGFyc2VfYnVnX2lkKG1lc3NhZ2UpOgorICAgIGlmIG5vdCBtZXNzYWdl OgorICAgICAgICByZXR1cm4gTm9uZQorICAgIG1hdGNoID0gcmUuc2VhcmNoKGNvbmZpZ191cmxz LmJ1Z191cmxfc2hvcnQsIG1lc3NhZ2UpCisgICAgaWYgbWF0Y2g6CisgICAgICAgIHJldHVybiBp bnQobWF0Y2guZ3JvdXAoJ2J1Z19pZCcpKQorICAgIG1hdGNoID0gcmUuc2VhcmNoKGNvbmZpZ191 cmxzLmJ1Z191cmxfbG9uZywgbWVzc2FnZSkKKyAgICBpZiBtYXRjaDoKKyAgICAgICAgcmV0dXJu IGludChtYXRjaC5ncm91cCgnYnVnX2lkJykpCisgICAgcmV0dXJuIE5vbmUKKworCisjIEZJWE1F OiBwYXJzZV9idWdfaWRfZnJvbV9jaGFuZ2Vsb2cgc2hvdWxkIG5vdCBiZSBhIGZyZWUgZnVuY3Rp b24uCisjIFBhcnNlIHRoZSBidWcgSUQgb3V0IG9mIGEgQ2hhbmdlbG9nIG1lc3NhZ2UgYmFzZWQg b24gdGhlIGZvcm1hdCB0aGF0IGlzCisjIHVzZWQgYnkgcHJlcGFyZS1DaGFuZ2VMb2cKK2RlZiBw YXJzZV9idWdfaWRfZnJvbV9jaGFuZ2Vsb2cobWVzc2FnZSk6CisgICAgaWYgbm90IG1lc3NhZ2U6 CisgICAgICAgIHJldHVybiBOb25lCisgICAgbWF0Y2ggPSByZS5zZWFyY2goIl5ccyoiICsgY29u ZmlnX3VybHMuYnVnX3VybF9zaG9ydCArICIkIiwgbWVzc2FnZSwgcmUuTVVMVElMSU5FKQorICAg IGlmIG1hdGNoOgorICAgICAgICByZXR1cm4gaW50KG1hdGNoLmdyb3VwKCdidWdfaWQnKSkKKyAg ICBtYXRjaCA9IHJlLnNlYXJjaCgiXlxzKiIgKyBjb25maWdfdXJscy5idWdfdXJsX2xvbmcgKyAi JCIsIG1lc3NhZ2UsIHJlLk1VTFRJTElORSkKKyAgICBpZiBtYXRjaDoKKyAgICAgICAgcmV0dXJu IGludChtYXRjaC5ncm91cCgnYnVnX2lkJykpCisgICAgIyBXZSB3ZXJlbid0IGFibGUgdG8gZmlu ZCBhIGJ1ZyBVUkwgaW4gdGhlIGZvcm1hdCB1c2VkIGJ5IHByZXBhcmUtQ2hhbmdlTG9nLiBGYWxs IGJhY2sgdG8gdGhlCisgICAgIyBmaXJzdCBidWcgVVJMIGZvdW5kIGFueXdoZXJlIGluIHRoZSBt ZXNzYWdlLgorICAgIHJldHVybiBwYXJzZV9idWdfaWQobWVzc2FnZSkKIAogCiBjbGFzcyBDaGFu Z2VMb2dFbnRyeShvYmplY3QpOgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v Y2hlY2tvdXQvY2hhbmdlbG9nX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoYW5nZWxvZ191bml0dGVzdC5weQkocmV2aXNp b24gODU2NjIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGFu Z2Vsb2dfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTkxLDYgKzkxLDUxIEBAIGNsYXNz IENoYW5nZUxvZ1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogPT0gUm9sbGVkIG92ZXIgdG8gQ2hh bmdlTG9nLTIwMDktMDYtMTYgPT0KICIiIgogCisgICAgZGVmIHRlc3RfcGFyc2VfYnVnX2lkX2Zy b21fY2hhbmdlbG9nKHNlbGYpOgorICAgICAgICBjb21taXRfdGV4dCA9ICcnJworMjAxMS0wMy0y MyAgT2phbiBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIEFkZCBmYWlsaW5n IHJlc3VsdCBmb3IgV2ViS2l0Mi4gQWxsIHRlc3RzIHRoYXQgcmVxdWlyZQorICAgICAgICBmb2N1 cyBmYWlsIG9uIFdlYktpdDIuIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTY5ODguCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMtd2syL2Zhc3QvY3NzL3BzZXVk by1hbnktZXhwZWN0ZWQudHh0OiBBZGRlZC4KKworICAgICAgICAnJycKKworICAgICAgICBzZWxm LmFzc2VydEVxdWFscyg1Njk4OCwgcGFyc2VfYnVnX2lkX2Zyb21fY2hhbmdlbG9nKGNvbW1pdF90 ZXh0KSkKKworICAgICAgICBjb21taXRfdGV4dCA9ICcnJworMjAxMS0wMy0yMyAgT2phbiBWYWZh aSAgPG9qYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIEFkZCBmYWlsaW5nIHJlc3VsdCBmb3Ig V2ViS2l0Mi4gQWxsIHRlc3RzIHRoYXQgcmVxdWlyZQorICAgICAgICBmb2N1cyBmYWlsIG9uIFdl YktpdDIuIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTY5ODgu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjM0NQor CisgICAgICAgICogcGxhdGZvcm0vbWFjLXdrMi9mYXN0L2Nzcy9wc2V1ZG8tYW55LWV4cGVjdGVk LnR4dDogQWRkZWQuCisKKyAgICAgICAgJycnCisKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMo MTIzNDUsIHBhcnNlX2J1Z19pZF9mcm9tX2NoYW5nZWxvZyhjb21taXRfdGV4dCkpCisKKyAgICAg ICAgY29tbWl0X3RleHQgPSAnJycKKzIwMTEtMDMtMzEgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBw bGUuY29tPgorCisgICAgICAgIFF1b3RlIHRoZSBleGVjdXRhYmxlIHBhdGggd2UgcGFzcyB0byA6 OkNyZWF0ZVByb2Nlc3NXCisKKyAgICAgICAgVGhpcyB3aWxsIGVuc3VyZSB0aGF0IHNwYWNlcyBp biB0aGUgcGF0aCB3aWxsIGJlIGludGVycHJldGVkIGNvcnJlY3RseS4KKworICAgICAgICBGaXhl cyA8aHR0cDovL3dlYmtpdC5vcmcvYi81NzU2OT4gV2ViIHByb2Nlc3Mgc29tZXRpbWVzIGZhaWxz IHRvIGxhdW5jaCB3aGVuIHRoZXJlIGFyZQorICAgICAgICBzcGFjZXMgaW4gaXRzIHBhdGgKKwor ICAgICAgICBSZXZpZXdlZCBieSBTdGV2ZSBGYWxrZW5idXJnLgorCisgICAgICAgICogVUlQcm9j ZXNzL0xhdW5jaGVyL3dpbi9Qcm9jZXNzTGF1bmNoZXJXaW4uY3BwOgorICAgICAgICAoV2ViS2l0 OjpQcm9jZXNzTGF1bmNoZXI6OmxhdW5jaFByb2Nlc3MpOiBTdXJyb3VuZCB0aGUgZXhlY3V0YWJs ZSBwYXRoIGluIHF1b3Rlcy4KKworICAgICAgICAnJycKKworICAgICAgICBzZWxmLmFzc2VydEVx dWFscyg1NzU2OSwgcGFyc2VfYnVnX2lkX2Zyb21fY2hhbmdlbG9nKGNvbW1pdF90ZXh0KSkKKwog ICAgIGRlZiB0ZXN0X2xhdGVzdF9lbnRyeV9wYXJzZShzZWxmKToKICAgICAgICAgY2hhbmdlbG9n X2NvbnRlbnRzID0gdSIlc1xuJXMiICUgKHNlbGYuX2V4YW1wbGVfZW50cnksIHNlbGYuX2V4YW1w bGVfY2hhbmdlbG9nKQogICAgICAgICBjaGFuZ2Vsb2dfZmlsZSA9IFN0cmluZ0lPKGNoYW5nZWxv Z19jb250ZW50cykKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0 L2NoZWNrb3V0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L2NoZWNrb3V0L2NoZWNrb3V0LnB5CShyZXZpc2lvbiA4NTY2MikKKysrIFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoZWNrb3V0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0z MCwxMiArMzAsMTEgQEAgaW1wb3J0IG9zCiBpbXBvcnQgU3RyaW5nSU8KIAogZnJvbSB3ZWJraXRw eS5jb21tb24uY29uZmlnIGltcG9ydCB1cmxzCi1mcm9tIHdlYmtpdHB5LmNvbW1vbi5jaGVja291 dC5jaGFuZ2Vsb2cgaW1wb3J0IENoYW5nZUxvZworZnJvbSB3ZWJraXRweS5jb21tb24uY2hlY2tv dXQuY2hhbmdlbG9nIGltcG9ydCBDaGFuZ2VMb2csIHBhcnNlX2J1Z19pZF9mcm9tX2NoYW5nZWxv ZwogZnJvbSB3ZWJraXRweS5jb21tb24uY2hlY2tvdXQuY29tbWl0aW5mbyBpbXBvcnQgQ29tbWl0 SW5mbwogZnJvbSB3ZWJraXRweS5jb21tb24uY2hlY2tvdXQuc2NtIGltcG9ydCBDb21taXRNZXNz YWdlCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5jaGVja291dC5kZXBzIGltcG9ydCBERVBTCiBmcm9t IHdlYmtpdHB5LmNvbW1vbi5tZW1vaXplZCBpbXBvcnQgbWVtb2l6ZWQKLWZyb20gd2Via2l0cHku Y29tbW9uLm5ldC5idWd6aWxsYSBpbXBvcnQgcGFyc2VfYnVnX2lkX2Zyb21fY2hhbmdlbG9nCiBm cm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBFeGVjdXRpdmUsIHJ1 bl9jb21tYW5kLCBTY3JpcHRFcnJvcgogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmRlcHJl Y2F0ZWRfbG9nZ2luZyBpbXBvcnQgbG9nCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL2NvbmZpZy91cmxzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NvbmZpZy91cmxzLnB5CShyZXZpc2lvbiA4NTY2MikKKysrIFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy91cmxzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yNiw2 ICsyNiw4IEBACiAjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcg SU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFE VklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCitpbXBvcnQgcmUKKwog CiBkZWYgdmlld19zb3VyY2VfdXJsKGxvY2FsX3BhdGgpOgogICAgIHJldHVybiAiaHR0cDovL3Ry YWMud2Via2l0Lm9yZy9icm93c2VyL3RydW5rLyVzIiAlIGxvY2FsX3BhdGgKQEAgLTM0LDYgKzM2 LDEzIEBAIGRlZiB2aWV3X3NvdXJjZV91cmwobG9jYWxfcGF0aCk6CiBkZWYgdmlld19yZXZpc2lv bl91cmwocmV2aXNpb25fbnVtYmVyKToKICAgICByZXR1cm4gImh0dHA6Ly90cmFjLndlYmtpdC5v cmcvY2hhbmdlc2V0LyVzIiAlIHJldmlzaW9uX251bWJlcgogCisKIGNocm9taXVtX2xrZ3JfdXJs ID0gImh0dHA6Ly9jaHJvbWl1bS1zdGF0dXMuYXBwc3BvdC5jb20vbGtnciIKIAogY29udHJpYnV0 aW9uX2d1aWRlbGluZXMgPSAiaHR0cDovL3dlYmtpdC5vcmcvY29kaW5nL2NvbnRyaWJ1dGluZy5o dG1sIgorCitidWdfc2VydmVyX2hvc3QgPSAiYnVncy53ZWJraXQub3JnIgorX2J1Z19zZXJ2ZXJf cmVnZXggPSAiaHR0cHM/Oi8vJXMvIiAlIHJlLnN1YignXC4nLCAnXFwuJywgYnVnX3NlcnZlcl9o b3N0KQorYnVnX3NlcnZlcl91cmwgPSAiaHR0cHM6Ly8lcy8iICUgYnVnX3NlcnZlcl9ob3N0Citi dWdfdXJsX2xvbmcgPSBfYnVnX3NlcnZlcl9yZWdleCArIHIic2hvd19idWdcLmNnaVw/aWQ9KD9Q PGJ1Z19pZD5cZCspKCZjdHlwZT14bWwpPyIKK2J1Z191cmxfc2hvcnQgPSByImh0dHBcOi8vd2Vi a2l0XC5vcmcvYi8oP1A8YnVnX2lkPlxkKykiCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9uZXQvYnVnemlsbGEvX19pbml0X18ucHkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL19faW5pdF9fLnB5CShyZXZpc2lvbiA4 NTY2MikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS9fX2lu aXRfXy5weQkod29ya2luZyBjb3B5KQpAQCAtMSw4ICsxLDcgQEAKICMgUmVxdWlyZWQgZm9yIFB5 dGhvbiB0byBzZWFyY2ggdGhpcyBkaXJlY3RvcnkgZm9yIG1vZHVsZSBmaWxlcwogCiAjIFdlIG9u bHkgZXhwb3J0IHB1YmxpYyBBUEkgaGVyZS4KLSMgRklYTUU6IHBhcnNlX2J1Z19pZCBzaG91bGQg bm90IGJlIGEgZnJlZSBmdW5jdGlvbi4KLWZyb20gLmJ1Z3ppbGxhIGltcG9ydCBCdWd6aWxsYSwg cGFyc2VfYnVnX2lkLCBwYXJzZV9idWdfaWRfZnJvbV9jaGFuZ2Vsb2cKK2Zyb20gLmJ1Z3ppbGxh IGltcG9ydCBCdWd6aWxsYQogIyBVbmNsZWFyIGlmIEJ1ZyBhbmQgQXR0YWNobWVudCBuZWVkIHRv IGJlIHB1YmxpYyBjbGFzc2VzLgogZnJvbSAuYnVnIGltcG9ydCBCdWcKIGZyb20gLmF0dGFjaG1l bnQgaW1wb3J0IEF0dGFjaG1lbnQKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L25ldC9idWd6aWxsYS9idWd6aWxsYS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHkJKHJldmlzaW9uIDg1NjYyKQor KysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhLnB5 CSh3b3JraW5nIGNvcHkpCkBAIC00Myw0MCArNDMsMTIgQEAgZnJvbSAuYnVnIGltcG9ydCBCdWcK IAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmRlcHJlY2F0ZWRfbG9nZ2luZyBpbXBvcnQg bG9nCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5jb25maWcgaW1wb3J0IGNvbW1pdHRlcnMKK2ltcG9y dCB3ZWJraXRweS5jb21tb24uY29uZmlnLnVybHMgYXMgY29uZmlnX3VybHMKIGZyb20gd2Via2l0 cHkuY29tbW9uLm5ldC5jcmVkZW50aWFscyBpbXBvcnQgQ3JlZGVudGlhbHMKIGZyb20gd2Via2l0 cHkuY29tbW9uLnN5c3RlbS51c2VyIGltcG9ydCBVc2VyCiBmcm9tIHdlYmtpdHB5LnRoaXJkcGFy dHkuQmVhdXRpZnVsU291cCBpbXBvcnQgQmVhdXRpZnVsU291cCwgQmVhdXRpZnVsU3RvbmVTb3Vw LCBTb3VwU3RyYWluZXIKIAogCi0jIEZJWE1FOiBwYXJzZV9idWdfaWQgc2hvdWxkIG5vdCBiZSBh IGZyZWUgZnVuY3Rpb24uCi1kZWYgcGFyc2VfYnVnX2lkKG1lc3NhZ2UpOgotICAgIGlmIG5vdCBt ZXNzYWdlOgotICAgICAgICByZXR1cm4gTm9uZQotICAgIG1hdGNoID0gcmUuc2VhcmNoKEJ1Z3pp bGxhLmJ1Z191cmxfc2hvcnQsIG1lc3NhZ2UpCi0gICAgaWYgbWF0Y2g6Ci0gICAgICAgIHJldHVy biBpbnQobWF0Y2guZ3JvdXAoJ2J1Z19pZCcpKQotICAgIG1hdGNoID0gcmUuc2VhcmNoKEJ1Z3pp bGxhLmJ1Z191cmxfbG9uZywgbWVzc2FnZSkKLSAgICBpZiBtYXRjaDoKLSAgICAgICAgcmV0dXJu IGludChtYXRjaC5ncm91cCgnYnVnX2lkJykpCi0gICAgcmV0dXJuIE5vbmUKLQotCi0jIEZJWE1F OiBwYXJzZV9idWdfaWRfZnJvbV9jaGFuZ2Vsb2cgc2hvdWxkIG5vdCBiZSBhIGZyZWUgZnVuY3Rp b24uCi0jIFBhcnNlIHRoZSBidWcgSUQgb3V0IG9mIGEgQ2hhbmdlbG9nIG1lc3NhZ2UgYmFzZWQg b24gdGhlIGZvcm1hdCB0aGF0IGlzCi0jIHVzZWQgYnkgcHJlcGFyZS1DaGFuZ2VMb2cKLWRlZiBw YXJzZV9idWdfaWRfZnJvbV9jaGFuZ2Vsb2cobWVzc2FnZSk6Ci0gICAgaWYgbm90IG1lc3NhZ2U6 Ci0gICAgICAgIHJldHVybiBOb25lCi0gICAgbWF0Y2ggPSByZS5zZWFyY2goIl5ccyoiICsgQnVn emlsbGEuYnVnX3VybF9zaG9ydCArICIkIiwgbWVzc2FnZSwgcmUuTVVMVElMSU5FKQotICAgIGlm IG1hdGNoOgotICAgICAgICByZXR1cm4gaW50KG1hdGNoLmdyb3VwKCdidWdfaWQnKSkKLSAgICBt YXRjaCA9IHJlLnNlYXJjaCgiXlxzKiIgKyBCdWd6aWxsYS5idWdfdXJsX2xvbmcgKyAiJCIsIG1l c3NhZ2UsIHJlLk1VTFRJTElORSkKLSAgICBpZiBtYXRjaDoKLSAgICAgICAgcmV0dXJuIGludCht YXRjaC5ncm91cCgnYnVnX2lkJykpCi0gICAgIyBXZSB3ZXJlbid0IGFibGUgdG8gZmluZCBhIGJ1 ZyBVUkwgaW4gdGhlIGZvcm1hdCB1c2VkIGJ5IHByZXBhcmUtQ2hhbmdlTG9nLiBGYWxsIGJhY2sg dG8gdGhlCi0gICAgIyBmaXJzdCBidWcgVVJMIGZvdW5kIGFueXdoZXJlIGluIHRoZSBtZXNzYWdl LgotICAgIHJldHVybiBwYXJzZV9idWdfaWQobWVzc2FnZSkKLQogZGVmIHRpbWVzdGFtcCgpOgog ICAgIHJldHVybiBkYXRldGltZS5ub3coKS5zdHJmdGltZSgiJVklbSVkJUglTSVTIikKIApAQCAt MTA3LDcgKzc5LDcgQEAgY2xhc3MgQnVnemlsbGFRdWVyaWVzKG9iamVjdCk6CiAKICAgICBkZWYg X2xvYWRfcXVlcnkoc2VsZiwgcXVlcnkpOgogICAgICAgICBzZWxmLl9idWd6aWxsYS5hdXRoZW50 aWNhdGUoKQotICAgICAgICBmdWxsX3VybCA9ICIlcyVzIiAlIChzZWxmLl9idWd6aWxsYS5idWdf c2VydmVyX3VybCwgcXVlcnkpCisgICAgICAgIGZ1bGxfdXJsID0gIiVzJXMiICUgKGNvbmZpZ191 cmxzLmJ1Z19zZXJ2ZXJfdXJsLCBxdWVyeSkKICAgICAgICAgcmV0dXJuIHNlbGYuX2J1Z3ppbGxh LmJyb3dzZXIub3BlbihmdWxsX3VybCkKIAogICAgIGRlZiBfZmV0Y2hfYnVnc19mcm9tX2FkdmFu Y2VkX3F1ZXJ5KHNlbGYsIHF1ZXJ5KToKQEAgLTIyMCwxNCArMTkyLDYgQEAgY2xhc3MgQnVnemls bGEob2JqZWN0KToKICAgICAgICAgIyBzY3JpcHQuCiAgICAgICAgIHNlbGYuYnJvd3Nlci5zZXRf aGFuZGxlX3JvYm90cyhGYWxzZSkKIAotICAgICMgRklYTUU6IE11Y2ggb2YgdGhpcyBzaG91bGQg Z28gaW50byBzb21lIHNvcnQgb2YgY29uZmlnIG1vZHVsZSwKLSAgICAjIHN1Y2ggYXMgY29tbW9u LmNvbmZpZy51cmxzLgotICAgIGJ1Z19zZXJ2ZXJfaG9zdCA9ICJidWdzLndlYmtpdC5vcmciCi0g ICAgYnVnX3NlcnZlcl9yZWdleCA9ICJodHRwcz86Ly8lcy8iICUgcmUuc3ViKCdcLicsICdcXC4n LCBidWdfc2VydmVyX2hvc3QpCi0gICAgYnVnX3NlcnZlcl91cmwgPSAiaHR0cHM6Ly8lcy8iICUg YnVnX3NlcnZlcl9ob3N0Ci0gICAgYnVnX3VybF9sb25nID0gYnVnX3NlcnZlcl9yZWdleCArIHIi c2hvd19idWdcLmNnaVw/aWQ9KD9QPGJ1Z19pZD5cZCspKCZjdHlwZT14bWwpPyIKLSAgICBidWdf dXJsX3Nob3J0ID0gciJodHRwXDovL3dlYmtpdFwub3JnL2IvKD9QPGJ1Z19pZD5cZCspIgotCiAg ICAgZGVmIHF1aXBzKHNlbGYpOgogICAgICAgICAjIFdlIG9ubHkgZmV0Y2ggYW5kIHBhcnNlIHRo ZSBsaXN0IG9mIHF1aXBzIG9uY2UgcGVyIGluc3RhbnRpYXRpb24KICAgICAgICAgIyBzbyB0aGF0 IHdlIGRvIG5vdCBidXJkZW4gYnVncy53ZWJraXQub3JnLgpAQCAtMjM5LDcgKzIwMyw3IEBAIGNs YXNzIEJ1Z3ppbGxhKG9iamVjdCk6CiAgICAgICAgIGlmIG5vdCBidWdfaWQ6CiAgICAgICAgICAg ICByZXR1cm4gTm9uZQogICAgICAgICBjb250ZW50X3R5cGUgPSAiJmN0eXBlPXhtbCIgaWYgeG1s IGVsc2UgIiIKLSAgICAgICAgcmV0dXJuICIlc3Nob3dfYnVnLmNnaT9pZD0lcyVzIiAlIChzZWxm LmJ1Z19zZXJ2ZXJfdXJsLCBidWdfaWQsIGNvbnRlbnRfdHlwZSkKKyAgICAgICAgcmV0dXJuICIl c3Nob3dfYnVnLmNnaT9pZD0lcyVzIiAlIChjb25maWdfdXJscy5idWdfc2VydmVyX3VybCwgYnVn X2lkLCBjb250ZW50X3R5cGUpCiAKICAgICBkZWYgc2hvcnRfYnVnX3VybF9mb3JfYnVnX2lkKHNl bGYsIGJ1Z19pZCk6CiAgICAgICAgIGlmIG5vdCBidWdfaWQ6CkBAIC0yNDcsNyArMjExLDcgQEAg Y2xhc3MgQnVnemlsbGEob2JqZWN0KToKICAgICAgICAgcmV0dXJuICJodHRwOi8vd2Via2l0Lm9y Zy9iLyVzIiAlIGJ1Z19pZAogCiAgICAgZGVmIGFkZF9hdHRhY2htZW50X3VybChzZWxmLCBidWdf aWQpOgotICAgICAgICByZXR1cm4gIiVzYXR0YWNobWVudC5jZ2k/YWN0aW9uPWVudGVyJmJ1Z2lk PSVzIiAlIChzZWxmLmJ1Z19zZXJ2ZXJfdXJsLCBidWdfaWQpCisgICAgICAgIHJldHVybiAiJXNh dHRhY2htZW50LmNnaT9hY3Rpb249ZW50ZXImYnVnaWQ9JXMiICUgKGNvbmZpZ191cmxzLmJ1Z19z ZXJ2ZXJfdXJsLCBidWdfaWQpCiAKICAgICBkZWYgYXR0YWNobWVudF91cmxfZm9yX2lkKHNlbGYs IGF0dGFjaG1lbnRfaWQsIGFjdGlvbj0idmlldyIpOgogICAgICAgICBpZiBub3QgYXR0YWNobWVu dF9pZDoKQEAgLTI1NSw3ICsyMTksNyBAQCBjbGFzcyBCdWd6aWxsYShvYmplY3QpOgogICAgICAg ICBhY3Rpb25fcGFyYW0gPSAiIgogICAgICAgICBpZiBhY3Rpb24gYW5kIGFjdGlvbiAhPSAidmll dyI6CiAgICAgICAgICAgICBhY3Rpb25fcGFyYW0gPSAiJmFjdGlvbj0lcyIgJSBhY3Rpb24KLSAg ICAgICAgcmV0dXJuICIlc2F0dGFjaG1lbnQuY2dpP2lkPSVzJXMiICUgKHNlbGYuYnVnX3NlcnZl cl91cmwsCisgICAgICAgIHJldHVybiAiJXNhdHRhY2htZW50LmNnaT9pZD0lcyVzIiAlIChjb25m aWdfdXJscy5idWdfc2VydmVyX3VybCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGF0dGFjaG1lbnRfaWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBhY3Rpb25fcGFyYW0pCiAKQEAgLTQwNSw3ICszNjksNyBAQCBjbGFz cyBCdWd6aWxsYShvYmplY3QpOgogICAgICAgICAgICAgc2VsZi5hdXRoZW50aWNhdGVkID0gVHJ1 ZQogICAgICAgICAgICAgcmV0dXJuCiAKLSAgICAgICAgY3JlZGVudGlhbHMgPSBDcmVkZW50aWFs cyhzZWxmLmJ1Z19zZXJ2ZXJfaG9zdCwgZ2l0X3ByZWZpeD0iYnVnemlsbGEiKQorICAgICAgICBj cmVkZW50aWFscyA9IENyZWRlbnRpYWxzKGNvbmZpZ191cmxzLmJ1Z19zZXJ2ZXJfaG9zdCwgZ2l0 X3ByZWZpeD0iYnVnemlsbGEiKQogCiAgICAgICAgIGF0dGVtcHRzID0gMAogICAgICAgICB3aGls ZSBub3Qgc2VsZi5hdXRoZW50aWNhdGVkOgpAQCAtNDEzLDcgKzM3Nyw3IEBAIGNsYXNzIEJ1Z3pp bGxhKG9iamVjdCk6CiAgICAgICAgICAgICB1c2VybmFtZSwgcGFzc3dvcmQgPSBjcmVkZW50aWFs cy5yZWFkX2NyZWRlbnRpYWxzKCkKIAogICAgICAgICAgICAgbG9nKCJMb2dnaW5nIGluIGFzICVz Li4uIiAlIHVzZXJuYW1lKQotICAgICAgICAgICAgc2VsZi5icm93c2VyLm9wZW4oc2VsZi5idWdf c2VydmVyX3VybCArCisgICAgICAgICAgICBzZWxmLmJyb3dzZXIub3Blbihjb25maWdfdXJscy5i dWdfc2VydmVyX3VybCArCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiaW5kZXguY2dp P0dvQWhlYWRBbmRMb2dJbj0xIikKICAgICAgICAgICAgIHNlbGYuYnJvd3Nlci5zZWxlY3RfZm9y bShuYW1lPSJsb2dpbiIpCiAgICAgICAgICAgICBzZWxmLmJyb3dzZXJbJ0J1Z3ppbGxhX2xvZ2lu J10gPSB1c2VybmFtZQpAQCAtNTc0LDcgKzUzOCw3IEBAIGNsYXNzIEJ1Z3ppbGxhKG9iamVjdCk6 CiAgICAgICAgICAgICAjIEZJWE1FOiBUaGlzIHdpbGwgbWFrZSBzb21lIHBhdGhzIGZhaWwsIGFz IHRoZXkgYXNzdW1lIHRoaXMgcmV0dXJucyBhbiBpZC4KICAgICAgICAgICAgIHJldHVybgogCi0g ICAgICAgIHNlbGYuYnJvd3Nlci5vcGVuKHNlbGYuYnVnX3NlcnZlcl91cmwgKyAiZW50ZXJfYnVn LmNnaT9wcm9kdWN0PVdlYktpdCIpCisgICAgICAgIHNlbGYuYnJvd3Nlci5vcGVuKGNvbmZpZ191 cmxzLmJ1Z19zZXJ2ZXJfdXJsICsgImVudGVyX2J1Zy5jZ2k/cHJvZHVjdD1XZWJLaXQiKQogICAg ICAgICBzZWxmLmJyb3dzZXIuc2VsZWN0X2Zvcm0obmFtZT0iQ3JlYXRlIikKICAgICAgICAgY29t cG9uZW50X2l0ZW1zID0gc2VsZi5icm93c2VyLmZpbmRfY29udHJvbCgnY29tcG9uZW50JykuaXRl bXMKICAgICAgICAgY29tcG9uZW50X25hbWVzID0gbWFwKGxhbWJkYSBpdGVtOiBpdGVtLm5hbWUs IGNvbXBvbmVudF9pdGVtcykKQEAgLTYxMCw3ICs1NzQsNyBAQCBjbGFzcyBCdWd6aWxsYShvYmpl Y3QpOgogCiAgICAgICAgIGJ1Z19pZCA9IHNlbGYuX2NoZWNrX2NyZWF0ZV9idWdfcmVzcG9uc2Uo cmVzcG9uc2UucmVhZCgpKQogICAgICAgICBsb2coIkJ1ZyAlcyBjcmVhdGVkLiIgJSBidWdfaWQp Ci0gICAgICAgIGxvZygiJXNzaG93X2J1Zy5jZ2k/aWQ9JXMiICUgKHNlbGYuYnVnX3NlcnZlcl91 cmwsIGJ1Z19pZCkpCisgICAgICAgIGxvZygiJXNzaG93X2J1Zy5jZ2k/aWQ9JXMiICUgKGNvbmZp Z191cmxzLmJ1Z19zZXJ2ZXJfdXJsLCBidWdfaWQpKQogICAgICAgICByZXR1cm4gYnVnX2lkCiAK ICAgICBkZWYgX2ZpbmRfc2VsZWN0X2VsZW1lbnRfZm9yX2ZsYWcoc2VsZiwgZmxhZ19uYW1lKToK SW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS9idWd6aWxs YV91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9uZXQvYnVnemlsbGEvYnVnemlsbGFfdW5pdHRlc3QucHkJKHJldmlzaW9uIDg1NjYyKQorKysg VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhX3VuaXR0 ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zMCw4ICszMCw5IEBAIGltcG9ydCB1bml0dGVzdAog aW1wb3J0IGRhdGV0aW1lCiBpbXBvcnQgU3RyaW5nSU8KIAotZnJvbSAuYnVnemlsbGEgaW1wb3J0 IEJ1Z3ppbGxhLCBCdWd6aWxsYVF1ZXJpZXMsIHBhcnNlX2J1Z19pZCwgcGFyc2VfYnVnX2lkX2Zy b21fY2hhbmdlbG9nCitmcm9tIC5idWd6aWxsYSBpbXBvcnQgQnVnemlsbGEsIEJ1Z3ppbGxhUXVl cmllcwogCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5jaGVja291dC5jaGFuZ2Vsb2cgaW1wb3J0IHBh cnNlX2J1Z19pZAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLm91dHB1dGNhcHR1cmUgaW1w b3J0IE91dHB1dENhcHR1cmUKIGZyb20gd2Via2l0cHkudG9vbC5tb2NrdG9vbCBpbXBvcnQgTW9j a0Jyb3dzZXIKIGZyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5tb2NrIGltcG9ydCBNb2NrCkBAIC0x OTIsNTIgKzE5Myw2IEBAIFpFWnBibWx6YUV4dllXUlhhWFJvVW1WaGMyOXVPbkpsWVhOdmJsMDcK ICAgICAgICAgfV0sCiAgICAgfQogCi0gICAgZGVmIHRlc3RfcGFyc2VfYnVnX2lkX2Zyb21fY2hh bmdlbG9nKHNlbGYpOgotICAgICAgICBjb21taXRfdGV4dCA9ICcnJwotMjAxMS0wMy0yMyAgT2ph biBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgotCi0gICAgICAgIEFkZCBmYWlsaW5nIHJlc3Vs dCBmb3IgV2ViS2l0Mi4gQWxsIHRlc3RzIHRoYXQgcmVxdWlyZQotICAgICAgICBmb2N1cyBmYWls IG9uIFdlYktpdDIuIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTY5ODguCi0KLSAgICAgICAgKiBwbGF0Zm9ybS9tYWMtd2syL2Zhc3QvY3NzL3BzZXVkby1hbnkt ZXhwZWN0ZWQudHh0OiBBZGRlZC4KLQotICAgICAgICAnJycKLQotICAgICAgICBzZWxmLmFzc2Vy dEVxdWFscyg1Njk4OCwgcGFyc2VfYnVnX2lkX2Zyb21fY2hhbmdlbG9nKGNvbW1pdF90ZXh0KSkK LQotICAgICAgICBjb21taXRfdGV4dCA9ICcnJwotMjAxMS0wMy0yMyAgT2phbiBWYWZhaSAgPG9q YW5AY2hyb21pdW0ub3JnPgotCi0gICAgICAgIEFkZCBmYWlsaW5nIHJlc3VsdCBmb3IgV2ViS2l0 Mi4gQWxsIHRlc3RzIHRoYXQgcmVxdWlyZQotICAgICAgICBmb2N1cyBmYWlsIG9uIFdlYktpdDIu IFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTY5ODguCi0gICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjM0NQotCi0gICAg ICAgICogcGxhdGZvcm0vbWFjLXdrMi9mYXN0L2Nzcy9wc2V1ZG8tYW55LWV4cGVjdGVkLnR4dDog QWRkZWQuCi0KLSAgICAgICAgJycnCi0KLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoMTIzNDUs IHBhcnNlX2J1Z19pZF9mcm9tX2NoYW5nZWxvZyhjb21taXRfdGV4dCkpCi0KLSAgICAgICAgY29t bWl0X3RleHQgPSAnJycKLTIwMTEtMDMtMzEgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29t PgotCi0gICAgICAgIFF1b3RlIHRoZSBleGVjdXRhYmxlIHBhdGggd2UgcGFzcyB0byA6OkNyZWF0 ZVByb2Nlc3NXCi0KLSAgICAgICAgVGhpcyB3aWxsIGVuc3VyZSB0aGF0IHNwYWNlcyBpbiB0aGUg cGF0aCB3aWxsIGJlIGludGVycHJldGVkIGNvcnJlY3RseS4KLQotICAgICAgICBGaXhlcyA8aHR0 cDovL3dlYmtpdC5vcmcvYi81NzU2OT4gV2ViIHByb2Nlc3Mgc29tZXRpbWVzIGZhaWxzIHRvIGxh dW5jaCB3aGVuIHRoZXJlIGFyZQotICAgICAgICBzcGFjZXMgaW4gaXRzIHBhdGgKLQotICAgICAg ICBSZXZpZXdlZCBieSBTdGV2ZSBGYWxrZW5idXJnLgotCi0gICAgICAgICogVUlQcm9jZXNzL0xh dW5jaGVyL3dpbi9Qcm9jZXNzTGF1bmNoZXJXaW4uY3BwOgotICAgICAgICAoV2ViS2l0OjpQcm9j ZXNzTGF1bmNoZXI6OmxhdW5jaFByb2Nlc3MpOiBTdXJyb3VuZCB0aGUgZXhlY3V0YWJsZSBwYXRo IGluIHF1b3Rlcy4KLQotICAgICAgICAnJycKLQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyg1 NzU2OSwgcGFyc2VfYnVnX2lkX2Zyb21fY2hhbmdlbG9nKGNvbW1pdF90ZXh0KSkKLQotCiAgICAg IyBGSVhNRTogVGhpcyBzaG91bGQgbW92ZSB0byBhIGNlbnRyYWwgbG9jYXRpb24gYW5kIGJlIHNo YXJlZCBieSBtb3JlIHVuaXQgdGVzdHMuCiAgICAgZGVmIF9hc3NlcnRfZGljdGlvbmFyaWVzX2Vx dWFsKHNlbGYsIGFjdHVhbCwgZXhwZWN0ZWQpOgogICAgICAgICAjIE1ha2Ugc3VyZSB3ZSBhcmVu J3QgcGFyc2luZyBtb3JlIG9yIGxlc3MgdGhhbiB3ZSBleHBlY3QKSW5kZXg6IFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY2hhbmdlbG9nLnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY2hhbmdlbG9nLnB5CShyZXZpc2lv biA4NTY2MikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY2hhbmdl bG9nLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yNyw3ICsyNyw3IEBACiAKIGltcG9ydCByZQogZnJv bSBjb21tb24gaW1wb3J0IFRhYkNoZWNrZXIKLWZyb20gd2Via2l0cHkuY29tbW9uLm5ldC5idWd6 aWxsYSBpbXBvcnQgcGFyc2VfYnVnX2lkX2Zyb21fY2hhbmdlbG9nCitmcm9tIHdlYmtpdHB5LmNv bW1vbi5jaGVja291dC5jaGFuZ2Vsb2cgaW1wb3J0IHBhcnNlX2J1Z19pZF9mcm9tX2NoYW5nZWxv ZwogCiAKIGNsYXNzIENoYW5nZUxvZ0NoZWNrZXIob2JqZWN0KToKSW5kZXg6IFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvdG9vbC9ib3QvaXJjX2NvbW1hbmQucHkKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv U2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9pcmNfY29tbWFuZC5weQkocmV2aXNpb24gODU2NjIp CisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L2lyY19jb21tYW5kLnB5CSh3b3Jr aW5nIGNvcHkpCkBAIC0zMSw3ICszMSw3IEBAIGZyb20gd2Via2l0cHkuY29tbW9uLmNvbmZpZyBp bXBvcnQgaXJjIGEKIAogZnJvbSB3ZWJraXRweS5jb21tb24uY29uZmlnIGltcG9ydCB1cmxzCiBm cm9tIHdlYmtpdHB5LmNvbW1vbi5jb25maWcuY29tbWl0dGVycyBpbXBvcnQgQ29tbWl0dGVyTGlz dAotZnJvbSB3ZWJraXRweS5jb21tb24ubmV0LmJ1Z3ppbGxhIGltcG9ydCBwYXJzZV9idWdfaWQK K2Zyb20gd2Via2l0cHkuY29tbW9uLmNoZWNrb3V0LmNoYW5nZWxvZyBpbXBvcnQgcGFyc2VfYnVn X2lkCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBTY3JpcHRF cnJvcgogZnJvbSB3ZWJraXRweS50b29sLmJvdC5xdWV1ZWVuZ2luZSBpbXBvcnQgVGVybWluYXRl UXVldWUKIGZyb20gd2Via2l0cHkudG9vbC5ncmFtbWFyIGltcG9ydCBqb2luX3dpdGhfc2VwYXJh dG9ycwpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9zaGVyaWZmLnB5Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3Qvc2hlcmlmZi5weQko cmV2aXNpb24gODU2NjIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L3NoZXJp ZmYucHkJKHdvcmtpbmcgY29weSkKQEAgLTI3LDcgKzI3LDcgQEAKICMgT0YgVEhJUyBTT0ZUV0FS RSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAog ZnJvbSB3ZWJraXRweS5jb21tb24uY29uZmlnIGltcG9ydCB1cmxzCi1mcm9tIHdlYmtpdHB5LmNv bW1vbi5uZXQuYnVnemlsbGEgaW1wb3J0IHBhcnNlX2J1Z19pZAorZnJvbSB3ZWJraXRweS5jb21t b24uY2hlY2tvdXQuY2hhbmdlbG9nIGltcG9ydCBwYXJzZV9idWdfaWQKIGZyb20gd2Via2l0cHku Y29tbW9uLnN5c3RlbS5kZXByZWNhdGVkX2xvZ2dpbmcgaW1wb3J0IGxvZwogZnJvbSB3ZWJraXRw eS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBpbXBvcnQgU2NyaXB0RXJyb3IKIGZyb20gd2Via2l0 cHkudG9vbC5ncmFtbWFyIGltcG9ydCBqb2luX3dpdGhfc2VwYXJhdG9ycwpJbmRleDogVG9vbHMv U2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3VwbG9hZC5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvdXBsb2FkLnB5CShyZXZpc2lvbiA4 NTY2MikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy91cGxvYWQucHkJ KHdvcmtpbmcgY29weSkKQEAgLTM2LDggKzM2LDggQEAgZnJvbSBvcHRwYXJzZSBpbXBvcnQgbWFr ZV9vcHRpb24KIAogZnJvbSB3ZWJraXRweS50b29sIGltcG9ydCBzdGVwcwogCitmcm9tIHdlYmtp dHB5LmNvbW1vbi5jaGVja291dC5jaGFuZ2Vsb2cgaW1wb3J0IHBhcnNlX2J1Z19pZF9mcm9tX2No YW5nZWxvZwogZnJvbSB3ZWJraXRweS5jb21tb24uY29uZmlnLmNvbW1pdHRlcnMgaW1wb3J0IENv bW1pdHRlckxpc3QKLWZyb20gd2Via2l0cHkuY29tbW9uLm5ldC5idWd6aWxsYSBpbXBvcnQgcGFy c2VfYnVnX2lkX2Zyb21fY2hhbmdlbG9nCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZGVw cmVjYXRlZF9sb2dnaW5nIGltcG9ydCBlcnJvciwgbG9nCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5z eXN0ZW0udXNlciBpbXBvcnQgVXNlcgogZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5Lm1vY2sgaW1w b3J0IE1vY2sK