130148 2014-03-12 11:35:42 -0700 [GTK][CMAKE] build-webkit doesn't detect when the build fails 2014-04-16 14:24:38 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia b.long b.long bunhere commit-queue glenn gyuyoung.kim mrobinson rakuco sergio oldest_to_newest 989756 0 cgarcia 2014-03-12 11:35:42 -0700 This is green in the bot http://build.webkit.org/builders/GTK%20Linux%2064-bit%20Release/builds/45543/steps/compile-webkit/logs/stdio PluginViewX11.cpp:(.text+0xb78): undefined reference to `void WTF::derefIfNotNull<_cairo>(_cairo*)' collect2: error: ld returned 1 exit status [100%] Built target WebKitPluginProcess ==================================================================== WebKit is now built (01m:48s). To run GtkLauncher with this newly-built code, use the "Tools/Scripts/run-launcher" script. ==================================================================== program finished with exit code 0 elapsedTime=108.171358 1001029 1 b.long 2014-04-15 16:34:04 -0700 This is really annoying, because it's hard to tell where a build failed. I think I tracked this down to OptionsGTK.cmake: build_command(COMMAND_LINE_TO_BUILD) file(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/build.sh "#!/bin/sh\n" "${COMMAND_LINE_TO_BUILD} $@" ) build_command() by default gives you `make -i`, where `-i` is also known as `--ignore-errors`. See: http://www.gnu.org/software/make/manual/html_node/Errors.html#Errors http://www.cmake.org/cmake/help/v3.0/command/build_command.html I'm not exactly sure how to fix this yet. Maybe just strip "-i" from the COMMAND_LINE_TO_BUILD? 1001034 2 mrobinson 2014-04-15 16:37:04 -0700 I think this is by design, so that people looking at EWS and buildbot output can fix all errors in one change. We should try to track down how this is configured via CMake. After we understand this, there are a couple options: 1. Let users override the setting in their environment. 2. Conditionally enable the setting only for bots. 1001035 3 b.long 2014-04-15 16:38:41 -0700 We should probably stop-on-error by default, and then have a --ignore-errors for bots, since I suspect most humans will want to see their errors immediately. 1001036 4 b.long 2014-04-15 16:40:13 -0700 Oh, and the CMake documentation sounds like it always adds this for makefiles: > The trailing -- -i option is added for Makefile generators. This may just be poorly documented though. 1001039 5 b.long 2014-04-15 16:58:19 -0700 I looked through CMake's source code since they documentation wasn't very helpful, and when generating the build_command, it has a "ignoreErrors" argument, which is unconditionally set to "true" in all cases where it gets called: std::string makecommand = this->Makefile->GetLocalGenerator() ->GetGlobalGenerator()->GenerateCMakeBuildCommand(target, configuration, "", true); With the signature: std::string cmGlobalGenerator::GenerateCMakeBuildCommand( const std::string& target, const std::string& config, const std::string& native, bool ignoreErrors) So if we want to remove the "-i", we'll have to do it manually. This works: string(REPLACE "-i" "" COMMAND_LINE_TO_BUILD ${COMMAND_LINE_TO_BUILD}) I'll look at adding some sort of option. 1001040 6 b.long 2014-04-15 17:00:13 -0700 What if we just turn this off, then let people add --makeargs="-i" ? 1001041 7 mrobinson 2014-04-15 17:01:41 -0700 (In reply to comment #6) > What if we just turn this off, then let people add --makeargs="-i" ? The issue is with the bots. 1001044 8 mrobinson 2014-04-15 17:03:24 -0700 (In reply to comment #7) > (In reply to comment #6) > > What if we just turn this off, then let people add --makeargs="-i" ? > > The issue is with the bots. Sorry. My comment wasn't very useful. What I mean to say is that we should make sure the bots don't suddenly become less useful for developers on other platforms. 1001045 9 b.long 2014-04-15 17:13:09 -0700 Yes, I mean: Can we make this not the default, then fix the bots to run build-webkit --makeargs="-i" ? 1001046 10 mrobinson 2014-04-15 17:14:57 -0700 (In reply to comment #9) > Yes, I mean: Can we make this not the default, then fix the bots to run build-webkit --makeargs="-i" ? I think we should shoot for making this not the default and fixing the bots all in one patch. 1001052 11 b.long 2014-04-15 17:30:46 -0700 (In reply to comment #10) > (In reply to comment #9) > > Yes, I mean: Can we make this not the default, then fix the bots to run build-webkit --makeargs="-i" ? > > I think we should shoot for making this not the default and fixing the bots all in one patch. I have a patch mostly ready, but don't we want to turn this off for bots too, since right now they can't tell if they're failing? 1001053 12 mrobinson 2014-04-15 17:32:50 -0700 I guess for the bots we really want to swap -i for -k. 1001054 13 229420 b.long 2014-04-15 17:36:30 -0700 Created attachment 229420 Patch 1001055 14 229420 b.long 2014-04-15 17:49:16 -0700 Comment on attachment 229420 Patch I just realized that the string replace for -i really needs a comment. I'll fix it soon. 1001062 15 mrobinson 2014-04-15 18:06:34 -0700 (In reply to comment #14) > (From update of attachment 229420 [details]) > I just realized that the string replace for -i really needs a comment. I'll fix it soon. Looks good so far, though the EWS probably also needs a fix. 1001073 16 229424 b.long 2014-04-15 19:48:59 -0700 Created attachment 229424 Patch Ok, now there's a nice comment. 1001130 17 229424 mrobinson 2014-04-16 06:22:37 -0700 Comment on attachment 229424 Patch Looks great, but do you think you could also fix this for the EWS? 1001240 18 b.long 2014-04-16 11:22:55 -0700 (In reply to comment #17) > (From update of attachment 229424 [details]) > Looks great, but do you think you could also fix this for the EWS? Do you know where the EWS build scripts are? I had assumed it was the same as the other build bots. 1001270 19 mrobinson 2014-04-16 12:44:28 -0700 I think it's in Tools/Scripts/webkitpy/common/config/ports.py 1001289 20 229473 b.long 2014-04-16 13:04:34 -0700 Created attachment 229473 Patch How's this? I changed ports.py so the default makeargs still apply, even if MAKEARGS is set. The defaults are listed first so they can be overridden. 1001294 21 229473 b.long 2014-04-16 13:11:52 -0700 Comment on attachment 229473 Patch Hm it's trying to add --keep-going to ninja. I'll look into that.. 1001300 22 b.long 2014-04-16 13:22:03 -0700 So if the build bots are running ninja, then this won't work anyway. It only happens with GNU make apparently. We can solve part of the problem by adding ninja-build to the dependencies. 1001303 23 229473 mrobinson 2014-04-16 13:23:00 -0700 Comment on attachment 229473 Patch You probably want to put this into GtkWK2Port and attach it onto the result of the calling the parent's method. 1001311 24 229476 b.long 2014-04-16 13:44:44 -0700 Created attachment 229476 Patch Here's a simpler one that just replaces -i with -k, so at least the error code will be correct. I'm going to look into adding ninja-build to install-dependencies. CMake doesn't do this with ninja by default, so if we can auto-install ninja then most peope won't see this unless they want it. 1001333 25 229476 commit-queue 2014-04-16 14:24:32 -0700 Comment on attachment 229476 Patch Clearing flags on attachment: 229476 Committed r167385: <http://trac.webkit.org/changeset/167385> 1001334 26 commit-queue 2014-04-16 14:24:38 -0700 All reviewed patches have been landed. Closing bug. 229420 2014-04-15 17:36:30 -0700 2014-04-15 19:48:55 -0700 Patch bug-130148-20140415173609.patch text/plain 2806 b.long U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3MzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0 aW9uc0dUSy5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCmluZGV4IGVkZmY5 M2U2Y2U3ZTRhNzJmZjM2YTgzNzUxNzc5YWI5ODZkMzkxZjguLjQwNjhkMGE5NDQ4ZWNkOTNjOWQ0 Y2M1NTlkOWJiMmFhNWNhOGFlZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RL LmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCkBAIC0zMjEsNiArMzIx LDcgQEAgbWFjcm8oQUREX1dIT0xFX0FSQ0hJVkVfVE9fTElCUkFSSUVTIF9saXN0X25hbWUpCiBl bmRtYWNybygpCiAKIGJ1aWxkX2NvbW1hbmQoQ09NTUFORF9MSU5FX1RPX0JVSUxEKQorc3RyaW5n KFJFUExBQ0UgIi1pIiAiIiBDT01NQU5EX0xJTkVfVE9fQlVJTEQgJHtDT01NQU5EX0xJTkVfVE9f QlVJTER9KQogZmlsZShXUklURQogICAgICR7Q01BS0VfQklOQVJZX0RJUn0ke0NNQUtFX0ZJTEVT X0RJUkVDVE9SWX0vYnVpbGQuc2gKICAgICAiIyEvYmluL3NoXG4iCmRpZmYgLS1naXQgYS9Ub29s cy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTIyYmFiYmYwNWVkZmQ4MjkxZmM4 ZDQwNjU2ZDM2OGE1ZTgwZGFhMS4uN2ZjNjNhOTJkOWI1MmJiYjVjNDQ5OWJhYWU4NjUxNzFkNDVj YzQzMiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDEzIEBACisyMDE0LTA0LTE1ICBCcmVuZGFuIExvbmcgIDxiLmxvbmdAY2FibGVs YWJzLmNvbT4KKworICAgICAgICBbR1RLXVtDTUFLRV0gYnVpbGQtd2Via2l0IGRvZXNuJ3QgZGV0 ZWN0IHdoZW4gdGhlIGJ1aWxkIGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzAxNDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL21hc3Rlci5jZmc6CisgICAgICAgIChhcHBlbmRDdXN0b21CdWlsZEZsYWdzKTogQWRkIC0t a2VlcC1nb2luZyBtYWtlIG9wdGlvbiAoY29udGludWUgYnVpbGQgZXZlbiBpZiB0aGVyZSBhcmUg ZXJyb3JzKSBmb3IgYm90cworCiAyMDE0LTA0LTE1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNn YXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBSZWR1Y2UgdGhlIGJpbmFyeSBzaXpl IGJ5IGNvbXByZXNzaW5nIHRoZSB0ZXh0IGJhc2VkIHdlYiBpbnNwZWN0b3IgcmVzb3VyY2VzCmRp ZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZp Zy9tYXN0ZXIuY2ZnIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1j b25maWcvbWFzdGVyLmNmZwppbmRleCAzMmE4Yjk0ZDgwYjRiN2FmNzQ4NTkzMzg3MzkxNWNhMmQw MDZhMmE3Li5lYmY2ZWQyZTY0Y2Y2NjA1Zjk4OWQ5MmY5NmZkN2VhNzRkMzc0YmNkIDEwMDY0NAot LS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0 ZXIuY2ZnCisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL21hc3Rlci5jZmcKQEAgLTE5MSw2ICsxOTEsOCBAQCBjbGFzcyBJbnN0YWxsR3RrRGVwZW5k ZW5jaWVzKHNoZWxsLlNoZWxsQ29tbWFuZCk6CiBkZWYgYXBwZW5kQ3VzdG9tQnVpbGRGbGFncyhz dGVwLCBwbGF0Zm9ybSwgZnVsbFBsYXRmb3JtPSIiKTogCiAgICAgaWYgcGxhdGZvcm0gaW4gKCdl ZmwnLCAnZ3RrJywgJ3dpbmNhaXJvJywgJ3d4Jyk6CiAgICAgICAgIHN0ZXAuc2V0Q29tbWFuZChz dGVwLmNvbW1hbmQgKyBbJy0tJyArIHBsYXRmb3JtXSkKKyAgICBpZiBwbGF0Zm9ybSBpbiAoJ2Vm bCcsICdndGsnKToKKyAgICAgICAgc3RlcC5zZXRDb21tYW5kKHN0ZXAuY29tbWFuZCArIFsnLS1t YWtlYXJncz0iLS1rZWVwLWdvaW5nIiddKQogCiBjbGFzcyBDb21waWxlV2ViS2l0KHNoZWxsLkNv bXBpbGUpOgogICAgIGNvbW1hbmQgPSBbInBlcmwiLCAiLi9Ub29scy9TY3JpcHRzL2J1aWxkLXdl YmtpdCIsIFdpdGhQcm9wZXJ0aWVzKCItLSUoY29uZmlndXJhdGlvbilzIildCmRpZmYgLS1naXQg YS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXggM2RiYzQxZWMyZTg0MzhhNzE0MDZjMTNhOTgw OGFjMTQ3NDY1YjljMC4uNjIxOTA3YzkxNGZiMmMwMzJmN2UzNmJmZDNkNGZlNmFkNDAzNjM3OSAx MDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisy MDE0LTA0LTE1ICBCcmVuZGFuIExvbmcgIDxiLmxvbmdAY2FibGVsYWJzLmNvbT4KKworICAgICAg ICBbR1RLXVtDTUFLRV0gYnVpbGQtd2Via2l0IGRvZXNuJ3QgZGV0ZWN0IHdoZW4gdGhlIGJ1aWxk IGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzAxNDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFNvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlOiBSZW1vdmUgLWkgb3B0aW9uIChpZ25vcmUg YnVpbGQgZmFpbHVyZXMpIGZyb20gZGVmYXVsdCBidWlsZCBjb21tYW5kCisKIDIwMTQtMDQtMTEg IEJyaWFuIEouIEJ1cmcgIDxidXJnQGNzLndhc2hpbmd0b24uZWR1PgogCiAgICAgICAgIFdlYiBS ZXBsYXk6IG1lbW9pemUgbm9uZGV0ZXJtaW5pc3RpYyBhdHRyaWJ1dGVzIG9mIHRoZSBOYXZpZ2F0 b3IgaW50ZXJmYWNlCg== 229424 2014-04-15 19:48:59 -0700 2014-04-16 13:04:27 -0700 Patch bug-130148-20140415194838.patch text/plain 3025 b.long U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3MzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0 aW9uc0dUSy5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCmluZGV4IGVkZmY5 M2U2Y2U3ZTRhNzJmZjM2YTgzNzUxNzc5YWI5ODZkMzkxZjguLjdiZTc0Y2YzNWQ5OGQ3YjBkNmUz YmY1MDA1NDYxYzBkNTdhYTRiNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RL LmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCkBAIC0zMjEsNiArMzIx LDEwIEBAIG1hY3JvKEFERF9XSE9MRV9BUkNISVZFX1RPX0xJQlJBUklFUyBfbGlzdF9uYW1lKQog ZW5kbWFjcm8oKQogCiBidWlsZF9jb21tYW5kKENPTU1BTkRfTElORV9UT19CVUlMRCkKKyMgYnVp bGRfY29tbWFuZCB1bmNvbmRpdGlvbmFsbHkgYWRkcyAtaSAoaWdub3JlIGVycm9ycykgZm9yIG1h a2UsIGFuZCB0aGVyZSdzCisjIG5vIHJlYXNvbmFibGUgd2F5IHRvIHR1cm4gdGhhdCBvZmYsIHNv IHdlIGp1c3QgcmVtb3ZlIGl0IGhlcmUuCisjIFNlZTogaHR0cDovL3d3dy5jbWFrZS5vcmcvY21h a2UvaGVscC92My4wL2NvbW1hbmQvYnVpbGRfY29tbWFuZC5odG1sCitzdHJpbmcoUkVQTEFDRSAi IC1pIiAiIiBDT01NQU5EX0xJTkVfVE9fQlVJTEQgJHtDT01NQU5EX0xJTkVfVE9fQlVJTER9KQog ZmlsZShXUklURQogICAgICR7Q01BS0VfQklOQVJZX0RJUn0ke0NNQUtFX0ZJTEVTX0RJUkVDVE9S WX0vYnVpbGQuc2gKICAgICAiIyEvYmluL3NoXG4iCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VM b2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTIyYmFiYmYwNWVkZmQ4MjkxZmM4ZDQwNjU2ZDM2 OGE1ZTgwZGFhMS4uN2ZjNjNhOTJkOWI1MmJiYjVjNDQ5OWJhYWU4NjUxNzFkNDVjYzQzMiAxMDA2 NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDEzIEBACisyMDE0LTA0LTE1ICBCcmVuZGFuIExvbmcgIDxiLmxvbmdAY2FibGVsYWJzLmNvbT4K KworICAgICAgICBbR1RLXVtDTUFLRV0gYnVpbGQtd2Via2l0IGRvZXNuJ3QgZGV0ZWN0IHdoZW4g dGhlIGJ1aWxkIGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMzAxNDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rl ci5jZmc6CisgICAgICAgIChhcHBlbmRDdXN0b21CdWlsZEZsYWdzKTogQWRkIC0ta2VlcC1nb2lu ZyBtYWtlIG9wdGlvbiAoY29udGludWUgYnVpbGQgZXZlbiBpZiB0aGVyZSBhcmUgZXJyb3JzKSBm b3IgYm90cworCiAyMDE0LTA0LTE1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdh bGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBSZWR1Y2UgdGhlIGJpbmFyeSBzaXplIGJ5IGNvbXBy ZXNzaW5nIHRoZSB0ZXh0IGJhc2VkIHdlYiBpbnNwZWN0b3IgcmVzb3VyY2VzCmRpZmYgLS1naXQg YS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIu Y2ZnIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFz dGVyLmNmZwppbmRleCAzMmE4Yjk0ZDgwYjRiN2FmNzQ4NTkzMzg3MzkxNWNhMmQwMDZhMmE3Li5l YmY2ZWQyZTY0Y2Y2NjA1Zjk4OWQ5MmY5NmZkN2VhNzRkMzc0YmNkIDEwMDY0NAotLS0gYS9Ub29s cy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCisr KyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rl ci5jZmcKQEAgLTE5MSw2ICsxOTEsOCBAQCBjbGFzcyBJbnN0YWxsR3RrRGVwZW5kZW5jaWVzKHNo ZWxsLlNoZWxsQ29tbWFuZCk6CiBkZWYgYXBwZW5kQ3VzdG9tQnVpbGRGbGFncyhzdGVwLCBwbGF0 Zm9ybSwgZnVsbFBsYXRmb3JtPSIiKTogCiAgICAgaWYgcGxhdGZvcm0gaW4gKCdlZmwnLCAnZ3Rr JywgJ3dpbmNhaXJvJywgJ3d4Jyk6CiAgICAgICAgIHN0ZXAuc2V0Q29tbWFuZChzdGVwLmNvbW1h bmQgKyBbJy0tJyArIHBsYXRmb3JtXSkKKyAgICBpZiBwbGF0Zm9ybSBpbiAoJ2VmbCcsICdndGsn KToKKyAgICAgICAgc3RlcC5zZXRDb21tYW5kKHN0ZXAuY29tbWFuZCArIFsnLS1tYWtlYXJncz0i LS1rZWVwLWdvaW5nIiddKQogCiBjbGFzcyBDb21waWxlV2ViS2l0KHNoZWxsLkNvbXBpbGUpOgog ICAgIGNvbW1hbmQgPSBbInBlcmwiLCAiLi9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdCIsIFdp dGhQcm9wZXJ0aWVzKCItLSUoY29uZmlndXJhdGlvbilzIildCmRpZmYgLS1naXQgYS9DaGFuZ2VM b2cgYi9DaGFuZ2VMb2cKaW5kZXggM2RiYzQxZWMyZTg0MzhhNzE0MDZjMTNhOTgwOGFjMTQ3NDY1 YjljMC4uNjIxOTA3YzkxNGZiMmMwMzJmN2UzNmJmZDNkNGZlNmFkNDAzNjM3OSAxMDA2NDQKLS0t IGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDE0LTA0LTE1 ICBCcmVuZGFuIExvbmcgIDxiLmxvbmdAY2FibGVsYWJzLmNvbT4KKworICAgICAgICBbR1RLXVtD TUFLRV0gYnVpbGQtd2Via2l0IGRvZXNuJ3QgZGV0ZWN0IHdoZW4gdGhlIGJ1aWxkIGZhaWxzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzAxNDgKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNvdXJjZS9j bWFrZS9PcHRpb25zR1RLLmNtYWtlOiBSZW1vdmUgLWkgb3B0aW9uIChpZ25vcmUgYnVpbGQgZmFp bHVyZXMpIGZyb20gZGVmYXVsdCBidWlsZCBjb21tYW5kCisKIDIwMTQtMDQtMTEgIEJyaWFuIEou IEJ1cmcgIDxidXJnQGNzLndhc2hpbmd0b24uZWR1PgogCiAgICAgICAgIFdlYiBSZXBsYXk6IG1l bW9pemUgbm9uZGV0ZXJtaW5pc3RpYyBhdHRyaWJ1dGVzIG9mIHRoZSBOYXZpZ2F0b3IgaW50ZXJm YWNlCg== 229473 2014-04-16 13:04:34 -0700 2014-04-16 13:44:37 -0700 Patch bug-130148-20140416130411.patch text/plain 4099 b.long U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3MzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0 aW9uc0dUSy5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCmluZGV4IGVkZmY5 M2U2Y2U3ZTRhNzJmZjM2YTgzNzUxNzc5YWI5ODZkMzkxZjguLjdiZTc0Y2YzNWQ5OGQ3YjBkNmUz YmY1MDA1NDYxYzBkNTdhYTRiNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RL LmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCkBAIC0zMjEsNiArMzIx LDEwIEBAIG1hY3JvKEFERF9XSE9MRV9BUkNISVZFX1RPX0xJQlJBUklFUyBfbGlzdF9uYW1lKQog ZW5kbWFjcm8oKQogCiBidWlsZF9jb21tYW5kKENPTU1BTkRfTElORV9UT19CVUlMRCkKKyMgYnVp bGRfY29tbWFuZCB1bmNvbmRpdGlvbmFsbHkgYWRkcyAtaSAoaWdub3JlIGVycm9ycykgZm9yIG1h a2UsIGFuZCB0aGVyZSdzCisjIG5vIHJlYXNvbmFibGUgd2F5IHRvIHR1cm4gdGhhdCBvZmYsIHNv IHdlIGp1c3QgcmVtb3ZlIGl0IGhlcmUuCisjIFNlZTogaHR0cDovL3d3dy5jbWFrZS5vcmcvY21h a2UvaGVscC92My4wL2NvbW1hbmQvYnVpbGRfY29tbWFuZC5odG1sCitzdHJpbmcoUkVQTEFDRSAi IC1pIiAiIiBDT01NQU5EX0xJTkVfVE9fQlVJTEQgJHtDT01NQU5EX0xJTkVfVE9fQlVJTER9KQog ZmlsZShXUklURQogICAgICR7Q01BS0VfQklOQVJZX0RJUn0ke0NNQUtFX0ZJTEVTX0RJUkVDVE9S WX0vYnVpbGQuc2gKICAgICAiIyEvYmluL3NoXG4iCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VM b2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTIyYmFiYmYwNWVkZmQ4MjkxZmM4ZDQwNjU2ZDM2 OGE1ZTgwZGFhMS4uNjExNzY4ZDA2OTFhMmU0Njk0YzU4ZDY4YmRkNjJjNGU5OGQ1NGY5MCAxMDA2 NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE1IEBACisyMDE0LTA0LTE2ICBCcmVuZGFuIExvbmcgIDxiLmxvbmdAY2FibGVsYWJzLmNvbT4K KworICAgICAgICBbR1RLXVtDTUFLRV0gYnVpbGQtd2Via2l0IGRvZXNuJ3QgZGV0ZWN0IHdoZW4g dGhlIGJ1aWxkIGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMzAxNDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rl ci5jZmc6CisgICAgICAgIChhcHBlbmRDdXN0b21CdWlsZEZsYWdzKTogQWRkIC0ta2VlcC1nb2lu ZyAoZG9uJ3Qgc3RvcCBvbiBlcnJvcnMpIHRvIG1ha2UgYXJndW1lbnRzLgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5weToKKyAgICAgICAgKERlcHJlY2F0 ZWRQb3J0Lm1ha2VBcmdzKTogU2FtZSwgYW5kIG1hZGUgZGVmYXVsdCBhcmd1bWVudHMgYXBwbHkg ZXZlbiBpZiBNQUtFRkxBR1MgaXMgc2V0IChNQUtFRkxBR1MgY2FuIG92ZXJyaWRlIHRoZW0pLgor CiAyMDE0LTA0LTE1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4K IAogICAgICAgICBbR1RLXSBSZWR1Y2UgdGhlIGJpbmFyeSBzaXplIGJ5IGNvbXByZXNzaW5nIHRo ZSB0ZXh0IGJhc2VkIHdlYiBpbnNwZWN0b3IgcmVzb3VyY2VzCmRpZmYgLS1naXQgYS9Ub29scy9C dWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnIGIvVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwpp bmRleCAzMmE4Yjk0ZDgwYjRiN2FmNzQ4NTkzMzg3MzkxNWNhMmQwMDZhMmE3Li5lYmY2ZWQyZTY0 Y2Y2NjA1Zjk4OWQ5MmY5NmZkN2VhNzRkMzc0YmNkIDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCisrKyBiL1Rvb2xz L0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcKQEAg LTE5MSw2ICsxOTEsOCBAQCBjbGFzcyBJbnN0YWxsR3RrRGVwZW5kZW5jaWVzKHNoZWxsLlNoZWxs Q29tbWFuZCk6CiBkZWYgYXBwZW5kQ3VzdG9tQnVpbGRGbGFncyhzdGVwLCBwbGF0Zm9ybSwgZnVs bFBsYXRmb3JtPSIiKTogCiAgICAgaWYgcGxhdGZvcm0gaW4gKCdlZmwnLCAnZ3RrJywgJ3dpbmNh aXJvJywgJ3d4Jyk6CiAgICAgICAgIHN0ZXAuc2V0Q29tbWFuZChzdGVwLmNvbW1hbmQgKyBbJy0t JyArIHBsYXRmb3JtXSkKKyAgICBpZiBwbGF0Zm9ybSBpbiAoJ2VmbCcsICdndGsnKToKKyAgICAg ICAgc3RlcC5zZXRDb21tYW5kKHN0ZXAuY29tbWFuZCArIFsnLS1tYWtlYXJncz0iLS1rZWVwLWdv aW5nIiddKQogCiBjbGFzcyBDb21waWxlV2ViS2l0KHNoZWxsLkNvbXBpbGUpOgogICAgIGNvbW1h bmQgPSBbInBlcmwiLCAiLi9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdCIsIFdpdGhQcm9wZXJ0 aWVzKCItLSUoY29uZmlndXJhdGlvbilzIildCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9jb25maWcvcG9ydHMucHkKaW5kZXggMzMxNGMwZWYwMDM5NDlhMjJhZGYxMDI2NDY5ZTli YTA1YTY3NTkxYi4uMjBjZmM4MDIzZGQ1NGJkMzkwYTU3NGEyZDZlNjJmZTQxNWI2ZjAzZSAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5weQpAQCAtODAs MTAgKzgwLDEwIEBAIGNsYXNzIERlcHJlY2F0ZWRQb3J0KG9iamVjdCk6CiAKICAgICBkZWYgbWFr ZUFyZ3Moc2VsZik6CiAgICAgICAgICMgRklYTUU6IFRoaXMgc2hvdWxkbid0IHVzZSBhIHN0YXRp YyBFeGVjdXRpdmUoKS4KLSAgICAgICAgYXJncyA9ICctLW1ha2VhcmdzPSItaiVzIicgJSBFeGVj dXRpdmUoKS5jcHVfY291bnQoKQorICAgICAgICBhcmdzID0gWyItaiVzIiAlIEV4ZWN1dGl2ZSgp LmNwdV9jb3VudCgpLCAiLS1rZWVwLWdvaW5nIl0KICAgICAgICAgaWYgb3MuZW52aXJvbi5oYXNf a2V5KCdNQUtFRkxBR1MnKToKLSAgICAgICAgICAgIGFyZ3MgPSAnLS1tYWtlYXJncz0iJXMiJyAl IG9zLmVudmlyb25bJ01BS0VGTEFHUyddCi0gICAgICAgIHJldHVybiBhcmdzCisgICAgICAgICAg ICBhcmdzLmFwcGVuZChvcy5lbnZpcm9uWydNQUtFRkxBR1MnXSkKKyAgICAgICAgcmV0dXJuICct LW1ha2VhcmdzPSIlcyInICUgIiAiLmpvaW4oYXJncykKIAogICAgIGRlZiB1cGRhdGVfd2Via2l0 X2NvbW1hbmQoc2VsZiwgbm9uX2ludGVyYWN0aXZlPUZhbHNlKToKICAgICAgICAgcmV0dXJuIHNl bGYuc2NyaXB0X3NoZWxsX2NvbW1hbmQoInVwZGF0ZS13ZWJraXQiKQpkaWZmIC0tZ2l0IGEvQ2hh bmdlTG9nIGIvQ2hhbmdlTG9nCmluZGV4IDNkYmM0MWVjMmU4NDM4YTcxNDA2YzEzYTk4MDhhYzE0 NzQ2NWI5YzAuLjdhYjE1ZjlhZjBjY2EzZjZkNWI4YmM4N2FjZTQ4ZWQzOWNjNDhjNDQgMTAwNjQ0 Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxNC0w NC0xNiAgQnJlbmRhbiBMb25nICA8Yi5sb25nQGNhYmxlbGFicy5jb20+CisKKyAgICAgICAgW0dU S11bQ01BS0VdIGJ1aWxkLXdlYmtpdCBkb2Vzbid0IGRldGVjdCB3aGVuIHRoZSBidWlsZCBmYWls cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwMTQ4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTb3Vy Y2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZTogUmVtb3ZlIC1pIChpZ25vcmUgZXJyb3JzKSBmcm9t IGRlZmF1bHQgbWFrZSBhcmd1bWVudHMuCisKIDIwMTQtMDQtMTEgIEJyaWFuIEouIEJ1cmcgIDxi dXJnQGNzLndhc2hpbmd0b24uZWR1PgogCiAgICAgICAgIFdlYiBSZXBsYXk6IG1lbW9pemUgbm9u ZGV0ZXJtaW5pc3RpYyBhdHRyaWJ1dGVzIG9mIHRoZSBOYXZpZ2F0b3IgaW50ZXJmYWNlCg== 229476 2014-04-16 13:44:44 -0700 2014-04-16 14:24:32 -0700 Patch bug-130148-20140416134421.patch text/plain 1586 b.long U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3MzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0 aW9uc0dUSy5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCmluZGV4IGVkZmY5 M2U2Y2U3ZTRhNzJmZjM2YTgzNzUxNzc5YWI5ODZkMzkxZjguLmI2OWFkOWY1OGU5MjAzNWEzOWZl YWFlMGU0Yzg2MTkwOGNkMzNmYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RL LmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCkBAIC0zMjEsNiArMzIx LDExIEBAIG1hY3JvKEFERF9XSE9MRV9BUkNISVZFX1RPX0xJQlJBUklFUyBfbGlzdF9uYW1lKQog ZW5kbWFjcm8oKQogCiBidWlsZF9jb21tYW5kKENPTU1BTkRfTElORV9UT19CVUlMRCkKKyMgYnVp bGRfY29tbWFuZCB1bmNvbmRpdGlvbmFsbHkgYWRkcyAtaSAoaWdub3JlIGVycm9ycykgZm9yIG1h a2UsIGFuZCB0aGVyZSdzCisjIG5vIHJlYXNvbmFibGUgd2F5IHRvIHR1cm4gdGhhdCBvZmYsIHNv IHdlIGp1c3QgcmVwbGFjZSBpdCB3aXRoIC1rLCB3aGljaCBoYXMKKyMgdGhlIHNhbWUgZWZmZWN0 LCBleGNlcHQgdGhhdCB0aGUgcmV0dXJuIGNvZGUgd2lsbCBpbmRpY2F0ZSB0aGF0IGFuIGVycm9y IG9jY3VycmVkLgorIyBTZWU6IGh0dHA6Ly93d3cuY21ha2Uub3JnL2NtYWtlL2hlbHAvdjMuMC9j b21tYW5kL2J1aWxkX2NvbW1hbmQuaHRtbAorc3RyaW5nKFJFUExBQ0UgIiAtaSIgIiAtayIgQ09N TUFORF9MSU5FX1RPX0JVSUxEICR7Q09NTUFORF9MSU5FX1RPX0JVSUxEfSkKIGZpbGUoV1JJVEUK ICAgICAke0NNQUtFX0JJTkFSWV9ESVJ9JHtDTUFLRV9GSUxFU19ESVJFQ1RPUll9L2J1aWxkLnNo CiAgICAgIiMhL2Jpbi9zaFxuIgpkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmlu ZGV4IDNkYmM0MWVjMmU4NDM4YTcxNDA2YzEzYTk4MDhhYzE0NzQ2NWI5YzAuLmZlZmU1N2UxZGY0 OTE0ZTJhZmM4YzIzOGUwMDc0OGExN2MwMjg5YWUgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysg Yi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxNC0wNC0xNiAgQnJlbmRhbiBMb25nICA8 Yi5sb25nQGNhYmxlbGFicy5jb20+CisKKyAgICAgICAgW0dUS11bQ01BS0VdIGJ1aWxkLXdlYmtp dCBkb2Vzbid0IGRldGVjdCB3aGVuIHRoZSBidWlsZCBmYWlscworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwMTQ4CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5j bWFrZTogUmVwbGFjZSBDTWFrZSdzIGF1dG9tYXRpYyBtYWtlIC1pIHdpdGggbWFrZSAtaywgd2hp Y2ggc3RpbGwgY29udGludWVzIGFmdGVyIGVycm9ycywgYnV0IGNvcnJlY3RseSByZXBvcnRzIHRo YSB0aGUgYnVpbGQgZmFpbGVkLgorCiAyMDE0LTA0LTExICBCcmlhbiBKLiBCdXJnICA8YnVyZ0Bj cy53YXNoaW5ndG9uLmVkdT4KIAogICAgICAgICBXZWIgUmVwbGF5OiBtZW1vaXplIG5vbmRldGVy bWluaXN0aWMgYXR0cmlidXRlcyBvZiB0aGUgTmF2aWdhdG9yIGludGVyZmFjZQo=