32179 2009-12-04 16:21:37 -0800 fixes to build-webkit --chromium 2009-12-07 12:17:33 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 yaar webkit-unassigned commit-queue dglazkov maruel webkit.review.bot yaar oldest_to_newest 168973 0 yaar 2009-12-04 16:21:37 -0800 1. Changes to support running build-webkit outside of cygwin on windows (Chromium is bundled with cygwin). 2. Generation and execution of linux make file. 168974 1 44339 yaar 2009-12-04 16:23:43 -0800 Created attachment 44339 fixes 168977 2 44339 dglazkov 2009-12-04 16:30:15 -0800 Comment on attachment 44339 fixes seems reasonable. 168990 3 44339 commit-queue 2009-12-04 17:12:28 -0800 Comment on attachment 44339 fixes Rejecting patch 44339 from commit-queue. Failed to run "['/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', '--reviewer', 'Dimitri Glazkov', '--force']" exit_code: 1 patching file WebKit/chromium/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebKit/chromium/DEPS Hunk #1 succeeded at 143 (offset 4 lines). patching file WebKit/chromium/WebKit.gyp patching file WebKit/chromium/gyp_webkit patching file WebKitTools/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebKitTools/Scripts/webkitdirs.pm Hunk #1 FAILED at 1037. 1 out of 3 hunks FAILED -- saving rejects to file WebKitTools/Scripts/webkitdirs.pm.rej 168995 4 44341 yaar 2009-12-04 17:31:07 -0800 Created attachment 44341 fixes 168996 5 webkit.review.bot 2009-12-04 17:33:58 -0800 style-queue ran check-webkit-style on attachment 44341 without any errors. 168998 6 44341 eric 2009-12-04 17:45:57 -0800 Comment on attachment 44341 fixes 52 # We can't turn on warnings on Windows and Linux until we're upstream the 5053 # WebKit API. That comment change is wrong. "we" or "we've" would work, but "we're" is wrong. These seem like unrelated changes. Or at lease could be landed separately. I'm not sure I understand the need for buildChromiumVisualStudioProject as a fork from buildVisualStudioProject I'm also not sure if there is code to be shared with buildChromiumMakefile ? 169365 7 44341 eric 2009-12-07 10:32:40 -0800 Comment on attachment 44341 fixes Yaar has convinced me he'll clean up the code duplication at a less "urgent" time. He can fix the comment on landing. 169375 8 44420 yaar 2009-12-07 10:38:58 -0800 Created attachment 44420 Patch with typo fix 169377 9 webkit.review.bot 2009-12-07 10:42:13 -0800 style-queue ran check-webkit-style on attachment 44420 without any errors. 169415 10 44420 commit-queue 2009-12-07 12:17:28 -0800 Comment on attachment 44420 Patch with typo fix Clearing flags on attachment: 44420 Committed r51788: <http://trac.webkit.org/changeset/51788> 169416 11 commit-queue 2009-12-07 12:17:33 -0800 All reviewed patches have been landed. Closing bug. 44339 2009-12-04 16:23:43 -0800 2009-12-04 17:31:03 -0800 fixes bug-32179-20091204162342.patch text/plain 7104 yaar ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDBiNTIzOWEuLjA3ZTU0ZjkgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE0IEBACisyMDA5LTEyLTA0ICBZYWFyIFNjaG5pdG1hbiAgPHlhYXJAY2hyb21pdW0ub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGZpeGVzIHRv IGJ1aWxkLXdlYmtpdCAtLWNocm9taXVtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0zMjE3OQorCisgICAgICAgICogREVQUzoKKyAgICAgICAgKiBXZWJL aXQuZ3lwOgorICAgICAgICAqIGd5cF93ZWJraXQ6CisKIDIwMDktMTItMDEgIFBldGVyIEthc3Rp bmcgIDxwa2FzdGluZ0Bnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEZp c2hlci4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9ERVBTIGIvV2ViS2l0L2Nocm9taXVt L0RFUFMKaW5kZXggNzBkYzZlZi4uYWVlNWZjMyAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVt L0RFUFMKKysrIGIvV2ViS2l0L2Nocm9taXVtL0RFUFMKQEAgLTEzOSw2ICsxMzksMTQgQEAgZGVw c19vcyA9IHsKICAgICAndGhpcmRfcGFydHkvcHRocmVhZHMtd2luMzInOgogICAgICAgVmFyKCdj aHJvbWl1bV9kZXBzX3N2bicpKycvcHRocmVhZHMtd2luMzJAJytWYXIoJ3B0aHJlYWRzLXdpbjMy X3JldicpLAogICB9LAorICAndW5peCc6IHsKKyAgICAjIExpbnV4LCBhY3R1YWxseS4KKyAgICAn dGhpcmRfcGFydHkvaGFyZmJ1enonOgorICAgICAgVmFyKCdjaHJvbWl1bV9zdm4nKSsnL3RoaXJk X3BhcnR5L2hhcmZidXp6QCcrVmFyKCdjaHJvbWl1bV9yZXYnKSwKKworICAgICd0b29scy94ZGlz cGxheWNoZWNrJzoKKyAgICAgIFZhcignY2hyb21pdW1fc3ZuJykrJy90b29scy94ZGlzcGxheWNo ZWNrQCcrVmFyKCdjaHJvbWl1bV9yZXYnKSwKKyAgfSwKIH0KIAogc2tpcF9jaGlsZF9pbmNsdWRl cyA9IFsKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwIGIvV2ViS2l0L2No cm9taXVtL1dlYktpdC5neXAKaW5kZXggYWIwOGRjOS4uOTFmODk4OCAxMDA2NDQKLS0tIGEvV2Vi S2l0L2Nocm9taXVtL1dlYktpdC5neXAKKysrIGIvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAK QEAgLTQwLDE3ICs0MCwyNiBAQAogICAgICAgICAgICAgICAgICMgV2Via2l0IGlzIGJlaW5nIGJ1 aWx0IG91dHNpZGUgb2YgdGhlIGZ1bGwgY2hyb21pdW0gcHJvamVjdC4KICAgICAgICAgICAgICAg ICAjIGUuZy4gdmlhIGJ1aWxkLXdlYmtpdCAtLWNocm9taXVtCiAgICAgICAgICAgICAgICAgJ2No cm9taXVtX3NyY19kaXInOiAnLicsCisgICAgICAgICAgICAgICAgIyBGSVhNRTogVG8gZW5hYmxl IHNoYXJlZF9saWJyYXJ5IGluIGxpbnV4IGFsbCBjb2RlIChpbmNsdWRpbmcKKyAgICAgICAgICAg ICAgICAjIGRlcGVuZGVuY2llcykgbXVzdCBiZSBjb21wbGllZCB3aXRoIC1mUElDIGZsYWcuIFRo YXQgaXMKKyAgICAgICAgICAgICAgICAjIHBlbmRpbmcgb24gY2hhbmdlcyBpbiBneXAuCiAgICAg ICAgICAgICAgICAgJ3dlYmtpdF90YXJnZXRfdHlwZSc6ICdzaGFyZWRfbGlicmFyeScsCiAgICAg ICAgICAgICB9LHsKICAgICAgICAgICAgICAgICAjIFdlYktpdCBpcyBjaGVja2VkIG91dCBpbiBz cmMvY2hyb21pdW0vdGhpcmRfcGFydHkvV2ViS2l0CiAgICAgICAgICAgICAgICAgJ2Nocm9taXVt X3NyY19kaXInOiAnLi4vLi4vLi4vLi4nLAogICAgICAgICAgICAgICAgICd3ZWJraXRfdGFyZ2V0 X3R5cGUnOiAnc3RhdGljX2xpYnJhcnknLAogICAgICAgICAgICAgfV0sCi0gICAgICAgICAgICAj IFdlIGNhbid0IHR1cm4gb24gd2FybmluZ3Mgb24gV2luZG93cyBhbmQgTGludXggdW50aWwgd2Ug dXBzdHJlYW0gdGhlCisgICAgICAgICAgICAjIFdlIGNhbid0IHR1cm4gb24gd2FybmluZ3Mgb24g V2luZG93cyBhbmQgTGludXggdW50aWwgd2UncmUgdXBzdHJlYW0gdGhlCiAgICAgICAgICAgICAj IFdlYktpdCBBUEkuCiAgICAgICAgICAgICBbJ09TPT0ibWFjIicsIHsKICAgICAgICAgICAgICAg ICAnY2hyb21pdW1fY29kZSc6IDEsCiAgICAgICAgICAgICB9XSwKKyAgICAgICAgICAgICMgRklY TUU6IFRvIGVuYWJsZSBzaGFyZWRfbGlicmFyeSBpbiBsaW51eCBhbGwgY29kZSAoaW5jbHVkaW5n CisgICAgICAgICAgICAjIGRlcGVuZGVuY2llcykgbXVzdCBiZSBjb21wbGllZCB3aXRoIC1mUElD IGZsYWcuIFRoYXQgaXMKKyAgICAgICAgICAgICMgcGVuZGluZyBvbiBjaGFuZ2VzIGluIGd5cC4K KyAgICAgICAgICAgIFsnT1M9PSJsaW51eCIgb3IgT1M9PSJmcmVlYnNkIicsIHsKKyAgICAgICAg ICAgICAgJ3dlYmtpdF90YXJnZXRfdHlwZSc6ICdzdGF0aWNfbGlicmFyeScsCisgICAgICAgICAg ICB9XSwKICAgICAgICAgXSwKICAgICB9LAogICAgICd0YXJnZXRzJzogWwpkaWZmIC0tZ2l0IGEv V2ViS2l0L2Nocm9taXVtL2d5cF93ZWJraXQgYi9XZWJLaXQvY2hyb21pdW0vZ3lwX3dlYmtpdApp bmRleCA4MTBhZjU0Li5lZjE4MjM5IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vZ3lwX3dl YmtpdAorKysgYi9XZWJLaXQvY2hyb21pdW0vZ3lwX3dlYmtpdApAQCAtMzIsNiArMzIsNyBAQAog CiBpbXBvcnQgZ2xvYgogaW1wb3J0IG9zCitpbXBvcnQgcGxhdGZvcm0KIGltcG9ydCBzaGxleAog aW1wb3J0IHN5cwogCkBAIC03Niw2ICs3NywxMCBAQCBpZiBfX25hbWVfXyA9PSAnX19tYWluX18n OgogICAjIEFkZCBpbmNsdWRlcy4KICAgYXJncy5leHRlbmQoWyctSScgKyBpIGZvciBpIGluIGFk ZGl0aW9uYWxfaW5jbHVkZV9maWxlcyhhcmdzKV0pCiAKKyAgIyBPbiBsaW51eCwgd2Ugd2FudCBn eXAgdG8gb3V0cHV0IGEgbWFrZWZpbGUgKGRlZmF1bHQgaXMgc2NvbnMpLgorICBpZiAocGxhdGZv cm0uc3lzdGVtKCkgPT0gJ0xpbnV4Jyk6CisgICAgYXJncy5leHRlbmQoWyctZm1ha2UnXSkKKwog ICAjIE90aGVyIGNvbW1hbmQgYXJnczoKICAgYXJncy5leHRlbmQoWwogICAgICAgICAgICAgICAg IyBneXAgdmFyaWFibGUgZGVmaW5lcy4KQEAgLTg3LDcgKzkyLDcgQEAgaWYgX19uYW1lX18gPT0g J19fbWFpbl9fJzoKICAgICAgICAgICAgICAgICctLWRlcHRoPS4vJywKIAogICAgICAgICAgICAg ICAgIyBneXAgZmlsZSB0byBleGVjdXRlLgotICAgICAgICAgICAgICAgJ3dlYmtpdC5neXAnXSkK KyAgICAgICAgICAgICAgICdXZWJLaXQuZ3lwJ10pCiAKICAgcHJpbnQgJ1VwZGF0aW5nIHdlYmtp dCBwcm9qZWN0cyBmcm9tIGd5cCBmaWxlcy4uLicKICAgc3lzLnN0ZG91dC5mbHVzaCgpCmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKaW5k ZXggMWNiMzg4Mi4uNTQwNGIxMSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCisr KyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDA5LTEyLTA0ICBZ YWFyIFNjaG5pdG1hbiAgPHlhYXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGZpeGVzIHRvIGJ1aWxkLXdlYmtpdCAtLWNocm9t aXVtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjE3 OQorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorCiAyMDA5LTEyLTAxICBDaHJp cyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAgICAgQnVpbGQgZml4YWdl IGZvciBXaW5kb3dzL0dUSyBmb3IgRHVtcFJlbmRlclRyZWUuCmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRp cnMucG0KaW5kZXggMmJjYzFjZC4uOTlmZmZjNCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5w bQpAQCAtMTAzNyw3ICsxMDM3LDcgQEAgc3ViIGNoZWNrUmVxdWlyZWRTeXN0ZW1Db25maWcKICAg ICAgICAgICAgIHByaW50ICJodHRwOi8vZGV2ZWxvcGVyLmFwcGxlLmNvbS90b29scy94Y29kZVxu IjsKICAgICAgICAgICAgIHByaW50ICIqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqXG4iOwogICAgICAgICB9Ci0gICAgfSBlbHNpZiAo aXNHdGsoKSBvciBpc1F0KCkgb3IgaXNXeCgpIG9yIGlzQ2hyb21pdW0oKSkgeworICAgIH0gZWxz aWYgKGlzR3RrKCkgb3IgaXNRdCgpIG9yIGlzV3goKSkgewogICAgICAgICBteSBAY21kcyA9IHF3 KGZsZXggYmlzb24gZ3BlcmYpOwogICAgICAgICBteSBAbWlzc2luZyA9ICgpOwogICAgICAgICBm b3JlYWNoIG15ICRjbWQgKEBjbWRzKSB7CkBAIC0xNDA1LDYgKzE0MDUsNDYgQEAgc3ViIGJ1aWxk R3RrUHJvamVjdCgkJEApCiAgICAgcmV0dXJuIGJ1aWxkQXV0b3Rvb2xzUHJvamVjdCgkY2xlYW4s IEBidWlsZEFyZ3MpOwogfQogCitzdWIgYnVpbGRDaHJvbWl1bU1ha2VmaWxlKCQkJCkKK3sKKyAg ICBteSAoJGRpciwgJHRhcmdldCwgJGNsZWFuKSA9IEBfOworICAgIGNoZGlyICRkaXI7CisgICAg aWYgKCRjbGVhbikgeworICAgICAgICByZXR1cm4gc3lzdGVtIHF3KHJtIC1yZiBvdXQpOworICAg IH0KKyAgICBteSAkY29uZmlnID0gY29uZmlndXJhdGlvbigpOworICAgIG15IEBjb21tYW5kID0g KCJtYWtlIiwgIi1qNCIsICJCVUlMRFRZUEU9JGNvbmZpZyIsICR0YXJnZXQpOworICAgIHByaW50 IGpvaW4oIiAiLCBAY29tbWFuZCkgLiAiXG4iOworICAgIHJldHVybiBzeXN0ZW0gQGNvbW1hbmQ7 Cit9CisKK3N1YiBidWlsZENocm9taXVtVmlzdWFsU3R1ZGlvUHJvamVjdCgkJCkKK3sKKyAgICBt eSAoJHByb2plY3RQYXRoLCAkY2xlYW4pID0gQF87CisKKyAgICBteSAkY29uZmlnID0gY29uZmln dXJhdGlvbigpOworICAgIG15ICRhY3Rpb24gPSAiL2J1aWxkIjsKKyAgICAkYWN0aW9uID0gIi9j bGVhbiIgaWYgJGNsZWFuOworCisgICAgIyBGaW5kIFZpc3VhbCBTdHVkaW8gaW5zdGFsbGF0aW9u LgorICAgIG15ICR2c0luc3RhbGxEaXI7CisgICAgbXkgJHByb2dyYW1GaWxlc1BhdGggPSAkRU5W eydQUk9HUkFNRklMRVMnfSB8fCAiQzpcXFByb2dyYW0gRmlsZXMiOworICAgIGlmICgkRU5WeydW U0lOU1RBTExESVInfSkgeworICAgICAgICAkdnNJbnN0YWxsRGlyID0gJEVOVnsnVlNJTlNUQUxM RElSJ307CisgICAgfSBlbHNlIHsKKyAgICAgICAgJHZzSW5zdGFsbERpciA9ICIkcHJvZ3JhbUZp bGVzUGF0aC9NaWNyb3NvZnQgVmlzdWFsIFN0dWRpbyA4IjsKKyAgICB9CisgICAgJHZzSW5zdGFs bERpciA9IGBjeWdwYXRoICIkdnNJbnN0YWxsRGlyImAgaWYgaXNDeWd3aW4oKTsKKyAgICBjaG9t cCAkdnNJbnN0YWxsRGlyOworICAgICR2Y0J1aWxkUGF0aCA9ICIkdnNJbnN0YWxsRGlyL0NvbW1v bjcvSURFL2RldmVudi5jb20iOworCisgICAgIyBDcmVhdGUgY29tbWFuZCBsaW5lIGFuZCBleGVj dXRlIGl0LgorICAgIG15IEBjb21tYW5kID0gKCR2Y0J1aWxkUGF0aCwgJHByb2plY3RQYXRoLCAk YWN0aW9uLCAkY29uZmlnKTsKKyAgICBwcmludCAiQnVpbGRpbmcgcmVzdWx0cyBpbnRvOiAiLCBi YXNlUHJvZHVjdERpcigpLCAiXG4iOworICAgIHByaW50IGpvaW4oIiAiLCBAY29tbWFuZCksICJc biI7CisgICAgcmV0dXJuIHN5c3RlbSBAY29tbWFuZDsKK30KKwogc3ViIGJ1aWxkQ2hyb21pdW0o JEApCiB7CiAgICAgbXkgKCRjbGVhbiwgQG9wdGlvbnMpID0gQF87CkBAIC0xNDEyLDE5ICsxNDUy LDE1IEBAIHN1YiBidWlsZENocm9taXVtKCRAKQogICAgIG15ICRyZXN1bHQgPSAxOwogICAgIGlm IChpc0RhcndpbigpKSB7CiAgICAgICAgICMgTWFjIGJ1aWxkIC0gYnVpbGRzIHRoZSByb290IHhj b2RlIHByb2plY3QuCi0gICAgICAgICRyZXN1bHQgPSBidWlsZFhDb2RlUHJvamVjdCgiV2ViS2l0 L2Nocm9taXVtL3dlYmtpdCIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAk Y2xlYW4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoQG9wdGlvbnMpKTsK LSAgICB9IGVsc2lmIChpc0N5Z3dpbigpKSB7CisgICAgICAgICRyZXN1bHQgPSBidWlsZFhDb2Rl UHJvamVjdCgiV2ViS2l0L2Nocm9taXVtL3dlYmtpdCIsICRjbGVhbiwgKEBvcHRpb25zKSk7Cisg ICAgfSBlbHNpZiAoaXNDeWd3aW4oKSB8fCBpc1dpbmRvd3MoKSkgewogICAgICAgICAjIFdpbmRv d3MgYnVpbGQgLSBidWlsZHMgdGhlIHJvb3QgdmlzdWFsIHN0dWRpbyBzb2x1dGlvbi4KLSAgICAg ICAgJHJlc3VsdCA9IGJ1aWxkVmlzdWFsU3R1ZGlvUHJvamVjdCgiV2ViS2l0L2Nocm9taXVtL3dl YmtpdC5zbG4iLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICRj bGVhbik7CisgICAgICAgICRyZXN1bHQgPSBidWlsZENocm9taXVtVmlzdWFsU3R1ZGlvUHJvamVj dCgiV2ViS2l0L2Nocm9taXVtL3dlYmtpdC5zbG4iLCAkY2xlYW4pOwogICAgIH0gZWxzaWYgKGlz TGludXgoKSkgewotICAgICAgICAjIExpbnV4IGJ1aWxkCi0gICAgICAgICMgRklYTUUgc3VwcG9y dCBsaW51eC4KLSAgICAgICAgcHJpbnQgU1RERVJSICJMaW51eCBidWlsZCBpcyBub3Qgc3VwcG9y dGVkLiBZZXQuIjsKKyAgICAgICAgIyBMaW51eCBidWlsZCAtIGJ1aWxkIHVzaW5nIG1ha2UuCisg ICAgICAgICQgcmVzdWx0ID0gYnVpbGRDaHJvbWl1bU1ha2VmaWxlKCJXZWJLaXQvY2hyb21pdW0v IiwgIldlYktpdCIsICRjbGVhbik7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgcHJpbnQgU1RERVJS ICJUaGlzIHBsYXRmb3JtIGlzIG5vdCBzdXBwb3J0ZWQgYnkgY2hyb21pdW0uIjsKKyAgICAgICAg cHJpbnQgU1RERVJSICJUaGlzIHBsYXRmb3JtIGlzIG5vdCBzdXBwb3J0ZWQgYnkgY2hyb21pdW0u XG4iOwogICAgIH0KICAgICByZXR1cm4gJHJlc3VsdDsKIH0K 44341 2009-12-04 17:31:07 -0800 2009-12-07 10:38:50 -0800 fixes bug-32179-20091204173106.patch text/plain 6656 yaar ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDQ0NWY5Y2EuLjIzZWZmYWIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE0IEBACisyMDA5LTEyLTA0ICBZYWFyIFNjaG5pdG1hbiAgPHlhYXJAY2hyb21pdW0ub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGZpeGVzIHRv IGJ1aWxkLXdlYmtpdCAtLWNocm9taXVtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0zMjE3OQorCisgICAgICAgICogREVQUzoKKyAgICAgICAgKiBXZWJL aXQuZ3lwOgorICAgICAgICAqIGd5cF93ZWJraXQ6CisKIDIwMDktMTItMDQgIEphbWVzIEhhd2tp bnMgIDxqaGF3a2luc0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4g RmlzaGVyLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL0RFUFMgYi9XZWJLaXQvY2hyb21p dW0vREVQUwppbmRleCAwN2UzODViLi5mYzkwMTg3IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21p dW0vREVQUworKysgYi9XZWJLaXQvY2hyb21pdW0vREVQUwpAQCAtMTQzLDYgKzE0MywxNCBAQCBk ZXBzX29zID0gewogICAgICd0aGlyZF9wYXJ0eS9wdGhyZWFkcy13aW4zMic6CiAgICAgICBWYXIo J2Nocm9taXVtX2RlcHNfc3ZuJykrJy9wdGhyZWFkcy13aW4zMkAnK1ZhcigncHRocmVhZHMtd2lu MzJfcmV2JyksCiAgIH0sCisgICd1bml4JzogeworICAgICMgTGludXgsIGFjdHVhbGx5LgorICAg ICd0aGlyZF9wYXJ0eS9oYXJmYnV6eic6CisgICAgICBWYXIoJ2Nocm9taXVtX3N2bicpKycvdGhp cmRfcGFydHkvaGFyZmJ1enpAJytWYXIoJ2Nocm9taXVtX3JldicpLAorCisgICAgJ3Rvb2xzL3hk aXNwbGF5Y2hlY2snOgorICAgICAgVmFyKCdjaHJvbWl1bV9zdm4nKSsnL3Rvb2xzL3hkaXNwbGF5 Y2hlY2tAJytWYXIoJ2Nocm9taXVtX3JldicpLAorICB9LAogfQogCiBza2lwX2NoaWxkX2luY2x1 ZGVzID0gWwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAgYi9XZWJLaXQv Y2hyb21pdW0vV2ViS2l0Lmd5cAppbmRleCBkN2JkMzBkLi42YzI5NmJmIDEwMDY0NAotLS0gYS9X ZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAorKysgYi9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5 cApAQCAtNDAsMTcgKzQwLDI2IEBACiAgICAgICAgICAgICAgICAgIyBXZWJraXQgaXMgYmVpbmcg YnVpbHQgb3V0c2lkZSBvZiB0aGUgZnVsbCBjaHJvbWl1bSBwcm9qZWN0LgogICAgICAgICAgICAg ICAgICMgZS5nLiB2aWEgYnVpbGQtd2Via2l0IC0tY2hyb21pdW0KICAgICAgICAgICAgICAgICAn Y2hyb21pdW1fc3JjX2Rpcic6ICcuJywKKyAgICAgICAgICAgICAgICAjIEZJWE1FOiBUbyBlbmFi bGUgc2hhcmVkX2xpYnJhcnkgaW4gbGludXggYWxsIGNvZGUgKGluY2x1ZGluZworICAgICAgICAg ICAgICAgICMgZGVwZW5kZW5jaWVzKSBtdXN0IGJlIGNvbXBsaWVkIHdpdGggLWZQSUMgZmxhZy4g VGhhdCBpcworICAgICAgICAgICAgICAgICMgcGVuZGluZyBvbiBjaGFuZ2VzIGluIGd5cC4KICAg ICAgICAgICAgICAgICAnd2Via2l0X3RhcmdldF90eXBlJzogJ3NoYXJlZF9saWJyYXJ5JywKICAg ICAgICAgICAgIH0sewogICAgICAgICAgICAgICAgICMgV2ViS2l0IGlzIGNoZWNrZWQgb3V0IGlu IHNyYy9jaHJvbWl1bS90aGlyZF9wYXJ0eS9XZWJLaXQKICAgICAgICAgICAgICAgICAnY2hyb21p dW1fc3JjX2Rpcic6ICcuLi8uLi8uLi8uLicsCiAgICAgICAgICAgICAgICAgJ3dlYmtpdF90YXJn ZXRfdHlwZSc6ICdzdGF0aWNfbGlicmFyeScsCiAgICAgICAgICAgICB9XSwKLSAgICAgICAgICAg ICMgV2UgY2FuJ3QgdHVybiBvbiB3YXJuaW5ncyBvbiBXaW5kb3dzIGFuZCBMaW51eCB1bnRpbCB3 ZSB1cHN0cmVhbSB0aGUKKyAgICAgICAgICAgICMgV2UgY2FuJ3QgdHVybiBvbiB3YXJuaW5ncyBv biBXaW5kb3dzIGFuZCBMaW51eCB1bnRpbCB3ZSdyZSB1cHN0cmVhbSB0aGUKICAgICAgICAgICAg ICMgV2ViS2l0IEFQSS4KICAgICAgICAgICAgIFsnT1M9PSJtYWMiJywgewogICAgICAgICAgICAg ICAgICdjaHJvbWl1bV9jb2RlJzogMSwKICAgICAgICAgICAgIH1dLAorICAgICAgICAgICAgIyBG SVhNRTogVG8gZW5hYmxlIHNoYXJlZF9saWJyYXJ5IGluIGxpbnV4IGFsbCBjb2RlIChpbmNsdWRp bmcKKyAgICAgICAgICAgICMgZGVwZW5kZW5jaWVzKSBtdXN0IGJlIGNvbXBsaWVkIHdpdGggLWZQ SUMgZmxhZy4gVGhhdCBpcworICAgICAgICAgICAgIyBwZW5kaW5nIG9uIGNoYW5nZXMgaW4gZ3lw LgorICAgICAgICAgICAgWydPUz09ImxpbnV4IiBvciBPUz09ImZyZWVic2QiJywgeworICAgICAg ICAgICAgICAnd2Via2l0X3RhcmdldF90eXBlJzogJ3N0YXRpY19saWJyYXJ5JywKKyAgICAgICAg ICAgIH1dLAogICAgICAgICBdLAogICAgIH0sCiAgICAgJ3RhcmdldHMnOiBbCmRpZmYgLS1naXQg YS9XZWJLaXQvY2hyb21pdW0vZ3lwX3dlYmtpdCBiL1dlYktpdC9jaHJvbWl1bS9neXBfd2Via2l0 CmluZGV4IDgxMGFmNTQuLmVmMTgyMzkgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9neXBf d2Via2l0CisrKyBiL1dlYktpdC9jaHJvbWl1bS9neXBfd2Via2l0CkBAIC0zMiw2ICszMiw3IEBA CiAKIGltcG9ydCBnbG9iCiBpbXBvcnQgb3MKK2ltcG9ydCBwbGF0Zm9ybQogaW1wb3J0IHNobGV4 CiBpbXBvcnQgc3lzCiAKQEAgLTc2LDYgKzc3LDEwIEBAIGlmIF9fbmFtZV9fID09ICdfX21haW5f Xyc6CiAgICMgQWRkIGluY2x1ZGVzLgogICBhcmdzLmV4dGVuZChbJy1JJyArIGkgZm9yIGkgaW4g YWRkaXRpb25hbF9pbmNsdWRlX2ZpbGVzKGFyZ3MpXSkKIAorICAjIE9uIGxpbnV4LCB3ZSB3YW50 IGd5cCB0byBvdXRwdXQgYSBtYWtlZmlsZSAoZGVmYXVsdCBpcyBzY29ucykuCisgIGlmIChwbGF0 Zm9ybS5zeXN0ZW0oKSA9PSAnTGludXgnKToKKyAgICBhcmdzLmV4dGVuZChbJy1mbWFrZSddKQor CiAgICMgT3RoZXIgY29tbWFuZCBhcmdzOgogICBhcmdzLmV4dGVuZChbCiAgICAgICAgICAgICAg ICAjIGd5cCB2YXJpYWJsZSBkZWZpbmVzLgpAQCAtODcsNyArOTIsNyBAQCBpZiBfX25hbWVfXyA9 PSAnX19tYWluX18nOgogICAgICAgICAgICAgICAgJy0tZGVwdGg9Li8nLAogCiAgICAgICAgICAg ICAgICAjIGd5cCBmaWxlIHRvIGV4ZWN1dGUuCi0gICAgICAgICAgICAgICAnd2Via2l0Lmd5cCdd KQorICAgICAgICAgICAgICAgJ1dlYktpdC5neXAnXSkKIAogICBwcmludCAnVXBkYXRpbmcgd2Vi a2l0IHByb2plY3RzIGZyb20gZ3lwIGZpbGVzLi4uJwogICBzeXMuc3Rkb3V0LmZsdXNoKCkKZGlm ZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwpp bmRleCBhOGM3YzQxLi5kNGI1MGVhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDktMTItMDQg IFlhYXIgU2Nobml0bWFuICA8eWFhckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgZml4ZXMgdG8gYnVpbGQtd2Via2l0IC0tY2hy b21pdW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMy MTc5CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisKIDIwMDktMTItMDQgIFlh ZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9raWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQg YnVpbGQgZml4LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBt IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IDllMGMyNzEuLjFkMjU1 YTcgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTE0MDUsNiArMTQwNSw0NiBAQCBz dWIgYnVpbGRHdGtQcm9qZWN0KCQkQCkKICAgICByZXR1cm4gYnVpbGRBdXRvdG9vbHNQcm9qZWN0 KCRjbGVhbiwgQGJ1aWxkQXJncyk7CiB9CiAKK3N1YiBidWlsZENocm9taXVtTWFrZWZpbGUoJCQk KQoreworICAgIG15ICgkZGlyLCAkdGFyZ2V0LCAkY2xlYW4pID0gQF87CisgICAgY2hkaXIgJGRp cjsKKyAgICBpZiAoJGNsZWFuKSB7CisgICAgICAgIHJldHVybiBzeXN0ZW0gcXcocm0gLXJmIG91 dCk7CisgICAgfQorICAgIG15ICRjb25maWcgPSBjb25maWd1cmF0aW9uKCk7CisgICAgbXkgQGNv bW1hbmQgPSAoIm1ha2UiLCAiLWo0IiwgIkJVSUxEVFlQRT0kY29uZmlnIiwgJHRhcmdldCk7Cisg ICAgcHJpbnQgam9pbigiICIsIEBjb21tYW5kKSAuICJcbiI7CisgICAgcmV0dXJuIHN5c3RlbSBA Y29tbWFuZDsKK30KKworc3ViIGJ1aWxkQ2hyb21pdW1WaXN1YWxTdHVkaW9Qcm9qZWN0KCQkKQor eworICAgIG15ICgkcHJvamVjdFBhdGgsICRjbGVhbikgPSBAXzsKKworICAgIG15ICRjb25maWcg PSBjb25maWd1cmF0aW9uKCk7CisgICAgbXkgJGFjdGlvbiA9ICIvYnVpbGQiOworICAgICRhY3Rp b24gPSAiL2NsZWFuIiBpZiAkY2xlYW47CisKKyAgICAjIEZpbmQgVmlzdWFsIFN0dWRpbyBpbnN0 YWxsYXRpb24uCisgICAgbXkgJHZzSW5zdGFsbERpcjsKKyAgICBteSAkcHJvZ3JhbUZpbGVzUGF0 aCA9ICRFTlZ7J1BST0dSQU1GSUxFUyd9IHx8ICJDOlxcUHJvZ3JhbSBGaWxlcyI7CisgICAgaWYg KCRFTlZ7J1ZTSU5TVEFMTERJUid9KSB7CisgICAgICAgICR2c0luc3RhbGxEaXIgPSAkRU5WeydW U0lOU1RBTExESVInfTsKKyAgICB9IGVsc2UgeworICAgICAgICAkdnNJbnN0YWxsRGlyID0gIiRw cm9ncmFtRmlsZXNQYXRoL01pY3Jvc29mdCBWaXN1YWwgU3R1ZGlvIDgiOworICAgIH0KKyAgICAk dnNJbnN0YWxsRGlyID0gYGN5Z3BhdGggIiR2c0luc3RhbGxEaXIiYCBpZiBpc0N5Z3dpbigpOwor ICAgIGNob21wICR2c0luc3RhbGxEaXI7CisgICAgJHZjQnVpbGRQYXRoID0gIiR2c0luc3RhbGxE aXIvQ29tbW9uNy9JREUvZGV2ZW52LmNvbSI7CisKKyAgICAjIENyZWF0ZSBjb21tYW5kIGxpbmUg YW5kIGV4ZWN1dGUgaXQuCisgICAgbXkgQGNvbW1hbmQgPSAoJHZjQnVpbGRQYXRoLCAkcHJvamVj dFBhdGgsICRhY3Rpb24sICRjb25maWcpOworICAgIHByaW50ICJCdWlsZGluZyByZXN1bHRzIGlu dG86ICIsIGJhc2VQcm9kdWN0RGlyKCksICJcbiI7CisgICAgcHJpbnQgam9pbigiICIsIEBjb21t YW5kKSwgIlxuIjsKKyAgICByZXR1cm4gc3lzdGVtIEBjb21tYW5kOworfQorCiBzdWIgYnVpbGRD aHJvbWl1bSgkQCkKIHsKICAgICBteSAoJGNsZWFuLCBAb3B0aW9ucykgPSBAXzsKQEAgLTE0MTIs MTkgKzE0NTIsMTUgQEAgc3ViIGJ1aWxkQ2hyb21pdW0oJEApCiAgICAgbXkgJHJlc3VsdCA9IDE7 CiAgICAgaWYgKGlzRGFyd2luKCkpIHsKICAgICAgICAgIyBNYWMgYnVpbGQgLSBidWlsZHMgdGhl IHJvb3QgeGNvZGUgcHJvamVjdC4KLSAgICAgICAgJHJlc3VsdCA9IGJ1aWxkWENvZGVQcm9qZWN0 KCJXZWJLaXQvY2hyb21pdW0vd2Via2l0IiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICRjbGVhbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChAb3B0 aW9ucykpOwotICAgIH0gZWxzaWYgKGlzQ3lnd2luKCkpIHsKKyAgICAgICAgJHJlc3VsdCA9IGJ1 aWxkWENvZGVQcm9qZWN0KCJXZWJLaXQvY2hyb21pdW0vV2ViS2l0IiwgJGNsZWFuLCAoQG9wdGlv bnMpKTsKKyAgICB9IGVsc2lmIChpc0N5Z3dpbigpIHx8IGlzV2luZG93cygpKSB7CiAgICAgICAg ICMgV2luZG93cyBidWlsZCAtIGJ1aWxkcyB0aGUgcm9vdCB2aXN1YWwgc3R1ZGlvIHNvbHV0aW9u LgotICAgICAgICAkcmVzdWx0ID0gYnVpbGRWaXN1YWxTdHVkaW9Qcm9qZWN0KCJXZWJLaXQvY2hy b21pdW0vd2Via2l0LnNsbiIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgJGNsZWFuKTsKKyAgICAgICAgJHJlc3VsdCA9IGJ1aWxkQ2hyb21pdW1WaXN1YWxTdHVk aW9Qcm9qZWN0KCJXZWJLaXQvY2hyb21pdW0vV2ViS2l0LnNsbiIsICRjbGVhbik7CiAgICAgfSBl bHNpZiAoaXNMaW51eCgpKSB7Ci0gICAgICAgICMgTGludXggYnVpbGQKLSAgICAgICAgIyBGSVhN RSBzdXBwb3J0IGxpbnV4LgotICAgICAgICBwcmludCBTVERFUlIgIkxpbnV4IGJ1aWxkIGlzIG5v dCBzdXBwb3J0ZWQuIFlldC4iOworICAgICAgICAjIExpbnV4IGJ1aWxkIC0gYnVpbGQgdXNpbmcg bWFrZS4KKyAgICAgICAgJCByZXN1bHQgPSBidWlsZENocm9taXVtTWFrZWZpbGUoIldlYktpdC9j aHJvbWl1bS8iLCAiV2ViS2l0IiwgJGNsZWFuKTsKICAgICB9IGVsc2UgewotICAgICAgICBwcmlu dCBTVERFUlIgIlRoaXMgcGxhdGZvcm0gaXMgbm90IHN1cHBvcnRlZCBieSBjaHJvbWl1bS4iOwor ICAgICAgICBwcmludCBTVERFUlIgIlRoaXMgcGxhdGZvcm0gaXMgbm90IHN1cHBvcnRlZCBieSBj aHJvbWl1bS5cbiI7CiAgICAgfQogICAgIHJldHVybiAkcmVzdWx0OwogfQo= 44420 2009-12-07 10:38:58 -0800 2009-12-07 12:17:28 -0800 Patch with typo fix bug-32179-20091207103856.patch text/plain 6628 yaar ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDU3OTdkM2UuLmMxYTRjOTAgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE0IEBACisyMDA5LTEyLTA3ICBZYWFyIFNjaG5pdG1hbiAgPHlhYXJAY2hyb21pdW0ub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGZpeGVzIHRv IGJ1aWxkLXdlYmtpdCAtLWNocm9taXVtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0zMjE3OQorCisgICAgICAgICogREVQUzoKKyAgICAgICAgKiBXZWJL aXQuZ3lwOgorICAgICAgICAqIGd5cF93ZWJraXQ6CisKIDIwMDktMTItMDcgIE1pa2hhaWwgTmFn YW5vdiAgPG1uYWdhbm92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZl bCBGZWxkbWFuLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL0RFUFMgYi9XZWJLaXQvY2hy b21pdW0vREVQUwppbmRleCAwN2UzODViLi5mYzkwMTg3IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hy b21pdW0vREVQUworKysgYi9XZWJLaXQvY2hyb21pdW0vREVQUwpAQCAtMTQzLDYgKzE0MywxNCBA QCBkZXBzX29zID0gewogICAgICd0aGlyZF9wYXJ0eS9wdGhyZWFkcy13aW4zMic6CiAgICAgICBW YXIoJ2Nocm9taXVtX2RlcHNfc3ZuJykrJy9wdGhyZWFkcy13aW4zMkAnK1ZhcigncHRocmVhZHMt d2luMzJfcmV2JyksCiAgIH0sCisgICd1bml4JzogeworICAgICMgTGludXgsIGFjdHVhbGx5Lgor ICAgICd0aGlyZF9wYXJ0eS9oYXJmYnV6eic6CisgICAgICBWYXIoJ2Nocm9taXVtX3N2bicpKycv dGhpcmRfcGFydHkvaGFyZmJ1enpAJytWYXIoJ2Nocm9taXVtX3JldicpLAorCisgICAgJ3Rvb2xz L3hkaXNwbGF5Y2hlY2snOgorICAgICAgVmFyKCdjaHJvbWl1bV9zdm4nKSsnL3Rvb2xzL3hkaXNw bGF5Y2hlY2tAJytWYXIoJ2Nocm9taXVtX3JldicpLAorICB9LAogfQogCiBza2lwX2NoaWxkX2lu Y2x1ZGVzID0gWwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAgYi9XZWJL aXQvY2hyb21pdW0vV2ViS2l0Lmd5cAppbmRleCBkN2JkMzBkLi43YzBkOTEzIDEwMDY0NAotLS0g YS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAorKysgYi9XZWJLaXQvY2hyb21pdW0vV2ViS2l0 Lmd5cApAQCAtNDAsNiArNDAsOSBAQAogICAgICAgICAgICAgICAgICMgV2Via2l0IGlzIGJlaW5n IGJ1aWx0IG91dHNpZGUgb2YgdGhlIGZ1bGwgY2hyb21pdW0gcHJvamVjdC4KICAgICAgICAgICAg ICAgICAjIGUuZy4gdmlhIGJ1aWxkLXdlYmtpdCAtLWNocm9taXVtCiAgICAgICAgICAgICAgICAg J2Nocm9taXVtX3NyY19kaXInOiAnLicsCisgICAgICAgICAgICAgICAgIyBGSVhNRTogVG8gZW5h YmxlIHNoYXJlZF9saWJyYXJ5IGluIGxpbnV4IGFsbCBjb2RlIChpbmNsdWRpbmcKKyAgICAgICAg ICAgICAgICAjIGRlcGVuZGVuY2llcykgbXVzdCBiZSBjb21wbGllZCB3aXRoIC1mUElDIGZsYWcu IFRoYXQgaXMKKyAgICAgICAgICAgICAgICAjIHBlbmRpbmcgb24gY2hhbmdlcyBpbiBneXAuCiAg ICAgICAgICAgICAgICAgJ3dlYmtpdF90YXJnZXRfdHlwZSc6ICdzaGFyZWRfbGlicmFyeScsCiAg ICAgICAgICAgICB9LHsKICAgICAgICAgICAgICAgICAjIFdlYktpdCBpcyBjaGVja2VkIG91dCBp biBzcmMvY2hyb21pdW0vdGhpcmRfcGFydHkvV2ViS2l0CkBAIC01MSw2ICs1NCwxMiBAQAogICAg ICAgICAgICAgWydPUz09Im1hYyInLCB7CiAgICAgICAgICAgICAgICAgJ2Nocm9taXVtX2NvZGUn OiAxLAogICAgICAgICAgICAgfV0sCisgICAgICAgICAgICAjIEZJWE1FOiBUbyBlbmFibGUgc2hh cmVkX2xpYnJhcnkgaW4gbGludXggYWxsIGNvZGUgKGluY2x1ZGluZworICAgICAgICAgICAgIyBk ZXBlbmRlbmNpZXMpIG11c3QgYmUgY29tcGxpZWQgd2l0aCAtZlBJQyBmbGFnLiBUaGF0IGlzCisg ICAgICAgICAgICAjIHBlbmRpbmcgb24gY2hhbmdlcyBpbiBneXAuCisgICAgICAgICAgICBbJ09T PT0ibGludXgiIG9yIE9TPT0iZnJlZWJzZCInLCB7CisgICAgICAgICAgICAgICd3ZWJraXRfdGFy Z2V0X3R5cGUnOiAnc3RhdGljX2xpYnJhcnknLAorICAgICAgICAgICAgfV0sCiAgICAgICAgIF0s CiAgICAgfSwKICAgICAndGFyZ2V0cyc6IFsKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9n eXBfd2Via2l0IGIvV2ViS2l0L2Nocm9taXVtL2d5cF93ZWJraXQKaW5kZXggODEwYWY1NC4uZWYx ODIzOSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL2d5cF93ZWJraXQKKysrIGIvV2ViS2l0 L2Nocm9taXVtL2d5cF93ZWJraXQKQEAgLTMyLDYgKzMyLDcgQEAKIAogaW1wb3J0IGdsb2IKIGlt cG9ydCBvcworaW1wb3J0IHBsYXRmb3JtCiBpbXBvcnQgc2hsZXgKIGltcG9ydCBzeXMKIApAQCAt NzYsNiArNzcsMTAgQEAgaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKICAgIyBBZGQgaW5jbHVk ZXMuCiAgIGFyZ3MuZXh0ZW5kKFsnLUknICsgaSBmb3IgaSBpbiBhZGRpdGlvbmFsX2luY2x1ZGVf ZmlsZXMoYXJncyldKQogCisgICMgT24gbGludXgsIHdlIHdhbnQgZ3lwIHRvIG91dHB1dCBhIG1h a2VmaWxlIChkZWZhdWx0IGlzIHNjb25zKS4KKyAgaWYgKHBsYXRmb3JtLnN5c3RlbSgpID09ICdM aW51eCcpOgorICAgIGFyZ3MuZXh0ZW5kKFsnLWZtYWtlJ10pCisKICAgIyBPdGhlciBjb21tYW5k IGFyZ3M6CiAgIGFyZ3MuZXh0ZW5kKFsKICAgICAgICAgICAgICAgICMgZ3lwIHZhcmlhYmxlIGRl ZmluZXMuCkBAIC04Nyw3ICs5Miw3IEBAIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6CiAgICAg ICAgICAgICAgICAnLS1kZXB0aD0uLycsCiAKICAgICAgICAgICAgICAgICMgZ3lwIGZpbGUgdG8g ZXhlY3V0ZS4KLSAgICAgICAgICAgICAgICd3ZWJraXQuZ3lwJ10pCisgICAgICAgICAgICAgICAn V2ViS2l0Lmd5cCddKQogCiAgIHByaW50ICdVcGRhdGluZyB3ZWJraXQgcHJvamVjdHMgZnJvbSBn eXAgZmlsZXMuLi4nCiAgIHN5cy5zdGRvdXQuZmx1c2goKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IGU3YWRmY2QuLjY0NTMx YzIgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAwOS0xMi0wNyAgWWFhciBTY2huaXRtYW4gIDx5 YWFyQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBmaXhlcyB0byBidWlsZC13ZWJraXQgLS1jaHJvbWl1bQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzIxNzkKKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0ZGlycy5wbToKKwogMjAwOS0xMi0wNyAgU3RldmUgRmFsa2VuYnVyZyAgPHNm YWxrZW5AYXBwbGUuY29tPgogCiAgICAgICAgIEJ1aWxkIGZpeC4gQmUgZmxleGlibGUgYWJvdXQg d2hpY2ggdmVyc2lvbiBvZiBJQ1UgaXMgdXNlZCBvbiBXaW5kb3dzLgpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRkaXJzLnBtCmluZGV4IDllMGMyNzEuLmFlMzM3MDggMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRp cnMucG0KQEAgLTExMzEsOSArMTEzMSw2IEBAIHN1YiBidWlsZFZpc3VhbFN0dWRpb1Byb2plY3QK ICAgICB9CiAKICAgICBteSAkdXNlZW52ID0gIi91c2VlbnYiOwotICAgIGlmIChpc0Nocm9taXVt KCkpIHsKLSAgICAgICAgJHVzZWVudiA9ICIiOwotICAgIH0KIAogICAgIG15IEBjb21tYW5kID0g KCR2Y0J1aWxkUGF0aCwgJHVzZWVudiwgJHdpblByb2plY3RQYXRoLCAkYWN0aW9uLCAkY29uZmln KTsKIApAQCAtMTQwNSw2ICsxNDAyLDQ2IEBAIHN1YiBidWlsZEd0a1Byb2plY3QoJCRAKQogICAg IHJldHVybiBidWlsZEF1dG90b29sc1Byb2plY3QoJGNsZWFuLCBAYnVpbGRBcmdzKTsKIH0KIAor c3ViIGJ1aWxkQ2hyb21pdW1NYWtlZmlsZSgkJCQpCit7CisgICAgbXkgKCRkaXIsICR0YXJnZXQs ICRjbGVhbikgPSBAXzsKKyAgICBjaGRpciAkZGlyOworICAgIGlmICgkY2xlYW4pIHsKKyAgICAg ICAgcmV0dXJuIHN5c3RlbSBxdyhybSAtcmYgb3V0KTsKKyAgICB9CisgICAgbXkgJGNvbmZpZyA9 IGNvbmZpZ3VyYXRpb24oKTsKKyAgICBteSBAY29tbWFuZCA9ICgibWFrZSIsICItajQiLCAiQlVJ TERUWVBFPSRjb25maWciLCAkdGFyZ2V0KTsKKyAgICBwcmludCBqb2luKCIgIiwgQGNvbW1hbmQp IC4gIlxuIjsKKyAgICByZXR1cm4gc3lzdGVtIEBjb21tYW5kOworfQorCitzdWIgYnVpbGRDaHJv bWl1bVZpc3VhbFN0dWRpb1Byb2plY3QoJCQpCit7CisgICAgbXkgKCRwcm9qZWN0UGF0aCwgJGNs ZWFuKSA9IEBfOworCisgICAgbXkgJGNvbmZpZyA9IGNvbmZpZ3VyYXRpb24oKTsKKyAgICBteSAk YWN0aW9uID0gIi9idWlsZCI7CisgICAgJGFjdGlvbiA9ICIvY2xlYW4iIGlmICRjbGVhbjsKKwor ICAgICMgRmluZCBWaXN1YWwgU3R1ZGlvIGluc3RhbGxhdGlvbi4KKyAgICBteSAkdnNJbnN0YWxs RGlyOworICAgIG15ICRwcm9ncmFtRmlsZXNQYXRoID0gJEVOVnsnUFJPR1JBTUZJTEVTJ30gfHwg IkM6XFxQcm9ncmFtIEZpbGVzIjsKKyAgICBpZiAoJEVOVnsnVlNJTlNUQUxMRElSJ30pIHsKKyAg ICAgICAgJHZzSW5zdGFsbERpciA9ICRFTlZ7J1ZTSU5TVEFMTERJUid9OworICAgIH0gZWxzZSB7 CisgICAgICAgICR2c0luc3RhbGxEaXIgPSAiJHByb2dyYW1GaWxlc1BhdGgvTWljcm9zb2Z0IFZp c3VhbCBTdHVkaW8gOCI7CisgICAgfQorICAgICR2c0luc3RhbGxEaXIgPSBgY3lncGF0aCAiJHZz SW5zdGFsbERpciJgIGlmIGlzQ3lnd2luKCk7CisgICAgY2hvbXAgJHZzSW5zdGFsbERpcjsKKyAg ICAkdmNCdWlsZFBhdGggPSAiJHZzSW5zdGFsbERpci9Db21tb243L0lERS9kZXZlbnYuY29tIjsK KworICAgICMgQ3JlYXRlIGNvbW1hbmQgbGluZSBhbmQgZXhlY3V0ZSBpdC4KKyAgICBteSBAY29t bWFuZCA9ICgkdmNCdWlsZFBhdGgsICRwcm9qZWN0UGF0aCwgJGFjdGlvbiwgJGNvbmZpZyk7Cisg ICAgcHJpbnQgIkJ1aWxkaW5nIHJlc3VsdHMgaW50bzogIiwgYmFzZVByb2R1Y3REaXIoKSwgIlxu IjsKKyAgICBwcmludCBqb2luKCIgIiwgQGNvbW1hbmQpLCAiXG4iOworICAgIHJldHVybiBzeXN0 ZW0gQGNvbW1hbmQ7Cit9CisKIHN1YiBidWlsZENocm9taXVtKCRAKQogewogICAgIG15ICgkY2xl YW4sIEBvcHRpb25zKSA9IEBfOwpAQCAtMTQxMiwxOSArMTQ0OSwxNSBAQCBzdWIgYnVpbGRDaHJv bWl1bSgkQCkKICAgICBteSAkcmVzdWx0ID0gMTsKICAgICBpZiAoaXNEYXJ3aW4oKSkgewogICAg ICAgICAjIE1hYyBidWlsZCAtIGJ1aWxkcyB0aGUgcm9vdCB4Y29kZSBwcm9qZWN0LgotICAgICAg ICAkcmVzdWx0ID0gYnVpbGRYQ29kZVByb2plY3QoIldlYktpdC9jaHJvbWl1bS93ZWJraXQiLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJGNsZWFuLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKEBvcHRpb25zKSk7Ci0gICAgfSBlbHNpZiAoaXNDeWd3 aW4oKSkgeworICAgICAgICAkcmVzdWx0ID0gYnVpbGRYQ29kZVByb2plY3QoIldlYktpdC9jaHJv bWl1bS9XZWJLaXQiLCAkY2xlYW4sIChAb3B0aW9ucykpOworICAgIH0gZWxzaWYgKGlzQ3lnd2lu KCkgfHwgaXNXaW5kb3dzKCkpIHsKICAgICAgICAgIyBXaW5kb3dzIGJ1aWxkIC0gYnVpbGRzIHRo ZSByb290IHZpc3VhbCBzdHVkaW8gc29sdXRpb24uCi0gICAgICAgICRyZXN1bHQgPSBidWlsZFZp c3VhbFN0dWRpb1Byb2plY3QoIldlYktpdC9jaHJvbWl1bS93ZWJraXQuc2xuIiwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAkY2xlYW4pOworICAgICAgICAkcmVz dWx0ID0gYnVpbGRDaHJvbWl1bVZpc3VhbFN0dWRpb1Byb2plY3QoIldlYktpdC9jaHJvbWl1bS9X ZWJLaXQuc2xuIiwgJGNsZWFuKTsKICAgICB9IGVsc2lmIChpc0xpbnV4KCkpIHsKLSAgICAgICAg IyBMaW51eCBidWlsZAotICAgICAgICAjIEZJWE1FIHN1cHBvcnQgbGludXguCi0gICAgICAgIHBy aW50IFNUREVSUiAiTGludXggYnVpbGQgaXMgbm90IHN1cHBvcnRlZC4gWWV0LiI7CisgICAgICAg ICMgTGludXggYnVpbGQgLSBidWlsZCB1c2luZyBtYWtlLgorICAgICAgICAkIHJlc3VsdCA9IGJ1 aWxkQ2hyb21pdW1NYWtlZmlsZSgiV2ViS2l0L2Nocm9taXVtLyIsICJXZWJLaXQiLCAkY2xlYW4p OwogICAgIH0gZWxzZSB7Ci0gICAgICAgIHByaW50IFNUREVSUiAiVGhpcyBwbGF0Zm9ybSBpcyBu b3Qgc3VwcG9ydGVkIGJ5IGNocm9taXVtLiI7CisgICAgICAgIHByaW50IFNUREVSUiAiVGhpcyBw bGF0Zm9ybSBpcyBub3Qgc3VwcG9ydGVkIGJ5IGNocm9taXVtLlxuIjsKICAgICB9CiAgICAgcmV0 dXJuICRyZXN1bHQ7CiB9Cg==