26537 2009-06-19 03:30:20 -0700 Builds from command-line fail if custom build product directory is set and ~/Library/Preferences/xcodebuild.plist exists 2009-06-24 22:11:16 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P3 Normal --- 1 tyoshino webkit-unassigned mrowe oldest_to_newest 126931 0 tyoshino 2009-06-19 03:30:20 -0700 When I set the directory to place build products by Xcode like this, Xcode -> Preferences -> Building tab -> Place Build Products in -> Customized location -> e.g. /tmp/ramdisk I got the following error. This happened because build-webkit script didn't set BUILT_PRODUCTS_DIR variable correctly. Output files were generated into each project directories separately, not into the specified directory together. % time build-webkit --debug ... setenv BUILT_PRODUCTS_DIR /Users/tyoshino/wk2_svn/JavaScriptCore/build/Debug ... CompileC build/JavaScriptGlue.build/Debug/JavaScriptGlue.build/Objects-normal/i386/JSBase.o /Users/tyoshino/wk2_svn/JavaScriptGlue/JSBase.cpp normal i386 c++ com.apple.compilers.gcc.4_2 cd /Users/tyoshino/wk2_svn/JavaScriptGlue /Developer/usr/bin/gcc-4.2 -x c++ -arch i386 -fmessage-length=0 -pipe -Wno-trigraphs -fno-exceptions -fno-rtti -fpascal-strings -fasm-blocks -O0 -Werror -Wnon-virtual-dtor -Wnewline-eof -DWEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST -fstrict-aliasing -fvisibility-inlines-hidden -fno-threadsafe-statics -mmacosx-version-min=10.5 -gdwarf-2 -I/Users/tyoshino/wk2_svn/JavaScriptGlue/build/JavaScriptGlue.build/Debug/JavaScriptGlue.build/JavaScriptGlue.hmap -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef -Wno-strict-aliasing -Wshorten-64-to-32 -F/Users/tyoshino/wk2_svn/JavaScriptGlue/build/Debug -I/Users/tyoshino/wk2_svn/JavaScriptGlue/build/Debug/include -IForwardingHeaders -I. -Iicu -I/Users/tyoshino/wk2_svn/JavaScriptGlue/build/JavaScriptGlue.build/Debug/JavaScriptGlue.build/DerivedSources -Wno-deprecated-declarations -c /Users/tyoshino/wk2_svn/JavaScriptGlue/JSBase.cpp -o /Users/tyoshino/wk2_svn/JavaScriptGlue/build/JavaScriptGlue.build/Debug/JavaScriptGlue.build/Objects-normal/i386/JSBase.o In file included from /Users/tyoshino/wk2_svn/JavaScriptGlue/config.h:5, from /Users/tyoshino/wk2_svn/JavaScriptGlue/JSBase.cpp:29: ForwardingHeaders/wtf/Platform.h:1:37: error: JavaScriptCore/Platform.h: No such file or directory 126932 1 31541 tyoshino 2009-06-19 03:33:29 -0700 Created attachment 31541 Proposed fix for 26537 126933 2 31542 tyoshino 2009-06-19 03:35:17 -0700 Created attachment 31542 Proposed fix for 26537 Oops! I included unrelated changes by mistake. 127298 3 31542 eric 2009-06-21 23:57:27 -0700 Comment on attachment 31542 Proposed fix for 26537 LGTM. 127303 4 mrowe 2009-06-22 00:11:51 -0700 I don't understand why this is necessary. I'm aware of a number of people that build with a global built products directory configured in Xcode. I'd like to understand what is special about your setup that requires this change? 127306 5 tyoshino 2009-06-22 00:19:16 -0700 (In reply to comment #4) > I don't understand why this is necessary. I'm aware of a number of people that > build with a global built products directory configured in Xcode. I'd like to > understand what is special about your setup that requires this change? > Do they build using build-webkit script? I can build WebKit on Xcode IDE without this patch, but cannot with build-webkit script when I changed the global built products directory to somewhere else than <Checkout directory>/WebKitBuild. I just followed the instruction on www.webkit.org. AFAIK, I didn't make any special changes on Xcode settings other than built product. One of my coworker also came across this failure when he tried to build. Thanks 127307 6 31542 mrowe 2009-06-22 00:22:09 -0700 Comment on attachment 31542 Proposed fix for 26537 Explicitly setting SYMROOT and OBJROOT shouldn't be necessary. Xcode derives these values automatically relative to configured build products directory. While the patch apparently fixes your problem, I think we should understand why you're running in to this when no-one else is. It makes me suspect that something is just a little off in your Xcode preferences. Until we understand what, I don't think this should be landed. 127308 7 mrowe 2009-06-22 00:24:20 -0700 (In reply to comment #5) > (In reply to comment #4) > > I don't understand why this is necessary. I'm aware of a number of people that > > build with a global built products directory configured in Xcode. I'd like to > > understand what is special about your setup that requires this change? > > > > Do they build using build-webkit script? I can build WebKit on Xcode IDE > without this patch, but cannot with build-webkit script when I changed the > global built products directory to somewhere else than <Checkout > directory>/WebKitBuild. Almost all of my coworkers at Apple have a custom built product location and build from the command-line (using "make", which gets the arguments to xcodebuild from webkitdirs.pm in a similar fashion to build-webkit). Do you happen to have a ~/Library/Preferences/xcodebuild.plist? 127309 8 tyoshino 2009-06-22 00:29:08 -0700 (In reply to comment #7) > (In reply to comment #5) > > (In reply to comment #4) > > > I don't understand why this is necessary. I'm aware of a number of people that > > > build with a global built products directory configured in Xcode. I'd like to > > > understand what is special about your setup that requires this change? > > > > > > > Do they build using build-webkit script? I can build WebKit on Xcode IDE > > without this patch, but cannot with build-webkit script when I changed the > > global built products directory to somewhere else than <Checkout > > directory>/WebKitBuild. > > Almost all of my coworkers at Apple have a custom built product location and > build from the command-line (using "make", which gets the arguments to > xcodebuild from webkitdirs.pm in a similar fashion to build-webkit). Hmm, I see. > > Do you happen to have a ~/Library/Preferences/xcodebuild.plist? > Yes % od -c xcodebuild.plist [~/Library/Preferences] 0000000 b p l i s t 0 0 321 001 002 _ 020 037 P B 0000020 X A p p l i c a t i o n w i d e 0000040 B u i l d S e t t i n g s 320 \b \v 0000060 - \0 \0 \0 \0 \0 \0 001 001 \0 \0 \0 \0 \0 \0 \0 0000100 003 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 0000120 . 0000121 127310 9 tyoshino 2009-06-22 00:30:35 -0700 (In reply to comment #8) > (In reply to comment #7) > > (In reply to comment #5) > > > (In reply to comment #4) > > > > I don't understand why this is necessary. I'm aware of a number of people that > > > > build with a global built products directory configured in Xcode. I'd like to > > > > understand what is special about your setup that requires this change? > > > > > > > > > > Do they build using build-webkit script? I can build WebKit on Xcode IDE > > > without this patch, but cannot with build-webkit script when I changed the > > > global built products directory to somewhere else than <Checkout > > > directory>/WebKitBuild. > > > > Almost all of my coworkers at Apple have a custom built product location and > > build from the command-line (using "make", which gets the arguments to > > xcodebuild from webkitdirs.pm in a similar fashion to build-webkit). > > Hmm, I see. > > > > > Do you happen to have a ~/Library/Preferences/xcodebuild.plist? > > > > Yes > > % od -c xcodebuild.plist > [~/Library/Preferences] > 0000000 b p l i s t 0 0 321 001 002 _ 020 037 P B > 0000020 X A p p l i c a t i o n w i d e > 0000040 B u i l d S e t t i n g s 320 \b \v > 0000060 - \0 \0 \0 \0 \0 \0 001 001 \0 \0 \0 \0 \0 \0 \0 > 0000100 003 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 > 0000120 . > 0000121 > And, FYI, % defaults read com.apple.Xcode PBXApplicationwideBuildSettings [~/Library/Preferences] { SYMROOT = "/tmp/ramdisk/WebKitBuild"; } 127311 10 tyoshino 2009-06-22 00:38:13 -0700 Deleting ~/Library/Preferences/xcodebuild.plist fixed this problem. I see. This file gave bad parameter to xcodebuild. 127313 11 mrowe 2009-06-22 00:40:48 -0700 > > Do you happen to have a ~/Library/Preferences/xcodebuild.plist? > > > > Yes Delete it! The problem you're seeing is that xcodebuild is reading preferences from that file when it should be pulling them from com.apple.Xcode.plist, the standard Xcode preferences. The situations under which xcodebuild.plist gets created are something of a mystery, but appears to be the result of a bug in xcodebuild itself (<rdar://problem/5585899>). The existence of this bogus preference file is likely to cause other subtle issues beyond the obvious build directory problem, so I don't think your patch is the appropriate workaround. A more direct approach may be to look for the existence of this preference file and warn the user, or perhaps even automatically remove it. 127316 12 tyoshino 2009-06-22 00:49:40 -0700 (In reply to comment #11) > > > Do you happen to have a ~/Library/Preferences/xcodebuild.plist? > > > > > > > Yes > > Delete it! The problem you're seeing is that xcodebuild is reading preferences > from that file when it should be pulling them from com.apple.Xcode.plist, the > standard Xcode preferences. The situations under which xcodebuild.plist gets > created are something of a mystery, but appears to be the result of a bug in > xcodebuild itself (<rdar://problem/5585899>). > > The existence of this bogus preference file is likely to cause other subtle > issues beyond the obvious build directory problem, so I don't think your patch > is the appropriate workaround. A more direct approach may be to look for the So, what's the best thing to do in this function? It's confusing that it has unnecessary code for setting baseProductionDirOption here. > existence of this preference file and warn the user, or perhaps even > automatically remove it. > OK. I agree with you about this point. I'll send another patch. 127319 13 mrowe 2009-06-22 01:00:56 -0700 (In reply to comment #12) > (In reply to comment #11) > > > > Do you happen to have a ~/Library/Preferences/xcodebuild.plist? > > > > > > > > > > Yes > > > > Delete it! The problem you're seeing is that xcodebuild is reading preferences > > from that file when it should be pulling them from com.apple.Xcode.plist, the > > standard Xcode preferences. The situations under which xcodebuild.plist gets > > created are something of a mystery, but appears to be the result of a bug in > > xcodebuild itself (<rdar://problem/5585899>). > > > > The existence of this bogus preference file is likely to cause other subtle > > issues beyond the obvious build directory problem, so I don't think your patch > > is the appropriate workaround. A more direct approach may be to look for the > > So, what's the best thing to do in this function? It's confusing that it has > unnecessary code for setting baseProductionDirOption here. What unnecessary code are you referring to? baseProductDirOption is set in two places: one place deals with the situation where Xcode has a global build product directory configured (no extra options necessary), and the other deals with the default behavior of placing the build product directory alongside the project (we override SYMROOT and OBJROOT to force things in to a single directory for all projects). It may be that this logic could be cleaner or more explicit, but that is something that would be best done in a separate patch. 127322 14 tyoshino 2009-06-22 01:15:52 -0700 > > So, what's the best thing to do in this function? It's confusing that it has > > unnecessary code for setting baseProductionDirOption here. > > What unnecessary code are you referring to? baseProductDirOption is set in two > places: one place deals with the situation where Xcode has a global build > product directory configured (no extra options necessary), and the other deals > with the default behavior of placing the build product directory alongside the > project (we override SYMROOT and OBJROOT to force things in to a single > directory for all projects). > Sorry, I was misunderstanding. I got it. The code is completely correct. > It may be that this logic could be cleaner or more explicit, but that is > something that would be best done in a separate patch. > All right. Will do. Thank you for review, Mark and Eric. 127329 15 31638 tyoshino 2009-06-22 01:45:50 -0700 Created attachment 31638 Proposed fix for 26537 (rev 3) A new approach to fix this issue following Mark's suggestion. 127356 16 31638 darin 2009-06-22 08:36:18 -0700 Comment on attachment 31638 Proposed fix for 26537 (rev 3) I think we could go further and just remove that file! r=me 127357 17 31638 mrowe 2009-06-22 08:37:32 -0700 Comment on attachment 31638 Proposed fix for 26537 (rev 3) This logic should go in webkitdirs.pm, near where we determine whether we need to add any custom options to xcodebuild in relation to the build product directory. That code is also used by the Makefiles, so it would be good to have the workaround affect both build-webkit and the Makefiles. I also think that removing the file silently if it exists is a better option, as we're just asking the user to do something we can trivially do ourselves. In addition, it'd be great if you could update the comment to refer to the Radar number I mentioned, so that in the future we can quickly determine why the workaround exists and if it is still needed. Something like the following should suffice: # The presence of ~/Library/Preferences/xcodebuild.plist can prevent xcodebuild from respecting global settings such as a custom build products directory (<rdar://problem/5585899>). 127561 18 31702 tyoshino 2009-06-22 20:58:32 -0700 Created attachment 31702 Proposed fix for 26537 (rev 4) 127563 19 31703 tyoshino 2009-06-22 21:04:14 -0700 Created attachment 31703 Proposed fix for 26537 (rev 5) 127564 20 tyoshino 2009-06-22 21:07:09 -0700 (In reply to comment #16) > (From update of attachment 31638 [review]) > I think we could go further and just remove that file! > > r=me > OK. Done. (In reply to comment #17) > (From update of attachment 31638 [review]) > This logic should go in webkitdirs.pm, near where we determine whether we need > to add any custom options to xcodebuild in relation to the build product > directory. That code is also used by the Makefiles, so it would be good to > have the workaround affect both build-webkit and the Makefiles. I also think > that removing the file silently if it exists is a better option, as we're just > asking the user to do something we can trivially do ourselves. In addition, > it'd be great if you could update the comment to refer to the Radar number I > mentioned, so that in the future we can quickly determine why the workaround > exists and if it is still needed. Something like the following should suffice: > > # The presence of ~/Library/Preferences/xcodebuild.plist can prevent > xcodebuild from respecting global settings such as a custom build products > directory (<rdar://problem/5585899>). > Done. Please take a look again. Thanks, 127589 21 31703 mrowe 2009-06-23 01:11:44 -0700 Comment on attachment 31703 Proposed fix for 26537 (rev 5) This looks fine to me. Lines in the ChangeLog and containing comments appear to be wrapped at a very narrow width, making them hard to read. Whomever lands the patch may want to reflow them at a more reasonable length. 127791 22 eric 2009-06-23 18:52:40 -0700 Sigh. Script failure r45032. 128093 23 tyoshino 2009-06-24 22:11:16 -0700 (In reply to comment #22) > Sigh. Script failure r45032. > Thank you. 31541 2009-06-19 03:33:29 -0700 2009-06-19 03:35:17 -0700 Proposed fix for 26537 26537.patch text/plain 10278 tyoshino SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDg1MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMDktMDYtMTkgIFRha2VzaGkgWW9zaGlubyAgPHNldCBFTUFJTF9B RERSRVNTIGVudmlyb25tZW50IHZhcmlhYmxlPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZhc3QvZnJhbWVzL3ZpZXdzb3VyY2Utb24taW1h Z2UtZmlsZS5odG1sCisKKyAgICAgICAgKiBkb20vRE9NSW1wbGVtZW50YXRpb24uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RE9NSW1wbGVtZW50YXRpb246OmNyZWF0ZURvY3VtZW50KToKKyAgICAg ICAgKiBodG1sL0hUTUxWaWV3U291cmNlRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTFZpZXdTb3VyY2VEb2N1bWVudDo6Y3JlYXRlVG9rZW5pemVyKToKKyAgICAgICAgKiBodG1s L0hUTUxWaWV3U291cmNlRG9jdW1lbnQuaDoKKwogMjAwOS0wNi0xOCAgU2hpbmljaGlybyBIYW1h amkgIDxoYW1hamlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlciBI dW50LgpJbmRleDogV2ViQ29yZS9kb20vRE9NSW1wbGVtZW50YXRpb24uY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvZG9tL0RPTUltcGxlbWVudGF0aW9uLmNwcAkocmV2aXNpb24gNDQ4NTEpCisr KyBXZWJDb3JlL2RvbS9ET01JbXBsZW1lbnRhdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMx NCwxNCArMzE0LDggQEAgUGFzc1JlZlB0cjxIVE1MRG9jdW1lbnQ+IERPTUltcGxlbWVudGF0aQog CiBQYXNzUmVmUHRyPERvY3VtZW50PiBET01JbXBsZW1lbnRhdGlvbjo6Y3JlYXRlRG9jdW1lbnQo Y29uc3QgU3RyaW5nJiB0eXBlLCBGcmFtZSogZnJhbWUsIGJvb2wgaW5WaWV3U291cmNlTW9kZSkK IHsKLSAgICBpZiAoaW5WaWV3U291cmNlTW9kZSkgewotICAgICAgICBpZiAodHlwZSA9PSAidGV4 dC9odG1sIiB8fCB0eXBlID09ICJhcHBsaWNhdGlvbi94aHRtbCt4bWwiIHx8IHR5cGUgPT0gImlt YWdlL3N2Zyt4bWwiIHx8IGlzVGV4dE1JTUVUeXBlKHR5cGUpIHx8IGlzWE1MTUlNRVR5cGUodHlw ZSkKLSNpZiBFTkFCTEUoWEhUTUxNUCkKLSAgICAgICAgICAgIHx8IHR5cGUgPT0gImFwcGxpY2F0 aW9uL3ZuZC53YXAueGh0bWwreG1sIgotI2VuZGlmCi0gICAgICAgICAgICkKLSAgICAgICAgICAg IHJldHVybiBIVE1MVmlld1NvdXJjZURvY3VtZW50OjpjcmVhdGUoZnJhbWUsIHR5cGUpOwotICAg IH0KKyAgICBpZiAoaW5WaWV3U291cmNlTW9kZSkKKyAgICAgICAgcmV0dXJuIEhUTUxWaWV3U291 cmNlRG9jdW1lbnQ6OmNyZWF0ZShmcmFtZSwgdHlwZSk7CiAKICAgICAvLyBQbHVnaW5zIGNhbm5v dCB0YWtlIEhUTUwgYW5kIFhIVE1MIGZyb20gdXMsIGFuZCB3ZSBkb24ndCBldmVuIG5lZWQgdG8g aW5pdGlhbGl6ZSB0aGUgcGx1Z2luIGRhdGFiYXNlIGZvciB0aG9zZS4KICAgICBpZiAodHlwZSA9 PSAidGV4dC9odG1sIikKSW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MVmlld1NvdXJjZURvY3VtZW50 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvSFRNTFZpZXdTb3VyY2VEb2N1bWVudC5j cHAJKHJldmlzaW9uIDQ0ODUxKQorKysgV2ViQ29yZS9odG1sL0hUTUxWaWV3U291cmNlRG9jdW1l bnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Niw5ICs1NiwxNiBAQCBIVE1MVmlld1NvdXJjZURv Y3VtZW50OjpIVE1MVmlld1NvdXJjZURvCiAKIFRva2VuaXplciogSFRNTFZpZXdTb3VyY2VEb2N1 bWVudDo6Y3JlYXRlVG9rZW5pemVyKCkKIHsKLSAgICBpZiAoaW1wbGVtZW50YXRpb24oKS0+aXNU ZXh0TUlNRVR5cGUobV90eXBlKSkKLSAgICAgICAgcmV0dXJuIGNyZWF0ZVRleHRUb2tlbml6ZXIo dGhpcyk7Ci0gICAgcmV0dXJuIG5ldyBIVE1MVG9rZW5pemVyKHRoaXMpOworICAgIC8vIFVzZSBI VE1MVG9rZW5pemVyIGlmIGFwcGxpY2FibGUsIG90aGVyd2lzZSB1c2UgVGV4dFRva2VuaXplci4K KyAgICBpZiAobV90eXBlID09ICJ0ZXh0L2h0bWwiIHx8IG1fdHlwZSA9PSAiYXBwbGljYXRpb24v eGh0bWwreG1sIiB8fCBtX3R5cGUgPT0gImltYWdlL3N2Zyt4bWwiIHx8IGltcGxlbWVudGF0aW9u KCktPmlzWE1MTUlNRVR5cGUobV90eXBlKQorI2lmIEVOQUJMRShYSFRNTE1QKQorICAgICAgICB8 fCBtX3R5cGUgPT0gImFwcGxpY2F0aW9uL3ZuZC53YXAueGh0bWwreG1sIgorI2VuZGlmCisgICAg ICAgICkgeworICAgICAgICByZXR1cm4gbmV3IEhUTUxUb2tlbml6ZXIodGhpcyk7CisgICAgfQor CisgICAgcmV0dXJuIGNyZWF0ZVRleHRUb2tlbml6ZXIodGhpcyk7CiB9CiAKIHZvaWQgSFRNTFZp ZXdTb3VyY2VEb2N1bWVudDo6Y3JlYXRlQ29udGFpbmluZ1RhYmxlKCkKSW5kZXg6IFdlYkNvcmUv aHRtbC9IVE1MVmlld1NvdXJjZURvY3VtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1s L0hUTUxWaWV3U291cmNlRG9jdW1lbnQuaAkocmV2aXNpb24gNDQ4NTEpCisrKyBXZWJDb3JlL2h0 bWwvSFRNTFZpZXdTb3VyY2VEb2N1bWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zOCw3ICszOCw4 IEBAIHB1YmxpYzoKICAgICB7CiAgICAgICAgIHJldHVybiBuZXcgSFRNTFZpZXdTb3VyY2VEb2N1 bWVudChmcmFtZSwgbWltZVR5cGUpOwogICAgIH0KLSAgICAKKworICAgIC8vIFJldHVybnMgSFRN TFRva2VuaXplciBvciBUZXh0VG9rZW5pemVyIGJhc2VkIG9uIG1fdHlwZS4KICAgICB2aXJ0dWFs IFRva2VuaXplciogY3JlYXRlVG9rZW5pemVyKCk7CiAgICAgCiAgICAgdm9pZCBhZGRWaWV3U291 cmNlVG9rZW4oVG9rZW4qKTsgLy8gVXNlZCBieSB0aGUgSFRNTCB0b2tlbml6ZXIuCkluZGV4OiBX ZWJLaXRUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDg1MSkKKysrIFdlYktpdFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5 KQpAQCAtMSwzICsxLDE5IEBACisyMDA5LTA2LTE5ICBUYWtlc2hpIFlvc2hpbm8gIDx0eW9zaGlu b0Bnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEJ1ZyAyNjUzNzogYnVpbGQtd2Via2l0IHNjcmlwdCBmYWlscyB3aGVuIHdlIGNoYW5n ZSB0aGUgZGlyZWN0b3J5IHRvIHBsYWNlIGJ1aWxkIHByb2R1Y3RzIGJ5IFhjb2RlCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjUzNworCisgICAgICAg IEZpeCB0aGUgZGV0ZXJtaW5lQmFzZVByb2R1Y3REaXIgc3Vicm91dGluZS4gQ3VycmVudGx5LCB0 aGlzIGZ1bmN0aW9uIHdvbid0IHNldAorICAgICAgICAkYmFzZVByb2R1Y3REaXIgdmFyaWFibGUg Y29ycmVjdGx5IHdoZW4gUEJYQXBwbGljYXRpb253aWRlQnVpbGRTZXR0aW5ncyBpcworICAgICAg ICBzZXQgYnkgWGNvZGUgcHJlZmVyZW5jZS4gV2Ugc2hvdWxkIG1vdmUgQGJhc2VQcm9kdWN0aW9u RGlyT3B0aW9uIHNldHRpbmcgY29kZQorICAgICAgICBvdXQgb2YgaWYgKCFkZWZpbmVkKCRiYXNl UHJvZHVjdGlvbkRpcikpIGNsYXVzZS4KKworICAgICAgICBEaWQgc29tZSByZWZhY3RvcmluZyBv biB0aGUgZnVuY3Rpb24sIGFkZGl0aW9uYWxseS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0 ZGlycy5wbToKKwogMjAwOS0wNi0xNSAgQW5kcmUgUGVkcmFsaG8gIDxhbmRyZS5wZWRyYWxob0Bv cGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFRvciBBcm5lIFZlc3Riw7guCklu ZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCShyZXZpc2lvbiA0NDg1MSkKKysrIFdlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5KQpAQCAtMTEwLDYgKzEx MCwxNSBAQCBzdWIgZGV0ZXJtaW5lQmFzZVByb2R1Y3REaXIKICAgICAgICAgICAgICAgICB1bmRl ZiAkYmFzZVByb2R1Y3REaXIgdW5sZXNzICRiYXNlUHJvZHVjdERpciA9fiAvXlwvLzsKICAgICAg ICAgICAgIH0KICAgICAgICAgfQorCisgICAgICAgIGlmICgkYmFzZVByb2R1Y3REaXIpIHsKKyAg ICAgICAgICAgICRiYXNlUHJvZHVjdERpciA9fiBzfF5cUSQoU1JDUk9PVCkvLi5cRSR8JHNvdXJj ZURpcnw7CisgICAgICAgICAgICAkYmFzZVByb2R1Y3REaXIgPX4gc3xeXFEkKFNSQ1JPT1QpLy4u L3wkc291cmNlRGlyL3w7CisgICAgICAgICAgICAkYmFzZVByb2R1Y3REaXIgPX4gc3xefi98JEVO VntIT01FfS98OworICAgICAgICAgICAgZGllICJDYW4ndCBoYW5kbGUgWGNvZGUgcHJvZHVjdCBk aXJlY3Rvcnkgd2l0aCBhIH4gaW4gaXQuXG4iIGlmICRiYXNlUHJvZHVjdERpciA9fiAvfi87Cisg ICAgICAgICAgICBkaWUgIkNhbid0IGhhbmRsZSBYY29kZSBwcm9kdWN0IGRpcmVjdG9yeSB3aXRo IGEgdmFyaWFibGUgaW4gaXQuXG4iIGlmICRiYXNlUHJvZHVjdERpciA9fiAvXCQvOworICAgICAg ICAgICAgQGJhc2VQcm9kdWN0RGlyT3B0aW9uID0gKCk7CisgICAgICAgIH0KICAgICB9IGVsc2Ug ewogICAgICAgICAkYmFzZVByb2R1Y3REaXIgPSAkRU5WeyJXRUJLSVRPVVRQVVRESVIifTsKICAg ICAgICAgaWYgKGlzQXBwbGVXaW5XZWJLaXQoKSAmJiAkYmFzZVByb2R1Y3REaXIpIHsKQEAgLTEx OSwxNSArMTI4LDYgQEAgc3ViIGRldGVybWluZUJhc2VQcm9kdWN0RGlyCiAgICAgICAgIH0KICAg ICB9CiAKLSAgICBpZiAoJGJhc2VQcm9kdWN0RGlyICYmIGlzQXBwbGVNYWNXZWJLaXQoKSkgewot ICAgICAgICAkYmFzZVByb2R1Y3REaXIgPX4gc3xeXFEkKFNSQ1JPT1QpLy4uXEUkfCRzb3VyY2VE aXJ8OwotICAgICAgICAkYmFzZVByb2R1Y3REaXIgPX4gc3xeXFEkKFNSQ1JPT1QpLy4uL3wkc291 cmNlRGlyL3w7Ci0gICAgICAgICRiYXNlUHJvZHVjdERpciA9fiBzfF5+L3wkRU5We0hPTUV9L3w7 Ci0gICAgICAgIGRpZSAiQ2FuJ3QgaGFuZGxlIFhjb2RlIHByb2R1Y3QgZGlyZWN0b3J5IHdpdGgg YSB+IGluIGl0LlxuIiBpZiAkYmFzZVByb2R1Y3REaXIgPX4gL34vOwotICAgICAgICBkaWUgIkNh bid0IGhhbmRsZSBYY29kZSBwcm9kdWN0IGRpcmVjdG9yeSB3aXRoIGEgdmFyaWFibGUgaW4gaXQu XG4iIGlmICRiYXNlUHJvZHVjdERpciA9fiAvXCQvOwotICAgICAgICBAYmFzZVByb2R1Y3REaXJP cHRpb24gPSAoKTsKLSAgICB9Ci0KICAgICBpZiAoIWRlZmluZWQoJGJhc2VQcm9kdWN0RGlyKSkg ewogICAgICAgICAkYmFzZVByb2R1Y3REaXIgPSAiJHNvdXJjZURpci9XZWJLaXRCdWlsZCI7CiAK QEAgLTEzNSwxMyArMTM1LDE0IEBAIHN1YiBkZXRlcm1pbmVCYXNlUHJvZHVjdERpcgogICAgICAg ICAgICAgbXkgJGJyYW5jaCA9IGdpdEJyYW5jaCgpOwogICAgICAgICAgICAgJGJhc2VQcm9kdWN0 RGlyID0gIiRiYXNlUHJvZHVjdERpci8kYnJhbmNoIjsKICAgICAgICAgfQorICAgIH0KIAotICAg ICAgICBAYmFzZVByb2R1Y3REaXJPcHRpb24gPSAoIlNZTVJPT1Q9JGJhc2VQcm9kdWN0RGlyIiwg Ik9CSlJPT1Q9JGJhc2VQcm9kdWN0RGlyIikgaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSk7Ci0gICAg ICAgIGlmIChpc0N5Z3dpbigpKSB7Ci0gICAgICAgICAgICBteSAkZG9zQnVpbGRQYXRoID0gYGN5 Z3BhdGggLS13aW5kb3dzIFwiJGJhc2VQcm9kdWN0RGlyXCJgOwotICAgICAgICAgICAgY2hvbXAg JGRvc0J1aWxkUGF0aDsKLSAgICAgICAgICAgICRFTlZ7IldFQktJVE9VVFBVVERJUiJ9ID0gJGRv c0J1aWxkUGF0aDsKLSAgICAgICAgfQorICAgIEBiYXNlUHJvZHVjdERpck9wdGlvbiA9ICgiU1lN Uk9PVD0kYmFzZVByb2R1Y3REaXIiLCAiT0JKUk9PVD0kYmFzZVByb2R1Y3REaXIiKSBpZiAoaXNB cHBsZU1hY1dlYktpdCgpKTsKKworICAgIGlmIChpc0N5Z3dpbigpKSB7CisgICAgICAgIG15ICRk b3NCdWlsZFBhdGggPSBgY3lncGF0aCAtLXdpbmRvd3MgXCIkYmFzZVByb2R1Y3REaXJcImA7Cisg ICAgICAgIGNob21wICRkb3NCdWlsZFBhdGg7CisgICAgICAgICRFTlZ7IldFQktJVE9VVFBVVERJ UiJ9ID0gJGRvc0J1aWxkUGF0aDsKICAgICB9CiB9CiAKSW5kZXg6IExheW91dFRlc3RzL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ0ODUx KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTEg QEAKKzIwMDktMDYtMTkgIFRha2VzaGkgWW9zaGlubyAgPHNldCBFTUFJTF9BRERSRVNTIGVudmly b25tZW50IHZhcmlhYmxlPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogZmFzdC9mcmFtZXMvcmVzb3VyY2VzL3ZpZXdzb3VyY2UtZmFrZS1pbWFnZS1m aWxlLnBuZzogQWRkZWQuCisgICAgICAgICogZmFzdC9mcmFtZXMvdmlld3NvdXJjZS1vbi1pbWFn ZS1maWxlLmh0bWw6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL21hYy9mYXN0L2ZyYW1lcy92 aWV3c291cmNlLW9uLWltYWdlLWZpbGUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKwogMjAwOS0wNi0x OCAgU2hpbmljaGlybyBIYW1hamkgIDxoYW1hamlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IE9saXZlciBIdW50LgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvdmll d3NvdXJjZS1vbi1pbWFnZS1maWxlLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFz dC9mcmFtZXMvdmlld3NvdXJjZS1vbi1pbWFnZS1maWxlLmh0bWwJKHJldmlzaW9uIDApCisrKyBM YXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy92aWV3c291cmNlLW9uLWltYWdlLWZpbGUuaHRtbAkocmV2 aXNpb24gMCkKQEAgLTAsMCArMSw3IEBACis8aHRtbD4NCis8Ym9keT4NCis8cD5Zb3Ugc2hvdWxk IHNlZSAnaGVsbG8gd29ybGQnIGluIHRoZSBmcmFtZSBiZWxvdyBpbiAndmlldyBzb3VyY2UnIG1v ZGUuPC9wPg0KKzxocj4NCis8aWZyYW1lIHZpZXdzb3VyY2Ugc3JjPSJyZXNvdXJjZXMvdmlld3Nv dXJjZS1mYWtlLWltYWdlLWZpbGUucG5nIj48L2lmcmFtZT4NCis8L2JvZHk+DQorPC9odG1sPg0K SW5kZXg6IExheW91dFRlc3RzL2Zhc3QvZnJhbWVzL3Jlc291cmNlcy92aWV3c291cmNlLWZha2Ut aW1hZ2UtZmlsZS5wbmcKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvcmVz b3VyY2VzL3ZpZXdzb3VyY2UtZmFrZS1pbWFnZS1maWxlLnBuZwkocmV2aXNpb24gMCkKKysrIExh eW91dFRlc3RzL2Zhc3QvZnJhbWVzL3Jlc291cmNlcy92aWV3c291cmNlLWZha2UtaW1hZ2UtZmls ZS5wbmcJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEgQEAKK2hlbGxvIHdvcmxkClwgTm8gbmV3bGlu ZSBhdCBlbmQgb2YgZmlsZQpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvZnJh bWVzL3ZpZXdzb3VyY2Utb24taW1hZ2UtZmlsZS1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g TGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvZnJhbWVzL3ZpZXdzb3VyY2Utb24taW1hZ2Ut ZmlsZS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMvZmFzdC9mcmFtZXMvdmlld3NvdXJjZS1vbi1pbWFnZS1maWxlLWV4cGVjdGVkLnR4dAkocmV2 aXNpb24gMCkKQEAgLTAsMCArMSwzMiBAQAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisg IFJlbmRlclZpZXcgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCitsYXllciBhdCAoMCwwKSBzaXplIDgw MHg2MDAKKyAgUmVuZGVyQmxvY2sge0hUTUx9IGF0ICgwLDApIHNpemUgODAweDYwMAorICAgIFJl bmRlckJvZHkge0JPRFl9IGF0ICg4LDgpIHNpemUgNzg0eDU4NAorICAgICAgUmVuZGVyQmxvY2sg e1B9IGF0ICgwLDApIHNpemUgNzg0eDE4CisgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAo MCwwKSBzaXplIDQ0N3gxOAorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDQ0Nzog IllvdSBzaG91bGQgc2VlICdoZWxsbyB3b3JsZCcgaW4gdGhlIGZyYW1lIGJlbG93IGluICd2aWV3 IHNvdXJjZScgbW9kZS4iCisgICAgICBSZW5kZXJCbG9jayB7SFJ9IGF0ICgwLDM0KSBzaXplIDc4 NHgyIFtib3JkZXI6ICgxcHggaW5zZXQgIzAwMDAwMCldCisgICAgICBSZW5kZXJCbG9jayAoYW5v bnltb3VzKSBhdCAoMCw0NCkgc2l6ZSA3ODR4MTU0CisgICAgICAgIFJlbmRlclBhcnRPYmplY3Qg e0lGUkFNRX0gYXQgKDAsMCkgc2l6ZSAzMDR4MTU0IFtib3JkZXI6ICgycHggaW5zZXQgIzAwMDAw MCldCisgICAgICAgICAgbGF5ZXIgYXQgKDAsMCkgc2l6ZSAzMDB4MTUwCisgICAgICAgICAgICBS ZW5kZXJWaWV3IGF0ICgwLDApIHNpemUgMzAweDE1MAorICAgICAgICAgIGxheWVyIGF0ICgwLDAp IHNpemUgMzAweDE1MCBsYXllclR5cGU6IGJhY2tncm91bmQgb25seQorICAgICAgICAgIGxheWVy IGF0ICgwLDApIHNpemUgMzF4MTUwCisgICAgICAgICAgICBSZW5kZXJCbG9jayAocG9zaXRpb25l ZCkgekk6IC0xIHtESVZ9IGF0ICgwLDApIHNpemUgMzF4MTUwIFtiZ2NvbG9yPSNGMEYwRjBdIFti b3JkZXI6ICgxcHggc29saWQgI0JCQkJCQikgbm9uZV0KKyAgICAgICAgICBsYXllciBhdCAoMCww KSBzaXplIDMwMHgxNTAgbGF5ZXJUeXBlOiBmb3JlZ3JvdW5kIG9ubHkKKyAgICAgICAgICAgIFJl bmRlckJsb2NrIHtIVE1MfSBhdCAoMCwwKSBzaXplIDMwMHgxNTAKKyAgICAgICAgICAgICAgUmVu ZGVyQm9keSB7Qk9EWX0gYXQgKDAsMCkgc2l6ZSAzMDB4MTUwCisgICAgICAgICAgICAgICAgUmVu ZGVyVGFibGUge1RBQkxFfSBhdCAoMCwwKSBzaXplIDMwMHgxNQorICAgICAgICAgICAgICAgICAg UmVuZGVyVGFibGVTZWN0aW9uIHtUQk9EWX0gYXQgKDAsMCkgc2l6ZSAzMDB4MTUKKyAgICAgICAg ICAgICAgICAgICAgUmVuZGVyVGFibGVSb3cge1RSfSBhdCAoMCwwKSBzaXplIDMwMHgxNQorICAg ICAgICAgICAgICAgICAgICAgIFJlbmRlclRhYmxlQ2VsbCB7VER9IGF0ICgwLDQpIHNpemUgMzF4 MTAgW2NvbG9yPSM4MDgwODBdIFtiZ2NvbG9yPSNGMEYwRjBdIFtib3JkZXI6IG5vbmUgKDFweCBz b2xpZCAjQkJCQkJCKSBub25lXSBbcj0wIGM9MCBycz0xIGNzPTFdCisgICAgICAgICAgICAgICAg ICAgICAgICBSZW5kZXJJbmxpbmUgKGdlbmVyYXRlZCkgYXQgKDAsMCkgc2l6ZSA1eDEwCisgICAg ICAgICAgICAgICAgICAgICAgICAgIFJlbmRlckNvdW50ZXIgYXQgKDIxLDApIHNpemUgNXgxMAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgyMSwwKSB3aWR0aCA1OiAi MSIKKyAgICAgICAgICAgICAgICAgICAgICBSZW5kZXJUYWJsZUNlbGwge1REfSBhdCAoMzEsMCkg c2l6ZSAyNjl4MTUgW3I9MCBjPTEgcnM9MSBjcz0xXQorICAgICAgICAgICAgICAgICAgICAgICAg UmVuZGVyVGV4dCB7I3RleHR9IGF0ICg1LDApIHNpemUgODh4MTUKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgdGV4dCBydW4gYXQgKDUsMCkgd2lkdGggODg6ICJoZWxsbyB3b3JsZCIKKyAgICAg ICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMHgwCisgICAgICAgIFJlbmRlclRl eHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDB4MAorICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0g YXQgKDAsMCkgc2l6ZSAweDAK 31542 2009-06-19 03:35:17 -0700 2009-06-22 01:45:50 -0700 Proposed fix for 26537 26537.patch text/plain 3347 tyoshino SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ0ODUxKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDktMDYtMTkgIFRha2VzaGkgWW9zaGlubyAg PHR5b3NoaW5vQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQnVnIDI2NTM3OiBidWlsZC13ZWJraXQgc2NyaXB0IGZhaWxzIHdoZW4g d2UgY2hhbmdlIHRoZSBkaXJlY3RvcnkgdG8gcGxhY2UgYnVpbGQgcHJvZHVjdHMgYnkgWGNvZGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2NTM3CisK KyAgICAgICAgRml4IHRoZSBkZXRlcm1pbmVCYXNlUHJvZHVjdERpciBzdWJyb3V0aW5lLiBDdXJy ZW50bHksIHRoaXMgZnVuY3Rpb24gd29uJ3Qgc2V0CisgICAgICAgICRiYXNlUHJvZHVjdERpciB2 YXJpYWJsZSBjb3JyZWN0bHkgd2hlbiBQQlhBcHBsaWNhdGlvbndpZGVCdWlsZFNldHRpbmdzIGlz CisgICAgICAgIHNldCBieSBYY29kZSBwcmVmZXJlbmNlLiBXZSBzaG91bGQgbW92ZSBAYmFzZVBy b2R1Y3Rpb25EaXJPcHRpb24gc2V0dGluZyBjb2RlCisgICAgICAgIG91dCBvZiBpZiAoIWRlZmlu ZWQoJGJhc2VQcm9kdWN0aW9uRGlyKSkgY2xhdXNlLgorCisgICAgICAgIERpZCBzb21lIHJlZmFj dG9yaW5nIG9uIHRoZSBmdW5jdGlvbiwgYWRkaXRpb25hbGx5LgorCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRkaXJzLnBtOgorCiAyMDA5LTA2LTE1ICBBbmRyZSBQZWRyYWxobyAgPGFuZHJlLnBl ZHJhbGhvQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVG9yIEFybmUgVmVz dGLDuC4KSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlzaW9uIDQ0ODUxKQor KysgV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCSh3b3JraW5nIGNvcHkpCkBAIC0x MTAsNiArMTEwLDE1IEBAIHN1YiBkZXRlcm1pbmVCYXNlUHJvZHVjdERpcgogICAgICAgICAgICAg ICAgIHVuZGVmICRiYXNlUHJvZHVjdERpciB1bmxlc3MgJGJhc2VQcm9kdWN0RGlyID1+IC9eXC8v OwogICAgICAgICAgICAgfQogICAgICAgICB9CisKKyAgICAgICAgaWYgKCRiYXNlUHJvZHVjdERp cikgeworICAgICAgICAgICAgJGJhc2VQcm9kdWN0RGlyID1+IHN8XlxRJChTUkNST09UKS8uLlxF JHwkc291cmNlRGlyfDsKKyAgICAgICAgICAgICRiYXNlUHJvZHVjdERpciA9fiBzfF5cUSQoU1JD Uk9PVCkvLi4vfCRzb3VyY2VEaXIvfDsKKyAgICAgICAgICAgICRiYXNlUHJvZHVjdERpciA9fiBz fF5+L3wkRU5We0hPTUV9L3w7CisgICAgICAgICAgICBkaWUgIkNhbid0IGhhbmRsZSBYY29kZSBw cm9kdWN0IGRpcmVjdG9yeSB3aXRoIGEgfiBpbiBpdC5cbiIgaWYgJGJhc2VQcm9kdWN0RGlyID1+ IC9+LzsKKyAgICAgICAgICAgIGRpZSAiQ2FuJ3QgaGFuZGxlIFhjb2RlIHByb2R1Y3QgZGlyZWN0 b3J5IHdpdGggYSB2YXJpYWJsZSBpbiBpdC5cbiIgaWYgJGJhc2VQcm9kdWN0RGlyID1+IC9cJC87 CisgICAgICAgICAgICBAYmFzZVByb2R1Y3REaXJPcHRpb24gPSAoKTsKKyAgICAgICAgfQogICAg IH0gZWxzZSB7CiAgICAgICAgICRiYXNlUHJvZHVjdERpciA9ICRFTlZ7IldFQktJVE9VVFBVVERJ UiJ9OwogICAgICAgICBpZiAoaXNBcHBsZVdpbldlYktpdCgpICYmICRiYXNlUHJvZHVjdERpcikg ewpAQCAtMTE5LDE1ICsxMjgsNiBAQCBzdWIgZGV0ZXJtaW5lQmFzZVByb2R1Y3REaXIKICAgICAg ICAgfQogICAgIH0KIAotICAgIGlmICgkYmFzZVByb2R1Y3REaXIgJiYgaXNBcHBsZU1hY1dlYktp dCgpKSB7Ci0gICAgICAgICRiYXNlUHJvZHVjdERpciA9fiBzfF5cUSQoU1JDUk9PVCkvLi5cRSR8 JHNvdXJjZURpcnw7Ci0gICAgICAgICRiYXNlUHJvZHVjdERpciA9fiBzfF5cUSQoU1JDUk9PVCkv Li4vfCRzb3VyY2VEaXIvfDsKLSAgICAgICAgJGJhc2VQcm9kdWN0RGlyID1+IHN8Xn4vfCRFTlZ7 SE9NRX0vfDsKLSAgICAgICAgZGllICJDYW4ndCBoYW5kbGUgWGNvZGUgcHJvZHVjdCBkaXJlY3Rv cnkgd2l0aCBhIH4gaW4gaXQuXG4iIGlmICRiYXNlUHJvZHVjdERpciA9fiAvfi87Ci0gICAgICAg IGRpZSAiQ2FuJ3QgaGFuZGxlIFhjb2RlIHByb2R1Y3QgZGlyZWN0b3J5IHdpdGggYSB2YXJpYWJs ZSBpbiBpdC5cbiIgaWYgJGJhc2VQcm9kdWN0RGlyID1+IC9cJC87Ci0gICAgICAgIEBiYXNlUHJv ZHVjdERpck9wdGlvbiA9ICgpOwotICAgIH0KLQogICAgIGlmICghZGVmaW5lZCgkYmFzZVByb2R1 Y3REaXIpKSB7CiAgICAgICAgICRiYXNlUHJvZHVjdERpciA9ICIkc291cmNlRGlyL1dlYktpdEJ1 aWxkIjsKIApAQCAtMTM1LDEzICsxMzUsMTQgQEAgc3ViIGRldGVybWluZUJhc2VQcm9kdWN0RGly CiAgICAgICAgICAgICBteSAkYnJhbmNoID0gZ2l0QnJhbmNoKCk7CiAgICAgICAgICAgICAkYmFz ZVByb2R1Y3REaXIgPSAiJGJhc2VQcm9kdWN0RGlyLyRicmFuY2giOwogICAgICAgICB9CisgICAg fQogCi0gICAgICAgIEBiYXNlUHJvZHVjdERpck9wdGlvbiA9ICgiU1lNUk9PVD0kYmFzZVByb2R1 Y3REaXIiLCAiT0JKUk9PVD0kYmFzZVByb2R1Y3REaXIiKSBpZiAoaXNBcHBsZU1hY1dlYktpdCgp KTsKLSAgICAgICAgaWYgKGlzQ3lnd2luKCkpIHsKLSAgICAgICAgICAgIG15ICRkb3NCdWlsZFBh dGggPSBgY3lncGF0aCAtLXdpbmRvd3MgXCIkYmFzZVByb2R1Y3REaXJcImA7Ci0gICAgICAgICAg ICBjaG9tcCAkZG9zQnVpbGRQYXRoOwotICAgICAgICAgICAgJEVOVnsiV0VCS0lUT1VUUFVURElS In0gPSAkZG9zQnVpbGRQYXRoOwotICAgICAgICB9CisgICAgQGJhc2VQcm9kdWN0RGlyT3B0aW9u ID0gKCJTWU1ST09UPSRiYXNlUHJvZHVjdERpciIsICJPQkpST09UPSRiYXNlUHJvZHVjdERpciIp IGlmIChpc0FwcGxlTWFjV2ViS2l0KCkpOworCisgICAgaWYgKGlzQ3lnd2luKCkpIHsKKyAgICAg ICAgbXkgJGRvc0J1aWxkUGF0aCA9IGBjeWdwYXRoIC0td2luZG93cyBcIiRiYXNlUHJvZHVjdERp clwiYDsKKyAgICAgICAgY2hvbXAgJGRvc0J1aWxkUGF0aDsKKyAgICAgICAgJEVOVnsiV0VCS0lU T1VUUFVURElSIn0gPSAkZG9zQnVpbGRQYXRoOwogICAgIH0KIH0KIAo= 31638 2009-06-22 01:45:50 -0700 2009-06-22 20:58:32 -0700 Proposed fix for 26537 (rev 3) 26537_rev3.patch text/plain 1724 tyoshino SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ0OTMyKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMDYtMjIgIFRha2VzaGkgWW9zaGlubyAg PHR5b3NoaW5vQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQnVnIDI2NTM3OiBCdWlsZHMgZnJvbSBjb21tYW5kLWxpbmUgZmFpbCBp ZiBjdXN0b20gYnVpbGQgcHJvZHVjdCBkaXJlY3RvcnkgaXMgc2V0IGFuZCB+L0xpYnJhcnkvUHJl ZmVyZW5jZXMveGNvZGVidWlsZC5wbGlzdCBleGlzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2NTM3CisKKyAgICAgICAgU3RvcCBidWlsZC13ZWJr aXQgc2NyaXB0IHdoZW4gd2UgZm91bGQgfi9MaWJyYXJ5L1ByZWZlcmVuY2VzL3hjb2RlYnVpbGQu cGxpc3QKKyAgICAgICAgYW5kIGFzayB0aGUgdXNlciB0byByZW1vdmUgaXQuIHhjb2RlYnVpbGQg d2lsbCBvdmVyd3JpdGUgdGhlIFhjb2RlIGJ1aWxkCisgICAgICAgIGNvbmZpZ3VyYXRpb24gb24g Y29tLmFwcGxlLlhjb2RlIGJ5IHRoZSB2YWx1ZSByZWFkIGZyb20gdGhpcyBmaWxlLiBUaGlzIGNh bgorICAgICAgICBjYXVzZSBidWlsZCBmYWlsdXJlLgorCisgICAgICAgICogU2NyaXB0cy9idWls ZC13ZWJraXQ6CisKIDIwMDktMDYtMjEgIFN0ZXZlIEZhbGtlbmJ1cmcgIDxzZmFsa2VuQGFwcGxl LmNvbT4KIAogICAgICAgICBTZXQgdXAgZ2xvYmFsIG5hdGl2ZSBjb250cm9scyBmbGFnIGJlZm9y ZSBjcmVhdGluZyB0aGUgZmlyc3QgV2ViVmlldy4KSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMv YnVpbGQtd2Via2l0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Vi a2l0CShyZXZpc2lvbiA0NDkyNykKKysrIFdlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0 CSh3b3JraW5nIGNvcHkpCkBAIC0xNzcsNiArMTc3LDE1IEBAIGlmICgkc2hvd0hlbHApIHsKIGNo ZWNrUmVxdWlyZWRTeXN0ZW1Db25maWcoKTsKIHNldENvbmZpZ3VyYXRpb24oKTsKIAoraWYgKGlz QXBwbGVNYWNXZWJLaXQoKSkgeworICAgICMgU3RvcCBidWlsZCBzY3JpcHQgaWYgd2UgaGF2ZSB+ L0xpYnJhcnkvUHJlZmVyZW5jZXMveGNvZGVidWlsZC5wbGlzdC4KKyAgICAjIEl0IG92ZXJ3cml0 ZXMgdGhlIFhjb2RlIGdsb2JhbCBzZXR0aW5nIG9uIGNvbS5hcHBsZS5YY29kZSBhbmQgY2FuIGNh dXNlIGJ1aWxkIGZhaWx1cmUuCisgICAgbXkgJHBlcnNvbmFsUGxpc3RGaWxlID0gJEVOVntIT01F fSAuICIvTGlicmFyeS9QcmVmZXJlbmNlcy94Y29kZWJ1aWxkLnBsaXN0IjsKKyAgICBpZiAoLWUg JHBlcnNvbmFsUGxpc3RGaWxlKSB7CisgICAgICAgIGRpZSAiRXJyb3I6IFBsZWFzZSByZW1vdmUg JHBlcnNvbmFsUGxpc3RGaWxlIHdoaWNoIGNhbiBjYXVzZSBidWlsZCBmYWlsdXJlLlxuIjsKKyAg ICB9Cit9CisKIGlmIChpc1d4KCkpIHsKICAgICAkRU5WeyJXRUJLSVRPVVRQVVRESVIifSA9IHBy b2R1Y3REaXIoKTsKIAo= 31702 2009-06-22 20:58:32 -0700 2009-06-22 21:04:14 -0700 Proposed fix for 26537 (rev 4) 26537_rev4.patch text/plain 1906 tyoshino SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ0OTcxKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMDYtMjIgIFRha2VzaGkgWW9zaGlubyAg PHR5b3NoaW5vQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQnVnIDI2NTM3OiBCdWlsZHMgZnJvbSBjb21tYW5kLWxpbmUgZmFpbCBp ZiBjdXN0b20gYnVpbGQgcHJvZHVjdCBkaXJlY3RvcnkgaXMgc2V0IGFuZCB+L0xpYnJhcnkvUHJl ZmVyZW5jZXMveGNvZGVidWlsZC5wbGlzdCBleGlzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2NTM3CisKKyAgICAgICAgTGV0IGRldGVybWluZUJh c2VQcm9kdWN0RGlyIHN1YnJvdXRpbmUgcmVtb3ZlCisJfi9MaWJyYXJ5L1ByZWZlcmVuY2VzL3hj b2RlYnVpbGQucGxpc3QuIEl0IGNhbiBwcmV2ZW50IHhjb2RlYnVpbGQgZnJvbQorCXJlc3BlY3Rp bmcgZ2xvYmFsIHNldHRpbmdzIHN1Y2ggYXMgYSBjdXN0b20gYnVpbGQgcHJvZHVjdHMgZGlyZWN0 b3J5CisJIyAoPHJkYXI6Ly9wcm9ibGVtLzU1ODU4OTk+KS4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0ZGlycy5wbToKKwogMjAwOS0wNi0yMiAgU3RldmUgRmFsa2VuYnVyZyAgPHNmYWxrZW5A YXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBlcnJhbnQgbGluZSBvZiBjb2RlIG1pc3Rha2Vu bHkgY2hlY2tlZCBpbi4KSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlzaW9u IDQ0OTI3KQorKysgV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCSh3b3JraW5nIGNv cHkpCkBAIC05NCw2ICs5NCwxNiBAQCBzdWIgZGV0ZXJtaW5lQmFzZVByb2R1Y3REaXIKICAgICBy ZXR1cm4gaWYgZGVmaW5lZCAkYmFzZVByb2R1Y3REaXI7CiAgICAgZGV0ZXJtaW5lU291cmNlRGly KCk7CiAgICAgaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgeworCSMgU2lsZW50bHkgcmVtb3ZlIH4v TGlicmFyeS9QcmVmZXJlbmNlcy94Y29kZWJ1aWxkLnBsaXN0IHdoaWNoIGNhbgorICAgICAgICAj IGNhdXNlIGJ1aWxkIGZhaWx1cmUuIFRoZSBwcmVzZW5jZSBvZgorCSMgfi9MaWJyYXJ5L1ByZWZl cmVuY2VzL3hjb2RlYnVpbGQucGxpc3QgY2FuIHByZXZlbnQgeGNvZGVidWlsZCBmcm9tCisJIyBy ZXNwZWN0aW5nIGdsb2JhbCBzZXR0aW5ncyBzdWNoIGFzIGEgY3VzdG9tIGJ1aWxkIHByb2R1Y3Rz IGRpcmVjdG9yeQorCSMgKDxyZGFyOi8vcHJvYmxlbS81NTg1ODk5PikuCisJbXkgJHBlcnNvbmFs UGxpc3RGaWxlID0gJEVOVntIT01FfSAuICIvTGlicmFyeS9QcmVmZXJlbmNlcy94Y29kZWJ1aWxk LnBsaXN0IjsKKwlpZiAoLWUgJHBlcnNvbmFsUGxpc3RGaWxlKSB7CisJICAgIHVubGluaygkcGVy c29uYWxQbGlzdEZpbGUpIHx8IGRpZSAiQ291bGQgbm90IGRlbGV0ZSAkcGVyc29uYWxQbGlzdEZp bGU6ICQhIjsKKwl9CisKICAgICAgICAgb3BlbiBQUk9EVUNULCAiZGVmYXVsdHMgcmVhZCBjb20u YXBwbGUuWGNvZGUgUEJYQXBwbGljYXRpb253aWRlQnVpbGRTZXR0aW5ncyAyPiAvZGV2L251bGwg fCIgb3IgZGllOwogICAgICAgICAkYmFzZVByb2R1Y3REaXIgPSBqb2luICcnLCA8UFJPRFVDVD47 CiAgICAgICAgIGNsb3NlIFBST0RVQ1Q7Cg== 31703 2009-06-22 21:04:14 -0700 2009-06-23 01:11:44 -0700 Proposed fix for 26537 (rev 5) 26537_rev5.patch text/plain 1981 tyoshino SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ0OTcxKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMDYtMjIgIFRha2VzaGkgWW9zaGlubyAg PHR5b3NoaW5vQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQnVnIDI2NTM3OiBCdWlsZHMgZnJvbSBjb21tYW5kLWxpbmUgZmFpbCBp ZiBjdXN0b20gYnVpbGQgcHJvZHVjdCBkaXJlY3RvcnkgaXMgc2V0IGFuZCB+L0xpYnJhcnkvUHJl ZmVyZW5jZXMveGNvZGVidWlsZC5wbGlzdCBleGlzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2NTM3CisKKyAgICAgICAgTGV0IGRldGVybWluZUJh c2VQcm9kdWN0RGlyIHN1YnJvdXRpbmUgcmVtb3ZlCisgICAgICAgIH4vTGlicmFyeS9QcmVmZXJl bmNlcy94Y29kZWJ1aWxkLnBsaXN0LiBJdCBjYW4gcHJldmVudCB4Y29kZWJ1aWxkIGZyb20KKyAg ICAgICAgcmVzcGVjdGluZyBnbG9iYWwgc2V0dGluZ3Mgc3VjaCBhcyBhIGN1c3RvbSBidWlsZCBw cm9kdWN0cyBkaXJlY3RvcnkKKyAgICAgICAgKDxyZGFyOi8vcHJvYmxlbS81NTg1ODk5PikuCisK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisKIDIwMDktMDYtMjIgIFN0ZXZlIEZh bGtlbmJ1cmcgIDxzZmFsa2VuQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgZXJyYW50IGxp bmUgb2YgY29kZSBtaXN0YWtlbmx5IGNoZWNrZWQgaW4uCkluZGV4OiBXZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdGRpcnMucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRkaXJzLnBtCShyZXZpc2lvbiA0NDkyNykKKysrIFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 ZGlycy5wbQkod29ya2luZyBjb3B5KQpAQCAtOTQsNiArOTQsMTYgQEAgc3ViIGRldGVybWluZUJh c2VQcm9kdWN0RGlyCiAgICAgcmV0dXJuIGlmIGRlZmluZWQgJGJhc2VQcm9kdWN0RGlyOwogICAg IGRldGVybWluZVNvdXJjZURpcigpOwogICAgIGlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKKyAg ICAgICAgIyBTaWxlbnRseSByZW1vdmUgfi9MaWJyYXJ5L1ByZWZlcmVuY2VzL3hjb2RlYnVpbGQu cGxpc3Qgd2hpY2ggY2FuCisgICAgICAgICMgY2F1c2UgYnVpbGQgZmFpbHVyZS4gVGhlIHByZXNl bmNlIG9mCisgICAgICAgICMgfi9MaWJyYXJ5L1ByZWZlcmVuY2VzL3hjb2RlYnVpbGQucGxpc3Qg Y2FuIHByZXZlbnQgeGNvZGVidWlsZCBmcm9tCisgICAgICAgICMgcmVzcGVjdGluZyBnbG9iYWwg c2V0dGluZ3Mgc3VjaCBhcyBhIGN1c3RvbSBidWlsZCBwcm9kdWN0cyBkaXJlY3RvcnkKKyAgICAg ICAgIyAoPHJkYXI6Ly9wcm9ibGVtLzU1ODU4OTk+KS4KKyAgICAgICAgbXkgJHBlcnNvbmFsUGxp c3RGaWxlID0gJEVOVntIT01FfSAuICIvTGlicmFyeS9QcmVmZXJlbmNlcy94Y29kZWJ1aWxkLnBs aXN0IjsKKyAgICAgICAgaWYgKC1lICRwZXJzb25hbFBsaXN0RmlsZSkgeworICAgICAgICAgICAg dW5saW5rKCRwZXJzb25hbFBsaXN0RmlsZSkgfHwgZGllICJDb3VsZCBub3QgZGVsZXRlICRwZXJz b25hbFBsaXN0RmlsZTogJCEiOworICAgICAgICB9CisKICAgICAgICAgb3BlbiBQUk9EVUNULCAi ZGVmYXVsdHMgcmVhZCBjb20uYXBwbGUuWGNvZGUgUEJYQXBwbGljYXRpb253aWRlQnVpbGRTZXR0 aW5ncyAyPiAvZGV2L251bGwgfCIgb3IgZGllOwogICAgICAgICAkYmFzZVByb2R1Y3REaXIgPSBq b2luICcnLCA8UFJPRFVDVD47CiAgICAgICAgIGNsb3NlIFBST0RVQ1Q7Cg==