71372 2011-11-02 09:39:19 -0700 Web Inspector: clear fixme in generator script 2011-11-17 21:48:18 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P4 Enhancement --- 0 peter.rybin webkit-unassigned apavlov bweinstein joepeck keishi loislo peter.rybin pfeldman pmuellr rik timothy yurys oldest_to_newest 494668 0 peter.rybin 2011-11-02 09:39:19 -0700 Clean fixme in Source/WebCore/inspector/CodeGeneratorInspector.py 494671 1 113322 peter.rybin 2011-11-02 09:43:48 -0700 Created attachment 113322 Patch 494696 2 loislo 2011-11-02 10:17:04 -0700 looks good to me 495246 3 113322 yurys 2011-11-03 00:54:27 -0700 Comment on attachment 113322 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=113322&action=review > Source/WebCore/inspector/CodeGeneratorInspector.py:109 > + field_name_res = domain_name.lower() + "Agent" This will generate m_domstorageAgent instead of m_domStorageAgent as per coding style guidelines. 495325 4 peter.rybin 2011-11-03 03:44:42 -0700 Do you mean we have standards for generated code that high? (In reply to comment #3) > (From update of attachment 113322 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=113322&action=review > > > Source/WebCore/inspector/CodeGeneratorInspector.py:109 > > + field_name_res = domain_name.lower() + "Agent" > > This will generate m_domstorageAgent instead of m_domStorageAgent as per coding style guidelines. 496667 5 113322 pfeldman 2011-11-05 09:10:24 -0700 Comment on attachment 113322 Patch As per yury's comment. 504252 6 115448 peter.rybin 2011-11-16 14:24:45 -0800 Created attachment 115448 Patch 504551 7 115448 loislo 2011-11-16 21:57:28 -0800 Comment on attachment 115448 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115448&action=review could you please also fix the indentation for InspectorBackendDispatcher.cpp the strings: if (!protocolErrors->length()) m_anAgent->aCommand(blablabla) sendResponse(callId, result, blablabla static CallHandler handlers[] = { &InspectorBackendDispatcher::Page_enable, and extract String::format("Some arguments of method '%s' can't be processed", "blablabla") as an inline function. > Source/WebCore/inspector/CodeGeneratorInspector.py:106 > + def lower_camel_case_to_upper(str): > + if len(str) > 0 and str[0].islower(): > + str = str[0].upper() + str[1:] > + return str unused. remove it. > Source/WebCore/inspector/CodeGeneratorInspector.py:126 > + def camel_case_to_capitilized_with_underscores(str): capitalized. unused - remove it. 504786 8 peter.rybin 2011-11-17 06:04:56 -0800 Ilya, thank you for review. > could you please also fix the indentation for InspectorBackendDispatcher.cpp > the strings: Done > and extract String::format("Some arguments of method '%s' can't be processed", "blablabla") > as an inline function. I don't think this is really related. Let's handle it separately. By the way, I don't like its string formatting before the error actually happend anyway. On each message you allocate string buffer, build a string and never use it (until an actual error). > > Source/WebCore/inspector/CodeGeneratorInspector.py:106 > unused. remove it. Done > > Source/WebCore/inspector/CodeGeneratorInspector.py:126 > capitalized. unused - remove it. Done 504788 9 115574 peter.rybin 2011-11-17 06:06:59 -0800 Created attachment 115574 Patch 504805 10 115574 loislo 2011-11-17 06:28:04 -0800 Comment on attachment 115574 Patch lgtm 505484 11 115574 loislo 2011-11-17 21:48:10 -0800 Comment on attachment 115574 Patch Clearing flags on attachment: 115574 Committed r100723: <http://trac.webkit.org/changeset/100723> 505485 12 loislo 2011-11-17 21:48:18 -0800 All reviewed patches have been landed. Closing bug. 113322 2011-11-02 09:43:48 -0700 2011-11-16 14:24:35 -0800 Patch bug-71372-20111102204345.patch text/plain 5673 peter.rybin U3VidmVyc2lvbiBSZXZpc2lvbjogOTg3MjgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzNGM0ODQ0MDExNWZiNTFk MWNhZDM1YmQwODYyY2ExYTQxMzFlMTZhLi4yNzRkNjE3ODk4ZDNkZmZlM2RiNDE3MDFlZDZmNGQ2 YTQ0NjZlZjgwIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMTEtMDIgIFBldGVy IFJ5YmluICA8cGV0ZXIucnliaW5AZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IGNsZWFyIGZpeG1lIGluIGdlbmVyYXRvciBzY3JpcHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxMzcyCisKKyAgICAgICAgUmVtb3ZlIHVubmVjZXNz YXJ5IGZpZWxkIG5hbWUgbWFwIGFuZCB1cGRhdGUgbGljZW5zZSB5ZWFyIG51bWJlci4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9D b2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5OgorCiAyMDExLTEwLTI4ICBQYXZlbCBGZWxkbWFuICA8 cGZlbGRtYW5AZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXNldCBsaW5lIG51bWJlcnMgZm9yIHNj cmlwdHMgZ2VuZXJhdGVkIHdpdGggZG9jdW1lbnQud3JpdGUuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5weSBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5CmluZGV4IDQxZjNiODRmYjg0 YjEyNDg4NGY2MWU0YTdmZjQxNDcxMzk1YWU1ZTguLjJlZmVlMTQ2NjlhOGMyN2U1MGMxNDY4MGQ4 YjVlOTI1NjE5N2NmNTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2Rl R2VuZXJhdG9ySW5zcGVjdG9yLnB5CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2Rl R2VuZXJhdG9ySW5zcGVjdG9yLnB5CkBAIC0zNyw2ICszNywxNiBAQCB0cnk6CiBleGNlcHQgSW1w b3J0RXJyb3I6CiAgICAgaW1wb3J0IHNpbXBsZWpzb24gYXMganNvbgogCisKK0RPTUFJTl9ERUZJ TkVfTkFNRV9NQVAgPSB7CisgICAgIkRhdGFiYXNlIjogIkVOQUJMRV9TUUxfREFUQUJBU0UiLAor ICAgICJEZWJ1Z2dlciI6ICJFTkFCTEVfSkFWQVNDUklQVF9ERUJVR0dFUiIsCisgICAgIkRPTURl YnVnZ2VyIjogIkVOQUJMRV9KQVZBU0NSSVBUX0RFQlVHR0VSIiwKKyAgICAiUHJvZmlsZXIiOiAi RU5BQkxFX0pBVkFTQ1JJUFRfREVCVUdHRVIiLAorICAgICJXb3JrZXIiOiAiRU5BQkxFX1dPUktF UlMiLAorfQorCisKIGNtZGxpbmVfcGFyc2VyID0gb3B0cGFyc2UuT3B0aW9uUGFyc2VyKCkKIGNt ZGxpbmVfcGFyc2VyLmFkZF9vcHRpb24oIi0tZGVmaW5lcyIpCiBjbWRsaW5lX3BhcnNlci5hZGRf b3B0aW9uKCItLW91dHB1dF9oX2RpciIpCkBAIC05NiwxMCArMTA2LDcgQEAgY2xhc3MgRG9tYWlu TmFtZUZpeGVzOgogICAgICAgICBlbHNlOgogICAgICAgICAgICAgYWdlbnRfbmFtZV9yZXMgPSAi SW5zcGVjdG9yJXNBZ2VudCIgJSBkb21haW5fbmFtZQogCi0gICAgICAgIGlmIGRvbWFpbl9uYW1l IGluIGNscy5hZ2VudF9maWVsZF9uYW1lX21hcDoKLSAgICAgICAgICAgIGZpZWxkX25hbWVfcmVz ID0gY2xzLmFnZW50X2ZpZWxkX25hbWVfbWFwW2RvbWFpbl9uYW1lXQotICAgICAgICBlbHNlOgot ICAgICAgICAgICAgZmllbGRfbmFtZV9yZXMgPSBkb21haW5fbmFtZS5sb3dlcigpICsgIkFnZW50 IgorICAgICAgICBmaWVsZF9uYW1lX3JlcyA9IGRvbWFpbl9uYW1lLmxvd2VyKCkgKyAiQWdlbnQi CiAKICAgICAgICAgY2xhc3MgUmVzKG9iamVjdCk6CiAgICAgICAgICAgICBhZ2VudF90eXBlX25h bWUgPSBhZ2VudF9uYW1lX3JlcwpAQCAtMTA5LDExICsxMTYsMTEgQEAgY2xhc3MgRG9tYWluTmFt ZUZpeGVzOgogCiAgICAgICAgICAgICBAc3RhdGljbWV0aG9kCiAgICAgICAgICAgICBkZWYgaXNf ZGlzYWJsZWQoZGVmaW5lcyk6Ci0gICAgICAgICAgICAgICAgaWYgbm90IGRvbWFpbl9uYW1lIGlu IGNscy5kb21haW5fZGVmaW5lX25hbWVfbWFwOgorICAgICAgICAgICAgICAgIGlmIG5vdCBkb21h aW5fbmFtZSBpbiBET01BSU5fREVGSU5FX05BTUVfTUFQOgogICAgICAgICAgICAgICAgICAgICAj IEhhcyBub3QgY29ycmVzcG9uZGluZyBwcmVwcm9jZXNzb3Igc3ltYm9sLgogICAgICAgICAgICAg ICAgICAgICByZXR1cm4gRmFsc2UKIAotICAgICAgICAgICAgICAgIGRlZmluZV9uYW1lID0gY2xz LmRvbWFpbl9kZWZpbmVfbmFtZV9tYXBbZG9tYWluX25hbWVdCisgICAgICAgICAgICAgICAgZGVm aW5lX25hbWUgPSBET01BSU5fREVGSU5FX05BTUVfTUFQW2RvbWFpbl9uYW1lXQogCiAgICAgICAg ICAgICAgICAgaWYgbm90IGRlZmluZV9uYW1lIGluIGRlZmluZXM6CiAgICAgICAgICAgICAgICAg ICAgICMgRGlzYWJsZWQgd2hlbiBub3QgbWVudGlvbmVkCkBAIC0xMjgsMzEgKzEzNSw2IEBAIGNs YXNzIERvbWFpbk5hbWVGaXhlczoKICAgICBoaWRkZW5fZG9tYWlucyA9IHNldChbIkluc3BlY3Rv ciJdKQogICAgIGFnZW50X3R5cGVfbWFwID0geyJOZXR3b3JrIjogIkluc3BlY3RvclJlc291cmNl QWdlbnQifQogCi0gICAgIyBUT0RPOiBnZXQgcmlkIG9mIHRoaXMsIGdlbmVyYXRlIG5hbWVzIGlu c3RlYWQuCi0gICAgYWdlbnRfZmllbGRfbmFtZV9tYXAgPSB7Ci0gICAgICAgICJQYWdlIjogInBh Z2VBZ2VudCIsCi0gICAgICAgICJSdW50aW1lIjogInJ1bnRpbWVBZ2VudCIsCi0gICAgICAgICJD b25zb2xlIjogImNvbnNvbGVBZ2VudCIsCi0gICAgICAgICJOZXR3b3JrIjogICJyZXNvdXJjZUFn ZW50IiwKLSAgICAgICAgIkRhdGFiYXNlIjogICJkYXRhYmFzZUFnZW50IiwKLSAgICAgICAgIkRP TVN0b3JhZ2UiOiAgImRvbVN0b3JhZ2VBZ2VudCIsCi0gICAgICAgICJBcHBsaWNhdGlvbkNhY2hl IjogICJhcHBsaWNhdGlvbkNhY2hlQWdlbnQiLAotICAgICAgICAiRE9NIjogICJkb21BZ2VudCIs Ci0gICAgICAgICJDU1MiOiAgImNzc0FnZW50IiwKLSAgICAgICAgIkRlYnVnZ2VyIjogImRlYnVn Z2VyQWdlbnQiLAotICAgICAgICAiRE9NRGVidWdnZXIiOiAiZG9tRGVidWdnZXJBZ2VudCIsCi0g ICAgICAgICJQcm9maWxlciI6ICJwcm9maWxlckFnZW50IiwKLSAgICAgICAgIldvcmtlciI6ICJ3 b3JrZXJBZ2VudCIsCi0gICAgfQotCi0gICAgZG9tYWluX2RlZmluZV9uYW1lX21hcCA9IHsKLSAg ICAgICAgIkRhdGFiYXNlIjogIkVOQUJMRV9TUUxfREFUQUJBU0UiLAotICAgICAgICAiRGVidWdn ZXIiOiAiRU5BQkxFX0pBVkFTQ1JJUFRfREVCVUdHRVIiLAotICAgICAgICAiRE9NRGVidWdnZXIi OiAiRU5BQkxFX0pBVkFTQ1JJUFRfREVCVUdHRVIiLAotICAgICAgICAiUHJvZmlsZXIiOiAiRU5B QkxFX0pBVkFTQ1JJUFRfREVCVUdHRVIiLAotICAgICAgICAiV29ya2VyIjogIkVOQUJMRV9XT1JL RVJTIiwKLSAgICB9Ci0KIAogY2xhc3MgQ1BhcmFtVHlwZShvYmplY3QpOgogICAgIGRlZiBfX2lu aXRfXyhzZWxmLCB0eXBlLCBzZXR0ZXJfZm9ybWF0PSIlcyIpOgpAQCAtNDYxLDcgKzQ0Myw3IEBA ICRjb2RlICAgIGlmIChtX2luc3BlY3RvckZyb250ZW5kQ2hhbm5lbCkKIH0KICIiIikKIAotICAg IGZyb250ZW5kX2ggPSBzdHJpbmcuVGVtcGxhdGUoIiIiLy8gQ29weXJpZ2h0IChjKSAyMDEwIFRo ZSBDaHJvbWl1bSBBdXRob3JzLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICAgIGZyb250ZW5kX2gg PSBzdHJpbmcuVGVtcGxhdGUoIiIiLy8gQ29weXJpZ2h0IChjKSAyMDExIFRoZSBDaHJvbWl1bSBB dXRob3JzLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogLy8gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUg aXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZQogLy8gZm91bmQg aW4gdGhlIExJQ0VOU0UgZmlsZS4KICNpZm5kZWYgSW5zcGVjdG9yRnJvbnRlbmRfaApAQCAtNDky LDcgKzQ3NCw3IEBAICR7ZmllbGREZWNsYXJhdGlvbnN9fTsKICNlbmRpZiAvLyAhZGVmaW5lZChJ bnNwZWN0b3JGcm9udGVuZF9oKQogIiIiKQogCi0gICAgYmFja2VuZF9oID0gc3RyaW5nLlRlbXBs YXRlKCIiIi8vIENvcHlyaWdodCAoYykgMjAxMCBUaGUgQ2hyb21pdW0gQXV0aG9ycy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyAgICBiYWNrZW5kX2ggPSBzdHJpbmcuVGVtcGxhdGUoIiIiLy8gQ29w eXJpZ2h0IChjKSAyMDExIFRoZSBDaHJvbWl1bSBBdXRob3JzLiBBbGwgcmlnaHRzIHJlc2VydmVk LgogLy8gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg bGljZW5zZSB0aGF0IGNhbiBiZQogLy8gZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZS4KICNpZm5k ZWYgSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXJfaApAQCAtNTY0LDcgKzU0Niw3IEBAICRmaWVs ZERlY2xhcmF0aW9ucwogCiAiIiIpCiAKLSAgICBiYWNrZW5kX2NwcCA9IHN0cmluZy5UZW1wbGF0 ZSgiIiIvLyBDb3B5cmlnaHQgKGMpIDIwMTAgVGhlIENocm9taXVtIEF1dGhvcnMuIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCisgICAgYmFja2VuZF9jcHAgPSBzdHJpbmcuVGVtcGxhdGUoIiIiLy8gQ29w eXJpZ2h0IChjKSAyMDExIFRoZSBDaHJvbWl1bSBBdXRob3JzLiBBbGwgcmlnaHRzIHJlc2VydmVk LgogLy8gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUg bGljZW5zZSB0aGF0IGNhbiBiZQogLy8gZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZS4KIApAQCAt ODk1LDcgKzg3Nyw3IEBAIGJvb2wgSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXI6OmdldENvbW1h bmROYW1lKGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgU3RyaW5nKiByCiAjZW5kaWYgLy8gRU5BQkxF KElOU1BFQ1RPUikKICIiIikKIAotICAgIGZyb250ZW5kX2NwcCA9IHN0cmluZy5UZW1wbGF0ZSgi IiIvLyBDb3B5cmlnaHQgKGMpIDIwMTAgVGhlIENocm9taXVtIEF1dGhvcnMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCisgICAgZnJvbnRlbmRfY3BwID0gc3RyaW5nLlRlbXBsYXRlKCIiIi8vIENvcHly aWdodCAoYykgMjAxMSBUaGUgQ2hyb21pdW0gQXV0aG9ycy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K IC8vIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGEgQlNELXN0eWxlIGxp Y2Vuc2UgdGhhdCBjYW4gYmUKIC8vIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUuCiAKQEAgLTky Nyw3ICs5MDksNyBAQCAkbWV0aG9kcwogI2VuZGlmIC8vIEVOQUJMRShJTlNQRUNUT1IpCiAiIiIp CiAKLSAgICBiYWNrZW5kX2pzID0gc3RyaW5nLlRlbXBsYXRlKCIiIi8vIENvcHlyaWdodCAoYykg MjAxMCBUaGUgQ2hyb21pdW0gQXV0aG9ycy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAgICBiYWNr ZW5kX2pzID0gc3RyaW5nLlRlbXBsYXRlKCIiIi8vIENvcHlyaWdodCAoYykgMjAxMSBUaGUgQ2hy b21pdW0gQXV0aG9ycy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KIC8vIFVzZSBvZiB0aGlzIHNvdXJj ZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGEgQlNELXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmUKIC8v IGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUuCiAK 115448 2011-11-16 14:24:45 -0800 2011-11-17 06:06:48 -0800 Patch bug-71372-20111117022443.patch text/plain 8293 peter.rybin U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDczODIwYzE3ZmMwYjNm MDVmNDViMTZlYWVkNjNiZWEwNDRiZjZkNS4uNzM2MDA0MjI4ZDcxMjM1M2MzZGM2MmY3YWZiMGU4 YWJjZTQzMDA4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDExLTExLTE3ICBQZXRl ciBSeWJpbiAgPHBldGVyLnJ5YmluQGdtYWlsLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBjbGVhciBmaXhtZSBpbiBnZW5lcmF0b3Igc2NyaXB0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTM3MgorCisgICAgICAgIFJlbW92ZSB1bm5lY2Vz c2FyeSBmaWVsZCBuYW1lIG1hcCBhbmQgdXBkYXRlIGxpY2Vuc2UgeWVhciBudW1iZXIuCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3Iv Q29kZUdlbmVyYXRvckluc3BlY3Rvci5weToKKwogMjAxMS0xMS0xNiAgTmF0ZSBDaGFwaW4gIDxq YXBoZXRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEZpeCBpbmNvcnJlY3QgbXVsdGlwYXJ0IGhh bmRsaW5nIGluIHIxMDAzMTEuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv Q29kZUdlbmVyYXRvckluc3BlY3Rvci5weSBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2Rl R2VuZXJhdG9ySW5zcGVjdG9yLnB5CmluZGV4IGE0Yjg2NDE0NzQ1YzFhYzk4MTM0MDM5ZTA4MTBi ODM1ODFmNTdiZTYuLjIxMWY3ZTZhNDcyMGQ4ZGIwODFmNzc0Mjc1OThkNDA4MmI0ZWMxY2MgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9y LnB5CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9y LnB5CkBAIC0zNyw2ICszNywxNiBAQCB0cnk6CiBleGNlcHQgSW1wb3J0RXJyb3I6CiAgICAgaW1w b3J0IHNpbXBsZWpzb24gYXMganNvbgogCisKK0RPTUFJTl9ERUZJTkVfTkFNRV9NQVAgPSB7Cisg ICAgIkRhdGFiYXNlIjogIkVOQUJMRV9TUUxfREFUQUJBU0UiLAorICAgICJEZWJ1Z2dlciI6ICJF TkFCTEVfSkFWQVNDUklQVF9ERUJVR0dFUiIsCisgICAgIkRPTURlYnVnZ2VyIjogIkVOQUJMRV9K QVZBU0NSSVBUX0RFQlVHR0VSIiwKKyAgICAiUHJvZmlsZXIiOiAiRU5BQkxFX0pBVkFTQ1JJUFRf REVCVUdHRVIiLAorICAgICJXb3JrZXIiOiAiRU5BQkxFX1dPUktFUlMiLAorfQorCisKIGNtZGxp bmVfcGFyc2VyID0gb3B0cGFyc2UuT3B0aW9uUGFyc2VyKCkKIGNtZGxpbmVfcGFyc2VyLmFkZF9v cHRpb24oIi0tZGVmaW5lcyIpCiBjbWRsaW5lX3BhcnNlci5hZGRfb3B0aW9uKCItLW91dHB1dF9o X2RpciIpCkBAIC04OCw2ICs5OCw3NCBAQCBkZWYgcGFyc2VfZGVmaW5lcyhzdHIpOgogZGVmaW5l c19tYXAgPSBwYXJzZV9kZWZpbmVzKGFyZ19vcHRpb25zLmRlZmluZXMpCiAKIAorY2xhc3MgQ2Fw aXRhbGl6ZXI6CisgICAgQHN0YXRpY21ldGhvZAorICAgIGRlZiBsb3dlcl9jYW1lbF9jYXNlX3Rv X3VwcGVyKHN0cik6CisgICAgICAgIGlmIGxlbihzdHIpID4gMCBhbmQgc3RyWzBdLmlzbG93ZXIo KToKKyAgICAgICAgICAgIHN0ciA9IHN0clswXS51cHBlcigpICsgc3RyWzE6XQorICAgICAgICBy ZXR1cm4gc3RyCisKKyAgICBAc3RhdGljbWV0aG9kCisgICAgZGVmIHVwcGVyX2NhbWVsX2Nhc2Vf dG9fbG93ZXIoc3RyKToKKyAgICAgICAgcG9zID0gMAorICAgICAgICB3aGlsZSBwb3MgPCBsZW4o c3RyKSBhbmQgc3RyW3Bvc10uaXN1cHBlcigpOgorICAgICAgICAgICAgcG9zICs9IDEKKyAgICAg ICAgaWYgcG9zID09IDA6CisgICAgICAgICAgICByZXR1cm4gc3RyCisgICAgICAgIGlmIHBvcyA9 PSAxOgorICAgICAgICAgICAgcmV0dXJuIHN0clswXS5sb3dlcigpICsgc3RyWzE6XQorICAgICAg ICBpZiBwb3MgPCBsZW4oc3RyKToKKyAgICAgICAgICAgIHBvcyAtPSAxCisgICAgICAgIHBvc3Np YmxlX2FiYnJldmlhdGlvbiA9IHN0clswOnBvc10KKyAgICAgICAgaWYgcG9zc2libGVfYWJicmV2 aWF0aW9uIG5vdCBpbiBDYXBpdGFsaXplci5BQkJSRVZJQVRJT046CisgICAgICAgICAgICByYWlz ZSBFeGNlcHRpb24oIlVua25vd24gYWJicmV2aWF0aW9uICVzIiAlIHBvc3NpYmxlX2FiYnJldmlh dGlvbikKKyAgICAgICAgc3RyID0gcG9zc2libGVfYWJicmV2aWF0aW9uLmxvd2VyKCkgKyBzdHJb cG9zOl0KKyAgICAgICAgcmV0dXJuIHN0cgorCisgICAgQHN0YXRpY21ldGhvZAorICAgIGRlZiBj YW1lbF9jYXNlX3RvX2NhcGl0aWxpemVkX3dpdGhfdW5kZXJzY29yZXMoc3RyKToKKyAgICAgICAg aWYgbGVuKHN0cikgPT0gMDoKKyAgICAgICAgICAgIHJldHVybiBzdHIKKyAgICAgICAgb3V0cHV0 ID0gQ2FwaXRhbGl6ZXIuc3BsaXRfY2FtZWxfY2FzZV8oc3RyKQorICAgICAgICBwb3MgPSAwCisg ICAgICAgIHdoaWxlIHBvcyA8IGxlbihvdXRwdXQpOgorICAgICAgICAgICAgb3V0cHV0W3Bvc10g PSBvdXRwdXRbcG9zXS51cHBlcigpCisgICAgICAgICAgICBwb3MgKz0gMQorICAgICAgICByZXR1 cm4gIl8iLmpvaW4ob3V0cHV0KQorCisgICAgQHN0YXRpY21ldGhvZAorICAgIGRlZiBzcGxpdF9j YW1lbF9jYXNlXyhzdHIpOgorICAgICAgICBvdXRwdXQgPSBbXQorICAgICAgICBwb3NfYmVpbmcg PSAwCisgICAgICAgIHBvcyA9IDEKKyAgICAgICAgaGFzX29uZWxldHRlciA9IEZhbHNlCisgICAg ICAgIHdoaWxlIHBvcyA8IGxlbihzdHIpOgorICAgICAgICAgICAgaWYgc3RyW3Bvc10uaXN1cHBl cigpOgorICAgICAgICAgICAgICAgIG91dHB1dC5hcHBlbmQoc3RyW3Bvc19iZWluZzpwb3NdLnVw cGVyKCkpCisgICAgICAgICAgICAgICAgaWYgcG9zIC0gcG9zX2JlaW5nID09IDE6CisgICAgICAg ICAgICAgICAgICAgIGhhc19vbmVsZXR0ZXIgPSBUcnVlCisgICAgICAgICAgICAgICAgcG9zX2Jl aW5nID0gcG9zCisgICAgICAgICAgICBwb3MgKz0gMQorICAgICAgICBvdXRwdXQuYXBwZW5kKHN0 cltwb3NfYmVpbmc6XSkKKyAgICAgICAgaWYgaGFzX29uZWxldHRlcjoKKyAgICAgICAgICAgIGFy cmF5X3BvcyA9IDAKKyAgICAgICAgICAgIHdoaWxlIGFycmF5X3BvcyA8IGxlbihvdXRwdXQpIC0g MToKKyAgICAgICAgICAgICAgICBpZiBsZW4ob3V0cHV0W2FycmF5X3Bvc10pID09IDE6CisgICAg ICAgICAgICAgICAgICAgIGFycmF5X3Bvc19lbmQgPSBhcnJheV9wb3MgKyAxCisgICAgICAgICAg ICAgICAgICAgIHdoaWxlIGFycmF5X3Bvc19lbmQgPCBsZW4ob3V0cHV0KSBhbmQgbGVuKG91dHB1 dFthcnJheV9wb3NfZW5kXSkgPT0gMToKKyAgICAgICAgICAgICAgICAgICAgICAgIGFycmF5X3Bv c19lbmQgKz0gMQorICAgICAgICAgICAgICAgICAgICBpZiBhcnJheV9wb3NfZW5kIC0gYXJyYXlf cG9zID4gMToKKyAgICAgICAgICAgICAgICAgICAgICAgIHBvc3NpYmxlX2FiYnJldmlhdGlvbiA9 ICIiLmpvaW4ob3V0cHV0W2FycmF5X3BvczphcnJheV9wb3NfZW5kXSkKKyAgICAgICAgICAgICAg ICAgICAgICAgIGlmIHBvc3NpYmxlX2FiYnJldmlhdGlvbi51cHBlcigpIGluIENhcGl0YWxpemVy LkFCQlJFVklBVElPTjoKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBvdXRwdXRbYXJyYXlf cG9zOmFycmF5X3Bvc19lbmRdID0gW3Bvc3NpYmxlX2FiYnJldmlhdGlvbl0KKyAgICAgICAgICAg ICAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXJyYXlfcG9z ID0gYXJyYXlfcG9zX2VuZCAtIDEKKyAgICAgICAgICAgICAgICBhcnJheV9wb3MgKz0gMQorICAg ICAgICByZXR1cm4gb3V0cHV0CisKKyAgICBBQkJSRVZJQVRJT04gPSBmcm96ZW5zZXQoWyJYSFIi LCAiRE9NIiwgIkNTUyJdKQorCisKIGNsYXNzIERvbWFpbk5hbWVGaXhlczoKICAgICBAY2xhc3Nt ZXRob2QKICAgICBkZWYgZ2V0X2ZpeGVkX2RhdGEoY2xzLCBkb21haW5fbmFtZSk6CkBAIC05Niwx MCArMTc0LDcgQEAgY2xhc3MgRG9tYWluTmFtZUZpeGVzOgogICAgICAgICBlbHNlOgogICAgICAg ICAgICAgYWdlbnRfbmFtZV9yZXMgPSAiSW5zcGVjdG9yJXNBZ2VudCIgJSBkb21haW5fbmFtZQog Ci0gICAgICAgIGlmIGRvbWFpbl9uYW1lIGluIGNscy5hZ2VudF9maWVsZF9uYW1lX21hcDoKLSAg ICAgICAgICAgIGZpZWxkX25hbWVfcmVzID0gY2xzLmFnZW50X2ZpZWxkX25hbWVfbWFwW2RvbWFp bl9uYW1lXQotICAgICAgICBlbHNlOgotICAgICAgICAgICAgZmllbGRfbmFtZV9yZXMgPSBkb21h aW5fbmFtZS5sb3dlcigpICsgIkFnZW50IgorICAgICAgICBmaWVsZF9uYW1lX3JlcyA9IENhcGl0 YWxpemVyLnVwcGVyX2NhbWVsX2Nhc2VfdG9fbG93ZXIoZG9tYWluX25hbWUpICsgIkFnZW50Igog CiAgICAgICAgIGNsYXNzIFJlcyhvYmplY3QpOgogICAgICAgICAgICAgYWdlbnRfdHlwZV9uYW1l ID0gYWdlbnRfbmFtZV9yZXMKQEAgLTEwOSwxMSArMTg0LDExIEBAIGNsYXNzIERvbWFpbk5hbWVG aXhlczoKIAogICAgICAgICAgICAgQHN0YXRpY21ldGhvZAogICAgICAgICAgICAgZGVmIGlzX2Rp c2FibGVkKGRlZmluZXMpOgotICAgICAgICAgICAgICAgIGlmIG5vdCBkb21haW5fbmFtZSBpbiBj bHMuZG9tYWluX2RlZmluZV9uYW1lX21hcDoKKyAgICAgICAgICAgICAgICBpZiBub3QgZG9tYWlu X25hbWUgaW4gRE9NQUlOX0RFRklORV9OQU1FX01BUDoKICAgICAgICAgICAgICAgICAgICAgIyBI YXMgbm90IGNvcnJlc3BvbmRpbmcgcHJlcHJvY2Vzc29yIHN5bWJvbC4KICAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIEZhbHNlCiAKLSAgICAgICAgICAgICAgICBkZWZpbmVfbmFtZSA9IGNscy5k b21haW5fZGVmaW5lX25hbWVfbWFwW2RvbWFpbl9uYW1lXQorICAgICAgICAgICAgICAgIGRlZmlu ZV9uYW1lID0gRE9NQUlOX0RFRklORV9OQU1FX01BUFtkb21haW5fbmFtZV0KIAogICAgICAgICAg ICAgICAgIGlmIG5vdCBkZWZpbmVfbmFtZSBpbiBkZWZpbmVzOgogICAgICAgICAgICAgICAgICAg ICAjIERpc2FibGVkIHdoZW4gbm90IG1lbnRpb25lZApAQCAtMTI4LDMxICsyMDMsNiBAQCBjbGFz cyBEb21haW5OYW1lRml4ZXM6CiAgICAgaGlkZGVuX2RvbWFpbnMgPSBzZXQoWyJJbnNwZWN0b3Ii XSkKICAgICBhZ2VudF90eXBlX21hcCA9IHsiTmV0d29yayI6ICJJbnNwZWN0b3JSZXNvdXJjZUFn ZW50In0KIAotICAgICMgVE9ETzogZ2V0IHJpZCBvZiB0aGlzLCBnZW5lcmF0ZSBuYW1lcyBpbnN0 ZWFkLgotICAgIGFnZW50X2ZpZWxkX25hbWVfbWFwID0gewotICAgICAgICAiUGFnZSI6ICJwYWdl QWdlbnQiLAotICAgICAgICAiUnVudGltZSI6ICJydW50aW1lQWdlbnQiLAotICAgICAgICAiQ29u c29sZSI6ICJjb25zb2xlQWdlbnQiLAotICAgICAgICAiTmV0d29yayI6ICAicmVzb3VyY2VBZ2Vu dCIsCi0gICAgICAgICJEYXRhYmFzZSI6ICAiZGF0YWJhc2VBZ2VudCIsCi0gICAgICAgICJET01T dG9yYWdlIjogICJkb21TdG9yYWdlQWdlbnQiLAotICAgICAgICAiQXBwbGljYXRpb25DYWNoZSI6 ICAiYXBwbGljYXRpb25DYWNoZUFnZW50IiwKLSAgICAgICAgIkRPTSI6ICAiZG9tQWdlbnQiLAot ICAgICAgICAiQ1NTIjogICJjc3NBZ2VudCIsCi0gICAgICAgICJEZWJ1Z2dlciI6ICJkZWJ1Z2dl ckFnZW50IiwKLSAgICAgICAgIkRPTURlYnVnZ2VyIjogImRvbURlYnVnZ2VyQWdlbnQiLAotICAg ICAgICAiUHJvZmlsZXIiOiAicHJvZmlsZXJBZ2VudCIsCi0gICAgICAgICJXb3JrZXIiOiAid29y a2VyQWdlbnQiLAotICAgIH0KLQotICAgIGRvbWFpbl9kZWZpbmVfbmFtZV9tYXAgPSB7Ci0gICAg ICAgICJEYXRhYmFzZSI6ICJFTkFCTEVfU1FMX0RBVEFCQVNFIiwKLSAgICAgICAgIkRlYnVnZ2Vy IjogIkVOQUJMRV9KQVZBU0NSSVBUX0RFQlVHR0VSIiwKLSAgICAgICAgIkRPTURlYnVnZ2VyIjog IkVOQUJMRV9KQVZBU0NSSVBUX0RFQlVHR0VSIiwKLSAgICAgICAgIlByb2ZpbGVyIjogIkVOQUJM RV9KQVZBU0NSSVBUX0RFQlVHR0VSIiwKLSAgICAgICAgIldvcmtlciI6ICJFTkFCTEVfV09SS0VS UyIsCi0gICAgfQotCiAKIGNsYXNzIENQYXJhbVR5cGUob2JqZWN0KToKICAgICBkZWYgX19pbml0 X18oc2VsZiwgdHlwZSwgc2V0dGVyX2Zvcm1hdD0iJXMiKToKQEAgLTQ2MSw3ICs1MTEsNyBAQCAk Y29kZSAgICBpZiAobV9pbnNwZWN0b3JGcm9udGVuZENoYW5uZWwpCiB9CiAiIiIpCiAKLSAgICBm cm9udGVuZF9oID0gc3RyaW5nLlRlbXBsYXRlKCIiIi8vIENvcHlyaWdodCAoYykgMjAxMCBUaGUg Q2hyb21pdW0gQXV0aG9ycy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAgICBmcm9udGVuZF9oID0g c3RyaW5nLlRlbXBsYXRlKCIiIi8vIENvcHlyaWdodCAoYykgMjAxMSBUaGUgQ2hyb21pdW0gQXV0 aG9ycy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KIC8vIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlz IGdvdmVybmVkIGJ5IGEgQlNELXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmUKIC8vIGZvdW5kIGlu IHRoZSBMSUNFTlNFIGZpbGUuCiAjaWZuZGVmIEluc3BlY3RvckZyb250ZW5kX2gKQEAgLTQ5Miw3 ICs1NDIsNyBAQCAke2ZpZWxkRGVjbGFyYXRpb25zfX07CiAjZW5kaWYgLy8gIWRlZmluZWQoSW5z cGVjdG9yRnJvbnRlbmRfaCkKICIiIikKIAotICAgIGJhY2tlbmRfaCA9IHN0cmluZy5UZW1wbGF0 ZSgiIiIvLyBDb3B5cmlnaHQgKGMpIDIwMTAgVGhlIENocm9taXVtIEF1dGhvcnMuIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCisgICAgYmFja2VuZF9oID0gc3RyaW5nLlRlbXBsYXRlKCIiIi8vIENvcHly aWdodCAoYykgMjAxMSBUaGUgQ2hyb21pdW0gQXV0aG9ycy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K IC8vIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGEgQlNELXN0eWxlIGxp Y2Vuc2UgdGhhdCBjYW4gYmUKIC8vIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUuCiAjaWZuZGVm IEluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyX2gKQEAgLTU2NCw3ICs2MTQsNyBAQCAkZmllbGRE ZWNsYXJhdGlvbnMKIAogIiIiKQogCi0gICAgYmFja2VuZF9jcHAgPSBzdHJpbmcuVGVtcGxhdGUo IiIiLy8gQ29weXJpZ2h0IChjKSAyMDEwIFRoZSBDaHJvbWl1bSBBdXRob3JzLiBBbGwgcmlnaHRz IHJlc2VydmVkLgorICAgIGJhY2tlbmRfY3BwID0gc3RyaW5nLlRlbXBsYXRlKCIiIi8vIENvcHly aWdodCAoYykgMjAxMSBUaGUgQ2hyb21pdW0gQXV0aG9ycy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K IC8vIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGEgQlNELXN0eWxlIGxp Y2Vuc2UgdGhhdCBjYW4gYmUKIC8vIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUuCiAKQEAgLTg5 NSw3ICs5NDUsNyBAQCBib29sIEluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyOjpnZXRDb21tYW5k TmFtZShjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIFN0cmluZyogcgogI2VuZGlmIC8vIEVOQUJMRShJ TlNQRUNUT1IpCiAiIiIpCiAKLSAgICBmcm9udGVuZF9jcHAgPSBzdHJpbmcuVGVtcGxhdGUoIiIi Ly8gQ29weXJpZ2h0IChjKSAyMDEwIFRoZSBDaHJvbWl1bSBBdXRob3JzLiBBbGwgcmlnaHRzIHJl c2VydmVkLgorICAgIGZyb250ZW5kX2NwcCA9IHN0cmluZy5UZW1wbGF0ZSgiIiIvLyBDb3B5cmln aHQgKGMpIDIwMTEgVGhlIENocm9taXVtIEF1dGhvcnMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAv LyBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhIEJTRC1zdHlsZSBsaWNl bnNlIHRoYXQgY2FuIGJlCiAvLyBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgogCkBAIC05Mjcs NyArOTc3LDcgQEAgJG1ldGhvZHMKICNlbmRpZiAvLyBFTkFCTEUoSU5TUEVDVE9SKQogIiIiKQog Ci0gICAgYmFja2VuZF9qcyA9IHN0cmluZy5UZW1wbGF0ZSgiIiIvLyBDb3B5cmlnaHQgKGMpIDIw MTAgVGhlIENocm9taXVtIEF1dGhvcnMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgICAgYmFja2Vu ZF9qcyA9IHN0cmluZy5UZW1wbGF0ZSgiIiIvLyBDb3B5cmlnaHQgKGMpIDIwMTEgVGhlIENocm9t aXVtIEF1dGhvcnMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAvLyBVc2Ugb2YgdGhpcyBzb3VyY2Ug Y29kZSBpcyBnb3Zlcm5lZCBieSBhIEJTRC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlCiAvLyBm b3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlLgogCg== 115574 2011-11-17 06:06:59 -0800 2011-11-17 21:48:10 -0800 Patch bug-71372-20111117180657.patch text/plain 8004 peter.rybin U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDczODIwYzE3ZmMwYjNm MDVmNDViMTZlYWVkNjNiZWEwNDRiZjZkNS4uNzM2MDA0MjI4ZDcxMjM1M2MzZGM2MmY3YWZiMGU4 YWJjZTQzMDA4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDExLTExLTE3ICBQZXRl ciBSeWJpbiAgPHBldGVyLnJ5YmluQGdtYWlsLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBjbGVhciBmaXhtZSBpbiBnZW5lcmF0b3Igc2NyaXB0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTM3MgorCisgICAgICAgIFJlbW92ZSB1bm5lY2Vz c2FyeSBmaWVsZCBuYW1lIG1hcCBhbmQgdXBkYXRlIGxpY2Vuc2UgeWVhciBudW1iZXIuCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3Iv Q29kZUdlbmVyYXRvckluc3BlY3Rvci5weToKKwogMjAxMS0xMS0xNiAgTmF0ZSBDaGFwaW4gIDxq YXBoZXRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEZpeCBpbmNvcnJlY3QgbXVsdGlwYXJ0IGhh bmRsaW5nIGluIHIxMDAzMTEuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv Q29kZUdlbmVyYXRvckluc3BlY3Rvci5weSBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2Rl R2VuZXJhdG9ySW5zcGVjdG9yLnB5CmluZGV4IGE0Yjg2NDE0NzQ1YzFhYzk4MTM0MDM5ZTA4MTBi ODM1ODFmNTdiZTYuLmVlNjRhZjAxMmEzMzE0NDgyZTc0MDU5Yjc1ZmViODM2NDg2ZDJjODYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9y LnB5CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9y LnB5CkBAIC0zNyw2ICszNywxNiBAQCB0cnk6CiBleGNlcHQgSW1wb3J0RXJyb3I6CiAgICAgaW1w b3J0IHNpbXBsZWpzb24gYXMganNvbgogCisKK0RPTUFJTl9ERUZJTkVfTkFNRV9NQVAgPSB7Cisg ICAgIkRhdGFiYXNlIjogIkVOQUJMRV9TUUxfREFUQUJBU0UiLAorICAgICJEZWJ1Z2dlciI6ICJF TkFCTEVfSkFWQVNDUklQVF9ERUJVR0dFUiIsCisgICAgIkRPTURlYnVnZ2VyIjogIkVOQUJMRV9K QVZBU0NSSVBUX0RFQlVHR0VSIiwKKyAgICAiUHJvZmlsZXIiOiAiRU5BQkxFX0pBVkFTQ1JJUFRf REVCVUdHRVIiLAorICAgICJXb3JrZXIiOiAiRU5BQkxFX1dPUktFUlMiLAorfQorCisKIGNtZGxp bmVfcGFyc2VyID0gb3B0cGFyc2UuT3B0aW9uUGFyc2VyKCkKIGNtZGxpbmVfcGFyc2VyLmFkZF9v cHRpb24oIi0tZGVmaW5lcyIpCiBjbWRsaW5lX3BhcnNlci5hZGRfb3B0aW9uKCItLW91dHB1dF9o X2RpciIpCkBAIC04OCw2ICs5OCwyNyBAQCBkZWYgcGFyc2VfZGVmaW5lcyhzdHIpOgogZGVmaW5l c19tYXAgPSBwYXJzZV9kZWZpbmVzKGFyZ19vcHRpb25zLmRlZmluZXMpCiAKIAorY2xhc3MgQ2Fw aXRhbGl6ZXI6CisgICAgQHN0YXRpY21ldGhvZAorICAgIGRlZiB1cHBlcl9jYW1lbF9jYXNlX3Rv X2xvd2VyKHN0cik6CisgICAgICAgIHBvcyA9IDAKKyAgICAgICAgd2hpbGUgcG9zIDwgbGVuKHN0 cikgYW5kIHN0cltwb3NdLmlzdXBwZXIoKToKKyAgICAgICAgICAgIHBvcyArPSAxCisgICAgICAg IGlmIHBvcyA9PSAwOgorICAgICAgICAgICAgcmV0dXJuIHN0cgorICAgICAgICBpZiBwb3MgPT0g MToKKyAgICAgICAgICAgIHJldHVybiBzdHJbMF0ubG93ZXIoKSArIHN0clsxOl0KKyAgICAgICAg aWYgcG9zIDwgbGVuKHN0cik6CisgICAgICAgICAgICBwb3MgLT0gMQorICAgICAgICBwb3NzaWJs ZV9hYmJyZXZpYXRpb24gPSBzdHJbMDpwb3NdCisgICAgICAgIGlmIHBvc3NpYmxlX2FiYnJldmlh dGlvbiBub3QgaW4gQ2FwaXRhbGl6ZXIuQUJCUkVWSUFUSU9OOgorICAgICAgICAgICAgcmFpc2Ug RXhjZXB0aW9uKCJVbmtub3duIGFiYnJldmlhdGlvbiAlcyIgJSBwb3NzaWJsZV9hYmJyZXZpYXRp b24pCisgICAgICAgIHN0ciA9IHBvc3NpYmxlX2FiYnJldmlhdGlvbi5sb3dlcigpICsgc3RyW3Bv czpdCisgICAgICAgIHJldHVybiBzdHIKKworICAgIEFCQlJFVklBVElPTiA9IGZyb3plbnNldChb IlhIUiIsICJET00iLCAiQ1NTIl0pCisKKwogY2xhc3MgRG9tYWluTmFtZUZpeGVzOgogICAgIEBj bGFzc21ldGhvZAogICAgIGRlZiBnZXRfZml4ZWRfZGF0YShjbHMsIGRvbWFpbl9uYW1lKToKQEAg LTk2LDEwICsxMjcsNyBAQCBjbGFzcyBEb21haW5OYW1lRml4ZXM6CiAgICAgICAgIGVsc2U6CiAg ICAgICAgICAgICBhZ2VudF9uYW1lX3JlcyA9ICJJbnNwZWN0b3Ilc0FnZW50IiAlIGRvbWFpbl9u YW1lCiAKLSAgICAgICAgaWYgZG9tYWluX25hbWUgaW4gY2xzLmFnZW50X2ZpZWxkX25hbWVfbWFw OgotICAgICAgICAgICAgZmllbGRfbmFtZV9yZXMgPSBjbHMuYWdlbnRfZmllbGRfbmFtZV9tYXBb ZG9tYWluX25hbWVdCi0gICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBmaWVsZF9uYW1lX3JlcyA9 IGRvbWFpbl9uYW1lLmxvd2VyKCkgKyAiQWdlbnQiCisgICAgICAgIGZpZWxkX25hbWVfcmVzID0g Q2FwaXRhbGl6ZXIudXBwZXJfY2FtZWxfY2FzZV90b19sb3dlcihkb21haW5fbmFtZSkgKyAiQWdl bnQiCiAKICAgICAgICAgY2xhc3MgUmVzKG9iamVjdCk6CiAgICAgICAgICAgICBhZ2VudF90eXBl X25hbWUgPSBhZ2VudF9uYW1lX3JlcwpAQCAtMTA5LDExICsxMzcsMTEgQEAgY2xhc3MgRG9tYWlu TmFtZUZpeGVzOgogCiAgICAgICAgICAgICBAc3RhdGljbWV0aG9kCiAgICAgICAgICAgICBkZWYg aXNfZGlzYWJsZWQoZGVmaW5lcyk6Ci0gICAgICAgICAgICAgICAgaWYgbm90IGRvbWFpbl9uYW1l IGluIGNscy5kb21haW5fZGVmaW5lX25hbWVfbWFwOgorICAgICAgICAgICAgICAgIGlmIG5vdCBk b21haW5fbmFtZSBpbiBET01BSU5fREVGSU5FX05BTUVfTUFQOgogICAgICAgICAgICAgICAgICAg ICAjIEhhcyBub3QgY29ycmVzcG9uZGluZyBwcmVwcm9jZXNzb3Igc3ltYm9sLgogICAgICAgICAg ICAgICAgICAgICByZXR1cm4gRmFsc2UKIAotICAgICAgICAgICAgICAgIGRlZmluZV9uYW1lID0g Y2xzLmRvbWFpbl9kZWZpbmVfbmFtZV9tYXBbZG9tYWluX25hbWVdCisgICAgICAgICAgICAgICAg ZGVmaW5lX25hbWUgPSBET01BSU5fREVGSU5FX05BTUVfTUFQW2RvbWFpbl9uYW1lXQogCiAgICAg ICAgICAgICAgICAgaWYgbm90IGRlZmluZV9uYW1lIGluIGRlZmluZXM6CiAgICAgICAgICAgICAg ICAgICAgICMgRGlzYWJsZWQgd2hlbiBub3QgbWVudGlvbmVkCkBAIC0xMjgsMzEgKzE1Niw2IEBA IGNsYXNzIERvbWFpbk5hbWVGaXhlczoKICAgICBoaWRkZW5fZG9tYWlucyA9IHNldChbIkluc3Bl Y3RvciJdKQogICAgIGFnZW50X3R5cGVfbWFwID0geyJOZXR3b3JrIjogIkluc3BlY3RvclJlc291 cmNlQWdlbnQifQogCi0gICAgIyBUT0RPOiBnZXQgcmlkIG9mIHRoaXMsIGdlbmVyYXRlIG5hbWVz IGluc3RlYWQuCi0gICAgYWdlbnRfZmllbGRfbmFtZV9tYXAgPSB7Ci0gICAgICAgICJQYWdlIjog InBhZ2VBZ2VudCIsCi0gICAgICAgICJSdW50aW1lIjogInJ1bnRpbWVBZ2VudCIsCi0gICAgICAg ICJDb25zb2xlIjogImNvbnNvbGVBZ2VudCIsCi0gICAgICAgICJOZXR3b3JrIjogICJyZXNvdXJj ZUFnZW50IiwKLSAgICAgICAgIkRhdGFiYXNlIjogICJkYXRhYmFzZUFnZW50IiwKLSAgICAgICAg IkRPTVN0b3JhZ2UiOiAgImRvbVN0b3JhZ2VBZ2VudCIsCi0gICAgICAgICJBcHBsaWNhdGlvbkNh Y2hlIjogICJhcHBsaWNhdGlvbkNhY2hlQWdlbnQiLAotICAgICAgICAiRE9NIjogICJkb21BZ2Vu dCIsCi0gICAgICAgICJDU1MiOiAgImNzc0FnZW50IiwKLSAgICAgICAgIkRlYnVnZ2VyIjogImRl YnVnZ2VyQWdlbnQiLAotICAgICAgICAiRE9NRGVidWdnZXIiOiAiZG9tRGVidWdnZXJBZ2VudCIs Ci0gICAgICAgICJQcm9maWxlciI6ICJwcm9maWxlckFnZW50IiwKLSAgICAgICAgIldvcmtlciI6 ICJ3b3JrZXJBZ2VudCIsCi0gICAgfQotCi0gICAgZG9tYWluX2RlZmluZV9uYW1lX21hcCA9IHsK LSAgICAgICAgIkRhdGFiYXNlIjogIkVOQUJMRV9TUUxfREFUQUJBU0UiLAotICAgICAgICAiRGVi dWdnZXIiOiAiRU5BQkxFX0pBVkFTQ1JJUFRfREVCVUdHRVIiLAotICAgICAgICAiRE9NRGVidWdn ZXIiOiAiRU5BQkxFX0pBVkFTQ1JJUFRfREVCVUdHRVIiLAotICAgICAgICAiUHJvZmlsZXIiOiAi RU5BQkxFX0pBVkFTQ1JJUFRfREVCVUdHRVIiLAotICAgICAgICAiV29ya2VyIjogIkVOQUJMRV9X T1JLRVJTIiwKLSAgICB9Ci0KIAogY2xhc3MgQ1BhcmFtVHlwZShvYmplY3QpOgogICAgIGRlZiBf X2luaXRfXyhzZWxmLCB0eXBlLCBzZXR0ZXJfZm9ybWF0PSIlcyIpOgpAQCAtNDQ0LDExICs0NDcs MTEgQEAgJHtmcm9udGVuZERvbWFpbk1ldGhvZERlY2xhcmF0aW9uc30gICAgICAgIHZvaWQgc2V0 SW5zcGVjdG9yRnJvbnRlbmRDaGFubmVsKEluc3AKICRtZXRob2RPdXRDb2RlCiAgICAgRXJyb3JT dHJpbmcgZXJyb3I7CiAkbWV0aG9kSW5Db2RlCi1pZiAoIXByb3RvY29sRXJyb3JzLT5sZW5ndGgo KSkKLSAgICAkYWdlbnRGaWVsZC0+JG1ldGhvZE5hbWUoJmVycm9yJGFnZW50Q2FsbFBhcmFtcyk7 CisgICAgaWYgKCFwcm90b2NvbEVycm9ycy0+bGVuZ3RoKCkpCisgICAgICAgICRhZ2VudEZpZWxk LT4kbWV0aG9kTmFtZSgmZXJyb3IkYWdlbnRDYWxsUGFyYW1zKTsKIAogICAgIFJlZlB0cjxJbnNw ZWN0b3JPYmplY3Q+IHJlc3VsdCA9IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRlKCk7Ci0ke3Jlc3Bv bnNlQ29va31zZW5kUmVzcG9uc2UoY2FsbElkLCByZXN1bHQsIFN0cmluZzo6Zm9ybWF0KCJTb21l IGFyZ3VtZW50cyBvZiBtZXRob2QgJyVzJyBjYW4ndCBiZSBwcm9jZXNzZWQiLCAiJGRvbWFpbk5h bWUuJG1ldGhvZE5hbWUiKSwgcHJvdG9jb2xFcnJvcnMsIGVycm9yKTsKKyR7cmVzcG9uc2VDb29r fSAgICBzZW5kUmVzcG9uc2UoY2FsbElkLCByZXN1bHQsIFN0cmluZzo6Zm9ybWF0KCJTb21lIGFy Z3VtZW50cyBvZiBtZXRob2QgJyVzJyBjYW4ndCBiZSBwcm9jZXNzZWQiLCAiJGRvbWFpbk5hbWUu JG1ldGhvZE5hbWUiKSwgcHJvdG9jb2xFcnJvcnMsIGVycm9yKTsKIH0KICIiIikKIApAQCAtNDYx LDcgKzQ2NCw3IEBAICRjb2RlICAgIGlmIChtX2luc3BlY3RvckZyb250ZW5kQ2hhbm5lbCkKIH0K ICIiIikKIAotICAgIGZyb250ZW5kX2ggPSBzdHJpbmcuVGVtcGxhdGUoIiIiLy8gQ29weXJpZ2h0 IChjKSAyMDEwIFRoZSBDaHJvbWl1bSBBdXRob3JzLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICAg IGZyb250ZW5kX2ggPSBzdHJpbmcuVGVtcGxhdGUoIiIiLy8gQ29weXJpZ2h0IChjKSAyMDExIFRo ZSBDaHJvbWl1bSBBdXRob3JzLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogLy8gVXNlIG9mIHRoaXMg c291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYSBCU0Qtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBi ZQogLy8gZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZS4KICNpZm5kZWYgSW5zcGVjdG9yRnJvbnRl bmRfaApAQCAtNDkyLDcgKzQ5NSw3IEBAICR7ZmllbGREZWNsYXJhdGlvbnN9fTsKICNlbmRpZiAv LyAhZGVmaW5lZChJbnNwZWN0b3JGcm9udGVuZF9oKQogIiIiKQogCi0gICAgYmFja2VuZF9oID0g c3RyaW5nLlRlbXBsYXRlKCIiIi8vIENvcHlyaWdodCAoYykgMjAxMCBUaGUgQ2hyb21pdW0gQXV0 aG9ycy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAgICBiYWNrZW5kX2ggPSBzdHJpbmcuVGVtcGxh dGUoIiIiLy8gQ29weXJpZ2h0IChjKSAyMDExIFRoZSBDaHJvbWl1bSBBdXRob3JzLiBBbGwgcmln aHRzIHJlc2VydmVkLgogLy8gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkg YSBCU0Qtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZQogLy8gZm91bmQgaW4gdGhlIExJQ0VOU0Ug ZmlsZS4KICNpZm5kZWYgSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXJfaApAQCAtNTY0LDcgKzU2 Nyw3IEBAICRmaWVsZERlY2xhcmF0aW9ucwogCiAiIiIpCiAKLSAgICBiYWNrZW5kX2NwcCA9IHN0 cmluZy5UZW1wbGF0ZSgiIiIvLyBDb3B5cmlnaHQgKGMpIDIwMTAgVGhlIENocm9taXVtIEF1dGhv cnMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgICAgYmFja2VuZF9jcHAgPSBzdHJpbmcuVGVtcGxh dGUoIiIiLy8gQ29weXJpZ2h0IChjKSAyMDExIFRoZSBDaHJvbWl1bSBBdXRob3JzLiBBbGwgcmln aHRzIHJlc2VydmVkLgogLy8gVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkg YSBCU0Qtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZQogLy8gZm91bmQgaW4gdGhlIExJQ0VOU0Ug ZmlsZS4KIApAQCAtODk1LDcgKzg5OCw3IEBAIGJvb2wgSW5zcGVjdG9yQmFja2VuZERpc3BhdGNo ZXI6OmdldENvbW1hbmROYW1lKGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgU3RyaW5nKiByCiAjZW5k aWYgLy8gRU5BQkxFKElOU1BFQ1RPUikKICIiIikKIAotICAgIGZyb250ZW5kX2NwcCA9IHN0cmlu Zy5UZW1wbGF0ZSgiIiIvLyBDb3B5cmlnaHQgKGMpIDIwMTAgVGhlIENocm9taXVtIEF1dGhvcnMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgICAgZnJvbnRlbmRfY3BwID0gc3RyaW5nLlRlbXBsYXRl KCIiIi8vIENvcHlyaWdodCAoYykgMjAxMSBUaGUgQ2hyb21pdW0gQXV0aG9ycy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KIC8vIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGEg QlNELXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmUKIC8vIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZp bGUuCiAKQEAgLTkyNyw3ICs5MzAsNyBAQCAkbWV0aG9kcwogI2VuZGlmIC8vIEVOQUJMRShJTlNQ RUNUT1IpCiAiIiIpCiAKLSAgICBiYWNrZW5kX2pzID0gc3RyaW5nLlRlbXBsYXRlKCIiIi8vIENv cHlyaWdodCAoYykgMjAxMCBUaGUgQ2hyb21pdW0gQXV0aG9ycy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4KKyAgICBiYWNrZW5kX2pzID0gc3RyaW5nLlRlbXBsYXRlKCIiIi8vIENvcHlyaWdodCAoYykg MjAxMSBUaGUgQ2hyb21pdW0gQXV0aG9ycy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KIC8vIFVzZSBv ZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGEgQlNELXN0eWxlIGxpY2Vuc2UgdGhh dCBjYW4gYmUKIC8vIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUuCiAKQEAgLTEzMDQsNyArMTMw Nyw3IEBAIGNsYXNzIEdlbmVyYXRvcjoKICAgICBkZWYgcHJvY2Vzc19jb21tYW5kKGpzb25fY29t bWFuZCwgZG9tYWluX25hbWUsIGFnZW50X2ZpZWxkX25hbWUpOgogICAgICAgICBqc29uX2NvbW1h bmRfbmFtZSA9IGpzb25fY29tbWFuZFsibmFtZSJdCiAgICAgICAgIEdlbmVyYXRvci5tZXRob2Rf bmFtZV9lbnVtX2xpc3QuYXBwZW5kKCIgICAgICAgIGslc18lc0NtZCwiICUgKGRvbWFpbl9uYW1l LCBqc29uX2NvbW1hbmRbIm5hbWUiXSkpCi0gICAgICAgIEdlbmVyYXRvci5tZXRob2RfaGFuZGxl cl9saXN0LmFwcGVuZCgiICAgICAgICAmSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXI6OiVzXyVz LCIgJSAoZG9tYWluX25hbWUsIGpzb25fY29tbWFuZF9uYW1lKSkKKyAgICAgICAgR2VuZXJhdG9y Lm1ldGhvZF9oYW5kbGVyX2xpc3QuYXBwZW5kKCIgICAgICAgICAgICAmSW5zcGVjdG9yQmFja2Vu ZERpc3BhdGNoZXI6OiVzXyVzLCIgJSAoZG9tYWluX25hbWUsIGpzb25fY29tbWFuZF9uYW1lKSkK ICAgICAgICAgR2VuZXJhdG9yLmJhY2tlbmRfbWV0aG9kX2RlY2xhcmF0aW9uX2xpc3QuYXBwZW5k KCIgICAgdm9pZCAlc18lcyhsb25nIGNhbGxJZCwgSW5zcGVjdG9yT2JqZWN0KiByZXF1ZXN0TWVz c2FnZU9iamVjdCk7IiAlIChkb21haW5fbmFtZSwganNvbl9jb21tYW5kX25hbWUpKQogCiAgICAg ICAgIG1ldGhvZF9pbl9jb2RlID0gIiIK