138978 2014-11-21 13:56:16 -0800 Start using the new :not() and :matches() in the Web Inspector 2014-11-21 18:06:32 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin joepeck jonowells timothy oldest_to_newest 1050558 0 benjamin 2014-11-21 13:56:16 -0800 Start using the new :not() and :matches() in the Web Inspector 1050559 1 242069 benjamin 2014-11-21 13:59:49 -0800 Created attachment 242069 Patch 1050647 2 242069 joepeck 2014-11-21 17:08:38 -0800 Comment on attachment 242069 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=242069&action=review r=me > Source/WebInspectorUI/UserInterface/Views/ControlToolbarItem.css:43 > +.toolbar:matches(.icon-and-label-horizontal, .toolbar.icon-only) .item.control { Oops, an extra ".toolbar" was left in here. Should be: .toolbar:matches(.icon-and-label-horizontal, .icon-only) .item.control > Source/WebInspectorUI/UserInterface/Views/DebuggerDashboardView.css:133 > +.toolbar.collapsed .dashboard.debugger > :not(.message, .navigation-bar ) { Nit: You can remove the extra trailing space in the :not. > Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.css:28 > -body.web .toolbar.collapsed .dashboard.default > .time, > -body.web .toolbar.collapsed .dashboard.default > .resourcesSize, > -body.web .toolbar.collapsed .dashboard.default > .logs { > +body.web .toolbar.collapsed .dashboard.default > :matches(.time, .resourcesSize, .logs) { > display: none; > } These are awesome cases. > Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.css:213 > -.toolbar.label-only .dashboard.default > .item, > -.toolbar.small-size.icon-only .dashboard.default > .item, > -.toolbar.small-size.icon-and-label-vertical .dashboard.default > .item, > -.toolbar.small-size.icon-and-label-horizontal .dashboard.default > .item { > +.toolbar:matches(.label-only, .small-size:matches(.icon-only, .icon-and-label-vertical, .icon-and-label-horizontal)) .dashboard.default > .item { These are less awesome because it becomes confusing to read. But I'm fine with it on the few cases. > Source/WebInspectorUI/UserInterface/Views/FindBanner.css:52 > +:matches(.find-banner, .supports-find-banner).no-find-banner-transition { I think in our code we will want to be stylistically consistent and always have :matches as a suffix. So could you change this to: .no-find-banner-transition:matches(.find-banner, .supports-find-banner) { 1050648 3 joepeck 2014-11-21 17:10:13 -0800 Also it is a bit misleading to enable this feature by default in a patch named "use :not and :matches in the inspector". Did you intend to split that up into two patches? 1050660 4 benjamin 2014-11-21 18:06:32 -0800 Committed r176494: <http://trac.webkit.org/changeset/176494> 242069 2014-11-21 13:59:49 -0800 2014-11-21 17:08:38 -0800 Patch bug-138978-20141121140006.patch text/plain 40712 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2NDcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjU3ZGNjOWQ4ZTM0ZTY2 YWZiOTcyYjUwZjUwMDhjYjQzN2NiM2UyOS4uMzc0YzY5Mjg5Yjc0NjJmYjQ0MDQzNzEyM2NhZWNk NzRkNzAxMDAyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE0LTExLTIxICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFN0YXJ0IHVzaW5n IHRoZSBuZXcgOm5vdCgpIGFuZCA6bWF0Y2hlcygpIGluIHRoZSBXZWIgSW5zcGVjdG9yCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg5NzgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVyZSBhcmUgb25s eSBtaW5vciBwZW5kaW5nIGlzc3VlcyBvbiA6bm90KCkgYW5kIDptYXRjaGVzKCkuIFRoZSBmZWVk YmFjaworICAgICAgICBoYXMgb25seSBiZWVuIHBvc2l0aXZlIHNvIGZhci4gSXQgaXMgdGltZSB0 byBtb3ZlIHRoZW0gb3V0IHRoZSBleHBlcmltZW50YWwKKyAgICAgICAgZmxhZy4KKworICAgICAg ICAqIGNzcy9DU1NHcmFtbWFyLnkuaW46CisgICAgICAgICogY3NzL0NTU1BhcnNlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OmRldGVjdEZ1bmN0aW9uVHlwZVRva2VuKToKKyAg ICAgICAgKiBjc3MvQ1NTU2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2ltcGxlU2Vs ZWN0b3JTcGVjaWZpY2l0eUludGVybmFsKToKKyAgICAgICAgKFdlYkNvcmU6OnNpbXBsZVNlbGVj dG9yRnVuY3Rpb25hbFBzZXVkb0NsYXNzU3RhdGljU3BlY2lmaWNpdHkpOgorICAgICAgICAoV2Vi Q29yZTo6YXBwZW5kU2VsZWN0b3JMaXN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1NlbGVjdG9y OjpzZWxlY3RvclRleHQpOgorICAgICAgICAqIGNzcy9DU1NTZWxlY3Rvci5oOgorICAgICAgICAq IGNzcy9TZWxlY3RvckNoZWNrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JDaGVj a2VyOjpjaGVja09uZSk6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3RvckNoZWNrZXI6OmRldGVy bWluZUxpbmtNYXRjaFR5cGUpOgorICAgICAgICAqIGNzcy9TZWxlY3RvclBzZXVkb0NsYXNzQW5k Q29tcGF0aWJpbGl0eUVsZW1lbnRNYXAuaW46CisgICAgICAgICogY3Nzaml0L1NlbGVjdG9yQ29t cGlsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JDb21waWxlcjo6YWRkUHNldWRv Q2xhc3NUeXBlKToKKwogMjAxNC0xMS0yMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t PgogCiAgICAgICAgIFJFR1JFU1NJT04ocjE3NTI1OSkgU2ltcGxlIGxpbmUgbGF5b3V0IHRleHQg bWVhc3VyaW5nIGJlaGF2aW9yIGNoYW5nZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAy YTY1MzVjN2IzMzE4OThkMGVlYTc3ODc2NWI5ZWE2NDkwZmM1NTAyLi40ODFiYTY0MWZlZDJkYmRl YmI5YTA1Y2NjY2U5YzZhNDM0ODJmZDM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw3NiBAQAorMjAxNC0xMS0yMSAgQmVuamFtaW4gUG91bGFpbiAgPGJwb3VsYWluQGFwcGxl LmNvbT4KKworICAgICAgICBTdGFydCB1c2luZyB0aGUgbmV3IDpub3QoKSBhbmQgOm1hdGNoZXMo KSBpbiB0aGUgV2ViIEluc3BlY3RvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTM4OTc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgU3RhcnQgc2ltcGlmeWluZyBzb21lIGRlZmluaXRpb25zIGJ5IHVzaW5n IG1vZGVybiBDU1MuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVj bGFyYXRpb25TZWN0aW9uLmNzczoKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAu c3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3VwICsgLnN0eWxlLWRlY2xhcmF0 aW9uLXNlY3Rpb246bWF0Y2hlcygubGFzdC1pbi1ncm91cCwgOmxhc3QtY2hpbGQpKToKKyAgICAg ICAgKC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uOm1hdGNoZXMoLmxvY2tlZCwgLnNlbGVjdG9y LWxvY2tlZCkgPiAuaGVhZGVyID4gLnNlbGVjdG9yKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRm b3JtLmxlZ2FjeSAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3VwICsgLnN0 eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb246bGFzdC1jaGlsZCk6IERlbGV0ZWQuCisgICAgICAgICgu c3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5zZWxlY3Rvci1sb2NrZWQgPiAuaGVhZGVyID4gLnNl bGVjdG9yKTogRGVsZXRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxl RGVjbGFyYXRpb25UZXh0RWRpdG9yLmNzczoKKyAgICAgICAgKC5jc3Mtc3R5bGUtdGV4dC1lZGl0 b3IgPiAuQ29kZU1pcnJvciAuQ29kZU1pcnJvci1saW5lcyAuY3NzLXN0eWxlLWRlY2xhcmF0aW9u LXByb3BlcnR5Om1hdGNoZXMoLmRpc2FibGVkLCAuaW52YWxpZCwgLm90aGVyLXZlbmRvciwgLm5v dC1pbmhlcml0ZWQsIC5vdmVycmlkZGVuKSk6CisgICAgICAgICguY3NzLXN0eWxlLXRleHQtZWRp dG9yID4gLkNvZGVNaXJyb3IgLkNvZGVNaXJyb3ItbGluZXMgLmNzcy1zdHlsZS1kZWNsYXJhdGlv bi1wcm9wZXJ0eTptYXRjaGVzKC5pbXBsaWNpdCwgLm5vdC1pbmhlcml0ZWQpKToKKyAgICAgICAg KC5jc3Mtc3R5bGUtdGV4dC1lZGl0b3IgPiAuQ29kZU1pcnJvciAuQ29kZU1pcnJvci1saW5lcyAu ZWRpdGluZy1saW5lIC5jc3Mtc3R5bGUtZGVjbGFyYXRpb24tcHJvcGVydHk6bWF0Y2hlcyguZGlz YWJsZWQsIC5vdGhlci12ZW5kb3IsIC5ub3QtaW5oZXJpdGVkLCAub3ZlcnJpZGRlbikpOgorICAg ICAgICAoLmNzcy1zdHlsZS10ZXh0LWVkaXRvciA+IC5Db2RlTWlycm9yIC5Db2RlTWlycm9yLWxp bmVzIC5jc3Mtc3R5bGUtZGVjbGFyYXRpb24tcHJvcGVydHkub3ZlcnJpZGRlbik6IERlbGV0ZWQu CisgICAgICAgICguY3NzLXN0eWxlLXRleHQtZWRpdG9yID4gLkNvZGVNaXJyb3IgLkNvZGVNaXJy b3ItbGluZXMgLmNzcy1zdHlsZS1kZWNsYXJhdGlvbi1wcm9wZXJ0eS5ub3QtaW5oZXJpdGVkKTog RGVsZXRlZC4KKyAgICAgICAgKC5jc3Mtc3R5bGUtdGV4dC1lZGl0b3IgPiAuQ29kZU1pcnJvciAu Q29kZU1pcnJvci1saW5lcyAuZWRpdGluZy1saW5lIC5jc3Mtc3R5bGUtZGVjbGFyYXRpb24tcHJv cGVydHkub3ZlcnJpZGRlbik6IERlbGV0ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9Db250cm9sVG9vbGJhckl0ZW0uY3NzOgorICAgICAgICAoLnRvb2xiYXI6bWF0Y2hlcyguaWNv bi1hbmQtbGFiZWwtaG9yaXpvbnRhbCwgLnRvb2xiYXIuaWNvbi1vbmx5KSAuaXRlbS5jb250cm9s KToKKyAgICAgICAgKC50b29sYmFyLmljb24tb25seSAuaXRlbS5jb250cm9sKTogRGVsZXRlZC4K KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3JhZ2VDb250ZW50Vmlldy5jc3M6 CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EYXNoYm9hcmRDb250YWluZXJWaWV3LmNz czoKKyAgICAgICAgKC50b29sYmFyLmljb24tYW5kLWxhYmVsLXZlcnRpY2FsOm1hdGNoZXMoLnNt YWxsLXNpemUsIC5ub3JtYWwtc2l6ZSkgLmRhc2hib2FyZC1jb250YWluZXIpOgorICAgICAgICAo LnRvb2xiYXI6bWF0Y2hlcygubGFiZWwtb25seSwgLnNtYWxsLXNpemU6bWF0Y2hlcyguaWNvbi1v bmx5LCAuaWNvbi1hbmQtbGFiZWwtdmVydGljYWwsIC5pY29uLWFuZC1sYWJlbC1ob3Jpem9udGFs KSkgLmRhc2hib2FyZC1jb250YWluZXIpOgorICAgICAgICAoLnRvb2xiYXIubm9ybWFsLXNpemU6 bWF0Y2hlcyguaWNvbi1vbmx5LCAuaWNvbi1hbmQtbGFiZWwtdmVydGljYWwsIC5pY29uLWFuZC1s YWJlbC1ob3Jpem9udGFsKSAuZGFzaGJvYXJkLWNvbnRhaW5lcik6CisgICAgICAgICgudG9vbGJh ci5ub3JtYWwtc2l6ZS5pY29uLWFuZC1sYWJlbC12ZXJ0aWNhbCAuZGFzaGJvYXJkLWNvbnRhaW5l cik6IERlbGV0ZWQuCisgICAgICAgICgudG9vbGJhci5zbWFsbC1zaXplLmljb24tYW5kLWxhYmVs LWhvcml6b250YWwgLmRhc2hib2FyZC1jb250YWluZXIpOiBEZWxldGVkLgorICAgICAgICAoLnRv b2xiYXIubm9ybWFsLXNpemUuaWNvbi1hbmQtbGFiZWwtaG9yaXpvbnRhbCAuZGFzaGJvYXJkLWNv bnRhaW5lcik6IERlbGV0ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3Jp ZC5jc3M6CisgICAgICAgICguZGF0YS1ncmlkIDptYXRjaGVzKHRoLCB0ZCk6bm90KDpsYXN0LWNo aWxkKSk6CisgICAgICAgICguZGF0YS1ncmlkIHRoOm1hdGNoZXMoLnNvcnQtYXNjZW5kaW5nLCAu c29ydC1kZXNjZW5kaW5nKSk6CisgICAgICAgICguZGF0YS1ncmlkIDptYXRjaGVzKHRoLCB0ZCkg PiBkaXYpOgorICAgICAgICAoLmRhdGEtZ3JpZCB0aDptYXRjaGVzKC5zb3J0LWFzY2VuZGluZywg LnNvcnQtZGVzY2VuZGluZykgPiBkaXY6Zmlyc3QtY2hpbGQpOgorICAgICAgICAoLmRhdGEtZ3Jp ZCB0cjptYXRjaGVzKC5zZWxlY3RlZCwgOmhvdmVyKSAuZ28tdG8tYXJyb3cpOgorICAgICAgICAo LmRhdGEtZ3JpZCA6LXdlYmtpdC1hbnkodGgsIHRkKTpub3QoOmxhc3QtY2hpbGQpKTogRGVsZXRl ZC4KKyAgICAgICAgKC5kYXRhLWdyaWQgdGg6LXdlYmtpdC1hbnkoLnNvcnQtYXNjZW5kaW5nLCAu c29ydC1kZXNjZW5kaW5nKSk6IERlbGV0ZWQuCisgICAgICAgICguZGF0YS1ncmlkIDotd2Via2l0 LWFueSh0aCwgdGQpID4gZGl2KTogRGVsZXRlZC4KKyAgICAgICAgKC5kYXRhLWdyaWQgdGg6LXdl YmtpdC1hbnkoLnNvcnQtYXNjZW5kaW5nLCAuc29ydC1kZXNjZW5kaW5nKSA+IGRpdjpmaXJzdC1j aGlsZCk6IERlbGV0ZWQuCisgICAgICAgICguZGF0YS1ncmlkIHRyOi13ZWJraXQtYW55KC5zZWxl Y3RlZCwgOmhvdmVyKSAuZ28tdG8tYXJyb3cpOiBEZWxldGVkLgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvRGVidWdnZXJEYXNoYm9hcmRWaWV3LmNzczoKKyAgICAgICAgKC50b29sYmFy LmNvbGxhcHNlZCAuZGFzaGJvYXJkLmRlYnVnZ2VyID4gOm5vdCgubWVzc2FnZSwgLm5hdmlnYXRp b24tYmFyICkpOgorICAgICAgICAoLnRvb2xiYXIuY29sbGFwc2VkIC5kYXNoYm9hcmQuZGVidWdn ZXIgPiA6bm90KC5tZXNzYWdlKTpub3QoLm5hdmlnYXRpb24tYmFyICkpOiBEZWxldGVkLgorICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGVmYXVsdERhc2hib2FyZFZpZXcuY3NzOgorICAg ICAgICAoYm9keS53ZWIgLnRvb2xiYXIuY29sbGFwc2VkIC5kYXNoYm9hcmQuZGVmYXVsdCA+IDpt YXRjaGVzKC50aW1lLCAucmVzb3VyY2VzU2l6ZSwgLmxvZ3MpKToKKyAgICAgICAgKGJvZHkuamF2 YXNjcmlwdCAudG9vbGJhciAuZGFzaGJvYXJkLmRlZmF1bHQgPiA6bWF0Y2hlcygudGltZSwgLnJl c291cmNlc1NpemUsIC5yZXNvdXJjZXNDb3VudCkpOgorICAgICAgICAoLnRvb2xiYXI6bWF0Y2hl cygubGFiZWwtb25seSwgLnNtYWxsLXNpemU6bWF0Y2hlcyguaWNvbi1vbmx5LCAuaWNvbi1hbmQt bGFiZWwtdmVydGljYWwsIC5pY29uLWFuZC1sYWJlbC1ob3Jpem9udGFsKSkgLmRhc2hib2FyZC5k ZWZhdWx0ID4gLml0ZW0pOgorICAgICAgICAoLnRvb2xiYXIubm9ybWFsLXNpemU6bWF0Y2hlcygu aWNvbi1vbmx5LCAuaWNvbi1hbmQtbGFiZWwtdmVydGljYWwsIC5pY29uLWFuZC1sYWJlbC1ob3Jp em9udGFsKSAuZGFzaGJvYXJkLmRlZmF1bHQgPiAuaXRlbSk6CisgICAgICAgIChib2R5LndlYiAu dG9vbGJhci5jb2xsYXBzZWQgLmRhc2hib2FyZC5kZWZhdWx0ID4gLmxvZ3MpOiBEZWxldGVkLgor ICAgICAgICAoYm9keS5qYXZhc2NyaXB0IC50b29sYmFyIC5kYXNoYm9hcmQuZGVmYXVsdCA+IC5y ZXNvdXJjZXNDb3VudCk6IERlbGV0ZWQuCisgICAgICAgICgudG9vbGJhci5zbWFsbC1zaXplLmlj b24tYW5kLWxhYmVsLWhvcml6b250YWwgLmRhc2hib2FyZC5kZWZhdWx0ID4gLml0ZW0pOiBEZWxl dGVkLgorICAgICAgICAoLnRvb2xiYXIubm9ybWFsLXNpemUuaWNvbi1hbmQtbGFiZWwtaG9yaXpv bnRhbCAuZGFzaGJvYXJkLmRlZmF1bHQgPiAuaXRlbSk6IERlbGV0ZWQuCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbi5jc3M6CisgICAgICAgICguZGV0YWlscy1z ZWN0aW9uID4gLmhlYWRlciA+IDptYXRjaGVzKC5ub2RlLWxpbmssIC5nby10by1hcnJvdykpOgor ICAgICAgICAoLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwOm50aC1jaGlsZChl dmVuKSA+IC5yb3c6bWF0Y2hlcyguc2ltcGxlOmZpcnN0LWNoaWxkID4gKiwgOm5vdCguc2ltcGxl KTpmaXJzdC1jaGlsZCkpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kZXRh aWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDptYXRjaGVzKDpudGgtY2hpbGQoZXZlbiks IDpsYXN0LWNoaWxkKSA+IC5yb3cuc2ltcGxlOmxhc3QtY2hpbGQgPiAqKToKKyAgICAgICAgKC5k ZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cCA+IC5yb3c6bWF0Y2hlcyguZW1wdHks IC50ZXh0KSk6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMtc2Vj dGlvbiA+IC5jb250ZW50ID4gLmdyb3VwID4gLnJvdzptYXRjaGVzKC5lbXB0eSwgLnRleHQpKToK KyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gPiAuaGVhZGVyID4gLmdvLXRvLWFycm93KTogRGVs ZXRlZC4KKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDpudGgt Y2hpbGQoZXZlbikgPiAucm93LnNpbXBsZTpmaXJzdC1jaGlsZCA+ICopOiBEZWxldGVkLgorICAg ICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVu dCA+IC5ncm91cDpsYXN0LWNoaWxkID4gLnJvdy5zaW1wbGU6bGFzdC1jaGlsZCA+ICopOiBEZWxl dGVkLgorICAgICAgICAoLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwID4gLnJv dy50ZXh0KTogRGVsZXRlZC4KKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZGV0 YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXAgPiAucm93LnRleHQpOiBEZWxldGVkLgor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5jc3M6CisgICAgICAgICg6 bWF0Y2hlcyguZmluZC1iYW5uZXIsIC5zdXBwb3J0cy1maW5kLWJhbm5lcikubm8tZmluZC1iYW5u ZXItdHJhbnNpdGlvbik6CisgICAgICAgICguc3VwcG9ydHMtZmluZC1iYW5uZXIubm8tZmluZC1i YW5uZXItdHJhbnNpdGlvbik6IERlbGV0ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9GbGV4aWJsZVNwYWNlTmF2aWdhdGlvbkl0ZW0uY3NzOgorICAgICAgICAoOm1hdGNoZXMoLm5h dmlnYXRpb24tYmFyLCAudG9vbGJhcikgLml0ZW0uZmxleGlibGUtc3BhY2UpOgorICAgICAgICAo LnRvb2xiYXIgLml0ZW0uZmxleGlibGUtc3BhY2UpOiBEZWxldGVkLgorCiAyMDE0LTExLTE5ICBK b3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogTGF5b3V0VGVzdHMvaW5zcGVjdG9yIHNob3VsZCBub3QgaGF2ZSBsb2NhbFN0b3JhZ2Ug c2lkZSBlZmZlY3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTR3JhbW1hci55 LmluIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0dyYW1tYXIueS5pbgppbmRleCA2ZmFhMWQ4ZDEy OWIxNDk5MmJhYjY0NDJiZGEwZGU4Yjc5ZjU4ZjYyLi5jZjQxZmNiZmNlNGYyNTU4MjFkN2QxMWY3 NTE5M2ZiNjRhOGY1YzQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTR3JhbW1h ci55LmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NHcmFtbWFyLnkuaW4KQEAgLTU3LDEz ICs1NywxMyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNDU1NUb2tlbkFTdHJpbmcoaW50IHl5dHlw ZSkKICAgICBjYXNlIEFOWUZVTkNUSU9OOgogICAgIGNhc2UgTk9URlVOQ1RJT046CiAgICAgY2Fz ZSBDQUxDRlVOQ1RJT046Ci0gICAgY2FzZSBNSU5GVU5DVElPTjoKKyAgICBjYXNlIE1BVENIRVNG VU5DVElPTjoKICAgICBjYXNlIE1BWEZVTkNUSU9OOgorICAgIGNhc2UgTUlORlVOQ1RJT046CiAg ICAgY2FzZSBOVEhDSElMREZVTkNUSU9OUzoKICAgICBjYXNlIE5USENISUxEU0VMRUNUT1JTRVBB UkFUT1I6CiAjaWYgRU5BQkxFX0NTU19TRUxFQ1RPUlNfTEVWRUw0CiAgICAgY2FzZSBMQU5HRlVO Q1RJT046Ci0gICAgY2FzZSBNQVRDSEVTRlVOQ1RJT046CiAgICAgY2FzZSBST0xFRlVOQ1RJT046 CiAjZW5kaWYKICAgICBjYXNlIFVOSUNPREVSQU5HRToKQEAgLTIyNiwxMyArMjI2LDEzIEBAIHN0 YXRpYyBib29sIHNlbGVjdG9yTGlzdERvZXNOb3RNYXRjaEFueVBzZXVkb0VsZW1lbnQoY29uc3Qg VmVjdG9yPHN0ZDo6dW5pcXVlX3B0CiAldG9rZW4gPHN0cmluZz4gQU5ZRlVOQ1RJT04KICV0b2tl biA8c3RyaW5nPiBOT1RGVU5DVElPTgogJXRva2VuIDxzdHJpbmc+IENBTENGVU5DVElPTgotJXRv a2VuIDxzdHJpbmc+IE1JTkZVTkNUSU9OCisldG9rZW4gPHN0cmluZz4gTUFUQ0hFU0ZVTkNUSU9O CiAldG9rZW4gPHN0cmluZz4gTUFYRlVOQ1RJT04KKyV0b2tlbiA8c3RyaW5nPiBNSU5GVU5DVElP TgogJXRva2VuIDxzdHJpbmc+IE5USENISUxERlVOQ1RJT05TCiAKICNpZiBFTkFCTEVfQ1NTX1NF TEVDVE9SU19MRVZFTDQKICV0b2tlbiA8c3RyaW5nPiBMQU5HRlVOQ1RJT04KLSV0b2tlbiA8c3Ry aW5nPiBNQVRDSEVTRlVOQ1RJT04KICV0b2tlbiA8c3RyaW5nPiBST0xFRlVOQ1RJT04KICNlbmRp ZgogCkBAIC0xMzYzLDYgKzEzNjMsMTcgQEAgcHNldWRvOgogICAgICAgICAgICAgICAgICQkID0g c2VsZWN0b3IucmVsZWFzZSgpOwogICAgICAgICB9CiAgICAgfQorICAgIHwgJzonIE1BVENIRVNG VU5DVElPTiBtYXliZV9zcGFjZSBuZXN0ZWRfc2VsZWN0b3JfbGlzdCBtYXliZV9zcGFjZSAnKScg eworICAgICAgICAkJCA9IG51bGxwdHI7CisgICAgICAgIGlmICgkNCkgeworICAgICAgICAgICAg YXV0byBzZWxlY3RvciA9IHN0ZDo6bWFrZV91bmlxdWU8Q1NTUGFyc2VyU2VsZWN0b3I+KCk7Cisg ICAgICAgICAgICBzZWxlY3Rvci0+c2V0TWF0Y2goQ1NTU2VsZWN0b3I6OlBzZXVkb0NsYXNzKTsK KyAgICAgICAgICAgIHNlbGVjdG9yLT5hZG9wdFNlbGVjdG9yVmVjdG9yKCpzdGQ6OnVuaXF1ZV9w dHI8VmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxDU1NQYXJzZXJTZWxlY3Rvcj4+PigkNCkpOworICAg ICAgICAgICAgc2VsZWN0b3ItPnNldFBzZXVkb0NsYXNzVmFsdWUoJDIpOworICAgICAgICAgICAg aWYgKHNlbGVjdG9yLT5wc2V1ZG9DbGFzc1R5cGUoKSA9PSBDU1NTZWxlY3Rvcjo6UHNldWRvQ2xh c3NNYXRjaGVzKQorICAgICAgICAgICAgICAgICQkID0gc2VsZWN0b3IucmVsZWFzZSgpOworICAg ICAgICB9CisgICAgfQogCiAjaWYgRU5BQkxFX0NTU19TRUxFQ1RPUlNfTEVWRUw0CiAgICAgfCAn OicgTEFOR0ZVTkNUSU9OIG1heWJlX3NwYWNlIGNvbW1hX3NlcGFyYXRlZF9pZGVudGlmaWVycyBt YXliZV9zcGFjZSAnKScgewpAQCAtMTM3NywxOCArMTM4OCw2IEBAIHBzZXVkbzoKICAgICAgICAg fQogICAgIH0KIAotICAgIHwgJzonIE1BVENIRVNGVU5DVElPTiBtYXliZV9zcGFjZSBuZXN0ZWRf c2VsZWN0b3JfbGlzdCBtYXliZV9zcGFjZSAnKScgewotICAgICAgICAkJCA9IG51bGxwdHI7Ci0g ICAgICAgIGlmICgkNCkgewotICAgICAgICAgICAgYXV0byBzZWxlY3RvciA9IHN0ZDo6bWFrZV91 bmlxdWU8Q1NTUGFyc2VyU2VsZWN0b3I+KCk7Ci0gICAgICAgICAgICBzZWxlY3Rvci0+c2V0TWF0 Y2goQ1NTU2VsZWN0b3I6OlBzZXVkb0NsYXNzKTsKLSAgICAgICAgICAgIHNlbGVjdG9yLT5hZG9w dFNlbGVjdG9yVmVjdG9yKCpzdGQ6OnVuaXF1ZV9wdHI8VmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxD U1NQYXJzZXJTZWxlY3Rvcj4+PigkNCkpOwotICAgICAgICAgICAgc2VsZWN0b3ItPnNldFBzZXVk b0NsYXNzVmFsdWUoJDIpOwotICAgICAgICAgICAgaWYgKHNlbGVjdG9yLT5wc2V1ZG9DbGFzc1R5 cGUoKSA9PSBDU1NTZWxlY3Rvcjo6UHNldWRvQ2xhc3NNYXRjaGVzKQotICAgICAgICAgICAgICAg ICQkID0gc2VsZWN0b3IucmVsZWFzZSgpOwotICAgICAgICB9Ci0gICAgfQotCiAgICAgfCAnOicg Uk9MRUZVTkNUSU9OIG1heWJlX3NwYWNlIElERU5UIG1heWJlX3NwYWNlICcpJyB7CiAgICAgICAg ICQkID0gbnVsbHB0cjsKICAgICAgICAgYXV0byBzZWxlY3RvciA9IHN0ZDo6bWFrZV91bmlxdWU8 Q1NTUGFyc2VyU2VsZWN0b3I+KCk7CkBAIC0xNDgzLDkgKzE0ODIsNyBAQCBwc2V1ZG86CiAgICAg ICAgIH0KICAgICAgICAgJCQgPSBzZWxlY3Rvci5yZWxlYXNlKCk7CiAgICAgfQotCiAgICAgLy8g RGVmaW5pdGlvbiBvZiA6bm90KCkuCi0jaWYgRU5BQkxFX0NTU19TRUxFQ1RPUlNfTEVWRUw0CiAg ICAgfCAnOicgTk9URlVOQ1RJT04gbWF5YmVfc3BhY2UgbmVzdGVkX3NlbGVjdG9yX2xpc3QgbWF5 YmVfc3BhY2UgJyknIHsKICAgICAgICAgJCQgPSBudWxscHRyOwogICAgICAgICBpZiAoJDQgJiYg c2VsZWN0b3JMaXN0RG9lc05vdE1hdGNoQW55UHNldWRvRWxlbWVudCgkNCkpIHsKQEAgLTE0OTcs MjEgKzE0OTQsNiBAQCBwc2V1ZG86CiAgICAgICAgICAgICAgICAgJCQgPSBzZWxlY3Rvci5yZWxl YXNlKCk7CiAgICAgICAgIH0KICAgICB9Ci0jZWxzZQotICAgIHwgJzonIE5PVEZVTkNUSU9OIG1h eWJlX3NwYWNlIGNvbXBvdW5kX3NlbGVjdG9yIG1heWJlX3NwYWNlICcpJyB7Ci0gICAgICAgIHN0 ZDo6dW5pcXVlX3B0cjxDU1NQYXJzZXJTZWxlY3Rvcj4gc2VsZWN0b3IoJDQpOwotICAgICAgICAk JCA9IG51bGxwdHI7Ci0gICAgICAgIGlmIChzZWxlY3RvciAmJiBzZWxlY3Rvci0+aXNTaW1wbGUo KSkgewotICAgICAgICAgICAgJCQgPSBuZXcgQ1NTUGFyc2VyU2VsZWN0b3I7Ci0gICAgICAgICAg ICAkJC0+c2V0TWF0Y2goQ1NTU2VsZWN0b3I6OlBzZXVkb0NsYXNzKTsKLQotICAgICAgICAgICAg VmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxDU1NQYXJzZXJTZWxlY3Rvcj4+IHNlbGVjdG9yVmVjdG9y OwotICAgICAgICAgICAgc2VsZWN0b3JWZWN0b3IuYXBwZW5kKFdURjo6bW92ZShzZWxlY3Rvcikp OwotICAgICAgICAgICAgJCQtPmFkb3B0U2VsZWN0b3JWZWN0b3Ioc2VsZWN0b3JWZWN0b3IpOwot ICAgICAgICAgICAgJCQtPnNldFBzZXVkb0NsYXNzVmFsdWUoJDIpOwotICAgICAgICB9Ci0gICAg fQotI2VuZGlmCiAgIDsKIAogZGVjbGFyYXRpb25fbGlzdDoKQEAgLTE4ODksOSArMTg3MSw5IEBA IGludmFsaWRfc3F1YXJlX2JyYWNrZXRzX2Jsb2NrOiAnWycgZXJyb3JfcmVjb3ZlcnkgJ10nIHwg J1snIGVycm9yX3JlY292ZXJ5IFRPS0VOCiBpbnZhbGlkX3BhcmVudGhlc2VzX2Jsb2NrOiBvcGVu aW5nX3BhcmVudGhlc2lzIGVycm9yX3JlY292ZXJ5IGNsb3NpbmdfcGFyZW50aGVzaXM7CiAKIG9w ZW5pbmdfcGFyZW50aGVzaXM6Ci0gICAgJygnIHwgRlVOQ1RJT04gfCBDQUxDRlVOQ1RJT04gfCBN SU5GVU5DVElPTiB8IE1BWEZVTkNUSU9OIHwgQU5ZRlVOQ1RJT04gfCBOT1RGVU5DVElPTgorICAg ICcoJyB8IEZVTkNUSU9OIHwgQ0FMQ0ZVTkNUSU9OIHwgTUFUQ0hFU0ZVTkNUSU9OIHwgTUFYRlVO Q1RJT04gfCBNSU5GVU5DVElPTiB8IEFOWUZVTkNUSU9OIHwgTk9URlVOQ1RJT04KICNpZiBFTkFC TEVfQ1NTX1NFTEVDVE9SU19MRVZFTDQKLSAgICB8IExBTkdGVU5DVElPTiB8IE1BVENIRVNGVU5D VElPTiB8IFJPTEVGVU5DVElPTgorICAgIHwgTEFOR0ZVTkNUSU9OIHwgUk9MRUZVTkNUSU9OCiAj ZW5kaWYKICNpZiBFTkFCTEVfVklERU9fVFJBQ0sKICAgICB8IENVRUZVTkNUSU9OCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NQYXJzZXIuY3BwCmluZGV4IDllYzIxNzg5NDk5MWQxM2YzZWE2ODQ2NTQwNWNkODFmNGZk M2JiNmIuLjBmNDYzMWNhNGFlMDkwNzFmMWY5Mjc5YmNiNzA1MzQ0MWQ1ODcxOGIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NQYXJzZXIuY3BwCkBAIC0xMDcxMSwxNCArMTA3MTEsMTIgQEAgaW5saW5lIGJvb2wg Q1NTUGFyc2VyOjpkZXRlY3RGdW5jdGlvblR5cGVUb2tlbihpbnQgbGVuZ3RoKQogI2VuZGlmCiAg ICAgICAgIHJldHVybiBmYWxzZTsKIAotI2lmIEVOQUJMRShDU1NfU0VMRUNUT1JTX0xFVkVMNCkK ICAgICBjYXNlIDc6CiAgICAgICAgIGlmIChpc0VxdWFsVG9DU1NJZGVudGlmaWVyKG5hbWUsICJt YXRjaGVzIikpIHsKICAgICAgICAgICAgIG1fdG9rZW4gPSBNQVRDSEVTRlVOQ1RJT047CiAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0j ZW5kaWYKIAogICAgIGNhc2UgOToKICAgICAgICAgaWYgKGlzRXF1YWxUb0NTU0lkZW50aWZpZXIo bmFtZSwgIm50aC1jaGlsZCIpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT U2VsZWN0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1NlbGVjdG9yLmNwcAppbmRleCA3 YTIyMjNmNTZlYjc1NWYyNzc4NzJmMTliZWE1MjgxZGYzNmVkNDNmLi4wMTIxZWZmODVlN2M0NDQx MTQzZmI2NGIzYTNkZWEyNzQ5OTVkMWQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTU2VsZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTZWxlY3Rvci5jcHAK QEAgLTg5LDcgKzg5LDYgQEAgc3RhdGljIHVuc2lnbmVkIHNpbXBsZVNlbGVjdG9yU3BlY2lmaWNp dHlJbnRlcm5hbChjb25zdCBDU1NTZWxlY3RvciYgc2ltcGxlU2VsZWMKICAgICBjYXNlIENTU1Nl bGVjdG9yOjpQYWdlUHNldWRvQ2xhc3M6CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQ1NTU2Vs ZWN0b3I6OlBzZXVkb0NsYXNzOgotI2lmIEVOQUJMRShDU1NfU0VMRUNUT1JTX0xFVkVMNCkKICAg ICAgICAgaWYgKHNpbXBsZVNlbGVjdG9yLnBzZXVkb0NsYXNzVHlwZSgpID09IENTU1NlbGVjdG9y OjpQc2V1ZG9DbGFzc01hdGNoZXMpIHsKICAgICAgICAgICAgIEFTU0VSVF9XSVRIX01FU1NBR0Uo c2ltcGxlU2VsZWN0b3Iuc2VsZWN0b3JMaXN0KCkgJiYgc2ltcGxlU2VsZWN0b3Iuc2VsZWN0b3JM aXN0KCktPmZpcnN0KCksICJUaGUgcGFyc2VyIHNob3VsZCBuZXZlciBnZW5lcmF0ZSBhIHZhbGlk IHNlbGVjdG9yIGZvciBhbiBlbXB0eSA6bWF0Y2hlcygpLiIpOwogICAgICAgICAgICAgaWYgKCFp c0NvbXB1dGluZ01heGltdW1TcGVjaWZpY2l0eSkKQEAgLTEwMiwxMSArMTAxLDYgQEAgc3RhdGlj IHVuc2lnbmVkIHNpbXBsZVNlbGVjdG9yU3BlY2lmaWNpdHlJbnRlcm5hbChjb25zdCBDU1NTZWxl Y3RvciYgc2ltcGxlU2VsZWMKICAgICAgICAgICAgIHJldHVybiBtYXhTcGVjaWZpY2l0eSgqc2lt cGxlU2VsZWN0b3Iuc2VsZWN0b3JMaXN0KCkpOwogICAgICAgICB9CiAgICAgICAgIEZBTExUSFJP VUdIOwotI2Vsc2UKLSAgICAgICAgaWYgKHNpbXBsZVNlbGVjdG9yLnBzZXVkb0NsYXNzVHlwZSgp ID09IENTU1NlbGVjdG9yOjpQc2V1ZG9DbGFzc05vdCAmJiBzaW1wbGVTZWxlY3Rvci5zZWxlY3Rv ckxpc3QoKSkKLSAgICAgICAgICAgIHJldHVybiBzaW1wbGVTZWxlY3Rvci5zZWxlY3Rvckxpc3Qo KS0+Zmlyc3QoKS0+c2ltcGxlU2VsZWN0b3JTcGVjaWZpY2l0eSgpOwotICAgICAgICBGQUxMVEhS T1VHSDsKLSNlbmRpZgogICAgIGNhc2UgQ1NTU2VsZWN0b3I6OkV4YWN0OgogICAgIGNhc2UgQ1NT U2VsZWN0b3I6OkNsYXNzOgogICAgIGNhc2UgQ1NTU2VsZWN0b3I6OlNldDoKQEAgLTEzNiw3ICsx MzAsNiBAQCBzdGF0aWMgdW5zaWduZWQgc3RhdGljU3BlY2lmaWNpdHlJbnRlcm5hbChjb25zdCBD U1NTZWxlY3RvciYgZmlyc3RTaW1wbGVTZWxlY3RvcgogCiBzdGF0aWMgdW5zaWduZWQgc2ltcGxl U2VsZWN0b3JGdW5jdGlvbmFsUHNldWRvQ2xhc3NTdGF0aWNTcGVjaWZpY2l0eShjb25zdCBDU1NT ZWxlY3RvciYgc2ltcGxlU2VsZWN0b3IsIGJvb2wmIG9rKQogewotI2lmIEVOQUJMRShDU1NfU0VM RUNUT1JTX0xFVkVMNCkKICAgICBpZiAoc2ltcGxlU2VsZWN0b3IubWF0Y2goKSA9PSBDU1NTZWxl Y3Rvcjo6UHNldWRvQ2xhc3MpIHsKICAgICAgICAgaWYgKHNpbXBsZVNlbGVjdG9yLnBzZXVkb0Ns YXNzVHlwZSgpID09IENTU1NlbGVjdG9yOjpQc2V1ZG9DbGFzc01hdGNoZXMpIHsKICAgICAgICAg ICAgIGNvbnN0IENTU1NlbGVjdG9yTGlzdCYgc2VsZWN0b3JMaXN0ID0gKnNpbXBsZVNlbGVjdG9y LnNlbGVjdG9yTGlzdCgpOwpAQCAtMTU3LDcgKzE1MCw2IEBAIHN0YXRpYyB1bnNpZ25lZCBzaW1w bGVTZWxlY3RvckZ1bmN0aW9uYWxQc2V1ZG9DbGFzc1N0YXRpY1NwZWNpZmljaXR5KGNvbnN0IENT U1NlCiAgICAgICAgICAgICByZXR1cm4gaW5pdGlhbFNwZWNpZmljaXR5OwogICAgICAgICB9CiAg ICAgfQotI2VuZGlmCiAgICAgcmV0dXJuIDA7CiB9CiAKQEAgLTM1NCw2ICszNDYsNyBAQCBzdGF0 aWMgdm9pZCBhcHBlbmRBcmd1bWVudExpc3QoU3RyaW5nQnVpbGRlciYgc3RyLCBjb25zdCBWZWN0 b3I8QXRvbWljU3RyaW5nPiYgYQogICAgICAgICAgICAgc3RyLmFwcGVuZExpdGVyYWwoIiwgIik7 CiAgICAgfQogfQorI2VuZGlmCiAKIHN0YXRpYyB2b2lkIGFwcGVuZFNlbGVjdG9yTGlzdChTdHJp bmdCdWlsZGVyJiBzdHIsIGNvbnN0IENTU1NlbGVjdG9yTGlzdCogc2VsZWN0b3JMaXN0KQogewpA QCAtMzY0LDcgKzM1Nyw2IEBAIHN0YXRpYyB2b2lkIGFwcGVuZFNlbGVjdG9yTGlzdChTdHJpbmdC dWlsZGVyJiBzdHIsIGNvbnN0IENTU1NlbGVjdG9yTGlzdCogc2VsZWN0CiAgICAgICAgIHN0ci5h cHBlbmQoc3ViU2VsZWN0b3ItPnNlbGVjdG9yVGV4dCgpKTsKICAgICB9CiB9Ci0jZW5kaWYKIAog U3RyaW5nIENTU1NlbGVjdG9yOjpzZWxlY3RvclRleHQoY29uc3QgU3RyaW5nJiByaWdodFNpZGUp IGNvbnN0CiB7CkBAIC01MjAsMTIgKzUxMiw3IEBAIFN0cmluZyBDU1NTZWxlY3Rvcjo6c2VsZWN0 b3JUZXh0KGNvbnN0IFN0cmluZyYgcmlnaHRTaWRlKSBjb25zdAogICAgICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICAgICAgY2FzZSBDU1NTZWxlY3Rvcjo6UHNldWRvQ2xhc3NOb3Q6CiAgICAg ICAgICAgICAgICAgc3RyLmFwcGVuZExpdGVyYWwoIjpub3QoIik7Ci0jaWYgRU5BQkxFKENTU19T RUxFQ1RPUlNfTEVWRUw0KQogICAgICAgICAgICAgICAgIGFwcGVuZFNlbGVjdG9yTGlzdChzdHIs IGNzLT5zZWxlY3Rvckxpc3QoKSk7Ci0jZWxzZQotICAgICAgICAgICAgICAgIGlmIChjb25zdCBD U1NTZWxlY3Rvckxpc3QqIHNlbGVjdG9yTGlzdCA9IGNzLT5zZWxlY3Rvckxpc3QoKSkKLSAgICAg ICAgICAgICAgICAgICAgc3RyLmFwcGVuZChzZWxlY3Rvckxpc3QtPmZpcnN0KCktPnNlbGVjdG9y VGV4dCgpKTsKLSNlbmRpZgogICAgICAgICAgICAgICAgIHN0ci5hcHBlbmQoJyknKTsKICAgICAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgQ1NTU2VsZWN0b3I6OlBzZXVkb0Ns YXNzTnRoQ2hpbGQ6CkBAIC01NzEsNyArNTU4LDYgQEAgU3RyaW5nIENTU1NlbGVjdG9yOjpzZWxl Y3RvclRleHQoY29uc3QgU3RyaW5nJiByaWdodFNpZGUpIGNvbnN0CiAgICAgICAgICAgICBjYXNl IENTU1NlbGVjdG9yOjpQc2V1ZG9DbGFzc09wdGlvbmFsOgogICAgICAgICAgICAgICAgIHN0ci5h cHBlbmRMaXRlcmFsKCI6b3B0aW9uYWwiKTsKICAgICAgICAgICAgICAgICBicmVhazsKLSNpZiBF TkFCTEUoQ1NTX1NFTEVDVE9SU19MRVZFTDQpCiAgICAgICAgICAgICBjYXNlIENTU1NlbGVjdG9y OjpQc2V1ZG9DbGFzc01hdGNoZXM6IHsKICAgICAgICAgICAgICAgICBzdHIuYXBwZW5kTGl0ZXJh bCgiOm1hdGNoZXMoIik7CiAgICAgICAgICAgICAgICAgYXBwZW5kU2VsZWN0b3JMaXN0KHN0ciwg Y3MtPnNlbGVjdG9yTGlzdCgpKTsKQEAgLTU4MSw3ICs1NjcsNiBAQCBTdHJpbmcgQ1NTU2VsZWN0 b3I6OnNlbGVjdG9yVGV4dChjb25zdCBTdHJpbmcmIHJpZ2h0U2lkZSkgY29uc3QKICAgICAgICAg ICAgIGNhc2UgQ1NTU2VsZWN0b3I6OlBzZXVkb0NsYXNzUGxhY2Vob2xkZXJTaG93bjoKICAgICAg ICAgICAgICAgICBzdHIuYXBwZW5kTGl0ZXJhbCgiOnBsYWNlaG9sZGVyLXNob3duIik7CiAgICAg ICAgICAgICAgICAgYnJlYWs7Ci0jZW5kaWYKICAgICAgICAgICAgIGNhc2UgQ1NTU2VsZWN0b3I6 OlBzZXVkb0NsYXNzT3V0T2ZSYW5nZToKICAgICAgICAgICAgICAgICBzdHIuYXBwZW5kTGl0ZXJh bCgiOm91dC1vZi1yYW5nZSIpOwogICAgICAgICAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvY3NzL0NTU1NlbGVjdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT U2VsZWN0b3IuaAppbmRleCA1YTZkOGMwOGYxMmFhNTVjMDJiYjNhZjljZDAzODgyNTc3M2M4YzFi Li44NTIyN2FkZDIzYTZjN2E5YjQ5YjhjZjY2M2E4NGExMDBiZGZmNDQ0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTU2VsZWN0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTU2VsZWN0b3IuaApAQCAtMTIyLDkgKzEyMiw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAg ICAgICAgICAgIFBzZXVkb0NsYXNzRGlzYWJsZWQsCiAgICAgICAgICAgICBQc2V1ZG9DbGFzc09w dGlvbmFsLAogI2lmIEVOQUJMRShDU1NfU0VMRUNUT1JTX0xFVkVMNCkKLSAgICAgICAgICAgIFBz ZXVkb0NsYXNzTWF0Y2hlcywKICAgICAgICAgICAgIFBzZXVkb0NsYXNzUGxhY2Vob2xkZXJTaG93 biwKICNlbmRpZgorICAgICAgICAgICAgUHNldWRvQ2xhc3NNYXRjaGVzLAogICAgICAgICAgICAg UHNldWRvQ2xhc3NSZXF1aXJlZCwKICAgICAgICAgICAgIFBzZXVkb0NsYXNzUmVhZE9ubHksCiAg ICAgICAgICAgICBQc2V1ZG9DbGFzc1JlYWRXcml0ZSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1NlbGVjdG9y Q2hlY2tlci5jcHAKaW5kZXggZGVkZGZmNWFkM2RmNjViZmFmMjQ2NTBkMDA5ODMzNzczODMxNGM2 MC4uMzA3MjI1MTFmOWY5Y2Y3M2M0NDViMjVhNzRhYmM3MzgyMTI3ZmFiOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvY3NzL1NlbGVjdG9yQ2hlY2tlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvY3NzL1NlbGVjdG9yQ2hlY2tlci5jcHAKQEAgLTU3NiwxMiArNTc2LDYgQEAgYm9vbCBTZWxl Y3RvckNoZWNrZXI6OmNoZWNrT25lKGNvbnN0IENoZWNraW5nQ29udGV4dFdpdGhTdGF0dXMmIGNv bnRleHQsIFBzZXVkb0kKICAgICAgICAgaWYgKHNlbGVjdG9yLT5wc2V1ZG9DbGFzc1R5cGUoKSA9 PSBDU1NTZWxlY3Rvcjo6UHNldWRvQ2xhc3NOb3QpIHsKICAgICAgICAgICAgIGNvbnN0IENTU1Nl bGVjdG9yTGlzdCogc2VsZWN0b3JMaXN0ID0gc2VsZWN0b3ItPnNlbGVjdG9yTGlzdCgpOwogCi0j aWYgIUVOQUJMRShDU1NfU0VMRUNUT1JTX0xFVkVMNCkKLSAgICAgICAgICAgIC8vIEZJWE1FOiBX ZSBwcm9iYWJseSBzaG91bGQgZml4IHRoZSBwYXJzZXIgYW5kIG1ha2UgaXQgbmV2ZXIgcHJvZHVj ZSA6bm90IHJ1bGVzIHdpdGggbWlzc2luZyBzZWxlY3RvciBsaXN0LgotICAgICAgICAgICAgaWYg KCFzZWxlY3Rvckxpc3QpCi0gICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotI2VuZGlmCi0K ICAgICAgICAgICAgIGZvciAoY29uc3QgQ1NTU2VsZWN0b3IqIHN1YnNlbGVjdG9yID0gc2VsZWN0 b3JMaXN0LT5maXJzdCgpOyBzdWJzZWxlY3Rvcjsgc3Vic2VsZWN0b3IgPSBDU1NTZWxlY3Rvckxp c3Q6Om5leHQoc3Vic2VsZWN0b3IpKSB7CiAgICAgICAgICAgICAgICAgQ2hlY2tpbmdDb250ZXh0 V2l0aFN0YXR1cyBzdWJjb250ZXh0KGNvbnRleHQpOwogICAgICAgICAgICAgICAgIHN1YmNvbnRl eHQuaW5GdW5jdGlvbmFsUHNldWRvQ2xhc3MgPSB0cnVlOwpAQCAtNTkxLDMwICs1ODUsMTIgQEAg Ym9vbCBTZWxlY3RvckNoZWNrZXI6OmNoZWNrT25lKGNvbnN0IENoZWNraW5nQ29udGV4dFdpdGhT dGF0dXMmIGNvbnRleHQsIFBzZXVkb0kKICAgICAgICAgICAgICAgICBQc2V1ZG9JZFNldCBpZ25v cmVEeW5hbWljUHNldWRvOwogCiAgICAgICAgICAgICAgICAgdW5zaWduZWQgaWdub3JlZFNwZWNp ZmljaXR5OwotI2lmIEVOQUJMRShDU1NfU0VMRUNUT1JTX0xFVkVMNCkKICAgICAgICAgICAgICAg ICBpZiAobWF0Y2hSZWN1cnNpdmVseShzdWJjb250ZXh0LCBpZ25vcmVEeW5hbWljUHNldWRvLCBp Z25vcmVkU3BlY2lmaWNpdHkpLm1hdGNoID09IE1hdGNoOjpTZWxlY3Rvck1hdGNoZXMpIHsKICAg ICAgICAgICAgICAgICAgICAgQVNTRVJUKCFpZ25vcmVEeW5hbWljUHNldWRvKTsKICAgICAgICAg ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgICAgIH0KLSNlbHNlCi0gICAg ICAgICAgICAgICAgaWYgKHN1YmNvbnRleHQuc2VsZWN0b3ItPm1hdGNoKCkgPT0gQ1NTU2VsZWN0 b3I6OlBzZXVkb0NsYXNzKSB7Ci0gICAgICAgICAgICAgICAgICAgIC8vIDpub3QgY2Fubm90IG5l c3QuIEkgZG9uJ3QgcmVhbGx5IGtub3cgd2h5IHRoaXMgaXMgYQotICAgICAgICAgICAgICAgICAg ICAvLyByZXN0cmljdGlvbiBpbiBDU1MzLCBidXQgaXQgaXMsIHNvIGxldCdzIGhvbm9yIGl0Lgot ICAgICAgICAgICAgICAgICAgICAvLyB0aGUgcGFyc2VyIGVuZm9yY2VzIHRoYXQgdGhpcyBuZXZl ciBvY2N1cnMKLSAgICAgICAgICAgICAgICAgICAgQVNTRVJUKHN1YmNvbnRleHQuc2VsZWN0b3It PnBzZXVkb0NsYXNzVHlwZSgpICE9IENTU1NlbGVjdG9yOjpQc2V1ZG9DbGFzc05vdCk7Ci0gICAg ICAgICAgICAgICAgICAgIC8vIFdlIHNlbGVjdCBiZXR3ZWVuIDp2aXNpdGVkIGFuZCA6bGluayB3 aGVuIGFwcGx5aW5nLiBXZSBkb24ndCBrbm93IHdoaWNoIG9uZSBhcHBsaWVkIChvciBub3QpIHll dC4KLSAgICAgICAgICAgICAgICAgICAgaWYgKHN1YmNvbnRleHQuc2VsZWN0b3ItPnBzZXVkb0Ns YXNzVHlwZSgpID09IENTU1NlbGVjdG9yOjpQc2V1ZG9DbGFzc1Zpc2l0ZWQpCi0gICAgICAgICAg ICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAg ICAgICAgLy8gU2luY2UgOm5vdCBjYW5ub3QgY29udGFpbiBwc2V1ZG8gZWxlbWVudHMsIHRoZXJl J3Mgbm8gZWZmZWN0IG9uIG1hdGNoVHlwZS4KLSAgICAgICAgICAgICAgICBNYXRjaFR5cGUgaWdu b3JlTWF0Y2hUeXBlID0gTWF0Y2hUeXBlOjpFbGVtZW50OwotICAgICAgICAgICAgICAgIGlmICgh Y2hlY2tPbmUoc3ViY29udGV4dCwgaWdub3JlRHluYW1pY1BzZXVkbywgaWdub3JlTWF0Y2hUeXBl LCBpZ25vcmVkU3BlY2lmaWNpdHkpKQotICAgICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsK LSNlbmRpZgogICAgICAgICAgICAgfQotI2lmIEVOQUJMRShDU1NfU0VMRUNUT1JTX0xFVkVMNCkK ICAgICAgICAgICAgIHJldHVybiB0cnVlOwotI2VuZGlmCiAgICAgICAgIH0gZWxzZSBpZiAoY29u dGV4dC5oYXNTY3JvbGxiYXJQc2V1ZG8pIHsKICAgICAgICAgICAgIC8vIENTUyBzY3JvbGxiYXJz IG1hdGNoIGEgc3BlY2lmaWMgc3Vic2V0IG9mIHBzZXVkbyBjbGFzc2VzLCBhbmQgdGhleSBoYXZl IHNwZWNpYWxpemVkIHJ1bGVzIGZvciBlYWNoCiAgICAgICAgICAgICAvLyAoc2luY2UgdGhlcmUg YXJlIG5vIGVsZW1lbnRzIGludm9sdmVkIGV4Y2VwdCB3aXRoIHdpbmRvdy1pbmFjdGl2ZSkuCkBA IC03MjIsNyArNjk4LDYgQEAgYm9vbCBTZWxlY3RvckNoZWNrZXI6OmNoZWNrT25lKGNvbnN0IENo ZWNraW5nQ29udGV4dFdpdGhTdGF0dXMmIGNvbnRleHQsIFBzZXVkb0kKICAgICAgICAgICAgICAg ICByZXR1cm4gaXNGaXJzdE9mVHlwZShlbGVtZW50LCBlbGVtZW50LT50YWdRTmFtZSgpLCBjb250 ZXh0LnJlc29sdmluZ01vZGUgPT0gTW9kZTo6UmVzb2x2aW5nU3R5bGUpICYmIGlzTGFzdE9mVHlw ZShlbGVtZW50LCBlbGVtZW50LT50YWdRTmFtZSgpKTsKICAgICAgICAgICAgIH0KICAgICAgICAg ICAgIGJyZWFrOwotI2lmIEVOQUJMRShDU1NfU0VMRUNUT1JTX0xFVkVMNCkKICAgICAgICAgY2Fz ZSBDU1NTZWxlY3Rvcjo6UHNldWRvQ2xhc3NNYXRjaGVzOgogICAgICAgICAgICAgewogICAgICAg ICAgICAgICAgIGJvb2wgaGFzTWF0Y2hlZEFueXRoaW5nID0gZmFsc2U7CkBAIC03NTQsNyArNzI5 LDcgQEAgYm9vbCBTZWxlY3RvckNoZWNrZXI6OmNoZWNrT25lKGNvbnN0IENoZWNraW5nQ29udGV4 dFdpdGhTdGF0dXMmIGNvbnRleHQsIFBzZXVkb0kKICAgICAgICAgICAgICAgICB9CiAgICAgICAg ICAgICAgICAgcmV0dXJuIGhhc01hdGNoZWRBbnl0aGluZzsKICAgICAgICAgICAgIH0KLQorI2lm IEVOQUJMRShDU1NfU0VMRUNUT1JTX0xFVkVMNCkKICAgICAgICAgY2FzZSBDU1NTZWxlY3Rvcjo6 UHNldWRvQ2xhc3NQbGFjZWhvbGRlclNob3duOgogICAgICAgICAgICAgaWYgKGlzPEhUTUxUZXh0 Rm9ybUNvbnRyb2xFbGVtZW50PigqZWxlbWVudCkpIHsKICAgICAgICAgICAgICAgICBpZiAoY29u dGV4dC5yZXNvbHZpbmdNb2RlID09IE1vZGU6OlJlc29sdmluZ1N0eWxlKSB7CkBAIC0xMTIwLDI2 ICsxMDk1LDYgQEAgdW5zaWduZWQgU2VsZWN0b3JDaGVja2VyOjpkZXRlcm1pbmVMaW5rTWF0Y2hU eXBlKGNvbnN0IENTU1NlbGVjdG9yKiBzZWxlY3RvcikKICAgICBmb3IgKDsgc2VsZWN0b3I7IHNl bGVjdG9yID0gc2VsZWN0b3ItPnRhZ0hpc3RvcnkoKSkgewogICAgICAgICBpZiAoc2VsZWN0b3It Pm1hdGNoKCkgPT0gQ1NTU2VsZWN0b3I6OlBzZXVkb0NsYXNzKSB7CiAgICAgICAgICAgICBzd2l0 Y2ggKHNlbGVjdG9yLT5wc2V1ZG9DbGFzc1R5cGUoKSkgewotI2lmISBFTkFCTEUoQ1NTX1NFTEVD VE9SU19MRVZFTDQpCi0gICAgICAgICAgICBjYXNlIENTU1NlbGVjdG9yOjpQc2V1ZG9DbGFzc05v dDoKLSAgICAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICAgIC8vIDpub3QoOnZpc2l0 ZWQpIGlzIGVxdWl2YWxlbnQgdG8gOmxpbmsuIFBhcnNlciBlbmZvcmNlcyB0aGF0IDpub3QgY2Fu J3QgbmVzdC4KLSAgICAgICAgICAgICAgICAgICAgY29uc3QgQ1NTU2VsZWN0b3JMaXN0KiBzZWxl Y3Rvckxpc3QgPSBzZWxlY3Rvci0+c2VsZWN0b3JMaXN0KCk7Ci0gICAgICAgICAgICAgICAgICAg IGlmICghc2VsZWN0b3JMaXN0KQotICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0KLSAg ICAgICAgICAgICAgICAgICAgZm9yIChjb25zdCBDU1NTZWxlY3Rvciogc3ViU2VsZWN0b3IgPSBz ZWxlY3Rvckxpc3QtPmZpcnN0KCk7IHN1YlNlbGVjdG9yOyBzdWJTZWxlY3RvciA9IHN1YlNlbGVj dG9yLT50YWdIaXN0b3J5KCkpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlmIChzdWJTZWxl Y3Rvci0+bWF0Y2goKSA9PSBDU1NTZWxlY3Rvcjo6UHNldWRvQ2xhc3MpIHsKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICBDU1NTZWxlY3Rvcjo6UHNldWRvQ2xhc3NUeXBlIHN1YlR5cGUgPSBz dWJTZWxlY3Rvci0+cHNldWRvQ2xhc3NUeXBlKCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgaWYgKHN1YlR5cGUgPT0gQ1NTU2VsZWN0b3I6OlBzZXVkb0NsYXNzVmlzaXRlZCkKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgbGlua01hdGNoVHlwZSAmPSB+U2VsZWN0b3JDaGVj a2VyOjpNYXRjaFZpc2l0ZWQ7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgZWxzZSBpZiAo c3ViVHlwZSA9PSBDU1NTZWxlY3Rvcjo6UHNldWRvQ2xhc3NMaW5rKQotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBsaW5rTWF0Y2hUeXBlICY9IH5TZWxlY3RvckNoZWNrZXI6Ok1hdGNo TGluazsKLSAgICAgICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAgICAgfQot ICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICBicmVhazsKLSNlbmRpZgogICAgICAg ICAgICAgY2FzZSBDU1NTZWxlY3Rvcjo6UHNldWRvQ2xhc3NMaW5rOgogICAgICAgICAgICAgICAg IGxpbmtNYXRjaFR5cGUgJj0gflNlbGVjdG9yQ2hlY2tlcjo6TWF0Y2hWaXNpdGVkOwogICAgICAg ICAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1NlbGVjdG9y UHNldWRvQ2xhc3NBbmRDb21wYXRpYmlsaXR5RWxlbWVudE1hcC5pbiBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9TZWxlY3RvclBzZXVkb0NsYXNzQW5kQ29tcGF0aWJpbGl0eUVsZW1lbnRNYXAuaW4KaW5k ZXggZTMwZDZmZTU5MTg1NDhjOTc2ODU1MDVkNTE5N2Q1NDM0MTcxZTJmNy4uN2U5MWIwZTk0NDc1 NmNjNmVmMjM1YWRiOGI4YjkzNDJhYjQ3OGRhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Y3NzL1NlbGVjdG9yUHNldWRvQ2xhc3NBbmRDb21wYXRpYmlsaXR5RWxlbWVudE1hcC5pbgorKysg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JQc2V1ZG9DbGFzc0FuZENvbXBhdGliaWxpdHlF bGVtZW50TWFwLmluCkBAIC0zNCw2ICszNCw3IEBAIGxhbmcoCiBsYXN0LWNoaWxkCiBsYXN0LW9m LXR5cGUKIGxpbmsKK21hdGNoZXMoCiBuby1idXR0b24KIG5vdCgKIG50aC1jaGlsZCgKQEAgLTQ2 LDcgKzQ3LDYgQEAgb3B0aW9uYWwKIG91dC1vZi1yYW5nZQogI2lmIEVOQUJMRShDU1NfU0VMRUNU T1JTX0xFVkVMNCkKIHBsYWNlaG9sZGVyLXNob3duCi1tYXRjaGVzKAogI2VuZGlmCiByZWFkLW9u bHkKIHJlYWQtd3JpdGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzc2ppdC9TZWxlY3Rv ckNvbXBpbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzc2ppdC9TZWxlY3RvckNvbXBpbGVyLmNw cAppbmRleCAyOTYxZWFhOTNiYzEwNGUwMjg1ZDE3MGE0MWRiNjNlM2U4NTYwYmM1Li4wOTQyNDIz NDI3MWM5NjdiMmNhZGEzMmUzMjI5ZjI2NmQ1Mjk0ODE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9jc3NqaXQvU2VsZWN0b3JDb21waWxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3Nz aml0L1NlbGVjdG9yQ29tcGlsZXIuY3BwCkBAIC03NTYsNyArNzU2LDYgQEAgc3RhdGljIGlubGlu ZSBGdW5jdGlvblR5cGUgYWRkUHNldWRvQ2xhc3NUeXBlKGNvbnN0IENTU1NlbGVjdG9yJiBzZWxl Y3RvciwgU2VsZWMKICNlbmRpZgogICAgICAgICB9CiAKLSNpZiBFTkFCTEUoQ1NTX1NFTEVDVE9S U19MRVZFTDQpCiAgICAgY2FzZSBDU1NTZWxlY3Rvcjo6UHNldWRvQ2xhc3NNYXRjaGVzOgogICAg ICAgICB7CiAgICAgICAgICAgICBTZWxlY3Rvckxpc3QgbWF0Y2hlc0xpc3Q7CkBAIC04MDQsNyAr ODAzLDYgQEAgc3RhdGljIGlubGluZSBGdW5jdGlvblR5cGUgYWRkUHNldWRvQ2xhc3NUeXBlKGNv bnN0IENTU1NlbGVjdG9yJiBzZWxlY3RvciwgU2VsZWMKIAogICAgICAgICAgICAgcmV0dXJuIGZ1 bmN0aW9uVHlwZTsKICAgICAgICAgfQotI2VuZGlmCiAKICAgICBjYXNlIENTU1NlbGVjdG9yOjpQ c2V1ZG9DbGFzc1Vua25vd246CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVE ZWNsYXJhdGlvblNlY3Rpb24uY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uY3NzCmluZGV4IDY5MjEzMmEzN2Qx YWQxN2Y4N2M4NDVhNmViZDVmMTI1YzM0ZWQ3MDYuLmI2YzRjZTc1OTgxZTZkMjQxYTRlY2E0ODEx YjUzNmQ5YmNlNmNhYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmNzcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uU2Vj dGlvbi5jc3MKQEAgLTY0LDggKzY0LDcgQEAgYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zdHls ZS1kZWNsYXJhdGlvbi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAgKyAuc3R5bGUtZGVjbGEKIAogYm9k eS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uOmZpcnN0LWNo aWxkLAogYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IGRpdjpub3QoLnN0eWxlLWRlY2xhcmF0aW9u LXNlY3Rpb24pICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24sCi1ib2R5Lm1hYy1wbGF0Zm9y bS5sZWdhY3kgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1pbi1ncm91cCArIC5zdHls ZS1kZWNsYXJhdGlvbi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAsCi1ib2R5Lm1hYy1wbGF0Zm9ybS5s ZWdhY3kgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1pbi1ncm91cCArIC5zdHlsZS1k ZWNsYXJhdGlvbi1zZWN0aW9uOmxhc3QtY2hpbGQgeworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5 IC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAgKyAuc3R5bGUtZGVjbGFy YXRpb24tc2VjdGlvbjptYXRjaGVzKC5sYXN0LWluLWdyb3VwLCA6bGFzdC1jaGlsZCkgewogICAg IGJveC1zaGFkb3c6IHJnYmEoMCwgMCwgMCwgMC4zKSAwIDFweCAzcHggMXB4OwogfQogCkBAIC0x MjEsOCArMTIwLDcgQEAgYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zdHlsZS1kZWNsYXJhdGlv bi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAgKyAuc3R5bGUtZGVjbGEKICAgICBjb2xvcjogYmxhY2s7 CiB9CiAKLS5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uLmxvY2tlZCA+IC5oZWFkZXIgPiAuc2Vs ZWN0b3IsCi0uc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5zZWxlY3Rvci1sb2NrZWQgPiAuaGVh ZGVyID4gLnNlbGVjdG9yIHsKKy5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uOm1hdGNoZXMoLmxv Y2tlZCwgLnNlbGVjdG9yLWxvY2tlZCkgPiAuaGVhZGVyID4gLnNlbGVjdG9yIHsKICAgICAtd2Vi a2l0LXVzZXItbW9kaWZ5OiByZWFkLW9ubHk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRp dG9yLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0 eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLmNzcwppbmRleCAwODM4N2YyZmRmY2NlYTlkNzI0NzUw NTQ4NmJhN2M0ZDQ1NTEyOTgyLi4zNmZjNjllNzI1Y2NlOTRiOTI5YzI0Y2RhYTg3NDljZWJmYzU4 ZDEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5jc3MKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3Iu Y3NzCkBAIC02MCwzNSArNjAsMjcgQEAKICAgICBkaXNwbGF5OiBub25lOwogfQogCi0uY3NzLXN0 eWxlLXRleHQtZWRpdG9yID4gLkNvZGVNaXJyb3IgLkNvZGVNaXJyb3ItbGluZXMgcHJlID4gc3Bh biBzcGFuOm5vdCguY3NzLXN0eWxlLWRlY2xhcmF0aW9uLXByb3BlcnR5KTpub3QoLkNvZGVNaXJy b3Itd2lkZ2V0KTpub3QoLmNtLWNvbW1lbnQpOm5vdCguY20tdGFiKSwKLS5jc3Mtc3R5bGUtdGV4 dC1lZGl0b3IgPiAuQ29kZU1pcnJvciAuQ29kZU1pcnJvci1saW5lcyAuY3NzLXN0eWxlLWRlY2xh cmF0aW9uLXByb3BlcnR5LmRpc2FibGVkLAotLmNzcy1zdHlsZS10ZXh0LWVkaXRvciA+IC5Db2Rl TWlycm9yIC5Db2RlTWlycm9yLWxpbmVzIC5jc3Mtc3R5bGUtZGVjbGFyYXRpb24tcHJvcGVydHku aW52YWxpZCwKLS5jc3Mtc3R5bGUtdGV4dC1lZGl0b3IgPiAuQ29kZU1pcnJvciAuQ29kZU1pcnJv ci1saW5lcyAuY3NzLXN0eWxlLWRlY2xhcmF0aW9uLXByb3BlcnR5Lm90aGVyLXZlbmRvciwKLS5j c3Mtc3R5bGUtdGV4dC1lZGl0b3IgPiAuQ29kZU1pcnJvciAuQ29kZU1pcnJvci1saW5lcyAuY3Nz LXN0eWxlLWRlY2xhcmF0aW9uLXByb3BlcnR5Lm5vdC1pbmhlcml0ZWQsCi0uY3NzLXN0eWxlLXRl eHQtZWRpdG9yID4gLkNvZGVNaXJyb3IgLkNvZGVNaXJyb3ItbGluZXMgLmNzcy1zdHlsZS1kZWNs YXJhdGlvbi1wcm9wZXJ0eS5vdmVycmlkZGVuIHsKKy5jc3Mtc3R5bGUtdGV4dC1lZGl0b3IgPiAu Q29kZU1pcnJvciAuQ29kZU1pcnJvci1saW5lcyBwcmUgPiBzcGFuIHNwYW46bm90KC5jc3Mtc3R5 bGUtZGVjbGFyYXRpb24tcHJvcGVydHksIC5Db2RlTWlycm9yLXdpZGdldCwgLmNtLWNvbW1lbnQs IC5jbS10YWIpLAorLmNzcy1zdHlsZS10ZXh0LWVkaXRvciA+IC5Db2RlTWlycm9yIC5Db2RlTWly cm9yLWxpbmVzIC5jc3Mtc3R5bGUtZGVjbGFyYXRpb24tcHJvcGVydHk6bWF0Y2hlcyguZGlzYWJs ZWQsIC5pbnZhbGlkLCAub3RoZXItdmVuZG9yLCAubm90LWluaGVyaXRlZCwgLm92ZXJyaWRkZW4p IHsKICAgICB0ZXh0LWRlY29yYXRpb246IGxpbmUtdGhyb3VnaDsKICAgICAtd2Via2l0LXRleHQt c3Ryb2tlLXdpZHRoOiAwLjAwMDAwMDAwMDAwMDAwMXB4OyAvKiBBIGhhY2sgdG8gZ2V0IGEgZGlm ZmVyZW50IGxpbmUtdGhyb3VnaCBjb2xvci4gKi8KICAgICAtd2Via2l0LXRleHQtc3Ryb2tlLWNv bG9yOiByZ2JhKDAsIDAsIDAsIDAuNik7CiB9CiAKLS5jc3Mtc3R5bGUtdGV4dC1lZGl0b3IgPiAu Q29kZU1pcnJvciAuQ29kZU1pcnJvci1saW5lcyBwcmUgPiBzcGFuIHNwYW46bm90KC5jc3Mtc3R5 bGUtZGVjbGFyYXRpb24tcHJvcGVydHkpOm5vdCguQ29kZU1pcnJvci13aWRnZXQpOm5vdCguY20t Y29tbWVudCk6bm90KC5jbS10YWIpLAorLmNzcy1zdHlsZS10ZXh0LWVkaXRvciA+IC5Db2RlTWly cm9yIC5Db2RlTWlycm9yLWxpbmVzIHByZSA+IHNwYW4gc3Bhbjpub3QoLmNzcy1zdHlsZS1kZWNs YXJhdGlvbi1wcm9wZXJ0eSwgLkNvZGVNaXJyb3Itd2lkZ2V0LCAuY20tY29tbWVudCwgLmNtLXRh YiksCiAuY3NzLXN0eWxlLXRleHQtZWRpdG9yID4gLkNvZGVNaXJyb3IgLkNvZGVNaXJyb3ItbGlu ZXMgLmNzcy1zdHlsZS1kZWNsYXJhdGlvbi1wcm9wZXJ0eS5pbnZhbGlkIHsKICAgICAtd2Via2l0 LXRleHQtc3Ryb2tlLWNvbG9yOiByZ2JhKDI1NSwgMCwgMCwgMC42KTsKIH0KIAotLmNzcy1zdHls ZS10ZXh0LWVkaXRvciA+IC5Db2RlTWlycm9yIC5Db2RlTWlycm9yLWxpbmVzIC5jc3Mtc3R5bGUt ZGVjbGFyYXRpb24tcHJvcGVydHkuaW1wbGljaXQsCi0uY3NzLXN0eWxlLXRleHQtZWRpdG9yID4g LkNvZGVNaXJyb3IgLkNvZGVNaXJyb3ItbGluZXMgLmNzcy1zdHlsZS1kZWNsYXJhdGlvbi1wcm9w ZXJ0eS5ub3QtaW5oZXJpdGVkIHsKKy5jc3Mtc3R5bGUtdGV4dC1lZGl0b3IgPiAuQ29kZU1pcnJv ciAuQ29kZU1pcnJvci1saW5lcyAuY3NzLXN0eWxlLWRlY2xhcmF0aW9uLXByb3BlcnR5Om1hdGNo ZXMoLmltcGxpY2l0LCAubm90LWluaGVyaXRlZCkgewogICAgIG9wYWNpdHk6IDAuNTsKIH0KIAot LmNzcy1zdHlsZS10ZXh0LWVkaXRvciA+IC5Db2RlTWlycm9yIC5Db2RlTWlycm9yLWxpbmVzIC5l ZGl0aW5nLWxpbmUgLmNzcy1zdHlsZS1kZWNsYXJhdGlvbi1wcm9wZXJ0eS5kaXNhYmxlZCwKLS5j c3Mtc3R5bGUtdGV4dC1lZGl0b3IgPiAuQ29kZU1pcnJvciAuQ29kZU1pcnJvci1saW5lcyAuZWRp dGluZy1saW5lIC5jc3Mtc3R5bGUtZGVjbGFyYXRpb24tcHJvcGVydHkub3RoZXItdmVuZG9yLAot LmNzcy1zdHlsZS10ZXh0LWVkaXRvciA+IC5Db2RlTWlycm9yIC5Db2RlTWlycm9yLWxpbmVzIC5l ZGl0aW5nLWxpbmUgLmNzcy1zdHlsZS1kZWNsYXJhdGlvbi1wcm9wZXJ0eS5ub3QtaW5oZXJpdGVk LAotLmNzcy1zdHlsZS10ZXh0LWVkaXRvciA+IC5Db2RlTWlycm9yIC5Db2RlTWlycm9yLWxpbmVz IC5lZGl0aW5nLWxpbmUgLmNzcy1zdHlsZS1kZWNsYXJhdGlvbi1wcm9wZXJ0eS5vdmVycmlkZGVu IHsKKy5jc3Mtc3R5bGUtdGV4dC1lZGl0b3IgPiAuQ29kZU1pcnJvciAuQ29kZU1pcnJvci1saW5l cyAuZWRpdGluZy1saW5lIC5jc3Mtc3R5bGUtZGVjbGFyYXRpb24tcHJvcGVydHk6bWF0Y2hlcygu ZGlzYWJsZWQsIC5vdGhlci12ZW5kb3IsIC5ub3QtaW5oZXJpdGVkLCAub3ZlcnJpZGRlbikgewog ICAgIC13ZWJraXQtdGV4dC1zdHJva2UtY29sb3I6IHJnYmEoMCwgMCwgMCwgMC4zKTsKIH0KIAot LmNzcy1zdHlsZS10ZXh0LWVkaXRvciA+IC5Db2RlTWlycm9yIC5Db2RlTWlycm9yLWxpbmVzIC5l ZGl0aW5nLWxpbmUgc3Bhbjpub3QoLmNzcy1zdHlsZS1kZWNsYXJhdGlvbi1wcm9wZXJ0eSk6bm90 KC5Db2RlTWlycm9yLXdpZGdldCk6bm90KC5jbS1jb21tZW50KTpub3QoLmNtLXRhYiksCisuY3Nz LXN0eWxlLXRleHQtZWRpdG9yID4gLkNvZGVNaXJyb3IgLkNvZGVNaXJyb3ItbGluZXMgLmVkaXRp bmctbGluZSBzcGFuOm5vdCguY3NzLXN0eWxlLWRlY2xhcmF0aW9uLXByb3BlcnR5LCAuQ29kZU1p cnJvci13aWRnZXQsIC5jbS1jb21tZW50LCAuY20tdGFiKSwKIC5jc3Mtc3R5bGUtdGV4dC1lZGl0 b3IgPiAuQ29kZU1pcnJvciAuQ29kZU1pcnJvci1saW5lcyAuZWRpdGluZy1saW5lIC5jc3Mtc3R5 bGUtZGVjbGFyYXRpb24tcHJvcGVydHkuaW52YWxpZCB7CiAgICAgdGV4dC1kZWNvcmF0aW9uOiBu b25lOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvQ29udHJvbFRvb2xiYXJJdGVtLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0NvbnRyb2xUb29sYmFySXRlbS5jc3MKaW5kZXggOTgwNGUyZjkxODBk NDczM2ExYTVhMWJjZTZiOWI1YzhhNTc5NjZiNS4uN2JhMGZlNDNmYjg1ODZlM2ZjN2FkMWUzZmRi OTU2ODRhNzEzZDc0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQ29udHJvbFRvb2xiYXJJdGVtLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250cm9sVG9vbGJhckl0ZW0uY3NzCkBAIC00MCw4 ICs0MCw3IEBAIGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAudG9vbGJhciAuaXRlbS5jb250cm9s IHsKICAgICBwYWRkaW5nOiAycHg7CiB9CiAKLS50b29sYmFyLmljb24tYW5kLWxhYmVsLWhvcml6 b250YWwgLml0ZW0uY29udHJvbCwKLS50b29sYmFyLmljb24tb25seSAuaXRlbS5jb250cm9sIHsK Ky50b29sYmFyOm1hdGNoZXMoLmljb24tYW5kLWxhYmVsLWhvcml6b250YWwsIC50b29sYmFyLmlj b24tb25seSkgLml0ZW0uY29udHJvbCB7CiAgICAgcGFkZGluZzogMCAycHg7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3Jh Z2VDb250ZW50Vmlldy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9ET01TdG9yYWdlQ29udGVudFZpZXcuY3NzCmluZGV4IGRmZWY1ZWIxYmIxYjA5MjRkYTYx NDEyODBmZmQzM2QyOTgyYmVkYTQuLmUzMDA4NTQ1OGFkZmJmNGMxNmE5MjE5NTEyZmRhMzc5M2Nj OGFjYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0RPTVN0b3JhZ2VDb250ZW50Vmlldy5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NU3RvcmFnZUNvbnRlbnRWaWV3LmNzcwpAQCAtMzEsMTQg KzMxLDEyIEBACiAgICAgYm90dG9tOiAwOwogfQogCi0uY29udGVudC12aWV3LmRvbS1zdG9yYWdl ID4gLmRhdGEtZ3JpZCB0ci5kdXBsaWNhdGUta2V5IHRkLmtleS1jb2x1bW4sCi0uY29udGVudC12 aWV3LmRvbS1zdG9yYWdlID4gLmRhdGEtZ3JpZCB0ci5taXNzaW5nLWtleSB0ZC5rZXktY29sdW1u LAorLmNvbnRlbnQtdmlldy5kb20tc3RvcmFnZSA+IC5kYXRhLWdyaWQgdHI6bWF0Y2hlcyguZHVw bGljYXRlLWtleSwgLm1pc3Npbmcta2V5KSB0ZC5rZXktY29sdW1uLAogLmNvbnRlbnQtdmlldy5k b20tc3RvcmFnZSA+IC5kYXRhLWdyaWQgdHIubWlzc2luZy12YWx1ZSB0ZC52YWx1ZS1jb2x1bW4g ewogICAgIGJhY2tncm91bmQtY29sb3I6ICNmZWU7CiB9CiAKLS5jb250ZW50LXZpZXcuZG9tLXN0 b3JhZ2UgPiAuZGF0YS1ncmlkOmZvY3VzIHRyLnNlbGVjdGVkLmR1cGxpY2F0ZS1rZXkgdGQua2V5 LWNvbHVtbiwKLS5jb250ZW50LXZpZXcuZG9tLXN0b3JhZ2UgPiAuZGF0YS1ncmlkOmZvY3VzIHRy LnNlbGVjdGVkLm1pc3Npbmcta2V5IHRkLmtleS1jb2x1bW4sCisuY29udGVudC12aWV3LmRvbS1z dG9yYWdlID4gLmRhdGEtZ3JpZDpmb2N1cyB0ci5zZWxlY3RlZDptYXRjaGVzKC5kdXBsaWNhdGUt a2V5LCAubWlzc2luZy1rZXkpIHRkLmtleS1jb2x1bW4sCiAuY29udGVudC12aWV3LmRvbS1zdG9y YWdlID4gLmRhdGEtZ3JpZDpmb2N1cyB0ci5zZWxlY3RlZC5taXNzaW5nLXZhbHVlIHRkLnZhbHVl LWNvbHVtbiB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogI2RhYTsKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Rhc2hib2FyZENvbnRhaW5l clZpZXcuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGFz aGJvYXJkQ29udGFpbmVyVmlldy5jc3MKaW5kZXggNWZlYWJiOGMyZWI2OGQ0YTgwNDUwYjhkNjdl MjViNzU1ZmVmYTRlOS4uYjY3OTFjYjliN2QzNmUxMWU2ODRhYjI1NDg2Y2IwYjY1MWI5NzBmYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGFz aGJvYXJkQ29udGFpbmVyVmlldy5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvRGFzaGJvYXJkQ29udGFpbmVyVmlldy5jc3MKQEAgLTYzLDI1ICs2Mywx OSBAQCBib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5k YXNoYm9hcmQtY29udGFpbmVyIHsKICAgICB3aWR0aDogMTc1cHg7CiB9CiAKLS50b29sYmFyLnNt YWxsLXNpemUuaWNvbi1hbmQtbGFiZWwtdmVydGljYWwgLmRhc2hib2FyZC1jb250YWluZXIsCi0u dG9vbGJhci5ub3JtYWwtc2l6ZS5pY29uLWFuZC1sYWJlbC12ZXJ0aWNhbCAuZGFzaGJvYXJkLWNv bnRhaW5lciB7CisudG9vbGJhci5pY29uLWFuZC1sYWJlbC12ZXJ0aWNhbDptYXRjaGVzKC5zbWFs bC1zaXplLCAubm9ybWFsLXNpemUpIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKICAgICBtYXJnaW4t dG9wOiA2cHg7CiB9CiAKIC8qIFN0eWxlcyBmb3IgdGhlIGV4dHJhIHNob3J0IHN0eWxlLCBvbmUg cm93IHdpdGggcXVpdGUgYSBzbWFsbCB5LW1hcmdpbiAqLwogCi0udG9vbGJhci5sYWJlbC1vbmx5 IC5kYXNoYm9hcmQtY29udGFpbmVyLAotLnRvb2xiYXIuc21hbGwtc2l6ZS5pY29uLW9ubHkgLmRh c2hib2FyZC1jb250YWluZXIsCi0udG9vbGJhci5zbWFsbC1zaXplLmljb24tYW5kLWxhYmVsLXZl cnRpY2FsIC5kYXNoYm9hcmQtY29udGFpbmVyLAotLnRvb2xiYXIuc21hbGwtc2l6ZS5pY29uLWFu ZC1sYWJlbC1ob3Jpem9udGFsIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKKy50b29sYmFyOm1hdGNo ZXMoLmxhYmVsLW9ubHksIC5zbWFsbC1zaXplOm1hdGNoZXMoLmljb24tb25seSwgLmljb24tYW5k LWxhYmVsLXZlcnRpY2FsLCAuaWNvbi1hbmQtbGFiZWwtaG9yaXpvbnRhbCkpIC5kYXNoYm9hcmQt Y29udGFpbmVyIHsKICAgICBoZWlnaHQ6IDIycHg7CiB9CiAKIC8qIFN0eWxlcyBmb3IgdGhlIGZh aXJseSBzaG9ydCBzdHlsZSwgb25lIHJvdyB3aXRoIHF1aXRlIGEgYml0IG9mIHktbWFyZ2luICov CiAKLS50b29sYmFyLm5vcm1hbC1zaXplLmljb24tb25seSAuZGFzaGJvYXJkLWNvbnRhaW5lciwK LS50b29sYmFyLm5vcm1hbC1zaXplLmljb24tYW5kLWxhYmVsLXZlcnRpY2FsIC5kYXNoYm9hcmQt Y29udGFpbmVyLAotLnRvb2xiYXIubm9ybWFsLXNpemUuaWNvbi1hbmQtbGFiZWwtaG9yaXpvbnRh bCAuZGFzaGJvYXJkLWNvbnRhaW5lciB7CisudG9vbGJhci5ub3JtYWwtc2l6ZTptYXRjaGVzKC5p Y29uLW9ubHksIC5pY29uLWFuZC1sYWJlbC12ZXJ0aWNhbCwgLmljb24tYW5kLWxhYmVsLWhvcml6 b250YWwpIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKICAgICBoZWlnaHQ6IDMwcHg7CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFH cmlkLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFH cmlkLmNzcwppbmRleCA1ZDZmMzkxMjQxZjhjMzdiZjRmZjk3YWU1NWEwNGE2NjJlY2UzNTViLi40 MTY0ODRjMTc4ZDQ5ZDQzZmRhNmFkY2Q3MzQxNWMyZTViZjg2NjY3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5jc3MKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuY3NzCkBA IC04Niw3ICs4Niw3IEBACiAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKIH0KIAotLmRhdGEtZ3JpZCA6 LXdlYmtpdC1hbnkodGgsIHRkKTpub3QoOmxhc3QtY2hpbGQpIHsKKy5kYXRhLWdyaWQgOm1hdGNo ZXModGgsIHRkKTpub3QoOmxhc3QtY2hpbGQpIHsKICAgICBib3JkZXItcmlnaHQ6IDFweCBzb2xp ZCByZ2IoMTc5LCAxNzksIDE3OSk7CiB9CiAKQEAgLTk0LDcgKzk0LDcgQEAKICAgICBiYWNrZ3Jv dW5kLWNvbG9yOiByZ2IoMTc5LCAxNzksIDE3OSk7CiB9CiAKLS5kYXRhLWdyaWQgdGg6LXdlYmtp dC1hbnkoLnNvcnQtYXNjZW5kaW5nLCAuc29ydC1kZXNjZW5kaW5nKSB7CisuZGF0YS1ncmlkIHRo Om1hdGNoZXMoLnNvcnQtYXNjZW5kaW5nLCAuc29ydC1kZXNjZW5kaW5nKSB7CiAgICAgYmFja2dy b3VuZC1jb2xvcjogcmdiKDIzMCwgMjMwLCAyMzApOwogfQogCkBAIC0xNTAsNyArMTUwLDcgQEAg Ym9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kYXRhLWdyaWQ6Zm9jdXMgdHIuc2VsZWN0ZWQgdGQ6 bm90KDpsYXN0LWNoaWxkKSB7CiAgICAgYm9yZGVyLXJpZ2h0LWNvbG9yOiByZ2IoNTMsIDEwOSwg MTg5KTsKIH0KIAotLmRhdGEtZ3JpZCA6LXdlYmtpdC1hbnkodGgsIHRkKSA+IGRpdiB7CisuZGF0 YS1ncmlkIDptYXRjaGVzKHRoLCB0ZCkgPiBkaXYgewogICAgIHdoaXRlLXNwYWNlOiBub3dyYXA7 CiAgICAgdGV4dC1vdmVyZmxvdzogZWxsaXBzaXM7CiAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKQEAg LTE2OCw3ICsxNjgsNyBAQCBib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRhdGEtZ3JpZDpmb2N1 cyB0ci5zZWxlY3RlZCB0ZDpub3QoOmxhc3QtY2hpbGQpIHsKICAgICBwb3NpdGlvbjogcmVsYXRp dmU7CiB9CiAKLS5kYXRhLWdyaWQgdGg6LXdlYmtpdC1hbnkoLnNvcnQtYXNjZW5kaW5nLCAuc29y dC1kZXNjZW5kaW5nKSA+IGRpdjpmaXJzdC1jaGlsZCB7CisuZGF0YS1ncmlkIHRoOm1hdGNoZXMo LnNvcnQtYXNjZW5kaW5nLCAuc29ydC1kZXNjZW5kaW5nKSA+IGRpdjpmaXJzdC1jaGlsZCB7CiAg ICAgcGFkZGluZy1yaWdodDogMTJweDsKIH0KIApAQCAtMjk4LDcgKzI5OCw3IEBAIGJvZHkubWFj LXBsYXRmb3JtLmxlZ2FjeSAuZGF0YS1ncmlkOmZvY3VzIHRyLnNlbGVjdGVkIHsKICAgICBtYXJn aW4tbGVmdDogMnB4OwogfQogCi0uZGF0YS1ncmlkIHRyOi13ZWJraXQtYW55KC5zZWxlY3RlZCwg OmhvdmVyKSAuZ28tdG8tYXJyb3cgeworLmRhdGEtZ3JpZCB0cjptYXRjaGVzKC5zZWxlY3RlZCwg OmhvdmVyKSAuZ28tdG8tYXJyb3cgewogICAgIGRpc3BsYXk6IGJsb2NrOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlckRh c2hib2FyZFZpZXcuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRGVidWdnZXJEYXNoYm9hcmRWaWV3LmNzcwppbmRleCBlNGQwZDQ1M2Y0OTM5Mzk1NmY5OWQx M2IxNTcxYmJjMThhMzI4ZWUzLi5lOWY1ZDE1NWJhODVjMDdmMmNmNTRhNTgyN2RjNTA2YThlODVj YjliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9EZWJ1Z2dlckRhc2hib2FyZFZpZXcuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyRGFzaGJvYXJkVmlldy5jc3MKQEAgLTEzMCw3ICsx MzAsNyBAQAogICAgIG92ZXJmbG93OiBoaWRkZW47CiB9CiAKLS50b29sYmFyLmNvbGxhcHNlZCAu ZGFzaGJvYXJkLmRlYnVnZ2VyID4gOm5vdCgubWVzc2FnZSk6bm90KC5uYXZpZ2F0aW9uLWJhciAp IHsKKy50b29sYmFyLmNvbGxhcHNlZCAuZGFzaGJvYXJkLmRlYnVnZ2VyID4gOm5vdCgubWVzc2Fn ZSwgLm5hdmlnYXRpb24tYmFyICkgewogICAgIGRpc3BsYXk6IG5vbmU7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlZmF1bHREYXNo Ym9hcmRWaWV3LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0RlZmF1bHREYXNoYm9hcmRWaWV3LmNzcwppbmRleCBkNzRjNWYyOTBjOTVlZjM5YmI3NjQwNjE0 NTQ3NWU3MWZhY2NjOTNhLi5iZmVmNWViMDQ0ZmQ3ZGNmZGYxMDU5M2IwNzE4ODlkYzYxOTViZjM1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9E ZWZhdWx0RGFzaGJvYXJkVmlldy5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvRGVmYXVsdERhc2hib2FyZFZpZXcuY3NzCkBAIC0yMywxNSArMjMsMTEg QEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCi1ib2R5LndlYiAu dG9vbGJhci5jb2xsYXBzZWQgLmRhc2hib2FyZC5kZWZhdWx0ID4gLnRpbWUsCi1ib2R5LndlYiAu dG9vbGJhci5jb2xsYXBzZWQgLmRhc2hib2FyZC5kZWZhdWx0ID4gLnJlc291cmNlc1NpemUsCi1i b2R5LndlYiAudG9vbGJhci5jb2xsYXBzZWQgLmRhc2hib2FyZC5kZWZhdWx0ID4gLmxvZ3Mgewor Ym9keS53ZWIgLnRvb2xiYXIuY29sbGFwc2VkIC5kYXNoYm9hcmQuZGVmYXVsdCA+IDptYXRjaGVz KC50aW1lLCAucmVzb3VyY2VzU2l6ZSwgLmxvZ3MpIHsKICAgICBkaXNwbGF5OiBub25lOwogfQog Ci1ib2R5LmphdmFzY3JpcHQgLnRvb2xiYXIgLmRhc2hib2FyZC5kZWZhdWx0ID4gLnRpbWUsCi1i b2R5LmphdmFzY3JpcHQgLnRvb2xiYXIgLmRhc2hib2FyZC5kZWZhdWx0ID4gLnJlc291cmNlc1Np emUsCi1ib2R5LmphdmFzY3JpcHQgLnRvb2xiYXIgLmRhc2hib2FyZC5kZWZhdWx0ID4gLnJlc291 cmNlc0NvdW50IHsKK2JvZHkuamF2YXNjcmlwdCAudG9vbGJhciAuZGFzaGJvYXJkLmRlZmF1bHQg PiA6bWF0Y2hlcygudGltZSwgLnJlc291cmNlc1NpemUsIC5yZXNvdXJjZXNDb3VudCkgewogICAg IGRpc3BsYXk6IG5vbmU7CiB9CiAKQEAgLTIxNCwxOCArMjEwLDEyIEBAIGJvZHkubWFjLXBsYXRm b3JtLmxlZ2FjeSAudG9vbGJhciAuZGFzaGJvYXJkLmRlZmF1bHQgPiAuaXNzdWVzLmVuYWJsZWQg PiBpbWcgewogCiAKIC8qIFN0eWxlcyBmb3IgdGhlIGV4dHJhIHNob3J0IHN0eWxlLCBvbmUgcm93 IHdpdGggcXVpdGUgYSBzbWFsbCB5LW1hcmdpbiAqLwotCi0udG9vbGJhci5sYWJlbC1vbmx5IC5k YXNoYm9hcmQuZGVmYXVsdCA+IC5pdGVtLAotLnRvb2xiYXIuc21hbGwtc2l6ZS5pY29uLW9ubHkg LmRhc2hib2FyZC5kZWZhdWx0ID4gLml0ZW0sCi0udG9vbGJhci5zbWFsbC1zaXplLmljb24tYW5k LWxhYmVsLXZlcnRpY2FsIC5kYXNoYm9hcmQuZGVmYXVsdCA+IC5pdGVtLAotLnRvb2xiYXIuc21h bGwtc2l6ZS5pY29uLWFuZC1sYWJlbC1ob3Jpem9udGFsIC5kYXNoYm9hcmQuZGVmYXVsdCA+IC5p dGVtIHsKKy50b29sYmFyOm1hdGNoZXMoLmxhYmVsLW9ubHksIC5zbWFsbC1zaXplOm1hdGNoZXMo Lmljb24tb25seSwgLmljb24tYW5kLWxhYmVsLXZlcnRpY2FsLCAuaWNvbi1hbmQtbGFiZWwtaG9y aXpvbnRhbCkpIC5kYXNoYm9hcmQuZGVmYXVsdCA+IC5pdGVtIHsKICAgICBtYXJnaW46IDFweCAw OwogfQogCiAvKiBTdHlsZXMgZm9yIHRoZSBmYWlybHkgc2hvcnQgc3R5bGUsIG9uZSByb3cgd2l0 aCBxdWl0ZSBhIGJpdCBvZiB5LW1hcmdpbiAqLwogCi0udG9vbGJhci5ub3JtYWwtc2l6ZS5pY29u LW9ubHkgLmRhc2hib2FyZC5kZWZhdWx0ID4gLml0ZW0sCi0udG9vbGJhci5ub3JtYWwtc2l6ZS5p Y29uLWFuZC1sYWJlbC12ZXJ0aWNhbCAuZGFzaGJvYXJkLmRlZmF1bHQgPiAuaXRlbSwKLS50b29s YmFyLm5vcm1hbC1zaXplLmljb24tYW5kLWxhYmVsLWhvcml6b250YWwgLmRhc2hib2FyZC5kZWZh dWx0ID4gLml0ZW0geworLnRvb2xiYXIubm9ybWFsLXNpemU6bWF0Y2hlcyguaWNvbi1vbmx5LCAu aWNvbi1hbmQtbGFiZWwtdmVydGljYWwsIC5pY29uLWFuZC1sYWJlbC1ob3Jpem9udGFsKSAuZGFz aGJvYXJkLmRlZmF1bHQgPiAuaXRlbSB7CiAgICAgbWFyZ2luOiA0cHggMDsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0 aW9uLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFp bHNTZWN0aW9uLmNzcwppbmRleCA5Yjg3YjYzOWQ1OTNhNzQ5M2JiZjliNzc0ZmFmNDk5ZTFiMDE5 YTJlLi4xMmRiYWFlZWU0NGZjMDYzYjhlZWE0ZGEzNWUwYTA4ZmRiZTY3NDkyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlv bi5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0 YWlsc1NlY3Rpb24uY3NzCkBAIC0xNjcsOCArMTY3LDcgQEAgYm9keS5tYWMtcGxhdGZvcm0ubGVn YWN5IC5kZXRhaWxzLXNlY3Rpb24uY29tcHV0ZWQtc3R5bGUtcHJvcGVydGllczpub3QoLmNvbGxh cHMKICAgICBmb250LXNpemU6IDEwcHg7CiB9CiAKLS5kZXRhaWxzLXNlY3Rpb24gPiAuaGVhZGVy ID4gLm5vZGUtbGluaywKLS5kZXRhaWxzLXNlY3Rpb24gPiAuaGVhZGVyID4gLmdvLXRvLWFycm93 IHsKKy5kZXRhaWxzLXNlY3Rpb24gPiAuaGVhZGVyID4gOm1hdGNoZXMoLm5vZGUtbGluaywgLmdv LXRvLWFycm93KSB7CiAgICAgZmxvYXQ6IHJpZ2h0OwogfQogCkBAIC0yMTAsMTUgKzIwOSwxMiBA QCBib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4g Lmdyb3VwOm50aC1jaGlsZChldmVuKSB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDIyMiwg MjIyLCAyMjIpOwogfQogCi0uZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bnRo LWNoaWxkKGV2ZW4pID4gLnJvdzpub3QoLnNpbXBsZSk6Zmlyc3QtY2hpbGQsCi0uZGV0YWlscy1z ZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bnRoLWNoaWxkKGV2ZW4pID4gLnJvdy5zaW1wbGU6 Zmlyc3QtY2hpbGQgPiAqIHsKKy5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDpu dGgtY2hpbGQoZXZlbikgPiAucm93Om1hdGNoZXMoLnNpbXBsZTpmaXJzdC1jaGlsZCA+ICosIDpu b3QoLnNpbXBsZSk6Zmlyc3QtY2hpbGQpIHsKICAgICBib3JkZXItdG9wOiAxcHggc29saWQgcmdi KDE3OSwgMTc5LCAxNzkpOwogfQogCi1ib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMt c2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwOm50aC1jaGlsZChldmVuKSA+IC5yb3c6bm90KC5z aW1wbGUpOmxhc3QtY2hpbGQsCi1ib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMtc2Vj dGlvbiA+IC5jb250ZW50ID4gLmdyb3VwOmxhc3QtY2hpbGQgPiAucm93Om5vdCguc2ltcGxlKTps YXN0LWNoaWxkLAotYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kZXRhaWxzLXNlY3Rpb24gPiAu Y29udGVudCA+IC5ncm91cDpudGgtY2hpbGQoZXZlbikgPiAucm93LnNpbXBsZTpsYXN0LWNoaWxk ID4gKiwKLWJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZGV0YWlscy1zZWN0aW9uID4gLmNvbnRl bnQgPiAuZ3JvdXA6bGFzdC1jaGlsZCA+IC5yb3cuc2ltcGxlOmxhc3QtY2hpbGQgPiAqIHsKK2Jv ZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3Jv dXA6bWF0Y2hlcyg6bnRoLWNoaWxkKGV2ZW4pLCA6bGFzdC1jaGlsZCkgPiAucm93Om5vdCguc2lt cGxlKTpsYXN0LWNoaWxkLAorYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kZXRhaWxzLXNlY3Rp b24gPiAuY29udGVudCA+IC5ncm91cDptYXRjaGVzKDpudGgtY2hpbGQoZXZlbiksIDpsYXN0LWNo aWxkKSA+IC5yb3cuc2ltcGxlOmxhc3QtY2hpbGQgPiAqIHsKICAgICBib3JkZXItYm90dG9tOiAx cHggc29saWQgcmdiKDE3OSwgMTc5LCAxNzkpOwogfQogCkBAIC0yOTgsMTUgKzI5NCwxMyBAQCBi b2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdy b3VwOmZpcnN0LWNoaWxkID4gLnJvdwogICAgIHdvcmQtYnJlYWs6IGJyZWFrLWFsbDsKIH0KIAot LmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwID4gLnJvdy5lbXB0eSwKLS5kZXRh aWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cCA+IC5yb3cudGV4dCB7CisuZGV0YWlscy1z ZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXAgPiAucm93Om1hdGNoZXMoLmVtcHR5LCAudGV4dCkg ewogICAgIHBhZGRpbmc6IDAgNnB4IDdweCA2cHg7CiAgICAgdGV4dC1hbGlnbjogY2VudGVyOwog ICAgIGNvbG9yOiBncmF5OwogfQogCi1ib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMt c2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwID4gLnJvdy5lbXB0eSwKLWJvZHkubWFjLXBsYXRm b3JtLmxlZ2FjeSAuZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXAgPiAucm93LnRl eHQgeworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVu dCA+IC5ncm91cCA+IC5yb3c6bWF0Y2hlcyguZW1wdHksIC50ZXh0KSB7CiAgICAgcGFkZGluZzog NnB4OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9GaW5kQmFubmVyLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0ZpbmRCYW5uZXIuY3NzCmluZGV4IGNhNjhiMTQ1NzAzYTFmYmFiMTE5ZjYzYjBj NjZkYWVjZmI5ZGE4ZDkuLjFjYTFlNTk5MTRiMjg2OWNmZmY3ZGI2MTNkNWIwMjYxOTJiN2YyOWIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Zp bmRCYW5uZXIuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0ZpbmRCYW5uZXIuY3NzCkBAIC00OSw4ICs0OSw3IEBACiAgICAgdHJhbnNpdGlvbi10aW1p bmctZnVuY3Rpb246IGVhc2Utb3V0OwogfQogCi0uZmluZC1iYW5uZXIubm8tZmluZC1iYW5uZXIt dHJhbnNpdGlvbiwKLS5zdXBwb3J0cy1maW5kLWJhbm5lci5uby1maW5kLWJhbm5lci10cmFuc2l0 aW9uIHsKKzptYXRjaGVzKC5maW5kLWJhbm5lciwgLnN1cHBvcnRzLWZpbmQtYmFubmVyKS5uby1m aW5kLWJhbm5lci10cmFuc2l0aW9uIHsKICAgICB0cmFuc2l0aW9uLWR1cmF0aW9uOiAwICFpbXBv cnRhbnQ7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0ZsZXhpYmxlU3BhY2VOYXZpZ2F0aW9uSXRlbS5jc3MgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GbGV4aWJsZVNwYWNlTmF2aWdhdGlvbkl0ZW0u Y3NzCmluZGV4IGIzNmM0ZDE4YjBlZDEzNTAzNTQzOTZiZDEzMTU5MzRjZTAyOWI3NTAuLjQzM2Ri NTZiYTYyODAxNTZjMmU4YWM3NDU1ZTk3NzEwM2RmOWFkNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZsZXhpYmxlU3BhY2VOYXZpZ2F0aW9u SXRlbS5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RmxleGlibGVTcGFjZU5hdmlnYXRpb25JdGVtLmNzcwpAQCAtMjMsNyArMjMsNiBAQAogICogVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKLS5uYXZpZ2F0aW9uLWJhciAuaXRl bS5mbGV4aWJsZS1zcGFjZSwKLS50b29sYmFyIC5pdGVtLmZsZXhpYmxlLXNwYWNlIHsKKzptYXRj aGVzKC5uYXZpZ2F0aW9uLWJhciwgLnRvb2xiYXIpIC5pdGVtLmZsZXhpYmxlLXNwYWNlIHsKICAg ICBmbGV4OiAxOwogfQo=