35551 2010-03-01 15:39:01 -0800 Hardcoding of /usr/bin/gcc in perl build scripts 2010-06-02 17:21:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 Fred_Ollinger webkit-unassigned commit-queue darin ddkilzer dglazkov eric gustavo lucas.de.marchi webkit.review.bot xan.lopez oldest_to_newest 194848 0 49760 Fred_Ollinger 2010-03-01 15:39:01 -0800 Created attachment 49760 Patch to change /usr/bin/gcc to $ENV{CC} in perl build scripts. Recently when trying to cross the nightly build: r55354, I noticed that several Perl scripts hardcoded the path to /usr/bin/gcc. Obviously, this completely breaks a cross compile as a cross compiler should not be installed in /usr/bin/gcc; that's where the native compiler is NOT the cross compiler. There are four perl build scripts that hard code /usr/bin/gcc as the default compiler. This is true even if one has chosen to cross-compile. This should effectively break cross-compiling as there is no way to tell ./configure that gcc is located in an alternate location. This bug will also break use of another compiler other than gcc. It will also break using a different version of gcc if it is not installed in the default location of /usr/bin/gcc. To fix this, I first isolated the areas where /usr/bin/gcc was called from Perl. Then I changed references from "/usr/bin/gcc" to $ENV{CC} which will allow a user to use any version of gcc that they wish. Patch is attached. 1. bindings/scripts/CodeGeneratorObjC.pm 2. bindings/scripts/IDLParser.pm 3. css/make-css-file-arrays.pl 4. dom/make_names.pl Fred Ollinger Embedded Software Engineer Seektech, Incorporated http://www.seektechinc.com/ fred_ollinger@seektech.com 194851 1 49760 commit-queue 2010-03-01 15:49:31 -0800 Comment on attachment 49760 Patch to change /usr/bin/gcc to $ENV{CC} in perl build scripts. Rejecting patch 49760 from review queue. Fred_Ollinger@seektech.com does not have reviewer permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/committers.py. - If you do not have reviewer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have reviewer rights please correct the error in WebKitTools/Scripts/webkitpy/committers.py by adding yourself to the file (no review needed). Due to bug 30084 the commit-queue will require a restart after your change. Please contact eseidel@chromium.org to request a commit-queue restart. After restart the commit-queue will correctly respect your reviewer rights. 194858 2 49760 commit-queue 2010-03-01 16:05:58 -0800 Comment on attachment 49760 Patch to change /usr/bin/gcc to $ENV{CC} in perl build scripts. Rejecting patch 49760 from commit-queue. Fred_Ollinger@seektech.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/committers.py. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in WebKitTools/Scripts/webkitpy/committers.py by adding yourself to the file (no review needed). Due to bug 30084 the commit-queue will require a restart after your change. Please contact eseidel@chromium.org to request a commit-queue restart. After restart the commit-queue will correctly respect your committer rights. 194887 3 eric 2010-03-01 17:33:54 -0800 I assume you may have meant to set these r? Please see http://webkit.org/coding/contributing.html 231043 4 57186 lucas.de.marchi 2010-05-26 19:19:52 -0700 Created attachment 57186 remove hardcoded refs to gcc's path Updated version of this old patch, fulfilling requirements for patches sent to WebKit. 231054 5 webkit.review.bot 2010-05-26 20:34:10 -0700 Attachment 57186 did not build on gtk: Build output: http://webkit-commit-queue.appspot.com/results/2521049 231056 6 57186 darin 2010-05-26 20:39:50 -0700 Comment on attachment 57186 remove hardcoded refs to gcc's path This will not work on my computers, for example. I don't think that most OS X users have an environment variable named "CC" set in their environment. Perhaps you could use the environment variable if it exists, and otherwise use the hardcoded path. 231060 7 webkit.review.bot 2010-05-26 21:07:16 -0700 Attachment 57186 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/2491048 231105 8 lucas.de.marchi 2010-05-26 22:23:06 -0700 (In reply to comment #6) > (From update of attachment 57186 [details]) > This will not work on my computers, for example. I don't think that most OS X users have an environment variable named "CC" set in their environment. Perhaps you could use the environment variable if it exists, and otherwise use the hardcoded path. Why are we hard-coding the path? Isn't it better to use the CC environment var and fall-back to the default path? 231125 9 57197 lucas.de.marchi 2010-05-26 23:24:30 -0700 Created attachment 57197 remove hardcoded refs to gcc's path Is this good for MacOS? 231422 10 57197 levin 2010-05-27 12:55:02 -0700 Comment on attachment 57197 remove hardcoded refs to gcc's path This patch doesn't do this "Perhaps you could use the environment variable if it exists, and otherwise use the hardcoded path" as suggested in the comments. Also, the variable name change is superfluous (and without that change, less lines of code are changed). 231510 11 lucas.de.marchi 2010-05-27 17:20:59 -0700 (In reply to comment #10) > (From update of attachment 57197 [details]) > This patch doesn't do this "Perhaps you could use the environment variable if it exists, and otherwise use the hardcoded path" as suggested in the comments. > I know. Did you see my comment above? What's the point in using the complete path when the PATH environment variable can help? > Also, the variable name change is superfluous (and without that change, less lines of code are changed). More lines of code are changed, but the variable name will make sense since with this patch it will not necessarily contain the path. I could do what was suggested, but I'm still convinced it's not the right thing to do. 232098 12 57409 lucas.de.marchi 2010-05-29 06:29:24 -0700 Created attachment 57409 Patch Here is the patch as suggested Darin. I'd rather take the previous patch I sent since it seems to be a better idea. But, anyway, here is the other patch. 232162 13 darin 2010-05-29 20:25:31 -0700 We definitely don't want to do anything that relies on PATH, so I do not think the previous patch was a better idea. 232163 14 57409 commit-queue 2010-05-29 20:49:23 -0700 Comment on attachment 57409 Patch Clearing flags on attachment: 57409 Committed r60413: <http://trac.webkit.org/changeset/60413> 232164 15 commit-queue 2010-05-29 20:49:30 -0700 All reviewed patches have been landed. Closing bug. 233516 16 lucas.de.marchi 2010-06-02 17:21:11 -0700 *** Bug 24454 has been marked as a duplicate of this bug. *** 49760 2010-03-01 15:39:01 -0800 2010-03-01 16:05:58 -0800 Patch to change /usr/bin/gcc to $ENV{CC} in perl build scripts. usr-bin-gcc-hardcode.patch text/plain 2455 Fred_Ollinger SW5kZXg6IFdlYktpdC1yNTUzNTQvV2ViQ29yZS9kb20vbWFrZV9uYW1lcy5wbAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQtcjU1MzU0Lm9yaWcvV2ViQ29yZS9kb20vbWFrZV9uYW1lcy5wbAkyMDEwLTAz LTAxIDIyOjUzOjU1LjAwMDAwMDAwMCArMDAwMAorKysgV2ViS2l0LXI1NTM1NC9XZWJDb3JlL2Rv bS9tYWtlX25hbWVzLnBsCTIwMTAtMDMtMDEgMjI6NTQ6MTguMDAwMDAwMDAwICswMDAwCkBAIC01 Miw3ICs1Miw3IEBACiBpZiAoKCRDb25maWc6OkNvbmZpZ3snb3NuYW1lJ30pID1+IC9zb2xhcmlz L2kpIHsKICAgICAkZ2NjTG9jYXRpb24gPSAiL3Vzci9zZncvYmluL2djYyI7CiB9IGVsc2Ugewot ICAgICRnY2NMb2NhdGlvbiA9ICIvdXNyL2Jpbi9nY2MiOworICAgICRnY2NMb2NhdGlvbiA9ICRF TlZ7Q0N9OwogfQogbXkgJHByZXByb2Nlc3NvciA9ICRnY2NMb2NhdGlvbiAuICIgLUUgLVAgLXgg YysrIjsKIApJbmRleDogV2ViS2l0LXI1NTM1NC9XZWJDb3JlL2Nzcy9tYWtlLWNzcy1maWxlLWFy cmF5cy5wbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQtcjU1MzU0Lm9yaWcvV2ViQ29yZS9jc3MvbWFr ZS1jc3MtZmlsZS1hcnJheXMucGwJMjAxMC0wMy0wMSAyMjo1NDo1Ni4wMDAwMDAwMDAgKzAwMDAK KysrIFdlYktpdC1yNTUzNTQvV2ViQ29yZS9jc3MvbWFrZS1jc3MtZmlsZS1hcnJheXMucGwJMjAx MC0wMy0wMSAyMjo1NToxNy4wMDAwMDAwMDAgKzAwMDAKQEAgLTMzLDcgKzMzLDcgQEAKICAgICBp ZiAoKCRDb25maWc6OkNvbmZpZ3snb3NuYW1lJ30pID1+IC9zb2xhcmlzL2kpIHsKICAgICAgICAg JGdjY0xvY2F0aW9uID0gIi91c3Ivc2Z3L2Jpbi9nY2MiOwogICAgIH0gZWxzZSB7Ci0gICAgICAg ICRnY2NMb2NhdGlvbiA9ICIvdXNyL2Jpbi9nY2MiOworICAgICAgICAkZ2NjTG9jYXRpb24gPSAk RU5We0NDfTsKICAgICB9CiAgICAgJHByZXByb2Nlc3NvciA9ICRnY2NMb2NhdGlvbiAuICIgLUUg LVAgLXggYysrIjsKIH0KSW5kZXg6IFdlYktpdC1yNTUzNTQvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL0NvZGVHZW5lcmF0b3JPYmpDLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC1yNTUzNTQub3Jp Zy9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvck9iakMucG0JMjAxMC0wMy0w MSAyMjo1NTozMi4wMDAwMDAwMDAgKzAwMDAKKysrIFdlYktpdC1yNTUzNTQvV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JPYmpDLnBtCTIwMTAtMDMtMDEgMjI6NTU6NTAuMDAw MDAwMDAwICswMDAwCkBAIC0yMjYsNyArMjI2LDcgQEAKICAgICBpZiAoKCRDb25maWc6OkNvbmZp Z3snb3NuYW1lJ30pID1+IC9zb2xhcmlzL2kpIHsKICAgICAgICAgJGdjY0xvY2F0aW9uID0gIi91 c3Ivc2Z3L2Jpbi9nY2MiOwogICAgIH0gZWxzZSB7Ci0gICAgICAgICRnY2NMb2NhdGlvbiA9ICIv dXNyL2Jpbi9nY2MiOworICAgICAgICAkZ2NjTG9jYXRpb24gPSAkRU5We0NDfTsKICAgICB9CiAg ICAgb3BlbiBGSUxFLCAiLXwiLCAkZ2NjTG9jYXRpb24sICItRSIsICItUCIsICIteCIsICJvYmpl Y3RpdmUtYyIsCiAgICAgICAgIChtYXAgeyAiLUQkXyIgfSBzcGxpdCgvICsvLCAkZGVmaW5lcykp LCAiLURPQkpDX0NPREVfR0VORVJBVElPTiIsICRmaWxlTmFtZSBvciBkaWUgIkNvdWxkIG5vdCBv cGVuICRmaWxlTmFtZSI7CkluZGV4OiBXZWJLaXQtcjU1MzU0L1dlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy9JRExQYXJzZXIucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0LXI1NTM1NC5vcmlnL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy9JRExQYXJzZXIucG0JMjAxMC0wMy0wMSAyMjo1NjowNy4wMDAw MDAwMDAgKzAwMDAKKysrIFdlYktpdC1yNTUzNTQvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lE TFBhcnNlci5wbQkyMDEwLTAzLTAxIDIyOjU2OjI1LjAwMDAwMDAwMCArMDAwMApAQCAtNjksNyAr NjksNyBAQAogICAgICAgICBpZiAoKCRDb25maWc6OkNvbmZpZ3snb3NuYW1lJ30pID1+IC9zb2xh cmlzL2kpIHsKICAgICAgICAgICAgICRnY2NMb2NhdGlvbiA9ICIvdXNyL3Nmdy9iaW4vZ2NjIjsK ICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICRnY2NMb2NhdGlvbiA9ICIvdXNyL2Jpbi9n Y2MiOworICAgICAgICAgICAgJGdjY0xvY2F0aW9uID0gJEVOVntDQ307CiAgICAgICAgIH0KICAg ICAgICAgJHByZXByb2Nlc3NvciA9ICRnY2NMb2NhdGlvbiAuICIgLUUgLVAgLXggYysrIjsKICAg ICB9Cg== 57186 2010-05-26 19:19:52 -0700 2010-05-26 23:24:30 -0700 remove hardcoded refs to gcc's path 005-remove-hardcoded-gcc-path.patch text/plain 2380 lucas.de.marchi ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZTBhNGYyOS4uZjJjZjMwOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wNS0yNiAgTHVjYXMgRGUgTWFy Y2hpICA8bHVjYXMuZGVtYXJjaGlAcHJvZnVzaW9uLm1vYmk+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIGhhcmRjb2RlZCByZWZlcmVuY2Vz IHRvIGdjYydzIHBhdGggZnJvbSBwZXJsIHNjcmlwdHMuIFRoaXMKKyAgICAgICAgYnJlYWtzIGNy b3NzLWNvbXBpbGluZyBhbmQgTGludXggZGlzdHJvcyB3aXRoIG1vcmUgdGhhbiBvbmUgZ2NjCisg ICAgICAgIGluc3RhbGxlZC4gVXNlIENDIGVudmlyb25tZW50IHZhcmlhYmxlIGluc3RlYWQuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTU1MQorCisg ICAgICAgIE5vIG5ldyBmdW5jdGlvbmFsaXR5LCBzbyBubyBuZXcgdGVzdHMuCisKKyAgICAgICAg KiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JPYmpDLnBtOgorICAgICAgICAqIGJpbmRp bmdzL3NjcmlwdHMvSURMUGFyc2VyLnBtOgorICAgICAgICAqIGRvbS9tYWtlX25hbWVzLnBsOgor CiAyMDEwLTA1LTE3ICBNT1JJVEEgSGFqaW1lICA8bW9ycml0YUBnb29nbGUuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEtlbnQgVGFtdXJhLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JPYmpDLnBtIGIvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRz L0NvZGVHZW5lcmF0b3JPYmpDLnBtCmluZGV4IDcxMzJlMjIuLjEwN2FlNDkgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yT2JqQy5wbQorKysgYi9XZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvck9iakMucG0KQEAgLTIyNiw3ICsyMjYs NyBAQCBzdWIgUmVhZFB1YmxpY0ludGVyZmFjZXMKICAgICBpZiAoKCRDb25maWc6OkNvbmZpZ3sn b3NuYW1lJ30pID1+IC9zb2xhcmlzL2kpIHsKICAgICAgICAgJGdjY0xvY2F0aW9uID0gIi91c3Iv c2Z3L2Jpbi9nY2MiOwogICAgIH0gZWxzZSB7Ci0gICAgICAgICRnY2NMb2NhdGlvbiA9ICIvdXNy L2Jpbi9nY2MiOworICAgICAgICAkZ2NjTG9jYXRpb24gPSAkRU5We0NDfTsKICAgICB9CiAgICAg b3BlbiBGSUxFLCAiLXwiLCAkZ2NjTG9jYXRpb24sICItRSIsICItUCIsICIteCIsICJvYmplY3Rp dmUtYyIsCiAgICAgICAgIChtYXAgeyAiLUQkXyIgfSBzcGxpdCgvICsvLCAkZGVmaW5lcykpLCAi LURPQkpDX0NPREVfR0VORVJBVElPTiIsICRmaWxlTmFtZSBvciBkaWUgIkNvdWxkIG5vdCBvcGVu ICRmaWxlTmFtZSI7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvSURMUGFy c2VyLnBtIGIvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lETFBhcnNlci5wbQppbmRleCBjNjc0 MmRjLi5hMjUxNDU4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvSURMUGFy c2VyLnBtCisrKyBiL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9JRExQYXJzZXIucG0KQEAgLTY5 LDcgKzY5LDcgQEAgc3ViIFBhcnNlCiAgICAgICAgIGlmICgoJENvbmZpZzo6Q29uZmlneydvc25h bWUnfSkgPX4gL3NvbGFyaXMvaSkgewogICAgICAgICAgICAgJGdjY0xvY2F0aW9uID0gIi91c3Iv c2Z3L2Jpbi9nY2MiOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgJGdjY0xvY2F0aW9u ID0gIi91c3IvYmluL2djYyI7CisgICAgICAgICAgICAkZ2NjTG9jYXRpb24gPSAkRU5We0NDfTsK ICAgICAgICAgfQogICAgICAgICAkcHJlcHJvY2Vzc29yID0gJGdjY0xvY2F0aW9uIC4gIiAtRSAt UCAteCBjKysiOwogICAgIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL21ha2VfbmFtZXMucGwg Yi9XZWJDb3JlL2RvbS9tYWtlX25hbWVzLnBsCmluZGV4IDU3MDA2ZDIuLmRkMmUzOTEgMTAwNzU1 Ci0tLSBhL1dlYkNvcmUvZG9tL21ha2VfbmFtZXMucGwKKysrIGIvV2ViQ29yZS9kb20vbWFrZV9u YW1lcy5wbApAQCAtNTIsNyArNTIsNyBAQCBteSAkZ2NjTG9jYXRpb24gPSAiIjsKIGlmICgoJENv bmZpZzo6Q29uZmlneydvc25hbWUnfSkgPX4gL3NvbGFyaXMvaSkgewogICAgICRnY2NMb2NhdGlv biA9ICIvdXNyL3Nmdy9iaW4vZ2NjIjsKIH0gZWxzZSB7Ci0gICAgJGdjY0xvY2F0aW9uID0gIi91 c3IvYmluL2djYyI7CisgICAgJGdjY0xvY2F0aW9uID0gJEVOVntDQ307CiB9CiBteSAkcHJlcHJv Y2Vzc29yID0gJGdjY0xvY2F0aW9uIC4gIiAtRSAtUCAteCBjKysiOwogCg== 57197 2010-05-26 23:24:30 -0700 2010-05-29 06:29:17 -0700 remove hardcoded refs to gcc's path 005-remove-hardcoded-gcc-path.patch text/plain 3129 lucas.de.marchi ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWM0NzQ3MS4uYWY0ZDY4MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wNS0yNiAgTHVjYXMgRGUgTWFy Y2hpICA8bHVjYXMuZGVtYXJjaGlAcHJvZnVzaW9uLm1vYmk+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIGhhcmRjb2RlZCByZWZlcmVuY2Vz IHRvIGdjYydzIHBhdGggZnJvbSBwZXJsIHNjcmlwdHMuIFRoaXMKKyAgICAgICAgYnJlYWtzIGNy b3NzLWNvbXBpbGluZyBhbmQgTGludXggZGlzdHJvcyB3aXRoIG1vcmUgdGhhbiBvbmUgZ2NjCisg ICAgICAgIGluc3RhbGxlZC4gVXNlIENDIGVudmlyb25tZW50IHZhcmlhYmxlIGluc3RlYWQgYW5k IGZhbGxiYWNrIHRvIGdjYyBpbgorICAgICAgICBQQVRIIGVudmlyb25tZW50IHZhcmlhYmxlLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU1NTEKKwor ICAgICAgICBObyBuZXcgZnVuY3Rpb25hbGl0eSwgc28gbm8gbmV3IHRlc3RzLgorCisgICAgICAg ICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yT2JqQy5wbToKKyAgICAgICAgKiBiaW5k aW5ncy9zY3JpcHRzL0lETFBhcnNlci5wbToKKyAgICAgICAgKiBkb20vbWFrZV9uYW1lcy5wbDoK KwogMjAxMC0wNS0yNiAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy9Db2RlR2VuZXJhdG9yT2JqQy5wbSBiL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2Rl R2VuZXJhdG9yT2JqQy5wbQppbmRleCBlMDZiMjc0Li42YjkwZGI2IDEwMDY0NAotLS0gYS9XZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvck9iakMucG0KKysrIGIvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JPYmpDLnBtCkBAIC0yMjMsMTMgKzIyMywxMSBA QCBzdWIgUmVhZFB1YmxpY0ludGVyZmFjZXMKICAgICAlcHVibGljSW50ZXJmYWNlcyA9ICgpOwog CiAgICAgbXkgJGZpbGVOYW1lID0gIldlYkNvcmUvYmluZGluZ3Mvb2JqYy9QdWJsaWNET01JbnRl cmZhY2VzLmgiOwotICAgIG15ICRnY2NMb2NhdGlvbiA9ICIiOwotICAgIGlmICgoJENvbmZpZzo6 Q29uZmlneydvc25hbWUnfSkgPX4gL3NvbGFyaXMvaSkgewotICAgICAgICAkZ2NjTG9jYXRpb24g PSAiL3Vzci9zZncvYmluL2djYyI7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgJGdjY0xvY2F0aW9u ID0gIi91c3IvYmluL2djYyI7CisgICAgbXkgJGNjID0gJEVOVntDQ307CisgICAgaWYgKCEkY2Mp IHsKKyAgICAgICAgJGNjID0gImdjYyI7CiAgICAgfQotICAgIG9wZW4gRklMRSwgIi18IiwgJGdj Y0xvY2F0aW9uLCAiLUUiLCAiLVAiLCAiLXgiLCAib2JqZWN0aXZlLWMiLAorICAgIG9wZW4gRklM RSwgIi18IiwgJGNjLCAiLUUiLCAiLVAiLCAiLXgiLCAib2JqZWN0aXZlLWMiLAogICAgICAgICAo bWFwIHsgIi1EJF8iIH0gc3BsaXQoLyArLywgJGRlZmluZXMpKSwgIi1ET0JKQ19DT0RFX0dFTkVS QVRJT04iLCAkZmlsZU5hbWUgb3IgZGllICJDb3VsZCBub3Qgb3BlbiAkZmlsZU5hbWUiOwogICAg IG15IEBkb2N1bWVudENvbnRlbnQgPSA8RklMRT47CiAgICAgY2xvc2UgRklMRTsKZGlmZiAtLWdp dCBhL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9JRExQYXJzZXIucG0gYi9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvSURMUGFyc2VyLnBtCmluZGV4IGM2NzQyZGMuLmViZjczODEgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9JRExQYXJzZXIucG0KKysrIGIvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL0lETFBhcnNlci5wbQpAQCAtNjQsMTQgKzY0LDExIEBAIHN1YiBQYXJz ZQogICAgICRwYXJlbnRzT25seSA9IHNoaWZ0OwogCiAgICAgaWYgKCEkcHJlcHJvY2Vzc29yKSB7 Ci0gICAgICAgIHJlcXVpcmUgQ29uZmlnOwotICAgICAgICBteSAkZ2NjTG9jYXRpb24gPSAiIjsK LSAgICAgICAgaWYgKCgkQ29uZmlnOjpDb25maWd7J29zbmFtZSd9KSA9fiAvc29sYXJpcy9pKSB7 Ci0gICAgICAgICAgICAkZ2NjTG9jYXRpb24gPSAiL3Vzci9zZncvYmluL2djYyI7Ci0gICAgICAg IH0gZWxzZSB7Ci0gICAgICAgICAgICAkZ2NjTG9jYXRpb24gPSAiL3Vzci9iaW4vZ2NjIjsKKyAg ICAgICAgbXkgJGNjID0gJEVOVntDQ307CisgICAgICAgIGlmICghJGNjKSB7CisgICAgICAgICAg ICAkY2MgPSAiZ2NjIjsKICAgICAgICAgfQotICAgICAgICAkcHJlcHJvY2Vzc29yID0gJGdjY0xv Y2F0aW9uIC4gIiAtRSAtUCAteCBjKysiOworICAgICAgICAkcHJlcHJvY2Vzc29yID0gJGNjIC4g IiAtRSAtUCAteCBjKysiOwogICAgIH0KIAogICAgIGlmICghJGRlZmluZXMpIHsKZGlmZiAtLWdp dCBhL1dlYkNvcmUvZG9tL21ha2VfbmFtZXMucGwgYi9XZWJDb3JlL2RvbS9tYWtlX25hbWVzLnBs CmluZGV4IDU3MDA2ZDIuLmYyZTQ2MmQgMTAwNzU1Ci0tLSBhL1dlYkNvcmUvZG9tL21ha2VfbmFt ZXMucGwKKysrIGIvV2ViQ29yZS9kb20vbWFrZV9uYW1lcy5wbApAQCAtNDcsMTQgKzQ3LDEyIEBA IG15ICV0YWdzID0gKCk7CiBteSAlYXR0cnMgPSAoKTsKIG15ICVwYXJhbWV0ZXJzID0gKCk7CiBt eSAkZXh0cmFEZWZpbmVzID0gMDsKLXJlcXVpcmUgQ29uZmlnOwotbXkgJGdjY0xvY2F0aW9uID0g IiI7Ci1pZiAoKCRDb25maWc6OkNvbmZpZ3snb3NuYW1lJ30pID1+IC9zb2xhcmlzL2kpIHsKLSAg ICAkZ2NjTG9jYXRpb24gPSAiL3Vzci9zZncvYmluL2djYyI7Ci19IGVsc2UgewotICAgICRnY2NM b2NhdGlvbiA9ICIvdXNyL2Jpbi9nY2MiOworbXkgJGNjID0gJEVOVntDQ307CitpZiAoISRjYykg eworICAgICRjYyA9ICJnY2MiOwogfQotbXkgJHByZXByb2Nlc3NvciA9ICRnY2NMb2NhdGlvbiAu ICIgLUUgLVAgLXggYysrIjsKKworbXkgJHByZXByb2Nlc3NvciA9ICRjYyAuICIgLUUgLVAgLXgg YysrIjsKIAogR2V0T3B0aW9ucygKICAgICAndGFncz1zJyA9PiBcJHRhZ3NGaWxlLCAK 57409 2010-05-29 06:29:24 -0700 2010-05-29 20:49:23 -0700 Patch bug-35551-20100529102959.patch text/plain 2838 lucas.de.marchi ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZjQwMzc2NDU1MDIyMzI4ZTg4YjViN2EyZTgyOGVlMTU4OGJkNzFjOS4uZDVkOTQ5MGYxZjA0NmQ2 ZDkzNzk0OGFlZjllZTUyMTA5ODhlOGNjNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wNS0yOSAgTHVj YXMgRGUgTWFyY2hpICA8bHVjYXMuZGVtYXJjaGlAcHJvZnVzaW9uLm1vYmk+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hlY2sgaWYgYSBDQyBlbnZp cm9ubWVudCB2YXJpYWJsZSBpcyBkZWZpbmVkIGJlZm9yZSBoYXJkLWNvZGluZyBnY2MncworICAg ICAgICBwYXRoLiBTaW1wbHkgaGFyZC1jb2RpbmcgaXQgYnJlYWtzIGNyb3NzLWNvbXBpbGF0aW9u IGFuZCBMaW51eAorICAgICAgICBkaXN0cmlidXRpb25zIHdpdGggbW9yZSB0aGFuIG9uZSBnY2Mg aW5zdGFsbGVkIChvciBub3QgaW4gdGhlIGRlZmF1bHQKKyAgICAgICAgcGF0aCkuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTU1MQorCisgICAgICAg IE5vIG5ldyBmdW5jdGlvbmFsaXR5LCBzbyBubyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBiaW5k aW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JPYmpDLnBtOgorICAgICAgICAqIGJpbmRpbmdzL3Nj cmlwdHMvSURMUGFyc2VyLnBtOgorICAgICAgICAqIGRvbS9tYWtlX25hbWVzLnBsOgorCiAyMDEw LTA1LTI5ICBBbnRvbiBNdWhpbiAgPGFudG9ubUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvQ29kZUdlbmVyYXRvck9iakMucG0gYi9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdl bmVyYXRvck9iakMucG0KaW5kZXggZTA2YjI3NGNiMGNiYTVlM2E3NzAxYzg4ZWIzNjE4YmMyZjVl YmNlNS4uODlkYTQ4ZDc0MzA1MGE4YjdjZDYxYWNmNDc2N2UwOTg0ZmZkZDQ3MiAxMDA2NDQKLS0t IGEvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JPYmpDLnBtCisrKyBiL1dl YkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yT2JqQy5wbQpAQCAtMjI0LDcgKzIy NCw5IEBAIHN1YiBSZWFkUHVibGljSW50ZXJmYWNlcwogCiAgICAgbXkgJGZpbGVOYW1lID0gIldl YkNvcmUvYmluZGluZ3Mvb2JqYy9QdWJsaWNET01JbnRlcmZhY2VzLmgiOwogICAgIG15ICRnY2NM b2NhdGlvbiA9ICIiOwotICAgIGlmICgoJENvbmZpZzo6Q29uZmlneydvc25hbWUnfSkgPX4gL3Nv bGFyaXMvaSkgeworICAgIGlmICgkRU5We0NDfSkgeworICAgICAgICAkZ2NjTG9jYXRpb24gPSAk RU5We0NDfTsKKyAgICB9IGVsc2lmICgoJENvbmZpZzo6Q29uZmlneydvc25hbWUnfSkgPX4gL3Nv bGFyaXMvaSkgewogICAgICAgICAkZ2NjTG9jYXRpb24gPSAiL3Vzci9zZncvYmluL2djYyI7CiAg ICAgfSBlbHNlIHsKICAgICAgICAgJGdjY0xvY2F0aW9uID0gIi91c3IvYmluL2djYyI7CmRpZmYg LS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvSURMUGFyc2VyLnBtIGIvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL0lETFBhcnNlci5wbQppbmRleCBjNjc0MmRjMmQxNjE5OTRmZjFjNTY3 MjMyM2E1ZDNkZDRlZGZhMmY0Li41YjdiZWIzMDkzMzIxODUzOGY5YjNiYTc5OGViODMyMzVjMzk5 ZWZjIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvSURMUGFyc2VyLnBtCisr KyBiL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9JRExQYXJzZXIucG0KQEAgLTY2LDcgKzY2LDkg QEAgc3ViIFBhcnNlCiAgICAgaWYgKCEkcHJlcHJvY2Vzc29yKSB7CiAgICAgICAgIHJlcXVpcmUg Q29uZmlnOwogICAgICAgICBteSAkZ2NjTG9jYXRpb24gPSAiIjsKLSAgICAgICAgaWYgKCgkQ29u ZmlnOjpDb25maWd7J29zbmFtZSd9KSA9fiAvc29sYXJpcy9pKSB7CisgICAgICAgIGlmICgkRU5W e0NDfSkgeworICAgICAgICAgICAgJGdjY0xvY2F0aW9uID0gJEVOVntDQ307CisgICAgICAgIH0g ZWxzaWYgKCgkQ29uZmlnOjpDb25maWd7J29zbmFtZSd9KSA9fiAvc29sYXJpcy9pKSB7CiAgICAg ICAgICAgICAkZ2NjTG9jYXRpb24gPSAiL3Vzci9zZncvYmluL2djYyI7CiAgICAgICAgIH0gZWxz ZSB7CiAgICAgICAgICAgICAkZ2NjTG9jYXRpb24gPSAiL3Vzci9iaW4vZ2NjIjsKZGlmZiAtLWdp dCBhL1dlYkNvcmUvZG9tL21ha2VfbmFtZXMucGwgYi9XZWJDb3JlL2RvbS9tYWtlX25hbWVzLnBs CmluZGV4IDU3MDA2ZDJmMzBhZDBmNzRlNjM5OTI3MmY3YzYwN2I1Y2VjNDc3ZjkuLjA0YTY4YmIx MWU0YmUzNWYyMDQwYzk2ZGNmZmFjODhmNmJhM2JmMGEgMTAwNzU1Ci0tLSBhL1dlYkNvcmUvZG9t L21ha2VfbmFtZXMucGwKKysrIGIvV2ViQ29yZS9kb20vbWFrZV9uYW1lcy5wbApAQCAtNDksNyAr NDksOSBAQCBteSAlcGFyYW1ldGVycyA9ICgpOwogbXkgJGV4dHJhRGVmaW5lcyA9IDA7CiByZXF1 aXJlIENvbmZpZzsKIG15ICRnY2NMb2NhdGlvbiA9ICIiOwotaWYgKCgkQ29uZmlnOjpDb25maWd7 J29zbmFtZSd9KSA9fiAvc29sYXJpcy9pKSB7CitpZiAoJEVOVntDQ30pIHsKKyAgICAkZ2NjTG9j YXRpb24gPSAkRU5We0NDfTsKK30gZWxzaWYgKCgkQ29uZmlnOjpDb25maWd7J29zbmFtZSd9KSA9 fiAvc29sYXJpcy9pKSB7CiAgICAgJGdjY0xvY2F0aW9uID0gIi91c3Ivc2Z3L2Jpbi9nY2MiOwog fSBlbHNlIHsKICAgICAkZ2NjTG9jYXRpb24gPSAiL3Vzci9iaW4vZ2NjIjsK