59545 2011-04-26 15:11:04 -0700 sherrifbot create-bug shouldn't assign bugs to webkit.review.bot 2011-04-27 11:17:06 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 webkit.review.bot eric abarth ap aroben commit-queue eric mihaip oldest_to_newest 392786 0 webkit.review.bot 2011-04-26 15:11:04 -0700 sherrifbot create-bug shouldn't assign bugs to webkit.review.bot Requested by aroben on #webkit. 393285 1 ap 2011-04-26 19:40:33 -0700 See also: bug 59575. 393380 2 91240 eric 2011-04-26 23:26:05 -0700 Created attachment 91240 Patch 393543 3 91240 mihaip 2011-04-27 07:49:43 -0700 Comment on attachment 91240 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91240&action=review > Tools/Scripts/webkitpy/common/config/committers.py:391 > + if contributor.full_name and contributor.full_name == name: Why the check if contributor.full_name is non-empty? Presumably the name argument will be non-empty, so the equality check should take care of that. > Tools/Scripts/webkitpy/common/config/committers.py:400 > + if contributor.irc_nickname and contributor.irc_nickname == irc_nickname: Ditto here. > Tools/Scripts/webkitpy/common/config/committers.py:404 > + def contributor_by_email(self, email): Now that you have this, perhaps the committer_by_email call in the whois command should also be changed to support contributors? 393552 4 eric 2011-04-27 08:18:23 -0700 (In reply to comment #3) > (From update of attachment 91240 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=91240&action=review > > > Tools/Scripts/webkitpy/common/config/committers.py:391 > > + if contributor.full_name and contributor.full_name == name: > > Why the check if contributor.full_name is non-empty? Presumably the name argument will be non-empty, so the equality check should take care of that. Originally I added an assert(name) to that function. However, current code violates that. (Which is OK, since full_name can never be empty.) I wanted to make sure that future code didn't end up allowing None full_name and causing this function to do strange things. > > Tools/Scripts/webkitpy/common/config/committers.py:400 > > + if contributor.irc_nickname and contributor.irc_nickname == irc_nickname: > > Ditto here. None is a valid value for irc_nickname however. But it doesn't make sense to search for a none nickname. I could assert that argument irc_nickname is never None, but that seemed to be confusing when compared with contributor_by_name(). > > Tools/Scripts/webkitpy/common/config/committers.py:404 > > + def contributor_by_email(self, email): > > Now that you have this, perhaps the committer_by_email call in the whois command should also be changed to support contributors? Happy to make that change! 393573 5 91290 eric 2011-04-27 08:45:10 -0700 Created attachment 91290 Patch for landing 393575 6 91291 eric 2011-04-27 08:49:13 -0700 Created attachment 91291 Patch for landing 393671 7 commit-queue 2011-04-27 11:15:21 -0700 The commit-queue encountered the following flaky tests while processing attachment 91291: http/tests/xmlhttprequest/basic-auth.html bug 51613 (author: ap@webkit.org) The commit-queue is continuing to process your patch. 393674 8 91291 commit-queue 2011-04-27 11:17:01 -0700 Comment on attachment 91291 Patch for landing Clearing flags on attachment: 91291 Committed r85065: <http://trac.webkit.org/changeset/85065> 393675 9 commit-queue 2011-04-27 11:17:06 -0700 All reviewed patches have been landed. Closing bug. 91240 2011-04-26 23:26:05 -0700 2011-04-27 08:45:06 -0700 Patch bug-59545-20110426232604.patch text/plain 15127 eric U3VidmVyc2lvbiBSZXZpc2lvbjogODUwMTcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwODExMTMzMzAxY2Q3NTc4MTdjZWM5NTIyNzdiOWY0NzBj MGUyNjE1Li42NDJmZjZlNDM5MmFlNzc4YmVmMDk2NmY1OGZjNzEzNWMxYzc3NTMwIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTEtMDQtMjYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHNoZXJyaWZib3QgY3JlYXRl LWJ1ZyBzaG91bGRuJ3QgYXNzaWduIGJ1Z3MgdG8gd2Via2l0LnJldmlldy5ib3QKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5NTQ1CisKKyAgICAgICAg VG8gZG8gdGhpcywgSSBuZWVkZWQgYSB3YXkgdG8gbG9vayB1cCBjb250cmlidXRvcnMgYnkgaXJj LW5hbWUKKyAgICAgICAgKHNpbmNlIGFueW9uZSBpbiAjd2Via2l0IHdobyBtaWdodCB1c2UgdGhp cyBjb21tYW5kIG1heSBub3QgYmUgYSBjb21taXR0ZXIpLgorICAgICAgICBUbyBsb29rdXAgY29u dHJpYnV0b3JzLCBJIGhhZCB0byBtYWtlIENvbnRyaWJ1dG9yIGEgcmVhbCBvYmplY3QuCisgICAg ICAgIFdoaWNoIGxlZCBtZSB0byByZWRlc2lnbiBwYXJ0cyBvZiBjb21taXR0ZXJzLnB5Li4uCisg ICAgICAgIGFuZCBmaW5hbGx5IGZpeCBvbmUgc3BvdCBpbiBjaGFuZ2Vsb2cucHkgd2hlcmUgd2Ug d2FudGVkIHRvIGJlCisgICAgICAgIGxvb2tpbmcgdXAgY29udHJpYnV0b3JzIGFuZCBub3QgY29t bWl0dGVycy4KKworICAgICAgICBPdmVyYWxsIGEgcHJldHR5IHNpbXBsZSBmaXgsIG9uY2UgeW91 IHdhZGUgdGhyb3VnaCB0aGUgeWFrLWhhaXIuCisKKyAgICAgICAgVGhpcyBtYXkgbm90IHByZXZl bnQgKmFsbCogcG9zc2libGUgd2F5cyB0aGF0IGJ1Z3Mgd291bGQgZ2V0IGFzc2lnbmVkCisgICAg ICAgIHRvIHdlYmtpdC5yZXZpZXcuYm90LiAgSWYgd2UgZG9uJ3QgcmVjb2duaXplIHRoZSByZXF1 ZXN0ZXIgd2Ugd2lsbAorICAgICAgICBnbyB0aHJvdWdoIHRoZSBwcmV2aW91cyBjb2RlIHBhdGgg KHdoaWNoIHNob3VsZG4ndCBjaGFuZ2UgdGhlIGFzc2lnbmVlCisgICAgICAgIG9uIHRoZSBidWcg ZnJvbSB0aGUgZGVmYXVsdCBhcyBmYXIgYXMgSSBjYW4gdGVsbCkuCisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGFuZ2Vsb2cucHk6CisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL2NvbW1pdHRlcnMucHk6CisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL2NvbW1pdHRlcnNfdW5pdHRlc3QucHk6CisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9pcmNfY29tbWFuZC5weToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L2lyY19jb21tYW5kX3VuaXR0ZXN0LnB5OgorCiAy MDExLTA0LTI2ICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgQWRlbGUgUGV0ZXJzb24uCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGFuZ2Vsb2cucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGFuZ2Vsb2cucHkKaW5kZXggYTg2YjdhOTMzMmI5NTZm MDIxZDBlZmY3NDU1N2QxZGFmMjUyZWZjMS4uZGM3OGYzNmJiMWM4Mzk3NmMwNGQ1Zjg1OGRhMTgw ODZkZTU1M2Q5MyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hl Y2tvdXQvY2hhbmdlbG9nLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No ZWNrb3V0L2NoYW5nZWxvZy5weQpAQCAtNjQsNyArNjQsNyBAQCBjbGFzcyBDaGFuZ2VMb2dFbnRy eShvYmplY3QpOgogICAgICAgICBzZWxmLl9yZXZpZXdlcl90ZXh0ID0gbWF0Y2guZ3JvdXAoInJl dmlld2VyIikgaWYgbWF0Y2ggZWxzZSBOb25lCiAKICAgICAgICAgc2VsZi5fcmV2aWV3ZXIgPSBz ZWxmLl9jb21taXR0ZXJfbGlzdC5jb21taXR0ZXJfYnlfbmFtZShzZWxmLl9yZXZpZXdlcl90ZXh0 KQotICAgICAgICBzZWxmLl9hdXRob3IgPSBzZWxmLl9jb21taXR0ZXJfbGlzdC5jb21taXR0ZXJf YnlfZW1haWwoc2VsZi5fYXV0aG9yX2VtYWlsKSBvciBzZWxmLl9jb21taXR0ZXJfbGlzdC5jb21t aXR0ZXJfYnlfbmFtZShzZWxmLl9hdXRob3JfbmFtZSkKKyAgICAgICAgc2VsZi5fYXV0aG9yID0g c2VsZi5fY29tbWl0dGVyX2xpc3QuY29tbWl0dGVyX2J5X2VtYWlsKHNlbGYuX2F1dGhvcl9lbWFp bCkgb3Igc2VsZi5fY29tbWl0dGVyX2xpc3QuY29udHJpYnV0b3JfYnlfbmFtZShzZWxmLl9hdXRo b3JfbmFtZSkKIAogICAgIGRlZiBhdXRob3JfbmFtZShzZWxmKToKICAgICAgICAgcmV0dXJuIHNl bGYuX2F1dGhvcl9uYW1lCkBAIC03Myw3ICs3Myw3IEBAIGNsYXNzIENoYW5nZUxvZ0VudHJ5KG9i amVjdCk6CiAgICAgICAgIHJldHVybiBzZWxmLl9hdXRob3JfZW1haWwKIAogICAgIGRlZiBhdXRo b3Ioc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxmLl9hdXRob3IgIyBNaWdodCBiZSBOb25lCisg ICAgICAgIHJldHVybiBzZWxmLl9hdXRob3IgICMgTWlnaHQgYmUgTm9uZQogCiAgICAgIyBGSVhN RTogRXZlbnR1YWxseSB3ZSB3b3VsZCBsaWtlIHRvIG1hcCByZXZpd2VyIG5hbWVzIHRvIHJldmll d2VyIG9iamVjdHMuCiAgICAgIyBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI2NTMzCkBAIC04MSw3ICs4MSw3IEBAIGNsYXNzIENoYW5nZUxvZ0VudHJ5KG9iamVj dCk6CiAgICAgICAgIHJldHVybiBzZWxmLl9yZXZpZXdlcl90ZXh0CiAKICAgICBkZWYgcmV2aWV3 ZXIoc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxmLl9yZXZpZXdlciAjIE1pZ2h0IGJlIE5vbmUK KyAgICAgICAgcmV0dXJuIHNlbGYuX3Jldmlld2VyICAjIE1pZ2h0IGJlIE5vbmUsIG1pZ2h0IGFs c28gbm90IGJlIGEgUmV2aWV3ZXIhCiAKICAgICBkZWYgY29udGVudHMoc2VsZik6CiAgICAgICAg IHJldHVybiBzZWxmLl9jb250ZW50cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vY29uZmlnL2NvbW1pdHRlcnMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9jb25maWcvY29tbWl0dGVycy5weQppbmRleCBkMDVmODNiZTI0OGFiOTEwZjY5N2VmYzE5 ZTI4MDQ4ZGVhNWE1ZTIxLi5lMDZkYzA4YWY2MDM2MTk0NGE4YjNkNDhjNjg3MTIzODNkNmJiNTMz IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29tbWl0 dGVycy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29tbWl0 dGVycy5weQpAQCAtMSw1ICsxLDUgQEAKICMgQ29weXJpZ2h0IChjKSAyMDExLCBBcHBsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0jIENvcHlyaWdodCAoYykgMjAwOSwgR29vZ2xlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChjKSAyMDA5LCAyMDExIEdvb2dsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4g c291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBtb2RpZmljYXRpb24s IGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJl CkBAIC0yNywyMyArMjcsMjAgQEAKICMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lT RSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9GIFRISVMgU09GVFdBUkUs IEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAjCi0j IFdlYktpdCdzIFB5dGhvbiBtb2R1bGUgZm9yIGNvbW1pdHRlciBhbmQgcmV2aWV3ZXIgdmFsaWRh dGlvbgorIyBXZWJLaXQncyBQeXRob24gbW9kdWxlIGZvciBjb21taXR0ZXIgYW5kIHJldmlld2Vy IHZhbGlkYXRpb24uCiAKIAotY2xhc3MgQ29udHJpYnV0b3I6Ci0KLSAgICBkZWYgX19pbml0X18o c2VsZiwgbmFtZSwgZW1haWxfb3JfZW1haWxzLCBpcmNfbmlja25hbWU9Tm9uZSk6Ci0gICAgICAg IHJldHVybgotCi1jbGFzcyBDb21taXR0ZXI6Ci0KK2NsYXNzIENvbnRyaWJ1dG9yKG9iamVjdCk6 CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJjX25pY2tu YW1lPU5vbmUpOgorICAgICAgICBhc3NlcnQobmFtZSkKKyAgICAgICAgYXNzZXJ0KGVtYWlsX29y X2VtYWlscykKICAgICAgICAgc2VsZi5mdWxsX25hbWUgPSBuYW1lCiAgICAgICAgIGlmIGlzaW5z dGFuY2UoZW1haWxfb3JfZW1haWxzLCBzdHIpOgogICAgICAgICAgICAgc2VsZi5lbWFpbHMgPSBb ZW1haWxfb3JfZW1haWxzXQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgc2VsZi5lbWFpbHMg PSBlbWFpbF9vcl9lbWFpbHMKICAgICAgICAgc2VsZi5pcmNfbmlja25hbWUgPSBpcmNfbmlja25h bWUKKyAgICAgICAgc2VsZi5jYW5fY29tbWl0ID0gRmFsc2UKICAgICAgICAgc2VsZi5jYW5fcmV2 aWV3ID0gRmFsc2UKIAogICAgIGRlZiBidWd6aWxsYV9lbWFpbChzZWxmKToKQEAgLTU1LDggKzUy LDEzIEBAIGNsYXNzIENvbW1pdHRlcjoKICAgICAgICAgcmV0dXJuICciJXMiIDwlcz4nICUgKHNl bGYuZnVsbF9uYW1lLCBzZWxmLmVtYWlsc1swXSkKIAogCi1jbGFzcyBSZXZpZXdlcihDb21taXR0 ZXIpOgorY2xhc3MgQ29tbWl0dGVyKENvbnRyaWJ1dG9yKToKKyAgICBkZWYgX19pbml0X18oc2Vs ZiwgbmFtZSwgZW1haWxfb3JfZW1haWxzLCBpcmNfbmlja25hbWU9Tm9uZSk6CisgICAgICAgIENv bnRyaWJ1dG9yLl9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJjX25pY2tu YW1lKQorICAgICAgICBzZWxmLmNhbl9jb21taXQgPSBUcnVlCisKIAorY2xhc3MgUmV2aWV3ZXIo Q29tbWl0dGVyKToKICAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgZW1haWxfb3JfZW1haWxz LCBpcmNfbmlja25hbWU9Tm9uZSk6CiAgICAgICAgIENvbW1pdHRlci5fX2luaXRfXyhzZWxmLCBu YW1lLCBlbWFpbF9vcl9lbWFpbHMsIGlyY19uaWNrbmFtZSkKICAgICAgICAgc2VsZi5jYW5fcmV2 aWV3ID0gVHJ1ZQpAQCAtMzQ0LDE2ICszNDYsMjAgQEAgcmV2aWV3ZXJzX2xpc3QgPSBbCiBdCiAK IAotY2xhc3MgQ29tbWl0dGVyTGlzdDoKK2NsYXNzIENvbW1pdHRlckxpc3Qob2JqZWN0KToKIAog ICAgICMgQ29tbWl0dGVycyBhbmQgcmV2aWV3ZXJzIGFyZSBwYXNzZWQgaW4gdG8gYWxsb3cgZWFz eSB0ZXN0aW5nCi0KICAgICBkZWYgX19pbml0X18oc2VsZiwKICAgICAgICAgICAgICAgICAgY29t bWl0dGVycz1jb21taXR0ZXJzX3VuYWJsZV90b19yZXZpZXcsCi0gICAgICAgICAgICAgICAgIHJl dmlld2Vycz1yZXZpZXdlcnNfbGlzdCk6CisgICAgICAgICAgICAgICAgIHJldmlld2Vycz1yZXZp ZXdlcnNfbGlzdCwKKyAgICAgICAgICAgICAgICAgY29udHJpYnV0b3JzPWNvbnRyaWJ1dG9yc193 aG9fYXJlX25vdF9jb21taXR0ZXJzKToKKyAgICAgICAgc2VsZi5fY29udHJpYnV0b3JzID0gY29u dHJpYnV0b3JzICsgY29tbWl0dGVycyArIHJldmlld2VycwogICAgICAgICBzZWxmLl9jb21taXR0 ZXJzID0gY29tbWl0dGVycyArIHJldmlld2VycwogICAgICAgICBzZWxmLl9yZXZpZXdlcnMgPSBy ZXZpZXdlcnMKLSAgICAgICAgc2VsZi5fY29tbWl0dGVyc19ieV9lbWFpbCA9IHt9CisgICAgICAg IHNlbGYuX2NvbnRyaWJ1dG9yc19ieV9lbWFpbCA9IHt9CisKKyAgICBkZWYgY29udHJpYnV0b3Jz KHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi5fY29udHJpYnV0b3JzCiAKICAgICBkZWYgY29t bWl0dGVycyhzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX2NvbW1pdHRlcnMKQEAgLTM2MSwy NCArMzY3LDQ1IEBAIGNsYXNzIENvbW1pdHRlckxpc3Q6CiAgICAgZGVmIHJldmlld2VycyhzZWxm KToKICAgICAgICAgcmV0dXJuIHNlbGYuX3Jldmlld2VycwogCi0gICAgZGVmIF9lbWFpbF90b19j b21taXR0ZXJfbWFwKHNlbGYpOgotICAgICAgICBpZiBub3QgbGVuKHNlbGYuX2NvbW1pdHRlcnNf YnlfZW1haWwpOgotICAgICAgICAgICAgZm9yIGNvbW1pdHRlciBpbiBzZWxmLl9jb21taXR0ZXJz OgotICAgICAgICAgICAgICAgIGZvciBlbWFpbCBpbiBjb21taXR0ZXIuZW1haWxzOgotICAgICAg ICAgICAgICAgICAgICBzZWxmLl9jb21taXR0ZXJzX2J5X2VtYWlsW2VtYWlsXSA9IGNvbW1pdHRl cgotICAgICAgICByZXR1cm4gc2VsZi5fY29tbWl0dGVyc19ieV9lbWFpbAorICAgIGRlZiBfZW1h aWxfdG9fY29udHJpYnV0b3JfbWFwKHNlbGYpOgorICAgICAgICBpZiBub3QgbGVuKHNlbGYuX2Nv bnRyaWJ1dG9yc19ieV9lbWFpbCk6CisgICAgICAgICAgICBmb3IgY29udHJpYnV0b3IgaW4gc2Vs Zi5fY29udHJpYnV0b3JzOgorICAgICAgICAgICAgICAgIGZvciBlbWFpbCBpbiBjb250cmlidXRv ci5lbWFpbHM6CisgICAgICAgICAgICAgICAgICAgIGFzc2VydChlbWFpbCBub3QgaW4gc2VsZi5f Y29udHJpYnV0b3JzX2J5X2VtYWlsKSAgIyBXZSBzaG91bGQgbmV2ZXIgaGF2ZSBkdXBsaWNhdGUg ZW1haWxzLgorICAgICAgICAgICAgICAgICAgICBzZWxmLl9jb250cmlidXRvcnNfYnlfZW1haWxb ZW1haWxdID0gY29udHJpYnV0b3IKKyAgICAgICAgcmV0dXJuIHNlbGYuX2NvbnRyaWJ1dG9yc19i eV9lbWFpbAogCi0gICAgZGVmIGNvbW1pdHRlcl9ieV9uYW1lKHNlbGYsIG5hbWUpOgorICAgIGRl ZiBfY29tbWl0dGVyX29ubHkoc2VsZiwgcmVjb3JkKToKKyAgICAgICAgaWYgcmVjb3JkIGFuZCBu b3QgcmVjb3JkLmNhbl9jb21taXQ6CisgICAgICAgICAgICByZXR1cm4gTm9uZQorICAgICAgICBy ZXR1cm4gcmVjb3JkCisKKyAgICBkZWYgX3Jldmlld2VyX29ubHkoc2VsZiwgcmVjb3JkKToKKyAg ICAgICAgaWYgcmVjb3JkIGFuZCBub3QgcmVjb3JkLmNhbl9yZXZpZXc6CisgICAgICAgICAgICBy ZXR1cm4gTm9uZQorICAgICAgICByZXR1cm4gcmVjb3JkCisKKyAgICBkZWYgY29udHJpYnV0b3Jf YnlfbmFtZShzZWxmLCBuYW1lKToKICAgICAgICAgIyBUaGlzIGNvdWxkIGJlIG1hZGUgaW50byBh IGhhc2ggbG9va3VwIGlmIGNhbGxlcnMgbmVlZCBpdCB0byBiZSBmYXN0LgotICAgICAgICBmb3Ig Y29tbWl0dGVyIGluIHNlbGYuY29tbWl0dGVycygpOgotICAgICAgICAgICAgaWYgY29tbWl0dGVy LmZ1bGxfbmFtZSA9PSBuYW1lOgotICAgICAgICAgICAgICAgIHJldHVybiBjb21taXR0ZXIKKyAg ICAgICAgZm9yIGNvbnRyaWJ1dG9yIGluIHNlbGYuY29udHJpYnV0b3JzKCk6CisgICAgICAgICAg ICBpZiBjb250cmlidXRvci5mdWxsX25hbWUgYW5kIGNvbnRyaWJ1dG9yLmZ1bGxfbmFtZSA9PSBu YW1lOgorICAgICAgICAgICAgICAgIHJldHVybiBjb250cmlidXRvcgorICAgICAgICByZXR1cm4g Tm9uZQorCisgICAgZGVmIGNvbW1pdHRlcl9ieV9uYW1lKHNlbGYsIG5hbWUpOgorICAgICAgICBy ZXR1cm4gc2VsZi5fY29tbWl0dGVyX29ubHkoc2VsZi5jb250cmlidXRvcl9ieV9uYW1lKG5hbWUp KQorCisgICAgZGVmIGNvbnRyaWJ1dG9yX2J5X2lyY19uaWNrbmFtZShzZWxmLCBpcmNfbmlja25h bWUpOgorICAgICAgICBmb3IgY29udHJpYnV0b3IgaW4gc2VsZi5jb250cmlidXRvcnMoKToKKyAg ICAgICAgICAgIGlmIGNvbnRyaWJ1dG9yLmlyY19uaWNrbmFtZSBhbmQgY29udHJpYnV0b3IuaXJj X25pY2tuYW1lID09IGlyY19uaWNrbmFtZToKKyAgICAgICAgICAgICAgICByZXR1cm4gY29udHJp YnV0b3IKKyAgICAgICAgcmV0dXJuIE5vbmUKKworICAgIGRlZiBjb250cmlidXRvcl9ieV9lbWFp bChzZWxmLCBlbWFpbCk6CisgICAgICAgIHJldHVybiBzZWxmLl9lbWFpbF90b19jb250cmlidXRv cl9tYXAoKS5nZXQoZW1haWwpCiAKICAgICBkZWYgY29tbWl0dGVyX2J5X2VtYWlsKHNlbGYsIGVt YWlsKToKLSAgICAgICAgcmV0dXJuIHNlbGYuX2VtYWlsX3RvX2NvbW1pdHRlcl9tYXAoKS5nZXQo ZW1haWwpCisgICAgICAgIHJldHVybiBzZWxmLl9jb21taXR0ZXJfb25seShzZWxmLmNvbnRyaWJ1 dG9yX2J5X2VtYWlsKGVtYWlsKSkKIAogICAgIGRlZiByZXZpZXdlcl9ieV9lbWFpbChzZWxmLCBl bWFpbCk6Ci0gICAgICAgIGNvbW1pdHRlciA9IHNlbGYuY29tbWl0dGVyX2J5X2VtYWlsKGVtYWls KQotICAgICAgICBpZiBjb21taXR0ZXIgYW5kIG5vdCBjb21taXR0ZXIuY2FuX3JldmlldzoKLSAg ICAgICAgICAgIHJldHVybiBOb25lCi0gICAgICAgIHJldHVybiBjb21taXR0ZXIKKyAgICAgICAg cmV0dXJuIHNlbGYuX3Jldmlld2VyX29ubHkoc2VsZi5jb250cmlidXRvcl9ieV9lbWFpbChlbWFp bCkpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29t bWl0dGVyc191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZp Zy9jb21taXR0ZXJzX3VuaXR0ZXN0LnB5CmluZGV4IDA2OGMwZWUyMDcyYjZiOGQxY2FiYzFmYmRk NTEzNWFlYjEwNzI4ZWYuLmJmYmZhNzQwYmRjMmI1NjgxMzZmOGNiYTdjOWM2MDNlYjNmYTJhYTYg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb21taXR0 ZXJzX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZp Zy9jb21taXR0ZXJzX3VuaXR0ZXN0LnB5CkBAIC0yNywzMiArMjcsMzggQEAKICMgT0YgVEhJUyBT T0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFH RS4KIAogaW1wb3J0IHVuaXR0ZXN0Ci1mcm9tIHdlYmtpdHB5LmNvbW1vbi5jb25maWcuY29tbWl0 dGVycyBpbXBvcnQgQ29tbWl0dGVyTGlzdCwgQ29tbWl0dGVyLCBSZXZpZXdlcgorZnJvbSB3ZWJr aXRweS5jb21tb24uY29uZmlnLmNvbW1pdHRlcnMgaW1wb3J0IENvbW1pdHRlckxpc3QsIENvbnRy aWJ1dG9yLCBDb21taXR0ZXIsIFJldmlld2VyCiAKIGNsYXNzIENvbW1pdHRlcnNUZXN0KHVuaXR0 ZXN0LlRlc3RDYXNlKToKIAogICAgIGRlZiB0ZXN0X2NvbW1pdHRlcl9sb29rdXAoc2VsZik6CiAg ICAgICAgIGNvbW1pdHRlciA9IENvbW1pdHRlcignVGVzdCBPbmUnLCAnb25lQHRlc3QuY29tJywg J29uZScpCiAgICAgICAgIHJldmlld2VyID0gUmV2aWV3ZXIoJ1Rlc3QgVHdvJywgWyd0d29AdGVz dC5jb20nLCAndHdvQHJhZC5jb20nLCAnc29fdHdvQGdtYWlsLmNvbSddKQotICAgICAgICBjb21t aXR0ZXJfbGlzdCA9IENvbW1pdHRlckxpc3QoY29tbWl0dGVycz1bY29tbWl0dGVyXSwgcmV2aWV3 ZXJzPVtyZXZpZXdlcl0pCisgICAgICAgIGNvbnRyaWJ1dG9yID0gQ29udHJpYnV0b3IoJ1Rlc3Qg VGhyZWUnLCBbJ3RocmVlQHRlc3QuY29tJ10sICd0aHJlZScpCisgICAgICAgIGNvbW1pdHRlcl9s aXN0ID0gQ29tbWl0dGVyTGlzdChjb21taXR0ZXJzPVtjb21taXR0ZXJdLCByZXZpZXdlcnM9W3Jl dmlld2VyXSwgY29udHJpYnV0b3JzPVtjb250cmlidXRvcl0pCiAKLSAgICAgICAgIyBUZXN0IHZh bGlkIGNvbW1pdHRlciBhbmQgcmV2aWV3ZXIgbG9va3VwCisgICAgICAgICMgVGVzdCB2YWxpZCBj b21taXR0ZXIsIHJldmlld2VyIGFuZCBjb250cmlidXRvciBsb29rdXAKICAgICAgICAgc2VsZi5h c3NlcnRFcXVhbChjb21taXR0ZXJfbGlzdC5jb21taXR0ZXJfYnlfZW1haWwoJ29uZUB0ZXN0LmNv bScpLCBjb21taXR0ZXIpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWl0dGVyX2xpc3Qu cmV2aWV3ZXJfYnlfZW1haWwoJ3R3b0B0ZXN0LmNvbScpLCByZXZpZXdlcikKICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChjb21taXR0ZXJfbGlzdC5jb21taXR0ZXJfYnlfZW1haWwoJ3R3b0B0ZXN0 LmNvbScpLCByZXZpZXdlcikKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21taXR0ZXJfbGlz dC5jb21taXR0ZXJfYnlfZW1haWwoJ3R3b0ByYWQuY29tJyksIHJldmlld2VyKQogICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRlcl9saXN0LnJldmlld2VyX2J5X2VtYWlsKCdzb190d29A Z21haWwuY29tJyksIHJldmlld2VyKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRl cl9saXN0LmNvbnRyaWJ1dG9yX2J5X2VtYWlsKCd0aHJlZUB0ZXN0LmNvbScpLCBjb250cmlidXRv cikKIAotICAgICAgICAjIFRlc3QgdmFsaWQgY29tbWl0dGVyIGFuZCByZXZpZXdlciBsb29rdXAK KyAgICAgICAgIyBUZXN0IHZhbGlkIGNvbW1pdHRlciwgcmV2aWV3ZXIgYW5kIGNvbnRyaWJ1dG9y IGxvb2t1cAogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRlcl9saXN0LmNvbW1pdHRl cl9ieV9uYW1lKCJUZXN0IE9uZSIpLCBjb21taXR0ZXIpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoY29tbWl0dGVyX2xpc3QuY29tbWl0dGVyX2J5X25hbWUoIlRlc3QgVHdvIiksIHJldmlld2Vy KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRlcl9saXN0LmNvbW1pdHRlcl9ieV9u YW1lKCJUZXN0IFRocmVlIiksIE5vbmUpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWl0 dGVyX2xpc3QuY29udHJpYnV0b3JfYnlfbmFtZSgiVGVzdCBUaHJlZSIpLCBjb250cmlidXRvcikK IAogICAgICAgICAjIFRlc3QgdGhhdCB0aGUgZmlyc3QgZW1haWwgaXMgYXNzdW1lZCB0byBiZSB0 aGUgQnVnemlsbGEgZW1haWwgYWRkcmVzcyAoZm9yIG5vdykKICAgICAgICAgc2VsZi5hc3NlcnRF cXVhbChjb21taXR0ZXJfbGlzdC5jb21taXR0ZXJfYnlfZW1haWwoJ3R3b0ByYWQuY29tJykuYnVn emlsbGFfZW1haWwoKSwgJ3R3b0B0ZXN0LmNvbScpCiAKICAgICAgICAgIyBUZXN0IHRoYXQgYSBr bm93biBjb21taXR0ZXIgaXMgbm90IHJldHVybmVkIGR1cmluZyByZXZpZXdlciBsb29rdXAKICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21taXR0ZXJfbGlzdC5yZXZpZXdlcl9ieV9lbWFpbCgn b25lQHRlc3QuY29tJyksIE5vbmUpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWl0dGVy X2xpc3QucmV2aWV3ZXJfYnlfZW1haWwoJ3RocmVlQHRlc3QuY29tJyksIE5vbmUpCisgICAgICAg ICMgYW5kIGxpa2V3aXNlIHRoYXQgYSBrbm93biBjb250cmlidXRvciBpcyBub3QgcmV0dXJuZWQg Zm9yIGNvbW1pdHRlciBsb29rdXAuCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWl0dGVy X2xpc3QuY29tbWl0dGVyX2J5X2VtYWlsKCd0aHJlZUB0ZXN0LmNvbScpLCBOb25lKQogCiAgICAg ICAgICMgVGVzdCB0aGF0IHVua25vd24gZW1haWwgYWRkcmVzcyBmYWlsIGJvdGggY29tbWl0dGVy IGFuZCByZXZpZXdlciBsb29rdXAKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21taXR0ZXJf bGlzdC5jb21taXR0ZXJfYnlfZW1haWwoJ2JhckBiYXIuY29tJyksIE5vbmUpCkBAIC02MiwxMSAr NjgsMTAgQEAgY2xhc3MgQ29tbWl0dGVyc1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRlci5lbWFpbHMsIFsnb25lQHRlc3QuY29tJ10pCiAK ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21taXR0ZXIuaXJjX25pY2tuYW1lLCAnb25lJykK KyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21taXR0ZXJfbGlzdC5jb250cmlidXRvcl9ieV9p cmNfbmlja25hbWUoJ29uZScpLCBjb21taXR0ZXIpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo Y29tbWl0dGVyX2xpc3QuY29udHJpYnV0b3JfYnlfaXJjX25pY2tuYW1lKCd0aHJlZScpLCBjb250 cmlidXRvcikKIAotICAgICAgICAjIFRlc3QgdGhhdCBjb21taXR0ZXJzIHJldHVybnMgY29tbWl0 dGVycyBhbmQgcmV2aWV3ZXJzIGFuZCByZXZpZXdlcnMoKSBqdXN0IHJldmlld2Vycy4KKyAgICAg ICAgIyBUZXN0IHRoYXQgdGhlIGxpc3RzIHJldHVybmVkIGFyZSBhcmUgd2UgZXhwZWN0IHRoZW0u CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWl0dGVyX2xpc3QuY29udHJpYnV0b3JzKCks IFtjb250cmlidXRvciwgY29tbWl0dGVyLCByZXZpZXdlcl0pCiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoY29tbWl0dGVyX2xpc3QuY29tbWl0dGVycygpLCBbY29tbWl0dGVyLCByZXZpZXdlcl0p CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWl0dGVyX2xpc3QucmV2aWV3ZXJzKCksIFty ZXZpZXdlcl0pCi0KLQotaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKLSAgICB1bml0dGVzdC5t YWluKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvaXJjX2Nv bW1hbmQucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L2lyY19jb21tYW5kLnB5 CmluZGV4IDU4M2EwMWRkYjJkMjk4MGE4ZjFhODU4YTAxMjBiZGZmZmY3NDZiNDkuLjExZDdlMTVm NTJmZGIwM2JjZWJjMWRkZDEyODMxZDliNGM4NjNkMGUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdG9vbC9ib3QvaXJjX2NvbW1hbmQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS90b29sL2JvdC9pcmNfY29tbWFuZC5weQpAQCAtMTQzLDggKzE0MywxMyBAQCBjbGFz cyBDcmVhdGVCdWcoSVJDQ29tbWFuZCk6CiAgICAgICAgIGJ1Z190aXRsZSA9ICIgIi5qb2luKGFy Z3MpCiAgICAgICAgIGJ1Z19kZXNjcmlwdGlvbiA9ICIlc1xuUmVxdWVzdGVkIGJ5ICVzIG9uICVz LiIgJSAoYnVnX3RpdGxlLCBuaWNrLCBjb25maWdfaXJjLmNoYW5uZWwpCiAKKyAgICAgICAgIyBU aGVyZSBoYXBwZW5zIHRvIGJlIGEgY29tbWl0dGVycyBsaXN0IGh1bmcgb2ZmIG9mIEJ1Z3ppbGxh LCBzbworICAgICAgICAjIHJlLXVzaW5nIHRoYXQgb25lIG1ha2VzIHRoaW5ncyBlYXNpZXN0IGZv ciBub3cuCisgICAgICAgIHJlcXVlc3RlciA9IHRvb2wuYnVncy5jb21taXR0ZXJzLmNvbnRyaWJ1 dG9yX2J5X2lyY19uaWNrbmFtZShuaWNrKQorICAgICAgICByZXF1ZXN0ZXJfZW1haWwgPSByZXF1 ZXN0ZXIuYnVnemlsbGFfZW1haWwoKSBpZiByZXF1ZXN0ZXIgZWxzZSBOb25lCisKICAgICAgICAg dHJ5OgotICAgICAgICAgICAgYnVnX2lkID0gdG9vbC5idWdzLmNyZWF0ZV9idWcoYnVnX3RpdGxl LCBidWdfZGVzY3JpcHRpb24pCisgICAgICAgICAgICBidWdfaWQgPSB0b29sLmJ1Z3MuY3JlYXRl X2J1ZyhidWdfdGl0bGUsIGJ1Z19kZXNjcmlwdGlvbiwgY2M9cmVxdWVzdGVyX2VtYWlsLCBhc3Np Z25lZT1yZXF1ZXN0ZXJfZW1haWwpCiAgICAgICAgICAgICBidWdfdXJsID0gdG9vbC5idWdzLmJ1 Z191cmxfZm9yX2J1Z19pZChidWdfaWQpCiAgICAgICAgICAgICByZXR1cm4gIiVzOiBDcmVhdGVk IGJ1ZzogJXMiICUgKG5pY2ssIGJ1Z191cmwpCiAgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24sIGU6 CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L2lyY19jb21tYW5k X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9pcmNfY29tbWFu ZF91bml0dGVzdC5weQppbmRleCAyNzMyZDk0YzlkNTU3MjhhNTk3NzU2NzczYmQwOTkyNTg4NjY3 YzRlLi4wOTVlNjdhN2M0Yzk3ZWQzOGNhNDlkMmY4ODkxMzk1OWRhZGMwYzgwIDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L2lyY19jb21tYW5kX3VuaXR0ZXN0LnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvaXJjX2NvbW1hbmRfdW5pdHRl c3QucHkKQEAgLTU2LDEyICs1NiwxNiBAQCBjbGFzcyBJUkNDb21tYW5kVGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKCJ0b206IFVzYWdlOiBCVUdfVElU TEUiLAogICAgICAgICAgICAgICAgICAgICAgICAgICBjcmVhdGVfYnVnLmV4ZWN1dGUoInRvbSIs IFtdLCBOb25lLCBOb25lKSkKIAorICAgICAgICBleGFtcGxlX2FyZ3MgPSBbInNoZXJyaWYtYm90 IiwgInNob3VsZCIsICJoYXZlIiwgImEiLCAiY3JlYXRlLWJ1ZyIsICJjb21tYW5kIl0KICAgICAg ICAgdG9vbCA9IE1vY2tUb29sKCkKKworICAgICAgICAjIE1vY2tCdWd6aWxsYSBoYXMgYSBjcmVh dGVfYnVnLCBidXQgaXQgbG9ncyB0byBzdGRlcnIsIHRoaXMgYXZvaWRzIGFueSBsb2dnaW5nLgor ICAgICAgICB0b29sLmJ1Z3MuY3JlYXRlX2J1ZyA9IGxhbWJkYSBhLCBiLCBjYz1Ob25lLCBhc3Np Z25lZT1Ob25lOiA3OAogICAgICAgICBzZWxmLmFzc2VydEVxdWFscygidG9tOiBDcmVhdGVkIGJ1 ZzogaHR0cDovL2V4YW1wbGUuY29tLzc4IiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgY3Jl YXRlX2J1Zy5leGVjdXRlKCJ0b20iLCBbInNoZXJyaWYtYm90IiwgInNob3VsZCIsICJoYXZlIiwg ImEiLCAiY3JlYXRlLWJ1ZyIsICJjb21tYW5kIl0sIHRvb2wsIE5vbmUpKQorICAgICAgICAgICAg ICAgICAgICAgICAgICBjcmVhdGVfYnVnLmV4ZWN1dGUoInRvbSIsIGV4YW1wbGVfYXJncywgdG9v bCwgTm9uZSkpCiAKLSAgICAgICAgZGVmIG1vY2tfY3JlYXRlX2J1Zyh0aXRsZSwgZGVzY3JpcHRp b24pOgorICAgICAgICBkZWYgbW9ja19jcmVhdGVfYnVnKHRpdGxlLCBkZXNjcmlwdGlvbiwgY2M9 Tm9uZSwgYXNzaWduZWU9Tm9uZSk6CiAgICAgICAgICAgICByYWlzZSBFeGNlcHRpb24oIkV4Y2Vw dGlvbiBmcm9tIGJ1Z3ppbGxhISIpCiAgICAgICAgIHRvb2wuYnVncy5jcmVhdGVfYnVnID0gbW9j a19jcmVhdGVfYnVnCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKCJ0b206IEZhaWxlZCB0byBj cmVhdGUgYnVnOlxuRXhjZXB0aW9uIGZyb20gYnVnemlsbGEhIiwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgY3JlYXRlX2J1Zy5leGVjdXRlKCJ0b20iLCBbInNoZXJyaWYtYm90IiwgInNob3Vs ZCIsICJoYXZlIiwgImEiLCAiY3JlYXRlLWJ1ZyIsICJjb21tYW5kIl0sIHRvb2wsIE5vbmUpKQor ICAgICAgICAgICAgICAgICAgICAgICAgICBjcmVhdGVfYnVnLmV4ZWN1dGUoInRvbSIsIGV4YW1w bGVfYXJncywgdG9vbCwgTm9uZSkpCg== 91290 2011-04-27 08:45:10 -0700 2011-04-27 08:49:09 -0700 Patch for landing bug-59545-20110427084509.patch text/plain 19476 eric U3VidmVyc2lvbiBSZXZpc2lvbjogODUwMTcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwODExMTMzMzAxY2Q3NTc4MTdjZWM5NTIyNzdiOWY0NzBj MGUyNjE1Li4zNmZmZTkyZTE5ZGYyNDJjYWMwZjg1ZTMxYzg1ODdhZWM1MWI5YjViIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTEtMDQtMjYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE1paGFpIFBhcnBhcml0YS4KKworICAgICAgICBzaGVycmlmYm90IGNyZWF0 ZS1idWcgc2hvdWxkbid0IGFzc2lnbiBidWdzIHRvIHdlYmtpdC5yZXZpZXcuYm90CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTU0NQorCisgICAgICAg IFRvIGRvIHRoaXMsIEkgbmVlZGVkIGEgd2F5IHRvIGxvb2sgdXAgY29udHJpYnV0b3JzIGJ5IGly Yy1uYW1lCisgICAgICAgIChzaW5jZSBhbnlvbmUgaW4gI3dlYmtpdCB3aG8gbWlnaHQgdXNlIHRo aXMgY29tbWFuZCBtYXkgbm90IGJlIGEgY29tbWl0dGVyKS4KKyAgICAgICAgVG8gbG9va3VwIGNv bnRyaWJ1dG9ycywgSSBoYWQgdG8gbWFrZSBDb250cmlidXRvciBhIHJlYWwgb2JqZWN0LgorICAg ICAgICBXaGljaCBsZWQgbWUgdG8gcmVkZXNpZ24gcGFydHMgb2YgY29tbWl0dGVycy5weS4uLgor ICAgICAgICBhbmQgZmluYWxseSBmaXggb25lIHNwb3QgaW4gY2hhbmdlbG9nLnB5IHdoZXJlIHdl IHdhbnRlZCB0byBiZQorICAgICAgICBsb29raW5nIHVwIGNvbnRyaWJ1dG9ycyBhbmQgbm90IGNv bW1pdHRlcnMuCisKKyAgICAgICAgT3ZlcmFsbCBhIHByZXR0eSBzaW1wbGUgZml4LCBvbmNlIHlv dSB3YWRlIHRocm91Z2ggdGhlIHlhay1oYWlyLgorCisgICAgICAgIFRoaXMgbWF5IG5vdCBwcmV2 ZW50ICphbGwqIHBvc3NpYmxlIHdheXMgdGhhdCBidWdzIHdvdWxkIGdldCBhc3NpZ25lZAorICAg ICAgICB0byB3ZWJraXQucmV2aWV3LmJvdC4gIElmIHdlIGRvbid0IHJlY29nbml6ZSB0aGUgcmVx dWVzdGVyIHdlIHdpbGwKKyAgICAgICAgZ28gdGhyb3VnaCB0aGUgcHJldmlvdXMgY29kZSBwYXRo ICh3aGljaCBzaG91bGRuJ3QgY2hhbmdlIHRoZSBhc3NpZ25lZQorICAgICAgICBvbiB0aGUgYnVn IGZyb20gdGhlIGRlZmF1bHQgYXMgZmFyIGFzIEkgY2FuIHRlbGwpLgorCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hhbmdlbG9nLnB5OgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzLnB5OgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzX3VuaXR0ZXN0LnB5OgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvaXJjX2NvbW1hbmQucHk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9pcmNfY29tbWFuZF91bml0dGVzdC5weToKKwog MjAxMS0wNC0yNiAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEFkZWxlIFBldGVyc29uLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hhbmdlbG9nLnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hhbmdlbG9nLnB5CmluZGV4IGE4NmI3YTkzMzJiOTU2 ZjAyMWQwZWZmNzQ1NTdkMWRhZjI1MmVmYzEuLjVmNjRjMDQzMDVkZDE4MmYzMjExOWIwNTIyYmZi ZGE4Zjc0ZmU2NzggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No ZWNrb3V0L2NoYW5nZWxvZy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9jaGFuZ2Vsb2cucHkKQEAgLTY0LDcgKzY0LDcgQEAgY2xhc3MgQ2hhbmdlTG9nRW50 cnkob2JqZWN0KToKICAgICAgICAgc2VsZi5fcmV2aWV3ZXJfdGV4dCA9IG1hdGNoLmdyb3VwKCJy ZXZpZXdlciIpIGlmIG1hdGNoIGVsc2UgTm9uZQogCiAgICAgICAgIHNlbGYuX3Jldmlld2VyID0g c2VsZi5fY29tbWl0dGVyX2xpc3QuY29tbWl0dGVyX2J5X25hbWUoc2VsZi5fcmV2aWV3ZXJfdGV4 dCkKLSAgICAgICAgc2VsZi5fYXV0aG9yID0gc2VsZi5fY29tbWl0dGVyX2xpc3QuY29tbWl0dGVy X2J5X2VtYWlsKHNlbGYuX2F1dGhvcl9lbWFpbCkgb3Igc2VsZi5fY29tbWl0dGVyX2xpc3QuY29t bWl0dGVyX2J5X25hbWUoc2VsZi5fYXV0aG9yX25hbWUpCisgICAgICAgIHNlbGYuX2F1dGhvciA9 IHNlbGYuX2NvbW1pdHRlcl9saXN0LmNvbnRyaWJ1dG9yX2J5X2VtYWlsKHNlbGYuX2F1dGhvcl9l bWFpbCkgb3Igc2VsZi5fY29tbWl0dGVyX2xpc3QuY29udHJpYnV0b3JfYnlfbmFtZShzZWxmLl9h dXRob3JfbmFtZSkKIAogICAgIGRlZiBhdXRob3JfbmFtZShzZWxmKToKICAgICAgICAgcmV0dXJu IHNlbGYuX2F1dGhvcl9uYW1lCkBAIC03Myw3ICs3Myw3IEBAIGNsYXNzIENoYW5nZUxvZ0VudHJ5 KG9iamVjdCk6CiAgICAgICAgIHJldHVybiBzZWxmLl9hdXRob3JfZW1haWwKIAogICAgIGRlZiBh dXRob3Ioc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxmLl9hdXRob3IgIyBNaWdodCBiZSBOb25l CisgICAgICAgIHJldHVybiBzZWxmLl9hdXRob3IgICMgTWlnaHQgYmUgTm9uZQogCiAgICAgIyBG SVhNRTogRXZlbnR1YWxseSB3ZSB3b3VsZCBsaWtlIHRvIG1hcCByZXZpd2VyIG5hbWVzIHRvIHJl dmlld2VyIG9iamVjdHMuCiAgICAgIyBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTI2NTMzCkBAIC04MSw3ICs4MSw3IEBAIGNsYXNzIENoYW5nZUxvZ0VudHJ5KG9i amVjdCk6CiAgICAgICAgIHJldHVybiBzZWxmLl9yZXZpZXdlcl90ZXh0CiAKICAgICBkZWYgcmV2 aWV3ZXIoc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxmLl9yZXZpZXdlciAjIE1pZ2h0IGJlIE5v bmUKKyAgICAgICAgcmV0dXJuIHNlbGYuX3Jldmlld2VyICAjIE1pZ2h0IGJlIE5vbmUsIG1pZ2h0 IGFsc28gbm90IGJlIGEgUmV2aWV3ZXIhCiAKICAgICBkZWYgY29udGVudHMoc2VsZik6CiAgICAg ICAgIHJldHVybiBzZWxmLl9jb250ZW50cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vY29uZmlnL2NvbW1pdHRlcnMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jb25maWcvY29tbWl0dGVycy5weQppbmRleCBkMDVmODNiZTI0OGFiOTEwZjY5N2Vm YzE5ZTI4MDQ4ZGVhNWE1ZTIxLi5lMDZkYzA4YWY2MDM2MTk0NGE4YjNkNDhjNjg3MTIzODNkNmJi NTMzIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29t bWl0dGVycy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29t bWl0dGVycy5weQpAQCAtMSw1ICsxLDUgQEAKICMgQ29weXJpZ2h0IChjKSAyMDExLCBBcHBsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0jIENvcHlyaWdodCAoYykgMjAwOSwgR29vZ2xlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChjKSAyMDA5LCAyMDExIEdvb2ds ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBtb2RpZmljYXRp b24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMg YXJlCkBAIC0yNywyMyArMjcsMjAgQEAKICMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVS V0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9GIFRISVMgU09GVFdB UkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAj Ci0jIFdlYktpdCdzIFB5dGhvbiBtb2R1bGUgZm9yIGNvbW1pdHRlciBhbmQgcmV2aWV3ZXIgdmFs aWRhdGlvbgorIyBXZWJLaXQncyBQeXRob24gbW9kdWxlIGZvciBjb21taXR0ZXIgYW5kIHJldmll d2VyIHZhbGlkYXRpb24uCiAKIAotY2xhc3MgQ29udHJpYnV0b3I6Ci0KLSAgICBkZWYgX19pbml0 X18oc2VsZiwgbmFtZSwgZW1haWxfb3JfZW1haWxzLCBpcmNfbmlja25hbWU9Tm9uZSk6Ci0gICAg ICAgIHJldHVybgotCi1jbGFzcyBDb21taXR0ZXI6Ci0KK2NsYXNzIENvbnRyaWJ1dG9yKG9iamVj dCk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJjX25p Y2tuYW1lPU5vbmUpOgorICAgICAgICBhc3NlcnQobmFtZSkKKyAgICAgICAgYXNzZXJ0KGVtYWls X29yX2VtYWlscykKICAgICAgICAgc2VsZi5mdWxsX25hbWUgPSBuYW1lCiAgICAgICAgIGlmIGlz aW5zdGFuY2UoZW1haWxfb3JfZW1haWxzLCBzdHIpOgogICAgICAgICAgICAgc2VsZi5lbWFpbHMg PSBbZW1haWxfb3JfZW1haWxzXQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgc2VsZi5lbWFp bHMgPSBlbWFpbF9vcl9lbWFpbHMKICAgICAgICAgc2VsZi5pcmNfbmlja25hbWUgPSBpcmNfbmlj a25hbWUKKyAgICAgICAgc2VsZi5jYW5fY29tbWl0ID0gRmFsc2UKICAgICAgICAgc2VsZi5jYW5f cmV2aWV3ID0gRmFsc2UKIAogICAgIGRlZiBidWd6aWxsYV9lbWFpbChzZWxmKToKQEAgLTU1LDgg KzUyLDEzIEBAIGNsYXNzIENvbW1pdHRlcjoKICAgICAgICAgcmV0dXJuICciJXMiIDwlcz4nICUg KHNlbGYuZnVsbF9uYW1lLCBzZWxmLmVtYWlsc1swXSkKIAogCi1jbGFzcyBSZXZpZXdlcihDb21t aXR0ZXIpOgorY2xhc3MgQ29tbWl0dGVyKENvbnRyaWJ1dG9yKToKKyAgICBkZWYgX19pbml0X18o c2VsZiwgbmFtZSwgZW1haWxfb3JfZW1haWxzLCBpcmNfbmlja25hbWU9Tm9uZSk6CisgICAgICAg IENvbnRyaWJ1dG9yLl9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJjX25p Y2tuYW1lKQorICAgICAgICBzZWxmLmNhbl9jb21taXQgPSBUcnVlCisKIAorY2xhc3MgUmV2aWV3 ZXIoQ29tbWl0dGVyKToKICAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgZW1haWxfb3JfZW1h aWxzLCBpcmNfbmlja25hbWU9Tm9uZSk6CiAgICAgICAgIENvbW1pdHRlci5fX2luaXRfXyhzZWxm LCBuYW1lLCBlbWFpbF9vcl9lbWFpbHMsIGlyY19uaWNrbmFtZSkKICAgICAgICAgc2VsZi5jYW5f cmV2aWV3ID0gVHJ1ZQpAQCAtMzQ0LDE2ICszNDYsMjAgQEAgcmV2aWV3ZXJzX2xpc3QgPSBbCiBd CiAKIAotY2xhc3MgQ29tbWl0dGVyTGlzdDoKK2NsYXNzIENvbW1pdHRlckxpc3Qob2JqZWN0KToK IAogICAgICMgQ29tbWl0dGVycyBhbmQgcmV2aWV3ZXJzIGFyZSBwYXNzZWQgaW4gdG8gYWxsb3cg ZWFzeSB0ZXN0aW5nCi0KICAgICBkZWYgX19pbml0X18oc2VsZiwKICAgICAgICAgICAgICAgICAg Y29tbWl0dGVycz1jb21taXR0ZXJzX3VuYWJsZV90b19yZXZpZXcsCi0gICAgICAgICAgICAgICAg IHJldmlld2Vycz1yZXZpZXdlcnNfbGlzdCk6CisgICAgICAgICAgICAgICAgIHJldmlld2Vycz1y ZXZpZXdlcnNfbGlzdCwKKyAgICAgICAgICAgICAgICAgY29udHJpYnV0b3JzPWNvbnRyaWJ1dG9y c193aG9fYXJlX25vdF9jb21taXR0ZXJzKToKKyAgICAgICAgc2VsZi5fY29udHJpYnV0b3JzID0g Y29udHJpYnV0b3JzICsgY29tbWl0dGVycyArIHJldmlld2VycwogICAgICAgICBzZWxmLl9jb21t aXR0ZXJzID0gY29tbWl0dGVycyArIHJldmlld2VycwogICAgICAgICBzZWxmLl9yZXZpZXdlcnMg PSByZXZpZXdlcnMKLSAgICAgICAgc2VsZi5fY29tbWl0dGVyc19ieV9lbWFpbCA9IHt9CisgICAg ICAgIHNlbGYuX2NvbnRyaWJ1dG9yc19ieV9lbWFpbCA9IHt9CisKKyAgICBkZWYgY29udHJpYnV0 b3JzKHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi5fY29udHJpYnV0b3JzCiAKICAgICBkZWYg Y29tbWl0dGVycyhzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX2NvbW1pdHRlcnMKQEAgLTM2 MSwyNCArMzY3LDQ1IEBAIGNsYXNzIENvbW1pdHRlckxpc3Q6CiAgICAgZGVmIHJldmlld2Vycyhz ZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX3Jldmlld2VycwogCi0gICAgZGVmIF9lbWFpbF90 b19jb21taXR0ZXJfbWFwKHNlbGYpOgotICAgICAgICBpZiBub3QgbGVuKHNlbGYuX2NvbW1pdHRl cnNfYnlfZW1haWwpOgotICAgICAgICAgICAgZm9yIGNvbW1pdHRlciBpbiBzZWxmLl9jb21taXR0 ZXJzOgotICAgICAgICAgICAgICAgIGZvciBlbWFpbCBpbiBjb21taXR0ZXIuZW1haWxzOgotICAg ICAgICAgICAgICAgICAgICBzZWxmLl9jb21taXR0ZXJzX2J5X2VtYWlsW2VtYWlsXSA9IGNvbW1p dHRlcgotICAgICAgICByZXR1cm4gc2VsZi5fY29tbWl0dGVyc19ieV9lbWFpbAorICAgIGRlZiBf ZW1haWxfdG9fY29udHJpYnV0b3JfbWFwKHNlbGYpOgorICAgICAgICBpZiBub3QgbGVuKHNlbGYu X2NvbnRyaWJ1dG9yc19ieV9lbWFpbCk6CisgICAgICAgICAgICBmb3IgY29udHJpYnV0b3IgaW4g c2VsZi5fY29udHJpYnV0b3JzOgorICAgICAgICAgICAgICAgIGZvciBlbWFpbCBpbiBjb250cmli dXRvci5lbWFpbHM6CisgICAgICAgICAgICAgICAgICAgIGFzc2VydChlbWFpbCBub3QgaW4gc2Vs Zi5fY29udHJpYnV0b3JzX2J5X2VtYWlsKSAgIyBXZSBzaG91bGQgbmV2ZXIgaGF2ZSBkdXBsaWNh dGUgZW1haWxzLgorICAgICAgICAgICAgICAgICAgICBzZWxmLl9jb250cmlidXRvcnNfYnlfZW1h aWxbZW1haWxdID0gY29udHJpYnV0b3IKKyAgICAgICAgcmV0dXJuIHNlbGYuX2NvbnRyaWJ1dG9y c19ieV9lbWFpbAogCi0gICAgZGVmIGNvbW1pdHRlcl9ieV9uYW1lKHNlbGYsIG5hbWUpOgorICAg IGRlZiBfY29tbWl0dGVyX29ubHkoc2VsZiwgcmVjb3JkKToKKyAgICAgICAgaWYgcmVjb3JkIGFu ZCBub3QgcmVjb3JkLmNhbl9jb21taXQ6CisgICAgICAgICAgICByZXR1cm4gTm9uZQorICAgICAg ICByZXR1cm4gcmVjb3JkCisKKyAgICBkZWYgX3Jldmlld2VyX29ubHkoc2VsZiwgcmVjb3JkKToK KyAgICAgICAgaWYgcmVjb3JkIGFuZCBub3QgcmVjb3JkLmNhbl9yZXZpZXc6CisgICAgICAgICAg ICByZXR1cm4gTm9uZQorICAgICAgICByZXR1cm4gcmVjb3JkCisKKyAgICBkZWYgY29udHJpYnV0 b3JfYnlfbmFtZShzZWxmLCBuYW1lKToKICAgICAgICAgIyBUaGlzIGNvdWxkIGJlIG1hZGUgaW50 byBhIGhhc2ggbG9va3VwIGlmIGNhbGxlcnMgbmVlZCBpdCB0byBiZSBmYXN0LgotICAgICAgICBm b3IgY29tbWl0dGVyIGluIHNlbGYuY29tbWl0dGVycygpOgotICAgICAgICAgICAgaWYgY29tbWl0 dGVyLmZ1bGxfbmFtZSA9PSBuYW1lOgotICAgICAgICAgICAgICAgIHJldHVybiBjb21taXR0ZXIK KyAgICAgICAgZm9yIGNvbnRyaWJ1dG9yIGluIHNlbGYuY29udHJpYnV0b3JzKCk6CisgICAgICAg ICAgICBpZiBjb250cmlidXRvci5mdWxsX25hbWUgYW5kIGNvbnRyaWJ1dG9yLmZ1bGxfbmFtZSA9 PSBuYW1lOgorICAgICAgICAgICAgICAgIHJldHVybiBjb250cmlidXRvcgorICAgICAgICByZXR1 cm4gTm9uZQorCisgICAgZGVmIGNvbW1pdHRlcl9ieV9uYW1lKHNlbGYsIG5hbWUpOgorICAgICAg ICByZXR1cm4gc2VsZi5fY29tbWl0dGVyX29ubHkoc2VsZi5jb250cmlidXRvcl9ieV9uYW1lKG5h bWUpKQorCisgICAgZGVmIGNvbnRyaWJ1dG9yX2J5X2lyY19uaWNrbmFtZShzZWxmLCBpcmNfbmlj a25hbWUpOgorICAgICAgICBmb3IgY29udHJpYnV0b3IgaW4gc2VsZi5jb250cmlidXRvcnMoKToK KyAgICAgICAgICAgIGlmIGNvbnRyaWJ1dG9yLmlyY19uaWNrbmFtZSBhbmQgY29udHJpYnV0b3Iu aXJjX25pY2tuYW1lID09IGlyY19uaWNrbmFtZToKKyAgICAgICAgICAgICAgICByZXR1cm4gY29u dHJpYnV0b3IKKyAgICAgICAgcmV0dXJuIE5vbmUKKworICAgIGRlZiBjb250cmlidXRvcl9ieV9l bWFpbChzZWxmLCBlbWFpbCk6CisgICAgICAgIHJldHVybiBzZWxmLl9lbWFpbF90b19jb250cmli dXRvcl9tYXAoKS5nZXQoZW1haWwpCiAKICAgICBkZWYgY29tbWl0dGVyX2J5X2VtYWlsKHNlbGYs IGVtYWlsKToKLSAgICAgICAgcmV0dXJuIHNlbGYuX2VtYWlsX3RvX2NvbW1pdHRlcl9tYXAoKS5n ZXQoZW1haWwpCisgICAgICAgIHJldHVybiBzZWxmLl9jb21taXR0ZXJfb25seShzZWxmLmNvbnRy aWJ1dG9yX2J5X2VtYWlsKGVtYWlsKSkKIAogICAgIGRlZiByZXZpZXdlcl9ieV9lbWFpbChzZWxm LCBlbWFpbCk6Ci0gICAgICAgIGNvbW1pdHRlciA9IHNlbGYuY29tbWl0dGVyX2J5X2VtYWlsKGVt YWlsKQotICAgICAgICBpZiBjb21taXR0ZXIgYW5kIG5vdCBjb21taXR0ZXIuY2FuX3JldmlldzoK LSAgICAgICAgICAgIHJldHVybiBOb25lCi0gICAgICAgIHJldHVybiBjb21taXR0ZXIKKyAgICAg ICAgcmV0dXJuIHNlbGYuX3Jldmlld2VyX29ubHkoc2VsZi5jb250cmlidXRvcl9ieV9lbWFpbChl bWFpbCkpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcv Y29tbWl0dGVyc191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2Nv bmZpZy9jb21taXR0ZXJzX3VuaXR0ZXN0LnB5CmluZGV4IDA2OGMwZWUyMDcyYjZiOGQxY2FiYzFm YmRkNTEzNWFlYjEwNzI4ZWYuLmJmYmZhNzQwYmRjMmI1NjgxMzZmOGNiYTdjOWM2MDNlYjNmYTJh YTYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb21t aXR0ZXJzX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2Nv bmZpZy9jb21taXR0ZXJzX3VuaXR0ZXN0LnB5CkBAIC0yNywzMiArMjcsMzggQEAKICMgT0YgVEhJ UyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERB TUFHRS4KIAogaW1wb3J0IHVuaXR0ZXN0Ci1mcm9tIHdlYmtpdHB5LmNvbW1vbi5jb25maWcuY29t bWl0dGVycyBpbXBvcnQgQ29tbWl0dGVyTGlzdCwgQ29tbWl0dGVyLCBSZXZpZXdlcgorZnJvbSB3 ZWJraXRweS5jb21tb24uY29uZmlnLmNvbW1pdHRlcnMgaW1wb3J0IENvbW1pdHRlckxpc3QsIENv bnRyaWJ1dG9yLCBDb21taXR0ZXIsIFJldmlld2VyCiAKIGNsYXNzIENvbW1pdHRlcnNUZXN0KHVu aXR0ZXN0LlRlc3RDYXNlKToKIAogICAgIGRlZiB0ZXN0X2NvbW1pdHRlcl9sb29rdXAoc2VsZik6 CiAgICAgICAgIGNvbW1pdHRlciA9IENvbW1pdHRlcignVGVzdCBPbmUnLCAnb25lQHRlc3QuY29t JywgJ29uZScpCiAgICAgICAgIHJldmlld2VyID0gUmV2aWV3ZXIoJ1Rlc3QgVHdvJywgWyd0d29A dGVzdC5jb20nLCAndHdvQHJhZC5jb20nLCAnc29fdHdvQGdtYWlsLmNvbSddKQotICAgICAgICBj b21taXR0ZXJfbGlzdCA9IENvbW1pdHRlckxpc3QoY29tbWl0dGVycz1bY29tbWl0dGVyXSwgcmV2 aWV3ZXJzPVtyZXZpZXdlcl0pCisgICAgICAgIGNvbnRyaWJ1dG9yID0gQ29udHJpYnV0b3IoJ1Rl c3QgVGhyZWUnLCBbJ3RocmVlQHRlc3QuY29tJ10sICd0aHJlZScpCisgICAgICAgIGNvbW1pdHRl cl9saXN0ID0gQ29tbWl0dGVyTGlzdChjb21taXR0ZXJzPVtjb21taXR0ZXJdLCByZXZpZXdlcnM9 W3Jldmlld2VyXSwgY29udHJpYnV0b3JzPVtjb250cmlidXRvcl0pCiAKLSAgICAgICAgIyBUZXN0 IHZhbGlkIGNvbW1pdHRlciBhbmQgcmV2aWV3ZXIgbG9va3VwCisgICAgICAgICMgVGVzdCB2YWxp ZCBjb21taXR0ZXIsIHJldmlld2VyIGFuZCBjb250cmlidXRvciBsb29rdXAKICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChjb21taXR0ZXJfbGlzdC5jb21taXR0ZXJfYnlfZW1haWwoJ29uZUB0ZXN0 LmNvbScpLCBjb21taXR0ZXIpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWl0dGVyX2xp c3QucmV2aWV3ZXJfYnlfZW1haWwoJ3R3b0B0ZXN0LmNvbScpLCByZXZpZXdlcikKICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChjb21taXR0ZXJfbGlzdC5jb21taXR0ZXJfYnlfZW1haWwoJ3R3b0B0 ZXN0LmNvbScpLCByZXZpZXdlcikKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21taXR0ZXJf bGlzdC5jb21taXR0ZXJfYnlfZW1haWwoJ3R3b0ByYWQuY29tJyksIHJldmlld2VyKQogICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRlcl9saXN0LnJldmlld2VyX2J5X2VtYWlsKCdzb190 d29AZ21haWwuY29tJyksIHJldmlld2VyKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbW1p dHRlcl9saXN0LmNvbnRyaWJ1dG9yX2J5X2VtYWlsKCd0aHJlZUB0ZXN0LmNvbScpLCBjb250cmli dXRvcikKIAotICAgICAgICAjIFRlc3QgdmFsaWQgY29tbWl0dGVyIGFuZCByZXZpZXdlciBsb29r dXAKKyAgICAgICAgIyBUZXN0IHZhbGlkIGNvbW1pdHRlciwgcmV2aWV3ZXIgYW5kIGNvbnRyaWJ1 dG9yIGxvb2t1cAogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRlcl9saXN0LmNvbW1p dHRlcl9ieV9uYW1lKCJUZXN0IE9uZSIpLCBjb21taXR0ZXIpCiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoY29tbWl0dGVyX2xpc3QuY29tbWl0dGVyX2J5X25hbWUoIlRlc3QgVHdvIiksIHJldmll d2VyKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRlcl9saXN0LmNvbW1pdHRlcl9i eV9uYW1lKCJUZXN0IFRocmVlIiksIE5vbmUpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29t bWl0dGVyX2xpc3QuY29udHJpYnV0b3JfYnlfbmFtZSgiVGVzdCBUaHJlZSIpLCBjb250cmlidXRv cikKIAogICAgICAgICAjIFRlc3QgdGhhdCB0aGUgZmlyc3QgZW1haWwgaXMgYXNzdW1lZCB0byBi ZSB0aGUgQnVnemlsbGEgZW1haWwgYWRkcmVzcyAoZm9yIG5vdykKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChjb21taXR0ZXJfbGlzdC5jb21taXR0ZXJfYnlfZW1haWwoJ3R3b0ByYWQuY29tJyku YnVnemlsbGFfZW1haWwoKSwgJ3R3b0B0ZXN0LmNvbScpCiAKICAgICAgICAgIyBUZXN0IHRoYXQg YSBrbm93biBjb21taXR0ZXIgaXMgbm90IHJldHVybmVkIGR1cmluZyByZXZpZXdlciBsb29rdXAK ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21taXR0ZXJfbGlzdC5yZXZpZXdlcl9ieV9lbWFp bCgnb25lQHRlc3QuY29tJyksIE5vbmUpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWl0 dGVyX2xpc3QucmV2aWV3ZXJfYnlfZW1haWwoJ3RocmVlQHRlc3QuY29tJyksIE5vbmUpCisgICAg ICAgICMgYW5kIGxpa2V3aXNlIHRoYXQgYSBrbm93biBjb250cmlidXRvciBpcyBub3QgcmV0dXJu ZWQgZm9yIGNvbW1pdHRlciBsb29rdXAuCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWl0 dGVyX2xpc3QuY29tbWl0dGVyX2J5X2VtYWlsKCd0aHJlZUB0ZXN0LmNvbScpLCBOb25lKQogCiAg ICAgICAgICMgVGVzdCB0aGF0IHVua25vd24gZW1haWwgYWRkcmVzcyBmYWlsIGJvdGggY29tbWl0 dGVyIGFuZCByZXZpZXdlciBsb29rdXAKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21taXR0 ZXJfbGlzdC5jb21taXR0ZXJfYnlfZW1haWwoJ2JhckBiYXIuY29tJyksIE5vbmUpCkBAIC02Miwx MSArNjgsMTAgQEAgY2xhc3MgQ29tbWl0dGVyc1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRlci5lbWFpbHMsIFsnb25lQHRlc3QuY29tJ10p CiAKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21taXR0ZXIuaXJjX25pY2tuYW1lLCAnb25l JykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21taXR0ZXJfbGlzdC5jb250cmlidXRvcl9i eV9pcmNfbmlja25hbWUoJ29uZScpLCBjb21taXR0ZXIpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoY29tbWl0dGVyX2xpc3QuY29udHJpYnV0b3JfYnlfaXJjX25pY2tuYW1lKCd0aHJlZScpLCBj b250cmlidXRvcikKIAotICAgICAgICAjIFRlc3QgdGhhdCBjb21taXR0ZXJzIHJldHVybnMgY29t bWl0dGVycyBhbmQgcmV2aWV3ZXJzIGFuZCByZXZpZXdlcnMoKSBqdXN0IHJldmlld2Vycy4KKyAg ICAgICAgIyBUZXN0IHRoYXQgdGhlIGxpc3RzIHJldHVybmVkIGFyZSBhcmUgd2UgZXhwZWN0IHRo ZW0uCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWl0dGVyX2xpc3QuY29udHJpYnV0b3Jz KCksIFtjb250cmlidXRvciwgY29tbWl0dGVyLCByZXZpZXdlcl0pCiAgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwoY29tbWl0dGVyX2xpc3QuY29tbWl0dGVycygpLCBbY29tbWl0dGVyLCByZXZpZXdl cl0pCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWl0dGVyX2xpc3QucmV2aWV3ZXJzKCks IFtyZXZpZXdlcl0pCi0KLQotaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKLSAgICB1bml0dGVz dC5tYWluKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9i dWd6aWxsYS9hdHRhY2htZW50LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0 L2J1Z3ppbGxhL2F0dGFjaG1lbnQucHkKaW5kZXggODU3NjFmZWE4OTM0YzRjYWU0YWM0YzkwYzJl YzQ3NWVhMTA2ZDY3NC4uNmUxMGQ2NWE5NTIxN2I2ODI5N2Y0ODFmNmUwZjVmM2IzOWUwMzZjNyAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2F0 dGFjaG1lbnQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3pp bGxhL2F0dGFjaG1lbnQucHkKQEAgLTI4LDYgKzI4LDcgQEAKICMgKElOQ0xVRElORyBORUdMSUdF TkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9G IFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VD SCBEQU1BR0UuCiAKK2Zyb20gd2Via2l0cHkuY29tbW9uLm1lbW9pemVkIGltcG9ydCBtZW1vaXpl ZAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmRlcHJlY2F0ZWRfbG9nZ2luZyBpbXBvcnQg bG9nCiAKIApAQCAtMzgsNiArMzksNyBAQCBjbGFzcyBBdHRhY2htZW50KG9iamVjdCk6CiAgICAg ZGVmIF9faW5pdF9fKHNlbGYsIGF0dGFjaG1lbnRfZGljdGlvbmFyeSwgYnVnKToKICAgICAgICAg c2VsZi5fYXR0YWNobWVudF9kaWN0aW9uYXJ5ID0gYXR0YWNobWVudF9kaWN0aW9uYXJ5CiAgICAg ICAgIHNlbGYuX2J1ZyA9IGJ1ZworICAgICAgICAjIEZJWE1FOiBUaGVzZSBzaG91bGQgYmUgcmVw bGFjZWQgd2l0aCBAbWVtb2l6ZWQgYWZ0ZXIgdXBkYXRpbmcgbW9ja3MuCiAgICAgICAgIHNlbGYu X3Jldmlld2VyID0gTm9uZQogICAgICAgICBzZWxmLl9jb21taXR0ZXIgPSBOb25lCiAKQEAgLTQ3 LDkgKzQ5LDkgQEAgY2xhc3MgQXR0YWNobWVudChvYmplY3QpOgogICAgIGRlZiBpZChzZWxmKToK ICAgICAgICAgcmV0dXJuIGludChzZWxmLl9hdHRhY2htZW50X2RpY3Rpb25hcnkuZ2V0KCJpZCIp KQogCi0gICAgZGVmIGF0dGFjaGVyX2lzX2NvbW1pdHRlcihzZWxmKToKLSAgICAgICAgcmV0dXJu IHNlbGYuX2J1Z3ppbGxhLmNvbW1pdHRlcnMuY29tbWl0dGVyX2J5X2VtYWlsKAotICAgICAgICAg ICAgcGF0Y2guYXR0YWNoZXJfZW1haWwoKSkKKyAgICBAbWVtb2l6ZWQKKyAgICBkZWYgYXR0YWNo ZXIoc2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLl9idWd6aWxsYSgpLmNvbW1pdHRlcnMuY29u dHJpYnV0b3JfYnlfZW1haWwoc2VsZi5hdHRhY2hlcl9lbWFpbCgpKQogCiAgICAgZGVmIGF0dGFj aGVyX2VtYWlsKHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5fYXR0YWNobWVudF9kaWN0aW9u YXJ5LmdldCgiYXR0YWNoZXJfZW1haWwiKQpAQCAtOTUsNiArOTcsNyBAQCBjbGFzcyBBdHRhY2ht ZW50KG9iamVjdCk6CiAgICAgICAgIGVtYWlsID0gc2VsZi5fYXR0YWNobWVudF9kaWN0aW9uYXJ5 LmdldCgiJXNfZW1haWwiICUgZmxhZykKICAgICAgICAgaWYgbm90IGVtYWlsOgogICAgICAgICAg ICAgcmV0dXJuIE5vbmUKKyAgICAgICAgIyBGSVhNRTogVGhpcyBpcyBub3QgYSByb2J1c3Qgd2F5 IHRvIGNhbGwgY29tbWl0dGVyX2J5X2VtYWlsCiAgICAgICAgIGNvbW1pdHRlciA9IGdldGF0dHIo c2VsZi5fYnVnemlsbGEoKS5jb21taXR0ZXJzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICIlc19ieV9lbWFpbCIgJSBmbGFnKShlbWFpbCkKICAgICAgICAgaWYgY29tbWl0dGVyOgpAQCAt MTAzLDYgKzEwNiw3IEBAIGNsYXNzIEF0dGFjaG1lbnQob2JqZWN0KToKICAgICAgICAgICAgICAg ICAgc2VsZi5fYXR0YWNobWVudF9kaWN0aW9uYXJ5WydpZCddLAogICAgICAgICAgICAgICAgICBz ZWxmLl9hdHRhY2htZW50X2RpY3Rpb25hcnlbJ2J1Z19pZCddLCBmbGFnLCBlbWFpbCkpCiAKKyAg ICAjIEZJWE1FOiBUaGVzZSBjb3VsZCB1c2UgQG1lbW9pemVkIGxpa2UgYXR0YWNoZXIoKSwgYnV0 IHVuaXQgdGVzdHMgd291bGQgbmVlZCB1cGRhdGVzLgogICAgIGRlZiByZXZpZXdlcihzZWxmKToK ICAgICAgICAgaWYgbm90IHNlbGYuX3Jldmlld2VyOgogICAgICAgICAgICAgc2VsZi5fcmV2aWV3 ZXIgPSBzZWxmLl92YWxpZGF0ZV9mbGFnX3ZhbHVlKCJyZXZpZXdlciIpCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L2lyY19jb21tYW5kLnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS90b29sL2JvdC9pcmNfY29tbWFuZC5weQppbmRleCA1ODNhMDFkZGIyZDI5 ODBhOGYxYTg1OGEwMTIwYmRmZmZmNzQ2YjQ5Li40MDMwOTYwZmUwNmNjMDlmMzk2M2E4Y2NmMDc0 ZGI4ZTU3M2M3MzUxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90 L2lyY19jb21tYW5kLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvaXJj X2NvbW1hbmQucHkKQEAgLTExNSw3ICsxMTUsOCBAQCBjbGFzcyBXaG9pcyhJUkNDb21tYW5kKToK ICAgICAgICAgaWYgbGVuKGFyZ3MpICE9IDE6CiAgICAgICAgICAgICByZXR1cm4gIiVzOiBVc2Fn ZTogQlVHWklMTEFfRU1BSUwiICUgbmljawogICAgICAgICBlbWFpbCA9IGFyZ3NbMF0KLSAgICAg ICAgY29tbWl0dGVyID0gQ29tbWl0dGVyTGlzdCgpLmNvbW1pdHRlcl9ieV9lbWFpbChlbWFpbCkK KyAgICAgICAgIyBGSVhNRTogV2Ugc2hvdWxkIGdldCB0aGUgQ29udHJpYnV0b3JMaXN0IG9mZiB0 aGUgdG9vbCBzb21ld2hlcmUuCisgICAgICAgIGNvbW1pdHRlciA9IENvbW1pdHRlckxpc3QoKS5j b250cmlidXRvcl9ieV9lbWFpbChlbWFpbCkKICAgICAgICAgaWYgbm90IGNvbW1pdHRlcjoKICAg ICAgICAgICAgIHJldHVybiAiJXM6IFNvcnJ5LCBJIGRvbid0IGtub3cgJXMuIE1heWJlIHlvdSBj b3VsZCBpbnRyb2R1Y2UgbWU/IiAlIChuaWNrLCBlbWFpbCkKICAgICAgICAgaWYgbm90IGNvbW1p dHRlci5pcmNfbmlja25hbWU6CkBAIC0xNDMsOCArMTQ0LDEzIEBAIGNsYXNzIENyZWF0ZUJ1ZyhJ UkNDb21tYW5kKToKICAgICAgICAgYnVnX3RpdGxlID0gIiAiLmpvaW4oYXJncykKICAgICAgICAg YnVnX2Rlc2NyaXB0aW9uID0gIiVzXG5SZXF1ZXN0ZWQgYnkgJXMgb24gJXMuIiAlIChidWdfdGl0 bGUsIG5pY2ssIGNvbmZpZ19pcmMuY2hhbm5lbCkKIAorICAgICAgICAjIFRoZXJlIGhhcHBlbnMg dG8gYmUgYSBjb21taXR0ZXJzIGxpc3QgaHVuZyBvZmYgb2YgQnVnemlsbGEsIHNvCisgICAgICAg ICMgcmUtdXNpbmcgdGhhdCBvbmUgbWFrZXMgdGhpbmdzIGVhc2llc3QgZm9yIG5vdy4KKyAgICAg ICAgcmVxdWVzdGVyID0gdG9vbC5idWdzLmNvbW1pdHRlcnMuY29udHJpYnV0b3JfYnlfaXJjX25p Y2tuYW1lKG5pY2spCisgICAgICAgIHJlcXVlc3Rlcl9lbWFpbCA9IHJlcXVlc3Rlci5idWd6aWxs YV9lbWFpbCgpIGlmIHJlcXVlc3RlciBlbHNlIE5vbmUKKwogICAgICAgICB0cnk6Ci0gICAgICAg ICAgICBidWdfaWQgPSB0b29sLmJ1Z3MuY3JlYXRlX2J1ZyhidWdfdGl0bGUsIGJ1Z19kZXNjcmlw dGlvbikKKyAgICAgICAgICAgIGJ1Z19pZCA9IHRvb2wuYnVncy5jcmVhdGVfYnVnKGJ1Z190aXRs ZSwgYnVnX2Rlc2NyaXB0aW9uLCBjYz1yZXF1ZXN0ZXJfZW1haWwsIGFzc2lnbmVlPXJlcXVlc3Rl cl9lbWFpbCkKICAgICAgICAgICAgIGJ1Z191cmwgPSB0b29sLmJ1Z3MuYnVnX3VybF9mb3JfYnVn X2lkKGJ1Z19pZCkKICAgICAgICAgICAgIHJldHVybiAiJXM6IENyZWF0ZWQgYnVnOiAlcyIgJSAo bmljaywgYnVnX3VybCkKICAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiwgZToKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvaXJjX2NvbW1hbmRfdW5pdHRlc3QucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L2lyY19jb21tYW5kX3VuaXR0ZXN0LnB5 CmluZGV4IDI3MzJkOTRjOWQ1NTcyOGE1OTc3NTY3NzNiZDA5OTI1ODg2NjdjNGUuLjA5NWU2N2E3 YzRjOTdlZDM4Y2E0OWQyZjg4OTEzOTU5ZGFkYzBjODAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdG9vbC9ib3QvaXJjX2NvbW1hbmRfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9pcmNfY29tbWFuZF91bml0dGVzdC5weQpAQCAtNTYs MTIgKzU2LDE2IEBAIGNsYXNzIElSQ0NvbW1hbmRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoInRvbTogVXNhZ2U6IEJVR19USVRMRSIsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNyZWF0ZV9idWcuZXhlY3V0ZSgidG9tIiwgW10sIE5vbmUsIE5v bmUpKQogCisgICAgICAgIGV4YW1wbGVfYXJncyA9IFsic2hlcnJpZi1ib3QiLCAic2hvdWxkIiwg ImhhdmUiLCAiYSIsICJjcmVhdGUtYnVnIiwgImNvbW1hbmQiXQogICAgICAgICB0b29sID0gTW9j a1Rvb2woKQorCisgICAgICAgICMgTW9ja0J1Z3ppbGxhIGhhcyBhIGNyZWF0ZV9idWcsIGJ1dCBp dCBsb2dzIHRvIHN0ZGVyciwgdGhpcyBhdm9pZHMgYW55IGxvZ2dpbmcuCisgICAgICAgIHRvb2wu YnVncy5jcmVhdGVfYnVnID0gbGFtYmRhIGEsIGIsIGNjPU5vbmUsIGFzc2lnbmVlPU5vbmU6IDc4 CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKCJ0b206IENyZWF0ZWQgYnVnOiBodHRwOi8vZXhh bXBsZS5jb20vNzgiLAotICAgICAgICAgICAgICAgICAgICAgICAgICBjcmVhdGVfYnVnLmV4ZWN1 dGUoInRvbSIsIFsic2hlcnJpZi1ib3QiLCAic2hvdWxkIiwgImhhdmUiLCAiYSIsICJjcmVhdGUt YnVnIiwgImNvbW1hbmQiXSwgdG9vbCwgTm9uZSkpCisgICAgICAgICAgICAgICAgICAgICAgICAg IGNyZWF0ZV9idWcuZXhlY3V0ZSgidG9tIiwgZXhhbXBsZV9hcmdzLCB0b29sLCBOb25lKSkKIAot ICAgICAgICBkZWYgbW9ja19jcmVhdGVfYnVnKHRpdGxlLCBkZXNjcmlwdGlvbik6CisgICAgICAg IGRlZiBtb2NrX2NyZWF0ZV9idWcodGl0bGUsIGRlc2NyaXB0aW9uLCBjYz1Ob25lLCBhc3NpZ25l ZT1Ob25lKToKICAgICAgICAgICAgIHJhaXNlIEV4Y2VwdGlvbigiRXhjZXB0aW9uIGZyb20gYnVn emlsbGEhIikKICAgICAgICAgdG9vbC5idWdzLmNyZWF0ZV9idWcgPSBtb2NrX2NyZWF0ZV9idWcK ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoInRvbTogRmFpbGVkIHRvIGNyZWF0ZSBidWc6XG5F eGNlcHRpb24gZnJvbSBidWd6aWxsYSEiLAotICAgICAgICAgICAgICAgICAgICAgICAgICBjcmVh dGVfYnVnLmV4ZWN1dGUoInRvbSIsIFsic2hlcnJpZi1ib3QiLCAic2hvdWxkIiwgImhhdmUiLCAi YSIsICJjcmVhdGUtYnVnIiwgImNvbW1hbmQiXSwgdG9vbCwgTm9uZSkpCisgICAgICAgICAgICAg ICAgICAgICAgICAgIGNyZWF0ZV9idWcuZXhlY3V0ZSgidG9tIiwgZXhhbXBsZV9hcmdzLCB0b29s LCBOb25lKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5k cy9lYXJseXdhcm5pbmdzeXN0ZW0ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29t bWFuZHMvZWFybHl3YXJuaW5nc3lzdGVtLnB5CmluZGV4IDk5NmFiMjQzZWIzMWU2NzgxNWQxZWE5 OTNhNzdhNGZlY2UwYWYwYzcuLmEzMjg1MzBkZDk0ZGU3ZDEyMjRhZjNhN2RmOGQ5OTJlZWU2ZDk5 ZWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9lYXJs eXdhcm5pbmdzeXN0ZW0ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1h bmRzL2Vhcmx5d2FybmluZ3N5c3RlbS5weQpAQCAtMTY0LDcgKzE2NCw3IEBAIGNsYXNzIEFic3Ry YWN0Q29tbWl0dGVyT25seUVXUyhBYnN0cmFjdEVhcmx5V2FybmluZ1N5c3RlbSk6CiAgICAgICAg IHNlbGYuX2NvbW1pdHRlcnMgPSBjb21taXR0ZXJzCiAKICAgICBkZWYgcHJvY2Vzc193b3JrX2l0 ZW0oc2VsZiwgcGF0Y2gpOgotICAgICAgICBpZiBub3Qgc2VsZi5fY29tbWl0dGVycy5jb21taXR0 ZXJfYnlfZW1haWwocGF0Y2guYXR0YWNoZXJfZW1haWwoKSk6CisgICAgICAgIGlmIG5vdCBwYXRj aC5hdHRhY2hlcigpIG9yIG5vdCBwYXRjaC5hdHRhY2hlcigpLmNhbl9jb21taXQ6CiAgICAgICAg ICAgICBzZWxmLl9kaWRfZXJyb3IocGF0Y2gsICIlcyBjYW5ub3QgcHJvY2VzcyBwYXRjaGVzIGZy b20gbm9uLWNvbW1pdHRlcnMgOigiICUgc2VsZi5uYW1lKQogICAgICAgICAgICAgcmV0dXJuIEZh bHNlCiAgICAgICAgIHJldHVybiBBYnN0cmFjdEVhcmx5V2FybmluZ1N5c3RlbS5wcm9jZXNzX3dv cmtfaXRlbShzZWxmLCBwYXRjaCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9tb2NrdG9vbC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9tb2NrdG9vbC5w eQppbmRleCA2YjUzMzMyYzBlMGJjYzZiYTZhNDlkNTEzNGRhNjczOGM2YzE4OThiLi5hMTFjMWJl MDAyMjhjYWY0ZTI3YjE5ZDQ2MWRjMTMzNjFlMWQ5NzE1IDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3Rvb2wvbW9ja3Rvb2wucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL21vY2t0b29sLnB5CkBAIC01MzcsNyArNTM3LDcgQEAgY2xhc3MgTW9ja0NoZWNrb3V0 KG9iamVjdCk6CiAgICAgICAgICAgICAiYnVnX2lkIjogNDIsCiAgICAgICAgICAgICAiYXV0aG9y X25hbWUiOiAiQWRhbSBCYXJ0aCIsCiAgICAgICAgICAgICAiYXV0aG9yX2VtYWlsIjogImFiYXJ0 aEB3ZWJraXQub3JnIiwKLSAgICAgICAgICAgICJhdXRob3IiOiBzZWxmLl9jb21taXR0ZXJfbGlz dC5jb21taXR0ZXJfYnlfZW1haWwoImFiYXJ0aEB3ZWJraXQub3JnIiksCisgICAgICAgICAgICAi YXV0aG9yIjogc2VsZi5fY29tbWl0dGVyX2xpc3QuY29udHJpYnV0b3JfYnlfZW1haWwoImFiYXJ0 aEB3ZWJraXQub3JnIiksCiAgICAgICAgICAgICAicmV2aWV3ZXJfdGV4dCI6ICJEYXJpbiBBZGxl ciIsCiAgICAgICAgICAgICAicmV2aWV3ZXIiOiBzZWxmLl9jb21taXR0ZXJfbGlzdC5jb21taXR0 ZXJfYnlfbmFtZSgiRGFyaW4gQWRsZXIiKSwKICAgICAgICAgfSkK 91291 2011-04-27 08:49:13 -0700 2011-04-27 11:17:00 -0700 Patch for landing bug-59545-20110427084912.patch text/plain 19784 eric U3VidmVyc2lvbiBSZXZpc2lvbjogODUwMTcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwODExMTMzMzAxY2Q3NTc4MTdjZWM5NTIyNzdiOWY0NzBj MGUyNjE1Li4zNmZmZTkyZTE5ZGYyNDJjYWMwZjg1ZTMxYzg1ODdhZWM1MWI5YjViIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTEtMDQtMjYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE1paGFpIFBhcnBhcml0YS4KKworICAgICAgICBzaGVycmlmYm90IGNyZWF0 ZS1idWcgc2hvdWxkbid0IGFzc2lnbiBidWdzIHRvIHdlYmtpdC5yZXZpZXcuYm90CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTU0NQorCisgICAgICAg IFRvIGRvIHRoaXMsIEkgbmVlZGVkIGEgd2F5IHRvIGxvb2sgdXAgY29udHJpYnV0b3JzIGJ5IGly Yy1uYW1lCisgICAgICAgIChzaW5jZSBhbnlvbmUgaW4gI3dlYmtpdCB3aG8gbWlnaHQgdXNlIHRo aXMgY29tbWFuZCBtYXkgbm90IGJlIGEgY29tbWl0dGVyKS4KKyAgICAgICAgVG8gbG9va3VwIGNv bnRyaWJ1dG9ycywgSSBoYWQgdG8gbWFrZSBDb250cmlidXRvciBhIHJlYWwgb2JqZWN0LgorICAg ICAgICBXaGljaCBsZWQgbWUgdG8gcmVkZXNpZ24gcGFydHMgb2YgY29tbWl0dGVycy5weS4uLgor ICAgICAgICBhbmQgZmluYWxseSBmaXggb25lIHNwb3QgaW4gY2hhbmdlbG9nLnB5IHdoZXJlIHdl IHdhbnRlZCB0byBiZQorICAgICAgICBsb29raW5nIHVwIGNvbnRyaWJ1dG9ycyBhbmQgbm90IGNv bW1pdHRlcnMuCisKKyAgICAgICAgT3ZlcmFsbCBhIHByZXR0eSBzaW1wbGUgZml4LCBvbmNlIHlv dSB3YWRlIHRocm91Z2ggdGhlIHlhay1oYWlyLgorCisgICAgICAgIFRoaXMgbWF5IG5vdCBwcmV2 ZW50ICphbGwqIHBvc3NpYmxlIHdheXMgdGhhdCBidWdzIHdvdWxkIGdldCBhc3NpZ25lZAorICAg ICAgICB0byB3ZWJraXQucmV2aWV3LmJvdC4gIElmIHdlIGRvbid0IHJlY29nbml6ZSB0aGUgcmVx dWVzdGVyIHdlIHdpbGwKKyAgICAgICAgZ28gdGhyb3VnaCB0aGUgcHJldmlvdXMgY29kZSBwYXRo ICh3aGljaCBzaG91bGRuJ3QgY2hhbmdlIHRoZSBhc3NpZ25lZQorICAgICAgICBvbiB0aGUgYnVn IGZyb20gdGhlIGRlZmF1bHQgYXMgZmFyIGFzIEkgY2FuIHRlbGwpLgorCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hhbmdlbG9nLnB5OgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzLnB5OgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzX3VuaXR0ZXN0LnB5OgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvaXJjX2NvbW1hbmQucHk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9pcmNfY29tbWFuZF91bml0dGVzdC5weToKKwog MjAxMS0wNC0yNiAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEFkZWxlIFBldGVyc29uLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hhbmdlbG9nLnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hhbmdlbG9nLnB5CmluZGV4IGE4NmI3YTkzMzJiOTU2 ZjAyMWQwZWZmNzQ1NTdkMWRhZjI1MmVmYzEuLjVmNjRjMDQzMDVkZDE4MmYzMjExOWIwNTIyYmZi ZGE4Zjc0ZmU2NzggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No ZWNrb3V0L2NoYW5nZWxvZy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9jaGFuZ2Vsb2cucHkKQEAgLTY0LDcgKzY0LDcgQEAgY2xhc3MgQ2hhbmdlTG9nRW50 cnkob2JqZWN0KToKICAgICAgICAgc2VsZi5fcmV2aWV3ZXJfdGV4dCA9IG1hdGNoLmdyb3VwKCJy ZXZpZXdlciIpIGlmIG1hdGNoIGVsc2UgTm9uZQogCiAgICAgICAgIHNlbGYuX3Jldmlld2VyID0g c2VsZi5fY29tbWl0dGVyX2xpc3QuY29tbWl0dGVyX2J5X25hbWUoc2VsZi5fcmV2aWV3ZXJfdGV4 dCkKLSAgICAgICAgc2VsZi5fYXV0aG9yID0gc2VsZi5fY29tbWl0dGVyX2xpc3QuY29tbWl0dGVy X2J5X2VtYWlsKHNlbGYuX2F1dGhvcl9lbWFpbCkgb3Igc2VsZi5fY29tbWl0dGVyX2xpc3QuY29t bWl0dGVyX2J5X25hbWUoc2VsZi5fYXV0aG9yX25hbWUpCisgICAgICAgIHNlbGYuX2F1dGhvciA9 IHNlbGYuX2NvbW1pdHRlcl9saXN0LmNvbnRyaWJ1dG9yX2J5X2VtYWlsKHNlbGYuX2F1dGhvcl9l bWFpbCkgb3Igc2VsZi5fY29tbWl0dGVyX2xpc3QuY29udHJpYnV0b3JfYnlfbmFtZShzZWxmLl9h dXRob3JfbmFtZSkKIAogICAgIGRlZiBhdXRob3JfbmFtZShzZWxmKToKICAgICAgICAgcmV0dXJu IHNlbGYuX2F1dGhvcl9uYW1lCkBAIC03Myw3ICs3Myw3IEBAIGNsYXNzIENoYW5nZUxvZ0VudHJ5 KG9iamVjdCk6CiAgICAgICAgIHJldHVybiBzZWxmLl9hdXRob3JfZW1haWwKIAogICAgIGRlZiBh dXRob3Ioc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxmLl9hdXRob3IgIyBNaWdodCBiZSBOb25l CisgICAgICAgIHJldHVybiBzZWxmLl9hdXRob3IgICMgTWlnaHQgYmUgTm9uZQogCiAgICAgIyBG SVhNRTogRXZlbnR1YWxseSB3ZSB3b3VsZCBsaWtlIHRvIG1hcCByZXZpd2VyIG5hbWVzIHRvIHJl dmlld2VyIG9iamVjdHMuCiAgICAgIyBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTI2NTMzCkBAIC04MSw3ICs4MSw3IEBAIGNsYXNzIENoYW5nZUxvZ0VudHJ5KG9i amVjdCk6CiAgICAgICAgIHJldHVybiBzZWxmLl9yZXZpZXdlcl90ZXh0CiAKICAgICBkZWYgcmV2 aWV3ZXIoc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxmLl9yZXZpZXdlciAjIE1pZ2h0IGJlIE5v bmUKKyAgICAgICAgcmV0dXJuIHNlbGYuX3Jldmlld2VyICAjIE1pZ2h0IGJlIE5vbmUsIG1pZ2h0 IGFsc28gbm90IGJlIGEgUmV2aWV3ZXIhCiAKICAgICBkZWYgY29udGVudHMoc2VsZik6CiAgICAg ICAgIHJldHVybiBzZWxmLl9jb250ZW50cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vY29uZmlnL2NvbW1pdHRlcnMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jb25maWcvY29tbWl0dGVycy5weQppbmRleCBkMDVmODNiZTI0OGFiOTEwZjY5N2Vm YzE5ZTI4MDQ4ZGVhNWE1ZTIxLi5lMDZkYzA4YWY2MDM2MTk0NGE4YjNkNDhjNjg3MTIzODNkNmJi NTMzIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29t bWl0dGVycy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29t bWl0dGVycy5weQpAQCAtMSw1ICsxLDUgQEAKICMgQ29weXJpZ2h0IChjKSAyMDExLCBBcHBsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0jIENvcHlyaWdodCAoYykgMjAwOSwgR29vZ2xlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChjKSAyMDA5LCAyMDExIEdvb2ds ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBtb2RpZmljYXRp b24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMg YXJlCkBAIC0yNywyMyArMjcsMjAgQEAKICMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVS V0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9GIFRISVMgU09GVFdB UkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAj Ci0jIFdlYktpdCdzIFB5dGhvbiBtb2R1bGUgZm9yIGNvbW1pdHRlciBhbmQgcmV2aWV3ZXIgdmFs aWRhdGlvbgorIyBXZWJLaXQncyBQeXRob24gbW9kdWxlIGZvciBjb21taXR0ZXIgYW5kIHJldmll d2VyIHZhbGlkYXRpb24uCiAKIAotY2xhc3MgQ29udHJpYnV0b3I6Ci0KLSAgICBkZWYgX19pbml0 X18oc2VsZiwgbmFtZSwgZW1haWxfb3JfZW1haWxzLCBpcmNfbmlja25hbWU9Tm9uZSk6Ci0gICAg ICAgIHJldHVybgotCi1jbGFzcyBDb21taXR0ZXI6Ci0KK2NsYXNzIENvbnRyaWJ1dG9yKG9iamVj dCk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJjX25p Y2tuYW1lPU5vbmUpOgorICAgICAgICBhc3NlcnQobmFtZSkKKyAgICAgICAgYXNzZXJ0KGVtYWls X29yX2VtYWlscykKICAgICAgICAgc2VsZi5mdWxsX25hbWUgPSBuYW1lCiAgICAgICAgIGlmIGlz aW5zdGFuY2UoZW1haWxfb3JfZW1haWxzLCBzdHIpOgogICAgICAgICAgICAgc2VsZi5lbWFpbHMg PSBbZW1haWxfb3JfZW1haWxzXQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgc2VsZi5lbWFp bHMgPSBlbWFpbF9vcl9lbWFpbHMKICAgICAgICAgc2VsZi5pcmNfbmlja25hbWUgPSBpcmNfbmlj a25hbWUKKyAgICAgICAgc2VsZi5jYW5fY29tbWl0ID0gRmFsc2UKICAgICAgICAgc2VsZi5jYW5f cmV2aWV3ID0gRmFsc2UKIAogICAgIGRlZiBidWd6aWxsYV9lbWFpbChzZWxmKToKQEAgLTU1LDgg KzUyLDEzIEBAIGNsYXNzIENvbW1pdHRlcjoKICAgICAgICAgcmV0dXJuICciJXMiIDwlcz4nICUg KHNlbGYuZnVsbF9uYW1lLCBzZWxmLmVtYWlsc1swXSkKIAogCi1jbGFzcyBSZXZpZXdlcihDb21t aXR0ZXIpOgorY2xhc3MgQ29tbWl0dGVyKENvbnRyaWJ1dG9yKToKKyAgICBkZWYgX19pbml0X18o c2VsZiwgbmFtZSwgZW1haWxfb3JfZW1haWxzLCBpcmNfbmlja25hbWU9Tm9uZSk6CisgICAgICAg IENvbnRyaWJ1dG9yLl9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJjX25p Y2tuYW1lKQorICAgICAgICBzZWxmLmNhbl9jb21taXQgPSBUcnVlCisKIAorY2xhc3MgUmV2aWV3 ZXIoQ29tbWl0dGVyKToKICAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgZW1haWxfb3JfZW1h aWxzLCBpcmNfbmlja25hbWU9Tm9uZSk6CiAgICAgICAgIENvbW1pdHRlci5fX2luaXRfXyhzZWxm LCBuYW1lLCBlbWFpbF9vcl9lbWFpbHMsIGlyY19uaWNrbmFtZSkKICAgICAgICAgc2VsZi5jYW5f cmV2aWV3ID0gVHJ1ZQpAQCAtMzQ0LDE2ICszNDYsMjAgQEAgcmV2aWV3ZXJzX2xpc3QgPSBbCiBd CiAKIAotY2xhc3MgQ29tbWl0dGVyTGlzdDoKK2NsYXNzIENvbW1pdHRlckxpc3Qob2JqZWN0KToK IAogICAgICMgQ29tbWl0dGVycyBhbmQgcmV2aWV3ZXJzIGFyZSBwYXNzZWQgaW4gdG8gYWxsb3cg ZWFzeSB0ZXN0aW5nCi0KICAgICBkZWYgX19pbml0X18oc2VsZiwKICAgICAgICAgICAgICAgICAg Y29tbWl0dGVycz1jb21taXR0ZXJzX3VuYWJsZV90b19yZXZpZXcsCi0gICAgICAgICAgICAgICAg IHJldmlld2Vycz1yZXZpZXdlcnNfbGlzdCk6CisgICAgICAgICAgICAgICAgIHJldmlld2Vycz1y ZXZpZXdlcnNfbGlzdCwKKyAgICAgICAgICAgICAgICAgY29udHJpYnV0b3JzPWNvbnRyaWJ1dG9y c193aG9fYXJlX25vdF9jb21taXR0ZXJzKToKKyAgICAgICAgc2VsZi5fY29udHJpYnV0b3JzID0g Y29udHJpYnV0b3JzICsgY29tbWl0dGVycyArIHJldmlld2VycwogICAgICAgICBzZWxmLl9jb21t aXR0ZXJzID0gY29tbWl0dGVycyArIHJldmlld2VycwogICAgICAgICBzZWxmLl9yZXZpZXdlcnMg PSByZXZpZXdlcnMKLSAgICAgICAgc2VsZi5fY29tbWl0dGVyc19ieV9lbWFpbCA9IHt9CisgICAg ICAgIHNlbGYuX2NvbnRyaWJ1dG9yc19ieV9lbWFpbCA9IHt9CisKKyAgICBkZWYgY29udHJpYnV0 b3JzKHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi5fY29udHJpYnV0b3JzCiAKICAgICBkZWYg Y29tbWl0dGVycyhzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX2NvbW1pdHRlcnMKQEAgLTM2 MSwyNCArMzY3LDQ1IEBAIGNsYXNzIENvbW1pdHRlckxpc3Q6CiAgICAgZGVmIHJldmlld2Vycyhz ZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX3Jldmlld2VycwogCi0gICAgZGVmIF9lbWFpbF90 b19jb21taXR0ZXJfbWFwKHNlbGYpOgotICAgICAgICBpZiBub3QgbGVuKHNlbGYuX2NvbW1pdHRl cnNfYnlfZW1haWwpOgotICAgICAgICAgICAgZm9yIGNvbW1pdHRlciBpbiBzZWxmLl9jb21taXR0 ZXJzOgotICAgICAgICAgICAgICAgIGZvciBlbWFpbCBpbiBjb21taXR0ZXIuZW1haWxzOgotICAg ICAgICAgICAgICAgICAgICBzZWxmLl9jb21taXR0ZXJzX2J5X2VtYWlsW2VtYWlsXSA9IGNvbW1p dHRlcgotICAgICAgICByZXR1cm4gc2VsZi5fY29tbWl0dGVyc19ieV9lbWFpbAorICAgIGRlZiBf ZW1haWxfdG9fY29udHJpYnV0b3JfbWFwKHNlbGYpOgorICAgICAgICBpZiBub3QgbGVuKHNlbGYu X2NvbnRyaWJ1dG9yc19ieV9lbWFpbCk6CisgICAgICAgICAgICBmb3IgY29udHJpYnV0b3IgaW4g c2VsZi5fY29udHJpYnV0b3JzOgorICAgICAgICAgICAgICAgIGZvciBlbWFpbCBpbiBjb250cmli dXRvci5lbWFpbHM6CisgICAgICAgICAgICAgICAgICAgIGFzc2VydChlbWFpbCBub3QgaW4gc2Vs Zi5fY29udHJpYnV0b3JzX2J5X2VtYWlsKSAgIyBXZSBzaG91bGQgbmV2ZXIgaGF2ZSBkdXBsaWNh dGUgZW1haWxzLgorICAgICAgICAgICAgICAgICAgICBzZWxmLl9jb250cmlidXRvcnNfYnlfZW1h aWxbZW1haWxdID0gY29udHJpYnV0b3IKKyAgICAgICAgcmV0dXJuIHNlbGYuX2NvbnRyaWJ1dG9y c19ieV9lbWFpbAogCi0gICAgZGVmIGNvbW1pdHRlcl9ieV9uYW1lKHNlbGYsIG5hbWUpOgorICAg IGRlZiBfY29tbWl0dGVyX29ubHkoc2VsZiwgcmVjb3JkKToKKyAgICAgICAgaWYgcmVjb3JkIGFu ZCBub3QgcmVjb3JkLmNhbl9jb21taXQ6CisgICAgICAgICAgICByZXR1cm4gTm9uZQorICAgICAg ICByZXR1cm4gcmVjb3JkCisKKyAgICBkZWYgX3Jldmlld2VyX29ubHkoc2VsZiwgcmVjb3JkKToK KyAgICAgICAgaWYgcmVjb3JkIGFuZCBub3QgcmVjb3JkLmNhbl9yZXZpZXc6CisgICAgICAgICAg ICByZXR1cm4gTm9uZQorICAgICAgICByZXR1cm4gcmVjb3JkCisKKyAgICBkZWYgY29udHJpYnV0 b3JfYnlfbmFtZShzZWxmLCBuYW1lKToKICAgICAgICAgIyBUaGlzIGNvdWxkIGJlIG1hZGUgaW50 byBhIGhhc2ggbG9va3VwIGlmIGNhbGxlcnMgbmVlZCBpdCB0byBiZSBmYXN0LgotICAgICAgICBm b3IgY29tbWl0dGVyIGluIHNlbGYuY29tbWl0dGVycygpOgotICAgICAgICAgICAgaWYgY29tbWl0 dGVyLmZ1bGxfbmFtZSA9PSBuYW1lOgotICAgICAgICAgICAgICAgIHJldHVybiBjb21taXR0ZXIK KyAgICAgICAgZm9yIGNvbnRyaWJ1dG9yIGluIHNlbGYuY29udHJpYnV0b3JzKCk6CisgICAgICAg ICAgICBpZiBjb250cmlidXRvci5mdWxsX25hbWUgYW5kIGNvbnRyaWJ1dG9yLmZ1bGxfbmFtZSA9 PSBuYW1lOgorICAgICAgICAgICAgICAgIHJldHVybiBjb250cmlidXRvcgorICAgICAgICByZXR1 cm4gTm9uZQorCisgICAgZGVmIGNvbW1pdHRlcl9ieV9uYW1lKHNlbGYsIG5hbWUpOgorICAgICAg ICByZXR1cm4gc2VsZi5fY29tbWl0dGVyX29ubHkoc2VsZi5jb250cmlidXRvcl9ieV9uYW1lKG5h bWUpKQorCisgICAgZGVmIGNvbnRyaWJ1dG9yX2J5X2lyY19uaWNrbmFtZShzZWxmLCBpcmNfbmlj a25hbWUpOgorICAgICAgICBmb3IgY29udHJpYnV0b3IgaW4gc2VsZi5jb250cmlidXRvcnMoKToK KyAgICAgICAgICAgIGlmIGNvbnRyaWJ1dG9yLmlyY19uaWNrbmFtZSBhbmQgY29udHJpYnV0b3Iu aXJjX25pY2tuYW1lID09IGlyY19uaWNrbmFtZToKKyAgICAgICAgICAgICAgICByZXR1cm4gY29u dHJpYnV0b3IKKyAgICAgICAgcmV0dXJuIE5vbmUKKworICAgIGRlZiBjb250cmlidXRvcl9ieV9l bWFpbChzZWxmLCBlbWFpbCk6CisgICAgICAgIHJldHVybiBzZWxmLl9lbWFpbF90b19jb250cmli dXRvcl9tYXAoKS5nZXQoZW1haWwpCiAKICAgICBkZWYgY29tbWl0dGVyX2J5X2VtYWlsKHNlbGYs IGVtYWlsKToKLSAgICAgICAgcmV0dXJuIHNlbGYuX2VtYWlsX3RvX2NvbW1pdHRlcl9tYXAoKS5n ZXQoZW1haWwpCisgICAgICAgIHJldHVybiBzZWxmLl9jb21taXR0ZXJfb25seShzZWxmLmNvbnRy aWJ1dG9yX2J5X2VtYWlsKGVtYWlsKSkKIAogICAgIGRlZiByZXZpZXdlcl9ieV9lbWFpbChzZWxm LCBlbWFpbCk6Ci0gICAgICAgIGNvbW1pdHRlciA9IHNlbGYuY29tbWl0dGVyX2J5X2VtYWlsKGVt YWlsKQotICAgICAgICBpZiBjb21taXR0ZXIgYW5kIG5vdCBjb21taXR0ZXIuY2FuX3JldmlldzoK LSAgICAgICAgICAgIHJldHVybiBOb25lCi0gICAgICAgIHJldHVybiBjb21taXR0ZXIKKyAgICAg ICAgcmV0dXJuIHNlbGYuX3Jldmlld2VyX29ubHkoc2VsZi5jb250cmlidXRvcl9ieV9lbWFpbChl bWFpbCkpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcv Y29tbWl0dGVyc191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2Nv bmZpZy9jb21taXR0ZXJzX3VuaXR0ZXN0LnB5CmluZGV4IDA2OGMwZWUyMDcyYjZiOGQxY2FiYzFm YmRkNTEzNWFlYjEwNzI4ZWYuLmJmYmZhNzQwYmRjMmI1NjgxMzZmOGNiYTdjOWM2MDNlYjNmYTJh YTYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb21t aXR0ZXJzX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2Nv bmZpZy9jb21taXR0ZXJzX3VuaXR0ZXN0LnB5CkBAIC0yNywzMiArMjcsMzggQEAKICMgT0YgVEhJ UyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERB TUFHRS4KIAogaW1wb3J0IHVuaXR0ZXN0Ci1mcm9tIHdlYmtpdHB5LmNvbW1vbi5jb25maWcuY29t bWl0dGVycyBpbXBvcnQgQ29tbWl0dGVyTGlzdCwgQ29tbWl0dGVyLCBSZXZpZXdlcgorZnJvbSB3 ZWJraXRweS5jb21tb24uY29uZmlnLmNvbW1pdHRlcnMgaW1wb3J0IENvbW1pdHRlckxpc3QsIENv bnRyaWJ1dG9yLCBDb21taXR0ZXIsIFJldmlld2VyCiAKIGNsYXNzIENvbW1pdHRlcnNUZXN0KHVu aXR0ZXN0LlRlc3RDYXNlKToKIAogICAgIGRlZiB0ZXN0X2NvbW1pdHRlcl9sb29rdXAoc2VsZik6 CiAgICAgICAgIGNvbW1pdHRlciA9IENvbW1pdHRlcignVGVzdCBPbmUnLCAnb25lQHRlc3QuY29t JywgJ29uZScpCiAgICAgICAgIHJldmlld2VyID0gUmV2aWV3ZXIoJ1Rlc3QgVHdvJywgWyd0d29A dGVzdC5jb20nLCAndHdvQHJhZC5jb20nLCAnc29fdHdvQGdtYWlsLmNvbSddKQotICAgICAgICBj b21taXR0ZXJfbGlzdCA9IENvbW1pdHRlckxpc3QoY29tbWl0dGVycz1bY29tbWl0dGVyXSwgcmV2 aWV3ZXJzPVtyZXZpZXdlcl0pCisgICAgICAgIGNvbnRyaWJ1dG9yID0gQ29udHJpYnV0b3IoJ1Rl c3QgVGhyZWUnLCBbJ3RocmVlQHRlc3QuY29tJ10sICd0aHJlZScpCisgICAgICAgIGNvbW1pdHRl cl9saXN0ID0gQ29tbWl0dGVyTGlzdChjb21taXR0ZXJzPVtjb21taXR0ZXJdLCByZXZpZXdlcnM9 W3Jldmlld2VyXSwgY29udHJpYnV0b3JzPVtjb250cmlidXRvcl0pCiAKLSAgICAgICAgIyBUZXN0 IHZhbGlkIGNvbW1pdHRlciBhbmQgcmV2aWV3ZXIgbG9va3VwCisgICAgICAgICMgVGVzdCB2YWxp ZCBjb21taXR0ZXIsIHJldmlld2VyIGFuZCBjb250cmlidXRvciBsb29rdXAKICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChjb21taXR0ZXJfbGlzdC5jb21taXR0ZXJfYnlfZW1haWwoJ29uZUB0ZXN0 LmNvbScpLCBjb21taXR0ZXIpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWl0dGVyX2xp c3QucmV2aWV3ZXJfYnlfZW1haWwoJ3R3b0B0ZXN0LmNvbScpLCByZXZpZXdlcikKICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChjb21taXR0ZXJfbGlzdC5jb21taXR0ZXJfYnlfZW1haWwoJ3R3b0B0 ZXN0LmNvbScpLCByZXZpZXdlcikKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21taXR0ZXJf bGlzdC5jb21taXR0ZXJfYnlfZW1haWwoJ3R3b0ByYWQuY29tJyksIHJldmlld2VyKQogICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRlcl9saXN0LnJldmlld2VyX2J5X2VtYWlsKCdzb190 d29AZ21haWwuY29tJyksIHJldmlld2VyKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbW1p dHRlcl9saXN0LmNvbnRyaWJ1dG9yX2J5X2VtYWlsKCd0aHJlZUB0ZXN0LmNvbScpLCBjb250cmli dXRvcikKIAotICAgICAgICAjIFRlc3QgdmFsaWQgY29tbWl0dGVyIGFuZCByZXZpZXdlciBsb29r dXAKKyAgICAgICAgIyBUZXN0IHZhbGlkIGNvbW1pdHRlciwgcmV2aWV3ZXIgYW5kIGNvbnRyaWJ1 dG9yIGxvb2t1cAogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRlcl9saXN0LmNvbW1p dHRlcl9ieV9uYW1lKCJUZXN0IE9uZSIpLCBjb21taXR0ZXIpCiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoY29tbWl0dGVyX2xpc3QuY29tbWl0dGVyX2J5X25hbWUoIlRlc3QgVHdvIiksIHJldmll d2VyKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRlcl9saXN0LmNvbW1pdHRlcl9i eV9uYW1lKCJUZXN0IFRocmVlIiksIE5vbmUpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29t bWl0dGVyX2xpc3QuY29udHJpYnV0b3JfYnlfbmFtZSgiVGVzdCBUaHJlZSIpLCBjb250cmlidXRv cikKIAogICAgICAgICAjIFRlc3QgdGhhdCB0aGUgZmlyc3QgZW1haWwgaXMgYXNzdW1lZCB0byBi ZSB0aGUgQnVnemlsbGEgZW1haWwgYWRkcmVzcyAoZm9yIG5vdykKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChjb21taXR0ZXJfbGlzdC5jb21taXR0ZXJfYnlfZW1haWwoJ3R3b0ByYWQuY29tJyku YnVnemlsbGFfZW1haWwoKSwgJ3R3b0B0ZXN0LmNvbScpCiAKICAgICAgICAgIyBUZXN0IHRoYXQg YSBrbm93biBjb21taXR0ZXIgaXMgbm90IHJldHVybmVkIGR1cmluZyByZXZpZXdlciBsb29rdXAK ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21taXR0ZXJfbGlzdC5yZXZpZXdlcl9ieV9lbWFp bCgnb25lQHRlc3QuY29tJyksIE5vbmUpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWl0 dGVyX2xpc3QucmV2aWV3ZXJfYnlfZW1haWwoJ3RocmVlQHRlc3QuY29tJyksIE5vbmUpCisgICAg ICAgICMgYW5kIGxpa2V3aXNlIHRoYXQgYSBrbm93biBjb250cmlidXRvciBpcyBub3QgcmV0dXJu ZWQgZm9yIGNvbW1pdHRlciBsb29rdXAuCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWl0 dGVyX2xpc3QuY29tbWl0dGVyX2J5X2VtYWlsKCd0aHJlZUB0ZXN0LmNvbScpLCBOb25lKQogCiAg ICAgICAgICMgVGVzdCB0aGF0IHVua25vd24gZW1haWwgYWRkcmVzcyBmYWlsIGJvdGggY29tbWl0 dGVyIGFuZCByZXZpZXdlciBsb29rdXAKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21taXR0 ZXJfbGlzdC5jb21taXR0ZXJfYnlfZW1haWwoJ2JhckBiYXIuY29tJyksIE5vbmUpCkBAIC02Miwx MSArNjgsMTAgQEAgY2xhc3MgQ29tbWl0dGVyc1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbW1pdHRlci5lbWFpbHMsIFsnb25lQHRlc3QuY29tJ10p CiAKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21taXR0ZXIuaXJjX25pY2tuYW1lLCAnb25l JykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21taXR0ZXJfbGlzdC5jb250cmlidXRvcl9i eV9pcmNfbmlja25hbWUoJ29uZScpLCBjb21taXR0ZXIpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoY29tbWl0dGVyX2xpc3QuY29udHJpYnV0b3JfYnlfaXJjX25pY2tuYW1lKCd0aHJlZScpLCBj b250cmlidXRvcikKIAotICAgICAgICAjIFRlc3QgdGhhdCBjb21taXR0ZXJzIHJldHVybnMgY29t bWl0dGVycyBhbmQgcmV2aWV3ZXJzIGFuZCByZXZpZXdlcnMoKSBqdXN0IHJldmlld2Vycy4KKyAg ICAgICAgIyBUZXN0IHRoYXQgdGhlIGxpc3RzIHJldHVybmVkIGFyZSBhcmUgd2UgZXhwZWN0IHRo ZW0uCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWl0dGVyX2xpc3QuY29udHJpYnV0b3Jz KCksIFtjb250cmlidXRvciwgY29tbWl0dGVyLCByZXZpZXdlcl0pCiAgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwoY29tbWl0dGVyX2xpc3QuY29tbWl0dGVycygpLCBbY29tbWl0dGVyLCByZXZpZXdl cl0pCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWl0dGVyX2xpc3QucmV2aWV3ZXJzKCks IFtyZXZpZXdlcl0pCi0KLQotaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKLSAgICB1bml0dGVz dC5tYWluKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9i dWd6aWxsYS9hdHRhY2htZW50LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0 L2J1Z3ppbGxhL2F0dGFjaG1lbnQucHkKaW5kZXggODU3NjFmZWE4OTM0YzRjYWU0YWM0YzkwYzJl YzQ3NWVhMTA2ZDY3NC4uNmUxMGQ2NWE5NTIxN2I2ODI5N2Y0ODFmNmUwZjVmM2IzOWUwMzZjNyAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2F0 dGFjaG1lbnQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3pp bGxhL2F0dGFjaG1lbnQucHkKQEAgLTI4LDYgKzI4LDcgQEAKICMgKElOQ0xVRElORyBORUdMSUdF TkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9G IFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VD SCBEQU1BR0UuCiAKK2Zyb20gd2Via2l0cHkuY29tbW9uLm1lbW9pemVkIGltcG9ydCBtZW1vaXpl ZAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmRlcHJlY2F0ZWRfbG9nZ2luZyBpbXBvcnQg bG9nCiAKIApAQCAtMzgsNiArMzksNyBAQCBjbGFzcyBBdHRhY2htZW50KG9iamVjdCk6CiAgICAg ZGVmIF9faW5pdF9fKHNlbGYsIGF0dGFjaG1lbnRfZGljdGlvbmFyeSwgYnVnKToKICAgICAgICAg c2VsZi5fYXR0YWNobWVudF9kaWN0aW9uYXJ5ID0gYXR0YWNobWVudF9kaWN0aW9uYXJ5CiAgICAg ICAgIHNlbGYuX2J1ZyA9IGJ1ZworICAgICAgICAjIEZJWE1FOiBUaGVzZSBzaG91bGQgYmUgcmVw bGFjZWQgd2l0aCBAbWVtb2l6ZWQgYWZ0ZXIgdXBkYXRpbmcgbW9ja3MuCiAgICAgICAgIHNlbGYu X3Jldmlld2VyID0gTm9uZQogICAgICAgICBzZWxmLl9jb21taXR0ZXIgPSBOb25lCiAKQEAgLTQ3 LDkgKzQ5LDkgQEAgY2xhc3MgQXR0YWNobWVudChvYmplY3QpOgogICAgIGRlZiBpZChzZWxmKToK ICAgICAgICAgcmV0dXJuIGludChzZWxmLl9hdHRhY2htZW50X2RpY3Rpb25hcnkuZ2V0KCJpZCIp KQogCi0gICAgZGVmIGF0dGFjaGVyX2lzX2NvbW1pdHRlcihzZWxmKToKLSAgICAgICAgcmV0dXJu IHNlbGYuX2J1Z3ppbGxhLmNvbW1pdHRlcnMuY29tbWl0dGVyX2J5X2VtYWlsKAotICAgICAgICAg ICAgcGF0Y2guYXR0YWNoZXJfZW1haWwoKSkKKyAgICBAbWVtb2l6ZWQKKyAgICBkZWYgYXR0YWNo ZXIoc2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLl9idWd6aWxsYSgpLmNvbW1pdHRlcnMuY29u dHJpYnV0b3JfYnlfZW1haWwoc2VsZi5hdHRhY2hlcl9lbWFpbCgpKQogCiAgICAgZGVmIGF0dGFj aGVyX2VtYWlsKHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5fYXR0YWNobWVudF9kaWN0aW9u YXJ5LmdldCgiYXR0YWNoZXJfZW1haWwiKQpAQCAtOTUsNiArOTcsNyBAQCBjbGFzcyBBdHRhY2ht ZW50KG9iamVjdCk6CiAgICAgICAgIGVtYWlsID0gc2VsZi5fYXR0YWNobWVudF9kaWN0aW9uYXJ5 LmdldCgiJXNfZW1haWwiICUgZmxhZykKICAgICAgICAgaWYgbm90IGVtYWlsOgogICAgICAgICAg ICAgcmV0dXJuIE5vbmUKKyAgICAgICAgIyBGSVhNRTogVGhpcyBpcyBub3QgYSByb2J1c3Qgd2F5 IHRvIGNhbGwgY29tbWl0dGVyX2J5X2VtYWlsCiAgICAgICAgIGNvbW1pdHRlciA9IGdldGF0dHIo c2VsZi5fYnVnemlsbGEoKS5jb21taXR0ZXJzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICIlc19ieV9lbWFpbCIgJSBmbGFnKShlbWFpbCkKICAgICAgICAgaWYgY29tbWl0dGVyOgpAQCAt MTAzLDYgKzEwNiw3IEBAIGNsYXNzIEF0dGFjaG1lbnQob2JqZWN0KToKICAgICAgICAgICAgICAg ICAgc2VsZi5fYXR0YWNobWVudF9kaWN0aW9uYXJ5WydpZCddLAogICAgICAgICAgICAgICAgICBz ZWxmLl9hdHRhY2htZW50X2RpY3Rpb25hcnlbJ2J1Z19pZCddLCBmbGFnLCBlbWFpbCkpCiAKKyAg ICAjIEZJWE1FOiBUaGVzZSBjb3VsZCB1c2UgQG1lbW9pemVkIGxpa2UgYXR0YWNoZXIoKSwgYnV0 IHVuaXQgdGVzdHMgd291bGQgbmVlZCB1cGRhdGVzLgogICAgIGRlZiByZXZpZXdlcihzZWxmKToK ICAgICAgICAgaWYgbm90IHNlbGYuX3Jldmlld2VyOgogICAgICAgICAgICAgc2VsZi5fcmV2aWV3 ZXIgPSBzZWxmLl92YWxpZGF0ZV9mbGFnX3ZhbHVlKCJyZXZpZXdlciIpCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L2lyY19jb21tYW5kLnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS90b29sL2JvdC9pcmNfY29tbWFuZC5weQppbmRleCA1ODNhMDFkZGIyZDI5 ODBhOGYxYTg1OGEwMTIwYmRmZmZmNzQ2YjQ5Li40MDMwOTYwZmUwNmNjMDlmMzk2M2E4Y2NmMDc0 ZGI4ZTU3M2M3MzUxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90 L2lyY19jb21tYW5kLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvaXJj X2NvbW1hbmQucHkKQEAgLTExNSw3ICsxMTUsOCBAQCBjbGFzcyBXaG9pcyhJUkNDb21tYW5kKToK ICAgICAgICAgaWYgbGVuKGFyZ3MpICE9IDE6CiAgICAgICAgICAgICByZXR1cm4gIiVzOiBVc2Fn ZTogQlVHWklMTEFfRU1BSUwiICUgbmljawogICAgICAgICBlbWFpbCA9IGFyZ3NbMF0KLSAgICAg ICAgY29tbWl0dGVyID0gQ29tbWl0dGVyTGlzdCgpLmNvbW1pdHRlcl9ieV9lbWFpbChlbWFpbCkK KyAgICAgICAgIyBGSVhNRTogV2Ugc2hvdWxkIGdldCB0aGUgQ29udHJpYnV0b3JMaXN0IG9mZiB0 aGUgdG9vbCBzb21ld2hlcmUuCisgICAgICAgIGNvbW1pdHRlciA9IENvbW1pdHRlckxpc3QoKS5j b250cmlidXRvcl9ieV9lbWFpbChlbWFpbCkKICAgICAgICAgaWYgbm90IGNvbW1pdHRlcjoKICAg ICAgICAgICAgIHJldHVybiAiJXM6IFNvcnJ5LCBJIGRvbid0IGtub3cgJXMuIE1heWJlIHlvdSBj b3VsZCBpbnRyb2R1Y2UgbWU/IiAlIChuaWNrLCBlbWFpbCkKICAgICAgICAgaWYgbm90IGNvbW1p dHRlci5pcmNfbmlja25hbWU6CkBAIC0xNDMsOCArMTQ0LDEzIEBAIGNsYXNzIENyZWF0ZUJ1ZyhJ UkNDb21tYW5kKToKICAgICAgICAgYnVnX3RpdGxlID0gIiAiLmpvaW4oYXJncykKICAgICAgICAg YnVnX2Rlc2NyaXB0aW9uID0gIiVzXG5SZXF1ZXN0ZWQgYnkgJXMgb24gJXMuIiAlIChidWdfdGl0 bGUsIG5pY2ssIGNvbmZpZ19pcmMuY2hhbm5lbCkKIAorICAgICAgICAjIFRoZXJlIGhhcHBlbnMg dG8gYmUgYSBjb21taXR0ZXJzIGxpc3QgaHVuZyBvZmYgb2YgQnVnemlsbGEsIHNvCisgICAgICAg ICMgcmUtdXNpbmcgdGhhdCBvbmUgbWFrZXMgdGhpbmdzIGVhc2llc3QgZm9yIG5vdy4KKyAgICAg ICAgcmVxdWVzdGVyID0gdG9vbC5idWdzLmNvbW1pdHRlcnMuY29udHJpYnV0b3JfYnlfaXJjX25p Y2tuYW1lKG5pY2spCisgICAgICAgIHJlcXVlc3Rlcl9lbWFpbCA9IHJlcXVlc3Rlci5idWd6aWxs YV9lbWFpbCgpIGlmIHJlcXVlc3RlciBlbHNlIE5vbmUKKwogICAgICAgICB0cnk6Ci0gICAgICAg ICAgICBidWdfaWQgPSB0b29sLmJ1Z3MuY3JlYXRlX2J1ZyhidWdfdGl0bGUsIGJ1Z19kZXNjcmlw dGlvbikKKyAgICAgICAgICAgIGJ1Z19pZCA9IHRvb2wuYnVncy5jcmVhdGVfYnVnKGJ1Z190aXRs ZSwgYnVnX2Rlc2NyaXB0aW9uLCBjYz1yZXF1ZXN0ZXJfZW1haWwsIGFzc2lnbmVlPXJlcXVlc3Rl cl9lbWFpbCkKICAgICAgICAgICAgIGJ1Z191cmwgPSB0b29sLmJ1Z3MuYnVnX3VybF9mb3JfYnVn X2lkKGJ1Z19pZCkKICAgICAgICAgICAgIHJldHVybiAiJXM6IENyZWF0ZWQgYnVnOiAlcyIgJSAo bmljaywgYnVnX3VybCkKICAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiwgZToKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvaXJjX2NvbW1hbmRfdW5pdHRlc3QucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L2lyY19jb21tYW5kX3VuaXR0ZXN0LnB5 CmluZGV4IDI3MzJkOTRjOWQ1NTcyOGE1OTc3NTY3NzNiZDA5OTI1ODg2NjdjNGUuLjA5NWU2N2E3 YzRjOTdlZDM4Y2E0OWQyZjg4OTEzOTU5ZGFkYzBjODAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdG9vbC9ib3QvaXJjX2NvbW1hbmRfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9pcmNfY29tbWFuZF91bml0dGVzdC5weQpAQCAtNTYs MTIgKzU2LDE2IEBAIGNsYXNzIElSQ0NvbW1hbmRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoInRvbTogVXNhZ2U6IEJVR19USVRMRSIsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNyZWF0ZV9idWcuZXhlY3V0ZSgidG9tIiwgW10sIE5vbmUsIE5v bmUpKQogCisgICAgICAgIGV4YW1wbGVfYXJncyA9IFsic2hlcnJpZi1ib3QiLCAic2hvdWxkIiwg ImhhdmUiLCAiYSIsICJjcmVhdGUtYnVnIiwgImNvbW1hbmQiXQogICAgICAgICB0b29sID0gTW9j a1Rvb2woKQorCisgICAgICAgICMgTW9ja0J1Z3ppbGxhIGhhcyBhIGNyZWF0ZV9idWcsIGJ1dCBp dCBsb2dzIHRvIHN0ZGVyciwgdGhpcyBhdm9pZHMgYW55IGxvZ2dpbmcuCisgICAgICAgIHRvb2wu YnVncy5jcmVhdGVfYnVnID0gbGFtYmRhIGEsIGIsIGNjPU5vbmUsIGFzc2lnbmVlPU5vbmU6IDc4 CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKCJ0b206IENyZWF0ZWQgYnVnOiBodHRwOi8vZXhh bXBsZS5jb20vNzgiLAotICAgICAgICAgICAgICAgICAgICAgICAgICBjcmVhdGVfYnVnLmV4ZWN1 dGUoInRvbSIsIFsic2hlcnJpZi1ib3QiLCAic2hvdWxkIiwgImhhdmUiLCAiYSIsICJjcmVhdGUt YnVnIiwgImNvbW1hbmQiXSwgdG9vbCwgTm9uZSkpCisgICAgICAgICAgICAgICAgICAgICAgICAg IGNyZWF0ZV9idWcuZXhlY3V0ZSgidG9tIiwgZXhhbXBsZV9hcmdzLCB0b29sLCBOb25lKSkKIAot ICAgICAgICBkZWYgbW9ja19jcmVhdGVfYnVnKHRpdGxlLCBkZXNjcmlwdGlvbik6CisgICAgICAg IGRlZiBtb2NrX2NyZWF0ZV9idWcodGl0bGUsIGRlc2NyaXB0aW9uLCBjYz1Ob25lLCBhc3NpZ25l ZT1Ob25lKToKICAgICAgICAgICAgIHJhaXNlIEV4Y2VwdGlvbigiRXhjZXB0aW9uIGZyb20gYnVn emlsbGEhIikKICAgICAgICAgdG9vbC5idWdzLmNyZWF0ZV9idWcgPSBtb2NrX2NyZWF0ZV9idWcK ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoInRvbTogRmFpbGVkIHRvIGNyZWF0ZSBidWc6XG5F eGNlcHRpb24gZnJvbSBidWd6aWxsYSEiLAotICAgICAgICAgICAgICAgICAgICAgICAgICBjcmVh dGVfYnVnLmV4ZWN1dGUoInRvbSIsIFsic2hlcnJpZi1ib3QiLCAic2hvdWxkIiwgImhhdmUiLCAi YSIsICJjcmVhdGUtYnVnIiwgImNvbW1hbmQiXSwgdG9vbCwgTm9uZSkpCisgICAgICAgICAgICAg ICAgICAgICAgICAgIGNyZWF0ZV9idWcuZXhlY3V0ZSgidG9tIiwgZXhhbXBsZV9hcmdzLCB0b29s LCBOb25lKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5k cy9lYXJseXdhcm5pbmdzeXN0ZW0ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29t bWFuZHMvZWFybHl3YXJuaW5nc3lzdGVtLnB5CmluZGV4IDk5NmFiMjQzZWIzMWU2NzgxNWQxZWE5 OTNhNzdhNGZlY2UwYWYwYzcuLjU1NzI0ODA1OGUxYThlMzg3YzFjNjYwNjgxMDYyNTY2YmE4Y2M0 NTMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9lYXJs eXdhcm5pbmdzeXN0ZW0ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1h bmRzL2Vhcmx5d2FybmluZ3N5c3RlbS5weQpAQCAtMTU5LDEyICsxNTksOCBAQCBjbGFzcyBDaHJv bWl1bVdpbmRvd3NFV1MoQWJzdHJhY3RDaHJvbWl1bUVXUyk6CiAjIEZvciBwbGF0Zm9ybXMgdGhh dCB3ZSBjYW4ndCBydW4gaW5zaWRlIGEgVk0gKGxpa2UgTWFjIE9TIFgpLCB3ZSByZXF1aXJlCiAj IHBhdGNoZXMgdG8gYmUgdXBsb2FkZWQgYnkgY29tbWl0dGVycywgd2hvIGFyZSBnZW5lcmFsbHkg dHJ1c3R3b3J0aHkgZm9say4gOikKIGNsYXNzIEFic3RyYWN0Q29tbWl0dGVyT25seUVXUyhBYnN0 cmFjdEVhcmx5V2FybmluZ1N5c3RlbSk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIGNvbW1pdHRl cnM9Q29tbWl0dGVyTGlzdCgpKToKLSAgICAgICAgQWJzdHJhY3RFYXJseVdhcm5pbmdTeXN0ZW0u X19pbml0X18oc2VsZikKLSAgICAgICAgc2VsZi5fY29tbWl0dGVycyA9IGNvbW1pdHRlcnMKLQog ICAgIGRlZiBwcm9jZXNzX3dvcmtfaXRlbShzZWxmLCBwYXRjaCk6Ci0gICAgICAgIGlmIG5vdCBz ZWxmLl9jb21taXR0ZXJzLmNvbW1pdHRlcl9ieV9lbWFpbChwYXRjaC5hdHRhY2hlcl9lbWFpbCgp KToKKyAgICAgICAgaWYgbm90IHBhdGNoLmF0dGFjaGVyKCkgb3Igbm90IHBhdGNoLmF0dGFjaGVy KCkuY2FuX2NvbW1pdDoKICAgICAgICAgICAgIHNlbGYuX2RpZF9lcnJvcihwYXRjaCwgIiVzIGNh bm5vdCBwcm9jZXNzIHBhdGNoZXMgZnJvbSBub24tY29tbWl0dGVycyA6KCIgJSBzZWxmLm5hbWUp CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKICAgICAgICAgcmV0dXJuIEFic3RyYWN0RWFybHlX YXJuaW5nU3lzdGVtLnByb2Nlc3Nfd29ya19pdGVtKHNlbGYsIHBhdGNoKQpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL21vY2t0b29sLnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS90b29sL21vY2t0b29sLnB5CmluZGV4IDZiNTMzMzJjMGUwYmNjNmJhNmE0OWQ1MTM0 ZGE2NzM4YzZjMTg5OGIuLmExMWMxYmUwMDIyOGNhZjRlMjdiMTlkNDYxZGMxMzM2MWUxZDk3MTUg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9tb2NrdG9vbC5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbW9ja3Rvb2wucHkKQEAgLTUzNyw3ICs1Mzcs NyBAQCBjbGFzcyBNb2NrQ2hlY2tvdXQob2JqZWN0KToKICAgICAgICAgICAgICJidWdfaWQiOiA0 MiwKICAgICAgICAgICAgICJhdXRob3JfbmFtZSI6ICJBZGFtIEJhcnRoIiwKICAgICAgICAgICAg ICJhdXRob3JfZW1haWwiOiAiYWJhcnRoQHdlYmtpdC5vcmciLAotICAgICAgICAgICAgImF1dGhv ciI6IHNlbGYuX2NvbW1pdHRlcl9saXN0LmNvbW1pdHRlcl9ieV9lbWFpbCgiYWJhcnRoQHdlYmtp dC5vcmciKSwKKyAgICAgICAgICAgICJhdXRob3IiOiBzZWxmLl9jb21taXR0ZXJfbGlzdC5jb250 cmlidXRvcl9ieV9lbWFpbCgiYWJhcnRoQHdlYmtpdC5vcmciKSwKICAgICAgICAgICAgICJyZXZp ZXdlcl90ZXh0IjogIkRhcmluIEFkbGVyIiwKICAgICAgICAgICAgICJyZXZpZXdlciI6IHNlbGYu X2NvbW1pdHRlcl9saXN0LmNvbW1pdHRlcl9ieV9uYW1lKCJEYXJpbiBBZGxlciIpLAogICAgICAg ICB9KQo=