143040 2015-03-24 22:48:02 -0700 Migrate update-webkit for Windows to not require Cygwin 2015-04-07 23:18:13 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 143086 1 mmaxfield mmaxfield bfulgham commit-queue dbates ossy oldest_to_newest 1079876 0 mmaxfield 2015-03-24 22:48:02 -0700 Migrate update-webkit-dependency to raw Perl 1079877 1 249386 mmaxfield 2015-03-24 22:49:22 -0700 Created attachment 249386 Patch 1079881 2 249386 mmaxfield 2015-03-24 23:13:13 -0700 Comment on attachment 249386 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=249386&action=review > Tools/Scripts/update-webkit-dependency:131 > +#$result = system "unzip", "-q", "-d", $tmpAbsDir, "$tmpAbsDir/$zipFile"; Whoops 1079991 3 249415 mmaxfield 2015-03-25 11:08:58 -0700 Created attachment 249415 Patch 1080006 4 bfulgham 2015-03-25 12:03:58 -0700 The updated Perl code no longer works under Cygwin. I know the goal is to get rid of Cygwin, but we can't land anything that will break the build system. I'm debugging this now to see why it doesn't work (it seems like it should be fine). It might just be a missing Perl dependency. 1080014 5 bfulgham 2015-03-25 12:36:17 -0700 It looks like making sure the Cygwin install has the Perl SSL stuff installed, and then doing: cpan LWP::Protocol::https is sufficient to get things working. 1080015 6 249415 bfulgham 2015-03-25 12:39:00 -0700 Comment on attachment 249415 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=249415&action=review > Tools/Scripts/update-webkit-dependency:98 > print STDERR "Please ensure that $libsURL is reachable.\n"; Please add an error message indicating that Perl LWP::Simple may be missing https support. 1080075 7 mmaxfield 2015-03-25 15:47:26 -0700 Committed r181977: <http://trac.webkit.org/changeset/181977> 1080235 8 ossy 2015-03-26 01:11:12 -0700 (In reply to comment #7) > Committed r181977: <http://trac.webkit.org/changeset/181977> It broke the WinCairo bot, see bug143086 for details. 1083558 9 249415 mmaxfield 2015-04-07 23:18:13 -0700 Comment on attachment 249415 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=249415&action=review Overall comments > Tools/Scripts/webkitdirs.pm:1529 > + my $ret = system "setx", $variable, $variablesToSet{$variable}; This almost certainly does not do what I expected. 249386 2015-03-24 22:49:22 -0700 2015-03-25 11:08:55 -0700 Patch bug-143040-20150324224845.patch text/plain 3844 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxODk4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWU0MWFmZTQ1ZmIwYWRkMjNlODRjNzJmMzAyNjczMmRl ZTUyY2ZmMC4uZTEzNmQ2ZWY3ZGMwNzQ1Mzk4NjMzMWI3ZTQ5ZDczM2MyYmRiNDY4YyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDE1LTAzLTI0ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+ CisKKyAgICAgICAgTWlncmF0ZSB1cGRhdGUtd2Via2l0LWRlcGVuZGVuY3kgdG8gcmF3IFBlcmwK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzA0MAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVsdGltYXRl bHkgd2Ugd2FudCB0byByZW1vdmUgb3VyIGRlcGVuZGVuY2UgZnJvbSBjb21tYW5kcyB0aGF0Cisg ICAgICAgIGRvIG5vdCBleGlzdCBvbiBhbGwgcGxhdGZvcm1zLiBUaGlzIGRvZXMgc28gb24gb25l IHBhcnRpY3VsYXIKKyAgICAgICAgc2NyaXB0LgorCisgICAgICAgICogU2NyaXB0cy91cGRhdGUt d2Via2l0LWRlcGVuZGVuY3k6CisKIDIwMTUtMDMtMjQgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9z c3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBbRUZMXSBBZGQgT3BlbldlYlJUQyBpbiBqaGJ1aWxk CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtZGVwZW5kZW5jeSBiL1Rv b2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1kZXBlbmRlbmN5CmluZGV4IGVjNWI2ZmQ5OGMyYmVi MDNlZTEzMTNiYWQxYmU3MjY5YWI1YzAwNDMuLjMxNjkyNmEyMDZhYjgxM2UxMjE1NzZkMTM5MDI1 YjRkY2Y4OWM0M2UgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1kZXBl bmRlbmN5CisrKyBiL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1kZXBlbmRlbmN5CkBAIC0z MiwxMSArMzIsMTQgQEAKIHVzZSBzdHJpY3Q7CiB1c2Ugd2FybmluZ3M7CiAKK3VzZSBBcmNoaXZl OjpaaXAgcXcoIDpFUlJPUl9DT0RFUyApOwordXNlIEZpbGU6OkNvcHk7CiB1c2UgRmlsZTo6Rmlu ZDsKIHVzZSBGaWxlOjpTcGVjOwogdXNlIEZpbGU6OlRlbXAgKCk7CiB1c2UgRmluZEJpbjsKLXVz ZSBIVFRQOjpEYXRlIHF3KHN0cjJ0aW1lKTsKK3VzZSBIVFRQOjpEYXRlIHF3KHN0cjJ0aW1lIHRp bWUyc3RyKTsKK3VzZSBMV1A6OlNpbXBsZTsKIHVzZSBQT1NJWDsKIHVzZSBsaWIgJEZpbmRCaW46 OkJpbjsKIHVzZSB3ZWJraXRkaXJzOwpAQCAtNzMsMTggKzc2LDI0IEBAIG15ICR0bXBBYnNEaXIg PSBGaWxlOjpTcGVjLT5yZWwyYWJzKCR0bXBSZWxhdGl2ZURpcik7CiAKIHByaW50ICJDaGVja2lu ZyBMYXN0LU1vZGlmaWVkIGRhdGUgb2YgJHppcEZpbGUuLi5cbiI7CiAKLW15ICRyZXN1bHQgPSBz eXN0ZW0gImN1cmwgLXMgLUkgLWsgJGxpYnNVUkwgfCBncmVwIExhc3QtTW9kaWZpZWQgPiBcIiR0 bXBBYnNEaXIvJGZpbGUuaGVhZGVyc1wiIjsKK215ICgkY29udGVudF90eXBlLCAkZG9jdW1lbnRf bGVuZ3RoLCAkbW9kaWZpZWRfdGltZSwgJGV4cGlyZXMsICRzZXJ2ZXIpID0gaGVhZCgkbGlic1VS TCk7CiAKLWlmIChXRVhJVFNUQVRVUygkcmVzdWx0KSkgeworaWYgKGRlZmluZWQgJG1vZGlmaWVk X3RpbWUpIHsKKworICAgIG9wZW4gTkVXLCAiPiIsICIkdG1wQWJzRGlyLyRmaWxlLmhlYWRlcnMi OworICAgIHByaW50IE5FVyAiTGFzdC1Nb2RpZmllZDogIiAuIHRpbWUyc3RyKCRtb2RpZmllZF90 aW1lKSAuICJcbiI7CisgICAgY2xvc2UgTkVXOworCit9IGVsc2UgewogCiAgICAgI05vdGU6IE5l aXRoZXIgR2l0SHViIG5vciBEcm9wQm94IGVtaXQgdGhlIExhc3QtTW9kaWZpZWQgSFRUUCBoZWFk ZXIsIHNvIGZhbGwgYmFjayB0byBhIGZpbGUKIAkjY29udGFpbmluZyB0aGUgbmVjZXNzYXJ5IGlu Zm9ybWF0aW9uIGlmIHdlIGRvIG5vdCByZWNlaXZlIHRoZSBpbmZvcm1hdGlvbiBpbiBvdXIgaW5p dGlhbCBxdWVyeS4KICAgICBteSAkaGVhZGVyVVJMID0gJGxpYnNVUkw7CiAgICAgJGhlYWRlclVS TCA9fiBzL1wuemlwJC9cLmhlYWRlcnMvOwogCi0gICAgJHJlc3VsdCA9IHN5c3RlbSAiY3VybCAt ayAtbyBcIiR0bXBBYnNEaXIvJGZpbGUuaGVhZGVyc1wiICRoZWFkZXJVUkwiOworICAgIG15ICRy ZXN1bHQgPSBnZXRzdG9yZSgkaGVhZGVyVVJMLCAiJHRtcEFic0Rpci8kZmlsZS5oZWFkZXJzIik7 CiAKLSAgICBpZiAoV0VYSVRTVEFUVVMoJHJlc3VsdCkpIHsKKyAgICBpZiAoIWlzX3N1Y2Nlc3Mo JHJlc3VsdCkpIHsKICAgICAgICAgcHJpbnQgU1RERVJSICJDb3VsZG4ndCBjaGVjayBMYXN0LU1v ZGlmaWVkIGRhdGUgb2YgbmV3ICR6aXBGaWxlLlxuIjsKICAgICAgICAgcHJpbnQgU1RERVJSICJQ bGVhc2UgZW5zdXJlIHRoYXQgJGxpYnNVUkwgaXMgcmVhY2hhYmxlLlxuIjsKIApAQCAtMTEzLDEx ICsxMjIsMTUgQEAgaWYgKG9wZW4gTkVXLCAiJHRtcEFic0Rpci8kZmlsZS5oZWFkZXJzIikgewog fQogCiBwcmludCAiRG93bmxvYWRpbmcgJHppcEZpbGUuLi5cblxuIjsKLSRyZXN1bHQgPSBzeXN0 ZW0gImN1cmwgLWsgLW8gXCIkdG1wQWJzRGlyLyR6aXBGaWxlXCIgJGxpYnNVUkwiOwotZGllICJD b3VsZG4ndCBkb3dubG9hZCAkemlwRmlsZSEiIGlmICRyZXN1bHQ7CitwcmludCAiJGxpYnNVUkxc biI7CitteSAkcmVzdWx0ID0gZ2V0c3RvcmUoJGxpYnNVUkwsICIkdG1wQWJzRGlyLyR6aXBGaWxl Iik7CitkaWUgIkNvdWxkbid0IGRvd25sb2FkICR6aXBGaWxlISIgaWYgaXNfZXJyb3IoJHJlc3Vs dCk7CiAKLSRyZXN1bHQgPSBzeXN0ZW0gInVuemlwIiwgIi1xIiwgIi1kIiwgJHRtcEFic0Rpciwg IiR0bXBBYnNEaXIvJHppcEZpbGUiOwotZGllICJDb3VsZG4ndCB1bnppcCAkemlwRmlsZS4iIGlm ICRyZXN1bHQ7CitteSAkemlwID0gQXJjaGl2ZTo6WmlwLT5uZXcoIiR0bXBBYnNEaXIvJHppcEZp bGUiKTsKKyRyZXN1bHQgPSAkemlwLT5leHRyYWN0VHJlZSgiIiwgJHRtcEFic0Rpcik7CisjJHJl c3VsdCA9IHN5c3RlbSAidW56aXAiLCAiLXEiLCAiLWQiLCAkdG1wQWJzRGlyLCAiJHRtcEFic0Rp ci8kemlwRmlsZSI7CitwcmludCAiJHJlc3VsdFxuIjsKK2RpZSAiQ291bGRuJ3QgdW56aXAgJHpp cEZpbGUuIiBpZiAkcmVzdWx0ICE9IEFaX09LOwogCiBwcmludCAiXG5JbnN0YWxsaW5nICRmaWxl Li4uXG4iOwogCkBAIC0xMzEsMTMgKzE0NCwxMyBAQCBzdWIgd2FudGVkCiAgICAgICAgIHJldHVy bjsKICAgICB9CiAKLSAgICBzeXN0ZW0gImNwIiwgJF8sICRkZXN0aW5hdGlvbjsKKyAgICBjb3B5 KCRfLCAkZGVzdGluYXRpb24pOwogfQogCiBGaWxlOjpGaW5kOjpmaW5kKFwmd2FudGVkLCAiJHRt cEFic0Rpci8kZmlsZSIpOwogCi0kcmVzdWx0ID0gc3lzdGVtICJtdiIsICIkdG1wQWJzRGlyLyRm aWxlLmhlYWRlcnMiLCAkd2Via2l0TGlicmFyaWVzRGlyOwotcHJpbnQgU1RERVJSICJDb3VsZG4n dCBtb3ZlICRmaWxlLmhlYWRlcnMgdG8gJHdlYmtpdExpYnJhcmllc0RpciIgLiAiLlxuIiBpZiAk cmVzdWx0OworJHJlc3VsdCA9IG1vdmUoIiR0bXBBYnNEaXIvJGZpbGUuaGVhZGVycyIsICR3ZWJr aXRMaWJyYXJpZXNEaXIpOworcHJpbnQgU1RERVJSICJDb3VsZG4ndCBtb3ZlICRmaWxlLmhlYWRl cnMgdG8gJHdlYmtpdExpYnJhcmllc0RpciIgLiAiLlxuIiBpZiAkcmVzdWx0ID09IDA7CiAKIHBy aW50ICJUaGUgJGZpbGUgaGFzIGJlZW4gc3VjZXNzZnVsbHkgaW5zdGFsbGVkIGluXG4gJHdlYmtp dExpYnJhcmllc0RpclxuIjsKIGV4aXQ7Cg== 249415 2015-03-25 11:08:58 -0700 2015-03-25 12:39:00 -0700 Patch bug-143040-20150325110821.patch text/plain 6733 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxODk4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWU0MWFmZTQ1ZmIwYWRkMjNlODRjNzJmMzAyNjczMmRl ZTUyY2ZmMC4uNThkOTViYjlmZjk1ZGU1YmJiODVlYTk5MmRmOGQxMTZhOWIzMDQxNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDE1LTAzLTI1ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+ CisKKyAgICAgICAgTWlncmF0ZSB1cGRhdGUtd2Via2l0IGZvciBXaW5kb3dzIHRvIG5vdCByZXF1 aXJlIEN5Z3dpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTQzMDQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBTY3JpcHRzL3VwZGF0ZS13ZWJraXQtZGVwZW5kZW5jeToKKyAgICAgICAgKHdhbnRlZCk6 CisgICAgICAgICh0b1VuaXhQYXRoKTogRGVsZXRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dGRpcnMucG06CisgICAgICAgIChmb250RXhpc3RzKToKKyAgICAgICAgKGNoZWNrSW5zdGFsbGVk VG9vbHMpOgorICAgICAgICAoc2V0dXBBcHBsZVdpbkVudik6CisKIDIwMTUtMDMtMjQgIENzYWJh IE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBbRUZMXSBBZGQgT3Bl bldlYlJUQyBpbiBqaGJ1aWxkCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJr aXQtZGVwZW5kZW5jeSBiL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1kZXBlbmRlbmN5Cmlu ZGV4IGVjNWI2ZmQ5OGMyYmViMDNlZTEzMTNiYWQxYmU3MjY5YWI1YzAwNDMuLmZiN2ZjNWEzMDM4 OWMzNmEwNTJkOTBjZTEyOTIxOWFjMTcxMTE4NzIgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv dXBkYXRlLXdlYmtpdC1kZXBlbmRlbmN5CisrKyBiL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtp dC1kZXBlbmRlbmN5CkBAIC0zMiwxMSArMzIsMTQgQEAKIHVzZSBzdHJpY3Q7CiB1c2Ugd2Fybmlu Z3M7CiAKK3VzZSBBcmNoaXZlOjpaaXAgcXcoIDpFUlJPUl9DT0RFUyApOwordXNlIEZpbGU6OkNv cHk7CiB1c2UgRmlsZTo6RmluZDsKIHVzZSBGaWxlOjpTcGVjOwogdXNlIEZpbGU6OlRlbXAgKCk7 CiB1c2UgRmluZEJpbjsKLXVzZSBIVFRQOjpEYXRlIHF3KHN0cjJ0aW1lKTsKK3VzZSBIVFRQOjpE YXRlIHF3KHN0cjJ0aW1lIHRpbWUyc3RyKTsKK3VzZSBMV1A6OlNpbXBsZTsKIHVzZSBQT1NJWDsK IHVzZSBsaWIgJEZpbmRCaW46OkJpbjsKIHVzZSB3ZWJraXRkaXJzOwpAQCAtNjcsMjQgKzcwLDMw IEBAIG15ICRwcmVmaXhJblppcCA9IHNoaWZ0OwogbXkgJHNvdXJjZURpciA9IHNvdXJjZURpcigp OwogbXkgJGZpbGUgPSBnZXRMaWJyYXJ5TmFtZSgkbGlic1VSTCk7CiBteSAkemlwRmlsZSA9ICIk ZmlsZS56aXAiOyAKLW15ICR3ZWJraXRMaWJyYXJpZXNEaXIgPSB0b1VuaXhQYXRoKCRFTlZ7J1dF QktJVF9MSUJSQVJJRVMnfSkgfHwgIiRzb3VyY2VEaXIvV2ViS2l0TGlicmFyaWVzL3dpbiI7Citt eSAkd2Via2l0TGlicmFyaWVzRGlyID0gJEVOVnsnV0VCS0lUX0xJQlJBUklFUyd9IHx8ICIkc291 cmNlRGlyL1dlYktpdExpYnJhcmllcy93aW4iOwogbXkgJHRtcFJlbGF0aXZlRGlyID0gRmlsZTo6 VGVtcDo6dGVtcGRpcigid2Via2l0bGlic1hYWFhYWFgiLCBUTVBESVIgPT4gMSwgQ0xFQU5VUCA9 PiAxKTsKIG15ICR0bXBBYnNEaXIgPSBGaWxlOjpTcGVjLT5yZWwyYWJzKCR0bXBSZWxhdGl2ZURp cik7CiAKIHByaW50ICJDaGVja2luZyBMYXN0LU1vZGlmaWVkIGRhdGUgb2YgJHppcEZpbGUuLi5c biI7CiAKLW15ICRyZXN1bHQgPSBzeXN0ZW0gImN1cmwgLXMgLUkgLWsgJGxpYnNVUkwgfCBncmVw IExhc3QtTW9kaWZpZWQgPiBcIiR0bXBBYnNEaXIvJGZpbGUuaGVhZGVyc1wiIjsKK215ICgkY29u dGVudF90eXBlLCAkZG9jdW1lbnRfbGVuZ3RoLCAkbW9kaWZpZWRfdGltZSwgJGV4cGlyZXMsICRz ZXJ2ZXIpID0gaGVhZCgkbGlic1VSTCk7CiAKLWlmIChXRVhJVFNUQVRVUygkcmVzdWx0KSkgewor aWYgKGRlZmluZWQgJG1vZGlmaWVkX3RpbWUpIHsKKworICAgIG9wZW4gTkVXLCAiPiIsICIkdG1w QWJzRGlyLyRmaWxlLmhlYWRlcnMiOworICAgIHByaW50IE5FVyAiTGFzdC1Nb2RpZmllZDogIiAu IHRpbWUyc3RyKCRtb2RpZmllZF90aW1lKSAuICJcbiI7CisgICAgY2xvc2UgTkVXOworCit9IGVs c2UgewogCiAgICAgI05vdGU6IE5laXRoZXIgR2l0SHViIG5vciBEcm9wQm94IGVtaXQgdGhlIExh c3QtTW9kaWZpZWQgSFRUUCBoZWFkZXIsIHNvIGZhbGwgYmFjayB0byBhIGZpbGUKIAkjY29udGFp bmluZyB0aGUgbmVjZXNzYXJ5IGluZm9ybWF0aW9uIGlmIHdlIGRvIG5vdCByZWNlaXZlIHRoZSBp bmZvcm1hdGlvbiBpbiBvdXIgaW5pdGlhbCBxdWVyeS4KICAgICBteSAkaGVhZGVyVVJMID0gJGxp YnNVUkw7CiAgICAgJGhlYWRlclVSTCA9fiBzL1wuemlwJC9cLmhlYWRlcnMvOwogCi0gICAgJHJl c3VsdCA9IHN5c3RlbSAiY3VybCAtayAtbyBcIiR0bXBBYnNEaXIvJGZpbGUuaGVhZGVyc1wiICRo ZWFkZXJVUkwiOworICAgIG15ICRyZXN1bHQgPSBnZXRzdG9yZSgkaGVhZGVyVVJMLCAiJHRtcEFi c0Rpci8kZmlsZS5oZWFkZXJzIik7CiAKLSAgICBpZiAoV0VYSVRTVEFUVVMoJHJlc3VsdCkpIHsK KyAgICBpZiAoIWlzX3N1Y2Nlc3MoJHJlc3VsdCkpIHsKICAgICAgICAgcHJpbnQgU1RERVJSICJD b3VsZG4ndCBjaGVjayBMYXN0LU1vZGlmaWVkIGRhdGUgb2YgbmV3ICR6aXBGaWxlLlxuIjsKICAg ICAgICAgcHJpbnQgU1RERVJSICJQbGVhc2UgZW5zdXJlIHRoYXQgJGxpYnNVUkwgaXMgcmVhY2hh YmxlLlxuIjsKIApAQCAtMTEzLDExICsxMjIsMTMgQEAgaWYgKG9wZW4gTkVXLCAiJHRtcEFic0Rp ci8kZmlsZS5oZWFkZXJzIikgewogfQogCiBwcmludCAiRG93bmxvYWRpbmcgJHppcEZpbGUuLi5c blxuIjsKLSRyZXN1bHQgPSBzeXN0ZW0gImN1cmwgLWsgLW8gXCIkdG1wQWJzRGlyLyR6aXBGaWxl XCIgJGxpYnNVUkwiOwotZGllICJDb3VsZG4ndCBkb3dubG9hZCAkemlwRmlsZSEiIGlmICRyZXN1 bHQ7CitwcmludCAiJGxpYnNVUkxcbiI7CitteSAkcmVzdWx0ID0gZ2V0c3RvcmUoJGxpYnNVUkws ICIkdG1wQWJzRGlyLyR6aXBGaWxlIik7CitkaWUgIkNvdWxkbid0IGRvd25sb2FkICR6aXBGaWxl ISIgaWYgaXNfZXJyb3IoJHJlc3VsdCk7CiAKLSRyZXN1bHQgPSBzeXN0ZW0gInVuemlwIiwgIi1x IiwgIi1kIiwgJHRtcEFic0RpciwgIiR0bXBBYnNEaXIvJHppcEZpbGUiOwotZGllICJDb3VsZG4n dCB1bnppcCAkemlwRmlsZS4iIGlmICRyZXN1bHQ7CitteSAkemlwID0gQXJjaGl2ZTo6WmlwLT5u ZXcoIiR0bXBBYnNEaXIvJHppcEZpbGUiKTsKKyRyZXN1bHQgPSAkemlwLT5leHRyYWN0VHJlZSgi IiwgJHRtcEFic0Rpcik7CitkaWUgIkNvdWxkbid0IHVuemlwICR6aXBGaWxlLiIgaWYgJHJlc3Vs dCAhPSBBWl9PSzsKIAogcHJpbnQgIlxuSW5zdGFsbGluZyAkZmlsZS4uLlxuIjsKIApAQCAtMTMx LDI1ICsxNDIsMTcgQEAgc3ViIHdhbnRlZAogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAg c3lzdGVtICJjcCIsICRfLCAkZGVzdGluYXRpb247CisgICAgY29weSgkXywgJGRlc3RpbmF0aW9u KTsKIH0KIAogRmlsZTo6RmluZDo6ZmluZChcJndhbnRlZCwgIiR0bXBBYnNEaXIvJGZpbGUiKTsK IAotJHJlc3VsdCA9IHN5c3RlbSAibXYiLCAiJHRtcEFic0Rpci8kZmlsZS5oZWFkZXJzIiwgJHdl YmtpdExpYnJhcmllc0RpcjsKLXByaW50IFNUREVSUiAiQ291bGRuJ3QgbW92ZSAkZmlsZS5oZWFk ZXJzIHRvICR3ZWJraXRMaWJyYXJpZXNEaXIiIC4gIi5cbiIgaWYgJHJlc3VsdDsKKyRyZXN1bHQg PSBtb3ZlKCIkdG1wQWJzRGlyLyRmaWxlLmhlYWRlcnMiLCAkd2Via2l0TGlicmFyaWVzRGlyKTsK K3ByaW50IFNUREVSUiAiQ291bGRuJ3QgbW92ZSAkZmlsZS5oZWFkZXJzIHRvICR3ZWJraXRMaWJy YXJpZXNEaXIiIC4gIi5cbiIgaWYgJHJlc3VsdCA9PSAwOwogCiBwcmludCAiVGhlICRmaWxlIGhh cyBiZWVuIHN1Y2Vzc2Z1bGx5IGluc3RhbGxlZCBpblxuICR3ZWJraXRMaWJyYXJpZXNEaXJcbiI7 CiBleGl0OwogCi1zdWIgdG9Vbml4UGF0aAotewotICAgIG15ICRwYXRoID0gc2hpZnQ7Ci0gICAg cmV0dXJuIHVubGVzcyAkcGF0aDsKLSAgICBjaG9tcCgkcGF0aCA9IGBjeWdwYXRoIC11ICckcGF0 aCdgKTsKLSAgICByZXR1cm4gJHBhdGg7Ci19Ci0KIHN1YiBsYXN0TW9kaWZpZWRUb1VuaXhUaW1l KCQpCiB7CiAgICAgbXkgKCRzdHIpID0gQF87CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggYTBjMjU3MzNi NjllMDdhMjY5NWZkZTQzMjkyMmM5OTFhMTg0MThjYS4uZDU5NWM2MTZlZDIzOGNhZmZhN2E0YzJk MWU2MmViNjViODNmYTdiZiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBt CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMTQ0OSwxNSArMTQ0OSwxNiBA QCBzdWIgd2luZG93c091dHB1dERpcigpCiBzdWIgZm9udEV4aXN0cygkKQogewogICAgIG15ICRm b250ID0gc2hpZnQ7Ci0gICAgbXkgJHZhbCA9IHN5c3RlbSBxdyhyZWd0b29sIGdldCksICdcXEhL TE1cXFNPRlRXQVJFXFxNaWNyb3NvZnRcXFdpbmRvd3MgTlRcXEN1cnJlbnRWZXJzaW9uXFxGb250 c1xcJyAuICRmb250IC4gJyAoVHJ1ZVR5cGUpJzsKLSAgICByZXR1cm4gMCA9PSAkdmFsOworICAg IG15ICRjbWQgPSAicmVnIHF1ZXJ5IFwiSEtMTVxcU09GVFdBUkVcXE1pY3Jvc29mdFxcV2luZG93 cyBOVFxcQ3VycmVudFZlcnNpb25cXEZvbnRzXFwiIC4gJGZvbnQgLiJcIiAyPiYxIjsKKyAgICBt eSAkdmFsID0gYCRjbWRgOworICAgIHJldHVybiAkPyA9PSAwOwogfQogCiBzdWIgY2hlY2tJbnN0 YWxsZWRUb29scygpCiB7CiAgICAgIyBTVk4gMS43LjEwIGlzIGtub3duIHRvIGJlIGNvbXBhdGli bGUgd2l0aCBjdXJyZW50IHNlcnZlcnMuIFNWTiAxLjgueCBzZWVtcyB0byBiZSBtaXNzaW5nIHNv bWUgYXV0aGVudGljYXRpb24KICAgICAjIHByb3RvY29scyB3ZSB1c2UgZm9yIHN2bi53ZWJraXQu b3JnOgotICAgIG15ICRzdm5WZXJzaW9uID0gYHN2biAtLXZlcnNpb24gfCBncmVwICJcXHN2ZXJz aW9uImA7CisgICAgbXkgJHN2blZlcnNpb24gPSBgc3ZuIC0tdmVyc2lvbiAyPiBOVUwgfCBncmVw ICJcXHN2ZXJzaW9uImA7CiAgICAgY2hvbXAoJHN2blZlcnNpb24pOwogICAgIGlmICghJD8gYW5k ICRzdm5WZXJzaW9uID1+IC8xXC44XC4vKSB7CiAgICAgICAgIHByaW50ICJzdm4gMS43LjEwIGlz IGtub3duIHRvIGJlIGNvbXBhdGlibGUgd2l0aCBvdXIgc2VydmVycy4gWW91IGFyZSBydW5uaW5n ICRzdm5WZXJzaW9uLFxud2hpY2ggbWF5IG5vdCB3b3JrIHByb3Blcmx5LlxuIgpAQCAtMTQ2OCw3 ICsxNDY5LDcgQEAgc3ViIGNoZWNrSW5zdGFsbGVkVG9vbHMoKQogICAgIGRpZSAiWW91IG11c3Qg aGF2ZSBQeXRob24gaW5zdGFsbGVkIHRvIGJ1aWxkIFdlYktpdC5cbiIgaWYgKCQ/KTsKIAogICAg ICMgY1VSTCA3LjM0LjAgaGFzIGEgYnVnIHRoYXQgcHJldmVudHMgYXV0aGVudGljYXRpb24gd2l0 aCBvcGVuc291cmNlLmFwcGxlLmNvbSAoYW5kIG90aGVyIHRoaW5ncyB1c2luZyBTU0wzKS4KLSAg ICBteSAkY3VybFZlciA9IGBjdXJsIC0tdmVyc2lvbiB8IGdyZXAgImN1cmwiYDsKKyAgICBteSAk Y3VybFZlciA9IGBjdXJsIC0tdmVyc2lvbiAyPiBOVUwgfCBncmVwICJjdXJsImA7CiAgICAgY2hv bXAoJGN1cmxWZXIpOwogICAgIGlmICghJD8gYW5kICRjdXJsVmVyID1+IC9saWJjdXJsXC83XC4z NFwuMC8pIHsKICAgICAgICAgcHJpbnQgImNVUkwgdmVyc2lvbiA3LjM0LjAgaGFzIGEgYnVnIHRo YXQgcHJldmVudHMgYXV0aGVudGljYXRpb24gd2l0aCBTU0wgdjIgb3IgdjMuXG4iOwpAQCAtMTUy NSw3ICsxNTI2LDEwIEBAIHN1YiBzZXR1cEFwcGxlV2luRW52KCkKIAogICAgICAgICBmb3JlYWNo IG15ICR2YXJpYWJsZSAoa2V5cyAldmFyaWFibGVzVG9TZXQpIHsKICAgICAgICAgICAgIHByaW50 ICJTZXR0aW5nIHRoZSBFbnZpcm9ubWVudCBWYXJpYWJsZSAnIiAuICR2YXJpYWJsZSAuICInIHRv ICciIC4gJHZhcmlhYmxlc1RvU2V0eyR2YXJpYWJsZX0gLiAiJ1xuXG4iOwotICAgICAgICAgICAg c3lzdGVtIHF3KHJlZ3Rvb2wgLXMgc2V0KSwgJ1xcSEtFWV9DVVJSRU5UX1VTRVJcXEVudmlyb25t ZW50XFwnIC4gJHZhcmlhYmxlLCAkdmFyaWFibGVzVG9TZXR7JHZhcmlhYmxlfTsKKyAgICAgICAg ICAgIG15ICRyZXQgPSBzeXN0ZW0gInNldHgiLCAkdmFyaWFibGUsICR2YXJpYWJsZXNUb1NldHsk dmFyaWFibGV9OworICAgICAgICAgICAgaWYgKCRyZXQgIT0gMCkgeworICAgICAgICAgICAgICAg IHN5c3RlbSBxdyhyZWd0b29sIC1zIHNldCksICdcXEhLRVlfQ1VSUkVOVF9VU0VSXFxFbnZpcm9u bWVudFxcJyAuICR2YXJpYWJsZSwgJHZhcmlhYmxlc1RvU2V0eyR2YXJpYWJsZX07CisgICAgICAg ICAgICB9CiAgICAgICAgICAgICAkcmVzdGFydE5lZWRlZCB8fD0gICR2YXJpYWJsZSBlcSAiV0VC S0lUX0xJQlJBUklFUyIgfHwgJHZhcmlhYmxlIGVxICJXRUJLSVRfT1VUUFVURElSIjsKICAgICAg ICAgfQogCg==