40939 2010-06-21 13:43:56 -0700 Full-screened content doesn't keep the display on: Safari not grabbing a power assertion? 2010-06-25 13:17:41 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED InRadar, PlatformOnly P2 Normal --- 1 jer.noble jer.noble eric webkit.review.bot oldest_to_newest 240857 0 jer.noble 2010-06-21 13:43:56 -0700 Safari doesn't grab a power assertion from IOKit when doing full-screen video content. See http://developer.apple.com/mac/library/releasenotes/Darwin/RN-IOKitPowerManagment/#//apple_ref/doc/uid/TP40006501-CH1-DontLinkElementID_4 240858 1 jer.noble 2010-06-21 13:44:08 -0700 rdar://problem/7996172 240871 2 59285 jer.noble 2010-06-21 13:59:03 -0700 Created attachment 59285 Patch 240872 3 webkit.review.bot 2010-06-21 14:01:53 -0700 Attachment 59285 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebKit/mac/WebView/WebVideoFullscreenController.h:51: _idleDisplaySleepAssertion is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit/mac/WebView/WebVideoFullscreenController.h:52: _idleSystemSleepAssertion is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 2 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 240875 4 eric 2010-06-21 14:07:22 -0700 Attachment 59285 did not build on mac: Build output: http://webkit-commit-queue.appspot.com/results/3303555 240903 5 59294 jer.noble 2010-06-21 14:42:10 -0700 Created attachment 59294 Patch 240904 6 webkit.review.bot 2010-06-21 14:43:15 -0700 Attachment 59294 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebKit/mac/WebView/WebVideoFullscreenController.h:51: _idleDisplaySleepAssertion is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit/mac/WebView/WebVideoFullscreenController.h:52: _idleSystemSleepAssertion is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 2 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 240907 7 eric 2010-06-21 14:50:00 -0700 Attachment 59294 did not build on mac: Build output: http://webkit-commit-queue.appspot.com/results/3341571 240983 8 59315 jer.noble 2010-06-21 17:03:57 -0700 Created attachment 59315 Patch 240986 9 webkit.review.bot 2010-06-21 17:05:39 -0700 Attachment 59315 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebKit/mac/WebView/WebVideoFullscreenController.h:51: _idleDisplaySleepAssertion is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit/mac/WebView/WebVideoFullscreenController.h:52: _idleSystemSleepAssertion is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 2 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 242630 10 59686 jer.noble 2010-06-24 13:00:08 -0700 Created attachment 59686 Patch 242634 11 webkit.review.bot 2010-06-24 13:05:47 -0700 Attachment 59686 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebKit/mac/WebView/WebVideoFullscreenController.h:51: _idleDisplaySleepAssertion is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit/mac/WebView/WebVideoFullscreenController.h:52: _idleSystemSleepAssertion is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 2 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 242642 12 59686 eric.carlson 2010-06-24 13:32:40 -0700 Comment on attachment 59686 Patch WebKit/WebKit.xcodeproj/project.pbxproj:777 + CD8EAC7211CAC9A300774075 /* IOKit.framework */, Should probably ask mrowe if it worth linking with the a Framework or if you should load it dynamically. WebKit/mac/WebView/WebVideoFullscreenController.mm:235 + if (_mediaElement && _mediaElement->platformMedia().type == WebCore::PlatformMedia::QTMovieType) + rate = [_mediaElement->platformMedia().media.qtMovie rate]; It might be worth having an accessor function for the QTMovie since "[_mediaElement->platformMedia().media.qtMovie" is used in the file in several places now WebKit/mac/WebView/WebVideoFullscreenController.mm:238 + if (rate && !_isEndingFullscreen) { + [self _disableIdleSystemSleep]; + [self _disableIdleDisplaySleep]; + } else { + [self _enableIdleSystemSleep]; + [self _enableIdleDisplaySleep]; + } Is there any reason to have separate functions for system and display sleep? You always enabled or disabled so you may want to have just one function to disable and one to enable. 242715 13 jer.noble 2010-06-24 16:25:36 -0700 Committed r61796: <http://trac.webkit.org/changeset/61796> 243159 14 59686 darin 2010-06-25 13:11:30 -0700 Comment on attachment 59686 Patch This should not statically link to the IOKit framework. We should soft link instead. Unless someone more expert than I on the Safari team said otherwise. 243164 15 jer.noble 2010-06-25 13:17:41 -0700 (In reply to comment #14) > (From update of attachment 59686 [details]) > This should not statically link to the IOKit framework. We should soft link instead. Unless someone more expert than I on the Safari team said otherwise. I talked this over with Eric and Mark before checking in; AppKit.framework statically links against IOKit.framework, and WebKit.framework statically links against AppKit.framework. So, it should be safe to link to this statically without affecting startup time, since we effectively already statically link against IOKit.framework. 59285 2010-06-21 13:59:03 -0700 2010-06-21 14:42:07 -0700 Patch bug-40939-20100621135901.patch text/plain 10959 jer.noble SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTU3MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTAtMDYtMjEgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRnVs bC1zY3JlZW5lZCBjb250ZW50IGRvZXNuJ3Qga2VlcCB0aGUgZGlzcGxheSBvbjogU2FmYXJpIG5v dCBncmFiYmluZyBhIHBvd2VyIGFzc2VydGlvbj8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQwOTM5CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzc5OTYx NzIKKyAgICAgICAgCisgICAgICAgIEV4cG9ydCAtW01lZGlhRWxlbWVudCBwbGF5YmFja1JhdGVd OworICAgICAgICAKKyAgICAgICAgKiBXZWJDb3JlLlZpZGVvLmV4cDoKKwogMjAxMC0wNi0yMSAg TmF0ZSBDaGFwaW4gIDxqYXBoZXRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IGJ1aWxkIGZpeC4KSW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5WaWRlby5leHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9XZWJDb3JlLlZpZGVvLmV4cAkocmV2aXNpb24gNjExMjkpCisrKyBXZWJDb3Jl L1dlYkNvcmUuVmlkZW8uZXhwCSh3b3JraW5nIGNvcHkpCkBAIC0xNCw0ICsxNCw1IEBAIF9fWk5L N1dlYkNvcmUxNkhUTUxNZWRpYUVsZW1lbnQyMXByb2Nlc3MKIF9fWk5LN1dlYkNvcmUxNkhUTUxN ZWRpYUVsZW1lbnQ1bXV0ZWRFdgogX19aTks3V2ViQ29yZTE2SFRNTE1lZGlhRWxlbWVudDZ2b2x1 bWVFdgogX19aTks3V2ViQ29yZTE2SFRNTE1lZGlhRWxlbWVudDdjYW5QbGF5RXYKK19fWk5LN1dl YkNvcmUxNkhUTUxNZWRpYUVsZW1lbnQxMnBsYXliYWNrUmF0ZUV2CiBfX1pOSzdXZWJDb3JlMTZI VE1MTWVkaWFFbGVtZW50OGR1cmF0aW9uRXYKSW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gNjE1NzIpCisrKyBXZWJLaXQvQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDYtMjEgIEplciBO b2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRnVsbC1zY3JlZW5lZCBjb250ZW50IGRvZXNuJ3Qga2VlcCB0 aGUgZGlzcGxheSBvbjogU2FmYXJpIG5vdCBncmFiYmluZyBhIHBvd2VyIGFzc2VydGlvbj8KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwOTM5CisgICAg ICAgIHJkYXI6Ly9wcm9ibGVtLzc5OTYxNzIKKyAgICAgICAgCisgICAgICAgIEFkZCBJT0tpdC5m cmFtZXdvcmsgdG8gdGhlIGxpc3Qgb2YgbGlua2VkIGZyYW1ld29ya3MuCisKKyAgICAgICAgKiBX ZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKwogMjAxMC0wNi0xOCAgQW5kZXJzIENh cmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBX ZWluaWcuCkluZGV4OiBXZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZp c2lvbiA2MTEyOSkKKysrIFdlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagko d29ya2luZyBjb3B5KQpAQCAtMzQwLDYgKzM0MCw3IEBACiAJCUMwQjg4RThCMTBBMDhGM0QwMEZC QjNGNSAvKiBXZWJGcmFtZUxvYWREZWxlZ2F0ZVByaXZhdGUuaCBpbiBIZWFkZXJzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEMwQjg4RThBMTBBMDhGM0QwMEZCQjNGNSAvKiBX ZWJGcmFtZUxvYWREZWxlZ2F0ZVByaXZhdGUuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9 IChQcml2YXRlLCApOyB9OyB9OwogCQlDMEM1QjNFRTExNzdBNEEwMDAyQjBBRUYgLyogV2ViVXNl ckNvbnRlbnRVUkxQYXR0ZXJuLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSBDMEM1QjNFQzExNzdBNEEwMDAyQjBBRUYgLyogV2ViVXNlckNvbnRlbnRVUkxQ YXR0ZXJuLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsK IAkJQzBDNUIzRUYxMTc3QTRBMDAwMkIwQUVGIC8qIFdlYlVzZXJDb250ZW50VVJMUGF0dGVybi5t bSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEMwQzVCM0VE MTE3N0E0QTAwMDJCMEFFRiAvKiBXZWJVc2VyQ29udGVudFVSTFBhdHRlcm4ubW0gKi87IH07CisJ CUNEOEVBQzczMTFDQUM5QTMwMDc3NDA3NSAvKiBJT0tpdC5mcmFtZXdvcmsgaW4gRnJhbWV3b3Jr cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDRDhFQUM3MjExQ0FDOUEzMDA3 NzQwNzUgLyogSU9LaXQuZnJhbWV3b3JrICovOyB9OwogCQlERDdDREVFNzBBMjNCQTlFMDAwNjk5 MjggLyogV2ViVHlwZXNJbnRlcm5hbC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gREQ3Q0RFRTYwQTIzQkE5RTAwMDY5OTI4IC8qIFdlYlR5cGVzSW50ZXJu YWwuaCAqLzsgfTsKIAkJREQ4OTY4MjAwOUFBODcyNDAwOTdFN0YwIC8qIFdlYkVsZW1lbnREaWN0 aW9uYXJ5LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBE RDg5NjgxRTA5QUE4NzI0MDA5N0U3RjAgLyogV2ViRWxlbWVudERpY3Rpb25hcnkuaCAqLzsgfTsK IAkJREQ4OTY4MjEwOUFBODcyNDAwOTdFN0YwIC8qIFdlYkVsZW1lbnREaWN0aW9uYXJ5Lm1tIGlu IFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gREQ4OTY4MUYwOUFB ODcyNDAwOTdFN0YwIC8qIFdlYkVsZW1lbnREaWN0aW9uYXJ5Lm1tICovOyB9OwpAQCAtNjM4LDYg KzYzOSw3IEBACiAJCUMwQjg4RThBMTBBMDhGM0QwMEZCQjNGNSAvKiBXZWJGcmFtZUxvYWREZWxl Z2F0ZVByaXZhdGUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViRnJhbWVM b2FkRGVsZWdhdGVQcml2YXRlLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUMwQzVC M0VDMTE3N0E0QTAwMDJCMEFFRiAvKiBXZWJVc2VyQ29udGVudFVSTFBhdHRlcm4uaCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViVXNlckNvbnRlbnRVUkxQYXR0ZXJuLmg7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUMwQzVCM0VEMTE3N0E0QTAwMDJCMEFFRiAvKiBX ZWJVc2VyQ29udGVudFVSTFBhdHRlcm4ubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpj cHA7IHBhdGggPSBXZWJVc2VyQ29udGVudFVSTFBhdHRlcm4ubW07IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CisJCUNEOEVBQzcyMTFDQUM5QTMwMDc3NDA3NSAvKiBJT0tpdC5mcmFtZXdvcmsg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSB3cmFwcGVy LmZyYW1ld29yazsgbmFtZSA9IElPS2l0LmZyYW1ld29yazsgcGF0aCA9IC9TeXN0ZW0vTGlicmFy eS9GcmFtZXdvcmtzL0lPS2l0LmZyYW1ld29yazsgc291cmNlVHJlZSA9ICI8YWJzb2x1dGU+Ijsg fTsKIAkJREQ3Q0RFRTYwQTIzQkE5RTAwMDY5OTI4IC8qIFdlYlR5cGVzSW50ZXJuYWwuaCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViVHlwZXNJbnRlcm5hbC5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQlERDg5NjgxRTA5QUE4NzI0MDA5N0U3RjAgLyogV2ViRWxl bWVudERpY3Rpb25hcnkuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBpbmRlbnRXaWR0aCA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j Lmg7IHBhdGggPSBXZWJFbGVtZW50RGljdGlvbmFyeS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB0YWJXaWR0aCA9IDg7IHVzZXNUYWJzID0gMDsgfTsKIAkJREQ4OTY4MUYwOUFBODcyNDAwOTdF N0YwIC8qIFdlYkVsZW1lbnREaWN0aW9uYXJ5Lm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGluZGVudFdpZHRoID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBXZWJFbGVtZW50RGljdGlvbmFyeS5tbTsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgdGFiV2lkdGggPSA4OyB1c2VzVGFicyA9IDA7IH07CkBA IC03MjYsNiArNzI4LDcgQEAKIAkJCQkxQTIwRDA4QjBFRDM4NEYyMDA0M0ZBOUYgLyogUXVhcnR6 Q29yZS5mcmFtZXdvcmsgaW4gRnJhbWV3b3JrcyAqLywKIAkJCQk5Mzk4MTEyRjA4MjRCRjAxMDA4 REYwMzggLyogU2VjdXJpdHkuZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8sCiAJCQkJOTM5ODEx MkMwODI0QkYwMTAwOERGMDM4IC8qIFdlYkNvcmUuZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8s CisJCQkJQ0Q4RUFDNzMxMUNBQzlBMzAwNzc0MDc1IC8qIElPS2l0LmZyYW1ld29yayBpbiBGcmFt ZXdvcmtzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3Npbmcg PSAwOwogCQl9OwpAQCAtNzcxLDYgKzc3NCw3IEBACiAJCTA4NjdENjlBRkU4NDAyOEZDMDJBQUMw NyAvKiBGcmFtZXdvcmtzIGFuZCBMaWJyYXJpZXMgKi8gPSB7CiAJCQlpc2EgPSBQQlhHcm91cDsK IAkJCWNoaWxkcmVuID0gKAorCQkJCUNEOEVBQzcyMTFDQUM5QTMwMDc3NDA3NSAvKiBJT0tpdC5m cmFtZXdvcmsgKi8sCiAJCQkJRjVDMjg2OTQwMjg0NkRDRDAxODYzNUNBIC8qIENhcmJvbi5mcmFt ZXdvcmsgKi8sCiAJCQkJRjVDMjg2OTUwMjg0NkRDRDAxODYzNUNBIC8qIENvY29hLmZyYW1ld29y ayAqLywKIAkJCQlGNzM4QzlFOTAzRkFEM0RGMDMyMUZCRTAgLyogSmF2YVNjcmlwdENvcmUuZnJh bWV3b3JrICovLApJbmRleDogV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDYxNTcyKQorKysgV2ViS2l0L21hYy9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wNi0yMSAgSmVyIE5vYmxl ICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBGdWxsLXNjcmVlbmVkIGNvbnRlbnQgZG9lc24ndCBrZWVwIHRoZSBk aXNwbGF5IG9uOiBTYWZhcmkgbm90IGdyYWJiaW5nIGEgcG93ZXIgYXNzZXJ0aW9uPworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA5MzkKKyAgICAgICAg cmRhcjovL3Byb2JsZW0vNzk5NjE3MgorICAgICAgICAKKyAgICAgICAgVGFrZSBhIElPS2l0IHBv d2VyIGFzc2VydGlvbiB3aGVuIHBsYXlpbmcgdmlkZW8gaW4gZnVsbHNjcmVlbiBtb2RlLiAgUmVs ZWFzZSB0aGUKKyAgICAgICAgYXNzZXJ0aW9uIHdoZW4gcGF1c2VkIGluIGZ1bGxzY3JlZW4gbW9k ZSwgYW5kIHdoZW4gZXhpdGluZyBmdWxsc2NyZWVuIG1vZGUuCisKKyAgICAgICAgKiBXZWJWaWV3 L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZp ZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW06CisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVl bkNvbnRyb2xsZXIgd2luZG93RGlkRXhpdEZ1bGxzY3JlZW5dKTogQ2FsbCB1cGRhdGVQb3dlckFz c2VydGlvbnMuCisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIgd2luZG93 RGlkRW50ZXJGdWxsc2NyZWVuXSk6IENhbGwgdXBkYXRlUG93ZXJBc3NlcnRpb25zLgorICAgICAg ICAoLVtXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyIF9kaXNhYmxlSWRsZURpc3BsYXlTbGVl cF0pOgorICAgICAgICAoLVtXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyIF9lbmFibGVJZGxl RGlzcGxheVNsZWVwXSk6CisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIg X2Rpc2FibGVJZGxlU3lzdGVtU2xlZXBdKToKKyAgICAgICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVu Q29udHJvbGxlciBfZW5hYmxlSWRsZVN5c3RlbVNsZWVwXSk6CisgICAgICAgICgtW1dlYlZpZGVv RnVsbHNjcmVlbkNvbnRyb2xsZXIgdXBkYXRlUG93ZXJBc3NlcnRpb25zXSk6IENhbGwgXyhlbmFi bGV8ZGlzYWJsZSlJZGxlKFN5c3RlbXxEaXNwbGF5KXNsZWVwIGRlcGVuZGluZyBvbiBjdXJyZW50 IHBsYXliYWNrIHJhdGUgYW5kIGZ1bGxzY3JlZW4gc3RhdHVzLgorICAgICAgICAoLVtXZWJWaWRl b0Z1bGxzY3JlZW5Db250cm9sbGVyIHJhdGVDaGFuZ2VkOl0pOiBDYWxsIHVwZGF0ZVBvd2VyQXNz ZXJ0aW9ucy4KKwogMjAxMC0wNi0yMSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgogCiAgICAgICAgIFRyeSB0byBmaXggdGhlIFBvd2VyUEMgYnVpbGQuCkluZGV4OiBXZWJL aXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9tYWMvV2ViVmlldy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLmgJKHJl dmlzaW9uIDYxMTI5KQorKysgV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNv bnRyb2xsZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNDgsNiArNDgsOCBAQCBAaW50ZXJmYWNlIFdl YlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIgCiAgICAgQk9PTCBfaXNFbmRpbmdGdWxsc2NyZWVu OwogICAgIEJPT0wgX2lzV2luZG93TG9hZGVkOwogICAgIEJPT0wgX2ZvcmNlRGlzYWJsZUFuaW1h dGlvbjsKKyAgICB1aW50MzJfdCBfaWRsZURpc3BsYXlTbGVlcEFzc2VydGlvbjsKKyAgICB1aW50 MzJfdCBfaWRsZVN5c3RlbVNsZWVwQXNzZXJ0aW9uOyAgICAKICAgICBTeXN0ZW1VSU1vZGUgX3Nh dmVkVUlNb2RlOwogICAgIFN5c3RlbVVJT3B0aW9ucyBfc2F2ZWRVSU9wdGlvbnM7CiB9CkluZGV4 OiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxl ci5tbQkocmV2aXNpb24gNjExMjkpCisrKyBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxs c2NyZWVuQ29udHJvbGxlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMzAsNiArMzAsNyBAQAogI2lt cG9ydCAiV2ViVHlwZXNJbnRlcm5hbC5oIgogI2ltcG9ydCAiV2ViVmlkZW9GdWxsc2NyZWVuSFVE V2luZG93Q29udHJvbGxlci5oIgogI2ltcG9ydCAiV2ViV2luZG93QW5pbWF0aW9uLmgiCisjaW1w b3J0IDxJT0tpdC9wd3JfbWd0L0lPUE1MaWIuaD4KICNpbXBvcnQgPFFUS2l0L1FUS2l0Lmg+CiAj aW1wb3J0IDxXZWJDb3JlL0hUTUxNZWRpYUVsZW1lbnQuaD4KICNpbXBvcnQgPFdlYkNvcmUvU29m dExpbmtpbmcuaD4KQEAgLTU1LDYgKzU2LDcgQEAgLSAodm9pZClhbmltYXRlRnJvbVJlY3Q6KE5T UmVjdClzdGFydFJlYwogQGVuZAogCiBAaW50ZXJmYWNlIFdlYlZpZGVvRnVsbHNjcmVlbkNvbnRy b2xsZXIoSFVEV2luZG93Q29udHJvbGxlckRlbGVnYXRlKSA8V2ViVmlkZW9GdWxsc2NyZWVuSFVE V2luZG93Q29udHJvbGxlckRlbGVnYXRlPgorLSAodm9pZCl1cGRhdGVQb3dlckFzc2VydGlvbnM7 CiBAZW5kCiAKIEBpbXBsZW1lbnRhdGlvbiBXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyCkBA IC0xNTMsNyArMTU1LDcgQEAgLSAodm9pZCl3aW5kb3dEaWRFeGl0RnVsbHNjcmVlbgogICAgIFtz ZWxmIGNsZWFyRmFkZUFuaW1hdGlvbl07CiAgICAgW1tzZWxmIHdpbmRvd10gY2xvc2VdOwogICAg IFtzZWxmIHNldFdpbmRvdzpuaWxdOwotICAgIFNldFN5c3RlbVVJTW9kZShfc2F2ZWRVSU1vZGUs IF9zYXZlZFVJT3B0aW9ucyk7CisgICAgW3NlbGYgdXBkYXRlUG93ZXJBc3NlcnRpb25zXTsKICAg ICBbX2h1ZENvbnRyb2xsZXIgc2V0RGVsZWdhdGU6bmlsXTsKICAgICBbX2h1ZENvbnRyb2xsZXIg cmVsZWFzZV07CiAgICAgX2h1ZENvbnRyb2xsZXIgPSBuaWw7CkBAIC0xNzMsOCArMTc1LDcgQEAg LSAodm9pZCl3aW5kb3dEaWRFbnRlckZ1bGxzY3JlZW4KICAgICBfaHVkQ29udHJvbGxlciA9IFtb V2ViVmlkZW9GdWxsc2NyZWVuSFVEV2luZG93Q29udHJvbGxlciBhbGxvY10gaW5pdF07CiAgICAg W19odWRDb250cm9sbGVyIHNldERlbGVnYXRlOnNlbGZdOwogCi0gICAgR2V0U3lzdGVtVUlNb2Rl KCZfc2F2ZWRVSU1vZGUsICZfc2F2ZWRVSU9wdGlvbnMpOwotICAgIFNldFN5c3RlbVVJTW9kZShr VUlNb2RlQWxsU3VwcHJlc3NlZCAsIDApOworICAgIFtzZWxmIHVwZGF0ZVBvd2VyQXNzZXJ0aW9u c107CiAgICAgW05TQ3Vyc29yIHNldEhpZGRlblVudGlsTW91c2VNb3ZlczpZRVNdOwogICAgIAog ICAgIC8vIEdpdmUgdGhlIEhVRCBrZXlib2FyZCBmb2N1cyBpbml0aWFsbHkKQEAgLTE4Niw2ICsx ODcsNDkgQEAgLSAoTlNSZWN0KW1lZGlhRWxlbWVudFJlY3QKICAgICByZXR1cm4gX21lZGlhRWxl bWVudC0+c2NyZWVuUmVjdCgpOwogfQogCistICh2b2lkKV9kaXNhYmxlSWRsZURpc3BsYXlTbGVl cAoreworICAgIGlmIChfaWRsZURpc3BsYXlTbGVlcEFzc2VydGlvbiA9PSBrSU9QTU51bGxBc3Nl cnRpb25JRCkgCisgICAgICAgIElPUE1Bc3NlcnRpb25DcmVhdGVXaXRoTmFtZShrSU9QTUFzc2Vy dGlvblR5cGVOb0Rpc3BsYXlTbGVlcCwga0lPUE1Bc3NlcnRpb25MZXZlbE9uLCBDRlNUUigiV2Vi S2l0IHBsYXlpbmcgYSB2aWRlbyBmdWxsc2NyZWVuLiIpLCAmX2lkbGVEaXNwbGF5U2xlZXBBc3Nl cnRpb24pOworfQorCistICh2b2lkKV9lbmFibGVJZGxlRGlzcGxheVNsZWVwCit7CisgICAgaWYg KF9pZGxlRGlzcGxheVNsZWVwQXNzZXJ0aW9uICE9IGtJT1BNTnVsbEFzc2VydGlvbklEKSB7Cisg ICAgICAgIElPUE1Bc3NlcnRpb25SZWxlYXNlKF9pZGxlRGlzcGxheVNsZWVwQXNzZXJ0aW9uKTsK KyAgICAgICAgX2lkbGVEaXNwbGF5U2xlZXBBc3NlcnRpb24gPSBrSU9QTU51bGxBc3NlcnRpb25J RDsKKyAgICB9Cit9CisKKy0gKHZvaWQpX2Rpc2FibGVJZGxlU3lzdGVtU2xlZXAKK3sKKyAgICBp ZiAoX2lkbGVTeXN0ZW1TbGVlcEFzc2VydGlvbiA9PSBrSU9QTU51bGxBc3NlcnRpb25JRCkgCisg ICAgICAgIElPUE1Bc3NlcnRpb25DcmVhdGVXaXRoTmFtZShrSU9QTUFzc2VydGlvblR5cGVOb0lk bGVTbGVlcCwga0lPUE1Bc3NlcnRpb25MZXZlbE9uLCBDRlNUUigiV2ViS2l0IHBsYXlpbmcgYSB2 aWRlbyBmdWxsc2NyZWVuLiIpLCAmX2lkbGVTeXN0ZW1TbGVlcEFzc2VydGlvbik7Cit9CisKKy0g KHZvaWQpX2VuYWJsZUlkbGVTeXN0ZW1TbGVlcAoreworICAgIGlmIChfaWRsZVN5c3RlbVNsZWVw QXNzZXJ0aW9uICE9IGtJT1BNTnVsbEFzc2VydGlvbklEKSB7CisgICAgICAgIElPUE1Bc3NlcnRp b25SZWxlYXNlKF9pZGxlU3lzdGVtU2xlZXBBc3NlcnRpb24pOworICAgICAgICBfaWRsZVN5c3Rl bVNsZWVwQXNzZXJ0aW9uID0ga0lPUE1OdWxsQXNzZXJ0aW9uSUQ7CisgICAgfQorfQorCistICh2 b2lkKXVwZGF0ZVBvd2VyQXNzZXJ0aW9ucworeworICAgIGZsb2F0IHJhdGUgPSAwOworICAgIGlm IChfbWVkaWFFbGVtZW50ICYmIF9tZWRpYUVsZW1lbnQtPnBsYXRmb3JtTWVkaWEoKS50eXBlID09 IFdlYkNvcmU6OlBsYXRmb3JtTWVkaWE6OlFUTW92aWVUeXBlKQorICAgICAgICByYXRlID0gW19t ZWRpYUVsZW1lbnQtPnBsYXRmb3JtTWVkaWEoKS5tZWRpYS5xdE1vdmllIHJhdGVdOworICAgIAor ICAgIGlmIChyYXRlICYmICFfaXNFbmRpbmdGdWxsc2NyZWVuKSB7CisgICAgICAgIFtzZWxmIF9k aXNhYmxlSWRsZVN5c3RlbVNsZWVwXTsKKyAgICAgICAgW3NlbGYgX2Rpc2FibGVJZGxlRGlzcGxh eVNsZWVwXTsKKyAgICB9IGVsc2UgeworICAgICAgICBbc2VsZiBfZW5hYmxlSWRsZVN5c3RlbVNs ZWVwXTsKKyAgICAgICAgW3NlbGYgX2VuYWJsZUlkbGVEaXNwbGF5U2xlZXBdOworICAgIH0gICAg ICAgIAorfQorCiAjcHJhZ21hIG1hcmsgLQogI3ByYWdtYSBtYXJrIEV4cG9zZWQgSW50ZXJmYWNl CiAKQEAgLTMxNCw2ICszNTgsNyBAQCAtICh2b2lkKXJhdGVDaGFuZ2VkOihOU05vdGlmaWNhdGlv biAqKXVuCiB7CiAgICAgVU5VU0VEX1BBUkFNKHVudXNlZE5vdGlmaWNhdGlvbik7CiAgICAgW19o dWRDb250cm9sbGVyIHVwZGF0ZVJhdGVdOworICAgIFtzZWxmIHVwZGF0ZVBvd2VyQXNzZXJ0aW9u c107CiB9CiAKIEBlbmQK 59294 2010-06-21 14:42:10 -0700 2010-06-21 17:03:53 -0700 Patch bug-40939-20100621144209.patch text/plain 11087 jer.noble SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTU3MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTAtMDYtMjEgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRnVs bC1zY3JlZW5lZCBjb250ZW50IGRvZXNuJ3Qga2VlcCB0aGUgZGlzcGxheSBvbjogU2FmYXJpIG5v dCBncmFiYmluZyBhIHBvd2VyIGFzc2VydGlvbj8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQwOTM5CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzc5OTYx NzIKKyAgICAgICAgCisgICAgICAgIEV4cG9ydCAtW01lZGlhRWxlbWVudCBwbGF5YmFja1JhdGVd OworICAgICAgICAKKyAgICAgICAgKiBXZWJDb3JlLlZpZGVvLmV4cDoKKwogMjAxMC0wNi0yMSAg TmF0ZSBDaGFwaW4gIDxqYXBoZXRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IGJ1aWxkIGZpeC4KSW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5WaWRlby5leHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9XZWJDb3JlLlZpZGVvLmV4cAkocmV2aXNpb24gNjExMjkpCisrKyBXZWJDb3Jl L1dlYkNvcmUuVmlkZW8uZXhwCSh3b3JraW5nIGNvcHkpCkBAIC0xNCw0ICsxNCw1IEBAIF9fWk5L N1dlYkNvcmUxNkhUTUxNZWRpYUVsZW1lbnQyMXByb2Nlc3MKIF9fWk5LN1dlYkNvcmUxNkhUTUxN ZWRpYUVsZW1lbnQ1bXV0ZWRFdgogX19aTks3V2ViQ29yZTE2SFRNTE1lZGlhRWxlbWVudDZ2b2x1 bWVFdgogX19aTks3V2ViQ29yZTE2SFRNTE1lZGlhRWxlbWVudDdjYW5QbGF5RXYKK19fWk5LN1dl YkNvcmUxNkhUTUxNZWRpYUVsZW1lbnQxMnBsYXliYWNrUmF0ZUV2CiBfX1pOSzdXZWJDb3JlMTZI VE1MTWVkaWFFbGVtZW50OGR1cmF0aW9uRXYKSW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gNjE1NzIpCisrKyBXZWJLaXQvQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDYtMjEgIEplciBO b2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRnVsbC1zY3JlZW5lZCBjb250ZW50IGRvZXNuJ3Qga2VlcCB0 aGUgZGlzcGxheSBvbjogU2FmYXJpIG5vdCBncmFiYmluZyBhIHBvd2VyIGFzc2VydGlvbj8KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwOTM5CisgICAg ICAgIHJkYXI6Ly9wcm9ibGVtLzc5OTYxNzIKKyAgICAgICAgCisgICAgICAgIEFkZCBJT0tpdC5m cmFtZXdvcmsgdG8gdGhlIGxpc3Qgb2YgbGlua2VkIGZyYW1ld29ya3MuCisKKyAgICAgICAgKiBX ZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKwogMjAxMC0wNi0xOCAgQW5kZXJzIENh cmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBX ZWluaWcuCkluZGV4OiBXZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZp c2lvbiA2MTEyOSkKKysrIFdlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagko d29ya2luZyBjb3B5KQpAQCAtMzQwLDYgKzM0MCw3IEBACiAJCUMwQjg4RThCMTBBMDhGM0QwMEZC QjNGNSAvKiBXZWJGcmFtZUxvYWREZWxlZ2F0ZVByaXZhdGUuaCBpbiBIZWFkZXJzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEMwQjg4RThBMTBBMDhGM0QwMEZCQjNGNSAvKiBX ZWJGcmFtZUxvYWREZWxlZ2F0ZVByaXZhdGUuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9 IChQcml2YXRlLCApOyB9OyB9OwogCQlDMEM1QjNFRTExNzdBNEEwMDAyQjBBRUYgLyogV2ViVXNl ckNvbnRlbnRVUkxQYXR0ZXJuLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSBDMEM1QjNFQzExNzdBNEEwMDAyQjBBRUYgLyogV2ViVXNlckNvbnRlbnRVUkxQ YXR0ZXJuLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsK IAkJQzBDNUIzRUYxMTc3QTRBMDAwMkIwQUVGIC8qIFdlYlVzZXJDb250ZW50VVJMUGF0dGVybi5t bSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEMwQzVCM0VE MTE3N0E0QTAwMDJCMEFFRiAvKiBXZWJVc2VyQ29udGVudFVSTFBhdHRlcm4ubW0gKi87IH07CisJ CUNEOEVBQzczMTFDQUM5QTMwMDc3NDA3NSAvKiBJT0tpdC5mcmFtZXdvcmsgaW4gRnJhbWV3b3Jr cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDRDhFQUM3MjExQ0FDOUEzMDA3 NzQwNzUgLyogSU9LaXQuZnJhbWV3b3JrICovOyB9OwogCQlERDdDREVFNzBBMjNCQTlFMDAwNjk5 MjggLyogV2ViVHlwZXNJbnRlcm5hbC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gREQ3Q0RFRTYwQTIzQkE5RTAwMDY5OTI4IC8qIFdlYlR5cGVzSW50ZXJu YWwuaCAqLzsgfTsKIAkJREQ4OTY4MjAwOUFBODcyNDAwOTdFN0YwIC8qIFdlYkVsZW1lbnREaWN0 aW9uYXJ5LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBE RDg5NjgxRTA5QUE4NzI0MDA5N0U3RjAgLyogV2ViRWxlbWVudERpY3Rpb25hcnkuaCAqLzsgfTsK IAkJREQ4OTY4MjEwOUFBODcyNDAwOTdFN0YwIC8qIFdlYkVsZW1lbnREaWN0aW9uYXJ5Lm1tIGlu IFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gREQ4OTY4MUYwOUFB ODcyNDAwOTdFN0YwIC8qIFdlYkVsZW1lbnREaWN0aW9uYXJ5Lm1tICovOyB9OwpAQCAtNjM4LDYg KzYzOSw3IEBACiAJCUMwQjg4RThBMTBBMDhGM0QwMEZCQjNGNSAvKiBXZWJGcmFtZUxvYWREZWxl Z2F0ZVByaXZhdGUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViRnJhbWVM b2FkRGVsZWdhdGVQcml2YXRlLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUMwQzVC M0VDMTE3N0E0QTAwMDJCMEFFRiAvKiBXZWJVc2VyQ29udGVudFVSTFBhdHRlcm4uaCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViVXNlckNvbnRlbnRVUkxQYXR0ZXJuLmg7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUMwQzVCM0VEMTE3N0E0QTAwMDJCMEFFRiAvKiBX ZWJVc2VyQ29udGVudFVSTFBhdHRlcm4ubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpj cHA7IHBhdGggPSBXZWJVc2VyQ29udGVudFVSTFBhdHRlcm4ubW07IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CisJCUNEOEVBQzcyMTFDQUM5QTMwMDc3NDA3NSAvKiBJT0tpdC5mcmFtZXdvcmsg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSB3cmFwcGVy LmZyYW1ld29yazsgbmFtZSA9IElPS2l0LmZyYW1ld29yazsgcGF0aCA9IC9TeXN0ZW0vTGlicmFy eS9GcmFtZXdvcmtzL0lPS2l0LmZyYW1ld29yazsgc291cmNlVHJlZSA9ICI8YWJzb2x1dGU+Ijsg fTsKIAkJREQ3Q0RFRTYwQTIzQkE5RTAwMDY5OTI4IC8qIFdlYlR5cGVzSW50ZXJuYWwuaCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViVHlwZXNJbnRlcm5hbC5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQlERDg5NjgxRTA5QUE4NzI0MDA5N0U3RjAgLyogV2ViRWxl bWVudERpY3Rpb25hcnkuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBpbmRlbnRXaWR0aCA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j Lmg7IHBhdGggPSBXZWJFbGVtZW50RGljdGlvbmFyeS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB0YWJXaWR0aCA9IDg7IHVzZXNUYWJzID0gMDsgfTsKIAkJREQ4OTY4MUYwOUFBODcyNDAwOTdF N0YwIC8qIFdlYkVsZW1lbnREaWN0aW9uYXJ5Lm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGluZGVudFdpZHRoID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBXZWJFbGVtZW50RGljdGlvbmFyeS5tbTsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgdGFiV2lkdGggPSA4OyB1c2VzVGFicyA9IDA7IH07CkBA IC03MjYsNiArNzI4LDcgQEAKIAkJCQkxQTIwRDA4QjBFRDM4NEYyMDA0M0ZBOUYgLyogUXVhcnR6 Q29yZS5mcmFtZXdvcmsgaW4gRnJhbWV3b3JrcyAqLywKIAkJCQk5Mzk4MTEyRjA4MjRCRjAxMDA4 REYwMzggLyogU2VjdXJpdHkuZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8sCiAJCQkJOTM5ODEx MkMwODI0QkYwMTAwOERGMDM4IC8qIFdlYkNvcmUuZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8s CisJCQkJQ0Q4RUFDNzMxMUNBQzlBMzAwNzc0MDc1IC8qIElPS2l0LmZyYW1ld29yayBpbiBGcmFt ZXdvcmtzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3Npbmcg PSAwOwogCQl9OwpAQCAtNzcxLDYgKzc3NCw3IEBACiAJCTA4NjdENjlBRkU4NDAyOEZDMDJBQUMw NyAvKiBGcmFtZXdvcmtzIGFuZCBMaWJyYXJpZXMgKi8gPSB7CiAJCQlpc2EgPSBQQlhHcm91cDsK IAkJCWNoaWxkcmVuID0gKAorCQkJCUNEOEVBQzcyMTFDQUM5QTMwMDc3NDA3NSAvKiBJT0tpdC5m cmFtZXdvcmsgKi8sCiAJCQkJRjVDMjg2OTQwMjg0NkRDRDAxODYzNUNBIC8qIENhcmJvbi5mcmFt ZXdvcmsgKi8sCiAJCQkJRjVDMjg2OTUwMjg0NkRDRDAxODYzNUNBIC8qIENvY29hLmZyYW1ld29y ayAqLywKIAkJCQlGNzM4QzlFOTAzRkFEM0RGMDMyMUZCRTAgLyogSmF2YVNjcmlwdENvcmUuZnJh bWV3b3JrICovLApJbmRleDogV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDYxNTcyKQorKysgV2ViS2l0L21hYy9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wNi0yMSAgSmVyIE5vYmxl ICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBGdWxsLXNjcmVlbmVkIGNvbnRlbnQgZG9lc24ndCBrZWVwIHRoZSBk aXNwbGF5IG9uOiBTYWZhcmkgbm90IGdyYWJiaW5nIGEgcG93ZXIgYXNzZXJ0aW9uPworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA5MzkKKyAgICAgICAg cmRhcjovL3Byb2JsZW0vNzk5NjE3MgorICAgICAgICAKKyAgICAgICAgVGFrZSBhIElPS2l0IHBv d2VyIGFzc2VydGlvbiB3aGVuIHBsYXlpbmcgdmlkZW8gaW4gZnVsbHNjcmVlbiBtb2RlLiAgUmVs ZWFzZSB0aGUKKyAgICAgICAgYXNzZXJ0aW9uIHdoZW4gcGF1c2VkIGluIGZ1bGxzY3JlZW4gbW9k ZSwgYW5kIHdoZW4gZXhpdGluZyBmdWxsc2NyZWVuIG1vZGUuCisKKyAgICAgICAgKiBXZWJWaWV3 L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZp ZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW06CisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVl bkNvbnRyb2xsZXIgd2luZG93RGlkRXhpdEZ1bGxzY3JlZW5dKTogQ2FsbCB1cGRhdGVQb3dlckFz c2VydGlvbnMuCisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIgd2luZG93 RGlkRW50ZXJGdWxsc2NyZWVuXSk6IENhbGwgdXBkYXRlUG93ZXJBc3NlcnRpb25zLgorICAgICAg ICAoLVtXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyIF9kaXNhYmxlSWRsZURpc3BsYXlTbGVl cF0pOgorICAgICAgICAoLVtXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyIF9lbmFibGVJZGxl RGlzcGxheVNsZWVwXSk6CisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIg X2Rpc2FibGVJZGxlU3lzdGVtU2xlZXBdKToKKyAgICAgICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVu Q29udHJvbGxlciBfZW5hYmxlSWRsZVN5c3RlbVNsZWVwXSk6CisgICAgICAgICgtW1dlYlZpZGVv RnVsbHNjcmVlbkNvbnRyb2xsZXIgdXBkYXRlUG93ZXJBc3NlcnRpb25zXSk6IENhbGwgXyhlbmFi bGV8ZGlzYWJsZSlJZGxlKFN5c3RlbXxEaXNwbGF5KXNsZWVwIGRlcGVuZGluZyBvbiBjdXJyZW50 IHBsYXliYWNrIHJhdGUgYW5kIGZ1bGxzY3JlZW4gc3RhdHVzLgorICAgICAgICAoLVtXZWJWaWRl b0Z1bGxzY3JlZW5Db250cm9sbGVyIHJhdGVDaGFuZ2VkOl0pOiBDYWxsIHVwZGF0ZVBvd2VyQXNz ZXJ0aW9ucy4KKwogMjAxMC0wNi0yMSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgogCiAgICAgICAgIFRyeSB0byBmaXggdGhlIFBvd2VyUEMgYnVpbGQuCkluZGV4OiBXZWJL aXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9tYWMvV2ViVmlldy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLmgJKHJl dmlzaW9uIDYxMTI5KQorKysgV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNv bnRyb2xsZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNDgsNiArNDgsOCBAQCBAaW50ZXJmYWNlIFdl YlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIgCiAgICAgQk9PTCBfaXNFbmRpbmdGdWxsc2NyZWVu OwogICAgIEJPT0wgX2lzV2luZG93TG9hZGVkOwogICAgIEJPT0wgX2ZvcmNlRGlzYWJsZUFuaW1h dGlvbjsKKyAgICB1aW50MzJfdCBfaWRsZURpc3BsYXlTbGVlcEFzc2VydGlvbjsKKyAgICB1aW50 MzJfdCBfaWRsZVN5c3RlbVNsZWVwQXNzZXJ0aW9uOyAgICAKICAgICBTeXN0ZW1VSU1vZGUgX3Nh dmVkVUlNb2RlOwogICAgIFN5c3RlbVVJT3B0aW9ucyBfc2F2ZWRVSU9wdGlvbnM7CiB9CkluZGV4 OiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxl ci5tbQkocmV2aXNpb24gNjExMjkpCisrKyBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxs c2NyZWVuQ29udHJvbGxlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMzAsNiArMzAsNyBAQAogI2lt cG9ydCAiV2ViVHlwZXNJbnRlcm5hbC5oIgogI2ltcG9ydCAiV2ViVmlkZW9GdWxsc2NyZWVuSFVE V2luZG93Q29udHJvbGxlci5oIgogI2ltcG9ydCAiV2ViV2luZG93QW5pbWF0aW9uLmgiCisjaW1w b3J0IDxJT0tpdC9wd3JfbWd0L0lPUE1MaWIuaD4KICNpbXBvcnQgPFFUS2l0L1FUS2l0Lmg+CiAj aW1wb3J0IDxXZWJDb3JlL0hUTUxNZWRpYUVsZW1lbnQuaD4KICNpbXBvcnQgPFdlYkNvcmUvU29m dExpbmtpbmcuaD4KQEAgLTU1LDYgKzU2LDcgQEAgLSAodm9pZClhbmltYXRlRnJvbVJlY3Q6KE5T UmVjdClzdGFydFJlYwogQGVuZAogCiBAaW50ZXJmYWNlIFdlYlZpZGVvRnVsbHNjcmVlbkNvbnRy b2xsZXIoSFVEV2luZG93Q29udHJvbGxlckRlbGVnYXRlKSA8V2ViVmlkZW9GdWxsc2NyZWVuSFVE V2luZG93Q29udHJvbGxlckRlbGVnYXRlPgorLSAodm9pZCl1cGRhdGVQb3dlckFzc2VydGlvbnM7 CiBAZW5kCiAKIEBpbXBsZW1lbnRhdGlvbiBXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyCkBA IC0xNTMsNyArMTU1LDcgQEAgLSAodm9pZCl3aW5kb3dEaWRFeGl0RnVsbHNjcmVlbgogICAgIFtz ZWxmIGNsZWFyRmFkZUFuaW1hdGlvbl07CiAgICAgW1tzZWxmIHdpbmRvd10gY2xvc2VdOwogICAg IFtzZWxmIHNldFdpbmRvdzpuaWxdOwotICAgIFNldFN5c3RlbVVJTW9kZShfc2F2ZWRVSU1vZGUs IF9zYXZlZFVJT3B0aW9ucyk7CisgICAgW3NlbGYgdXBkYXRlUG93ZXJBc3NlcnRpb25zXTsKICAg ICBbX2h1ZENvbnRyb2xsZXIgc2V0RGVsZWdhdGU6bmlsXTsKICAgICBbX2h1ZENvbnRyb2xsZXIg cmVsZWFzZV07CiAgICAgX2h1ZENvbnRyb2xsZXIgPSBuaWw7CkBAIC0xNzMsOCArMTc1LDcgQEAg LSAodm9pZCl3aW5kb3dEaWRFbnRlckZ1bGxzY3JlZW4KICAgICBfaHVkQ29udHJvbGxlciA9IFtb V2ViVmlkZW9GdWxsc2NyZWVuSFVEV2luZG93Q29udHJvbGxlciBhbGxvY10gaW5pdF07CiAgICAg W19odWRDb250cm9sbGVyIHNldERlbGVnYXRlOnNlbGZdOwogCi0gICAgR2V0U3lzdGVtVUlNb2Rl KCZfc2F2ZWRVSU1vZGUsICZfc2F2ZWRVSU9wdGlvbnMpOwotICAgIFNldFN5c3RlbVVJTW9kZShr VUlNb2RlQWxsU3VwcHJlc3NlZCAsIDApOworICAgIFtzZWxmIHVwZGF0ZVBvd2VyQXNzZXJ0aW9u c107CiAgICAgW05TQ3Vyc29yIHNldEhpZGRlblVudGlsTW91c2VNb3ZlczpZRVNdOwogICAgIAog ICAgIC8vIEdpdmUgdGhlIEhVRCBrZXlib2FyZCBmb2N1cyBpbml0aWFsbHkKQEAgLTE4Niw2ICsx ODcsNTMgQEAgLSAoTlNSZWN0KW1lZGlhRWxlbWVudFJlY3QKICAgICByZXR1cm4gX21lZGlhRWxl bWVudC0+c2NyZWVuUmVjdCgpOwogfQogCisjaWYgIWRlZmluZWQoQlVJTERJTkdfT05fVElHRVIp IC8vIElPUE1Bc3NlcnRpb25DcmVhdGVXaXRoTmFtZSBub3QgZGVmaW5lZCBvbiA8IDEwLjUKKy0g KHZvaWQpX2Rpc2FibGVJZGxlRGlzcGxheVNsZWVwCit7CisgICAgaWYgKF9pZGxlRGlzcGxheVNs ZWVwQXNzZXJ0aW9uID09IGtJT1BNTnVsbEFzc2VydGlvbklEKSAKKyAgICAgICAgSU9QTUFzc2Vy dGlvbkNyZWF0ZVdpdGhOYW1lKGtJT1BNQXNzZXJ0aW9uVHlwZU5vRGlzcGxheVNsZWVwLCBrSU9Q TUFzc2VydGlvbkxldmVsT24sIENGU1RSKCJXZWJLaXQgcGxheWluZyBhIHZpZGVvIGZ1bGxzY3Jl ZW4uIiksICZfaWRsZURpc3BsYXlTbGVlcEFzc2VydGlvbik7Cit9CisKKy0gKHZvaWQpX2VuYWJs ZUlkbGVEaXNwbGF5U2xlZXAKK3sKKyAgICBpZiAoX2lkbGVEaXNwbGF5U2xlZXBBc3NlcnRpb24g IT0ga0lPUE1OdWxsQXNzZXJ0aW9uSUQpIHsKKyAgICAgICAgSU9QTUFzc2VydGlvblJlbGVhc2Uo X2lkbGVEaXNwbGF5U2xlZXBBc3NlcnRpb24pOworICAgICAgICBfaWRsZURpc3BsYXlTbGVlcEFz c2VydGlvbiA9IGtJT1BNTnVsbEFzc2VydGlvbklEOworICAgIH0KK30KKworLSAodm9pZClfZGlz YWJsZUlkbGVTeXN0ZW1TbGVlcAoreworICAgIGlmIChfaWRsZVN5c3RlbVNsZWVwQXNzZXJ0aW9u ID09IGtJT1BNTnVsbEFzc2VydGlvbklEKSAKKyAgICAgICAgSU9QTUFzc2VydGlvbkNyZWF0ZVdp dGhOYW1lKGtJT1BNQXNzZXJ0aW9uVHlwZU5vSWRsZVNsZWVwLCBrSU9QTUFzc2VydGlvbkxldmVs T24sIENGU1RSKCJXZWJLaXQgcGxheWluZyBhIHZpZGVvIGZ1bGxzY3JlZW4uIiksICZfaWRsZVN5 c3RlbVNsZWVwQXNzZXJ0aW9uKTsKK30KKworLSAodm9pZClfZW5hYmxlSWRsZVN5c3RlbVNsZWVw Cit7CisgICAgaWYgKF9pZGxlU3lzdGVtU2xlZXBBc3NlcnRpb24gIT0ga0lPUE1OdWxsQXNzZXJ0 aW9uSUQpIHsKKyAgICAgICAgSU9QTUFzc2VydGlvblJlbGVhc2UoX2lkbGVTeXN0ZW1TbGVlcEFz c2VydGlvbik7CisgICAgICAgIF9pZGxlU3lzdGVtU2xlZXBBc3NlcnRpb24gPSBrSU9QTU51bGxB c3NlcnRpb25JRDsKKyAgICB9Cit9CisjZW5kaWYKKworLSAodm9pZCl1cGRhdGVQb3dlckFzc2Vy dGlvbnMKK3sKKyNpZiAhZGVmaW5lZChCVUlMRElOR19PTl9USUdFUikgCisgICAgZmxvYXQgcmF0 ZSA9IDA7CisgICAgaWYgKF9tZWRpYUVsZW1lbnQgJiYgX21lZGlhRWxlbWVudC0+cGxhdGZvcm1N ZWRpYSgpLnR5cGUgPT0gV2ViQ29yZTo6UGxhdGZvcm1NZWRpYTo6UVRNb3ZpZVR5cGUpCisgICAg ICAgIHJhdGUgPSBbX21lZGlhRWxlbWVudC0+cGxhdGZvcm1NZWRpYSgpLm1lZGlhLnF0TW92aWUg cmF0ZV07CisgICAgCisgICAgaWYgKHJhdGUgJiYgIV9pc0VuZGluZ0Z1bGxzY3JlZW4pIHsKKyAg ICAgICAgW3NlbGYgX2Rpc2FibGVJZGxlU3lzdGVtU2xlZXBdOworICAgICAgICBbc2VsZiBfZGlz YWJsZUlkbGVEaXNwbGF5U2xlZXBdOworICAgIH0gZWxzZSB7CisgICAgICAgIFtzZWxmIF9lbmFi bGVJZGxlU3lzdGVtU2xlZXBdOworICAgICAgICBbc2VsZiBfZW5hYmxlSWRsZURpc3BsYXlTbGVl cF07CisgICAgfQorI2VuZGlmCit9CisKICNwcmFnbWEgbWFyayAtCiAjcHJhZ21hIG1hcmsgRXhw b3NlZCBJbnRlcmZhY2UKIApAQCAtMzE0LDYgKzM2Miw3IEBAIC0gKHZvaWQpcmF0ZUNoYW5nZWQ6 KE5TTm90aWZpY2F0aW9uICopdW4KIHsKICAgICBVTlVTRURfUEFSQU0odW51c2VkTm90aWZpY2F0 aW9uKTsKICAgICBbX2h1ZENvbnRyb2xsZXIgdXBkYXRlUmF0ZV07CisgICAgW3NlbGYgdXBkYXRl UG93ZXJBc3NlcnRpb25zXTsKIH0KIAogQGVuZAo= 59315 2010-06-21 17:03:57 -0700 2010-06-24 13:00:04 -0700 Patch bug-40939-20100621170356.patch text/plain 11629 jer.noble SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTU3MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTAtMDYtMjEgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRnVs bC1zY3JlZW5lZCBjb250ZW50IGRvZXNuJ3Qga2VlcCB0aGUgZGlzcGxheSBvbjogU2FmYXJpIG5v dCBncmFiYmluZyBhIHBvd2VyIGFzc2VydGlvbj8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQwOTM5CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzc5OTYx NzIKKyAgICAgICAgCisgICAgICAgIEV4cG9ydCAtW01lZGlhRWxlbWVudCBwbGF5YmFja1JhdGVd OworICAgICAgICAKKyAgICAgICAgKiBXZWJDb3JlLlZpZGVvLmV4cDoKKwogMjAxMC0wNi0yMSAg TmF0ZSBDaGFwaW4gIDxqYXBoZXRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IGJ1aWxkIGZpeC4KSW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5WaWRlby5leHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9XZWJDb3JlLlZpZGVvLmV4cAkocmV2aXNpb24gNjExMjkpCisrKyBXZWJDb3Jl L1dlYkNvcmUuVmlkZW8uZXhwCSh3b3JraW5nIGNvcHkpCkBAIC0xNCw0ICsxNCw1IEBAIF9fWk5L N1dlYkNvcmUxNkhUTUxNZWRpYUVsZW1lbnQyMXByb2Nlc3MKIF9fWk5LN1dlYkNvcmUxNkhUTUxN ZWRpYUVsZW1lbnQ1bXV0ZWRFdgogX19aTks3V2ViQ29yZTE2SFRNTE1lZGlhRWxlbWVudDZ2b2x1 bWVFdgogX19aTks3V2ViQ29yZTE2SFRNTE1lZGlhRWxlbWVudDdjYW5QbGF5RXYKK19fWk5LN1dl YkNvcmUxNkhUTUxNZWRpYUVsZW1lbnQxMnBsYXliYWNrUmF0ZUV2CiBfX1pOSzdXZWJDb3JlMTZI VE1MTWVkaWFFbGVtZW50OGR1cmF0aW9uRXYKSW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gNjE1NzIpCisrKyBXZWJLaXQvQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDYtMjEgIEplciBO b2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRnVsbC1zY3JlZW5lZCBjb250ZW50IGRvZXNuJ3Qga2VlcCB0 aGUgZGlzcGxheSBvbjogU2FmYXJpIG5vdCBncmFiYmluZyBhIHBvd2VyIGFzc2VydGlvbj8KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwOTM5CisgICAg ICAgIHJkYXI6Ly9wcm9ibGVtLzc5OTYxNzIKKyAgICAgICAgCisgICAgICAgIEFkZCBJT0tpdC5m cmFtZXdvcmsgdG8gdGhlIGxpc3Qgb2YgbGlua2VkIGZyYW1ld29ya3MuCisKKyAgICAgICAgKiBX ZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKwogMjAxMC0wNi0xOCAgQW5kZXJzIENh cmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBX ZWluaWcuCkluZGV4OiBXZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZp c2lvbiA2MTEyOSkKKysrIFdlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagko d29ya2luZyBjb3B5KQpAQCAtMzQwLDYgKzM0MCw3IEBACiAJCUMwQjg4RThCMTBBMDhGM0QwMEZC QjNGNSAvKiBXZWJGcmFtZUxvYWREZWxlZ2F0ZVByaXZhdGUuaCBpbiBIZWFkZXJzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEMwQjg4RThBMTBBMDhGM0QwMEZCQjNGNSAvKiBX ZWJGcmFtZUxvYWREZWxlZ2F0ZVByaXZhdGUuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9 IChQcml2YXRlLCApOyB9OyB9OwogCQlDMEM1QjNFRTExNzdBNEEwMDAyQjBBRUYgLyogV2ViVXNl ckNvbnRlbnRVUkxQYXR0ZXJuLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSBDMEM1QjNFQzExNzdBNEEwMDAyQjBBRUYgLyogV2ViVXNlckNvbnRlbnRVUkxQ YXR0ZXJuLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsK IAkJQzBDNUIzRUYxMTc3QTRBMDAwMkIwQUVGIC8qIFdlYlVzZXJDb250ZW50VVJMUGF0dGVybi5t bSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEMwQzVCM0VE MTE3N0E0QTAwMDJCMEFFRiAvKiBXZWJVc2VyQ29udGVudFVSTFBhdHRlcm4ubW0gKi87IH07CisJ CUNEOEVBQzczMTFDQUM5QTMwMDc3NDA3NSAvKiBJT0tpdC5mcmFtZXdvcmsgaW4gRnJhbWV3b3Jr cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDRDhFQUM3MjExQ0FDOUEzMDA3 NzQwNzUgLyogSU9LaXQuZnJhbWV3b3JrICovOyB9OwogCQlERDdDREVFNzBBMjNCQTlFMDAwNjk5 MjggLyogV2ViVHlwZXNJbnRlcm5hbC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gREQ3Q0RFRTYwQTIzQkE5RTAwMDY5OTI4IC8qIFdlYlR5cGVzSW50ZXJu YWwuaCAqLzsgfTsKIAkJREQ4OTY4MjAwOUFBODcyNDAwOTdFN0YwIC8qIFdlYkVsZW1lbnREaWN0 aW9uYXJ5LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBE RDg5NjgxRTA5QUE4NzI0MDA5N0U3RjAgLyogV2ViRWxlbWVudERpY3Rpb25hcnkuaCAqLzsgfTsK IAkJREQ4OTY4MjEwOUFBODcyNDAwOTdFN0YwIC8qIFdlYkVsZW1lbnREaWN0aW9uYXJ5Lm1tIGlu IFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gREQ4OTY4MUYwOUFB ODcyNDAwOTdFN0YwIC8qIFdlYkVsZW1lbnREaWN0aW9uYXJ5Lm1tICovOyB9OwpAQCAtNjM4LDYg KzYzOSw3IEBACiAJCUMwQjg4RThBMTBBMDhGM0QwMEZCQjNGNSAvKiBXZWJGcmFtZUxvYWREZWxl Z2F0ZVByaXZhdGUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViRnJhbWVM b2FkRGVsZWdhdGVQcml2YXRlLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUMwQzVC M0VDMTE3N0E0QTAwMDJCMEFFRiAvKiBXZWJVc2VyQ29udGVudFVSTFBhdHRlcm4uaCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViVXNlckNvbnRlbnRVUkxQYXR0ZXJuLmg7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUMwQzVCM0VEMTE3N0E0QTAwMDJCMEFFRiAvKiBX ZWJVc2VyQ29udGVudFVSTFBhdHRlcm4ubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpj cHA7IHBhdGggPSBXZWJVc2VyQ29udGVudFVSTFBhdHRlcm4ubW07IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CisJCUNEOEVBQzcyMTFDQUM5QTMwMDc3NDA3NSAvKiBJT0tpdC5mcmFtZXdvcmsg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSB3cmFwcGVy LmZyYW1ld29yazsgbmFtZSA9IElPS2l0LmZyYW1ld29yazsgcGF0aCA9IC9TeXN0ZW0vTGlicmFy eS9GcmFtZXdvcmtzL0lPS2l0LmZyYW1ld29yazsgc291cmNlVHJlZSA9ICI8YWJzb2x1dGU+Ijsg fTsKIAkJREQ3Q0RFRTYwQTIzQkE5RTAwMDY5OTI4IC8qIFdlYlR5cGVzSW50ZXJuYWwuaCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViVHlwZXNJbnRlcm5hbC5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQlERDg5NjgxRTA5QUE4NzI0MDA5N0U3RjAgLyogV2ViRWxl bWVudERpY3Rpb25hcnkuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBpbmRlbnRXaWR0aCA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j Lmg7IHBhdGggPSBXZWJFbGVtZW50RGljdGlvbmFyeS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB0YWJXaWR0aCA9IDg7IHVzZXNUYWJzID0gMDsgfTsKIAkJREQ4OTY4MUYwOUFBODcyNDAwOTdF N0YwIC8qIFdlYkVsZW1lbnREaWN0aW9uYXJ5Lm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGluZGVudFdpZHRoID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBXZWJFbGVtZW50RGljdGlvbmFyeS5tbTsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgdGFiV2lkdGggPSA4OyB1c2VzVGFicyA9IDA7IH07CkBA IC03MjYsNiArNzI4LDcgQEAKIAkJCQkxQTIwRDA4QjBFRDM4NEYyMDA0M0ZBOUYgLyogUXVhcnR6 Q29yZS5mcmFtZXdvcmsgaW4gRnJhbWV3b3JrcyAqLywKIAkJCQk5Mzk4MTEyRjA4MjRCRjAxMDA4 REYwMzggLyogU2VjdXJpdHkuZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8sCiAJCQkJOTM5ODEx MkMwODI0QkYwMTAwOERGMDM4IC8qIFdlYkNvcmUuZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8s CisJCQkJQ0Q4RUFDNzMxMUNBQzlBMzAwNzc0MDc1IC8qIElPS2l0LmZyYW1ld29yayBpbiBGcmFt ZXdvcmtzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3Npbmcg PSAwOwogCQl9OwpAQCAtNzcxLDYgKzc3NCw3IEBACiAJCTA4NjdENjlBRkU4NDAyOEZDMDJBQUMw NyAvKiBGcmFtZXdvcmtzIGFuZCBMaWJyYXJpZXMgKi8gPSB7CiAJCQlpc2EgPSBQQlhHcm91cDsK IAkJCWNoaWxkcmVuID0gKAorCQkJCUNEOEVBQzcyMTFDQUM5QTMwMDc3NDA3NSAvKiBJT0tpdC5m cmFtZXdvcmsgKi8sCiAJCQkJRjVDMjg2OTQwMjg0NkRDRDAxODYzNUNBIC8qIENhcmJvbi5mcmFt ZXdvcmsgKi8sCiAJCQkJRjVDMjg2OTUwMjg0NkRDRDAxODYzNUNBIC8qIENvY29hLmZyYW1ld29y ayAqLywKIAkJCQlGNzM4QzlFOTAzRkFEM0RGMDMyMUZCRTAgLyogSmF2YVNjcmlwdENvcmUuZnJh bWV3b3JrICovLApJbmRleDogV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDYxNTcyKQorKysgV2ViS2l0L21hYy9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wNi0yMSAgSmVyIE5vYmxl ICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBGdWxsLXNjcmVlbmVkIGNvbnRlbnQgZG9lc24ndCBrZWVwIHRoZSBk aXNwbGF5IG9uOiBTYWZhcmkgbm90IGdyYWJiaW5nIGEgcG93ZXIgYXNzZXJ0aW9uPworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA5MzkKKyAgICAgICAg cmRhcjovL3Byb2JsZW0vNzk5NjE3MgorICAgICAgICAKKyAgICAgICAgVGFrZSBhIElPS2l0IHBv d2VyIGFzc2VydGlvbiB3aGVuIHBsYXlpbmcgdmlkZW8gaW4gZnVsbHNjcmVlbiBtb2RlLiAgUmVs ZWFzZSB0aGUKKyAgICAgICAgYXNzZXJ0aW9uIHdoZW4gcGF1c2VkIGluIGZ1bGxzY3JlZW4gbW9k ZSwgYW5kIHdoZW4gZXhpdGluZyBmdWxsc2NyZWVuIG1vZGUuCisKKyAgICAgICAgKiBXZWJWaWV3 L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZp ZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW06CisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVl bkNvbnRyb2xsZXIgd2luZG93RGlkRXhpdEZ1bGxzY3JlZW5dKTogQ2FsbCB1cGRhdGVQb3dlckFz c2VydGlvbnMuCisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIgd2luZG93 RGlkRW50ZXJGdWxsc2NyZWVuXSk6IENhbGwgdXBkYXRlUG93ZXJBc3NlcnRpb25zLgorICAgICAg ICAoLVtXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyIF9kaXNhYmxlSWRsZURpc3BsYXlTbGVl cF0pOgorICAgICAgICAoLVtXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyIF9lbmFibGVJZGxl RGlzcGxheVNsZWVwXSk6CisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIg X2Rpc2FibGVJZGxlU3lzdGVtU2xlZXBdKToKKyAgICAgICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVu Q29udHJvbGxlciBfZW5hYmxlSWRsZVN5c3RlbVNsZWVwXSk6CisgICAgICAgICgtW1dlYlZpZGVv RnVsbHNjcmVlbkNvbnRyb2xsZXIgdXBkYXRlUG93ZXJBc3NlcnRpb25zXSk6IENhbGwgXyhlbmFi bGV8ZGlzYWJsZSlJZGxlKFN5c3RlbXxEaXNwbGF5KXNsZWVwIGRlcGVuZGluZyBvbiBjdXJyZW50 IHBsYXliYWNrIHJhdGUgYW5kIGZ1bGxzY3JlZW4gc3RhdHVzLgorICAgICAgICAoLVtXZWJWaWRl b0Z1bGxzY3JlZW5Db250cm9sbGVyIHJhdGVDaGFuZ2VkOl0pOiBDYWxsIHVwZGF0ZVBvd2VyQXNz ZXJ0aW9ucy4KKwogMjAxMC0wNi0yMSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgogCiAgICAgICAgIFRyeSB0byBmaXggdGhlIFBvd2VyUEMgYnVpbGQuCkluZGV4OiBXZWJL aXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9tYWMvV2ViVmlldy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLmgJKHJl dmlzaW9uIDYxMTI5KQorKysgV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNv bnRyb2xsZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNDgsNiArNDgsOCBAQCBAaW50ZXJmYWNlIFdl YlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIgCiAgICAgQk9PTCBfaXNFbmRpbmdGdWxsc2NyZWVu OwogICAgIEJPT0wgX2lzV2luZG93TG9hZGVkOwogICAgIEJPT0wgX2ZvcmNlRGlzYWJsZUFuaW1h dGlvbjsKKyAgICB1aW50MzJfdCBfaWRsZURpc3BsYXlTbGVlcEFzc2VydGlvbjsKKyAgICB1aW50 MzJfdCBfaWRsZVN5c3RlbVNsZWVwQXNzZXJ0aW9uOyAgICAKICAgICBTeXN0ZW1VSU1vZGUgX3Nh dmVkVUlNb2RlOwogICAgIFN5c3RlbVVJT3B0aW9ucyBfc2F2ZWRVSU9wdGlvbnM7CiB9CkluZGV4 OiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxl ci5tbQkocmV2aXNpb24gNjExMjkpCisrKyBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxs c2NyZWVuQ29udHJvbGxlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMzAsNiArMzAsNyBAQAogI2lt cG9ydCAiV2ViVHlwZXNJbnRlcm5hbC5oIgogI2ltcG9ydCAiV2ViVmlkZW9GdWxsc2NyZWVuSFVE V2luZG93Q29udHJvbGxlci5oIgogI2ltcG9ydCAiV2ViV2luZG93QW5pbWF0aW9uLmgiCisjaW1w b3J0IDxJT0tpdC9wd3JfbWd0L0lPUE1MaWIuaD4KICNpbXBvcnQgPFFUS2l0L1FUS2l0Lmg+CiAj aW1wb3J0IDxXZWJDb3JlL0hUTUxNZWRpYUVsZW1lbnQuaD4KICNpbXBvcnQgPFdlYkNvcmUvU29m dExpbmtpbmcuaD4KQEAgLTU1LDYgKzU2LDcgQEAgLSAodm9pZClhbmltYXRlRnJvbVJlY3Q6KE5T UmVjdClzdGFydFJlYwogQGVuZAogCiBAaW50ZXJmYWNlIFdlYlZpZGVvRnVsbHNjcmVlbkNvbnRy b2xsZXIoSFVEV2luZG93Q29udHJvbGxlckRlbGVnYXRlKSA8V2ViVmlkZW9GdWxsc2NyZWVuSFVE V2luZG93Q29udHJvbGxlckRlbGVnYXRlPgorLSAodm9pZCl1cGRhdGVQb3dlckFzc2VydGlvbnM7 CiBAZW5kCiAKIEBpbXBsZW1lbnRhdGlvbiBXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyCkBA IC0xNTMsNyArMTU1LDcgQEAgLSAodm9pZCl3aW5kb3dEaWRFeGl0RnVsbHNjcmVlbgogICAgIFtz ZWxmIGNsZWFyRmFkZUFuaW1hdGlvbl07CiAgICAgW1tzZWxmIHdpbmRvd10gY2xvc2VdOwogICAg IFtzZWxmIHNldFdpbmRvdzpuaWxdOwotICAgIFNldFN5c3RlbVVJTW9kZShfc2F2ZWRVSU1vZGUs IF9zYXZlZFVJT3B0aW9ucyk7CisgICAgW3NlbGYgdXBkYXRlUG93ZXJBc3NlcnRpb25zXTsKICAg ICBbX2h1ZENvbnRyb2xsZXIgc2V0RGVsZWdhdGU6bmlsXTsKICAgICBbX2h1ZENvbnRyb2xsZXIg cmVsZWFzZV07CiAgICAgX2h1ZENvbnRyb2xsZXIgPSBuaWw7CkBAIC0xNzMsOCArMTc1LDcgQEAg LSAodm9pZCl3aW5kb3dEaWRFbnRlckZ1bGxzY3JlZW4KICAgICBfaHVkQ29udHJvbGxlciA9IFtb V2ViVmlkZW9GdWxsc2NyZWVuSFVEV2luZG93Q29udHJvbGxlciBhbGxvY10gaW5pdF07CiAgICAg W19odWRDb250cm9sbGVyIHNldERlbGVnYXRlOnNlbGZdOwogCi0gICAgR2V0U3lzdGVtVUlNb2Rl KCZfc2F2ZWRVSU1vZGUsICZfc2F2ZWRVSU9wdGlvbnMpOwotICAgIFNldFN5c3RlbVVJTW9kZShr VUlNb2RlQWxsU3VwcHJlc3NlZCAsIDApOworICAgIFtzZWxmIHVwZGF0ZVBvd2VyQXNzZXJ0aW9u c107CiAgICAgW05TQ3Vyc29yIHNldEhpZGRlblVudGlsTW91c2VNb3ZlczpZRVNdOwogICAgIAog ICAgIC8vIEdpdmUgdGhlIEhVRCBrZXlib2FyZCBmb2N1cyBpbml0aWFsbHkKQEAgLTE4Niw2ICsx ODcsNjEgQEAgLSAoTlNSZWN0KW1lZGlhRWxlbWVudFJlY3QKICAgICByZXR1cm4gX21lZGlhRWxl bWVudC0+c2NyZWVuUmVjdCgpOwogfQogCisjaWYgIWRlZmluZWQoQlVJTERJTkdfT05fVElHRVIp IC8vIElPUE1Bc3NlcnRpb25DcmVhdGVXaXRoTmFtZSBub3QgZGVmaW5lZCBvbiA8IDEwLjUKKy0g KHZvaWQpX2Rpc2FibGVJZGxlRGlzcGxheVNsZWVwCit7CisgICAgaWYgKF9pZGxlRGlzcGxheVNs ZWVwQXNzZXJ0aW9uID09IGtJT1BNTnVsbEFzc2VydGlvbklEKSAKKyNpZiBkZWZpbmVkKEJVSUxE SU5HX09OX0xFT1BBUkQpIC8vIElPUE1Bc3NlcnRpb25DcmVhdGVXaXRoTmFtZSBpcyBub3QgZGVm aW5lZCBpbiB0aGUgMTAuNSBTREsKKyAgICAgICAgSU9QTUFzc2VydGlvbkNyZWF0ZShrSU9QTUFz c2VydGlvblR5cGVOb0Rpc3BsYXlTbGVlcCwga0lPUE1Bc3NlcnRpb25MZXZlbE9uLCAmX2lkbGVE aXNwbGF5U2xlZXBBc3NlcnRpb24pOworI2Vsc2UgLy8gSU9QTUFzc2VydGlvbkNyZWF0ZSBpcyBk ZXByZWNpYXRlZCBpbiA+IDEwLjUKKyAgICAgICAgSU9QTUFzc2VydGlvbkNyZWF0ZVdpdGhOYW1l KGtJT1BNQXNzZXJ0aW9uVHlwZU5vRGlzcGxheVNsZWVwLCBrSU9QTUFzc2VydGlvbkxldmVsT24s IENGU1RSKCJXZWJLaXQgcGxheWluZyBhIHZpZGVvIGZ1bGxzY3JlZW4uIiksICZfaWRsZURpc3Bs YXlTbGVlcEFzc2VydGlvbik7CisjZW5kaWYKK30KKworLSAodm9pZClfZW5hYmxlSWRsZURpc3Bs YXlTbGVlcAoreworICAgIGlmIChfaWRsZURpc3BsYXlTbGVlcEFzc2VydGlvbiAhPSBrSU9QTU51 bGxBc3NlcnRpb25JRCkgeworICAgICAgICBJT1BNQXNzZXJ0aW9uUmVsZWFzZShfaWRsZURpc3Bs YXlTbGVlcEFzc2VydGlvbik7CisgICAgICAgIF9pZGxlRGlzcGxheVNsZWVwQXNzZXJ0aW9uID0g a0lPUE1OdWxsQXNzZXJ0aW9uSUQ7CisgICAgfQorfQorCistICh2b2lkKV9kaXNhYmxlSWRsZVN5 c3RlbVNsZWVwCit7CisgICAgaWYgKF9pZGxlU3lzdGVtU2xlZXBBc3NlcnRpb24gPT0ga0lPUE1O dWxsQXNzZXJ0aW9uSUQpIAorI2lmIGRlZmluZWQoQlVJTERJTkdfT05fTEVPUEFSRCkgLy8gSU9Q TUFzc2VydGlvbkNyZWF0ZVdpdGhOYW1lIGlzIG5vdCBkZWZpbmVkIGluIHRoZSAxMC41IFNESwor ICAgICAgICBJT1BNQXNzZXJ0aW9uQ3JlYXRlKGtJT1BNQXNzZXJ0aW9uVHlwZU5vSWRsZVNsZWVw LCBrSU9QTUFzc2VydGlvbkxldmVsT24sICZfaWRsZVN5c3RlbVNsZWVwQXNzZXJ0aW9uKTsKKyNl bHNlIC8vIElPUE1Bc3NlcnRpb25DcmVhdGUgaXMgZGVwcmVjaWF0ZWQgaW4gPiAxMC41CisgICAg SU9QTUFzc2VydGlvbkNyZWF0ZVdpdGhOYW1lKGtJT1BNQXNzZXJ0aW9uVHlwZU5vSWRsZVNsZWVw LCBrSU9QTUFzc2VydGlvbkxldmVsT24sIENGU1RSKCJXZWJLaXQgcGxheWluZyBhIHZpZGVvIGZ1 bGxzY3JlZW4uIiksICZfaWRsZVN5c3RlbVNsZWVwQXNzZXJ0aW9uKTsKKyNlbmRpZgorfQorCist ICh2b2lkKV9lbmFibGVJZGxlU3lzdGVtU2xlZXAKK3sKKyAgICBpZiAoX2lkbGVTeXN0ZW1TbGVl cEFzc2VydGlvbiAhPSBrSU9QTU51bGxBc3NlcnRpb25JRCkgeworICAgICAgICBJT1BNQXNzZXJ0 aW9uUmVsZWFzZShfaWRsZVN5c3RlbVNsZWVwQXNzZXJ0aW9uKTsKKyAgICAgICAgX2lkbGVTeXN0 ZW1TbGVlcEFzc2VydGlvbiA9IGtJT1BNTnVsbEFzc2VydGlvbklEOworICAgIH0KK30KKyNlbmRp ZgorCistICh2b2lkKXVwZGF0ZVBvd2VyQXNzZXJ0aW9ucworeworI2lmICFkZWZpbmVkKEJVSUxE SU5HX09OX1RJR0VSKSAKKyAgICBmbG9hdCByYXRlID0gMDsKKyAgICBpZiAoX21lZGlhRWxlbWVu dCAmJiBfbWVkaWFFbGVtZW50LT5wbGF0Zm9ybU1lZGlhKCkudHlwZSA9PSBXZWJDb3JlOjpQbGF0 Zm9ybU1lZGlhOjpRVE1vdmllVHlwZSkKKyAgICAgICAgcmF0ZSA9IFtfbWVkaWFFbGVtZW50LT5w bGF0Zm9ybU1lZGlhKCkubWVkaWEucXRNb3ZpZSByYXRlXTsKKyAgICAKKyAgICBpZiAocmF0ZSAm JiAhX2lzRW5kaW5nRnVsbHNjcmVlbikgeworICAgICAgICBbc2VsZiBfZGlzYWJsZUlkbGVTeXN0 ZW1TbGVlcF07CisgICAgICAgIFtzZWxmIF9kaXNhYmxlSWRsZURpc3BsYXlTbGVlcF07CisgICAg fSBlbHNlIHsKKyAgICAgICAgW3NlbGYgX2VuYWJsZUlkbGVTeXN0ZW1TbGVlcF07CisgICAgICAg IFtzZWxmIF9lbmFibGVJZGxlRGlzcGxheVNsZWVwXTsKKyAgICB9CisjZW5kaWYKK30KKwogI3By YWdtYSBtYXJrIC0KICNwcmFnbWEgbWFyayBFeHBvc2VkIEludGVyZmFjZQogCkBAIC0zMTQsNiAr MzcwLDcgQEAgLSAodm9pZClyYXRlQ2hhbmdlZDooTlNOb3RpZmljYXRpb24gKil1bgogewogICAg IFVOVVNFRF9QQVJBTSh1bnVzZWROb3RpZmljYXRpb24pOwogICAgIFtfaHVkQ29udHJvbGxlciB1 cGRhdGVSYXRlXTsKKyAgICBbc2VsZiB1cGRhdGVQb3dlckFzc2VydGlvbnNdOwogfQogCiBAZW5k Cg== 59686 2010-06-24 13:00:08 -0700 2010-06-25 13:11:30 -0700 Patch bug-40939-20100624130006.patch text/plain 11481 jer.noble SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTU3MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTAtMDYtMjEgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRnVs bC1zY3JlZW5lZCBjb250ZW50IGRvZXNuJ3Qga2VlcCB0aGUgZGlzcGxheSBvbjogU2FmYXJpIG5v dCBncmFiYmluZyBhIHBvd2VyIGFzc2VydGlvbj8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQwOTM5CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzc5OTYx NzIKKyAgICAgICAgCisgICAgICAgIEV4cG9ydCAtW01lZGlhRWxlbWVudCBwbGF5YmFja1JhdGVd OworICAgICAgICAKKyAgICAgICAgKiBXZWJDb3JlLlZpZGVvLmV4cDoKKwogMjAxMC0wNi0yMSAg TmF0ZSBDaGFwaW4gIDxqYXBoZXRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IGJ1aWxkIGZpeC4KSW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5WaWRlby5leHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9XZWJDb3JlLlZpZGVvLmV4cAkocmV2aXNpb24gNjExMjkpCisrKyBXZWJDb3Jl L1dlYkNvcmUuVmlkZW8uZXhwCSh3b3JraW5nIGNvcHkpCkBAIC0xNCw0ICsxNCw1IEBAIF9fWk5L N1dlYkNvcmUxNkhUTUxNZWRpYUVsZW1lbnQyMXByb2Nlc3MKIF9fWk5LN1dlYkNvcmUxNkhUTUxN ZWRpYUVsZW1lbnQ1bXV0ZWRFdgogX19aTks3V2ViQ29yZTE2SFRNTE1lZGlhRWxlbWVudDZ2b2x1 bWVFdgogX19aTks3V2ViQ29yZTE2SFRNTE1lZGlhRWxlbWVudDdjYW5QbGF5RXYKK19fWk5LN1dl YkNvcmUxNkhUTUxNZWRpYUVsZW1lbnQxMnBsYXliYWNrUmF0ZUV2CiBfX1pOSzdXZWJDb3JlMTZI VE1MTWVkaWFFbGVtZW50OGR1cmF0aW9uRXYKSW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gNjE1NzIpCisrKyBXZWJLaXQvQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDYtMjEgIEplciBO b2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRnVsbC1zY3JlZW5lZCBjb250ZW50IGRvZXNuJ3Qga2VlcCB0 aGUgZGlzcGxheSBvbjogU2FmYXJpIG5vdCBncmFiYmluZyBhIHBvd2VyIGFzc2VydGlvbj8KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwOTM5CisgICAg ICAgIHJkYXI6Ly9wcm9ibGVtLzc5OTYxNzIKKyAgICAgICAgCisgICAgICAgIEFkZCBJT0tpdC5m cmFtZXdvcmsgdG8gdGhlIGxpc3Qgb2YgbGlua2VkIGZyYW1ld29ya3MuCisKKyAgICAgICAgKiBX ZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKwogMjAxMC0wNi0xOCAgQW5kZXJzIENh cmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBX ZWluaWcuCkluZGV4OiBXZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZp c2lvbiA2MTEyOSkKKysrIFdlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagko d29ya2luZyBjb3B5KQpAQCAtMzQwLDYgKzM0MCw3IEBACiAJCUMwQjg4RThCMTBBMDhGM0QwMEZC QjNGNSAvKiBXZWJGcmFtZUxvYWREZWxlZ2F0ZVByaXZhdGUuaCBpbiBIZWFkZXJzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEMwQjg4RThBMTBBMDhGM0QwMEZCQjNGNSAvKiBX ZWJGcmFtZUxvYWREZWxlZ2F0ZVByaXZhdGUuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9 IChQcml2YXRlLCApOyB9OyB9OwogCQlDMEM1QjNFRTExNzdBNEEwMDAyQjBBRUYgLyogV2ViVXNl ckNvbnRlbnRVUkxQYXR0ZXJuLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSBDMEM1QjNFQzExNzdBNEEwMDAyQjBBRUYgLyogV2ViVXNlckNvbnRlbnRVUkxQ YXR0ZXJuLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsK IAkJQzBDNUIzRUYxMTc3QTRBMDAwMkIwQUVGIC8qIFdlYlVzZXJDb250ZW50VVJMUGF0dGVybi5t bSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEMwQzVCM0VE MTE3N0E0QTAwMDJCMEFFRiAvKiBXZWJVc2VyQ29udGVudFVSTFBhdHRlcm4ubW0gKi87IH07CisJ CUNEOEVBQzczMTFDQUM5QTMwMDc3NDA3NSAvKiBJT0tpdC5mcmFtZXdvcmsgaW4gRnJhbWV3b3Jr cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDRDhFQUM3MjExQ0FDOUEzMDA3 NzQwNzUgLyogSU9LaXQuZnJhbWV3b3JrICovOyB9OwogCQlERDdDREVFNzBBMjNCQTlFMDAwNjk5 MjggLyogV2ViVHlwZXNJbnRlcm5hbC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gREQ3Q0RFRTYwQTIzQkE5RTAwMDY5OTI4IC8qIFdlYlR5cGVzSW50ZXJu YWwuaCAqLzsgfTsKIAkJREQ4OTY4MjAwOUFBODcyNDAwOTdFN0YwIC8qIFdlYkVsZW1lbnREaWN0 aW9uYXJ5LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBE RDg5NjgxRTA5QUE4NzI0MDA5N0U3RjAgLyogV2ViRWxlbWVudERpY3Rpb25hcnkuaCAqLzsgfTsK IAkJREQ4OTY4MjEwOUFBODcyNDAwOTdFN0YwIC8qIFdlYkVsZW1lbnREaWN0aW9uYXJ5Lm1tIGlu IFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gREQ4OTY4MUYwOUFB ODcyNDAwOTdFN0YwIC8qIFdlYkVsZW1lbnREaWN0aW9uYXJ5Lm1tICovOyB9OwpAQCAtNjM4LDYg KzYzOSw3IEBACiAJCUMwQjg4RThBMTBBMDhGM0QwMEZCQjNGNSAvKiBXZWJGcmFtZUxvYWREZWxl Z2F0ZVByaXZhdGUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViRnJhbWVM b2FkRGVsZWdhdGVQcml2YXRlLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUMwQzVC M0VDMTE3N0E0QTAwMDJCMEFFRiAvKiBXZWJVc2VyQ29udGVudFVSTFBhdHRlcm4uaCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViVXNlckNvbnRlbnRVUkxQYXR0ZXJuLmg7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUMwQzVCM0VEMTE3N0E0QTAwMDJCMEFFRiAvKiBX ZWJVc2VyQ29udGVudFVSTFBhdHRlcm4ubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpj cHA7IHBhdGggPSBXZWJVc2VyQ29udGVudFVSTFBhdHRlcm4ubW07IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CisJCUNEOEVBQzcyMTFDQUM5QTMwMDc3NDA3NSAvKiBJT0tpdC5mcmFtZXdvcmsg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSB3cmFwcGVy LmZyYW1ld29yazsgbmFtZSA9IElPS2l0LmZyYW1ld29yazsgcGF0aCA9IC9TeXN0ZW0vTGlicmFy eS9GcmFtZXdvcmtzL0lPS2l0LmZyYW1ld29yazsgc291cmNlVHJlZSA9ICI8YWJzb2x1dGU+Ijsg fTsKIAkJREQ3Q0RFRTYwQTIzQkE5RTAwMDY5OTI4IC8qIFdlYlR5cGVzSW50ZXJuYWwuaCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViVHlwZXNJbnRlcm5hbC5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQlERDg5NjgxRTA5QUE4NzI0MDA5N0U3RjAgLyogV2ViRWxl bWVudERpY3Rpb25hcnkuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBpbmRlbnRXaWR0aCA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j Lmg7IHBhdGggPSBXZWJFbGVtZW50RGljdGlvbmFyeS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB0YWJXaWR0aCA9IDg7IHVzZXNUYWJzID0gMDsgfTsKIAkJREQ4OTY4MUYwOUFBODcyNDAwOTdF N0YwIC8qIFdlYkVsZW1lbnREaWN0aW9uYXJ5Lm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGluZGVudFdpZHRoID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBXZWJFbGVtZW50RGljdGlvbmFyeS5tbTsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgdGFiV2lkdGggPSA4OyB1c2VzVGFicyA9IDA7IH07CkBA IC03MjYsNiArNzI4LDcgQEAKIAkJCQkxQTIwRDA4QjBFRDM4NEYyMDA0M0ZBOUYgLyogUXVhcnR6 Q29yZS5mcmFtZXdvcmsgaW4gRnJhbWV3b3JrcyAqLywKIAkJCQk5Mzk4MTEyRjA4MjRCRjAxMDA4 REYwMzggLyogU2VjdXJpdHkuZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8sCiAJCQkJOTM5ODEx MkMwODI0QkYwMTAwOERGMDM4IC8qIFdlYkNvcmUuZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8s CisJCQkJQ0Q4RUFDNzMxMUNBQzlBMzAwNzc0MDc1IC8qIElPS2l0LmZyYW1ld29yayBpbiBGcmFt ZXdvcmtzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3Npbmcg PSAwOwogCQl9OwpAQCAtNzcxLDYgKzc3NCw3IEBACiAJCTA4NjdENjlBRkU4NDAyOEZDMDJBQUMw NyAvKiBGcmFtZXdvcmtzIGFuZCBMaWJyYXJpZXMgKi8gPSB7CiAJCQlpc2EgPSBQQlhHcm91cDsK IAkJCWNoaWxkcmVuID0gKAorCQkJCUNEOEVBQzcyMTFDQUM5QTMwMDc3NDA3NSAvKiBJT0tpdC5m cmFtZXdvcmsgKi8sCiAJCQkJRjVDMjg2OTQwMjg0NkRDRDAxODYzNUNBIC8qIENhcmJvbi5mcmFt ZXdvcmsgKi8sCiAJCQkJRjVDMjg2OTUwMjg0NkRDRDAxODYzNUNBIC8qIENvY29hLmZyYW1ld29y ayAqLywKIAkJCQlGNzM4QzlFOTAzRkFEM0RGMDMyMUZCRTAgLyogSmF2YVNjcmlwdENvcmUuZnJh bWV3b3JrICovLApJbmRleDogV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDYxNTcyKQorKysgV2ViS2l0L21hYy9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wNi0yMSAgSmVyIE5vYmxl ICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBGdWxsLXNjcmVlbmVkIGNvbnRlbnQgZG9lc24ndCBrZWVwIHRoZSBk aXNwbGF5IG9uOiBTYWZhcmkgbm90IGdyYWJiaW5nIGEgcG93ZXIgYXNzZXJ0aW9uPworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA5MzkKKyAgICAgICAg cmRhcjovL3Byb2JsZW0vNzk5NjE3MgorICAgICAgICAKKyAgICAgICAgVGFrZSBhIElPS2l0IHBv d2VyIGFzc2VydGlvbiB3aGVuIHBsYXlpbmcgdmlkZW8gaW4gZnVsbHNjcmVlbiBtb2RlLiAgUmVs ZWFzZSB0aGUKKyAgICAgICAgYXNzZXJ0aW9uIHdoZW4gcGF1c2VkIGluIGZ1bGxzY3JlZW4gbW9k ZSwgYW5kIHdoZW4gZXhpdGluZyBmdWxsc2NyZWVuIG1vZGUuCisKKyAgICAgICAgKiBXZWJWaWV3 L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZp ZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW06CisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVl bkNvbnRyb2xsZXIgd2luZG93RGlkRXhpdEZ1bGxzY3JlZW5dKTogQ2FsbCB1cGRhdGVQb3dlckFz c2VydGlvbnMuCisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIgd2luZG93 RGlkRW50ZXJGdWxsc2NyZWVuXSk6IENhbGwgdXBkYXRlUG93ZXJBc3NlcnRpb25zLgorICAgICAg ICAoLVtXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyIF9kaXNhYmxlSWRsZURpc3BsYXlTbGVl cF0pOgorICAgICAgICAoLVtXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyIF9lbmFibGVJZGxl RGlzcGxheVNsZWVwXSk6CisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIg X2Rpc2FibGVJZGxlU3lzdGVtU2xlZXBdKToKKyAgICAgICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVu Q29udHJvbGxlciBfZW5hYmxlSWRsZVN5c3RlbVNsZWVwXSk6CisgICAgICAgICgtW1dlYlZpZGVv RnVsbHNjcmVlbkNvbnRyb2xsZXIgdXBkYXRlUG93ZXJBc3NlcnRpb25zXSk6IENhbGwgXyhlbmFi bGV8ZGlzYWJsZSlJZGxlKFN5c3RlbXxEaXNwbGF5KXNsZWVwIGRlcGVuZGluZyBvbiBjdXJyZW50 IHBsYXliYWNrIHJhdGUgYW5kIGZ1bGxzY3JlZW4gc3RhdHVzLgorICAgICAgICAoLVtXZWJWaWRl b0Z1bGxzY3JlZW5Db250cm9sbGVyIHJhdGVDaGFuZ2VkOl0pOiBDYWxsIHVwZGF0ZVBvd2VyQXNz ZXJ0aW9ucy4KKwogMjAxMC0wNi0yMSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgogCiAgICAgICAgIFRyeSB0byBmaXggdGhlIFBvd2VyUEMgYnVpbGQuCkluZGV4OiBXZWJL aXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9tYWMvV2ViVmlldy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLmgJKHJl dmlzaW9uIDYxMTI5KQorKysgV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNv bnRyb2xsZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNDgsNiArNDgsOCBAQCBAaW50ZXJmYWNlIFdl YlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIgCiAgICAgQk9PTCBfaXNFbmRpbmdGdWxsc2NyZWVu OwogICAgIEJPT0wgX2lzV2luZG93TG9hZGVkOwogICAgIEJPT0wgX2ZvcmNlRGlzYWJsZUFuaW1h dGlvbjsKKyAgICB1aW50MzJfdCBfaWRsZURpc3BsYXlTbGVlcEFzc2VydGlvbjsKKyAgICB1aW50 MzJfdCBfaWRsZVN5c3RlbVNsZWVwQXNzZXJ0aW9uOyAgICAKICAgICBTeXN0ZW1VSU1vZGUgX3Nh dmVkVUlNb2RlOwogICAgIFN5c3RlbVVJT3B0aW9ucyBfc2F2ZWRVSU9wdGlvbnM7CiB9CkluZGV4 OiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxl ci5tbQkocmV2aXNpb24gNjExMjkpCisrKyBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxs c2NyZWVuQ29udHJvbGxlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMzAsNiArMzAsNyBAQAogI2lt cG9ydCAiV2ViVHlwZXNJbnRlcm5hbC5oIgogI2ltcG9ydCAiV2ViVmlkZW9GdWxsc2NyZWVuSFVE V2luZG93Q29udHJvbGxlci5oIgogI2ltcG9ydCAiV2ViV2luZG93QW5pbWF0aW9uLmgiCisjaW1w b3J0IDxJT0tpdC9wd3JfbWd0L0lPUE1MaWIuaD4KICNpbXBvcnQgPFFUS2l0L1FUS2l0Lmg+CiAj aW1wb3J0IDxXZWJDb3JlL0hUTUxNZWRpYUVsZW1lbnQuaD4KICNpbXBvcnQgPFdlYkNvcmUvU29m dExpbmtpbmcuaD4KQEAgLTU1LDYgKzU2LDcgQEAgLSAodm9pZClhbmltYXRlRnJvbVJlY3Q6KE5T UmVjdClzdGFydFJlYwogQGVuZAogCiBAaW50ZXJmYWNlIFdlYlZpZGVvRnVsbHNjcmVlbkNvbnRy b2xsZXIoSFVEV2luZG93Q29udHJvbGxlckRlbGVnYXRlKSA8V2ViVmlkZW9GdWxsc2NyZWVuSFVE V2luZG93Q29udHJvbGxlckRlbGVnYXRlPgorLSAodm9pZCl1cGRhdGVQb3dlckFzc2VydGlvbnM7 CiBAZW5kCiAKIEBpbXBsZW1lbnRhdGlvbiBXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyCkBA IC0xNTQsNiArMTU2LDcgQEAgLSAodm9pZCl3aW5kb3dEaWRFeGl0RnVsbHNjcmVlbgogICAgIFtb c2VsZiB3aW5kb3ddIGNsb3NlXTsKICAgICBbc2VsZiBzZXRXaW5kb3c6bmlsXTsKICAgICBTZXRT eXN0ZW1VSU1vZGUoX3NhdmVkVUlNb2RlLCBfc2F2ZWRVSU9wdGlvbnMpOworICAgIFtzZWxmIHVw ZGF0ZVBvd2VyQXNzZXJ0aW9uc107CiAgICAgW19odWRDb250cm9sbGVyIHNldERlbGVnYXRlOm5p bF07CiAgICAgW19odWRDb250cm9sbGVyIHJlbGVhc2VdOwogICAgIF9odWRDb250cm9sbGVyID0g bmlsOwpAQCAtMTc1LDYgKzE3OCw3IEBAIC0gKHZvaWQpd2luZG93RGlkRW50ZXJGdWxsc2NyZWVu CiAKICAgICBHZXRTeXN0ZW1VSU1vZGUoJl9zYXZlZFVJTW9kZSwgJl9zYXZlZFVJT3B0aW9ucyk7 CiAgICAgU2V0U3lzdGVtVUlNb2RlKGtVSU1vZGVBbGxTdXBwcmVzc2VkICwgMCk7CisgICAgW3Nl bGYgdXBkYXRlUG93ZXJBc3NlcnRpb25zXTsKICAgICBbTlNDdXJzb3Igc2V0SGlkZGVuVW50aWxN b3VzZU1vdmVzOllFU107CiAgICAgCiAgICAgLy8gR2l2ZSB0aGUgSFVEIGtleWJvYXJkIGZvY3Vz IGluaXRpYWxseQpAQCAtMTg2LDYgKzE5MCw2MSBAQCAtIChOU1JlY3QpbWVkaWFFbGVtZW50UmVj dAogICAgIHJldHVybiBfbWVkaWFFbGVtZW50LT5zY3JlZW5SZWN0KCk7CiB9CiAKKyNpZiAhZGVm aW5lZChCVUlMRElOR19PTl9USUdFUikgLy8gSU9QTUFzc2VydGlvbkNyZWF0ZVdpdGhOYW1lIG5v dCBkZWZpbmVkIG9uIDwgMTAuNQorLSAodm9pZClfZGlzYWJsZUlkbGVEaXNwbGF5U2xlZXAKK3sK KyAgICBpZiAoX2lkbGVEaXNwbGF5U2xlZXBBc3NlcnRpb24gPT0ga0lPUE1OdWxsQXNzZXJ0aW9u SUQpIAorI2lmIGRlZmluZWQoQlVJTERJTkdfT05fTEVPUEFSRCkgLy8gSU9QTUFzc2VydGlvbkNy ZWF0ZVdpdGhOYW1lIGlzIG5vdCBkZWZpbmVkIGluIHRoZSAxMC41IFNESworICAgICAgICBJT1BN QXNzZXJ0aW9uQ3JlYXRlKGtJT1BNQXNzZXJ0aW9uVHlwZU5vRGlzcGxheVNsZWVwLCBrSU9QTUFz c2VydGlvbkxldmVsT24sICZfaWRsZURpc3BsYXlTbGVlcEFzc2VydGlvbik7CisjZWxzZSAvLyBJ T1BNQXNzZXJ0aW9uQ3JlYXRlIGlzIGRlcHJlY2lhdGVkIGluID4gMTAuNQorICAgICAgICBJT1BN QXNzZXJ0aW9uQ3JlYXRlV2l0aE5hbWUoa0lPUE1Bc3NlcnRpb25UeXBlTm9EaXNwbGF5U2xlZXAs IGtJT1BNQXNzZXJ0aW9uTGV2ZWxPbiwgQ0ZTVFIoIldlYktpdCBwbGF5aW5nIGEgdmlkZW8gZnVs bHNjcmVlbi4iKSwgJl9pZGxlRGlzcGxheVNsZWVwQXNzZXJ0aW9uKTsKKyNlbmRpZgorfQorCist ICh2b2lkKV9lbmFibGVJZGxlRGlzcGxheVNsZWVwCit7CisgICAgaWYgKF9pZGxlRGlzcGxheVNs ZWVwQXNzZXJ0aW9uICE9IGtJT1BNTnVsbEFzc2VydGlvbklEKSB7CisgICAgICAgIElPUE1Bc3Nl cnRpb25SZWxlYXNlKF9pZGxlRGlzcGxheVNsZWVwQXNzZXJ0aW9uKTsKKyAgICAgICAgX2lkbGVE aXNwbGF5U2xlZXBBc3NlcnRpb24gPSBrSU9QTU51bGxBc3NlcnRpb25JRDsKKyAgICB9Cit9CisK Ky0gKHZvaWQpX2Rpc2FibGVJZGxlU3lzdGVtU2xlZXAKK3sKKyAgICBpZiAoX2lkbGVTeXN0ZW1T bGVlcEFzc2VydGlvbiA9PSBrSU9QTU51bGxBc3NlcnRpb25JRCkgCisjaWYgZGVmaW5lZChCVUlM RElOR19PTl9MRU9QQVJEKSAvLyBJT1BNQXNzZXJ0aW9uQ3JlYXRlV2l0aE5hbWUgaXMgbm90IGRl ZmluZWQgaW4gdGhlIDEwLjUgU0RLCisgICAgICAgIElPUE1Bc3NlcnRpb25DcmVhdGUoa0lPUE1B c3NlcnRpb25UeXBlTm9JZGxlU2xlZXAsIGtJT1BNQXNzZXJ0aW9uTGV2ZWxPbiwgJl9pZGxlU3lz dGVtU2xlZXBBc3NlcnRpb24pOworI2Vsc2UgLy8gSU9QTUFzc2VydGlvbkNyZWF0ZSBpcyBkZXBy ZWNpYXRlZCBpbiA+IDEwLjUKKyAgICBJT1BNQXNzZXJ0aW9uQ3JlYXRlV2l0aE5hbWUoa0lPUE1B c3NlcnRpb25UeXBlTm9JZGxlU2xlZXAsIGtJT1BNQXNzZXJ0aW9uTGV2ZWxPbiwgQ0ZTVFIoIldl YktpdCBwbGF5aW5nIGEgdmlkZW8gZnVsbHNjcmVlbi4iKSwgJl9pZGxlU3lzdGVtU2xlZXBBc3Nl cnRpb24pOworI2VuZGlmCit9CisKKy0gKHZvaWQpX2VuYWJsZUlkbGVTeXN0ZW1TbGVlcAorewor ICAgIGlmIChfaWRsZVN5c3RlbVNsZWVwQXNzZXJ0aW9uICE9IGtJT1BNTnVsbEFzc2VydGlvbklE KSB7CisgICAgICAgIElPUE1Bc3NlcnRpb25SZWxlYXNlKF9pZGxlU3lzdGVtU2xlZXBBc3NlcnRp b24pOworICAgICAgICBfaWRsZVN5c3RlbVNsZWVwQXNzZXJ0aW9uID0ga0lPUE1OdWxsQXNzZXJ0 aW9uSUQ7CisgICAgfQorfQorI2VuZGlmCisKKy0gKHZvaWQpdXBkYXRlUG93ZXJBc3NlcnRpb25z Cit7CisjaWYgIWRlZmluZWQoQlVJTERJTkdfT05fVElHRVIpIAorICAgIGZsb2F0IHJhdGUgPSAw OworICAgIGlmIChfbWVkaWFFbGVtZW50ICYmIF9tZWRpYUVsZW1lbnQtPnBsYXRmb3JtTWVkaWEo KS50eXBlID09IFdlYkNvcmU6OlBsYXRmb3JtTWVkaWE6OlFUTW92aWVUeXBlKQorICAgICAgICBy YXRlID0gW19tZWRpYUVsZW1lbnQtPnBsYXRmb3JtTWVkaWEoKS5tZWRpYS5xdE1vdmllIHJhdGVd OworICAgIAorICAgIGlmIChyYXRlICYmICFfaXNFbmRpbmdGdWxsc2NyZWVuKSB7CisgICAgICAg IFtzZWxmIF9kaXNhYmxlSWRsZVN5c3RlbVNsZWVwXTsKKyAgICAgICAgW3NlbGYgX2Rpc2FibGVJ ZGxlRGlzcGxheVNsZWVwXTsKKyAgICB9IGVsc2UgeworICAgICAgICBbc2VsZiBfZW5hYmxlSWRs ZVN5c3RlbVNsZWVwXTsKKyAgICAgICAgW3NlbGYgX2VuYWJsZUlkbGVEaXNwbGF5U2xlZXBdOwor ICAgIH0KKyNlbmRpZgorfQorCiAjcHJhZ21hIG1hcmsgLQogI3ByYWdtYSBtYXJrIEV4cG9zZWQg SW50ZXJmYWNlCiAKQEAgLTMxNCw2ICszNzMsNyBAQCAtICh2b2lkKXJhdGVDaGFuZ2VkOihOU05v dGlmaWNhdGlvbiAqKXVuCiB7CiAgICAgVU5VU0VEX1BBUkFNKHVudXNlZE5vdGlmaWNhdGlvbik7 CiAgICAgW19odWRDb250cm9sbGVyIHVwZGF0ZVJhdGVdOworICAgIFtzZWxmIHVwZGF0ZVBvd2Vy QXNzZXJ0aW9uc107CiB9CiAKIEBlbmQK