93208 2012-08-05 16:25:11 -0700 [jhbuild] move md5sum checking to update-webkit-libs-jhbuild 2012-08-16 02:02:13 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 gustavo gustavo cdumez mrobinson pnormand oldest_to_newest 687664 0 gustavo 2012-08-05 16:25:11 -0700 [jhbuild] move md5sum checking to update-webkit-libs-jhbuild 687665 1 156570 gustavo 2012-08-05 16:32:02 -0700 Created attachment 156570 Patch 690497 2 156570 mrobinson 2012-08-08 10:44:28 -0700 Comment on attachment 156570 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156570&action=review Looks good, but I have a couple concerns below... > Tools/Scripts/update-webkit-libs-jhbuild:50 > + # Read the whole file. You can probably omit this comment. > Tools/Scripts/update-webkit-libs-jhbuild:63 > + foreach my $file (qw(jhbuildrc.md5sum jhbuild.modules.md5sum)) { It seems a bit less expensive and logical to start with the base names and then append ".md5sum" for the frozen version of the md5sum, like in saveJhbuildMd5. > Tools/Scripts/webkitdirs.pm:1924 > + unshift(@buildArgs, jhbuildWrapperPrefixIfNeeded()); Will this do the right thing if the WebKit jhbuild isn't used? It adds an empty string to the front of the array. 694939 3 gustavo 2012-08-14 07:20:12 -0700 (In reply to comment #2) > > Tools/Scripts/webkitdirs.pm:1924 > > + unshift(@buildArgs, jhbuildWrapperPrefixIfNeeded()); > > Will this do the right thing if the WebKit jhbuild isn't used? It adds an empty string to the front of the array. Actually, it'll prepend 'env': + } elsif (isGtk()) { + if (-e getJhbuildPath()) { + return File::Spec->catfile(sourceDir(), "Tools", "gtk", "run-with-jhbuild"); + } + return "env"; 695988 4 156570 gustavo 2012-08-15 07:26:29 -0700 Comment on attachment 156570 Patch http://trac.webkit.org/changeset/125674 696900 5 cdumez 2012-08-16 01:35:36 -0700 After this patch, the behavior on EFL port seems unexpected: It triggers jhbuild before EVERY build. This is quite annoying: """ Updating EFL port dependencies using jhbuild... *** Checking out pixman *** [1/22] *** Skipping pixman (not updated) *** [1/22] *** Checking out cairo *** [2/22] *** Skipping cairo (not updated) *** [2/22] *** Checking out fonts *** [3/22] *** Skipping fonts (not updated) *** [3/22] *** Checking out fontconfig *** [4/22] *** Skipping fontconfig (not updated) *** [4/22] *** Checking out freetype6 *** [5/22] *** Skipping freetype6 (not updated) *** [5/22] *** Checking out harfbuzz *** [6/22] *** Skipping harfbuzz (not updated) *** [6/22] *** Checking out libffi *** [7/22] *** Skipping libffi (not updated) *** [7/22] *** Checking out glib *** [8/22] ... """ 696926 6 156570 pnormand 2012-08-16 02:02:13 -0700 Comment on attachment 156570 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156570&action=review > Tools/Scripts/webkitdirs.pm:2105 > if (isEfl()) { > - saveJhbuildMd5(); > + system("perl", "$sourceDir/Tools/Scripts/update-webkitefl-libs") == 0 or die $!; Due to this change I presume? 156570 2012-08-05 16:32:02 -0700 2012-08-16 02:02:12 -0700 Patch bug-93208-20120805203139.patch text/plain 11375 gustavo U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0Njc3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWQ0YjY1ZmM2ZmU0NDM1MjczNmYzMGNlNWE3NDFiMmM5 YTE4MzA0OS4uNzgyZTQ5NmM0MTFmOTY0YmQzOGM0Y2UwMmRiZjA1YjJkZThjNGE2MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDEyLTA4LTA1ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxnbnNAZ25vbWUub3JnPgor CisgICAgICAgIFtqaGJ1aWxkXSBtb3ZlIG1kNXN1bSBjaGVja2luZyB0byB1cGRhdGUtd2Via2l0 LWxpYnMtamhidWlsZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTMyMDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBUaGlzIGNoYW5nZSBtYWtlcyB0aGUgbWQ1c3VtIGNoZWNrIGFuZCBzYXZpbmcgYmUgZG9u ZSBieSB0aGUgc2NyaXB0CisgICAgICAgIHRoYXQgcGVyZm9ybXMgdGhlIGRlcGVuZGVuY2llcyB1 cGRhdGUuIGJ1aWxkLXdlYmtpdCBubyBsb25nZXIgcHJlZml4ZXMKKyAgICAgICAgY2FsbHMgdG8g Y29tbWFuZHMgd2l0aCBqaGJ1aWxkLXdyYXBwZXIgaWYgamhidWlsZCBoYXMgbm90IGJlZW4KKyAg ICAgICAgYm9vdHN0cmFwcGVkIGJ5IHRoZSBkZXZlbG9wZXIgYW5kIC0tdXBkYXRlLWd0ayBpcyBu b3QgZ2l2ZW4uCisKKyAgICAgICAgKiBTY3JpcHRzL3VwZGF0ZS13ZWJraXQtbGlicy1qaGJ1aWxk OgorICAgICAgICAoZ2V0TUQ1SGFzaEZvckZpbGUpOiBtb3ZlZCBmcm9tIHdlYmtpdGRpcnMuCisg ICAgICAgIChqaGJ1aWxkQ29uZmlndXJhdGlvbkNoYW5nZWQpOiBkaXR0by4KKyAgICAgICAgKHNh dmVKaGJ1aWxkTWQ1KTogZGl0dG8uCisgICAgICAgIChjbGVhbkpoYnVpbGQpOiBkaXR0bywgYW5k IGNoYW5nZWQgdG8gcnVuIGpoYnVpbGQgY2xlYW4gYmVmb3JlIHJlbW92aW5nCisgICAgICAgIGpo YnVpbGQuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAocnVuQXV0 b2dlbkZvckF1dG90b29sc1Byb2plY3RJZk5lY2Vzc2FyeSk6IHVzZSBqaGJ1aWxkV3JhcHBlclBy ZWZpeElmTmVlZGVkLgorICAgICAgICAoYnVpbGRBdXRvdG9vbHNQcm9qZWN0KTogZGl0dG8uCisg ICAgICAgIChqaGJ1aWxkV3JhcHBlclByZWZpeElmTmVlZGVkKTogYWRkIGEgY29kZSBicmFuY2gg Zm9yIEdUSysuCisgICAgICAgIChnZW5lcmF0ZUJ1aWxkU3lzdGVtRnJvbUNNYWtlUHJvamVjdCk6 IGNhbGwgdXBkYXRlLXdlYmtpdGVmbC1saWJzCisgICAgICAgIHVuY29uZGl0aW9uYWxseSBmb3Ig RUZMLgorICAgICAgICAqIGpoYnVpbGQvamhidWlsZC13cmFwcGVyOgorICAgICAgICAodXBkYXRl X3dlYmtpdF9saWJzX2poYnVpbGQpOiByZW1vdmVkLCBqaGJ1aWxkLXdyYXBwZXIgbm8gbG9uZ2Vy IHJ1bnMgdGhlCisgICAgICAgIHVwZGF0ZSBzY3JpcHQgaXRzZWxmCisgICAgICAgIChlbnN1cmVf amhidWlsZCk6IHJlbW92ZSB1cGRhdGUgY2FsbC4KKwogMjAxMi0wOC0wMyAgWWFyb24gRnJpZWRt YW4gIDx5ZnJpZWRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWUtQW5kcm9pZF0g LSBQcmVwYXJlIGFwayB0ZXN0cyBmb3Igc3dpdGNoIHRvIGNoZWNrZWQgaW4gU0RLLgpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWxpYnMtamhidWlsZCBiL1Rvb2xzL1Nj cmlwdHMvdXBkYXRlLXdlYmtpdC1saWJzLWpoYnVpbGQKaW5kZXggNDgzNDNmYjMwNTZhMWRkNWU0 NWQzMTBjNTlkMjAwZGMzOWIxNGQ4OC4uMGU1NTlhN2FjMWFkNWMyYWE0ZDdjZjY4Y2Y0NDdkZGMx NzQxMjFkMiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWxpYnMtamhi dWlsZAorKysgYi9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtbGlicy1qaGJ1aWxkCkBAIC00 MSw2ICs0MSw1OCBAQCBpZiAoISRnZXRPcHRpb25zUmVzdWx0KSB7CiAgICAgfQogfQogCitzdWIg Z2V0TUQ1SGFzaEZvckZpbGUoJCkKK3sKKyAgICBteSAkZmlsZSA9IHNoaWZ0OworCisgICAgb3Bl bihGSUxFX0NPTlRFTlRTLCAkZmlsZSk7CisKKyAgICAjIFJlYWQgdGhlIHdob2xlIGZpbGUuCisg ICAgbXkgJGNvbnRlbnRzID0gIiI7CisgICAgd2hpbGUgKDxGSUxFX0NPTlRFTlRTPikgeworICAg ICAgICAkY29udGVudHMgLj0gJF87CisgICAgfQorCisgICAgY2xvc2UoRklMRV9DT05URU5UUyk7 CisKKyAgICByZXR1cm4gbWQ1X2hleCgkY29udGVudHMpOworfQorCitzdWIgamhidWlsZENvbmZp Z3VyYXRpb25DaGFuZ2VkKCkKK3sKKyAgICBmb3JlYWNoIG15ICRmaWxlIChxdyhqaGJ1aWxkcmMu bWQ1c3VtIGpoYnVpbGQubW9kdWxlcy5tZDVzdW0pKSB7CisgICAgICAgIG15ICRwYXRoID0gam9p bignLycsIGdldEpoYnVpbGRQYXRoKCksICRmaWxlKTsKKyAgICAgICAgaWYgKCEgLWUgJHBhdGgp IHsKKyAgICAgICAgICAgIHJldHVybiAxOworICAgICAgICB9CisKKyAgICAgICAgIyBHZXQgdGhl IG1kNSBzdW0gb2YgdGhlIGZpbGUgd2UncmUgdGVzdGluZywgbG9vayBpbiB0aGUgcmlnaHQgcGxh dGZvcm0gZGlyZWN0b3J5LgorICAgICAgICAkZmlsZSA9fiBtLyguKylcLm1kNXN1bS87CisgICAg ICAgIG15ICRhY3R1YWxGaWxlID0gam9pbignLycsIHNvdXJjZURpcigpLCAnVG9vbHMnLCAkcGxh dGZvcm0sICQxKTsKKyAgICAgICAgbXkgJGN1cnJlbnRTdW0gPSBnZXRNRDVIYXNoRm9yRmlsZSgk YWN0dWFsRmlsZSk7CisKKyAgICAgICAgIyBHZXQgb3VyIHByZXZpb3VzIHJlY29yZC4KKyAgICAg ICAgb3BlbihQUkVWSU9VU19NRDUsICRwYXRoKTsKKyAgICAgICAgY2hvbXAobXkgJHByZXZpb3Vz U3VtID0gPFBSRVZJT1VTX01ENT4pOworICAgICAgICBjbG9zZShQUkVWSU9VU19NRDUpOworCisg ICAgICAgIGlmICgkcHJldmlvdXNTdW0gbmUgJGN1cnJlbnRTdW0pIHsKKyAgICAgICAgICAgIHJl dHVybiAxOworICAgICAgICB9CisgICAgfQorfQorCitzdWIgc2F2ZUpoYnVpbGRNZDUoKSB7Cisg ICAgIyBTYXZlIG1kNXN1bSBmb3IgamhidWlsZC1yZWxhdGVkIGZpbGVzLnNhdmVKaGJ1aWxkTWQ1 KCk7CisgICAgZm9yZWFjaCBteSAkZmlsZSAocXcoamhidWlsZHJjIGpoYnVpbGQubW9kdWxlcykp IHsKKyAgICAgICAgbXkgJHNvdXJjZSA9IGpvaW4oJy8nLCBzb3VyY2VEaXIoKSwgIlRvb2xzIiwg JHBsYXRmb3JtLCAkZmlsZSk7CisgICAgICAgIG15ICRkZXN0aW5hdGlvbiA9IGpvaW4oJy8nLCBn ZXRKaGJ1aWxkUGF0aCgpLCAkZmlsZSk7CisgICAgICAgIG9wZW4oU1VNLCAiPiRkZXN0aW5hdGlv biIgLiAiLm1kNXN1bSIpOworICAgICAgICBwcmludCBTVU0gZ2V0TUQ1SGFzaEZvckZpbGUoJHNv dXJjZSk7CisgICAgICAgIGNsb3NlKFNVTSk7CisgICAgfQorfQorCiBzdWIgcnVuSmhidWlsZAog ewogICAgIG15ICRjb21tYW5kID0gc2hpZnQ7CkBAIC00OSwxMCArMTAxLDMwIEBAIHN1YiBydW5K aGJ1aWxkCiAgICAgc3lzdGVtKEBqaGJ1aWxkQXJncykgPT0gMCBvciBkaWUgIlJ1bm5pbmcgamhi dWlsZC13cmFwcGVyICIgLiAkY29tbWFuZCAuICIgZmFpbGVkLlxuIjsKIH0KIAorc3ViIGNsZWFu SmhidWlsZCgpCit7CisgICAgcnVuSmhidWlsZCgiY2xlYW4iKTsKKworICAgICMgSWYgdGhlIGNv bmZpZ3VyYXRpb24gY2hhbmdlZCwgZGVwZW5kZW5jaWVzIG1heSBoYXZlIGJlZW4gcmVtb3ZlZC4K KyAgICAjIFNpbmNlIHdlIGxhY2sgYSBncmFudWxhciB3YXkgb2YgdW5pbnN0YWxsaW5nIHRob3Nl IHdlIHdpcGUgb3V0IHRoZQorICAgICMgamhidWlsZCByb290IGFuZCBzdGFydCBmcm9tIHNjcmF0 Y2guCisgICAgbXkgJGpoYnVpbGRQYXRoID0gZ2V0SmhidWlsZFBhdGgoKTsKKyAgICBpZiAoc3lz dGVtKCJybSAtcmYgJGpoYnVpbGRQYXRoL1Jvb3QiKSBuZSAwKSB7CisgICAgICAgIGRpZSAiQ2xl YW5pbmcgamhidWlsZCByb290IGZhaWxlZCEiOworICAgIH0KK30KKwogZGVsZXRlICRFTlZ7QVJf RkxBR1N9IGlmIGV4aXN0cyAkRU5We0FSX0ZMQUdTfTsKIAogY2hkaXIocmVsYXRpdmVTY3JpcHRz RGlyKCkgLiAiLy4uL2poYnVpbGQiKSBvciBkaWUgJCE7CiAKIG15ICVwcmV0dHlQbGF0Zm9ybSA9 ICggImVmbCIgPT4gIkVGTCIsICJndGsiID0+ICJHVEsrIiApOworCitpZiAoLWUgZ2V0SmhidWls ZFBhdGgoKSAmJiBqaGJ1aWxkQ29uZmlndXJhdGlvbkNoYW5nZWQoKSkgeworICAgIGNsZWFuSmhi dWlsZCgpOworfQorCiBwcmludCAiVXBkYXRpbmcgIiAuICRwcmV0dHlQbGF0Zm9ybXskcGxhdGZv cm19IC4gIiBwb3J0IGRlcGVuZGVuY2llcyB1c2luZyBqaGJ1aWxkLi4uXG4iOwogcnVuSmhidWls ZCgiYnVpbGQiKTsKKworc2F2ZUpoYnVpbGRNZDUoKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCBjYzE2 ZTM4YjcwMTM4MjY5YzE5Y2M3ZTVhYTYyYmU2MjJjYzQ3MDBmLi42MjE1NTk3YjhkMzJmZGExYTk0 M2FjZWZiZDNmYzdhNGE2MDY0OGMxIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRp cnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC0xODc4LDIzICsxODc4 LDYgQEAgc3ViIGF1dG90b29sc0ZsYWcoJCQpCiAgICAgcmV0dXJuICRwcmVmaXggLiAnLScgLiAk ZmVhdHVyZTsKIH0KIAotc3ViIGdldE1ENUhhc2hGb3JGaWxlKCQpCi17Ci0gICAgbXkgJGZpbGUg PSBzaGlmdDsKLQotICAgIG9wZW4oRklMRV9DT05URU5UUywgJGZpbGUpOwotCi0gICAgIyBSZWFk IHRoZSB3aG9sZSBmaWxlLgotICAgIG15ICRjb250ZW50cyA9ICIiOwotICAgIHdoaWxlICg8RklM RV9DT05URU5UUz4pIHsKLSAgICAgICAgJGNvbnRlbnRzIC49ICRfOwotICAgIH0KLQotICAgIGNs b3NlKEZJTEVfQ09OVEVOVFMpOwotCi0gICAgcmV0dXJuIG1kNV9oZXgoJGNvbnRlbnRzKTsKLX0K LQogc3ViIHJ1bkF1dG9nZW5Gb3JBdXRvdG9vbHNQcm9qZWN0SWZOZWNlc3NhcnkoJEApCiB7CiAg ICAgbXkgKCRkaXIsICRwcmVmaXgsICRzb3VyY2VEaXIsICRwcm9qZWN0LCBAYnVpbGRBcmdzKSA9 IEBfOwpAQCAtMTkzOCw3ICsxOTIxLDcgQEAgc3ViIHJ1bkF1dG9nZW5Gb3JBdXRvdG9vbHNQcm9q ZWN0SWZOZWNlc3NhcnkoJEApCiAKICAgICAjIFByZWZpeCB0aGUgY29tbWFuZCB3aXRoIGpoYnVp bGQgcnVuLgogICAgIHVuc2hpZnQoQGJ1aWxkQXJncywgIiRyZWxTb3VyY2VEaXIvYXV0b2dlbi5z aCIpOwotICAgIHVuc2hpZnQoQGJ1aWxkQXJncywgIiRzb3VyY2VEaXIvVG9vbHMvZ3RrL3J1bi13 aXRoLWpoYnVpbGQiKTsKKyAgICB1bnNoaWZ0KEBidWlsZEFyZ3MsIGpoYnVpbGRXcmFwcGVyUHJl Zml4SWZOZWVkZWQoKSk7CiAgICAgaWYgKHN5c3RlbShAYnVpbGRBcmdzKSBuZSAwKSB7CiAgICAg ICAgIGRpZSAiQ2FsbGluZyBhdXRvZ2VuLnNoIGZhaWxlZCFcbiI7CiAgICAgfQpAQCAtMTk0OSw1 OCArMTkzMiw2IEBAIHN1YiBnZXRKaGJ1aWxkUGF0aCgpCiAgICAgcmV0dXJuIGpvaW4oJy8nLCBi YXNlUHJvZHVjdERpcigpLCAiRGVwZW5kZW5jaWVzIik7CiB9CiAKLXN1YiBqaGJ1aWxkQ29uZmln dXJhdGlvbkNoYW5nZWQoKQotewotICAgIGZvcmVhY2ggbXkgJGZpbGUgKHF3KGpoYnVpbGRyYy5t ZDVzdW0gamhidWlsZC5tb2R1bGVzLm1kNXN1bSkpIHsKLSAgICAgICAgbXkgJHBhdGggPSBqb2lu KCcvJywgZ2V0SmhidWlsZFBhdGgoKSwgJGZpbGUpOwotICAgICAgICBpZiAoISAtZSAkcGF0aCkg ewotICAgICAgICAgICAgcmV0dXJuIDE7Ci0gICAgICAgIH0KLQotICAgICAgICAjIEdldCB0aGUg bWQ1IHN1bSBvZiB0aGUgZmlsZSB3ZSdyZSB0ZXN0aW5nLCBsb29rIGluIHRoZSByaWdodCBwbGF0 Zm9ybSBkaXJlY3RvcnkuCi0gICAgICAgICRmaWxlID1+IG0vKC4rKVwubWQ1c3VtLzsKLSAgICAg ICAgbXkgJHBsYXRmb3JtRGlyID0gaXNFZmwoKSA/ICdlZmwnIDogJ2d0ayc7Ci0gICAgICAgIG15 ICRhY3R1YWxGaWxlID0gam9pbignLycsICRzb3VyY2VEaXIsICdUb29scycsICRwbGF0Zm9ybURp ciwgJDEpOwotICAgICAgICBteSAkY3VycmVudFN1bSA9IGdldE1ENUhhc2hGb3JGaWxlKCRhY3R1 YWxGaWxlKTsKLQotICAgICAgICAjIEdldCBvdXIgcHJldmlvdXMgcmVjb3JkLgotICAgICAgICBv cGVuKFBSRVZJT1VTX01ENSwgJHBhdGgpOwotICAgICAgICBjaG9tcChteSAkcHJldmlvdXNTdW0g PSA8UFJFVklPVVNfTUQ1Pik7Ci0gICAgICAgIGNsb3NlKFBSRVZJT1VTX01ENSk7Ci0KLSAgICAg ICAgaWYgKCRwcmV2aW91c1N1bSBuZSAkY3VycmVudFN1bSkgewotICAgICAgICAgICAgcmV0dXJu IDE7Ci0gICAgICAgIH0KLSAgICB9Ci19Ci0KLXN1YiBzYXZlSmhidWlsZE1kNSgpIHsKLSAgICBt eSAkcGxhdGZvcm0gPSBpc0VmbCgpID8gJ2VmbCcgOiAnZ3RrJzsKLSAgICAjIFNhdmUgbWQ1c3Vt IGZvciBqaGJ1aWxkLXJlbGF0ZWQgZmlsZXMuCi0gICAgZm9yZWFjaCBteSAkZmlsZSAocXcoamhi dWlsZHJjIGpoYnVpbGQubW9kdWxlcykpIHsKLSAgICAgICAgbXkgJHNvdXJjZSA9IGpvaW4oJy8n LCAkc291cmNlRGlyLCAiVG9vbHMiLCAkcGxhdGZvcm0sICRmaWxlKTsKLSAgICAgICAgbXkgJGRl c3RpbmF0aW9uID0gam9pbignLycsIGdldEpoYnVpbGRQYXRoKCksICRmaWxlKTsKLSAgICAgICAg b3BlbihTVU0sICI+JGRlc3RpbmF0aW9uIiAuICIubWQ1c3VtIik7Ci0gICAgICAgIHByaW50IFNV TSBnZXRNRDVIYXNoRm9yRmlsZSgkc291cmNlKTsKLSAgICAgICAgY2xvc2UoU1VNKTsKLSAgICB9 Ci19Ci0KLXN1YiBjbGVhbkpoYnVpbGQoKSB7Ci0gICAgICAgICMgSWYgdGhlIGNvbmZpZ3VyYXRp b24gY2hhbmdlZCwgZGVwZW5kZW5jaWVzIG1heSBoYXZlIGJlZW4gcmVtb3ZlZC4KLSAgICAgICAg IyBTaW5jZSB3ZSBsYWNrIGEgZ3JhbnVsYXIgd2F5IG9mIHVuaW5zdGFsbGluZyB0aG9zZSB3ZSB3 aXBlIG91dCB0aGUKLSAgICAgICAgIyBqaGJ1aWxkIHJvb3QgYW5kIHN0YXJ0IGZyb20gc2NyYXRj aC4KLSAgICAgICAgbXkgJGpoYnVpbGRQYXRoID0gZ2V0SmhidWlsZFBhdGgoKTsKLSAgICAgICAg aWYgKHN5c3RlbSgicm0gLXJmICRqaGJ1aWxkUGF0aC9Sb290IikgbmUgMCkgewotICAgICAgICAg ICAgZGllICJDbGVhbmluZyBqaGJ1aWxkIHJvb3QgZmFpbGVkISI7Ci0gICAgICAgIH0KLQotICAg ICAgICBteSAkcGxhdGZvcm0gPSBpc0VmbCgpID8gJ2VmbCcgOiAnZ3RrJzsKLSAgICAgICAgaWYg KHN5c3RlbSgicGVybCAkc291cmNlRGlyL1Rvb2xzL2poYnVpbGQvamhidWlsZC13cmFwcGVyIC0t JHBsYXRmb3JtIGNsZWFuIikgbmUgMCkgewotICAgICAgICAgICAgZGllICJDbGVhbmluZyBqaGJ1 aWxkIG1vZHVsZXMgZmFpbGVkISI7Ci0gICAgICAgIH0KLX0KLQogc3ViIG11c3RSZVJ1bkF1dG9n ZW4oJEApCiB7CiAgICAgbXkgKCRzb3VyY2VEaXIsICRmaWxlbmFtZSwgQGN1cnJlbnRBcmd1bWVu dHMpID0gQF87CkBAIC0yMDkwLDMzICsyMDIxLDE5IEBAIHN1YiBidWlsZEF1dG90b29sc1Byb2pl Y3QoJEApCiAgICAgIyBFbmFibGUgdW5zdGFibGUgZmVhdHVyZXMgd2hlbiBidWlsZGluZyB0aHJv dWdoIGJ1aWxkLXdlYmtpdC4KICAgICBwdXNoIEBidWlsZEFyZ3MsICItLWVuYWJsZS11bnN0YWJs ZS1mZWF0dXJlcyI7CiAKLSAgICAjIFdlIG1pZ2h0IG5lZWQgdG8gdXBkYXRlIGpoYnVpbGQgZGVw ZW5kZW5jaWVzLgotICAgIG15ICRuZWVkVXBkYXRlID0gMDsKLSAgICBpZiAoamhidWlsZENvbmZp Z3VyYXRpb25DaGFuZ2VkKCkpIHsKLSAgICAgICAgY2xlYW5KaGJ1aWxkKCk7Ci0gICAgICAgICRu ZWVkVXBkYXRlID0gMTsKLSAgICB9Ci0KICAgICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92 ZUZyb21BcnJheVJlZigiLS11cGRhdGUtZ3RrIiwgXEBidWlsZEFyZ3MpKSB7Ci0gICAgICAgICRu ZWVkVXBkYXRlID0gMTsKLSAgICB9Ci0KLSAgICBpZiAoJG5lZWRVcGRhdGUpIHsKICAgICAgICAg IyBGb3JjZSBhdXRvZ2VuIHRvIHJ1biwgdG8gY2F0Y2ggdGhlIHBvc3NpYmx5IHVwZGF0ZWQgbGli cmFyaWVzLgogICAgICAgICBzeXN0ZW0oInJtIC1mIHByZXZpb3VzLWF1dG9nZW4tYXJndW1lbnRz LnR4dCIpOwogCiAgICAgICAgIHN5c3RlbSgicGVybCIsICIkc291cmNlRGlyL1Rvb2xzL1Njcmlw dHMvdXBkYXRlLXdlYmtpdGd0ay1saWJzIikgPT0gMCBvciBkaWUgJCE7CiAgICAgfQogCi0gICAg c2F2ZUpoYnVpbGRNZDUoKTsKLQogICAgICMgSWYgR05VbWFrZWZpbGUgZXhpc3RzLCBkb24ndCBy dW4gYXV0b2dlbi5zaCB1bmxlc3MgaXRzIGFyZ3VtZW50cwogICAgICMgaGF2ZSBjaGFuZ2VkLiBU aGUgbWFrZWZpbGUgc2hvdWxkIGJlIHNtYXJ0IGVub3VnaCB0byB0cmFjayBhdXRvdG9vbHMKICAg ICAjIGRlcGVuZGVuY2llcyBhbmQgcmUtcnVuIGF1dG9nZW4uc2ggd2hlbiBidWlsZCBmaWxlcyBj aGFuZ2UuCiAgICAgcnVuQXV0b2dlbkZvckF1dG90b29sc1Byb2plY3RJZk5lY2Vzc2FyeSgkZGly LCAkcHJlZml4LCAkc291cmNlRGlyLCAkcHJvamVjdCwgQGJ1aWxkQXJncyk7CiAKLSAgICBteSAk Z3RrU2NyaXB0c1BhdGggPSAiJHNvdXJjZURpci9Ub29scy9ndGsiOwotICAgIG15ICRydW5XaXRo SmhidWlsZCA9ICIkZ3RrU2NyaXB0c1BhdGgvcnVuLXdpdGgtamhidWlsZCI7CisgICAgbXkgJHJ1 bldpdGhKaGJ1aWxkID0gamhidWlsZFdyYXBwZXJQcmVmaXhJZk5lZWRlZCgpOwogICAgIGlmIChz eXN0ZW0oIiRydW5XaXRoSmhidWlsZCAkbWFrZSAkbWFrZUFyZ3MiKSBuZSAwKSB7CiAgICAgICAg IGRpZSAiXG5GYWlsZWQgdG8gYnVpbGQgV2ViS2l0IHVzaW5nICckbWFrZSchXG4iOwogICAgIH0K QEAgLTIxMjQsNyArMjA0MSw3IEBAIHN1YiBidWlsZEF1dG90b29sc1Byb2plY3QoJEApCiAgICAg Y2hkaXIgIi4uIiBvciBkaWU7CiAKICAgICBpZiAoJHByb2plY3QgZXEgJ1dlYktpdCcgJiYgIWlz Q3Jvc3NDb21waWxhdGlvbigpKSB7Ci0gICAgICAgIG15IEBkb2NHZW5lcmF0aW9uT3B0aW9ucyA9 ICgkcnVuV2l0aEpoYnVpbGQsICIkZ3RrU2NyaXB0c1BhdGgvZ2VuZXJhdGUtZ3RrZG9jIiwgIi0t c2tpcC1odG1sIik7CisgICAgICAgIG15IEBkb2NHZW5lcmF0aW9uT3B0aW9ucyA9ICgkcnVuV2l0 aEpoYnVpbGQsICIkc291cmNlRGlyL1Rvb2xzL2d0ay9nZW5lcmF0ZS1ndGtkb2MiLCAiLS1za2lw LWh0bWwiKTsKICAgICAgICAgcHVzaChAZG9jR2VuZXJhdGlvbk9wdGlvbnMsIHByb2R1Y3REaXIo KSk7CiAKICAgICAgICAgaWYgKHN5c3RlbShAZG9jR2VuZXJhdGlvbk9wdGlvbnMpKSB7CkBAIC0y MTM5LDYgKzIwNTYsMTEgQEAgc3ViIGpoYnVpbGRXcmFwcGVyUHJlZml4SWZOZWVkZWQoKQogewog ICAgIGlmIChpc0VmbCgpKSB7CiAgICAgICAgIHJldHVybiBGaWxlOjpTcGVjLT5jYXRmaWxlKHNv dXJjZURpcigpLCAiVG9vbHMiLCAiZWZsIiwgInJ1bi13aXRoLWpoYnVpbGQiKTsKKyAgICB9IGVs c2lmIChpc0d0aygpKSB7CisgICAgICAgIGlmICgtZSBnZXRKaGJ1aWxkUGF0aCgpKSB7CisgICAg ICAgICAgICByZXR1cm4gRmlsZTo6U3BlYy0+Y2F0ZmlsZShzb3VyY2VEaXIoKSwgIlRvb2xzIiwg Imd0ayIsICJydW4td2l0aC1qaGJ1aWxkIik7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuICJl bnYiOwogICAgIH0KICAgICByZXR1cm4gIiI7CiB9CkBAIC0yMTc5LDEzICsyMTAxLDggQEAgc3Vi IGdlbmVyYXRlQnVpbGRTeXN0ZW1Gcm9tQ01ha2VQcm9qZWN0CiAgICAgICAgICRFTlZ7J0NYWEZM QUdTJ30gPSAiLW1hcmNoPXBlbnRpdW00IC1tc3NlMiAtbWZwbWF0aD1zc2UgIiAuICgkRU5WeydD WFhGTEFHUyd9IHx8ICIiKTsKICAgICB9CiAKLSAgICBpZiAoaXNFZmwoKSAmJiBqaGJ1aWxkQ29u ZmlndXJhdGlvbkNoYW5nZWQoKSkgewotICAgICAgICBjbGVhbkpoYnVpbGQoKTsKLSAgICAgICAg c3lzdGVtKCJwZXJsIiwgIiRzb3VyY2VEaXIvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0ZWZs LWxpYnMiKSA9PSAwIG9yIGRpZSAkITsKLSAgICB9Ci0KICAgICBpZiAoaXNFZmwoKSkgewotICAg ICAgICBzYXZlSmhidWlsZE1kNSgpOworICAgICAgICBzeXN0ZW0oInBlcmwiLCAiJHNvdXJjZURp ci9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXRlZmwtbGlicyIpID09IDAgb3IgZGllICQhOwog ICAgIH0KIAogICAgICMgV2UgY2FsbCBzeXN0ZW0oImNtYWtlIEBhcmdzIikgaW5zdGVhZCBvZiBz eXN0ZW0oImNtYWtlIiwgQGFyZ3MpIHNvIHRoYXQgQGFyZ3MgaXMKZGlmZiAtLWdpdCBhL1Rvb2xz L2poYnVpbGQvamhidWlsZC13cmFwcGVyIGIvVG9vbHMvamhidWlsZC9qaGJ1aWxkLXdyYXBwZXIK aW5kZXggMzkwZmM3ODIxMTBmM2ViYzNkMzUwY2JiYzFhYzhlMzEwOTE0MDk2Ny4uNDBiYmIwMTAx Y2E0N2M3ZDZhYjZkZDA3MTc0OGFiNjEwYWRhM2JkOSAxMDA3NTUKLS0tIGEvVG9vbHMvamhidWls ZC9qaGJ1aWxkLXdyYXBwZXIKKysrIGIvVG9vbHMvamhidWlsZC9qaGJ1aWxkLXdyYXBwZXIKQEAg LTkwLDEzICs5MCw2IEBAIGRlZiBpbnN0YWxsX2poYnVpbGQoKToKICAgICAgICAgcmFpc2UgRXhj ZXB0aW9uKCdqaGJ1aWxkIGNvbmZpZ3VyZSBmYWlsZWQgd2l0aCByZXR1cm4gY29kZTogJWknICUg cHJvY2Vzcy5yZXR1cm5jb2RlKQogCiAKLWRlZiB1cGRhdGVfd2Via2l0X2xpYnNfamhidWlsZChw bGF0Zm9ybSk6Ci0gICAgcHJvY2VzcyA9IHN1YnByb2Nlc3MuUG9wZW4oW2poYnVpbGR1dGlscy50 b3BfbGV2ZWxfcGF0aCgnVG9vbHMnLCAnU2NyaXB0cycsICd1cGRhdGUtd2Via2l0LWxpYnMtamhi dWlsZCcpLCAnLS0nICsgcGxhdGZvcm1dKQotICAgIHByb2Nlc3Mud2FpdCgpCi0gICAgaWYgcHJv Y2Vzcy5yZXR1cm5jb2RlICE9IDA6Ci0gICAgICAgIHJhaXNlIEV4Y2VwdGlvbignamhidWlsZCBj b25maWd1cmUgZmFpbGVkIHdpdGggcmV0dXJuIGNvZGU6ICVpJyAlIHByb2Nlc3MucmV0dXJuY29k ZSkKLQotCiBkZWYgZGV0ZXJtaW5lX3BsYXRmb3JtKCk6CiAgICAgaWYgJy0tZWZsJyBpbiBzeXMu YXJndjoKICAgICAgICAgcmV0dXJuICJlZmwiOwpAQCAtMTEwLDcgKzEwMyw2IEBAIGRlZiBlbnN1 cmVfamhidWlsZChwbGF0Zm9ybSk6CiAgICAgICAgIGNsb25lX2poYnVpbGQoKQogICAgICAgICB1 cGRhdGVfamhidWlsZCgpCiAgICAgICAgIGluc3RhbGxfamhidWlsZCgpCi0gICAgICAgIHVwZGF0 ZV93ZWJraXRfbGlic19qaGJ1aWxkKHBsYXRmb3JtKQogICAgIGVsaWYgbm90IGpoYnVpbGRfaW5z dGFsbGVkKCkgXAogICAgICAgICAgICAgb3Igbm90IGpoYnVpbGRfYXRfZXhwZWN0ZWRfcmV2aXNp b24oKToKICAgICAgICAgdXBkYXRlX2poYnVpbGQoKQo=