222428 2021-02-25 11:00:12 -0800 Web Inspector: Refine CSS Grid overlay options 2021-03-03 15:00:45 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 rcaliman rcaliman bburg ews-watchlist hi inspector-bugzilla-changes pangle webkit-bug-importer oldest_to_newest 1733415 0 rcaliman 2021-02-25 11:00:12 -0800 - Move options to top of list - Rename section header to "Grid Overlay Options" - Drop the "Show" prefix from labels - Reorder and set default values for options: * Track sizes: ON * Line numbers: ON * Labels for line names: OFF * Labels for area names: OFF * Extended grid lines: OFF 1733416 1 webkit-bug-importer 2021-02-25 11:00:57 -0800 <rdar://problem/74751569> 1733908 2 421689 rcaliman 2021-02-26 12:11:50 -0800 Created attachment 421689 Patch 1733930 3 421689 hi 2021-02-26 12:27:57 -0800 Comment on attachment 421689 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=421689&action=review > Source/WebInspectorUI/UserInterface/Views/CSSGridSection.js:70 > + let settingsGroup = new WI.SettingsGroup(WI.UIString("Grid Overlay Options", "Page Overlay Options @ Layout Panel Section Header", "Heading for list of grid overlay options")); This should really be named `"Page Overlay Options"` since we're already inside a section named "Grid" and out existing documentation refers to it as the "Page Overlay". > Source/WebInspectorUI/UserInterface/Views/CSSGridSection.js:73 > + settingsGroup.addSetting(WI.settings.gridOverlayShowTrackSizes, WI.UIString("Track Sizes", "Track sizes @ Layers Panel Grid Overlay Setting", "Label for option to toggle the track sizes setting for CSS grid overlays")); I'm not sure we want to drop the "Show *" in these strings. I can see a situation where a developer unfamiliar with CSS grid might mistakenly think that these checkboxes are used to control whether WebKit supports this CSS feature, not something changing in the page overlay. I realize that this is in a "Page Overlay Options" subsection, but I think we should keep the "Show *" so that it's explicitly clear what these boxes are doing. > Source/WebInspectorUI/UserInterface/Views/LayoutDetailsSidebarPanel.css:36 > +.details-section.layout-css-grid.collapsed > .content { Rather than add a new rule, can you `.content:not(.collapsed)` above? 1734402 4 421689 rcaliman 2021-03-01 07:05:53 -0800 Comment on attachment 421689 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=421689&action=review >> Source/WebInspectorUI/UserInterface/Views/CSSGridSection.js:73 >> + settingsGroup.addSetting(WI.settings.gridOverlayShowTrackSizes, WI.UIString("Track Sizes", "Track sizes @ Layers Panel Grid Overlay Setting", "Label for option to toggle the track sizes setting for CSS grid overlays")); > > I'm not sure we want to drop the "Show *" in these strings. I can see a situation where a developer unfamiliar with CSS grid might mistakenly think that these checkboxes are used to control whether WebKit supports this CSS feature, not something changing in the page overlay. I realize that this is in a "Page Overlay Options" subsection, but I think we should keep the "Show *" so that it's explicitly clear what these boxes are doing. We discussed this in the team meeting and decided to drop the "Show" prefix because it is: 1) needlessly repetitive; it applies to all five options. 2) redundant because the label is associated with a checkbox input which implies an on/off state change. In the same spirit, if "Page Overlay Options" doesn't require disambiguation because it's nested under the "Grid" section, then it stands to reason that labels under the "Page Overlay Options" subsection relate to the overlay configuration and do not toggle CSS features. >> Source/WebInspectorUI/UserInterface/Views/LayoutDetailsSidebarPanel.css:36 >> +.details-section.layout-css-grid.collapsed > .content { > > Rather than add a new rule, can you `.content:not(.collapsed)` above? Yes, that works too. 1734403 5 421819 rcaliman 2021-03-01 07:07:55 -0800 Created attachment 421819 Patch 1734465 6 421819 pangle 2021-03-01 09:47:18 -0800 Comment on attachment 421819 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=421819&action=review > Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js:182 > +localizedStrings["Area names @ Layers Panel Grid Overlay Setting"] = "Area Names"; This should probably be `... @ Layout Panel Overlay Options` or similar, since the section is now labeled `Page Overlay Options`. Additionally, the `Layers` panel is a different panel entirely. > Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js:848 > +localizedStrings["Line names @ Layers Panel Grid Overlay Setting"] = "Line Names"; Dito :182 > Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js:850 > +localizedStrings["Line numbers @ Layers Panel Grid Overlay Setting"] = "Line Numbers"; Dito :182 > Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js:1326 > +localizedStrings["Show extended lines @ Layers Panel Grid Overlay Setting"] = "Extended Grid Lines"; Dito :182 > Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js:1550 > +localizedStrings["Track sizes @ Layers Panel Grid Overlay Setting"] = "Track Sizes"; Dito :182 1735232 7 422060 rcaliman 2021-03-03 03:57:00 -0800 Created attachment 422060 Patch 1735234 8 421819 rcaliman 2021-03-03 03:58:51 -0800 Comment on attachment 421819 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=421819&action=review >> Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js:182 >> +localizedStrings["Area names @ Layers Panel Grid Overlay Setting"] = "Area Names"; > > This should probably be `... @ Layout Panel Overlay Options` or similar, since the section is now labeled `Page Overlay Options`. Additionally, the `Layers` panel is a different panel entirely. Good catch! It was a slip of the keyboard and then copied over and over. 1735533 9 422060 bburg 2021-03-03 14:52:31 -0800 Comment on attachment 422060 Patch r=me 1735543 10 ews-feeder 2021-03-03 15:00:43 -0800 Committed r273847: <https://commits.webkit.org/r273847> All reviewed patches have been landed. Closing bug and clearing flags on attachment 422060. 421689 2021-02-26 12:11:50 -0800 2021-03-01 07:07:49 -0800 Patch bug-222428-20210226211149.patch text/plain 12336 rcaliman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGMxYjliODE0ODNhOTg1OGEwYjc0YTY4ZjQ4MjEx YzZiZTM2ZWFkNjAuLjY0YjQzODE0NGVkNzlhZTJjMDA3Y2QwNGY2YTIzZjkxMzQ1MzVmNjMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTAyLTI2ICBSYXp2 YW4gQ2FsaW1hbiAgPHJjYWxpbWFuQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBSZWZpbmUgQ1NTIEdyaWQgb3ZlcmxheSBvcHRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjI0MjgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt Lzc0NzUxNTY5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE1vdmUgQ1NTIEdyaWQgb3ZlcmxheSBzZXR0aW5ncyBhYm92ZSBub2RlIGxpc3QsIHNpbXBs aWZ5IGxhYmVscywgcmVvcmRlciBhbmQgc2V0IGRlZmF1bHQgdmFsdWVzLgorCisgICAgICAgICog TG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvQ1NTR3JpZFNlY3Rpb24uanM6CisgICAgICAgIChXSS5DU1NHcmlkU2VjdGlvbi5wcm90b3R5 cGUuaW5pdGlhbExheW91dCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRE ZXRhaWxzU2lkZWJhclBhbmVsLmNzczoKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24ubGF5b3V0 LWNzcy1ncmlkLmNvbGxhcHNlZCA+IC5jb250ZW50KToKKyAgICAgICAgRHJpdmUtYnk6IEZpeCBh IGJ1ZyB3aGljaCBwcmV2ZW50ZWQgdGhlIGNvbnRlbnRzIGZyb20gYmVpbmcgaGlkZGVuIHdoZW4g dGhlIHNlY3Rpb24gaXMgY29sbGFwc2VkLiAKKwogMjAyMS0wMi0yNSAgQkogQnVyZyAgPGJidXJn QGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIFdlYiBJbnNwZWN0b3I6IGFkZCBzdXBwb3J0 IGZvciByZWNlaXZpbmcgV2ViIEV4dGVuc2lvbiBldmVudHMgdmlhIF9XS0luc3BlY3RvckV4dGVu c2lvbkRlbGVnYXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0 aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCBhMjAzNjk4 ZDQ0OTIxZGM3NzE2M2ZjNjE0NTgyYTA3NDZjNzQ1OGFlLi4zODlhMDI5NjI0NGZiZmMwZDJjN2Jh MDU3ZTE0MmY4MGIxZWNhZGZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9j YWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKQEAg LTE3OCw2ICsxNzgsOCBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJBcHBsaWNhdGlvbiBDYWNoZSJdID0g IkFwcGxpY2F0aW9uIENhY2hlIjsKIC8qIEFwcHJveGltYXRlIGNvdW50IG9mIGV2ZW50cyAqLwog bG9jYWxpemVkU3RyaW5nc1siQXBwcm94aW1hdGUgTnVtYmVyIl0gPSAifiVzIjsKIGxvY2FsaXpl ZFN0cmluZ3NbIkFyZWEiXSA9ICJBcmVhIjsKKy8qIExhYmVsIGZvciBvcHRpb24gdG8gdG9nZ2xl IHRoZSBhcmVhIG5hbWVzIHNldHRpbmcgZm9yIENTUyBncmlkIG92ZXJsYXlzICovCitsb2NhbGl6 ZWRTdHJpbmdzWyJBcmVhIG5hbWVzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3ZlcmxheSBTZXR0aW5n Il0gPSAiQXJlYSBOYW1lcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJBc3NlcnRpb24iXSA9ICJBc3Nl cnRpb24iOwogbG9jYWxpemVkU3RyaW5nc1siQXNzZXJ0aW9uIEZhaWxlZCJdID0gIkFzc2VydGlv biBGYWlsZWQiOwogbG9jYWxpemVkU3RyaW5nc1siQXNzZXJ0aW9uIEZhaWxlZDogJXMiXSA9ICJB c3NlcnRpb24gRmFpbGVkOiAlcyI7CkBAIC04NDIsNiArODQ0LDEwIEBAIGxvY2FsaXplZFN0cmlu Z3NbIkxpZ2h0IEAgU2V0dGluZ3MgR2VuZXJhbCBBcHBlYXJhbmNlIl0gPSAiTGlnaHQiOwogbG9j YWxpemVkU3RyaW5nc1siTGluZSAlZCJdID0gIkxpbmUgJWQiOwogbG9jYWxpemVkU3RyaW5nc1si TGluZSAlZDolZCJdID0gIkxpbmUgJWQ6JWQiOwogbG9jYWxpemVkU3RyaW5nc1siTGluZSBOdW1i ZXIiXSA9ICJMaW5lIE51bWJlciI7CisvKiBMYWJlbCBmb3Igb3B0aW9uIHRvIHRvZ2dsZSB0aGUg bGluZSBuYW1lcyBzZXR0aW5nIGZvciBDU1MgZ3JpZCBvdmVybGF5cyAqLworbG9jYWxpemVkU3Ry aW5nc1siTGluZSBuYW1lcyBAIExheWVycyBQYW5lbCBHcmlkIE92ZXJsYXkgU2V0dGluZyJdID0g IkxpbmUgTmFtZXMiOworLyogTGFiZWwgZm9yIG9wdGlvbiB0byB0b2dnbGUgdGhlIGxpbmUgbnVt YmVycyBzZXR0aW5nIGZvciBDU1MgZ3JpZCBvdmVybGF5cyAqLworbG9jYWxpemVkU3RyaW5nc1si TGluZSBudW1iZXJzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3ZlcmxheSBTZXR0aW5nIl0gPSAiTGlu ZSBOdW1iZXJzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkxpbmUgd3JhcHBpbmc6Il0gPSAiTGluZSB3 cmFwcGluZzoiOwogbG9jYWxpemVkU3RyaW5nc1siTGluZWFyIEdyYWRpZW50Il0gPSAiTGluZWFy IEdyYWRpZW50IjsKIC8qIFByb3BlcnR5IHZhbHVlIGZvciBgZm9udC12YXJpYW50LW51bWVyaWM6 IGxpbmluZy1udW1zYC4gKi8KQEAgLTEwMzMsOCArMTAzOSw4IEBAIGxvY2FsaXplZFN0cmluZ3Nb IlBERiJdID0gIlBERiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJQTkciXSA9ICJQTkciOwogbG9jYWxp emVkU3RyaW5nc1siUGFnZSJdID0gIlBhZ2UiOwogbG9jYWxpemVkU3RyaW5nc1siUGFnZSBJc3N1 ZSJdID0gIlBhZ2UgSXNzdWUiOwotLyogSGVhZGluZyBmb3IgbGlzdCBvZiBncmlkIG92ZXJsYXkg c2V0dGluZ3MgKi8KLWxvY2FsaXplZFN0cmluZ3NbIlBhZ2UgT3ZlcmxheSBTZXR0aW5ncyBAIExh eW91dCBQYW5lbCBTZWN0aW9uIEhlYWRlciJdID0gIkdyaWQgT3ZlcmxheSBTZXR0aW5ncyI7Cisv KiBIZWFkaW5nIGZvciBsaXN0IG9mIGdyaWQgb3ZlcmxheSBvcHRpb25zICovCitsb2NhbGl6ZWRT dHJpbmdzWyJQYWdlIE92ZXJsYXkgT3B0aW9ucyBAIExheW91dCBQYW5lbCBTZWN0aW9uIEhlYWRl ciJdID0gIkdyaWQgT3ZlcmxheSBPcHRpb25zIjsKIC8qIEhlYWRpbmcgZm9yIGxpc3Qgb2YgZ3Jp ZCBub2RlcyAqLwogbG9jYWxpemVkU3RyaW5nc1siUGFnZSBPdmVybGF5cyBAIExheW91dCBTaWRl YmFyIFNlY3Rpb24gSGVhZGVyIl0gPSAiR3JpZCBPdmVybGF5cyI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJQYWdlIG5hdmlnYXRlZCBhdCAlcyJdID0gIlBhZ2UgbmF2aWdhdGVkIGF0ICVzIjsKQEAgLTEz MTUsMjggKzEzMjEsMjAgQEAgbG9jYWxpemVkU3RyaW5nc1siU2hvdyBSZW1haW5pbmcgKCVkKSJd ID0gIlNob3cgUmVtYWluaW5nICglZCkiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBTY29wZSBD aGFpbiBvbiBwYXVzZSJdID0gIlNob3cgU2NvcGUgQ2hhaW4gb24gcGF1c2UiOwogbG9jYWxpemVk U3RyaW5nc1siU2hvdyBhbGwgYWN0aW9ucyJdID0gIlNob3cgYWxsIGFjdGlvbnMiOwogbG9jYWxp emVkU3RyaW5nc1siU2hvdyBhbGwgcmVzb3VyY2VzIl0gPSAiU2hvdyBhbGwgcmVzb3VyY2VzIjsK LS8qIExhYmVsIGZvciBvcHRpb24gdG8gdG9nZ2xlIHRoZSBhcmVhIG5hbWVzIHNldHRpbmcgZm9y IENTUyBncmlkIG92ZXJsYXlzICovCi1sb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGFyZWEgbmFtZXMg QCBMYXllcnMgUGFuZWwgR3JpZCBPdmVybGF5IFNldHRpbmciXSA9ICJTaG93IGFyZWEgbmFtZXMi OwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBjb21wb3NpdGluZyBib3JkZXJzIl0gPSAiU2hvdyBj b21wb3NpdGluZyBib3JkZXJzIjsKIC8qIExhYmVsIGZvciBvcHRpb24gdG8gdG9nZ2xlIHRoZSBl eHRlbmRlZCBsaW5lcyBzZXR0aW5nIGZvciBDU1MgZ3JpZCBvdmVybGF5cyAqLwotbG9jYWxpemVk U3RyaW5nc1siU2hvdyBleHRlbmRlZCBsaW5lcyBAIExheWVycyBQYW5lbCBHcmlkIE92ZXJsYXkg U2V0dGluZyJdID0gIlNob3cgZXh0ZW5kZWQgbGluZXMiOworbG9jYWxpemVkU3RyaW5nc1siU2hv dyBleHRlbmRlZCBsaW5lcyBAIExheWVycyBQYW5lbCBHcmlkIE92ZXJsYXkgU2V0dGluZyJdID0g IkV4dGVuZGVkIEdyaWQgTGluZXMiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBmdWxsIGNlcnRp ZmljYXRlIl0gPSAiU2hvdyBmdWxsIGNlcnRpZmljYXRlIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNo b3cgaGlkZGVuIHRhYnMiXSA9ICJTaG93IGhpZGRlbiB0YWJzIjsKIC8qIFNldHRpbmdzIHRhYiBj aGVja2JveCBsYWJlbCBmb3Igd2hldGhlciB0aGUgaW5kZXBlbmRlbnQgc3R5bGVzIHNpZGViYXIg c2hvdWxkIGJlIHNob3duICovCiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGluZGVwZW5kZW50IFN0 eWxlcyBzaWRlYmFyIEAgU2V0dGluZ3MgRWxlbWVudHMgUGFuZSJdID0gIlNob3cgaW5kZXBlbmRl bnQgU3R5bGVzIHNpZGViYXIiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBqdW1wIHRvIGVmZmVj dGl2ZSBwcm9wZXJ0eSBidXR0b24iXSA9ICJTaG93IGp1bXAgdG8gZWZmZWN0aXZlIHByb3BlcnR5 IGJ1dHRvbiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGp1bXAgdG8gdmFyaWFibGUgZGVjbGFy YXRpb24gYnV0dG9uIl0gPSAiU2hvdyBqdW1wIHRvIHZhcmlhYmxlIGRlY2xhcmF0aW9uIGJ1dHRv biI7Ci0vKiBMYWJlbCBmb3Igb3B0aW9uIHRvIHRvZ2dsZSB0aGUgbGluZSBuYW1lcyBzZXR0aW5n IGZvciBDU1MgZ3JpZCBvdmVybGF5cyAqLwotbG9jYWxpemVkU3RyaW5nc1siU2hvdyBsaW5lIG5h bWVzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3ZlcmxheSBTZXR0aW5nIl0gPSAiU2hvdyBsaW5lIG5h bWVzIjsKLS8qIExhYmVsIGZvciBvcHRpb24gdG8gdG9nZ2xlIHRoZSBsaW5lIG51bWJlcnMgc2V0 dGluZyBmb3IgQ1NTIGdyaWQgb3ZlcmxheXMgKi8KLWxvY2FsaXplZFN0cmluZ3NbIlNob3cgbGlu ZSBudW1iZXJzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3ZlcmxheSBTZXR0aW5nIl0gPSAiU2hvdyBs aW5lIG51bWJlcnMiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBvbmx5IGZvciBzZWxlY3RlZCBu b2RlIl0gPSAiU2hvdyBvbmx5IGZvciBzZWxlY3RlZCBub2RlIjsKIGxvY2FsaXplZFN0cmluZ3Nb IlNob3cgcGFnZSBydWxlcnMgYW5kIG5vZGUgYm9yZGVyIGxpbmVzIl0gPSAiU2hvdyBwYWdlIHJ1 bGVycyBhbmQgbm9kZSBib3JkZXIgbGluZXMiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBydWxl cnMiXSA9ICJTaG93IHJ1bGVycyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IHRoZSBkZXRhaWxz IHNpZGViYXIgKCVzKSJdID0gIlNob3cgdGhlIGRldGFpbHMgc2lkZWJhciAoJXMpIjsKIGxvY2Fs aXplZFN0cmluZ3NbIlNob3cgdGhlIG5hdmlnYXRpb24gc2lkZWJhciAoJXMpIl0gPSAiU2hvdyB0 aGUgbmF2aWdhdGlvbiBzaWRlYmFyICglcykiOwotLyogTGFiZWwgZm9yIG9wdGlvbiB0byB0b2dn bGUgdGhlIHRyYWNrIHNpemVzIHNldHRpbmcgZm9yIENTUyBncmlkIG92ZXJsYXlzICovCi1sb2Nh bGl6ZWRTdHJpbmdzWyJTaG93IHRyYWNrIHNpemVzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3Zlcmxh eSBTZXR0aW5nIl0gPSAiU2hvdyB0cmFjayBzaXplcyI7CiAvKiBTZXR0aW5ncyB0YWIgY2hlY2ti b3ggbGFiZWwgZm9yIHdoZXRoZXIgdGhlIHRyYW5zcGFyZW5jeSBncmlkIGlzIHNob3duIGJ5IGRl ZmF1bHQgKi8KIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQgKHNldHRp bmdzIGxhYmVsKSJdID0gIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQiOwogLyogVG9vbHRpcCBmb3Ig c2hvd2luZyB0aGUgY2hlY2tlcmVkIHRyYW5zcGFyZW5jeSBncmlkIHVuZGVyIGltYWdlcyBhbmQg Y2FudmFzZXMgKi8KQEAgLTE1NDgsNiArMTU0Niw4IEBAIGxvY2FsaXplZFN0cmluZ3NbIlRvdGFs czoiXSA9ICJUb3RhbHM6IjsKIGxvY2FsaXplZFN0cmluZ3NbIlRyYWNlIl0gPSAiVHJhY2UiOwog bG9jYWxpemVkU3RyaW5nc1siVHJhY2U6ICVzIl0gPSAiVHJhY2U6ICVzIjsKIGxvY2FsaXplZFN0 cmluZ3NbIlRyYWNlczoiXSA9ICJUcmFjZXM6IjsKKy8qIExhYmVsIGZvciBvcHRpb24gdG8gdG9n Z2xlIHRoZSB0cmFjayBzaXplcyBzZXR0aW5nIGZvciBDU1MgZ3JpZCBvdmVybGF5cyAqLworbG9j YWxpemVkU3RyaW5nc1siVHJhY2sgc2l6ZXMgQCBMYXllcnMgUGFuZWwgR3JpZCBPdmVybGF5IFNl dHRpbmciXSA9ICJUcmFjayBTaXplcyI7CiAvKiBQcm9wZXJ0eSB2YWx1ZSBmb3IgYGZvbnQtdmFy aWFudC1hbHRlcm5hdGVzOiB0cmFkaXRpb25hbGAuICovCiBsb2NhbGl6ZWRTdHJpbmdzWyJUcmFk aXRpb25hbCBGb3JtcyBAIEZvbnQgRGV0YWlscyBTaWRlYmFyIFByb3BlcnR5IFZhbHVlIl0gPSAi VHJhZGl0aW9uYWwgRm9ybXMiOwogLyogQW1vdW50IG9mIGRhdGEgc2VudCBvdmVyIHRoZSBuZXR3 b3JrIGZvciBhIHNpbmdsZSByZXNvdXJjZSAqLwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCmluZGV4IDVmMzdkOTM3MzhkNTM5MmVi YzliNWVkODMyYjU3NTc4MzY5OGVmMDUuLjEwODIyMDViNzNkODgwOTBkM2FkZDAxOTc0MzM2ZGQ3 OGU0ZGI2Y2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0Jhc2UvU2V0dGluZy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL1NldHRpbmcuanMKQEAgLTIwMCw4ICsyMDAsOCBAQCBXSS5zZXR0aW5ncyA9IHsKICAg ICBncmlkT3ZlcmxheVNob3dBcmVhTmFtZXM6IG5ldyBXSS5TZXR0aW5nKCJncmlkLW92ZXJsYXkt c2hvdy1hcmVhLW5hbWVzIiwgZmFsc2UpLAogICAgIGdyaWRPdmVybGF5U2hvd0V4dGVuZGVkR3Jp ZExpbmVzOiBuZXcgV0kuU2V0dGluZygiZ3JpZC1vdmVybGF5LXNob3ctZXh0ZW5kZWQtZ3JpZC1s aW5lcyIsIGZhbHNlKSwKICAgICBncmlkT3ZlcmxheVNob3dMaW5lTmFtZXM6IG5ldyBXSS5TZXR0 aW5nKCJncmlkLW92ZXJsYXktc2hvdy1saW5lLW5hbWVzIiwgZmFsc2UpLAotICAgIGdyaWRPdmVy bGF5U2hvd0xpbmVOdW1iZXJzOiBuZXcgV0kuU2V0dGluZygiZ3JpZC1vdmVybGF5LXNob3ctbGlu ZS1udW1iZXJzIiwgZmFsc2UpLAotICAgIGdyaWRPdmVybGF5U2hvd1RyYWNrU2l6ZXM6IG5ldyBX SS5TZXR0aW5nKCJncmlkLW92ZXJsYXktc2hvdy10cmFjay1zaXplcyIsIGZhbHNlKSwKKyAgICBn cmlkT3ZlcmxheVNob3dMaW5lTnVtYmVyczogbmV3IFdJLlNldHRpbmcoImdyaWQtb3ZlcmxheS1z aG93LWxpbmUtbnVtYmVycyIsIHRydWUpLAorICAgIGdyaWRPdmVybGF5U2hvd1RyYWNrU2l6ZXM6 IG5ldyBXSS5TZXR0aW5nKCJncmlkLW92ZXJsYXktc2hvdy10cmFjay1zaXplcyIsIHRydWUpLAog ICAgIGdyb3VwTWVkaWFSZXF1ZXN0c0J5RE9NTm9kZTogbmV3IFdJLlNldHRpbmcoImdyb3VwLW1l ZGlhLXJlcXVlc3RzLWJ5LWRvbS1ub2RlIiwgV0kuU2V0dGluZy5taWdyYXRlVmFsdWUoImdyb3Vw LWJ5LWRvbS1ub2RlIikgfHwgZmFsc2UpLAogICAgIGluZGVudFVuaXQ6IG5ldyBXSS5TZXR0aW5n KCJpbmRlbnQtdW5pdCIsIDQpLAogICAgIGluZGVudFdpdGhUYWJzOiBuZXcgV0kuU2V0dGluZygi aW5kZW50LXdpdGgtdGFicyIsIGZhbHNlKSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU0dyaWRTZWN0aW9uLmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTR3JpZFNlY3Rpb24uanMKaW5kZXggMjdk MmI4MzExMGVjYmIxOGVhNTljNGNiODZmYThkYjQ5N2IwODE0Yi4uYTYyOTQ2NmYyODU5MTVhY2Vj N2Q2NDZlYzU1ZjJjNTI0MGYwMTdiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTR3JpZFNlY3Rpb24uanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTR3JpZFNlY3Rpb24uanMKQEAgLTY3LDIx ICs2NywyMSBAQCBXSS5DU1NHcmlkU2VjdGlvbiA9IGNsYXNzIENTU0dyaWRTZWN0aW9uIGV4dGVu ZHMgV0kuVmlldwogICAgIHsKICAgICAgICAgc3VwZXIuaW5pdGlhbExheW91dCgpOwogCisgICAg ICAgIGxldCBzZXR0aW5nc0dyb3VwID0gbmV3IFdJLlNldHRpbmdzR3JvdXAoV0kuVUlTdHJpbmco IkdyaWQgT3ZlcmxheSBPcHRpb25zIiwgIlBhZ2UgT3ZlcmxheSBPcHRpb25zIEAgTGF5b3V0IFBh bmVsIFNlY3Rpb24gSGVhZGVyIiwgIkhlYWRpbmcgZm9yIGxpc3Qgb2YgZ3JpZCBvdmVybGF5IG9w dGlvbnMiKSk7CisgICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmQoc2V0dGluZ3NHcm91cC5lbGVt ZW50KTsKKworICAgICAgICBzZXR0aW5nc0dyb3VwLmFkZFNldHRpbmcoV0kuc2V0dGluZ3MuZ3Jp ZE92ZXJsYXlTaG93VHJhY2tTaXplcywgV0kuVUlTdHJpbmcoIlRyYWNrIFNpemVzIiwgIlRyYWNr IHNpemVzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3ZlcmxheSBTZXR0aW5nIiwgIkxhYmVsIGZvciBv cHRpb24gdG8gdG9nZ2xlIHRoZSB0cmFjayBzaXplcyBzZXR0aW5nIGZvciBDU1MgZ3JpZCBvdmVy bGF5cyIpKTsKKyAgICAgICAgc2V0dGluZ3NHcm91cC5hZGRTZXR0aW5nKFdJLnNldHRpbmdzLmdy aWRPdmVybGF5U2hvd0xpbmVOdW1iZXJzLCBXSS5VSVN0cmluZygiTGluZSBOdW1iZXJzIiwgIkxp bmUgbnVtYmVycyBAIExheWVycyBQYW5lbCBHcmlkIE92ZXJsYXkgU2V0dGluZyIsICJMYWJlbCBm b3Igb3B0aW9uIHRvIHRvZ2dsZSB0aGUgbGluZSBudW1iZXJzIHNldHRpbmcgZm9yIENTUyBncmlk IG92ZXJsYXlzIikpOworICAgICAgICBzZXR0aW5nc0dyb3VwLmFkZFNldHRpbmcoV0kuc2V0dGlu Z3MuZ3JpZE92ZXJsYXlTaG93TGluZU5hbWVzLCBXSS5VSVN0cmluZygiTGluZSBOYW1lcyIsICJM aW5lIG5hbWVzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3ZlcmxheSBTZXR0aW5nIiwgIkxhYmVsIGZv ciBvcHRpb24gdG8gdG9nZ2xlIHRoZSBsaW5lIG5hbWVzIHNldHRpbmcgZm9yIENTUyBncmlkIG92 ZXJsYXlzIikpOworICAgICAgICBzZXR0aW5nc0dyb3VwLmFkZFNldHRpbmcoV0kuc2V0dGluZ3Mu Z3JpZE92ZXJsYXlTaG93QXJlYU5hbWVzLCBXSS5VSVN0cmluZygiQXJlYSBOYW1lcyIsICJBcmVh IG5hbWVzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3ZlcmxheSBTZXR0aW5nIiwgIkxhYmVsIGZvciBv cHRpb24gdG8gdG9nZ2xlIHRoZSBhcmVhIG5hbWVzIHNldHRpbmcgZm9yIENTUyBncmlkIG92ZXJs YXlzIikpOworICAgICAgICBzZXR0aW5nc0dyb3VwLmFkZFNldHRpbmcoV0kuc2V0dGluZ3MuZ3Jp ZE92ZXJsYXlTaG93RXh0ZW5kZWRHcmlkTGluZXMsIFdJLlVJU3RyaW5nKCJFeHRlbmRlZCBHcmlk IExpbmVzIiwgIlNob3cgZXh0ZW5kZWQgbGluZXMgQCBMYXllcnMgUGFuZWwgR3JpZCBPdmVybGF5 IFNldHRpbmciLCAiTGFiZWwgZm9yIG9wdGlvbiB0byB0b2dnbGUgdGhlIGV4dGVuZGVkIGxpbmVz IHNldHRpbmcgZm9yIENTUyBncmlkIG92ZXJsYXlzIikpOworCiAgICAgICAgIGxldCBsaXN0SGVh ZGluZyA9IHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJo MiIpKTsKICAgICAgICAgbGlzdEhlYWRpbmcuY2xhc3NMaXN0LmFkZCgiaGVhZGluZyIpOwogICAg ICAgICBsaXN0SGVhZGluZy50ZXh0Q29udGVudCA9IFdJLlVJU3RyaW5nKCJHcmlkIE92ZXJsYXlz IiwgIlBhZ2UgT3ZlcmxheXMgQCBMYXlvdXQgU2lkZWJhciBTZWN0aW9uIEhlYWRlciIsICJIZWFk aW5nIGZvciBsaXN0IG9mIGdyaWQgbm9kZXMiKTsKIAogICAgICAgICB0aGlzLl9saXN0RWxlbWVu dCA9IHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJ1bCIp KTsKICAgICAgICAgdGhpcy5fbGlzdEVsZW1lbnQuY2xhc3NMaXN0LmFkZCgibm9kZS1vdmVybGF5 LWxpc3QiKTsKLQotICAgICAgICBsZXQgc2V0dGluZ3NHcm91cCA9IG5ldyBXSS5TZXR0aW5nc0dy b3VwKFdJLlVJU3RyaW5nKCJHcmlkIE92ZXJsYXkgU2V0dGluZ3MiLCAiUGFnZSBPdmVybGF5IFNl dHRpbmdzIEAgTGF5b3V0IFBhbmVsIFNlY3Rpb24gSGVhZGVyIiwgIkhlYWRpbmcgZm9yIGxpc3Qg b2YgZ3JpZCBvdmVybGF5IHNldHRpbmdzIikpOwotICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5k KHNldHRpbmdzR3JvdXAuZWxlbWVudCk7Ci0KLSAgICAgICAgc2V0dGluZ3NHcm91cC5hZGRTZXR0 aW5nKFdJLnNldHRpbmdzLmdyaWRPdmVybGF5U2hvd0xpbmVOdW1iZXJzLCBXSS5VSVN0cmluZygi U2hvdyBsaW5lIG51bWJlcnMiLCAiU2hvdyBsaW5lIG51bWJlcnMgQCBMYXllcnMgUGFuZWwgR3Jp ZCBPdmVybGF5IFNldHRpbmciLCAiTGFiZWwgZm9yIG9wdGlvbiB0byB0b2dnbGUgdGhlIGxpbmUg bnVtYmVycyBzZXR0aW5nIGZvciBDU1MgZ3JpZCBvdmVybGF5cyIpKTsKLSAgICAgICAgc2V0dGlu Z3NHcm91cC5hZGRTZXR0aW5nKFdJLnNldHRpbmdzLmdyaWRPdmVybGF5U2hvd0xpbmVOYW1lcywg V0kuVUlTdHJpbmcoIlNob3cgbGluZSBuYW1lcyIsICJTaG93IGxpbmUgbmFtZXMgQCBMYXllcnMg UGFuZWwgR3JpZCBPdmVybGF5IFNldHRpbmciLCAiTGFiZWwgZm9yIG9wdGlvbiB0byB0b2dnbGUg dGhlIGxpbmUgbmFtZXMgc2V0dGluZyBmb3IgQ1NTIGdyaWQgb3ZlcmxheXMiKSk7Ci0gICAgICAg IHNldHRpbmdzR3JvdXAuYWRkU2V0dGluZyhXSS5zZXR0aW5ncy5ncmlkT3ZlcmxheVNob3dFeHRl bmRlZEdyaWRMaW5lcywgV0kuVUlTdHJpbmcoIlNob3cgZXh0ZW5kZWQgbGluZXMiLCAiU2hvdyBl eHRlbmRlZCBsaW5lcyBAIExheWVycyBQYW5lbCBHcmlkIE92ZXJsYXkgU2V0dGluZyIsICJMYWJl bCBmb3Igb3B0aW9uIHRvIHRvZ2dsZSB0aGUgZXh0ZW5kZWQgbGluZXMgc2V0dGluZyBmb3IgQ1NT IGdyaWQgb3ZlcmxheXMiKSk7Ci0gICAgICAgIHNldHRpbmdzR3JvdXAuYWRkU2V0dGluZyhXSS5z ZXR0aW5ncy5ncmlkT3ZlcmxheVNob3dBcmVhTmFtZXMsIFdJLlVJU3RyaW5nKCJTaG93IGFyZWEg bmFtZXMiLCAiU2hvdyBhcmVhIG5hbWVzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3ZlcmxheSBTZXR0 aW5nIiwgIkxhYmVsIGZvciBvcHRpb24gdG8gdG9nZ2xlIHRoZSBhcmVhIG5hbWVzIHNldHRpbmcg Zm9yIENTUyBncmlkIG92ZXJsYXlzIikpOwotICAgICAgICBzZXR0aW5nc0dyb3VwLmFkZFNldHRp bmcoV0kuc2V0dGluZ3MuZ3JpZE92ZXJsYXlTaG93VHJhY2tTaXplcywgV0kuVUlTdHJpbmcoIlNo b3cgdHJhY2sgc2l6ZXMiLCAiU2hvdyB0cmFjayBzaXplcyBAIExheWVycyBQYW5lbCBHcmlkIE92 ZXJsYXkgU2V0dGluZyIsICJMYWJlbCBmb3Igb3B0aW9uIHRvIHRvZ2dsZSB0aGUgdHJhY2sgc2l6 ZXMgc2V0dGluZyBmb3IgQ1NTIGdyaWQgb3ZlcmxheXMiKSk7CiAgICAgfQogCiAgICAgbGF5b3V0 KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0xheW91dERldGFpbHNTaWRlYmFyUGFuZWwuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0RGV0YWlsc1NpZGViYXJQYW5lbC5jc3MKaW5kZXggMDI5 MGI5MmU2MDI0YTZmYmNlZThhOWI4YWQwMDQyNTM2MDM1Y2UxYi4uYWI0MmIwZDcwZTlkZTkyNmJm ZjcxZjM0NzdkZDY1NjI5OTFlNzQxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0RGV0YWlsc1NpZGViYXJQYW5lbC5jc3MKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0RGV0YWlsc1Np ZGViYXJQYW5lbC5jc3MKQEAgLTMyLDMgKzMyLDcgQEAKIC5kZXRhaWxzLXNlY3Rpb24ubGF5b3V0 LWNzcy1ncmlkID4gLmNvbnRlbnQgPiAuZ3JvdXAgewogICAgIGRpc3BsYXk6IGJsb2NrOwogfQor CisuZGV0YWlscy1zZWN0aW9uLmxheW91dC1jc3MtZ3JpZC5jb2xsYXBzZWQgPiAuY29udGVudCB7 CisgICAgZGlzcGxheTogbm9uZTsKK30K 421819 2021-03-01 07:07:55 -0800 2021-03-03 03:56:57 -0800 Patch bug-222428-20210301160753.patch text/plain 12391 rcaliman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGMxYjliODE0ODNhOTg1OGEwYjc0YTY4ZjQ4MjEx YzZiZTM2ZWFkNjAuLmMyYTczNGNkYWFmYmVlMDkwYWQ1OGMyOTBmYTgzZTYzYTk5ZDU1YjcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTAyLTI2ICBSYXp2 YW4gQ2FsaW1hbiAgPHJjYWxpbWFuQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBSZWZpbmUgQ1NTIEdyaWQgb3ZlcmxheSBvcHRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjI0MjgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt Lzc0NzUxNTY5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE1vdmUgQ1NTIEdyaWQgb3ZlcmxheSBzZXR0aW5ncyBhYm92ZSBub2RlIGxpc3QsIHNpbXBs aWZ5IGxhYmVscywgcmVvcmRlciBhbmQgc2V0IGRlZmF1bHQgdmFsdWVzLgorCisgICAgICAgICog TG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvQ1NTR3JpZFNlY3Rpb24uanM6CisgICAgICAgIChXSS5DU1NHcmlkU2VjdGlvbi5wcm90b3R5 cGUuaW5pdGlhbExheW91dCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRE ZXRhaWxzU2lkZWJhclBhbmVsLmNzczoKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24ubGF5b3V0 LWNzcy1ncmlkLmNvbGxhcHNlZCA+IC5jb250ZW50KToKKyAgICAgICAgRHJpdmUtYnk6IEZpeCBh IGJ1ZyB3aGljaCBwcmV2ZW50ZWQgdGhlIGNvbnRlbnRzIGZyb20gYmVpbmcgaGlkZGVuIHdoZW4g dGhlIHNlY3Rpb24gaXMgY29sbGFwc2VkLgorCiAyMDIxLTAyLTI1ICBCSiBCdXJnICA8YmJ1cmdA YXBwbGUuY29tPgogCiAgICAgICAgIFtDb2NvYV0gV2ViIEluc3BlY3RvcjogYWRkIHN1cHBvcnQg Zm9yIHJlY2VpdmluZyBXZWIgRXh0ZW5zaW9uIGV2ZW50cyB2aWEgX1dLSW5zcGVjdG9yRXh0ZW5z aW9uRGVsZWdhdGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRp b25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv TG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IGEyMDM2OThk NDQ5MjFkYzc3MTYzZmM2MTQ1ODJhMDc0NmM3NDU4YWUuLjU1NjFmZmU4ZWQ4Mzc3NjQwOGMxNGUx YzdmODFhNTkyNjAwNjhkNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2Nh bGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpAQCAt MTc4LDYgKzE3OCw4IEBAIGxvY2FsaXplZFN0cmluZ3NbIkFwcGxpY2F0aW9uIENhY2hlIl0gPSAi QXBwbGljYXRpb24gQ2FjaGUiOwogLyogQXBwcm94aW1hdGUgY291bnQgb2YgZXZlbnRzICovCiBs b2NhbGl6ZWRTdHJpbmdzWyJBcHByb3hpbWF0ZSBOdW1iZXIiXSA9ICJ+JXMiOwogbG9jYWxpemVk U3RyaW5nc1siQXJlYSJdID0gIkFyZWEiOworLyogTGFiZWwgZm9yIG9wdGlvbiB0byB0b2dnbGUg dGhlIGFyZWEgbmFtZXMgc2V0dGluZyBmb3IgQ1NTIGdyaWQgb3ZlcmxheXMgKi8KK2xvY2FsaXpl ZFN0cmluZ3NbIkFyZWEgbmFtZXMgQCBMYXllcnMgUGFuZWwgR3JpZCBPdmVybGF5IFNldHRpbmci XSA9ICJBcmVhIE5hbWVzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkFzc2VydGlvbiJdID0gIkFzc2Vy dGlvbiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJBc3NlcnRpb24gRmFpbGVkIl0gPSAiQXNzZXJ0aW9u IEZhaWxlZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJBc3NlcnRpb24gRmFpbGVkOiAlcyJdID0gIkFz c2VydGlvbiBGYWlsZWQ6ICVzIjsKQEAgLTg0Miw2ICs4NDQsMTAgQEAgbG9jYWxpemVkU3RyaW5n c1siTGlnaHQgQCBTZXR0aW5ncyBHZW5lcmFsIEFwcGVhcmFuY2UiXSA9ICJMaWdodCI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJMaW5lICVkIl0gPSAiTGluZSAlZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJM aW5lICVkOiVkIl0gPSAiTGluZSAlZDolZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJMaW5lIE51bWJl ciJdID0gIkxpbmUgTnVtYmVyIjsKKy8qIExhYmVsIGZvciBvcHRpb24gdG8gdG9nZ2xlIHRoZSBs aW5lIG5hbWVzIHNldHRpbmcgZm9yIENTUyBncmlkIG92ZXJsYXlzICovCitsb2NhbGl6ZWRTdHJp bmdzWyJMaW5lIG5hbWVzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3ZlcmxheSBTZXR0aW5nIl0gPSAi TGluZSBOYW1lcyI7CisvKiBMYWJlbCBmb3Igb3B0aW9uIHRvIHRvZ2dsZSB0aGUgbGluZSBudW1i ZXJzIHNldHRpbmcgZm9yIENTUyBncmlkIG92ZXJsYXlzICovCitsb2NhbGl6ZWRTdHJpbmdzWyJM aW5lIG51bWJlcnMgQCBMYXllcnMgUGFuZWwgR3JpZCBPdmVybGF5IFNldHRpbmciXSA9ICJMaW5l IE51bWJlcnMiOwogbG9jYWxpemVkU3RyaW5nc1siTGluZSB3cmFwcGluZzoiXSA9ICJMaW5lIHdy YXBwaW5nOiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJMaW5lYXIgR3JhZGllbnQiXSA9ICJMaW5lYXIg R3JhZGllbnQiOwogLyogUHJvcGVydHkgdmFsdWUgZm9yIGBmb250LXZhcmlhbnQtbnVtZXJpYzog bGluaW5nLW51bXNgLiAqLwpAQCAtMTAzMyw4ICsxMDM5LDggQEAgbG9jYWxpemVkU3RyaW5nc1si UERGIl0gPSAiUERGIjsKIGxvY2FsaXplZFN0cmluZ3NbIlBORyJdID0gIlBORyI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJQYWdlIl0gPSAiUGFnZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJQYWdlIElzc3Vl Il0gPSAiUGFnZSBJc3N1ZSI7Ci0vKiBIZWFkaW5nIGZvciBsaXN0IG9mIGdyaWQgb3ZlcmxheSBz ZXR0aW5ncyAqLwotbG9jYWxpemVkU3RyaW5nc1siUGFnZSBPdmVybGF5IFNldHRpbmdzIEAgTGF5 b3V0IFBhbmVsIFNlY3Rpb24gSGVhZGVyIl0gPSAiR3JpZCBPdmVybGF5IFNldHRpbmdzIjsKKy8q IEhlYWRpbmcgZm9yIGxpc3Qgb2YgZ3JpZCBvdmVybGF5IG9wdGlvbnMgKi8KK2xvY2FsaXplZFN0 cmluZ3NbIlBhZ2UgT3ZlcmxheSBPcHRpb25zIEAgTGF5b3V0IFBhbmVsIFNlY3Rpb24gSGVhZGVy Il0gPSAiUGFnZSBPdmVybGF5IE9wdGlvbnMiOwogLyogSGVhZGluZyBmb3IgbGlzdCBvZiBncmlk IG5vZGVzICovCiBsb2NhbGl6ZWRTdHJpbmdzWyJQYWdlIE92ZXJsYXlzIEAgTGF5b3V0IFNpZGVi YXIgU2VjdGlvbiBIZWFkZXIiXSA9ICJHcmlkIE92ZXJsYXlzIjsKIGxvY2FsaXplZFN0cmluZ3Nb IlBhZ2UgbmF2aWdhdGVkIGF0ICVzIl0gPSAiUGFnZSBuYXZpZ2F0ZWQgYXQgJXMiOwpAQCAtMTMx NSwyOCArMTMyMSwyMCBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IFJlbWFpbmluZyAoJWQpIl0g PSAiU2hvdyBSZW1haW5pbmcgKCVkKSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IFNjb3BlIENo YWluIG9uIHBhdXNlIl0gPSAiU2hvdyBTY29wZSBDaGFpbiBvbiBwYXVzZSI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJTaG93IGFsbCBhY3Rpb25zIl0gPSAiU2hvdyBhbGwgYWN0aW9ucyI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJTaG93IGFsbCByZXNvdXJjZXMiXSA9ICJTaG93IGFsbCByZXNvdXJjZXMiOwot LyogTGFiZWwgZm9yIG9wdGlvbiB0byB0b2dnbGUgdGhlIGFyZWEgbmFtZXMgc2V0dGluZyBmb3Ig Q1NTIGdyaWQgb3ZlcmxheXMgKi8KLWxvY2FsaXplZFN0cmluZ3NbIlNob3cgYXJlYSBuYW1lcyBA IExheWVycyBQYW5lbCBHcmlkIE92ZXJsYXkgU2V0dGluZyJdID0gIlNob3cgYXJlYSBuYW1lcyI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGNvbXBvc2l0aW5nIGJvcmRlcnMiXSA9ICJTaG93IGNv bXBvc2l0aW5nIGJvcmRlcnMiOwogLyogTGFiZWwgZm9yIG9wdGlvbiB0byB0b2dnbGUgdGhlIGV4 dGVuZGVkIGxpbmVzIHNldHRpbmcgZm9yIENTUyBncmlkIG92ZXJsYXlzICovCi1sb2NhbGl6ZWRT dHJpbmdzWyJTaG93IGV4dGVuZGVkIGxpbmVzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3ZlcmxheSBT ZXR0aW5nIl0gPSAiU2hvdyBleHRlbmRlZCBsaW5lcyI7Citsb2NhbGl6ZWRTdHJpbmdzWyJTaG93 IGV4dGVuZGVkIGxpbmVzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3ZlcmxheSBTZXR0aW5nIl0gPSAi RXh0ZW5kZWQgR3JpZCBMaW5lcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGZ1bGwgY2VydGlm aWNhdGUiXSA9ICJTaG93IGZ1bGwgY2VydGlmaWNhdGUiOwogbG9jYWxpemVkU3RyaW5nc1siU2hv dyBoaWRkZW4gdGFicyJdID0gIlNob3cgaGlkZGVuIHRhYnMiOwogLyogU2V0dGluZ3MgdGFiIGNo ZWNrYm94IGxhYmVsIGZvciB3aGV0aGVyIHRoZSBpbmRlcGVuZGVudCBzdHlsZXMgc2lkZWJhciBz aG91bGQgYmUgc2hvd24gKi8KIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgaW5kZXBlbmRlbnQgU3R5 bGVzIHNpZGViYXIgQCBTZXR0aW5ncyBFbGVtZW50cyBQYW5lIl0gPSAiU2hvdyBpbmRlcGVuZGVu dCBTdHlsZXMgc2lkZWJhciI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGp1bXAgdG8gZWZmZWN0 aXZlIHByb3BlcnR5IGJ1dHRvbiJdID0gIlNob3cganVtcCB0byBlZmZlY3RpdmUgcHJvcGVydHkg YnV0dG9uIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cganVtcCB0byB2YXJpYWJsZSBkZWNsYXJh dGlvbiBidXR0b24iXSA9ICJTaG93IGp1bXAgdG8gdmFyaWFibGUgZGVjbGFyYXRpb24gYnV0dG9u IjsKLS8qIExhYmVsIGZvciBvcHRpb24gdG8gdG9nZ2xlIHRoZSBsaW5lIG5hbWVzIHNldHRpbmcg Zm9yIENTUyBncmlkIG92ZXJsYXlzICovCi1sb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGxpbmUgbmFt ZXMgQCBMYXllcnMgUGFuZWwgR3JpZCBPdmVybGF5IFNldHRpbmciXSA9ICJTaG93IGxpbmUgbmFt ZXMiOwotLyogTGFiZWwgZm9yIG9wdGlvbiB0byB0b2dnbGUgdGhlIGxpbmUgbnVtYmVycyBzZXR0 aW5nIGZvciBDU1MgZ3JpZCBvdmVybGF5cyAqLwotbG9jYWxpemVkU3RyaW5nc1siU2hvdyBsaW5l IG51bWJlcnMgQCBMYXllcnMgUGFuZWwgR3JpZCBPdmVybGF5IFNldHRpbmciXSA9ICJTaG93IGxp bmUgbnVtYmVycyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IG9ubHkgZm9yIHNlbGVjdGVkIG5v ZGUiXSA9ICJTaG93IG9ubHkgZm9yIHNlbGVjdGVkIG5vZGUiOwogbG9jYWxpemVkU3RyaW5nc1si U2hvdyBwYWdlIHJ1bGVycyBhbmQgbm9kZSBib3JkZXIgbGluZXMiXSA9ICJTaG93IHBhZ2UgcnVs ZXJzIGFuZCBub2RlIGJvcmRlciBsaW5lcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IHJ1bGVy cyJdID0gIlNob3cgcnVsZXJzIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgdGhlIGRldGFpbHMg c2lkZWJhciAoJXMpIl0gPSAiU2hvdyB0aGUgZGV0YWlscyBzaWRlYmFyICglcykiOwogbG9jYWxp emVkU3RyaW5nc1siU2hvdyB0aGUgbmF2aWdhdGlvbiBzaWRlYmFyICglcykiXSA9ICJTaG93IHRo ZSBuYXZpZ2F0aW9uIHNpZGViYXIgKCVzKSI7Ci0vKiBMYWJlbCBmb3Igb3B0aW9uIHRvIHRvZ2ds ZSB0aGUgdHJhY2sgc2l6ZXMgc2V0dGluZyBmb3IgQ1NTIGdyaWQgb3ZlcmxheXMgKi8KLWxvY2Fs aXplZFN0cmluZ3NbIlNob3cgdHJhY2sgc2l6ZXMgQCBMYXllcnMgUGFuZWwgR3JpZCBPdmVybGF5 IFNldHRpbmciXSA9ICJTaG93IHRyYWNrIHNpemVzIjsKIC8qIFNldHRpbmdzIHRhYiBjaGVja2Jv eCBsYWJlbCBmb3Igd2hldGhlciB0aGUgdHJhbnNwYXJlbmN5IGdyaWQgaXMgc2hvd24gYnkgZGVm YXVsdCAqLwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCAoc2V0dGlu Z3MgbGFiZWwpIl0gPSAiU2hvdyB0cmFuc3BhcmVuY3kgZ3JpZCI7CiAvKiBUb29sdGlwIGZvciBz aG93aW5nIHRoZSBjaGVja2VyZWQgdHJhbnNwYXJlbmN5IGdyaWQgdW5kZXIgaW1hZ2VzIGFuZCBj YW52YXNlcyAqLwpAQCAtMTU0OCw2ICsxNTQ2LDggQEAgbG9jYWxpemVkU3RyaW5nc1siVG90YWxz OiJdID0gIlRvdGFsczoiOwogbG9jYWxpemVkU3RyaW5nc1siVHJhY2UiXSA9ICJUcmFjZSI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJUcmFjZTogJXMiXSA9ICJUcmFjZTogJXMiOwogbG9jYWxpemVkU3Ry aW5nc1siVHJhY2VzOiJdID0gIlRyYWNlczoiOworLyogTGFiZWwgZm9yIG9wdGlvbiB0byB0b2dn bGUgdGhlIHRyYWNrIHNpemVzIHNldHRpbmcgZm9yIENTUyBncmlkIG92ZXJsYXlzICovCitsb2Nh bGl6ZWRTdHJpbmdzWyJUcmFjayBzaXplcyBAIExheWVycyBQYW5lbCBHcmlkIE92ZXJsYXkgU2V0 dGluZyJdID0gIlRyYWNrIFNpemVzIjsKIC8qIFByb3BlcnR5IHZhbHVlIGZvciBgZm9udC12YXJp YW50LWFsdGVybmF0ZXM6IHRyYWRpdGlvbmFsYC4gKi8KIGxvY2FsaXplZFN0cmluZ3NbIlRyYWRp dGlvbmFsIEZvcm1zIEAgRm9udCBEZXRhaWxzIFNpZGViYXIgUHJvcGVydHkgVmFsdWUiXSA9ICJU cmFkaXRpb25hbCBGb3JtcyI7CiAvKiBBbW91bnQgb2YgZGF0YSBzZW50IG92ZXIgdGhlIG5ldHdv cmsgZm9yIGEgc2luZ2xlIHJlc291cmNlICovCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKaW5kZXggNWYzN2Q5MzczOGQ1MzkyZWJj OWI1ZWQ4MzJiNTc1NzgzNjk4ZWYwNS4uMTA4MjIwNWI3M2Q4ODA5MGQzYWRkMDE5NzQzMzZkZDc4 ZTRkYjZjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv QmFzZS9TZXR0aW5nLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0Jhc2UvU2V0dGluZy5qcwpAQCAtMjAwLDggKzIwMCw4IEBAIFdJLnNldHRpbmdzID0gewogICAg IGdyaWRPdmVybGF5U2hvd0FyZWFOYW1lczogbmV3IFdJLlNldHRpbmcoImdyaWQtb3ZlcmxheS1z aG93LWFyZWEtbmFtZXMiLCBmYWxzZSksCiAgICAgZ3JpZE92ZXJsYXlTaG93RXh0ZW5kZWRHcmlk TGluZXM6IG5ldyBXSS5TZXR0aW5nKCJncmlkLW92ZXJsYXktc2hvdy1leHRlbmRlZC1ncmlkLWxp bmVzIiwgZmFsc2UpLAogICAgIGdyaWRPdmVybGF5U2hvd0xpbmVOYW1lczogbmV3IFdJLlNldHRp bmcoImdyaWQtb3ZlcmxheS1zaG93LWxpbmUtbmFtZXMiLCBmYWxzZSksCi0gICAgZ3JpZE92ZXJs YXlTaG93TGluZU51bWJlcnM6IG5ldyBXSS5TZXR0aW5nKCJncmlkLW92ZXJsYXktc2hvdy1saW5l LW51bWJlcnMiLCBmYWxzZSksCi0gICAgZ3JpZE92ZXJsYXlTaG93VHJhY2tTaXplczogbmV3IFdJ LlNldHRpbmcoImdyaWQtb3ZlcmxheS1zaG93LXRyYWNrLXNpemVzIiwgZmFsc2UpLAorICAgIGdy aWRPdmVybGF5U2hvd0xpbmVOdW1iZXJzOiBuZXcgV0kuU2V0dGluZygiZ3JpZC1vdmVybGF5LXNo b3ctbGluZS1udW1iZXJzIiwgdHJ1ZSksCisgICAgZ3JpZE92ZXJsYXlTaG93VHJhY2tTaXplczog bmV3IFdJLlNldHRpbmcoImdyaWQtb3ZlcmxheS1zaG93LXRyYWNrLXNpemVzIiwgdHJ1ZSksCiAg ICAgZ3JvdXBNZWRpYVJlcXVlc3RzQnlET01Ob2RlOiBuZXcgV0kuU2V0dGluZygiZ3JvdXAtbWVk aWEtcmVxdWVzdHMtYnktZG9tLW5vZGUiLCBXSS5TZXR0aW5nLm1pZ3JhdGVWYWx1ZSgiZ3JvdXAt YnktZG9tLW5vZGUiKSB8fCBmYWxzZSksCiAgICAgaW5kZW50VW5pdDogbmV3IFdJLlNldHRpbmco ImluZGVudC11bml0IiwgNCksCiAgICAgaW5kZW50V2l0aFRhYnM6IG5ldyBXSS5TZXR0aW5nKCJp bmRlbnQtd2l0aC10YWJzIiwgZmFsc2UpLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTR3JpZFNlY3Rpb24uanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NHcmlkU2VjdGlvbi5qcwppbmRleCAyN2Qy YjgzMTEwZWNiYjE4ZWE1OWM0Y2I4NmZhOGRiNDk3YjA4MTRiLi44YTQ1YWZhNjQ1YTNkMTMzMzVk ZTI0YzQxYTM4ZTBmNDUwZjY2ZjMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9DU1NHcmlkU2VjdGlvbi5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NHcmlkU2VjdGlvbi5qcwpAQCAtNjcsMjEg KzY3LDIxIEBAIFdJLkNTU0dyaWRTZWN0aW9uID0gY2xhc3MgQ1NTR3JpZFNlY3Rpb24gZXh0ZW5k cyBXSS5WaWV3CiAgICAgewogICAgICAgICBzdXBlci5pbml0aWFsTGF5b3V0KCk7CiAKKyAgICAg ICAgbGV0IHNldHRpbmdzR3JvdXAgPSBuZXcgV0kuU2V0dGluZ3NHcm91cChXSS5VSVN0cmluZygi UGFnZSBPdmVybGF5IE9wdGlvbnMiLCAiUGFnZSBPdmVybGF5IE9wdGlvbnMgQCBMYXlvdXQgUGFu ZWwgU2VjdGlvbiBIZWFkZXIiLCAiSGVhZGluZyBmb3IgbGlzdCBvZiBncmlkIG92ZXJsYXkgb3B0 aW9ucyIpKTsKKyAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZChzZXR0aW5nc0dyb3VwLmVsZW1l bnQpOworCisgICAgICAgIHNldHRpbmdzR3JvdXAuYWRkU2V0dGluZyhXSS5zZXR0aW5ncy5ncmlk T3ZlcmxheVNob3dUcmFja1NpemVzLCBXSS5VSVN0cmluZygiVHJhY2sgU2l6ZXMiLCAiVHJhY2sg c2l6ZXMgQCBMYXllcnMgUGFuZWwgR3JpZCBPdmVybGF5IFNldHRpbmciLCAiTGFiZWwgZm9yIG9w dGlvbiB0byB0b2dnbGUgdGhlIHRyYWNrIHNpemVzIHNldHRpbmcgZm9yIENTUyBncmlkIG92ZXJs YXlzIikpOworICAgICAgICBzZXR0aW5nc0dyb3VwLmFkZFNldHRpbmcoV0kuc2V0dGluZ3MuZ3Jp ZE92ZXJsYXlTaG93TGluZU51bWJlcnMsIFdJLlVJU3RyaW5nKCJMaW5lIE51bWJlcnMiLCAiTGlu ZSBudW1iZXJzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3ZlcmxheSBTZXR0aW5nIiwgIkxhYmVsIGZv ciBvcHRpb24gdG8gdG9nZ2xlIHRoZSBsaW5lIG51bWJlcnMgc2V0dGluZyBmb3IgQ1NTIGdyaWQg b3ZlcmxheXMiKSk7CisgICAgICAgIHNldHRpbmdzR3JvdXAuYWRkU2V0dGluZyhXSS5zZXR0aW5n cy5ncmlkT3ZlcmxheVNob3dMaW5lTmFtZXMsIFdJLlVJU3RyaW5nKCJMaW5lIE5hbWVzIiwgIkxp bmUgbmFtZXMgQCBMYXllcnMgUGFuZWwgR3JpZCBPdmVybGF5IFNldHRpbmciLCAiTGFiZWwgZm9y IG9wdGlvbiB0byB0b2dnbGUgdGhlIGxpbmUgbmFtZXMgc2V0dGluZyBmb3IgQ1NTIGdyaWQgb3Zl cmxheXMiKSk7CisgICAgICAgIHNldHRpbmdzR3JvdXAuYWRkU2V0dGluZyhXSS5zZXR0aW5ncy5n cmlkT3ZlcmxheVNob3dBcmVhTmFtZXMsIFdJLlVJU3RyaW5nKCJBcmVhIE5hbWVzIiwgIkFyZWEg bmFtZXMgQCBMYXllcnMgUGFuZWwgR3JpZCBPdmVybGF5IFNldHRpbmciLCAiTGFiZWwgZm9yIG9w dGlvbiB0byB0b2dnbGUgdGhlIGFyZWEgbmFtZXMgc2V0dGluZyBmb3IgQ1NTIGdyaWQgb3Zlcmxh eXMiKSk7CisgICAgICAgIHNldHRpbmdzR3JvdXAuYWRkU2V0dGluZyhXSS5zZXR0aW5ncy5ncmlk T3ZlcmxheVNob3dFeHRlbmRlZEdyaWRMaW5lcywgV0kuVUlTdHJpbmcoIkV4dGVuZGVkIEdyaWQg TGluZXMiLCAiU2hvdyBleHRlbmRlZCBsaW5lcyBAIExheWVycyBQYW5lbCBHcmlkIE92ZXJsYXkg U2V0dGluZyIsICJMYWJlbCBmb3Igb3B0aW9uIHRvIHRvZ2dsZSB0aGUgZXh0ZW5kZWQgbGluZXMg c2V0dGluZyBmb3IgQ1NTIGdyaWQgb3ZlcmxheXMiKSk7CisKICAgICAgICAgbGV0IGxpc3RIZWFk aW5nID0gdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImgy IikpOwogICAgICAgICBsaXN0SGVhZGluZy5jbGFzc0xpc3QuYWRkKCJoZWFkaW5nIik7CiAgICAg ICAgIGxpc3RIZWFkaW5nLnRleHRDb250ZW50ID0gV0kuVUlTdHJpbmcoIkdyaWQgT3ZlcmxheXMi LCAiUGFnZSBPdmVybGF5cyBAIExheW91dCBTaWRlYmFyIFNlY3Rpb24gSGVhZGVyIiwgIkhlYWRp bmcgZm9yIGxpc3Qgb2YgZ3JpZCBub2RlcyIpOwogCiAgICAgICAgIHRoaXMuX2xpc3RFbGVtZW50 ID0gdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInVsIikp OwogICAgICAgICB0aGlzLl9saXN0RWxlbWVudC5jbGFzc0xpc3QuYWRkKCJub2RlLW92ZXJsYXkt bGlzdCIpOwotCi0gICAgICAgIGxldCBzZXR0aW5nc0dyb3VwID0gbmV3IFdJLlNldHRpbmdzR3Jv dXAoV0kuVUlTdHJpbmcoIkdyaWQgT3ZlcmxheSBTZXR0aW5ncyIsICJQYWdlIE92ZXJsYXkgU2V0 dGluZ3MgQCBMYXlvdXQgUGFuZWwgU2VjdGlvbiBIZWFkZXIiLCAiSGVhZGluZyBmb3IgbGlzdCBv ZiBncmlkIG92ZXJsYXkgc2V0dGluZ3MiKSk7Ci0gICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmQo c2V0dGluZ3NHcm91cC5lbGVtZW50KTsKLQotICAgICAgICBzZXR0aW5nc0dyb3VwLmFkZFNldHRp bmcoV0kuc2V0dGluZ3MuZ3JpZE92ZXJsYXlTaG93TGluZU51bWJlcnMsIFdJLlVJU3RyaW5nKCJT aG93IGxpbmUgbnVtYmVycyIsICJTaG93IGxpbmUgbnVtYmVycyBAIExheWVycyBQYW5lbCBHcmlk IE92ZXJsYXkgU2V0dGluZyIsICJMYWJlbCBmb3Igb3B0aW9uIHRvIHRvZ2dsZSB0aGUgbGluZSBu dW1iZXJzIHNldHRpbmcgZm9yIENTUyBncmlkIG92ZXJsYXlzIikpOwotICAgICAgICBzZXR0aW5n c0dyb3VwLmFkZFNldHRpbmcoV0kuc2V0dGluZ3MuZ3JpZE92ZXJsYXlTaG93TGluZU5hbWVzLCBX SS5VSVN0cmluZygiU2hvdyBsaW5lIG5hbWVzIiwgIlNob3cgbGluZSBuYW1lcyBAIExheWVycyBQ YW5lbCBHcmlkIE92ZXJsYXkgU2V0dGluZyIsICJMYWJlbCBmb3Igb3B0aW9uIHRvIHRvZ2dsZSB0 aGUgbGluZSBuYW1lcyBzZXR0aW5nIGZvciBDU1MgZ3JpZCBvdmVybGF5cyIpKTsKLSAgICAgICAg c2V0dGluZ3NHcm91cC5hZGRTZXR0aW5nKFdJLnNldHRpbmdzLmdyaWRPdmVybGF5U2hvd0V4dGVu ZGVkR3JpZExpbmVzLCBXSS5VSVN0cmluZygiU2hvdyBleHRlbmRlZCBsaW5lcyIsICJTaG93IGV4 dGVuZGVkIGxpbmVzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3ZlcmxheSBTZXR0aW5nIiwgIkxhYmVs IGZvciBvcHRpb24gdG8gdG9nZ2xlIHRoZSBleHRlbmRlZCBsaW5lcyBzZXR0aW5nIGZvciBDU1Mg Z3JpZCBvdmVybGF5cyIpKTsKLSAgICAgICAgc2V0dGluZ3NHcm91cC5hZGRTZXR0aW5nKFdJLnNl dHRpbmdzLmdyaWRPdmVybGF5U2hvd0FyZWFOYW1lcywgV0kuVUlTdHJpbmcoIlNob3cgYXJlYSBu YW1lcyIsICJTaG93IGFyZWEgbmFtZXMgQCBMYXllcnMgUGFuZWwgR3JpZCBPdmVybGF5IFNldHRp bmciLCAiTGFiZWwgZm9yIG9wdGlvbiB0byB0b2dnbGUgdGhlIGFyZWEgbmFtZXMgc2V0dGluZyBm b3IgQ1NTIGdyaWQgb3ZlcmxheXMiKSk7Ci0gICAgICAgIHNldHRpbmdzR3JvdXAuYWRkU2V0dGlu ZyhXSS5zZXR0aW5ncy5ncmlkT3ZlcmxheVNob3dUcmFja1NpemVzLCBXSS5VSVN0cmluZygiU2hv dyB0cmFjayBzaXplcyIsICJTaG93IHRyYWNrIHNpemVzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3Zl cmxheSBTZXR0aW5nIiwgIkxhYmVsIGZvciBvcHRpb24gdG8gdG9nZ2xlIHRoZSB0cmFjayBzaXpl cyBzZXR0aW5nIGZvciBDU1MgZ3JpZCBvdmVybGF5cyIpKTsKICAgICB9CiAKICAgICBsYXlvdXQo KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv TGF5b3V0RGV0YWlsc1NpZGViYXJQYW5lbC5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9MYXlvdXREZXRhaWxzU2lkZWJhclBhbmVsLmNzcwppbmRleCAwMjkw YjkyZTYwMjRhNmZiY2VlOGE5YjhhZDAwNDI1MzYwMzVjZTFiLi5lZTI5ZTFkYTE5MTQ0OTQ2YWYw ZjdhZWY0MTNiY2YyNzU2MzczOTA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXREZXRhaWxzU2lkZWJhclBhbmVsLmNzcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXREZXRhaWxzU2lk ZWJhclBhbmVsLmNzcwpAQCAtMjgsNyArMjgsNyBAQAogICAgIG1hcmdpbi1ib3R0b206IDRweDsK IH0KIAotLmRldGFpbHMtc2VjdGlvbi5sYXlvdXQtY3NzLWdyaWQgPiAuY29udGVudCwKKy5kZXRh aWxzLXNlY3Rpb24ubGF5b3V0LWNzcy1ncmlkOm5vdCguY29sbGFwc2VkKSA+IC5jb250ZW50LAog LmRldGFpbHMtc2VjdGlvbi5sYXlvdXQtY3NzLWdyaWQgPiAuY29udGVudCA+IC5ncm91cCB7CiAg ICAgZGlzcGxheTogYmxvY2s7CiB9Cg== 422060 2021-03-03 03:57:00 -0800 2021-03-03 15:00:44 -0800 Patch bug-222428-20210303125659.patch text/plain 12341 rcaliman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGMxYjliODE0ODNhOTg1OGEwYjc0YTY4ZjQ4MjEx YzZiZTM2ZWFkNjAuLmMyYTczNGNkYWFmYmVlMDkwYWQ1OGMyOTBmYTgzZTYzYTk5ZDU1YjcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTAyLTI2ICBSYXp2 YW4gQ2FsaW1hbiAgPHJjYWxpbWFuQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBSZWZpbmUgQ1NTIEdyaWQgb3ZlcmxheSBvcHRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjI0MjgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt Lzc0NzUxNTY5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE1vdmUgQ1NTIEdyaWQgb3ZlcmxheSBzZXR0aW5ncyBhYm92ZSBub2RlIGxpc3QsIHNpbXBs aWZ5IGxhYmVscywgcmVvcmRlciBhbmQgc2V0IGRlZmF1bHQgdmFsdWVzLgorCisgICAgICAgICog TG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvQ1NTR3JpZFNlY3Rpb24uanM6CisgICAgICAgIChXSS5DU1NHcmlkU2VjdGlvbi5wcm90b3R5 cGUuaW5pdGlhbExheW91dCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRE ZXRhaWxzU2lkZWJhclBhbmVsLmNzczoKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24ubGF5b3V0 LWNzcy1ncmlkLmNvbGxhcHNlZCA+IC5jb250ZW50KToKKyAgICAgICAgRHJpdmUtYnk6IEZpeCBh IGJ1ZyB3aGljaCBwcmV2ZW50ZWQgdGhlIGNvbnRlbnRzIGZyb20gYmVpbmcgaGlkZGVuIHdoZW4g dGhlIHNlY3Rpb24gaXMgY29sbGFwc2VkLgorCiAyMDIxLTAyLTI1ICBCSiBCdXJnICA8YmJ1cmdA YXBwbGUuY29tPgogCiAgICAgICAgIFtDb2NvYV0gV2ViIEluc3BlY3RvcjogYWRkIHN1cHBvcnQg Zm9yIHJlY2VpdmluZyBXZWIgRXh0ZW5zaW9uIGV2ZW50cyB2aWEgX1dLSW5zcGVjdG9yRXh0ZW5z aW9uRGVsZWdhdGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRp b25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv TG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IGEyMDM2OThk NDQ5MjFkYzc3MTYzZmM2MTQ1ODJhMDc0NmM3NDU4YWUuLmJiYzg5ZWVjY2VlMjFlMGYxMjdkOWIz NmE4NjY4MmU3MGY5YmUyMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2Nh bGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpAQCAt MTc4LDYgKzE3OCw4IEBAIGxvY2FsaXplZFN0cmluZ3NbIkFwcGxpY2F0aW9uIENhY2hlIl0gPSAi QXBwbGljYXRpb24gQ2FjaGUiOwogLyogQXBwcm94aW1hdGUgY291bnQgb2YgZXZlbnRzICovCiBs b2NhbGl6ZWRTdHJpbmdzWyJBcHByb3hpbWF0ZSBOdW1iZXIiXSA9ICJ+JXMiOwogbG9jYWxpemVk U3RyaW5nc1siQXJlYSJdID0gIkFyZWEiOworLyogTGFiZWwgZm9yIG9wdGlvbiB0byB0b2dnbGUg dGhlIGFyZWEgbmFtZXMgc2V0dGluZyBmb3IgQ1NTIGdyaWQgb3ZlcmxheXMgKi8KK2xvY2FsaXpl ZFN0cmluZ3NbIkFyZWEgbmFtZXMgQCBMYXlvdXQgUGFuZWwgT3ZlcmxheSBPcHRpb25zIl0gPSAi QXJlYSBOYW1lcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJBc3NlcnRpb24iXSA9ICJBc3NlcnRpb24i OwogbG9jYWxpemVkU3RyaW5nc1siQXNzZXJ0aW9uIEZhaWxlZCJdID0gIkFzc2VydGlvbiBGYWls ZWQiOwogbG9jYWxpemVkU3RyaW5nc1siQXNzZXJ0aW9uIEZhaWxlZDogJXMiXSA9ICJBc3NlcnRp b24gRmFpbGVkOiAlcyI7CkBAIC04NDIsNiArODQ0LDEwIEBAIGxvY2FsaXplZFN0cmluZ3NbIkxp Z2h0IEAgU2V0dGluZ3MgR2VuZXJhbCBBcHBlYXJhbmNlIl0gPSAiTGlnaHQiOwogbG9jYWxpemVk U3RyaW5nc1siTGluZSAlZCJdID0gIkxpbmUgJWQiOwogbG9jYWxpemVkU3RyaW5nc1siTGluZSAl ZDolZCJdID0gIkxpbmUgJWQ6JWQiOwogbG9jYWxpemVkU3RyaW5nc1siTGluZSBOdW1iZXIiXSA9 ICJMaW5lIE51bWJlciI7CisvKiBMYWJlbCBmb3Igb3B0aW9uIHRvIHRvZ2dsZSB0aGUgbGluZSBu YW1lcyBzZXR0aW5nIGZvciBDU1MgZ3JpZCBvdmVybGF5cyAqLworbG9jYWxpemVkU3RyaW5nc1si TGluZSBuYW1lcyBAIExheW91dCBQYW5lbCBPdmVybGF5IE9wdGlvbnMiXSA9ICJMaW5lIE5hbWVz IjsKKy8qIExhYmVsIGZvciBvcHRpb24gdG8gdG9nZ2xlIHRoZSBsaW5lIG51bWJlcnMgc2V0dGlu ZyBmb3IgQ1NTIGdyaWQgb3ZlcmxheXMgKi8KK2xvY2FsaXplZFN0cmluZ3NbIkxpbmUgbnVtYmVy cyBAIExheW91dCBQYW5lbCBPdmVybGF5IE9wdGlvbnMiXSA9ICJMaW5lIE51bWJlcnMiOwogbG9j YWxpemVkU3RyaW5nc1siTGluZSB3cmFwcGluZzoiXSA9ICJMaW5lIHdyYXBwaW5nOiI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJMaW5lYXIgR3JhZGllbnQiXSA9ICJMaW5lYXIgR3JhZGllbnQiOwogLyog UHJvcGVydHkgdmFsdWUgZm9yIGBmb250LXZhcmlhbnQtbnVtZXJpYzogbGluaW5nLW51bXNgLiAq LwpAQCAtMTAzMyw4ICsxMDM5LDggQEAgbG9jYWxpemVkU3RyaW5nc1siUERGIl0gPSAiUERGIjsK IGxvY2FsaXplZFN0cmluZ3NbIlBORyJdID0gIlBORyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJQYWdl Il0gPSAiUGFnZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJQYWdlIElzc3VlIl0gPSAiUGFnZSBJc3N1 ZSI7Ci0vKiBIZWFkaW5nIGZvciBsaXN0IG9mIGdyaWQgb3ZlcmxheSBzZXR0aW5ncyAqLwotbG9j YWxpemVkU3RyaW5nc1siUGFnZSBPdmVybGF5IFNldHRpbmdzIEAgTGF5b3V0IFBhbmVsIFNlY3Rp b24gSGVhZGVyIl0gPSAiR3JpZCBPdmVybGF5IFNldHRpbmdzIjsKKy8qIEhlYWRpbmcgZm9yIGxp c3Qgb2YgZ3JpZCBvdmVybGF5IG9wdGlvbnMgKi8KK2xvY2FsaXplZFN0cmluZ3NbIlBhZ2UgT3Zl cmxheSBPcHRpb25zIEAgTGF5b3V0IFBhbmVsIFNlY3Rpb24gSGVhZGVyIl0gPSAiUGFnZSBPdmVy bGF5IE9wdGlvbnMiOwogLyogSGVhZGluZyBmb3IgbGlzdCBvZiBncmlkIG5vZGVzICovCiBsb2Nh bGl6ZWRTdHJpbmdzWyJQYWdlIE92ZXJsYXlzIEAgTGF5b3V0IFNpZGViYXIgU2VjdGlvbiBIZWFk ZXIiXSA9ICJHcmlkIE92ZXJsYXlzIjsKIGxvY2FsaXplZFN0cmluZ3NbIlBhZ2UgbmF2aWdhdGVk IGF0ICVzIl0gPSAiUGFnZSBuYXZpZ2F0ZWQgYXQgJXMiOwpAQCAtMTMxNSwyOCArMTMyMSwyMCBA QCBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IFJlbWFpbmluZyAoJWQpIl0gPSAiU2hvdyBSZW1haW5p bmcgKCVkKSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IFNjb3BlIENoYWluIG9uIHBhdXNlIl0g PSAiU2hvdyBTY29wZSBDaGFpbiBvbiBwYXVzZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGFs bCBhY3Rpb25zIl0gPSAiU2hvdyBhbGwgYWN0aW9ucyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93 IGFsbCByZXNvdXJjZXMiXSA9ICJTaG93IGFsbCByZXNvdXJjZXMiOwotLyogTGFiZWwgZm9yIG9w dGlvbiB0byB0b2dnbGUgdGhlIGFyZWEgbmFtZXMgc2V0dGluZyBmb3IgQ1NTIGdyaWQgb3Zlcmxh eXMgKi8KLWxvY2FsaXplZFN0cmluZ3NbIlNob3cgYXJlYSBuYW1lcyBAIExheWVycyBQYW5lbCBH cmlkIE92ZXJsYXkgU2V0dGluZyJdID0gIlNob3cgYXJlYSBuYW1lcyI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJTaG93IGNvbXBvc2l0aW5nIGJvcmRlcnMiXSA9ICJTaG93IGNvbXBvc2l0aW5nIGJvcmRl cnMiOwogLyogTGFiZWwgZm9yIG9wdGlvbiB0byB0b2dnbGUgdGhlIGV4dGVuZGVkIGxpbmVzIHNl dHRpbmcgZm9yIENTUyBncmlkIG92ZXJsYXlzICovCi1sb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGV4 dGVuZGVkIGxpbmVzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3ZlcmxheSBTZXR0aW5nIl0gPSAiU2hv dyBleHRlbmRlZCBsaW5lcyI7Citsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGV4dGVuZGVkIGxpbmVz IEAgTGF5b3V0IFBhbmVsIE92ZXJsYXkgT3B0aW9ucyJdID0gIkV4dGVuZGVkIEdyaWQgTGluZXMi OwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBmdWxsIGNlcnRpZmljYXRlIl0gPSAiU2hvdyBmdWxs IGNlcnRpZmljYXRlIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgaGlkZGVuIHRhYnMiXSA9ICJT aG93IGhpZGRlbiB0YWJzIjsKIC8qIFNldHRpbmdzIHRhYiBjaGVja2JveCBsYWJlbCBmb3Igd2hl dGhlciB0aGUgaW5kZXBlbmRlbnQgc3R5bGVzIHNpZGViYXIgc2hvdWxkIGJlIHNob3duICovCiBs b2NhbGl6ZWRTdHJpbmdzWyJTaG93IGluZGVwZW5kZW50IFN0eWxlcyBzaWRlYmFyIEAgU2V0dGlu Z3MgRWxlbWVudHMgUGFuZSJdID0gIlNob3cgaW5kZXBlbmRlbnQgU3R5bGVzIHNpZGViYXIiOwog bG9jYWxpemVkU3RyaW5nc1siU2hvdyBqdW1wIHRvIGVmZmVjdGl2ZSBwcm9wZXJ0eSBidXR0b24i XSA9ICJTaG93IGp1bXAgdG8gZWZmZWN0aXZlIHByb3BlcnR5IGJ1dHRvbiI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJTaG93IGp1bXAgdG8gdmFyaWFibGUgZGVjbGFyYXRpb24gYnV0dG9uIl0gPSAiU2hv dyBqdW1wIHRvIHZhcmlhYmxlIGRlY2xhcmF0aW9uIGJ1dHRvbiI7Ci0vKiBMYWJlbCBmb3Igb3B0 aW9uIHRvIHRvZ2dsZSB0aGUgbGluZSBuYW1lcyBzZXR0aW5nIGZvciBDU1MgZ3JpZCBvdmVybGF5 cyAqLwotbG9jYWxpemVkU3RyaW5nc1siU2hvdyBsaW5lIG5hbWVzIEAgTGF5ZXJzIFBhbmVsIEdy aWQgT3ZlcmxheSBTZXR0aW5nIl0gPSAiU2hvdyBsaW5lIG5hbWVzIjsKLS8qIExhYmVsIGZvciBv cHRpb24gdG8gdG9nZ2xlIHRoZSBsaW5lIG51bWJlcnMgc2V0dGluZyBmb3IgQ1NTIGdyaWQgb3Zl cmxheXMgKi8KLWxvY2FsaXplZFN0cmluZ3NbIlNob3cgbGluZSBudW1iZXJzIEAgTGF5ZXJzIFBh bmVsIEdyaWQgT3ZlcmxheSBTZXR0aW5nIl0gPSAiU2hvdyBsaW5lIG51bWJlcnMiOwogbG9jYWxp emVkU3RyaW5nc1siU2hvdyBvbmx5IGZvciBzZWxlY3RlZCBub2RlIl0gPSAiU2hvdyBvbmx5IGZv ciBzZWxlY3RlZCBub2RlIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgcGFnZSBydWxlcnMgYW5k IG5vZGUgYm9yZGVyIGxpbmVzIl0gPSAiU2hvdyBwYWdlIHJ1bGVycyBhbmQgbm9kZSBib3JkZXIg bGluZXMiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBydWxlcnMiXSA9ICJTaG93IHJ1bGVycyI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IHRoZSBkZXRhaWxzIHNpZGViYXIgKCVzKSJdID0gIlNo b3cgdGhlIGRldGFpbHMgc2lkZWJhciAoJXMpIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgdGhl IG5hdmlnYXRpb24gc2lkZWJhciAoJXMpIl0gPSAiU2hvdyB0aGUgbmF2aWdhdGlvbiBzaWRlYmFy ICglcykiOwotLyogTGFiZWwgZm9yIG9wdGlvbiB0byB0b2dnbGUgdGhlIHRyYWNrIHNpemVzIHNl dHRpbmcgZm9yIENTUyBncmlkIG92ZXJsYXlzICovCi1sb2NhbGl6ZWRTdHJpbmdzWyJTaG93IHRy YWNrIHNpemVzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3ZlcmxheSBTZXR0aW5nIl0gPSAiU2hvdyB0 cmFjayBzaXplcyI7CiAvKiBTZXR0aW5ncyB0YWIgY2hlY2tib3ggbGFiZWwgZm9yIHdoZXRoZXIg dGhlIHRyYW5zcGFyZW5jeSBncmlkIGlzIHNob3duIGJ5IGRlZmF1bHQgKi8KIGxvY2FsaXplZFN0 cmluZ3NbIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQgKHNldHRpbmdzIGxhYmVsKSJdID0gIlNob3cg dHJhbnNwYXJlbmN5IGdyaWQiOwogLyogVG9vbHRpcCBmb3Igc2hvd2luZyB0aGUgY2hlY2tlcmVk IHRyYW5zcGFyZW5jeSBncmlkIHVuZGVyIGltYWdlcyBhbmQgY2FudmFzZXMgKi8KQEAgLTE1NDgs NiArMTU0Niw4IEBAIGxvY2FsaXplZFN0cmluZ3NbIlRvdGFsczoiXSA9ICJUb3RhbHM6IjsKIGxv Y2FsaXplZFN0cmluZ3NbIlRyYWNlIl0gPSAiVHJhY2UiOwogbG9jYWxpemVkU3RyaW5nc1siVHJh Y2U6ICVzIl0gPSAiVHJhY2U6ICVzIjsKIGxvY2FsaXplZFN0cmluZ3NbIlRyYWNlczoiXSA9ICJU cmFjZXM6IjsKKy8qIExhYmVsIGZvciBvcHRpb24gdG8gdG9nZ2xlIHRoZSB0cmFjayBzaXplcyBz ZXR0aW5nIGZvciBDU1MgZ3JpZCBvdmVybGF5cyAqLworbG9jYWxpemVkU3RyaW5nc1siVHJhY2sg c2l6ZXMgQCBMYXlvdXQgUGFuZWwgT3ZlcmxheSBPcHRpb25zIl0gPSAiVHJhY2sgU2l6ZXMiOwog LyogUHJvcGVydHkgdmFsdWUgZm9yIGBmb250LXZhcmlhbnQtYWx0ZXJuYXRlczogdHJhZGl0aW9u YWxgLiAqLwogbG9jYWxpemVkU3RyaW5nc1siVHJhZGl0aW9uYWwgRm9ybXMgQCBGb250IERldGFp bHMgU2lkZWJhciBQcm9wZXJ0eSBWYWx1ZSJdID0gIlRyYWRpdGlvbmFsIEZvcm1zIjsKIC8qIEFt b3VudCBvZiBkYXRhIHNlbnQgb3ZlciB0aGUgbmV0d29yayBmb3IgYSBzaW5nbGUgcmVzb3VyY2Ug Ki8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2Uv U2V0dGluZy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvU2V0 dGluZy5qcwppbmRleCA1ZjM3ZDkzNzM4ZDUzOTJlYmM5YjVlZDgzMmI1NzU3ODM2OThlZjA1Li4x MDgyMjA1YjczZDg4MDkwZDNhZGQwMTk3NDMzNmRkNzhlNGRiNmNlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCkBAIC0yMDAs OCArMjAwLDggQEAgV0kuc2V0dGluZ3MgPSB7CiAgICAgZ3JpZE92ZXJsYXlTaG93QXJlYU5hbWVz OiBuZXcgV0kuU2V0dGluZygiZ3JpZC1vdmVybGF5LXNob3ctYXJlYS1uYW1lcyIsIGZhbHNlKSwK ICAgICBncmlkT3ZlcmxheVNob3dFeHRlbmRlZEdyaWRMaW5lczogbmV3IFdJLlNldHRpbmcoImdy aWQtb3ZlcmxheS1zaG93LWV4dGVuZGVkLWdyaWQtbGluZXMiLCBmYWxzZSksCiAgICAgZ3JpZE92 ZXJsYXlTaG93TGluZU5hbWVzOiBuZXcgV0kuU2V0dGluZygiZ3JpZC1vdmVybGF5LXNob3ctbGlu ZS1uYW1lcyIsIGZhbHNlKSwKLSAgICBncmlkT3ZlcmxheVNob3dMaW5lTnVtYmVyczogbmV3IFdJ LlNldHRpbmcoImdyaWQtb3ZlcmxheS1zaG93LWxpbmUtbnVtYmVycyIsIGZhbHNlKSwKLSAgICBn cmlkT3ZlcmxheVNob3dUcmFja1NpemVzOiBuZXcgV0kuU2V0dGluZygiZ3JpZC1vdmVybGF5LXNo b3ctdHJhY2stc2l6ZXMiLCBmYWxzZSksCisgICAgZ3JpZE92ZXJsYXlTaG93TGluZU51bWJlcnM6 IG5ldyBXSS5TZXR0aW5nKCJncmlkLW92ZXJsYXktc2hvdy1saW5lLW51bWJlcnMiLCB0cnVlKSwK KyAgICBncmlkT3ZlcmxheVNob3dUcmFja1NpemVzOiBuZXcgV0kuU2V0dGluZygiZ3JpZC1vdmVy bGF5LXNob3ctdHJhY2stc2l6ZXMiLCB0cnVlKSwKICAgICBncm91cE1lZGlhUmVxdWVzdHNCeURP TU5vZGU6IG5ldyBXSS5TZXR0aW5nKCJncm91cC1tZWRpYS1yZXF1ZXN0cy1ieS1kb20tbm9kZSIs IFdJLlNldHRpbmcubWlncmF0ZVZhbHVlKCJncm91cC1ieS1kb20tbm9kZSIpIHx8IGZhbHNlKSwK ICAgICBpbmRlbnRVbml0OiBuZXcgV0kuU2V0dGluZygiaW5kZW50LXVuaXQiLCA0KSwKICAgICBp bmRlbnRXaXRoVGFiczogbmV3IFdJLlNldHRpbmcoImluZGVudC13aXRoLXRhYnMiLCBmYWxzZSks CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9D U1NHcmlkU2VjdGlvbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0NTU0dyaWRTZWN0aW9uLmpzCmluZGV4IDI3ZDJiODMxMTBlY2JiMThlYTU5YzRjYjg2ZmE4 ZGI0OTdiMDgxNGIuLmVjNDFjNThhYWYxYTJkZmJiNjljOWUwZmJkYmE2OTBhMWE2ZDRjOTEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU0dy aWRTZWN0aW9uLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0NTU0dyaWRTZWN0aW9uLmpzCkBAIC02NywyMSArNjcsMjEgQEAgV0kuQ1NTR3JpZFNlY3Rp b24gPSBjbGFzcyBDU1NHcmlkU2VjdGlvbiBleHRlbmRzIFdJLlZpZXcKICAgICB7CiAgICAgICAg IHN1cGVyLmluaXRpYWxMYXlvdXQoKTsKIAorICAgICAgICBsZXQgc2V0dGluZ3NHcm91cCA9IG5l dyBXSS5TZXR0aW5nc0dyb3VwKFdJLlVJU3RyaW5nKCJQYWdlIE92ZXJsYXkgT3B0aW9ucyIsICJQ YWdlIE92ZXJsYXkgT3B0aW9ucyBAIExheW91dCBQYW5lbCBTZWN0aW9uIEhlYWRlciIsICJIZWFk aW5nIGZvciBsaXN0IG9mIGdyaWQgb3ZlcmxheSBvcHRpb25zIikpOworICAgICAgICB0aGlzLmVs ZW1lbnQuYXBwZW5kKHNldHRpbmdzR3JvdXAuZWxlbWVudCk7CisKKyAgICAgICAgc2V0dGluZ3NH cm91cC5hZGRTZXR0aW5nKFdJLnNldHRpbmdzLmdyaWRPdmVybGF5U2hvd1RyYWNrU2l6ZXMsIFdJ LlVJU3RyaW5nKCJUcmFjayBTaXplcyIsICJUcmFjayBzaXplcyBAIExheW91dCBQYW5lbCBPdmVy bGF5IE9wdGlvbnMiLCAiTGFiZWwgZm9yIG9wdGlvbiB0byB0b2dnbGUgdGhlIHRyYWNrIHNpemVz IHNldHRpbmcgZm9yIENTUyBncmlkIG92ZXJsYXlzIikpOworICAgICAgICBzZXR0aW5nc0dyb3Vw LmFkZFNldHRpbmcoV0kuc2V0dGluZ3MuZ3JpZE92ZXJsYXlTaG93TGluZU51bWJlcnMsIFdJLlVJ U3RyaW5nKCJMaW5lIE51bWJlcnMiLCAiTGluZSBudW1iZXJzIEAgTGF5b3V0IFBhbmVsIE92ZXJs YXkgT3B0aW9ucyIsICJMYWJlbCBmb3Igb3B0aW9uIHRvIHRvZ2dsZSB0aGUgbGluZSBudW1iZXJz IHNldHRpbmcgZm9yIENTUyBncmlkIG92ZXJsYXlzIikpOworICAgICAgICBzZXR0aW5nc0dyb3Vw LmFkZFNldHRpbmcoV0kuc2V0dGluZ3MuZ3JpZE92ZXJsYXlTaG93TGluZU5hbWVzLCBXSS5VSVN0 cmluZygiTGluZSBOYW1lcyIsICJMaW5lIG5hbWVzIEAgTGF5b3V0IFBhbmVsIE92ZXJsYXkgT3B0 aW9ucyIsICJMYWJlbCBmb3Igb3B0aW9uIHRvIHRvZ2dsZSB0aGUgbGluZSBuYW1lcyBzZXR0aW5n IGZvciBDU1MgZ3JpZCBvdmVybGF5cyIpKTsKKyAgICAgICAgc2V0dGluZ3NHcm91cC5hZGRTZXR0 aW5nKFdJLnNldHRpbmdzLmdyaWRPdmVybGF5U2hvd0FyZWFOYW1lcywgV0kuVUlTdHJpbmcoIkFy ZWEgTmFtZXMiLCAiQXJlYSBuYW1lcyBAIExheW91dCBQYW5lbCBPdmVybGF5IE9wdGlvbnMiLCAi TGFiZWwgZm9yIG9wdGlvbiB0byB0b2dnbGUgdGhlIGFyZWEgbmFtZXMgc2V0dGluZyBmb3IgQ1NT IGdyaWQgb3ZlcmxheXMiKSk7CisgICAgICAgIHNldHRpbmdzR3JvdXAuYWRkU2V0dGluZyhXSS5z ZXR0aW5ncy5ncmlkT3ZlcmxheVNob3dFeHRlbmRlZEdyaWRMaW5lcywgV0kuVUlTdHJpbmcoIkV4 dGVuZGVkIEdyaWQgTGluZXMiLCAiU2hvdyBleHRlbmRlZCBsaW5lcyBAIExheW91dCBQYW5lbCBP dmVybGF5IE9wdGlvbnMiLCAiTGFiZWwgZm9yIG9wdGlvbiB0byB0b2dnbGUgdGhlIGV4dGVuZGVk IGxpbmVzIHNldHRpbmcgZm9yIENTUyBncmlkIG92ZXJsYXlzIikpOworCiAgICAgICAgIGxldCBs aXN0SGVhZGluZyA9IHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJoMiIpKTsKICAgICAgICAgbGlzdEhlYWRpbmcuY2xhc3NMaXN0LmFkZCgiaGVhZGluZyIp OwogICAgICAgICBsaXN0SGVhZGluZy50ZXh0Q29udGVudCA9IFdJLlVJU3RyaW5nKCJHcmlkIE92 ZXJsYXlzIiwgIlBhZ2UgT3ZlcmxheXMgQCBMYXlvdXQgU2lkZWJhciBTZWN0aW9uIEhlYWRlciIs ICJIZWFkaW5nIGZvciBsaXN0IG9mIGdyaWQgbm9kZXMiKTsKIAogICAgICAgICB0aGlzLl9saXN0 RWxlbWVudCA9IHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJ1bCIpKTsKICAgICAgICAgdGhpcy5fbGlzdEVsZW1lbnQuY2xhc3NMaXN0LmFkZCgibm9kZS1v dmVybGF5LWxpc3QiKTsKLQotICAgICAgICBsZXQgc2V0dGluZ3NHcm91cCA9IG5ldyBXSS5TZXR0 aW5nc0dyb3VwKFdJLlVJU3RyaW5nKCJHcmlkIE92ZXJsYXkgU2V0dGluZ3MiLCAiUGFnZSBPdmVy bGF5IFNldHRpbmdzIEAgTGF5b3V0IFBhbmVsIFNlY3Rpb24gSGVhZGVyIiwgIkhlYWRpbmcgZm9y IGxpc3Qgb2YgZ3JpZCBvdmVybGF5IHNldHRpbmdzIikpOwotICAgICAgICB0aGlzLmVsZW1lbnQu YXBwZW5kKHNldHRpbmdzR3JvdXAuZWxlbWVudCk7Ci0KLSAgICAgICAgc2V0dGluZ3NHcm91cC5h ZGRTZXR0aW5nKFdJLnNldHRpbmdzLmdyaWRPdmVybGF5U2hvd0xpbmVOdW1iZXJzLCBXSS5VSVN0 cmluZygiU2hvdyBsaW5lIG51bWJlcnMiLCAiU2hvdyBsaW5lIG51bWJlcnMgQCBMYXllcnMgUGFu ZWwgR3JpZCBPdmVybGF5IFNldHRpbmciLCAiTGFiZWwgZm9yIG9wdGlvbiB0byB0b2dnbGUgdGhl IGxpbmUgbnVtYmVycyBzZXR0aW5nIGZvciBDU1MgZ3JpZCBvdmVybGF5cyIpKTsKLSAgICAgICAg c2V0dGluZ3NHcm91cC5hZGRTZXR0aW5nKFdJLnNldHRpbmdzLmdyaWRPdmVybGF5U2hvd0xpbmVO YW1lcywgV0kuVUlTdHJpbmcoIlNob3cgbGluZSBuYW1lcyIsICJTaG93IGxpbmUgbmFtZXMgQCBM YXllcnMgUGFuZWwgR3JpZCBPdmVybGF5IFNldHRpbmciLCAiTGFiZWwgZm9yIG9wdGlvbiB0byB0 b2dnbGUgdGhlIGxpbmUgbmFtZXMgc2V0dGluZyBmb3IgQ1NTIGdyaWQgb3ZlcmxheXMiKSk7Ci0g ICAgICAgIHNldHRpbmdzR3JvdXAuYWRkU2V0dGluZyhXSS5zZXR0aW5ncy5ncmlkT3ZlcmxheVNo b3dFeHRlbmRlZEdyaWRMaW5lcywgV0kuVUlTdHJpbmcoIlNob3cgZXh0ZW5kZWQgbGluZXMiLCAi U2hvdyBleHRlbmRlZCBsaW5lcyBAIExheWVycyBQYW5lbCBHcmlkIE92ZXJsYXkgU2V0dGluZyIs ICJMYWJlbCBmb3Igb3B0aW9uIHRvIHRvZ2dsZSB0aGUgZXh0ZW5kZWQgbGluZXMgc2V0dGluZyBm b3IgQ1NTIGdyaWQgb3ZlcmxheXMiKSk7Ci0gICAgICAgIHNldHRpbmdzR3JvdXAuYWRkU2V0dGlu ZyhXSS5zZXR0aW5ncy5ncmlkT3ZlcmxheVNob3dBcmVhTmFtZXMsIFdJLlVJU3RyaW5nKCJTaG93 IGFyZWEgbmFtZXMiLCAiU2hvdyBhcmVhIG5hbWVzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3Zlcmxh eSBTZXR0aW5nIiwgIkxhYmVsIGZvciBvcHRpb24gdG8gdG9nZ2xlIHRoZSBhcmVhIG5hbWVzIHNl dHRpbmcgZm9yIENTUyBncmlkIG92ZXJsYXlzIikpOwotICAgICAgICBzZXR0aW5nc0dyb3VwLmFk ZFNldHRpbmcoV0kuc2V0dGluZ3MuZ3JpZE92ZXJsYXlTaG93VHJhY2tTaXplcywgV0kuVUlTdHJp bmcoIlNob3cgdHJhY2sgc2l6ZXMiLCAiU2hvdyB0cmFjayBzaXplcyBAIExheWVycyBQYW5lbCBH cmlkIE92ZXJsYXkgU2V0dGluZyIsICJMYWJlbCBmb3Igb3B0aW9uIHRvIHRvZ2dsZSB0aGUgdHJh Y2sgc2l6ZXMgc2V0dGluZyBmb3IgQ1NTIGdyaWQgb3ZlcmxheXMiKSk7CiAgICAgfQogCiAgICAg bGF5b3V0KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0xheW91dERldGFpbHNTaWRlYmFyUGFuZWwuY3NzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0RGV0YWlsc1NpZGViYXJQYW5lbC5jc3MKaW5k ZXggMDI5MGI5MmU2MDI0YTZmYmNlZThhOWI4YWQwMDQyNTM2MDM1Y2UxYi4uZWUyOWUxZGExOTE0 NDk0NmFmMGY3YWVmNDEzYmNmMjc1NjM3MzkwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0RGV0YWlsc1NpZGViYXJQYW5lbC5jc3MK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0RGV0 YWlsc1NpZGViYXJQYW5lbC5jc3MKQEAgLTI4LDcgKzI4LDcgQEAKICAgICBtYXJnaW4tYm90dG9t OiA0cHg7CiB9CiAKLS5kZXRhaWxzLXNlY3Rpb24ubGF5b3V0LWNzcy1ncmlkID4gLmNvbnRlbnQs CisuZGV0YWlscy1zZWN0aW9uLmxheW91dC1jc3MtZ3JpZDpub3QoLmNvbGxhcHNlZCkgPiAuY29u dGVudCwKIC5kZXRhaWxzLXNlY3Rpb24ubGF5b3V0LWNzcy1ncmlkID4gLmNvbnRlbnQgPiAuZ3Jv dXAgewogICAgIGRpc3BsYXk6IGJsb2NrOwogfQo=