153962 2016-02-07 09:36:58 -0800 Web Inspector: UIString should take an optional key and description to aid localization 2018-12-20 10:29:56 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg hi bburg commit-queue graouts hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1162740 0 bburg 2016-02-07 09:36:58 -0800 Will probably need to update the JS string extraction script. 1162741 1 webkit-bug-importer 2016-02-07 09:37:10 -0800 <rdar://problem/24542505> 1489622 2 357764 hi 2018-12-19 17:16:12 -0800 Created attachment 357764 Patch 1489712 3 357764 bburg 2018-12-19 21:04:03 -0800 Comment on attachment 357764 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=357764&action=review It would be nice if you could add a single usage of each form that we expect to work into the codebase, so that the script can be shown to work correctly. > Tools/Scripts/extract-localizable-js-strings:-78 > - print "$file:$.:WARNING: $&\n" while s/WI\.UIString\(.*?\)//; Why did this warning get removed? It seems useful in the case where the arguments to UIString could not be parsed. > Tools/Scripts/extract-localizable-js-strings:154 > + $localizedStrings .= " // $commentByKey{$key}" if length $commentByKey{$key}; To make this consistent with Cocoa lproj files, please make the following changes: - the comment should precede the localized string - use /* multiline comment style */ 1489740 4 357786 hi 2018-12-19 22:27:09 -0800 Created attachment 357786 Patch 1489780 5 357786 bburg 2018-12-19 23:57:09 -0800 Comment on attachment 357786 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=357786&action=review r=me > Source/WebInspectorUI/UserInterface/Views/AuditTestGroupContentView.js:68 > + const format = WI.UIString("%s%%", "audit-percentage-pass", "The number of tests that passed expressed as a percentage, followed by a literal %."); Let's follow existing practice in Safari and use human-readable keys. In this case, something like "Percentage (of audits)". Ideally we wouldn't have a percent UIString floating by itself since it may interact with surrounding text, but I don't think it's a real problem in this specific instance. 1489891 6 357825 hi 2018-12-20 09:50:48 -0800 Created attachment 357825 Patch 1489924 7 357825 commit-queue 2018-12-20 10:29:54 -0800 Comment on attachment 357825 Patch Clearing flags on attachment: 357825 Committed r239452: <https://trac.webkit.org/changeset/239452> 1489925 8 commit-queue 2018-12-20 10:29:56 -0800 All reviewed patches have been landed. Closing bug. 357764 2018-12-19 17:16:12 -0800 2018-12-19 22:27:07 -0800 Patch bug-153962-20181219181611.patch text/plain 5154 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDJkZmQ3ZjU4NDE0MGMyMTBhY2Q1NzAwM2EzZGY4 YzVjMjI0ZDNmNDAuLjMzNWE5MzI4ODEzZGMyM2ZjYzJlODYxNjQ4NGNjNDQ0NWExOTA2ODkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE4LTEyLTE5ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcgc2hvdWxkIHRha2UgYW4gb3B0aW9uYWwga2V5IGFuZCBkZXNj cmlwdGlvbiB0byBhaWQgbG9jYWxpemF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNTM5NjIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI0NTQy NTA1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VXNlckludGVyZmFjZS9CYXNlL0xvYWRMb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAoV0ku VUlTdHJpbmcpOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9UZXN0L1Rlc3QuanM6CisgICAg ICAgIChXSS5VSVN0cmluZyk6CisKIDIwMTgtMTItMTkgIE5pa2l0YSBWYXNpbHlldiAgPG52YXNp bHlldkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQ29tcHV0ZWQ6IG1ha2Ug VUkgbW9yZSB1c2FibGUgd2hlbiB0aGUgcGFuZWwgaXMgbmFycm93CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL0xvYWRMb2NhbGl6ZWRTdHJpbmdz LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9Mb2FkTG9jYWxp emVkU3RyaW5ncy5qcwppbmRleCBmMGZkOGNkNmVhMGFjZjZlYzUxNmE3YTZkNzY1ZDMxZjc1YjQx MWIyLi5jMGY1YTM3NWUzM2RkMDc2YWM3MGFhODkwMTQ5N2RkZGVlZjQ1NzdmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL0xvYWRMb2NhbGl6ZWRT dHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2Uv TG9hZExvY2FsaXplZFN0cmluZ3MuanMKQEAgLTQxLDIzICs0MSwyNSBAQCBXSS51bmxvY2FsaXpl ZFN0cmluZyA9IGZ1bmN0aW9uKHN0cmluZykKICAgICByZXR1cm4gc3RyaW5nOwogfTsKIAotV0ku VUlTdHJpbmcgPSBmdW5jdGlvbihzdHJpbmcpCitXSS5VSVN0cmluZyA9IGZ1bmN0aW9uKHN0cmlu Zywga2V5LCBjb21tZW50KQogewogICAgIGlmIChXSS5kb250TG9jYWxpemVVc2VySW50ZXJmYWNl KQogICAgICAgICByZXR1cm4gc3RyaW5nOwogCi0gICAgaWYgKHdpbmRvdy5sb2NhbGl6ZWRTdHJp bmdzICYmIHN0cmluZyBpbiB3aW5kb3cubG9jYWxpemVkU3RyaW5ncykKLSAgICAgICAgcmV0dXJu IHdpbmRvdy5sb2NhbGl6ZWRTdHJpbmdzW3N0cmluZ107CisgICAga2V5ID0ga2V5IHx8IHN0cmlu ZzsKKworICAgIGlmICh3aW5kb3cubG9jYWxpemVkU3RyaW5ncyAmJiBrZXkgaW4gd2luZG93Lmxv Y2FsaXplZFN0cmluZ3MpCisgICAgICAgIHJldHVybiB3aW5kb3cubG9jYWxpemVkU3RyaW5nc1tr ZXldOwogCiAgICAgaWYgKCF3aW5kb3cubG9jYWxpemVkU3RyaW5ncykKLSAgICAgICAgY29uc29s ZS5lcnJvcihgQXR0ZW1wdGVkIHRvIGxvYWQgbG9jYWxpemVkIHN0cmluZyAiJHtzdHJpbmd9IiBi ZWZvcmUgbG9jYWxpemVkU3RyaW5ncyB3YXMgaW5pdGlhbGl6ZWQuYCk7CisgICAgICAgIGNvbnNv bGUuZXJyb3IoYEF0dGVtcHRlZCB0byBsb2FkIGxvY2FsaXplZCBzdHJpbmcgIiR7a2V5fSIgYmVm b3JlIGxvY2FsaXplZFN0cmluZ3Mgd2FzIGluaXRpYWxpemVkLmAsIGNvbW1lbnQpOwogCiAgICAg aWYgKCF0aGlzLl9taXNzaW5nTG9jYWxpemVkU3RyaW5ncykKICAgICAgICAgdGhpcy5fbWlzc2lu Z0xvY2FsaXplZFN0cmluZ3MgPSB7fTsKIAotICAgIGlmICghKHN0cmluZyBpbiB0aGlzLl9taXNz aW5nTG9jYWxpemVkU3RyaW5ncykpIHsKLSAgICAgICAgY29uc29sZS5lcnJvcigiTG9jYWxpemVk IHN0cmluZyBcIiIgKyBzdHJpbmcgKyAiXCIgd2FzIG5vdCBmb3VuZC4iKTsKLSAgICAgICAgdGhp cy5fbWlzc2luZ0xvY2FsaXplZFN0cmluZ3Nbc3RyaW5nXSA9IHRydWU7CisgICAgaWYgKCEoa2V5 IGluIHRoaXMuX21pc3NpbmdMb2NhbGl6ZWRTdHJpbmdzKSkgeworICAgICAgICBjb25zb2xlLmVy cm9yKGBMb2NhbGl6ZWQgc3RyaW5nICIke2tleX0iIHdhcyBub3QgZm91bmQuYCwgY29tbWVudCk7 CisgICAgICAgIHRoaXMuX21pc3NpbmdMb2NhbGl6ZWRTdHJpbmdzW2tleV0gPSB0cnVlOwogICAg IH0KIAogICAgIHJldHVybiAiTE9DQUxJWkVEIFNUUklORyBOT1QgRk9VTkQiOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGVzdC9UZXN0LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGVzdC9UZXN0LmpzCmluZGV4IDdmNmM3 MjZmZmQzMmVjMjg2ZjEyNzA5ZDY0YzU3ZGVjOWFhNjFkM2QuLmY4YWRkZTgxNGEzMTE5OTIyMmI4 MDcwODFiYTNkYWNhZWIyN2I1ZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1Rlc3QvVGVzdC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9UZXN0L1Rlc3QuanMKQEAgLTE2NSw3ICsxNjUsNyBAQCBXSS5hc3N1bWluZ01h aW5UYXJnZXQgPSAoKSA9PiBXSS5tYWluVGFyZ2V0OwogV0kuaXNEZWJ1Z1VJRW5hYmxlZCA9ICgp ID0+IGZhbHNlOwogCiBXSS51bmxvY2FsaXplZFN0cmluZyA9IChzdHJpbmcpID0+IHN0cmluZzsK LVdJLlVJU3RyaW5nID0gKHN0cmluZykgPT4gc3RyaW5nOworV0kuVUlTdHJpbmcgPSAoc3RyaW5n LCBrZXksIGNvbW1lbnQpID0+IHN0cmluZzsKIAogV0kuaW5kZW50U3RyaW5nID0gKCkgPT4gIiAg ICAiOwogCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5k ZXggMjlmYjc0NGM2ZDljZWE2NGFmYWFjMjFmZjk1YTkxMGUzM2JkN2Y0Zi4uMTU0NzNjY2U4ZTQ5 YmFjOGY3MzBkYmM3YzRiMGNlMWE4ODg1MDkxYiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9n CisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE4LTEyLTE5ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcgc2hvdWxkIHRha2UgYW4gb3B0aW9uYWwga2V5IGFuZCBkZXNj cmlwdGlvbiB0byBhaWQgbG9jYWxpemF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNTM5NjIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI0NTQy NTA1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog U2NyaXB0cy9leHRyYWN0LWxvY2FsaXphYmxlLWpzLXN0cmluZ3M6CisKIDIwMTgtMTItMTkgIE1l Z2FuIEdhcmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KIAogICAgICAgICBBbGxvdyBj bGllbnRzIHRvIHNldCB0aGUgbmF2aWdhdG9yIHBsYXRmb3JtCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL2V4dHJhY3QtbG9jYWxpemFibGUtanMtc3RyaW5ncyBiL1Rvb2xzL1NjcmlwdHMvZXh0 cmFjdC1sb2NhbGl6YWJsZS1qcy1zdHJpbmdzCmluZGV4IGI0MjAwZjZlZjQyMWY0YmI5NGY5YWQ4 OWYyZDQ1MGZiODI2ODY5ODQuLmM4OWI5NjliMWFjZDcwYmFkODgzYmY4N2VmNjM3NTMwY2YyYmE5 NjEgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvZXh0cmFjdC1sb2NhbGl6YWJsZS1qcy1zdHJp bmdzCisrKyBiL1Rvb2xzL1NjcmlwdHMvZXh0cmFjdC1sb2NhbGl6YWJsZS1qcy1zdHJpbmdzCkBA IC03NCw4ICs3NCw3IEBAIGZvciBteSAkZmlsZSAoc29ydCBAZmlsZXMpIHsKICAgICAgICAgY2hv bXA7CiAKICAgICAgICAgIyBIYW5kbGUgV2ViSW5zcGVjdG9yIHN0cmluZ3MuIFByaW50cyBhIHdh cm5pbmcgaWYgYSBub24tc3RyaW5nIGxpdGVyYWwgaXMgcGFzc2VkIHRvIFdJLlVJU3RyaW5nKCku Ci0gICAgICAgIEhhbmRsZVVJU3RyaW5nKCQxLCAkMSwgIiIsICRmaWxlLCAkLikgd2hpbGUgcy9X SVwuVUlTdHJpbmdcKCIoW14iXSspIlwpLy87Ci0gICAgICAgIHByaW50ICIkZmlsZTokLjpXQVJO SU5HOiAkJlxuIiB3aGlsZSBzL1dJXC5VSVN0cmluZ1woLio/XCkvLzsKKyAgICAgICAgSGFuZGxl VUlTdHJpbmcoJDEsICQyIHx8ICQxLCAkMyB8fCAiIiwgJGZpbGUsICQuKSB3aGlsZSBzL1dJXC5V SVN0cmluZ1woIihbXiJdKykiKD86LFxzKiIoW14iXSspIig/OixccyoiKFteIl0rKSIpPyk/XCkv LzsKIAogICAgICAgICAjIEhhbmRsZSBzdHJpbmdzIGZvciBvdGhlciBwcm9qZWN0cyB0aGF0IGFs c28gdXNlIHRoaXMgc2NyaXB0LgogICAgICAgICBIYW5kbGVVSVN0cmluZygkMiwgJDIsICIiLCAk ZmlsZSwgJC4pIHdoaWxlIHMvKFxiY2xhc3M9IlteIl0qbDEybi10b29sdGlwW14iXSoiW14+XSop dGl0bGU9IihbXiJdKykiLyQxLzsKQEAgLTE1MSw3ICsxNTAsOSBAQCBpZiAoJHNhd0Vycm9yKSB7 CiBteSAkbG9jYWxpemVkU3RyaW5ncyA9ICJ2YXIgbG9jYWxpemVkU3RyaW5ncyA9IG5ldyBPYmpl Y3Q7XG5cbiI7CiAKIGZvciBteSAka2V5IChzb3J0IGtleXMgJWNvbW1lbnRCeUtleSkgewotICAg ICRsb2NhbGl6ZWRTdHJpbmdzIC49ICJsb2NhbGl6ZWRTdHJpbmdzW1wiJGtleVwiXSA9IFwiJHN0 cmluZ0J5S2V5eyRrZXl9XCI7XG4iOworICAgICRsb2NhbGl6ZWRTdHJpbmdzIC49ICJsb2NhbGl6 ZWRTdHJpbmdzW1wiJGtleVwiXSA9IFwiJHN0cmluZ0J5S2V5eyRrZXl9XCI7IjsKKyAgICAkbG9j YWxpemVkU3RyaW5ncyAuPSAiIC8vICRjb21tZW50QnlLZXl7JGtleX0iIGlmIGxlbmd0aCAkY29t bWVudEJ5S2V5eyRrZXl9OworICAgICRsb2NhbGl6ZWRTdHJpbmdzIC49ICJcbiI7CiB9CiAKIGlm ICgtZSAiJGZpbGVUb1VwZGF0ZSIpIHsK 357786 2018-12-19 22:27:09 -0800 2018-12-20 09:50:46 -0800 Patch bug-153962-20181219232708.patch text/plain 7663 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGFhYWUzYmE5MDI1NzU1NmIxNDRlYmQxOGVlMGVh MDJmZjJiNjJkYmYuLmYwMjk2N2YzOTRkNmM0MzM3YzkzMGUxNTQyNWU3MzZlMmI5NWQyMDggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTEyLTE5ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcgc2hvdWxkIHRha2UgYW4gb3B0aW9uYWwga2V5IGFuZCBkZXNj cmlwdGlvbiB0byBhaWQgbG9jYWxpemF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNTM5NjIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI0NTQy NTA1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VXNlckludGVyZmFjZS9CYXNlL0xvYWRMb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAoV0ku VUlTdHJpbmcpOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9UZXN0L1Rlc3QuanM6CisgICAg ICAgIChXSS5VSVN0cmluZyk6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0 VGVzdEdyb3VwQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5BdWRpdFRlc3RHcm91cENvbnRl bnRWaWV3LnByb3RvdHlwZS5pbml0aWFsTGF5b3V0KToKKwogMjAxOC0xMi0xOSAgRGV2aW4gUm91 c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogVW5jYXVn aHQgRXhjZXB0aW9uOiBUeXBlRXJyb3I6IG51bGwgaXMgbm90IGFuIG9iamVjdCAoZXZhbHVhdGlu ZyAnZWZmZWN0aXZlRE9NTm9kZS5lbmFibGVkUHNldWRvQ2xhc3NlcycpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJp bmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9j YWxpemVkU3RyaW5ncy5qcwppbmRleCBiZDk3OTcyMGY0MTljMWFjMGVmMGQwMTRjNTEyNGFlNjZk N2ZlYTVjLi4wNDBjYjAxZjMwODRlOTc5MGIyNzcwOWQyOTYzYTZjYzhkNWE4MzZjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2Vu Lmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKQEAgLTU2LDcgKzU2LDYgQEAgbG9jYWxpemVkU3Ry aW5nc1siJXMgY2Fubm90IGJlIG1vZGlmaWVkIl0gPSAiJXMgY2Fubm90IGJlIG1vZGlmaWVkIjsK IGxvY2FsaXplZFN0cmluZ3NbIiVzIGRlbGF5Il0gPSAiJXMgZGVsYXkiOwogbG9jYWxpemVkU3Ry aW5nc1siJXMgZXZhbFxuJXMgYXN5bmMiXSA9ICIlcyBldmFsXG4lcyBhc3luYyI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyIlcyBpbnRlcnZhbCJdID0gIiVzIGludGVydmFsIjsKLWxvY2FsaXplZFN0cmlu Z3NbIiVzJSUiXSA9ICIlcyUlIjsKIGxvY2FsaXplZFN0cmluZ3NbIihBY3Rpb24gJXMpIl0gPSAi KEFjdGlvbiAlcykiOwogbG9jYWxpemVkU3RyaW5nc1siKERpc2spIl0gPSAiKERpc2spIjsKIGxv Y2FsaXplZFN0cmluZ3NbIihJbmRleCkiXSA9ICIoSW5kZXgpIjsKQEAgLTEwMzksNiArMTAzOCw4 IEBAIGxvY2FsaXplZFN0cmluZ3NbIlx1MDAyMiVzXHUwMDIyIG11c3QgYmUgYW4gJXMiXSA9ICJc dTAwMjIlc1x1MDAyMiBtdXN0IGJlIGFuICVzCiBsb2NhbGl6ZWRTdHJpbmdzWyJcdTAwMjIlc1x1 MDAyMiB0aHJldyBhbiBlcnJvci4iXSA9ICJcdTAwMjIlc1x1MDAyMiB0aHJldyBhbiBlcnJvci4i OwogbG9jYWxpemVkU3RyaW5nc1siXHUyMDFDJXNcdTIwMUQgRXZlbnQgRmlyZWQiXSA9ICJcdTIw MUMlc1x1MjAxRCBFdmVudCBGaXJlZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJcdTIwMUMlc1x1MjAx RCBQcm9maWxlIFJlY29yZGVkIl0gPSAiXHUyMDFDJXNcdTIwMUQgUHJvZmlsZSBSZWNvcmRlZCI7 CisvKiBUaGUgbnVtYmVyIG9mIHRlc3RzIHRoYXQgcGFzc2VkIGV4cHJlc3NlZCBhcyBhIHBlcmNl bnRhZ2UsIGZvbGxvd2VkIGJ5IGEgbGl0ZXJhbCAlLiAqLworbG9jYWxpemVkU3RyaW5nc1siYXVk aXQtcGVyY2VudGFnZS1wYXNzIl0gPSAiJXMlJSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJjb21wdXRl ZCJdID0gImNvbXB1dGVkIjsKIGxvY2FsaXplZFN0cmluZ3NbImRlZmF1bHQiXSA9ICJkZWZhdWx0 IjsKIGxvY2FsaXplZFN0cmluZ3NbImZvciBjaGFuZ2VzIHRvIHRha2UgZWZmZWN0Il0gPSAiZm9y IGNoYW5nZXMgdG8gdGFrZSBlZmZlY3QiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQmFzZS9Mb2FkTG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTG9hZExvY2FsaXplZFN0cmluZ3MuanMK aW5kZXggZjBmZDhjZDZlYTBhY2Y2ZWM1MTZhN2E2ZDc2NWQzMWY3NWI0MTFiMi4uYzBmNWEzNzVl MzNkZDA3NmFjNzBhYTg5MDE0OTdkZGRlZWY0NTc3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9Mb2FkTG9jYWxpemVkU3RyaW5ncy5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL0xvYWRMb2NhbGl6ZWRT dHJpbmdzLmpzCkBAIC00MSwyMyArNDEsMjUgQEAgV0kudW5sb2NhbGl6ZWRTdHJpbmcgPSBmdW5j dGlvbihzdHJpbmcpCiAgICAgcmV0dXJuIHN0cmluZzsKIH07CiAKLVdJLlVJU3RyaW5nID0gZnVu Y3Rpb24oc3RyaW5nKQorV0kuVUlTdHJpbmcgPSBmdW5jdGlvbihzdHJpbmcsIGtleSwgY29tbWVu dCkKIHsKICAgICBpZiAoV0kuZG9udExvY2FsaXplVXNlckludGVyZmFjZSkKICAgICAgICAgcmV0 dXJuIHN0cmluZzsKIAotICAgIGlmICh3aW5kb3cubG9jYWxpemVkU3RyaW5ncyAmJiBzdHJpbmcg aW4gd2luZG93LmxvY2FsaXplZFN0cmluZ3MpCi0gICAgICAgIHJldHVybiB3aW5kb3cubG9jYWxp emVkU3RyaW5nc1tzdHJpbmddOworICAgIGtleSA9IGtleSB8fCBzdHJpbmc7CisKKyAgICBpZiAo d2luZG93LmxvY2FsaXplZFN0cmluZ3MgJiYga2V5IGluIHdpbmRvdy5sb2NhbGl6ZWRTdHJpbmdz KQorICAgICAgICByZXR1cm4gd2luZG93LmxvY2FsaXplZFN0cmluZ3Nba2V5XTsKIAogICAgIGlm ICghd2luZG93LmxvY2FsaXplZFN0cmluZ3MpCi0gICAgICAgIGNvbnNvbGUuZXJyb3IoYEF0dGVt cHRlZCB0byBsb2FkIGxvY2FsaXplZCBzdHJpbmcgIiR7c3RyaW5nfSIgYmVmb3JlIGxvY2FsaXpl ZFN0cmluZ3Mgd2FzIGluaXRpYWxpemVkLmApOworICAgICAgICBjb25zb2xlLmVycm9yKGBBdHRl bXB0ZWQgdG8gbG9hZCBsb2NhbGl6ZWQgc3RyaW5nICIke2tleX0iIGJlZm9yZSBsb2NhbGl6ZWRT dHJpbmdzIHdhcyBpbml0aWFsaXplZC5gLCBjb21tZW50KTsKIAogICAgIGlmICghdGhpcy5fbWlz c2luZ0xvY2FsaXplZFN0cmluZ3MpCiAgICAgICAgIHRoaXMuX21pc3NpbmdMb2NhbGl6ZWRTdHJp bmdzID0ge307CiAKLSAgICBpZiAoIShzdHJpbmcgaW4gdGhpcy5fbWlzc2luZ0xvY2FsaXplZFN0 cmluZ3MpKSB7Ci0gICAgICAgIGNvbnNvbGUuZXJyb3IoIkxvY2FsaXplZCBzdHJpbmcgXCIiICsg c3RyaW5nICsgIlwiIHdhcyBub3QgZm91bmQuIik7Ci0gICAgICAgIHRoaXMuX21pc3NpbmdMb2Nh bGl6ZWRTdHJpbmdzW3N0cmluZ10gPSB0cnVlOworICAgIGlmICghKGtleSBpbiB0aGlzLl9taXNz aW5nTG9jYWxpemVkU3RyaW5ncykpIHsKKyAgICAgICAgY29uc29sZS5lcnJvcihgTG9jYWxpemVk IHN0cmluZyAiJHtrZXl9IiB3YXMgbm90IGZvdW5kLmAsIGNvbW1lbnQpOworICAgICAgICB0aGlz Ll9taXNzaW5nTG9jYWxpemVkU3RyaW5nc1trZXldID0gdHJ1ZTsKICAgICB9CiAKICAgICByZXR1 cm4gIkxPQ0FMSVpFRCBTVFJJTkcgTk9UIEZPVU5EIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QvVGVzdC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QvVGVzdC5qcwppbmRleCA3ZjZjNzI2ZmZkMzJlYzI4NmYx MjcwOWQ2NGM1N2RlYzlhYTYxZDNkLi5mOGFkZGU4MTRhMzExOTkyMjJiODA3MDgxYmEzZGFjYWVi MjdiNWRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9U ZXN0L1Rlc3QuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGVz dC9UZXN0LmpzCkBAIC0xNjUsNyArMTY1LDcgQEAgV0kuYXNzdW1pbmdNYWluVGFyZ2V0ID0gKCkg PT4gV0kubWFpblRhcmdldDsKIFdJLmlzRGVidWdVSUVuYWJsZWQgPSAoKSA9PiBmYWxzZTsKIAog V0kudW5sb2NhbGl6ZWRTdHJpbmcgPSAoc3RyaW5nKSA9PiBzdHJpbmc7Ci1XSS5VSVN0cmluZyA9 IChzdHJpbmcpID0+IHN0cmluZzsKK1dJLlVJU3RyaW5nID0gKHN0cmluZywga2V5LCBjb21tZW50 KSA9PiBzdHJpbmc7CiAKIFdJLmluZGVudFN0cmluZyA9ICgpID0+ICIgICAgIjsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXVkaXRUZXN0 R3JvdXBDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0F1ZGl0VGVzdEdyb3VwQ29udGVudFZpZXcuanMKaW5kZXggNDQxMDFkYWQ1YWNhM2Zm NDU0MDQ2N2E0MzQ2ODZiNWViYmRhZTgxYy4uYTkxMTQwNzJhZTgzNTcyMGVjZmMwNjdlM2I3Nzgy OTRjN2JlM2QzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQXVkaXRUZXN0R3JvdXBDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BdWRpdFRlc3RHcm91cENvbnRlbnRWaWV3Lmpz CkBAIC02NSw3ICs2NSw4IEBAIFdJLkF1ZGl0VGVzdEdyb3VwQ29udGVudFZpZXcgPSBjbGFzcyBB dWRpdFRlc3RHcm91cENvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQXVkaXRUCiAKICAgICAgICAgdGhp cy5fcGVyY2VudGFnZVRleHRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIp OwogCi0gICAgICAgIFN0cmluZy5mb3JtYXQoV0kuVUlTdHJpbmcoIiVzJSUiKSwgW3RoaXMuX3Bl cmNlbnRhZ2VUZXh0RWxlbWVudF0sIFN0cmluZy5zdGFuZGFyZEZvcm1hdHRlcnMsIHRoaXMuX3Bl cmNlbnRhZ2VDb250YWluZXIsIChhLCBiKSA9PiB7CisgICAgICAgIGNvbnN0IGZvcm1hdCA9IFdJ LlVJU3RyaW5nKCIlcyUlIiwgImF1ZGl0LXBlcmNlbnRhZ2UtcGFzcyIsICJUaGUgbnVtYmVyIG9m IHRlc3RzIHRoYXQgcGFzc2VkIGV4cHJlc3NlZCBhcyBhIHBlcmNlbnRhZ2UsIGZvbGxvd2VkIGJ5 IGEgbGl0ZXJhbCAlLiIpOworICAgICAgICBTdHJpbmcuZm9ybWF0KGZvcm1hdCwgW3RoaXMuX3Bl cmNlbnRhZ2VUZXh0RWxlbWVudF0sIFN0cmluZy5zdGFuZGFyZEZvcm1hdHRlcnMsIHRoaXMuX3Bl cmNlbnRhZ2VDb250YWluZXIsIChhLCBiKSA9PiB7CiAgICAgICAgICAgICBhLmFwcGVuZChiKTsK ICAgICAgICAgICAgIHJldHVybiBhOwogICAgICAgICB9KTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0No YW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkMDY5MzkzYzM0MzIxNzlhZjc0OTRmZDQ1 Yzk2NWYwZTFlOWFkZmZlLi5mMWFmM2MzZDcyNDU1ZDk0N2VlN2ZjZjk5Yzk1ZmI1YWFmNzFhMDRi IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTMgQEAKKzIwMTgtMTItMTkgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFdlYkluc3BlY3Rvci5VSVN0cmluZyBzaG91bGQg dGFrZSBhbiBvcHRpb25hbCBrZXkgYW5kIGRlc2NyaXB0aW9uIHRvIGFpZCBsb2NhbGl6YXRpb24K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1Mzk2Mgor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjQ1NDI1MDU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2V4dHJhY3QtbG9jYWxpemFibGUt anMtc3RyaW5nczoKKwogMjAxOC0xMi0xOSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29t PgogCiAgICAgICAgIHd0Zi9PcHRpb25hbC5oOiBtb3ZlLWNvbnN0cnVjdG9yIGFuZCBtb3ZlLWFz c2lnbm1lbnQgb3BlcmF0b3Igc2hvdWxkIGRpc2VuZ2FnZSB0aGUgdmFsdWUgYmVpbmcgbW92ZWQg ZnJvbQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9leHRyYWN0LWxvY2FsaXphYmxlLWpzLXN0 cmluZ3MgYi9Ub29scy9TY3JpcHRzL2V4dHJhY3QtbG9jYWxpemFibGUtanMtc3RyaW5ncwppbmRl eCBiNDIwMGY2ZWY0MjFmNGJiOTRmOWFkODlmMmQ0NTBmYjgyNjg2OTg0Li4zNGI1YWM3NzkzYjM4 MDZlYWZhNTQyMzQ4MzYyZWQxYmVlZjQxNWVkIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL2V4 dHJhY3QtbG9jYWxpemFibGUtanMtc3RyaW5ncworKysgYi9Ub29scy9TY3JpcHRzL2V4dHJhY3Qt bG9jYWxpemFibGUtanMtc3RyaW5ncwpAQCAtNzQsNyArNzQsNyBAQCBmb3IgbXkgJGZpbGUgKHNv cnQgQGZpbGVzKSB7CiAgICAgICAgIGNob21wOwogCiAgICAgICAgICMgSGFuZGxlIFdlYkluc3Bl Y3RvciBzdHJpbmdzLiBQcmludHMgYSB3YXJuaW5nIGlmIGEgbm9uLXN0cmluZyBsaXRlcmFsIGlz IHBhc3NlZCB0byBXSS5VSVN0cmluZygpLgotICAgICAgICBIYW5kbGVVSVN0cmluZygkMSwgJDEs ICIiLCAkZmlsZSwgJC4pIHdoaWxlIHMvV0lcLlVJU3RyaW5nXCgiKFteIl0rKSJcKS8vOworICAg ICAgICBIYW5kbGVVSVN0cmluZygkMSwgJDIgfHwgJDEsICQzIHx8ICIiLCAkZmlsZSwgJC4pIHdo aWxlIHMvV0lcLlVJU3RyaW5nXCgiKFteIl0rKSIoPzosXHMqIihbXiJdKykiKD86LFxzKiIoW14i XSspIik/KT9cKS8vOwogICAgICAgICBwcmludCAiJGZpbGU6JC46V0FSTklORzogJCZcbiIgd2hp bGUgcy9XSVwuVUlTdHJpbmdcKC4qP1wpLy87CiAKICAgICAgICAgIyBIYW5kbGUgc3RyaW5ncyBm b3Igb3RoZXIgcHJvamVjdHMgdGhhdCBhbHNvIHVzZSB0aGlzIHNjcmlwdC4KQEAgLTE1MSw2ICsx NTEsNyBAQCBpZiAoJHNhd0Vycm9yKSB7CiBteSAkbG9jYWxpemVkU3RyaW5ncyA9ICJ2YXIgbG9j YWxpemVkU3RyaW5ncyA9IG5ldyBPYmplY3Q7XG5cbiI7CiAKIGZvciBteSAka2V5IChzb3J0IGtl eXMgJWNvbW1lbnRCeUtleSkgeworICAgICRsb2NhbGl6ZWRTdHJpbmdzIC49ICIvKiAkY29tbWVu dEJ5S2V5eyRrZXl9ICovXG4iIGlmIGxlbmd0aCAkY29tbWVudEJ5S2V5eyRrZXl9OwogICAgICRs b2NhbGl6ZWRTdHJpbmdzIC49ICJsb2NhbGl6ZWRTdHJpbmdzW1wiJGtleVwiXSA9IFwiJHN0cmlu Z0J5S2V5eyRrZXl9XCI7XG4iOwogfQogCg== 357825 2018-12-20 09:50:48 -0800 2018-12-20 10:29:54 -0800 Patch bug-153962-20181220105047.patch text/plain 7423 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGI0NjRjY2E4NzJhZGI0YzdkOWVjOGRlOTU1YmNk M2FiMmQ5YTY2MzcuLmQ0MzI4NjgzNWI1MWRmNjQyMjljYWIxNzQ2NjJjN2RmNGNkZDJmYTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTEyLTIwICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBV SVN0cmluZyBzaG91bGQgdGFrZSBhbiBvcHRpb25hbCBrZXkgYW5kIGRlc2NyaXB0aW9uIHRvIGFp ZCBsb2NhbGl6YXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE1Mzk2MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjQ1NDI1MDU+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgQnJpYW4gQnVyZy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFz ZS9Mb2FkTG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKFdJLlVJU3RyaW5nKToKKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVGVzdC9UZXN0LmpzOgorICAgICAgICAoV0kuVUlTdHJpbmcp OgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9BdWRpdFRlc3RHcm91cENvbnRlbnRW aWV3LmpzOgorICAgICAgICAoV0kuQXVkaXRUZXN0R3JvdXBDb250ZW50Vmlldy5wcm90b3R5cGUu aW5pdGlhbExheW91dCk6CisKIDIwMTgtMTItMTkgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBw bGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEF1ZGl0OiBmaXggZGVzY3JpcHRpb25z IGZvciBkZWZhdWx0IHRlc3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9j YWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCA0 OTQyMzRiZWVlODMwMGYzNzU4YjFkZDc4ZjJmMzQ1MzNjMzJlZjUzLi5hYTc4ZWViMDVmYjNlMDlk MjYzNDJmN2I0MmZiZWJlZjRhMGQ1MzZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3Mu anMKQEAgLTU2LDcgKzU2LDYgQEAgbG9jYWxpemVkU3RyaW5nc1siJXMgY2Fubm90IGJlIG1vZGlm aWVkIl0gPSAiJXMgY2Fubm90IGJlIG1vZGlmaWVkIjsKIGxvY2FsaXplZFN0cmluZ3NbIiVzIGRl bGF5Il0gPSAiJXMgZGVsYXkiOwogbG9jYWxpemVkU3RyaW5nc1siJXMgZXZhbFxuJXMgYXN5bmMi XSA9ICIlcyBldmFsXG4lcyBhc3luYyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyIlcyBpbnRlcnZhbCJd ID0gIiVzIGludGVydmFsIjsKLWxvY2FsaXplZFN0cmluZ3NbIiVzJSUiXSA9ICIlcyUlIjsKIGxv Y2FsaXplZFN0cmluZ3NbIihBY3Rpb24gJXMpIl0gPSAiKEFjdGlvbiAlcykiOwogbG9jYWxpemVk U3RyaW5nc1siKERpc2spIl0gPSAiKERpc2spIjsKIGxvY2FsaXplZFN0cmluZ3NbIihJbmRleCki XSA9ICIoSW5kZXgpIjsKQEAgLTY3Miw2ICs2NzEsOCBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJQYXRo Il0gPSAiUGF0aCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJQYXVzZSBQcm9jZXNzaW5nIl0gPSAiUGF1 c2UgUHJvY2Vzc2luZyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJQYXVzZSBSZWFzb24iXSA9ICJQYXVz ZSBSZWFzb24iOwogbG9jYWxpemVkU3RyaW5nc1siUGF1c2Ugc2NyaXB0IGV4ZWN1dGlvbiAoJXMg b3IgJXMpIl0gPSAiUGF1c2Ugc2NyaXB0IGV4ZWN1dGlvbiAoJXMgb3IgJXMpIjsKKy8qIFRoZSBu dW1iZXIgb2YgdGVzdHMgdGhhdCBwYXNzZWQgZXhwcmVzc2VkIGFzIGEgcGVyY2VudGFnZSwgZm9s bG93ZWQgYnkgYSBsaXRlcmFsICUuICovCitsb2NhbGl6ZWRTdHJpbmdzWyJQZXJjZW50YWdlIChv ZiBhdWRpdHMpIl0gPSAiJXMlJSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJQaW5nIl0gPSAiUGluZyI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJQaW5nIEZyYW1lIl0gPSAiUGluZyBGcmFtZSI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJQaW5ncyJdID0gIlBpbmdzIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTG9hZExvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL0xvYWRMb2NhbGl6ZWRTdHJpbmdz LmpzCmluZGV4IGYwZmQ4Y2Q2ZWEwYWNmNmVjNTE2YTdhNmQ3NjVkMzFmNzViNDExYjIuLmMwZjVh Mzc1ZTMzZGQwNzZhYzcwYWE4OTAxNDk3ZGRkZWVmNDU3N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTG9hZExvY2FsaXplZFN0cmluZ3MuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9Mb2FkTG9jYWxp emVkU3RyaW5ncy5qcwpAQCAtNDEsMjMgKzQxLDI1IEBAIFdJLnVubG9jYWxpemVkU3RyaW5nID0g ZnVuY3Rpb24oc3RyaW5nKQogICAgIHJldHVybiBzdHJpbmc7CiB9OwogCi1XSS5VSVN0cmluZyA9 IGZ1bmN0aW9uKHN0cmluZykKK1dJLlVJU3RyaW5nID0gZnVuY3Rpb24oc3RyaW5nLCBrZXksIGNv bW1lbnQpCiB7CiAgICAgaWYgKFdJLmRvbnRMb2NhbGl6ZVVzZXJJbnRlcmZhY2UpCiAgICAgICAg IHJldHVybiBzdHJpbmc7CiAKLSAgICBpZiAod2luZG93LmxvY2FsaXplZFN0cmluZ3MgJiYgc3Ry aW5nIGluIHdpbmRvdy5sb2NhbGl6ZWRTdHJpbmdzKQotICAgICAgICByZXR1cm4gd2luZG93Lmxv Y2FsaXplZFN0cmluZ3Nbc3RyaW5nXTsKKyAgICBrZXkgPSBrZXkgfHwgc3RyaW5nOworCisgICAg aWYgKHdpbmRvdy5sb2NhbGl6ZWRTdHJpbmdzICYmIGtleSBpbiB3aW5kb3cubG9jYWxpemVkU3Ry aW5ncykKKyAgICAgICAgcmV0dXJuIHdpbmRvdy5sb2NhbGl6ZWRTdHJpbmdzW2tleV07CiAKICAg ICBpZiAoIXdpbmRvdy5sb2NhbGl6ZWRTdHJpbmdzKQotICAgICAgICBjb25zb2xlLmVycm9yKGBB dHRlbXB0ZWQgdG8gbG9hZCBsb2NhbGl6ZWQgc3RyaW5nICIke3N0cmluZ30iIGJlZm9yZSBsb2Nh bGl6ZWRTdHJpbmdzIHdhcyBpbml0aWFsaXplZC5gKTsKKyAgICAgICAgY29uc29sZS5lcnJvcihg QXR0ZW1wdGVkIHRvIGxvYWQgbG9jYWxpemVkIHN0cmluZyAiJHtrZXl9IiBiZWZvcmUgbG9jYWxp emVkU3RyaW5ncyB3YXMgaW5pdGlhbGl6ZWQuYCwgY29tbWVudCk7CiAKICAgICBpZiAoIXRoaXMu X21pc3NpbmdMb2NhbGl6ZWRTdHJpbmdzKQogICAgICAgICB0aGlzLl9taXNzaW5nTG9jYWxpemVk U3RyaW5ncyA9IHt9OwogCi0gICAgaWYgKCEoc3RyaW5nIGluIHRoaXMuX21pc3NpbmdMb2NhbGl6 ZWRTdHJpbmdzKSkgewotICAgICAgICBjb25zb2xlLmVycm9yKCJMb2NhbGl6ZWQgc3RyaW5nIFwi IiArIHN0cmluZyArICJcIiB3YXMgbm90IGZvdW5kLiIpOwotICAgICAgICB0aGlzLl9taXNzaW5n TG9jYWxpemVkU3RyaW5nc1tzdHJpbmddID0gdHJ1ZTsKKyAgICBpZiAoIShrZXkgaW4gdGhpcy5f bWlzc2luZ0xvY2FsaXplZFN0cmluZ3MpKSB7CisgICAgICAgIGNvbnNvbGUuZXJyb3IoYExvY2Fs aXplZCBzdHJpbmcgIiR7a2V5fSIgd2FzIG5vdCBmb3VuZC5gLCBjb21tZW50KTsKKyAgICAgICAg dGhpcy5fbWlzc2luZ0xvY2FsaXplZFN0cmluZ3Nba2V5XSA9IHRydWU7CiAgICAgfQogCiAgICAg cmV0dXJuICJMT0NBTElaRUQgU1RSSU5HIE5PVCBGT1VORCI7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UZXN0L1Rlc3QuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9UZXN0L1Rlc3QuanMKaW5kZXggN2Y2YzcyNmZmZDMyZWMy ODZmMTI3MDlkNjRjNTdkZWM5YWE2MWQzZC4uZjhhZGRlODE0YTMxMTk5MjIyYjgwNzA4MWJhM2Rh Y2FlYjI3YjVkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVGVzdC9UZXN0LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1Rlc3QvVGVzdC5qcwpAQCAtMTY1LDcgKzE2NSw3IEBAIFdJLmFzc3VtaW5nTWFpblRhcmdldCA9 ICgpID0+IFdJLm1haW5UYXJnZXQ7CiBXSS5pc0RlYnVnVUlFbmFibGVkID0gKCkgPT4gZmFsc2U7 CiAKIFdJLnVubG9jYWxpemVkU3RyaW5nID0gKHN0cmluZykgPT4gc3RyaW5nOwotV0kuVUlTdHJp bmcgPSAoc3RyaW5nKSA9PiBzdHJpbmc7CitXSS5VSVN0cmluZyA9IChzdHJpbmcsIGtleSwgY29t bWVudCkgPT4gc3RyaW5nOwogCiBXSS5pbmRlbnRTdHJpbmcgPSAoKSA9PiAiICAgICI7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0 VGVzdEdyb3VwQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9BdWRpdFRlc3RHcm91cENvbnRlbnRWaWV3LmpzCmluZGV4IDQ0MTAxZGFkNWFj YTNmZjQ1NDA0NjdhNDM0Njg2YjVlYmJkYWU4MWMuLjYyOGViMWIzMGRmZjNjYzMwYjIxNWFjZGQ1 YWEzNjIzNmZkMGYwOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0F1ZGl0VGVzdEdyb3VwQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXVkaXRUZXN0R3JvdXBDb250ZW50Vmll dy5qcwpAQCAtNjUsNyArNjUsOCBAQCBXSS5BdWRpdFRlc3RHcm91cENvbnRlbnRWaWV3ID0gY2xh c3MgQXVkaXRUZXN0R3JvdXBDb250ZW50VmlldyBleHRlbmRzIFdJLkF1ZGl0VAogCiAgICAgICAg IHRoaXMuX3BlcmNlbnRhZ2VUZXh0RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNw YW4iKTsKIAotICAgICAgICBTdHJpbmcuZm9ybWF0KFdJLlVJU3RyaW5nKCIlcyUlIiksIFt0aGlz Ll9wZXJjZW50YWdlVGV4dEVsZW1lbnRdLCBTdHJpbmcuc3RhbmRhcmRGb3JtYXR0ZXJzLCB0aGlz Ll9wZXJjZW50YWdlQ29udGFpbmVyLCAoYSwgYikgPT4geworICAgICAgICBjb25zdCBmb3JtYXQg PSBXSS5VSVN0cmluZygiJXMlJSIsICJQZXJjZW50YWdlIChvZiBhdWRpdHMpIiwgIlRoZSBudW1i ZXIgb2YgdGVzdHMgdGhhdCBwYXNzZWQgZXhwcmVzc2VkIGFzIGEgcGVyY2VudGFnZSwgZm9sbG93 ZWQgYnkgYSBsaXRlcmFsICUuIik7CisgICAgICAgIFN0cmluZy5mb3JtYXQoZm9ybWF0LCBbdGhp cy5fcGVyY2VudGFnZVRleHRFbGVtZW50XSwgU3RyaW5nLnN0YW5kYXJkRm9ybWF0dGVycywgdGhp cy5fcGVyY2VudGFnZUNvbnRhaW5lciwgKGEsIGIpID0+IHsKICAgICAgICAgICAgIGEuYXBwZW5k KGIpOwogICAgICAgICAgICAgcmV0dXJuIGE7CiAgICAgICAgIH0pOwpkaWZmIC0tZ2l0IGEvVG9v bHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGQwNjkzOTNjMzQzMjE3OWFmNzQ5 NGZkNDVjOTY1ZjBlMWU5YWRmZmUuLjEyNjg2N2M3ZTE1NDhiMmExNWI1NTgzNjM1MTFjMDJjOTkw ZDkzMmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxMyBAQAorMjAxOC0xMi0yMCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBs ZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVUlTdHJpbmcgc2hvdWxkIHRha2UgYW4g b3B0aW9uYWwga2V5IGFuZCBkZXNjcmlwdGlvbiB0byBhaWQgbG9jYWxpemF0aW9uCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTM5NjIKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzI0NTQyNTA1PgorCisgICAgICAgIFJldmlld2VkIGJ5IEJyaWFuIEJ1 cmcuCisKKyAgICAgICAgKiBTY3JpcHRzL2V4dHJhY3QtbG9jYWxpemFibGUtanMtc3RyaW5nczoK KwogMjAxOC0xMi0xOSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAg IHd0Zi9PcHRpb25hbC5oOiBtb3ZlLWNvbnN0cnVjdG9yIGFuZCBtb3ZlLWFzc2lnbm1lbnQgb3Bl cmF0b3Igc2hvdWxkIGRpc2VuZ2FnZSB0aGUgdmFsdWUgYmVpbmcgbW92ZWQgZnJvbQpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy9leHRyYWN0LWxvY2FsaXphYmxlLWpzLXN0cmluZ3MgYi9Ub29s cy9TY3JpcHRzL2V4dHJhY3QtbG9jYWxpemFibGUtanMtc3RyaW5ncwppbmRleCBiNDIwMGY2ZWY0 MjFmNGJiOTRmOWFkODlmMmQ0NTBmYjgyNjg2OTg0Li4zNGI1YWM3NzkzYjM4MDZlYWZhNTQyMzQ4 MzYyZWQxYmVlZjQxNWVkIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL2V4dHJhY3QtbG9jYWxp emFibGUtanMtc3RyaW5ncworKysgYi9Ub29scy9TY3JpcHRzL2V4dHJhY3QtbG9jYWxpemFibGUt anMtc3RyaW5ncwpAQCAtNzQsNyArNzQsNyBAQCBmb3IgbXkgJGZpbGUgKHNvcnQgQGZpbGVzKSB7 CiAgICAgICAgIGNob21wOwogCiAgICAgICAgICMgSGFuZGxlIFdlYkluc3BlY3RvciBzdHJpbmdz LiBQcmludHMgYSB3YXJuaW5nIGlmIGEgbm9uLXN0cmluZyBsaXRlcmFsIGlzIHBhc3NlZCB0byBX SS5VSVN0cmluZygpLgotICAgICAgICBIYW5kbGVVSVN0cmluZygkMSwgJDEsICIiLCAkZmlsZSwg JC4pIHdoaWxlIHMvV0lcLlVJU3RyaW5nXCgiKFteIl0rKSJcKS8vOworICAgICAgICBIYW5kbGVV SVN0cmluZygkMSwgJDIgfHwgJDEsICQzIHx8ICIiLCAkZmlsZSwgJC4pIHdoaWxlIHMvV0lcLlVJ U3RyaW5nXCgiKFteIl0rKSIoPzosXHMqIihbXiJdKykiKD86LFxzKiIoW14iXSspIik/KT9cKS8v OwogICAgICAgICBwcmludCAiJGZpbGU6JC46V0FSTklORzogJCZcbiIgd2hpbGUgcy9XSVwuVUlT dHJpbmdcKC4qP1wpLy87CiAKICAgICAgICAgIyBIYW5kbGUgc3RyaW5ncyBmb3Igb3RoZXIgcHJv amVjdHMgdGhhdCBhbHNvIHVzZSB0aGlzIHNjcmlwdC4KQEAgLTE1MSw2ICsxNTEsNyBAQCBpZiAo JHNhd0Vycm9yKSB7CiBteSAkbG9jYWxpemVkU3RyaW5ncyA9ICJ2YXIgbG9jYWxpemVkU3RyaW5n cyA9IG5ldyBPYmplY3Q7XG5cbiI7CiAKIGZvciBteSAka2V5IChzb3J0IGtleXMgJWNvbW1lbnRC eUtleSkgeworICAgICRsb2NhbGl6ZWRTdHJpbmdzIC49ICIvKiAkY29tbWVudEJ5S2V5eyRrZXl9 ICovXG4iIGlmIGxlbmd0aCAkY29tbWVudEJ5S2V5eyRrZXl9OwogICAgICRsb2NhbGl6ZWRTdHJp bmdzIC49ICJsb2NhbGl6ZWRTdHJpbmdzW1wiJGtleVwiXSA9IFwiJHN0cmluZ0J5S2V5eyRrZXl9 XCI7XG4iOwogfQogCg==