36974 2010-04-01 11:43:20 -0700 Add cr-win-ews 2010-04-02 00:05:01 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth webkit-unassigned commit-queue eric oldest_to_newest 207281 0 abarth 2010-04-01 11:43:20 -0700 Add cr-win-ews 207283 1 52316 abarth 2010-04-01 11:44:22 -0700 Created attachment 52316 Patch 207290 2 52318 abarth 2010-04-01 11:50:00 -0700 Created attachment 52318 Patch 207293 3 eric 2010-04-01 11:56:51 -0700 Soooo big... 207295 4 abarth 2010-04-01 11:57:59 -0700 Sorry. I'm sure it breaks something. :) 207366 5 52318 abarth 2010-04-01 13:44:56 -0700 Comment on attachment 52318 Patch Ok. I'll do the small version. 207584 6 52363 abarth 2010-04-01 18:35:14 -0700 Created attachment 52363 Patch 207587 7 52363 eric 2010-04-01 18:37:58 -0700 Comment on attachment 52363 Patch You are a machine. 207737 8 52363 commit-queue 2010-04-02 00:04:56 -0700 Comment on attachment 52363 Patch Clearing flags on attachment: 52363 Committed r56976: <http://trac.webkit.org/changeset/56976> 207738 9 commit-queue 2010-04-02 00:05:01 -0700 All reviewed patches have been landed. Closing bug. 52316 2010-04-01 11:44:22 -0700 2010-04-01 11:49:56 -0700 Patch bug-36974-20100401114421.patch text/plain 24684 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA5ZDQ3NTNjLi41NzEzYWRhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMgQEAKIDIwMTAtMDQt MDEgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgY3Itd2luLWV3cworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY5NzQKKworICAgICAgICBUaGlz IHBhdGNoIGFkZHMgYSBjci13aW4tZXdzLiAgSSBhbHNvIGNsZWFuZWQgdXAgb3VyIFBvcnQgY2xh c3Mgc28KKyAgICAgICAgd2UncmUgdXNpbmcgaW5zdGFuY2VzIGluc3RlYWQgb2YgY2xhc3Mgb2Jq ZWN0cy4gIE91ciBuZXcgc3R5bGUgY2hlY2tlcgorICAgICAgICBhbHNvIGZvcmNlZCBtZSB0byBj bGVhbiB1cCBhIHRvbiBvZiBzdHlsZSB2aW9sYXRpb25zLgorCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NvbmZpZy9wb3J0c191bml0dGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3Rvb2wvY29tbWFuZHMvZWFybHl3YXJuaW5nc3lzdGVtLnB5OgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0ZW1fdW5pdHRlc3Qu cHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3NoZXJpZmZib3Qu cHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL2Fic3RyYWN0c3RlcC5w eToKKworMjAxMC0wNC0wMSAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCiAgICAg ICAgIFVucmV2aWV3ZWQuCiAKICAgICAgICAgVHVybnMgb3V0IHRoZSBDaHJvbWl1bSBXaW5kb3dz IGJvdHMgZG9uJ3QgaGF2ZSBwZGV2ZW52IGluc3RhbGxlZC4KZGlmZiAtLWdpdCBhL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5weSBiL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5weQppbmRleCA2ZDM1YWZlLi41 N2RiZGZkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j b25maWcvcG9ydHMucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v Y29uZmlnL3BvcnRzLnB5CkBAIC0zNiwxNTcgKzM2LDEyMCBAQCBmcm9tIG9wdHBhcnNlIGltcG9y dCBtYWtlX29wdGlvbgogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBpbXBv cnQgRXhlY3V0aXZlCiAKIAotY2xhc3MgV2ViS2l0UG9ydChvYmplY3QpOgotCitjbGFzcyBQb3J0 KG9iamVjdCk6CiAgICAgIyBXZSBtaWdodCBuZWVkIHRvIHBhc3Mgc2NtIGludG8gdGhpcyBmdW5j dGlvbiBmb3Igc2NtLmNoZWNrb3V0X3Jvb3QKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgc2Ny aXB0X3BhdGgoY2xzLCBzY3JpcHRfbmFtZSk6CiAgICAgICAgIHJldHVybiBvcy5wYXRoLmpvaW4o IldlYktpdFRvb2xzIiwgIlNjcmlwdHMiLCBzY3JpcHRfbmFtZSkKIAotICAgIEBzdGF0aWNtZXRo b2QKLSAgICBkZWYgcG9ydChwb3J0X25hbWUpOgotICAgICAgICBwb3J0cyA9IHsKLSAgICAgICAg ICAgICJjaHJvbWl1bSI6IENocm9taXVtUG9ydCwKLSAgICAgICAgICAgICJndGsiOiBHdGtQb3J0 LAotICAgICAgICAgICAgIm1hYyI6IE1hY1BvcnQsCi0gICAgICAgICAgICAid2luIjogV2luUG9y dCwKLSAgICAgICAgICAgICJxdCI6IFF0UG9ydCwKLSAgICAgICAgfQotICAgICAgICBkZWZhdWx0 X3BvcnQgPSB7Ci0gICAgICAgICAgICAiV2luZG93cyI6IFdpblBvcnQsCi0gICAgICAgICAgICAi RGFyd2luIjogTWFjUG9ydCwKKyAgICBfcG9ydF9pbmRleCA9IE5vbmUKKworICAgIEBjbGFzc21l dGhvZAorICAgIGRlZiBwb3J0X2J5X25hbWUoY2xzLCBuYW1lKToKKyAgICAgICAgcG9ydHMgPSBb CisgICAgICAgICAgICBDaHJvbWl1bUxpbnV4UG9ydCwKKyAgICAgICAgICAgIENocm9taXVtV2lu ZG93c1BvcnQsCisgICAgICAgICAgICBHdGtQb3J0LAorICAgICAgICAgICAgTWFjUG9ydCwKKyAg ICAgICAgICAgIFdpblBvcnQsCisgICAgICAgICAgICBRdFBvcnQsCisgICAgICAgIF0KKyAgICAg ICAgaWYgbm90IGNscy5fcG9ydF9pbmRleDoKKyAgICAgICAgICAgIGNscy5fcG9ydF9pbmRleCA9 IHt9CisgICAgICAgICAgICBmb3IgcG9ydF9jbGFzcyBpbiBwb3J0czoKKyAgICAgICAgICAgICAg ICBjbHMuX3BvcnRfaW5kZXhbcG9ydF9jbGFzcy5uYW1lXSA9IHBvcnRfY2xhc3MoKQorICAgICAg ICBkZWZhdWx0X3BvcnRfYnlfcGxhdGZvcm0gPSB7CisgICAgICAgICAgICAiV2luZG93cyI6IGNs cy5fcG9ydF9pbmRleFsid2luIl0sCisgICAgICAgICAgICAiRGFyd2luIjogY2xzLl9wb3J0X2lu ZGV4WyJtYWMiXSwKICAgICAgICAgfQotICAgICAgICAjIERvIHdlIHJlYWxseSBuZWVkIE1hY1Bv cnQgYXMgdGhlIHVsdGltYXRlIGRlZmF1bHQ/Ci0gICAgICAgIHJldHVybiBwb3J0cy5nZXQocG9y dF9uYW1lLCBkZWZhdWx0X3BvcnQuZ2V0KHBsYXRmb3JtLnN5c3RlbSgpLCBNYWNQb3J0KSkKKyAg ICAgICAgIyBEbyB3ZSByZWFsbHkgbmVlZCBtYWMgYXMgdGhlIHVsdGltYXRlIGRlZmF1bHQ/Cisg ICAgICAgIHJldHVybiBjbHMuX3BvcnRfaW5kZXguZ2V0KG5hbWUsIGRlZmF1bHRfcG9ydF9ieV9w bGF0Zm9ybS5nZXQoCisgICAgICAgICAgICAgICAgICAgcGxhdGZvcm0uc3lzdGVtKCksIGNscy5f cG9ydF9pbmRleFsibWFjIl0pKQogCi0gICAgQHN0YXRpY21ldGhvZAotICAgIGRlZiBtYWtlQXJn cygpOgotICAgICAgICBhcmdzID0gJy0tbWFrZWFyZ3M9Ii1qJXMiJyAlIEV4ZWN1dGl2ZS5jcHVf Y291bnQoKQotICAgICAgICBpZiBvcy5lbnZpcm9uLmhhc19rZXkoJ01BS0VGTEFHUycpOgotICAg ICAgICAgICAgYXJncyA9ICctLW1ha2VhcmdzPSIlcyInICUgb3MuZW52aXJvblsnTUFLRUZMQUdT J10KLSAgICAgICAgcmV0dXJuIGFyZ3MKKyAgICBkZWYgZmxhZyhzZWxmKToKKyAgICAgICAgcmV0 dXJuICItLXBvcnQ9JXMiICUgc2VsZi5uYW1lCiAKLSAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYg bmFtZShjbHMpOgotICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yKCJzdWJjbGFzc2Vz IG11c3QgaW1wbGVtZW50IikKKyAgICBkZWYgdXBkYXRlX3dlYmtpdF9jb21tYW5kKHNlbGYpOgor ICAgICAgICByZXR1cm4gW3NlbGYuc2NyaXB0X3BhdGgoInVwZGF0ZS13ZWJraXQiKV0KIAotICAg IEBjbGFzc21ldGhvZAotICAgIGRlZiBmbGFnKGNscyk6Ci0gICAgICAgIHJhaXNlIE5vdEltcGxl bWVudGVkRXJyb3IoInN1YmNsYXNzZXMgbXVzdCBpbXBsZW1lbnQiKQotCi0gICAgQGNsYXNzbWV0 aG9kCi0gICAgZGVmIHVwZGF0ZV93ZWJraXRfY29tbWFuZChjbHMpOgotICAgICAgICByZXR1cm4g W2Nscy5zY3JpcHRfcGF0aCgidXBkYXRlLXdlYmtpdCIpXQotCi0gICAgQGNsYXNzbWV0aG9kCi0g ICAgZGVmIGJ1aWxkX3dlYmtpdF9jb21tYW5kKGNscywgYnVpbGRfc3R5bGU9Tm9uZSk6Ci0gICAg ICAgIGNvbW1hbmQgPSBbY2xzLnNjcmlwdF9wYXRoKCJidWlsZC13ZWJraXQiKV0KKyAgICBkZWYg YnVpbGRfd2Via2l0X2NvbW1hbmQoc2VsZiwgYnVpbGRfc3R5bGU9Tm9uZSk6CisgICAgICAgIGNv bW1hbmQgPSBbc2VsZi5zY3JpcHRfcGF0aCgiYnVpbGQtd2Via2l0IildCiAgICAgICAgIGlmIGJ1 aWxkX3N0eWxlID09ICJkZWJ1ZyI6CiAgICAgICAgICAgICBjb21tYW5kLmFwcGVuZCgiLS1kZWJ1 ZyIpCiAgICAgICAgIGlmIGJ1aWxkX3N0eWxlID09ICJyZWxlYXNlIjoKICAgICAgICAgICAgIGNv bW1hbmQuYXBwZW5kKCItLXJlbGVhc2UiKQogICAgICAgICByZXR1cm4gY29tbWFuZAogCi0gICAg QGNsYXNzbWV0aG9kCi0gICAgZGVmIHJ1bl9qYXZhc2NyaXB0Y29yZV90ZXN0c19jb21tYW5kKGNs cyk6Ci0gICAgICAgIHJldHVybiBbY2xzLnNjcmlwdF9wYXRoKCJydW4tamF2YXNjcmlwdGNvcmUt dGVzdHMiKV0KKyAgICBkZWYgcnVuX2phdmFzY3JpcHRjb3JlX3Rlc3RzX2NvbW1hbmQoc2VsZik6 CisgICAgICAgIHJldHVybiBbc2VsZi5zY3JpcHRfcGF0aCgicnVuLWphdmFzY3JpcHRjb3JlLXRl c3RzIildCiAKLSAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgcnVuX3dlYmtpdF90ZXN0c19jb21t YW5kKGNscyk6Ci0gICAgICAgIHJldHVybiBbY2xzLnNjcmlwdF9wYXRoKCJydW4td2Via2l0LXRl c3RzIildCisgICAgZGVmIHJ1bl93ZWJraXRfdGVzdHNfY29tbWFuZChzZWxmKToKKyAgICAgICAg cmV0dXJuIFtzZWxmLnNjcmlwdF9wYXRoKCJydW4td2Via2l0LXRlc3RzIildCiAKLSAgICBAY2xh c3NtZXRob2QKLSAgICBkZWYgcnVuX3B5dGhvbl91bml0dGVzdHNfY29tbWFuZChjbHMpOgotICAg ICAgICByZXR1cm4gW2Nscy5zY3JpcHRfcGF0aCgidGVzdC13ZWJraXRweSIpXQorICAgIGRlZiBy dW5fcHl0aG9uX3VuaXR0ZXN0c19jb21tYW5kKHNlbGYpOgorICAgICAgICByZXR1cm4gW3NlbGYu c2NyaXB0X3BhdGgoInRlc3Qtd2Via2l0cHkiKV0KIAogICAgIEBjbGFzc21ldGhvZAotICAgIGRl ZiBydW5fcGVybF91bml0dGVzdHNfY29tbWFuZChjbHMpOgotICAgICAgICByZXR1cm4gW2Nscy5z Y3JpcHRfcGF0aCgidGVzdC13ZWJraXRwZXJsIildCisgICAgZGVmIHJ1bl9wZXJsX3VuaXR0ZXN0 c19jb21tYW5kKHNlbGYpOgorICAgICAgICByZXR1cm4gW3NlbGYuc2NyaXB0X3BhdGgoInRlc3Qt d2Via2l0cGVybCIpXQogCiAKLWNsYXNzIE1hY1BvcnQoV2ViS2l0UG9ydCk6CitjbGFzcyBNYWNQ b3J0KFBvcnQpOgorICAgIG5hbWUgPSAibWFjIgogCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVm IG5hbWUoY2xzKToKLSAgICAgICAgcmV0dXJuICJNYWMiCi0KLSAgICBAY2xhc3NtZXRob2QKLSAg ICBkZWYgZmxhZyhjbHMpOgotICAgICAgICByZXR1cm4gIi0tcG9ydD1tYWMiCiAKLQotY2xhc3Mg V2luUG9ydChXZWJLaXRQb3J0KToKLQotICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBuYW1lKGNs cyk6Ci0gICAgICAgIHJldHVybiAiV2luIgotCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIGZs YWcoY2xzKToKLSAgICAgICAgIyBGSVhNRTogVGhpcyBpcyBsYW1lLiAgV2Ugc2hvdWxkIGF1dG9n ZW5lcmF0ZSB0aGlzIGZyb20gYSBjb2RlbmFtZSBvciBzb21ldGhpbmcuCi0gICAgICAgIHJldHVy biAiLS1wb3J0PXdpbiIKK2NsYXNzIFdpblBvcnQoUG9ydCk6CisgICAgbmFtZSA9ICJ3aW4iCiAK IAotY2xhc3MgR3RrUG9ydChXZWJLaXRQb3J0KToKK2NsYXNzIEFyZ3VtZW50UG9ydChQb3J0KToK KyAgICBkZWYgYnVpbGRfd2Via2l0X2NvbW1hbmQoc2VsZiwgYnVpbGRfc3R5bGU9Tm9uZSk6Cisg ICAgICAgIGNvbW1hbmQgPSBQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKHNlbGYsIGJ1aWxkX3N0 eWxlPWJ1aWxkX3N0eWxlKQorICAgICAgICBjb21tYW5kLmFwcGVuZChzZWxmLmNvbW1hbmRfbGlu ZV9hcmd1bWVudCkKKyAgICAgICAgcmV0dXJuIGNvbW1hbmQKIAotICAgIEBjbGFzc21ldGhvZAot ICAgIGRlZiBuYW1lKGNscyk6Ci0gICAgICAgIHJldHVybiAiR3RrIgorICAgIGRlZiBydW5fd2Vi a2l0X3Rlc3RzX2NvbW1hbmQoc2VsZik6CisgICAgICAgIGNvbW1hbmQgPSBQb3J0LnJ1bl93ZWJr aXRfdGVzdHNfY29tbWFuZChzZWxmKQorICAgICAgICBjb21tYW5kLmFwcGVuZChzZWxmLmNvbW1h bmRfbGluZV9hcmd1bWVudCkKKyAgICAgICAgcmV0dXJuIGNvbW1hbmQKIAotICAgIEBjbGFzc21l dGhvZAotICAgIGRlZiBmbGFnKGNscyk6Ci0gICAgICAgIHJldHVybiAiLS1wb3J0PWd0ayIKIAot ICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBidWlsZF93ZWJraXRfY29tbWFuZChjbHMsIGJ1aWxk X3N0eWxlPU5vbmUpOgotICAgICAgICBjb21tYW5kID0gV2ViS2l0UG9ydC5idWlsZF93ZWJraXRf Y29tbWFuZChidWlsZF9zdHlsZT1idWlsZF9zdHlsZSkKLSAgICAgICAgY29tbWFuZC5hcHBlbmQo Ii0tZ3RrIikKLSAgICAgICAgY29tbWFuZC5hcHBlbmQoV2ViS2l0UG9ydC5tYWtlQXJncygpKQot ICAgICAgICByZXR1cm4gY29tbWFuZAorY2xhc3MgQ2hyb21pdW1Qb3J0KEFyZ3VtZW50UG9ydCk6 CisgICAgY29tbWFuZF9saW5lX2FyZ3VtZW50ID0gIi0tY2hyb21pdW0iCiAKLSAgICBAY2xhc3Nt ZXRob2QKLSAgICBkZWYgcnVuX3dlYmtpdF90ZXN0c19jb21tYW5kKGNscyk6Ci0gICAgICAgIGNv bW1hbmQgPSBXZWJLaXRQb3J0LnJ1bl93ZWJraXRfdGVzdHNfY29tbWFuZCgpCi0gICAgICAgIGNv bW1hbmQuYXBwZW5kKCItLWd0ayIpCisgICAgZGVmIHVwZGF0ZV93ZWJraXRfY29tbWFuZChzZWxm KToKKyAgICAgICAgY29tbWFuZCA9IEFyZ3VtZW50UG9ydC51cGRhdGVfd2Via2l0X2NvbW1hbmQo c2VsZikKKyAgICAgICAgY29tbWFuZC5hcHBlbmQoc2VsZi5jb21tYW5kX2xpbmVfYXJndW1lbnQp CiAgICAgICAgIHJldHVybiBjb21tYW5kCiAKIAotY2xhc3MgUXRQb3J0KFdlYktpdFBvcnQpOgor Y2xhc3MgQ2hyb21pdW1MaW51eFBvcnQoQ2hyb21pdW1Qb3J0KToKKyAgICBuYW1lID0gImNyLWxp bnV4IgogCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIG5hbWUoY2xzKToKLSAgICAgICAgcmV0 dXJuICJRdCIKIAotICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBmbGFnKGNscyk6Ci0gICAgICAg IHJldHVybiAiLS1wb3J0PXF0IgorY2xhc3MgQ2hyb21pdW1XaW5kb3dzUG9ydChDaHJvbWl1bVBv cnQpOgorICAgIG5hbWUgPSAiY3Itd2luIgogCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIGJ1 aWxkX3dlYmtpdF9jb21tYW5kKGNscywgYnVpbGRfc3R5bGU9Tm9uZSk6Ci0gICAgICAgIGNvbW1h bmQgPSBXZWJLaXRQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPWJ1aWxkX3N0 eWxlKQotICAgICAgICBjb21tYW5kLmFwcGVuZCgiLS1xdCIpCi0gICAgICAgIGNvbW1hbmQuYXBw ZW5kKFdlYktpdFBvcnQubWFrZUFyZ3MoKSkKLSAgICAgICAgcmV0dXJuIGNvbW1hbmQKIAorY2xh c3MgTWFrZUFyZ3NQb3J0KEFyZ3VtZW50UG9ydCk6CisgICAgZGVmIG1ha2VfYXJncyhzZWxmKToK KyAgICAgICAgYXJncyA9ICctLW1ha2VhcmdzPSItaiVzIicgJSBFeGVjdXRpdmUuY3B1X2NvdW50 KCkKKyAgICAgICAgaWYgb3MuZW52aXJvbi5nZXQoJ01BS0VGTEFHUycpOgorICAgICAgICAgICAg YXJncyA9ICctLW1ha2VhcmdzPSIlcyInICUgb3MuZW52aXJvblsnTUFLRUZMQUdTJ10KKyAgICAg ICAgcmV0dXJuIGFyZ3MKIAotY2xhc3MgQ2hyb21pdW1Qb3J0KFdlYktpdFBvcnQpOgorICAgIGRl ZiBidWlsZF93ZWJraXRfY29tbWFuZChzZWxmLCBidWlsZF9zdHlsZT1Ob25lKToKKyAgICAgICAg Y29tbWFuZCA9IEFyZ3VtZW50UG9ydC5idWlsZF93ZWJraXRfY29tbWFuZChzZWxmLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJ1aWxkX3N0eWxl PWJ1aWxkX3N0eWxlKQorICAgICAgICBjb21tYW5kLmFwcGVuZChzZWxmLm1ha2VfYXJncygpKQor ICAgICAgICByZXR1cm4gY29tbWFuZAogCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIG5hbWUo Y2xzKToKLSAgICAgICAgcmV0dXJuICJDaHJvbWl1bSIKIAotICAgIEBjbGFzc21ldGhvZAotICAg IGRlZiBmbGFnKGNscyk6Ci0gICAgICAgIHJldHVybiAiLS1wb3J0PWNocm9taXVtIgorY2xhc3Mg R3RrUG9ydChNYWtlQXJnc1BvcnQpOgorICAgIG5hbWUgPSAiZ3RrIgorICAgIGNvbW1hbmRfbGlu ZV9hcmd1bWVudCA9ICItLWd0ayIKIAotICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiB1cGRhdGVf d2Via2l0X2NvbW1hbmQoY2xzKToKLSAgICAgICAgY29tbWFuZCA9IFdlYktpdFBvcnQudXBkYXRl X3dlYmtpdF9jb21tYW5kKCkKLSAgICAgICAgY29tbWFuZC5hcHBlbmQoIi0tY2hyb21pdW0iKQot ICAgICAgICByZXR1cm4gY29tbWFuZAogCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIGJ1aWxk X3dlYmtpdF9jb21tYW5kKGNscywgYnVpbGRfc3R5bGU9Tm9uZSk6Ci0gICAgICAgIGNvbW1hbmQg PSBXZWJLaXRQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPWJ1aWxkX3N0eWxl KQotICAgICAgICBjb21tYW5kLmFwcGVuZCgiLS1jaHJvbWl1bSIpCi0gICAgICAgIHJldHVybiBj b21tYW5kCitjbGFzcyBRdFBvcnQoTWFrZUFyZ3NQb3J0KToKKyAgICBuYW1lID0gInF0IgorICAg IGNvbW1hbmRfbGluZV9hcmd1bWVudCA9ICItLXF0IgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzX3VuaXR0ZXN0LnB5IGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzX3VuaXR0ZXN0LnB5Cmlu ZGV4IDkyOWE0ODAuLjU3OWE5YjAgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0c191bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHNfdW5pdHRlc3QucHkKQEAgLTI5LDQx ICsyOSw3MSBAQAogCiBpbXBvcnQgdW5pdHRlc3QKIAotZnJvbSB3ZWJraXRweS5jb21tb24uY29u ZmlnLnBvcnRzIGltcG9ydCBXZWJLaXRQb3J0LCBNYWNQb3J0LCBHdGtQb3J0LCBRdFBvcnQsIENo cm9taXVtUG9ydAorZnJvbSB3ZWJraXRweS5jb21tb24uY29uZmlnLnBvcnRzIGltcG9ydCAqCiBm cm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBFeGVjdXRpdmUKIAog Ci1jbGFzcyBXZWJLaXRQb3J0VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CitjbGFzcyBQb3J0VGVz dCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIHRlc3RfbWFjX3BvcnQoc2VsZik6Ci0gICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWxzKE1hY1BvcnQubmFtZSgpLCAiTWFjIikKLSAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbHMoTWFjUG9ydC5mbGFnKCksICItLXBvcnQ9bWFjIikKLSAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbHMoTWFjUG9ydC5ydW5fd2Via2l0X3Rlc3RzX2NvbW1hbmQoKSwgW1dlYktp dFBvcnQuc2NyaXB0X3BhdGgoInJ1bi13ZWJraXQtdGVzdHMiKV0pCi0gICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWxzKE1hY1BvcnQuYnVpbGRfd2Via2l0X2NvbW1hbmQoKSwgW1dlYktpdFBvcnQuc2Ny aXB0X3BhdGgoImJ1aWxkLXdlYmtpdCIpXSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoTWFj UG9ydC5idWlsZF93ZWJraXRfY29tbWFuZChidWlsZF9zdHlsZT0iZGVidWciKSwgW1dlYktpdFBv cnQuc2NyaXB0X3BhdGgoImJ1aWxkLXdlYmtpdCIpLCAiLS1kZWJ1ZyJdKQotICAgICAgICBzZWxm LmFzc2VydEVxdWFscyhNYWNQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPSJy ZWxlYXNlIiksIFtXZWJLaXRQb3J0LnNjcmlwdF9wYXRoKCJidWlsZC13ZWJraXQiKSwgIi0tcmVs ZWFzZSJdKQorICAgICAgICBwb3J0ID0gTWFjUG9ydCgpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWxzKHBvcnQubmFtZSwgIm1hYyIpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQuZmxh ZygpLCAiLS1wb3J0PW1hYyIpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQucnVuX3dl YmtpdF90ZXN0c19jb21tYW5kKCksCisgICAgICAgICAgICAgICAgICAgICAgICAgW1BvcnQoKS5z Y3JpcHRfcGF0aCgicnVuLXdlYmtpdC10ZXN0cyIpXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVh bHMocG9ydC5idWlsZF93ZWJraXRfY29tbWFuZCgpLAorICAgICAgICAgICAgICAgICAgICAgICAg ICBbUG9ydCgpLnNjcmlwdF9wYXRoKCJidWlsZC13ZWJraXQiKV0pCisgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWxzKHBvcnQuYnVpbGRfd2Via2l0X2NvbW1hbmQoYnVpbGRfc3R5bGU9ImRlYnVnIiks CisgICAgICAgICAgICAgICAgICAgICAgICAgIFtQb3J0KCkuc2NyaXB0X3BhdGgoImJ1aWxkLXdl YmtpdCIpLCAiLS1kZWJ1ZyJdKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0LmJ1aWxk X3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPSJyZWxlYXNlIiksCisgICAgICAgICAgICAgICAg ICAgICAgICAgIFtQb3J0KCkuc2NyaXB0X3BhdGgoImJ1aWxkLXdlYmtpdCIpLCAiLS1yZWxlYXNl Il0pCiAKICAgICBkZWYgdGVzdF9ndGtfcG9ydChzZWxmKToKLSAgICAgICAgc2VsZi5hc3NlcnRF cXVhbHMoR3RrUG9ydC5uYW1lKCksICJHdGsiKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhH dGtQb3J0LmZsYWcoKSwgIi0tcG9ydD1ndGsiKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhH dGtQb3J0LnJ1bl93ZWJraXRfdGVzdHNfY29tbWFuZCgpLCBbV2ViS2l0UG9ydC5zY3JpcHRfcGF0 aCgicnVuLXdlYmtpdC10ZXN0cyIpLCAiLS1ndGsiXSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVh bHMoR3RrUG9ydC5idWlsZF93ZWJraXRfY29tbWFuZCgpLCBbV2ViS2l0UG9ydC5zY3JpcHRfcGF0 aCgiYnVpbGQtd2Via2l0IiksICItLWd0ayIsIFdlYktpdFBvcnQubWFrZUFyZ3MoKV0pCi0gICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWxzKEd0a1BvcnQuYnVpbGRfd2Via2l0X2NvbW1hbmQoYnVpbGRf c3R5bGU9ImRlYnVnIiksIFtXZWJLaXRQb3J0LnNjcmlwdF9wYXRoKCJidWlsZC13ZWJraXQiKSwg Ii0tZGVidWciLCAiLS1ndGsiLCBXZWJLaXRQb3J0Lm1ha2VBcmdzKCldKQorICAgICAgICBwb3J0 ID0gR3RrUG9ydCgpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQubmFtZSwgImd0ayIp CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQuZmxhZygpLCAiLS1wb3J0PWd0ayIpCisg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQucnVuX3dlYmtpdF90ZXN0c19jb21tYW5kKCks CisgICAgICAgICAgICAgICAgICAgICAgICAgIFtQb3J0KCkuc2NyaXB0X3BhdGgoInJ1bi13ZWJr aXQtdGVzdHMiKSwgIi0tZ3RrIl0pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQuYnVp bGRfd2Via2l0X2NvbW1hbmQoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICBbUG9ydCgpLnNj cmlwdF9wYXRoKCJidWlsZC13ZWJraXQiKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIi0t Z3RrIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgTWFrZUFyZ3NQb3J0KCkubWFrZV9hcmdz KCldKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5k KGJ1aWxkX3N0eWxlPSJkZWJ1ZyIpLAorICAgICAgICAgICAgICAgICAgICAgICAgICBbUG9ydCgp LnNjcmlwdF9wYXRoKCJidWlsZC13ZWJraXQiKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICItLWRlYnVnIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICItLWd0ayIsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICBNYWtlQXJnc1BvcnQoKS5tYWtlX2FyZ3MoKV0pCiAKICAgICBk ZWYgdGVzdF9xdF9wb3J0KHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhRdFBvcnQu bmFtZSgpLCAiUXQiKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhRdFBvcnQuZmxhZygpLCAi LS1wb3J0PXF0IikKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoUXRQb3J0LnJ1bl93ZWJraXRf dGVzdHNfY29tbWFuZCgpLCBbV2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgicnVuLXdlYmtpdC10ZXN0 cyIpXSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoUXRQb3J0LmJ1aWxkX3dlYmtpdF9jb21t YW5kKCksIFtXZWJLaXRQb3J0LnNjcmlwdF9wYXRoKCJidWlsZC13ZWJraXQiKSwgIi0tcXQiLCBX ZWJLaXRQb3J0Lm1ha2VBcmdzKCldKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhRdFBvcnQu YnVpbGRfd2Via2l0X2NvbW1hbmQoYnVpbGRfc3R5bGU9ImRlYnVnIiksIFtXZWJLaXRQb3J0LnNj cmlwdF9wYXRoKCJidWlsZC13ZWJraXQiKSwgIi0tZGVidWciLCAiLS1xdCIsIFdlYktpdFBvcnQu bWFrZUFyZ3MoKV0pCisgICAgICAgIHBvcnQgPSBRdFBvcnQoKQorICAgICAgICBzZWxmLmFzc2Vy dEVxdWFscyhwb3J0Lm5hbWUsICJxdCIpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQu ZmxhZygpLCAiLS1wb3J0PXF0IikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5ydW5f d2Via2l0X3Rlc3RzX2NvbW1hbmQoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgW1BvcnQo KS5zY3JpcHRfcGF0aCgicnVuLXdlYmtpdC10ZXN0cyIpLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgIi0tcXQiXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5idWlsZF93ZWJr aXRfY29tbWFuZCgpLAorICAgICAgICAgICAgICAgICAgICAgICAgICBbUG9ydCgpLnNjcmlwdF9w YXRoKCJidWlsZC13ZWJraXQiKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICItLXF0IiwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgIE1ha2VBcmdzUG9ydCgpLm1ha2VfYXJncygpXSkK KyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5idWlsZF93ZWJraXRfY29tbWFuZChidWls ZF9zdHlsZT0iZGVidWciKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgW1BvcnQoKS5zY3Jp cHRfcGF0aCgiYnVpbGQtd2Via2l0IiksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAiLS1k ZWJ1ZyIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAiLS1xdCIsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICBNYWtlQXJnc1BvcnQoKS5tYWtlX2FyZ3MoKV0pCiAKLSAgICBkZWYgdGVz dF9jaHJvbWl1bV9wb3J0KHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhDaHJvbWl1 bVBvcnQubmFtZSgpLCAiQ2hyb21pdW0iKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhDaHJv bWl1bVBvcnQuZmxhZygpLCAiLS1wb3J0PWNocm9taXVtIikKLSAgICAgICAgc2VsZi5hc3NlcnRF cXVhbHMoQ2hyb21pdW1Qb3J0LnJ1bl93ZWJraXRfdGVzdHNfY29tbWFuZCgpLCBbV2ViS2l0UG9y dC5zY3JpcHRfcGF0aCgicnVuLXdlYmtpdC10ZXN0cyIpXSkKLSAgICAgICAgc2VsZi5hc3NlcnRF cXVhbHMoQ2hyb21pdW1Qb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKCksIFtXZWJLaXRQb3J0LnNj cmlwdF9wYXRoKCJidWlsZC13ZWJraXQiKSwgIi0tY2hyb21pdW0iXSkKLSAgICAgICAgc2VsZi5h c3NlcnRFcXVhbHMoQ2hyb21pdW1Qb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxl PSJkZWJ1ZyIpLCBbV2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgiYnVpbGQtd2Via2l0IiksICItLWRl YnVnIiwgIi0tY2hyb21pdW0iXSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoQ2hyb21pdW1Q b3J0LnVwZGF0ZV93ZWJraXRfY29tbWFuZCgpLCBbV2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgidXBk YXRlLXdlYmtpdCIpLCAiLS1jaHJvbWl1bSJdKQotCi0KLWlmIF9fbmFtZV9fID09ICdfX21haW5f Xyc6Ci0gICAgdW5pdHRlc3QubWFpbigpCisgICAgZGVmIHRlc3RfY2hyb21pdW1fbGluaXhfcG9y dChzZWxmKToKKyAgICAgICAgcG9ydCA9IENocm9taXVtTGludXhQb3J0KCkKKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbHMocG9ydC5uYW1lLCAiY3ItbGludXgiKQorICAgICAgICBzZWxmLmFzc2Vy dEVxdWFscyhwb3J0LmZsYWcoKSwgIi0tcG9ydD1jci1saW51eCIpCisgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWxzKHBvcnQucnVuX3dlYmtpdF90ZXN0c19jb21tYW5kKCksCisgICAgICAgICAgICAg ICAgICAgICAgICAgIFtQb3J0KCkuc2NyaXB0X3BhdGgoInJ1bi13ZWJraXQtdGVzdHMiKSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICItLWNocm9taXVtIl0pCisgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWxzKHBvcnQuYnVpbGRfd2Via2l0X2NvbW1hbmQoKSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgW1BvcnQoKS5zY3JpcHRfcGF0aCgiYnVpbGQtd2Via2l0IiksCisgICAgICAgICAg ICAgICAgICAgICAgICAgICItLWNocm9taXVtIl0pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxz KHBvcnQuYnVpbGRfd2Via2l0X2NvbW1hbmQoYnVpbGRfc3R5bGU9ImRlYnVnIiksCisgICAgICAg ICAgICAgICAgICAgICAgICAgIFtQb3J0KCkuc2NyaXB0X3BhdGgoImJ1aWxkLXdlYmtpdCIpLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgIi0tZGVidWciLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgIi0tY2hyb21pdW0iXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC51 cGRhdGVfd2Via2l0X2NvbW1hbmQoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgW1BvcnQo KS5zY3JpcHRfcGF0aCgidXBkYXRlLXdlYmtpdCIpLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgIi0tY2hyb21pdW0iXSkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0ZW0ucHkgYi9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZWFybHl3YXJuaW5nc3lzdGVtLnB5CmluZGV4IGE1 Nzk5NDcuLmU4Nzg2YjMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0ZW0ucHkKKysrIGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Vhcmx5d2FybmluZ3N5c3RlbS5weQpAQCAtMzAs NyArMzAsNyBAQCBmcm9tIFN0cmluZ0lPIGltcG9ydCBTdHJpbmdJTwogCiBmcm9tIHdlYmtpdHB5 LnRvb2wuY29tbWFuZHMucXVldWVzIGltcG9ydCBBYnN0cmFjdFJldmlld1F1ZXVlCiBmcm9tIHdl YmtpdHB5LmNvbW1vbi5jb25maWcuY29tbWl0dGVycyBpbXBvcnQgQ29tbWl0dGVyTGlzdAotZnJv bSB3ZWJraXRweS5jb21tb24uY29uZmlnLnBvcnRzIGltcG9ydCBXZWJLaXRQb3J0Citmcm9tIHdl YmtpdHB5LmNvbW1vbi5jb25maWcucG9ydHMgaW1wb3J0IFBvcnQKIGZyb20gd2Via2l0cHkuY29t bW9uLnN5c3RlbS5leGVjdXRpdmUgaW1wb3J0IFNjcmlwdEVycm9yCiBmcm9tIHdlYmtpdHB5LnRv b2wuYm90LnF1ZXVlZW5naW5lIGltcG9ydCBRdWV1ZUVuZ2luZQogCkBAIC00MCw3ICs0MCw3IEBA IGNsYXNzIEFic3RyYWN0RWFybHlXYXJuaW5nU3lzdGVtKEFic3RyYWN0UmV2aWV3UXVldWUpOgog CiAgICAgZGVmIF9faW5pdF9fKHNlbGYpOgogICAgICAgICBBYnN0cmFjdFJldmlld1F1ZXVlLl9f aW5pdF9fKHNlbGYpCi0gICAgICAgIHNlbGYucG9ydCA9IFdlYktpdFBvcnQucG9ydChzZWxmLnBv cnRfbmFtZSkKKyAgICAgICAgc2VsZi5wb3J0ID0gUG9ydC5wb3J0X2J5X25hbWUoc2VsZi5wb3J0 X25hbWUpCiAKICAgICBkZWYgc2hvdWxkX3Byb2NlZWRfd2l0aF93b3JrX2l0ZW0oc2VsZiwgcGF0 Y2gpOgogICAgICAgICByZXR1cm4gVHJ1ZQpAQCAtNzAsNyArNzAsNyBAQCBjbGFzcyBBYnN0cmFj dEVhcmx5V2FybmluZ1N5c3RlbShBYnN0cmFjdFJldmlld1F1ZXVlKToKICAgICAgICAgICAgICAg ICAiLS1ub24taW50ZXJhY3RpdmUiLAogICAgICAgICAgICAgICAgIHBhdGNoLmlkKCldCiAgICAg ICAgICAgICBpZiBub3QgZmlyc3RfcnVuOgotICAgICAgICAgICAgICAgICMgU2VlIGNvbW1pdC1x dWV1ZSBmb3IgYW4gZXhwbGFuYXRpb24gb2Ygd2hhdCB3ZSdyZSBkb2luZyBoZXJlLgorICAgICAg ICAgICAgICAgICMgU2VlIGNvbW1pdC1xdWV1ZSBmb3IgYW4gZXhwbGFuYXRpb24gb2Ygd2hhdCB3 ZSdyZSBkb2luZy4KICAgICAgICAgICAgICAgICBhcmdzLmFwcGVuZCgiLS1uby11cGRhdGUiKQog ICAgICAgICAgICAgICAgIGFyZ3MuYXBwZW5kKCItLXBhcmVudC1jb21tYW5kPSVzIiAlIHNlbGYu bmFtZSkKICAgICAgICAgICAgIHNlbGYucnVuX3dlYmtpdF9wYXRjaChhcmdzKQpAQCAtOTAsMTIg KzkwLDE4IEBAIGNsYXNzIEFic3RyYWN0RWFybHlXYXJuaW5nU3lzdGVtKEFic3RyYWN0UmV2aWV3 UXVldWUpOgogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBoYW5kbGVfc2NyaXB0X2Vycm9yKGNs cywgdG9vbCwgc3RhdGUsIHNjcmlwdF9lcnJvcik6CiAgICAgICAgIGlzX3N2bl9hcHBseSA9IHNj cmlwdF9lcnJvci5jb21tYW5kX25hbWUoKSA9PSAic3ZuLWFwcGx5IgotICAgICAgICBzdGF0dXNf aWQgPSBjbHMuX3VwZGF0ZV9zdGF0dXNfZm9yX3NjcmlwdF9lcnJvcih0b29sLCBzdGF0ZSwgc2Ny aXB0X2Vycm9yLCBpc19lcnJvcj1pc19zdm5fYXBwbHkpCisgICAgICAgIHN0YXR1c19pZCA9IGNs cy5fdXBkYXRlX3N0YXR1c19mb3Jfc2NyaXB0X2Vycm9yKHRvb2wsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRlLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzY3JpcHRfZXJy b3IsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGlzX2Vycm9yPWlzX3N2bl9hcHBseSkKICAgICAgICAgaWYgaXNfc3ZuX2FwcGx5OgogICAg ICAgICAgICAgUXVldWVFbmdpbmUuZXhpdF9hZnRlcl9oYW5kbGVkX2Vycm9yKHNjcmlwdF9lcnJv cikKICAgICAgICAgcmVzdWx0c19saW5rID0gdG9vbC5zdGF0dXNfc2VydmVyLnJlc3VsdHNfdXJs X2Zvcl9zdGF0dXMoc3RhdHVzX2lkKQotICAgICAgICBtZXNzYWdlID0gIkF0dGFjaG1lbnQgJXMg ZGlkIG5vdCBidWlsZCBvbiAlczpcbkJ1aWxkIG91dHB1dDogJXMiICUgKHN0YXRlWyJwYXRjaCJd LmlkKCksIGNscy5wb3J0X25hbWUsIHJlc3VsdHNfbGluaykKLSAgICAgICAgdG9vbC5idWdzLnBv c3RfY29tbWVudF90b19idWcoc3RhdGVbInBhdGNoIl0uYnVnX2lkKCksIG1lc3NhZ2UsIGNjPWNs cy53YXRjaGVycykKKyAgICAgICAgbWVzc2FnZSA9ICJBdHRhY2htZW50ICVzIGRpZCBub3QgYnVp bGQgb24gJXM6XG5CdWlsZCBvdXRwdXQ6ICVzIiAlICgKKyAgICAgICAgICAgICAgICBzdGF0ZVsi cGF0Y2giXS5pZCgpLCBjbHMucG9ydF9uYW1lLCByZXN1bHRzX2xpbmspCisgICAgICAgIHRvb2wu YnVncy5wb3N0X2NvbW1lbnRfdG9fYnVnKHN0YXRlWyJwYXRjaCJdLmJ1Z19pZCgpLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtZXNzYWdlLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBjYz1jbHMud2F0Y2hlcnMpCiAgICAgICAgIGV4aXQoMSkK IAogCkBAIC0xMTgsOSArMTI0LDE5IEBAIGNsYXNzIFdpbkVXUyhBYnN0cmFjdEVhcmx5V2Fybmlu Z1N5c3RlbSk6CiAgICAgcG9ydF9uYW1lID0gIndpbiIKIAogCi1jbGFzcyBDaHJvbWl1bUVXUyhB YnN0cmFjdEVhcmx5V2FybmluZ1N5c3RlbSk6CitjbGFzcyBDaHJvbWl1bUxpbnV4RVdTKEFic3Ry YWN0RWFybHlXYXJuaW5nU3lzdGVtKToKKyAgICAjIEZJWE1FOiBXZSBzaG91bGQgcmVuYW1lIHRo aXMgcXVldWUgdG8gImNyLWxpbnV4LWV3cyIsIGJ1dCB0aGF0IHJlcXVpcmVzCisgICAgIyAgICAg ICAgYSBkYXRhYmFzZSBtaWdyYXRpb24uCiAgICAgbmFtZSA9ICJjaHJvbWl1bS1ld3MiCi0gICAg cG9ydF9uYW1lID0gImNocm9taXVtIgorICAgIHBvcnRfbmFtZSA9ICJjci1saW51eCIKKyAgICB3 YXRjaGVycyA9IEFic3RyYWN0RWFybHlXYXJuaW5nU3lzdGVtLndhdGNoZXJzICsgWworICAgICAg ICAiZGdsYXprb3ZAY2hyb21pdW0ub3JnIiwKKyAgICBdCisKKworY2xhc3MgQ2hyb21pdW1XaW5k b3dzRVdTKEFic3RyYWN0RWFybHlXYXJuaW5nU3lzdGVtKToKKyAgICBuYW1lID0gImNyLXdpbi1l d3MiCisgICAgcG9ydF9uYW1lID0gImNyLXdpbiIKICAgICB3YXRjaGVycyA9IEFic3RyYWN0RWFy bHlXYXJuaW5nU3lzdGVtLndhdGNoZXJzICsgWwogICAgICAgICAiZGdsYXprb3ZAY2hyb21pdW0u b3JnIiwKICAgICBdCkBAIC0xMjgsNiArMTQ0LDggQEAgY2xhc3MgQ2hyb21pdW1FV1MoQWJzdHJh Y3RFYXJseVdhcm5pbmdTeXN0ZW0pOgogCiAjIEZvciBwbGF0Zm9ybXMgdGhhdCB3ZSBjYW4ndCBy dW4gaW5zaWRlIGEgVk0gKGxpa2UgTWFjIE9TIFgpLCB3ZSByZXF1aXJlCiAjIHBhdGNoZXMgdG8g YmUgdXBsb2FkZWQgYnkgY29tbWl0dGVycywgd2hvIGFyZSBnZW5lcmFsbHkgdHJ1c3R3b3J0aHkg Zm9say4gOikKKworCiBjbGFzcyBBYnN0cmFjdENvbW1pdHRlck9ubHlFV1MoQWJzdHJhY3RFYXJs eVdhcm5pbmdTeXN0ZW0pOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBjb21taXR0ZXJzPUNvbW1p dHRlckxpc3QoKSk6CiAgICAgICAgIEFic3RyYWN0RWFybHlXYXJuaW5nU3lzdGVtLl9faW5pdF9f KHNlbGYpCkBAIC0xMzUsNyArMTUzLDggQEAgY2xhc3MgQWJzdHJhY3RDb21taXR0ZXJPbmx5RVdT KEFic3RyYWN0RWFybHlXYXJuaW5nU3lzdGVtKToKIAogICAgIGRlZiBwcm9jZXNzX3dvcmtfaXRl bShzZWxmLCBwYXRjaCk6CiAgICAgICAgIGlmIG5vdCBzZWxmLl9jb21taXR0ZXJzLmNvbW1pdHRl cl9ieV9lbWFpbChwYXRjaC5hdHRhY2hlcl9lbWFpbCgpKToKLSAgICAgICAgICAgIHNlbGYuX2Rp ZF9lcnJvcihwYXRjaCwgIiVzIGNhbm5vdCBwcm9jZXNzIHBhdGNoZXMgZnJvbSBub24tY29tbWl0 dGVycyA6KCIgJSBzZWxmLm5hbWUpCisgICAgICAgICAgICBzZWxmLl9kaWRfZXJyb3IocGF0Y2gs CisgICAgICAgICAgICAgICAgIiVzIGNhbm5vdCBwcm9jZXNzIHBhdGNoZXMgZnJvbSBub24tY29t bWl0dGVycyA6KCIgJSBzZWxmLm5hbWUpCiAgICAgICAgICAgICByZXR1cm4KICAgICAgICAgQWJz dHJhY3RFYXJseVdhcm5pbmdTeXN0ZW0ucHJvY2Vzc193b3JrX2l0ZW0oc2VsZiwgcGF0Y2gpCiAK ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9l YXJseXdhcm5pbmdzeXN0ZW1fdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L3Rvb2wvY29tbWFuZHMvZWFybHl3YXJuaW5nc3lzdGVtX3VuaXR0ZXN0LnB5CmluZGV4IGYy MjAzNDcuLjM3YTYxYTEgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0ZW1fdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Vhcmx5d2FybmluZ3N5c3RlbV91 bml0dGVzdC5weQpAQCAtMzQsMzUgKzM0LDQ0IEBAIGZyb20gd2Via2l0cHkudG9vbC5jb21tYW5k cy5xdWV1ZXN0ZXN0IGltcG9ydCBRdWV1ZXNUZXN0CiAKIGNsYXNzIEVhcmx5V2FybmluZ1N5dGVt VGVzdChRdWV1ZXNUZXN0KToKICAgICBkZWYgdGVzdF9mYWlsZWRfYnVpbGRzKHNlbGYpOgotICAg ICAgICBld3MgPSBDaHJvbWl1bUVXUygpCisgICAgICAgIGV3cyA9IENocm9taXVtTGludXhFV1Mo KQogICAgICAgICBld3MuX2J1aWxkID0gbGFtYmRhIHBhdGNoLCBmaXJzdF9ydW49RmFsc2U6IEZh bHNlCiAgICAgICAgIGV3cy5fY2FuX2J1aWxkID0gbGFtYmRhOiBUcnVlCiAgICAgICAgIGV3cy5y ZXZpZXdfcGF0Y2goTW9jaygpKQogCiAgICAgZGVmIHRlc3RfY2hyb21pdW1fZXdzKHNlbGYpOgog ICAgICAgICBleHBlY3RlZF9zdGRlcnIgPSB7Ci0gICAgICAgICAgICAiYmVnaW5fd29ya19xdWV1 ZSIgOiAiQ0FVVElPTjogY2hyb21pdW0tZXdzIHdpbGwgZGlzY2FyZCBhbGwgbG9jYWwgY2hhbmdl cyBpbiBcIiVzXCJcblJ1bm5pbmcgV2ViS2l0IGNocm9taXVtLWV3cy5cbiIgJSBvcy5nZXRjd2Qo KSwKLSAgICAgICAgICAgICJoYW5kbGVfdW5leHBlY3RlZF9lcnJvciIgOiAiTW9jayBlcnJvciBt ZXNzYWdlXG4iLAorICAgICAgICAgICAgImJlZ2luX3dvcmtfcXVldWUiOgorICAgICAgICAgICAg ICAgICJDQVVUSU9OOiBjaHJvbWl1bS1ld3Mgd2lsbCBkaXNjYXJkIGFsbCBsb2NhbCBjaGFuZ2Vz ICIKKyAgICAgICAgICAgICAgICAiaW4gXCIlc1wiXG5SdW5uaW5nIFdlYktpdCBjaHJvbWl1bS1l d3MuXG4iICUgb3MuZ2V0Y3dkKCksCisgICAgICAgICAgICAiaGFuZGxlX3VuZXhwZWN0ZWRfZXJy b3IiOiAiTW9jayBlcnJvciBtZXNzYWdlXG4iLAogICAgICAgICB9Ci0gICAgICAgIHNlbGYuYXNz ZXJ0X3F1ZXVlX291dHB1dHMoQ2hyb21pdW1FV1MoKSwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVk X3N0ZGVycikKKyAgICAgICAgc2VsZi5hc3NlcnRfcXVldWVfb3V0cHV0cyhDaHJvbWl1bUxpbnV4 RVdTKCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXhwZWN0ZWRfc3RkZXJy PWV4cGVjdGVkX3N0ZGVycikKIAogICAgIGRlZiB0ZXN0X3F0X2V3cyhzZWxmKToKICAgICAgICAg ZXhwZWN0ZWRfc3RkZXJyID0gewotICAgICAgICAgICAgImJlZ2luX3dvcmtfcXVldWUiIDogIkNB VVRJT046IHF0LWV3cyB3aWxsIGRpc2NhcmQgYWxsIGxvY2FsIGNoYW5nZXMgaW4gXCIlc1wiXG5S dW5uaW5nIFdlYktpdCBxdC1ld3MuXG4iICUgb3MuZ2V0Y3dkKCksCi0gICAgICAgICAgICAiaGFu ZGxlX3VuZXhwZWN0ZWRfZXJyb3IiIDogIk1vY2sgZXJyb3IgbWVzc2FnZVxuIiwKKyAgICAgICAg ICAgICJiZWdpbl93b3JrX3F1ZXVlIjoKKyAgICAgICAgICAgICAgICAiQ0FVVElPTjogcXQtZXdz IHdpbGwgZGlzY2FyZCBhbGwgbG9jYWwgY2hhbmdlcyAiCisgICAgICAgICAgICAgICAgImluIFwi JXNcIlxuUnVubmluZyBXZWJLaXQgcXQtZXdzLlxuIiAlIG9zLmdldGN3ZCgpLAorICAgICAgICAg ICAgImhhbmRsZV91bmV4cGVjdGVkX2Vycm9yIjogIk1vY2sgZXJyb3IgbWVzc2FnZVxuIiwKICAg ICAgICAgfQogICAgICAgICBzZWxmLmFzc2VydF9xdWV1ZV9vdXRwdXRzKFF0RVdTKCksIGV4cGVj dGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCiAKICAgICBkZWYgdGVzdF9ndGtfZXdzKHNlbGYp OgogICAgICAgICBleHBlY3RlZF9zdGRlcnIgPSB7Ci0gICAgICAgICAgICAiYmVnaW5fd29ya19x dWV1ZSIgOiAiQ0FVVElPTjogZ3RrLWV3cyB3aWxsIGRpc2NhcmQgYWxsIGxvY2FsIGNoYW5nZXMg aW4gXCIlc1wiXG5SdW5uaW5nIFdlYktpdCBndGstZXdzLlxuIiAlIG9zLmdldGN3ZCgpLAotICAg ICAgICAgICAgImhhbmRsZV91bmV4cGVjdGVkX2Vycm9yIiA6ICJNb2NrIGVycm9yIG1lc3NhZ2Vc biIsCisgICAgICAgICAgICAiYmVnaW5fd29ya19xdWV1ZSI6CisgICAgICAgICAgICAgICAgIkNB VVRJT046IGd0ay1ld3Mgd2lsbCBkaXNjYXJkIGFsbCBsb2NhbCBjaGFuZ2VzICIKKyAgICAgICAg ICAgICAgICAiaW4gXCIlc1wiXG5SdW5uaW5nIFdlYktpdCBndGstZXdzLlxuIiAlIG9zLmdldGN3 ZCgpLAorICAgICAgICAgICAgImhhbmRsZV91bmV4cGVjdGVkX2Vycm9yIjogIk1vY2sgZXJyb3Ig bWVzc2FnZVxuIiwKICAgICAgICAgfQogICAgICAgICBzZWxmLmFzc2VydF9xdWV1ZV9vdXRwdXRz KEd0a0VXUygpLCBleHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJyKQogCiAgICAgZGVmIHRl c3RfbWFjX2V3cyhzZWxmKToKICAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gewotICAgICAgICAg ICAgImJlZ2luX3dvcmtfcXVldWUiIDogIkNBVVRJT046IG1hYy1ld3Mgd2lsbCBkaXNjYXJkIGFs bCBsb2NhbCBjaGFuZ2VzIGluIFwiJXNcIlxuUnVubmluZyBXZWJLaXQgbWFjLWV3cy5cbiIgJSBv cy5nZXRjd2QoKSwKLSAgICAgICAgICAgICJoYW5kbGVfdW5leHBlY3RlZF9lcnJvciIgOiAiTW9j ayBlcnJvciBtZXNzYWdlXG4iLAorICAgICAgICAgICAgImJlZ2luX3dvcmtfcXVldWUiOgorICAg ICAgICAgICAgICAgICJDQVVUSU9OOiBtYWMtZXdzIHdpbGwgZGlzY2FyZCBhbGwgbG9jYWwgY2hh bmdlcyAiCisgICAgICAgICAgICAgICAgImluIFwiJXNcIlxuUnVubmluZyBXZWJLaXQgbWFjLWV3 cy5cbiIgJSBvcy5nZXRjd2QoKSwKKyAgICAgICAgICAgICJoYW5kbGVfdW5leHBlY3RlZF9lcnJv ciI6ICJNb2NrIGVycm9yIG1lc3NhZ2VcbiIsCiAgICAgICAgIH0KICAgICAgICAgc2VsZi5hc3Nl cnRfcXVldWVfb3V0cHV0cyhNYWNFV1MoKSwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0ZGVy cikKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5k cy9zaGVyaWZmYm90LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1h bmRzL3NoZXJpZmZib3QucHkKaW5kZXggZTJlNmM4NC4uYWUwNjcwZiAxMDA2NDQKLS0tIGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3NoZXJpZmZib3QucHkKKysr IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3NoZXJpZmZib3Qu cHkKQEAgLTMwLDcgKzMwLDcgQEAgaW1wb3J0IG9zCiAKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5 c3RlbS5kZXByZWNhdGVkX2xvZ2dpbmcgaW1wb3J0IGxvZwogZnJvbSB3ZWJraXRweS5jb21tb24u Y2hlY2tvdXQuY2hhbmdlbG9nIGltcG9ydCB2aWV3X3NvdXJjZV91cmwKLWZyb20gd2Via2l0cHku Y29tbW9uLmNvbmZpZy5wb3J0cyBpbXBvcnQgV2ViS2l0UG9ydAorZnJvbSB3ZWJraXRweS5jb21t b24uY29uZmlnLnBvcnRzIGltcG9ydCBQb3J0CiBmcm9tIHdlYmtpdHB5LnRvb2wuYm90LnNoZXJp ZmZpcmNib3QgaW1wb3J0IFNoZXJpZmZJUkNCb3QKIGZyb20gd2Via2l0cHkudG9vbC5jb21tYW5k cy5xdWV1ZXMgaW1wb3J0IEFic3RyYWN0UXVldWUKIGZyb20gd2Via2l0cHkudG9vbC5ncmFtbWFy IGltcG9ydCBqb2luX3dpdGhfc2VwYXJhdG9ycwpAQCAtMzksNyArMzksOSBAQCBjbGFzcyBTaGVy aWZmQm90KEFic3RyYWN0UXVldWUpOgogICAgIG5hbWUgPSAic2hlcmlmZi1ib3QiCiAKICAgICBk ZWYgdXBkYXRlKHNlbGYpOgotICAgICAgICBzZWxmLnRvb2wuZXhlY3V0aXZlLnJ1bl9hbmRfdGhy b3dfaWZfZmFpbChXZWJLaXRQb3J0LnVwZGF0ZV93ZWJraXRfY29tbWFuZCgpLCBxdWlldD1UcnVl KQorICAgICAgICAjIEZJWE1FOiBVc2UgdGhlIHBvcnQgb2JqZWN0IG9uIHRoZSB0b29sIHdoZW4g dGhhdCBleGlzdHMuCisgICAgICAgIHNlbGYudG9vbC5leGVjdXRpdmUucnVuX2FuZF90aHJvd19p Zl9mYWlsKAorICAgICAgICAgICAgUG9ydCgpLnVwZGF0ZV93ZWJraXRfY29tbWFuZCgpLCBxdWll dD1UcnVlKQogCiAgICAgIyBBYnN0cmFjdFF1ZXVlIG1ldGhvZHMKIApkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL2Fic3RyYWN0c3RlcC5weSBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9hYnN0cmFjdHN0ZXAucHkKaW5k ZXggMWFkMzQzZC4uZDQzZDhmZiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS90b29sL3N0ZXBzL2Fic3RyYWN0c3RlcC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvc3RlcHMvYWJzdHJhY3RzdGVwLnB5CkBAIC0yNyw3ICsyNyw3IEBACiAj IE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuCiAKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5kZXByZWNhdGVkX2xv Z2dpbmcgaW1wb3J0IGxvZwotZnJvbSB3ZWJraXRweS5jb21tb24uY29uZmlnLnBvcnRzIGltcG9y dCBXZWJLaXRQb3J0Citmcm9tIHdlYmtpdHB5LmNvbW1vbi5jb25maWcucG9ydHMgaW1wb3J0IFBv cnQKIAogCiBjbGFzcyBBYnN0cmFjdFN0ZXAob2JqZWN0KToKQEAgLTM2LDE2ICszNiwxNiBAQCBj bGFzcyBBYnN0cmFjdFN0ZXAob2JqZWN0KToKICAgICAgICAgc2VsZi5fb3B0aW9ucyA9IG9wdGlv bnMKICAgICAgICAgc2VsZi5fcG9ydCA9IE5vbmUKIAotICAgIGRlZiBfcnVuX3NjcmlwdChzZWxm LCBzY3JpcHRfbmFtZSwgcXVpZXQ9RmFsc2UsIHBvcnQ9V2ViS2l0UG9ydCk6CisgICAgZGVmIF9y dW5fc2NyaXB0KHNlbGYsIHNjcmlwdF9uYW1lLCBxdWlldD1GYWxzZSk6CiAgICAgICAgIGxvZygi UnVubmluZyAlcyIgJSBzY3JpcHRfbmFtZSkKLSAgICAgICAgIyBGSVhNRTogVGhpcyBzaG91bGQg dXNlIHNlbGYucG9ydCgpCi0gICAgICAgIHNlbGYuX3Rvb2wuZXhlY3V0aXZlLnJ1bl9hbmRfdGhy b3dfaWZfZmFpbChwb3J0LnNjcmlwdF9wYXRoKHNjcmlwdF9uYW1lKSwgcXVpZXQpCisgICAgICAg IHNlbGYuX3Rvb2wuZXhlY3V0aXZlLnJ1bl9hbmRfdGhyb3dfaWZfZmFpbCgKKyAgICAgICAgICAg IHNlbGYucG9ydCgpLnNjcmlwdF9wYXRoKHNjcmlwdF9uYW1lKSwgcXVpZXQpCiAKICAgICAjIEZJ WE1FOiBUaGUgcG9ydCBzaG91bGQgbGl2ZSBvbiB0aGUgdG9vbC4KICAgICBkZWYgcG9ydChzZWxm KToKICAgICAgICAgaWYgc2VsZi5fcG9ydDoKICAgICAgICAgICAgIHJldHVybiBzZWxmLl9wb3J0 Ci0gICAgICAgIHNlbGYuX3BvcnQgPSBXZWJLaXRQb3J0LnBvcnQoc2VsZi5fb3B0aW9ucy5wb3J0 KQorICAgICAgICBzZWxmLl9wb3J0ID0gUG9ydC5wb3J0X2J5X25hbWUoc2VsZi5fb3B0aW9ucy5w b3J0KQogICAgICAgICByZXR1cm4gc2VsZi5fcG9ydAogCiAgICAgX3dlbGxfa25vd25fa2V5cyA9 IHsK 52318 2010-04-01 11:50:00 -0700 2010-04-01 18:35:11 -0700 Patch bug-36974-20100401114959.patch text/plain 26524 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA5ZDQ3NTNjLi42ZmU5Zjg3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjcgQEAKIDIwMTAtMDQt MDEgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgY3Itd2luLWV3cworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY5NzQKKworICAgICAgICBUaGlz IHBhdGNoIGFkZHMgYSBjci13aW4tZXdzLiAgSSBhbHNvIGNsZWFuZWQgdXAgb3VyIFBvcnQgY2xh c3Mgc28KKyAgICAgICAgd2UncmUgdXNpbmcgaW5zdGFuY2VzIGluc3RlYWQgb2YgY2xhc3Mgb2Jq ZWN0cy4gIE91ciBuZXcgc3R5bGUgY2hlY2tlcgorICAgICAgICBhbHNvIGZvcmNlZCBtZSB0byBj bGVhbiB1cCBhIHRvbiBvZiBzdHlsZSB2aW9sYXRpb25zLgorCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NvbmZpZy9wb3J0c191bml0dGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3Rvb2wvY29tbWFuZHMvZWFybHl3YXJuaW5nc3lzdGVtLnB5OgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0ZW1fdW5pdHRlc3Qu cHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3NoZXJpZmZib3Qu cHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3N0ZXBzZXF1ZW5j ZS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvYWJzdHJhY3RzdGVw LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9wcmVwYXJlY2hhbmdl bG9nLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9ydW50ZXN0cy5w eToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvdXBkYXRlLnB5OgorCisy MDEwLTA0LTAxICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKICAgICAgICAgVW5y ZXZpZXdlZC4KIAogICAgICAgICBUdXJucyBvdXQgdGhlIENocm9taXVtIFdpbmRvd3MgYm90cyBk b24ndCBoYXZlIHBkZXZlbnYgaW5zdGFsbGVkLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzLnB5CmluZGV4IDZkMzVhZmUuLjU3ZGJkZmQg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9w b3J0cy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcv cG9ydHMucHkKQEAgLTM2LDE1NyArMzYsMTIwIEBAIGZyb20gb3B0cGFyc2UgaW1wb3J0IG1ha2Vf b3B0aW9uCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBFeGVj dXRpdmUKIAogCi1jbGFzcyBXZWJLaXRQb3J0KG9iamVjdCk6Ci0KK2NsYXNzIFBvcnQob2JqZWN0 KToKICAgICAjIFdlIG1pZ2h0IG5lZWQgdG8gcGFzcyBzY20gaW50byB0aGlzIGZ1bmN0aW9uIGZv ciBzY20uY2hlY2tvdXRfcm9vdAogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBzY3JpcHRfcGF0 aChjbHMsIHNjcmlwdF9uYW1lKToKICAgICAgICAgcmV0dXJuIG9zLnBhdGguam9pbigiV2ViS2l0 VG9vbHMiLCAiU2NyaXB0cyIsIHNjcmlwdF9uYW1lKQogCi0gICAgQHN0YXRpY21ldGhvZAotICAg IGRlZiBwb3J0KHBvcnRfbmFtZSk6Ci0gICAgICAgIHBvcnRzID0gewotICAgICAgICAgICAgImNo cm9taXVtIjogQ2hyb21pdW1Qb3J0LAotICAgICAgICAgICAgImd0ayI6IEd0a1BvcnQsCi0gICAg ICAgICAgICAibWFjIjogTWFjUG9ydCwKLSAgICAgICAgICAgICJ3aW4iOiBXaW5Qb3J0LAotICAg ICAgICAgICAgInF0IjogUXRQb3J0LAotICAgICAgICB9Ci0gICAgICAgIGRlZmF1bHRfcG9ydCA9 IHsKLSAgICAgICAgICAgICJXaW5kb3dzIjogV2luUG9ydCwKLSAgICAgICAgICAgICJEYXJ3aW4i OiBNYWNQb3J0LAorICAgIF9wb3J0X2luZGV4ID0gTm9uZQorCisgICAgQGNsYXNzbWV0aG9kCisg ICAgZGVmIHBvcnRfYnlfbmFtZShjbHMsIG5hbWUpOgorICAgICAgICBwb3J0cyA9IFsKKyAgICAg ICAgICAgIENocm9taXVtTGludXhQb3J0LAorICAgICAgICAgICAgQ2hyb21pdW1XaW5kb3dzUG9y dCwKKyAgICAgICAgICAgIEd0a1BvcnQsCisgICAgICAgICAgICBNYWNQb3J0LAorICAgICAgICAg ICAgV2luUG9ydCwKKyAgICAgICAgICAgIFF0UG9ydCwKKyAgICAgICAgXQorICAgICAgICBpZiBu b3QgY2xzLl9wb3J0X2luZGV4OgorICAgICAgICAgICAgY2xzLl9wb3J0X2luZGV4ID0ge30KKyAg ICAgICAgICAgIGZvciBwb3J0X2NsYXNzIGluIHBvcnRzOgorICAgICAgICAgICAgICAgIGNscy5f cG9ydF9pbmRleFtwb3J0X2NsYXNzLm5hbWVdID0gcG9ydF9jbGFzcygpCisgICAgICAgIGRlZmF1 bHRfcG9ydF9ieV9wbGF0Zm9ybSA9IHsKKyAgICAgICAgICAgICJXaW5kb3dzIjogY2xzLl9wb3J0 X2luZGV4WyJ3aW4iXSwKKyAgICAgICAgICAgICJEYXJ3aW4iOiBjbHMuX3BvcnRfaW5kZXhbIm1h YyJdLAogICAgICAgICB9Ci0gICAgICAgICMgRG8gd2UgcmVhbGx5IG5lZWQgTWFjUG9ydCBhcyB0 aGUgdWx0aW1hdGUgZGVmYXVsdD8KLSAgICAgICAgcmV0dXJuIHBvcnRzLmdldChwb3J0X25hbWUs IGRlZmF1bHRfcG9ydC5nZXQocGxhdGZvcm0uc3lzdGVtKCksIE1hY1BvcnQpKQorICAgICAgICAj IERvIHdlIHJlYWxseSBuZWVkIG1hYyBhcyB0aGUgdWx0aW1hdGUgZGVmYXVsdD8KKyAgICAgICAg cmV0dXJuIGNscy5fcG9ydF9pbmRleC5nZXQobmFtZSwgZGVmYXVsdF9wb3J0X2J5X3BsYXRmb3Jt LmdldCgKKyAgICAgICAgICAgICAgICAgICBwbGF0Zm9ybS5zeXN0ZW0oKSwgY2xzLl9wb3J0X2lu ZGV4WyJtYWMiXSkpCiAKLSAgICBAc3RhdGljbWV0aG9kCi0gICAgZGVmIG1ha2VBcmdzKCk6Ci0g ICAgICAgIGFyZ3MgPSAnLS1tYWtlYXJncz0iLWolcyInICUgRXhlY3V0aXZlLmNwdV9jb3VudCgp Ci0gICAgICAgIGlmIG9zLmVudmlyb24uaGFzX2tleSgnTUFLRUZMQUdTJyk6Ci0gICAgICAgICAg ICBhcmdzID0gJy0tbWFrZWFyZ3M9IiVzIicgJSBvcy5lbnZpcm9uWydNQUtFRkxBR1MnXQotICAg ICAgICByZXR1cm4gYXJncworICAgIGRlZiBmbGFnKHNlbGYpOgorICAgICAgICByZXR1cm4gIi0t cG9ydD0lcyIgJSBzZWxmLm5hbWUKIAotICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBuYW1lKGNs cyk6Ci0gICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IoInN1YmNsYXNzZXMgbXVzdCBp bXBsZW1lbnQiKQorICAgIGRlZiB1cGRhdGVfd2Via2l0X2NvbW1hbmQoc2VsZik6CisgICAgICAg IHJldHVybiBbc2VsZi5zY3JpcHRfcGF0aCgidXBkYXRlLXdlYmtpdCIpXQogCi0gICAgQGNsYXNz bWV0aG9kCi0gICAgZGVmIGZsYWcoY2xzKToKLSAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRF cnJvcigic3ViY2xhc3NlcyBtdXN0IGltcGxlbWVudCIpCi0KLSAgICBAY2xhc3NtZXRob2QKLSAg ICBkZWYgdXBkYXRlX3dlYmtpdF9jb21tYW5kKGNscyk6Ci0gICAgICAgIHJldHVybiBbY2xzLnNj cmlwdF9wYXRoKCJ1cGRhdGUtd2Via2l0IildCi0KLSAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYg YnVpbGRfd2Via2l0X2NvbW1hbmQoY2xzLCBidWlsZF9zdHlsZT1Ob25lKToKLSAgICAgICAgY29t bWFuZCA9IFtjbHMuc2NyaXB0X3BhdGgoImJ1aWxkLXdlYmtpdCIpXQorICAgIGRlZiBidWlsZF93 ZWJraXRfY29tbWFuZChzZWxmLCBidWlsZF9zdHlsZT1Ob25lKToKKyAgICAgICAgY29tbWFuZCA9 IFtzZWxmLnNjcmlwdF9wYXRoKCJidWlsZC13ZWJraXQiKV0KICAgICAgICAgaWYgYnVpbGRfc3R5 bGUgPT0gImRlYnVnIjoKICAgICAgICAgICAgIGNvbW1hbmQuYXBwZW5kKCItLWRlYnVnIikKICAg ICAgICAgaWYgYnVpbGRfc3R5bGUgPT0gInJlbGVhc2UiOgogICAgICAgICAgICAgY29tbWFuZC5h cHBlbmQoIi0tcmVsZWFzZSIpCiAgICAgICAgIHJldHVybiBjb21tYW5kCiAKLSAgICBAY2xhc3Nt ZXRob2QKLSAgICBkZWYgcnVuX2phdmFzY3JpcHRjb3JlX3Rlc3RzX2NvbW1hbmQoY2xzKToKLSAg ICAgICAgcmV0dXJuIFtjbHMuc2NyaXB0X3BhdGgoInJ1bi1qYXZhc2NyaXB0Y29yZS10ZXN0cyIp XQorICAgIGRlZiBydW5famF2YXNjcmlwdGNvcmVfdGVzdHNfY29tbWFuZChzZWxmKToKKyAgICAg ICAgcmV0dXJuIFtzZWxmLnNjcmlwdF9wYXRoKCJydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMiKV0K IAotICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBydW5fd2Via2l0X3Rlc3RzX2NvbW1hbmQoY2xz KToKLSAgICAgICAgcmV0dXJuIFtjbHMuc2NyaXB0X3BhdGgoInJ1bi13ZWJraXQtdGVzdHMiKV0K KyAgICBkZWYgcnVuX3dlYmtpdF90ZXN0c19jb21tYW5kKHNlbGYpOgorICAgICAgICByZXR1cm4g W3NlbGYuc2NyaXB0X3BhdGgoInJ1bi13ZWJraXQtdGVzdHMiKV0KIAotICAgIEBjbGFzc21ldGhv ZAotICAgIGRlZiBydW5fcHl0aG9uX3VuaXR0ZXN0c19jb21tYW5kKGNscyk6Ci0gICAgICAgIHJl dHVybiBbY2xzLnNjcmlwdF9wYXRoKCJ0ZXN0LXdlYmtpdHB5IildCisgICAgZGVmIHJ1bl9weXRo b25fdW5pdHRlc3RzX2NvbW1hbmQoc2VsZik6CisgICAgICAgIHJldHVybiBbc2VsZi5zY3JpcHRf cGF0aCgidGVzdC13ZWJraXRweSIpXQogCiAgICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIHJ1bl9w ZXJsX3VuaXR0ZXN0c19jb21tYW5kKGNscyk6Ci0gICAgICAgIHJldHVybiBbY2xzLnNjcmlwdF9w YXRoKCJ0ZXN0LXdlYmtpdHBlcmwiKV0KKyAgICBkZWYgcnVuX3BlcmxfdW5pdHRlc3RzX2NvbW1h bmQoc2VsZik6CisgICAgICAgIHJldHVybiBbc2VsZi5zY3JpcHRfcGF0aCgidGVzdC13ZWJraXRw ZXJsIildCiAKIAotY2xhc3MgTWFjUG9ydChXZWJLaXRQb3J0KToKK2NsYXNzIE1hY1BvcnQoUG9y dCk6CisgICAgbmFtZSA9ICJtYWMiCiAKLSAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgbmFtZShj bHMpOgotICAgICAgICByZXR1cm4gIk1hYyIKLQotICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBm bGFnKGNscyk6Ci0gICAgICAgIHJldHVybiAiLS1wb3J0PW1hYyIKIAotCi1jbGFzcyBXaW5Qb3J0 KFdlYktpdFBvcnQpOgotCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIG5hbWUoY2xzKToKLSAg ICAgICAgcmV0dXJuICJXaW4iCi0KLSAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgZmxhZyhjbHMp OgotICAgICAgICAjIEZJWE1FOiBUaGlzIGlzIGxhbWUuICBXZSBzaG91bGQgYXV0b2dlbmVyYXRl IHRoaXMgZnJvbSBhIGNvZGVuYW1lIG9yIHNvbWV0aGluZy4KLSAgICAgICAgcmV0dXJuICItLXBv cnQ9d2luIgorY2xhc3MgV2luUG9ydChQb3J0KToKKyAgICBuYW1lID0gIndpbiIKIAogCi1jbGFz cyBHdGtQb3J0KFdlYktpdFBvcnQpOgorY2xhc3MgQXJndW1lbnRQb3J0KFBvcnQpOgorICAgIGRl ZiBidWlsZF93ZWJraXRfY29tbWFuZChzZWxmLCBidWlsZF9zdHlsZT1Ob25lKToKKyAgICAgICAg Y29tbWFuZCA9IFBvcnQuYnVpbGRfd2Via2l0X2NvbW1hbmQoc2VsZiwgYnVpbGRfc3R5bGU9YnVp bGRfc3R5bGUpCisgICAgICAgIGNvbW1hbmQuYXBwZW5kKHNlbGYuY29tbWFuZF9saW5lX2FyZ3Vt ZW50KQorICAgICAgICByZXR1cm4gY29tbWFuZAogCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVm IG5hbWUoY2xzKToKLSAgICAgICAgcmV0dXJuICJHdGsiCisgICAgZGVmIHJ1bl93ZWJraXRfdGVz dHNfY29tbWFuZChzZWxmKToKKyAgICAgICAgY29tbWFuZCA9IFBvcnQucnVuX3dlYmtpdF90ZXN0 c19jb21tYW5kKHNlbGYpCisgICAgICAgIGNvbW1hbmQuYXBwZW5kKHNlbGYuY29tbWFuZF9saW5l X2FyZ3VtZW50KQorICAgICAgICByZXR1cm4gY29tbWFuZAogCi0gICAgQGNsYXNzbWV0aG9kCi0g ICAgZGVmIGZsYWcoY2xzKToKLSAgICAgICAgcmV0dXJuICItLXBvcnQ9Z3RrIgogCi0gICAgQGNs YXNzbWV0aG9kCi0gICAgZGVmIGJ1aWxkX3dlYmtpdF9jb21tYW5kKGNscywgYnVpbGRfc3R5bGU9 Tm9uZSk6Ci0gICAgICAgIGNvbW1hbmQgPSBXZWJLaXRQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5k KGJ1aWxkX3N0eWxlPWJ1aWxkX3N0eWxlKQotICAgICAgICBjb21tYW5kLmFwcGVuZCgiLS1ndGsi KQotICAgICAgICBjb21tYW5kLmFwcGVuZChXZWJLaXRQb3J0Lm1ha2VBcmdzKCkpCi0gICAgICAg IHJldHVybiBjb21tYW5kCitjbGFzcyBDaHJvbWl1bVBvcnQoQXJndW1lbnRQb3J0KToKKyAgICBj b21tYW5kX2xpbmVfYXJndW1lbnQgPSAiLS1jaHJvbWl1bSIKIAotICAgIEBjbGFzc21ldGhvZAot ICAgIGRlZiBydW5fd2Via2l0X3Rlc3RzX2NvbW1hbmQoY2xzKToKLSAgICAgICAgY29tbWFuZCA9 IFdlYktpdFBvcnQucnVuX3dlYmtpdF90ZXN0c19jb21tYW5kKCkKLSAgICAgICAgY29tbWFuZC5h cHBlbmQoIi0tZ3RrIikKKyAgICBkZWYgdXBkYXRlX3dlYmtpdF9jb21tYW5kKHNlbGYpOgorICAg ICAgICBjb21tYW5kID0gQXJndW1lbnRQb3J0LnVwZGF0ZV93ZWJraXRfY29tbWFuZChzZWxmKQor ICAgICAgICBjb21tYW5kLmFwcGVuZChzZWxmLmNvbW1hbmRfbGluZV9hcmd1bWVudCkKICAgICAg ICAgcmV0dXJuIGNvbW1hbmQKIAogCi1jbGFzcyBRdFBvcnQoV2ViS2l0UG9ydCk6CitjbGFzcyBD aHJvbWl1bUxpbnV4UG9ydChDaHJvbWl1bVBvcnQpOgorICAgIG5hbWUgPSAiY3ItbGludXgiCiAK LSAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgbmFtZShjbHMpOgotICAgICAgICByZXR1cm4gIlF0 IgogCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIGZsYWcoY2xzKToKLSAgICAgICAgcmV0dXJu ICItLXBvcnQ9cXQiCitjbGFzcyBDaHJvbWl1bVdpbmRvd3NQb3J0KENocm9taXVtUG9ydCk6Cisg ICAgbmFtZSA9ICJjci13aW4iCiAKLSAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgYnVpbGRfd2Vi a2l0X2NvbW1hbmQoY2xzLCBidWlsZF9zdHlsZT1Ob25lKToKLSAgICAgICAgY29tbWFuZCA9IFdl YktpdFBvcnQuYnVpbGRfd2Via2l0X2NvbW1hbmQoYnVpbGRfc3R5bGU9YnVpbGRfc3R5bGUpCi0g ICAgICAgIGNvbW1hbmQuYXBwZW5kKCItLXF0IikKLSAgICAgICAgY29tbWFuZC5hcHBlbmQoV2Vi S2l0UG9ydC5tYWtlQXJncygpKQotICAgICAgICByZXR1cm4gY29tbWFuZAogCitjbGFzcyBNYWtl QXJnc1BvcnQoQXJndW1lbnRQb3J0KToKKyAgICBkZWYgbWFrZV9hcmdzKHNlbGYpOgorICAgICAg ICBhcmdzID0gJy0tbWFrZWFyZ3M9Ii1qJXMiJyAlIEV4ZWN1dGl2ZS5jcHVfY291bnQoKQorICAg ICAgICBpZiBvcy5lbnZpcm9uLmdldCgnTUFLRUZMQUdTJyk6CisgICAgICAgICAgICBhcmdzID0g Jy0tbWFrZWFyZ3M9IiVzIicgJSBvcy5lbnZpcm9uWydNQUtFRkxBR1MnXQorICAgICAgICByZXR1 cm4gYXJncwogCi1jbGFzcyBDaHJvbWl1bVBvcnQoV2ViS2l0UG9ydCk6CisgICAgZGVmIGJ1aWxk X3dlYmtpdF9jb21tYW5kKHNlbGYsIGJ1aWxkX3N0eWxlPU5vbmUpOgorICAgICAgICBjb21tYW5k ID0gQXJndW1lbnRQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKHNlbGYsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYnVpbGRfc3R5bGU9YnVpbGRf c3R5bGUpCisgICAgICAgIGNvbW1hbmQuYXBwZW5kKHNlbGYubWFrZV9hcmdzKCkpCisgICAgICAg IHJldHVybiBjb21tYW5kCiAKLSAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgbmFtZShjbHMpOgot ICAgICAgICByZXR1cm4gIkNocm9taXVtIgogCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIGZs YWcoY2xzKToKLSAgICAgICAgcmV0dXJuICItLXBvcnQ9Y2hyb21pdW0iCitjbGFzcyBHdGtQb3J0 KE1ha2VBcmdzUG9ydCk6CisgICAgbmFtZSA9ICJndGsiCisgICAgY29tbWFuZF9saW5lX2FyZ3Vt ZW50ID0gIi0tZ3RrIgogCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIHVwZGF0ZV93ZWJraXRf Y29tbWFuZChjbHMpOgotICAgICAgICBjb21tYW5kID0gV2ViS2l0UG9ydC51cGRhdGVfd2Via2l0 X2NvbW1hbmQoKQotICAgICAgICBjb21tYW5kLmFwcGVuZCgiLS1jaHJvbWl1bSIpCi0gICAgICAg IHJldHVybiBjb21tYW5kCiAKLSAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgYnVpbGRfd2Via2l0 X2NvbW1hbmQoY2xzLCBidWlsZF9zdHlsZT1Ob25lKToKLSAgICAgICAgY29tbWFuZCA9IFdlYktp dFBvcnQuYnVpbGRfd2Via2l0X2NvbW1hbmQoYnVpbGRfc3R5bGU9YnVpbGRfc3R5bGUpCi0gICAg ICAgIGNvbW1hbmQuYXBwZW5kKCItLWNocm9taXVtIikKLSAgICAgICAgcmV0dXJuIGNvbW1hbmQK K2NsYXNzIFF0UG9ydChNYWtlQXJnc1BvcnQpOgorICAgIG5hbWUgPSAicXQiCisgICAgY29tbWFu ZF9saW5lX2FyZ3VtZW50ID0gIi0tcXQiCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHNfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHNfdW5pdHRlc3QucHkKaW5kZXggOTI5 YTQ4MC4uNTc5YTliMCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vY29uZmlnL3BvcnRzX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0c191bml0dGVzdC5weQpAQCAtMjksNDEgKzI5LDcx IEBACiAKIGltcG9ydCB1bml0dGVzdAogCi1mcm9tIHdlYmtpdHB5LmNvbW1vbi5jb25maWcucG9y dHMgaW1wb3J0IFdlYktpdFBvcnQsIE1hY1BvcnQsIEd0a1BvcnQsIFF0UG9ydCwgQ2hyb21pdW1Q b3J0Citmcm9tIHdlYmtpdHB5LmNvbW1vbi5jb25maWcucG9ydHMgaW1wb3J0ICoKIGZyb20gd2Vi a2l0cHkuY29tbW9uLnN5c3RlbS5leGVjdXRpdmUgaW1wb3J0IEV4ZWN1dGl2ZQogCiAKLWNsYXNz IFdlYktpdFBvcnRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKK2NsYXNzIFBvcnRUZXN0KHVuaXR0 ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVzdF9tYWNfcG9ydChzZWxmKToKLSAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbHMoTWFjUG9ydC5uYW1lKCksICJNYWMiKQotICAgICAgICBzZWxmLmFzc2Vy dEVxdWFscyhNYWNQb3J0LmZsYWcoKSwgIi0tcG9ydD1tYWMiKQotICAgICAgICBzZWxmLmFzc2Vy dEVxdWFscyhNYWNQb3J0LnJ1bl93ZWJraXRfdGVzdHNfY29tbWFuZCgpLCBbV2ViS2l0UG9ydC5z Y3JpcHRfcGF0aCgicnVuLXdlYmtpdC10ZXN0cyIpXSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVh bHMoTWFjUG9ydC5idWlsZF93ZWJraXRfY29tbWFuZCgpLCBbV2ViS2l0UG9ydC5zY3JpcHRfcGF0 aCgiYnVpbGQtd2Via2l0IildKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhNYWNQb3J0LmJ1 aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPSJkZWJ1ZyIpLCBbV2ViS2l0UG9ydC5zY3Jp cHRfcGF0aCgiYnVpbGQtd2Via2l0IiksICItLWRlYnVnIl0pCi0gICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWxzKE1hY1BvcnQuYnVpbGRfd2Via2l0X2NvbW1hbmQoYnVpbGRfc3R5bGU9InJlbGVhc2Ui KSwgW1dlYktpdFBvcnQuc2NyaXB0X3BhdGgoImJ1aWxkLXdlYmtpdCIpLCAiLS1yZWxlYXNlIl0p CisgICAgICAgIHBvcnQgPSBNYWNQb3J0KCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9y dC5uYW1lLCAibWFjIikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5mbGFnKCksICIt LXBvcnQ9bWFjIikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5ydW5fd2Via2l0X3Rl c3RzX2NvbW1hbmQoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICBbUG9ydCgpLnNjcmlwdF9w YXRoKCJydW4td2Via2l0LXRlc3RzIildKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0 LmJ1aWxkX3dlYmtpdF9jb21tYW5kKCksCisgICAgICAgICAgICAgICAgICAgICAgICAgIFtQb3J0 KCkuc2NyaXB0X3BhdGgoImJ1aWxkLXdlYmtpdCIpXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVh bHMocG9ydC5idWlsZF93ZWJraXRfY29tbWFuZChidWlsZF9zdHlsZT0iZGVidWciKSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgW1BvcnQoKS5zY3JpcHRfcGF0aCgiYnVpbGQtd2Via2l0Iiks ICItLWRlYnVnIl0pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQuYnVpbGRfd2Via2l0 X2NvbW1hbmQoYnVpbGRfc3R5bGU9InJlbGVhc2UiKSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgW1BvcnQoKS5zY3JpcHRfcGF0aCgiYnVpbGQtd2Via2l0IiksICItLXJlbGVhc2UiXSkKIAog ICAgIGRlZiB0ZXN0X2d0a19wb3J0KHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhH dGtQb3J0Lm5hbWUoKSwgIkd0ayIpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKEd0a1BvcnQu ZmxhZygpLCAiLS1wb3J0PWd0ayIpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKEd0a1BvcnQu cnVuX3dlYmtpdF90ZXN0c19jb21tYW5kKCksIFtXZWJLaXRQb3J0LnNjcmlwdF9wYXRoKCJydW4t d2Via2l0LXRlc3RzIiksICItLWd0ayJdKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhHdGtQ b3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKCksIFtXZWJLaXRQb3J0LnNjcmlwdF9wYXRoKCJidWls ZC13ZWJraXQiKSwgIi0tZ3RrIiwgV2ViS2l0UG9ydC5tYWtlQXJncygpXSkKLSAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbHMoR3RrUG9ydC5idWlsZF93ZWJraXRfY29tbWFuZChidWlsZF9zdHlsZT0i ZGVidWciKSwgW1dlYktpdFBvcnQuc2NyaXB0X3BhdGgoImJ1aWxkLXdlYmtpdCIpLCAiLS1kZWJ1 ZyIsICItLWd0ayIsIFdlYktpdFBvcnQubWFrZUFyZ3MoKV0pCisgICAgICAgIHBvcnQgPSBHdGtQ b3J0KCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5uYW1lLCAiZ3RrIikKKyAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5mbGFnKCksICItLXBvcnQ9Z3RrIikKKyAgICAgICAg c2VsZi5hc3NlcnRFcXVhbHMocG9ydC5ydW5fd2Via2l0X3Rlc3RzX2NvbW1hbmQoKSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgW1BvcnQoKS5zY3JpcHRfcGF0aCgicnVuLXdlYmtpdC10ZXN0 cyIpLCAiLS1ndGsiXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5idWlsZF93ZWJr aXRfY29tbWFuZCgpLAorICAgICAgICAgICAgICAgICAgICAgICAgIFtQb3J0KCkuc2NyaXB0X3Bh dGgoImJ1aWxkLXdlYmtpdCIpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAiLS1ndGsiLAor ICAgICAgICAgICAgICAgICAgICAgICAgICBNYWtlQXJnc1BvcnQoKS5tYWtlX2FyZ3MoKV0pCisg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQuYnVpbGRfd2Via2l0X2NvbW1hbmQoYnVpbGRf c3R5bGU9ImRlYnVnIiksCisgICAgICAgICAgICAgICAgICAgICAgICAgIFtQb3J0KCkuc2NyaXB0 X3BhdGgoImJ1aWxkLXdlYmtpdCIpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIi0tZGVi dWciLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIi0tZ3RrIiwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgIE1ha2VBcmdzUG9ydCgpLm1ha2VfYXJncygpXSkKIAogICAgIGRlZiB0ZXN0 X3F0X3BvcnQoc2VsZik6Ci0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKFF0UG9ydC5uYW1lKCks ICJRdCIpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKFF0UG9ydC5mbGFnKCksICItLXBvcnQ9 cXQiKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhRdFBvcnQucnVuX3dlYmtpdF90ZXN0c19j b21tYW5kKCksIFtXZWJLaXRQb3J0LnNjcmlwdF9wYXRoKCJydW4td2Via2l0LXRlc3RzIildKQot ICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhRdFBvcnQuYnVpbGRfd2Via2l0X2NvbW1hbmQoKSwg W1dlYktpdFBvcnQuc2NyaXB0X3BhdGgoImJ1aWxkLXdlYmtpdCIpLCAiLS1xdCIsIFdlYktpdFBv cnQubWFrZUFyZ3MoKV0pCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKFF0UG9ydC5idWlsZF93 ZWJraXRfY29tbWFuZChidWlsZF9zdHlsZT0iZGVidWciKSwgW1dlYktpdFBvcnQuc2NyaXB0X3Bh dGgoImJ1aWxkLXdlYmtpdCIpLCAiLS1kZWJ1ZyIsICItLXF0IiwgV2ViS2l0UG9ydC5tYWtlQXJn cygpXSkKKyAgICAgICAgcG9ydCA9IFF0UG9ydCgpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxz KHBvcnQubmFtZSwgInF0IikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5mbGFnKCks ICItLXBvcnQ9cXQiKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0LnJ1bl93ZWJraXRf dGVzdHNfY29tbWFuZCgpLAorICAgICAgICAgICAgICAgICAgICAgICAgICBbUG9ydCgpLnNjcmlw dF9wYXRoKCJydW4td2Via2l0LXRlc3RzIiksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAi LS1xdCJdKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0LmJ1aWxkX3dlYmtpdF9jb21t YW5kKCksCisgICAgICAgICAgICAgICAgICAgICAgICAgIFtQb3J0KCkuc2NyaXB0X3BhdGgoImJ1 aWxkLXdlYmtpdCIpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIi0tcXQiLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgTWFrZUFyZ3NQb3J0KCkubWFrZV9hcmdzKCldKQorICAgICAg ICBzZWxmLmFzc2VydEVxdWFscyhwb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxl PSJkZWJ1ZyIpLAorICAgICAgICAgICAgICAgICAgICAgICAgICBbUG9ydCgpLnNjcmlwdF9wYXRo KCJidWlsZC13ZWJraXQiKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICItLWRlYnVnIiwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICItLXF0IiwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgIE1ha2VBcmdzUG9ydCgpLm1ha2VfYXJncygpXSkKIAotICAgIGRlZiB0ZXN0X2Nocm9t aXVtX3BvcnQoc2VsZik6Ci0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKENocm9taXVtUG9ydC5u YW1lKCksICJDaHJvbWl1bSIpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKENocm9taXVtUG9y dC5mbGFnKCksICItLXBvcnQ9Y2hyb21pdW0iKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhD aHJvbWl1bVBvcnQucnVuX3dlYmtpdF90ZXN0c19jb21tYW5kKCksIFtXZWJLaXRQb3J0LnNjcmlw dF9wYXRoKCJydW4td2Via2l0LXRlc3RzIildKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhD aHJvbWl1bVBvcnQuYnVpbGRfd2Via2l0X2NvbW1hbmQoKSwgW1dlYktpdFBvcnQuc2NyaXB0X3Bh dGgoImJ1aWxkLXdlYmtpdCIpLCAiLS1jaHJvbWl1bSJdKQotICAgICAgICBzZWxmLmFzc2VydEVx dWFscyhDaHJvbWl1bVBvcnQuYnVpbGRfd2Via2l0X2NvbW1hbmQoYnVpbGRfc3R5bGU9ImRlYnVn IiksIFtXZWJLaXRQb3J0LnNjcmlwdF9wYXRoKCJidWlsZC13ZWJraXQiKSwgIi0tZGVidWciLCAi LS1jaHJvbWl1bSJdKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhDaHJvbWl1bVBvcnQudXBk YXRlX3dlYmtpdF9jb21tYW5kKCksIFtXZWJLaXRQb3J0LnNjcmlwdF9wYXRoKCJ1cGRhdGUtd2Vi a2l0IiksICItLWNocm9taXVtIl0pCi0KLQotaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKLSAg ICB1bml0dGVzdC5tYWluKCkKKyAgICBkZWYgdGVzdF9jaHJvbWl1bV9saW5peF9wb3J0KHNlbGYp OgorICAgICAgICBwb3J0ID0gQ2hyb21pdW1MaW51eFBvcnQoKQorICAgICAgICBzZWxmLmFzc2Vy dEVxdWFscyhwb3J0Lm5hbWUsICJjci1saW51eCIpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxz KHBvcnQuZmxhZygpLCAiLS1wb3J0PWNyLWxpbnV4IikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVh bHMocG9ydC5ydW5fd2Via2l0X3Rlc3RzX2NvbW1hbmQoKSwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgW1BvcnQoKS5zY3JpcHRfcGF0aCgicnVuLXdlYmtpdC10ZXN0cyIpLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgIi0tY2hyb21pdW0iXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVh bHMocG9ydC5idWlsZF93ZWJraXRfY29tbWFuZCgpLAorICAgICAgICAgICAgICAgICAgICAgICAg ICBbUG9ydCgpLnNjcmlwdF9wYXRoKCJidWlsZC13ZWJraXQiKSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgIi0tY2hyb21pdW0iXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5i dWlsZF93ZWJraXRfY29tbWFuZChidWlsZF9zdHlsZT0iZGVidWciKSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgW1BvcnQoKS5zY3JpcHRfcGF0aCgiYnVpbGQtd2Via2l0IiksCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAiLS1kZWJ1ZyIsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAiLS1jaHJvbWl1bSJdKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0LnVwZGF0ZV93 ZWJraXRfY29tbWFuZCgpLAorICAgICAgICAgICAgICAgICAgICAgICAgICBbUG9ydCgpLnNjcmlw dF9wYXRoKCJ1cGRhdGUtd2Via2l0IiksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAiLS1j aHJvbWl1bSJdKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L2NvbW1hbmRzL2Vhcmx5d2FybmluZ3N5c3RlbS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0ZW0ucHkKaW5kZXggYTU3OTk0Ny4u ZGE4ZWU1NyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2Nv bW1hbmRzL2Vhcmx5d2FybmluZ3N5c3RlbS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L3Rvb2wvY29tbWFuZHMvZWFybHl3YXJuaW5nc3lzdGVtLnB5CkBAIC0zMCw3ICszMCw3 IEBAIGZyb20gU3RyaW5nSU8gaW1wb3J0IFN0cmluZ0lPCiAKIGZyb20gd2Via2l0cHkudG9vbC5j b21tYW5kcy5xdWV1ZXMgaW1wb3J0IEFic3RyYWN0UmV2aWV3UXVldWUKIGZyb20gd2Via2l0cHku Y29tbW9uLmNvbmZpZy5jb21taXR0ZXJzIGltcG9ydCBDb21taXR0ZXJMaXN0Ci1mcm9tIHdlYmtp dHB5LmNvbW1vbi5jb25maWcucG9ydHMgaW1wb3J0IFdlYktpdFBvcnQKK2Zyb20gd2Via2l0cHku Y29tbW9uLmNvbmZpZy5wb3J0cyBpbXBvcnQgUG9ydAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lz dGVtLmV4ZWN1dGl2ZSBpbXBvcnQgU2NyaXB0RXJyb3IKIGZyb20gd2Via2l0cHkudG9vbC5ib3Qu cXVldWVlbmdpbmUgaW1wb3J0IFF1ZXVlRW5naW5lCiAKQEAgLTQwLDcgKzQwLDcgQEAgY2xhc3Mg QWJzdHJhY3RFYXJseVdhcm5pbmdTeXN0ZW0oQWJzdHJhY3RSZXZpZXdRdWV1ZSk6CiAKICAgICBk ZWYgX19pbml0X18oc2VsZik6CiAgICAgICAgIEFic3RyYWN0UmV2aWV3UXVldWUuX19pbml0X18o c2VsZikKLSAgICAgICAgc2VsZi5wb3J0ID0gV2ViS2l0UG9ydC5wb3J0KHNlbGYucG9ydF9uYW1l KQorICAgICAgICBzZWxmLnBvcnQgPSBQb3J0LnBvcnRfYnlfbmFtZShzZWxmLnBvcnRfbmFtZSkK IAogICAgIGRlZiBzaG91bGRfcHJvY2VlZF93aXRoX3dvcmtfaXRlbShzZWxmLCBwYXRjaCk6CiAg ICAgICAgIHJldHVybiBUcnVlCkBAIC03MCw3ICs3MCw3IEBAIGNsYXNzIEFic3RyYWN0RWFybHlX YXJuaW5nU3lzdGVtKEFic3RyYWN0UmV2aWV3UXVldWUpOgogICAgICAgICAgICAgICAgICItLW5v bi1pbnRlcmFjdGl2ZSIsCiAgICAgICAgICAgICAgICAgcGF0Y2guaWQoKV0KICAgICAgICAgICAg IGlmIG5vdCBmaXJzdF9ydW46Ci0gICAgICAgICAgICAgICAgIyBTZWUgY29tbWl0LXF1ZXVlIGZv ciBhbiBleHBsYW5hdGlvbiBvZiB3aGF0IHdlJ3JlIGRvaW5nIGhlcmUuCisgICAgICAgICAgICAg ICAgIyBTZWUgY29tbWl0LXF1ZXVlIGZvciBhbiBleHBsYW5hdGlvbiBvZiB3aGF0IHdlJ3JlIGRv aW5nLgogICAgICAgICAgICAgICAgIGFyZ3MuYXBwZW5kKCItLW5vLXVwZGF0ZSIpCiAgICAgICAg ICAgICAgICAgYXJncy5hcHBlbmQoIi0tcGFyZW50LWNvbW1hbmQ9JXMiICUgc2VsZi5uYW1lKQog ICAgICAgICAgICAgc2VsZi5ydW5fd2Via2l0X3BhdGNoKGFyZ3MpCkBAIC05MCwxMiArOTAsMTgg QEAgY2xhc3MgQWJzdHJhY3RFYXJseVdhcm5pbmdTeXN0ZW0oQWJzdHJhY3RSZXZpZXdRdWV1ZSk6 CiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIGhhbmRsZV9zY3JpcHRfZXJyb3IoY2xzLCB0b29s LCBzdGF0ZSwgc2NyaXB0X2Vycm9yKToKICAgICAgICAgaXNfc3ZuX2FwcGx5ID0gc2NyaXB0X2Vy cm9yLmNvbW1hbmRfbmFtZSgpID09ICJzdm4tYXBwbHkiCi0gICAgICAgIHN0YXR1c19pZCA9IGNs cy5fdXBkYXRlX3N0YXR1c19mb3Jfc2NyaXB0X2Vycm9yKHRvb2wsIHN0YXRlLCBzY3JpcHRfZXJy b3IsIGlzX2Vycm9yPWlzX3N2bl9hcHBseSkKKyAgICAgICAgc3RhdHVzX2lkID0gY2xzLl91cGRh dGVfc3RhdHVzX2Zvcl9zY3JpcHRfZXJyb3IodG9vbCwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RhdGUsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNjcmlwdF9lcnJvciwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaXNf ZXJyb3I9aXNfc3ZuX2FwcGx5KQogICAgICAgICBpZiBpc19zdm5fYXBwbHk6CiAgICAgICAgICAg ICBRdWV1ZUVuZ2luZS5leGl0X2FmdGVyX2hhbmRsZWRfZXJyb3Ioc2NyaXB0X2Vycm9yKQogICAg ICAgICByZXN1bHRzX2xpbmsgPSB0b29sLnN0YXR1c19zZXJ2ZXIucmVzdWx0c191cmxfZm9yX3N0 YXR1cyhzdGF0dXNfaWQpCi0gICAgICAgIG1lc3NhZ2UgPSAiQXR0YWNobWVudCAlcyBkaWQgbm90 IGJ1aWxkIG9uICVzOlxuQnVpbGQgb3V0cHV0OiAlcyIgJSAoc3RhdGVbInBhdGNoIl0uaWQoKSwg Y2xzLnBvcnRfbmFtZSwgcmVzdWx0c19saW5rKQotICAgICAgICB0b29sLmJ1Z3MucG9zdF9jb21t ZW50X3RvX2J1ZyhzdGF0ZVsicGF0Y2giXS5idWdfaWQoKSwgbWVzc2FnZSwgY2M9Y2xzLndhdGNo ZXJzKQorICAgICAgICBtZXNzYWdlID0gIkF0dGFjaG1lbnQgJXMgZGlkIG5vdCBidWlsZCBvbiAl czpcbkJ1aWxkIG91dHB1dDogJXMiICUgKAorICAgICAgICAgICAgICAgIHN0YXRlWyJwYXRjaCJd LmlkKCksIGNscy5wb3J0X25hbWUsIHJlc3VsdHNfbGluaykKKyAgICAgICAgdG9vbC5idWdzLnBv c3RfY29tbWVudF90b19idWcoc3RhdGVbInBhdGNoIl0uYnVnX2lkKCksCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIG1lc3NhZ2UsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNjPWNscy53YXRjaGVycykKICAgICAgICAgZXhpdCgxKQogCiAKQEAg LTExOCw5ICsxMjQsMTkgQEAgY2xhc3MgV2luRVdTKEFic3RyYWN0RWFybHlXYXJuaW5nU3lzdGVt KToKICAgICBwb3J0X25hbWUgPSAid2luIgogCiAKLWNsYXNzIENocm9taXVtRVdTKEFic3RyYWN0 RWFybHlXYXJuaW5nU3lzdGVtKToKK2NsYXNzIENocm9taXVtTGludXhFV1MoQWJzdHJhY3RFYXJs eVdhcm5pbmdTeXN0ZW0pOgorICAgICMgRklYTUU6IFdlIHNob3VsZCByZW5hbWUgdGhpcyBxdWV1 ZSB0byAiY3ItbGludXgtZXdzIiwgYnV0IHRoYXQgcmVxdWlyZXMKKyAgICAjICAgICAgICBhIGRh dGFiYXNlIG1pZ3JhdGlvbi4KICAgICBuYW1lID0gImNocm9taXVtLWV3cyIKLSAgICBwb3J0X25h bWUgPSAiY2hyb21pdW0iCisgICAgcG9ydF9uYW1lID0gImNyLWxpbnV4IgorICAgIHdhdGNoZXJz ID0gQWJzdHJhY3RFYXJseVdhcm5pbmdTeXN0ZW0ud2F0Y2hlcnMgKyBbCisgICAgICAgICJkZ2xh emtvdkBjaHJvbWl1bS5vcmciLAorICAgIF0KKworCitjbGFzcyBDaHJvbWl1bVdpbmRvd3NFV1Mo QWJzdHJhY3RFYXJseVdhcm5pbmdTeXN0ZW0pOgorICAgIG5hbWUgPSAiY3Itd2luLWV3cyIKKyAg ICBwb3J0X25hbWUgPSAiY3Itd2luIgogICAgIHdhdGNoZXJzID0gQWJzdHJhY3RFYXJseVdhcm5p bmdTeXN0ZW0ud2F0Y2hlcnMgKyBbCiAgICAgICAgICJkZ2xhemtvdkBjaHJvbWl1bS5vcmciLAog ICAgIF0KQEAgLTEzNSw3ICsxNTEsOCBAQCBjbGFzcyBBYnN0cmFjdENvbW1pdHRlck9ubHlFV1Mo QWJzdHJhY3RFYXJseVdhcm5pbmdTeXN0ZW0pOgogCiAgICAgZGVmIHByb2Nlc3Nfd29ya19pdGVt KHNlbGYsIHBhdGNoKToKICAgICAgICAgaWYgbm90IHNlbGYuX2NvbW1pdHRlcnMuY29tbWl0dGVy X2J5X2VtYWlsKHBhdGNoLmF0dGFjaGVyX2VtYWlsKCkpOgotICAgICAgICAgICAgc2VsZi5fZGlk X2Vycm9yKHBhdGNoLCAiJXMgY2Fubm90IHByb2Nlc3MgcGF0Y2hlcyBmcm9tIG5vbi1jb21taXR0 ZXJzIDooIiAlIHNlbGYubmFtZSkKKyAgICAgICAgICAgIHNlbGYuX2RpZF9lcnJvcihwYXRjaCwK KyAgICAgICAgICAgICAgICAiJXMgY2Fubm90IHByb2Nlc3MgcGF0Y2hlcyBmcm9tIG5vbi1jb21t aXR0ZXJzIDooIiAlIHNlbGYubmFtZSkKICAgICAgICAgICAgIHJldHVybgogICAgICAgICBBYnN0 cmFjdEVhcmx5V2FybmluZ1N5c3RlbS5wcm9jZXNzX3dvcmtfaXRlbShzZWxmLCBwYXRjaCkKIApk aWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Vh cmx5d2FybmluZ3N5c3RlbV91bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0ZW1fdW5pdHRlc3QucHkKaW5kZXggZjIy MDM0Ny4uMzdhNjFhMSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL2NvbW1hbmRzL2Vhcmx5d2FybmluZ3N5c3RlbV91bml0dGVzdC5weQorKysgYi9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZWFybHl3YXJuaW5nc3lzdGVtX3Vu aXR0ZXN0LnB5CkBAIC0zNCwzNSArMzQsNDQgQEAgZnJvbSB3ZWJraXRweS50b29sLmNvbW1hbmRz LnF1ZXVlc3Rlc3QgaW1wb3J0IFF1ZXVlc1Rlc3QKIAogY2xhc3MgRWFybHlXYXJuaW5nU3l0ZW1U ZXN0KFF1ZXVlc1Rlc3QpOgogICAgIGRlZiB0ZXN0X2ZhaWxlZF9idWlsZHMoc2VsZik6Ci0gICAg ICAgIGV3cyA9IENocm9taXVtRVdTKCkKKyAgICAgICAgZXdzID0gQ2hyb21pdW1MaW51eEVXUygp CiAgICAgICAgIGV3cy5fYnVpbGQgPSBsYW1iZGEgcGF0Y2gsIGZpcnN0X3J1bj1GYWxzZTogRmFs c2UKICAgICAgICAgZXdzLl9jYW5fYnVpbGQgPSBsYW1iZGE6IFRydWUKICAgICAgICAgZXdzLnJl dmlld19wYXRjaChNb2NrKCkpCiAKICAgICBkZWYgdGVzdF9jaHJvbWl1bV9ld3Moc2VsZik6CiAg ICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9IHsKLSAgICAgICAgICAgICJiZWdpbl93b3JrX3F1ZXVl IiA6ICJDQVVUSU9OOiBjaHJvbWl1bS1ld3Mgd2lsbCBkaXNjYXJkIGFsbCBsb2NhbCBjaGFuZ2Vz IGluIFwiJXNcIlxuUnVubmluZyBXZWJLaXQgY2hyb21pdW0tZXdzLlxuIiAlIG9zLmdldGN3ZCgp LAotICAgICAgICAgICAgImhhbmRsZV91bmV4cGVjdGVkX2Vycm9yIiA6ICJNb2NrIGVycm9yIG1l c3NhZ2VcbiIsCisgICAgICAgICAgICAiYmVnaW5fd29ya19xdWV1ZSI6CisgICAgICAgICAgICAg ICAgIkNBVVRJT046IGNocm9taXVtLWV3cyB3aWxsIGRpc2NhcmQgYWxsIGxvY2FsIGNoYW5nZXMg IgorICAgICAgICAgICAgICAgICJpbiBcIiVzXCJcblJ1bm5pbmcgV2ViS2l0IGNocm9taXVtLWV3 cy5cbiIgJSBvcy5nZXRjd2QoKSwKKyAgICAgICAgICAgICJoYW5kbGVfdW5leHBlY3RlZF9lcnJv ciI6ICJNb2NrIGVycm9yIG1lc3NhZ2VcbiIsCiAgICAgICAgIH0KLSAgICAgICAgc2VsZi5hc3Nl cnRfcXVldWVfb3V0cHV0cyhDaHJvbWl1bUVXUygpLCBleHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRf c3RkZXJyKQorICAgICAgICBzZWxmLmFzc2VydF9xdWV1ZV9vdXRwdXRzKENocm9taXVtTGludXhF V1MoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBleHBlY3RlZF9zdGRlcnI9 ZXhwZWN0ZWRfc3RkZXJyKQogCiAgICAgZGVmIHRlc3RfcXRfZXdzKHNlbGYpOgogICAgICAgICBl eHBlY3RlZF9zdGRlcnIgPSB7Ci0gICAgICAgICAgICAiYmVnaW5fd29ya19xdWV1ZSIgOiAiQ0FV VElPTjogcXQtZXdzIHdpbGwgZGlzY2FyZCBhbGwgbG9jYWwgY2hhbmdlcyBpbiBcIiVzXCJcblJ1 bm5pbmcgV2ViS2l0IHF0LWV3cy5cbiIgJSBvcy5nZXRjd2QoKSwKLSAgICAgICAgICAgICJoYW5k bGVfdW5leHBlY3RlZF9lcnJvciIgOiAiTW9jayBlcnJvciBtZXNzYWdlXG4iLAorICAgICAgICAg ICAgImJlZ2luX3dvcmtfcXVldWUiOgorICAgICAgICAgICAgICAgICJDQVVUSU9OOiBxdC1ld3Mg d2lsbCBkaXNjYXJkIGFsbCBsb2NhbCBjaGFuZ2VzICIKKyAgICAgICAgICAgICAgICAiaW4gXCIl c1wiXG5SdW5uaW5nIFdlYktpdCBxdC1ld3MuXG4iICUgb3MuZ2V0Y3dkKCksCisgICAgICAgICAg ICAiaGFuZGxlX3VuZXhwZWN0ZWRfZXJyb3IiOiAiTW9jayBlcnJvciBtZXNzYWdlXG4iLAogICAg ICAgICB9CiAgICAgICAgIHNlbGYuYXNzZXJ0X3F1ZXVlX291dHB1dHMoUXRFV1MoKSwgZXhwZWN0 ZWRfc3RkZXJyPWV4cGVjdGVkX3N0ZGVycikKIAogICAgIGRlZiB0ZXN0X2d0a19ld3Moc2VsZik6 CiAgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9IHsKLSAgICAgICAgICAgICJiZWdpbl93b3JrX3F1 ZXVlIiA6ICJDQVVUSU9OOiBndGstZXdzIHdpbGwgZGlzY2FyZCBhbGwgbG9jYWwgY2hhbmdlcyBp biBcIiVzXCJcblJ1bm5pbmcgV2ViS2l0IGd0ay1ld3MuXG4iICUgb3MuZ2V0Y3dkKCksCi0gICAg ICAgICAgICAiaGFuZGxlX3VuZXhwZWN0ZWRfZXJyb3IiIDogIk1vY2sgZXJyb3IgbWVzc2FnZVxu IiwKKyAgICAgICAgICAgICJiZWdpbl93b3JrX3F1ZXVlIjoKKyAgICAgICAgICAgICAgICAiQ0FV VElPTjogZ3RrLWV3cyB3aWxsIGRpc2NhcmQgYWxsIGxvY2FsIGNoYW5nZXMgIgorICAgICAgICAg ICAgICAgICJpbiBcIiVzXCJcblJ1bm5pbmcgV2ViS2l0IGd0ay1ld3MuXG4iICUgb3MuZ2V0Y3dk KCksCisgICAgICAgICAgICAiaGFuZGxlX3VuZXhwZWN0ZWRfZXJyb3IiOiAiTW9jayBlcnJvciBt ZXNzYWdlXG4iLAogICAgICAgICB9CiAgICAgICAgIHNlbGYuYXNzZXJ0X3F1ZXVlX291dHB1dHMo R3RrRVdTKCksIGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCiAKICAgICBkZWYgdGVz dF9tYWNfZXdzKHNlbGYpOgogICAgICAgICBleHBlY3RlZF9zdGRlcnIgPSB7Ci0gICAgICAgICAg ICAiYmVnaW5fd29ya19xdWV1ZSIgOiAiQ0FVVElPTjogbWFjLWV3cyB3aWxsIGRpc2NhcmQgYWxs IGxvY2FsIGNoYW5nZXMgaW4gXCIlc1wiXG5SdW5uaW5nIFdlYktpdCBtYWMtZXdzLlxuIiAlIG9z LmdldGN3ZCgpLAotICAgICAgICAgICAgImhhbmRsZV91bmV4cGVjdGVkX2Vycm9yIiA6ICJNb2Nr IGVycm9yIG1lc3NhZ2VcbiIsCisgICAgICAgICAgICAiYmVnaW5fd29ya19xdWV1ZSI6CisgICAg ICAgICAgICAgICAgIkNBVVRJT046IG1hYy1ld3Mgd2lsbCBkaXNjYXJkIGFsbCBsb2NhbCBjaGFu Z2VzICIKKyAgICAgICAgICAgICAgICAiaW4gXCIlc1wiXG5SdW5uaW5nIFdlYktpdCBtYWMtZXdz LlxuIiAlIG9zLmdldGN3ZCgpLAorICAgICAgICAgICAgImhhbmRsZV91bmV4cGVjdGVkX2Vycm9y IjogIk1vY2sgZXJyb3IgbWVzc2FnZVxuIiwKICAgICAgICAgfQogICAgICAgICBzZWxmLmFzc2Vy dF9xdWV1ZV9vdXRwdXRzKE1hY0VXUygpLCBleHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJy KQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRz L3NoZXJpZmZib3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFu ZHMvc2hlcmlmZmJvdC5weQppbmRleCBlMmU2Yzg0Li5hZTA2NzBmIDEwMDY0NAotLS0gYS9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvc2hlcmlmZmJvdC5weQorKysg Yi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvc2hlcmlmZmJvdC5w eQpAQCAtMzAsNyArMzAsNyBAQCBpbXBvcnQgb3MKIAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lz dGVtLmRlcHJlY2F0ZWRfbG9nZ2luZyBpbXBvcnQgbG9nCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5j aGVja291dC5jaGFuZ2Vsb2cgaW1wb3J0IHZpZXdfc291cmNlX3VybAotZnJvbSB3ZWJraXRweS5j b21tb24uY29uZmlnLnBvcnRzIGltcG9ydCBXZWJLaXRQb3J0Citmcm9tIHdlYmtpdHB5LmNvbW1v bi5jb25maWcucG9ydHMgaW1wb3J0IFBvcnQKIGZyb20gd2Via2l0cHkudG9vbC5ib3Quc2hlcmlm ZmlyY2JvdCBpbXBvcnQgU2hlcmlmZklSQ0JvdAogZnJvbSB3ZWJraXRweS50b29sLmNvbW1hbmRz LnF1ZXVlcyBpbXBvcnQgQWJzdHJhY3RRdWV1ZQogZnJvbSB3ZWJraXRweS50b29sLmdyYW1tYXIg aW1wb3J0IGpvaW5fd2l0aF9zZXBhcmF0b3JzCkBAIC0zOSw3ICszOSw5IEBAIGNsYXNzIFNoZXJp ZmZCb3QoQWJzdHJhY3RRdWV1ZSk6CiAgICAgbmFtZSA9ICJzaGVyaWZmLWJvdCIKIAogICAgIGRl ZiB1cGRhdGUoc2VsZik6Ci0gICAgICAgIHNlbGYudG9vbC5leGVjdXRpdmUucnVuX2FuZF90aHJv d19pZl9mYWlsKFdlYktpdFBvcnQudXBkYXRlX3dlYmtpdF9jb21tYW5kKCksIHF1aWV0PVRydWUp CisgICAgICAgICMgRklYTUU6IFVzZSB0aGUgcG9ydCBvYmplY3Qgb24gdGhlIHRvb2wgd2hlbiB0 aGF0IGV4aXN0cy4KKyAgICAgICAgc2VsZi50b29sLmV4ZWN1dGl2ZS5ydW5fYW5kX3Rocm93X2lm X2ZhaWwoCisgICAgICAgICAgICBQb3J0KCkudXBkYXRlX3dlYmtpdF9jb21tYW5kKCksIHF1aWV0 PVRydWUpCiAKICAgICAjIEFic3RyYWN0UXVldWUgbWV0aG9kcwogCmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvc3RlcHNlcXVlbmNlLnB5IGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3N0ZXBzZXF1ZW5jZS5w eQppbmRleCBkMjZlODJlLi5iODI3YWEwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvc3RlcHNlcXVlbmNlLnB5CisrKyBiL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9zdGVwc2VxdWVuY2UucHkKQEAgLTQ4LDYg KzQ4LDcgQEAgY2xhc3MgU3RlcFNlcXVlbmNlKG9iamVjdCk6CiAgICAgICAgIGNvbGxlY3RlZF9v cHRpb25zID0gWwogICAgICAgICAgICAgc3RlcHMuT3B0aW9ucy5wYXJlbnRfY29tbWFuZCwKICAg ICAgICAgICAgIHN0ZXBzLk9wdGlvbnMucXVpZXQsCisgICAgICAgICAgICBzdGVwcy5PcHRpb25z LnBvcnQsCiAgICAgICAgIF0KICAgICAgICAgZm9yIHN0ZXAgaW4gc2VsZi5fc3RlcHM6CiAgICAg ICAgICAgICBjb2xsZWN0ZWRfb3B0aW9ucyA9IGNvbGxlY3RlZF9vcHRpb25zICsgc3RlcC5vcHRp b25zKCkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVw cy9hYnN0cmFjdHN0ZXAucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3Rl cHMvYWJzdHJhY3RzdGVwLnB5CmluZGV4IDFhZDM0M2QuLmQ0M2Q4ZmYgMTAwNjQ0Ci0tLSBhL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9hYnN0cmFjdHN0ZXAucHkKKysr IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL2Fic3RyYWN0c3RlcC5w eQpAQCAtMjcsNyArMjcsNyBAQAogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQg T0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCiBmcm9tIHdlYmtpdHB5LmNvbW1v bi5zeXN0ZW0uZGVwcmVjYXRlZF9sb2dnaW5nIGltcG9ydCBsb2cKLWZyb20gd2Via2l0cHkuY29t bW9uLmNvbmZpZy5wb3J0cyBpbXBvcnQgV2ViS2l0UG9ydAorZnJvbSB3ZWJraXRweS5jb21tb24u Y29uZmlnLnBvcnRzIGltcG9ydCBQb3J0CiAKIAogY2xhc3MgQWJzdHJhY3RTdGVwKG9iamVjdCk6 CkBAIC0zNiwxNiArMzYsMTYgQEAgY2xhc3MgQWJzdHJhY3RTdGVwKG9iamVjdCk6CiAgICAgICAg IHNlbGYuX29wdGlvbnMgPSBvcHRpb25zCiAgICAgICAgIHNlbGYuX3BvcnQgPSBOb25lCiAKLSAg ICBkZWYgX3J1bl9zY3JpcHQoc2VsZiwgc2NyaXB0X25hbWUsIHF1aWV0PUZhbHNlLCBwb3J0PVdl YktpdFBvcnQpOgorICAgIGRlZiBfcnVuX3NjcmlwdChzZWxmLCBzY3JpcHRfbmFtZSwgcXVpZXQ9 RmFsc2UpOgogICAgICAgICBsb2coIlJ1bm5pbmcgJXMiICUgc2NyaXB0X25hbWUpCi0gICAgICAg ICMgRklYTUU6IFRoaXMgc2hvdWxkIHVzZSBzZWxmLnBvcnQoKQotICAgICAgICBzZWxmLl90b29s LmV4ZWN1dGl2ZS5ydW5fYW5kX3Rocm93X2lmX2ZhaWwocG9ydC5zY3JpcHRfcGF0aChzY3JpcHRf bmFtZSksIHF1aWV0KQorICAgICAgICBzZWxmLl90b29sLmV4ZWN1dGl2ZS5ydW5fYW5kX3Rocm93 X2lmX2ZhaWwoCisgICAgICAgICAgICBzZWxmLnBvcnQoKS5zY3JpcHRfcGF0aChzY3JpcHRfbmFt ZSksIHF1aWV0KQogCiAgICAgIyBGSVhNRTogVGhlIHBvcnQgc2hvdWxkIGxpdmUgb24gdGhlIHRv b2wuCiAgICAgZGVmIHBvcnQoc2VsZik6CiAgICAgICAgIGlmIHNlbGYuX3BvcnQ6CiAgICAgICAg ICAgICByZXR1cm4gc2VsZi5fcG9ydAotICAgICAgICBzZWxmLl9wb3J0ID0gV2ViS2l0UG9ydC5w b3J0KHNlbGYuX29wdGlvbnMucG9ydCkKKyAgICAgICAgc2VsZi5fcG9ydCA9IFBvcnQucG9ydF9i eV9uYW1lKHNlbGYuX29wdGlvbnMucG9ydCkKICAgICAgICAgcmV0dXJuIHNlbGYuX3BvcnQKIAog ICAgIF93ZWxsX2tub3duX2tleXMgPSB7CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvc3RlcHMvcHJlcGFyZWNoYW5nZWxvZy5weSBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9wcmVwYXJlY2hhbmdlbG9nLnB5CmluZGV4IGZjYjQw YmUuLjNmYjE3MTggMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9v bC9zdGVwcy9wcmVwYXJlY2hhbmdlbG9nLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9zdGVwcy9wcmVwYXJlY2hhbmdlbG9nLnB5CkBAIC0zOCw3ICszOCw2IEBAIGNs YXNzIFByZXBhcmVDaGFuZ2VMb2coQWJzdHJhY3RTdGVwKToKICAgICBAY2xhc3NtZXRob2QKICAg ICBkZWYgb3B0aW9ucyhjbHMpOgogICAgICAgICByZXR1cm4gWwotICAgICAgICAgICAgT3B0aW9u cy5wb3J0LAogICAgICAgICAgICAgT3B0aW9ucy5xdWlldCwKICAgICAgICAgICAgIE9wdGlvbnMu ZW1haWwsCiAgICAgICAgIF0KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9zdGVwcy9ydW50ZXN0cy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9zdGVwcy9ydW50ZXN0cy5weQppbmRleCAzNTNkMTI1Li4zYTQxMjEzIDEwMDY0NAotLS0g YS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvcnVudGVzdHMucHkKKysr IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3J1bnRlc3RzLnB5CkBA IC0zOCw3ICszOCw2IEBAIGNsYXNzIFJ1blRlc3RzKEFic3RyYWN0U3RlcCk6CiAgICAgICAgICAg ICBPcHRpb25zLnRlc3QsCiAgICAgICAgICAgICBPcHRpb25zLm5vbl9pbnRlcmFjdGl2ZSwKICAg ICAgICAgICAgIE9wdGlvbnMucXVpZXQsCi0gICAgICAgICAgICBPcHRpb25zLnBvcnQsCiAgICAg ICAgIF0KIAogICAgIGRlZiBydW4oc2VsZiwgc3RhdGUpOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3VwZGF0ZS5weSBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy91cGRhdGUucHkKaW5kZXggYzk4ZWJhNy4uN2UwMTQ3 OCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3Vw ZGF0ZS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvdXBk YXRlLnB5CkBAIC0zNiw3ICszNiw2IEBAIGNsYXNzIFVwZGF0ZShBYnN0cmFjdFN0ZXApOgogICAg IGRlZiBvcHRpb25zKGNscyk6CiAgICAgICAgIHJldHVybiBbCiAgICAgICAgICAgICBPcHRpb25z LnVwZGF0ZSwKLSAgICAgICAgICAgIE9wdGlvbnMucG9ydCwKICAgICAgICAgXQogCiAgICAgZGVm IHJ1bihzZWxmLCBzdGF0ZSk6Cg== 52363 2010-04-01 18:35:14 -0700 2010-04-02 00:04:56 -0700 Patch bug-36974-20100401183513.patch text/plain 5427 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA0MDY2NTNkLi5hOTMzM2YzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkgQEAKIDIwMTAtMDQt MDEgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgY3Itd2luLWV3cworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY5NzQKKworICAgICAgICBBZGRz IHN1cHBvcnQgZm9yIGFuIEVhcmx5IFdhcm5pbmcgU3lzdGVtIGZvciBDaHJvbWl1bSBvbiBMaW51 eC4gIFRoZQorICAgICAgICBpbnRlcmZhY2UgdG8gdGhlIENocm9taXVtIHBvcnQgaXMgdGhlIHNh bWUgb24gZXZlcnkgcGxhdGZvcm0sIHNvIHdlCisgICAgICAgIGRvbid0IG5lZWQgdG8gY3JlYXRl IGEgbmV3IFBvcnQgb2JqZWN0IGZvciB0aGlzIHF1ZXVlLgorCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS90b29sL2NvbW1hbmRzL2Vhcmx5d2FybmluZ3N5c3RlbS5weToKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZWFybHl3YXJuaW5nc3lzdGVtX3VuaXR0ZXN0 LnB5OgorCisyMDEwLTA0LTAxICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKICAg ICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCiAKICAgICAgICAgUHJpbnQgYW4gZXJyb3Ig bWVzc2FnZSBmb3IgcmVhZGxpbmUgYm9nb3NpdHkgaW4gTWFjUG9ydHMKZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0 ZW0ucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZWFybHl3 YXJuaW5nc3lzdGVtLnB5CmluZGV4IGE1Nzk5NDcuLjg0ZmE1ZTcgMTAwNjQ0Ci0tLSBhL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0ZW0u cHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Vhcmx5 d2FybmluZ3N5c3RlbS5weQpAQCAtMTE4LDE0ICsxMTgsMjMgQEAgY2xhc3MgV2luRVdTKEFic3Ry YWN0RWFybHlXYXJuaW5nU3lzdGVtKToKICAgICBwb3J0X25hbWUgPSAid2luIgogCiAKLWNsYXNz IENocm9taXVtRVdTKEFic3RyYWN0RWFybHlXYXJuaW5nU3lzdGVtKToKLSAgICBuYW1lID0gImNo cm9taXVtLWV3cyIKK2NsYXNzIEFic3RyYWN0Q2hyb21pdW1FV1MoQWJzdHJhY3RFYXJseVdhcm5p bmdTeXN0ZW0pOgogICAgIHBvcnRfbmFtZSA9ICJjaHJvbWl1bSIKICAgICB3YXRjaGVycyA9IEFi c3RyYWN0RWFybHlXYXJuaW5nU3lzdGVtLndhdGNoZXJzICsgWwogICAgICAgICAiZGdsYXprb3ZA Y2hyb21pdW0ub3JnIiwKICAgICBdCiAKIAorY2xhc3MgQ2hyb21pdW1MaW51eEVXUyhBYnN0cmFj dENocm9taXVtRVdTKToKKyAgICAjIEZJWE1FOiBXZSBzaG91bGQgcmVuYW1lIHRoaXMgY29tbWFu ZCB0byBjci1saW51eC1ld3MsIGJ1dCB0aGF0IHJlcXVpcmVzCisgICAgIyAgICAgICAgYSBkYXRh YmFzZSBtaWdyYXRpb24uIDooCisgICAgbmFtZSA9ICJjaHJvbWl1bS1ld3MiCisKKworY2xhc3Mg Q2hyb21pdW1XaW5kb3dzRVdTKEFic3RyYWN0Q2hyb21pdW1FV1MpOgorICAgIG5hbWUgPSAiY3It d2luLWV3cyIKKworCiAjIEZvciBwbGF0Zm9ybXMgdGhhdCB3ZSBjYW4ndCBydW4gaW5zaWRlIGEg Vk0gKGxpa2UgTWFjIE9TIFgpLCB3ZSByZXF1aXJlCiAjIHBhdGNoZXMgdG8gYmUgdXBsb2FkZWQg YnkgY29tbWl0dGVycywgd2hvIGFyZSBnZW5lcmFsbHkgdHJ1c3R3b3J0aHkgZm9say4gOikKIGNs YXNzIEFic3RyYWN0Q29tbWl0dGVyT25seUVXUyhBYnN0cmFjdEVhcmx5V2FybmluZ1N5c3RlbSk6 CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMv ZWFybHl3YXJuaW5nc3lzdGVtX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS90b29sL2NvbW1hbmRzL2Vhcmx5d2FybmluZ3N5c3RlbV91bml0dGVzdC5weQppbmRleCBm MjIwMzQ3Li5jMWRlMWZlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3Rvb2wvY29tbWFuZHMvZWFybHl3YXJuaW5nc3lzdGVtX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0ZW1f dW5pdHRlc3QucHkKQEAgLTM0LDM1ICszNCw0MiBAQCBmcm9tIHdlYmtpdHB5LnRvb2wuY29tbWFu ZHMucXVldWVzdGVzdCBpbXBvcnQgUXVldWVzVGVzdAogCiBjbGFzcyBFYXJseVdhcm5pbmdTeXRl bVRlc3QoUXVldWVzVGVzdCk6CiAgICAgZGVmIHRlc3RfZmFpbGVkX2J1aWxkcyhzZWxmKToKLSAg ICAgICAgZXdzID0gQ2hyb21pdW1FV1MoKQorICAgICAgICBld3MgPSBDaHJvbWl1bUxpbnV4RVdT KCkKICAgICAgICAgZXdzLl9idWlsZCA9IGxhbWJkYSBwYXRjaCwgZmlyc3RfcnVuPUZhbHNlOiBG YWxzZQogICAgICAgICBld3MuX2Nhbl9idWlsZCA9IGxhbWJkYTogVHJ1ZQogICAgICAgICBld3Mu cmV2aWV3X3BhdGNoKE1vY2soKSkKIAotICAgIGRlZiB0ZXN0X2Nocm9taXVtX2V3cyhzZWxmKToK KyAgICBkZWYgdGVzdF9jaHJvbWl1bV9saW51eF9ld3Moc2VsZik6CiAgICAgICAgIGV4cGVjdGVk X3N0ZGVyciA9IHsKLSAgICAgICAgICAgICJiZWdpbl93b3JrX3F1ZXVlIiA6ICJDQVVUSU9OOiBj aHJvbWl1bS1ld3Mgd2lsbCBkaXNjYXJkIGFsbCBsb2NhbCBjaGFuZ2VzIGluIFwiJXNcIlxuUnVu bmluZyBXZWJLaXQgY2hyb21pdW0tZXdzLlxuIiAlIG9zLmdldGN3ZCgpLAotICAgICAgICAgICAg ImhhbmRsZV91bmV4cGVjdGVkX2Vycm9yIiA6ICJNb2NrIGVycm9yIG1lc3NhZ2VcbiIsCisgICAg ICAgICAgICAiYmVnaW5fd29ya19xdWV1ZSI6ICJDQVVUSU9OOiBjaHJvbWl1bS1ld3Mgd2lsbCBk aXNjYXJkIGFsbCBsb2NhbCBjaGFuZ2VzIGluIFwiJXNcIlxuUnVubmluZyBXZWJLaXQgY2hyb21p dW0tZXdzLlxuIiAlIG9zLmdldGN3ZCgpLAorICAgICAgICAgICAgImhhbmRsZV91bmV4cGVjdGVk X2Vycm9yIjogIk1vY2sgZXJyb3IgbWVzc2FnZVxuIiwKICAgICAgICAgfQotICAgICAgICBzZWxm LmFzc2VydF9xdWV1ZV9vdXRwdXRzKENocm9taXVtRVdTKCksIGV4cGVjdGVkX3N0ZGVycj1leHBl Y3RlZF9zdGRlcnIpCisgICAgICAgIHNlbGYuYXNzZXJ0X3F1ZXVlX291dHB1dHMoQ2hyb21pdW1M aW51eEVXUygpLCBleHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJyKQorCisgICAgZGVmIHRl c3RfY2hyb21pdW1fd2luZG93c19ld3Moc2VsZik6CisgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9 IHsKKyAgICAgICAgICAgICJiZWdpbl93b3JrX3F1ZXVlIjogIkNBVVRJT046IGNyLXdpbi1ld3Mg d2lsbCBkaXNjYXJkIGFsbCBsb2NhbCBjaGFuZ2VzIGluIFwiJXNcIlxuUnVubmluZyBXZWJLaXQg Y3Itd2luLWV3cy5cbiIgJSBvcy5nZXRjd2QoKSwKKyAgICAgICAgICAgICJoYW5kbGVfdW5leHBl Y3RlZF9lcnJvciI6ICJNb2NrIGVycm9yIG1lc3NhZ2VcbiIsCisgICAgICAgIH0KKyAgICAgICAg c2VsZi5hc3NlcnRfcXVldWVfb3V0cHV0cyhDaHJvbWl1bVdpbmRvd3NFV1MoKSwgZXhwZWN0ZWRf c3RkZXJyPWV4cGVjdGVkX3N0ZGVycikKIAogICAgIGRlZiB0ZXN0X3F0X2V3cyhzZWxmKToKICAg ICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gewotICAgICAgICAgICAgImJlZ2luX3dvcmtfcXVldWUi IDogIkNBVVRJT046IHF0LWV3cyB3aWxsIGRpc2NhcmQgYWxsIGxvY2FsIGNoYW5nZXMgaW4gXCIl c1wiXG5SdW5uaW5nIFdlYktpdCBxdC1ld3MuXG4iICUgb3MuZ2V0Y3dkKCksCi0gICAgICAgICAg ICAiaGFuZGxlX3VuZXhwZWN0ZWRfZXJyb3IiIDogIk1vY2sgZXJyb3IgbWVzc2FnZVxuIiwKKyAg ICAgICAgICAgICJiZWdpbl93b3JrX3F1ZXVlIjogIkNBVVRJT046IHF0LWV3cyB3aWxsIGRpc2Nh cmQgYWxsIGxvY2FsIGNoYW5nZXMgaW4gXCIlc1wiXG5SdW5uaW5nIFdlYktpdCBxdC1ld3MuXG4i ICUgb3MuZ2V0Y3dkKCksCisgICAgICAgICAgICAiaGFuZGxlX3VuZXhwZWN0ZWRfZXJyb3IiOiAi TW9jayBlcnJvciBtZXNzYWdlXG4iLAogICAgICAgICB9CiAgICAgICAgIHNlbGYuYXNzZXJ0X3F1 ZXVlX291dHB1dHMoUXRFV1MoKSwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0ZGVycikKIAog ICAgIGRlZiB0ZXN0X2d0a19ld3Moc2VsZik6CiAgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9IHsK LSAgICAgICAgICAgICJiZWdpbl93b3JrX3F1ZXVlIiA6ICJDQVVUSU9OOiBndGstZXdzIHdpbGwg ZGlzY2FyZCBhbGwgbG9jYWwgY2hhbmdlcyBpbiBcIiVzXCJcblJ1bm5pbmcgV2ViS2l0IGd0ay1l d3MuXG4iICUgb3MuZ2V0Y3dkKCksCi0gICAgICAgICAgICAiaGFuZGxlX3VuZXhwZWN0ZWRfZXJy b3IiIDogIk1vY2sgZXJyb3IgbWVzc2FnZVxuIiwKKyAgICAgICAgICAgICJiZWdpbl93b3JrX3F1 ZXVlIjogIkNBVVRJT046IGd0ay1ld3Mgd2lsbCBkaXNjYXJkIGFsbCBsb2NhbCBjaGFuZ2VzIGlu IFwiJXNcIlxuUnVubmluZyBXZWJLaXQgZ3RrLWV3cy5cbiIgJSBvcy5nZXRjd2QoKSwKKyAgICAg ICAgICAgICJoYW5kbGVfdW5leHBlY3RlZF9lcnJvciI6ICJNb2NrIGVycm9yIG1lc3NhZ2VcbiIs CiAgICAgICAgIH0KICAgICAgICAgc2VsZi5hc3NlcnRfcXVldWVfb3V0cHV0cyhHdGtFV1MoKSwg ZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0ZGVycikKIAogICAgIGRlZiB0ZXN0X21hY19ld3Mo c2VsZik6CiAgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9IHsKLSAgICAgICAgICAgICJiZWdpbl93 b3JrX3F1ZXVlIiA6ICJDQVVUSU9OOiBtYWMtZXdzIHdpbGwgZGlzY2FyZCBhbGwgbG9jYWwgY2hh bmdlcyBpbiBcIiVzXCJcblJ1bm5pbmcgV2ViS2l0IG1hYy1ld3MuXG4iICUgb3MuZ2V0Y3dkKCks Ci0gICAgICAgICAgICAiaGFuZGxlX3VuZXhwZWN0ZWRfZXJyb3IiIDogIk1vY2sgZXJyb3IgbWVz c2FnZVxuIiwKKyAgICAgICAgICAgICJiZWdpbl93b3JrX3F1ZXVlIjogIkNBVVRJT046IG1hYy1l d3Mgd2lsbCBkaXNjYXJkIGFsbCBsb2NhbCBjaGFuZ2VzIGluIFwiJXNcIlxuUnVubmluZyBXZWJL aXQgbWFjLWV3cy5cbiIgJSBvcy5nZXRjd2QoKSwKKyAgICAgICAgICAgICJoYW5kbGVfdW5leHBl Y3RlZF9lcnJvciI6ICJNb2NrIGVycm9yIG1lc3NhZ2VcbiIsCiAgICAgICAgIH0KICAgICAgICAg c2VsZi5hc3NlcnRfcXVldWVfb3V0cHV0cyhNYWNFV1MoKSwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVj dGVkX3N0ZGVycikK