32816 2009-12-21 00:36:11 -0800 [bzt] Automate the process of calling prepare-ChangeLog 2009-12-21 22:47:08 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 abarth webkit-unassigned eric mjs webkit.review.bot oldest_to_newest 173904 0 abarth 2009-12-21 00:36:11 -0800 We should start work on a submit-patch command that automates the process of creating a bug and uploading a code change. In the first cut, I'm going to focus on calling prepare-ChangeLog. I'll create the bug in a second round. 173905 1 45309 abarth 2009-12-21 00:38:30 -0800 Created attachment 45309 Patch 173906 2 webkit.review.bot 2009-12-21 00:40:13 -0800 Attachment 45309 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKitTools/ChangeLog:17: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 173907 3 45310 abarth 2009-12-21 00:41:21 -0800 Created attachment 45310 Patch 173909 4 webkit.review.bot 2009-12-21 00:45:32 -0800 style-queue ran check-webkit-style on attachment 45310 without any errors. 174186 5 45310 eric 2009-12-21 22:38:40 -0800 Comment on attachment 45310 Patch I think the -o approach is strange, and probably wrong. $EDITOR or some sort of user prompting is what we want in the end. Also --non-interactive makes little sense for PrepareChangeLog, but ok. The addition of SubmitPatch at this time doesn't seem much value add. But the rest of the changes seem great! (I'm OK keeping it around, just seems kinda vacuous atm.) Clearly PostCommits needs to be converted too. :( LGTM. 174188 6 45310 abarth 2009-12-21 22:40:32 -0800 Comment on attachment 45310 Patch tahnks 174190 7 abarth 2009-12-21 22:47:08 -0800 Committed r52480: <http://trac.webkit.org/changeset/52480> 45309 2009-12-21 00:38:30 -0800 2009-12-21 00:41:15 -0800 Patch bug-32816-20091221003829.patch text/plain 14104 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlNTJhMmU3Li5iYzcyMzY4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMDktMTIt MjEgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbYnp0XSBBdXRvbWF0ZSB0aGUgcHJvY2VzcyBv ZiBjYWxsaW5nIHByZXBhcmUtQ2hhbmdlTG9nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zMjgxNgorCisJVGhpcyBwYXRjaCBhdXRvbWF0ZXMgdGhlIHBy b2Nlc3Mgb2YgY3JlYXRpbmcgYSBidWcgYW5kIHBhdGNoIGFuZAorICAgICAgICB1cGxvYWRpbmcg aXQgdG8gYnVnemlsbGEuICBUaGUgZmlyc3QgY3V0IGp1c3QgY2FsbHMKKyAgICAgICAgcHJlcGFy ZS1DaGFuZ2VMb2cuCisKKyAgICAgICAgVGhpcyBwYXRjaCByZXF1aXJlZCBzb21lIHJlZmFjdG9y aW5nIG9mIHVwbG9hZC5weSB0byB0aGUgU3RlcAorICAgICAgICBtb2RlbCwgYnV0IHRoYXQncyB3 b3J0aCBkb2luZyBhbnl3YXkuCisKKyAgICAgICAgKiBTY3JpcHRzL2J1Z3ppbGxhLXRvb2w6Cisg ICAgICAgICogU2NyaXB0cy9tb2R1bGVzL2J1aWxkc3RlcHMucHk6CisgICAgICAgICogU2NyaXB0 cy9tb2R1bGVzL2NvbW1hbmRzL2Rvd25sb2FkLnB5OgorICAgICAgICAqIFNjcmlwdHMvbW9kdWxl cy9jb21tYW5kcy91cGxvYWQucHk6CisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRz L3VwbG9hZF91bml0dGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMvbW9ja19idWd6 aWxsYXRvb2wucHk6CisKKzIwMDktMTItMjAgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOZWVk IGEgc2hvcnQgZGVzY3JpcHRpb24gYW5kIGJ1ZyBVUkwgKE9PUFMhKQorCisgICAgICAgICogU2Ny aXB0cy9tb2R1bGVzL2J1aWxkc3RlcHMucHk6CisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL2Nv bW1hbmRzL3VwbG9hZC5weToKKwogMjAwOS0xMi0yMCAgQ2hyaXMgSmVyZG9uZWsgIDxjaHJpcy5q ZXJkb25la0BnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRp ZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wgYi9XZWJLaXRUb29s cy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wKaW5kZXggMmE2YWU5MC4uZDMzMjNlZCAxMDA3NTUKLS0t IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sCisrKyBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvYnVnemlsbGEtdG9vbApAQCAtNDMsNiArNDMsOCBAQCBmcm9tIG1vZHVsZXMuZXhlY3V0 aXZlIGltcG9ydCBFeGVjdXRpdmUKIGZyb20gbW9kdWxlcy5sb2dnaW5nIGltcG9ydCBsb2cKIGZy b20gbW9kdWxlcy5tdWx0aWNvbW1hbmR0b29sIGltcG9ydCBNdWx0aUNvbW1hbmRUb29sCiBmcm9t IG1vZHVsZXMuc2NtIGltcG9ydCBkZXRlY3Rfc2NtX3N5c3RlbQorZnJvbSBtb2R1bGVzLnVzZXIg aW1wb3J0IFVzZXIKKwogCiBjbGFzcyBCdWd6aWxsYVRvb2woTXVsdGlDb21tYW5kVG9vbCk6CiAg ICAgZGVmIF9faW5pdF9fKHNlbGYpOgpAQCAtNTMsNiArNTUsNyBAQCBjbGFzcyBCdWd6aWxsYVRv b2woTXVsdGlDb21tYW5kVG9vbCk6CiAgICAgICAgIHNlbGYuYnVncyA9IEJ1Z3ppbGxhKCkKICAg ICAgICAgc2VsZi5idWlsZGJvdCA9IEJ1aWxkQm90KCkKICAgICAgICAgc2VsZi5leGVjdXRpdmUg PSBFeGVjdXRpdmUoKQorICAgICAgICBzZWxmLnVzZXIgPSBVc2VyKCkKICAgICAgICAgc2VsZi5f c2NtID0gTm9uZQogICAgICAgICBzZWxmLnN0YXR1c19ib3QgPSBTdGF0dXNCb3QoKQogCmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvYnVpbGRzdGVwcy5weSBiL1dlYktp dFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWlsZHN0ZXBzLnB5CmluZGV4IDBlZmZjNDguLmY4YTM1 ZDEgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWlsZHN0ZXBzLnB5 CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWlsZHN0ZXBzLnB5CkBAIC0yNyw2 ICsyNyw3IEBACiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9T U0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKIGltcG9ydCBvcworaW1wb3J0IFN0cmluZ0lPCiAK IGZyb20gb3B0cGFyc2UgaW1wb3J0IG1ha2Vfb3B0aW9uCiAKQEAgLTUyLDYgKzUzLDEwIEBAIGNs YXNzIENvbW1hbmRPcHRpb25zKG9iamVjdCk6CiAgICAgcG9ydCA9IG1ha2Vfb3B0aW9uKCItLXBv cnQiLCBhY3Rpb249InN0b3JlIiwgZGVzdD0icG9ydCIsIGRlZmF1bHQ9Tm9uZSwgaGVscD0iU3Bl Y2lmeSBhIHBvcnQgKGUuZy4sIG1hYywgcXQsIGd0aywgLi4uKS4iKQogICAgIHJldmlld2VyID0g bWFrZV9vcHRpb24oIi1yIiwgIi0tcmV2aWV3ZXIiLCBhY3Rpb249InN0b3JlIiwgdHlwZT0ic3Ry aW5nIiwgZGVzdD0icmV2aWV3ZXIiLCBoZWxwPSJVcGRhdGUgQ2hhbmdlTG9ncyB0byBzYXkgUmV2 aWV3ZWQgYnkgUkVWSUVXRVIuIikKICAgICBjb21wbGV0ZV9yb2xsb3V0ID0gbWFrZV9vcHRpb24o Ii0tY29tcGxldGUtcm9sbG91dCIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlc3Q9ImNvbXBsZXRl X3JvbGxvdXQiLCBoZWxwPSJDb21taXQgdGhlIHJldmVydCBhbmQgcmUtb3BlbiB0aGUgb3JpZ2lu YWwgYnVnLiIpCisgICAgb2Jzb2xldGVfcGF0Y2hlcyA9IG1ha2Vfb3B0aW9uKCItLW5vLW9ic29s ZXRlIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9Im9ic29sZXRlX3BhdGNoZXMiLCBkZWZh dWx0PVRydWUsIGhlbHA9IkRvIG5vdCBvYnNvbGV0ZSBvbGQgcGF0Y2hlcyBiZWZvcmUgcG9zdGlu ZyB0aGlzIG9uZS4iKQorICAgIHJldmlldyA9IG1ha2Vfb3B0aW9uKCItLW5vLXJldmlldyIsIGFj dGlvbj0ic3RvcmVfZmFsc2UiLCBkZXN0PSJyZXZpZXciLCBkZWZhdWx0PVRydWUsIGhlbHA9IkRv IG5vdCBtYXJrIHRoZSBwYXRjaCBmb3IgcmV2aWV3LiIpCisgICAgcmVxdWVzdF9jb21taXQgPSBt YWtlX29wdGlvbigiLS1yZXF1ZXN0LWNvbW1pdCIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlc3Q9 InJlcXVlc3RfY29tbWl0IiwgZGVmYXVsdD1GYWxzZSwgaGVscD0iTWFyayB0aGUgcGF0Y2ggYXMg bmVlZGluZyBhdXRvLWNvbW1pdCBhZnRlciByZXZpZXcuIikKKyAgICBkZXNjcmlwdGlvbiA9IG1h a2Vfb3B0aW9uKCItbSIsICItLWRlc2NyaXB0aW9uIiwgYWN0aW9uPSJzdG9yZSIsIHR5cGU9InN0 cmluZyIsIGRlc3Q9ImRlc2NyaXB0aW9uIiwgaGVscD0iRGVzY3JpcHRpb24gc3RyaW5nIGZvciB0 aGUgYXR0YWNobWVudCAoZGVmYXVsdDogXCJwYXRjaFwiKSIpCiAKIAogY2xhc3MgQWJzdHJhY3RT dGVwKG9iamVjdCk6CkBAIC02Miw2ICs2Nyw3IEBAIGNsYXNzIEFic3RyYWN0U3RlcChvYmplY3Qp OgogCiAgICAgZGVmIF9ydW5fc2NyaXB0KHNlbGYsIHNjcmlwdF9uYW1lLCBxdWlldD1GYWxzZSwg cG9ydD1XZWJLaXRQb3J0KToKICAgICAgICAgbG9nKCJSdW5uaW5nICVzIiAlIHNjcmlwdF9uYW1l KQorICAgICAgICAjIEZJWE1FOiBUaGlzIHNob3VsZCB1c2Ugc2VsZi5wb3J0KCkKICAgICAgICAg c2VsZi5fdG9vbC5leGVjdXRpdmUucnVuX2FuZF90aHJvd19pZl9mYWlsKHBvcnQuc2NyaXB0X3Bh dGgoc2NyaXB0X25hbWUpLCBxdWlldCkKIAogICAgICMgRklYTUU6IFRoZSBwb3J0IHNob3VsZCBs aXZlIG9uIHRoZSB0b29sLgpAQCAtMTA1LDggKzExMSw1OSBAQCBjbGFzcyBNZXRhU3RlcChBYnN0 cmFjdFN0ZXApOgogCiAKIGNsYXNzIFByZXBhcmVDaGFuZ2Vsb2dTdGVwKEFic3RyYWN0U3RlcCk6 CisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIG9wdGlvbnMoY2xzKToKKyAgICAgICAgcmV0dXJu IFsKKyAgICAgICAgICAgIENvbW1hbmRPcHRpb25zLnBvcnQsCisgICAgICAgICAgICBDb21tYW5k T3B0aW9ucy5xdWlldCwKKyAgICAgICAgICAgIENvbW1hbmRPcHRpb25zLm5vbl9pbnRlcmFjdGl2 ZSwKKyAgICAgICAgXQorCiAgICAgZGVmIHJ1bihzZWxmLCBzdGF0ZSk6Ci0gICAgICAgIHNlbGYu X3J1bl9zY3JpcHQoInByZXBhcmUtQ2hhbmdlTG9nIikKKyAgICAgICAgb3MuY2hkaXIoc2VsZi5f dG9vbC5zY20oKS5jaGVja291dF9yb290KQorICAgICAgICBhcmdzID0gW3NlbGYucG9ydCgpLnNj cmlwdF9wYXRoKCJwcmVwYXJlLUNoYW5nZUxvZyIpXQorICAgICAgICBpZiBub3Qgc2VsZi5fb3B0 aW9ucy5ub25faW50ZXJhY3RpdmU6CisgICAgICAgICAgICBhcmdzLmFwcGVuZCgiLW8iKQorICAg ICAgICBpZiBzdGF0ZVsiYnVnX2lkIl06CisgICAgICAgICAgICBhcmdzLmFwcGVuZCgiLS1idWc9 JXMiICUgc3RhdGVbImJ1Z19pZCJdKQorICAgICAgICBzZWxmLl90b29sLmV4ZWN1dGl2ZS5ydW5f YW5kX3Rocm93X2lmX2ZhaWwoYXJncywgc2VsZi5fb3B0aW9ucy5xdWlldCkKKyAgICAgICAgaWYg bm90IHNlbGYuX29wdGlvbnMubm9uX2ludGVyYWN0aXZlOgorICAgICAgICAgICAgc2VsZi5fdG9v bC51c2VyLnByb21wdCgiUHJlc3MgZW50ZXIgd2hlbiByZWFkeSB0byBjb250aW51ZS4iKQorCisK K2NsYXNzIE9ic29sZXRlUGF0Y2hlc09uQnVnU3RlcChBYnN0cmFjdFN0ZXApOgorICAgIEBjbGFz c21ldGhvZAorICAgIGRlZiBvcHRpb25zKGNscyk6CisgICAgICAgIHJldHVybiBbCisgICAgICAg ICAgICBDb21tYW5kT3B0aW9ucy5vYnNvbGV0ZV9wYXRjaGVzLAorICAgICAgICBdCisKKyAgICBk ZWYgcnVuKHNlbGYsIHN0YXRlKToKKyAgICAgICAgaWYgbm90IHNlbGYuX29wdGlvbnMub2Jzb2xl dGVfcGF0Y2hlczoKKyAgICAgICAgICAgIHJldHVybgorICAgICAgICBidWdfaWQgPSBzdGF0ZVsi YnVnX2lkIl0KKyAgICAgICAgcGF0Y2hlcyA9IHNlbGYuX3Rvb2wuYnVncy5mZXRjaF9wYXRjaGVz X2Zyb21fYnVnKGJ1Z19pZCkKKyAgICAgICAgaWYgbm90IHBhdGNoZXM6CisgICAgICAgICAgICBy ZXR1cm4KKyAgICAgICAgbG9nKCJPYnNvbGV0aW5nICVzIG9uIGJ1ZyAlcyIgJSAocGx1cmFsaXpl KCJvbGQgcGF0Y2giLCBsZW4ocGF0Y2hlcykpLCBidWdfaWQpKQorICAgICAgICBmb3IgcGF0Y2gg aW4gcGF0Y2hlczoKKyAgICAgICAgICAgIHNlbGYuX3Rvb2wuYnVncy5vYnNvbGV0ZV9hdHRhY2ht ZW50KHBhdGNoWyJpZCJdKQorCisKK2NsYXNzIFBvc3REaWZmVG9CdWdTdGVwKEFic3RyYWN0U3Rl cCk6CisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIG9wdGlvbnMoY2xzKToKKyAgICAgICAgcmV0 dXJuIFsKKyAgICAgICAgICAgIENvbW1hbmRPcHRpb25zLmRlc2NyaXB0aW9uLAorICAgICAgICAg ICAgQ29tbWFuZE9wdGlvbnMucmV2aWV3LAorICAgICAgICAgICAgQ29tbWFuZE9wdGlvbnMucmVx dWVzdF9jb21taXQsCisgICAgICAgIF0KKworICAgIGRlZiBydW4oc2VsZiwgc3RhdGUpOgorICAg ICAgICBkaWZmID0gc2VsZi5fdG9vbC5zY20oKS5jcmVhdGVfcGF0Y2goKQorICAgICAgICBkaWZm X2ZpbGUgPSBTdHJpbmdJTy5TdHJpbmdJTyhkaWZmKSAjIGFkZF9wYXRjaF90b19idWcgZXhwZWN0 cyBhIGZpbGUtbGlrZSBvYmplY3QKKyAgICAgICAgZGVzY3JpcHRpb24gPSBzZWxmLl9vcHRpb25z LmRlc2NyaXB0aW9uIG9yICJQYXRjaCIKKyAgICAgICAgc2VsZi5fdG9vbC5idWdzLmFkZF9wYXRj aF90b19idWcoc3RhdGVbImJ1Z19pZCJdLCBkaWZmX2ZpbGUsIGRlc2NyaXB0aW9uLCBtYXJrX2Zv cl9yZXZpZXc9c2VsZi5fb3B0aW9ucy5yZXZpZXcsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1zZWxm Ll9vcHRpb25zLnJlcXVlc3RfY29tbWl0KQogCiAKIGNsYXNzIFByZXBhcmVDaGFuZ2Vsb2dGb3JS ZXZlcnRTdGVwKEFic3RyYWN0U3RlcCk6CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRz L21vZHVsZXMvY29tbWFuZHMvZG93bmxvYWQucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVs ZXMvY29tbWFuZHMvZG93bmxvYWQucHkKaW5kZXggYjhmY2IxOC4uNTU1YzU4ZCAxMDA2NDQKLS0t IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL2Rvd25sb2FkLnB5CisrKyBi L1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy9kb3dubG9hZC5weQpAQCAtNTIs NiArNTIsNyBAQCBjbGFzcyBBYnN0cmFjdERlY2xhcmF0aXZlQ29tbW1hbmQoQ29tbWFuZCk6CiAg ICAgICAgIENvbW1hbmQuX19pbml0X18oc2VsZiwgc2VsZi5oZWxwX3RleHQsIHNlbGYuYXJndW1l bnRfbmFtZXMsIG9wdGlvbnMpCiAKIAorIyBGSVhNRTogTW92ZSB0aGlzIHRvIGEgbW9yZSBnZW5l cmFsIGxvY2F0aW9uLgogY2xhc3MgQWJzdHJhY3RTZXF1ZW5jZWRDb21tbWFuZChBYnN0cmFjdERl Y2xhcmF0aXZlQ29tbW1hbmQpOgogICAgIHN0ZXBzID0gTm9uZQogICAgIGRlZiBfX2luaXRfXyhz ZWxmKToKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy91 cGxvYWQucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvdXBsb2FkLnB5 CmluZGV4IGVmOGJhMWUuLjIwNjRjNDAgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMv bW9kdWxlcy9jb21tYW5kcy91cGxvYWQucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1 bGVzL2NvbW1hbmRzL3VwbG9hZC5weQpAQCAtMzYsNiArMzYsOCBAQCBpbXBvcnQgc3lzCiBmcm9t IG9wdHBhcnNlIGltcG9ydCBtYWtlX29wdGlvbgogCiBmcm9tIG1vZHVsZXMuYnVnemlsbGEgaW1w b3J0IHBhcnNlX2J1Z19pZAorZnJvbSBtb2R1bGVzLmJ1aWxkc3RlcHMgaW1wb3J0IFByZXBhcmVD aGFuZ2Vsb2dTdGVwLCBDb21tYW5kT3B0aW9ucywgT2Jzb2xldGVQYXRjaGVzT25CdWdTdGVwLCBQ b3N0RGlmZlRvQnVnU3RlcAorZnJvbSBtb2R1bGVzLmNvbW1hbmRzLmRvd25sb2FkIGltcG9ydCBB YnN0cmFjdFNlcXVlbmNlZENvbW1tYW5kCiBmcm9tIG1vZHVsZXMuY29tbWVudHMgaW1wb3J0IGJ1 Z19jb21tZW50X2Zyb21fc3ZuX3JldmlzaW9uCiBmcm9tIG1vZHVsZXMuZ3JhbW1hciBpbXBvcnQg cGx1cmFsaXplCiBmcm9tIG1vZHVsZXMubG9nZ2luZyBpbXBvcnQgZXJyb3IsIGxvZwpAQCAtNTIs NTkgKzU0LDUwIEBAIGNsYXNzIENvbW1pdE1lc3NhZ2VGb3JDdXJyZW50RGlmZihDb21tYW5kKToK ICAgICAgICAgcHJpbnQgIiVzIiAlIHRvb2wuc2NtKCkuY29tbWl0X21lc3NhZ2VfZm9yX3RoaXNf Y29tbWl0KCkubWVzc2FnZSgpCiAKIAotY2xhc3MgT2Jzb2xldGVBdHRhY2htZW50cyhDb21tYW5k KToKK2NsYXNzIE9ic29sZXRlQXR0YWNobWVudHMoQWJzdHJhY3RTZXF1ZW5jZWRDb21tbWFuZCk6 CiAgICAgbmFtZSA9ICJvYnNvbGV0ZS1hdHRhY2htZW50cyIKLSAgICBkZWYgX19pbml0X18oc2Vs Zik6Ci0gICAgICAgIENvbW1hbmQuX19pbml0X18oc2VsZiwgIk1hcmsgYWxsIGF0dGFjaG1lbnRz IG9uIGEgYnVnIGFzIG9ic29sZXRlIiwgIkJVR0lEIikKKyAgICBoZWxwX3RleHQgPSAiTWFyayBh bGwgYXR0YWNobWVudHMgb24gYSBidWcgYXMgb2Jzb2xldGUiCisgICAgYXJndW1lbnRfbmFtZXMg PSAiQlVHSUQiCisgICAgc3RlcHMgPSBbCisgICAgICAgIE9ic29sZXRlUGF0Y2hlc09uQnVnU3Rl cCwKKyAgICBdCiAKLSAgICBkZWYgZXhlY3V0ZShzZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToK LSAgICAgICAgYnVnX2lkID0gYXJnc1swXQotICAgICAgICBhdHRhY2htZW50cyA9IHRvb2wuYnVn cy5mZXRjaF9hdHRhY2htZW50c19mcm9tX2J1ZyhidWdfaWQpCi0gICAgICAgIGZvciBhdHRhY2ht ZW50IGluIGF0dGFjaG1lbnRzOgotICAgICAgICAgICAgaWYgbm90IGF0dGFjaG1lbnRbImlzX29i c29sZXRlIl06Ci0gICAgICAgICAgICAgICAgdG9vbC5idWdzLm9ic29sZXRlX2F0dGFjaG1lbnQo YXR0YWNobWVudFsiaWQiXSkKKyAgICBkZWYgX3ByZXBhcmVfc3RhdGUoc2VsZiwgb3B0aW9ucywg YXJncywgdG9vbCk6CisgICAgICAgIHJldHVybiB7ICJidWdfaWQiIDogYXJnc1swXSB9CiAKIAot Y2xhc3MgUG9zdERpZmYoQ29tbWFuZCk6CitjbGFzcyBQb3N0RGlmZihBYnN0cmFjdFNlcXVlbmNl ZENvbW1tYW5kKToKICAgICBuYW1lID0gInBvc3QtZGlmZiIKKyAgICBoZWxwX3RleHQgPSAiQXR0 YWNoIHRoZSBjdXJyZW50IHdvcmtpbmcgZGlyZWN0b3J5IGRpZmYgdG8gYSBidWcgYXMgYSBwYXRj aCBmaWxlIgorICAgIGFyZ3VtZW50X25hbWVzID0gIltCVUdJRF0iCiAgICAgc2hvd19pbl9tYWlu X2hlbHAgPSBUcnVlCi0gICAgZGVmIF9faW5pdF9fKHNlbGYpOgotICAgICAgICBvcHRpb25zID0g WwotICAgICAgICAgICAgbWFrZV9vcHRpb24oIi1tIiwgIi0tZGVzY3JpcHRpb24iLCBhY3Rpb249 InN0b3JlIiwgdHlwZT0ic3RyaW5nIiwgZGVzdD0iZGVzY3JpcHRpb24iLCBoZWxwPSJEZXNjcmlw dGlvbiBzdHJpbmcgZm9yIHRoZSBhdHRhY2htZW50IChkZWZhdWx0OiBcInBhdGNoXCIpIiksCi0g ICAgICAgIF0KLSAgICAgICAgb3B0aW9ucyArPSBzZWxmLnBvc3Rpbmdfb3B0aW9ucygpCi0gICAg ICAgIENvbW1hbmQuX19pbml0X18oc2VsZiwgIkF0dGFjaCB0aGUgY3VycmVudCB3b3JraW5nIGRp cmVjdG9yeSBkaWZmIHRvIGEgYnVnIGFzIGEgcGF0Y2ggZmlsZSIsICJbQlVHSURdIiwgb3B0aW9u cz1vcHRpb25zKQotCi0gICAgQHN0YXRpY21ldGhvZAotICAgIGRlZiBwb3N0aW5nX29wdGlvbnMo KToKLSAgICAgICAgcmV0dXJuIFsKLSAgICAgICAgICAgIG1ha2Vfb3B0aW9uKCItLW5vLW9ic29s ZXRlIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9Im9ic29sZXRlX3BhdGNoZXMiLCBkZWZh dWx0PVRydWUsIGhlbHA9IkRvIG5vdCBvYnNvbGV0ZSBvbGQgcGF0Y2hlcyBiZWZvcmUgcG9zdGlu ZyB0aGlzIG9uZS4iKSwKLSAgICAgICAgICAgIG1ha2Vfb3B0aW9uKCItLW5vLXJldmlldyIsIGFj dGlvbj0ic3RvcmVfZmFsc2UiLCBkZXN0PSJyZXZpZXciLCBkZWZhdWx0PVRydWUsIGhlbHA9IkRv IG5vdCBtYXJrIHRoZSBwYXRjaCBmb3IgcmV2aWV3LiIpLAotICAgICAgICAgICAgbWFrZV9vcHRp b24oIi0tcmVxdWVzdC1jb21taXQiLCBhY3Rpb249InN0b3JlX3RydWUiLCBkZXN0PSJyZXF1ZXN0 X2NvbW1pdCIsIGRlZmF1bHQ9RmFsc2UsIGhlbHA9Ik1hcmsgdGhlIHBhdGNoIGFzIG5lZWRpbmcg YXV0by1jb21taXQgYWZ0ZXIgcmV2aWV3LiIpLAotICAgICAgICBdCi0KLSAgICBAc3RhdGljbWV0 aG9kCi0gICAgZGVmIG9ic29sZXRlX3BhdGNoZXNfb25fYnVnKGJ1Z19pZCwgYnVncyk6Ci0gICAg ICAgIHBhdGNoZXMgPSBidWdzLmZldGNoX3BhdGNoZXNfZnJvbV9idWcoYnVnX2lkKQotICAgICAg ICBpZiBsZW4ocGF0Y2hlcyk6Ci0gICAgICAgICAgICBsb2coIk9ic29sZXRpbmcgJXMgb24gYnVn ICVzIiAlIChwbHVyYWxpemUoIm9sZCBwYXRjaCIsIGxlbihwYXRjaGVzKSksIGJ1Z19pZCkpCi0g ICAgICAgICAgICBmb3IgcGF0Y2ggaW4gcGF0Y2hlczoKLSAgICAgICAgICAgICAgICBidWdzLm9i c29sZXRlX2F0dGFjaG1lbnQocGF0Y2hbImlkIl0pCisgICAgc3RlcHMgPSBbCisgICAgICAgIE9i c29sZXRlUGF0Y2hlc09uQnVnU3RlcCwKKyAgICAgICAgUG9zdERpZmZUb0J1Z1N0ZXAsCisgICAg XQogCi0gICAgZGVmIGV4ZWN1dGUoc2VsZiwgb3B0aW9ucywgYXJncywgdG9vbCk6CisgICAgZGVm IF9wcmVwYXJlX3N0YXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgogICAgICAgICAjIFBl cmZlciBhIGJ1ZyBpZCBwYXNzZWQgYXMgYW4gYXJndW1lbnQgb3ZlciBhIGJ1ZyB1cmwgaW4gdGhl IGRpZmYgKGkuZS4gQ2hhbmdlTG9ncykuCiAgICAgICAgIGJ1Z19pZCA9IChhcmdzIGFuZCBhcmdz WzBdKSBvciBwYXJzZV9idWdfaWQodG9vbC5zY20oKS5jcmVhdGVfcGF0Y2goKSkKICAgICAgICAg aWYgbm90IGJ1Z19pZDoKICAgICAgICAgICAgIGVycm9yKCJObyBidWcgaWQgcGFzc2VkIGFuZCBu byBidWcgdXJsIGZvdW5kIGluIGRpZmYsIGNhbid0IHBvc3QuIikKKyAgICAgICAgcmV0dXJuIHsg ImJ1Z19pZCIgOiBidWdfaWQgfQogCi0gICAgICAgIGlmIG9wdGlvbnMub2Jzb2xldGVfcGF0Y2hl czoKLSAgICAgICAgICAgIHNlbGYub2Jzb2xldGVfcGF0Y2hlc19vbl9idWcoYnVnX2lkLCB0b29s LmJ1Z3MpCiAKLSAgICAgICAgZGlmZiA9IHRvb2wuc2NtKCkuY3JlYXRlX3BhdGNoKCkKLSAgICAg ICAgZGlmZl9maWxlID0gU3RyaW5nSU8uU3RyaW5nSU8oZGlmZikgIyBhZGRfcGF0Y2hfdG9fYnVn IGV4cGVjdHMgYSBmaWxlLWxpa2Ugb2JqZWN0CitjbGFzcyBTdWJtaXRQYXRjaChBYnN0cmFjdFNl cXVlbmNlZENvbW1tYW5kKToKKyAgICBuYW1lID0gInN1Ym1pdC1wYXRjaCIKKyAgICBoZWxwX3Rl eHQgPSAiRXhwZXJpbWVudGFsLiAgQ3JlYXRlcyBhIHBhdGNoIGZyb20gdGhlIGN1cnJlbnQgd29y a2luZyBjb3B5IGFuZCB1cGxvYWRzIGJ1Z3ppbGxhIgorICAgIGFyZ3VtZW50X25hbWVzID0gIkJV R0lEIgorICAgIHN0ZXBzID0gWworICAgICAgICBQcmVwYXJlQ2hhbmdlbG9nU3RlcCwKKyAgICAg ICAgIyBGSVhNRTogQWRkIGEgQ3JlYXRlQnVnU3RlcCEKKyAgICAgICAgT2Jzb2xldGVQYXRjaGVz T25CdWdTdGVwLAorICAgICAgICBQb3N0RGlmZlRvQnVnU3RlcCwKKyAgICBdCiAKLSAgICAgICAg ZGVzY3JpcHRpb24gPSBvcHRpb25zLmRlc2NyaXB0aW9uIG9yICJQYXRjaCIKLSAgICAgICAgdG9v bC5idWdzLmFkZF9wYXRjaF90b19idWcoYnVnX2lkLCBkaWZmX2ZpbGUsIGRlc2NyaXB0aW9uLCBt YXJrX2Zvcl9yZXZpZXc9b3B0aW9ucy5yZXZpZXcsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1vcHRp b25zLnJlcXVlc3RfY29tbWl0KQorICAgIGRlZiBfcHJlcGFyZV9zdGF0ZShzZWxmLCBvcHRpb25z LCBhcmdzLCB0b29sKToKKyAgICAgICAgYnVnX2lkID0gYXJnc1swXQorICAgICAgICByZXR1cm4g eyAiYnVnX2lkIiA6IGJ1Z19pZCB9CiAKIAogY2xhc3MgUG9zdENvbW1pdHMoQ29tbWFuZCk6CkBA IC0xMTUsOCArMTA4LDEwIEBAIGNsYXNzIFBvc3RDb21taXRzKENvbW1hbmQpOgogICAgICAgICAg ICAgbWFrZV9vcHRpb24oIi1iIiwgIi0tYnVnLWlkIiwgYWN0aW9uPSJzdG9yZSIsIHR5cGU9InN0 cmluZyIsIGRlc3Q9ImJ1Z19pZCIsIGhlbHA9IlNwZWNpZnkgYnVnIGlkIGlmIG5vIFVSTCBpcyBw cm92aWRlZCBpbiB0aGUgY29tbWl0IGxvZy4iKSwKICAgICAgICAgICAgIG1ha2Vfb3B0aW9uKCIt LWFkZC1sb2ctYXMtY29tbWVudCIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlc3Q9ImFkZF9sb2df YXNfY29tbWVudCIsIGRlZmF1bHQ9RmFsc2UsIGhlbHA9IkFkZCBjb21taXQgbG9nIG1lc3NhZ2Ug YXMgYSBjb21tZW50IHdoZW4gdXBsb2FkaW5nIHRoZSBwYXRjaC4iKSwKICAgICAgICAgICAgIG1h a2Vfb3B0aW9uKCItbSIsICItLWRlc2NyaXB0aW9uIiwgYWN0aW9uPSJzdG9yZSIsIHR5cGU9InN0 cmluZyIsIGRlc3Q9ImRlc2NyaXB0aW9uIiwgaGVscD0iRGVzY3JpcHRpb24gc3RyaW5nIGZvciB0 aGUgYXR0YWNobWVudCAoZGVmYXVsdDogZGVzY3JpcHRpb24gZnJvbSBjb21taXQgbWVzc2FnZSki KSwKKyAgICAgICAgICAgIENvbW1hbmRPcHRpb25zLm9ic29sZXRlX3BhdGNoZXMsCisgICAgICAg ICAgICBDb21tYW5kT3B0aW9ucy5yZXZpZXcsCisgICAgICAgICAgICBDb21tYW5kT3B0aW9ucy5y ZXF1ZXN0X2NvbW1pdCwKICAgICAgICAgXQotICAgICAgICBvcHRpb25zICs9IFBvc3REaWZmLnBv c3Rpbmdfb3B0aW9ucygpCiAgICAgICAgIENvbW1hbmQuX19pbml0X18oc2VsZiwgIkF0dGFjaCBh IHJhbmdlIG9mIGxvY2FsIGNvbW1pdHMgdG8gYnVncyBhcyBwYXRjaCBmaWxlcyIsICJDT01NSVRJ U0giLCBvcHRpb25zPW9wdGlvbnMsIHJlcXVpcmVzX2xvY2FsX2NvbW1pdHM9VHJ1ZSkKIAogICAg IGRlZiBfY29tbWVudF90ZXh0X2Zvcl9jb21taXQoc2VsZiwgb3B0aW9ucywgY29tbWl0X21lc3Nh Z2UsIHRvb2wsIGNvbW1pdF9pZCk6CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21v ZHVsZXMvY29tbWFuZHMvdXBsb2FkX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9t b2R1bGVzL2NvbW1hbmRzL3VwbG9hZF91bml0dGVzdC5weQppbmRleCBlMjA2ZDEwLi5mZjczNzFm IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvdXBsb2Fk X3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy91 cGxvYWRfdW5pdHRlc3QucHkKQEAgLTMzLDggKzMzLDEzIEBAIGZyb20gbW9kdWxlcy5jb21tYW5k cy51cGxvYWQgaW1wb3J0ICoKIAogY2xhc3MgVXBsb2FkQ29tbWFuZHNUZXN0KENvbW1hbmRzVGVz dCk6CiAgICAgZGVmIHRlc3Rfb2Jzb2xldGVfYXR0YWNobWVudHMoc2VsZik6Ci0gICAgICAgIHNl bGYuYXNzZXJ0X2V4ZWN1dGVfb3V0cHV0cyhPYnNvbGV0ZUF0dGFjaG1lbnRzKCksIFs0Ml0pCisg ICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJPYnNvbGV0aW5nIDIgb2xkIHBhdGNoZXMgb24gYnVn IDQyXG4iCisgICAgICAgIHNlbGYuYXNzZXJ0X2V4ZWN1dGVfb3V0cHV0cyhPYnNvbGV0ZUF0dGFj aG1lbnRzKCksIFs0Ml0sIGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCiAKICAgICBk ZWYgdGVzdF9wb3N0X2RpZmYoc2VsZik6CiAgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJPYnNv bGV0aW5nIDIgb2xkIHBhdGNoZXMgb24gYnVnIDQyXG4iCiAgICAgICAgIHNlbGYuYXNzZXJ0X2V4 ZWN1dGVfb3V0cHV0cyhQb3N0RGlmZigpLCBbNDJdLCBleHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRf c3RkZXJyKQorCisgICAgZGVmIHRlc3Rfc3VibWl0X3BhdGNoKHNlbGYpOgorICAgICAgICBleHBl Y3RlZF9zdGRlcnIgPSAiT2Jzb2xldGluZyAyIG9sZCBwYXRjaGVzIG9uIGJ1ZyA0MlxuIgorICAg ICAgICBzZWxmLmFzc2VydF9leGVjdXRlX291dHB1dHMoU3VibWl0UGF0Y2goKSwgWzQyXSwgZXhw ZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0ZGVycikKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvbW9kdWxlcy9tb2NrX2J1Z3ppbGxhdG9vbC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMv bW9kdWxlcy9tb2NrX2J1Z3ppbGxhdG9vbC5weQppbmRleCAzNTEzOThmLi4yOWE0ZjA1IDEwMDY0 NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvbW9ja19idWd6aWxsYXRvb2wucHkK KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL21vY2tfYnVnemlsbGF0b29sLnB5CkBA IC0xMDgsNiArMTA4LDcgQEAgY2xhc3MgTW9ja0J1aWxkQm90KE1vY2spOgogICAgIGRlZiByZWRf Y29yZV9idWlsZGVyc19uYW1lcyhzZWxmKToKICAgICAgICAgcmV0dXJuIFtdCiAKKwogY2xhc3Mg TW9ja1NDTShNb2NrKToKICAgICBkZWYgX19pbml0X18oc2VsZik6CiAgICAgICAgIE1vY2suX19p bml0X18oc2VsZikKQEAgLTE0Miw2ICsxNDMsMTEgQEAgY2xhc3MgTW9ja1NDTShNb2NrKToKICAg ICAgICAgcmV0dXJuIFtdCiAKIAorY2xhc3MgTW9ja1VzZXIob2JqZWN0KToKKyAgICBkZWYgcHJv bXB0KHNlbGYsIG1lc3NhZ2UpOgorICAgICAgICByZXR1cm4gIk1vY2sgdXNlciByZXNwb25zZSIK KworCiBjbGFzcyBNb2NrU3RhdHVzQm90KG9iamVjdCk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYp OgogICAgICAgICBzZWxmLnN0YXR1c2JvdF9ob3N0ID0gImV4YW1wbGUuY29tIgpAQCAtMTU4LDYg KzE2NCw3IEBAIGNsYXNzIE1vY2tCdWd6aWxsYVRvb2woKToKICAgICAgICAgc2VsZi5idWdzID0g TW9ja0J1Z3ppbGxhKCkKICAgICAgICAgc2VsZi5idWlsZGJvdCA9IE1vY2tCdWlsZEJvdCgpCiAg ICAgICAgIHNlbGYuZXhlY3V0aXZlID0gTW9jaygpCisgICAgICAgIHNlbGYudXNlciA9IE1vY2tV c2VyKCkKICAgICAgICAgc2VsZi5fc2NtID0gTW9ja1NDTSgpCiAgICAgICAgIHNlbGYuc3RhdHVz X2JvdCA9IE1vY2tTdGF0dXNCb3QoKQogCg== 45310 2009-12-21 00:41:21 -0800 2009-12-21 22:40:32 -0800 Patch bug-32816-20091221004119.patch text/plain 13878 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlNTJhMmU3Li41ZTM3Zjc3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMDktMTIt MjEgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbYnp0XSBBdXRvbWF0ZSB0aGUgcHJvY2VzcyBv ZiBjYWxsaW5nIHByZXBhcmUtQ2hhbmdlTG9nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zMjgxNgorCisgICAgICAgIFRoaXMgcGF0Y2ggYXV0b21hdGVz IHRoZSBwcm9jZXNzIG9mIGNyZWF0aW5nIGEgYnVnIGFuZCBwYXRjaCBhbmQKKyAgICAgICAgdXBs b2FkaW5nIGl0IHRvIGJ1Z3ppbGxhLiAgVGhlIGZpcnN0IGN1dCBqdXN0IGNhbGxzCisgICAgICAg IHByZXBhcmUtQ2hhbmdlTG9nLgorCisgICAgICAgIFRoaXMgcGF0Y2ggcmVxdWlyZWQgc29tZSBy ZWZhY3RvcmluZyBvZiB1cGxvYWQucHkgdG8gdGhlIFN0ZXAKKyAgICAgICAgbW9kZWwsIGJ1dCB0 aGF0J3Mgd29ydGggZG9pbmcgYW55d2F5LgorCisgICAgICAgICogU2NyaXB0cy9idWd6aWxsYS10 b29sOgorICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9idWlsZHN0ZXBzLnB5OgorICAgICAgICAq IFNjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy9kb3dubG9hZC5weToKKyAgICAgICAgKiBTY3JpcHRz L21vZHVsZXMvY29tbWFuZHMvdXBsb2FkLnB5OgorICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9j b21tYW5kcy91cGxvYWRfdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL21v Y2tfYnVnemlsbGF0b29sLnB5OgorCiAyMDA5LTEyLTIwICBDaHJpcyBKZXJkb25layAgPGNocmlz LmplcmRvbmVrQGdtYWlsLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4K ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbCBiL1dlYktpdFRv b2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbAppbmRleCAyYTZhZTkwLi5kMzMyM2VkIDEwMDc1NQot LS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wKKysrIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy9idWd6aWxsYS10b29sCkBAIC00Myw2ICs0Myw4IEBAIGZyb20gbW9kdWxlcy5leGVj dXRpdmUgaW1wb3J0IEV4ZWN1dGl2ZQogZnJvbSBtb2R1bGVzLmxvZ2dpbmcgaW1wb3J0IGxvZwog ZnJvbSBtb2R1bGVzLm11bHRpY29tbWFuZHRvb2wgaW1wb3J0IE11bHRpQ29tbWFuZFRvb2wKIGZy b20gbW9kdWxlcy5zY20gaW1wb3J0IGRldGVjdF9zY21fc3lzdGVtCitmcm9tIG1vZHVsZXMudXNl ciBpbXBvcnQgVXNlcgorCiAKIGNsYXNzIEJ1Z3ppbGxhVG9vbChNdWx0aUNvbW1hbmRUb29sKToK ICAgICBkZWYgX19pbml0X18oc2VsZik6CkBAIC01Myw2ICs1NSw3IEBAIGNsYXNzIEJ1Z3ppbGxh VG9vbChNdWx0aUNvbW1hbmRUb29sKToKICAgICAgICAgc2VsZi5idWdzID0gQnVnemlsbGEoKQog ICAgICAgICBzZWxmLmJ1aWxkYm90ID0gQnVpbGRCb3QoKQogICAgICAgICBzZWxmLmV4ZWN1dGl2 ZSA9IEV4ZWN1dGl2ZSgpCisgICAgICAgIHNlbGYudXNlciA9IFVzZXIoKQogICAgICAgICBzZWxm Ll9zY20gPSBOb25lCiAgICAgICAgIHNlbGYuc3RhdHVzX2JvdCA9IFN0YXR1c0JvdCgpCiAKZGlm ZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWlsZHN0ZXBzLnB5IGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1aWxkc3RlcHMucHkKaW5kZXggMGVmZmM0OC4uZjhh MzVkMSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1aWxkc3RlcHMu cHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1aWxkc3RlcHMucHkKQEAgLTI3 LDYgKzI3LDcgQEAKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQ T1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAogaW1wb3J0IG9zCitpbXBvcnQgU3RyaW5nSU8K IAogZnJvbSBvcHRwYXJzZSBpbXBvcnQgbWFrZV9vcHRpb24KIApAQCAtNTIsNiArNTMsMTAgQEAg Y2xhc3MgQ29tbWFuZE9wdGlvbnMob2JqZWN0KToKICAgICBwb3J0ID0gbWFrZV9vcHRpb24oIi0t cG9ydCIsIGFjdGlvbj0ic3RvcmUiLCBkZXN0PSJwb3J0IiwgZGVmYXVsdD1Ob25lLCBoZWxwPSJT cGVjaWZ5IGEgcG9ydCAoZS5nLiwgbWFjLCBxdCwgZ3RrLCAuLi4pLiIpCiAgICAgcmV2aWV3ZXIg PSBtYWtlX29wdGlvbigiLXIiLCAiLS1yZXZpZXdlciIsIGFjdGlvbj0ic3RvcmUiLCB0eXBlPSJz dHJpbmciLCBkZXN0PSJyZXZpZXdlciIsIGhlbHA9IlVwZGF0ZSBDaGFuZ2VMb2dzIHRvIHNheSBS ZXZpZXdlZCBieSBSRVZJRVdFUi4iKQogICAgIGNvbXBsZXRlX3JvbGxvdXQgPSBtYWtlX29wdGlv bigiLS1jb21wbGV0ZS1yb2xsb3V0IiwgYWN0aW9uPSJzdG9yZV90cnVlIiwgZGVzdD0iY29tcGxl dGVfcm9sbG91dCIsIGhlbHA9IkNvbW1pdCB0aGUgcmV2ZXJ0IGFuZCByZS1vcGVuIHRoZSBvcmln aW5hbCBidWcuIikKKyAgICBvYnNvbGV0ZV9wYXRjaGVzID0gbWFrZV9vcHRpb24oIi0tbm8tb2Jz b2xldGUiLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0ib2Jzb2xldGVfcGF0Y2hlcyIsIGRl ZmF1bHQ9VHJ1ZSwgaGVscD0iRG8gbm90IG9ic29sZXRlIG9sZCBwYXRjaGVzIGJlZm9yZSBwb3N0 aW5nIHRoaXMgb25lLiIpCisgICAgcmV2aWV3ID0gbWFrZV9vcHRpb24oIi0tbm8tcmV2aWV3Iiwg YWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9InJldmlldyIsIGRlZmF1bHQ9VHJ1ZSwgaGVscD0i RG8gbm90IG1hcmsgdGhlIHBhdGNoIGZvciByZXZpZXcuIikKKyAgICByZXF1ZXN0X2NvbW1pdCA9 IG1ha2Vfb3B0aW9uKCItLXJlcXVlc3QtY29tbWl0IiwgYWN0aW9uPSJzdG9yZV90cnVlIiwgZGVz dD0icmVxdWVzdF9jb21taXQiLCBkZWZhdWx0PUZhbHNlLCBoZWxwPSJNYXJrIHRoZSBwYXRjaCBh cyBuZWVkaW5nIGF1dG8tY29tbWl0IGFmdGVyIHJldmlldy4iKQorICAgIGRlc2NyaXB0aW9uID0g bWFrZV9vcHRpb24oIi1tIiwgIi0tZGVzY3JpcHRpb24iLCBhY3Rpb249InN0b3JlIiwgdHlwZT0i c3RyaW5nIiwgZGVzdD0iZGVzY3JpcHRpb24iLCBoZWxwPSJEZXNjcmlwdGlvbiBzdHJpbmcgZm9y IHRoZSBhdHRhY2htZW50IChkZWZhdWx0OiBcInBhdGNoXCIpIikKIAogCiBjbGFzcyBBYnN0cmFj dFN0ZXAob2JqZWN0KToKQEAgLTYyLDYgKzY3LDcgQEAgY2xhc3MgQWJzdHJhY3RTdGVwKG9iamVj dCk6CiAKICAgICBkZWYgX3J1bl9zY3JpcHQoc2VsZiwgc2NyaXB0X25hbWUsIHF1aWV0PUZhbHNl LCBwb3J0PVdlYktpdFBvcnQpOgogICAgICAgICBsb2coIlJ1bm5pbmcgJXMiICUgc2NyaXB0X25h bWUpCisgICAgICAgICMgRklYTUU6IFRoaXMgc2hvdWxkIHVzZSBzZWxmLnBvcnQoKQogICAgICAg ICBzZWxmLl90b29sLmV4ZWN1dGl2ZS5ydW5fYW5kX3Rocm93X2lmX2ZhaWwocG9ydC5zY3JpcHRf cGF0aChzY3JpcHRfbmFtZSksIHF1aWV0KQogCiAgICAgIyBGSVhNRTogVGhlIHBvcnQgc2hvdWxk IGxpdmUgb24gdGhlIHRvb2wuCkBAIC0xMDUsOCArMTExLDU5IEBAIGNsYXNzIE1ldGFTdGVwKEFi c3RyYWN0U3RlcCk6CiAKIAogY2xhc3MgUHJlcGFyZUNoYW5nZWxvZ1N0ZXAoQWJzdHJhY3RTdGVw KToKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgb3B0aW9ucyhjbHMpOgorICAgICAgICByZXR1 cm4gWworICAgICAgICAgICAgQ29tbWFuZE9wdGlvbnMucG9ydCwKKyAgICAgICAgICAgIENvbW1h bmRPcHRpb25zLnF1aWV0LAorICAgICAgICAgICAgQ29tbWFuZE9wdGlvbnMubm9uX2ludGVyYWN0 aXZlLAorICAgICAgICBdCisKICAgICBkZWYgcnVuKHNlbGYsIHN0YXRlKToKLSAgICAgICAgc2Vs Zi5fcnVuX3NjcmlwdCgicHJlcGFyZS1DaGFuZ2VMb2ciKQorICAgICAgICBvcy5jaGRpcihzZWxm Ll90b29sLnNjbSgpLmNoZWNrb3V0X3Jvb3QpCisgICAgICAgIGFyZ3MgPSBbc2VsZi5wb3J0KCku c2NyaXB0X3BhdGgoInByZXBhcmUtQ2hhbmdlTG9nIildCisgICAgICAgIGlmIG5vdCBzZWxmLl9v cHRpb25zLm5vbl9pbnRlcmFjdGl2ZToKKyAgICAgICAgICAgIGFyZ3MuYXBwZW5kKCItbyIpCisg ICAgICAgIGlmIHN0YXRlWyJidWdfaWQiXToKKyAgICAgICAgICAgIGFyZ3MuYXBwZW5kKCItLWJ1 Zz0lcyIgJSBzdGF0ZVsiYnVnX2lkIl0pCisgICAgICAgIHNlbGYuX3Rvb2wuZXhlY3V0aXZlLnJ1 bl9hbmRfdGhyb3dfaWZfZmFpbChhcmdzLCBzZWxmLl9vcHRpb25zLnF1aWV0KQorICAgICAgICBp ZiBub3Qgc2VsZi5fb3B0aW9ucy5ub25faW50ZXJhY3RpdmU6CisgICAgICAgICAgICBzZWxmLl90 b29sLnVzZXIucHJvbXB0KCJQcmVzcyBlbnRlciB3aGVuIHJlYWR5IHRvIGNvbnRpbnVlLiIpCisK KworY2xhc3MgT2Jzb2xldGVQYXRjaGVzT25CdWdTdGVwKEFic3RyYWN0U3RlcCk6CisgICAgQGNs YXNzbWV0aG9kCisgICAgZGVmIG9wdGlvbnMoY2xzKToKKyAgICAgICAgcmV0dXJuIFsKKyAgICAg ICAgICAgIENvbW1hbmRPcHRpb25zLm9ic29sZXRlX3BhdGNoZXMsCisgICAgICAgIF0KKworICAg IGRlZiBydW4oc2VsZiwgc3RhdGUpOgorICAgICAgICBpZiBub3Qgc2VsZi5fb3B0aW9ucy5vYnNv bGV0ZV9wYXRjaGVzOgorICAgICAgICAgICAgcmV0dXJuCisgICAgICAgIGJ1Z19pZCA9IHN0YXRl WyJidWdfaWQiXQorICAgICAgICBwYXRjaGVzID0gc2VsZi5fdG9vbC5idWdzLmZldGNoX3BhdGNo ZXNfZnJvbV9idWcoYnVnX2lkKQorICAgICAgICBpZiBub3QgcGF0Y2hlczoKKyAgICAgICAgICAg IHJldHVybgorICAgICAgICBsb2coIk9ic29sZXRpbmcgJXMgb24gYnVnICVzIiAlIChwbHVyYWxp emUoIm9sZCBwYXRjaCIsIGxlbihwYXRjaGVzKSksIGJ1Z19pZCkpCisgICAgICAgIGZvciBwYXRj aCBpbiBwYXRjaGVzOgorICAgICAgICAgICAgc2VsZi5fdG9vbC5idWdzLm9ic29sZXRlX2F0dGFj aG1lbnQocGF0Y2hbImlkIl0pCisKKworY2xhc3MgUG9zdERpZmZUb0J1Z1N0ZXAoQWJzdHJhY3RT dGVwKToKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgb3B0aW9ucyhjbHMpOgorICAgICAgICBy ZXR1cm4gWworICAgICAgICAgICAgQ29tbWFuZE9wdGlvbnMuZGVzY3JpcHRpb24sCisgICAgICAg ICAgICBDb21tYW5kT3B0aW9ucy5yZXZpZXcsCisgICAgICAgICAgICBDb21tYW5kT3B0aW9ucy5y ZXF1ZXN0X2NvbW1pdCwKKyAgICAgICAgXQorCisgICAgZGVmIHJ1bihzZWxmLCBzdGF0ZSk6Cisg ICAgICAgIGRpZmYgPSBzZWxmLl90b29sLnNjbSgpLmNyZWF0ZV9wYXRjaCgpCisgICAgICAgIGRp ZmZfZmlsZSA9IFN0cmluZ0lPLlN0cmluZ0lPKGRpZmYpICMgYWRkX3BhdGNoX3RvX2J1ZyBleHBl Y3RzIGEgZmlsZS1saWtlIG9iamVjdAorICAgICAgICBkZXNjcmlwdGlvbiA9IHNlbGYuX29wdGlv bnMuZGVzY3JpcHRpb24gb3IgIlBhdGNoIgorICAgICAgICBzZWxmLl90b29sLmJ1Z3MuYWRkX3Bh dGNoX3RvX2J1ZyhzdGF0ZVsiYnVnX2lkIl0sIGRpZmZfZmlsZSwgZGVzY3JpcHRpb24sIG1hcmtf Zm9yX3Jldmlldz1zZWxmLl9vcHRpb25zLnJldmlldywgbWFya19mb3JfY29tbWl0X3F1ZXVlPXNl bGYuX29wdGlvbnMucmVxdWVzdF9jb21taXQpCiAKIAogY2xhc3MgUHJlcGFyZUNoYW5nZWxvZ0Zv clJldmVydFN0ZXAoQWJzdHJhY3RTdGVwKToKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Njcmlw dHMvbW9kdWxlcy9jb21tYW5kcy9kb3dubG9hZC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9k dWxlcy9jb21tYW5kcy9kb3dubG9hZC5weQppbmRleCBiOGZjYjE4Li41NTVjNThkIDEwMDY0NAot LS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvZG93bmxvYWQucHkKKysr IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL2Rvd25sb2FkLnB5CkBAIC01 Miw2ICs1Miw3IEBAIGNsYXNzIEFic3RyYWN0RGVjbGFyYXRpdmVDb21tbWFuZChDb21tYW5kKToK ICAgICAgICAgQ29tbWFuZC5fX2luaXRfXyhzZWxmLCBzZWxmLmhlbHBfdGV4dCwgc2VsZi5hcmd1 bWVudF9uYW1lcywgb3B0aW9ucykKIAogCisjIEZJWE1FOiBNb3ZlIHRoaXMgdG8gYSBtb3JlIGdl bmVyYWwgbG9jYXRpb24uCiBjbGFzcyBBYnN0cmFjdFNlcXVlbmNlZENvbW1tYW5kKEFic3RyYWN0 RGVjbGFyYXRpdmVDb21tbWFuZCk6CiAgICAgc3RlcHMgPSBOb25lCiAgICAgZGVmIF9faW5pdF9f KHNlbGYpOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRz L3VwbG9hZC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy91cGxvYWQu cHkKaW5kZXggZWY4YmExZS4uMjA2NGM0MCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy9tb2R1bGVzL2NvbW1hbmRzL3VwbG9hZC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21v ZHVsZXMvY29tbWFuZHMvdXBsb2FkLnB5CkBAIC0zNiw2ICszNiw4IEBAIGltcG9ydCBzeXMKIGZy b20gb3B0cGFyc2UgaW1wb3J0IG1ha2Vfb3B0aW9uCiAKIGZyb20gbW9kdWxlcy5idWd6aWxsYSBp bXBvcnQgcGFyc2VfYnVnX2lkCitmcm9tIG1vZHVsZXMuYnVpbGRzdGVwcyBpbXBvcnQgUHJlcGFy ZUNoYW5nZWxvZ1N0ZXAsIENvbW1hbmRPcHRpb25zLCBPYnNvbGV0ZVBhdGNoZXNPbkJ1Z1N0ZXAs IFBvc3REaWZmVG9CdWdTdGVwCitmcm9tIG1vZHVsZXMuY29tbWFuZHMuZG93bmxvYWQgaW1wb3J0 IEFic3RyYWN0U2VxdWVuY2VkQ29tbW1hbmQKIGZyb20gbW9kdWxlcy5jb21tZW50cyBpbXBvcnQg YnVnX2NvbW1lbnRfZnJvbV9zdm5fcmV2aXNpb24KIGZyb20gbW9kdWxlcy5ncmFtbWFyIGltcG9y dCBwbHVyYWxpemUKIGZyb20gbW9kdWxlcy5sb2dnaW5nIGltcG9ydCBlcnJvciwgbG9nCkBAIC01 Miw1OSArNTQsNTAgQEAgY2xhc3MgQ29tbWl0TWVzc2FnZUZvckN1cnJlbnREaWZmKENvbW1hbmQp OgogICAgICAgICBwcmludCAiJXMiICUgdG9vbC5zY20oKS5jb21taXRfbWVzc2FnZV9mb3JfdGhp c19jb21taXQoKS5tZXNzYWdlKCkKIAogCi1jbGFzcyBPYnNvbGV0ZUF0dGFjaG1lbnRzKENvbW1h bmQpOgorY2xhc3MgT2Jzb2xldGVBdHRhY2htZW50cyhBYnN0cmFjdFNlcXVlbmNlZENvbW1tYW5k KToKICAgICBuYW1lID0gIm9ic29sZXRlLWF0dGFjaG1lbnRzIgotICAgIGRlZiBfX2luaXRfXyhz ZWxmKToKLSAgICAgICAgQ29tbWFuZC5fX2luaXRfXyhzZWxmLCAiTWFyayBhbGwgYXR0YWNobWVu dHMgb24gYSBidWcgYXMgb2Jzb2xldGUiLCAiQlVHSUQiKQorICAgIGhlbHBfdGV4dCA9ICJNYXJr IGFsbCBhdHRhY2htZW50cyBvbiBhIGJ1ZyBhcyBvYnNvbGV0ZSIKKyAgICBhcmd1bWVudF9uYW1l cyA9ICJCVUdJRCIKKyAgICBzdGVwcyA9IFsKKyAgICAgICAgT2Jzb2xldGVQYXRjaGVzT25CdWdT dGVwLAorICAgIF0KIAotICAgIGRlZiBleGVjdXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wp OgotICAgICAgICBidWdfaWQgPSBhcmdzWzBdCi0gICAgICAgIGF0dGFjaG1lbnRzID0gdG9vbC5i dWdzLmZldGNoX2F0dGFjaG1lbnRzX2Zyb21fYnVnKGJ1Z19pZCkKLSAgICAgICAgZm9yIGF0dGFj aG1lbnQgaW4gYXR0YWNobWVudHM6Ci0gICAgICAgICAgICBpZiBub3QgYXR0YWNobWVudFsiaXNf b2Jzb2xldGUiXToKLSAgICAgICAgICAgICAgICB0b29sLmJ1Z3Mub2Jzb2xldGVfYXR0YWNobWVu dChhdHRhY2htZW50WyJpZCJdKQorICAgIGRlZiBfcHJlcGFyZV9zdGF0ZShzZWxmLCBvcHRpb25z LCBhcmdzLCB0b29sKToKKyAgICAgICAgcmV0dXJuIHsgImJ1Z19pZCIgOiBhcmdzWzBdIH0KIAog Ci1jbGFzcyBQb3N0RGlmZihDb21tYW5kKToKK2NsYXNzIFBvc3REaWZmKEFic3RyYWN0U2VxdWVu Y2VkQ29tbW1hbmQpOgogICAgIG5hbWUgPSAicG9zdC1kaWZmIgorICAgIGhlbHBfdGV4dCA9ICJB dHRhY2ggdGhlIGN1cnJlbnQgd29ya2luZyBkaXJlY3RvcnkgZGlmZiB0byBhIGJ1ZyBhcyBhIHBh dGNoIGZpbGUiCisgICAgYXJndW1lbnRfbmFtZXMgPSAiW0JVR0lEXSIKICAgICBzaG93X2luX21h aW5faGVscCA9IFRydWUKLSAgICBkZWYgX19pbml0X18oc2VsZik6Ci0gICAgICAgIG9wdGlvbnMg PSBbCi0gICAgICAgICAgICBtYWtlX29wdGlvbigiLW0iLCAiLS1kZXNjcmlwdGlvbiIsIGFjdGlv bj0ic3RvcmUiLCB0eXBlPSJzdHJpbmciLCBkZXN0PSJkZXNjcmlwdGlvbiIsIGhlbHA9IkRlc2Ny aXB0aW9uIHN0cmluZyBmb3IgdGhlIGF0dGFjaG1lbnQgKGRlZmF1bHQ6IFwicGF0Y2hcIikiKSwK LSAgICAgICAgXQotICAgICAgICBvcHRpb25zICs9IHNlbGYucG9zdGluZ19vcHRpb25zKCkKLSAg ICAgICAgQ29tbWFuZC5fX2luaXRfXyhzZWxmLCAiQXR0YWNoIHRoZSBjdXJyZW50IHdvcmtpbmcg ZGlyZWN0b3J5IGRpZmYgdG8gYSBidWcgYXMgYSBwYXRjaCBmaWxlIiwgIltCVUdJRF0iLCBvcHRp b25zPW9wdGlvbnMpCi0KLSAgICBAc3RhdGljbWV0aG9kCi0gICAgZGVmIHBvc3Rpbmdfb3B0aW9u cygpOgotICAgICAgICByZXR1cm4gWwotICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0tbm8tb2Jz b2xldGUiLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0ib2Jzb2xldGVfcGF0Y2hlcyIsIGRl ZmF1bHQ9VHJ1ZSwgaGVscD0iRG8gbm90IG9ic29sZXRlIG9sZCBwYXRjaGVzIGJlZm9yZSBwb3N0 aW5nIHRoaXMgb25lLiIpLAotICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0tbm8tcmV2aWV3Iiwg YWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9InJldmlldyIsIGRlZmF1bHQ9VHJ1ZSwgaGVscD0i RG8gbm90IG1hcmsgdGhlIHBhdGNoIGZvciByZXZpZXcuIiksCi0gICAgICAgICAgICBtYWtlX29w dGlvbigiLS1yZXF1ZXN0LWNvbW1pdCIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlc3Q9InJlcXVl c3RfY29tbWl0IiwgZGVmYXVsdD1GYWxzZSwgaGVscD0iTWFyayB0aGUgcGF0Y2ggYXMgbmVlZGlu ZyBhdXRvLWNvbW1pdCBhZnRlciByZXZpZXcuIiksCi0gICAgICAgIF0KLQotICAgIEBzdGF0aWNt ZXRob2QKLSAgICBkZWYgb2Jzb2xldGVfcGF0Y2hlc19vbl9idWcoYnVnX2lkLCBidWdzKToKLSAg ICAgICAgcGF0Y2hlcyA9IGJ1Z3MuZmV0Y2hfcGF0Y2hlc19mcm9tX2J1ZyhidWdfaWQpCi0gICAg ICAgIGlmIGxlbihwYXRjaGVzKToKLSAgICAgICAgICAgIGxvZygiT2Jzb2xldGluZyAlcyBvbiBi dWcgJXMiICUgKHBsdXJhbGl6ZSgib2xkIHBhdGNoIiwgbGVuKHBhdGNoZXMpKSwgYnVnX2lkKSkK LSAgICAgICAgICAgIGZvciBwYXRjaCBpbiBwYXRjaGVzOgotICAgICAgICAgICAgICAgIGJ1Z3Mu b2Jzb2xldGVfYXR0YWNobWVudChwYXRjaFsiaWQiXSkKKyAgICBzdGVwcyA9IFsKKyAgICAgICAg T2Jzb2xldGVQYXRjaGVzT25CdWdTdGVwLAorICAgICAgICBQb3N0RGlmZlRvQnVnU3RlcCwKKyAg ICBdCiAKLSAgICBkZWYgZXhlY3V0ZShzZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToKKyAgICBk ZWYgX3ByZXBhcmVfc3RhdGUoc2VsZiwgb3B0aW9ucywgYXJncywgdG9vbCk6CiAgICAgICAgICMg UGVyZmVyIGEgYnVnIGlkIHBhc3NlZCBhcyBhbiBhcmd1bWVudCBvdmVyIGEgYnVnIHVybCBpbiB0 aGUgZGlmZiAoaS5lLiBDaGFuZ2VMb2dzKS4KICAgICAgICAgYnVnX2lkID0gKGFyZ3MgYW5kIGFy Z3NbMF0pIG9yIHBhcnNlX2J1Z19pZCh0b29sLnNjbSgpLmNyZWF0ZV9wYXRjaCgpKQogICAgICAg ICBpZiBub3QgYnVnX2lkOgogICAgICAgICAgICAgZXJyb3IoIk5vIGJ1ZyBpZCBwYXNzZWQgYW5k IG5vIGJ1ZyB1cmwgZm91bmQgaW4gZGlmZiwgY2FuJ3QgcG9zdC4iKQorICAgICAgICByZXR1cm4g eyAiYnVnX2lkIiA6IGJ1Z19pZCB9CiAKLSAgICAgICAgaWYgb3B0aW9ucy5vYnNvbGV0ZV9wYXRj aGVzOgotICAgICAgICAgICAgc2VsZi5vYnNvbGV0ZV9wYXRjaGVzX29uX2J1ZyhidWdfaWQsIHRv b2wuYnVncykKIAotICAgICAgICBkaWZmID0gdG9vbC5zY20oKS5jcmVhdGVfcGF0Y2goKQotICAg ICAgICBkaWZmX2ZpbGUgPSBTdHJpbmdJTy5TdHJpbmdJTyhkaWZmKSAjIGFkZF9wYXRjaF90b19i dWcgZXhwZWN0cyBhIGZpbGUtbGlrZSBvYmplY3QKK2NsYXNzIFN1Ym1pdFBhdGNoKEFic3RyYWN0 U2VxdWVuY2VkQ29tbW1hbmQpOgorICAgIG5hbWUgPSAic3VibWl0LXBhdGNoIgorICAgIGhlbHBf dGV4dCA9ICJFeHBlcmltZW50YWwuICBDcmVhdGVzIGEgcGF0Y2ggZnJvbSB0aGUgY3VycmVudCB3 b3JraW5nIGNvcHkgYW5kIHVwbG9hZHMgYnVnemlsbGEiCisgICAgYXJndW1lbnRfbmFtZXMgPSAi QlVHSUQiCisgICAgc3RlcHMgPSBbCisgICAgICAgIFByZXBhcmVDaGFuZ2Vsb2dTdGVwLAorICAg ICAgICAjIEZJWE1FOiBBZGQgYSBDcmVhdGVCdWdTdGVwIQorICAgICAgICBPYnNvbGV0ZVBhdGNo ZXNPbkJ1Z1N0ZXAsCisgICAgICAgIFBvc3REaWZmVG9CdWdTdGVwLAorICAgIF0KIAotICAgICAg ICBkZXNjcmlwdGlvbiA9IG9wdGlvbnMuZGVzY3JpcHRpb24gb3IgIlBhdGNoIgotICAgICAgICB0 b29sLmJ1Z3MuYWRkX3BhdGNoX3RvX2J1ZyhidWdfaWQsIGRpZmZfZmlsZSwgZGVzY3JpcHRpb24s IG1hcmtfZm9yX3Jldmlldz1vcHRpb25zLnJldmlldywgbWFya19mb3JfY29tbWl0X3F1ZXVlPW9w dGlvbnMucmVxdWVzdF9jb21taXQpCisgICAgZGVmIF9wcmVwYXJlX3N0YXRlKHNlbGYsIG9wdGlv bnMsIGFyZ3MsIHRvb2wpOgorICAgICAgICBidWdfaWQgPSBhcmdzWzBdCisgICAgICAgIHJldHVy biB7ICJidWdfaWQiIDogYnVnX2lkIH0KIAogCiBjbGFzcyBQb3N0Q29tbWl0cyhDb21tYW5kKToK QEAgLTExNSw4ICsxMDgsMTAgQEAgY2xhc3MgUG9zdENvbW1pdHMoQ29tbWFuZCk6CiAgICAgICAg ICAgICBtYWtlX29wdGlvbigiLWIiLCAiLS1idWctaWQiLCBhY3Rpb249InN0b3JlIiwgdHlwZT0i c3RyaW5nIiwgZGVzdD0iYnVnX2lkIiwgaGVscD0iU3BlY2lmeSBidWcgaWQgaWYgbm8gVVJMIGlz IHByb3ZpZGVkIGluIHRoZSBjb21taXQgbG9nLiIpLAogICAgICAgICAgICAgbWFrZV9vcHRpb24o Ii0tYWRkLWxvZy1hcy1jb21tZW50IiwgYWN0aW9uPSJzdG9yZV90cnVlIiwgZGVzdD0iYWRkX2xv Z19hc19jb21tZW50IiwgZGVmYXVsdD1GYWxzZSwgaGVscD0iQWRkIGNvbW1pdCBsb2cgbWVzc2Fn ZSBhcyBhIGNvbW1lbnQgd2hlbiB1cGxvYWRpbmcgdGhlIHBhdGNoLiIpLAogICAgICAgICAgICAg bWFrZV9vcHRpb24oIi1tIiwgIi0tZGVzY3JpcHRpb24iLCBhY3Rpb249InN0b3JlIiwgdHlwZT0i c3RyaW5nIiwgZGVzdD0iZGVzY3JpcHRpb24iLCBoZWxwPSJEZXNjcmlwdGlvbiBzdHJpbmcgZm9y IHRoZSBhdHRhY2htZW50IChkZWZhdWx0OiBkZXNjcmlwdGlvbiBmcm9tIGNvbW1pdCBtZXNzYWdl KSIpLAorICAgICAgICAgICAgQ29tbWFuZE9wdGlvbnMub2Jzb2xldGVfcGF0Y2hlcywKKyAgICAg ICAgICAgIENvbW1hbmRPcHRpb25zLnJldmlldywKKyAgICAgICAgICAgIENvbW1hbmRPcHRpb25z LnJlcXVlc3RfY29tbWl0LAogICAgICAgICBdCi0gICAgICAgIG9wdGlvbnMgKz0gUG9zdERpZmYu cG9zdGluZ19vcHRpb25zKCkKICAgICAgICAgQ29tbWFuZC5fX2luaXRfXyhzZWxmLCAiQXR0YWNo IGEgcmFuZ2Ugb2YgbG9jYWwgY29tbWl0cyB0byBidWdzIGFzIHBhdGNoIGZpbGVzIiwgIkNPTU1J VElTSCIsIG9wdGlvbnM9b3B0aW9ucywgcmVxdWlyZXNfbG9jYWxfY29tbWl0cz1UcnVlKQogCiAg ICAgZGVmIF9jb21tZW50X3RleHRfZm9yX2NvbW1pdChzZWxmLCBvcHRpb25zLCBjb21taXRfbWVz c2FnZSwgdG9vbCwgY29tbWl0X2lkKToKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMv bW9kdWxlcy9jb21tYW5kcy91cGxvYWRfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRz L21vZHVsZXMvY29tbWFuZHMvdXBsb2FkX3VuaXR0ZXN0LnB5CmluZGV4IGUyMDZkMTAuLmZmNzM3 MWYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy91cGxv YWRfdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRz L3VwbG9hZF91bml0dGVzdC5weQpAQCAtMzMsOCArMzMsMTMgQEAgZnJvbSBtb2R1bGVzLmNvbW1h bmRzLnVwbG9hZCBpbXBvcnQgKgogCiBjbGFzcyBVcGxvYWRDb21tYW5kc1Rlc3QoQ29tbWFuZHNU ZXN0KToKICAgICBkZWYgdGVzdF9vYnNvbGV0ZV9hdHRhY2htZW50cyhzZWxmKToKLSAgICAgICAg c2VsZi5hc3NlcnRfZXhlY3V0ZV9vdXRwdXRzKE9ic29sZXRlQXR0YWNobWVudHMoKSwgWzQyXSkK KyAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gIk9ic29sZXRpbmcgMiBvbGQgcGF0Y2hlcyBvbiBi dWcgNDJcbiIKKyAgICAgICAgc2VsZi5hc3NlcnRfZXhlY3V0ZV9vdXRwdXRzKE9ic29sZXRlQXR0 YWNobWVudHMoKSwgWzQyXSwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0ZGVycikKIAogICAg IGRlZiB0ZXN0X3Bvc3RfZGlmZihzZWxmKToKICAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gIk9i c29sZXRpbmcgMiBvbGQgcGF0Y2hlcyBvbiBidWcgNDJcbiIKICAgICAgICAgc2VsZi5hc3NlcnRf ZXhlY3V0ZV9vdXRwdXRzKFBvc3REaWZmKCksIFs0Ml0sIGV4cGVjdGVkX3N0ZGVycj1leHBlY3Rl ZF9zdGRlcnIpCisKKyAgICBkZWYgdGVzdF9zdWJtaXRfcGF0Y2goc2VsZik6CisgICAgICAgIGV4 cGVjdGVkX3N0ZGVyciA9ICJPYnNvbGV0aW5nIDIgb2xkIHBhdGNoZXMgb24gYnVnIDQyXG4iCisg ICAgICAgIHNlbGYuYXNzZXJ0X2V4ZWN1dGVfb3V0cHV0cyhTdWJtaXRQYXRjaCgpLCBbNDJdLCBl eHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJyKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv U2NyaXB0cy9tb2R1bGVzL21vY2tfYnVnemlsbGF0b29sLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy9tb2R1bGVzL21vY2tfYnVnemlsbGF0b29sLnB5CmluZGV4IDM1MTM5OGYuLjI5YTRmMDUgMTAw NjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9tb2NrX2J1Z3ppbGxhdG9vbC5w eQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvbW9ja19idWd6aWxsYXRvb2wucHkK QEAgLTEwOCw2ICsxMDgsNyBAQCBjbGFzcyBNb2NrQnVpbGRCb3QoTW9jayk6CiAgICAgZGVmIHJl ZF9jb3JlX2J1aWxkZXJzX25hbWVzKHNlbGYpOgogICAgICAgICByZXR1cm4gW10KIAorCiBjbGFz cyBNb2NrU0NNKE1vY2spOgogICAgIGRlZiBfX2luaXRfXyhzZWxmKToKICAgICAgICAgTW9jay5f X2luaXRfXyhzZWxmKQpAQCAtMTQyLDYgKzE0MywxMSBAQCBjbGFzcyBNb2NrU0NNKE1vY2spOgog ICAgICAgICByZXR1cm4gW10KIAogCitjbGFzcyBNb2NrVXNlcihvYmplY3QpOgorICAgIGRlZiBw cm9tcHQoc2VsZiwgbWVzc2FnZSk6CisgICAgICAgIHJldHVybiAiTW9jayB1c2VyIHJlc3BvbnNl IgorCisKIGNsYXNzIE1vY2tTdGF0dXNCb3Qob2JqZWN0KToKICAgICBkZWYgX19pbml0X18oc2Vs Zik6CiAgICAgICAgIHNlbGYuc3RhdHVzYm90X2hvc3QgPSAiZXhhbXBsZS5jb20iCkBAIC0xNTgs NiArMTY0LDcgQEAgY2xhc3MgTW9ja0J1Z3ppbGxhVG9vbCgpOgogICAgICAgICBzZWxmLmJ1Z3Mg PSBNb2NrQnVnemlsbGEoKQogICAgICAgICBzZWxmLmJ1aWxkYm90ID0gTW9ja0J1aWxkQm90KCkK ICAgICAgICAgc2VsZi5leGVjdXRpdmUgPSBNb2NrKCkKKyAgICAgICAgc2VsZi51c2VyID0gTW9j a1VzZXIoKQogICAgICAgICBzZWxmLl9zY20gPSBNb2NrU0NNKCkKICAgICAgICAgc2VsZi5zdGF0 dXNfYm90ID0gTW9ja1N0YXR1c0JvdCgpCiAK