48636 2010-10-29 07:31:40 -0700 [Qt] Mobile Devices should include Model and Firmware Version in Webkit Generated User Agent String 2011-04-11 11:44:12 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) S60 Hardware S60 3rd edition RESOLVED FIXED P2 Normal --- 1 Stanislav.Paltis qi.2.zhang ademar benjamin christian.webkit commit-queue cshu eric hausmann kenneth laszlo.gombos menard pkasting suresh.voruganti webkit-ews zalan oldest_to_newest 301753 0 Stanislav.Paltis 2010-10-29 07:31:40 -0700 With QtMobility SystemInfo module present on the mobile device, proposal is to include Model and Firmware Version information in Webkit Generated USer agent String. 301849 1 ap 2010-10-29 10:22:51 -0700 Note that this would be detrimental to privacy, see e.g. <http://panopticlick.eff.org/browser-uniqueness.pdf>. 302800 2 Stanislav.Paltis 2010-11-01 11:26:12 -0700 Added [Qt] in the title, as it is related to Qt implementation. 302821 3 72535 Stanislav.Paltis 2010-11-01 11:50:40 -0700 Created attachment 72535 Implementation proposal v1, wanted to hear comments, if you believe tests are needed, please comment appropriately. 303272 4 72535 laszlo.gombos 2010-11-02 02:20:05 -0700 Comment on attachment 72535 Implementation proposal v1, wanted to hear comments, if you believe tests are needed, please comment appropriately. View in context: https://bugs.webkit.org/attachment.cgi?id=72535&action=review If this is up for review, please set the r? flag. > WebKit/qt/ChangeLog:11 > + Fixed addition of S60 Version in User Agent, where extra space woudl show up, if S60 typo - woudl. Please fix. > WebKit/qt/ChangeLog:16 > + (QWebPagePrivate::_q_onLoadProgressChanged): Changes in the body of this function is not related, please remove them. > WebKit/qt/Api/qwebpage.cpp:3601 > + firstPartTemp += QLatin1Char(' '); Shouldn't the order of the concatenation changed here ? Also perhaps we can combine the two string operations into one " Series60/3.1" > WebKit/qt/Api/qwebpage.cpp:3605 > + firstPartTemp += QLatin1Char(' '); Ditto. > WebKit/qt/Api/qwebpage.cpp:3609 > + firstPartTemp += QLatin1Char(' '); Ditto. > WebKit/qt/Api/qwebpage.cpp:3622 > +#if ENABLE(QT_SYSTEMINFO) Perhaps we should check if the model or the Firmware version is empty even if ENABLE_QT_SYSTEMINFO is defined. I do not think we should add "/" if the Firmware version is empty. Similarly I do not think we should add the firmware version if the model information is empty. > WebKit/qt/Api/qwebpage.cpp:-3673 > - Unrelated change, please remove. > WebKit/qt/Api/qwebpage.cpp:-3680 > - Ditto. 303415 5 72681 Stanislav.Paltis 2010-11-02 09:40:56 -0700 Created attachment 72681 Patch 303418 6 kenneth 2010-11-02 09:43:06 -0700 (In reply to comment #5) > Created an attachment (id=72681) [details] > Patch Will this work for all upcoming MeeGo powered devices as well? Has it been tested? 303425 7 72681 kenneth 2010-11-02 09:46:17 -0700 Comment on attachment 72681 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=72681&action=review > WebKit/qt/ChangeLog:12 > + Model is not empty, but Firmware is empty string, than "/" won't be Why are some words as Firmware and Model written with capital? It seems strange > WebKit/qt/ChangeLog:15 > + Fixed addition of S60 Versionin User Agent, where extra space would show up, Versionin ? Needs a space I guess > WebKit/qt/Api/qwebpage.cpp:3616 > firstPartTemp += QString::fromLatin1("Unknown"); Why no added space here then. Might we get Unknown8u923u2 in a UA? > WebKit/qt/Api/qwebpage.cpp:3627 > + > + QString model = systemDeviceInfo.model(); > + if (!model.isEmpty()) { > + firstPartTemp += systemDeviceInfo.model(); > + QString firmware = systemInfo.version(QtMobility::QSystemInfo::Firmware); Maybe we should prepend an empty space here instead? ofcourse we need to consider performance. 303430 8 Stanislav.Paltis 2010-11-02 09:49:16 -0700 (In reply to comment #6) > (In reply to comment #5) > > Created an attachment (id=72681) [details] [details] > > Patch > > Will this work for all upcoming MeeGo powered devices as well? Has it been tested? No, it was not tested on Meego yet, only on Symbian device. 303431 9 Stanislav.Paltis 2010-11-02 09:49:59 -0700 (In reply to comment #4) > (From update of attachment 72535 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=72535&action=review > > If this is up for review, please set the r? flag. > > > WebKit/qt/ChangeLog:11 > > + Fixed addition of S60 Version in User Agent, where extra space woudl show up, if S60 > > typo - woudl. Please fix. > > > WebKit/qt/ChangeLog:16 > > + (QWebPagePrivate::_q_onLoadProgressChanged): > > Changes in the body of this function is not related, please remove them. > > > WebKit/qt/Api/qwebpage.cpp:3601 > > + firstPartTemp += QLatin1Char(' '); > > Shouldn't the order of the concatenation changed here ? > Also perhaps we can combine the two string operations into one " Series60/3.1" > > > WebKit/qt/Api/qwebpage.cpp:3605 > > + firstPartTemp += QLatin1Char(' '); > > Ditto. > > > WebKit/qt/Api/qwebpage.cpp:3609 > > + firstPartTemp += QLatin1Char(' '); > > Ditto. > > > WebKit/qt/Api/qwebpage.cpp:3622 > > +#if ENABLE(QT_SYSTEMINFO) > > Perhaps we should check if the model or the Firmware version is empty even if ENABLE_QT_SYSTEMINFO is defined. I do not think we should add "/" if the Firmware version is empty. > Similarly I do not think we should add the firmware version if the model information is empty. > > > WebKit/qt/Api/qwebpage.cpp:-3673 > > - > > Unrelated change, please remove. > > > WebKit/qt/Api/qwebpage.cpp:-3680 > > - > > Ditto. Fixed the patch according to comments. 303435 10 Stanislav.Paltis 2010-11-02 09:55:38 -0700 (In reply to comment #7) > (From update of attachment 72681 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=72681&action=review > > > WebKit/qt/ChangeLog:12 > > + Model is not empty, but Firmware is empty string, than "/" won't be > > Why are some words as Firmware and Model written with capital? It seems strange I will fix that. Sorry about that. > > > WebKit/qt/ChangeLog:15 > > + Fixed addition of S60 Versionin User Agent, where extra space would show up, > > Versionin ? Needs a space I guess you are right, my mistake. > > > WebKit/qt/Api/qwebpage.cpp:3616 > > firstPartTemp += QString::fromLatin1("Unknown"); > > Why no added space here then. Might we get Unknown8u923u2 in a UA? In what case? > > > WebKit/qt/Api/qwebpage.cpp:3627 > > + > > + QString model = systemDeviceInfo.model(); > > + if (!model.isEmpty()) { > > + firstPartTemp += systemDeviceInfo.model(); > > + QString firmware = systemInfo.version(QtMobility::QSystemInfo::Firmware); > > Maybe we should prepend an empty space here instead? of course we need to consider performance. space is prepended either after Symbian version, if on Symbian, and/or after adding SSL Support. 303437 11 kenneth 2010-11-02 09:56:42 -0700 (In reply to comment #8) > (In reply to comment #6) > > (In reply to comment #5) > > > Created an attachment (id=72681) [details] [details] [details] > > > Patch > > > > Will this work for all upcoming MeeGo powered devices as well? Has it been tested? > > No, it was not tested on Meego yet, only on Symbian device. I would like it tested to make sure it doesn't cause any regression. If so we would need to make this change only apply to Symbian devices at least until it can be made to work for MeeGo. 303439 12 kenneth 2010-11-02 09:58:47 -0700 (In reply to comment #1) > Note that this would be detrimental to privacy, see e.g. <http://panopticlick.eff.org/browser-uniqueness.pdf>. Christian, did you see this? ^ 303442 13 72691 Stanislav.Paltis 2010-11-02 10:01:46 -0700 Created attachment 72691 Patch 303449 14 Stanislav.Paltis 2010-11-02 10:14:14 -0700 (In reply to comment #11) > (In reply to comment #8) > > (In reply to comment #6) > > > (In reply to comment #5) > > > > Created an attachment (id=72681) [details] [details] [details] [details] > > > > Patch > > > > > > Will this work for all upcoming MeeGo powered devices as well? Has it been tested? > > > > No, it was not tested on Meego yet, only on Symbian device. > > I would like it tested to make sure it doesn't cause any regression. If so we would need to make this change only apply to Symbian devices at least until it can be made to work for MeeGo. At this point, I will isolate it only for Symbian, unless there are objections from others.. 303485 15 webkit-ews 2010-11-02 11:03:26 -0700 Attachment 72691 did not build on qt: Build output: http://queues.webkit.org/results/4989016 303542 16 72691 hausmann 2010-11-02 12:11:13 -0700 Comment on attachment 72691 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=72691&action=review One thing that is also missing from this patch is an update of the documentation, which explains the contents of the string. The documentation should be extended to explain how the user agent looks like with the device information included IMHO. I think the patch is good otherwise, and I don't think we should limit it to Symbian. > WebKit/qt/Api/qwebpage.cpp:3622 > + QtMobility::QSystemDeviceInfo systemDeviceInfo = QtMobility::QSystemDeviceInfo(d->q); > + QtMobility::QSystemInfo systemInfo = QtMobility::QSystemInfo(d->q); I think this should be written simpler: QtMobility::QSystemDeviceInfo systemDeviceInfo; QtMobility::QSystemInfo systemInfo; The objects are on the stack, no need to provide parents. 303577 17 zalan 2010-11-02 12:48:55 -0700 what is the browser use case to include firmware version? Do we know how big that string is going to be? -just wondering about payload of transferring all this information on each and every request. Isn't there any other way for backends to query this information? 304038 18 72824 Stanislav.Paltis 2010-11-03 08:15:50 -0700 Created attachment 72824 Patch 304039 19 Stanislav.Paltis 2010-11-03 08:19:34 -0700 (In reply to comment #16) > (From update of attachment 72691 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=72691&action=review > > One thing that is also missing from this patch is an update of the documentation, which explains the contents of the string. The documentation should be extended to explain how the user agent looks like with the device information included IMHO. > > I think the patch is good otherwise, and I don't think we should limit it to Symbian. > > > WebKit/qt/Api/qwebpage.cpp:3622 > > + QtMobility::QSystemDeviceInfo systemDeviceInfo = QtMobility::QSystemDeviceInfo(d->q); > > + QtMobility::QSystemInfo systemInfo = QtMobility::QSystemInfo(d->q); > > I think this should be written simpler: > > QtMobility::QSystemDeviceInfo systemDeviceInfo; > QtMobility::QSystemInfo systemInfo; > > The objects are on the stack, no need to provide parents. Done. patch submitted. 304693 20 72824 Stanislav.Paltis 2010-11-04 08:59:38 -0700 Comment on attachment 72824 Patch setting for commit-queue- until decisions are clarified and explained in the bug report. 309975 21 72824 laszlo.gombos 2010-11-16 15:30:13 -0800 Comment on attachment 72824 Patch This patch has been only tested on Symbian and it seems that this really only works well on Symbian. We should either guard the code with SYMBIAN (which I do not recommend) or consider other platforms as well. On Linux desktop (QtMobility installed) the patch results in the following User-Agent string: "Mozilla/5.0 (X11; N; Linux i686i686 Other/2.6.32-24-generic; en-US) ...". Notice that the CPU architecture (i686) is reported twice and a space seems to be missing. In general for most OSs I would suggest to test if QT_SYSTEMINFO is available and if it is, than we should report the values returned by QtMobility (runtime). As a fall-back we can have compile time flags in QtWebKit (as we have now) when Qt_MOBILITY is not available. In general we should keep the User-Agent small and simple and not report information just because it is available. I'm not sure if we really want to report QtMobility::QSystemInfo::Firmware, however I think reporting the model or parts of the model make sense. r- as non-Symbian platforms needs to be addressed as well. 353074 22 82840 qi.2.zhang 2011-02-17 12:03:42 -0800 Created attachment 82840 patch 1. only keep model in user agent string, no hardware version. 2. remove duplicates ";" 3. for linux: with qtmobility: "Mozilla/5.0 (X11; U; Linux; i686 Tower; en-US) AppleWebKit/534.17 (KHTML, like Gecko) QtTestBrowser/0.1 Safari/534.17" without qtmobility: "Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/534.17 (KHTML, like Gecko) QtTestBrowser/0.1 Safari/534.17" 4. for symbian: with qtmobility: "Mozilla/5.0 (Symbian/3; U; N8-00; en-US) AppleWebKit/534.17 (KHTML, like Gecko) QtTestBrowser/0.1 Safari/534.3" without qtmobility: "Mozilla/5.0 (Symbian/3; U; en-US) AppleWebKit/534.17 (KHTML, like Gecko) QtTestBrowser/0.1 Safari/534.3" 353631 23 menard 2011-02-18 09:37:34 -0800 I remember the WebKit team having this discussion with a visitor from Boston and we said it was a bad idea. Instead can the website detects what the browser support? Interesting link btw : http://diveintohtml5.org/detect.html 356837 24 eric 2011-02-24 03:15:46 -0800 There is an ongoing effort to simplify user agent strings. 357144 25 pkasting 2011-02-24 10:31:06 -0800 Please don't add to the UA string if at all possible. There is a cross-browser effort to simplify UA strings. See http://hacks.mozilla.org/2010/09/final-user-agent-string-for-firefox-4/ for some details, including notes about how Firefox for Android and Maemo constructs its UA string. Any string we send ought to be in sync with what they're doing. I have scanned all the comments on this bug and there's been no justification of this change, or links to outside discussions, despite multiple people's questions or reservations. 359283 26 82840 laszlo.gombos 2011-02-28 13:23:02 -0800 Comment on attachment 82840 patch Cross-posting from the Gecko discussion (https://bugzilla.mozilla.org/show_bug.cgi?id=595669) 1./ From the Android 2.3 Compatibility Definition it is clear that Android mandates reporting the DeviceModel - (http://source.android.com/compatibility/android-2.3-cdd.pdf): The user agent string reported by the WebView MUST be in this format: Mozilla/5.0 (Linux; U; Android $(VERSION); $(LOCALE); $(MODEL) Build/$(BUILD)) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 2./ IE for Windows Phone mandates DeviceModel section - http://blogs.msdn.com/b/iemobile/archive/2010/03/25/ladies-and-gentlemen-please-welcome-the-ie-mobile-user-agent-string.aspx. 3./ Device manufactures (e.g. Nokia) typically includes DeviceModel. I think there is a real need for an HTTP request to identify the device, and the DeviceModel in the user agent string seems to be the most commonly used approach today. The DeviceModel could be considered the %Subplatform% for some (all?) mobile platforms, which would fit nicely into our WebKit UA template. When it comes to the patch attached, I do agree that on desktop (non-mobile) platforms QtWebKit should not report the systemDeviceInfo.model just because QtWebKit was built with QtMobility libraries available. I will mark the patch r- for this specific reason. I think we should only report the model info for specific mobile platforms (e.g. Symbian; MeeGo). For these mobile platforms the "%Platform%" part of the UA string should be specific to the mobile platform as well (e.g report "MeeGo" as the platform, instead of Linux or X11 - as MeeGo implies Linux already, just like Android would). 359289 27 pkasting 2011-02-28 13:26:26 -0800 (In reply to comment #26) > (From update of attachment 82840 [details]) > 1./ From the Android 2.3 Compatibility Definition it is clear that Android > mandates reporting the DeviceModel - > (http://source.android.com/compatibility/android-2.3-cdd.pdf): > > The user agent string reported by the WebView MUST be in this format: > > Mozilla/5.0 (Linux; U; Android $(VERSION); $(LOCALE); $(MODEL) Build/$(BUILD)) > AppleWebKit/533.1 (KHTML, like > Gecko) Version/4.0 Mobile Safari/533.1 Interesting... that's probably going to have to change as we're scrapping U; and $(LOCALE); and I doubt Android browsers are going to want to differ. > I think we should only report the model info for specific mobile platforms (e.g. Symbian; MeeGo). For these mobile platforms the "%Platform%" part of the UA string should be specific to the mobile platform as well (e.g report "MeeGo" as the platform, instead of Linux or X11 - as MeeGo implies Linux already, just like Android would). Yes, please do this, it matches what Firefox 4 is doing (see http://hacks.mozilla.org/2010/09/final-user-agent-string-for-firefox-4/ point 4). 361653 28 ademar 2011-03-03 09:00:14 -0800 Please remember that tomorrow is the deadline to have this fix included in the weekly tag of Qtwebkit-2.1, so if you have a patch, you should submit it ASAP. 361691 29 ademar 2011-03-03 09:41:35 -0800 (In reply to comment #28) > Please remember that tomorrow is the deadline to have this fix included in the weekly tag of Qtwebkit-2.1, so if you have a patch, you should submit it ASAP. By tomorrow I mean tomorrow by noon. 362443 30 84733 qi.2.zhang 2011-03-04 05:59:59 -0800 Created attachment 84733 patch2 Update the patch based on Laszlo's latest comments. 362461 31 84733 laszlo.gombos 2011-03-04 06:37:44 -0800 Comment on attachment 84733 patch2 LGTM. r+. 362491 32 84733 laszlo.gombos 2011-03-04 07:53:47 -0800 Comment on attachment 84733 patch2 + !CONFIG(QTDIR_build):!contains(DEFINES, ENABLE_QT_USERAGENT_DEVICEMODEL=.) { + contains(MOBILITY_CONFIG, systeminfo) { + DEFINES += ENABLE_QT_SYSTEMINFO=1 + } I missed that ENABLE_QT_SYSTEMINFO needs to be renamed to ENABLE_QT_USERAGENT_DEVICEMODEL r- to take it out from the queue. 362503 33 84733 kenneth 2011-03-04 08:17:06 -0800 Comment on attachment 84733 patch2 Weren't we trying to simplify the UA? 362593 34 84770 qi.2.zhang 2011-03-04 10:06:42 -0800 Created attachment 84770 patch3 Update patch. 362627 35 84782 ademar 2011-03-04 10:53:58 -0800 Created attachment 84782 patch for qtwebkit-2.1, sent by Laszlo / Qi Laszlo sent me this backport rubber-stamped. It's being added to 2.1 right now. 362630 36 84782 kenneth 2011-03-04 10:58:57 -0800 Comment on attachment 84782 patch for qtwebkit-2.1, sent by Laszlo / Qi View in context: https://bugs.webkit.org/attachment.cgi?id=84782&action=review > WebCore/WebCore.pri:139 > +# systeminfo support if QtMobility systeminfo module exists, but only for symbian, maemo and meego > +symbian|maemo5|maemo6 { > + !CONFIG(QTDIR_build):!contains(DEFINES, ENABLE_QT_USERAGENT_DEVICEMODEL=.) { Does the people who decided adding this device info know there is an ongoing effort to remove these things from the UA's? This seems like a step in the wrong direction. > WebKit/qt/Api/qwebpage.cpp:1997 > - Its argument, either true or false, indicates whether or not the load > + Its argument, either true or false, indicates whether or not the load Why adding a trailing space here? > WebKit/qt/Api/qwebpage.cpp:3873 > + // adding Model Number We normally use proper sentences. 362649 37 ademar 2011-03-04 11:55:18 -0800 Well... this bug discussion clearly shows why the policy is to only add patches to a branch after they're included in trunk and not before, but given the circunstances (symbian need/pressure + extended holiday), I had no choice but to add it to the branch. Hopefully it does end in trunk AS IS. Please have in mind that I'm now on vacation and we have an extended holiday ahead of us here in Brazil. If some problem happens in the next days, someone with commit privileges on the branches please go ahead and revert it. Patch added to 2.1 as 01f01edc8dde851f60a1067190e9a819c9bb024a, merged into 2.1.x as well. 362715 38 84770 laszlo.gombos 2011-03-04 14:50:44 -0800 Comment on attachment 84770 patch3 > Does the people who decided adding this device info know there is an ongoing effort to remove these things from the UA's? This seems like a step in the wrong direction. Well, I can only speak for myself, but I'm aware of bug 54556 (hint: check the reporter). > Weren't we trying to simplify the UA? The simplified UA model is "Mozilla/5.0 (%Platform%; %Subplatform%)...."; this patch fits into that model and makes both the %Platform% and %Subplatform% more specific for that narrow use-case where this information is used. Note that in general neither %Platform% nor %Subplatform% should not be used for making a decision on the server what sort of web content to offer for the browser. This patch allows to turn this reporting of by setting ENABLE_QT_USERAGENT_DEVICEMODEL=0 at build time. I believe most serious concerns were addressed. r=me. 362960 39 84770 commit-queue 2011-03-05 09:32:25 -0800 Comment on attachment 84770 patch3 Clearing flags on attachment: 84770 Committed r80424: <http://trac.webkit.org/changeset/80424> 362961 40 commit-queue 2011-03-05 09:32:33 -0800 All reviewed patches have been landed. Closing bug. 72535 2010-11-01 11:50:40 -0700 2010-11-02 09:40:50 -0700 Implementation proposal v1, wanted to hear comments, if you believe tests are needed, please comment appropriately. UA.patch text/plain 5562 Stanislav.Paltis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MTAzOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMTEtMDEgIFN0YW5pc2xhdiBQYWx0aXMgIDxTdGFuaXNsYXYu UGFsdGlzQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBbUXRdIE1vYmlsZSBEZXZpY2VzIHNob3VsZCBpbmNsdWRlIE1vZGVsIGFuZCBG aXJtd2FyZSBWZXJzaW9uIGluIFdlYmtpdCBHZW5lcmF0ZWQgVXNlciBBZ2VudCBTdHJpbmcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4NjM2CisKKyAg ICAgICAgSW1wbGVtZW50ZWQgYWJvdmUgZmVhdHVyZSBiZWhpbmQgdGhlIGZsYWcgUVRfU1lTVEVN SU5GTyAtIHdpbGwgYmUKKyAgICAgICAgZW5hYmxlZCBpZiBRdE1vYmlsaXR5IHN5c3RlbWluZm8g bW9kdWxlIGlzIGF2YWlsYWJsZS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIChPT1BTISkKKwor ICAgICAgICAqIFdlYkNvcmUucHJvOgorICAgICAgICAqIGZlYXR1cmVzLnByaToKKwogMjAxMC0x MS0wMSAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBBZGFtIFJvYmVuLgpJbmRleDogV2ViQ29yZS9XZWJDb3JlLnBybwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL1dlYkNvcmUucHJvCShyZXZpc2lvbiA3MTAzNCkKKysrIFdlYkNvcmUv V2ViQ29yZS5wcm8JKHdvcmtpbmcgY29weSkKQEAgLTMzMTUsNiArMzMxNSwxMSBAQCBjb250YWlu cyhERUZJTkVTLCBFTkFCTEVfUVRfQkVBUkVSPTEpIHsKICAgICB9CiB9CiAKK2NvbnRhaW5zKERF RklORVMsIEVOQUJMRV9RVF9TWVNURU1JTkZPPTEpIHsKKyAgICAgQ09ORklHICs9IG1vYmlsaXR5 CisgICAgIE1PQklMSVRZICs9IHN5c3RlbWluZm8KK30KKwogY29udGFpbnMoREVGSU5FUywgRU5B QkxFX0dFT0xPQ0FUSU9OPTEpIHsKICAgICBERUZJTkVTICs9IFdURl9VU0VfUFJFRU1QVF9HRU9M T0NBVElPTl9QRVJNSVNTSU9OCiAgICAgSEVBREVSUyArPSBcCkluZGV4OiBXZWJDb3JlL2ZlYXR1 cmVzLnByaQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2ZlYXR1cmVzLnByaQkocmV2aXNpb24gNzEw MzQpCisrKyBXZWJDb3JlL2ZlYXR1cmVzLnByaQkod29ya2luZyBjb3B5KQpAQCAtMTE1LDYgKzEx NSwxMyBAQCBjb250YWlucyhERUZJTkVTLCBFTkFCTEVfU0lOR0xFX1RIUkVBREVECiAgICAgfQog fQogCisjIHN5c3RlbWluZm8gc3VwcG9ydCBpZiBRdE1vYmlsaXR5IHN5c3RlbWluZm8gbW9kdWxl IGV4aXN0cworIUNPTkZJRyhRVERJUl9idWlsZCk6IWNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9R VF9TWVNURU1JTkZPPS4pIHsKKyAgICBjb250YWlucyhNT0JJTElUWV9DT05GSUcsIHN5c3RlbWlu Zm8pIHsKKyAgICAgICBERUZJTkVTICs9IEVOQUJMRV9RVF9TWVNURU1JTkZPPTEKKyAgICB9Cit9 CisKICMgQmVhcmVyIG1hbmFnZW1lbnQgaXMgcGFydCBvZiBRdCA0LjcKICMgZm9yIG9sZGVyIHZl cnNpb24sIGNoZWNrIGZvciBtb2JpbGl0eSB3aXRoIGJlYXJlcgogIWNvbnRhaW5zKERFRklORVMs IEVOQUJMRV9RVF9CRUFSRVI9LikgewpJbmRleDogV2ViS2l0L3F0L0NoYW5nZUxvZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiA3MTAzOSkKKysrIFdlYktpdC9x dC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0xMS0wMSAg U3RhbmlzbGF2IFBhbHRpcyAgPFN0YW5pc2xhdi5QYWx0aXNAbm9raWEuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gTW9iaWxlIERldmlj ZXMgc2hvdWxkIGluY2x1ZGUgTW9kZWwgYW5kIEZpcm13YXJlIFZlcnNpb24gaW4gV2Via2l0IEdl bmVyYXRlZCBVc2VyIEFnZW50IFN0cmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDg2MzYKKworICAgICAgICBJbXBsZW1lbnRhdGlvbiBvZiBpbmNs dWRpbmcgUGhvbmUgTW9kZWwgYW5kIEZpcm13YXJlIHZlcnNpb24gaW4gdGhlCisgICAgICAgIFVz ZXIgQWdlbnQgU3RyaW5nLiBJbXBsZW1lbnRhdGlvbiBpcyBiZWhpbmQgdGhlIFFUX1NZU1RFTUlO Rk8gZmxhZy4KKworICAgICAgICBGaXhlZCBhZGRpdGlvbiBvZiBTNjAgVmVyc2lvbiBpbiBVc2Vy IEFnZW50LCB3aGVyZSBleHRyYSBzcGFjZSB3b3VkbCBzaG93IHVwLCBpZiBTNjAKKyAgICAgICAg dmVyc2lvbiB3b3VsZCBub3QgYmUgaW5jbHVkZWQuCisKKyAgICAgICAgKiBBcGkvcXdlYnBhZ2Uu Y3BwOgorICAgICAgICAoUVdlYlBhZ2U6OnVzZXJBZ2VudEZvclVybCk6CisgICAgICAgIChRV2Vi UGFnZVByaXZhdGU6Ol9xX29uTG9hZFByb2dyZXNzQ2hhbmdlZCk6CisKIDIwMTAtMTAtMzEgIFJv YmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFu dG9uaW8gR29tZXMuCkluZGV4OiBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAkocmV2aXNpb24gNzEwMzQpCisrKyBXZWJL aXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTMwLDYgKzEzMCw5IEBA CiAjaW5jbHVkZSA8UVgxMUluZm8+CiAjZW5kaWYKIAorI2lmIEVOQUJMRShRVF9TWVNURU1JTkZP KQorI2luY2x1ZGUgPHFzeXN0ZW1pbmZvLmg+ICAgICAgICAKKyNlbmRpZiAgICAgICAgCiAKIHVz aW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCkBAIC0zNTkxLDE3ICszNTk0LDE5IEBAIFFTdHJpbmcg UVdlYlBhZ2U6OnVzZXJBZ2VudEZvclVybChjb25zdAogI2VsaWYgZGVmaW5lZCBRX09TX1VMVFJJ WAogICAgICAgICBmaXJzdFBhcnRUZW1wICs9IFFTdHJpbmc6OmZyb21MYXRpbjEoIkRFQyBVbHRy aXgiKTsKICNlbGlmIGRlZmluZWQgUV9PU19TWU1CSUFOCi0gICAgICAgIGZpcnN0UGFydFRlbXAg Kz0gUUxhdGluMUNoYXIoJyAnKTsKICAgICAgICAgUVN5c0luZm86OlM2MFZlcnNpb24gczYwVmVy c2lvbiA9IFFTeXNJbmZvOjpzNjBWZXJzaW9uKCk7CiAgICAgICAgIHN3aXRjaCAoczYwVmVyc2lv bikgewogICAgICAgICBjYXNlIFFTeXNJbmZvOjpTVl9TNjBfM18xOgogICAgICAgICAgICAgZmly c3RQYXJ0VGVtcCArPSBRU3RyaW5nOjpmcm9tTGF0aW4xKCJTZXJpZXM2MC8zLjEiKTsKKyAgICAg ICAgICAgIGZpcnN0UGFydFRlbXAgKz0gUUxhdGluMUNoYXIoJyAnKTsKICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICBjYXNlIFFTeXNJbmZvOjpTVl9TNjBfM18yOgogICAgICAgICAgICAgZmly c3RQYXJ0VGVtcCArPSBRU3RyaW5nOjpmcm9tTGF0aW4xKCJTZXJpZXM2MC8zLjIiKTsKKyAgICAg ICAgICAgIGZpcnN0UGFydFRlbXAgKz0gUUxhdGluMUNoYXIoJyAnKTsKICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICBjYXNlIFFTeXNJbmZvOjpTVl9TNjBfNV8wOgogICAgICAgICAgICAgZmly c3RQYXJ0VGVtcCArPSBRU3RyaW5nOjpmcm9tTGF0aW4xKCJTZXJpZXM2MC81LjAiKTsKKyAgICAg ICAgICAgIGZpcnN0UGFydFRlbXAgKz0gUUxhdGluMUNoYXIoJyAnKTsKICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgYnJlYWs7CkBAIC0zNjE0LDYgKzM2 MTksMTYgQEAgUVN0cmluZyBRV2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKGNvbnN0CiAgICAgICAg IGZpcnN0UGFydFRlbXAgKz0gUVN0cmluZzo6ZnJvbUxhdGluMSgiVW5rbm93biIpOwogI2VuZGlm CiAKKyNpZiBFTkFCTEUoUVRfU1lTVEVNSU5GTykKKyAgICAgICAgLy8gYWRkaW5nIE1vZGVsIE51 bWJlciBhbmQgRmlybXdhcmUgVmVyc2lvbgorICAgICAgICBRdE1vYmlsaXR5OjpRU3lzdGVtRGV2 aWNlSW5mbyBzeXN0ZW1EZXZpY2VJbmZvID0gUXRNb2JpbGl0eTo6UVN5c3RlbURldmljZUluZm8o ZC0+cSk7CisgICAgICAgIFF0TW9iaWxpdHk6OlFTeXN0ZW1JbmZvIHN5c3RlbUluZm8gPSBRdE1v YmlsaXR5OjpRU3lzdGVtSW5mbyhkLT5xKTsKKyAgICAgICAgCisgICAgICAgIGZpcnN0UGFydFRl bXAgKz0gc3lzdGVtRGV2aWNlSW5mby5tb2RlbCgpOworICAgICAgICBmaXJzdFBhcnRUZW1wICs9 IFFTdHJpbmc6OmZyb21MYXRpbjEoIi8iKTsKKyAgICAgICAgZmlyc3RQYXJ0VGVtcCArPSBzeXN0 ZW1JbmZvLnZlcnNpb24oUXRNb2JpbGl0eTo6UVN5c3RlbUluZm86OkZpcm13YXJlKTsKKyNlbmRp ZgorICAgICAgICAKICAgICAgICAgLy8gbGFuZ3VhZ2UgaXMgdGhlIHNwbGl0CiAgICAgICAgIGZp cnN0UGFydFRlbXAgKz0gUVN0cmluZzo6ZnJvbUxhdGluMSgiOyAiKTsKICAgICAgICAgZmlyc3RQ YXJ0VGVtcC5zcXVlZXplKCk7CkBAIC0zNjI4LDcgKzM2NDMsNiBAQCBRU3RyaW5nIFFXZWJQYWdl Ojp1c2VyQWdlbnRGb3JVcmwoY29uc3QKICAgICAgICAgc2Vjb25kUGFydFRlbXAgKz0gcVdlYktp dFZlcnNpb24oKTsKICAgICAgICAgc2Vjb25kUGFydFRlbXAgKz0gUVN0cmluZzo6ZnJvbUxhdGlu MSgiIChLSFRNTCwgbGlrZSBHZWNrbykgIik7CiAKLQogICAgICAgICAvLyBBcHBsaWNhdGlvbiBu YW1lIHNwbGl0IHRoZSB0aGlyZCBwYXJ0CiAgICAgICAgIHNlY29uZFBhcnRUZW1wLnNxdWVlemUo KTsKICAgICAgICAgc2Vjb25kUGFydCA9IHNlY29uZFBhcnRUZW1wOwpAQCAtMzY3MCwxNCArMzY4 NCwxMiBAQCBRU3RyaW5nIFFXZWJQYWdlOjp1c2VyQWdlbnRGb3JVcmwoY29uc3QKICAgICByZXR1 cm4gZmlyc3RQYXJ0ICsgbGFuZ3VhZ2VOYW1lICsgc2Vjb25kUGFydCArIGFwcE5hbWUgKyB0aGly ZFBhcnQ7CiB9CiAKLQogdm9pZCBRV2ViUGFnZVByaXZhdGU6Ol9xX29uTG9hZFByb2dyZXNzQ2hh bmdlZChpbnQpCiB7CiAgICAgbV90b3RhbEJ5dGVzID0gcGFnZS0+cHJvZ3Jlc3MoKS0+dG90YWxQ YWdlQW5kUmVzb3VyY2VCeXRlc1RvTG9hZCgpOwogICAgIG1fYnl0ZXNSZWNlaXZlZCA9IHBhZ2Ut PnByb2dyZXNzKCktPnRvdGFsQnl0ZXNSZWNlaXZlZCgpOwogfQogCi0KIC8qIQogICAgIFJldHVy bnMgdGhlIHRvdGFsIG51bWJlciBvZiBieXRlcyB0aGF0IHdlcmUgcmVjZWl2ZWQgZnJvbSB0aGUg bmV0d29yayB0byByZW5kZXIgdGhlIGN1cnJlbnQgcGFnZSwKICAgICBpbmNsdWRpbmcgZXh0cmEg Y29udGVudCBzdWNoIGFzIGVtYmVkZGVkIGltYWdlcy4K 72681 2010-11-02 09:40:56 -0700 2010-11-02 10:01:39 -0700 Patch bug-48636-20101102174055.patch text/plain 5780 Stanislav.Paltis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MTEyMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjcgQEAKKzIwMTAtMTEtMDIgIFN0YW5pc2xhdiBQYWx0aXMgIDxTdGFuaXNsYXYu UGFsdGlzQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBbUXRdIE1vYmlsZSBEZXZpY2VzIHNob3VsZCBpbmNsdWRlIE1vZGVsIGFuZCBG aXJtd2FyZSBWZXJzaW9uIGluIFdlYmtpdCBHZW5lcmF0ZWQgVXNlciBBZ2VudCBTdHJpbmcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4NjM2CisKKyAg ICAgICAgSW1wbGVtZW50YXRpb24gb2YgaW5jbHVkaW5nIFBob25lIE1vZGVsIGFuZCBGaXJtd2Fy ZSB2ZXJzaW9uIGluIHRoZSAKKyAgICAgICAgVXNlciBBZ2VudCBTdHJpbmcuIEltcGxlbWVudGF0 aW9uIGlzIGJlaGluZCB0aGUgUVRfU1lTVEVNSU5GTyBmbGFnLgorCisgICAgICAgIElmIE1vZGVs IFN0cmluZyBpcyBlbXB0eSwgdGhlIHdob2xlIHNlY3Rpb24gd29uJ3QgYmUgYWRkZWQsIGJ1dCBp ZgorICAgICAgICBNb2RlbCBpcyBub3QgZW1wdHksIGJ1dCBGaXJtd2FyZSBpcyBlbXB0eSBzdHJp bmcsIHRoYW4gIi8iIHdvbid0IGJlCisgICAgICAgIGFkZGVkLgorCisgICAgICAgIEZpeGVkIGFk ZGl0aW9uIG9mIFM2MCBWZXJzaW9uIGluIFVzZXIgQWdlbnQsIHdoZXJlIGV4dHJhIHNwYWNlIHdv dWxkIHNob3cgdXAsIAorICAgICAgICBpZiBTNjAgdmVyc2lvbiB3b3VsZCBub3QgYmUgaW5jbHVk ZWQuIFRoZSBzcGFjZSBpcyBuZWVkZWQgYWZ0ZXIgUzYwCisgICAgICAgIFZlcnNpb24gYXMgc3Bh Y2UgaXMgYWRkZWQgZWl0aGVyIGluIHRoZSBzZWN0aW9uIFN5bWJpYW4gT1MgVmVyc2lvbgorICAg ICAgICBzZWN0aW9uIG9yL2FuZCB3aGVuIGFkZGluZyBTU0wgU3VwcG9ydC4gCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBXZWJDb3JlLnBybzoKKyAgICAgICAg KiBmZWF0dXJlcy5wcmk6CisKIDIwMTAtMTEtMDEgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNv bkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFhhbiBMb3Blei4KSW5kZXg6IFdl YkNvcmUvV2ViQ29yZS5wcm8KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9XZWJDb3JlLnBybwkocmV2 aXNpb24gNzExMjEpCisrKyBXZWJDb3JlL1dlYkNvcmUucHJvCSh3b3JraW5nIGNvcHkpCkBAIC0z MzE0LDYgKzMzMTQsMTEgQEAgY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1FUX0JFQVJFUj0xKSB7 CiAgICAgfQogfQogCitjb250YWlucyhERUZJTkVTLCBFTkFCTEVfUVRfU1lTVEVNSU5GTz0xKSB7 CisgICAgIENPTkZJRyArPSBtb2JpbGl0eQorICAgICBNT0JJTElUWSArPSBzeXN0ZW1pbmZvCit9 CisKIGNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9HRU9MT0NBVElPTj0xKSB7CiAgICAgREVGSU5F UyArPSBXVEZfVVNFX1BSRUVNUFRfR0VPTE9DQVRJT05fUEVSTUlTU0lPTgogICAgIEhFQURFUlMg Kz0gXApJbmRleDogV2ViQ29yZS9mZWF0dXJlcy5wcmkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9m ZWF0dXJlcy5wcmkJKHJldmlzaW9uIDcxMTIxKQorKysgV2ViQ29yZS9mZWF0dXJlcy5wcmkJKHdv cmtpbmcgY29weSkKQEAgLTExNSw2ICsxMTUsMTMgQEAgY29udGFpbnMoREVGSU5FUywgRU5BQkxF X1NJTkdMRV9USFJFQURFRAogICAgIH0KIH0KIAorIyBzeXN0ZW1pbmZvIHN1cHBvcnQgaWYgUXRN b2JpbGl0eSBzeXN0ZW1pbmZvIG1vZHVsZSBleGlzdHMKKyFDT05GSUcoUVRESVJfYnVpbGQpOiFj b250YWlucyhERUZJTkVTLCBFTkFCTEVfUVRfU1lTVEVNSU5GTz0uKSB7CisgICAgY29udGFpbnMo TU9CSUxJVFlfQ09ORklHLCBzeXN0ZW1pbmZvKSB7CisgICAgICAgREVGSU5FUyArPSBFTkFCTEVf UVRfU1lTVEVNSU5GTz0xCisgICAgfQorfQorCiAjIEJlYXJlciBtYW5hZ2VtZW50IGlzIHBhcnQg b2YgUXQgNC43CiAjIGZvciBvbGRlciB2ZXJzaW9uLCBjaGVjayBmb3IgbW9iaWxpdHkgd2l0aCBi ZWFyZXIKICFjb250YWlucyhERUZJTkVTLCBFTkFCTEVfUVRfQkVBUkVSPS4pIHsKSW5kZXg6IFdl YktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5nZUxvZwkocmV2 aXNpb24gNzExMjEpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMjUgQEAKKzIwMTAtMTEtMDIgIFN0YW5pc2xhdiBQYWx0aXMgIDxTdGFuaXNsYXYuUGFs dGlzQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBbUXRdIE1vYmlsZSBEZXZpY2VzIHNob3VsZCBpbmNsdWRlIE1vZGVsIGFuZCBGaXJt d2FyZSBWZXJzaW9uIGluIFdlYmtpdCBHZW5lcmF0ZWQgVXNlciBBZ2VudCBTdHJpbmcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4NjM2CisKKyAgICAg ICAgSW1wbGVtZW50YXRpb24gb2YgaW5jbHVkaW5nIFBob25lIE1vZGVsIGFuZCBGaXJtd2FyZSB2 ZXJzaW9uIGluIHRoZSAKKyAgICAgICAgVXNlciBBZ2VudCBTdHJpbmcuIEltcGxlbWVudGF0aW9u IGlzIGJlaGluZCB0aGUgUVRfU1lTVEVNSU5GTyBmbGFnLgorCisgICAgICAgIElmIE1vZGVsIFN0 cmluZyBpcyBlbXB0eSwgdGhlIHdob2xlIHNlY3Rpb24gd29uJ3QgYmUgYWRkZWQsIGJ1dCBpZiAK KyAgICAgICAgTW9kZWwgaXMgbm90IGVtcHR5LCBidXQgRmlybXdhcmUgaXMgZW1wdHkgc3RyaW5n LCB0aGFuICIvIiB3b24ndCBiZSAKKyAgICAgICAgYWRkZWQuCisKKyAgICAgICAgRml4ZWQgYWRk aXRpb24gb2YgUzYwIFZlcnNpb25pbiBVc2VyIEFnZW50LCB3aGVyZSBleHRyYSBzcGFjZSB3b3Vs ZCBzaG93IHVwLCAKKyAgICAgICAgaWYgUzYwIHZlcnNpb24gd291bGQgbm90IGJlIGluY2x1ZGVk LiBUaGUgc3BhY2UgaXMgbmVlZGVkIGFmdGVyIFM2MCBWZXJzaW9uIGFzCisgICAgICAgIHNwYWNl IGlzIGFkZGVkIGVpdGhlciBpbiB0aGUgc2VjdGlvbiBTeW1iaWFuIE9TIFZlcnNpb24gc2VjdGlv biBvci9hbmQKKyAgICAgICAgd2hlbiBhZGRpbmcgU1NMIFN1cHBvcnQuCisKKyAgICAgICAgKiBB cGkvcXdlYnBhZ2UuY3BwOgorICAgICAgICAoUVdlYlBhZ2U6OnVzZXJBZ2VudEZvclVybCk6CisK IDIwMTAtMTEtMDEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEFuZGVycyBDYXJsc3Nvbi4KSW5kZXg6IFdlYktpdC9xdC9BcGkvcXdlYnBh Z2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCShyZXZpc2lv biA3MTEyMSkKKysrIFdlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xMzAsNiArMTMwLDkgQEAKICNpbmNsdWRlIDxRWDExSW5mbz4KICNlbmRpZgogCisjaWYgRU5B QkxFKFFUX1NZU1RFTUlORk8pCisjaW5jbHVkZSA8cXN5c3RlbWluZm8uaD4gICAgICAgIAorI2Vu ZGlmICAgICAgICAKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTM1OTEsMTcgKzM1 OTQsMTYgQEAgUVN0cmluZyBRV2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKGNvbnN0CiAjZWxpZiBk ZWZpbmVkIFFfT1NfVUxUUklYCiAgICAgICAgIGZpcnN0UGFydFRlbXAgKz0gUVN0cmluZzo6ZnJv bUxhdGluMSgiREVDIFVsdHJpeCIpOwogI2VsaWYgZGVmaW5lZCBRX09TX1NZTUJJQU4KLSAgICAg ICAgZmlyc3RQYXJ0VGVtcCArPSBRTGF0aW4xQ2hhcignICcpOwogICAgICAgICBRU3lzSW5mbzo6 UzYwVmVyc2lvbiBzNjBWZXJzaW9uID0gUVN5c0luZm86OnM2MFZlcnNpb24oKTsKICAgICAgICAg c3dpdGNoIChzNjBWZXJzaW9uKSB7CiAgICAgICAgIGNhc2UgUVN5c0luZm86OlNWX1M2MF8zXzE6 Ci0gICAgICAgICAgICBmaXJzdFBhcnRUZW1wICs9IFFTdHJpbmc6OmZyb21MYXRpbjEoIlNlcmll czYwLzMuMSIpOworICAgICAgICAgICAgZmlyc3RQYXJ0VGVtcCArPSBRU3RyaW5nOjpmcm9tTGF0 aW4xKCJTZXJpZXM2MC8zLjEgIik7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBR U3lzSW5mbzo6U1ZfUzYwXzNfMjoKLSAgICAgICAgICAgIGZpcnN0UGFydFRlbXAgKz0gUVN0cmlu Zzo6ZnJvbUxhdGluMSgiU2VyaWVzNjAvMy4yIik7CisgICAgICAgICAgICBmaXJzdFBhcnRUZW1w ICs9IFFTdHJpbmc6OmZyb21MYXRpbjEoIlNlcmllczYwLzMuMiAiKTsKICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICBjYXNlIFFTeXNJbmZvOjpTVl9TNjBfNV8wOgotICAgICAgICAgICAgZmly c3RQYXJ0VGVtcCArPSBRU3RyaW5nOjpmcm9tTGF0aW4xKCJTZXJpZXM2MC81LjAiKTsKKyAgICAg ICAgICAgIGZpcnN0UGFydFRlbXAgKz0gUVN0cmluZzo6ZnJvbUxhdGluMSgiU2VyaWVzNjAvNS4w ICIpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICBi cmVhazsKQEAgLTM2MTQsNiArMzYxNiwyMiBAQCBRU3RyaW5nIFFXZWJQYWdlOjp1c2VyQWdlbnRG b3JVcmwoY29uc3QKICAgICAgICAgZmlyc3RQYXJ0VGVtcCArPSBRU3RyaW5nOjpmcm9tTGF0aW4x KCJVbmtub3duIik7CiAjZW5kaWYKIAorI2lmIEVOQUJMRShRVF9TWVNURU1JTkZPKQorICAgICAg ICAvLyBhZGRpbmcgTW9kZWwgTnVtYmVyIGFuZCBGaXJtd2FyZSBWZXJzaW9uCisgICAgICAgIFF0 TW9iaWxpdHk6OlFTeXN0ZW1EZXZpY2VJbmZvIHN5c3RlbURldmljZUluZm8gPSBRdE1vYmlsaXR5 OjpRU3lzdGVtRGV2aWNlSW5mbyhkLT5xKTsKKyAgICAgICAgUXRNb2JpbGl0eTo6UVN5c3RlbUlu Zm8gc3lzdGVtSW5mbyA9IFF0TW9iaWxpdHk6OlFTeXN0ZW1JbmZvKGQtPnEpOworICAgICAgICAK KyAgICAgICAgUVN0cmluZyBtb2RlbCA9IHN5c3RlbURldmljZUluZm8ubW9kZWwoKTsKKyAgICAg ICAgaWYgKCFtb2RlbC5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgIGZpcnN0UGFydFRlbXAgKz0g c3lzdGVtRGV2aWNlSW5mby5tb2RlbCgpOworICAgICAgICAgICAgUVN0cmluZyBmaXJtd2FyZSA9 IHN5c3RlbUluZm8udmVyc2lvbihRdE1vYmlsaXR5OjpRU3lzdGVtSW5mbzo6RmlybXdhcmUpOwor ICAgICAgICAgICAgaWYgKCFmaXJtd2FyZS5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgICAgICBm aXJzdFBhcnRUZW1wICs9IFFTdHJpbmc6OmZyb21MYXRpbjEoIi8iKTsKKyAgICAgICAgICAgICAg ICBmaXJzdFBhcnRUZW1wICs9IGZpcm13YXJlOworICAgICAgICAgICAgfQorICAgICAgICB9Cisj ZW5kaWYKKyAgICAgICAgCiAgICAgICAgIC8vIGxhbmd1YWdlIGlzIHRoZSBzcGxpdAogICAgICAg ICBmaXJzdFBhcnRUZW1wICs9IFFTdHJpbmc6OmZyb21MYXRpbjEoIjsgIik7CiAgICAgICAgIGZp cnN0UGFydFRlbXAuc3F1ZWV6ZSgpOwo= 72691 2010-11-02 10:01:46 -0700 2010-11-03 08:15:43 -0700 Patch bug-48636-20101102180145.patch text/plain 5781 Stanislav.Paltis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MTEyMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjcgQEAKKzIwMTAtMTEtMDIgIFN0YW5pc2xhdiBQYWx0aXMgIDxTdGFuaXNsYXYu UGFsdGlzQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBbUXRdIE1vYmlsZSBEZXZpY2VzIHNob3VsZCBpbmNsdWRlIE1vZGVsIGFuZCBG aXJtd2FyZSBWZXJzaW9uIGluIFdlYmtpdCBHZW5lcmF0ZWQgVXNlciBBZ2VudCBTdHJpbmcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4NjM2CisKKyAg ICAgICAgSW1wbGVtZW50YXRpb24gb2YgaW5jbHVkaW5nIHBob25lIG1vZGVsIGFuZCBmaXJtd2Fy ZSB2ZXJzaW9uIGluIHRoZSAKKyAgICAgICAgVXNlciBBZ2VudCBzdHJpbmcuIEltcGxlbWVudGF0 aW9uIGlzIGJlaGluZCB0aGUgUVRfU1lTVEVNSU5GTyBmbGFnLgorCisgICAgICAgIElmIG1vZGVs IHN0cmluZyBpcyBlbXB0eSwgdGhlIHdob2xlIHNlY3Rpb24gd29uJ3QgYmUgYWRkZWQsIGJ1dCBp ZgorICAgICAgICBtb2RlbCBpcyBub3QgZW1wdHksIGJ1dCBmaXJtd2FyZSBpcyBlbXB0eSBzdHJp bmcsIHRoYW4gIi8iIHdvbid0IGJlCisgICAgICAgIGFkZGVkLgorCisgICAgICAgIEZpeGVkIGFk ZGl0aW9uIG9mIFM2MCB2ZXJzaW9uIGluIFVzZXIgQWdlbnQsIHdoZXJlIGV4dHJhIHNwYWNlIHdv dWxkIHNob3cgdXAsIAorICAgICAgICBpZiBTNjAgdmVyc2lvbiB3b3VsZCBub3QgYmUgaW5jbHVk ZWQuIFRoZSBzcGFjZSBpcyBuZWVkZWQgYWZ0ZXIgUzYwCisgICAgICAgIHZlcnNpb24gYXMgc3Bh Y2UgaXMgYWRkZWQgZWl0aGVyIGluIHRoZSBzZWN0aW9uIFN5bWJpYW4gT1MgVmVyc2lvbgorICAg ICAgICBzZWN0aW9uIG9yL2FuZCB3aGVuIGFkZGluZyBTU0wgU3VwcG9ydC4gCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBXZWJDb3JlLnBybzoKKyAgICAgICAg KiBmZWF0dXJlcy5wcmk6CisKIDIwMTAtMTEtMDEgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNv bkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFhhbiBMb3Blei4KSW5kZXg6IFdl YkNvcmUvV2ViQ29yZS5wcm8KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9XZWJDb3JlLnBybwkocmV2 aXNpb24gNzExMjEpCisrKyBXZWJDb3JlL1dlYkNvcmUucHJvCSh3b3JraW5nIGNvcHkpCkBAIC0z MzE0LDYgKzMzMTQsMTEgQEAgY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1FUX0JFQVJFUj0xKSB7 CiAgICAgfQogfQogCitjb250YWlucyhERUZJTkVTLCBFTkFCTEVfUVRfU1lTVEVNSU5GTz0xKSB7 CisgICAgIENPTkZJRyArPSBtb2JpbGl0eQorICAgICBNT0JJTElUWSArPSBzeXN0ZW1pbmZvCit9 CisKIGNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9HRU9MT0NBVElPTj0xKSB7CiAgICAgREVGSU5F UyArPSBXVEZfVVNFX1BSRUVNUFRfR0VPTE9DQVRJT05fUEVSTUlTU0lPTgogICAgIEhFQURFUlMg Kz0gXApJbmRleDogV2ViQ29yZS9mZWF0dXJlcy5wcmkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9m ZWF0dXJlcy5wcmkJKHJldmlzaW9uIDcxMTIxKQorKysgV2ViQ29yZS9mZWF0dXJlcy5wcmkJKHdv cmtpbmcgY29weSkKQEAgLTExNSw2ICsxMTUsMTMgQEAgY29udGFpbnMoREVGSU5FUywgRU5BQkxF X1NJTkdMRV9USFJFQURFRAogICAgIH0KIH0KIAorIyBzeXN0ZW1pbmZvIHN1cHBvcnQgaWYgUXRN b2JpbGl0eSBzeXN0ZW1pbmZvIG1vZHVsZSBleGlzdHMKKyFDT05GSUcoUVRESVJfYnVpbGQpOiFj b250YWlucyhERUZJTkVTLCBFTkFCTEVfUVRfU1lTVEVNSU5GTz0uKSB7CisgICAgY29udGFpbnMo TU9CSUxJVFlfQ09ORklHLCBzeXN0ZW1pbmZvKSB7CisgICAgICAgREVGSU5FUyArPSBFTkFCTEVf UVRfU1lTVEVNSU5GTz0xCisgICAgfQorfQorCiAjIEJlYXJlciBtYW5hZ2VtZW50IGlzIHBhcnQg b2YgUXQgNC43CiAjIGZvciBvbGRlciB2ZXJzaW9uLCBjaGVjayBmb3IgbW9iaWxpdHkgd2l0aCBi ZWFyZXIKICFjb250YWlucyhERUZJTkVTLCBFTkFCTEVfUVRfQkVBUkVSPS4pIHsKSW5kZXg6IFdl YktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5nZUxvZwkocmV2 aXNpb24gNzExMjEpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMjUgQEAKKzIwMTAtMTEtMDIgIFN0YW5pc2xhdiBQYWx0aXMgIDxTdGFuaXNsYXYuUGFs dGlzQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBbUXRdIE1vYmlsZSBEZXZpY2VzIHNob3VsZCBpbmNsdWRlIE1vZGVsIGFuZCBGaXJt d2FyZSBWZXJzaW9uIGluIFdlYmtpdCBHZW5lcmF0ZWQgVXNlciBBZ2VudCBTdHJpbmcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4NjM2CisKKyAgICAg ICAgSW1wbGVtZW50YXRpb24gb2YgaW5jbHVkaW5nIHBob25lIG1vZGVsIGFuZCBmaXJtd2FyZSB2 ZXJzaW9uIGluIHRoZSAKKyAgICAgICAgVXNlciBBZ2VudCBTdHJpbmcuIEltcGxlbWVudGF0aW9u IGlzIGJlaGluZCB0aGUgUVRfU1lTVEVNSU5GTyBmbGFnLgorCisgICAgICAgIElmIG1vZGVsIHN0 cmluZyBpcyBlbXB0eSwgdGhlIHdob2xlIHNlY3Rpb24gd29uJ3QgYmUgYWRkZWQsIGJ1dCBpZiAK KyAgICAgICAgbW9kZWwgaXMgbm90IGVtcHR5LCBidXQgZmlybXdhcmUgaXMgZW1wdHkgc3RyaW5n LCB0aGFuICIvIiB3b24ndCBiZSAKKyAgICAgICAgYWRkZWQuCisKKyAgICAgICAgRml4ZWQgYWRk aXRpb24gb2YgUzYwIHZlcnNpb24gaW4gVXNlciBBZ2VudCwgd2hlcmUgZXh0cmEgc3BhY2Ugd291 bGQgc2hvdyB1cCwgCisgICAgICAgIGlmIFM2MCB2ZXJzaW9uIHdvdWxkIG5vdCBiZSBpbmNsdWRl ZC4gVGhlIHNwYWNlIGlzIG5lZWRlZCBhZnRlciBTNjAgdmVyc2lvbiBhcworICAgICAgICBzcGFj ZSBpcyBhZGRlZCBlaXRoZXIgaW4gdGhlIHNlY3Rpb24gU3ltYmlhbiBPUyBWZXJzaW9uIHNlY3Rp b24gb3IvYW5kCisgICAgICAgIHdoZW4gYWRkaW5nIFNTTCBTdXBwb3J0LgorCisgICAgICAgICog QXBpL3F3ZWJwYWdlLmNwcDoKKyAgICAgICAgKFFXZWJQYWdlOjp1c2VyQWdlbnRGb3JVcmwpOgor CiAyMDEwLTExLTAxICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBBbmRlcnMgQ2FybHNzb24uCkluZGV4OiBXZWJLaXQvcXQvQXBpL3F3ZWJw YWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAkocmV2aXNp b24gNzExMjEpCisrKyBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTMwLDYgKzEzMCw5IEBACiAjaW5jbHVkZSA8UVgxMUluZm8+CiAjZW5kaWYKIAorI2lmIEVO QUJMRShRVF9TWVNURU1JTkZPKQorI2luY2x1ZGUgPHFzeXN0ZW1pbmZvLmg+ICAgICAgICAKKyNl bmRpZiAgICAgICAgCiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCkBAIC0zNTkxLDE3ICsz NTk0LDE2IEBAIFFTdHJpbmcgUVdlYlBhZ2U6OnVzZXJBZ2VudEZvclVybChjb25zdAogI2VsaWYg ZGVmaW5lZCBRX09TX1VMVFJJWAogICAgICAgICBmaXJzdFBhcnRUZW1wICs9IFFTdHJpbmc6OmZy b21MYXRpbjEoIkRFQyBVbHRyaXgiKTsKICNlbGlmIGRlZmluZWQgUV9PU19TWU1CSUFOCi0gICAg ICAgIGZpcnN0UGFydFRlbXAgKz0gUUxhdGluMUNoYXIoJyAnKTsKICAgICAgICAgUVN5c0luZm86 OlM2MFZlcnNpb24gczYwVmVyc2lvbiA9IFFTeXNJbmZvOjpzNjBWZXJzaW9uKCk7CiAgICAgICAg IHN3aXRjaCAoczYwVmVyc2lvbikgewogICAgICAgICBjYXNlIFFTeXNJbmZvOjpTVl9TNjBfM18x OgotICAgICAgICAgICAgZmlyc3RQYXJ0VGVtcCArPSBRU3RyaW5nOjpmcm9tTGF0aW4xKCJTZXJp ZXM2MC8zLjEiKTsKKyAgICAgICAgICAgIGZpcnN0UGFydFRlbXAgKz0gUVN0cmluZzo6ZnJvbUxh dGluMSgiU2VyaWVzNjAvMy4xICIpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2Ug UVN5c0luZm86OlNWX1M2MF8zXzI6Ci0gICAgICAgICAgICBmaXJzdFBhcnRUZW1wICs9IFFTdHJp bmc6OmZyb21MYXRpbjEoIlNlcmllczYwLzMuMiIpOworICAgICAgICAgICAgZmlyc3RQYXJ0VGVt cCArPSBRU3RyaW5nOjpmcm9tTGF0aW4xKCJTZXJpZXM2MC8zLjIgIik7CiAgICAgICAgICAgICBi cmVhazsKICAgICAgICAgY2FzZSBRU3lzSW5mbzo6U1ZfUzYwXzVfMDoKLSAgICAgICAgICAgIGZp cnN0UGFydFRlbXAgKz0gUVN0cmluZzo6ZnJvbUxhdGluMSgiU2VyaWVzNjAvNS4wIik7CisgICAg ICAgICAgICBmaXJzdFBhcnRUZW1wICs9IFFTdHJpbmc6OmZyb21MYXRpbjEoIlNlcmllczYwLzUu MCAiKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAg YnJlYWs7CkBAIC0zNjE0LDYgKzM2MTYsMjIgQEAgUVN0cmluZyBRV2ViUGFnZTo6dXNlckFnZW50 Rm9yVXJsKGNvbnN0CiAgICAgICAgIGZpcnN0UGFydFRlbXAgKz0gUVN0cmluZzo6ZnJvbUxhdGlu MSgiVW5rbm93biIpOwogI2VuZGlmCiAKKyNpZiBFTkFCTEUoUVRfU1lTVEVNSU5GTykKKyAgICAg ICAgLy8gYWRkaW5nIE1vZGVsIE51bWJlciBhbmQgRmlybXdhcmUgVmVyc2lvbgorICAgICAgICBR dE1vYmlsaXR5OjpRU3lzdGVtRGV2aWNlSW5mbyBzeXN0ZW1EZXZpY2VJbmZvID0gUXRNb2JpbGl0 eTo6UVN5c3RlbURldmljZUluZm8oZC0+cSk7CisgICAgICAgIFF0TW9iaWxpdHk6OlFTeXN0ZW1J bmZvIHN5c3RlbUluZm8gPSBRdE1vYmlsaXR5OjpRU3lzdGVtSW5mbyhkLT5xKTsKKyAgICAgICAg CisgICAgICAgIFFTdHJpbmcgbW9kZWwgPSBzeXN0ZW1EZXZpY2VJbmZvLm1vZGVsKCk7CisgICAg ICAgIGlmICghbW9kZWwuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICBmaXJzdFBhcnRUZW1wICs9 IHN5c3RlbURldmljZUluZm8ubW9kZWwoKTsKKyAgICAgICAgICAgIFFTdHJpbmcgZmlybXdhcmUg PSBzeXN0ZW1JbmZvLnZlcnNpb24oUXRNb2JpbGl0eTo6UVN5c3RlbUluZm86OkZpcm13YXJlKTsK KyAgICAgICAgICAgIGlmICghZmlybXdhcmUuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICAgICAg Zmlyc3RQYXJ0VGVtcCArPSBRU3RyaW5nOjpmcm9tTGF0aW4xKCIvIik7CisgICAgICAgICAgICAg ICAgZmlyc3RQYXJ0VGVtcCArPSBmaXJtd2FyZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQor I2VuZGlmCisgICAgICAgIAogICAgICAgICAvLyBsYW5ndWFnZSBpcyB0aGUgc3BsaXQKICAgICAg ICAgZmlyc3RQYXJ0VGVtcCArPSBRU3RyaW5nOjpmcm9tTGF0aW4xKCI7ICIpOwogICAgICAgICBm aXJzdFBhcnRUZW1wLnNxdWVlemUoKTsK 72824 2010-11-03 08:15:50 -0700 2011-03-04 05:59:59 -0800 Patch bug-48636-20101103161550.patch text/plain 3213 Stanislav.Paltis SW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5wcm8KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9XZWJDb3Jl LnBybwkocmV2aXNpb24gNzEyMzkpCisrKyBXZWJDb3JlL1dlYkNvcmUucHJvCSh3b3JraW5nIGNv cHkpCkBAIC0zMzE2LDYgKzMzMTYsMTEgQEAgY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1FUX0JF QVJFUj0xKSB7CiAgICAgfQogfQogCitjb250YWlucyhERUZJTkVTLCBFTkFCTEVfUVRfU1lTVEVN SU5GTz0xKSB7CisgICAgIENPTkZJRyArPSBtb2JpbGl0eQorICAgICBNT0JJTElUWSArPSBzeXN0 ZW1pbmZvCit9CisKIGNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9HRU9MT0NBVElPTj0xKSB7CiAg ICAgREVGSU5FUyArPSBXVEZfVVNFX1BSRUVNUFRfR0VPTE9DQVRJT05fUEVSTUlTU0lPTgogICAg IEhFQURFUlMgKz0gXApJbmRleDogV2ViQ29yZS9mZWF0dXJlcy5wcmkKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9mZWF0dXJlcy5wcmkJKHJldmlzaW9uIDcxMjM5KQorKysgV2ViQ29yZS9mZWF0dXJl cy5wcmkJKHdvcmtpbmcgY29weSkKQEAgLTExNSw2ICsxMTUsMTMgQEAgY29udGFpbnMoREVGSU5F UywgRU5BQkxFX1NJTkdMRV9USFJFQURFRAogICAgIH0KIH0KIAorIyBzeXN0ZW1pbmZvIHN1cHBv cnQgaWYgUXRNb2JpbGl0eSBzeXN0ZW1pbmZvIG1vZHVsZSBleGlzdHMKKyFDT05GSUcoUVRESVJf YnVpbGQpOiFjb250YWlucyhERUZJTkVTLCBFTkFCTEVfUVRfU1lTVEVNSU5GTz0uKSB7CisgICAg Y29udGFpbnMoTU9CSUxJVFlfQ09ORklHLCBzeXN0ZW1pbmZvKSB7CisgICAgICAgREVGSU5FUyAr PSBFTkFCTEVfUVRfU1lTVEVNSU5GTz0xCisgICAgfQorfQorCiAjIEJlYXJlciBtYW5hZ2VtZW50 IGlzIHBhcnQgb2YgUXQgNC43CiAjIGZvciBvbGRlciB2ZXJzaW9uLCBjaGVjayBmb3IgbW9iaWxp dHkgd2l0aCBiZWFyZXIKICFjb250YWlucyhERUZJTkVTLCBFTkFCTEVfUVRfQkVBUkVSPS4pIHsK SW5kZXg6IFdlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9x dC9BcGkvcXdlYnBhZ2UuY3BwCShyZXZpc2lvbiA3MTIzOSkKKysrIFdlYktpdC9xdC9BcGkvcXdl YnBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzAsNiArMTMwLDkgQEAKICNpbmNsdWRlIDxR WDExSW5mbz4KICNlbmRpZgogCisjaWYgRU5BQkxFKFFUX1NZU1RFTUlORk8pCisjaW5jbHVkZSA8 cXN5c3RlbWluZm8uaD4KKyNlbmRpZgogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIApAQCAt MzU5MSwxNyArMzU5NCwxNiBAQCBRU3RyaW5nIFFXZWJQYWdlOjp1c2VyQWdlbnRGb3JVcmwoY29u c3QKICNlbGlmIGRlZmluZWQgUV9PU19VTFRSSVgKICAgICAgICAgZmlyc3RQYXJ0VGVtcCArPSBR U3RyaW5nOjpmcm9tTGF0aW4xKCJERUMgVWx0cml4Iik7CiAjZWxpZiBkZWZpbmVkIFFfT1NfU1lN QklBTgotICAgICAgICBmaXJzdFBhcnRUZW1wICs9IFFMYXRpbjFDaGFyKCcgJyk7CiAgICAgICAg IFFTeXNJbmZvOjpTNjBWZXJzaW9uIHM2MFZlcnNpb24gPSBRU3lzSW5mbzo6czYwVmVyc2lvbigp OwogICAgICAgICBzd2l0Y2ggKHM2MFZlcnNpb24pIHsKICAgICAgICAgY2FzZSBRU3lzSW5mbzo6 U1ZfUzYwXzNfMToKLSAgICAgICAgICAgIGZpcnN0UGFydFRlbXAgKz0gUVN0cmluZzo6ZnJvbUxh dGluMSgiU2VyaWVzNjAvMy4xIik7CisgICAgICAgICAgICBmaXJzdFBhcnRUZW1wICs9IFFTdHJp bmc6OmZyb21MYXRpbjEoIlNlcmllczYwLzMuMSAiKTsKICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICBjYXNlIFFTeXNJbmZvOjpTVl9TNjBfM18yOgotICAgICAgICAgICAgZmlyc3RQYXJ0VGVt cCArPSBRU3RyaW5nOjpmcm9tTGF0aW4xKCJTZXJpZXM2MC8zLjIiKTsKKyAgICAgICAgICAgIGZp cnN0UGFydFRlbXAgKz0gUVN0cmluZzo6ZnJvbUxhdGluMSgiU2VyaWVzNjAvMy4yICIpOwogICAg ICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgUVN5c0luZm86OlNWX1M2MF81XzA6Ci0gICAg ICAgICAgICBmaXJzdFBhcnRUZW1wICs9IFFTdHJpbmc6OmZyb21MYXRpbjEoIlNlcmllczYwLzUu MCIpOworICAgICAgICAgICAgZmlyc3RQYXJ0VGVtcCArPSBRU3RyaW5nOjpmcm9tTGF0aW4xKCJT ZXJpZXM2MC81LjAgIik7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgZGVmYXVsdDoKICAg ICAgICAgICAgIGJyZWFrOwpAQCAtMzYxNCw2ICszNjE2LDIyIEBAIFFTdHJpbmcgUVdlYlBhZ2U6 OnVzZXJBZ2VudEZvclVybChjb25zdAogICAgICAgICBmaXJzdFBhcnRUZW1wICs9IFFTdHJpbmc6 OmZyb21MYXRpbjEoIlVua25vd24iKTsKICNlbmRpZgogCisjaWYgRU5BQkxFKFFUX1NZU1RFTUlO Rk8pCisgICAgICAgIC8vIGFkZGluZyBNb2RlbCBOdW1iZXIgYW5kIEZpcm13YXJlIFZlcnNpb24K KyAgICAgICAgUXRNb2JpbGl0eTo6UVN5c3RlbURldmljZUluZm8gc3lzdGVtRGV2aWNlSW5mbzsK KyAgICAgICAgUXRNb2JpbGl0eTo6UVN5c3RlbUluZm8gc3lzdGVtSW5mbzsKKyAgICAgICAgCisg ICAgICAgIFFTdHJpbmcgbW9kZWwgPSBzeXN0ZW1EZXZpY2VJbmZvLm1vZGVsKCk7CisgICAgICAg IGlmICghbW9kZWwuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICBmaXJzdFBhcnRUZW1wICs9IHN5 c3RlbURldmljZUluZm8ubW9kZWwoKTsKKyAgICAgICAgICAgIFFTdHJpbmcgZmlybXdhcmUgPSBz eXN0ZW1JbmZvLnZlcnNpb24oUXRNb2JpbGl0eTo6UVN5c3RlbUluZm86OkZpcm13YXJlKTsKKyAg ICAgICAgICAgIGlmICghZmlybXdhcmUuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICAgICAgZmly c3RQYXJ0VGVtcCArPSBRU3RyaW5nOjpmcm9tTGF0aW4xKCIvIik7CisgICAgICAgICAgICAgICAg Zmlyc3RQYXJ0VGVtcCArPSBmaXJtd2FyZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorI2Vu ZGlmCisgICAgICAgIAogICAgICAgICAvLyBsYW5ndWFnZSBpcyB0aGUgc3BsaXQKICAgICAgICAg Zmlyc3RQYXJ0VGVtcCArPSBRU3RyaW5nOjpmcm9tTGF0aW4xKCI7ICIpOwogICAgICAgICBmaXJz dFBhcnRUZW1wLnNxdWVlemUoKTsK 82840 2011-02-17 12:03:42 -0800 2011-03-04 05:59:59 -0800 patch bug48636.patch text/plain 4722 qi.2.zhang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc4ODQzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDItMTcgIFFpIFpoYW5n ICA8cWkuMi56aGFuZ0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgW1F0XSBNb2JpbGUgRGV2aWNlcyBzaG91bGQgaW5jbHVkZSBNb2Rl bCBhbmQgRmlybXdhcmUgVmVyc2lvbiBpbiBXZWJraXQgR2VuZXJhdGVkIFVzZXIgQWdlbnQgU3Ry aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00ODYz NgorCisgICAgICAgIEFkZCBtb2RlbCBpbmZvbWF0aW9uIGludG8gdXNlciBhZ2VudCBzdHJpbmcg d2hlbiBxdG1vYmlsaXR5IGlzIGF2YWlsYWJsZS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIChP T1BTISkKKworICAgICAgICAqIFdlYkNvcmUucHJvOgorCiAyMDExLTAyLTEwICBMdWl6IEFnb3N0 aW5pICA8bHVpei5hZ29zdGluaUBvcGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEFkYW0gUm9iZW4uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnBybwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnBybwkocmV2aXNpb24gNzcxMzYpCisrKyBTb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLnBybwkod29ya2luZyBjb3B5KQpAQCAtMzQ0NSw2ICszNDQ1LDEx IEBAIGNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9RVF9CRUFSRVI9MSkgewogICAgIH0KIH0KIAor Y29udGFpbnMoREVGSU5FUywgRU5BQkxFX1FUX1NZU1RFTUlORk89MSkgeworICAgICBDT05GSUcg Kz0gbW9iaWxpdHkKKyAgICAgTU9CSUxJVFkgKz0gc3lzdGVtaW5mbworfQorCiBjb250YWlucyhE RUZJTkVTLCBFTkFCTEVfR0VPTE9DQVRJT049MSkgewogICAgIERFRklORVMgKz0gV1RGX1VTRV9Q UkVFTVBUX0dFT0xPQ0FUSU9OX1BFUk1JU1NJT04KICAgICBIRUFERVJTICs9IFwKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2ZlYXR1cmVzLnByaQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9m ZWF0dXJlcy5wcmkJKHJldmlzaW9uIDc3MTM2KQorKysgU291cmNlL1dlYkNvcmUvZmVhdHVyZXMu cHJpCSh3b3JraW5nIGNvcHkpCkBAIC0xMjksNiArMTI5LDEzIEBAIGNvbnRhaW5zKE1PQklMSVRZ X0NPTkZJRywgc2Vuc29ycykgewogICAgTU9CSUxJVFkgKj0gc2Vuc29ycwogfQogCisjIHN5c3Rl bWluZm8gc3VwcG9ydCBpZiBRdE1vYmlsaXR5IHN5c3RlbWluZm8gbW9kdWxlIGV4aXN0cworIUNP TkZJRyhRVERJUl9idWlsZCk6IWNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9RVF9TWVNURU1JTkZP PS4pIHsKKyAgICBjb250YWlucyhNT0JJTElUWV9DT05GSUcsIHN5c3RlbWluZm8pIHsKKyAgICAg ICBERUZJTkVTICs9IEVOQUJMRV9RVF9TWVNURU1JTkZPPTEKKyAgICB9Cit9CisKICMgQmVhcmVy IG1hbmFnZW1lbnQgaXMgcGFydCBvZiBRdCA0LjcKICMgZm9yIG9sZGVyIHZlcnNpb24sIGNoZWNr IGZvciBtb2JpbGl0eSB3aXRoIGJlYXJlcgogIWNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9RVF9C RUFSRVI9LikgewpJbmRleDogU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDc4ODQzKQorKysgU291cmNl L1dlYktpdC9xdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAx MS0wMi0xNyAgUWkgWmhhbmcgIDxxaS4yLnpoYW5nQG5va2lhLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIE1vYmlsZSBEZXZpY2VzIHNo b3VsZCBpbmNsdWRlIE1vZGVsIGFuZCBGaXJtd2FyZSBWZXJzaW9uIGluIFdlYmtpdCBHZW5lcmF0 ZWQgVXNlciBBZ2VudCBTdHJpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTQ4NjM2CisKKyAgICAgICAgQWRkIG1vZGVsIGluZm9tYXRpb24gaW50byB1 c2VyIGFnZW50IHN0cmluZyB3aGVuIHF0bW9iaWxpdHkgaXMgYXZhaWxhYmxlLgorCisgICAgICAg ICogQXBpL3F3ZWJwYWdlLmNwcDoKKyAgICAgICAgKFFXZWJQYWdlOjp1c2VyQWdlbnRGb3JVcmwp OgorCiAyMDExLTAyLTEwICBMdWl6IEFnb3N0aW5pICA8bHVpei5hZ29zdGluaUBvcGVuYm9zc2Eu b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4uCkluZGV4OiBTb3VyY2UvV2Vi S2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9xdC9B cGkvcXdlYnBhZ2UuY3BwCShyZXZpc2lvbiA3NzEzNikKKysrIFNvdXJjZS9XZWJLaXQvcXQvQXBp L3F3ZWJwYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM3LDYgKzEzNyw5IEBACiAjaWYgZGVm aW5lZChRX1dTX1gxMSkKICNpbmNsdWRlIDxRWDExSW5mbz4KICNlbmRpZgorI2lmIEVOQUJMRShR VF9TWVNURU1JTkZPKQorI2luY2x1ZGUgPHFzeXN0ZW1pbmZvLmg+CisjZW5kaWYKIAogCiB1c2lu ZyBuYW1lc3BhY2UgV2ViQ29yZTsKQEAgLTM4MjQsNiArMzgyNywxMCBAQCBRU3RyaW5nIFFXZWJQ YWdlOjp1c2VyQWdlbnRGb3JVcmwoY29uc3QgCiAgICAgICAgIGZpcnN0UGFydFRlbXAgKz0gUVN0 cmluZzo6ZnJvbUxhdGluMSgiU0dJIElyaXgiKTsKICNlbGlmIGRlZmluZWQgUV9PU19MSU5VWAog CisjaWYgRU5BQkxFKFFUX1NZU1RFTUlORk8pCisgICAgICAgIGZpcnN0UGFydFRlbXAgKz0gUVN0 cmluZzo6ZnJvbUxhdGluMSgiTGludXgiKTsKKyNlbHNlCisKICNpZiBkZWZpbmVkKF9feDg2XzY0 X18pCiAgICAgICAgIGZpcnN0UGFydFRlbXAgKz0gUVN0cmluZzo6ZnJvbUxhdGluMSgiTGludXgg eDg2XzY0Iik7CiAjZWxpZiBkZWZpbmVkKF9faTM4Nl9fKQpAQCAtMzgzMiw2ICszODM5LDggQEAg UVN0cmluZyBRV2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKGNvbnN0IAogICAgICAgICBmaXJzdFBh cnRUZW1wICs9IFFTdHJpbmc6OmZyb21MYXRpbjEoIkxpbnV4Iik7CiAjZW5kaWYKIAorI2VuZGlm CisKICNlbGlmIGRlZmluZWQgUV9PU19MWU5YCiAgICAgICAgIGZpcnN0UGFydFRlbXAgKz0gUVN0 cmluZzo6ZnJvbUxhdGluMSgiTHlueE9TIik7CiAjZWxpZiBkZWZpbmVkIFFfT1NfTkVUQlNECkBA IC0zODU3LDcgKzM4NjYsNiBAQCBRU3RyaW5nIFFXZWJQYWdlOjp1c2VyQWdlbnRGb3JVcmwoY29u c3QgCiAjZWxpZiBkZWZpbmVkIFFfT1NfVUxUUklYCiAgICAgICAgIGZpcnN0UGFydFRlbXAgKz0g UVN0cmluZzo6ZnJvbUxhdGluMSgiREVDIFVsdHJpeCIpOwogI2VsaWYgZGVmaW5lZCBRX09TX1NZ TUJJQU4KLSAgICAgICAgZmlyc3RQYXJ0VGVtcCArPSBRTGF0aW4xQ2hhcignICcpOwogICAgICAg ICBRU3lzSW5mbzo6UzYwVmVyc2lvbiBzNjBWZXJzaW9uID0gUVN5c0luZm86OnM2MFZlcnNpb24o KTsKICAgICAgICAgc3dpdGNoIChzNjBWZXJzaW9uKSB7CiAgICAgICAgIGNhc2UgUVN5c0luZm86 OlNWX1M2MF8zXzE6CkBAIC0zODgwLDggKzM4ODgsMjIgQEAgUVN0cmluZyBRV2ViUGFnZTo6dXNl ckFnZW50Rm9yVXJsKGNvbnN0IAogICAgICAgICBmaXJzdFBhcnRUZW1wICs9IFFTdHJpbmc6OmZy b21MYXRpbjEoIlVua25vd24iKTsKICNlbmRpZgogCisjaWYgRU5BQkxFKFFUX1NZU1RFTUlORk8p CisgICAgICAgIC8vIGFkZGluZyBNb2RlbCBOdW1iZXIKKyAgICAgICAgUXRNb2JpbGl0eTo6UVN5 c3RlbURldmljZUluZm8gc3lzdGVtRGV2aWNlSW5mbzsKKyAgICAgICAgUXRNb2JpbGl0eTo6UVN5 c3RlbUluZm8gc3lzdGVtSW5mbzsKKyAgICAgICAgCisgICAgICAgIFFTdHJpbmcgbW9kZWwgPSBz eXN0ZW1EZXZpY2VJbmZvLm1vZGVsKCk7CisgICAgICAgIGlmICghbW9kZWwuaXNFbXB0eSgpKSB7 CisgICAgICAgICAgICBpZiAoIWZpcnN0UGFydFRlbXAuZW5kc1dpdGgoIjsgIikpCisgICAgICAg ICAgICAgICAgZmlyc3RQYXJ0VGVtcCArPSBRU3RyaW5nOjpmcm9tTGF0aW4xKCI7ICIpOworICAg ICAgICAgICAgZmlyc3RQYXJ0VGVtcCArPSBzeXN0ZW1EZXZpY2VJbmZvLm1vZGVsKCk7CisgICAg ICAgIH0KKyNlbmRpZgorCiAgICAgICAgIC8vIGxhbmd1YWdlIGlzIHRoZSBzcGxpdAotICAgICAg ICBmaXJzdFBhcnRUZW1wICs9IFFTdHJpbmc6OmZyb21MYXRpbjEoIjsgIik7CisgICAgICAgIGlm ICghZmlyc3RQYXJ0VGVtcC5lbmRzV2l0aCgiOyAiKSkKKyAgICAgICAgICAgIGZpcnN0UGFydFRl bXAgKz0gUVN0cmluZzo6ZnJvbUxhdGluMSgiOyAiKTsKICAgICAgICAgZmlyc3RQYXJ0VGVtcC5z cXVlZXplKCk7CiAgICAgICAgIGZpcnN0UGFydCA9IGZpcnN0UGFydFRlbXA7CiAK 84733 2011-03-04 05:59:59 -0800 2011-03-04 10:06:42 -0800 patch2 bug48636_2.patch text/plain 5023 qi.2.zhang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwMzQ1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDMtMDQgIFFpIFpoYW5n ICA8cWkuMi56aGFuZ0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgW1F0XSBNb2JpbGUgRGV2aWNlcyBzaG91bGQgaW5jbHVkZSBNb2Rl bCBhbmQgRmlybXdhcmUgVmVyc2lvbiBpbiBXZWJraXQgR2VuZXJhdGVkIFVzZXIgQWdlbnQgU3Ry aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00ODYz NgorCisgICAgICAgIEFkZCBtb2RlbCBpbmZvbWF0aW9uIGludG8gdXNlciBhZ2VudCBzdHJpbmcg d2hlbiBxdG1vYmlsaXR5IGlzIGF2YWlsYWJsZSwgYnV0IG9ubHkgZm9yIHN5bWJpYW4sIE1hZW1v IGFuZCBNZWVHby4KKworICAgICAgICAqIFdlYkNvcmUucHJpOgorICAgICAgICAqIGZlYXR1cmVz LnByaToKKwogMjAxMS0wMy0wNCAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWXVyeSBTZW1pa2hhdHNreS4KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL1dlYkNvcmUucHJpCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1dlYkNv cmUucHJpCShyZXZpc2lvbiA4MDIzNykKKysrIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUucHJpCSh3 b3JraW5nIGNvcHkpCkBAIC0yMjksNiArMjI5LDExIEBAIGNvbnRhaW5zKERFRklORVMsIEVOQUJM RV9ERVZJQ0VfT1JJRU5UQVQKICAgICBNT0JJTElUWSAqPSBzZW5zb3JzCiB9CiAKK2NvbnRhaW5z KERFRklORVMsIEVOQUJMRV9RVF9VU0VSQUdFTlRfREVWSUNFTU9ERUw9MSkgeworICAgICBDT05G SUcgKj0gbW9iaWxpdHkKKyAgICAgTU9CSUxJVFkgKj0gc3lzdGVtaW5mbworfQorCiBjb250YWlu cyhERUZJTkVTLCBFTkFCTEVfUVRfQkVBUkVSPTEpIHsKICAgICAjIEJlYXJlciBtYW5hZ2VtZW50 IGlzIHBhcnQgb2YgUXQgNC43LCBzbyBkb24ndCBhY2NpZGVudGlhbGx5CiAgICAgIyBwdWxsIGlu IFF0IE1vYmlsaXR5IHdoZW4gYnVpbGRpbmcgYWdhaW5zdCA+PSA0LjcKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2ZlYXR1cmVzLnByaQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9mZWF0dXJl cy5wcmkJKHJldmlzaW9uIDgwMjM3KQorKysgU291cmNlL1dlYkNvcmUvZmVhdHVyZXMucHJpCSh3 b3JraW5nIGNvcHkpCkBAIC0xMzEsNiArMTMxLDE1IEBAIGNvbnRhaW5zKE1PQklMSVRZX0NPTkZJ Rywgc2Vuc29ycykgewogICAgTU9CSUxJVFkgKj0gc2Vuc29ycwogfQogCisjIHN5c3RlbWluZm8g c3VwcG9ydCBpZiBRdE1vYmlsaXR5IHN5c3RlbWluZm8gbW9kdWxlIGV4aXN0cywgYnV0IG9ubHkg Zm9yIHN5bWJpYW4sIG1hZW1vIGFuZCBtZWVnbworc3ltYmlhbnxtYWVtbzV8bWFlbW82IHsKKyAg ICAhQ09ORklHKFFURElSX2J1aWxkKTohY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1FUX1VTRVJB R0VOVF9ERVZJQ0VNT0RFTD0uKSB7CisgICAgICAgIGNvbnRhaW5zKE1PQklMSVRZX0NPTkZJRywg c3lzdGVtaW5mbykgeworICAgICAgICAgICAgREVGSU5FUyArPSBFTkFCTEVfUVRfU1lTVEVNSU5G Tz0xCisgICAgICAgIH0KKyAgICB9Cit9CisKICMgQmVhcmVyIG1hbmFnZW1lbnQgaXMgcGFydCBv ZiBRdCA0LjcKICMgZm9yIG9sZGVyIHZlcnNpb24sIGNoZWNrIGZvciBtb2JpbGl0eSB3aXRoIGJl YXJlcgogIWNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9RVF9CRUFSRVI9LikgewpJbmRleDogU291 cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9xdC9D aGFuZ2VMb2cJKHJldmlzaW9uIDgwMzQ1KQorKysgU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxMS0wMy0wNCAgUWkgWmhhbmcgIDxx aS4yLnpoYW5nQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBbUXRdIE1vYmlsZSBEZXZpY2VzIHNob3VsZCBpbmNsdWRlIE1vZGVsIGFu ZCBGaXJtd2FyZSBWZXJzaW9uIGluIFdlYmtpdCBHZW5lcmF0ZWQgVXNlciBBZ2VudCBTdHJpbmcK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4NjM2CisK KyAgICAgICAgQWRkIG1vZGVsIGluZm9tYXRpb24gaW50byB1c2VyIGFnZW50IHN0cmluZyB3aGVu IHF0bW9iaWxpdHkgaXMgYXZhaWxhYmxlLCBidXQgb25seSBmb3Igc3ltYmlhbiwgTWFlbW8gYW5k IE1lZUdvLgorCisgICAgICAgICogQXBpL3F3ZWJwYWdlLmNwcDoKKyAgICAgICAgKFFXZWJQYWdl Ojp1c2VyQWdlbnRGb3JVcmwpOgorCiAyMDExLTAzLTAzICBNYWhlc2ggS3Vsa2FybmkgIDxtYWhl c2gua3Vsa2FybmlAbm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9o ZGUgQ2hyaXN0aWFuc2VuLgpJbmRleDogU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAkocmV2aXNp b24gODAyMzcpCisrKyBTb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTE0MSw3ICsxNDEsOSBAQAogI2lmIGRlZmluZWQoUV9XU19YMTEpCiAjaW5jbHVk ZSA8UVgxMUluZm8+CiAjZW5kaWYKLQorI2lmIEVOQUJMRShRVF9VU0VSQUdFTlRfREVWSUNFTU9E RUwpCisjaW5jbHVkZSA8cXN5c3RlbWluZm8uaD4KKyNlbmRpZgogCiB1c2luZyBuYW1lc3BhY2Ug V2ViQ29yZTsKIApAQCAtMzcxMiw2ICszNzE0LDEwIEBAIFFTdHJpbmcgUVdlYlBhZ2U6OnVzZXJB Z2VudEZvclVybChjb25zdCAKICAgICAgICAgIk1hY2ludG9zaDsgIgogI2VsaWYgZGVmaW5lZCBR X1dTX1FXUwogICAgICAgICAiUXRFbWJlZGRlZDsgIgorI2VsaWYgZGVmaW5lZCBRX1dTX01BRU1P XzUKKyAgICAgICAgIk1hZW1vIgorI2VsaWYgZGVmaW5lZCBRX1dTX01BRU1PXzYKKyAgICAgICAg Ik1lZUdvIgogI2VsaWYgZGVmaW5lZCBRX1dTX1dJTgogICAgICAgICAvLyBOb3RoaW5nCiAjZWxp ZiBkZWZpbmVkIFFfV1NfWDExCkBAIC0zODMxLDYgKzM4MzcsNyBAQCBRU3RyaW5nIFFXZWJQYWdl Ojp1c2VyQWdlbnRGb3JVcmwoY29uc3QgCiAjZWxpZiBkZWZpbmVkIFFfT1NfSVJJWAogICAgICAg ICBmaXJzdFBhcnRUZW1wICs9IFFTdHJpbmc6OmZyb21MYXRpbjEoIlNHSSBJcml4Iik7CiAjZWxp ZiBkZWZpbmVkIFFfT1NfTElOVVgKKyNpZiAhZGVmaW5lZChRX1dTX01BRU1PXzUpICYmICFkZWZp bmVkKFFfV1NfTUFFTU9fNikKIAogI2lmIGRlZmluZWQoX194ODZfNjRfXykKICAgICAgICAgZmly c3RQYXJ0VGVtcCArPSBRU3RyaW5nOjpmcm9tTGF0aW4xKCJMaW51eCB4ODZfNjQiKTsKQEAgLTM4 MzksNiArMzg0Niw3IEBAIFFTdHJpbmcgUVdlYlBhZ2U6OnVzZXJBZ2VudEZvclVybChjb25zdCAK ICNlbHNlCiAgICAgICAgIGZpcnN0UGFydFRlbXAgKz0gUVN0cmluZzo6ZnJvbUxhdGluMSgiTGlu dXgiKTsKICNlbmRpZgorI2VuZGlmCiAKICNlbGlmIGRlZmluZWQgUV9PU19MWU5YCiAgICAgICAg IGZpcnN0UGFydFRlbXAgKz0gUVN0cmluZzo6ZnJvbUxhdGluMSgiTHlueE9TIik7CkBAIC0zODg4 LDYgKzM4OTYsMTcgQEAgUVN0cmluZyBRV2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKGNvbnN0IAog ICAgICAgICBmaXJzdFBhcnRUZW1wICs9IFFTdHJpbmc6OmZyb21MYXRpbjEoIlVua25vd24iKTsK ICNlbmRpZgogCisjaWYgRU5BQkxFKFFUX1VTRVJBR0VOVF9ERVZJQ0VNT0RFTCkKKyAgICAgICAg Ly8gYWRkaW5nIE1vZGVsIE51bWJlcgorICAgICAgICBRdE1vYmlsaXR5OjpRU3lzdGVtRGV2aWNl SW5mbyBzeXN0ZW1EZXZpY2VJbmZvOworCisgICAgICAgIFFTdHJpbmcgbW9kZWwgPSBzeXN0ZW1E ZXZpY2VJbmZvLm1vZGVsKCk7CisgICAgICAgIGlmICghbW9kZWwuaXNFbXB0eSgpKSB7CisgICAg ICAgICAgICBpZiAoIWZpcnN0UGFydFRlbXAuZW5kc1dpdGgoIjsgIikpCisgICAgICAgICAgICAg ICAgZmlyc3RQYXJ0VGVtcCArPSBRU3RyaW5nOjpmcm9tTGF0aW4xKCI7ICIpOworICAgICAgICAg ICAgZmlyc3RQYXJ0VGVtcCArPSBzeXN0ZW1EZXZpY2VJbmZvLm1vZGVsKCk7CisgICAgICAgIH0K KyNlbmRpZgogICAgICAgICBmaXJzdFBhcnRUZW1wLnNxdWVlemUoKTsKICAgICAgICAgZmlyc3RQ YXJ0ID0gZmlyc3RQYXJ0VGVtcDsKIApAQCAtMzkwNyw3ICszOTI2LDcgQEAgUVN0cmluZyBRV2Vi UGFnZTo6dXNlckFnZW50Rm9yVXJsKGNvbnN0IAogCiAgICAgICAgIFFTdHJpbmcgdGhpcmRQYXJ0 VGVtcDsKICAgICAgICAgdGhpcmRQYXJ0VGVtcC5yZXNlcnZlKDE1MCk7Ci0jaWYgZGVmaW5lZChR X09TX1NZTUJJQU4pIHx8IGRlZmluZWQoUV9XU19NQUVNT181KQorI2lmIGRlZmluZWQoUV9PU19T WU1CSUFOKSB8fCBkZWZpbmVkKFFfV1NfTUFFTU9fNSkgfHwgZGVmaW5lZChRX1dTX01BRU1PXzYp CiAgICAgICAgIHRoaXJkUGFydFRlbXAgKz0gUUxhdGluMVN0cmluZygiIE1vYmlsZSBTYWZhcmkv Iik7CiAjZWxzZQogICAgICAgICB0aGlyZFBhcnRUZW1wICs9IFFMYXRpbjFTdHJpbmcoIiBTYWZh cmkvIik7Cg== 84770 2011-03-04 10:06:42 -0800 2011-03-05 09:32:25 -0800 patch3 bug48636_3.patch text/plain 5027 qi.2.zhang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwMzQ1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDMtMDQgIFFpIFpoYW5n ICA8cWkuMi56aGFuZ0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgW1F0XSBNb2JpbGUgRGV2aWNlcyBzaG91bGQgaW5jbHVkZSBNb2Rl bCBhbmQgRmlybXdhcmUgVmVyc2lvbiBpbiBXZWJraXQgR2VuZXJhdGVkIFVzZXIgQWdlbnQgU3Ry aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00ODYz NgorCisgICAgICAgIEFkZCBtb2RlbCBpbmZvbWF0aW9uIGludG8gdXNlciBhZ2VudCBzdHJpbmcg d2hlbiBxdG1vYmlsaXR5IGlzIGF2YWlsYWJsZSwgYnV0IG9ubHkgZm9yIHN5bWJpYW4sIE1hZW1v IGFuZCBNZWVHby4KKworICAgICAgICAqIFdlYkNvcmUucHJpOgorICAgICAgICAqIGZlYXR1cmVz LnByaToKKwogMjAxMS0wMy0wNCAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWXVyeSBTZW1pa2hhdHNreS4KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL1dlYkNvcmUucHJpCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1dlYkNv cmUucHJpCShyZXZpc2lvbiA4MDIzNykKKysrIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUucHJpCSh3 b3JraW5nIGNvcHkpCkBAIC0yMjksNiArMjI5LDExIEBAIGNvbnRhaW5zKERFRklORVMsIEVOQUJM RV9ERVZJQ0VfT1JJRU5UQVQKICAgICBNT0JJTElUWSAqPSBzZW5zb3JzCiB9CiAKK2NvbnRhaW5z KERFRklORVMsIEVOQUJMRV9RVF9VU0VSQUdFTlRfREVWSUNFTU9ERUw9MSkgeworICAgICBDT05G SUcgKj0gbW9iaWxpdHkKKyAgICAgTU9CSUxJVFkgKj0gc3lzdGVtaW5mbworfQorCiBjb250YWlu cyhERUZJTkVTLCBFTkFCTEVfUVRfQkVBUkVSPTEpIHsKICAgICAjIEJlYXJlciBtYW5hZ2VtZW50 IGlzIHBhcnQgb2YgUXQgNC43LCBzbyBkb24ndCBhY2NpZGVudGlhbGx5CiAgICAgIyBwdWxsIGlu IFF0IE1vYmlsaXR5IHdoZW4gYnVpbGRpbmcgYWdhaW5zdCA+PSA0LjcKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2ZlYXR1cmVzLnByaQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9mZWF0dXJl cy5wcmkJKHJldmlzaW9uIDgwMjM3KQorKysgU291cmNlL1dlYkNvcmUvZmVhdHVyZXMucHJpCSh3 b3JraW5nIGNvcHkpCkBAIC0xMzEsNiArMTMxLDE1IEBAIGNvbnRhaW5zKE1PQklMSVRZX0NPTkZJ Rywgc2Vuc29ycykgewogICAgTU9CSUxJVFkgKj0gc2Vuc29ycwogfQogCisjIHN5c3RlbWluZm8g c3VwcG9ydCBpZiBRdE1vYmlsaXR5IHN5c3RlbWluZm8gbW9kdWxlIGV4aXN0cywgYnV0IG9ubHkg Zm9yIHN5bWJpYW4sIG1hZW1vIGFuZCBtZWVnbworc3ltYmlhbnxtYWVtbzV8bWFlbW82IHsKKyAg ICAhQ09ORklHKFFURElSX2J1aWxkKTohY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1FUX1VTRVJB R0VOVF9ERVZJQ0VNT0RFTD0uKSB7CisgICAgICAgIGNvbnRhaW5zKE1PQklMSVRZX0NPTkZJRywg c3lzdGVtaW5mbykgeworICAgICAgICAgICAgREVGSU5FUyArPSBRVF9VU0VSQUdFTlRfREVWSUNF TU9ERUw9MQorICAgICAgICB9CisgICAgfQorfQorCiAjIEJlYXJlciBtYW5hZ2VtZW50IGlzIHBh cnQgb2YgUXQgNC43CiAjIGZvciBvbGRlciB2ZXJzaW9uLCBjaGVjayBmb3IgbW9iaWxpdHkgd2l0 aCBiZWFyZXIKICFjb250YWlucyhERUZJTkVTLCBFTkFCTEVfUVRfQkVBUkVSPS4pIHsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv cXQvQ2hhbmdlTG9nCShyZXZpc2lvbiA4MDM0NSkKKysrIFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDMtMDQgIFFpIFpoYW5n ICA8cWkuMi56aGFuZ0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgW1F0XSBNb2JpbGUgRGV2aWNlcyBzaG91bGQgaW5jbHVkZSBNb2Rl bCBhbmQgRmlybXdhcmUgVmVyc2lvbiBpbiBXZWJraXQgR2VuZXJhdGVkIFVzZXIgQWdlbnQgU3Ry aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00ODYz NgorCisgICAgICAgIEFkZCBtb2RlbCBpbmZvbWF0aW9uIGludG8gdXNlciBhZ2VudCBzdHJpbmcg d2hlbiBxdG1vYmlsaXR5IGlzIGF2YWlsYWJsZSwgYnV0IG9ubHkgZm9yIHN5bWJpYW4sIE1hZW1v IGFuZCBNZWVHby4KKworICAgICAgICAqIEFwaS9xd2VicGFnZS5jcHA6CisgICAgICAgIChRV2Vi UGFnZTo6dXNlckFnZW50Rm9yVXJsKToKKwogMjAxMS0wMy0wMyAgTWFoZXNoIEt1bGthcm5pICA8 bWFoZXNoLmt1bGthcm5pQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRo IFJvaGRlIENocmlzdGlhbnNlbi4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdl LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAJKHJl dmlzaW9uIDgwMjM3KQorKysgU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xNDEsNyArMTQxLDkgQEAKICNpZiBkZWZpbmVkKFFfV1NfWDExKQogI2lu Y2x1ZGUgPFFYMTFJbmZvPgogI2VuZGlmCi0KKyNpZiBFTkFCTEUoUVRfVVNFUkFHRU5UX0RFVklD RU1PREVMKQorI2luY2x1ZGUgPHFzeXN0ZW1pbmZvLmg+CisjZW5kaWYKIAogdXNpbmcgbmFtZXNw YWNlIFdlYkNvcmU7CiAKQEAgLTM3MTIsNiArMzcxNCwxMCBAQCBRU3RyaW5nIFFXZWJQYWdlOjp1 c2VyQWdlbnRGb3JVcmwoY29uc3QgCiAgICAgICAgICJNYWNpbnRvc2g7ICIKICNlbGlmIGRlZmlu ZWQgUV9XU19RV1MKICAgICAgICAgIlF0RW1iZWRkZWQ7ICIKKyNlbGlmIGRlZmluZWQgUV9XU19N QUVNT181CisgICAgICAgICJNYWVtbyIKKyNlbGlmIGRlZmluZWQgUV9XU19NQUVNT182CisgICAg ICAgICJNZWVHbyIKICNlbGlmIGRlZmluZWQgUV9XU19XSU4KICAgICAgICAgLy8gTm90aGluZwog I2VsaWYgZGVmaW5lZCBRX1dTX1gxMQpAQCAtMzgzMSw2ICszODM3LDcgQEAgUVN0cmluZyBRV2Vi UGFnZTo6dXNlckFnZW50Rm9yVXJsKGNvbnN0IAogI2VsaWYgZGVmaW5lZCBRX09TX0lSSVgKICAg ICAgICAgZmlyc3RQYXJ0VGVtcCArPSBRU3RyaW5nOjpmcm9tTGF0aW4xKCJTR0kgSXJpeCIpOwog I2VsaWYgZGVmaW5lZCBRX09TX0xJTlVYCisjaWYgIWRlZmluZWQoUV9XU19NQUVNT181KSAmJiAh ZGVmaW5lZChRX1dTX01BRU1PXzYpCiAKICNpZiBkZWZpbmVkKF9feDg2XzY0X18pCiAgICAgICAg IGZpcnN0UGFydFRlbXAgKz0gUVN0cmluZzo6ZnJvbUxhdGluMSgiTGludXggeDg2XzY0Iik7CkBA IC0zODM5LDYgKzM4NDYsNyBAQCBRU3RyaW5nIFFXZWJQYWdlOjp1c2VyQWdlbnRGb3JVcmwoY29u c3QgCiAjZWxzZQogICAgICAgICBmaXJzdFBhcnRUZW1wICs9IFFTdHJpbmc6OmZyb21MYXRpbjEo IkxpbnV4Iik7CiAjZW5kaWYKKyNlbmRpZgogCiAjZWxpZiBkZWZpbmVkIFFfT1NfTFlOWAogICAg ICAgICBmaXJzdFBhcnRUZW1wICs9IFFTdHJpbmc6OmZyb21MYXRpbjEoIkx5bnhPUyIpOwpAQCAt Mzg4OCw2ICszODk2LDE3IEBAIFFTdHJpbmcgUVdlYlBhZ2U6OnVzZXJBZ2VudEZvclVybChjb25z dCAKICAgICAgICAgZmlyc3RQYXJ0VGVtcCArPSBRU3RyaW5nOjpmcm9tTGF0aW4xKCJVbmtub3du Iik7CiAjZW5kaWYKIAorI2lmIEVOQUJMRShRVF9VU0VSQUdFTlRfREVWSUNFTU9ERUwpCisgICAg ICAgIC8vIGFkZGluZyBNb2RlbCBOdW1iZXIKKyAgICAgICAgUXRNb2JpbGl0eTo6UVN5c3RlbURl dmljZUluZm8gc3lzdGVtRGV2aWNlSW5mbzsKKworICAgICAgICBRU3RyaW5nIG1vZGVsID0gc3lz dGVtRGV2aWNlSW5mby5tb2RlbCgpOworICAgICAgICBpZiAoIW1vZGVsLmlzRW1wdHkoKSkgewor ICAgICAgICAgICAgaWYgKCFmaXJzdFBhcnRUZW1wLmVuZHNXaXRoKCI7ICIpKQorICAgICAgICAg ICAgICAgIGZpcnN0UGFydFRlbXAgKz0gUVN0cmluZzo6ZnJvbUxhdGluMSgiOyAiKTsKKyAgICAg ICAgICAgIGZpcnN0UGFydFRlbXAgKz0gc3lzdGVtRGV2aWNlSW5mby5tb2RlbCgpOworICAgICAg ICB9CisjZW5kaWYKICAgICAgICAgZmlyc3RQYXJ0VGVtcC5zcXVlZXplKCk7CiAgICAgICAgIGZp cnN0UGFydCA9IGZpcnN0UGFydFRlbXA7CiAKQEAgLTM5MDcsNyArMzkyNiw3IEBAIFFTdHJpbmcg UVdlYlBhZ2U6OnVzZXJBZ2VudEZvclVybChjb25zdCAKIAogICAgICAgICBRU3RyaW5nIHRoaXJk UGFydFRlbXA7CiAgICAgICAgIHRoaXJkUGFydFRlbXAucmVzZXJ2ZSgxNTApOwotI2lmIGRlZmlu ZWQoUV9PU19TWU1CSUFOKSB8fCBkZWZpbmVkKFFfV1NfTUFFTU9fNSkKKyNpZiBkZWZpbmVkKFFf T1NfU1lNQklBTikgfHwgZGVmaW5lZChRX1dTX01BRU1PXzUpIHx8IGRlZmluZWQoUV9XU19NQUVN T182KQogICAgICAgICB0aGlyZFBhcnRUZW1wICs9IFFMYXRpbjFTdHJpbmcoIiBNb2JpbGUgU2Fm YXJpLyIpOwogI2Vsc2UKICAgICAgICAgdGhpcmRQYXJ0VGVtcCArPSBRTGF0aW4xU3RyaW5nKCIg U2FmYXJpLyIpOwo= 84782 2011-03-04 10:53:58 -0800 2011-03-04 10:58:57 -0800 patch for qtwebkit-2.1, sent by Laszlo / Qi 48636_qtwebkit21.patch text/plain 3834 ademar ZGlmZiAtLWdpdCBhL1dlYkNvcmUvV2ViQ29yZS5wcmkgYi9XZWJDb3JlL1dlYkNvcmUucHJpCmlu ZGV4IDM2NTQ3NmMuLjQwOWJjNWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvV2ViQ29yZS5wcmkKKysr IGIvV2ViQ29yZS9XZWJDb3JlLnByaQpAQCAtMTM0LDYgKzEzNCwyMCBAQCBncmVhdGVyVGhhbihR VF9NSU5PUl9WRVJTSU9OLCA1KSB7CiAgICAgfQogfQogCisjIHN5c3RlbWluZm8gc3VwcG9ydCBp ZiBRdE1vYmlsaXR5IHN5c3RlbWluZm8gbW9kdWxlIGV4aXN0cywgYnV0IG9ubHkgZm9yIHN5bWJp YW4sIG1hZW1vIGFuZCBtZWVnbworc3ltYmlhbnxtYWVtbzV8bWFlbW82IHsKKyAgICAhQ09ORklH KFFURElSX2J1aWxkKTohY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1FUX1VTRVJBR0VOVF9ERVZJ Q0VNT0RFTD0uKSB7CisgICAgICAgIGNvbnRhaW5zKE1PQklMSVRZX0NPTkZJRywgc3lzdGVtaW5m bykgeworICAgICAgICAgICAgREVGSU5FUyArPSBFTkFCTEVfUVRfVVNFUkFHRU5UX0RFVklDRU1P REVMPTEKKyAgICAgICAgfQorICAgIH0KK30KKworY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1FU X1VTRVJBR0VOVF9ERVZJQ0VNT0RFTD0xKSB7CisgICAgIENPTkZJRyAqPSBtb2JpbGl0eQorICAg ICBNT0JJTElUWSAqPSBzeXN0ZW1pbmZvCit9CisKICMgQmVhcmVyIG1hbmFnZW1lbnQgaXMgcGFy dCBvZiBRdCA0LjcKICMgZm9yIG9sZGVyIHZlcnNpb24sIGNoZWNrIGZvciBtb2JpbGl0eSB3aXRo IGJlYXJlciAKICFjb250YWlucyhERUZJTkVTLCBFTkFCTEVfUVRfQkVBUkVSPS4pIHsKZGlmZiAt LWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwIGIvV2ViS2l0L3F0L0FwaS9xd2VicGFn ZS5jcHAKaW5kZXggN2ZjZGZkNS4uMzdhNWU5OCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9x d2VicGFnZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKQEAgLTEzMSw2ICsx MzEsMTAgQEAKICNpbmNsdWRlICJQbGF0Zm9ybVRvdWNoRXZlbnQuaCIKICNlbmRpZgogCisjaWYg RU5BQkxFKFFUX1VTRVJBR0VOVF9ERVZJQ0VNT0RFTCkKKyNpbmNsdWRlIDxxc3lzdGVtaW5mby5o PgorI2VuZGlmCisKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBib29sIFFXZWJQYWdlUHJp dmF0ZTo6ZHJ0UnVuID0gZmFsc2U7CkBAIC0xOTkwLDcgKzE5OTQsNyBAQCBRV2ViUGFnZTo6Vmll d3BvcnRBdHRyaWJ1dGVzJiBRV2ViUGFnZTo6Vmlld3BvcnRBdHRyaWJ1dGVzOjpvcGVyYXRvcj0o Y29uc3QgUVdlYgogICAgIG9mIHRoZSB3ZWIgcGFnZSBjb21wbGV0ZXMgbG9hZGluZywgc3VjaCBh cyBhbiBlbWJlZGRlZCBpbWFnZSwgYSBzY3JpcHQsCiAgICAgZXRjLiBGaW5hbGx5LCB0aGUgbG9h ZEZpbmlzaGVkKCkgc2lnbmFsIGlzIGVtaXR0ZWQgd2hlbiB0aGUgcGFnZSBjb250ZW50cwogICAg IGFyZSBsb2FkZWQgY29tcGxldGVseSwgaW5kZXBlbmRlbnQgb2Ygc2NyaXB0IGV4ZWN1dGlvbiBv ciBwYWdlIHJlbmRlcmluZy4KLSAgICBJdHMgYXJndW1lbnQsIGVpdGhlciB0cnVlIG9yIGZhbHNl LCBpbmRpY2F0ZXMgd2hldGhlciBvciBub3QgdGhlIGxvYWQKKyAgICBJdHMgYXJndW1lbnQsIGVp dGhlciB0cnVlIG9yIGZhbHNlLCBpbmRpY2F0ZXMgd2hldGhlciBvciBub3QgdGhlIGxvYWQgCiAg ICAgb3BlcmF0aW9uIHN1Y2NlZWRlZC4KIAogICAgIFxzZWN0aW9uMSBVc2luZyBRV2ViUGFnZSBp biBhIFdpZGdldC1sZXNzIEVudmlyb25tZW50CkBAIC0zNjgwLDYgKzM2ODQsMTAgQEAgUVN0cmlu ZyBRV2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKGNvbnN0IFFVcmwmKSBjb25zdAogICAgICAgICAi TWFjaW50b3NoIgogI2VsaWYgZGVmaW5lZCBRX1dTX1FXUwogICAgICAgICAiUXRFbWJlZGRlZCIK KyNlbGlmIGRlZmluZWQgUV9XU19NQUVNT181CisgICAgICAgICJNYWVtbyIKKyNlbGlmIGRlZmlu ZWQgUV9XU19NQUVNT182CisgICAgICAgICJNZWVHbyIKICNlbGlmIGRlZmluZWQgUV9XU19XSU4K ICAgICAgICAgIldpbmRvd3MiCiAjZWxpZiBkZWZpbmVkIFFfV1NfWDExCkBAIC0zODA2LDcgKzM4 MTQsNyBAQCBRU3RyaW5nIFFXZWJQYWdlOjp1c2VyQWdlbnRGb3JVcmwoY29uc3QgUVVybCYpIGNv bnN0CiAjZWxpZiBkZWZpbmVkIFFfT1NfSVJJWAogICAgICAgICBmaXJzdFBhcnRUZW1wICs9IFFT dHJpbmc6OmZyb21MYXRpbjEoIlNHSSBJcml4Iik7CiAjZWxpZiBkZWZpbmVkIFFfT1NfTElOVVgK LQorI2lmICFkZWZpbmVkKFFfV1NfTUFFTU9fNSkgJiYgIWRlZmluZWQoUV9XU19NQUVNT182KQog I2lmIGRlZmluZWQoX194ODZfNjRfXykKICAgICAgICAgZmlyc3RQYXJ0VGVtcCArPSBRU3RyaW5n Ojpmcm9tTGF0aW4xKCJMaW51eCB4ODZfNjQiKTsKICNlbGlmIGRlZmluZWQoX19pMzg2X18pCkBA IC0zODE0LDcgKzM4MjIsNyBAQCBRU3RyaW5nIFFXZWJQYWdlOjp1c2VyQWdlbnRGb3JVcmwoY29u c3QgUVVybCYpIGNvbnN0CiAjZWxzZQogICAgICAgICBmaXJzdFBhcnRUZW1wICs9IFFTdHJpbmc6 OmZyb21MYXRpbjEoIkxpbnV4Iik7CiAjZW5kaWYKLQorI2VuZGlmCiAjZWxpZiBkZWZpbmVkIFFf T1NfTFlOWAogICAgICAgICBmaXJzdFBhcnRUZW1wICs9IFFTdHJpbmc6OmZyb21MYXRpbjEoIkx5 bnhPUyIpOwogI2VsaWYgZGVmaW5lZCBRX09TX05FVEJTRApAQCAtMzg0MCw3ICszODQ4LDYgQEAg UVN0cmluZyBRV2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKGNvbnN0IFFVcmwmKSBjb25zdAogI2Vs aWYgZGVmaW5lZCBRX09TX1VMVFJJWAogICAgICAgICBmaXJzdFBhcnRUZW1wICs9IFFTdHJpbmc6 OmZyb21MYXRpbjEoIkRFQyBVbHRyaXgiKTsKICNlbGlmIGRlZmluZWQgUV9PU19TWU1CSUFOCi0g ICAgICAgIGZpcnN0UGFydFRlbXAgKz0gUUxhdGluMUNoYXIoJyAnKTsKICAgICAgICAgUVN5c0lu Zm86OlM2MFZlcnNpb24gczYwVmVyc2lvbiA9IFFTeXNJbmZvOjpzNjBWZXJzaW9uKCk7CiAgICAg ICAgIHN3aXRjaCAoczYwVmVyc2lvbikgewogICAgICAgICBjYXNlIFFTeXNJbmZvOjpTVl9TNjBf M18xOgpAQCAtMzg2Miw5ICszODY5LDIwIEBAIFFTdHJpbmcgUVdlYlBhZ2U6OnVzZXJBZ2VudEZv clVybChjb25zdCBRVXJsJikgY29uc3QKICNlbHNlCiAgICAgICAgIGZpcnN0UGFydFRlbXAgKz0g UVN0cmluZzo6ZnJvbUxhdGluMSgiVW5rbm93biIpOwogI2VuZGlmCi0KKyNpZiBFTkFCTEUoUVRf VVNFUkFHRU5UX0RFVklDRU1PREVMKQorICAgICAgICAvLyBhZGRpbmcgTW9kZWwgTnVtYmVyCisg ICAgICAgIFF0TW9iaWxpdHk6OlFTeXN0ZW1EZXZpY2VJbmZvIHN5c3RlbURldmljZUluZm87CisK KyAgICAgICAgUVN0cmluZyBtb2RlbCA9IHN5c3RlbURldmljZUluZm8ubW9kZWwoKTsKKyAgICAg ICAgaWYgKCFtb2RlbC5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgIGlmICghZmlyc3RQYXJ0VGVt cC5lbmRzV2l0aCgiOyAiKSkKKyAgICAgICAgICAgICAgICBmaXJzdFBhcnRUZW1wICs9IFFTdHJp bmc6OmZyb21MYXRpbjEoIjsgIik7CisgICAgICAgICAgICBmaXJzdFBhcnRUZW1wICs9IHN5c3Rl bURldmljZUluZm8ubW9kZWwoKTsKKyAgICAgICAgfQorI2VuZGlmCiAgICAgICAgIC8vIGxhbmd1 YWdlIGlzIHRoZSBzcGxpdAotICAgICAgICBmaXJzdFBhcnRUZW1wICs9IFFTdHJpbmc6OmZyb21M YXRpbjEoIjsgIik7CisgICAgICAgIGlmICghZmlyc3RQYXJ0VGVtcC5lbmRzV2l0aCgiOyAiKSkK KyAgICAgICAgICAgIGZpcnN0UGFydFRlbXAgKz0gUVN0cmluZzo6ZnJvbUxhdGluMSgiOyAiKTsK ICAgICAgICAgZmlyc3RQYXJ0VGVtcC5zcXVlZXplKCk7CiAgICAgICAgIGZpcnN0UGFydCA9IGZp cnN0UGFydFRlbXA7CiAK