27007 2009-07-06 14:23:52 -0700 Build fixes when ICONDATABASE is disabled 2009-07-10 23:16:59 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ddkilzer webkit-unassigned beidson mrowe oldest_to_newest 130019 0 32324 ddkilzer 2009-07-06 14:23:52 -0700 Created attachment 32324 Patch v1 Build fixes when ICONDATABASE is disabled Reviewed by NOBODY (OOPS!). WebCore: * Configurations/WebCore.xcconfig: Exclude IconDatabase.cpp from being compiled when ICONDATABASE is disabled, and exclude IconDatabaseNone.cpp when ICONDATABASE is enabled. Reworked definition of EXCLUDED_SOURCE_FILE_NAMES. * WebCore.xcodeproj/project.pbxproj: Added IconDatabaseNone.cpp to the project. * loader/icon/IconDatabase.h: Removed three public methods from #if ENABLE(ICONDATABASE)/#endif macro so that they may be stubbed out in IconDatabaseNone.cpp. * loader/icon/IconDatabaseNone.cpp: (WebCore::IconDatabase::importIconURLForPageURL): Added. (WebCore::IconDatabase::importIconDataForIconURL): Added. (WebCore::IconDatabase::shouldStopThreadActivity): Added. WebKit/mac: * Misc/WebIconDatabase.mm: (defaultClient): Return 0 if ICONDATABASE is disabled. * WebCoreSupport/WebFrameLoaderClient.mm: (WebFrameLoaderClient::dispatchDidReceiveIcon): Commented out the body of the method if ICONDATABASE is disabled. (WebFrameLoaderClient::registerForIconNotification): Ditto. * WebCoreSupport/WebIconDatabaseClient.mm: Added #if ENABLE(ICONDATABASE)/#endif guard to source. * WebView/WebView.mm: (-[WebView setFrameLoadDelegate:]): Wrapped code that starts the icon database machinery in #if ENABLE(ICONDATABASE)/#endif. (-[WebView _registerForIconNotification:]): Wrapped method in #if ENABLE(ICONDATABASE)/#endif guard. (-[WebView _dispatchDidReceiveIconFromWebFrame:]): Ditto. * WebView/WebViewInternal.h: Wrapped methods in #if ENABLE(ICONDATABASE)/#endif guard. (-[WebView _registerForIconNotification:]): (-[WebView _dispatchDidReceiveIconFromWebFrame:]): 130075 1 32324 ddkilzer 2009-07-06 18:07:45 -0700 Comment on attachment 32324 Patch v1 Mark Rowe prefers #if macros around the IconDatabase.cpp and IconDatabaseNone.cpp source rather than futzing with the EXCLUDED_SOURCE_FILE_NAMES Xcode setting, so I will update the patch to do that. 130284 2 32396 ddkilzer 2009-07-07 15:21:31 -0700 Created attachment 32396 Patch v2 <https://bugs.webkit.org/show_bug.cgi?id=27007> Reviewed by NOBODY (OOPS!). WebCore: * WebCore.xcodeproj/project.pbxproj: Added IconDatabaseNone.cpp to the project. * loader/icon/IconDatabase.cpp: Added #if ENABLE(ICONDATABASE)/#endif macro guard. * loader/icon/IconDatabase.h: Removed three public methods from #if ENABLE(ICONDATABASE)/#endif macro so that they may be stubbed out in IconDatabaseNone.cpp. * loader/icon/IconDatabaseNone.cpp: Added #if !ENABLE(ICONDATABASE)/#endif macro guard. (WebCore::IconDatabase::importIconURLForPageURL): Added. (WebCore::IconDatabase::importIconDataForIconURL): Added. (WebCore::IconDatabase::shouldStopThreadActivity): Added. WebKit/mac: * Misc/WebIconDatabase.mm: (defaultClient): Return 0 if ICONDATABASE is disabled. * WebCoreSupport/WebFrameLoaderClient.mm: (WebFrameLoaderClient::dispatchDidReceiveIcon): Commented out the body of the method if ICONDATABASE is disabled. (WebFrameLoaderClient::registerForIconNotification): Ditto. * WebCoreSupport/WebIconDatabaseClient.mm: Added #if ENABLE(ICONDATABASE)/#endif guard to source. * WebView/WebView.mm: (-[WebView setFrameLoadDelegate:]): Wrapped code that starts the icon database machinery in #if ENABLE(ICONDATABASE)/#endif. (-[WebView _registerForIconNotification:]): Wrapped method in #if ENABLE(ICONDATABASE)/#endif guard. (-[WebView _dispatchDidReceiveIconFromWebFrame:]): Ditto. * WebView/WebViewInternal.h: Wrapped methods in #if ENABLE(ICONDATABASE)/#endif guard. (-[WebView _registerForIconNotification:]): (-[WebView _dispatchDidReceiveIconFromWebFrame:]):--- 11 files changed, 97 insertions(+), 2 deletions(-) 130294 3 32396 eric 2009-07-07 15:57:49 -0700 Comment on attachment 32396 Patch v2 This seems like the wrong patch. re: this patch. I like the ability to detect bug URLs in ChangeLogs, but I don't think we should remove the ability to specify a bug? Maybe we should... I guess that forces folks to add the bug url to the ChangeLog? Also the changelog greping code shoudl be in its own function. 130297 4 32396 ddkilzer 2009-07-07 16:03:06 -0700 Comment on attachment 32396 Patch v2 (In reply to comment #3) > (From update of attachment 32396 [details]) > This seems like the wrong patch. bugzilla-tool FAIL. Why did "post-commit" post a local diff? *sigh* > re: this patch. I like the ability to detect bug URLs in ChangeLogs, but I > don't think we should remove the ability to specify a bug? Maybe we should... > I guess that forces folks to add the bug url to the ChangeLog? Exactly. > Also the changelog greping code shoudl be in its own function. Okay. Will do that before posting the bugzilla-tool patch. 130311 5 32404 ddkilzer 2009-07-07 17:17:02 -0700 Created attachment 32404 Patch v3 <https://bugs.webkit.org/show_bug.cgi?id=27007> Reviewed by NOBODY (OOPS!). WebCore: * WebCore.xcodeproj/project.pbxproj: Added IconDatabaseNone.cpp to the project. * loader/icon/IconDatabase.cpp: Added #if ENABLE(ICONDATABASE)/#endif macro guard. * loader/icon/IconDatabase.h: Removed three public methods from #if ENABLE(ICONDATABASE)/#endif macro so that they may be stubbed out in IconDatabaseNone.cpp. * loader/icon/IconDatabaseNone.cpp: Added #if !ENABLE(ICONDATABASE)/#endif macro guard. (WebCore::IconDatabase::importIconURLForPageURL): Added. (WebCore::IconDatabase::importIconDataForIconURL): Added. (WebCore::IconDatabase::shouldStopThreadActivity): Added. WebKit/mac: * Misc/WebIconDatabase.mm: (defaultClient): Return 0 if ICONDATABASE is disabled. * WebCoreSupport/WebFrameLoaderClient.mm: (WebFrameLoaderClient::dispatchDidReceiveIcon): Commented out the body of the method if ICONDATABASE is disabled. (WebFrameLoaderClient::registerForIconNotification): Ditto. * WebCoreSupport/WebIconDatabaseClient.mm: Added #if ENABLE(ICONDATABASE)/#endif guard to source. * WebView/WebView.mm: (-[WebView setFrameLoadDelegate:]): Wrapped code that starts the icon database machinery in #if ENABLE(ICONDATABASE)/#endif. (-[WebView _registerForIconNotification:]): Wrapped method in #if ENABLE(ICONDATABASE)/#endif guard. (-[WebView _dispatchDidReceiveIconFromWebFrame:]): Ditto. * WebView/WebViewInternal.h: Wrapped methods in #if ENABLE(ICONDATABASE)/#endif guard. (-[WebView _registerForIconNotification:]): (-[WebView _dispatchDidReceiveIconFromWebFrame:]): --- 11 files changed, 97 insertions(+), 2 deletions(-) 130312 6 32404 ddkilzer 2009-07-07 17:17:59 -0700 Comment on attachment 32404 Patch v3 bugzilla-tool FAIL again, probably one of my local modifications. 130315 7 32405 ddkilzer 2009-07-07 17:24:19 -0700 Created attachment 32405 Patch v4 <https://bugs.webkit.org/show_bug.cgi?id=27007> Reviewed by NOBODY (OOPS!). WebCore: * WebCore.xcodeproj/project.pbxproj: Added IconDatabaseNone.cpp to the project. * loader/icon/IconDatabase.cpp: Added #if ENABLE(ICONDATABASE)/#endif macro guard. * loader/icon/IconDatabase.h: Removed three public methods from #if ENABLE(ICONDATABASE)/#endif macro so that they may be stubbed out in IconDatabaseNone.cpp. * loader/icon/IconDatabaseNone.cpp: Added #if !ENABLE(ICONDATABASE)/#endif macro guard. (WebCore::IconDatabase::importIconURLForPageURL): Added. (WebCore::IconDatabase::importIconDataForIconURL): Added. (WebCore::IconDatabase::shouldStopThreadActivity): Added. WebKit/mac: * Misc/WebIconDatabase.mm: (defaultClient): Return 0 if ICONDATABASE is disabled. * WebCoreSupport/WebFrameLoaderClient.mm: (WebFrameLoaderClient::dispatchDidReceiveIcon): Commented out the body of the method if ICONDATABASE is disabled. (WebFrameLoaderClient::registerForIconNotification): Ditto. * WebCoreSupport/WebIconDatabaseClient.mm: Added #if ENABLE(ICONDATABASE)/#endif guard to source. * WebView/WebView.mm: (-[WebView setFrameLoadDelegate:]): Wrapped code that starts the icon database machinery in #if ENABLE(ICONDATABASE)/#endif. (-[WebView _registerForIconNotification:]): Wrapped method in #if ENABLE(ICONDATABASE)/#endif guard. (-[WebView _dispatchDidReceiveIconFromWebFrame:]): Ditto. * WebView/WebViewInternal.h: Wrapped methods in #if ENABLE(ICONDATABASE)/#endif guard. (-[WebView _registerForIconNotification:]): (-[WebView _dispatchDidReceiveIconFromWebFrame:]): --- 11 files changed, 97 insertions(+), 2 deletions(-) 130317 8 mrowe 2009-07-07 17:42:59 -0700 What's with posting the changelogs in the comment of the bug? Is that intentional? 130329 9 ddkilzer 2009-07-07 18:44:15 -0700 (In reply to comment #8) > What's with posting the changelogs in the comment of the bug? Is that > intentional? That's the current behavior of "bugzilla-tool post-commits". It is kind of annoying for large ChangeLogs, though. 131087 10 ddkilzer 2009-07-10 23:16:59 -0700 $ git svn dcommit Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/WebCore.xcodeproj/project.pbxproj M WebCore/loader/icon/IconDatabase.cpp M WebCore/loader/icon/IconDatabase.h M WebCore/loader/icon/IconDatabaseNone.cpp M WebKit/mac/ChangeLog M WebKit/mac/Misc/WebIconDatabase.mm M WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm M WebKit/mac/WebCoreSupport/WebIconDatabaseClient.mm M WebKit/mac/WebView/WebView.mm M WebKit/mac/WebView/WebViewInternal.h Committed r45750 http://trac.webkit.org/changeset/45750 32324 2009-07-06 14:23:52 -0700 2009-07-06 18:07:45 -0700 Patch v1 0008--Build-fixes-when-ICONDATABASE-is-disabled.patch text/plain 16103 ddkilzer RnJvbSA1MWM4ZWMxOTJiYTJhMzRlNDA3Mjg5ODcwNjhiYzc5YjM1ZmNiY2VmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYXZpZCBLaWx6ZXIgPGRka2lsemVyQGFwcGxlLmNvbT4KRGF0 ZTogTW9uLCA2IEp1bCAyMDA5IDA3OjIzOjE5IC0wNzAwClN1YmplY3Q6IFtQQVRDSCA4LzhdICAg ICAgICAgQnVpbGQgZml4ZXMgd2hlbiBJQ09OREFUQUJBU0UgaXMgZGlzYWJsZWQKCiAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpXZWJDb3JlOgoKICAgICAgICAqIENvbmZpZ3Vy YXRpb25zL1dlYkNvcmUueGNjb25maWc6IEV4Y2x1ZGUgSWNvbkRhdGFiYXNlLmNwcAogICAgICAg IGZyb20gYmVpbmcgY29tcGlsZWQgd2hlbiBJQ09OREFUQUJBU0UgaXMgZGlzYWJsZWQsIGFuZCBl eGNsdWRlCiAgICAgICAgSWNvbkRhdGFiYXNlTm9uZS5jcHAgd2hlbiBJQ09OREFUQUJBU0UgaXMg ZW5hYmxlZC4gIFJld29ya2VkCiAgICAgICAgZGVmaW5pdGlvbiBvZiBFWENMVURFRF9TT1VSQ0Vf RklMRV9OQU1FUy4KICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajog QWRkZWQgSWNvbkRhdGFiYXNlTm9uZS5jcHAKICAgICAgICB0byB0aGUgcHJvamVjdC4KICAgICAg ICAqIGxvYWRlci9pY29uL0ljb25EYXRhYmFzZS5oOiBSZW1vdmVkIHRocmVlIHB1YmxpYyBtZXRo b2RzIGZyb20KICAgICAgICAjaWYgRU5BQkxFKElDT05EQVRBQkFTRSkvI2VuZGlmIG1hY3JvIHNv IHRoYXQgdGhleSBtYXkgYmUKICAgICAgICBzdHViYmVkIG91dCBpbiBJY29uRGF0YWJhc2VOb25l LmNwcC4KICAgICAgICAqIGxvYWRlci9pY29uL0ljb25EYXRhYmFzZU5vbmUuY3BwOgogICAgICAg IChXZWJDb3JlOjpJY29uRGF0YWJhc2U6OmltcG9ydEljb25VUkxGb3JQYWdlVVJMKTogQWRkZWQu CiAgICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZTo6aW1wb3J0SWNvbkRhdGFGb3JJY29uVVJM KTogQWRkZWQuCiAgICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZTo6c2hvdWxkU3RvcFRocmVh ZEFjdGl2aXR5KTogQWRkZWQuCgpXZWJLaXQvbWFjOgoKICAgICAgICAqIE1pc2MvV2ViSWNvbkRh dGFiYXNlLm1tOgogICAgICAgIChkZWZhdWx0Q2xpZW50KTogUmV0dXJuIDAgaWYgSUNPTkRBVEFC QVNFIGlzIGRpc2FibGVkLgogICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJD bGllbnQubW06CiAgICAgICAgKFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFJlY2Vp dmVJY29uKTogQ29tbWVudGVkIG91dAogICAgICAgIHRoZSBib2R5IG9mIHRoZSBtZXRob2QgaWYg SUNPTkRBVEFCQVNFIGlzIGRpc2FibGVkLgogICAgICAgIChXZWJGcmFtZUxvYWRlckNsaWVudDo6 cmVnaXN0ZXJGb3JJY29uTm90aWZpY2F0aW9uKTogRGl0dG8uCiAgICAgICAgKiBXZWJDb3JlU3Vw cG9ydC9XZWJJY29uRGF0YWJhc2VDbGllbnQubW06IEFkZGVkICNpZgogICAgICAgIEVOQUJMRShJ Q09OREFUQUJBU0UpLyNlbmRpZiBndWFyZCB0byBzb3VyY2UuCiAgICAgICAgKiBXZWJWaWV3L1dl YlZpZXcubW06CiAgICAgICAgKC1bV2ViVmlldyBzZXRGcmFtZUxvYWREZWxlZ2F0ZTpdKTogV3Jh cHBlZCBjb2RlIHRoYXQgc3RhcnRzIHRoZQogICAgICAgIGljb24gZGF0YWJhc2UgbWFjaGluZXJ5 IGluICNpZiBFTkFCTEUoSUNPTkRBVEFCQVNFKS8jZW5kaWYuCiAgICAgICAgKC1bV2ViVmlldyBf cmVnaXN0ZXJGb3JJY29uTm90aWZpY2F0aW9uOl0pOiBXcmFwcGVkIG1ldGhvZCBpbgogICAgICAg ICNpZiBFTkFCTEUoSUNPTkRBVEFCQVNFKS8jZW5kaWYgZ3VhcmQuCiAgICAgICAgKC1bV2ViVmll dyBfZGlzcGF0Y2hEaWRSZWNlaXZlSWNvbkZyb21XZWJGcmFtZTpdKTogRGl0dG8uCiAgICAgICAg KiBXZWJWaWV3L1dlYlZpZXdJbnRlcm5hbC5oOiBXcmFwcGVkIG1ldGhvZHMgaW4gI2lmCiAgICAg ICAgRU5BQkxFKElDT05EQVRBQkFTRSkvI2VuZGlmIGd1YXJkLgogICAgICAgICgtW1dlYlZpZXcg X3JlZ2lzdGVyRm9ySWNvbk5vdGlmaWNhdGlvbjpdKToKICAgICAgICAoLVtXZWJWaWV3IF9kaXNw YXRjaERpZFJlY2VpdmVJY29uRnJvbVdlYkZyYW1lOl0pOgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9n ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAyMCArKysrKysrKysrKysrKysr CiBXZWJDb3JlL0NvbmZpZ3VyYXRpb25zL1dlYkNvcmUueGNjb25maWcgICAgICAgICAgICB8ICAg IDggKysrKy0tCiBXZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiAgICAg ICAgICB8ICAgIDQgKysrCiBXZWJDb3JlL2xvYWRlci9pY29uL0ljb25EYXRhYmFzZS5oICAgICAg ICAgICAgICAgICB8ICAgIDQgKystCiBXZWJDb3JlL2xvYWRlci9pY29uL0ljb25EYXRhYmFzZU5v bmUuY3BwICAgICAgICAgICB8ICAgMTcgKysrKysrKysrKysrKwogV2ViS2l0L21hYy9DaGFuZ2VM b2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDI1ICsrKysrKysrKysrKysrKysr KysrCiBXZWJLaXQvbWFjL01pc2MvV2ViSWNvbkRhdGFiYXNlLm1tICAgICAgICAgICAgICAgICB8 ICAgIDQgKysrCiBXZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50 Lm1tICB8ICAgIDQgKysrCiBXZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkljb25EYXRhYmFz ZUNsaWVudC5tbSB8ICAgIDQgKystCiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbSAgICAg ICAgICAgICAgICAgICAgICB8ICAgIDQgKysrCiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlld0lu dGVybmFsLmggICAgICAgICAgICAgICB8ICAgIDIgKwogMTEgZmlsZXMgY2hhbmdlZCwgOTEgaW5z ZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDY1YzAzMWEuLjhjOWE4ODQgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjUg QEAKIDIwMDktMDctMDYgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAorICAg ICAgICBCdWlsZCBmaXhlcyB3aGVuIElDT05EQVRBQkFTRSBpcyBkaXNhYmxlZAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQ29uZmlndXJhdGlvbnMv V2ViQ29yZS54Y2NvbmZpZzogRXhjbHVkZSBJY29uRGF0YWJhc2UuY3BwCisgICAgICAgIGZyb20g YmVpbmcgY29tcGlsZWQgd2hlbiBJQ09OREFUQUJBU0UgaXMgZGlzYWJsZWQsIGFuZCBleGNsdWRl CisgICAgICAgIEljb25EYXRhYmFzZU5vbmUuY3BwIHdoZW4gSUNPTkRBVEFCQVNFIGlzIGVuYWJs ZWQuICBSZXdvcmtlZAorICAgICAgICBkZWZpbml0aW9uIG9mIEVYQ0xVREVEX1NPVVJDRV9GSUxF X05BTUVTLgorICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajogQWRk ZWQgSWNvbkRhdGFiYXNlTm9uZS5jcHAKKyAgICAgICAgdG8gdGhlIHByb2plY3QuCisgICAgICAg ICogbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlLmg6IFJlbW92ZWQgdGhyZWUgcHVibGljIG1ldGhv ZHMgZnJvbQorICAgICAgICAjaWYgRU5BQkxFKElDT05EQVRBQkFTRSkvI2VuZGlmIG1hY3JvIHNv IHRoYXQgdGhleSBtYXkgYmUKKyAgICAgICAgc3R1YmJlZCBvdXQgaW4gSWNvbkRhdGFiYXNlTm9u ZS5jcHAuCisgICAgICAgICogbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlTm9uZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJY29uRGF0YWJhc2U6OmltcG9ydEljb25VUkxGb3JQYWdlVVJMKTogQWRk ZWQuCisgICAgICAgIChXZWJDb3JlOjpJY29uRGF0YWJhc2U6OmltcG9ydEljb25EYXRhRm9ySWNv blVSTCk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6SWNvbkRhdGFiYXNlOjpzaG91bGRTdG9w VGhyZWFkQWN0aXZpdHkpOiBBZGRlZC4KKworMjAwOS0wNy0wNiAgRGF2aWQgS2lsemVyICA8ZGRr aWx6ZXJAYXBwbGUuY29tPgorCiAgICAgICAgIEJ1aWxkIGZpeCB3aGVuIERBU0hCT0FSRF9TVVBQ T1JUIGlzIGRpc2FibGVkIHdpdGggLVd1bnVzZWQtcGFyYW1ldGVyCiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NvbmZpZ3VyYXRpb25z L1dlYkNvcmUueGNjb25maWcgYi9XZWJDb3JlL0NvbmZpZ3VyYXRpb25zL1dlYkNvcmUueGNjb25m aWcKaW5kZXggNGVhMDA5Ny4uYzE3ZDkyYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9Db25maWd1cmF0 aW9ucy9XZWJDb3JlLnhjY29uZmlnCisrKyBiL1dlYkNvcmUvQ29uZmlndXJhdGlvbnMvV2ViQ29y ZS54Y2NvbmZpZwpAQCAtNDcsOSArNDcsMTEgQEAgSkFWQVNDUklQVENPUkVfUFJJVkFURV9IRUFE RVJTX0RJUl9tYWNvc3hfRGVidWcgPSAkKEpBVkFTQ1JJUFRDT1JFX1BSSVZBVEVfSEVBREUKIEpB VkFTQ1JJUFRDT1JFX1BSSVZBVEVfSEVBREVSU19ESVJfbWFjb3N4X1Byb2R1Y3Rpb24gPSAkKE5F WFRfUk9PVCkkKFNZU1RFTV9MSUJSQVJZX0RJUikvRnJhbWV3b3Jrcy9KYXZhU2NyaXB0Q29yZS5m cmFtZXdvcmsvUHJpdmF0ZUhlYWRlcnM7CiBKQVZBU0NSSVBUQ09SRV9QUklWQVRFX0hFQURFUlNf ZW5naW5lZXJpbmcgPSAkKEJVSUxUX1BST0RVQ1RTX0RJUikvSmF2YVNjcmlwdENvcmUuZnJhbWV3 b3JrL1ByaXZhdGVIZWFkZXJzOwogCi1FWENMVURFRF9TT1VSQ0VfRklMRV9OQU1FUyA9ICQoRVhD TFVERURfU09VUkNFX0ZJTEVfTkFNRVNfJChFTkFCTEVfU1ZHX0RPTV9PQkpDX0JJTkRJTkdTKSkK LUVYQ0xVREVEX1NPVVJDRV9GSUxFX05BTUVTXyA9IERPTVNWRyouKiBET01IVE1MRnJhbWVFbGVt ZW50UHJpdmF0ZS5oIERPTUhUTUxJRnJhbWVFbGVtZW50UHJpdmF0ZS5oOwotRVhDTFVERURfU09V UkNFX0ZJTEVfTkFNRVNfRU5BQkxFX1NWR19ET01fT0JKQ19CSU5ESU5HUyA9IDsKK0VYQ0xVREVE X1NPVVJDRV9GSUxFX05BTUVTID0gJChFWENMVURFRF9TT1VSQ0VfRklMRV9OQU1FU18xXyQoRU5B QkxFX0lDT05EQVRBQkFTRSkpICQoRVhDTFVERURfU09VUkNFX0ZJTEVfTkFNRVNfMl8kKEVOQUJM RV9TVkdfRE9NX09CSkNfQklORElOR1MpKTsKK0VYQ0xVREVEX1NPVVJDRV9GSUxFX05BTUVTXzFf ID0gSWNvbkRhdGFiYXNlLmNwcDsKK0VYQ0xVREVEX1NPVVJDRV9GSUxFX05BTUVTXzFfRU5BQkxF X0lDT05EQVRBQkFTRSA9IEljb25EYXRhYmFzZU5vbmUuY3BwOworRVhDTFVERURfU09VUkNFX0ZJ TEVfTkFNRVNfMl8gPSBET01TVkcqLiogRE9NSFRNTEZyYW1lRWxlbWVudFByaXZhdGUuaCBET01I VE1MSUZyYW1lRWxlbWVudFByaXZhdGUuaDsKK0VYQ0xVREVEX1NPVVJDRV9GSUxFX05BTUVTXzJf RU5BQkxFX1NWR19ET01fT0JKQ19CSU5ESU5HUyA9IDsKIAogU1FMSVRFM19MSUJSQVJZID0gJChT UUxJVEUzX0xJQlJBUllfJChNQUNfT1NfWF9WRVJTSU9OX01BSk9SKSk7CiBTUUxJVEUzX0xJQlJB UllfID0gV2ViQ29yZVNRTGl0ZTM7CmRpZmYgLS1naXQgYS9XZWJDb3JlL1dlYkNvcmUueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvaiBiL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5w Ynhwcm9qCmluZGV4IDc4MTM4Y2IuLjE4OTc1ZTkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvV2ViQ29y ZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1dlYkNvcmUvV2ViQ29yZS54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qCkBAIC02NzQsNiArNjc0LDcgQEAKIAkJNDQxQjA1NUMwQ0Q3N0Ey RDAwN0MxRjE4IC8qIERPTUhUTUxFbWJlZEVsZW1lbnRQcml2YXRlLmggaW4gQ29weSBHZW5lcmF0 ZWQgSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0NDI5QUFGQjBD Qjg0RTg4MDA3NjQ3QzUgLyogRE9NSFRNTEVtYmVkRWxlbWVudFByaXZhdGUuaCAqLzsgfTsKIAkJ NDQxQjA1NUUwQ0Q3N0E0ODAwN0MxRjE4IC8qIERPTUhUTUxJRnJhbWVFbGVtZW50UHJpdmF0ZS5o IGluIENvcHkgR2VuZXJhdGVkIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gNDQyOUFBRkQwQ0I4NEVBNTAwNzY0N0M1IC8qIERPTUhUTUxJRnJhbWVFbGVtZW50UHJp dmF0ZS5oICovOyB9OwogCQk0NDFCMDU2MDBDRDc3QTY1MDA3QzFGMTggLyogRE9NSFRNTE9iamVj dEVsZW1lbnRQcml2YXRlLmggaW4gQ29weSBHZW5lcmF0ZWQgSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0NDI5QUFGRjBDQjg0RUMzMDA3NjQ3QzUgLyogRE9NSFRN TE9iamVjdEVsZW1lbnRQcml2YXRlLmggKi87IH07CisJCTQ0NUM4REI3MTAwMTVGQzkwMDMxNTMx QSAvKiBJY29uRGF0YWJhc2VOb25lLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDQ0NUM4REI2MTAwMTVGQzkwMDMxNTMxQSAvKiBJY29uRGF0YWJhc2VO b25lLmNwcCAqLzsgfTsKIAkJNDQ3RDY5MDMwRkE2MjY4MTAwMTVDQ0IxIC8qIFJ1bnRpbWVBcHBs aWNhdGlvbkNoZWNrcy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gNDQ3RDY5MDEwRkE2MjY4MTAwMTVDQ0IxIC8qIFJ1bnRpbWVBcHBsaWNhdGlvbkNoZWNr cy5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTQ0 N0Q2OTA0MEZBNjI2ODEwMDE1Q0NCMSAvKiBSdW50aW1lQXBwbGljYXRpb25DaGVja3MubW0gaW4g U291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0NDdENjkwMjBGQTYy NjgxMDAxNUNDQjEgLyogUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLm1tICovOyB9OwogCQk0NDhB MjlCRjBBNDZEOUNCMDAzMDc1OUYgLyogSlNIVE1MT3B0aW9uc0NvbGxlY3Rpb24uaCBpbiBIZWFk ZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDQ0OEEyOUJEMEE0NkQ5Q0Iw MDMwNzU5RiAvKiBKU0hUTUxPcHRpb25zQ29sbGVjdGlvbi5oICovOyB9OwpAQCAtNTYwMiw2ICs1 NjAzLDcgQEAKIAkJNDQyOUFBRkQwQ0I4NEVBNTAwNzY0N0M1IC8qIERPTUhUTUxJRnJhbWVFbGVt ZW50UHJpdmF0ZS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDMwOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gRE9NSFRNTElG cmFtZUVsZW1lbnRQcml2YXRlLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQ0MjlB QUZGMENCODRFQzMwMDc2NDdDNSAvKiBET01IVE1MT2JqZWN0RWxlbWVudFByaXZhdGUuaCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSAzMDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IERPTUhUTUxPYmplY3RFbGVtZW50UHJpdmF0 ZS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NDI5QUIwNzBDQjg0RjgxMDA3NjQ3 QzUgLyogRE9NVGV4dEV2ZW50SW50ZXJuYWwuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSAzMDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsg cGF0aCA9IERPTVRleHRFdmVudEludGVybmFsLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CisJCTQ0NUM4REI2MTAwMTVGQzkwMDMxNTMxQSAvKiBJY29uRGF0YWJhc2VOb25lLmNwcCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEljb25EYXRhYmFzZU5vbmUuY3BwOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NDdENjkwMTBGQTYyNjgxMDAxNUNDQjEgLyog UnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0 aCA9IFJ1bnRpbWVBcHBsaWNhdGlvbkNoZWNrcy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwogCQk0NDdENjkwMjBGQTYyNjgxMDAxNUNDQjEgLyogUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tz Lm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gUnVudGltZUFwcGxp Y2F0aW9uQ2hlY2tzLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk0NDhBMjlCRDBB NDZEOUNCMDAzMDc1OUYgLyogSlNIVE1MT3B0aW9uc0NvbGxlY3Rpb24uaCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSAzMDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEpTSFRNTE9wdGlvbnNDb2xsZWN0aW9uLmg7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0xMDAyMyw2ICsxMDAyNSw3IEBACiAJCQkJNTEyNkU2Qjkw QTJFM0IxMjAwNUMyOUZBIC8qIEljb25EYXRhYmFzZS5jcHAgKi8sCiAJCQkJNTEyNkU2QkEwQTJF M0IxMjAwNUMyOUZBIC8qIEljb25EYXRhYmFzZS5oICovLAogCQkJCTUxRTFFQ0I4MEM5MUM5MDQw MERDMjU1QiAvKiBJY29uRGF0YWJhc2VDbGllbnQuaCAqLywKKwkJCQk0NDVDOERCNjEwMDE1RkM5 MDAzMTUzMUEgLyogSWNvbkRhdGFiYXNlTm9uZS5jcHAgKi8sCiAJCQkJMUEyRDc1M0MwREU0N0ZB QjAwRjBBNjQ4IC8qIEljb25GZXRjaGVyLmNwcCAqLywKIAkJCQkxQTJENzUzQjBERTQ3RkFCMDBG MEE2NDggLyogSWNvbkZldGNoZXIuaCAqLywKIAkJCQk1MTNGMTQ1MTBBQjYzNEM0MDAwOTREREYg LyogSWNvbkxvYWRlci5jcHAgKi8sCkBAIC0xODkyNyw2ICsxODkzMCw3IEBACiAJCQkJQkM3N0Qy MzkwRkYyOTgwODAwNzA4ODdCIC8qIERhdGFHcmlkQ29sdW1uLmNwcCBpbiBTb3VyY2VzICovLAog CQkJCUM1MEQwRTgyMEZGNDI3MjkwMEFDMjY0NCAvKiBTdG9yYWdlTmFtZXNwYWNlLmNwcCBpbiBT b3VyY2VzICovLAogCQkJCUJDN0RBQUVFMEZGOTYxNUQwMENFMDEzOCAvKiBET01EYXRhR3JpZERh dGFTb3VyY2UuY3BwIGluIFNvdXJjZXMgKi8sCisJCQkJNDQ1QzhEQjcxMDAxNUZDOTAwMzE1MzFB IC8qIEljb25EYXRhYmFzZU5vbmUuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkpOwogCQkJcnVuT25s eUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7CiAJCX07CmRpZmYgLS1naXQgYS9XZWJD b3JlL2xvYWRlci9pY29uL0ljb25EYXRhYmFzZS5oIGIvV2ViQ29yZS9sb2FkZXIvaWNvbi9JY29u RGF0YWJhc2UuaAppbmRleCA0MGY2NDFhLi42NzVlNmM4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2xv YWRlci9pY29uL0ljb25EYXRhYmFzZS5oCisrKyBiL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRh dGFiYXNlLmgKQEAgLTE2NSw2ICsxNjUsNyBAQCBwcml2YXRlOgogICAgIEhhc2hTZXQ8U3RyaW5n PiBtX3BhZ2VVUkxzUGVuZGluZ0ltcG9ydDsKICAgICBIYXNoU2V0PFN0cmluZz4gbV9wYWdlVVJM c0ludGVyZXN0ZWRJbkljb25zOwogICAgIEhhc2hTZXQ8SWNvblJlY29yZCo+IG1faWNvbnNQZW5k aW5nUmVhZGluZzsKKyNlbmRpZiAvLyBFTkFCTEUoSUNPTkRBVEFCQVNFKQogCiAvLyAqKiogU3lu YyBUaHJlYWQgT25seSAqKioKIHB1YmxpYzoKQEAgLTE3NCw2ICsxNzUsNyBAQCBwdWJsaWM6CiAg ICAgCiAgICAgYm9vbCBzaG91bGRTdG9wVGhyZWFkQWN0aXZpdHkoKSBjb25zdDsKIAorI2lmIEVO QUJMRShJQ09OREFUQUJBU0UpCiBwcml2YXRlOiAgICAKICAgICBzdGF0aWMgdm9pZCogaWNvbkRh dGFiYXNlU3luY1RocmVhZFN0YXJ0KHZvaWQgKik7CiAgICAgdm9pZCogaWNvbkRhdGFiYXNlU3lu Y1RocmVhZCgpOwpAQCAtMjM4LDQgKzI0MCw0IEBAIEljb25EYXRhYmFzZSogaWNvbkRhdGFiYXNl KCk7CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAotI2VuZGlmCisjZW5kaWYgLy8gSWNvbkRh dGFiYXNlX2gKZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlTm9u ZS5jcHAgYi9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25EYXRhYmFzZU5vbmUuY3BwCmluZGV4IGE3 ZmI4OGQuLmQ5OWM3NjMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFi YXNlTm9uZS5jcHAKKysrIGIvV2ViQ29yZS9sb2FkZXIvaWNvbi9JY29uRGF0YWJhc2VOb25lLmNw cApAQCAtMTk0LDQgKzE5NCwyMSBAQCB2b2lkIEljb25EYXRhYmFzZTo6c2V0Q2xpZW50KEljb25E YXRhYmFzZUNsaWVudCopCiB7CiB9CiAKKy8vICoqKioqKioqKioqKioqKioqKioqKioqKgorLy8g KioqIFN5bmMgVGhyZWFkIE9ubHkgKioqCisvLyAqKioqKioqKioqKioqKioqKioqKioqKioKKwor dm9pZCBJY29uRGF0YWJhc2U6OmltcG9ydEljb25VUkxGb3JQYWdlVVJMKGNvbnN0IFN0cmluZyYs IGNvbnN0IFN0cmluZyYpCit7Cit9CisKK3ZvaWQgSWNvbkRhdGFiYXNlOjppbXBvcnRJY29uRGF0 YUZvckljb25VUkwoUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+LCBjb25zdCBTdHJpbmcmKQorewor fQorCitib29sIEljb25EYXRhYmFzZTo6c2hvdWxkU3RvcFRocmVhZEFjdGl2aXR5KCkgY29uc3QK K3sKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0t Z2l0IGEvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCAx ZWZlNTEzLi4xMjJhYTJlIDEwMDY0NAotLS0gYS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9X ZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDA5LTA3LTA2ICBEYXZpZCBL aWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKKyAgICAgICAgQnVpbGQgZml4ZXMgd2hlbiBJ Q09OREFUQUJBU0UgaXMgZGlzYWJsZWQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIE1pc2MvV2ViSWNvbkRhdGFiYXNlLm1tOgorICAgICAgICAoZGVm YXVsdENsaWVudCk6IFJldHVybiAwIGlmIElDT05EQVRBQkFTRSBpcyBkaXNhYmxlZC4KKyAgICAg ICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbToKKyAgICAgICAgKFdl YkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFJlY2VpdmVJY29uKTogQ29tbWVudGVkIG91 dAorICAgICAgICB0aGUgYm9keSBvZiB0aGUgbWV0aG9kIGlmIElDT05EQVRBQkFTRSBpcyBkaXNh YmxlZC4KKyAgICAgICAgKFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpyZWdpc3RlckZvckljb25Ob3Rp ZmljYXRpb24pOiBEaXR0by4KKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJJY29uRGF0YWJh c2VDbGllbnQubW06IEFkZGVkICNpZgorICAgICAgICBFTkFCTEUoSUNPTkRBVEFCQVNFKS8jZW5k aWYgZ3VhcmQgdG8gc291cmNlLgorICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAg ICAgKC1bV2ViVmlldyBzZXRGcmFtZUxvYWREZWxlZ2F0ZTpdKTogV3JhcHBlZCBjb2RlIHRoYXQg c3RhcnRzIHRoZQorICAgICAgICBpY29uIGRhdGFiYXNlIG1hY2hpbmVyeSBpbiAjaWYgRU5BQkxF KElDT05EQVRBQkFTRSkvI2VuZGlmLgorICAgICAgICAoLVtXZWJWaWV3IF9yZWdpc3RlckZvcklj b25Ob3RpZmljYXRpb246XSk6IFdyYXBwZWQgbWV0aG9kIGluCisgICAgICAgICNpZiBFTkFCTEUo SUNPTkRBVEFCQVNFKS8jZW5kaWYgZ3VhcmQuCisgICAgICAgICgtW1dlYlZpZXcgX2Rpc3BhdGNo RGlkUmVjZWl2ZUljb25Gcm9tV2ViRnJhbWU6XSk6IERpdHRvLgorICAgICAgICAqIFdlYlZpZXcv V2ViVmlld0ludGVybmFsLmg6IFdyYXBwZWQgbWV0aG9kcyBpbiAjaWYKKyAgICAgICAgRU5BQkxF KElDT05EQVRBQkFTRSkvI2VuZGlmIGd1YXJkLgorICAgICAgICAoLVtXZWJWaWV3IF9yZWdpc3Rl ckZvckljb25Ob3RpZmljYXRpb246XSk6CisgICAgICAgICgtW1dlYlZpZXcgX2Rpc3BhdGNoRGlk UmVjZWl2ZUljb25Gcm9tV2ViRnJhbWU6XSk6CisKKzIwMDktMDctMDYgIERhdmlkIEtpbHplciAg PGRka2lsemVyQGFwcGxlLmNvbT4KKwogICAgICAgICBCdWlsZCBmaXggd2hlbiBNQUNfSkFWQV9C UklER0UgaXMgZGlzYWJsZWQKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K ZGlmZiAtLWdpdCBhL1dlYktpdC9tYWMvTWlzYy9XZWJJY29uRGF0YWJhc2UubW0gYi9XZWJLaXQv bWFjL01pc2MvV2ViSWNvbkRhdGFiYXNlLm1tCmluZGV4IDczNmRhYmEuLjYyYzhlMmYgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9tYWMvTWlzYy9XZWJJY29uRGF0YWJhc2UubW0KKysrIGIvV2ViS2l0L21h Yy9NaXNjL1dlYkljb25EYXRhYmFzZS5tbQpAQCAtNjUsOCArNjUsMTIgQEAgTlNTaXplIFdlYklj b25MYXJnZVNpemUgPSB7MTI4LCAxMjh9OwogCiBzdGF0aWMgV2ViSWNvbkRhdGFiYXNlQ2xpZW50 KiBkZWZhdWx0Q2xpZW50KCkKIHsKKyNpZiBFTkFCTEUoSUNPTkRBVEFCQVNFKQogICAgIHN0YXRp YyBXZWJJY29uRGF0YWJhc2VDbGllbnQqIGRlZmF1bHRDbGllbnQgPSBuZXcgV2ViSWNvbkRhdGFi YXNlQ2xpZW50KCk7CiAgICAgcmV0dXJuIGRlZmF1bHRDbGllbnQ7CisjZWxzZQorICAgIHJldHVy biAwOworI2VuZGlmCiB9CiAKIEBpbnRlcmZhY2UgV2ViSWNvbkRhdGFiYXNlIChXZWJSZWFsbHlJ bnRlcm5hbCkKZGlmZiAtLWdpdCBhL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVM b2FkZXJDbGllbnQubW0gYi9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVy Q2xpZW50Lm1tCmluZGV4IGE2Y2RlYzMuLjBlMGFiYzUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9tYWMv V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KKysrIGIvV2ViS2l0L21hYy9X ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQpAQCAtNTM5LDkgKzUzOSwxMSBA QCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaFdpbGxDbG9zZSgpCiAKIHZvaWQg V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkUmVjZWl2ZUljb24oKQogeworI2lmIEVO QUJMRShJQ09OREFUQUJBU0UpCiAgICAgV2ViVmlldyAqd2ViVmlldyA9IGdldFdlYlZpZXcobV93 ZWJGcmFtZS5nZXQoKSk7ICAgCiAgICAgQVNTRVJUKG1fd2ViRnJhbWUgPT0gW3dlYlZpZXcgbWFp bkZyYW1lXSk7CiAgICAgW3dlYlZpZXcgX2Rpc3BhdGNoRGlkUmVjZWl2ZUljb25Gcm9tV2ViRnJh bWU6bV93ZWJGcmFtZS5nZXQoKV07CisjZW5kaWYKIH0KIAogdm9pZCBXZWJGcmFtZUxvYWRlckNs aWVudDo6ZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9hZCgpCkBAIC0xNjM1LDcgKzE2Mzcs OSBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojp3aW5kb3dPYmplY3RDbGVhcmVkKCkKIAog dm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6cmVnaXN0ZXJGb3JJY29uTm90aWZpY2F0aW9uKGJv b2wgbGlzdGVuKQogeworI2lmIEVOQUJMRShJQ09OREFUQUJBU0UpCiAgICAgW1ttX3dlYkZyYW1l LmdldCgpIHdlYlZpZXddIF9yZWdpc3RlckZvckljb25Ob3RpZmljYXRpb246bGlzdGVuXTsKKyNl bmRpZgogfQogCiB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaWRQZXJmb3JtRmlyc3ROYXZp Z2F0aW9uKCkgY29uc3QKZGlmZiAtLWdpdCBhL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2Vi SWNvbkRhdGFiYXNlQ2xpZW50Lm1tIGIvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJJY29u RGF0YWJhc2VDbGllbnQubW0KaW5kZXggZGM5YWU2ZC4uMWIwYzgzNCAxMDA2NDQKLS0tIGEvV2Vi S2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJJY29uRGF0YWJhc2VDbGllbnQubW0KKysrIGIvV2Vi S2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJJY29uRGF0YWJhc2VDbGllbnQubW0KQEAgLTI5LDkg KzI5LDkgQEAKICNpbXBvcnQgIldlYkljb25EYXRhYmFzZUNsaWVudC5oIgogCiAjaW1wb3J0ICJX ZWJJY29uRGF0YWJhc2VJbnRlcm5hbC5oIgotCiAjaW1wb3J0IDxXZWJDb3JlL1BsYXRmb3JtU3Ry aW5nLmg+CiAKKyNpZiBFTkFCTEUoSUNPTkRBVEFCQVNFKQogCiBib29sIFdlYkljb25EYXRhYmFz ZUNsaWVudDo6cGVyZm9ybUltcG9ydCgpCiB7CkBAIC01NSwzICs1NSw1IEBAIHZvaWQgV2ViSWNv bkRhdGFiYXNlQ2xpZW50OjpkaXNwYXRjaERpZEFkZEljb25Gb3JQYWdlVVJMKGNvbnN0IFdlYkNv cmU6OlN0cmluZyYKICAgICAvLyBpbnN0ZWFkIG9mIHVzIGRvaW5nIGl0IGV2ZXJ5IGl0ZXJhdGlv bgogICAgIFtbV2ViSWNvbkRhdGFiYXNlIHNoYXJlZEljb25EYXRhYmFzZV0gX3NlbmROb3RpZmlj YXRpb25Gb3JVUkw6cGFnZVVSTF07CiB9CisKKyNlbmRpZiAvLyBFTkFCTEUoSUNPTkRBVEFCQVNF KQpkaWZmIC0tZ2l0IGEvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0gYi9XZWJLaXQvbWFj L1dlYlZpZXcvV2ViVmlldy5tbQppbmRleCAwMmI0OWM1Li5lNDM5NmRhIDEwMDY0NAotLS0gYS9X ZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQorKysgYi9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi Vmlldy5tbQpAQCAtMjcwMSw5ICsyNzAxLDExIEBAIHN0YXRpYyBib29sIG5lZWRzV2ViVmlld0lu aXRUaHJlYWRXb3JrYXJvdW5kKCkKICAgICBfcHJpdmF0ZS0+ZnJhbWVMb2FkRGVsZWdhdGUgPSBk ZWxlZ2F0ZTsKICAgICBbc2VsZiBfY2FjaGVGcmFtZUxvYWREZWxlZ2F0ZUltcGxlbWVudGF0aW9u c107CiAKKyNpZiBFTkFCTEUoSUNPTkRBVEFCQVNFKQogICAgIC8vIElmIHRoaXMgZGVsZWdhdGUg d2FudHMgY2FsbGJhY2tzIGZvciBpY29ucywgZmlyZSB1cCB0aGUgaWNvbiBkYXRhYmFzZS4KICAg ICBpZiAoX3ByaXZhdGUtPmZyYW1lTG9hZERlbGVnYXRlSW1wbGVtZW50YXRpb25zLmRpZFJlY2Vp dmVJY29uRm9yRnJhbWVGdW5jKQogICAgICAgICBbV2ViSWNvbkRhdGFiYXNlIHNoYXJlZEljb25E YXRhYmFzZV07CisjZW5kaWYKIH0KIAogLSBmcmFtZUxvYWREZWxlZ2F0ZQpAQCAtNTExMCw2ICs1 MTEyLDcgQEAgc3RhdGljIFdlYkZyYW1lVmlldyAqY29udGFpbmluZ0ZyYW1lVmlldyhOU1ZpZXcg KnZpZXcpCiAgICAgcmV0dXJuIF9wcml2YXRlLT5iZWNvbWluZ0ZpcnN0UmVzcG9uZGVyRnJvbU91 dHNpZGU7CiB9CiAKKyNpZiBFTkFCTEUoSUNPTkRBVEFCQVNFKQogLSAodm9pZClfcmVjZWl2ZWRJ Y29uQ2hhbmdlZE5vdGlmaWNhdGlvbjooTlNOb3RpZmljYXRpb24gKilub3RpZmljYXRpb24KIHsK ICAgICAvLyBHZXQgdGhlIFVSTCBmb3IgdGhpcyBub3RpZmljYXRpb24KQEAgLTUxNTAsNiArNTE1 Myw3IEBAIHN0YXRpYyBXZWJGcmFtZVZpZXcgKmNvbnRhaW5pbmdGcmFtZVZpZXcoTlNWaWV3ICp2 aWV3KQogCiAgICAgW3NlbGYgX2RpZENoYW5nZVZhbHVlRm9yS2V5Ol9XZWJNYWluRnJhbWVJY29u S2V5XTsKIH0KKyNlbmRpZiAvLyBFTkFCTEUoSUNPTkRBVEFCQVNFKQogCiAvLyBHZXQgdGhlIGFw cHJvcHJpYXRlIHVzZXItYWdlbnQgc3RyaW5nIGZvciBhIHBhcnRpY3VsYXIgVVJMLgogLSAoV2Vi Q29yZTo6U3RyaW5nKV91c2VyQWdlbnRGb3JVUkw6KGNvbnN0IFdlYkNvcmU6OktVUkwmKXVybApk aWZmIC0tZ2l0IGEvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXdJbnRlcm5hbC5oIGIvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYlZpZXdJbnRlcm5hbC5oCmluZGV4IGI0MjZlMmIuLjcxNGRhODcgMTAw NjQ0Ci0tLSBhL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3SW50ZXJuYWwuaAorKysgYi9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViVmlld0ludGVybmFsLmgKQEAgLTcwLDggKzcwLDEwIEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAogLSAoQk9PTClfYmVjb21pbmdGaXJzdFJlc3BvbmRlckZyb21PdXRz aWRlOwogCisjaWYgRU5BQkxFKElDT05EQVRBQkFTRSkKIC0gKHZvaWQpX3JlZ2lzdGVyRm9ySWNv bk5vdGlmaWNhdGlvbjooQk9PTClsaXN0ZW47CiAtICh2b2lkKV9kaXNwYXRjaERpZFJlY2VpdmVJ Y29uRnJvbVdlYkZyYW1lOihXZWJGcmFtZSAqKXdlYkZyYW1lOworI2VuZGlmCiAKIC0gKHZvaWQp X3NldE1vdXNlRG93bkV2ZW50OihOU0V2ZW50ICopZXZlbnQ7CiAtICh2b2lkKV9jYW5jZWxVcGRh dGVNb3VzZW92ZXJUaW1lcjsKLS0gCjEuNi4yCgo= 32396 2009-07-07 15:21:31 -0700 2009-07-08 14:07:05 -0700 Patch v2 bugzilla_requires_a_filename.patch text/plain 2980 ddkilzer ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbCBiL1dlYktpdFRv b2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbAppbmRleCBiZmQ1YmJhLi4zZjRkNDRhIDEwMDc1NQot LS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wKKysrIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy9idWd6aWxsYS10b29sCkBAIC00MTAsMzMgKzQxMCwzOCBAQCBjbGFzcyBQb3N0Q29t bWl0c0FzUGF0Y2hlc1RvQnVnKENvbW1hbmQpOgogICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0t bm8tb2Jzb2xldGUiLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0ib2Jzb2xldGVfcGF0Y2hl cyIsIGRlZmF1bHQ9VHJ1ZSwgaGVscD0iRG8gbm90IG9ic29sZXRlIG9sZCBwYXRjaGVzIGJlZm9y ZSBwb3N0aW5nIG5ldyBvbmVzLiIpLAogICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0tbm8tcmV2 aWV3IiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9InJldmlldyIsIGRlZmF1bHQ9VHJ1ZSwg aGVscD0iRG8gbm90IG1hcmsgdGhlIHBhdGNoIGZvciByZXZpZXcuIiksCiAgICAgICAgIF0KLSAg ICAgICAgQ29tbWFuZC5fX2luaXRfXyhzZWxmLCAnQXR0YWNoZXMgYSByYW5nZSBvZiBsb2NhbCBj b21taXRzIHRvIGEgYnVnIGFzIHBhdGNoIGZpbGVzLicsICdCVUdJRCBDT01NSVRJU0gnLCBvcHRp b25zPW9wdGlvbnMpCisgICAgICAgIENvbW1hbmQuX19pbml0X18oc2VsZiwgJ0F0dGFjaGVzIGEg cmFuZ2Ugb2YgbG9jYWwgY29tbWl0cyB0byBidWdzIGFzIHBhdGNoIGZpbGVzLicsICdDT01NSVRJ U0gnLCBvcHRpb25zPW9wdGlvbnMpCiAKICAgICBkZWYgZXhlY3V0ZShzZWxmLCBvcHRpb25zLCBh cmdzLCB0b29sKToKLSAgICAgICAgYnVnX2lkID0gYXJnc1swXQotICAgICAgICAKICAgICAgICAg aWYgbm90IHRvb2wuc2NtKCkuc3VwcG9ydHNfbG9jYWxfY29tbWl0cygpOgogICAgICAgICAgICAg ZXJyb3IodG9vbC5zY20oKS5kaXNwbGF5X25hbWUoKSArICIgZG9lcyBub3Qgc3VwcG9ydCBsb2Nh bCBjb21taXRzLiIpCi0gICAgICAgIAotICAgICAgICBjb21taXRfaWRzID0gdG9vbC5zY20oKS5j b21taXRfaWRzX2Zyb21fcmFuZ2VfYXJndW1lbnRzKGFyZ3NbMTpdKQotICAgICAgICAKKworICAg ICAgICBjb21taXRfaWRzID0gdG9vbC5zY20oKS5jb21taXRfaWRzX2Zyb21fcmFuZ2VfYXJndW1l bnRzKGFyZ3MpCisKICAgICAgICAgaWYgbGVuKGNvbW1pdF9pZHMpID4gMTA6Ci0gICAgICAgICAg ICBlcnJvcigiQXJlIHlvdSBzdXJlIHlvdSB3YW50IHRvIGF0dGFjaCAlcyB0byBidWcgJXM/IiAl IChwbHVyYWxpemUoJ3BhdGNoJywgbGVuKGNvbW1pdF9pZHMpKSwgYnVnX2lkKSkKKyAgICAgICAg ICAgIGVycm9yKCJBcmUgeW91IHN1cmUgeW91IHdhbnQgdG8gYXR0YWNoICVzIHBhdGNoZXM/IiAl IChwbHVyYWxpemUoJ3BhdGNoJywgbGVuKGNvbW1pdF9pZHMpKSkpCiAgICAgICAgICAgICAjIENv dWxkIGFkZCBhIC0tcGF0Y2hlcy1saW1pdCBvcHRpb24uCiAKLSAgICAgICAgaWYgb3B0aW9ucy5v YnNvbGV0ZV9wYXRjaGVzOgotICAgICAgICAgICAgUG9zdERpZmZBc1BhdGNoVG9CdWcub2Jzb2xl dGVfcGF0Y2hlc19vbl9idWcoYnVnX2lkLCB0b29sLmJ1Z3MpCi0gICAgICAgIAotICAgICAgICBs b2coIkF0dGFjaGluZyAlcyBhcyBwYXRjaGVzIHRvIGJ1ZyAlcyIgJSAocGx1cmFsaXplKCdjb21t aXQnLCBsZW4oY29tbWl0X2lkcykpLCBidWdfaWQpKQorICAgICAgICBoYXZlX29ic29sZXRlZF9w YXRjaGVzID0gc2V0KCkKICAgICAgICAgZm9yIGNvbW1pdF9pZCBpbiBjb21taXRfaWRzOgogICAg ICAgICAgICAgY29tbWl0X21lc3NhZ2UgPSB0b29sLnNjbSgpLmNvbW1pdF9tZXNzYWdlX2Zvcl9j b21taXQoY29tbWl0X2lkKQogICAgICAgICAgICAgY29tbWl0X2xpbmVzID0gY29tbWl0X21lc3Nh Z2Uuc3BsaXRsaW5lcygpCi0gICAgICAgICAgICAKKworICAgICAgICAgICAgbWF0Y2ggPSByZS5z ZWFyY2goImh0dHBzP1w6Ly9idWdzXC53ZWJraXRcLm9yZy9zaG93X2J1Z1wuY2dpXD9pZD0oP1A8 YnVnX2lkPlxkKykiLCBjb21taXRfbWVzc2FnZSwgcmUuTVVMVElMSU5FKQorICAgICAgICAgICAg YnVnX2lkID0gbWF0Y2guZ3JvdXAoJ2J1Z19pZCcpCisgICAgICAgICAgICBpZiBub3QgYnVnX2lk OgorICAgICAgICAgICAgICAgIGxvZygiTm8gYnVnIGlkIGZvdW5kIGluIGNvbW1pdCBsb2cgZm9y ICVzIiAlIGNvbW1pdF9pZCkKKyAgICAgICAgICAgICAgICBjb250aW51ZQorCisgICAgICAgICAg ICBpZiBvcHRpb25zLm9ic29sZXRlX3BhdGNoZXMgYW5kIGJ1Z19pZCBub3QgaW4gaGF2ZV9vYnNv bGV0ZWRfcGF0Y2hlczoKKyAgICAgICAgICAgICAgICBQb3N0RGlmZkFzUGF0Y2hUb0J1Zy5vYnNv bGV0ZV9wYXRjaGVzX29uX2J1ZyhidWdfaWQsIHRvb2wuYnVncykKKyAgICAgICAgICAgICAgICBo YXZlX29ic29sZXRlZF9wYXRjaGVzLnVwZGF0ZShidWdfaWQpCisKICAgICAgICAgICAgIGRlc2Ny aXB0aW9uID0gY29tbWl0X2xpbmVzWzBdCiAgICAgICAgICAgICBjb21tZW50X3RleHQgPSAiXG4i LmpvaW4oY29tbWl0X2xpbmVzWzE6XSkKICAgICAgICAgICAgIGNvbW1lbnRfdGV4dCArPSAiLS0t XG4iCiAgICAgICAgICAgICBjb21tZW50X3RleHQgKz0gdG9vbC5zY20oKS5maWxlc19jaGFuZ2Vk X3N1bW1hcnlfZm9yX2NvbW1pdChjb21taXRfaWQpCi0gICAgICAgIAorCiAgICAgICAgICAgICBk aWZmID0gdG9vbC5zY20oKS5jcmVhdGVfcGF0Y2goKQogICAgICAgICAgICAgZGlmZl9maWxlID0g U3RyaW5nSU8uU3RyaW5nSU8oZGlmZikgIyBhZGRfcGF0Y2hfdG9fYnVnIGV4cGVjdHMgYSBmaWxl LWxpa2Ugb2JqZWN0CiAgICAgICAgICAgICB0b29sLmJ1Z3MuYWRkX3BhdGNoX3RvX2J1ZyhidWdf aWQsIGRpZmZfZmlsZSwgZGVzY3JpcHRpb24sIGNvbW1lbnRfdGV4dCwgbWFya19mb3JfcmV2aWV3 PW9wdGlvbnMucmV2aWV3KQ== 32404 2009-07-07 17:17:02 -0700 2009-07-08 14:07:16 -0700 Patch v3 bug-27007-20090707171701.patch text/plain 4 ddkilzer Tm9uZQ== 32405 2009-07-07 17:24:19 -0700 2009-07-09 21:47:50 -0700 Patch v4 bug-27007-20090707172418.patch text/plain 12600 ddkilzer ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODk2YWM0NS4uODlhNDI4YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAwOS0wNy0wNyAgRGF2aWQgS2lsemVy ICA8ZGRraWx6ZXJAYXBwbGUuY29tPgorCisgICAgICAgIEJ1ZyAyNzAwNzogQnVpbGQgZml4ZXMg d2hlbiBJQ09OREFUQUJBU0UgaXMgZGlzYWJsZWQKKworICAgICAgICA8aHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3MDA3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qOiBBZGRlZCBJY29uRGF0YWJhc2VOb25lLmNwcAorICAgICAgICB0byB0aGUgcHJvamVjdC4K KyAgICAgICAgKiBsb2FkZXIvaWNvbi9JY29uRGF0YWJhc2UuY3BwOiBBZGRlZAorICAgICAgICAj aWYgRU5BQkxFKElDT05EQVRBQkFTRSkvI2VuZGlmIG1hY3JvIGd1YXJkLgorICAgICAgICAqIGxv YWRlci9pY29uL0ljb25EYXRhYmFzZS5oOiBSZW1vdmVkIHRocmVlIHB1YmxpYyBtZXRob2RzIGZy b20KKyAgICAgICAgI2lmIEVOQUJMRShJQ09OREFUQUJBU0UpLyNlbmRpZiBtYWNybyBzbyB0aGF0 IHRoZXkgbWF5IGJlCisgICAgICAgIHN0dWJiZWQgb3V0IGluIEljb25EYXRhYmFzZU5vbmUuY3Bw LgorICAgICAgICAqIGxvYWRlci9pY29uL0ljb25EYXRhYmFzZU5vbmUuY3BwOiBBZGRlZAorICAg ICAgICAjaWYgIUVOQUJMRShJQ09OREFUQUJBU0UpLyNlbmRpZiBtYWNybyBndWFyZC4KKyAgICAg ICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZTo6aW1wb3J0SWNvblVSTEZvclBhZ2VVUkwpOiBBZGRl ZC4KKyAgICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZTo6aW1wb3J0SWNvbkRhdGFGb3JJY29u VVJMKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpJY29uRGF0YWJhc2U6OnNob3VsZFN0b3BU aHJlYWRBY3Rpdml0eSk6IEFkZGVkLgorCiAyMDA5LTA3LTA2ICBEYXZpZCBLaWx6ZXIgIDxkZGtp bHplckBhcHBsZS5jb20+CiAKICAgICAgICAgQnVnIDI3MDAyOiBCdWlsZCBmaXggd2hlbiBEQVNI Qk9BUkRfU1VQUE9SVCBpcyBkaXNhYmxlZCB3aXRoIC1XdW51c2VkLXBhcmFtZXRlcgpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9XZWJDb3Jl L1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCA2NzlmMzExLi42ZWY2MjU4 IDEwMDY0NAotLS0gYS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagor KysgYi9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtNjc0LDYg KzY3NCw3IEBACiAJCTQ0MUIwNTVDMENENzdBMkQwMDdDMUYxOCAvKiBET01IVE1MRW1iZWRFbGVt ZW50UHJpdmF0ZS5oIGluIENvcHkgR2VuZXJhdGVkIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gNDQyOUFBRkIwQ0I4NEU4ODAwNzY0N0M1IC8qIERPTUhUTUxFbWJl ZEVsZW1lbnRQcml2YXRlLmggKi87IH07CiAJCTQ0MUIwNTVFMENENzdBNDgwMDdDMUYxOCAvKiBE T01IVE1MSUZyYW1lRWxlbWVudFByaXZhdGUuaCBpbiBDb3B5IEdlbmVyYXRlZCBIZWFkZXJzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDQ0MjlBQUZEMENCODRFQTUwMDc2NDdD NSAvKiBET01IVE1MSUZyYW1lRWxlbWVudFByaXZhdGUuaCAqLzsgfTsKIAkJNDQxQjA1NjAwQ0Q3 N0E2NTAwN0MxRjE4IC8qIERPTUhUTUxPYmplY3RFbGVtZW50UHJpdmF0ZS5oIGluIENvcHkgR2Vu ZXJhdGVkIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNDQyOUFB RkYwQ0I4NEVDMzAwNzY0N0M1IC8qIERPTUhUTUxPYmplY3RFbGVtZW50UHJpdmF0ZS5oICovOyB9 OworCQk0NDVDOERCNzEwMDE1RkM5MDAzMTUzMUEgLyogSWNvbkRhdGFiYXNlTm9uZS5jcHAgaW4g U291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0NDVDOERCNjEwMDE1 RkM5MDAzMTUzMUEgLyogSWNvbkRhdGFiYXNlTm9uZS5jcHAgKi87IH07CiAJCTQ0N0Q2OTAzMEZB NjI2ODEwMDE1Q0NCMSAvKiBSdW50aW1lQXBwbGljYXRpb25DaGVja3MuaCBpbiBIZWFkZXJzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDQ0N0Q2OTAxMEZBNjI2ODEwMDE1Q0NC MSAvKiBSdW50aW1lQXBwbGljYXRpb25DaGVja3MuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRF UyA9IChQcml2YXRlLCApOyB9OyB9OwogCQk0NDdENjkwNDBGQTYyNjgxMDAxNUNDQjEgLyogUnVu dGltZUFwcGxpY2F0aW9uQ2hlY2tzLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gNDQ3RDY5MDIwRkE2MjY4MTAwMTVDQ0IxIC8qIFJ1bnRpbWVBcHBsaWNh dGlvbkNoZWNrcy5tbSAqLzsgfTsKIAkJNDQ4QTI5QkYwQTQ2RDlDQjAwMzA3NTlGIC8qIEpTSFRN TE9wdGlvbnNDb2xsZWN0aW9uLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSA0NDhBMjlCRDBBNDZEOUNCMDAzMDc1OUYgLyogSlNIVE1MT3B0aW9uc0NvbGxl Y3Rpb24uaCAqLzsgfTsKQEAgLTU2MDQsNiArNTYwNSw3IEBACiAJCTQ0MjlBQUZEMENCODRFQTUw MDc2NDdDNSAvKiBET01IVE1MSUZyYW1lRWxlbWVudFByaXZhdGUuaCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSAzMDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmMuaDsgcGF0aCA9IERPTUhUTUxJRnJhbWVFbGVtZW50UHJpdmF0ZS5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQk0NDI5QUFGRjBDQjg0RUMzMDA3NjQ3QzUgLyogRE9NSFRN TE9iamVjdEVsZW1lbnRQcml2YXRlLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGgg PSBET01IVE1MT2JqZWN0RWxlbWVudFByaXZhdGUuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKIAkJNDQyOUFCMDcwQ0I4NEY4MTAwNzY0N0M1IC8qIERPTVRleHRFdmVudEludGVybmFsLmgg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGxhc3RLbm93 bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBET01UZXh0RXZlbnRJbnRlcm5hbC5o OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQk0NDVDOERCNjEwMDE1RkM5MDAzMTUzMUEg LyogSWNvbkRhdGFiYXNlTm9uZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBh dGggPSBJY29uRGF0YWJhc2VOb25lLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ NDQ3RDY5MDEwRkE2MjY4MTAwMTVDQ0IxIC8qIFJ1bnRpbWVBcHBsaWNhdGlvbkNoZWNrcy5oICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZp bGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBSdW50aW1lQXBwbGljYXRpb25DaGVja3Mu aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDQ3RDY5MDIwRkE2MjY4MTAwMTVDQ0Ix IC8qIFJ1bnRpbWVBcHBsaWNhdGlvbkNoZWNrcy5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3Bw Lm9iamNwcDsgcGF0aCA9IFJ1bnRpbWVBcHBsaWNhdGlvbkNoZWNrcy5tbTsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJNDQ4QTI5QkQwQTQ2RDlDQjAwMzA3NTlGIC8qIEpTSFRNTE9wdGlv bnNDb2xsZWN0aW9uLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBKU0hUTUxP cHRpb25zQ29sbGVjdGlvbi5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtMTAwMjks NiArMTAwMzEsNyBAQAogCQkJCTUxMjZFNkI5MEEyRTNCMTIwMDVDMjlGQSAvKiBJY29uRGF0YWJh c2UuY3BwICovLAogCQkJCTUxMjZFNkJBMEEyRTNCMTIwMDVDMjlGQSAvKiBJY29uRGF0YWJhc2Uu aCAqLywKIAkJCQk1MUUxRUNCODBDOTFDOTA0MDBEQzI1NUIgLyogSWNvbkRhdGFiYXNlQ2xpZW50 LmggKi8sCisJCQkJNDQ1QzhEQjYxMDAxNUZDOTAwMzE1MzFBIC8qIEljb25EYXRhYmFzZU5vbmUu Y3BwICovLAogCQkJCTFBMkQ3NTNDMERFNDdGQUIwMEYwQTY0OCAvKiBJY29uRmV0Y2hlci5jcHAg Ki8sCiAJCQkJMUEyRDc1M0IwREU0N0ZBQjAwRjBBNjQ4IC8qIEljb25GZXRjaGVyLmggKi8sCiAJ CQkJNTEzRjE0NTEwQUI2MzRDNDAwMDk0RERGIC8qIEljb25Mb2FkZXIuY3BwICovLApAQCAtMTg5 MzUsNiArMTg5MzgsNyBAQAogCQkJCUM1MEQwRTgyMEZGNDI3MjkwMEFDMjY0NCAvKiBTdG9yYWdl TmFtZXNwYWNlLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCUJDN0RBQUVFMEZGOTYxNUQwMENFMDEz OCAvKiBET01EYXRhR3JpZERhdGFTb3VyY2UuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJQjVBNjg0 MjQwRkZBQkVBQTAwRDI0Njg5IC8qIFNRTGl0ZUZpbGVTeXN0ZW0uY3BwIGluIFNvdXJjZXMgKi8s CisJCQkJNDQ1QzhEQjcxMDAxNUZDOTAwMzE1MzFBIC8qIEljb25EYXRhYmFzZU5vbmUuY3BwIGlu IFNvdXJjZXMgKi8sCiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2lu ZyA9IDA7CiAJCX07CmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25EYXRhYmFz ZS5jcHAgYi9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25EYXRhYmFzZS5jcHAKaW5kZXggM2RlZDRm My4uYjc4MjkxZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvaWNvbi9JY29uRGF0YWJhc2Uu Y3BwCisrKyBiL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlLmNwcApAQCAtMjcsNiAr MjcsOCBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIkljb25EYXRhYmFzZS5oIgog CisjaWYgRU5BQkxFKElDT05EQVRBQkFTRSkKKwogI2luY2x1ZGUgIkF1dG9kcmFpbmVkUG9vbC5o IgogI2luY2x1ZGUgIkRvY3VtZW50TG9hZGVyLmgiCiAjaW5jbHVkZSAiRmlsZVN5c3RlbS5oIgpA QCAtMjA2NywzICsyMDY5LDUgQEAgdm9pZCBJY29uRGF0YWJhc2U6OndyaXRlSWNvblNuYXBzaG90 VG9TUUxEYXRhYmFzZShjb25zdCBJY29uU25hcHNob3QmIHNuYXBzaG90KQogfQogCiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCisKKyNlbmRpZiAvLyBFTkFCTEUoSUNPTkRBVEFCQVNFKQpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9sb2FkZXIvaWNvbi9JY29uRGF0YWJhc2UuaCBiL1dlYkNvcmUvbG9hZGVy L2ljb24vSWNvbkRhdGFiYXNlLmgKaW5kZXggNDBmNjQxYS4uNjc1ZTZjOCAxMDA2NDQKLS0tIGEv V2ViQ29yZS9sb2FkZXIvaWNvbi9JY29uRGF0YWJhc2UuaAorKysgYi9XZWJDb3JlL2xvYWRlci9p Y29uL0ljb25EYXRhYmFzZS5oCkBAIC0xNjUsNiArMTY1LDcgQEAgcHJpdmF0ZToKICAgICBIYXNo U2V0PFN0cmluZz4gbV9wYWdlVVJMc1BlbmRpbmdJbXBvcnQ7CiAgICAgSGFzaFNldDxTdHJpbmc+ IG1fcGFnZVVSTHNJbnRlcmVzdGVkSW5JY29uczsKICAgICBIYXNoU2V0PEljb25SZWNvcmQqPiBt X2ljb25zUGVuZGluZ1JlYWRpbmc7CisjZW5kaWYgLy8gRU5BQkxFKElDT05EQVRBQkFTRSkKIAog Ly8gKioqIFN5bmMgVGhyZWFkIE9ubHkgKioqCiBwdWJsaWM6CkBAIC0xNzQsNiArMTc1LDcgQEAg cHVibGljOgogICAgIAogICAgIGJvb2wgc2hvdWxkU3RvcFRocmVhZEFjdGl2aXR5KCkgY29uc3Q7 CiAKKyNpZiBFTkFCTEUoSUNPTkRBVEFCQVNFKQogcHJpdmF0ZTogICAgCiAgICAgc3RhdGljIHZv aWQqIGljb25EYXRhYmFzZVN5bmNUaHJlYWRTdGFydCh2b2lkICopOwogICAgIHZvaWQqIGljb25E YXRhYmFzZVN5bmNUaHJlYWQoKTsKQEAgLTIzOCw0ICsyNDAsNCBAQCBJY29uRGF0YWJhc2UqIGlj b25EYXRhYmFzZSgpOwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKLSNlbmRpZgorI2VuZGlm IC8vIEljb25EYXRhYmFzZV9oCmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25E YXRhYmFzZU5vbmUuY3BwIGIvV2ViQ29yZS9sb2FkZXIvaWNvbi9JY29uRGF0YWJhc2VOb25lLmNw cAppbmRleCBhN2ZiODhkLi4wM2E3OTY0IDEwMDY0NAotLS0gYS9XZWJDb3JlL2xvYWRlci9pY29u L0ljb25EYXRhYmFzZU5vbmUuY3BwCisrKyBiL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFi YXNlTm9uZS5jcHAKQEAgLTI2LDYgKzI2LDggQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNs dWRlICJJY29uRGF0YWJhc2UuaCIKIAorI2lmICFFTkFCTEUoSUNPTkRBVEFCQVNFKQorCiAjaW5j bHVkZSAiUGxhdGZvcm1TdHJpbmcuaCIKICNpbmNsdWRlICJTaGFyZWRCdWZmZXIuaCIKICNpbmNs dWRlIDx3dGYvU3RkTGliRXh0cmFzLmg+CkBAIC0xOTQsNCArMTk2LDIzIEBAIHZvaWQgSWNvbkRh dGFiYXNlOjpzZXRDbGllbnQoSWNvbkRhdGFiYXNlQ2xpZW50KikKIHsKIH0KIAorLy8gKioqKioq KioqKioqKioqKioqKioqKioqCisvLyAqKiogU3luYyBUaHJlYWQgT25seSAqKioKKy8vICoqKioq KioqKioqKioqKioqKioqKioqKgorCit2b2lkIEljb25EYXRhYmFzZTo6aW1wb3J0SWNvblVSTEZv clBhZ2VVUkwoY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJikKK3sKK30KKwordm9pZCBJY29u RGF0YWJhc2U6OmltcG9ydEljb25EYXRhRm9ySWNvblVSTChQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZl cj4sIGNvbnN0IFN0cmluZyYpCit7Cit9CisKK2Jvb2wgSWNvbkRhdGFiYXNlOjpzaG91bGRTdG9w VGhyZWFkQWN0aXZpdHkoKSBjb25zdAoreworICAgIHJldHVybiB0cnVlOworfQorCiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCisKKyNlbmRpZiAvLyAhRU5BQkxFKElDT05EQVRBQkFTRSkKZGlmZiAt LWdpdCBhL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXgg ZDI3MmM4ZS4uMmYzMGJlZSAxMDA2NDQKLS0tIGEvV2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIv V2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAwOS0wNy0wNyAgRGF2aWQg S2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgorCisgICAgICAgIEJ1ZyAyNzAwNzogQnVpbGQg Zml4ZXMgd2hlbiBJQ09OREFUQUJBU0UgaXMgZGlzYWJsZWQKKworICAgICAgICA8aHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3MDA3PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTWlzYy9XZWJJY29uRGF0YWJhc2UubW06 CisgICAgICAgIChkZWZhdWx0Q2xpZW50KTogUmV0dXJuIDAgaWYgSUNPTkRBVEFCQVNFIGlzIGRp c2FibGVkLgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1t OgorICAgICAgICAoV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkUmVjZWl2ZUljb24p OiBDb21tZW50ZWQgb3V0CisgICAgICAgIHRoZSBib2R5IG9mIHRoZSBtZXRob2QgaWYgSUNPTkRB VEFCQVNFIGlzIGRpc2FibGVkLgorICAgICAgICAoV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnJlZ2lz dGVyRm9ySWNvbk5vdGlmaWNhdGlvbik6IERpdHRvLgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0 L1dlYkljb25EYXRhYmFzZUNsaWVudC5tbTogQWRkZWQgI2lmCisgICAgICAgIEVOQUJMRShJQ09O REFUQUJBU0UpLyNlbmRpZiBndWFyZCB0byBzb3VyY2UuCisgICAgICAgICogV2ViVmlldy9XZWJW aWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IHNldEZyYW1lTG9hZERlbGVnYXRlOl0pOiBXcmFw cGVkIGNvZGUgdGhhdCBzdGFydHMgdGhlCisgICAgICAgIGljb24gZGF0YWJhc2UgbWFjaGluZXJ5 IGluICNpZiBFTkFCTEUoSUNPTkRBVEFCQVNFKS8jZW5kaWYuCisgICAgICAgICgtW1dlYlZpZXcg X3JlZ2lzdGVyRm9ySWNvbk5vdGlmaWNhdGlvbjpdKTogV3JhcHBlZCBtZXRob2QgaW4KKyAgICAg ICAgI2lmIEVOQUJMRShJQ09OREFUQUJBU0UpLyNlbmRpZiBndWFyZC4KKyAgICAgICAgKC1bV2Vi VmlldyBfZGlzcGF0Y2hEaWRSZWNlaXZlSWNvbkZyb21XZWJGcmFtZTpdKTogRGl0dG8uCisgICAg ICAgICogV2ViVmlldy9XZWJWaWV3SW50ZXJuYWwuaDogV3JhcHBlZCBtZXRob2RzIGluICNpZgor ICAgICAgICBFTkFCTEUoSUNPTkRBVEFCQVNFKS8jZW5kaWYgZ3VhcmQuCisgICAgICAgICgtW1dl YlZpZXcgX3JlZ2lzdGVyRm9ySWNvbk5vdGlmaWNhdGlvbjpdKToKKyAgICAgICAgKC1bV2ViVmll dyBfZGlzcGF0Y2hEaWRSZWNlaXZlSWNvbkZyb21XZWJGcmFtZTpdKToKKwogMjAwOS0wNy0wNiAg RGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEJ1ZyAyNzAwNjog QnVpbGQgZml4IHdoZW4gTUFDX0pBVkFfQlJJREdFIGlzIGRpc2FibGVkCmRpZmYgLS1naXQgYS9X ZWJLaXQvbWFjL01pc2MvV2ViSWNvbkRhdGFiYXNlLm1tIGIvV2ViS2l0L21hYy9NaXNjL1dlYklj b25EYXRhYmFzZS5tbQppbmRleCA3MzZkYWJhLi42MmM4ZTJmIDEwMDY0NAotLS0gYS9XZWJLaXQv bWFjL01pc2MvV2ViSWNvbkRhdGFiYXNlLm1tCisrKyBiL1dlYktpdC9tYWMvTWlzYy9XZWJJY29u RGF0YWJhc2UubW0KQEAgLTY1LDggKzY1LDEyIEBAIE5TU2l6ZSBXZWJJY29uTGFyZ2VTaXplID0g ezEyOCwgMTI4fTsKIAogc3RhdGljIFdlYkljb25EYXRhYmFzZUNsaWVudCogZGVmYXVsdENsaWVu dCgpCiB7CisjaWYgRU5BQkxFKElDT05EQVRBQkFTRSkKICAgICBzdGF0aWMgV2ViSWNvbkRhdGFi YXNlQ2xpZW50KiBkZWZhdWx0Q2xpZW50ID0gbmV3IFdlYkljb25EYXRhYmFzZUNsaWVudCgpOwog ICAgIHJldHVybiBkZWZhdWx0Q2xpZW50OworI2Vsc2UKKyAgICByZXR1cm4gMDsKKyNlbmRpZgog fQogCiBAaW50ZXJmYWNlIFdlYkljb25EYXRhYmFzZSAoV2ViUmVhbGx5SW50ZXJuYWwpCmRpZmYg LS1naXQgYS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1t IGIvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQppbmRl eCBhNmNkZWMzLi4wZTBhYmM1IDEwMDY0NAotLS0gYS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0 L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCisrKyBiL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQv V2ViRnJhbWVMb2FkZXJDbGllbnQubW0KQEAgLTUzOSw5ICs1MzksMTEgQEAgdm9pZCBXZWJGcmFt ZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hXaWxsQ2xvc2UoKQogCiB2b2lkIFdlYkZyYW1lTG9hZGVy Q2xpZW50OjpkaXNwYXRjaERpZFJlY2VpdmVJY29uKCkKIHsKKyNpZiBFTkFCTEUoSUNPTkRBVEFC QVNFKQogICAgIFdlYlZpZXcgKndlYlZpZXcgPSBnZXRXZWJWaWV3KG1fd2ViRnJhbWUuZ2V0KCkp OyAgIAogICAgIEFTU0VSVChtX3dlYkZyYW1lID09IFt3ZWJWaWV3IG1haW5GcmFtZV0pOwogICAg IFt3ZWJWaWV3IF9kaXNwYXRjaERpZFJlY2VpdmVJY29uRnJvbVdlYkZyYW1lOm1fd2ViRnJhbWUu Z2V0KCldOworI2VuZGlmCiB9CiAKIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNo RGlkU3RhcnRQcm92aXNpb25hbExvYWQoKQpAQCAtMTYzNSw3ICsxNjM3LDkgQEAgdm9pZCBXZWJG cmFtZUxvYWRlckNsaWVudDo6d2luZG93T2JqZWN0Q2xlYXJlZCgpCiAKIHZvaWQgV2ViRnJhbWVM b2FkZXJDbGllbnQ6OnJlZ2lzdGVyRm9ySWNvbk5vdGlmaWNhdGlvbihib29sIGxpc3RlbikKIHsK KyNpZiBFTkFCTEUoSUNPTkRBVEFCQVNFKQogICAgIFtbbV93ZWJGcmFtZS5nZXQoKSB3ZWJWaWV3 XSBfcmVnaXN0ZXJGb3JJY29uTm90aWZpY2F0aW9uOmxpc3Rlbl07CisjZW5kaWYKIH0KIAogdm9p ZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlkUGVyZm9ybUZpcnN0TmF2aWdhdGlvbigpIGNvbnN0 CmRpZmYgLS1naXQgYS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkljb25EYXRhYmFzZUNs aWVudC5tbSBiL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSWNvbkRhdGFiYXNlQ2xpZW50 Lm1tCmluZGV4IGRjOWFlNmQuLjFiMGM4MzQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9tYWMvV2ViQ29y ZVN1cHBvcnQvV2ViSWNvbkRhdGFiYXNlQ2xpZW50Lm1tCisrKyBiL1dlYktpdC9tYWMvV2ViQ29y ZVN1cHBvcnQvV2ViSWNvbkRhdGFiYXNlQ2xpZW50Lm1tCkBAIC0yOSw5ICsyOSw5IEBACiAjaW1w b3J0ICJXZWJJY29uRGF0YWJhc2VDbGllbnQuaCIKIAogI2ltcG9ydCAiV2ViSWNvbkRhdGFiYXNl SW50ZXJuYWwuaCIKLQogI2ltcG9ydCA8V2ViQ29yZS9QbGF0Zm9ybVN0cmluZy5oPgogCisjaWYg RU5BQkxFKElDT05EQVRBQkFTRSkKIAogYm9vbCBXZWJJY29uRGF0YWJhc2VDbGllbnQ6OnBlcmZv cm1JbXBvcnQoKQogewpAQCAtNTUsMyArNTUsNSBAQCB2b2lkIFdlYkljb25EYXRhYmFzZUNsaWVu dDo6ZGlzcGF0Y2hEaWRBZGRJY29uRm9yUGFnZVVSTChjb25zdCBXZWJDb3JlOjpTdHJpbmcmCiAg ICAgLy8gaW5zdGVhZCBvZiB1cyBkb2luZyBpdCBldmVyeSBpdGVyYXRpb24KICAgICBbW1dlYklj b25EYXRhYmFzZSBzaGFyZWRJY29uRGF0YWJhc2VdIF9zZW5kTm90aWZpY2F0aW9uRm9yVVJMOnBh Z2VVUkxdOwogfQorCisjZW5kaWYgLy8gRU5BQkxFKElDT05EQVRBQkFTRSkKZGlmZiAtLWdpdCBh L1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tIGIvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZp ZXcubW0KaW5kZXggMDJiNDljNS4uZTQzOTZkYSAxMDA2NDQKLS0tIGEvV2ViS2l0L21hYy9XZWJW aWV3L1dlYlZpZXcubW0KKysrIGIvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KQEAgLTI3 MDEsOSArMjcwMSwxMSBAQCBzdGF0aWMgYm9vbCBuZWVkc1dlYlZpZXdJbml0VGhyZWFkV29ya2Fy b3VuZCgpCiAgICAgX3ByaXZhdGUtPmZyYW1lTG9hZERlbGVnYXRlID0gZGVsZWdhdGU7CiAgICAg W3NlbGYgX2NhY2hlRnJhbWVMb2FkRGVsZWdhdGVJbXBsZW1lbnRhdGlvbnNdOwogCisjaWYgRU5B QkxFKElDT05EQVRBQkFTRSkKICAgICAvLyBJZiB0aGlzIGRlbGVnYXRlIHdhbnRzIGNhbGxiYWNr cyBmb3IgaWNvbnMsIGZpcmUgdXAgdGhlIGljb24gZGF0YWJhc2UuCiAgICAgaWYgKF9wcml2YXRl LT5mcmFtZUxvYWREZWxlZ2F0ZUltcGxlbWVudGF0aW9ucy5kaWRSZWNlaXZlSWNvbkZvckZyYW1l RnVuYykKICAgICAgICAgW1dlYkljb25EYXRhYmFzZSBzaGFyZWRJY29uRGF0YWJhc2VdOworI2Vu ZGlmCiB9CiAKIC0gZnJhbWVMb2FkRGVsZWdhdGUKQEAgLTUxMTAsNiArNTExMiw3IEBAIHN0YXRp YyBXZWJGcmFtZVZpZXcgKmNvbnRhaW5pbmdGcmFtZVZpZXcoTlNWaWV3ICp2aWV3KQogICAgIHJl dHVybiBfcHJpdmF0ZS0+YmVjb21pbmdGaXJzdFJlc3BvbmRlckZyb21PdXRzaWRlOwogfQogCisj aWYgRU5BQkxFKElDT05EQVRBQkFTRSkKIC0gKHZvaWQpX3JlY2VpdmVkSWNvbkNoYW5nZWROb3Rp ZmljYXRpb246KE5TTm90aWZpY2F0aW9uICopbm90aWZpY2F0aW9uCiB7CiAgICAgLy8gR2V0IHRo ZSBVUkwgZm9yIHRoaXMgbm90aWZpY2F0aW9uCkBAIC01MTUwLDYgKzUxNTMsNyBAQCBzdGF0aWMg V2ViRnJhbWVWaWV3ICpjb250YWluaW5nRnJhbWVWaWV3KE5TVmlldyAqdmlldykKIAogICAgIFtz ZWxmIF9kaWRDaGFuZ2VWYWx1ZUZvcktleTpfV2ViTWFpbkZyYW1lSWNvbktleV07CiB9CisjZW5k aWYgLy8gRU5BQkxFKElDT05EQVRBQkFTRSkKIAogLy8gR2V0IHRoZSBhcHByb3ByaWF0ZSB1c2Vy LWFnZW50IHN0cmluZyBmb3IgYSBwYXJ0aWN1bGFyIFVSTC4KIC0gKFdlYkNvcmU6OlN0cmluZylf dXNlckFnZW50Rm9yVVJMOihjb25zdCBXZWJDb3JlOjpLVVJMJil1cmwKZGlmZiAtLWdpdCBhL1dl YktpdC9tYWMvV2ViVmlldy9XZWJWaWV3SW50ZXJuYWwuaCBiL1dlYktpdC9tYWMvV2ViVmlldy9X ZWJWaWV3SW50ZXJuYWwuaAppbmRleCBiNDI2ZTJiLi43MTRkYTg3IDEwMDY0NAotLS0gYS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViVmlld0ludGVybmFsLmgKKysrIGIvV2ViS2l0L21hYy9XZWJWaWV3 L1dlYlZpZXdJbnRlcm5hbC5oCkBAIC03MCw4ICs3MCwxMCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKIC0gKEJPT0wpX2JlY29taW5nRmlyc3RSZXNwb25kZXJGcm9tT3V0c2lkZTsKIAorI2lmIEVO QUJMRShJQ09OREFUQUJBU0UpCiAtICh2b2lkKV9yZWdpc3RlckZvckljb25Ob3RpZmljYXRpb246 KEJPT0wpbGlzdGVuOwogLSAodm9pZClfZGlzcGF0Y2hEaWRSZWNlaXZlSWNvbkZyb21XZWJGcmFt ZTooV2ViRnJhbWUgKil3ZWJGcmFtZTsKKyNlbmRpZgogCiAtICh2b2lkKV9zZXRNb3VzZURvd25F dmVudDooTlNFdmVudCAqKWV2ZW50OwogLSAodm9pZClfY2FuY2VsVXBkYXRlTW91c2VvdmVyVGlt ZXI7