134846 2014-07-11 15:45:18 -0700 Web Inspector: Modernize UI styles and better sync with platform styles 2014-07-15 20:07:28 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 jonowells jonowells commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 1021921 0 jonowells 2014-07-11 15:45:18 -0700 The web inspector styles should match the OS more closely. 1021922 1 webkit-bug-importer 2014-07-11 15:45:57 -0700 <rdar://problem/17647568> 1021932 2 234790 jonowells 2014-07-11 16:16:06 -0700 Created attachment 234790 [PATCH] Styles update v1. Initial tests in Mountain Lion and Mavericks look fine but going over them with a fine tooth comb. The buttons are not yet updated as I'm figuring out how to work with the caching. Will update shortly. 1021953 3 234790 timothy 2014-07-11 20:05:07 -0700 Comment on attachment 234790 [PATCH] Styles update v1. View in context: https://bugs.webkit.org/attachment.cgi?id=234790&action=review > Source/WebInspectorUI/ChangeLog:12 > + * UserInterface/Images/BackArrowModern.svg: Added. Not used. > Source/WebInspectorUI/ChangeLog:14 > + * UserInterface/Images/ForwardArrowModern.svg: Added. Not used. > Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js:52 > + this._backButtonNavigationItem = new WebInspector.ButtonNavigationItem("back", WebInspector.UIString("Back (%s)").format(this._backKeyboardShortcut.displayName), "Images/BackArrowLight.svg", 9, 9); The 9, 9 here needs updated. It needs to be 10, 16. We should also continue to use BackArrow.svg on older systems. This will likely have cache issues since the image changed but the name didn't. We might want to change ImageUtilities.js to store the OS version in the SQL database (maybe as a modified imageVersion — like imageVersion = imageVersion + osVersion.) > Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js:57 > + this._forwardButtonNavigationItem = new WebInspector.ButtonNavigationItem("forward", WebInspector.UIString("Forward (%s)").format(this._forwardKeyboardShortcut.displayName), "Images/ForwardArrowLight.svg", 9, 9); Ditto. > Source/WebInspectorUI/UserInterface/Views/DataGrid.css:88 > + /*background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.2)), linear-gradient(to bottom, transparent, transparent), > + linear-gradient(to bottom, white, white 25%, rgb(244, 244, 244) 50%, rgb(236, 236, 236) 50%, rgb(237, 237, 237));*/ > + > + /*background-size: 1px 11px, 0 0, 100% 100%;*/ > + /*background-position: left 2px, right 2px, center;*/ > + /*background-repeat: no-repeat;*/ > > - box-shadow: inset rgba(255, 255, 255, 0.3) 0 -1px 0; > + /*box-shadow: inset rgba(255, 255, 255, 0.3) 0 -1px 0;*/ > + border-top: 1px solid rgb(179, 179, 179); > border-bottom: 1px solid rgb(182, 182, 182); > + /*border-bottom: 1px solid rgb(182, 182, 182);*/ Remove commented lines. > Source/WebInspectorUI/UserInterface/Views/DetailsSection.css:124 > +/*.details-section.dom-node-properties { > + border-bottom: none; > +} > + > +.details-section.dom-node-properties > .header { > + border-bottom: 1px solid rgb(153, 153, 153); > +} > + > +body.mac-platform.mountain-lion .details-section.dom-node-properties > .header, > +body.mac-platform.mavericks .details-section.dom-node-properties > .header { > + border-bottom: none; > +}*/ Remove? > Source/WebInspectorUI/UserInterface/Views/DetailsSection.css:236 > +body.mac-platform.mountain-lion .details-section > .content > .group:nth-child(even) > .row:not(.simple):last-child, > +body.mac-platform.mavericks .details-section > .content > .group:nth-child(even) > .row:not(.simple):last-child, > +body.mac-platform.mountain-lion .details-section > .content > .group:last-child > .row:not(.simple):last-child, > +body.mac-platform.mavericks .details-section > .content > .group:last-child > .row:not(.simple):last-child, > +body.mac-platform.mountain-lion .details-section > .content > .group:nth-child(even) > .row.simple:last-child > *, > +body.mac-platform.mavericks .details-section > .content > .group:nth-child(even) > .row.simple:last-child > *, > +body.mac-platform.mountain-lion .details-section > .content > .group:last-child > .row.simple:last-child > *, > +body.mac-platform.mavericks .details-section > .content > .group:last-child > .row.simple:last-child > * { Maybe we should add a style class that is ".mountain-lion-or-mavericks" to make this and all the other selectors shorter. > Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj:489 > + <None Include="..\UserInterface\Images\ForwardArrowLight.svg" /> Why no BackArrowLight.svg? > Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters:1299 > + <None Include="..\UserInterface\Images\ForwardArrowLight.svg"> Ditto. 1022547 4 234947 jonowells 2014-07-15 13:45:15 -0700 Created attachment 234947 [PATCH] Styles update v2. 1022566 5 234947 timothy 2014-07-15 14:32:31 -0700 Comment on attachment 234947 [PATCH] Styles update v2. View in context: https://bugs.webkit.org/attachment.cgi?id=234947&action=review > Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js:57 > + } > + else { One line. > Source/WebInspectorUI/UserInterface/Views/DetailsSection.css:100 > +body.mac-platform.mavericks .details-section .details-section > .header, > +body.mac-platform.mountain-lion .details-section .details-section > .header { body.mac-platform.legacy 1022579 6 234959 jonowells 2014-07-15 15:32:39 -0700 Created attachment 234959 [PATCH] Styles update v3, reviewed. 1022606 7 234966 jonowells 2014-07-15 17:05:06 -0700 Created attachment 234966 [PATCH] Styles update v3, reviewed. 1022624 8 234971 jonowells 2014-07-15 19:00:19 -0700 Created attachment 234971 [PATCH] Styles update v3, reviewed, shadow tweak. 1022644 9 234971 commit-queue 2014-07-15 20:07:25 -0700 Comment on attachment 234971 [PATCH] Styles update v3, reviewed, shadow tweak. Clearing flags on attachment: 234971 Committed r171134: <http://trac.webkit.org/changeset/171134> 1022645 10 commit-queue 2014-07-15 20:07:28 -0700 All reviewed patches have been landed. Closing bug. 234790 2014-07-11 16:16:06 -0700 2014-07-15 13:45:15 -0700 [PATCH] Styles update v1. ui.diff text/plain 39779 jonowells ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDNmOTdkZjAuLjJmZjIwZmEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDExNSBAQAorMjAxNC0wNy0xMSAgSm9uYXRoYW4gV2Vs bHMgIDxqb25vd2VsbHNAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IE1vZGVy bml6ZSBVSSBzdHlsZXMgYW5kIGJldHRlciBzeW5jIHdpdGggcGxhdGZvcm0gc3R5bGVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQ4NDYKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGVkIHN0eWxl cyB0byBiZXR0ZXIgbWF0Y2ggdGhlIE9TIFVJIGRlc2lnbi4gVXBkYXRlZCB0aGUgZm9yd2FyZC9i YWNrIGJ1dHRvbi4gCisgICAgICAgIE1vdmVkIHNldmVyYWwgcnVsZXMgdG8gc2VsZWN0b3JzIHRo YXQgc3VwcG9ydCBvbGRlciBPUyBkZXNpZ25zLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9J bWFnZXMvQmFja0Fycm93TGlnaHQuc3ZnOiBBZGRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L0ltYWdlcy9CYWNrQXJyb3dNb2Rlcm4uc3ZnOiBBZGRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL0ltYWdlcy9Gb3J3YXJkQXJyb3dMaWdodC5zdmc6IEFkZGVkLgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvSW1hZ2VzL0ZvcndhcmRBcnJvd01vZGVybi5zdmc6IEFkZGVkLgorICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uY3NzOgorICAg ICAgICAoLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24pOgorICAgICAgICAoYm9keS5tYWMtcGxh dGZvcm0ubWF2ZXJpY2tzIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uKToKKyAgICAgICAgKGJv ZHkubWFjLXBsYXRmb3JtLm1hdmVyaWNrcyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbiArIC5z dHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uKToKKyAgICAgICAgKC5zdHlsZS1kZWNsYXJhdGlvbi1z ZWN0aW9uLmxhc3QtaW4tZ3JvdXApOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubWF2ZXJp Y2tzIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXApOgorICAgICAgICAo LnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1pbi1ncm91cCArIC5zdHlsZS1kZWNsYXJh dGlvbi1zZWN0aW9uKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLm1hdmVyaWNrcyAuc3R5 bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3VwICsgLnN0eWxlLWRlY2xhcmF0aW9u LXNlY3Rpb24pOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubWF2ZXJpY2tzIC5zdHlsZS1k ZWNsYXJhdGlvbi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAgKyAuc3R5bGUtZGVjbGFyYXRpb24tc2Vj dGlvbjpsYXN0LWNoaWxkKToKKyAgICAgICAgKC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uICsg LnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24pOiBEZWxldGVkLgorICAgICAgICAoLnN0eWxlLWRl Y2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1pbi1ncm91cCArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0 aW9uOmxhc3QtY2hpbGQpOiBEZWxldGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv Q1NTU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLmNzczoKKyAgICAgICAgKC5zaWRlYmFyID4gLnBh bmVsLmRldGFpbHMuY3NzLXN0eWxlID4gLmNvbnRlbnQgPiAucHNldWRvLWNsYXNzZXMpOgorICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvRE9NVHJlZU91dGxpbmUuY3NzOgorICAgICAgICAoLmRvbS10cmVlLW91dGxpbmUgbGkuaG92 ZXJlZDpub3QoLnNlbGVjdGVkKSAuc2VsZWN0aW9uKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRm b3JtLm1hdmVyaWNrcyAuZG9tLXRyZWUtb3V0bGluZSBsaS5ob3ZlcmVkOm5vdCguc2VsZWN0ZWQp IC5zZWxlY3Rpb24pOgorICAgICAgICAoLmRvbS10cmVlLW91dGxpbmUgbGkuZWxlbWVudHMtZHJh Zy1vdmVyIC5zZWxlY3Rpb24pOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubWF2ZXJpY2tz IC5kb20tdHJlZS1vdXRsaW5lIGxpLmVsZW1lbnRzLWRyYWctb3ZlciAuc2VsZWN0aW9uKToKKyAg ICAgICAgKC5kb20tdHJlZS1vdXRsaW5lOmZvY3VzIGxpLnNlbGVjdGVkIC5zZWxlY3Rpb24pOgor ICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubWF2ZXJpY2tzIC5kb20tdHJlZS1vdXRsaW5lOmZv Y3VzIGxpLnNlbGVjdGVkIC5zZWxlY3Rpb24pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvRGFzaGJvYXJkQ29udGFpbmVyVmlldy5jc3M6CisgICAgICAgICgudG9vbGJhciAuZGFzaGJv YXJkLWNvbnRhaW5lcik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5tYXZlcmlja3MgLnRv b2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIpOgorICAgICAgICAoYm9keS53aW5kb3ctaW5hY3Rp dmUgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIpOgorICAgICAgICAoYm9keS5tYWMtcGxh dGZvcm0ubWF2ZXJpY2tzLndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRh aW5lcik6CisgICAgICAgICgudG9vbGJhciAuZGFzaGJvYXJkKToKKyAgICAgICAgKGJvZHkud2lu ZG93LWluYWN0aXZlIC50b29sYmFyIC5kYXNoYm9hcmQpOgorICAgICAgICAoYm9keS5tYWMtcGxh dGZvcm0ubWF2ZXJpY2tzLndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJkKToKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmNzczoKKyAgICAgICAgKC5kYXRh LWdyaWQgdGgpOgorICAgICAgICAoLmRhdGEtZ3JpZCB0ci5zZWxlY3RlZCk6CisgICAgICAgIChi b2R5Lm1hYy1wbGF0Zm9ybS5tYXZlcmlja3MgLmRhdGEtZ3JpZCB0ci5zZWxlY3RlZCk6CisgICAg ICAgICguZGF0YS1ncmlkOmZvY3VzIHRyLnNlbGVjdGVkKToKKyAgICAgICAgKGJvZHkubWFjLXBs YXRmb3JtLm1hdmVyaWNrcyAuZGF0YS1ncmlkOmZvY3VzIHRyLnNlbGVjdGVkKToKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uLmNzczoKKyAgICAgICAgKC5kZXRh aWxzLXNlY3Rpb24pOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubWF2ZXJpY2tzIC5kZXRh aWxzLXNlY3Rpb24pOgorICAgICAgICAoLmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0aW9u KToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLm1hdmVyaWNrcyAuZGV0YWlscy1zZWN0aW9u IC5kZXRhaWxzLXNlY3Rpb24pOgorICAgICAgICAoLmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1z ZWN0aW9uOmxhc3QtY2hpbGQpOgorICAgICAgICAoLmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1z ZWN0aW9uOmZpcnN0LWNoaWxkKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gPiAuaGVhZGVy KToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLm1hdmVyaWNrcyAuZGV0YWlscy1zZWN0aW9u ID4gLmhlYWRlcik6CisgICAgICAgICguZGV0YWlscy1zZWN0aW9uIC5kZXRhaWxzLXNlY3Rpb24g PiAuaGVhZGVyKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLm1vdW50YWluLWxpb24gLmRl dGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0aW9uID4gLmhlYWRlcik6CisgICAgICAgICguZGV0 YWlscy1zZWN0aW9uIC5kZXRhaWxzLXNlY3Rpb24uY29sbGFzcHNlZCA+IC5oZWFkZXIpOgorICAg ICAgICAoLmRldGFpbHMtc2VjdGlvbi5jb21wdXRlZC1zdHlsZS1wcm9wZXJ0aWVzOm5vdCguY29s bGFwc2VkKSA+IC5oZWFkZXIpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubWF2ZXJpY2tz IC5kZXRhaWxzLXNlY3Rpb24uY29tcHV0ZWQtc3R5bGUtcHJvcGVydGllczpub3QoLmNvbGxhcHNl ZCkgPiAuaGVhZGVyKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5n cm91cCk6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5tYXZlcmlja3MgIC5kZXRhaWxzLXNl Y3Rpb24gPiAuY29udGVudCA+IC5ncm91cCk6CisgICAgICAgICguZGV0YWlscy1zZWN0aW9uID4g LmNvbnRlbnQgPiAuZ3JvdXA6bGFzdC1jaGlsZCk6CisgICAgICAgICguZGV0YWlscy1zZWN0aW9u ID4gLmNvbnRlbnQgPiAuZ3JvdXA6bnRoLWNoaWxkKGV2ZW4pKToKKyAgICAgICAgKGJvZHkubWFj LXBsYXRmb3JtLm1hdmVyaWNrcyAgLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3Vw Om50aC1jaGlsZChldmVuKSk6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5tYXZlcmlja3Mg LmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwOmxhc3QtY2hpbGQgPiAucm93LnNp bXBsZTpsYXN0LWNoaWxkID4gKik6CisgICAgICAgICguZGV0YWlscy1zZWN0aW9uID4gLmNvbnRl bnQgPiAuZ3JvdXA6bGFzdC1jaGlsZCA+IC5yb3cuc2ltcGxlOmxhc3QtY2hpbGQgPiAqKTogRGVs ZXRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0ZpbHRlckJhci5jc3M6CisgICAg ICAgICguZmlsdGVyLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdKToKKyAgICAgICAgKGJvZHku bWFjLXBsYXRmb3JtLm1hdmVyaWNrcyAuZmlsdGVyLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJd KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25TaWRlYmFyUGFuZWwu Y3NzOgorICAgICAgICAoLm5hdmlnYXRpb24tc2lkZWJhci1wYW5lbC1jb250ZW50LXRyZWUtb3V0 bGluZSAuaXRlbS5zZWxlY3RlZCk6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5tYXZlcmlj a3MgLm5hdmlnYXRpb24tc2lkZWJhci1wYW5lbC1jb250ZW50LXRyZWUtb3V0bGluZSAuaXRlbS5z ZWxlY3RlZCk6CisgICAgICAgICgubmF2aWdhdGlvbi1zaWRlYmFyLXBhbmVsLWNvbnRlbnQtdHJl ZS1vdXRsaW5lOmZvY3VzIC5pdGVtLnNlbGVjdGVkKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRm b3JtLm1hdmVyaWNrcyAubmF2aWdhdGlvbi1zaWRlYmFyLXBhbmVsLWNvbnRlbnQtdHJlZS1vdXRs aW5lOmZvY3VzIC5pdGVtLnNlbGVjdGVkKToKKyAgICAgICAgKGJvZHkud2luZG93LWluYWN0aXZl IC5uYXZpZ2F0aW9uLXNpZGViYXItcGFuZWwtY29udGVudC10cmVlLW91dGxpbmUgLml0ZW0uc2Vs ZWN0ZWQpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubWF2ZXJpY2tzLndpbmRvdy1pbmFj dGl2ZSAubmF2aWdhdGlvbi1zaWRlYmFyLXBhbmVsLWNvbnRlbnQtdHJlZS1vdXRsaW5lIC5pdGVt LnNlbGVjdGVkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1JhZGlvQnV0dG9uTmF2 aWdhdGlvbkl0ZW0uY3NzOgorICAgICAgICAoLm5hdmlnYXRpb24tYmFyIC5pdGVtLnJhZGlvLmJ1 dHRvbi50ZXh0LW9ubHkuc2VsZWN0ZWQpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubWF2 ZXJpY2tzIC5uYXZpZ2F0aW9uLWJhciAuaXRlbS5yYWRpby5idXR0b24udGV4dC1vbmx5LnNlbGVj dGVkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1J1bGVzU3R5bGVEZXRhaWxzUGFu ZWwuY3NzOgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnJ1 bGVzIC5sYWJlbCArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uKToKKyAgICAgICAgKGJvZHku bWFjLXBsYXRmb3JtLm1hdmVyaWNrcyAuc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHls ZSAucnVsZXMgLmxhYmVsICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24pOgorICAgICAgICAo LnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnJ1bGVzIC5uZXctcnVsZSk6Cisg ICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5tYXZlcmlja3MgLnNpZGViYXIgPiAucGFuZWwuZGV0 YWlscy5jc3Mtc3R5bGUgLnJ1bGVzIC5uZXctcnVsZSk6CisgICAgICAgICguc2lkZWJhciA+IC5w YW5lbC5kZXRhaWxzLmNzcy1zdHlsZSAucnVsZXMgLm5ldy1ydWxlICsgLnN0eWxlLWRlY2xhcmF0 aW9uLXNlY3Rpb24pOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubWF2ZXJpY2tzIC5zaWRl YmFyID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlIC5ydWxlcyAubmV3LXJ1bGUgKyAuc3R5bGUt ZGVjbGFyYXRpb24tc2VjdGlvbik6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TY29w ZUJhci5jc3M6CisgICAgICAgICguc2NvcGUtYmFyID4gbGkpOgorICAgICAgICAoYm9keS5tYWMt cGxhdGZvcm0ubWF2ZXJpY2tzIC5zY29wZS1iYXIgPiBsaSk6CisgICAgICAgICguc2NvcGUtYmFy ID4gbGkuc2VsZWN0ZWQpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubWF2ZXJpY2tzIC5z Y29wZS1iYXIgPiBsaS5zZWxlY3RlZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9T ZWFyY2hCYXIuY3NzOgorICAgICAgICAoLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2gi XSk6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5tYXZlcmlja3MgLnNlYXJjaC1iYXIgPiBp bnB1dFt0eXBlPSJzZWFyY2giXSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TaWRl YmFyLmNzczoKKyAgICAgICAgKC5zaWRlYmFyKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3Jt Lm1hdmVyaWNrcyAuc2lkZWJhcik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5tYXZlcmlj a3Mud2luZG93LWluYWN0aXZlIC5zaWRlYmFyKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3Jt Lm1hdmVyaWNrcyAuc2lkZWJhci5yaWdodCk6CisgICAgICAgIChib2R5LndpbmRvdy1pbmFjdGl2 ZSAuc2lkZWJhcik6IERlbGV0ZWQuCisgICAgICAgICguc2lkZWJhci5yaWdodCk6IERlbGV0ZWQu CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5jc3M6 CisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnRpbWVsaW5lID4gLnRpdGxl LWJhcik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5tYXZlcmlja3MgLnNpZGViYXIgPiAu cGFuZWwubmF2aWdhdGlvbi50aW1lbGluZSA+IC50aXRsZS1iYXIpOgorICAgICAgICAqIFdlYklu c3BlY3RvclVJLnZjeHByb2ovV2ViSW5zcGVjdG9yVUkudmN4cHJvajoKKyAgICAgICAgKiBXZWJJ bnNwZWN0b3JVSS52Y3hwcm9qL1dlYkluc3BlY3RvclVJLnZjeHByb2ouZmlsdGVyczoKKwogMjAx NC0wNy0wOSAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBb V2luXSBSZW1vdmUgdXNlcyBvZiAnYmFzaCcgaW4gYnVpbGQgc3lzdGVtCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvQmFja0Fycm93TGlnaHQu c3ZnIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0JhY2tBcnJv d0xpZ2h0LnN2ZwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xODA1MzFlCi0t LSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1h Z2VzL0JhY2tBcnJvd0xpZ2h0LnN2ZwpAQCAtMCwwICsxLDUgQEAKKzw/eG1sIHZlcnNpb249IjEu MCIgZW5jb2Rpbmc9InV0Zi04Ij8+Cis8IS0tIENvcHlyaWdodCDCqSAyMDEzIEFwcGxlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4gLS0+Cis8c3ZnIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6 Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgMTAgMTYiPgorICAgIDxwYXRoIGQ9 Ik0gMy4yMDU0MDA2NCA3Ljc1OTgzMjgzIEwgOS4zNDQ4IDEuNjI0NCBMIDcuNzM4OCAwLjAxNzQg TCAtMC4wMDAyIDcuNzUxNCBMIDAuMDA5MTk5Mzc1OSA3Ljc2MDgwNTIzIEwgMC4wMDE4IDcuNzY4 MiBMIDcuNzM1OCAxNS41MDcyIEwgOS4zNDI4IDEzLjkwMTIgTCAzLjIwNTQwMDY0IDcuNzU5ODMy ODMgWiI+PC9wYXRoPgorPC9zdmc+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9JbWFnZXMvQmFja0Fycm93TW9kZXJuLnN2ZyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9CYWNrQXJyb3dNb2Rlcm4uc3ZnCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjE4MDUzMWUKLS0tIC9kZXYvbnVsbAorKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvQmFja0Fycm93TW9kZXJu LnN2ZwpAQCAtMCwwICsxLDUgQEAKKzw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi04 Ij8+Cis8IS0tIENvcHlyaWdodCDCqSAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4gLS0+Cis8c3ZnIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAv c3ZnIiB2aWV3Qm94PSIwIDAgMTAgMTYiPgorICAgIDxwYXRoIGQ9Ik0gMy4yMDU0MDA2NCA3Ljc1 OTgzMjgzIEwgOS4zNDQ4IDEuNjI0NCBMIDcuNzM4OCAwLjAxNzQgTCAtMC4wMDAyIDcuNzUxNCBM IDAuMDA5MTk5Mzc1OSA3Ljc2MDgwNTIzIEwgMC4wMDE4IDcuNzY4MiBMIDcuNzM1OCAxNS41MDcy IEwgOS4zNDI4IDEzLjkwMTIgTCAzLjIwNTQwMDY0IDcuNzU5ODMyODMgWiI+PC9wYXRoPgorPC9z dmc+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFn ZXMvRm9yd2FyZEFycm93TGlnaHQuc3ZnIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvSW1hZ2VzL0ZvcndhcmRBcnJvd0xpZ2h0LnN2ZwpuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwLi42OGI4ZjE1Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0ZvcndhcmRBcnJvd0xpZ2h0LnN2ZwpAQCAtMCww ICsxLDUgQEAKKzw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi04Ij8+Cis8IS0tIENv cHlyaWdodCDCqSAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4gLS0+Cis8c3Zn IHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94 PSIwIDAgMTAgMTYiPgorICAgIDxwYXRoIGQ9Ik0gNi4xMzkyNDkzMyA3Ljc1OTc4MjgzIEwgMC4w MDE4IDEzLjkwMTIgTCAxLjYwODggMTUuNTA3MiBMIDkuMzQyOCA3Ljc2ODIgTCA5LjMzNTQ1MDY2 IDcuNzYwODU1MjMgTCA5LjM0NDkgNy43NTE0IEwgMS42MDU5IDAuMDE3NCBMIC0wLjAwMDEgMS42 MjQ0IEwgNi4xMzkyNDkzMyA3Ljc1OTc4MjgzIFoiPjwvcGF0aD4KKzwvc3ZnPgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0ZvcndhcmRBcnJv d01vZGVybi5zdmcgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMv Rm9yd2FyZEFycm93TW9kZXJuLnN2ZwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw Li42OGI4ZjE1Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvSW1hZ2VzL0ZvcndhcmRBcnJvd01vZGVybi5zdmcKQEAgLTAsMCArMSw1IEBACis8 P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJ1dGYtOCI/PgorPCEtLSBDb3B5cmlnaHQgwqkg MjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuIC0tPgorPHN2ZyB2ZXJzaW9uPSIx LjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDEwIDE2 Ij4KKyAgICA8cGF0aCBkPSJNIDYuMTM5MjQ5MzMgNy43NTk3ODI4MyBMIDAuMDAxOCAxMy45MDEy IEwgMS42MDg4IDE1LjUwNzIgTCA5LjM0MjggNy43NjgyIEwgOS4zMzU0NTA2NiA3Ljc2MDg1NTIz IEwgOS4zNDQ5IDcuNzUxNCBMIDEuNjA1OSAwLjAxNzQgTCAtMC4wMDAxIDEuNjI0NCBMIDYuMTM5 MjQ5MzMgNy43NTk3ODI4MyBaIj48L3BhdGg+Cis8L3N2Zz4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25TZWN0 aW9uLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0 eWxlRGVjbGFyYXRpb25TZWN0aW9uLmNzcwppbmRleCA1YjM2ZmIzLi5jMzQ3Zjg1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURl Y2xhcmF0aW9uU2VjdGlvbi5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uY3NzCkBAIC0zMCwzMCArMzAs NTAgQEAKICAgICBwYWRkaW5nOiA1cHg7CiAKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsK KyAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgcmdiKDIxMCwgMjEwLCAyMTApOwogfQogCi0u c3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbiArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uIHsK K2JvZHkubWFjLXBsYXRmb3JtLm1vdW50YWluLWxpb24gLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rp b24sCitib2R5Lm1hYy1wbGF0Zm9ybS5tYXZlcmlja3MgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rp b24geworICAgIGJvcmRlci1ib3R0b206IG5vbmU7Cit9CisKK2JvZHkubWFjLXBsYXRmb3JtLm1v dW50YWluLWxpb24gLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24gKyAuc3R5bGUtZGVjbGFyYXRp b24tc2VjdGlvbiwKK2JvZHkubWFjLXBsYXRmb3JtLm1hdmVyaWNrcyAuc3R5bGUtZGVjbGFyYXRp b24tc2VjdGlvbiArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uIHsKICAgICBib3JkZXItdG9w OiAxcHggc29saWQgcmdiKDIxMCwgMjEwLCAyMTApOwogfQogCiAuc3R5bGUtZGVjbGFyYXRpb24t c2VjdGlvbi5sYXN0LWluLWdyb3VwIHsKICAgICBtYXJnaW4tYm90dG9tOiAxNXB4OwogCisgICAg Ym9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHJnYigyMTAsIDIxMCwgMjEwKTsKK30KKworYm9keS5t YWMtcGxhdGZvcm0ubW91bnRhaW4tbGlvbiAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0 LWluLWdyb3VwLAorYm9keS5tYWMtcGxhdGZvcm0ubWF2ZXJpY2tzIC5zdHlsZS1kZWNsYXJhdGlv bi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAgewogICAgIGJveC1zaGFkb3c6IHJnYmEoMCwgMCwgMCwg MC4zKSAwIDJweCAycHggMDsKIH0KIAogLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1p bi1ncm91cCArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uIHsKICAgICBtYXJnaW4tdG9wOiAx NXB4OwogCi0gICAgYm9yZGVyLXRvcDogbm9uZTsKKyAgICBib3JkZXItdG9wOiAxcHggc29saWQg cmdiKDIxMCwgMjEwLCAyMTApOworfQogCitib2R5Lm1hYy1wbGF0Zm9ybS5tb3VudGFpbi1saW9u IC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAgKyAuc3R5bGUtZGVjbGFy YXRpb24tc2VjdGlvbiwKK2JvZHkubWFjLXBsYXRmb3JtLm1hdmVyaWNrcyAuc3R5bGUtZGVjbGFy YXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3VwICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24g ewogICAgIGJveC1zaGFkb3c6IHJnYmEoMCwgMCwgMCwgMC4zKSAwIDAgMnB4IDA7CisgICAgYm9y ZGVyLXRvcDogbm9uZTsKIH0KIAotLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb246Zmlyc3QtY2hp bGQsCi1kaXY6bm90KC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uKSArIC5zdHlsZS1kZWNsYXJh dGlvbi1zZWN0aW9uLAotLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1pbi1ncm91cCAr IC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAsCi0uc3R5bGUtZGVjbGFy YXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3VwICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb246 bGFzdC1jaGlsZCB7Citib2R5Lm1hYy1wbGF0Zm9ybS5tb3VudGFpbi1saW9uIC5zdHlsZS1kZWNs YXJhdGlvbi1zZWN0aW9uOmZpcnN0LWNoaWxkLAorYm9keS5tYWMtcGxhdGZvcm0ubWF2ZXJpY2tz IC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uOmZpcnN0LWNoaWxkLAorYm9keS5tYWMtcGxhdGZv cm0ubW91bnRhaW4tbGlvbiBkaXY6bm90KC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uKSArIC5z dHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uLAorYm9keS5tYWMtcGxhdGZvcm0ubWF2ZXJpY2tzIGRp djpub3QoLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24pICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNl Y3Rpb24sCitib2R5Lm1hYy1wbGF0Zm9ybS5tb3VudGFpbi1saW9uIC5zdHlsZS1kZWNsYXJhdGlv bi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAgKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0 LWluLWdyb3VwLAorYm9keS5tYWMtcGxhdGZvcm0ubWF2ZXJpY2tzIC5zdHlsZS1kZWNsYXJhdGlv bi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAgKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0 LWluLWdyb3VwLAorYm9keS5tYWMtcGxhdGZvcm0ubW91bnRhaW4tbGlvbiAuc3R5bGUtZGVjbGFy YXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3VwICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb246 bGFzdC1jaGlsZCwKK2JvZHkubWFjLXBsYXRmb3JtLm1hdmVyaWNrcyAuc3R5bGUtZGVjbGFyYXRp b24tc2VjdGlvbi5sYXN0LWluLWdyb3VwICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb246bGFz dC1jaGlsZCB7CiAgICAgYm94LXNoYWRvdzogcmdiYSgwLCAwLCAwLCAwLjMpIDAgMXB4IDNweCAx cHg7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0NTU1N0eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwuY3Nz CmluZGV4IDlkZjg4MmIuLjc2ZGYzYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5jc3MKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZXRh aWxzU2lkZWJhclBhbmVsLmNzcwpAQCAtNDMsNiArNDMsNyBAQAogCiAuc2lkZWJhciA+IC5wYW5l bC5kZXRhaWxzLmNzcy1zdHlsZSA+IC5jb250ZW50ID4gLnBzZXVkby1jbGFzc2VzIHsKICAgICBw YWRkaW5nOiAxMHB4OworICAgIGJvcmRlci1ib3R0b206IDFweCBzb2xpZCByZ2IoMTUzLCAxNTMs IDE1Myk7CiAKICAgICBkaXNwbGF5OiAtd2Via2l0LWZsZXg7CiAgICAgLXdlYmtpdC1mbGV4LWZs b3c6IHJvdyB3cmFwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcwppbmRleCA3ZjU4N2ExLi4wYTBhY2Mz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9D b250ZW50QnJvd3Nlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcwpAQCAtNDksMTIgKzQ5LDEyIEBAIFdlYkluc3BlY3Rv ci5Db250ZW50QnJvd3NlciA9IGZ1bmN0aW9uKGVsZW1lbnQsIGRlbGVnYXRlLCBkaXNhYmxlQmFj a0ZvcndhcmQpCiAgICAgICAgIHRoaXMuX2JhY2tLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYklu c3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1v ZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wgfCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5N b2RpZmllci5Db250cm9sLCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuTGVmdCwg dGhpcy5fYmFja0J1dHRvbkNsaWNrZWQuYmluZCh0aGlzKSk7CiAgICAgICAgIHRoaXMuX2Zvcndh cmRLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wgfCBX ZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db250cm9sLCBXZWJJbnNwZWN0 b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuUmlnaHQsIHRoaXMuX2ZvcndhcmRCdXR0b25DbGlja2Vk LmJpbmQodGhpcykpOwogCi0gICAgICAgIHRoaXMuX2JhY2tCdXR0b25OYXZpZ2F0aW9uSXRlbSA9 IG5ldyBXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImJhY2siLCBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIkJhY2sgKCVzKSIpLmZvcm1hdCh0aGlzLl9iYWNrS2V5Ym9hcmRTaG9ydGN1 dC5kaXNwbGF5TmFtZSksICJJbWFnZXMvQmFja0Fycm93LnN2ZyIsIDksIDkpOworICAgICAgICB0 aGlzLl9iYWNrQnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV2ViSW5zcGVjdG9yLkJ1dHRvbk5h dmlnYXRpb25JdGVtKCJiYWNrIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJCYWNrICglcykiKS5m b3JtYXQodGhpcy5fYmFja0tleWJvYXJkU2hvcnRjdXQuZGlzcGxheU5hbWUpLCAiSW1hZ2VzL0Jh Y2tBcnJvd0xpZ2h0LnN2ZyIsIDksIDkpOwogICAgICAgICB0aGlzLl9iYWNrQnV0dG9uTmF2aWdh dGlvbkl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0 ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fYmFja0J1dHRvbkNsaWNrZWQsIHRoaXMpOwogICAgICAg ICB0aGlzLl9iYWNrQnV0dG9uTmF2aWdhdGlvbkl0ZW0uZW5hYmxlZCA9IGZhbHNlOwogICAgICAg ICB0aGlzLl9uYXZpZ2F0aW9uQmFyLmFkZE5hdmlnYXRpb25JdGVtKHRoaXMuX2JhY2tCdXR0b25O YXZpZ2F0aW9uSXRlbSk7CiAKLSAgICAgICAgdGhpcy5fZm9yd2FyZEJ1dHRvbk5hdmlnYXRpb25J dGVtID0gbmV3IFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbSgiZm9yd2FyZCIsIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiRm9yd2FyZCAoJXMpIikuZm9ybWF0KHRoaXMuX2ZvcndhcmRL ZXlib2FyZFNob3J0Y3V0LmRpc3BsYXlOYW1lKSwgIkltYWdlcy9Gb3J3YXJkQXJyb3cuc3ZnIiwg OSwgOSk7CisgICAgICAgIHRoaXMuX2ZvcndhcmRCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBX ZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImZvcndhcmQiLCBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIkZvcndhcmQgKCVzKSIpLmZvcm1hdCh0aGlzLl9mb3J3YXJkS2V5Ym9hcmRTaG9y dGN1dC5kaXNwbGF5TmFtZSksICJJbWFnZXMvRm9yd2FyZEFycm93TGlnaHQuc3ZnIiwgOSwgOSk7 CiAgICAgICAgIHRoaXMuX2ZvcndhcmRCdXR0b25OYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlz Ll9mb3J3YXJkQnV0dG9uQ2xpY2tlZCwgdGhpcyk7CiAgICAgICAgIHRoaXMuX2ZvcndhcmRCdXR0 b25OYXZpZ2F0aW9uSXRlbS5lbmFibGVkID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX25hdmlnYXRp b25CYXIuYWRkTmF2aWdhdGlvbkl0ZW0odGhpcy5fZm9yd2FyZEJ1dHRvbk5hdmlnYXRpb25JdGVt KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0RPTVRyZWVPdXRsaW5lLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmNzcwppbmRleCAzMTk0YjU5Li40MDJiMmE1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlT3V0 bGluZS5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RE9NVHJlZU91dGxpbmUuY3NzCkBAIC00NCwxMCArNDQsMTUgQEAKICAgICBsZWZ0OiAzcHg7CiAg ICAgcmlnaHQ6IDNweDsKIAotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYmEoNTYsIDEyMSwgMjE3 LCAwLjEpOworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYmEoMCwgMTI4LCAyNTIsIDAuMSk7CiAg ICAgYm9yZGVyLXJhZGl1czogNXB4OwogfQogCitib2R5Lm1hYy1wbGF0Zm9ybS5tb3VudGFpbi1s aW9uIC5kb20tdHJlZS1vdXRsaW5lIGxpLmhvdmVyZWQ6bm90KC5zZWxlY3RlZCkgLnNlbGVjdGlv biwKK2JvZHkubWFjLXBsYXRmb3JtLm1hdmVyaWNrcyAuZG9tLXRyZWUtb3V0bGluZSBsaS5ob3Zl cmVkOm5vdCguc2VsZWN0ZWQpIC5zZWxlY3Rpb24geworICAgIGJhY2tncm91bmQtY29sb3I6IHJn YmEoNTYsIDEyMSwgMjE3LCAwLjEpOworfQorCiAuZG9tLXRyZWUtb3V0bGluZSBsaSAuc2VsZWN0 aW9uIHsKICAgICBkaXNwbGF5OiBub25lOwogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKQEAgLTY1 LDEwICs3MCwyMCBAQAogLmRvbS10cmVlLW91dGxpbmUgbGkuZWxlbWVudHMtZHJhZy1vdmVyIC5z ZWxlY3Rpb24gewogICAgIGRpc3BsYXk6IGJsb2NrOwogICAgIG1hcmdpbi10b3A6IC0ycHg7Cisg ICAgYm9yZGVyLXRvcDogMnB4IHNvbGlkIHJnYigwLCAxMjgsIDI1Mik7Cit9CisKK2JvZHkubWFj LXBsYXRmb3JtLm1vdW50YWluLWxpb24gLmRvbS10cmVlLW91dGxpbmUgbGkuZWxlbWVudHMtZHJh Zy1vdmVyIC5zZWxlY3Rpb24sCitib2R5Lm1hYy1wbGF0Zm9ybS5tYXZlcmlja3MgLmRvbS10cmVl LW91dGxpbmUgbGkuZWxlbWVudHMtZHJhZy1vdmVyIC5zZWxlY3Rpb24gewogICAgIGJvcmRlci10 b3A6IDJweCBzb2xpZCByZ2IoNTYsIDEyMSwgMjE3KTsKIH0KIAogLmRvbS10cmVlLW91dGxpbmU6 Zm9jdXMgbGkuc2VsZWN0ZWQgLnNlbGVjdGlvbiB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdi KDAsIDEyOCwgMjUyKTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubW91bnRhaW4tbGlvbiAuZG9t LXRyZWUtb3V0bGluZTpmb2N1cyBsaS5zZWxlY3RlZCAuc2VsZWN0aW9uLAorYm9keS5tYWMtcGxh dGZvcm0ubWF2ZXJpY2tzIC5kb20tdHJlZS1vdXRsaW5lOmZvY3VzIGxpLnNlbGVjdGVkIC5zZWxl Y3Rpb24gewogICAgIGJhY2tncm91bmQtY29sb3I6IHJnYig1NiwgMTIxLCAyMTcpOwogfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXNo Ym9hcmRDb250YWluZXJWaWV3LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0Rhc2hib2FyZENvbnRhaW5lclZpZXcuY3NzCmluZGV4IDI2OTg2ZGEuLjIzNjdh ODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0Rhc2hib2FyZENvbnRhaW5lclZpZXcuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0Rhc2hib2FyZENvbnRhaW5lclZpZXcuY3NzCkBAIC0yOCw4ICsy OCw5IEBACiAKICAgICB3aWR0aDogMzc1cHg7CiAKLSAgICBib3JkZXI6IDFweCBzb2xpZCByZ2Io MTYzLCAxNjMsIDE2Myk7CisgICAgYm9yZGVyOiAxcHggc29saWQgcmdiKDI1NSwgMjU1LCAyNTUp OwogICAgIGJvcmRlci1yYWRpdXM6IDRweDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjU1 LCAyNTUsIDI1NSk7CiAKICAgICBib3gtc2hhZG93OiByZ2JhKDI1NSwgMjU1LCAyNTUsIDAuNDUp IDAgMXB4IDA7CiAKQEAgLTM3LDcgKzM4LDE5IEBACiAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKIH0K IAorYm9keS5tYWMtcGxhdGZvcm0ubW91bnRhaW4tbGlvbiAudG9vbGJhciAuZGFzaGJvYXJkLWNv bnRhaW5lciwKK2JvZHkubWFjLXBsYXRmb3JtLm1hdmVyaWNrcyAudG9vbGJhciAuZGFzaGJvYXJk LWNvbnRhaW5lciB7CisgICAgYm9yZGVyLWNvbG9yOiByZ2IoMTYzLCAxNjMsIDE2Myk7CisgICAg YmFja2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7Cit9CisKIGJvZHkud2luZG93LWluYWN0aXZl IC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKKyAgICBib3JkZXItY29sb3I6IHJnYigy MjAsIDIyMCwgMjIwKTsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjQ2LCAyNDYsIDI0Nik7 Cit9CisKK2JvZHkubWFjLXBsYXRmb3JtLm1vdW50YWluLWxpb24ud2luZG93LWluYWN0aXZlIC50 b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyLAorYm9keS5tYWMtcGxhdGZvcm0ubWF2ZXJpY2tz LndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lciB7CiAgICAgYm9y ZGVyLWNvbG9yOiByZ2IoMTk2LCAxOTYsIDE5Nik7CiAgICAgYmFja2dyb3VuZC1pbWFnZTogbm9u ZTsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjM5LCAyMzksIDIzOSk7CkBAIC03OCwxNiAr OTEsMjggQEAgYm9keS53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWlu ZXIgewogICAgIGxlZnQ6IDA7CiAgICAgcmlnaHQ6IDA7CiAKKyAgICBwYWRkaW5nOiAwIDVweDsK KworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyNTUsIDI1NSwgMjU1KTsKKworICAgIC13ZWJr aXQtYW5pbWF0aW9uLWR1cmF0aW9uOiAwLjRzOworfQorCitib2R5LndpbmRvdy1pbmFjdGl2ZSAu dG9vbGJhciAuZGFzaGJvYXJkIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjQ2LCAyNDYs IDI0Nik7Cit9CisKK2JvZHkubWFjLXBsYXRmb3JtLm1vdW50YWluLWxpb24gLnRvb2xiYXIgLmRh c2hib2FyZCwKK2JvZHkubWFjLXBsYXRmb3JtLm1hdmVyaWNrcyAudG9vbGJhciAuZGFzaGJvYXJk LAorYm9keS5tYWMtcGxhdGZvcm0ubW91bnRhaW4tbGlvbi53aW5kb3ctaW5hY3RpdmUgLnRvb2xi YXIgLmRhc2hib2FyZCwKK2JvZHkubWFjLXBsYXRmb3JtLm1hdmVyaWNrcy53aW5kb3ctaW5hY3Rp dmUgLnRvb2xiYXIgLmRhc2hib2FyZCB7CiAgICAgYmFja2dyb3VuZC1pbWFnZTogbGluZWFyLWdy YWRpZW50KHRvIGJvdHRvbSwgcmdiYSgwLCAxMjgsIDI1NSwgMCksIHJnYmEoMCwgMTI4LCAyNTUs IDAuMDc1KSksCiAgICAgICAgIGxpbmVhci1ncmFkaWVudCh0byByaWdodCwgcmdiYSgwLCAwLCAw LCAwLjA5KSwgdHJhbnNwYXJlbnQsIHJnYmEoMCwgMCwgMCwgMC4wOSkpLAogICAgICAgICBsaW5l YXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2IoMjQwLCAyNDQsIDI1MSksIHJnYigyNTAsIDI1Mywg MjU1KSk7CiAgICAgYmFja2dyb3VuZC1zaXplOiAxMDAlIDZweCwgYXV0bywgYXV0bzsKICAgICBi YWNrZ3JvdW5kLXBvc2l0aW9uOiBib3R0b20sIGNlbnRlciwgY2VudGVyOwogICAgIGJhY2tncm91 bmQtcmVwZWF0OiBuby1yZXBlYXQ7Ci0KLSAgICBwYWRkaW5nOiAwIDVweDsKLQotICAgIC13ZWJr aXQtYW5pbWF0aW9uLWR1cmF0aW9uOiAwLjRzOworICAgIGJhY2tncm91bmQtY29sb3I6IHRyYW5z cGFyZW50OwogfQogCiAudG9vbGJhciAuZGFzaGJvYXJkLnZpc2libGUgewpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuY3NzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuY3NzCmlu ZGV4IDM5NTc3YzQuLjQyYTdhNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5jc3MKQEAgLTc1LDE0ICs3NSwxNyBAQAog ICAgIHRleHQtYWxpZ246IGxlZnQ7CiAgICAgdmVydGljYWwtYWxpZ246IG1pZGRsZTsKIAotICAg IGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHJnYmEoMCwgMCwg MCwgMC4yKSwgcmdiYSgwLCAwLCAwLCAwLjIpKSwgbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwg dHJhbnNwYXJlbnQsIHRyYW5zcGFyZW50KSwKLSAgICAgICAgbGluZWFyLWdyYWRpZW50KHRvIGJv dHRvbSwgd2hpdGUsIHdoaXRlIDI1JSwgcmdiKDI0NCwgMjQ0LCAyNDQpIDUwJSwgcmdiKDIzNiwg MjM2LCAyMzYpIDUwJSwgcmdiKDIzNywgMjM3LCAyMzcpKTsKLSAgICBiYWNrZ3JvdW5kLXNpemU6 IDFweCAxMXB4LCAwIDAsIDEwMCUgMTAwJTsKLSAgICBiYWNrZ3JvdW5kLXBvc2l0aW9uOiBsZWZ0 IDJweCwgcmlnaHQgMnB4LCBjZW50ZXI7Ci0gICAgYmFja2dyb3VuZC1yZXBlYXQ6IG5vLXJlcGVh dDsKKyAgICAvKmJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHJn YmEoMCwgMCwgMCwgMC4yKSwgcmdiYSgwLCAwLCAwLCAwLjIpKSwgbGluZWFyLWdyYWRpZW50KHRv IGJvdHRvbSwgdHJhbnNwYXJlbnQsIHRyYW5zcGFyZW50KSwKKyAgICAgICAgbGluZWFyLWdyYWRp ZW50KHRvIGJvdHRvbSwgd2hpdGUsIHdoaXRlIDI1JSwgcmdiKDI0NCwgMjQ0LCAyNDQpIDUwJSwg cmdiKDIzNiwgMjM2LCAyMzYpIDUwJSwgcmdiKDIzNywgMjM3LCAyMzcpKTsqLworCisgICAgLypi YWNrZ3JvdW5kLXNpemU6IDFweCAxMXB4LCAwIDAsIDEwMCUgMTAwJTsqLworICAgIC8qYmFja2dy b3VuZC1wb3NpdGlvbjogbGVmdCAycHgsIHJpZ2h0IDJweCwgY2VudGVyOyovCisgICAgLypiYWNr Z3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0OyovCiAKLSAgICBib3gtc2hhZG93OiBpbnNldCByZ2Jh KDI1NSwgMjU1LCAyNTUsIDAuMykgMCAtMXB4IDA7CisgICAgLypib3gtc2hhZG93OiBpbnNldCBy Z2JhKDI1NSwgMjU1LCAyNTUsIDAuMykgMCAtMXB4IDA7Ki8KKyAgICBib3JkZXItdG9wOiAxcHgg c29saWQgcmdiKDE3OSwgMTc5LCAxNzkpOwogICAgIGJvcmRlci1ib3R0b206IDFweCBzb2xpZCBy Z2IoMTgyLCAxODIsIDE4Mik7CisgICAgLypib3JkZXItYm90dG9tOiAxcHggc29saWQgcmdiKDE4 MiwgMTgyLCAxODIpOyovCiAKICAgICBoZWlnaHQ6IDE1cHg7CiAgICAgZm9udC13ZWlnaHQ6IG5v cm1hbDsKQEAgLTMxMywxNSArMzE2LDI1IEBAIGJvZHkud2luZG93LWluYWN0aXZlIC5kYXRhLWdy aWQgdGguc29ydC1kZXNjZW5kaW5nIHsKIH0KIAogLmRhdGEtZ3JpZCB0ci5zZWxlY3RlZCB7Ci0g ICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDIxMiwgMjEyLCAyMTIpICFpbXBvcnRhbnQ7CisgICAg YmFja2dyb3VuZC1jb2xvcjogcmdiKDE4NSwgMTg0LCAxODUpICFpbXBvcnRhbnQ7CiAgICAgY29s b3I6IGluaGVyaXQgIWltcG9ydGFudDsKIH0KIAorYm9keS5tYWMtcGxhdGZvcm0ubW91bnRhaW4t bGlvbiAuZGF0YS1ncmlkIHRyLnNlbGVjdGVkLAorYm9keS5tYWMtcGxhdGZvcm0ubWF2ZXJpY2tz IC5kYXRhLWdyaWQgdHIuc2VsZWN0ZWQgeworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyMTIs IDIxMiwgMjEyKSAhaW1wb3J0YW50OworfQorCiAuZGF0YS1ncmlkOmZvY3VzIHRyLnNlbGVjdGVk IHsKLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoNTYsIDEyMSwgMjE3KSAhaW1wb3J0YW50Owor ICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigwLCAxMjgsIDI1MikgIWltcG9ydGFudDsKICAgICBj b2xvcjogd2hpdGUgIWltcG9ydGFudDsKIH0KIAorYm9keS5tYWMtcGxhdGZvcm0ubW91bnRhaW4t bGlvbiAuZGF0YS1ncmlkOmZvY3VzIHRyLnNlbGVjdGVkLAorYm9keS5tYWMtcGxhdGZvcm0ubWF2 ZXJpY2tzIC5kYXRhLWdyaWQ6Zm9jdXMgdHIuc2VsZWN0ZWQgeworICAgIGJhY2tncm91bmQtY29s b3I6IHJnYig1NiwgMTIxLCAyMTcpICFpbXBvcnRhbnQ7Cit9CisKIC5kYXRhLWdyaWQgdHI6bm90 KC5wYXJlbnQpIHRkLmRpc2Nsb3N1cmUgewogICAgIHRleHQtaW5kZW50OiAxMHB4OwogfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWls c1NlY3Rpb24uY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RGV0YWlsc1NlY3Rpb24uY3NzCmluZGV4IDIzYzYwMDUuLjc4NDZlMTggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uLmNz cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxz U2VjdGlvbi5jc3MKQEAgLTI0LDEwICsyNCwzNSBAQAogICovCiAKIC5kZXRhaWxzLXNlY3Rpb24g eworICAgIGZvbnQtc2l6ZTogMTBweDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjQyLCAy NDIsIDI0Mik7CisgICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHJnYigxNTMsIDE1MywgMTUz KTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubW91bnRhaW4tbGlvbiAuZGV0YWlscy1zZWN0aW9u LAorYm9keS5tYWMtcGxhdGZvcm0ubWF2ZXJpY2tzIC5kZXRhaWxzLXNlY3Rpb24gewogICAgIG1h cmdpbi10b3A6IC0xcHg7CiAgICAgbWFyZ2luLWJvdHRvbTogLTFweDsKIAotICAgIGZvbnQtc2l6 ZTogMTBweDsKKyAgICBib3JkZXItYm90dG9tOiBub25lOworICAgIGJhY2tncm91bmQtY29sb3I6 IHRyYW5zcGFyZW50OworfQorCisuZGV0YWlscy1zZWN0aW9uIC5kZXRhaWxzLXNlY3Rpb24gewor ICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyNTUsIDI1NSwgMjU1KTsKK30KKworYm9keS5tYWMt cGxhdGZvcm0ubW91bnRhaW4tbGlvbiAuZGV0YWlscy1zZWN0aW9uIC5kZXRhaWxzLXNlY3Rpb24s Citib2R5Lm1hYy1wbGF0Zm9ybS5tYXZlcmlja3MgLmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1z ZWN0aW9uIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsKK30KKworLmRldGFp bHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0aW9uOmxhc3QtY2hpbGQgeworICAgIGJvcmRlci1ib3R0 b206IG5vbmU7Cit9CisKKy5kZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMtc2VjdGlvbjpmaXJzdC1j aGlsZCB7CisgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIHJnYigxNTMsIDE1MywgMTUzKTsKIH0K IAogLmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXIgewpAQCAtMzUsMTMgKzYwLDggQEAKICAgICB0 b3A6IC0xcHg7CiAgICAgaGVpZ2h0OiAyM3B4OwogCi0gICAgYm9yZGVyLXRvcDogMXB4IHNvbGlk IHJnYigxNTMsIDE1MywgMTUzKTsKLSAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgcmdiKDE1 MywgMTUzLCAxNTMpOwotICAgIGJveC1zaGFkb3c6IGluc2V0IHJnYmEoMjU1LCAyNTUsIDI1NSwg MC4yKSAwIDFweCAwOwotICAgIGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBi b3R0b20sIHJnYigyMzgsIDI0MCwgMjQ0KSwgcmdiKDIyNCwgMjI2LCAyMzApKTsKLQorICAgIGJh Y2tncm91bmQtY29sb3I6IHJnYigyNDIsIDI0MiwgMjQyKTsKICAgICBjb2xvcjogcmdiKDU3LCA1 NywgNTcpOwotICAgIHRleHQtc2hhZG93OiByZ2JhKDI1NSwgMjU1LCAyNTUsIDAuNSkgMCAxcHgg MDsKIAogICAgIHdoaXRlLXNwYWNlOiBub3dyYXA7CiAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKQEAg LTU2LDEzICs3Niw2MCBAQAogICAgIHotaW5kZXg6IDIwMDsKIH0KIAotLmRldGFpbHMtc2VjdGlv biAuZGV0YWlscy1zZWN0aW9uID4gLmhlYWRlciB7Ci0gICAgYmFja2dyb3VuZC1pbWFnZTogbGlu ZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgcmdiKDI1MCwgMjUwLCAyNTApLCByZ2IoMjQwLCAyNDAs IDI0MCkpOworYm9keS5tYWMtcGxhdGZvcm0ubW91bnRhaW4tbGlvbiAuZGV0YWlscy1zZWN0aW9u ID4gLmhlYWRlciwKK2JvZHkubWFjLXBsYXRmb3JtLm1hdmVyaWNrcyAuZGV0YWlscy1zZWN0aW9u ID4gLmhlYWRlciB7CisgICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHJnYigxNTMsIDE1Mywg MTUzKTsKKyAgICBib3gtc2hhZG93OiBpbnNldCByZ2JhKDI1NSwgMjU1LCAyNTUsIDAuMikgMCAx cHggMDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsKKyAgICBiYWNrZ3JvdW5k LWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2IoMjM4LCAyNDAsIDI0NCksIHJn YigyMjQsIDIyNiwgMjMwKSk7CiAKKyAgICBib3JkZXItdG9wOiAxcHggc29saWQgcmdiKDE1Mywg MTUzLCAxNTMpOworCisgICAgdGV4dC1zaGFkb3c6IHJnYmEoMjU1LCAyNTUsIDI1NSwgMC41KSAw IDFweCAwOworfQorCisuZGV0YWlscy1zZWN0aW9uIC5kZXRhaWxzLXNlY3Rpb24gPiAuaGVhZGVy IHsKICAgICB0b3A6IDIxcHg7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDI1NSwgMjU1LCAy NTUpOworCisgICAgYm94LXNoYWRvdzogcmdiYSgwLCAwLCAwLCAwLjEpIDAgMXB4IDA7CiAKICAg ICAvKiBFbnN1cmUgdGhlc2UgaGVhZGVycyBhcmUgZGlzcGxheWVkIGJlbG93IHRoZSBwYXJlbnQg aGVhZGVyIGJ1dCBhYm92ZSBzY3JvbGxiYXJzLiAqLwogICAgIHotaW5kZXg6IDEwMDsKKworfQor Citib2R5Lm1hYy1wbGF0Zm9ybS5tYXZlcmlja3MgLmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1z ZWN0aW9uID4gLmhlYWRlciwKK2JvZHkubWFjLXBsYXRmb3JtLm1vdW50YWluLWxpb24gLmRldGFp bHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0aW9uID4gLmhlYWRlciB7CisgICAgYmFja2dyb3VuZC1j b2xvcjogdHJhbnNwYXJlbnQ7CisgICAgYmFja2dyb3VuZC1pbWFnZTogbGluZWFyLWdyYWRpZW50 KHRvIGJvdHRvbSwgcmdiKDI1MCwgMjUwLCAyNTApLCByZ2IoMjQwLCAyNDAsIDI0MCkpOworICAg IGJveC1zaGFkb3c6IG5vbmU7Cit9CisKKy5kZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMtc2VjdGlv bi5jb2xsYXNwc2VkID4gLmhlYWRlciB7CisgICAgYm94LXNoYWRvdzogbm9uZTsKK30KKworLyou ZGV0YWlscy1zZWN0aW9uLmRvbS1ub2RlLXByb3BlcnRpZXMgeworICAgIGJvcmRlci1ib3R0b206 IG5vbmU7Cit9CisKKy5kZXRhaWxzLXNlY3Rpb24uZG9tLW5vZGUtcHJvcGVydGllcyA+IC5oZWFk ZXIgeworICAgIGJvcmRlci1ib3R0b206IDFweCBzb2xpZCByZ2IoMTUzLCAxNTMsIDE1Myk7Cit9 CisKK2JvZHkubWFjLXBsYXRmb3JtLm1vdW50YWluLWxpb24gLmRldGFpbHMtc2VjdGlvbi5kb20t bm9kZS1wcm9wZXJ0aWVzID4gLmhlYWRlciwKK2JvZHkubWFjLXBsYXRmb3JtLm1hdmVyaWNrcyAu ZGV0YWlscy1zZWN0aW9uLmRvbS1ub2RlLXByb3BlcnRpZXMgPiAuaGVhZGVyIHsKKyAgICBib3Jk ZXItYm90dG9tOiBub25lOworfSovCisKKy5kZXRhaWxzLXNlY3Rpb24uY29tcHV0ZWQtc3R5bGUt cHJvcGVydGllczpub3QoLmNvbGxhcHNlZCkgPiAuaGVhZGVyIHsKKyAgICBiYWNrZ3JvdW5kLWNv bG9yOiByZ2IoMjU1LCAyNTUsIDI1NSk7Cit9CisKK2JvZHkubWFjLXBsYXRmb3JtLm1vdW50YWlu LWxpb24gLmRldGFpbHMtc2VjdGlvbi5jb21wdXRlZC1zdHlsZS1wcm9wZXJ0aWVzOm5vdCguY29s bGFwc2VkKSA+IC5oZWFkZXIsCitib2R5Lm1hYy1wbGF0Zm9ybS5tYXZlcmlja3MgLmRldGFpbHMt c2VjdGlvbi5jb21wdXRlZC1zdHlsZS1wcm9wZXJ0aWVzOm5vdCguY29sbGFwc2VkKSA+IC5oZWFk ZXIgeworICAgIGJhY2tncm91bmQtY29sb3I6IHRyYW5zcGFyZW50OwogfQogCiAuZGV0YWlscy1z ZWN0aW9uID4gLmhlYWRlcjo6YmVmb3JlIHsKQEAgLTEzMyw5ICsyMDAsMjQgQEAKIAogLmRldGFp bHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwIHsKICAgICBkaXNwbGF5OiB0YWJsZS1yb3ct Z3JvdXA7CisgICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHJnYigxNTMsIDE1MywgMTUzKTsK K30KKworYm9keS5tYWMtcGxhdGZvcm0ubW91bnRhaW4tbGlvbiAuZGV0YWlscy1zZWN0aW9uID4g LmNvbnRlbnQgPiAuZ3JvdXAsCitib2R5Lm1hYy1wbGF0Zm9ybS5tYXZlcmlja3MgIC5kZXRhaWxz LXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cCB7CisgICAgYm9yZGVyLWJvdHRvbTogbm9uZTsK K30KKworLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwOmxhc3QtY2hpbGQgewor ICAgIGJvcmRlci1ib3R0b206IG5vbmU7CiB9CiAKIC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVu dCA+IC5ncm91cDpudGgtY2hpbGQoZXZlbikgeworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigy MzMsIDIzMywgMjMzKTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubW91bnRhaW4tbGlvbiAuZGV0 YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bnRoLWNoaWxkKGV2ZW4pLAorYm9keS5t YWMtcGxhdGZvcm0ubWF2ZXJpY2tzICAuZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3Jv dXA6bnRoLWNoaWxkKGV2ZW4pIHsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjIyLCAyMjIs IDIyMik7CiB9CiAKQEAgLTE0NCwxMCArMjI2LDE0IEBACiAgICAgYm9yZGVyLXRvcDogMXB4IHNv bGlkIHJnYigxNTMsIDE1MywgMTUzKTsKIH0KIAotLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50 ID4gLmdyb3VwOm50aC1jaGlsZChldmVuKSA+IC5yb3c6bm90KC5zaW1wbGUpOmxhc3QtY2hpbGQs Ci0uZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bGFzdC1jaGlsZCA+IC5yb3c6 bm90KC5zaW1wbGUpOmxhc3QtY2hpbGQsCi0uZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAu Z3JvdXA6bnRoLWNoaWxkKGV2ZW4pID4gLnJvdy5zaW1wbGU6bGFzdC1jaGlsZCA+ICosCi0uZGV0 YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bGFzdC1jaGlsZCA+IC5yb3cuc2ltcGxl Omxhc3QtY2hpbGQgPiAqIHsKK2JvZHkubWFjLXBsYXRmb3JtLm1vdW50YWluLWxpb24gLmRldGFp bHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwOm50aC1jaGlsZChldmVuKSA+IC5yb3c6bm90 KC5zaW1wbGUpOmxhc3QtY2hpbGQsCitib2R5Lm1hYy1wbGF0Zm9ybS5tYXZlcmlja3MgLmRldGFp bHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwOm50aC1jaGlsZChldmVuKSA+IC5yb3c6bm90 KC5zaW1wbGUpOmxhc3QtY2hpbGQsCitib2R5Lm1hYy1wbGF0Zm9ybS5tb3VudGFpbi1saW9uIC5k ZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDpsYXN0LWNoaWxkID4gLnJvdzpub3Qo LnNpbXBsZSk6bGFzdC1jaGlsZCwKK2JvZHkubWFjLXBsYXRmb3JtLm1hdmVyaWNrcyAuZGV0YWls cy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bGFzdC1jaGlsZCA+IC5yb3c6bm90KC5zaW1w bGUpOmxhc3QtY2hpbGQsCitib2R5Lm1hYy1wbGF0Zm9ybS5tb3VudGFpbi1saW9uIC5kZXRhaWxz LXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDpudGgtY2hpbGQoZXZlbikgPiAucm93LnNpbXBs ZTpsYXN0LWNoaWxkID4gKiwKK2JvZHkubWFjLXBsYXRmb3JtLm1hdmVyaWNrcyAuZGV0YWlscy1z ZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bnRoLWNoaWxkKGV2ZW4pID4gLnJvdy5zaW1wbGU6 bGFzdC1jaGlsZCA+ICosCitib2R5Lm1hYy1wbGF0Zm9ybS5tb3VudGFpbi1saW9uIC5kZXRhaWxz LXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDpsYXN0LWNoaWxkID4gLnJvdy5zaW1wbGU6bGFz dC1jaGlsZCA+ICosCitib2R5Lm1hYy1wbGF0Zm9ybS5tYXZlcmlja3MgLmRldGFpbHMtc2VjdGlv biA+IC5jb250ZW50ID4gLmdyb3VwOmxhc3QtY2hpbGQgPiAucm93LnNpbXBsZTpsYXN0LWNoaWxk ID4gKiB7CiAgICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHJnYigxNTMsIDE1MywgMTUzKTsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRmlsdGVyQmFyLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0ZpbHRlckJhci5jc3MKaW5kZXggZDg5ZjI2OC4uNGEwYjdjZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmlsdGVyQmFyLmNzcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GaWx0ZXJCYXIuY3Nz CkBAIC00Myw3ICs0Myw3IEBACiAgICAgLXdlYmtpdC1hcHBlYXJhbmNlOiBub25lOwogCiAgICAg Ym9yZGVyOiAxcHggc29saWQgcmdiYSgwLCAwLCAwLCAwLjM1KTsKLSAgICBib3JkZXItcmFkaXVz OiAxMHB4OworICAgIGJvcmRlci1yYWRpdXM6IDNweDsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBy Z2JhKDI1NSwgMjU1LCAyNTUsIDAuMik7CiAgICAgYm94LXNoYWRvdzogaW5zZXQgcmdiYSgwLCAw LCAwLCAwLjEpIDAgMXB4IDA7CiAgICAgYmFja2dyb3VuZC1jbGlwOiBwYWRkaW5nLWJveDsKQEAg LTUzLDYgKzUzLDExIEBACiAgICAgdHJhbnNpdGlvbjogYmFja2dyb3VuZC1jb2xvciAyMDBtcyBl YXNlLWluLW91dDsKIH0KIAorYm9keS5tYWMtcGxhdGZvcm0ubW91bnRhaW4tbGlvbiAuZmlsdGVy LWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdLAorYm9keS5tYWMtcGxhdGZvcm0ubWF2ZXJpY2tz IC5maWx0ZXItYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0geworICAgIGJvcmRlci1yYWRpdXM6 IDEwcHg7Cit9CisKIC5maWx0ZXItYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06Oi13ZWJraXQt aW5wdXQtcGxhY2Vob2xkZXIgewogICAgIGNvbG9yOiByZ2JhKDAsIDAsIDAsIDAuMzUpOwogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2 aWdhdGlvblNpZGViYXJQYW5lbC5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmNzcwppbmRleCA3YWNlMjFhLi5mOGUw ODQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmNzcwpAQCAtMjEzLDE5 ICsyMTMsMzcgQEAKIC5uYXZpZ2F0aW9uLXNpZGViYXItcGFuZWwtY29udGVudC10cmVlLW91dGxp bmUgLml0ZW0uc2VsZWN0ZWQgewogICAgIGNvbG9yOiB3aGl0ZTsKIAorICAgIGJhY2tncm91bmQt Y29sb3I6IHJnYigxODUsIDE4NCwgMTg1KTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubW91bnRh aW4tbGlvbiAubmF2aWdhdGlvbi1zaWRlYmFyLXBhbmVsLWNvbnRlbnQtdHJlZS1vdXRsaW5lIC5p dGVtLnNlbGVjdGVkLAorYm9keS5tYWMtcGxhdGZvcm0ubWF2ZXJpY2tzIC5uYXZpZ2F0aW9uLXNp ZGViYXItcGFuZWwtY29udGVudC10cmVlLW91dGxpbmUgLml0ZW0uc2VsZWN0ZWQgewogICAgIGJv cmRlci10b3A6IDFweCBzb2xpZCByZ2IoMTYyLCAxNzcsIDIwMSk7CiAKKyAgICBiYWNrZ3JvdW5k LWNvbG9yOiB0cmFuc3BhcmVudDsKICAgICBiYWNrZ3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGll bnQodG8gYm90dG9tLCByZ2IoMTc1LCAxOTAsIDIxMyksIHJnYigxMzAsIDE1MSwgMTgyKSk7CiAg ICAgYmFja2dyb3VuZC1vcmlnaW46IHBhZGRpbmc7CiAgICAgYmFja2dyb3VuZC1jbGlwOiBwYWRk aW5nOwogfQogCiAubmF2aWdhdGlvbi1zaWRlYmFyLXBhbmVsLWNvbnRlbnQtdHJlZS1vdXRsaW5l OmZvY3VzIC5pdGVtLnNlbGVjdGVkIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMCwgMTI4 LCAyNTIpOworfQorCitib2R5Lm1hYy1wbGF0Zm9ybS5tb3VudGFpbi1saW9uIC5uYXZpZ2F0aW9u LXNpZGViYXItcGFuZWwtY29udGVudC10cmVlLW91dGxpbmU6Zm9jdXMgLml0ZW0uc2VsZWN0ZWQs Citib2R5Lm1hYy1wbGF0Zm9ybS5tYXZlcmlja3MgLm5hdmlnYXRpb24tc2lkZWJhci1wYW5lbC1j b250ZW50LXRyZWUtb3V0bGluZTpmb2N1cyAuaXRlbS5zZWxlY3RlZCB7CisgICAgYmFja2dyb3Vu ZC1jb2xvcjogdHJhbnNwYXJlbnQ7CiAgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIHJnYigxNDgs IDE3NCwgMTkzKTsKICAgICBiYWNrZ3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90 dG9tLCByZ2IoMTU0LCAxODAsIDIwMyksIHJnYigxMTIsIDEzOSwgMTc2KSk7CiB9CiAKIGJvZHku d2luZG93LWluYWN0aXZlIC5uYXZpZ2F0aW9uLXNpZGViYXItcGFuZWwtY29udGVudC10cmVlLW91 dGxpbmUgLml0ZW0uc2VsZWN0ZWQgeworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyMTIsIDIx MiwgMjEyKTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubW91bnRhaW4tbGlvbi53aW5kb3ctaW5h Y3RpdmUgLm5hdmlnYXRpb24tc2lkZWJhci1wYW5lbC1jb250ZW50LXRyZWUtb3V0bGluZSAuaXRl bS5zZWxlY3RlZCwKK2JvZHkubWFjLXBsYXRmb3JtLm1hdmVyaWNrcy53aW5kb3ctaW5hY3RpdmUg Lm5hdmlnYXRpb24tc2lkZWJhci1wYW5lbC1jb250ZW50LXRyZWUtb3V0bGluZSAuaXRlbS5zZWxl Y3RlZCB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7CiAgICAgYm9yZGVyLXRv cDogMXB4IHNvbGlkIHJnYigxNjgsIDE2OCwgMTY4KTsKICAgICBiYWNrZ3JvdW5kLWltYWdlOiBs aW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2IoMTk0LCAxOTQsIDE5NCksIHJnYigxNTgsIDE1 OCwgMTU4KSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9SYWRpb0J1dHRvbk5hdmlnYXRpb25JdGVtLmNzcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JhZGlvQnV0dG9uTmF2aWdhdGlvbkl0ZW0uY3Nz CmluZGV4IDUxZTA0ZjQuLmE1YWZjYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JhZGlvQnV0dG9uTmF2aWdhdGlvbkl0ZW0uY3NzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JhZGlvQnV0dG9uTmF2 aWdhdGlvbkl0ZW0uY3NzCkBAIC0zMiwxMSArMzIsMTcgQEAKIH0KIAogLm5hdmlnYXRpb24tYmFy IC5pdGVtLnJhZGlvLmJ1dHRvbi50ZXh0LW9ubHkuc2VsZWN0ZWQgeworICAgIGNvbG9yOiByZ2Io NTIsIDE0MSwgMjIwKTsKKyAgICBmb250LXdlaWdodDogYm9sZDsKK30KKworYm9keS5tYWMtcGxh dGZvcm0ubW91bnRhaW4tbGlvbiAubmF2aWdhdGlvbi1iYXIgLml0ZW0ucmFkaW8uYnV0dG9uLnRl eHQtb25seS5zZWxlY3RlZCwKK2JvZHkubWFjLXBsYXRmb3JtLm1hdmVyaWNrcyAubmF2aWdhdGlv bi1iYXIgLml0ZW0ucmFkaW8uYnV0dG9uLnRleHQtb25seS5zZWxlY3RlZCB7CisgICAgY29sb3I6 IHJnYigwLCAwLCAwKTsKKwogICAgIGJhY2tncm91bmQtcmVwZWF0OiBuby1yZXBlYXQ7CiAgICAg YmFja2dyb3VuZC1pbWFnZTogbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgcmdiYSgwLCAwLCAw LCAwLjE1KSwgcmdiYSgwLCAwLCAwLCAwLjA5KSAxMiUsIHJnYmEoMCwgMCwgMCwgMC4wNikgMTIl LCB0cmFuc3BhcmVudCksIGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHJnYmEoMCwgMCwgMCwg MC40NSksIHRyYW5zcGFyZW50KSwKICAgICAgICAgbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwg cmdiYSgwLCAwLCAwLCAwLjQ1KSwgdHJhbnNwYXJlbnQpOwogICAgIGJhY2tncm91bmQtc2l6ZTog MTAwJSAxMDAlLCAxcHggMTAwJSwgMXB4IDEwMCU7CiAgICAgYmFja2dyb3VuZC1wb3NpdGlvbjog bGVmdCB0b3AsIGxlZnQgdG9wLCByaWdodCB0b3A7Ci0KLSAgICBmb250LXdlaWdodDogYm9sZDsK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1J1bGVzU3R5bGVEZXRhaWxzUGFuZWwuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvUnVsZXNTdHlsZURldGFpbHNQYW5lbC5jc3MKaW5kZXggODExYjA1My4u ZWZmYjNkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvUnVsZXNTdHlsZURldGFpbHNQYW5lbC5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUnVsZXNTdHlsZURldGFpbHNQYW5lbC5jc3MKQEAgLTM2 LDYgKzM2LDEyIEBACiAKIC5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlIC5ydWxl cyAubGFiZWwgKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbiB7CiAgICAgbWFyZ2luLXRvcDog NXB4OworICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCByZ2IoMjEwLCAyMTAsIDIxMCk7Cit9CisK K2JvZHkubWFjLXBsYXRmb3JtLm1vdW50YWluLWxpb24gLnNpZGViYXIgPiAucGFuZWwuZGV0YWls cy5jc3Mtc3R5bGUgLnJ1bGVzIC5sYWJlbCArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uLAor Ym9keS5tYWMtcGxhdGZvcm0ubWF2ZXJpY2tzIC5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3Nz LXN0eWxlIC5ydWxlcyAubGFiZWwgKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbiB7CisgICAg Ym9yZGVyLXRvcDogbm9uZTsKIH0KIAogLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5 bGUgLnJ1bGVzIC5uZXctcnVsZSB7CkBAIC00Myw3ICs0OSw2IEBACiAgICAgZm9udC13ZWlnaHQ6 IGJvbGQ7CiAKICAgICBjb2xvcjogYmxhY2s7Ci0gICAgdGV4dC1zaGFkb3c6IHdoaXRlIDAgMXB4 IDA7CiAKICAgICBwYWRkaW5nOiA1cHggMTBweDsKIApAQCAtNTMsNiArNTgsMjEgQEAKICAgICBv cGFjaXR5OiAwLjU7CiB9CiAKK2JvZHkubWFjLXBsYXRmb3JtLm1vdW50YWluLWxpb24gLnNpZGVi YXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnJ1bGVzIC5uZXctcnVsZSwKK2JvZHkubWFj LXBsYXRmb3JtLm1hdmVyaWNrcyAuc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSAu cnVsZXMgLm5ldy1ydWxlIHsKKyAgICB0ZXh0LXNoYWRvdzogd2hpdGUgMCAxcHggMDsKKyAgICBi b3JkZXItYm90dG9tOiBub25lOworfQorCisuc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1z dHlsZSAucnVsZXMgLm5ldy1ydWxlICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24geworICAg IGJvcmRlci10b3A6IDFweCBzb2xpZCByZ2IoMjEwLCAyMTAsIDIxMCk7Cit9CisKK2JvZHkubWFj LXBsYXRmb3JtLm1vdW50YWluLWxpb24gLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5 bGUgLnJ1bGVzIC5uZXctcnVsZSArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uLAorYm9keS5t YWMtcGxhdGZvcm0ubWF2ZXJpY2tzIC5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0eWxl IC5ydWxlcyAubmV3LXJ1bGUgKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbiB7CisgICAgYm9y ZGVyLXRvcDogbm9uZTsKK30KKwogLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUg LnJ1bGVzIC5uZXctcnVsZSBpbWcgewogICAgIGNvbnRlbnQ6IHVybCguLi9JbWFnZXMvUGx1cy5z dmcpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9TY29wZUJhci5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9TY29wZUJhci5jc3MKaW5kZXggYTE3ODlkNi4uYzhhZjY2NiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVCYXIuY3NzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Njb3BlQmFyLmNzcwpA QCAtMzMsNyArMzMsNiBAQAogICAgIG1hcmdpbjogMCAycHg7CiAgICAgcGFkZGluZzogMCA4cHgg M3B4OwogICAgIGZvbnQtc2l6ZTogMTFweDsKLSAgICBmb250LXdlaWdodDogYm9sZDsKICAgICBs aW5lLWhlaWdodDogMTFweDsKICAgICBjb2xvcjogcmdiKDQ2LCA0NiwgNDYpOwogICAgIGJhY2tn cm91bmQtY29sb3I6IHRyYW5zcGFyZW50OwpAQCAtNDUsNiArNDQsMTEgQEAKICAgICB0cmFuc2l0 aW9uLXByb3BlcnR5OiBiYWNrZ3JvdW5kLWNvbG9yLCBib3JkZXItY29sb3I7CiB9CiAKK2JvZHku bWFjLXBsYXRmb3JtLm1vdW50YWluLWxpb24gLnNjb3BlLWJhciA+IGxpLAorYm9keS5tYWMtcGxh dGZvcm0ubWF2ZXJpY2tzIC5zY29wZS1iYXIgPiBsaSB7CisgICAgZm9udC13ZWlnaHQ6IGJvbGQ7 Cit9CisKIC5zY29wZS1iYXIgPiBsaS5zZWxlY3RlZCwKIC5zY29wZS1iYXIgPiBsaTphY3RpdmUg ewogICAgIHRyYW5zaXRpb24tZHVyYXRpb246IDc1bXM7CkBAIC01NSw2ICs1OSwxNCBAQAogfQog CiAuc2NvcGUtYmFyID4gbGkuc2VsZWN0ZWQgeworICAgIGNvbG9yOiByZ2IoNTIsIDE0MSwgMjIw KTsKKyAgICBib3JkZXItY29sb3I6IHJnYmEoNTIsIDE0MSwgMjIwLCAxKTsKKyAgICBmb250LXdl aWdodDogYm9sZDsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubW91bnRhaW4tbGlvbiAuc2NvcGUt YmFyID4gbGkuc2VsZWN0ZWQsCitib2R5Lm1hYy1wbGF0Zm9ybS5tYXZlcmlja3MgLnNjb3BlLWJh ciA+IGxpLnNlbGVjdGVkIHsKKyAgICBjb2xvcjogaW5oZXJpdDsKICAgICBiYWNrZ3JvdW5kLWNv bG9yOiByZ2JhKDAsIDAsIDAsIDAuMDYpOwogICAgIGJvcmRlci1jb2xvcjogcmdiYSgwLCAwLCAw LCAwLjMwKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1NlYXJjaEJhci5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9TZWFyY2hCYXIuY3NzCmluZGV4IDcyNzVlNGMuLmIzZWU4MjUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NlYXJjaEJhci5j c3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNo QmFyLmNzcwpAQCAtMzEsNyArMzEsNyBAQAogICAgIC13ZWJraXQtYXBwZWFyYW5jZTogbm9uZTsK IAogICAgIGJvcmRlcjogMXB4IHNvbGlkIHJnYmEoMCwgMCwgMCwgMC4zNSk7Ci0gICAgYm9yZGVy LXJhZGl1czogMTBweDsKKyAgICBib3JkZXItcmFkaXVzOiAzcHg7CiAgICAgYmFja2dyb3VuZC1j b2xvcjogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjIpOwogICAgIGJveC1zaGFkb3c6IGluc2V0IHJn YmEoMCwgMCwgMCwgMC4xKSAwIDFweCAwOwogICAgIGJhY2tncm91bmQtY2xpcDogcGFkZGluZy1i b3g7CkBAIC00MSw2ICs0MSwxMSBAQAogICAgIHRyYW5zaXRpb246IGJhY2tncm91bmQtY29sb3Ig MjAwbXMgZWFzZS1pbi1vdXQ7CiB9CiAKK2JvZHkubWFjLXBsYXRmb3JtLm1vdW50YWluLWxpb24g LnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSwKK2JvZHkubWFjLXBsYXRmb3JtLm1h dmVyaWNrcyAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdIHsKKyAgICBib3JkZXIt cmFkaXVzOiAxMHB4OworfQorCiAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdOjot d2Via2l0LWlucHV0LXBsYWNlaG9sZGVyIHsKICAgICBjb2xvcjogcmdiYSgwLCAwLCAwLCAwLjM1 KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1NpZGViYXIuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU2lkZWJhci5jc3MKaW5kZXggM2ExZjc1Mi4uNTc5OWUzNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2lkZWJhci5jc3MKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2lkZWJhci5jc3MKQEAgLTI2 LDYgKzI2LDExIEBACiAuc2lkZWJhciB7CiAgICAgcG9zaXRpb246IHJlbGF0aXZlOwogCisgICAg YmFja2dyb3VuZC1jb2xvcjogcmdiKDI0MiwgMjQyLCAyNDIpOworfQorCitib2R5Lm1hYy1wbGF0 Zm9ybS5tb3VudGFpbi1saW9uIC5zaWRlYmFyLAorYm9keS5tYWMtcGxhdGZvcm0ubWF2ZXJpY2tz IC5zaWRlYmFyIHsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjI3LCAyMzEsIDIzNSk7CiB9 CiAKQEAgLTM0LDcgKzM5LDggQEAKICAgICBib3JkZXI6IG5vbmUgIWltcG9ydGFudDsKIH0KIAot Ym9keS53aW5kb3ctaW5hY3RpdmUgLnNpZGViYXIgeworYm9keS5tYWMtcGxhdGZvcm0ubW91bnRh aW4tbGlvbi53aW5kb3ctaW5hY3RpdmUgLnNpZGViYXIsCitib2R5Lm1hYy1wbGF0Zm9ybS5tYXZl cmlja3Mud2luZG93LWluYWN0aXZlIC5zaWRlYmFyIHsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBy Z2IoMjMxLCAyMzEsIDIzMSk7CiB9CiAKQEAgLTg4LDYgKzk0LDEwIEBAIGJvZHkud2luZG93LWlu YWN0aXZlIC5zaWRlYmFyIHsKIH0KIAogLnNpZGViYXIucmlnaHQgewotICAgIGJhY2tncm91bmQt Y29sb3I6IHJnYigyMzEsIDIzMSwgMjMxKTsKICAgICBib3JkZXItbGVmdDogMXB4IHNvbGlkIHJn YigxNTMsIDE1MywgMTUzKTsKIH0KKworYm9keS5tYWMtcGxhdGZvcm0ubW91bnRhaW4tbGlvbiAu c2lkZWJhci5yaWdodCwKK2JvZHkubWFjLXBsYXRmb3JtLm1hdmVyaWNrcyAuc2lkZWJhci5yaWdo dCB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDIzMSwgMjMxLCAyMzEpOworfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVT aWRlYmFyUGFuZWwuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVGltZWxpbmVTaWRlYmFyUGFuZWwuY3NzCmluZGV4IGU4Yjc4MGYuLjUyNjZlNzcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5l U2lkZWJhclBhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5jc3MKQEAgLTk1LDEwICs5NSw4IEBACiAgICAg aGVpZ2h0OiAyMnB4OwogCiAgICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHJnYigxNzksIDE3 OSwgMTc5KTsKLSAgICBiYWNrZ3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9t LCByZ2IoMjM4LCAyNDAsIDI0NCksIHJnYigyMjQsIDIyNiwgMjMwKSk7Ci0KKyAgICBiYWNrZ3Jv dW5kLWNvbG9yOiByZ2IoMjQyLCAyNDIsIDI0Mik7CiAgICAgY29sb3I6IHJnYig1NywgNTcsIDU3 KTsKLSAgICB0ZXh0LXNoYWRvdzogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjUpIDAgMXB4IDA7CiAK ICAgICB3aGl0ZS1zcGFjZTogbm93cmFwOwogICAgIG92ZXJmbG93OiBoaWRkZW47CkBAIC0xMTIs NiArMTEwLDEzIEBACiAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKIH0KIAorYm9keS5tYWMtcGxhdGZv cm0ubW91bnRhaW4tbGlvbiAuc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnRpbWVsaW5lID4g LnRpdGxlLWJhciwKK2JvZHkubWFjLXBsYXRmb3JtLm1hdmVyaWNrcyAuc2lkZWJhciA+IC5wYW5l bC5uYXZpZ2F0aW9uLnRpbWVsaW5lID4gLnRpdGxlLWJhciB7CisgICAgYmFja2dyb3VuZC1jb2xv cjogdHJhbnNwYXJlbnQ7CisgICAgYmFja2dyb3VuZC1pbWFnZTogbGluZWFyLWdyYWRpZW50KHRv IGJvdHRvbSwgcmdiKDIzOCwgMjQwLCAyNDQpLCByZ2IoMjI0LCAyMjYsIDIzMCkpOworICAgIHRl eHQtc2hhZG93OiByZ2JhKDI1NSwgMjU1LCAyNTUsIDAuNSkgMCAxcHggMDsKK30KKwogLnNpZGVi YXIgPiAucGFuZWwubmF2aWdhdGlvbi50aW1lbGluZSA+IC50aXRsZS1iYXIudGltZWxpbmVzIHsK ICAgICB0b3A6IDIycHg7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvV2Vi SW5zcGVjdG9yVUkudmN4cHJvai9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1dlYkluc3BlY3RvclVJLnZjeHByb2ovV2ViSW5zcGVjdG9yVUkudmN4cHJvagpp bmRleCA1NWI5YjllLi5kYjU3Zjg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv V2ViSW5zcGVjdG9yVUkudmN4cHJvai9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qL1dlYkluc3BlY3RvclVJLnZj eHByb2oKQEAgLTQ4Niw2ICs0ODYsNyBAQAogICAgIDxOb25lIEluY2x1ZGU9Ii4uXFVzZXJJbnRl cmZhY2VcSW1hZ2VzXEZvbGRlckdlbmVyaWMlNDAyeC5wbmciIC8+CiAgICAgPE5vbmUgSW5jbHVk ZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNcRm9sZGVyR2VuZXJpYy5wbmciIC8+CiAgICAgPE5v bmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNcRm9yd2FyZEFycm93LnN2ZyIgLz4K KyAgICA8Tm9uZSBJbmNsdWRlPSIuLlxVc2VySW50ZXJmYWNlXEltYWdlc1xGb3J3YXJkQXJyb3dM aWdodC5zdmciIC8+CiAgICAgPE5vbmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNc RnVuY3Rpb24uc3ZnIiAvPgogICAgIDxOb25lIEluY2x1ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1h Z2VzXEdvVG9BcnJvdy5zdmciIC8+CiAgICAgPE5vbmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFj ZVxJbWFnZXNcSGllcmFyY2hpY2FsTmF2aWdhdGlvbkl0ZW1DaGV2cm9uLnN2ZyIgLz4KQEAgLTc4 NCw0ICs3ODUsNCBAQAogICA8SW1wb3J0IFByb2plY3Q9IiQoVkNUYXJnZXRzUGF0aClcTWljcm9z b2Z0LkNwcC50YXJnZXRzIiAvPgogICA8SW1wb3J0R3JvdXAgTGFiZWw9IkV4dGVuc2lvblRhcmdl dHMiPgogICA8L0ltcG9ydEdyb3VwPgotPC9Qcm9qZWN0PgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9m IGZpbGUKKzwvUHJvamVjdD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9XZWJJ bnNwZWN0b3JVSS52Y3hwcm9qL1dlYkluc3BlY3RvclVJLnZjeHByb2ouZmlsdGVycyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qL1dlYkluc3BlY3RvclVJLnZj eHByb2ouZmlsdGVycwppbmRleCA0OTJmZDVjLi42MjZiNTg3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvV2ViSW5zcGVjdG9yVUkudmN4cHJvai9XZWJJbnNwZWN0b3JVSS52Y3hw cm9qLmZpbHRlcnMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1dlYkluc3BlY3RvclVJLnZj eHByb2ovV2ViSW5zcGVjdG9yVUkudmN4cHJvai5maWx0ZXJzCkBAIC0xMjk2LDYgKzEyOTYsOSBA QAogICAgIDxOb25lIEluY2x1ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEZvcndhcmRBcnJv dy5zdmciPgogICAgICAgPEZpbHRlcj5JbWFnZXM8L0ZpbHRlcj4KICAgICA8L05vbmU+CisgICAg PE5vbmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNcRm9yd2FyZEFycm93TGlnaHQu c3ZnIj4KKyAgICAgIDxGaWx0ZXI+SW1hZ2VzPC9GaWx0ZXI+CisgICAgPC9Ob25lPgogICAgIDxO b25lIEluY2x1ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEZ1bmN0aW9uLnN2ZyI+CiAgICAg ICA8RmlsdGVyPkltYWdlczwvRmlsdGVyPgogICAgIDwvTm9uZT4KQEAgLTE3MjIsNCArMTcyNSw0 IEBACiAgICAgPE5vbmUgSW5jbHVkZT0iV2ViSW5zcGVjdG9yVUkubWFrZSIgLz4KICAgICA8Tm9u ZSBJbmNsdWRlPSJidWlsZC13ZWJpbnNwZWN0b3J1aS5wbCIgLz4KICAgPC9JdGVtR3JvdXA+Ci08 L1Byb2plY3Q+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorPC9Qcm9qZWN0Pgo= 234947 2014-07-15 13:45:15 -0700 2014-07-15 15:32:39 -0700 [PATCH] Styles update v2. ui.diff text/plain 55784 jonowells ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGI0ZjljNzUuLjY2NDVmNGQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0MyBAQAorMjAxNC0wNy0xNSAgSm9uYXRoYW4gV2Vs bHMgIDxqb25vd2VsbHNAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IE1vZGVy bml6ZSBVSSBzdHlsZXMgYW5kIGJldHRlciBzeW5jIHdpdGggcGxhdGZvcm0gc3R5bGVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQ4NDYKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGVkIHN0eWxl cyB0byBiZXR0ZXIgbWF0Y2ggdGhlIE9TIFVJIGRlc2lnbi4gVXBkYXRlZCB0aGUgZm9yd2FyZC9i YWNrIGJ1dHRvbi4gCisgICAgICAgIE1vdmVkIHNldmVyYWwgcnVsZXMgdG8gc2VsZWN0b3JzIHRo YXQgc3VwcG9ydCBvbGRlciBPUyBkZXNpZ25zLiBBZGRlZCBnbG9iYWwgcGxhdGZvcm0KKyAgICAg ICAgZGF0YSB0byBzdXBwb3J0IHRoaXMgcGF0Y2guCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L0ltYWdlcy9CYWNrQXJyb3cuc3ZnOiBBZGRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0lt YWdlcy9CYWNrQXJyb3dMZWdhY3kuc3ZnOiBDb3BpZWQgZnJvbSBTb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9JbWFnZXMvQmFja0Fycm93LnN2Zy4KKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL0ltYWdlcy9Gb3J3YXJkQXJyb3cuc3ZnOiBBZGRlZC4KKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL0ltYWdlcy9Gb3J3YXJkQXJyb3dMZWdhY3kuc3ZnOiBDb3BpZWQgZnJvbSBTb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvRm9yd2FyZEFycm93LnN2Zy4KKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9JbWFnZVV0aWxpdGllcy5qczogVXBkYXRlZCBp bWFnZSB2ZXJzaW9uCisgICAgICAgICguZ2VuZXJhdGVJbWFnZS5nZW5lcmF0ZU1vZGVybkltYWdl KToKKyAgICAgICAgKC5nZW5lcmF0ZUltYWdlLmdlbmVyYXRlTGVnYWN5SW1hZ2UpOgorICAgICAg ICAoLmdlbmVyYXRlSW1hZ2UpOgorICAgICAgICBVcGRhdGVkIGltYWdlIGdlbmVyYXRpb24gdG8g c3VwcG9ydCBtb2Rlcm4gbG9vay4gVXBkYXRlZCB2ZXJzaW9uaW5nIHNjaGVtZSBhbmQgdmVyc2lv bi4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLmxvYWRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuY29udGVudExvYWRlZC5X ZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi50b1N0cmluZyk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuY29udGVudExvYWRlZC5XZWJJbnNwZWN0b3IuUGxhdGZvcm0udG9TdHJpbmcpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLmNvbnRlbnRMb2FkZWQpOgorICAgICAgICBBZGRlZCBnbG9iYWwg cGxhdGZvcm0gaW5mb3JtYXRpb24uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0Nv bnRlbnRCcm93c2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyKToK KyAgICAgICAgVXBkYXRlZCBiYWNrIGFuZCBmb3J3YXJkIGJ1dHRvbnMuCisKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL0ZpbmRCYW5uZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu RmluZEJhbm5lci5wcm90b3R5cGUuX2dlbmVyYXRlQnV0dG9uc0dseXBoc0lmTmVlZGVkKToKKyAg ICAgICAgVXBkYXRlZCBpbWFnZXMgZm9yIHRoZSBmaW5kIGJhbm5lci4KKworICAgICAgICAqIFdl Ykluc3BlY3RvclVJLnZjeHByb2ovV2ViSW5zcGVjdG9yVUkudmN4cHJvajoKKyAgICAgICAgKiBX ZWJJbnNwZWN0b3JVSS52Y3hwcm9qL1dlYkluc3BlY3RvclVJLnZjeHByb2ouZmlsdGVyczoKKyAg ICAgICAgQWRkZWQgbmV3IGltYWdlcy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv QnV0dG9uVG9vbGJhckl0ZW0uY3NzOgorICAgICAgICAoLnRvb2xiYXIgLml0ZW0uYnV0dG9uID4g LmxhYmVsKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAudG9vbGJhciAuaXRl bS5idXR0b24gPiAubGFiZWwpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5 bGVEZWNsYXJhdGlvblNlY3Rpb24uY3NzOgorICAgICAgICAoLnN0eWxlLWRlY2xhcmF0aW9uLXNl Y3Rpb24pOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zdHlsZS1kZWNsYXJh dGlvbi1zZWN0aW9uKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc3R5bGUt ZGVjbGFyYXRpb24tc2VjdGlvbiArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uKToKKyAgICAg ICAgKC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXApOgorICAgICAgICAo Ym9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uLmxhc3Qt aW4tZ3JvdXApOgorICAgICAgICAoLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1pbi1n cm91cCArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uKToKKyAgICAgICAgKGJvZHkubWFjLXBs YXRmb3JtLmxlZ2FjeSAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3VwICsg LnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24pOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0u bGVnYWN5IC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAgKyAuc3R5bGUt ZGVjbGFyYXRpb24tc2VjdGlvbjpsYXN0LWNoaWxkKToKKyAgICAgICAgKC5zdHlsZS1kZWNsYXJh dGlvbi1zZWN0aW9uICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24pOiBEZWxldGVkLgorICAg ICAgICAoLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1pbi1ncm91cCArIC5zdHlsZS1k ZWNsYXJhdGlvbi1zZWN0aW9uOmxhc3QtY2hpbGQpOiBEZWxldGVkLgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLmNzczoKKyAgICAgICAg KC5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlID4gLmNvbnRlbnQgPiAucHNldWRv LWNsYXNzZXMpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZU91dGxpbmUu Y3NzOgorICAgICAgICAoLmRvbS10cmVlLW91dGxpbmUgbGkuaG92ZXJlZDpub3QoLnNlbGVjdGVk KSAuc2VsZWN0aW9uKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZG9tLXRy ZWUtb3V0bGluZSBsaS5ob3ZlcmVkOm5vdCguc2VsZWN0ZWQpIC5zZWxlY3Rpb24pOgorICAgICAg ICAoLmRvbS10cmVlLW91dGxpbmUgbGkuZWxlbWVudHMtZHJhZy1vdmVyIC5zZWxlY3Rpb24pOgor ICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kb20tdHJlZS1vdXRsaW5lIGxpLmVs ZW1lbnRzLWRyYWctb3ZlciAuc2VsZWN0aW9uKToKKyAgICAgICAgKC5kb20tdHJlZS1vdXRsaW5l OmZvY3VzIGxpLnNlbGVjdGVkIC5zZWxlY3Rpb24pOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZv cm0ubGVnYWN5IC5kb20tdHJlZS1vdXRsaW5lOmZvY3VzIGxpLnNlbGVjdGVkIC5zZWxlY3Rpb24p OgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGFzaGJvYXJkQ29udGFpbmVyVmlldy5j c3M6CisgICAgICAgICgudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lcik6CisgICAgICAgIChi b2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIpOgor ICAgICAgICAoYm9keS53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWlu ZXIpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5LndpbmRvdy1pbmFjdGl2ZSAu dG9vbGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lcik6CisgICAgICAgICgudG9vbGJhciAuZGFzaGJv YXJkKToKKyAgICAgICAgKGJvZHkud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5kYXNoYm9hcmQp OgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5LndpbmRvdy1pbmFjdGl2ZSAudG9v bGJhciAuZGFzaGJvYXJkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlk LmNzczoKKyAgICAgICAgKC5kYXRhLWdyaWQgdGgpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZv cm0ubGVnYWN5IC5kYXRhLWdyaWQgdGgpOgorICAgICAgICAoLmRhdGEtZ3JpZCB0ci5zZWxlY3Rl ZCk6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRhdGEtZ3JpZCB0ci5zZWxl Y3RlZCk6CisgICAgICAgICguZGF0YS1ncmlkOmZvY3VzIHRyLnNlbGVjdGVkKToKKyAgICAgICAg KGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZGF0YS1ncmlkOmZvY3VzIHRyLnNlbGVjdGVkKToK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uLmNzczoKKyAgICAg ICAgKC5kZXRhaWxzLXNlY3Rpb24pOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5 IC5kZXRhaWxzLXNlY3Rpb24pOgorICAgICAgICAoLmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1z ZWN0aW9uKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZGV0YWlscy1zZWN0 aW9uIC5kZXRhaWxzLXNlY3Rpb24pOgorICAgICAgICAoLmRldGFpbHMtc2VjdGlvbiAuZGV0YWls cy1zZWN0aW9uOmxhc3QtY2hpbGQpOgorICAgICAgICAoLmRldGFpbHMtc2VjdGlvbiAuZGV0YWls cy1zZWN0aW9uOmZpcnN0LWNoaWxkKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gPiAuaGVh ZGVyKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZGV0YWlscy1zZWN0aW9u ID4gLmhlYWRlcik6CisgICAgICAgICguZGV0YWlscy1zZWN0aW9uIC5kZXRhaWxzLXNlY3Rpb24g PiAuaGVhZGVyKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLm1vdW50YWluLWxpb24gLmRl dGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0aW9uID4gLmhlYWRlcik6CisgICAgICAgICguZGV0 YWlscy1zZWN0aW9uIC5kZXRhaWxzLXNlY3Rpb24uY29sbGFzcHNlZCA+IC5oZWFkZXIpOgorICAg ICAgICAoLmRldGFpbHMtc2VjdGlvbi5jb21wdXRlZC1zdHlsZS1wcm9wZXJ0aWVzOm5vdCguY29s bGFwc2VkKSA+IC5oZWFkZXIpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5k ZXRhaWxzLXNlY3Rpb24uY29tcHV0ZWQtc3R5bGUtcHJvcGVydGllczpub3QoLmNvbGxhcHNlZCkg PiAuaGVhZGVyKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91 cCk6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMtc2VjdGlvbiA+ IC5jb250ZW50ID4gLmdyb3VwKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVu dCA+IC5ncm91cDpsYXN0LWNoaWxkKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gPiAuY29u dGVudCA+IC5ncm91cDpudGgtY2hpbGQoZXZlbikpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZv cm0ubGVnYWN5IC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDpudGgtY2hpbGQo ZXZlbikpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kZXRhaWxzLXNlY3Rp b24gPiAuY29udGVudCA+IC5ncm91cDpsYXN0LWNoaWxkID4gLnJvdy5zaW1wbGU6bGFzdC1jaGls ZCA+ICopOgorICAgICAgICAoLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwOmxh c3QtY2hpbGQgPiAucm93LnNpbXBsZTpsYXN0LWNoaWxkID4gKik6IERlbGV0ZWQuCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9GaWx0ZXJCYXIuY3NzOgorICAgICAgICAoLmZpbHRlci1i YXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSk6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5s ZWdhY3kgLmZpbHRlci1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSk6CisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmNzczoKKyAgICAgICAgKC5u YXZpZ2F0aW9uLXNpZGViYXItcGFuZWwtY29udGVudC10cmVlLW91dGxpbmUgLml0ZW0uc2VsZWN0 ZWQpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5uYXZpZ2F0aW9uLXNpZGVi YXItcGFuZWwtY29udGVudC10cmVlLW91dGxpbmUgLml0ZW0uc2VsZWN0ZWQpOgorICAgICAgICAo Lm5hdmlnYXRpb24tc2lkZWJhci1wYW5lbC1jb250ZW50LXRyZWUtb3V0bGluZTpmb2N1cyAuaXRl bS5zZWxlY3RlZCk6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLm5hdmlnYXRp b24tc2lkZWJhci1wYW5lbC1jb250ZW50LXRyZWUtb3V0bGluZTpmb2N1cyAuaXRlbS5zZWxlY3Rl ZCk6CisgICAgICAgIChib2R5LndpbmRvdy1pbmFjdGl2ZSAubmF2aWdhdGlvbi1zaWRlYmFyLXBh bmVsLWNvbnRlbnQtdHJlZS1vdXRsaW5lIC5pdGVtLnNlbGVjdGVkKToKKyAgICAgICAgKGJvZHku bWFjLXBsYXRmb3JtLmxlZ2FjeS53aW5kb3ctaW5hY3RpdmUgLm5hdmlnYXRpb24tc2lkZWJhci1w YW5lbC1jb250ZW50LXRyZWUtb3V0bGluZSAuaXRlbS5zZWxlY3RlZCk6CisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9SYWRpb0J1dHRvbk5hdmlnYXRpb25JdGVtLmNzczoKKyAgICAgICAg KC5uYXZpZ2F0aW9uLWJhciAuaXRlbS5yYWRpby5idXR0b24udGV4dC1vbmx5LnNlbGVjdGVkKToK KyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAubmF2aWdhdGlvbi1iYXIgLml0ZW0u cmFkaW8uYnV0dG9uLnRleHQtb25seS5zZWxlY3RlZCk6CisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9SdWxlc1N0eWxlRGV0YWlsc1BhbmVsLmNzczoKKyAgICAgICAgKC5zaWRlYmFyID4g LnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlIC5ydWxlcyAubGFiZWwgKyAuc3R5bGUtZGVjbGFyYXRp b24tc2VjdGlvbik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnNpZGViYXIg PiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnJ1bGVzIC5sYWJlbCArIC5zdHlsZS1kZWNsYXJh dGlvbi1zZWN0aW9uKToKKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0 eWxlIC5ydWxlcyAubmV3LXJ1bGUpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5 IC5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlIC5ydWxlcyAubmV3LXJ1bGUpOgor ICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnJ1bGVzIC5uZXct cnVsZSArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uKToKKyAgICAgICAgKGJvZHkubWFjLXBs YXRmb3JtLmxlZ2FjeSAuc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSAucnVsZXMg Lm5ldy1ydWxlICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24pOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvU2NvcGVCYXIuY3NzOgorICAgICAgICAoLnNjb3BlLWJhciA+IGxpKToK KyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc2NvcGUtYmFyID4gbGkpOgorICAg ICAgICAoLnNjb3BlLWJhciA+IGxpLnNlbGVjdGVkKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRm b3JtLmxlZ2FjeSAuc2NvcGUtYmFyID4gbGkuc2VsZWN0ZWQpOgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvU2VhcmNoQmFyLmNzczoKKyAgICAgICAgKC5zZWFyY2gtYmFyID4gaW5wdXRb dHlwZT0ic2VhcmNoIl0pOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zZWFy Y2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvU2lkZWJhci5jc3M6CisgICAgICAgICguc2lkZWJhcik6CisgICAgICAgIChib2R5Lm1h Yy1wbGF0Zm9ybS5sZWdhY3kgLnNpZGViYXIpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0u bGVnYWN5LndpbmRvdy1pbmFjdGl2ZSAuc2lkZWJhcik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0 Zm9ybS5sZWdhY3kgLnNpZGViYXIucmlnaHQpOgorICAgICAgICAoYm9keS53aW5kb3ctaW5hY3Rp dmUgLnNpZGViYXIpOiBEZWxldGVkLgorICAgICAgICAoLnNpZGViYXIucmlnaHQpOiBEZWxldGVk LgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVTaWRlYmFyUGFuZWwuY3Nz OgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi50aW1lbGluZSA+IC50aXRs ZS1iYXIpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zaWRlYmFyID4gLnBh bmVsLm5hdmlnYXRpb24udGltZWxpbmUgPiAudGl0bGUtYmFyKToKKyAgICAgICAgU3R5bGUgdXBk YXRlcyBmb3IgbmV3IGxvb2sgYW5kIGZlZWwuCisKIDIwMTQtMDctMTEgIEpvc2VwaCBQZWNvcmFy byAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBEZWJ1Z2dl ciBQYXVzZSBidXR0b24gZG9lcyBub3Qgd29yawpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9JbWFnZVV0aWxpdGllcy5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvSW1hZ2VVdGlsaXRpZXMuanMKaW5kZXggNDJk YmM2ZS4uNDMwNTZhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQmFzZS9JbWFnZVV0aWxpdGllcy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9CYXNlL0ltYWdlVXRpbGl0aWVzLmpzCkBAIC0zOTMsOCArMzkzLDkgQEAg ZnVuY3Rpb24gZ2VuZXJhdGVFbWJvc3NlZEltYWdlcyhzcmMsIHdpZHRoLCBoZWlnaHQsIHN0YXRl cywgY2FudmFzSWRlbnRpZmllckNhbGwKICAgICB2YXIgc2NhbGVkV2lkdGggPSB3aWR0aCAqIHNj YWxlRmFjdG9yOwogICAgIHZhciBzY2FsZWRIZWlnaHQgPSBoZWlnaHQgKiBzY2FsZUZhY3RvcjsK IAotICAgIC8vIEJ1bXAgdGhpcyB2ZXJzaW9uIHdoZW4gbWFraW5nIGNoYW5nZXMgdGhhdCBhZmZl Y3QgdGhlIHJlc3VsdCBpbWFnZS4KLSAgICBjb25zdCBpbWFnZVZlcnNpb24gPSAyOworICAgIC8v IEJ1bXAgdGhlIGJhc2UgdmVyc2lvbiB3aGVuIG1ha2luZyBjaGFuZ2VzIHRoYXQgYWZmZWN0IHRo ZSByZXN1bHQgaW1hZ2UuCisgICAgY29uc3QgYmFzZUltYWdlVmVyc2lvbiA9IDM7CisgICAgY29u c3QgaW1hZ2VWZXJzaW9uID0gYmFzZUltYWdlVmVyc2lvbiArIDAuMDEgKiBXZWJJbnNwZWN0b3Iu UGxhdGZvcm0udmVyc2lvbi5iYXNlICsgMC4wMDAxICogV2ViSW5zcGVjdG9yLlBsYXRmb3JtLnZl cnNpb24ucmVsZWFzZTsKIAogICAgIGNvbnN0IHN0b3JhZ2VLZXlQcmVmaXggPSAiZ2VuZXJhdGVk LWVtYm9zc2VkLWltYWdlLSI7CiAKQEAgLTQ4NywxMDMgKzQ4OCwxNDggQEAgZnVuY3Rpb24gZ2Vu ZXJhdGVFbWJvc3NlZEltYWdlcyhzcmMsIHdpZHRoLCBoZWlnaHQsIHN0YXRlcywgY2FudmFzSWRl bnRpZmllckNhbGwKIAogICAgIGZ1bmN0aW9uIGdlbmVyYXRlSW1hZ2Uoc3RhdGUpCiAgICAgewot ICAgICAgICBjb25zdCBkZXB0aCA9IDEgKiBzY2FsZUZhY3RvcjsKLSAgICAgICAgY29uc3Qgc2hh ZG93RGVwdGggPSBkZXB0aDsKLSAgICAgICAgY29uc3Qgc2hhZG93Qmx1ciA9IGRlcHRoIC0gMTsK LSAgICAgICAgY29uc3QgZ2xvd0JsdXIgPSAyOworICAgICAgICBmdW5jdGlvbiBnZW5lcmF0ZU1v ZGVybkltYWdlKCkKKyAgICAgICAgeworICAgICAgICAgICAgY29uc3QgY29udGV4dCA9IGRvY3Vt ZW50LmdldENTU0NhbnZhc0NvbnRleHQoIjJkIiwgY2FudmFzSWRlbnRpZmllckNhbGxiYWNrKHN0 YXRlKSwgc2NhbGVkV2lkdGgsIHNjYWxlZEhlaWdodCk7CisgICAgICAgICAgICBjb250ZXh0LnNh dmUoKTsKKyAgICAgICAgICAgIGNvbnRleHQuc2NhbGUoc2NhbGVGYWN0b3IsIHNjYWxlRmFjdG9y KTsKKworICAgICAgICAgICAgY29udGV4dC5jbGVhclJlY3QoMCwgMCwgd2lkdGgsIGhlaWdodCk7 CisKKyAgICAgICAgICAgIHZhciBncmFkaWVudCA9IGNvbnRleHQuY3JlYXRlTGluZWFyR3JhZGll bnQoMCwgMCwgMCwgaGVpZ2h0KTsKKyAgICAgICAgICAgIGlmIChzdGF0ZSA9PT0gc3RhdGVzLkFj dGl2ZSkgeworICAgICAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9yU3RvcCgwLCAicmdiKDY1 LCA2NSwgNjUpIik7CisgICAgICAgICAgICAgICAgZ3JhZGllbnQuYWRkQ29sb3JTdG9wKDEsICJy Z2IoNzAsIDcwLCA3MCkiKTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAoc3RhdGUgPT09IHN0YXRl cy5Gb2N1cykgeworICAgICAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9yU3RvcCgwLCAicmdi KDAsIDEyMywgMjQ3KSIpOworICAgICAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9yU3RvcCgx LCAicmdiKDAsIDEyOCwgMjUyKSIpOworICAgICAgICAgICAgfSBlbHNlIGlmIChzdGF0ZSA9PT0g c3RhdGVzLkFjdGl2ZUZvY3VzKSB7CisgICAgICAgICAgICAgICAgZ3JhZGllbnQuYWRkQ29sb3JT dG9wKDAsICJyZ2IoMCwgNjIsIDIxMCkiKTsKKyAgICAgICAgICAgICAgICBncmFkaWVudC5hZGRD b2xvclN0b3AoMSwgInJnYigwLCA2NywgMjE1KSIpOworICAgICAgICAgICAgfSBlbHNlIHsKKyAg ICAgICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMCwgInJnYig3NSwgNzUsIDc1KSIp OworICAgICAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9yU3RvcCgxLCAicmdiKDgwLCA4MCwg ODApIik7CisgICAgICAgICAgICB9CiAKLSAgICAgICAgY29uc3QgY29udGV4dCA9IGRvY3VtZW50 LmdldENTU0NhbnZhc0NvbnRleHQoIjJkIiwgY2FudmFzSWRlbnRpZmllckNhbGxiYWNrKHN0YXRl KSwgc2NhbGVkV2lkdGgsIHNjYWxlZEhlaWdodCk7Ci0gICAgICAgIGNvbnRleHQuc2F2ZSgpOwot ICAgICAgICBjb250ZXh0LnNjYWxlKHNjYWxlRmFjdG9yLCBzY2FsZUZhY3Rvcik7CisgICAgICAg ICAgICBjb250ZXh0LmZpbGxTdHlsZSA9IGdyYWRpZW50OworICAgICAgICAgICAgY29udGV4dC5m aWxsUmVjdCgwLCAwLCB3aWR0aCwgaGVpZ2h0KTsKIAotICAgICAgICBjb250ZXh0LmNsZWFyUmVj dCgwLCAwLCB3aWR0aCwgaGVpZ2h0KTsKLQotICAgICAgICBpZiAoZGVwdGggPiAwKSB7Ci0gICAg ICAgICAgICAvLyBVc2Ugc2NyYXRjaCBjYW52YXMgc28gd2UgY2FuIGFwcGx5IHRoZSBkcmF3IHRo ZSB3aGl0ZSBkcm9wIHNoYWRvdwotICAgICAgICAgICAgLy8gdG8gdGhlIHdob2xlIGdseXBoIGF0 IHRoZSBlbmQuCi0KLSAgICAgICAgICAgIHZhciBzY3JhdGNoQ2FudmFzID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiY2FudmFzIik7Ci0gICAgICAgICAgICBzY3JhdGNoQ2FudmFzLndpZHRoID0g c2NhbGVkV2lkdGg7Ci0gICAgICAgICAgICBzY3JhdGNoQ2FudmFzLmhlaWdodCA9IHNjYWxlZEhl aWdodDsKLQotICAgICAgICAgICAgdmFyIHNjcmF0Y2hDb250ZXh0ID0gc2NyYXRjaENhbnZhcy5n ZXRDb250ZXh0KCIyZCIpOwotICAgICAgICAgICAgc2NyYXRjaENvbnRleHQuc2NhbGUoc2NhbGVG YWN0b3IsIHNjYWxlRmFjdG9yKTsKLSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICB2YXIgc2Ny YXRjaENvbnRleHQgPSBjb250ZXh0OwotCi0gICAgICAgIHZhciBncmFkaWVudCA9IHNjcmF0Y2hD b250ZXh0LmNyZWF0ZUxpbmVhckdyYWRpZW50KDAsIDAsIDAsIGhlaWdodCk7Ci0gICAgICAgIGlm IChzdGF0ZSA9PT0gc3RhdGVzLkFjdGl2ZSkgewotICAgICAgICAgICAgZ3JhZGllbnQuYWRkQ29s b3JTdG9wKDAsICJyZ2IoNjAsIDYwLCA2MCkiKTsKLSAgICAgICAgICAgIGdyYWRpZW50LmFkZENv bG9yU3RvcCgxLCAicmdiKDEwMCwgMTAwLCAxMDApIik7Ci0gICAgICAgIH0gZWxzZSBpZiAoc3Rh dGUgPT09IHN0YXRlcy5Gb2N1cykgewotICAgICAgICAgICAgZ3JhZGllbnQuYWRkQ29sb3JTdG9w KDAsICJyZ2IoNTAsIDEzNSwgMjAwKSIpOwotICAgICAgICAgICAgZ3JhZGllbnQuYWRkQ29sb3JT dG9wKDEsICJyZ2IoNjAsIDE1NSwgMjI1KSIpOwotICAgICAgICB9IGVsc2UgaWYgKHN0YXRlID09 PSBzdGF0ZXMuQWN0aXZlRm9jdXMpIHsKLSAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9yU3Rv cCgwLCAicmdiKDMwLCAxMTUsIDE4NSkiKTsKLSAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9y U3RvcCgxLCAicmdiKDQwLCAxMzUsIDIwMCkiKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAg ICAgIGdyYWRpZW50LmFkZENvbG9yU3RvcCgwLCAicmdiKDkwLCA5MCwgOTApIik7Ci0gICAgICAg ICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMSwgInJnYigxNDUsIDE0NSwgMTQ1KSIpOworICAg ICAgICAgICAgLy8gQXBwbHkgdGhlIG1hc2sgdG8ga2VlcCBqdXN0IHRoZSBpbm5lciBzaGFwZSBv ZiB0aGUgZ2x5cGguCisgICAgICAgICAgICBfYXBwbHlJbWFnZU1hc2soY29udGV4dCwgaW1hZ2Up OworCisgICAgICAgICAgICBpZiAoIWlnbm9yZUNhY2hlKSB7CisgICAgICAgICAgICAgICAgY29u c3Qgc3RvcmFnZUtleSA9IHN0b3JhZ2VLZXlQcmVmaXggKyBjYW52YXNJZGVudGlmaWVyQ2FsbGJh Y2soc3RhdGUpOworICAgICAgICAgICAgICAgIHNhdmVJbWFnZVRvU3RvcmFnZShzdG9yYWdlS2V5 LCBjb250ZXh0LCBzY2FsZWRXaWR0aCwgc2NhbGVkSGVpZ2h0LCBpbWFnZVZlcnNpb24pOworICAg ICAgICAgICAgfQorCisgICAgICAgICAgICBjb250ZXh0LnJlc3RvcmUoKTsKICAgICAgICAgfQog Ci0gICAgICAgIHNjcmF0Y2hDb250ZXh0LmZpbGxTdHlsZSA9IGdyYWRpZW50OwotICAgICAgICBz Y3JhdGNoQ29udGV4dC5maWxsUmVjdCgwLCAwLCB3aWR0aCwgaGVpZ2h0KTsKLQotICAgICAgICBp ZiAoZGVwdGggPiAwKSB7Ci0gICAgICAgICAgICAvLyBJbnZlcnQgdGhlIGltYWdlIHRvIHVzZSBh cyBhIHJldmVyc2UgaW1hZ2UgbWFzayBmb3IgdGhlIGlubmVyIHNoYWRvd3MuCi0gICAgICAgICAg ICAvLyBQYXNzIGluIHRoZSBjb2xvciB0byB1c2UgZm9yIHRoZSBvcGFxdWUgYXJlYXMgdG8gcHJl dmVudCAiYmxhY2sgaGFsb3MiCi0gICAgICAgICAgICAvLyBsYXRlciB3aGVuIGFwcGx5aW5nIHRo ZSBmaW5hbCBpbWFnZSBtYXNrLgotCi0gICAgICAgICAgICBpZiAoc3RhdGUgPT09IHN0YXRlcy5B Y3RpdmUpCi0gICAgICAgICAgICAgICAgdmFyIGludmVydGVkSW1hZ2UgPSBfaW52ZXJ0TWFza0lt YWdlKGltYWdlLCA2MCwgNjAsIDYwKTsKLSAgICAgICAgICAgIGVsc2UgaWYgKHN0YXRlID09PSBz dGF0ZXMuRm9jdXMpCi0gICAgICAgICAgICAgICAgdmFyIGludmVydGVkSW1hZ2UgPSBfaW52ZXJ0 TWFza0ltYWdlKGltYWdlLCA0NSwgMTQ1LCAyMTApOwotICAgICAgICAgICAgZWxzZSBpZiAoc3Rh dGUgPT09IHN0YXRlcy5BY3RpdmVGb2N1cykKLSAgICAgICAgICAgICAgICB2YXIgaW52ZXJ0ZWRJ bWFnZSA9IF9pbnZlcnRNYXNrSW1hZ2UoaW1hZ2UsIDM1LCAxMjUsIDE5NSk7Ci0gICAgICAgICAg ICBlbHNlCi0gICAgICAgICAgICAgICAgdmFyIGludmVydGVkSW1hZ2UgPSBfaW52ZXJ0TWFza0lt YWdlKGltYWdlLCA5MCwgOTAsIDkwKTsKLQotICAgICAgICAgICAgaWYgKHN0YXRlID09PSBzdGF0 ZXMuRm9jdXMpIHsKLSAgICAgICAgICAgICAgICAvLyBEb3VibGUgZHJhdyB0aGUgYmx1cnJ5IGlu bmVyIHNoYWRvdyB0byBnZXQgdGhlIHJpZ2h0IGVmZmVjdC4KLSAgICAgICAgICAgICAgICBfZHJh d0ltYWdlU2hhZG93KHNjcmF0Y2hDb250ZXh0LCAwLCAwLCBzaGFkb3dEZXB0aCwgInJnYigxMCwg OTUsIDE1MCkiLCBpbnZlcnRlZEltYWdlKTsKLSAgICAgICAgICAgICAgICBfZHJhd0ltYWdlU2hh ZG93KHNjcmF0Y2hDb250ZXh0LCAwLCAwLCBzaGFkb3dEZXB0aCwgInJnYigxMCwgOTUsIDE1MCki LCBpbnZlcnRlZEltYWdlKTsKLQotICAgICAgICAgICAgICAgIC8vIERyYXcgdGhlIGlubmVyIHNo YWRvdy4KLSAgICAgICAgICAgICAgICBfZHJhd0ltYWdlU2hhZG93KHNjcmF0Y2hDb250ZXh0LCAw LCBzaGFkb3dEZXB0aCwgc2hhZG93Qmx1ciwgInJnYigwLCA4MCwgMTcwKSIsIGludmVydGVkSW1h Z2UpOwotICAgICAgICAgICAgfSBlbHNlIGlmIChzdGF0ZSA9PT0gc3RhdGVzLkFjdGl2ZUZvY3Vz KSB7Ci0gICAgICAgICAgICAgICAgLy8gRG91YmxlIGRyYXcgdGhlIGJsdXJyeSBpbm5lciBzaGFk b3cgdG8gZ2V0IHRoZSByaWdodCBlZmZlY3QuCi0gICAgICAgICAgICAgICAgX2RyYXdJbWFnZVNo YWRvdyhzY3JhdGNoQ29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2IoMCwgODAsIDEwMCki LCBpbnZlcnRlZEltYWdlKTsKLSAgICAgICAgICAgICAgICBfZHJhd0ltYWdlU2hhZG93KHNjcmF0 Y2hDb250ZXh0LCAwLCAwLCBzaGFkb3dEZXB0aCwgInJnYigwLCA4MCwgMTAwKSIsIGludmVydGVk SW1hZ2UpOworICAgICAgICBmdW5jdGlvbiBnZW5lcmF0ZUxlZ2FjeUltYWdlKCkKKyAgICAgICAg eworICAgICAgICAgICAgY29uc3QgZGVwdGggPSAxICogc2NhbGVGYWN0b3I7CisgICAgICAgICAg ICBjb25zdCBzaGFkb3dEZXB0aCA9IGRlcHRoOworICAgICAgICAgICAgY29uc3Qgc2hhZG93Qmx1 ciA9IGRlcHRoIC0gMTsKKyAgICAgICAgICAgIGNvbnN0IGdsb3dCbHVyID0gMjsKIAotICAgICAg ICAgICAgICAgIC8vIERyYXcgdGhlIGlubmVyIHNoYWRvdy4KLSAgICAgICAgICAgICAgICBfZHJh d0ltYWdlU2hhZG93KHNjcmF0Y2hDb250ZXh0LCAwLCBzaGFkb3dEZXB0aCwgc2hhZG93Qmx1ciwg InJnYigwLCA2NSwgMTUwKSIsIGludmVydGVkSW1hZ2UpOworICAgICAgICAgICAgY29uc3QgY29u dGV4dCA9IGRvY3VtZW50LmdldENTU0NhbnZhc0NvbnRleHQoIjJkIiwgY2FudmFzSWRlbnRpZmll ckNhbGxiYWNrKHN0YXRlKSwgc2NhbGVkV2lkdGgsIHNjYWxlZEhlaWdodCk7CisgICAgICAgICAg ICBjb250ZXh0LnNhdmUoKTsKKyAgICAgICAgICAgIGNvbnRleHQuc2NhbGUoc2NhbGVGYWN0b3Is IHNjYWxlRmFjdG9yKTsKKworICAgICAgICAgICAgY29udGV4dC5jbGVhclJlY3QoMCwgMCwgd2lk dGgsIGhlaWdodCk7CisKKyAgICAgICAgICAgIGlmIChkZXB0aCA+IDApIHsKKyAgICAgICAgICAg ICAgICAvLyBVc2Ugc2NyYXRjaCBjYW52YXMgc28gd2UgY2FuIGFwcGx5IHRoZSBkcmF3IHRoZSB3 aGl0ZSBkcm9wIHNoYWRvdworICAgICAgICAgICAgICAgIC8vIHRvIHRoZSB3aG9sZSBnbHlwaCBh dCB0aGUgZW5kLgorCisgICAgICAgICAgICAgICAgdmFyIHNjcmF0Y2hDYW52YXMgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJjYW52YXMiKTsKKyAgICAgICAgICAgICAgICBzY3JhdGNoQ2FudmFz LndpZHRoID0gc2NhbGVkV2lkdGg7CisgICAgICAgICAgICAgICAgc2NyYXRjaENhbnZhcy5oZWln aHQgPSBzY2FsZWRIZWlnaHQ7CisKKyAgICAgICAgICAgICAgICB2YXIgc2NyYXRjaENvbnRleHQg PSBzY3JhdGNoQ2FudmFzLmdldENvbnRleHQoIjJkIik7CisgICAgICAgICAgICAgICAgc2NyYXRj aENvbnRleHQuc2NhbGUoc2NhbGVGYWN0b3IsIHNjYWxlRmFjdG9yKTsKKyAgICAgICAgICAgIH0g ZWxzZQorICAgICAgICAgICAgICAgIHZhciBzY3JhdGNoQ29udGV4dCA9IGNvbnRleHQ7CisKKyAg ICAgICAgICAgIHZhciBncmFkaWVudCA9IHNjcmF0Y2hDb250ZXh0LmNyZWF0ZUxpbmVhckdyYWRp ZW50KDAsIDAsIDAsIGhlaWdodCk7CisgICAgICAgICAgICBpZiAoc3RhdGUgPT09IHN0YXRlcy5B Y3RpdmUpIHsKKyAgICAgICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMCwgInJnYig2 MCwgNjAsIDYwKSIpOworICAgICAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9yU3RvcCgxLCAi cmdiKDEwMCwgMTAwLCAxMDApIik7CisgICAgICAgICAgICB9IGVsc2UgaWYgKHN0YXRlID09PSBz dGF0ZXMuRm9jdXMpIHsKKyAgICAgICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMCwg InJnYig1MCwgMTM1LCAyMDApIik7CisgICAgICAgICAgICAgICAgZ3JhZGllbnQuYWRkQ29sb3JT dG9wKDEsICJyZ2IoNjAsIDE1NSwgMjI1KSIpOworICAgICAgICAgICAgfSBlbHNlIGlmIChzdGF0 ZSA9PT0gc3RhdGVzLkFjdGl2ZUZvY3VzKSB7CisgICAgICAgICAgICAgICAgZ3JhZGllbnQuYWRk Q29sb3JTdG9wKDAsICJyZ2IoMzAsIDExNSwgMTg1KSIpOworICAgICAgICAgICAgICAgIGdyYWRp ZW50LmFkZENvbG9yU3RvcCgxLCAicmdiKDQwLCAxMzUsIDIwMCkiKTsKICAgICAgICAgICAgIH0g ZWxzZSB7Ci0gICAgICAgICAgICAgICAgLy8gRG91YmxlIGRyYXcgdGhlIGJsdXJyeSBpbm5lciBz aGFkb3cgdG8gZ2V0IHRoZSByaWdodCBlZmZlY3QuCi0gICAgICAgICAgICAgICAgX2RyYXdJbWFn ZVNoYWRvdyhzY3JhdGNoQ29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2JhKDAsIDAsIDAs IDEpIiwgaW52ZXJ0ZWRJbWFnZSk7Ci0gICAgICAgICAgICAgICAgX2RyYXdJbWFnZVNoYWRvdyhz Y3JhdGNoQ29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2JhKDAsIDAsIDAsIDEpIiwgaW52 ZXJ0ZWRJbWFnZSk7CisgICAgICAgICAgICAgICAgZ3JhZGllbnQuYWRkQ29sb3JTdG9wKDAsICJy Z2IoOTAsIDkwLCA5MCkiKTsKKyAgICAgICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3Ao MSwgInJnYigxNDUsIDE0NSwgMTQ1KSIpOworICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAg ICAgLy8gRHJhdyB0aGUgaW5uZXIgc2hhZG93LgotICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VT aGFkb3coc2NyYXRjaENvbnRleHQsIDAsIHNoYWRvd0RlcHRoLCBzaGFkb3dCbHVyLCAicmdiYSgw LCAwLCAwLCAwLjYpIiwgaW52ZXJ0ZWRJbWFnZSk7CisgICAgICAgICAgICBzY3JhdGNoQ29udGV4 dC5maWxsU3R5bGUgPSBncmFkaWVudDsKKyAgICAgICAgICAgIHNjcmF0Y2hDb250ZXh0LmZpbGxS ZWN0KDAsIDAsIHdpZHRoLCBoZWlnaHQpOworCisgICAgICAgICAgICBpZiAoZGVwdGggPiAwKSB7 CisgICAgICAgICAgICAgICAgLy8gSW52ZXJ0IHRoZSBpbWFnZSB0byB1c2UgYXMgYSByZXZlcnNl IGltYWdlIG1hc2sgZm9yIHRoZSBpbm5lciBzaGFkb3dzLgorICAgICAgICAgICAgICAgIC8vIFBh c3MgaW4gdGhlIGNvbG9yIHRvIHVzZSBmb3IgdGhlIG9wYXF1ZSBhcmVhcyB0byBwcmV2ZW50ICJi bGFjayBoYWxvcyIKKyAgICAgICAgICAgICAgICAvLyBsYXRlciB3aGVuIGFwcGx5aW5nIHRoZSBm aW5hbCBpbWFnZSBtYXNrLgorCisgICAgICAgICAgICAgICAgaWYgKHN0YXRlID09PSBzdGF0ZXMu QWN0aXZlKQorICAgICAgICAgICAgICAgICAgICB2YXIgaW52ZXJ0ZWRJbWFnZSA9IF9pbnZlcnRN YXNrSW1hZ2UoaW1hZ2UsIDYwLCA2MCwgNjApOworICAgICAgICAgICAgICAgIGVsc2UgaWYgKHN0 YXRlID09PSBzdGF0ZXMuRm9jdXMpCisgICAgICAgICAgICAgICAgICAgIHZhciBpbnZlcnRlZElt YWdlID0gX2ludmVydE1hc2tJbWFnZShpbWFnZSwgNDUsIDE0NSwgMjEwKTsKKyAgICAgICAgICAg ICAgICBlbHNlIGlmIChzdGF0ZSA9PT0gc3RhdGVzLkFjdGl2ZUZvY3VzKQorICAgICAgICAgICAg ICAgICAgICB2YXIgaW52ZXJ0ZWRJbWFnZSA9IF9pbnZlcnRNYXNrSW1hZ2UoaW1hZ2UsIDM1LCAx MjUsIDE5NSk7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICB2YXIg aW52ZXJ0ZWRJbWFnZSA9IF9pbnZlcnRNYXNrSW1hZ2UoaW1hZ2UsIDkwLCA5MCwgOTApOworCisg ICAgICAgICAgICAgICAgaWYgKHN0YXRlID09PSBzdGF0ZXMuRm9jdXMpIHsKKyAgICAgICAgICAg ICAgICAgICAgLy8gRG91YmxlIGRyYXcgdGhlIGJsdXJyeSBpbm5lciBzaGFkb3cgdG8gZ2V0IHRo ZSByaWdodCBlZmZlY3QuCisgICAgICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VTaGFkb3coc2Ny YXRjaENvbnRleHQsIDAsIDAsIHNoYWRvd0RlcHRoLCAicmdiKDEwLCA5NSwgMTUwKSIsIGludmVy dGVkSW1hZ2UpOworICAgICAgICAgICAgICAgICAgICBfZHJhd0ltYWdlU2hhZG93KHNjcmF0Y2hD b250ZXh0LCAwLCAwLCBzaGFkb3dEZXB0aCwgInJnYigxMCwgOTUsIDE1MCkiLCBpbnZlcnRlZElt YWdlKTsKKworICAgICAgICAgICAgICAgICAgICAvLyBEcmF3IHRoZSBpbm5lciBzaGFkb3cuCisg ICAgICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VTaGFkb3coc2NyYXRjaENvbnRleHQsIDAsIHNo YWRvd0RlcHRoLCBzaGFkb3dCbHVyLCAicmdiKDAsIDgwLCAxNzApIiwgaW52ZXJ0ZWRJbWFnZSk7 CisgICAgICAgICAgICAgICAgfSBlbHNlIGlmIChzdGF0ZSA9PT0gc3RhdGVzLkFjdGl2ZUZvY3Vz KSB7CisgICAgICAgICAgICAgICAgICAgIC8vIERvdWJsZSBkcmF3IHRoZSBibHVycnkgaW5uZXIg c2hhZG93IHRvIGdldCB0aGUgcmlnaHQgZWZmZWN0LgorICAgICAgICAgICAgICAgICAgICBfZHJh d0ltYWdlU2hhZG93KHNjcmF0Y2hDb250ZXh0LCAwLCAwLCBzaGFkb3dEZXB0aCwgInJnYigwLCA4 MCwgMTAwKSIsIGludmVydGVkSW1hZ2UpOworICAgICAgICAgICAgICAgICAgICBfZHJhd0ltYWdl U2hhZG93KHNjcmF0Y2hDb250ZXh0LCAwLCAwLCBzaGFkb3dEZXB0aCwgInJnYigwLCA4MCwgMTAw KSIsIGludmVydGVkSW1hZ2UpOworCisgICAgICAgICAgICAgICAgICAgIC8vIERyYXcgdGhlIGlu bmVyIHNoYWRvdy4KKyAgICAgICAgICAgICAgICAgICAgX2RyYXdJbWFnZVNoYWRvdyhzY3JhdGNo Q29udGV4dCwgMCwgc2hhZG93RGVwdGgsIHNoYWRvd0JsdXIsICJyZ2IoMCwgNjUsIDE1MCkiLCBp bnZlcnRlZEltYWdlKTsKKyAgICAgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAg ICAgICAvLyBEb3VibGUgZHJhdyB0aGUgYmx1cnJ5IGlubmVyIHNoYWRvdyB0byBnZXQgdGhlIHJp Z2h0IGVmZmVjdC4KKyAgICAgICAgICAgICAgICAgICAgX2RyYXdJbWFnZVNoYWRvdyhzY3JhdGNo Q29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2JhKDAsIDAsIDAsIDEpIiwgaW52ZXJ0ZWRJ bWFnZSk7CisgICAgICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VTaGFkb3coc2NyYXRjaENvbnRl eHQsIDAsIDAsIHNoYWRvd0RlcHRoLCAicmdiYSgwLCAwLCAwLCAxKSIsIGludmVydGVkSW1hZ2Up OworCisgICAgICAgICAgICAgICAgICAgIC8vIERyYXcgdGhlIGlubmVyIHNoYWRvdy4KKyAgICAg ICAgICAgICAgICAgICAgX2RyYXdJbWFnZVNoYWRvdyhzY3JhdGNoQ29udGV4dCwgMCwgc2hhZG93 RGVwdGgsIHNoYWRvd0JsdXIsICJyZ2JhKDAsIDAsIDAsIDAuNikiLCBpbnZlcnRlZEltYWdlKTsK KyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9Ci0gICAgICAgIH0KIAotICAgICAgICAv LyBBcHBseSB0aGUgbWFzayB0byBrZWVwIGp1c3QgdGhlIGlubmVyIHNoYXBlIG9mIHRoZSBnbHlw aC4KLSAgICAgICAgX2FwcGx5SW1hZ2VNYXNrKHNjcmF0Y2hDb250ZXh0LCBpbWFnZSk7CisgICAg ICAgICAgICAvLyBBcHBseSB0aGUgbWFzayB0byBrZWVwIGp1c3QgdGhlIGlubmVyIHNoYXBlIG9m IHRoZSBnbHlwaC4KKyAgICAgICAgICAgIF9hcHBseUltYWdlTWFzayhzY3JhdGNoQ29udGV4dCwg aW1hZ2UpOworCisgICAgICAgICAgICAvLyBEcmF3IHRoZSB3aGl0ZSBkcm9wIHNoYWRvdy4KKyAg ICAgICAgICAgIGlmIChkZXB0aCA+IDApCisgICAgICAgICAgICAgICAgX2RyYXdJbWFnZVNoYWRv dyhjb250ZXh0LCAwLCBzaGFkb3dEZXB0aCwgc2hhZG93Qmx1ciwgInJnYmEoMjU1LCAyNTUsIDI1 NSwgMC42KSIsIHNjcmF0Y2hDYW52YXMpOwogCi0gICAgICAgIC8vIERyYXcgdGhlIHdoaXRlIGRy b3Agc2hhZG93LgotICAgICAgICBpZiAoZGVwdGggPiAwKQotICAgICAgICAgICAgX2RyYXdJbWFn ZVNoYWRvdyhjb250ZXh0LCAwLCBzaGFkb3dEZXB0aCwgc2hhZG93Qmx1ciwgInJnYmEoMjU1LCAy NTUsIDI1NSwgMC42KSIsIHNjcmF0Y2hDYW52YXMpOworICAgICAgICAgICAgLy8gRHJhdyBhIHN1 YnRsZSBnbG93IGZvciB0aGUgZm9jdXMgc3RhdGVzLgorICAgICAgICAgICAgaWYgKHN0YXRlID09 PSBzdGF0ZXMuRm9jdXMgfHwgc3RhdGUgPT09IHN0YXRlcy5BY3RpdmVGb2N1cykKKyAgICAgICAg ICAgICAgICBfZHJhd0ltYWdlU2hhZG93KGNvbnRleHQsIDAsIDAsIGdsb3dCbHVyLCAicmdiYSgy MCwgMTAwLCAyMjAsIDAuNCkiLCBzY3JhdGNoQ2FudmFzKTsKIAotICAgICAgICAvLyBEcmF3IGEg c3VidGxlIGdsb3cgZm9yIHRoZSBmb2N1cyBzdGF0ZXMuCi0gICAgICAgIGlmIChzdGF0ZSA9PT0g c3RhdGVzLkZvY3VzIHx8IHN0YXRlID09PSBzdGF0ZXMuQWN0aXZlRm9jdXMpCi0gICAgICAgICAg ICBfZHJhd0ltYWdlU2hhZG93KGNvbnRleHQsIDAsIDAsIGdsb3dCbHVyLCAicmdiYSgyMCwgMTAw LCAyMjAsIDAuNCkiLCBzY3JhdGNoQ2FudmFzKTsKKyAgICAgICAgICAgIGlmICghaWdub3JlQ2Fj aGUpIHsKKyAgICAgICAgICAgICAgICBjb25zdCBzdG9yYWdlS2V5ID0gc3RvcmFnZUtleVByZWZp eCArIGNhbnZhc0lkZW50aWZpZXJDYWxsYmFjayhzdGF0ZSk7CisgICAgICAgICAgICAgICAgc2F2 ZUltYWdlVG9TdG9yYWdlKHN0b3JhZ2VLZXksIGNvbnRleHQsIHNjYWxlZFdpZHRoLCBzY2FsZWRI ZWlnaHQsIGltYWdlVmVyc2lvbik7CisgICAgICAgICAgICB9CiAKLSAgICAgICAgaWYgKCFpZ25v cmVDYWNoZSkgewotICAgICAgICAgICAgY29uc3Qgc3RvcmFnZUtleSA9IHN0b3JhZ2VLZXlQcmVm aXggKyBjYW52YXNJZGVudGlmaWVyQ2FsbGJhY2soc3RhdGUpOwotICAgICAgICAgICAgc2F2ZUlt YWdlVG9TdG9yYWdlKHN0b3JhZ2VLZXksIGNvbnRleHQsIHNjYWxlZFdpZHRoLCBzY2FsZWRIZWln aHQsIGltYWdlVmVyc2lvbik7CisgICAgICAgICAgICBjb250ZXh0LnJlc3RvcmUoKTsKICAgICAg ICAgfQogCi0gICAgICAgIGNvbnRleHQucmVzdG9yZSgpOworICAgICAgICBpZiAoV2ViSW5zcGVj dG9yLlBsYXRmb3JtLm5hbWUgPT09ICJtYWMiICYmIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJz aW9uLmJhc2UgPT09ICIxMCIgJiYgV2ViSW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24ucmVsZWFz ZSA8IDEwKQorICAgICAgICAgICAgZ2VuZXJhdGVMZWdhY3lJbWFnZSgpOworICAgICAgICBlbHNl CisgICAgICAgICAgICBnZW5lcmF0ZU1vZGVybkltYWdlKCk7CiAgICAgfQogCiAgICAgZnVuY3Rp b24gX2RyYXdJbWFnZVNoYWRvdyhjb250ZXh0LCB4T2Zmc2V0LCB5T2Zmc2V0LCBibHVyLCBjb2xv ciwgaW1hZ2UpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0Jhc2UvTWFpbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jh c2UvTWFpbi5qcwppbmRleCBhNGE2Y2NlLi4wNTc0MGJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCkBAIC0xNjcsNyArMTY3LDcgQEAg V2ViSW5zcGVjdG9yLmxvYWRlZCA9IGZ1bmN0aW9uKCkKICAgICB9OwogCiAgICAgdGhpcy5fd2lu ZG93S2V5ZG93bkxpc3RlbmVycyA9IFtdOwotfQorfTsKIAogV2ViSW5zcGVjdG9yLmNvbnRlbnRM b2FkZWQgPSBmdW5jdGlvbigpCiB7CkBAIC0xOTMsMTYgKzE5Myw1MCBAQCBXZWJJbnNwZWN0b3Iu Y29udGVudExvYWRlZCA9IGZ1bmN0aW9uKCkKICAgICAgICAgZG9jdW1lbnQuYm9keS5jbGFzc0xp c3QuYWRkKCJuaWdodGx5LWJ1aWxkIik7CiAKICAgICAvLyBBZGQgcGxhdGZvcm0gc3R5bGUgY2xh c3NlcyBzbyB0aGUgVUkgY2FuIGJlIHR3ZWFrZWQgcGVyLXBsYXRmb3JtLgotICAgIGRvY3VtZW50 LmJvZHkuY2xhc3NMaXN0LmFkZChJbnNwZWN0b3JGcm9udGVuZEhvc3QucGxhdGZvcm0oKSArICIt cGxhdGZvcm0iKTsKLQotICAgIGlmIChJbnNwZWN0b3JGcm9udGVuZEhvc3QucGxhdGZvcm0oKSA9 PT0gIm1hYyIpIHsKLSAgICAgICAgdmFyIHZlcnNpb25NYXRjaCA9IC8gTWFjIE9TIFggKFxkKylf KFxkKykvLmV4ZWMobmF2aWdhdG9yLmFwcFZlcnNpb24pOwotICAgICAgICBpZiAodmVyc2lvbk1h dGNoICYmIHZlcnNpb25NYXRjaFsxXSA9PSAxMCAmJiB2ZXJzaW9uTWF0Y2hbMl0gPT0gOCkKLSAg ICAgICAgICAgIGRvY3VtZW50LmJvZHkuY2xhc3NMaXN0LmFkZCgibW91bnRhaW4tbGlvbiIpOwot ICAgICAgICBlbHNlIGlmICh2ZXJzaW9uTWF0Y2ggJiYgdmVyc2lvbk1hdGNoWzFdID09IDEwICYm IHZlcnNpb25NYXRjaFsyXSA9PSA5KQotICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5jbGFzc0xp c3QuYWRkKCJtYXZlcmlja3MiKTsKKyAgICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0gPSB7CisgICAg ICAgIG5hbWU6IEluc3BlY3RvckZyb250ZW5kSG9zdC5wbGF0Zm9ybSgpLAorICAgICAgICBjb2Rl TmFtZTogIiIsCisgICAgICAgIHZlcnNpb246IHsKKyAgICAgICAgICAgIGJhc2U6IDAsCisgICAg ICAgICAgICByZWxlYXNlOiAwLAorICAgICAgICAgICAgdG9TdHJpbmc6IGZ1bmN0aW9uKCkKKyAg ICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICByZXR1cm4gdGhpcy5iYXNlICsgIi4iICsgdGhp cy52ZXJzaW9uOworICAgICAgICAgICAgfQorICAgICAgICB9LAorICAgICAgICB0b1N0cmluZzog ZnVuY3Rpb24oKQorICAgICAgICB7CisgICAgICAgICAgICByZXR1cm4gdGhpcy5uYW1lOworICAg ICAgICB9CisgICAgfTsKKworICAgIHZhciBpc0xlZ2FjeU1hY09TID0gZmFsc2U7CisgICAgdmFy IG9zVmVyc2lvbk1hdGNoID0gLyBNYWMgT1MgWCAoXGQrKV8oXGQrKS8uZXhlYyhuYXZpZ2F0b3Iu YXBwVmVyc2lvbik7CisgICAgaWYgKG9zVmVyc2lvbk1hdGNoICYmIG9zVmVyc2lvbk1hdGNoWzFd ID09PSAiMTAiKSB7CisgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLmJhc2Ug PSAxMDsKKyAgICAgICAgc3dpdGNoKG9zVmVyc2lvbk1hdGNoWzJdKSB7CisgICAgICAgICAgICBj YXNlICIxMCI6CisgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLlBsYXRmb3JtLmNvZGVOYW1l ID0gInlvc2VtaXRlIjsKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVy c2lvbi5yZWxlYXNlID0gMTA7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBj YXNlICI5IjoKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0uY29kZU5hbWUg PSAibWF2ZXJpY2tzIjsKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVy c2lvbi5yZWxlYXNlID0gOTsKKyAgICAgICAgICAgICAgICBpc0xlZ2FjeU1hY09TID0gdHJ1ZTsK KyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgIjgiOgorICAgICAgICAg ICAgICAgIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS5jb2RlTmFtZSA9ICJtb3VudGFpbi1saW9uIjsK KyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5yZWxlYXNlID0g ODsKKyAgICAgICAgICAgICAgICBpc0xlZ2FjeU1hY09TID0gdHJ1ZTsKKyAgICAgICAgfQogICAg IH0KIAorICAgIGRvY3VtZW50LmJvZHkuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuUGxhdGZv cm0gKyAiLXBsYXRmb3JtIik7CisgICAgaWYgKFdlYkluc3BlY3Rvci5QbGF0Zm9ybS5jb2RlTmFt ZSkKKyAgICAgICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5QbGF0 Zm9ybS5jb2RlTmFtZSk7CisgICAgaWYgKGlzTGVnYWN5TWFjT1MpCisgICAgICAgIGRvY3VtZW50 LmJvZHkuY2xhc3NMaXN0LmFkZCgibGVnYWN5Iik7CisKICAgICB0aGlzLmRlYnVnZ2FibGVUeXBl ID0gSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmRlYnVnZ2FibGVUeXBlKCkgPT09ICJ3ZWIiID8gV2Vi SW5zcGVjdG9yLkRlYnVnZ2FibGVUeXBlLldlYiA6IFdlYkluc3BlY3Rvci5EZWJ1Z2dhYmxlVHlw ZS5KYXZhU2NyaXB0OwogICAgIGRvY3VtZW50LmJvZHkuY2xhc3NMaXN0LmFkZCh0aGlzLmRlYnVn Z2FibGVUeXBlKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvSW1hZ2VzL0JhY2tBcnJvdy5zdmcgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9JbWFnZXMvQmFja0Fycm93LnN2ZwppbmRleCBlMWY1OTBlLi4xODA1MzFlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvQmFja0Fy cm93LnN2ZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMv QmFja0Fycm93LnN2ZwpAQCAtMSw1ICsxLDUgQEAKIDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rp bmc9InV0Zi04Ij8+CiA8IS0tIENvcHlyaWdodCDCqSAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4gLS0+Ci08c3ZnIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMu b3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgOSA5Ij4KLSAgICA8cGF0aCBkPSJNIDkgMCBMIDAu NDg0Mzc1IDQuNDg0Mzc1IEwgOSA5IFoiLz4KKzxzdmcgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0 cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMCAxNiI+CisgICAgPHBhdGgg ZD0iTSAzLjIwNTQwMDY0IDcuNzU5ODMyODMgTCA5LjM0NDggMS42MjQ0IEwgNy43Mzg4IDAuMDE3 NCBMIC0wLjAwMDIgNy43NTE0IEwgMC4wMDkxOTkzNzU5IDcuNzYwODA1MjMgTCAwLjAwMTggNy43 NjgyIEwgNy43MzU4IDE1LjUwNzIgTCA5LjM0MjggMTMuOTAxMiBMIDMuMjA1NDAwNjQgNy43NTk4 MzI4MyBaIj48L3BhdGg+CiA8L3N2Zz4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9CYWNrQXJyb3dMZWdhY3kuc3ZnIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0JhY2tBcnJvd0xlZ2FjeS5zdmcKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZTFmNTkwZQotLS0gL2Rldi9udWxsCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9CYWNrQXJyb3dMZWdh Y3kuc3ZnCkBAIC0wLDAgKzEsNSBAQAorPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRm LTgiPz4KKzwhLS0gQ29weXJpZ2h0IMKpIDIwMTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLiAtLT4KKzxzdmcgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAw MC9zdmciIHZpZXdCb3g9IjAgMCA5IDkiPgorICAgIDxwYXRoIGQ9Ik0gOSAwIEwgMC40ODQzNzUg NC40ODQzNzUgTCA5IDkgWiIvPgorPC9zdmc+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvRm9yd2FyZEFycm93LnN2ZyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9Gb3J3YXJkQXJyb3cuc3ZnCmluZGV4IGMx NmJjNjUuLjY4YjhmMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0ltYWdlcy9Gb3J3YXJkQXJyb3cuc3ZnCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9Gb3J3YXJkQXJyb3cuc3ZnCkBAIC0xLDUgKzEsNSBAQAog PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KIDwhLS0gQ29weXJpZ2h0IMKp IDIwMTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLiAtLT4KLTxzdmcgdmVyc2lvbj0i MS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA5IDki PgotICAgIDxwYXRoIGQ9Ik0gMCAwIEwgOC41MTU2MjUgNC40ODQzNzUgTCAwIDkgWiIvPgorPHN2 ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0Jv eD0iMCAwIDEwIDE2Ij4KKyAgICA8cGF0aCBkPSJNIDYuMTM5MjQ5MzMgNy43NTk3ODI4MyBMIDAu MDAxOCAxMy45MDEyIEwgMS42MDg4IDE1LjUwNzIgTCA5LjM0MjggNy43NjgyIEwgOS4zMzU0NTA2 NiA3Ljc2MDg1NTIzIEwgOS4zNDQ5IDcuNzUxNCBMIDEuNjA1OSAwLjAxNzQgTCAtMC4wMDAxIDEu NjI0NCBMIDYuMTM5MjQ5MzMgNy43NTk3ODI4MyBaIj48L3BhdGg+CiA8L3N2Zz4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9Gb3J3YXJkQXJy b3dMZWdhY3kuc3ZnIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2Vz L0ZvcndhcmRBcnJvd0xlZ2FjeS5zdmcKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MC4uYzE2YmM2NQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0ltYWdlcy9Gb3J3YXJkQXJyb3dMZWdhY3kuc3ZnCkBAIC0wLDAgKzEsNSBAQAor PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KKzwhLS0gQ29weXJpZ2h0IMKp IDIwMTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLiAtLT4KKzxzdmcgdmVyc2lvbj0i MS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA5IDki PgorICAgIDxwYXRoIGQ9Ik0gMCAwIEwgOC41MTU2MjUgNC40ODQzNzUgTCAwIDkgWiIvPgorPC9z dmc+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9CdXR0b25Ub29sYmFySXRlbS5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9CdXR0b25Ub29sYmFySXRlbS5jc3MKaW5kZXggZDYyYTE4OS4uY2RkZWViMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQnV0 dG9uVG9vbGJhckl0ZW0uY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0J1dHRvblRvb2xiYXJJdGVtLmNzcwpAQCAtNTksNiArNTksMTAgQEAKIAogLnRv b2xiYXIgLml0ZW0uYnV0dG9uID4gLmxhYmVsIHsKICAgICB0ZXh0LWFsaWduOiBjZW50ZXI7Cisg ICAgY29sb3I6IHJnYig4MCwgODAsIDgwKTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5 IC50b29sYmFyIC5pdGVtLmJ1dHRvbiA+IC5sYWJlbCB7CiAgICAgdGV4dC1zaGFkb3c6IHJnYmEo MjU1LCAyNTUsIDI1NSwgMC41KSAwIDFweCAwOwogICAgIGNvbG9yOiByZ2IoNjAsIDYwLCA2MCk7 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9DU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5jc3MKaW5kZXgg NWIzNmZiMy4uNDgyZTc4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uY3NzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25T ZWN0aW9uLmNzcwpAQCAtMzAsMzAgKzMwLDQyIEBACiAgICAgcGFkZGluZzogNXB4OwogCiAgICAg YmFja2dyb3VuZC1jb2xvcjogd2hpdGU7CisgICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHJn YigyMTAsIDIxMCwgMjEwKTsKIH0KIAotLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24gKyAuc3R5 bGUtZGVjbGFyYXRpb24tc2VjdGlvbiB7Citib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnN0eWxl LWRlY2xhcmF0aW9uLXNlY3Rpb24geworICAgIGJvcmRlci1ib3R0b206IG5vbmU7Cit9CisKK2Jv ZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbiArIC5zdHls ZS1kZWNsYXJhdGlvbi1zZWN0aW9uIHsKICAgICBib3JkZXItdG9wOiAxcHggc29saWQgcmdiKDIx MCwgMjEwLCAyMTApOwogfQogCiAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0LWluLWdy b3VwIHsKICAgICBtYXJnaW4tYm90dG9tOiAxNXB4OwogCisgICAgYm9yZGVyLWJvdHRvbTogMXB4 IHNvbGlkIHJnYigyMTAsIDIxMCwgMjEwKTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5 IC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAgewogICAgIGJveC1zaGFk b3c6IHJnYmEoMCwgMCwgMCwgMC4zKSAwIDJweCAycHggMDsKIH0KIAogLnN0eWxlLWRlY2xhcmF0 aW9uLXNlY3Rpb24ubGFzdC1pbi1ncm91cCArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uIHsK ICAgICBtYXJnaW4tdG9wOiAxNXB4OwogCi0gICAgYm9yZGVyLXRvcDogbm9uZTsKKyAgICBib3Jk ZXItdG9wOiAxcHggc29saWQgcmdiKDIxMCwgMjEwLCAyMTApOworfQogCitib2R5Lm1hYy1wbGF0 Zm9ybS5sZWdhY3kgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1pbi1ncm91cCArIC5z dHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uIHsKICAgICBib3gtc2hhZG93OiByZ2JhKDAsIDAsIDAs IDAuMykgMCAwIDJweCAwOworICAgIGJvcmRlci10b3A6IG5vbmU7CiB9CiAKLS5zdHlsZS1kZWNs YXJhdGlvbi1zZWN0aW9uOmZpcnN0LWNoaWxkLAotZGl2Om5vdCguc3R5bGUtZGVjbGFyYXRpb24t c2VjdGlvbikgKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbiwKLS5zdHlsZS1kZWNsYXJhdGlv bi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAgKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0 LWluLWdyb3VwLAotLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1pbi1ncm91cCArIC5z dHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uOmxhc3QtY2hpbGQgeworYm9keS5tYWMtcGxhdGZvcm0u bGVnYWN5IC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uOmZpcnN0LWNoaWxkLAorYm9keS5tYWMt cGxhdGZvcm0ubGVnYWN5IGRpdjpub3QoLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24pICsgLnN0 eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24sCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnN0eWxl LWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1pbi1ncm91cCArIC5zdHlsZS1kZWNsYXJhdGlvbi1z ZWN0aW9uLmxhc3QtaW4tZ3JvdXAsCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnN0eWxlLWRl Y2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1pbi1ncm91cCArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0 aW9uOmxhc3QtY2hpbGQgewogICAgIGJveC1zaGFkb3c6IHJnYmEoMCwgMCwgMCwgMC4zKSAwIDFw eCAzcHggMXB4OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9DU1NTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwuY3NzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZXRhaWxzU2lkZWJhclBh bmVsLmNzcwppbmRleCA5ZGY4ODJiLi43NmRmM2EzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwu Y3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0 eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5jc3MKQEAgLTQzLDYgKzQzLDcgQEAKIAogLnNpZGViYXIg PiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgPiAuY29udGVudCA+IC5wc2V1ZG8tY2xhc3NlcyB7 CiAgICAgcGFkZGluZzogMTBweDsKKyAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgcmdiKDE1 MywgMTUzLCAxNTMpOwogCiAgICAgZGlzcGxheTogLXdlYmtpdC1mbGV4OwogICAgIC13ZWJraXQt ZmxleC1mbG93OiByb3cgd3JhcDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanMKaW5kZXggN2Y1ODdhMS4u OGIxNWVmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvQ29udGVudEJyb3dzZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanMKQEAgLTQ5LDEyICs0OSwyMiBAQCBXZWJJ bnNwZWN0b3IuQ29udGVudEJyb3dzZXIgPSBmdW5jdGlvbihlbGVtZW50LCBkZWxlZ2F0ZSwgZGlz YWJsZUJhY2tGb3J3YXJkKQogICAgICAgICB0aGlzLl9iYWNrS2V5Ym9hcmRTaG9ydGN1dCA9IG5l dyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9y dGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9sIHwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hv cnRjdXQuTW9kaWZpZXIuQ29udHJvbCwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5 LkxlZnQsIHRoaXMuX2JhY2tCdXR0b25DbGlja2VkLmJpbmQodGhpcykpOwogICAgICAgICB0aGlz Ll9mb3J3YXJkS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9y dGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250 cm9sIHwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29udHJvbCwgV2Vi SW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5LlJpZ2h0LCB0aGlzLl9mb3J3YXJkQnV0dG9u Q2xpY2tlZC5iaW5kKHRoaXMpKTsKIAotICAgICAgICB0aGlzLl9iYWNrQnV0dG9uTmF2aWdhdGlv bkl0ZW0gPSBuZXcgV2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVtKCJiYWNrIiwgV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJCYWNrICglcykiKS5mb3JtYXQodGhpcy5fYmFja0tleWJvYXJk U2hvcnRjdXQuZGlzcGxheU5hbWUpLCAiSW1hZ2VzL0JhY2tBcnJvdy5zdmciLCA5LCA5KTsKKyAg ICAgICAgdmFyIGZvcndhcmRBcnJvdywgYmFja0Fycm93OworICAgICAgICBpZiAoV2ViSW5zcGVj dG9yLlBsYXRmb3JtLm5hbWUgPT09ICJtYWMiICYmIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJz aW9uLnJlbGVhc2UgPCAxMCkgeworICAgICAgICAgICAgZm9yd2FyZEFycm93ID0ge3NyYzogIklt YWdlcy9Gb3J3YXJkQXJyb3dMZWdhY3kuc3ZnIiwgd2lkdGg6IDksIGhlaWdodDogOX07CisgICAg ICAgICAgICBiYWNrQXJyb3cgPSB7c3JjOiAiSW1hZ2VzL0JhY2tBcnJvd0xlZ2FjeS5zdmciLCB3 aWR0aDogOSwgaGVpZ2h0OiA5fTsKKyAgICAgICAgfQorICAgICAgICBlbHNlIHsKKyAgICAgICAg ICAgIGZvcndhcmRBcnJvdyA9IHtzcmM6ICJJbWFnZXMvRm9yd2FyZEFycm93LnN2ZyIsIHdpZHRo OiAxMCwgaGVpZ2h0OiAxNn07CisgICAgICAgICAgICBiYWNrQXJyb3cgPSB7c3JjOiAiSW1hZ2Vz L0JhY2tBcnJvdy5zdmciLCB3aWR0aDogMTAsIGhlaWdodDogMTZ9OworICAgICAgICB9CisKKyAg ICAgICAgdGhpcy5fYmFja0J1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdlYkluc3BlY3Rvci5C dXR0b25OYXZpZ2F0aW9uSXRlbSgiYmFjayIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQmFjayAo JXMpIikuZm9ybWF0KHRoaXMuX2JhY2tLZXlib2FyZFNob3J0Y3V0LmRpc3BsYXlOYW1lKSwgYmFj a0Fycm93LnNyYywgYmFja0Fycm93LndpZHRoLCBiYWNrQXJyb3cuaGVpZ2h0KTsKICAgICAgICAg dGhpcy5fYmFja0J1dHRvbk5hdmlnYXRpb25JdGVtLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVj dG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX2JhY2tCdXR0b25D bGlja2VkLCB0aGlzKTsKICAgICAgICAgdGhpcy5fYmFja0J1dHRvbk5hdmlnYXRpb25JdGVtLmVu YWJsZWQgPSBmYWxzZTsKICAgICAgICAgdGhpcy5fbmF2aWdhdGlvbkJhci5hZGROYXZpZ2F0aW9u SXRlbSh0aGlzLl9iYWNrQnV0dG9uTmF2aWdhdGlvbkl0ZW0pOwogCi0gICAgICAgIHRoaXMuX2Zv cndhcmRCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdh dGlvbkl0ZW0oImZvcndhcmQiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkZvcndhcmQgKCVzKSIp LmZvcm1hdCh0aGlzLl9mb3J3YXJkS2V5Ym9hcmRTaG9ydGN1dC5kaXNwbGF5TmFtZSksICJJbWFn ZXMvRm9yd2FyZEFycm93LnN2ZyIsIDksIDkpOworICAgICAgICB0aGlzLl9mb3J3YXJkQnV0dG9u TmF2aWdhdGlvbkl0ZW0gPSBuZXcgV2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVtKCJm b3J3YXJkIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJGb3J3YXJkICglcykiKS5mb3JtYXQodGhp cy5fZm9yd2FyZEtleWJvYXJkU2hvcnRjdXQuZGlzcGxheU5hbWUpLCBmb3J3YXJkQXJyb3cuc3Jj LCBmb3J3YXJkQXJyb3cud2lkdGgsIGZvcndhcmRBcnJvdy5oZWlnaHQpOwogICAgICAgICB0aGlz Ll9mb3J3YXJkQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fZm9yd2FyZEJ1dHRv bkNsaWNrZWQsIHRoaXMpOwogICAgICAgICB0aGlzLl9mb3J3YXJkQnV0dG9uTmF2aWdhdGlvbkl0 ZW0uZW5hYmxlZCA9IGZhbHNlOwogICAgICAgICB0aGlzLl9uYXZpZ2F0aW9uQmFyLmFkZE5hdmln YXRpb25JdGVtKHRoaXMuX2ZvcndhcmRCdXR0b25OYXZpZ2F0aW9uSXRlbSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlT3V0bGlu ZS5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVl T3V0bGluZS5jc3MKaW5kZXggMzE5NGI1OS4uYzRjMWQ5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZU91dGxpbmUuY3NzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5l LmNzcwpAQCAtNDQsMTAgKzQ0LDE0IEBACiAgICAgbGVmdDogM3B4OwogICAgIHJpZ2h0OiAzcHg7 CiAKLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2JhKDU2LCAxMjEsIDIxNywgMC4xKTsKKyAgICBi YWNrZ3JvdW5kLWNvbG9yOiByZ2JhKDAsIDEyOCwgMjUyLCAwLjEpOwogICAgIGJvcmRlci1yYWRp dXM6IDVweDsKIH0KIAorYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kb20tdHJlZS1vdXRsaW5l IGxpLmhvdmVyZWQ6bm90KC5zZWxlY3RlZCkgLnNlbGVjdGlvbiB7CisgICAgYmFja2dyb3VuZC1j b2xvcjogcmdiYSg1NiwgMTIxLCAyMTcsIDAuMSk7Cit9CisKIC5kb20tdHJlZS1vdXRsaW5lIGxp IC5zZWxlY3Rpb24gewogICAgIGRpc3BsYXk6IG5vbmU7CiAgICAgcG9zaXRpb246IGFic29sdXRl OwpAQCAtNjUsMTAgKzY5LDE4IEBACiAuZG9tLXRyZWUtb3V0bGluZSBsaS5lbGVtZW50cy1kcmFn LW92ZXIgLnNlbGVjdGlvbiB7CiAgICAgZGlzcGxheTogYmxvY2s7CiAgICAgbWFyZ2luLXRvcDog LTJweDsKKyAgICBib3JkZXItdG9wOiAycHggc29saWQgcmdiKDAsIDEyOCwgMjUyKTsKK30KKwor Ym9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kb20tdHJlZS1vdXRsaW5lIGxpLmVsZW1lbnRzLWRy YWctb3ZlciAuc2VsZWN0aW9uIHsKICAgICBib3JkZXItdG9wOiAycHggc29saWQgcmdiKDU2LCAx MjEsIDIxNyk7CiB9CiAKIC5kb20tdHJlZS1vdXRsaW5lOmZvY3VzIGxpLnNlbGVjdGVkIC5zZWxl Y3Rpb24geworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigwLCAxMjgsIDI1Mik7Cit9CisKK2Jv ZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZG9tLXRyZWUtb3V0bGluZTpmb2N1cyBsaS5zZWxlY3Rl ZCAuc2VsZWN0aW9uIHsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoNTYsIDEyMSwgMjE3KTsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRGFzaGJvYXJkQ29udGFpbmVyVmlldy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9EYXNoYm9hcmRDb250YWluZXJWaWV3LmNzcwppbmRleCAyNjk4NmRh Li5mOTNhNjUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9EYXNoYm9hcmRDb250YWluZXJWaWV3LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXNoYm9hcmRDb250YWluZXJWaWV3LmNzcwpAQCAt MjgsOCArMjgsOSBAQAogCiAgICAgd2lkdGg6IDM3NXB4OwogCi0gICAgYm9yZGVyOiAxcHggc29s aWQgcmdiKDE2MywgMTYzLCAxNjMpOworICAgIGJvcmRlcjogMXB4IHNvbGlkIHJnYigyNTUsIDI1 NSwgMjU1KTsKICAgICBib3JkZXItcmFkaXVzOiA0cHg7CisgICAgYmFja2dyb3VuZC1jb2xvcjog cmdiKDI1NSwgMjU1LCAyNTUpOwogCiAgICAgYm94LXNoYWRvdzogcmdiYSgyNTUsIDI1NSwgMjU1 LCAwLjQ1KSAwIDFweCAwOwogCkBAIC0zNyw3ICszOCwxNyBAQAogICAgIG92ZXJmbG93OiBoaWRk ZW47CiB9CiAKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAudG9vbGJhciAuZGFzaGJvYXJkLWNv bnRhaW5lciB7CisgICAgYm9yZGVyLWNvbG9yOiByZ2IoMTYzLCAxNjMsIDE2Myk7CisgICAgYmFj a2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7Cit9CisKIGJvZHkud2luZG93LWluYWN0aXZlIC50 b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKKyAgICBib3JkZXItY29sb3I6IHJnYigyMjAs IDIyMCwgMjIwKTsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjQ2LCAyNDYsIDI0Nik7Cit9 CisKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeS53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLmRh c2hib2FyZC1jb250YWluZXIgewogICAgIGJvcmRlci1jb2xvcjogcmdiKDE5NiwgMTk2LCAxOTYp OwogICAgIGJhY2tncm91bmQtaW1hZ2U6IG5vbmU7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogcmdi KDIzOSwgMjM5LCAyMzkpOwpAQCAtNzgsMTYgKzg5LDI2IEBAIGJvZHkud2luZG93LWluYWN0aXZl IC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKICAgICBsZWZ0OiAwOwogICAgIHJpZ2h0 OiAwOwogCisgICAgcGFkZGluZzogMCA1cHg7CisKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2Io MjU1LCAyNTUsIDI1NSk7CisKKyAgICAtd2Via2l0LWFuaW1hdGlvbi1kdXJhdGlvbjogMC40czsK K30KKworYm9keS53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLmRhc2hib2FyZCB7CisgICAgYmFj a2dyb3VuZC1jb2xvcjogcmdiKDI0NiwgMjQ2LCAyNDYpOworfQorCitib2R5Lm1hYy1wbGF0Zm9y bS5sZWdhY3kgLnRvb2xiYXIgLmRhc2hib2FyZCwKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeS53 aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLmRhc2hib2FyZCB7CiAgICAgYmFja2dyb3VuZC1pbWFn ZTogbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgcmdiYSgwLCAxMjgsIDI1NSwgMCksIHJnYmEo MCwgMTI4LCAyNTUsIDAuMDc1KSksCiAgICAgICAgIGxpbmVhci1ncmFkaWVudCh0byByaWdodCwg cmdiYSgwLCAwLCAwLCAwLjA5KSwgdHJhbnNwYXJlbnQsIHJnYmEoMCwgMCwgMCwgMC4wOSkpLAog ICAgICAgICBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2IoMjQwLCAyNDQsIDI1MSksIHJn YigyNTAsIDI1MywgMjU1KSk7CiAgICAgYmFja2dyb3VuZC1zaXplOiAxMDAlIDZweCwgYXV0bywg YXV0bzsKICAgICBiYWNrZ3JvdW5kLXBvc2l0aW9uOiBib3R0b20sIGNlbnRlciwgY2VudGVyOwog ICAgIGJhY2tncm91bmQtcmVwZWF0OiBuby1yZXBlYXQ7Ci0KLSAgICBwYWRkaW5nOiAwIDVweDsK LQotICAgIC13ZWJraXQtYW5pbWF0aW9uLWR1cmF0aW9uOiAwLjRzOworICAgIGJhY2tncm91bmQt Y29sb3I6IHRyYW5zcGFyZW50OwogfQogCiAudG9vbGJhciAuZGFzaGJvYXJkLnZpc2libGUgewpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0 YUdyaWQuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0 YUdyaWQuY3NzCmluZGV4IDM5NTc3YzQuLjlhYzNkZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmNzcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5jc3MKQEAgLTc1LDIw ICs3NSwyNiBAQAogICAgIHRleHQtYWxpZ246IGxlZnQ7CiAgICAgdmVydGljYWwtYWxpZ246IG1p ZGRsZTsKIAorICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCByZ2IoMTc5LCAxNzksIDE3OSk7Cisg ICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHJnYigxODIsIDE4MiwgMTgyKTsKKworICAgIGhl aWdodDogMTVweDsKKyAgICBmb250LXdlaWdodDogbm9ybWFsOworICAgIHBhZGRpbmc6IDAgNHB4 OworICAgIHdoaXRlLXNwYWNlOiBub3dyYXA7CisgICAgb3ZlcmZsb3c6IGhpZGRlbjsKK30KKwor Ym9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kYXRhLWdyaWQgdGggewogICAgIGJhY2tncm91bmQt aW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHJnYmEoMCwgMCwgMCwgMC4yKSwgcmdi YSgwLCAwLCAwLCAwLjIpKSwgbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgdHJhbnNwYXJlbnQs IHRyYW5zcGFyZW50KSwKICAgICAgICAgbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgd2hpdGUs IHdoaXRlIDI1JSwgcmdiKDI0NCwgMjQ0LCAyNDQpIDUwJSwgcmdiKDIzNiwgMjM2LCAyMzYpIDUw JSwgcmdiKDIzNywgMjM3LCAyMzcpKTsKKwogICAgIGJhY2tncm91bmQtc2l6ZTogMXB4IDExcHgs IDAgMCwgMTAwJSAxMDAlOwogICAgIGJhY2tncm91bmQtcG9zaXRpb246IGxlZnQgMnB4LCByaWdo dCAycHgsIGNlbnRlcjsKICAgICBiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0OwogCiAgICAg Ym94LXNoYWRvdzogaW5zZXQgcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjMpIDAgLTFweCAwOwogICAg IGJvcmRlci1ib3R0b206IDFweCBzb2xpZCByZ2IoMTgyLCAxODIsIDE4Mik7Ci0KLSAgICBoZWln aHQ6IDE1cHg7Ci0gICAgZm9udC13ZWlnaHQ6IG5vcm1hbDsKLSAgICBwYWRkaW5nOiAwIDRweDsK LSAgICB3aGl0ZS1zcGFjZTogbm93cmFwOwotICAgIG92ZXJmbG93OiBoaWRkZW47CiB9CiAKIC5k YXRhLWdyaWQgdGg6Zmlyc3QtY2hpbGQgewpAQCAtMzEzLDE1ICszMTksMjMgQEAgYm9keS53aW5k b3ctaW5hY3RpdmUgLmRhdGEtZ3JpZCB0aC5zb3J0LWRlc2NlbmRpbmcgewogfQogCiAuZGF0YS1n cmlkIHRyLnNlbGVjdGVkIHsKLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjEyLCAyMTIsIDIx MikgIWltcG9ydGFudDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMTg1LCAxODQsIDE4NSkg IWltcG9ydGFudDsKICAgICBjb2xvcjogaW5oZXJpdCAhaW1wb3J0YW50OwogfQogCitib2R5Lm1h Yy1wbGF0Zm9ybS5sZWdhY3kgLmRhdGEtZ3JpZCB0ci5zZWxlY3RlZCB7CisgICAgYmFja2dyb3Vu ZC1jb2xvcjogcmdiKDIxMiwgMjEyLCAyMTIpICFpbXBvcnRhbnQ7Cit9CisKIC5kYXRhLWdyaWQ6 Zm9jdXMgdHIuc2VsZWN0ZWQgewotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYig1NiwgMTIxLCAy MTcpICFpbXBvcnRhbnQ7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDAsIDEyOCwgMjUyKSAh aW1wb3J0YW50OwogICAgIGNvbG9yOiB3aGl0ZSAhaW1wb3J0YW50OwogfQogCitib2R5Lm1hYy1w bGF0Zm9ybS5sZWdhY3kgLmRhdGEtZ3JpZDpmb2N1cyB0ci5zZWxlY3RlZCB7CisgICAgYmFja2dy b3VuZC1jb2xvcjogcmdiKDU2LCAxMjEsIDIxNykgIWltcG9ydGFudDsKK30KKwogLmRhdGEtZ3Jp ZCB0cjpub3QoLnBhcmVudCkgdGQuZGlzY2xvc3VyZSB7CiAgICAgdGV4dC1pbmRlbnQ6IDEwcHg7 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9EZXRhaWxzU2VjdGlvbi5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9EZXRhaWxzU2VjdGlvbi5jc3MKaW5kZXggMjNjNjAwNS4uNjQ2MzAyNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1Nl Y3Rpb24uY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0RldGFpbHNTZWN0aW9uLmNzcwpAQCAtMjQsMTAgKzI0LDMzIEBACiAgKi8KIAogLmRldGFpbHMt c2VjdGlvbiB7CisgICAgZm9udC1zaXplOiAxMHB4OworICAgIGJhY2tncm91bmQtY29sb3I6IHJn YigyNDIsIDI0MiwgMjQyKTsKKyAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgcmdiKDE1Mywg MTUzLCAxNTMpOworfQorCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMtc2VjdGlv biB7CiAgICAgbWFyZ2luLXRvcDogLTFweDsKICAgICBtYXJnaW4tYm90dG9tOiAtMXB4OwogCi0g ICAgZm9udC1zaXplOiAxMHB4OworICAgIGJvcmRlci1ib3R0b206IG5vbmU7CisgICAgYmFja2dy b3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7Cit9CisKKy5kZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMt c2VjdGlvbiB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDI1NSwgMjU1LCAyNTUpOworfQor Citib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0 aW9uIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsKK30KKworLmRldGFpbHMt c2VjdGlvbiAuZGV0YWlscy1zZWN0aW9uOmxhc3QtY2hpbGQgeworICAgIGJvcmRlci1ib3R0b206 IG5vbmU7Cit9CisKKy5kZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMtc2VjdGlvbjpmaXJzdC1jaGls ZCB7CisgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIHJnYigxNTMsIDE1MywgMTUzKTsKIH0KIAog LmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXIgewpAQCAtMzUsMTMgKzU4LDggQEAKICAgICB0b3A6 IC0xcHg7CiAgICAgaGVpZ2h0OiAyM3B4OwogCi0gICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIHJn YigxNTMsIDE1MywgMTUzKTsKLSAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgcmdiKDE1Mywg MTUzLCAxNTMpOwotICAgIGJveC1zaGFkb3c6IGluc2V0IHJnYmEoMjU1LCAyNTUsIDI1NSwgMC4y KSAwIDFweCAwOwotICAgIGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBib3R0 b20sIHJnYigyMzgsIDI0MCwgMjQ0KSwgcmdiKDIyNCwgMjI2LCAyMzApKTsKLQorICAgIGJhY2tn cm91bmQtY29sb3I6IHJnYigyNDIsIDI0MiwgMjQyKTsKICAgICBjb2xvcjogcmdiKDU3LCA1Nywg NTcpOwotICAgIHRleHQtc2hhZG93OiByZ2JhKDI1NSwgMjU1LCAyNTUsIDAuNSkgMCAxcHggMDsK IAogICAgIHdoaXRlLXNwYWNlOiBub3dyYXA7CiAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKQEAgLTU2 LDEzICs3NCw0NSBAQAogICAgIHotaW5kZXg6IDIwMDsKIH0KIAotLmRldGFpbHMtc2VjdGlvbiAu ZGV0YWlscy1zZWN0aW9uID4gLmhlYWRlciB7Ci0gICAgYmFja2dyb3VuZC1pbWFnZTogbGluZWFy LWdyYWRpZW50KHRvIGJvdHRvbSwgcmdiKDI1MCwgMjUwLCAyNTApLCByZ2IoMjQwLCAyNDAsIDI0 MCkpOworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kZXRhaWxzLXNlY3Rpb24gPiAuaGVhZGVy IHsKKyAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgcmdiKDE1MywgMTUzLCAxNTMpOworICAg IGJveC1zaGFkb3c6IGluc2V0IHJnYmEoMjU1LCAyNTUsIDI1NSwgMC4yKSAwIDFweCAwOworICAg IGJhY2tncm91bmQtY29sb3I6IHRyYW5zcGFyZW50OworICAgIGJhY2tncm91bmQtaW1hZ2U6IGxp bmVhci1ncmFkaWVudCh0byBib3R0b20sIHJnYigyMzgsIDI0MCwgMjQ0KSwgcmdiKDIyNCwgMjI2 LCAyMzApKTsKIAorICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCByZ2IoMTUzLCAxNTMsIDE1Myk7 CisKKyAgICB0ZXh0LXNoYWRvdzogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjUpIDAgMXB4IDA7Cit9 CisKKy5kZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXIgewogICAgIHRv cDogMjFweDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjU1LCAyNTUsIDI1NSk7CisKKyAg ICBib3gtc2hhZG93OiByZ2JhKDAsIDAsIDAsIDAuMSkgMCAxcHggMDsKIAogICAgIC8qIEVuc3Vy ZSB0aGVzZSBoZWFkZXJzIGFyZSBkaXNwbGF5ZWQgYmVsb3cgdGhlIHBhcmVudCBoZWFkZXIgYnV0 IGFib3ZlIHNjcm9sbGJhcnMuICovCiAgICAgei1pbmRleDogMTAwOworCit9CisKK2JvZHkubWFj LXBsYXRmb3JtLm1hdmVyaWNrcyAuZGV0YWlscy1zZWN0aW9uIC5kZXRhaWxzLXNlY3Rpb24gPiAu aGVhZGVyLAorYm9keS5tYWMtcGxhdGZvcm0ubW91bnRhaW4tbGlvbiAuZGV0YWlscy1zZWN0aW9u IC5kZXRhaWxzLXNlY3Rpb24gPiAuaGVhZGVyIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFu c3BhcmVudDsKKyAgICBiYWNrZ3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9t LCByZ2IoMjUwLCAyNTAsIDI1MCksIHJnYigyNDAsIDI0MCwgMjQwKSk7CisgICAgYm94LXNoYWRv dzogbm9uZTsKK30KKworLmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0aW9uLmNvbGxhc3Bz ZWQgPiAuaGVhZGVyIHsKKyAgICBib3gtc2hhZG93OiBub25lOworfQorCisuZGV0YWlscy1zZWN0 aW9uLmNvbXB1dGVkLXN0eWxlLXByb3BlcnRpZXM6bm90KC5jb2xsYXBzZWQpID4gLmhlYWRlciB7 CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDI1NSwgMjU1LCAyNTUpOworfQorCitib2R5Lm1h Yy1wbGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMtc2VjdGlvbi5jb21wdXRlZC1zdHlsZS1wcm9wZXJ0 aWVzOm5vdCguY29sbGFwc2VkKSA+IC5oZWFkZXIgeworICAgIGJhY2tncm91bmQtY29sb3I6IHRy YW5zcGFyZW50OwogfQogCiAuZGV0YWlscy1zZWN0aW9uID4gLmhlYWRlcjo6YmVmb3JlIHsKQEAg LTEzMyw5ICsxODMsMjIgQEAKIAogLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3Vw IHsKICAgICBkaXNwbGF5OiB0YWJsZS1yb3ctZ3JvdXA7CisgICAgYm9yZGVyLWJvdHRvbTogMXB4 IHNvbGlkIHJnYigxNTMsIDE1MywgMTUzKTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5 IC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cCB7CisgICAgYm9yZGVyLWJvdHRv bTogbm9uZTsKK30KKworLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwOmxhc3Qt Y2hpbGQgeworICAgIGJvcmRlci1ib3R0b206IG5vbmU7CiB9CiAKIC5kZXRhaWxzLXNlY3Rpb24g PiAuY29udGVudCA+IC5ncm91cDpudGgtY2hpbGQoZXZlbikgeworICAgIGJhY2tncm91bmQtY29s b3I6IHJnYigyMzMsIDIzMywgMjMzKTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5k ZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDpudGgtY2hpbGQoZXZlbikgewogICAg IGJhY2tncm91bmQtY29sb3I6IHJnYigyMjIsIDIyMiwgMjIyKTsKIH0KIApAQCAtMTQ0LDEwICsy MDcsMTAgQEAKICAgICBib3JkZXItdG9wOiAxcHggc29saWQgcmdiKDE1MywgMTUzLCAxNTMpOwog fQogCi0uZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bnRoLWNoaWxkKGV2ZW4p ID4gLnJvdzpub3QoLnNpbXBsZSk6bGFzdC1jaGlsZCwKLS5kZXRhaWxzLXNlY3Rpb24gPiAuY29u dGVudCA+IC5ncm91cDpsYXN0LWNoaWxkID4gLnJvdzpub3QoLnNpbXBsZSk6bGFzdC1jaGlsZCwK LS5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDpudGgtY2hpbGQoZXZlbikgPiAu cm93LnNpbXBsZTpsYXN0LWNoaWxkID4gKiwKLS5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+ IC5ncm91cDpsYXN0LWNoaWxkID4gLnJvdy5zaW1wbGU6bGFzdC1jaGlsZCA+ICogeworYm9keS5t YWMtcGxhdGZvcm0ubGVnYWN5IC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDpu dGgtY2hpbGQoZXZlbikgPiAucm93Om5vdCguc2ltcGxlKTpsYXN0LWNoaWxkLAorYm9keS5tYWMt cGxhdGZvcm0ubGVnYWN5IC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDpsYXN0 LWNoaWxkID4gLnJvdzpub3QoLnNpbXBsZSk6bGFzdC1jaGlsZCwKK2JvZHkubWFjLXBsYXRmb3Jt LmxlZ2FjeSAuZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bnRoLWNoaWxkKGV2 ZW4pID4gLnJvdy5zaW1wbGU6bGFzdC1jaGlsZCA+ICosCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdh Y3kgLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwOmxhc3QtY2hpbGQgPiAucm93 LnNpbXBsZTpsYXN0LWNoaWxkID4gKiB7CiAgICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHJn YigxNTMsIDE1MywgMTUzKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvRmlsdGVyQmFyLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZpbHRlckJhci5jc3MKaW5kZXggZDg5ZjI2OC4uYWI2MWNl OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RmlsdGVyQmFyLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9GaWx0ZXJCYXIuY3NzCkBAIC00Myw3ICs0Myw3IEBACiAgICAgLXdlYmtpdC1hcHBlYXJh bmNlOiBub25lOwogCiAgICAgYm9yZGVyOiAxcHggc29saWQgcmdiYSgwLCAwLCAwLCAwLjM1KTsK LSAgICBib3JkZXItcmFkaXVzOiAxMHB4OworICAgIGJvcmRlci1yYWRpdXM6IDNweDsKICAgICBi YWNrZ3JvdW5kLWNvbG9yOiByZ2JhKDI1NSwgMjU1LCAyNTUsIDAuMik7CiAgICAgYm94LXNoYWRv dzogaW5zZXQgcmdiYSgwLCAwLCAwLCAwLjEpIDAgMXB4IDA7CiAgICAgYmFja2dyb3VuZC1jbGlw OiBwYWRkaW5nLWJveDsKQEAgLTUzLDYgKzUzLDEwIEBACiAgICAgdHJhbnNpdGlvbjogYmFja2dy b3VuZC1jb2xvciAyMDBtcyBlYXNlLWluLW91dDsKIH0KIAorYm9keS5tYWMtcGxhdGZvcm0ubGVn YWN5IC5maWx0ZXItYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0geworICAgIGJvcmRlci1yYWRp dXM6IDEwcHg7Cit9CisKIC5maWx0ZXItYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06Oi13ZWJr aXQtaW5wdXQtcGxhY2Vob2xkZXIgewogICAgIGNvbG9yOiByZ2JhKDAsIDAsIDAsIDAuMzUpOwog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RmluZEJhbm5lci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0ZpbmRCYW5uZXIuanMKaW5kZXggZDY3NmFiYS4uZjE2NjU5MCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmpzCkBA IC0zMjYsOCArMzI2LDE4IEBAIFdlYkluc3BlY3Rvci5GaW5kQmFubmVyLnByb3RvdHlwZSA9IHsK ICAgICAgICAgc3BlY2lmaWNhdGlvbnNbIm5vcm1hbCJdID0ge2ZpbGxDb2xvcjogWzgxLCA4MSwg ODFdfTsKICAgICAgICAgc3BlY2lmaWNhdGlvbnNbIm5vcm1hbC1hY3RpdmUiXSA9IHtmaWxsQ29s b3I6IFszNywgMzcsIDM3XX07CiAKLSAgICAgICAgZ2VuZXJhdGVDb2xvcmVkSW1hZ2VzRm9yQ1NT KCJJbWFnZXMvQmFja0Fycm93LnN2ZyIsIHNwZWNpZmljYXRpb25zLCA3LCA3LCAiZmluZC1iYW5u ZXItcHJldmlvdXMtYXJyb3ctIik7Ci0gICAgICAgIGdlbmVyYXRlQ29sb3JlZEltYWdlc0ZvckNT UygiSW1hZ2VzL0ZvcndhcmRBcnJvdy5zdmciLCBzcGVjaWZpY2F0aW9ucywgNywgNywgImZpbmQt YmFubmVyLW5leHQtYXJyb3ctIik7CisgICAgICAgIHZhciBmb3J3YXJkQXJyb3csIGJhY2tBcnJv dzsKKyAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5QbGF0Zm9ybS5uYW1lID09PSAibWFjIiAmJiBX ZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5yZWxlYXNlIDwgMTApIHsKKyAgICAgICAgICAg IGZvcndhcmRBcnJvdyA9ICJJbWFnZXMvRm9yd2FyZEFycm93TGVnYWN5LnN2ZyI7CisgICAgICAg ICAgICBiYWNrQXJyb3cgPSAiSW1hZ2VzL0JhY2tBcnJvd0xlZ2FjeS5zdmciOworICAgICAgICB9 CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAgZm9yd2FyZEFycm93ID0gIkltYWdlcy9Gb3J3 YXJkQXJyb3cuc3ZnIjsKKyAgICAgICAgICAgIGJhY2tBcnJvdyA9ICJJbWFnZXMvQmFja0Fycm93 LnN2ZyI7CisgICAgICAgIH0KKworICAgICAgICBnZW5lcmF0ZUNvbG9yZWRJbWFnZXNGb3JDU1Mo YmFja0Fycm93LCBzcGVjaWZpY2F0aW9ucywgNywgNywgImZpbmQtYmFubmVyLXByZXZpb3VzLWFy cm93LSIpOworICAgICAgICBnZW5lcmF0ZUNvbG9yZWRJbWFnZXNGb3JDU1MoZm9yd2FyZEFycm93 LCBzcGVjaWZpY2F0aW9ucywgNywgNywgImZpbmQtYmFubmVyLW5leHQtYXJyb3ctIik7CiAgICAg fQogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmNzcwppbmRleCA3YWNl MjFhLi45MTZhNDBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmNzcwpA QCAtMjEzLDE5ICsyMTMsMzQgQEAKIC5uYXZpZ2F0aW9uLXNpZGViYXItcGFuZWwtY29udGVudC10 cmVlLW91dGxpbmUgLml0ZW0uc2VsZWN0ZWQgewogICAgIGNvbG9yOiB3aGl0ZTsKIAorICAgIGJh Y2tncm91bmQtY29sb3I6IHJnYigxODUsIDE4NCwgMTg1KTsKK30KKworYm9keS5tYWMtcGxhdGZv cm0ubGVnYWN5IC5uYXZpZ2F0aW9uLXNpZGViYXItcGFuZWwtY29udGVudC10cmVlLW91dGxpbmUg Lml0ZW0uc2VsZWN0ZWQgewogICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCByZ2IoMTYyLCAxNzcs IDIwMSk7CiAKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsKICAgICBiYWNrZ3Jv dW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2IoMTc1LCAxOTAsIDIxMyks IHJnYigxMzAsIDE1MSwgMTgyKSk7CiAgICAgYmFja2dyb3VuZC1vcmlnaW46IHBhZGRpbmc7CiAg ICAgYmFja2dyb3VuZC1jbGlwOiBwYWRkaW5nOwogfQogCiAubmF2aWdhdGlvbi1zaWRlYmFyLXBh bmVsLWNvbnRlbnQtdHJlZS1vdXRsaW5lOmZvY3VzIC5pdGVtLnNlbGVjdGVkIHsKKyAgICBiYWNr Z3JvdW5kLWNvbG9yOiByZ2IoMCwgMTI4LCAyNTIpOworfQorCitib2R5Lm1hYy1wbGF0Zm9ybS5s ZWdhY3kgLm5hdmlnYXRpb24tc2lkZWJhci1wYW5lbC1jb250ZW50LXRyZWUtb3V0bGluZTpmb2N1 cyAuaXRlbS5zZWxlY3RlZCB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7CiAg ICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIHJnYigxNDgsIDE3NCwgMTkzKTsKICAgICBiYWNrZ3Jv dW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2IoMTU0LCAxODAsIDIwMyks IHJnYigxMTIsIDEzOSwgMTc2KSk7CiB9CiAKIGJvZHkud2luZG93LWluYWN0aXZlIC5uYXZpZ2F0 aW9uLXNpZGViYXItcGFuZWwtY29udGVudC10cmVlLW91dGxpbmUgLml0ZW0uc2VsZWN0ZWQgewor ICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyMTIsIDIxMiwgMjEyKTsKK30KKworYm9keS5tYWMt cGxhdGZvcm0ubGVnYWN5LndpbmRvdy1pbmFjdGl2ZSAubmF2aWdhdGlvbi1zaWRlYmFyLXBhbmVs LWNvbnRlbnQtdHJlZS1vdXRsaW5lIC5pdGVtLnNlbGVjdGVkIHsKKyAgICBiYWNrZ3JvdW5kLWNv bG9yOiB0cmFuc3BhcmVudDsKICAgICBib3JkZXItdG9wOiAxcHggc29saWQgcmdiKDE2OCwgMTY4 LCAxNjgpOwogICAgIGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20s IHJnYigxOTQsIDE5NCwgMTk0KSwgcmdiKDE1OCwgMTU4LCAxNTgpKTsKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JhZGlvQnV0dG9uTmF2 aWdhdGlvbkl0ZW0uY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvUmFkaW9CdXR0b25OYXZpZ2F0aW9uSXRlbS5jc3MKaW5kZXggNTFlMDRmNC4uMjIxOTk5MCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmFk aW9CdXR0b25OYXZpZ2F0aW9uSXRlbS5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvUmFkaW9CdXR0b25OYXZpZ2F0aW9uSXRlbS5jc3MKQEAgLTMyLDEx ICszMiwxNiBAQAogfQogCiAubmF2aWdhdGlvbi1iYXIgLml0ZW0ucmFkaW8uYnV0dG9uLnRleHQt b25seS5zZWxlY3RlZCB7CisgICAgY29sb3I6IHJnYig1MiwgMTQxLCAyMjApOworICAgIGZvbnQt d2VpZ2h0OiBib2xkOworfQorCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLm5hdmlnYXRpb24t YmFyIC5pdGVtLnJhZGlvLmJ1dHRvbi50ZXh0LW9ubHkuc2VsZWN0ZWQgeworICAgIGNvbG9yOiBy Z2IoMCwgMCwgMCk7CisKICAgICBiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0OwogICAgIGJh Y2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHJnYmEoMCwgMCwgMCwg MC4xNSksIHJnYmEoMCwgMCwgMCwgMC4wOSkgMTIlLCByZ2JhKDAsIDAsIDAsIDAuMDYpIDEyJSwg dHJhbnNwYXJlbnQpLCBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2JhKDAsIDAsIDAsIDAu NDUpLCB0cmFuc3BhcmVudCksCiAgICAgICAgIGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHJn YmEoMCwgMCwgMCwgMC40NSksIHRyYW5zcGFyZW50KTsKICAgICBiYWNrZ3JvdW5kLXNpemU6IDEw MCUgMTAwJSwgMXB4IDEwMCUsIDFweCAxMDAlOwogICAgIGJhY2tncm91bmQtcG9zaXRpb246IGxl ZnQgdG9wLCBsZWZ0IHRvcCwgcmlnaHQgdG9wOwotCi0gICAgZm9udC13ZWlnaHQ6IGJvbGQ7CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9S dWxlc1N0eWxlRGV0YWlsc1BhbmVsLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1J1bGVzU3R5bGVEZXRhaWxzUGFuZWwuY3NzCmluZGV4IDgxMWIwNTMuLjIy MDY1NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1J1bGVzU3R5bGVEZXRhaWxzUGFuZWwuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1J1bGVzU3R5bGVEZXRhaWxzUGFuZWwuY3NzCkBAIC0zNiw2 ICszNiwxMSBAQAogCiAuc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSAucnVsZXMg LmxhYmVsICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24gewogICAgIG1hcmdpbi10b3A6IDVw eDsKKyAgICBib3JkZXItdG9wOiAxcHggc29saWQgcmdiKDIxMCwgMjEwLCAyMTApOworfQorCiti b2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5 bGUgLnJ1bGVzIC5sYWJlbCArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uIHsKKyAgICBib3Jk ZXItdG9wOiBub25lOwogfQogCiAuc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSAu cnVsZXMgLm5ldy1ydWxlIHsKQEAgLTQzLDcgKzQ4LDYgQEAKICAgICBmb250LXdlaWdodDogYm9s ZDsKIAogICAgIGNvbG9yOiBibGFjazsKLSAgICB0ZXh0LXNoYWRvdzogd2hpdGUgMCAxcHggMDsK IAogICAgIHBhZGRpbmc6IDVweCAxMHB4OwogCkBAIC01Myw2ICs1NywxOSBAQAogICAgIG9wYWNp dHk6IDAuNTsKIH0KIAorYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zaWRlYmFyID4gLnBhbmVs LmRldGFpbHMuY3NzLXN0eWxlIC5ydWxlcyAubmV3LXJ1bGUgeworICAgIHRleHQtc2hhZG93OiB3 aGl0ZSAwIDFweCAwOworICAgIGJvcmRlci1ib3R0b206IG5vbmU7Cit9CisKKy5zaWRlYmFyID4g LnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlIC5ydWxlcyAubmV3LXJ1bGUgKyAuc3R5bGUtZGVjbGFy YXRpb24tc2VjdGlvbiB7CisgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIHJnYigyMTAsIDIxMCwg MjEwKTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zaWRlYmFyID4gLnBhbmVsLmRl dGFpbHMuY3NzLXN0eWxlIC5ydWxlcyAubmV3LXJ1bGUgKyAuc3R5bGUtZGVjbGFyYXRpb24tc2Vj dGlvbiB7CisgICAgYm9yZGVyLXRvcDogbm9uZTsKK30KKwogLnNpZGViYXIgPiAucGFuZWwuZGV0 YWlscy5jc3Mtc3R5bGUgLnJ1bGVzIC5uZXctcnVsZSBpbWcgewogICAgIGNvbnRlbnQ6IHVybCgu Li9JbWFnZXMvUGx1cy5zdmcpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9TY29wZUJhci5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9TY29wZUJhci5jc3MKaW5kZXggYTE3ODlkNi4uM2M3MDU0NyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2Nv cGVCYXIuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1Njb3BlQmFyLmNzcwpAQCAtMzMsNyArMzMsNiBAQAogICAgIG1hcmdpbjogMCAycHg7CiAgICAg cGFkZGluZzogMCA4cHggM3B4OwogICAgIGZvbnQtc2l6ZTogMTFweDsKLSAgICBmb250LXdlaWdo dDogYm9sZDsKICAgICBsaW5lLWhlaWdodDogMTFweDsKICAgICBjb2xvcjogcmdiKDQ2LCA0Niwg NDYpOwogICAgIGJhY2tncm91bmQtY29sb3I6IHRyYW5zcGFyZW50OwpAQCAtNDUsNiArNDQsMTAg QEAKICAgICB0cmFuc2l0aW9uLXByb3BlcnR5OiBiYWNrZ3JvdW5kLWNvbG9yLCBib3JkZXItY29s b3I7CiB9CiAKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc2NvcGUtYmFyID4gbGkgeworICAg IGZvbnQtd2VpZ2h0OiBib2xkOworfQorCiAuc2NvcGUtYmFyID4gbGkuc2VsZWN0ZWQsCiAuc2Nv cGUtYmFyID4gbGk6YWN0aXZlIHsKICAgICB0cmFuc2l0aW9uLWR1cmF0aW9uOiA3NW1zOwpAQCAt NTUsNiArNTgsMTMgQEAKIH0KIAogLnNjb3BlLWJhciA+IGxpLnNlbGVjdGVkIHsKKyAgICBjb2xv cjogcmdiKDUyLCAxNDEsIDIyMCk7CisgICAgYm9yZGVyLWNvbG9yOiByZ2JhKDUyLCAxNDEsIDIy MCwgMSk7CisgICAgZm9udC13ZWlnaHQ6IGJvbGQ7Cit9CisKK2JvZHkubWFjLXBsYXRmb3JtLmxl Z2FjeSAuc2NvcGUtYmFyID4gbGkuc2VsZWN0ZWQgeworICAgIGNvbG9yOiBpbmhlcml0OwogICAg IGJhY2tncm91bmQtY29sb3I6IHJnYmEoMCwgMCwgMCwgMC4wNik7CiAgICAgYm9yZGVyLWNvbG9y OiByZ2JhKDAsIDAsIDAsIDAuMzApOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNoQmFyLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NlYXJjaEJhci5jc3MKaW5kZXggNzI3NWU0Yy4uMTYw NWVlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU2VhcmNoQmFyLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9TZWFyY2hCYXIuY3NzCkBAIC0zMSw3ICszMSw3IEBACiAgICAgLXdlYmtpdC1hcHBl YXJhbmNlOiBub25lOwogCiAgICAgYm9yZGVyOiAxcHggc29saWQgcmdiYSgwLCAwLCAwLCAwLjM1 KTsKLSAgICBib3JkZXItcmFkaXVzOiAxMHB4OworICAgIGJvcmRlci1yYWRpdXM6IDNweDsKICAg ICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2JhKDI1NSwgMjU1LCAyNTUsIDAuMik7CiAgICAgYm94LXNo YWRvdzogaW5zZXQgcmdiYSgwLCAwLCAwLCAwLjEpIDAgMXB4IDA7CiAgICAgYmFja2dyb3VuZC1j bGlwOiBwYWRkaW5nLWJveDsKQEAgLTQxLDYgKzQxLDEwIEBACiAgICAgdHJhbnNpdGlvbjogYmFj a2dyb3VuZC1jb2xvciAyMDBtcyBlYXNlLWluLW91dDsKIH0KIAorYm9keS5tYWMtcGxhdGZvcm0u bGVnYWN5IC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0geworICAgIGJvcmRlci1y YWRpdXM6IDEwcHg7Cit9CisKIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06Oi13 ZWJraXQtaW5wdXQtcGxhY2Vob2xkZXIgewogICAgIGNvbG9yOiByZ2JhKDAsIDAsIDAsIDAuMzUp OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU2lkZWJhci5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9TaWRlYmFyLmNzcwppbmRleCAzYTFmNzUyLi44NTZmYTNhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TaWRlYmFyLmNzcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TaWRlYmFyLmNzcwpAQCAtMjYs NiArMjYsMTAgQEAKIC5zaWRlYmFyIHsKICAgICBwb3NpdGlvbjogcmVsYXRpdmU7CiAKKyAgICBi YWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjQyLCAyNDIsIDI0Mik7Cit9CisKK2JvZHkubWFjLXBsYXRm b3JtLmxlZ2FjeSAuc2lkZWJhciB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDIyNywgMjMx LCAyMzUpOwogfQogCkBAIC0zNCw3ICszOCw3IEBACiAgICAgYm9yZGVyOiBub25lICFpbXBvcnRh bnQ7CiB9CiAKLWJvZHkud2luZG93LWluYWN0aXZlIC5zaWRlYmFyIHsKK2JvZHkubWFjLXBsYXRm b3JtLmxlZ2FjeS53aW5kb3ctaW5hY3RpdmUgLnNpZGViYXIgewogICAgIGJhY2tncm91bmQtY29s b3I6IHJnYigyMzEsIDIzMSwgMjMxKTsKIH0KIApAQCAtODgsNiArOTIsOSBAQCBib2R5LndpbmRv dy1pbmFjdGl2ZSAuc2lkZWJhciB7CiB9CiAKIC5zaWRlYmFyLnJpZ2h0IHsKLSAgICBiYWNrZ3Jv dW5kLWNvbG9yOiByZ2IoMjMxLCAyMzEsIDIzMSk7CiAgICAgYm9yZGVyLWxlZnQ6IDFweCBzb2xp ZCByZ2IoMTUzLCAxNTMsIDE1Myk7CiB9CisKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc2lk ZWJhci5yaWdodCB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDIzMSwgMjMxLCAyMzEpOwor fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv VGltZWxpbmVTaWRlYmFyUGFuZWwuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVGltZWxpbmVTaWRlYmFyUGFuZWwuY3NzCmluZGV4IGU4Yjc4MGYuLmMzYmM1 NDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RpbWVsaW5lU2lkZWJhclBhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5jc3MKQEAgLTk1LDEwICs5NSw4 IEBACiAgICAgaGVpZ2h0OiAyMnB4OwogCiAgICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHJn YigxNzksIDE3OSwgMTc5KTsKLSAgICBiYWNrZ3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQo dG8gYm90dG9tLCByZ2IoMjM4LCAyNDAsIDI0NCksIHJnYigyMjQsIDIyNiwgMjMwKSk7Ci0KKyAg ICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjQyLCAyNDIsIDI0Mik7CiAgICAgY29sb3I6IHJnYig1 NywgNTcsIDU3KTsKLSAgICB0ZXh0LXNoYWRvdzogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjUpIDAg MXB4IDA7CiAKICAgICB3aGl0ZS1zcGFjZTogbm93cmFwOwogICAgIG92ZXJmbG93OiBoaWRkZW47 CkBAIC0xMTIsNiArMTEwLDEyIEBACiAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKIH0KIAorYm9keS5t YWMtcGxhdGZvcm0ubGVnYWN5IC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24udGltZWxpbmUg PiAudGl0bGUtYmFyIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsKKyAgICBi YWNrZ3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2IoMjM4LCAyNDAs IDI0NCksIHJnYigyMjQsIDIyNiwgMjMwKSk7CisgICAgdGV4dC1zaGFkb3c6IHJnYmEoMjU1LCAy NTUsIDI1NSwgMC41KSAwIDFweCAwOworfQorCiAuc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9u LnRpbWVsaW5lID4gLnRpdGxlLWJhci50aW1lbGluZXMgewogICAgIHRvcDogMjJweDsKIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qL1dl Ykluc3BlY3RvclVJLnZjeHByb2ogYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvV2ViSW5zcGVjdG9y VUkudmN4cHJvai9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qCmluZGV4IDU1YjliOWUuLjhjMTIzZjIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9XZWJJbnNwZWN0b3JVSS52Y3hwcm9q L1dlYkluc3BlY3RvclVJLnZjeHByb2oKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1dlYklu c3BlY3RvclVJLnZjeHByb2ovV2ViSW5zcGVjdG9yVUkudmN4cHJvagpAQCAtNDI3LDYgKzQyNyw3 IEBACiAgICAgPE5vbmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNcQXBwbGljYXRp b25DYWNoZU1hbmlmZXN0JTQwMngucG5nIiAvPgogICAgIDxOb25lIEluY2x1ZGU9Ii4uXFVzZXJJ bnRlcmZhY2VcSW1hZ2VzXEFwcGxpY2F0aW9uQ2FjaGVNYW5pZmVzdC5wbmciIC8+CiAgICAgPE5v bmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNcQmFja0Fycm93LnN2ZyIgLz4KKyAg ICA8Tm9uZSBJbmNsdWRlPSIuLlxVc2VySW50ZXJmYWNlXEltYWdlc1xCYWNrQXJyb3dMZWdhY3ku c3ZnIiAvPgogICAgIDxOb25lIEluY2x1ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEJvdHRv bVVwVHJlZS5zdmciIC8+CiAgICAgPE5vbmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFn ZXNcQnJlYWtwb2ludCU0MDJ4LnBuZyIgLz4KICAgICA8Tm9uZSBJbmNsdWRlPSIuLlxVc2VySW50 ZXJmYWNlXEltYWdlc1xCcmVha3BvaW50LnBuZyIgLz4KQEAgLTQ4Niw2ICs0ODcsNyBAQAogICAg IDxOb25lIEluY2x1ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEZvbGRlckdlbmVyaWMlNDAy eC5wbmciIC8+CiAgICAgPE5vbmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNcRm9s ZGVyR2VuZXJpYy5wbmciIC8+CiAgICAgPE5vbmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJ bWFnZXNcRm9yd2FyZEFycm93LnN2ZyIgLz4KKyAgICA8Tm9uZSBJbmNsdWRlPSIuLlxVc2VySW50 ZXJmYWNlXEltYWdlc1xGb3J3YXJkQXJyb3dMZWdhY3kuc3ZnIiAvPgogICAgIDxOb25lIEluY2x1 ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEZ1bmN0aW9uLnN2ZyIgLz4KICAgICA8Tm9uZSBJ bmNsdWRlPSIuLlxVc2VySW50ZXJmYWNlXEltYWdlc1xHb1RvQXJyb3cuc3ZnIiAvPgogICAgIDxO b25lIEluY2x1ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEhpZXJhcmNoaWNhbE5hdmlnYXRp b25JdGVtQ2hldnJvbi5zdmciIC8+CkBAIC03ODQsNCArNzg2LDQgQEAKICAgPEltcG9ydCBQcm9q ZWN0PSIkKFZDVGFyZ2V0c1BhdGgpXE1pY3Jvc29mdC5DcHAudGFyZ2V0cyIgLz4KICAgPEltcG9y dEdyb3VwIExhYmVsPSJFeHRlbnNpb25UYXJnZXRzIj4KICAgPC9JbXBvcnRHcm91cD4KLTwvUHJv amVjdD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCis8L1Byb2plY3Q+CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvV2ViSW5zcGVjdG9yVUkudmN4cHJvai9XZWJJbnNwZWN0 b3JVSS52Y3hwcm9qLmZpbHRlcnMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvV2ViSW5zcGVjdG9y VUkudmN4cHJvai9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qLmZpbHRlcnMKaW5kZXggNDkyZmQ1Yy4u MWVjYjdmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1dlYkluc3BlY3RvclVJ LnZjeHByb2ovV2ViSW5zcGVjdG9yVUkudmN4cHJvai5maWx0ZXJzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qL1dlYkluc3BlY3RvclVJLnZjeHByb2ou ZmlsdGVycwpAQCAtMSw0ICsxLDQgQEAKLe+7vzw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9 InV0Zi04Ij8+Cis8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJ1dGYtOCI/PgogPFByb2pl Y3QgVG9vbHNWZXJzaW9uPSI0LjAiIHhtbG5zPSJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29t L2RldmVsb3Blci9tc2J1aWxkLzIwMDMiPgogICA8SXRlbUdyb3VwPgogICAgIDxGaWx0ZXIgSW5j bHVkZT0iUmVzb3VyY2UgRmlsZXMiPgpAQCAtMTExOSw2ICsxMTE5LDkgQEAKICAgICA8Tm9uZSBJ bmNsdWRlPSIuLlxVc2VySW50ZXJmYWNlXEltYWdlc1xCYWNrQXJyb3cuc3ZnIj4KICAgICAgIDxG aWx0ZXI+SW1hZ2VzPC9GaWx0ZXI+CiAgICAgPC9Ob25lPgorICAgIDxOb25lIEluY2x1ZGU9Ii4u XFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEJhY2tBcnJvd0xlZ2FjeS5zdmciPgorICAgICAgPEZpbHRl cj5JbWFnZXM8L0ZpbHRlcj4KKyAgICA8L05vbmU+CiAgICAgPE5vbmUgSW5jbHVkZT0iLi5cVXNl ckludGVyZmFjZVxJbWFnZXNcQm90dG9tVXBUcmVlLnN2ZyI+CiAgICAgICA8RmlsdGVyPkltYWdl czwvRmlsdGVyPgogICAgIDwvTm9uZT4KQEAgLTEyOTYsNiArMTI5OSw5IEBACiAgICAgPE5vbmUg SW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNcRm9yd2FyZEFycm93LnN2ZyI+CiAgICAg ICA8RmlsdGVyPkltYWdlczwvRmlsdGVyPgogICAgIDwvTm9uZT4KKyAgICA8Tm9uZSBJbmNsdWRl PSIuLlxVc2VySW50ZXJmYWNlXEltYWdlc1xGb3J3YXJkQXJyb3dMZWdhY3kuc3ZnIj4KKyAgICAg IDxGaWx0ZXI+SW1hZ2VzPC9GaWx0ZXI+CisgICAgPC9Ob25lPgogICAgIDxOb25lIEluY2x1ZGU9 Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEZ1bmN0aW9uLnN2ZyI+CiAgICAgICA8RmlsdGVyPklt YWdlczwvRmlsdGVyPgogICAgIDwvTm9uZT4KQEAgLTE3MjIsNCArMTcyOCw0IEBACiAgICAgPE5v bmUgSW5jbHVkZT0iV2ViSW5zcGVjdG9yVUkubWFrZSIgLz4KICAgICA8Tm9uZSBJbmNsdWRlPSJi dWlsZC13ZWJpbnNwZWN0b3J1aS5wbCIgLz4KICAgPC9JdGVtR3JvdXA+Ci08L1Byb2plY3Q+Clwg Tm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorPC9Qcm9qZWN0Pgo= 234959 2014-07-15 15:32:39 -0700 2014-07-15 17:05:06 -0700 [PATCH] Styles update v3, reviewed. ui.diff text/plain 56598 jonowells ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGI0ZjljNzUuLjk2MzhmODMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0MyBAQAorMjAxNC0wNy0xNSAgSm9uYXRoYW4gV2Vs bHMgIDxqb25vd2VsbHNAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IE1vZGVy bml6ZSBVSSBzdHlsZXMgYW5kIGJldHRlciBzeW5jIHdpdGggcGxhdGZvcm0gc3R5bGVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQ4NDYKKworICAg ICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCisKKyAgICAgICAgVXBkYXRlZCBzdHls ZXMgdG8gYmV0dGVyIG1hdGNoIHRoZSBPUyBVSSBkZXNpZ24uIFVwZGF0ZWQgdGhlIGZvcndhcmQv YmFjayBidXR0b24uIAorICAgICAgICBNb3ZlZCBzZXZlcmFsIHJ1bGVzIHRvIHNlbGVjdG9ycyB0 aGF0IHN1cHBvcnQgb2xkZXIgT1MgZGVzaWducy4gQWRkZWQgZ2xvYmFsIHBsYXRmb3JtCisgICAg ICAgIGRhdGEgdG8gc3VwcG9ydCB0aGlzIHBhdGNoLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9JbWFnZXMvQmFja0Fycm93LnN2ZzogQWRkZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9J bWFnZXMvQmFja0Fycm93TGVnYWN5LnN2ZzogQ29waWVkIGZyb20gU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0JhY2tBcnJvdy5zdmcuCisgICAgICAgICogVXNlcklu dGVyZmFjZS9JbWFnZXMvRm9yd2FyZEFycm93LnN2ZzogQWRkZWQuCisgICAgICAgICogVXNlcklu dGVyZmFjZS9JbWFnZXMvRm9yd2FyZEFycm93TGVnYWN5LnN2ZzogQ29waWVkIGZyb20gU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0ZvcndhcmRBcnJvdy5zdmcuCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvSW1hZ2VVdGlsaXRpZXMuanM6IFVwZGF0ZWQg aW1hZ2UgdmVyc2lvbgorICAgICAgICAoLmdlbmVyYXRlSW1hZ2UuZ2VuZXJhdGVNb2Rlcm5JbWFn ZSk6CisgICAgICAgICguZ2VuZXJhdGVJbWFnZS5nZW5lcmF0ZUxlZ2FjeUltYWdlKToKKyAgICAg ICAgKC5nZW5lcmF0ZUltYWdlKToKKyAgICAgICAgVXBkYXRlZCBpbWFnZSBnZW5lcmF0aW9uIHRv IHN1cHBvcnQgbW9kZXJuIGxvb2suIFVwZGF0ZWQgdmVyc2lvbmluZyBzY2hlbWUgYW5kIHZlcnNp b24uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5sb2FkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmNvbnRlbnRMb2FkZWQu V2ViSW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24udG9TdHJpbmcpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLmNvbnRlbnRMb2FkZWQuV2ViSW5zcGVjdG9yLlBsYXRmb3JtLnRvU3RyaW5nKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5jb250ZW50TG9hZGVkKToKKyAgICAgICAgQWRkZWQgZ2xvYmFs IHBsYXRmb3JtIGluZm9ybWF0aW9uLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9D b250ZW50QnJvd3Nlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3Nlcik6 CisgICAgICAgIFVwZGF0ZWQgYmFjayBhbmQgZm9yd2FyZCBidXR0b25zLgorCisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkZpbmRCYW5uZXIucHJvdG90eXBlLl9nZW5lcmF0ZUJ1dHRvbnNHbHlwaHNJZk5lZWRlZCk6Cisg ICAgICAgIFVwZGF0ZWQgaW1hZ2VzIGZvciB0aGUgZmluZCBiYW5uZXIuCisKKyAgICAgICAgKiBX ZWJJbnNwZWN0b3JVSS52Y3hwcm9qL1dlYkluc3BlY3RvclVJLnZjeHByb2o6CisgICAgICAgICog V2ViSW5zcGVjdG9yVUkudmN4cHJvai9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qLmZpbHRlcnM6Cisg ICAgICAgIEFkZGVkIG5ldyBpbWFnZXMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L0J1dHRvblRvb2xiYXJJdGVtLmNzczoKKyAgICAgICAgKC50b29sYmFyIC5pdGVtLmJ1dHRvbiA+ IC5sYWJlbCk6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnRvb2xiYXIgLml0 ZW0uYnV0dG9uID4gLmxhYmVsKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0 eWxlRGVjbGFyYXRpb25TZWN0aW9uLmNzczoKKyAgICAgICAgKC5zdHlsZS1kZWNsYXJhdGlvbi1z ZWN0aW9uKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc3R5bGUtZGVjbGFy YXRpb24tc2VjdGlvbik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnN0eWxl LWRlY2xhcmF0aW9uLXNlY3Rpb24gKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbik6CisgICAg ICAgICguc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3VwKToKKyAgICAgICAg KGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0 LWluLWdyb3VwKToKKyAgICAgICAgKC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uLmxhc3QtaW4t Z3JvdXAgKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbik6CisgICAgICAgIChib2R5Lm1hYy1w bGF0Zm9ybS5sZWdhY3kgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1pbi1ncm91cCAr IC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3Jt LmxlZ2FjeSAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3VwICsgLnN0eWxl LWRlY2xhcmF0aW9uLXNlY3Rpb246bGFzdC1jaGlsZCk6CisgICAgICAgICguc3R5bGUtZGVjbGFy YXRpb24tc2VjdGlvbiArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uKTogRGVsZXRlZC4KKyAg ICAgICAgKC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAgKyAuc3R5bGUt ZGVjbGFyYXRpb24tc2VjdGlvbjpsYXN0LWNoaWxkKTogRGVsZXRlZC4KKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5jc3M6CisgICAgICAg ICguc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSA+IC5jb250ZW50ID4gLnBzZXVk by1jbGFzc2VzKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5l LmNzczoKKyAgICAgICAgKC5kb20tdHJlZS1vdXRsaW5lIGxpLmhvdmVyZWQ6bm90KC5zZWxlY3Rl ZCkgLnNlbGVjdGlvbik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRvbS10 cmVlLW91dGxpbmUgbGkuaG92ZXJlZDpub3QoLnNlbGVjdGVkKSAuc2VsZWN0aW9uKToKKyAgICAg ICAgKC5kb20tdHJlZS1vdXRsaW5lIGxpLmVsZW1lbnRzLWRyYWctb3ZlciAuc2VsZWN0aW9uKToK KyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZG9tLXRyZWUtb3V0bGluZSBsaS5l bGVtZW50cy1kcmFnLW92ZXIgLnNlbGVjdGlvbik6CisgICAgICAgICguZG9tLXRyZWUtb3V0bGlu ZTpmb2N1cyBsaS5zZWxlY3RlZCAuc2VsZWN0aW9uKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRm b3JtLmxlZ2FjeSAuZG9tLXRyZWUtb3V0bGluZTpmb2N1cyBsaS5zZWxlY3RlZCAuc2VsZWN0aW9u KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0Rhc2hib2FyZENvbnRhaW5lclZpZXcu Y3NzOgorICAgICAgICAoLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIpOgorICAgICAgICAo Ym9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyKToK KyAgICAgICAgKGJvZHkud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFp bmVyKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeS53aW5kb3ctaW5hY3RpdmUg LnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIpOgorICAgICAgICAoLnRvb2xiYXIgLmRhc2hi b2FyZCk6CisgICAgICAgIChib2R5LndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJk KToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeS53aW5kb3ctaW5hY3RpdmUgLnRv b2xiYXIgLmRhc2hib2FyZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3Jp ZC5jc3M6CisgICAgICAgICguZGF0YS1ncmlkIHRoKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRm b3JtLmxlZ2FjeSAuZGF0YS1ncmlkIHRoKToKKyAgICAgICAgKC5kYXRhLWdyaWQgdHIuc2VsZWN0 ZWQpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kYXRhLWdyaWQgdHIuc2Vs ZWN0ZWQpOgorICAgICAgICAoLmRhdGEtZ3JpZDpmb2N1cyB0ci5zZWxlY3RlZCk6CisgICAgICAg IChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRhdGEtZ3JpZDpmb2N1cyB0ci5zZWxlY3RlZCk6 CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbi5jc3M6CisgICAg ICAgICguZGV0YWlscy1zZWN0aW9uKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2Fj eSAuZGV0YWlscy1zZWN0aW9uKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMt c2VjdGlvbik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMtc2Vj dGlvbiAuZGV0YWlscy1zZWN0aW9uKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gLmRldGFp bHMtc2VjdGlvbjpsYXN0LWNoaWxkKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gLmRldGFp bHMtc2VjdGlvbjpmaXJzdC1jaGlsZCk6CisgICAgICAgICguZGV0YWlscy1zZWN0aW9uID4gLmhl YWRlcik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMtc2VjdGlv biA+IC5oZWFkZXIpOgorICAgICAgICAoLmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0aW9u ID4gLmhlYWRlcik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5tb3VudGFpbi1saW9uIC5k ZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXIpOgorICAgICAgICAoLmRl dGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0aW9uLmNvbGxhc3BzZWQgPiAuaGVhZGVyKToKKyAg ICAgICAgKC5kZXRhaWxzLXNlY3Rpb24uY29tcHV0ZWQtc3R5bGUtcHJvcGVydGllczpub3QoLmNv bGxhcHNlZCkgPiAuaGVhZGVyKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAu ZGV0YWlscy1zZWN0aW9uLmNvbXB1dGVkLXN0eWxlLXByb3BlcnRpZXM6bm90KC5jb2xsYXBzZWQp ID4gLmhlYWRlcik6CisgICAgICAgICguZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3Jv dXApOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kZXRhaWxzLXNlY3Rpb24g PiAuY29udGVudCA+IC5ncm91cCk6CisgICAgICAgICguZGV0YWlscy1zZWN0aW9uID4gLmNvbnRl bnQgPiAuZ3JvdXA6bGFzdC1jaGlsZCk6CisgICAgICAgICguZGV0YWlscy1zZWN0aW9uID4gLmNv bnRlbnQgPiAuZ3JvdXA6bnRoLWNoaWxkKGV2ZW4pKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRm b3JtLmxlZ2FjeSAuZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bnRoLWNoaWxk KGV2ZW4pKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZGV0YWlscy1zZWN0 aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bGFzdC1jaGlsZCA+IC5yb3cuc2ltcGxlOmxhc3QtY2hp bGQgPiAqKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDps YXN0LWNoaWxkID4gLnJvdy5zaW1wbGU6bGFzdC1jaGlsZCA+ICopOiBEZWxldGVkLgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRmlsdGVyQmFyLmNzczoKKyAgICAgICAgKC5maWx0ZXIt YmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0pOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0u bGVnYWN5IC5maWx0ZXItYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0pOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5jc3M6CisgICAgICAgICgu bmF2aWdhdGlvbi1zaWRlYmFyLXBhbmVsLWNvbnRlbnQtdHJlZS1vdXRsaW5lIC5pdGVtLnNlbGVj dGVkKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAubmF2aWdhdGlvbi1zaWRl YmFyLXBhbmVsLWNvbnRlbnQtdHJlZS1vdXRsaW5lIC5pdGVtLnNlbGVjdGVkKToKKyAgICAgICAg KC5uYXZpZ2F0aW9uLXNpZGViYXItcGFuZWwtY29udGVudC10cmVlLW91dGxpbmU6Zm9jdXMgLml0 ZW0uc2VsZWN0ZWQpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5uYXZpZ2F0 aW9uLXNpZGViYXItcGFuZWwtY29udGVudC10cmVlLW91dGxpbmU6Zm9jdXMgLml0ZW0uc2VsZWN0 ZWQpOgorICAgICAgICAoYm9keS53aW5kb3ctaW5hY3RpdmUgLm5hdmlnYXRpb24tc2lkZWJhci1w YW5lbC1jb250ZW50LXRyZWUtb3V0bGluZSAuaXRlbS5zZWxlY3RlZCk6CisgICAgICAgIChib2R5 Lm1hYy1wbGF0Zm9ybS5sZWdhY3kud2luZG93LWluYWN0aXZlIC5uYXZpZ2F0aW9uLXNpZGViYXIt cGFuZWwtY29udGVudC10cmVlLW91dGxpbmUgLml0ZW0uc2VsZWN0ZWQpOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvUmFkaW9CdXR0b25OYXZpZ2F0aW9uSXRlbS5jc3M6CisgICAgICAg ICgubmF2aWdhdGlvbi1iYXIgLml0ZW0ucmFkaW8uYnV0dG9uLnRleHQtb25seS5zZWxlY3RlZCk6 CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLm5hdmlnYXRpb24tYmFyIC5pdGVt LnJhZGlvLmJ1dHRvbi50ZXh0LW9ubHkuc2VsZWN0ZWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvUnVsZXNTdHlsZURldGFpbHNQYW5lbC5jc3M6CisgICAgICAgICguc2lkZWJhciA+ IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSAucnVsZXMgLmxhYmVsICsgLnN0eWxlLWRlY2xhcmF0 aW9uLXNlY3Rpb24pOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zaWRlYmFy ID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlIC5ydWxlcyAubGFiZWwgKyAuc3R5bGUtZGVjbGFy YXRpb24tc2VjdGlvbik6CisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1z dHlsZSAucnVsZXMgLm5ldy1ydWxlKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2Fj eSAuc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSAucnVsZXMgLm5ldy1ydWxlKToK KyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlIC5ydWxlcyAubmV3 LXJ1bGUgKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbik6CisgICAgICAgIChib2R5Lm1hYy1w bGF0Zm9ybS5sZWdhY3kgLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnJ1bGVz IC5uZXctcnVsZSArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uKToKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL1Njb3BlQmFyLmNzczoKKyAgICAgICAgKC5zY29wZS1iYXIgPiBsaSk6 CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnNjb3BlLWJhciA+IGxpKToKKyAg ICAgICAgKC5zY29wZS1iYXIgPiBsaS5zZWxlY3RlZCk6CisgICAgICAgIChib2R5Lm1hYy1wbGF0 Zm9ybS5sZWdhY3kgLnNjb3BlLWJhciA+IGxpLnNlbGVjdGVkKToKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL1NlYXJjaEJhci5jc3M6CisgICAgICAgICguc2VhcmNoLWJhciA+IGlucHV0 W3R5cGU9InNlYXJjaCJdKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc2Vh cmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL1NpZGViYXIuY3NzOgorICAgICAgICAoLnNpZGViYXIpOgorICAgICAgICAoYm9keS5t YWMtcGxhdGZvcm0ubGVnYWN5IC5zaWRlYmFyKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3Jt LmxlZ2FjeS53aW5kb3ctaW5hY3RpdmUgLnNpZGViYXIpOgorICAgICAgICAoYm9keS5tYWMtcGxh dGZvcm0ubGVnYWN5IC5zaWRlYmFyLnJpZ2h0KToKKyAgICAgICAgKGJvZHkud2luZG93LWluYWN0 aXZlIC5zaWRlYmFyKTogRGVsZXRlZC4KKyAgICAgICAgKC5zaWRlYmFyLnJpZ2h0KTogRGVsZXRl ZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lU2lkZWJhclBhbmVsLmNz czoKKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24udGltZWxpbmUgPiAudGl0 bGUtYmFyKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc2lkZWJhciA+IC5w YW5lbC5uYXZpZ2F0aW9uLnRpbWVsaW5lID4gLnRpdGxlLWJhcik6CisgICAgICAgIFN0eWxlIHVw ZGF0ZXMgZm9yIG5ldyBsb29rIGFuZCBmZWVsLgorCiAyMDE0LTA3LTExICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogRGVidWdn ZXIgUGF1c2UgYnV0dG9uIGRvZXMgbm90IHdvcmsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvSW1hZ2VVdGlsaXRpZXMuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL0ltYWdlVXRpbGl0aWVzLmpzCmluZGV4IDQy ZGJjNmUuLjllZTA4NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0Jhc2UvSW1hZ2VVdGlsaXRpZXMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQmFzZS9JbWFnZVV0aWxpdGllcy5qcwpAQCAtMzkzLDggKzM5Myw5IEBA IGZ1bmN0aW9uIGdlbmVyYXRlRW1ib3NzZWRJbWFnZXMoc3JjLCB3aWR0aCwgaGVpZ2h0LCBzdGF0 ZXMsIGNhbnZhc0lkZW50aWZpZXJDYWxsCiAgICAgdmFyIHNjYWxlZFdpZHRoID0gd2lkdGggKiBz Y2FsZUZhY3RvcjsKICAgICB2YXIgc2NhbGVkSGVpZ2h0ID0gaGVpZ2h0ICogc2NhbGVGYWN0b3I7 CiAKLSAgICAvLyBCdW1wIHRoaXMgdmVyc2lvbiB3aGVuIG1ha2luZyBjaGFuZ2VzIHRoYXQgYWZm ZWN0IHRoZSByZXN1bHQgaW1hZ2UuCi0gICAgY29uc3QgaW1hZ2VWZXJzaW9uID0gMjsKKyAgICAv LyBCdW1wIHRoZSBiYXNlIHZlcnNpb24gd2hlbiBtYWtpbmcgY2hhbmdlcyB0aGF0IGFmZmVjdCB0 aGUgcmVzdWx0IGltYWdlLgorICAgIGNvbnN0IGJhc2VJbWFnZVZlcnNpb24gPSAzOworICAgIGNv bnN0IGltYWdlVmVyc2lvbiA9IGJhc2VJbWFnZVZlcnNpb24gKyAwLjAxICogV2ViSW5zcGVjdG9y LlBsYXRmb3JtLnZlcnNpb24uYmFzZSArIDAuMDAwMSAqIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52 ZXJzaW9uLnJlbGVhc2U7CiAKICAgICBjb25zdCBzdG9yYWdlS2V5UHJlZml4ID0gImdlbmVyYXRl ZC1lbWJvc3NlZC1pbWFnZS0iOwogCkBAIC00ODcsMTAzICs0ODgsMTQ4IEBAIGZ1bmN0aW9uIGdl bmVyYXRlRW1ib3NzZWRJbWFnZXMoc3JjLCB3aWR0aCwgaGVpZ2h0LCBzdGF0ZXMsIGNhbnZhc0lk ZW50aWZpZXJDYWxsCiAKICAgICBmdW5jdGlvbiBnZW5lcmF0ZUltYWdlKHN0YXRlKQogICAgIHsK LSAgICAgICAgY29uc3QgZGVwdGggPSAxICogc2NhbGVGYWN0b3I7Ci0gICAgICAgIGNvbnN0IHNo YWRvd0RlcHRoID0gZGVwdGg7Ci0gICAgICAgIGNvbnN0IHNoYWRvd0JsdXIgPSBkZXB0aCAtIDE7 Ci0gICAgICAgIGNvbnN0IGdsb3dCbHVyID0gMjsKKyAgICAgICAgZnVuY3Rpb24gZ2VuZXJhdGVN b2Rlcm5JbWFnZSgpCisgICAgICAgIHsKKyAgICAgICAgICAgIGNvbnN0IGNvbnRleHQgPSBkb2N1 bWVudC5nZXRDU1NDYW52YXNDb250ZXh0KCIyZCIsIGNhbnZhc0lkZW50aWZpZXJDYWxsYmFjayhz dGF0ZSksIHNjYWxlZFdpZHRoLCBzY2FsZWRIZWlnaHQpOworICAgICAgICAgICAgY29udGV4dC5z YXZlKCk7CisgICAgICAgICAgICBjb250ZXh0LnNjYWxlKHNjYWxlRmFjdG9yLCBzY2FsZUZhY3Rv cik7CisKKyAgICAgICAgICAgIGNvbnRleHQuY2xlYXJSZWN0KDAsIDAsIHdpZHRoLCBoZWlnaHQp OworCisgICAgICAgICAgICB2YXIgZ3JhZGllbnQgPSBjb250ZXh0LmNyZWF0ZUxpbmVhckdyYWRp ZW50KDAsIDAsIDAsIGhlaWdodCk7CisgICAgICAgICAgICBpZiAoc3RhdGUgPT09IHN0YXRlcy5B Y3RpdmUpIHsKKyAgICAgICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMCwgInJnYig2 NSwgNjUsIDY1KSIpOworICAgICAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9yU3RvcCgxLCAi cmdiKDcwLCA3MCwgNzApIik7CisgICAgICAgICAgICB9IGVsc2UgaWYgKHN0YXRlID09PSBzdGF0 ZXMuRm9jdXMpIHsKKyAgICAgICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMCwgInJn YigwLCAxMjMsIDI0NykiKTsKKyAgICAgICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3Ao MSwgInJnYigwLCAxMjgsIDI1MikiKTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAoc3RhdGUgPT09 IHN0YXRlcy5BY3RpdmVGb2N1cykgeworICAgICAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9y U3RvcCgwLCAicmdiKDAsIDYyLCAyMTApIik7CisgICAgICAgICAgICAgICAgZ3JhZGllbnQuYWRk Q29sb3JTdG9wKDEsICJyZ2IoMCwgNjcsIDIxNSkiKTsKKyAgICAgICAgICAgIH0gZWxzZSB7Cisg ICAgICAgICAgICAgICAgZ3JhZGllbnQuYWRkQ29sb3JTdG9wKDAsICJyZ2IoNzUsIDc1LCA3NSki KTsKKyAgICAgICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMSwgInJnYig4MCwgODAs IDgwKSIpOworICAgICAgICAgICAgfQogCi0gICAgICAgIGNvbnN0IGNvbnRleHQgPSBkb2N1bWVu dC5nZXRDU1NDYW52YXNDb250ZXh0KCIyZCIsIGNhbnZhc0lkZW50aWZpZXJDYWxsYmFjayhzdGF0 ZSksIHNjYWxlZFdpZHRoLCBzY2FsZWRIZWlnaHQpOwotICAgICAgICBjb250ZXh0LnNhdmUoKTsK LSAgICAgICAgY29udGV4dC5zY2FsZShzY2FsZUZhY3Rvciwgc2NhbGVGYWN0b3IpOworICAgICAg ICAgICAgY29udGV4dC5maWxsU3R5bGUgPSBncmFkaWVudDsKKyAgICAgICAgICAgIGNvbnRleHQu ZmlsbFJlY3QoMCwgMCwgd2lkdGgsIGhlaWdodCk7CiAKLSAgICAgICAgY29udGV4dC5jbGVhclJl Y3QoMCwgMCwgd2lkdGgsIGhlaWdodCk7Ci0KLSAgICAgICAgaWYgKGRlcHRoID4gMCkgewotICAg ICAgICAgICAgLy8gVXNlIHNjcmF0Y2ggY2FudmFzIHNvIHdlIGNhbiBhcHBseSB0aGUgZHJhdyB0 aGUgd2hpdGUgZHJvcCBzaGFkb3cKLSAgICAgICAgICAgIC8vIHRvIHRoZSB3aG9sZSBnbHlwaCBh dCB0aGUgZW5kLgotCi0gICAgICAgICAgICB2YXIgc2NyYXRjaENhbnZhcyA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImNhbnZhcyIpOwotICAgICAgICAgICAgc2NyYXRjaENhbnZhcy53aWR0aCA9 IHNjYWxlZFdpZHRoOwotICAgICAgICAgICAgc2NyYXRjaENhbnZhcy5oZWlnaHQgPSBzY2FsZWRI ZWlnaHQ7Ci0KLSAgICAgICAgICAgIHZhciBzY3JhdGNoQ29udGV4dCA9IHNjcmF0Y2hDYW52YXMu Z2V0Q29udGV4dCgiMmQiKTsKLSAgICAgICAgICAgIHNjcmF0Y2hDb250ZXh0LnNjYWxlKHNjYWxl RmFjdG9yLCBzY2FsZUZhY3Rvcik7Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAgICAgdmFyIHNj cmF0Y2hDb250ZXh0ID0gY29udGV4dDsKLQotICAgICAgICB2YXIgZ3JhZGllbnQgPSBzY3JhdGNo Q29udGV4dC5jcmVhdGVMaW5lYXJHcmFkaWVudCgwLCAwLCAwLCBoZWlnaHQpOwotICAgICAgICBp ZiAoc3RhdGUgPT09IHN0YXRlcy5BY3RpdmUpIHsKLSAgICAgICAgICAgIGdyYWRpZW50LmFkZENv bG9yU3RvcCgwLCAicmdiKDYwLCA2MCwgNjApIik7Ci0gICAgICAgICAgICBncmFkaWVudC5hZGRD b2xvclN0b3AoMSwgInJnYigxMDAsIDEwMCwgMTAwKSIpOwotICAgICAgICB9IGVsc2UgaWYgKHN0 YXRlID09PSBzdGF0ZXMuRm9jdXMpIHsKLSAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9yU3Rv cCgwLCAicmdiKDUwLCAxMzUsIDIwMCkiKTsKLSAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9y U3RvcCgxLCAicmdiKDYwLCAxNTUsIDIyNSkiKTsKLSAgICAgICAgfSBlbHNlIGlmIChzdGF0ZSA9 PT0gc3RhdGVzLkFjdGl2ZUZvY3VzKSB7Ci0gICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0 b3AoMCwgInJnYigzMCwgMTE1LCAxODUpIik7Ci0gICAgICAgICAgICBncmFkaWVudC5hZGRDb2xv clN0b3AoMSwgInJnYig0MCwgMTM1LCAyMDApIik7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAg ICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMCwgInJnYig5MCwgOTAsIDkwKSIpOwotICAgICAg ICAgICAgZ3JhZGllbnQuYWRkQ29sb3JTdG9wKDEsICJyZ2IoMTQ1LCAxNDUsIDE0NSkiKTsKKyAg ICAgICAgICAgIC8vIEFwcGx5IHRoZSBtYXNrIHRvIGtlZXAganVzdCB0aGUgaW5uZXIgc2hhcGUg b2YgdGhlIGdseXBoLgorICAgICAgICAgICAgX2FwcGx5SW1hZ2VNYXNrKGNvbnRleHQsIGltYWdl KTsKKworICAgICAgICAgICAgaWYgKCFpZ25vcmVDYWNoZSkgeworICAgICAgICAgICAgICAgIGNv bnN0IHN0b3JhZ2VLZXkgPSBzdG9yYWdlS2V5UHJlZml4ICsgY2FudmFzSWRlbnRpZmllckNhbGxi YWNrKHN0YXRlKTsKKyAgICAgICAgICAgICAgICBzYXZlSW1hZ2VUb1N0b3JhZ2Uoc3RvcmFnZUtl eSwgY29udGV4dCwgc2NhbGVkV2lkdGgsIHNjYWxlZEhlaWdodCwgaW1hZ2VWZXJzaW9uKTsKKyAg ICAgICAgICAgIH0KKworICAgICAgICAgICAgY29udGV4dC5yZXN0b3JlKCk7CiAgICAgICAgIH0K IAotICAgICAgICBzY3JhdGNoQ29udGV4dC5maWxsU3R5bGUgPSBncmFkaWVudDsKLSAgICAgICAg c2NyYXRjaENvbnRleHQuZmlsbFJlY3QoMCwgMCwgd2lkdGgsIGhlaWdodCk7Ci0KLSAgICAgICAg aWYgKGRlcHRoID4gMCkgewotICAgICAgICAgICAgLy8gSW52ZXJ0IHRoZSBpbWFnZSB0byB1c2Ug YXMgYSByZXZlcnNlIGltYWdlIG1hc2sgZm9yIHRoZSBpbm5lciBzaGFkb3dzLgotICAgICAgICAg ICAgLy8gUGFzcyBpbiB0aGUgY29sb3IgdG8gdXNlIGZvciB0aGUgb3BhcXVlIGFyZWFzIHRvIHBy ZXZlbnQgImJsYWNrIGhhbG9zIgotICAgICAgICAgICAgLy8gbGF0ZXIgd2hlbiBhcHBseWluZyB0 aGUgZmluYWwgaW1hZ2UgbWFzay4KLQotICAgICAgICAgICAgaWYgKHN0YXRlID09PSBzdGF0ZXMu QWN0aXZlKQotICAgICAgICAgICAgICAgIHZhciBpbnZlcnRlZEltYWdlID0gX2ludmVydE1hc2tJ bWFnZShpbWFnZSwgNjAsIDYwLCA2MCk7Ci0gICAgICAgICAgICBlbHNlIGlmIChzdGF0ZSA9PT0g c3RhdGVzLkZvY3VzKQotICAgICAgICAgICAgICAgIHZhciBpbnZlcnRlZEltYWdlID0gX2ludmVy dE1hc2tJbWFnZShpbWFnZSwgNDUsIDE0NSwgMjEwKTsKLSAgICAgICAgICAgIGVsc2UgaWYgKHN0 YXRlID09PSBzdGF0ZXMuQWN0aXZlRm9jdXMpCi0gICAgICAgICAgICAgICAgdmFyIGludmVydGVk SW1hZ2UgPSBfaW52ZXJ0TWFza0ltYWdlKGltYWdlLCAzNSwgMTI1LCAxOTUpOwotICAgICAgICAg ICAgZWxzZQotICAgICAgICAgICAgICAgIHZhciBpbnZlcnRlZEltYWdlID0gX2ludmVydE1hc2tJ bWFnZShpbWFnZSwgOTAsIDkwLCA5MCk7Ci0KLSAgICAgICAgICAgIGlmIChzdGF0ZSA9PT0gc3Rh dGVzLkZvY3VzKSB7Ci0gICAgICAgICAgICAgICAgLy8gRG91YmxlIGRyYXcgdGhlIGJsdXJyeSBp bm5lciBzaGFkb3cgdG8gZ2V0IHRoZSByaWdodCBlZmZlY3QuCi0gICAgICAgICAgICAgICAgX2Ry YXdJbWFnZVNoYWRvdyhzY3JhdGNoQ29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2IoMTAs IDk1LCAxNTApIiwgaW52ZXJ0ZWRJbWFnZSk7Ci0gICAgICAgICAgICAgICAgX2RyYXdJbWFnZVNo YWRvdyhzY3JhdGNoQ29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2IoMTAsIDk1LCAxNTAp IiwgaW52ZXJ0ZWRJbWFnZSk7Ci0KLSAgICAgICAgICAgICAgICAvLyBEcmF3IHRoZSBpbm5lciBz aGFkb3cuCi0gICAgICAgICAgICAgICAgX2RyYXdJbWFnZVNoYWRvdyhzY3JhdGNoQ29udGV4dCwg MCwgc2hhZG93RGVwdGgsIHNoYWRvd0JsdXIsICJyZ2IoMCwgODAsIDE3MCkiLCBpbnZlcnRlZElt YWdlKTsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAoc3RhdGUgPT09IHN0YXRlcy5BY3RpdmVGb2N1 cykgewotICAgICAgICAgICAgICAgIC8vIERvdWJsZSBkcmF3IHRoZSBibHVycnkgaW5uZXIgc2hh ZG93IHRvIGdldCB0aGUgcmlnaHQgZWZmZWN0LgotICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VT aGFkb3coc2NyYXRjaENvbnRleHQsIDAsIDAsIHNoYWRvd0RlcHRoLCAicmdiKDAsIDgwLCAxMDAp IiwgaW52ZXJ0ZWRJbWFnZSk7Ci0gICAgICAgICAgICAgICAgX2RyYXdJbWFnZVNoYWRvdyhzY3Jh dGNoQ29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2IoMCwgODAsIDEwMCkiLCBpbnZlcnRl ZEltYWdlKTsKKyAgICAgICAgZnVuY3Rpb24gZ2VuZXJhdGVMZWdhY3lJbWFnZSgpCisgICAgICAg IHsKKyAgICAgICAgICAgIGNvbnN0IGRlcHRoID0gMSAqIHNjYWxlRmFjdG9yOworICAgICAgICAg ICAgY29uc3Qgc2hhZG93RGVwdGggPSBkZXB0aDsKKyAgICAgICAgICAgIGNvbnN0IHNoYWRvd0Js dXIgPSBkZXB0aCAtIDE7CisgICAgICAgICAgICBjb25zdCBnbG93Qmx1ciA9IDI7CisKKyAgICAg ICAgICAgIGNvbnN0IGNvbnRleHQgPSBkb2N1bWVudC5nZXRDU1NDYW52YXNDb250ZXh0KCIyZCIs IGNhbnZhc0lkZW50aWZpZXJDYWxsYmFjayhzdGF0ZSksIHNjYWxlZFdpZHRoLCBzY2FsZWRIZWln aHQpOworICAgICAgICAgICAgY29udGV4dC5zYXZlKCk7CisgICAgICAgICAgICBjb250ZXh0LnNj YWxlKHNjYWxlRmFjdG9yLCBzY2FsZUZhY3Rvcik7CiAKLSAgICAgICAgICAgICAgICAvLyBEcmF3 IHRoZSBpbm5lciBzaGFkb3cuCi0gICAgICAgICAgICAgICAgX2RyYXdJbWFnZVNoYWRvdyhzY3Jh dGNoQ29udGV4dCwgMCwgc2hhZG93RGVwdGgsIHNoYWRvd0JsdXIsICJyZ2IoMCwgNjUsIDE1MCki LCBpbnZlcnRlZEltYWdlKTsKKyAgICAgICAgICAgIGNvbnRleHQuY2xlYXJSZWN0KDAsIDAsIHdp ZHRoLCBoZWlnaHQpOworCisgICAgICAgICAgICBpZiAoZGVwdGggPiAwKSB7CisgICAgICAgICAg ICAgICAgLy8gVXNlIHNjcmF0Y2ggY2FudmFzIHNvIHdlIGNhbiBhcHBseSB0aGUgZHJhdyB0aGUg d2hpdGUgZHJvcCBzaGFkb3cKKyAgICAgICAgICAgICAgICAvLyB0byB0aGUgd2hvbGUgZ2x5cGgg YXQgdGhlIGVuZC4KKworICAgICAgICAgICAgICAgIHZhciBzY3JhdGNoQ2FudmFzID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgiY2FudmFzIik7CisgICAgICAgICAgICAgICAgc2NyYXRjaENhbnZh cy53aWR0aCA9IHNjYWxlZFdpZHRoOworICAgICAgICAgICAgICAgIHNjcmF0Y2hDYW52YXMuaGVp Z2h0ID0gc2NhbGVkSGVpZ2h0OworCisgICAgICAgICAgICAgICAgdmFyIHNjcmF0Y2hDb250ZXh0 ID0gc2NyYXRjaENhbnZhcy5nZXRDb250ZXh0KCIyZCIpOworICAgICAgICAgICAgICAgIHNjcmF0 Y2hDb250ZXh0LnNjYWxlKHNjYWxlRmFjdG9yLCBzY2FsZUZhY3Rvcik7CisgICAgICAgICAgICB9 IGVsc2UKKyAgICAgICAgICAgICAgICB2YXIgc2NyYXRjaENvbnRleHQgPSBjb250ZXh0OworCisg ICAgICAgICAgICB2YXIgZ3JhZGllbnQgPSBzY3JhdGNoQ29udGV4dC5jcmVhdGVMaW5lYXJHcmFk aWVudCgwLCAwLCAwLCBoZWlnaHQpOworICAgICAgICAgICAgaWYgKHN0YXRlID09PSBzdGF0ZXMu QWN0aXZlKSB7CisgICAgICAgICAgICAgICAgZ3JhZGllbnQuYWRkQ29sb3JTdG9wKDAsICJyZ2Io NjAsIDYwLCA2MCkiKTsKKyAgICAgICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMSwg InJnYigxMDAsIDEwMCwgMTAwKSIpOworICAgICAgICAgICAgfSBlbHNlIGlmIChzdGF0ZSA9PT0g c3RhdGVzLkZvY3VzKSB7CisgICAgICAgICAgICAgICAgZ3JhZGllbnQuYWRkQ29sb3JTdG9wKDAs ICJyZ2IoNTAsIDEzNSwgMjAwKSIpOworICAgICAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9y U3RvcCgxLCAicmdiKDYwLCAxNTUsIDIyNSkiKTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAoc3Rh dGUgPT09IHN0YXRlcy5BY3RpdmVGb2N1cykgeworICAgICAgICAgICAgICAgIGdyYWRpZW50LmFk ZENvbG9yU3RvcCgwLCAicmdiKDMwLCAxMTUsIDE4NSkiKTsKKyAgICAgICAgICAgICAgICBncmFk aWVudC5hZGRDb2xvclN0b3AoMSwgInJnYig0MCwgMTM1LCAyMDApIik7CiAgICAgICAgICAgICB9 IGVsc2UgewotICAgICAgICAgICAgICAgIC8vIERvdWJsZSBkcmF3IHRoZSBibHVycnkgaW5uZXIg c2hhZG93IHRvIGdldCB0aGUgcmlnaHQgZWZmZWN0LgotICAgICAgICAgICAgICAgIF9kcmF3SW1h Z2VTaGFkb3coc2NyYXRjaENvbnRleHQsIDAsIDAsIHNoYWRvd0RlcHRoLCAicmdiYSgwLCAwLCAw LCAxKSIsIGludmVydGVkSW1hZ2UpOwotICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VTaGFkb3co c2NyYXRjaENvbnRleHQsIDAsIDAsIHNoYWRvd0RlcHRoLCAicmdiYSgwLCAwLCAwLCAxKSIsIGlu dmVydGVkSW1hZ2UpOworICAgICAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9yU3RvcCgwLCAi cmdiKDkwLCA5MCwgOTApIik7CisgICAgICAgICAgICAgICAgZ3JhZGllbnQuYWRkQ29sb3JTdG9w KDEsICJyZ2IoMTQ1LCAxNDUsIDE0NSkiKTsKKyAgICAgICAgICAgIH0KIAotICAgICAgICAgICAg ICAgIC8vIERyYXcgdGhlIGlubmVyIHNoYWRvdy4KLSAgICAgICAgICAgICAgICBfZHJhd0ltYWdl U2hhZG93KHNjcmF0Y2hDb250ZXh0LCAwLCBzaGFkb3dEZXB0aCwgc2hhZG93Qmx1ciwgInJnYmEo MCwgMCwgMCwgMC42KSIsIGludmVydGVkSW1hZ2UpOworICAgICAgICAgICAgc2NyYXRjaENvbnRl eHQuZmlsbFN0eWxlID0gZ3JhZGllbnQ7CisgICAgICAgICAgICBzY3JhdGNoQ29udGV4dC5maWxs UmVjdCgwLCAwLCB3aWR0aCwgaGVpZ2h0KTsKKworICAgICAgICAgICAgaWYgKGRlcHRoID4gMCkg eworICAgICAgICAgICAgICAgIC8vIEludmVydCB0aGUgaW1hZ2UgdG8gdXNlIGFzIGEgcmV2ZXJz ZSBpbWFnZSBtYXNrIGZvciB0aGUgaW5uZXIgc2hhZG93cy4KKyAgICAgICAgICAgICAgICAvLyBQ YXNzIGluIHRoZSBjb2xvciB0byB1c2UgZm9yIHRoZSBvcGFxdWUgYXJlYXMgdG8gcHJldmVudCAi YmxhY2sgaGFsb3MiCisgICAgICAgICAgICAgICAgLy8gbGF0ZXIgd2hlbiBhcHBseWluZyB0aGUg ZmluYWwgaW1hZ2UgbWFzay4KKworICAgICAgICAgICAgICAgIGlmIChzdGF0ZSA9PT0gc3RhdGVz LkFjdGl2ZSkKKyAgICAgICAgICAgICAgICAgICAgdmFyIGludmVydGVkSW1hZ2UgPSBfaW52ZXJ0 TWFza0ltYWdlKGltYWdlLCA2MCwgNjAsIDYwKTsKKyAgICAgICAgICAgICAgICBlbHNlIGlmIChz dGF0ZSA9PT0gc3RhdGVzLkZvY3VzKQorICAgICAgICAgICAgICAgICAgICB2YXIgaW52ZXJ0ZWRJ bWFnZSA9IF9pbnZlcnRNYXNrSW1hZ2UoaW1hZ2UsIDQ1LCAxNDUsIDIxMCk7CisgICAgICAgICAg ICAgICAgZWxzZSBpZiAoc3RhdGUgPT09IHN0YXRlcy5BY3RpdmVGb2N1cykKKyAgICAgICAgICAg ICAgICAgICAgdmFyIGludmVydGVkSW1hZ2UgPSBfaW52ZXJ0TWFza0ltYWdlKGltYWdlLCAzNSwg MTI1LCAxOTUpOworICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgdmFy IGludmVydGVkSW1hZ2UgPSBfaW52ZXJ0TWFza0ltYWdlKGltYWdlLCA5MCwgOTAsIDkwKTsKKwor ICAgICAgICAgICAgICAgIGlmIChzdGF0ZSA9PT0gc3RhdGVzLkZvY3VzKSB7CisgICAgICAgICAg ICAgICAgICAgIC8vIERvdWJsZSBkcmF3IHRoZSBibHVycnkgaW5uZXIgc2hhZG93IHRvIGdldCB0 aGUgcmlnaHQgZWZmZWN0LgorICAgICAgICAgICAgICAgICAgICBfZHJhd0ltYWdlU2hhZG93KHNj cmF0Y2hDb250ZXh0LCAwLCAwLCBzaGFkb3dEZXB0aCwgInJnYigxMCwgOTUsIDE1MCkiLCBpbnZl cnRlZEltYWdlKTsKKyAgICAgICAgICAgICAgICAgICAgX2RyYXdJbWFnZVNoYWRvdyhzY3JhdGNo Q29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2IoMTAsIDk1LCAxNTApIiwgaW52ZXJ0ZWRJ bWFnZSk7CisKKyAgICAgICAgICAgICAgICAgICAgLy8gRHJhdyB0aGUgaW5uZXIgc2hhZG93Lgor ICAgICAgICAgICAgICAgICAgICBfZHJhd0ltYWdlU2hhZG93KHNjcmF0Y2hDb250ZXh0LCAwLCBz aGFkb3dEZXB0aCwgc2hhZG93Qmx1ciwgInJnYigwLCA4MCwgMTcwKSIsIGludmVydGVkSW1hZ2Up OworICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoc3RhdGUgPT09IHN0YXRlcy5BY3RpdmVGb2N1 cykgeworICAgICAgICAgICAgICAgICAgICAvLyBEb3VibGUgZHJhdyB0aGUgYmx1cnJ5IGlubmVy IHNoYWRvdyB0byBnZXQgdGhlIHJpZ2h0IGVmZmVjdC4KKyAgICAgICAgICAgICAgICAgICAgX2Ry YXdJbWFnZVNoYWRvdyhzY3JhdGNoQ29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2IoMCwg ODAsIDEwMCkiLCBpbnZlcnRlZEltYWdlKTsKKyAgICAgICAgICAgICAgICAgICAgX2RyYXdJbWFn ZVNoYWRvdyhzY3JhdGNoQ29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2IoMCwgODAsIDEw MCkiLCBpbnZlcnRlZEltYWdlKTsKKworICAgICAgICAgICAgICAgICAgICAvLyBEcmF3IHRoZSBp bm5lciBzaGFkb3cuCisgICAgICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VTaGFkb3coc2NyYXRj aENvbnRleHQsIDAsIHNoYWRvd0RlcHRoLCBzaGFkb3dCbHVyLCAicmdiKDAsIDY1LCAxNTApIiwg aW52ZXJ0ZWRJbWFnZSk7CisgICAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAg ICAgICAgLy8gRG91YmxlIGRyYXcgdGhlIGJsdXJyeSBpbm5lciBzaGFkb3cgdG8gZ2V0IHRoZSBy aWdodCBlZmZlY3QuCisgICAgICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VTaGFkb3coc2NyYXRj aENvbnRleHQsIDAsIDAsIHNoYWRvd0RlcHRoLCAicmdiYSgwLCAwLCAwLCAxKSIsIGludmVydGVk SW1hZ2UpOworICAgICAgICAgICAgICAgICAgICBfZHJhd0ltYWdlU2hhZG93KHNjcmF0Y2hDb250 ZXh0LCAwLCAwLCBzaGFkb3dEZXB0aCwgInJnYmEoMCwgMCwgMCwgMSkiLCBpbnZlcnRlZEltYWdl KTsKKworICAgICAgICAgICAgICAgICAgICAvLyBEcmF3IHRoZSBpbm5lciBzaGFkb3cuCisgICAg ICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VTaGFkb3coc2NyYXRjaENvbnRleHQsIDAsIHNoYWRv d0RlcHRoLCBzaGFkb3dCbHVyLCAicmdiYSgwLCAwLCAwLCAwLjYpIiwgaW52ZXJ0ZWRJbWFnZSk7 CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQotICAgICAgICB9CiAKLSAgICAgICAg Ly8gQXBwbHkgdGhlIG1hc2sgdG8ga2VlcCBqdXN0IHRoZSBpbm5lciBzaGFwZSBvZiB0aGUgZ2x5 cGguCi0gICAgICAgIF9hcHBseUltYWdlTWFzayhzY3JhdGNoQ29udGV4dCwgaW1hZ2UpOworICAg ICAgICAgICAgLy8gQXBwbHkgdGhlIG1hc2sgdG8ga2VlcCBqdXN0IHRoZSBpbm5lciBzaGFwZSBv ZiB0aGUgZ2x5cGguCisgICAgICAgICAgICBfYXBwbHlJbWFnZU1hc2soc2NyYXRjaENvbnRleHQs IGltYWdlKTsKKworICAgICAgICAgICAgLy8gRHJhdyB0aGUgd2hpdGUgZHJvcCBzaGFkb3cuCisg ICAgICAgICAgICBpZiAoZGVwdGggPiAwKQorICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VTaGFk b3coY29udGV4dCwgMCwgc2hhZG93RGVwdGgsIHNoYWRvd0JsdXIsICJyZ2JhKDI1NSwgMjU1LCAy NTUsIDAuNikiLCBzY3JhdGNoQ2FudmFzKTsKIAotICAgICAgICAvLyBEcmF3IHRoZSB3aGl0ZSBk cm9wIHNoYWRvdy4KLSAgICAgICAgaWYgKGRlcHRoID4gMCkKLSAgICAgICAgICAgIF9kcmF3SW1h Z2VTaGFkb3coY29udGV4dCwgMCwgc2hhZG93RGVwdGgsIHNoYWRvd0JsdXIsICJyZ2JhKDI1NSwg MjU1LCAyNTUsIDAuNikiLCBzY3JhdGNoQ2FudmFzKTsKKyAgICAgICAgICAgIC8vIERyYXcgYSBz dWJ0bGUgZ2xvdyBmb3IgdGhlIGZvY3VzIHN0YXRlcy4KKyAgICAgICAgICAgIGlmIChzdGF0ZSA9 PT0gc3RhdGVzLkZvY3VzIHx8IHN0YXRlID09PSBzdGF0ZXMuQWN0aXZlRm9jdXMpCisgICAgICAg ICAgICAgICAgX2RyYXdJbWFnZVNoYWRvdyhjb250ZXh0LCAwLCAwLCBnbG93Qmx1ciwgInJnYmEo MjAsIDEwMCwgMjIwLCAwLjQpIiwgc2NyYXRjaENhbnZhcyk7CiAKLSAgICAgICAgLy8gRHJhdyBh IHN1YnRsZSBnbG93IGZvciB0aGUgZm9jdXMgc3RhdGVzLgotICAgICAgICBpZiAoc3RhdGUgPT09 IHN0YXRlcy5Gb2N1cyB8fCBzdGF0ZSA9PT0gc3RhdGVzLkFjdGl2ZUZvY3VzKQotICAgICAgICAg ICAgX2RyYXdJbWFnZVNoYWRvdyhjb250ZXh0LCAwLCAwLCBnbG93Qmx1ciwgInJnYmEoMjAsIDEw MCwgMjIwLCAwLjQpIiwgc2NyYXRjaENhbnZhcyk7CisgICAgICAgICAgICBpZiAoIWlnbm9yZUNh Y2hlKSB7CisgICAgICAgICAgICAgICAgY29uc3Qgc3RvcmFnZUtleSA9IHN0b3JhZ2VLZXlQcmVm aXggKyBjYW52YXNJZGVudGlmaWVyQ2FsbGJhY2soc3RhdGUpOworICAgICAgICAgICAgICAgIHNh dmVJbWFnZVRvU3RvcmFnZShzdG9yYWdlS2V5LCBjb250ZXh0LCBzY2FsZWRXaWR0aCwgc2NhbGVk SGVpZ2h0LCBpbWFnZVZlcnNpb24pOworICAgICAgICAgICAgfQogCi0gICAgICAgIGlmICghaWdu b3JlQ2FjaGUpIHsKLSAgICAgICAgICAgIGNvbnN0IHN0b3JhZ2VLZXkgPSBzdG9yYWdlS2V5UHJl Zml4ICsgY2FudmFzSWRlbnRpZmllckNhbGxiYWNrKHN0YXRlKTsKLSAgICAgICAgICAgIHNhdmVJ bWFnZVRvU3RvcmFnZShzdG9yYWdlS2V5LCBjb250ZXh0LCBzY2FsZWRXaWR0aCwgc2NhbGVkSGVp Z2h0LCBpbWFnZVZlcnNpb24pOworICAgICAgICAgICAgY29udGV4dC5yZXN0b3JlKCk7CiAgICAg ICAgIH0KIAotICAgICAgICBjb250ZXh0LnJlc3RvcmUoKTsKKyAgICAgICAgaWYgKFdlYkluc3Bl Y3Rvci5QbGF0Zm9ybS5uYW1lID09PSAibWFjIiAmJiBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVy c2lvbi5iYXNlID09PSAxMCAmJiBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5yZWxlYXNl IDwgMTApCisgICAgICAgICAgICBnZW5lcmF0ZUxlZ2FjeUltYWdlKCk7CisgICAgICAgIGVsc2UK KyAgICAgICAgICAgIGdlbmVyYXRlTW9kZXJuSW1hZ2UoKTsKICAgICB9CiAKICAgICBmdW5jdGlv biBfZHJhd0ltYWdlU2hhZG93KGNvbnRleHQsIHhPZmZzZXQsIHlPZmZzZXQsIGJsdXIsIGNvbG9y LCBpbWFnZSkgewpAQCAtNjUzLDcgKzY5OSw2IEBAIGZ1bmN0aW9uIGdlbmVyYXRlRW1ib3NzZWRJ bWFnZXMoc3JjLCB3aWR0aCwgaGVpZ2h0LCBzdGF0ZXMsIGNhbnZhc0lkZW50aWZpZXJDYWxsCiAg ICAgfQogfQogCi0KIHZhciBzdmdJbWFnZUNhY2hlID0ge307CiAKIGZ1bmN0aW9uIGxvYWRTVkdJ bWFnZURvY3VtZW50RWxlbWVudCh1cmwsIGNhbGxiYWNrKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCmluZGV4IGE0YTZjY2UuLjA1NzQwYmIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFp bi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4u anMKQEAgLTE2Nyw3ICsxNjcsNyBAQCBXZWJJbnNwZWN0b3IubG9hZGVkID0gZnVuY3Rpb24oKQog ICAgIH07CiAKICAgICB0aGlzLl93aW5kb3dLZXlkb3duTGlzdGVuZXJzID0gW107Ci19Cit9Owog CiBXZWJJbnNwZWN0b3IuY29udGVudExvYWRlZCA9IGZ1bmN0aW9uKCkKIHsKQEAgLTE5MywxNiAr MTkzLDUwIEBAIFdlYkluc3BlY3Rvci5jb250ZW50TG9hZGVkID0gZnVuY3Rpb24oKQogICAgICAg ICBkb2N1bWVudC5ib2R5LmNsYXNzTGlzdC5hZGQoIm5pZ2h0bHktYnVpbGQiKTsKIAogICAgIC8v IEFkZCBwbGF0Zm9ybSBzdHlsZSBjbGFzc2VzIHNvIHRoZSBVSSBjYW4gYmUgdHdlYWtlZCBwZXIt cGxhdGZvcm0uCi0gICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QuYWRkKEluc3BlY3RvckZyb250 ZW5kSG9zdC5wbGF0Zm9ybSgpICsgIi1wbGF0Zm9ybSIpOwotCi0gICAgaWYgKEluc3BlY3RvckZy b250ZW5kSG9zdC5wbGF0Zm9ybSgpID09PSAibWFjIikgewotICAgICAgICB2YXIgdmVyc2lvbk1h dGNoID0gLyBNYWMgT1MgWCAoXGQrKV8oXGQrKS8uZXhlYyhuYXZpZ2F0b3IuYXBwVmVyc2lvbik7 Ci0gICAgICAgIGlmICh2ZXJzaW9uTWF0Y2ggJiYgdmVyc2lvbk1hdGNoWzFdID09IDEwICYmIHZl cnNpb25NYXRjaFsyXSA9PSA4KQotICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3Qu YWRkKCJtb3VudGFpbi1saW9uIik7Ci0gICAgICAgIGVsc2UgaWYgKHZlcnNpb25NYXRjaCAmJiB2 ZXJzaW9uTWF0Y2hbMV0gPT0gMTAgJiYgdmVyc2lvbk1hdGNoWzJdID09IDkpCi0gICAgICAgICAg ICBkb2N1bWVudC5ib2R5LmNsYXNzTGlzdC5hZGQoIm1hdmVyaWNrcyIpOworICAgIFdlYkluc3Bl Y3Rvci5QbGF0Zm9ybSA9IHsKKyAgICAgICAgbmFtZTogSW5zcGVjdG9yRnJvbnRlbmRIb3N0LnBs YXRmb3JtKCksCisgICAgICAgIGNvZGVOYW1lOiAiIiwKKyAgICAgICAgdmVyc2lvbjogeworICAg ICAgICAgICAgYmFzZTogMCwKKyAgICAgICAgICAgIHJlbGVhc2U6IDAsCisgICAgICAgICAgICB0 b1N0cmluZzogZnVuY3Rpb24oKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHJldHVy biB0aGlzLmJhc2UgKyAiLiIgKyB0aGlzLnZlcnNpb247CisgICAgICAgICAgICB9CisgICAgICAg IH0sCisgICAgICAgIHRvU3RyaW5nOiBmdW5jdGlvbigpCisgICAgICAgIHsKKyAgICAgICAgICAg IHJldHVybiB0aGlzLm5hbWU7CisgICAgICAgIH0KKyAgICB9OworCisgICAgdmFyIGlzTGVnYWN5 TWFjT1MgPSBmYWxzZTsKKyAgICB2YXIgb3NWZXJzaW9uTWF0Y2ggPSAvIE1hYyBPUyBYIChcZCsp XyhcZCspLy5leGVjKG5hdmlnYXRvci5hcHBWZXJzaW9uKTsKKyAgICBpZiAob3NWZXJzaW9uTWF0 Y2ggJiYgb3NWZXJzaW9uTWF0Y2hbMV0gPT09ICIxMCIpIHsKKyAgICAgICAgV2ViSW5zcGVjdG9y LlBsYXRmb3JtLnZlcnNpb24uYmFzZSA9IDEwOworICAgICAgICBzd2l0Y2gob3NWZXJzaW9uTWF0 Y2hbMl0pIHsKKyAgICAgICAgICAgIGNhc2UgIjEwIjoKKyAgICAgICAgICAgICAgICBXZWJJbnNw ZWN0b3IuUGxhdGZvcm0uY29kZU5hbWUgPSAieW9zZW1pdGUiOworICAgICAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLnJlbGVhc2UgPSAxMDsKKyAgICAgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgIjkiOgorICAgICAgICAgICAgICAgIFdlYkluc3Bl Y3Rvci5QbGF0Zm9ybS5jb2RlTmFtZSA9ICJtYXZlcmlja3MiOworICAgICAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLnJlbGVhc2UgPSA5OworICAgICAgICAgICAgICAg IGlzTGVnYWN5TWFjT1MgPSB0cnVlOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAg ICAgY2FzZSAiOCI6CisgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLlBsYXRmb3JtLmNvZGVO YW1lID0gIm1vdW50YWluLWxpb24iOworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0 Zm9ybS52ZXJzaW9uLnJlbGVhc2UgPSA4OworICAgICAgICAgICAgICAgIGlzTGVnYWN5TWFjT1Mg PSB0cnVlOworICAgICAgICB9CiAgICAgfQogCisgICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3Qu YWRkKFdlYkluc3BlY3Rvci5QbGF0Zm9ybSArICItcGxhdGZvcm0iKTsKKyAgICBpZiAoV2ViSW5z cGVjdG9yLlBsYXRmb3JtLmNvZGVOYW1lKQorICAgICAgICBkb2N1bWVudC5ib2R5LmNsYXNzTGlz dC5hZGQoV2ViSW5zcGVjdG9yLlBsYXRmb3JtLmNvZGVOYW1lKTsKKyAgICBpZiAoaXNMZWdhY3lN YWNPUykKKyAgICAgICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QuYWRkKCJsZWdhY3kiKTsKKwog ICAgIHRoaXMuZGVidWdnYWJsZVR5cGUgPSBJbnNwZWN0b3JGcm9udGVuZEhvc3QuZGVidWdnYWJs ZVR5cGUoKSA9PT0gIndlYiIgPyBXZWJJbnNwZWN0b3IuRGVidWdnYWJsZVR5cGUuV2ViIDogV2Vi SW5zcGVjdG9yLkRlYnVnZ2FibGVUeXBlLkphdmFTY3JpcHQ7CiAgICAgZG9jdW1lbnQuYm9keS5j bGFzc0xpc3QuYWRkKHRoaXMuZGVidWdnYWJsZVR5cGUpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvQmFja0Fycm93LnN2ZyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9CYWNrQXJyb3cuc3ZnCmluZGV4 IGUxZjU5MGUuLjE4MDUzMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0ltYWdlcy9CYWNrQXJyb3cuc3ZnCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9CYWNrQXJyb3cuc3ZnCkBAIC0xLDUgKzEsNSBAQAogPD94 bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KIDwhLS0gQ29weXJpZ2h0IMKpIDIw MTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLiAtLT4KLTxzdmcgdmVyc2lvbj0iMS4x IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA5IDkiPgot ICAgIDxwYXRoIGQ9Ik0gOSAwIEwgMC40ODQzNzUgNC40ODQzNzUgTCA5IDkgWiIvPgorPHN2ZyB2 ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0i MCAwIDEwIDE2Ij4KKyAgICA8cGF0aCBkPSJNIDMuMjA1NDAwNjQgNy43NTk4MzI4MyBMIDkuMzQ0 OCAxLjYyNDQgTCA3LjczODggMC4wMTc0IEwgLTAuMDAwMiA3Ljc1MTQgTCAwLjAwOTE5OTM3NTkg Ny43NjA4MDUyMyBMIDAuMDAxOCA3Ljc2ODIgTCA3LjczNTggMTUuNTA3MiBMIDkuMzQyOCAxMy45 MDEyIEwgMy4yMDU0MDA2NCA3Ljc1OTgzMjgzIFoiPjwvcGF0aD4KIDwvc3ZnPgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0JhY2tBcnJvd0xl Z2FjeS5zdmcgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvQmFj a0Fycm93TGVnYWN5LnN2ZwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lMWY1 OTBlCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvSW1hZ2VzL0JhY2tBcnJvd0xlZ2FjeS5zdmcKQEAgLTAsMCArMSw1IEBACis8P3htbCB2ZXJz aW9uPSIxLjAiIGVuY29kaW5nPSJ1dGYtOCI/PgorPCEtLSBDb3B5cmlnaHQgwqkgMjAxMyBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuIC0tPgorPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5z PSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDkgOSI+CisgICAgPHBh dGggZD0iTSA5IDAgTCAwLjQ4NDM3NSA0LjQ4NDM3NSBMIDkgOSBaIi8+Cis8L3N2Zz4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9Gb3J3YXJk QXJyb3cuc3ZnIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0Zv cndhcmRBcnJvdy5zdmcKaW5kZXggYzE2YmM2NS4uNjhiOGYxNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0ZvcndhcmRBcnJvdy5zdmcKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0ZvcndhcmRBcnJv dy5zdmcKQEAgLTEsNSArMSw1IEBACiA8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJ1dGYt OCI/PgogPCEtLSBDb3B5cmlnaHQgwqkgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuIC0tPgotPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw L3N2ZyIgdmlld0JveD0iMCAwIDkgOSI+Ci0gICAgPHBhdGggZD0iTSAwIDAgTCA4LjUxNTYyNSA0 LjQ4NDM3NSBMIDAgOSBaIi8+Cis8c3ZnIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cu dzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgMTAgMTYiPgorICAgIDxwYXRoIGQ9Ik0gNi4x MzkyNDkzMyA3Ljc1OTc4MjgzIEwgMC4wMDE4IDEzLjkwMTIgTCAxLjYwODggMTUuNTA3MiBMIDku MzQyOCA3Ljc2ODIgTCA5LjMzNTQ1MDY2IDcuNzYwODU1MjMgTCA5LjM0NDkgNy43NTE0IEwgMS42 MDU5IDAuMDE3NCBMIC0wLjAwMDEgMS42MjQ0IEwgNi4xMzkyNDkzMyA3Ljc1OTc4MjgzIFoiPjwv cGF0aD4KIDwvc3ZnPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvSW1hZ2VzL0ZvcndhcmRBcnJvd0xlZ2FjeS5zdmcgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9JbWFnZXMvRm9yd2FyZEFycm93TGVnYWN5LnN2ZwpuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jMTZiYzY1Ci0tLSAvZGV2L251bGwKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0ZvcndhcmRBcnJvd0xlZ2Fj eS5zdmcKQEAgLTAsMCArMSw1IEBACis8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJ1dGYt OCI/PgorPCEtLSBDb3B5cmlnaHQgwqkgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuIC0tPgorPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw L3N2ZyIgdmlld0JveD0iMCAwIDkgOSI+CisgICAgPHBhdGggZD0iTSAwIDAgTCA4LjUxNTYyNSA0 LjQ4NDM3NSBMIDAgOSBaIi8+Cis8L3N2Zz4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0J1dHRvblRvb2xiYXJJdGVtLmNzcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0J1dHRvblRvb2xiYXJJdGVtLmNzcwpp bmRleCBkNjJhMTg5Li5jZGRlZWIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9CdXR0b25Ub29sYmFySXRlbS5jc3MKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQnV0dG9uVG9vbGJhckl0ZW0uY3NzCkBA IC01OSw2ICs1OSwxMCBAQAogCiAudG9vbGJhciAuaXRlbS5idXR0b24gPiAubGFiZWwgewogICAg IHRleHQtYWxpZ246IGNlbnRlcjsKKyAgICBjb2xvcjogcmdiKDgwLCA4MCwgODApOworfQorCiti b2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnRvb2xiYXIgLml0ZW0uYnV0dG9uID4gLmxhYmVsIHsK ICAgICB0ZXh0LXNoYWRvdzogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjUpIDAgMXB4IDA7CiAgICAg Y29sb3I6IHJnYig2MCwgNjAsIDYwKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmNzcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFy YXRpb25TZWN0aW9uLmNzcwppbmRleCA1YjM2ZmIzLi40ODJlNzhjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9u U2VjdGlvbi5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uY3NzCkBAIC0zMCwzMCArMzAsNDIgQEAKICAg ICBwYWRkaW5nOiA1cHg7CiAKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsKKyAgICBib3Jk ZXItYm90dG9tOiAxcHggc29saWQgcmdiKDIxMCwgMjEwLCAyMTApOwogfQogCi0uc3R5bGUtZGVj bGFyYXRpb24tc2VjdGlvbiArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uIHsKK2JvZHkubWFj LXBsYXRmb3JtLmxlZ2FjeSAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbiB7CisgICAgYm9yZGVy LWJvdHRvbTogbm9uZTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zdHlsZS1kZWNs YXJhdGlvbi1zZWN0aW9uICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24gewogICAgIGJvcmRl ci10b3A6IDFweCBzb2xpZCByZ2IoMjEwLCAyMTAsIDIxMCk7CiB9CiAKIC5zdHlsZS1kZWNsYXJh dGlvbi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAgewogICAgIG1hcmdpbi1ib3R0b206IDE1cHg7CiAK KyAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgcmdiKDIxMCwgMjEwLCAyMTApOworfQorCiti b2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1p bi1ncm91cCB7CiAgICAgYm94LXNoYWRvdzogcmdiYSgwLCAwLCAwLCAwLjMpIDAgMnB4IDJweCAw OwogfQogCiAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3VwICsgLnN0eWxl LWRlY2xhcmF0aW9uLXNlY3Rpb24gewogICAgIG1hcmdpbi10b3A6IDE1cHg7CiAKLSAgICBib3Jk ZXItdG9wOiBub25lOworICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCByZ2IoMjEwLCAyMTAsIDIx MCk7Cit9CiAKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc3R5bGUtZGVjbGFyYXRpb24tc2Vj dGlvbi5sYXN0LWluLWdyb3VwICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24gewogICAgIGJv eC1zaGFkb3c6IHJnYmEoMCwgMCwgMCwgMC4zKSAwIDAgMnB4IDA7CisgICAgYm9yZGVyLXRvcDog bm9uZTsKIH0KIAotLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb246Zmlyc3QtY2hpbGQsCi1kaXY6 bm90KC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uKSArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0 aW9uLAotLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1pbi1ncm91cCArIC5zdHlsZS1k ZWNsYXJhdGlvbi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAsCi0uc3R5bGUtZGVjbGFyYXRpb24tc2Vj dGlvbi5sYXN0LWluLWdyb3VwICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb246bGFzdC1jaGls ZCB7Citib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb246 Zmlyc3QtY2hpbGQsCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgZGl2Om5vdCguc3R5bGUtZGVj bGFyYXRpb24tc2VjdGlvbikgKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbiwKK2JvZHkubWFj LXBsYXRmb3JtLmxlZ2FjeSAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3Vw ICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1pbi1ncm91cCwKK2JvZHkubWFjLXBs YXRmb3JtLmxlZ2FjeSAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3VwICsg LnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb246bGFzdC1jaGlsZCB7CiAgICAgYm94LXNoYWRvdzog cmdiYSgwLCAwLCAwLCAwLjMpIDAgMXB4IDNweCAxcHg7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGV0YWlsc1NpZGVi YXJQYW5lbC5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9D U1NTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwuY3NzCmluZGV4IDlkZjg4MmIuLjc2ZGYzYTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0 eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLmNzcwpAQCAtNDMs NiArNDMsNyBAQAogCiAuc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSA+IC5jb250 ZW50ID4gLnBzZXVkby1jbGFzc2VzIHsKICAgICBwYWRkaW5nOiAxMHB4OworICAgIGJvcmRlci1i b3R0b206IDFweCBzb2xpZCByZ2IoMTUzLCAxNTMsIDE1Myk7CiAKICAgICBkaXNwbGF5OiAtd2Vi a2l0LWZsZXg7CiAgICAgLXdlYmtpdC1mbGV4LWZsb3c6IHJvdyB3cmFwOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJv d3Nlci5qcwppbmRleCA3ZjU4N2ExLi44YjE1ZWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcwpA QCAtNDksMTIgKzQ5LDIyIEBAIFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlciA9IGZ1bmN0aW9u KGVsZW1lbnQsIGRlbGVnYXRlLCBkaXNhYmxlQmFja0ZvcndhcmQpCiAgICAgICAgIHRoaXMuX2Jh Y2tLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wgfCBX ZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db250cm9sLCBXZWJJbnNwZWN0 b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuTGVmdCwgdGhpcy5fYmFja0J1dHRvbkNsaWNrZWQuYmlu ZCh0aGlzKSk7CiAgICAgICAgIHRoaXMuX2ZvcndhcmRLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0 Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wgfCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1 dC5Nb2RpZmllci5Db250cm9sLCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuUmln aHQsIHRoaXMuX2ZvcndhcmRCdXR0b25DbGlja2VkLmJpbmQodGhpcykpOwogCi0gICAgICAgIHRo aXMuX2JhY2tCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuQnV0dG9uTmF2 aWdhdGlvbkl0ZW0oImJhY2siLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkJhY2sgKCVzKSIpLmZv cm1hdCh0aGlzLl9iYWNrS2V5Ym9hcmRTaG9ydGN1dC5kaXNwbGF5TmFtZSksICJJbWFnZXMvQmFj a0Fycm93LnN2ZyIsIDksIDkpOworICAgICAgICB2YXIgZm9yd2FyZEFycm93LCBiYWNrQXJyb3c7 CisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IuUGxhdGZvcm0ubmFtZSA9PT0gIm1hYyIgJiYgV2Vi SW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24ucmVsZWFzZSA8IDEwKSB7CisgICAgICAgICAgICBm b3J3YXJkQXJyb3cgPSB7c3JjOiAiSW1hZ2VzL0ZvcndhcmRBcnJvd0xlZ2FjeS5zdmciLCB3aWR0 aDogOSwgaGVpZ2h0OiA5fTsKKyAgICAgICAgICAgIGJhY2tBcnJvdyA9IHtzcmM6ICJJbWFnZXMv QmFja0Fycm93TGVnYWN5LnN2ZyIsIHdpZHRoOiA5LCBoZWlnaHQ6IDl9OworICAgICAgICB9Cisg ICAgICAgIGVsc2UgeworICAgICAgICAgICAgZm9yd2FyZEFycm93ID0ge3NyYzogIkltYWdlcy9G b3J3YXJkQXJyb3cuc3ZnIiwgd2lkdGg6IDEwLCBoZWlnaHQ6IDE2fTsKKyAgICAgICAgICAgIGJh Y2tBcnJvdyA9IHtzcmM6ICJJbWFnZXMvQmFja0Fycm93LnN2ZyIsIHdpZHRoOiAxMCwgaGVpZ2h0 OiAxNn07CisgICAgICAgIH0KKworICAgICAgICB0aGlzLl9iYWNrQnV0dG9uTmF2aWdhdGlvbkl0 ZW0gPSBuZXcgV2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVtKCJiYWNrIiwgV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJCYWNrICglcykiKS5mb3JtYXQodGhpcy5fYmFja0tleWJvYXJkU2hv cnRjdXQuZGlzcGxheU5hbWUpLCBiYWNrQXJyb3cuc3JjLCBiYWNrQXJyb3cud2lkdGgsIGJhY2tB cnJvdy5oZWlnaHQpOwogICAgICAgICB0aGlzLl9iYWNrQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWRk RXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xp Y2tlZCwgdGhpcy5fYmFja0J1dHRvbkNsaWNrZWQsIHRoaXMpOwogICAgICAgICB0aGlzLl9iYWNr QnV0dG9uTmF2aWdhdGlvbkl0ZW0uZW5hYmxlZCA9IGZhbHNlOwogICAgICAgICB0aGlzLl9uYXZp Z2F0aW9uQmFyLmFkZE5hdmlnYXRpb25JdGVtKHRoaXMuX2JhY2tCdXR0b25OYXZpZ2F0aW9uSXRl bSk7CiAKLSAgICAgICAgdGhpcy5fZm9yd2FyZEJ1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdl Ykluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbSgiZm9yd2FyZCIsIFdlYkluc3BlY3Rvci5V SVN0cmluZygiRm9yd2FyZCAoJXMpIikuZm9ybWF0KHRoaXMuX2ZvcndhcmRLZXlib2FyZFNob3J0 Y3V0LmRpc3BsYXlOYW1lKSwgIkltYWdlcy9Gb3J3YXJkQXJyb3cuc3ZnIiwgOSwgOSk7CisgICAg ICAgIHRoaXMuX2ZvcndhcmRCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXZWJJbnNwZWN0b3Iu QnV0dG9uTmF2aWdhdGlvbkl0ZW0oImZvcndhcmQiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkZv cndhcmQgKCVzKSIpLmZvcm1hdCh0aGlzLl9mb3J3YXJkS2V5Ym9hcmRTaG9ydGN1dC5kaXNwbGF5 TmFtZSksIGZvcndhcmRBcnJvdy5zcmMsIGZvcndhcmRBcnJvdy53aWR0aCwgZm9yd2FyZEFycm93 LmhlaWdodCk7CiAgICAgICAgIHRoaXMuX2ZvcndhcmRCdXR0b25OYXZpZ2F0aW9uSXRlbS5hZGRF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlj a2VkLCB0aGlzLl9mb3J3YXJkQnV0dG9uQ2xpY2tlZCwgdGhpcyk7CiAgICAgICAgIHRoaXMuX2Zv cndhcmRCdXR0b25OYXZpZ2F0aW9uSXRlbS5lbmFibGVkID0gZmFsc2U7CiAgICAgICAgIHRoaXMu X25hdmlnYXRpb25CYXIuYWRkTmF2aWdhdGlvbkl0ZW0odGhpcy5fZm9yd2FyZEJ1dHRvbk5hdmln YXRpb25JdGVtKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmNzcwppbmRleCAzMTk0YjU5Li5jNGMxZDky IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9E T01UcmVlT3V0bGluZS5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRE9NVHJlZU91dGxpbmUuY3NzCkBAIC00NCwxMCArNDQsMTQgQEAKICAgICBsZWZ0 OiAzcHg7CiAgICAgcmlnaHQ6IDNweDsKIAotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYmEoNTYs IDEyMSwgMjE3LCAwLjEpOworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYmEoMCwgMTI4LCAyNTIs IDAuMSk7CiAgICAgYm9yZGVyLXJhZGl1czogNXB4OwogfQogCitib2R5Lm1hYy1wbGF0Zm9ybS5s ZWdhY3kgLmRvbS10cmVlLW91dGxpbmUgbGkuaG92ZXJlZDpub3QoLnNlbGVjdGVkKSAuc2VsZWN0 aW9uIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2JhKDU2LCAxMjEsIDIxNywgMC4xKTsKK30K KwogLmRvbS10cmVlLW91dGxpbmUgbGkgLnNlbGVjdGlvbiB7CiAgICAgZGlzcGxheTogbm9uZTsK ICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CkBAIC02NSwxMCArNjksMTggQEAKIC5kb20tdHJlZS1v dXRsaW5lIGxpLmVsZW1lbnRzLWRyYWctb3ZlciAuc2VsZWN0aW9uIHsKICAgICBkaXNwbGF5OiBi bG9jazsKICAgICBtYXJnaW4tdG9wOiAtMnB4OworICAgIGJvcmRlci10b3A6IDJweCBzb2xpZCBy Z2IoMCwgMTI4LCAyNTIpOworfQorCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRvbS10cmVl LW91dGxpbmUgbGkuZWxlbWVudHMtZHJhZy1vdmVyIC5zZWxlY3Rpb24gewogICAgIGJvcmRlci10 b3A6IDJweCBzb2xpZCByZ2IoNTYsIDEyMSwgMjE3KTsKIH0KIAogLmRvbS10cmVlLW91dGxpbmU6 Zm9jdXMgbGkuc2VsZWN0ZWQgLnNlbGVjdGlvbiB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdi KDAsIDEyOCwgMjUyKTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kb20tdHJlZS1v dXRsaW5lOmZvY3VzIGxpLnNlbGVjdGVkIC5zZWxlY3Rpb24gewogICAgIGJhY2tncm91bmQtY29s b3I6IHJnYig1NiwgMTIxLCAyMTcpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXNoYm9hcmRDb250YWluZXJWaWV3LmNzcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Rhc2hib2FyZENvbnRhaW5l clZpZXcuY3NzCmluZGV4IDI2OTg2ZGEuLmY5M2E2NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Rhc2hib2FyZENvbnRhaW5lclZpZXcuY3Nz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Rhc2hib2Fy ZENvbnRhaW5lclZpZXcuY3NzCkBAIC0yOCw4ICsyOCw5IEBACiAKICAgICB3aWR0aDogMzc1cHg7 CiAKLSAgICBib3JkZXI6IDFweCBzb2xpZCByZ2IoMTYzLCAxNjMsIDE2Myk7CisgICAgYm9yZGVy OiAxcHggc29saWQgcmdiKDI1NSwgMjU1LCAyNTUpOwogICAgIGJvcmRlci1yYWRpdXM6IDRweDsK KyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjU1LCAyNTUsIDI1NSk7CiAKICAgICBib3gtc2hh ZG93OiByZ2JhKDI1NSwgMjU1LCAyNTUsIDAuNDUpIDAgMXB4IDA7CiAKQEAgLTM3LDcgKzM4LDE3 IEBACiAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKIH0KIAorYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5 IC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKKyAgICBib3JkZXItY29sb3I6IHJnYigx NjMsIDE2MywgMTYzKTsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsKK30KKwog Ym9keS53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIgeworICAg IGJvcmRlci1jb2xvcjogcmdiKDIyMCwgMjIwLCAyMjApOworICAgIGJhY2tncm91bmQtY29sb3I6 IHJnYigyNDYsIDI0NiwgMjQ2KTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5LndpbmRv dy1pbmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lciB7CiAgICAgYm9yZGVyLWNv bG9yOiByZ2IoMTk2LCAxOTYsIDE5Nik7CiAgICAgYmFja2dyb3VuZC1pbWFnZTogbm9uZTsKICAg ICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjM5LCAyMzksIDIzOSk7CkBAIC03OCwxNiArODksMjYg QEAgYm9keS53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIgewog ICAgIGxlZnQ6IDA7CiAgICAgcmlnaHQ6IDA7CiAKKyAgICBwYWRkaW5nOiAwIDVweDsKKworICAg IGJhY2tncm91bmQtY29sb3I6IHJnYigyNTUsIDI1NSwgMjU1KTsKKworICAgIC13ZWJraXQtYW5p bWF0aW9uLWR1cmF0aW9uOiAwLjRzOworfQorCitib2R5LndpbmRvdy1pbmFjdGl2ZSAudG9vbGJh ciAuZGFzaGJvYXJkIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjQ2LCAyNDYsIDI0Nik7 Cit9CisKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAudG9vbGJhciAuZGFzaGJvYXJkLAorYm9k eS5tYWMtcGxhdGZvcm0ubGVnYWN5LndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJk IHsKICAgICBiYWNrZ3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2Jh KDAsIDEyOCwgMjU1LCAwKSwgcmdiYSgwLCAxMjgsIDI1NSwgMC4wNzUpKSwKICAgICAgICAgbGlu ZWFyLWdyYWRpZW50KHRvIHJpZ2h0LCByZ2JhKDAsIDAsIDAsIDAuMDkpLCB0cmFuc3BhcmVudCwg cmdiYSgwLCAwLCAwLCAwLjA5KSksCiAgICAgICAgIGxpbmVhci1ncmFkaWVudCh0byBib3R0b20s IHJnYigyNDAsIDI0NCwgMjUxKSwgcmdiKDI1MCwgMjUzLCAyNTUpKTsKICAgICBiYWNrZ3JvdW5k LXNpemU6IDEwMCUgNnB4LCBhdXRvLCBhdXRvOwogICAgIGJhY2tncm91bmQtcG9zaXRpb246IGJv dHRvbSwgY2VudGVyLCBjZW50ZXI7CiAgICAgYmFja2dyb3VuZC1yZXBlYXQ6IG5vLXJlcGVhdDsK LQotICAgIHBhZGRpbmc6IDAgNXB4OwotCi0gICAgLXdlYmtpdC1hbmltYXRpb24tZHVyYXRpb246 IDAuNHM7CisgICAgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7CiB9CiAKIC50b29sYmFy IC5kYXNoYm9hcmQudmlzaWJsZSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3JpZC5jc3MKaW5kZXggMzk1NzdjNC4uOWFjM2RkNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0 YUdyaWQuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0RhdGFHcmlkLmNzcwpAQCAtNzUsMjAgKzc1LDI2IEBACiAgICAgdGV4dC1hbGlnbjogbGVmdDsK ICAgICB2ZXJ0aWNhbC1hbGlnbjogbWlkZGxlOwogCisgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlk IHJnYigxNzksIDE3OSwgMTc5KTsKKyAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgcmdiKDE4 MiwgMTgyLCAxODIpOworCisgICAgaGVpZ2h0OiAxNXB4OworICAgIGZvbnQtd2VpZ2h0OiBub3Jt YWw7CisgICAgcGFkZGluZzogMCA0cHg7CisgICAgd2hpdGUtc3BhY2U6IG5vd3JhcDsKKyAgICBv dmVyZmxvdzogaGlkZGVuOworfQorCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRhdGEtZ3Jp ZCB0aCB7CiAgICAgYmFja2dyb3VuZC1pbWFnZTogbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwg cmdiYSgwLCAwLCAwLCAwLjIpLCByZ2JhKDAsIDAsIDAsIDAuMikpLCBsaW5lYXItZ3JhZGllbnQo dG8gYm90dG9tLCB0cmFuc3BhcmVudCwgdHJhbnNwYXJlbnQpLAogICAgICAgICBsaW5lYXItZ3Jh ZGllbnQodG8gYm90dG9tLCB3aGl0ZSwgd2hpdGUgMjUlLCByZ2IoMjQ0LCAyNDQsIDI0NCkgNTAl LCByZ2IoMjM2LCAyMzYsIDIzNikgNTAlLCByZ2IoMjM3LCAyMzcsIDIzNykpOworCiAgICAgYmFj a2dyb3VuZC1zaXplOiAxcHggMTFweCwgMCAwLCAxMDAlIDEwMCU7CiAgICAgYmFja2dyb3VuZC1w b3NpdGlvbjogbGVmdCAycHgsIHJpZ2h0IDJweCwgY2VudGVyOwogICAgIGJhY2tncm91bmQtcmVw ZWF0OiBuby1yZXBlYXQ7CiAKICAgICBib3gtc2hhZG93OiBpbnNldCByZ2JhKDI1NSwgMjU1LCAy NTUsIDAuMykgMCAtMXB4IDA7CiAgICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHJnYigxODIs IDE4MiwgMTgyKTsKLQotICAgIGhlaWdodDogMTVweDsKLSAgICBmb250LXdlaWdodDogbm9ybWFs OwotICAgIHBhZGRpbmc6IDAgNHB4OwotICAgIHdoaXRlLXNwYWNlOiBub3dyYXA7Ci0gICAgb3Zl cmZsb3c6IGhpZGRlbjsKIH0KIAogLmRhdGEtZ3JpZCB0aDpmaXJzdC1jaGlsZCB7CkBAIC0zMTMs MTUgKzMxOSwyMyBAQCBib2R5LndpbmRvdy1pbmFjdGl2ZSAuZGF0YS1ncmlkIHRoLnNvcnQtZGVz Y2VuZGluZyB7CiB9CiAKIC5kYXRhLWdyaWQgdHIuc2VsZWN0ZWQgewotICAgIGJhY2tncm91bmQt Y29sb3I6IHJnYigyMTIsIDIxMiwgMjEyKSAhaW1wb3J0YW50OworICAgIGJhY2tncm91bmQtY29s b3I6IHJnYigxODUsIDE4NCwgMTg1KSAhaW1wb3J0YW50OwogICAgIGNvbG9yOiBpbmhlcml0ICFp bXBvcnRhbnQ7CiB9CiAKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZGF0YS1ncmlkIHRyLnNl bGVjdGVkIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjEyLCAyMTIsIDIxMikgIWltcG9y dGFudDsKK30KKwogLmRhdGEtZ3JpZDpmb2N1cyB0ci5zZWxlY3RlZCB7Ci0gICAgYmFja2dyb3Vu ZC1jb2xvcjogcmdiKDU2LCAxMjEsIDIxNykgIWltcG9ydGFudDsKKyAgICBiYWNrZ3JvdW5kLWNv bG9yOiByZ2IoMCwgMTI4LCAyNTIpICFpbXBvcnRhbnQ7CiAgICAgY29sb3I6IHdoaXRlICFpbXBv cnRhbnQ7CiB9CiAKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZGF0YS1ncmlkOmZvY3VzIHRy LnNlbGVjdGVkIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoNTYsIDEyMSwgMjE3KSAhaW1w b3J0YW50OworfQorCiAuZGF0YS1ncmlkIHRyOm5vdCgucGFyZW50KSB0ZC5kaXNjbG9zdXJlIHsK ICAgICB0ZXh0LWluZGVudDogMTBweDsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uLmNzcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uLmNzcwppbmRleCAy M2M2MDA1Li45YzkxZmQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbi5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb24uY3NzCkBAIC0yNCwxMCArMjQs MzMgQEAKICAqLwogCiAuZGV0YWlscy1zZWN0aW9uIHsKKyAgICBmb250LXNpemU6IDEwcHg7Cisg ICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDI0MiwgMjQyLCAyNDIpOworICAgIGJvcmRlci1ib3R0 b206IDFweCBzb2xpZCByZ2IoMTUzLCAxNTMsIDE1Myk7Cit9CisKK2JvZHkubWFjLXBsYXRmb3Jt LmxlZ2FjeSAuZGV0YWlscy1zZWN0aW9uIHsKICAgICBtYXJnaW4tdG9wOiAtMXB4OwogICAgIG1h cmdpbi1ib3R0b206IC0xcHg7CiAKLSAgICBmb250LXNpemU6IDEwcHg7CisgICAgYm9yZGVyLWJv dHRvbTogbm9uZTsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsKK30KKworLmRl dGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0aW9uIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBy Z2IoMjU1LCAyNTUsIDI1NSk7Cit9CisKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZGV0YWls cy1zZWN0aW9uIC5kZXRhaWxzLXNlY3Rpb24geworICAgIGJhY2tncm91bmQtY29sb3I6IHRyYW5z cGFyZW50OworfQorCisuZGV0YWlscy1zZWN0aW9uIC5kZXRhaWxzLXNlY3Rpb246bGFzdC1jaGls ZCB7CisgICAgYm9yZGVyLWJvdHRvbTogbm9uZTsKK30KKworLmRldGFpbHMtc2VjdGlvbiAuZGV0 YWlscy1zZWN0aW9uOmZpcnN0LWNoaWxkIHsKKyAgICBib3JkZXItdG9wOiAxcHggc29saWQgcmdi KDE1MywgMTUzLCAxNTMpOwogfQogCiAuZGV0YWlscy1zZWN0aW9uID4gLmhlYWRlciB7CkBAIC0z NSwxMyArNTgsOCBAQAogICAgIHRvcDogLTFweDsKICAgICBoZWlnaHQ6IDIzcHg7CiAKLSAgICBi b3JkZXItdG9wOiAxcHggc29saWQgcmdiKDE1MywgMTUzLCAxNTMpOwotICAgIGJvcmRlci1ib3R0 b206IDFweCBzb2xpZCByZ2IoMTUzLCAxNTMsIDE1Myk7Ci0gICAgYm94LXNoYWRvdzogaW5zZXQg cmdiYSgyNTUsIDI1NSwgMjU1LCAwLjIpIDAgMXB4IDA7Ci0gICAgYmFja2dyb3VuZC1pbWFnZTog bGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgcmdiKDIzOCwgMjQwLCAyNDQpLCByZ2IoMjI0LCAy MjYsIDIzMCkpOwotCisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDI0MiwgMjQyLCAyNDIpOwog ICAgIGNvbG9yOiByZ2IoNTcsIDU3LCA1Nyk7Ci0gICAgdGV4dC1zaGFkb3c6IHJnYmEoMjU1LCAy NTUsIDI1NSwgMC41KSAwIDFweCAwOwogCiAgICAgd2hpdGUtc3BhY2U6IG5vd3JhcDsKICAgICBv dmVyZmxvdzogaGlkZGVuOwpAQCAtNTYsMTMgKzc0LDQ0IEBACiAgICAgei1pbmRleDogMjAwOwog fQogCi0uZGV0YWlscy1zZWN0aW9uIC5kZXRhaWxzLXNlY3Rpb24gPiAuaGVhZGVyIHsKLSAgICBi YWNrZ3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2IoMjUwLCAyNTAs IDI1MCksIHJnYigyNDAsIDI0MCwgMjQwKSk7Citib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRl dGFpbHMtc2VjdGlvbiA+IC5oZWFkZXIgeworICAgIGJvcmRlci1ib3R0b206IDFweCBzb2xpZCBy Z2IoMTUzLCAxNTMsIDE1Myk7CisgICAgYm94LXNoYWRvdzogaW5zZXQgcmdiYSgyNTUsIDI1NSwg MjU1LCAwLjIpIDAgMXB4IDA7CisgICAgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7Cisg ICAgYmFja2dyb3VuZC1pbWFnZTogbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgcmdiKDIzOCwg MjQwLCAyNDQpLCByZ2IoMjI0LCAyMjYsIDIzMCkpOwogCisgICAgYm9yZGVyLXRvcDogMXB4IHNv bGlkIHJnYigxNTMsIDE1MywgMTUzKTsKKworICAgIHRleHQtc2hhZG93OiByZ2JhKDI1NSwgMjU1 LCAyNTUsIDAuNSkgMCAxcHggMDsKK30KKworLmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0 aW9uID4gLmhlYWRlciB7CiAgICAgdG9wOiAyMXB4OworICAgIGJhY2tncm91bmQtY29sb3I6IHJn YigyNTUsIDI1NSwgMjU1KTsKKworICAgIGJveC1zaGFkb3c6IHJnYmEoMCwgMCwgMCwgMC4xKSAw IDFweCAwOwogCiAgICAgLyogRW5zdXJlIHRoZXNlIGhlYWRlcnMgYXJlIGRpc3BsYXllZCBiZWxv dyB0aGUgcGFyZW50IGhlYWRlciBidXQgYWJvdmUgc2Nyb2xsYmFycy4gKi8KICAgICB6LWluZGV4 OiAxMDA7CisKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kZXRhaWxzLXNlY3Rpb24g LmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXIgeworICAgIGJhY2tncm91bmQtY29sb3I6IHRyYW5z cGFyZW50OworICAgIGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20s IHJnYigyNTAsIDI1MCwgMjUwKSwgcmdiKDI0MCwgMjQwLCAyNDApKTsKKyAgICBib3gtc2hhZG93 OiBub25lOworfQorCisuZGV0YWlscy1zZWN0aW9uIC5kZXRhaWxzLXNlY3Rpb24uY29sbGFzcHNl ZCA+IC5oZWFkZXIgeworICAgIGJveC1zaGFkb3c6IG5vbmU7Cit9CisKKy5kZXRhaWxzLXNlY3Rp b24uY29tcHV0ZWQtc3R5bGUtcHJvcGVydGllczpub3QoLmNvbGxhcHNlZCkgPiAuaGVhZGVyIHsK KyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjU1LCAyNTUsIDI1NSk7Cit9CisKK2JvZHkubWFj LXBsYXRmb3JtLmxlZ2FjeSAuZGV0YWlscy1zZWN0aW9uLmNvbXB1dGVkLXN0eWxlLXByb3BlcnRp ZXM6bm90KC5jb2xsYXBzZWQpID4gLmhlYWRlciB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogdHJh bnNwYXJlbnQ7CiB9CiAKIC5kZXRhaWxzLXNlY3Rpb24gPiAuaGVhZGVyOjpiZWZvcmUgewpAQCAt MTMzLDkgKzE4MiwyMiBAQAogCiAuZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXAg ewogICAgIGRpc3BsYXk6IHRhYmxlLXJvdy1ncm91cDsKKyAgICBib3JkZXItYm90dG9tOiAxcHgg c29saWQgcmdiKDE1MywgMTUzLCAxNTMpOworfQorCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kg LmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwIHsKKyAgICBib3JkZXItYm90dG9t OiBub25lOworfQorCisuZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bGFzdC1j aGlsZCB7CisgICAgYm9yZGVyLWJvdHRvbTogbm9uZTsKIH0KIAogLmRldGFpbHMtc2VjdGlvbiA+ IC5jb250ZW50ID4gLmdyb3VwOm50aC1jaGlsZChldmVuKSB7CisgICAgYmFja2dyb3VuZC1jb2xv cjogcmdiKDIzMywgMjMzLCAyMzMpOworfQorCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRl dGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwOm50aC1jaGlsZChldmVuKSB7CiAgICAg YmFja2dyb3VuZC1jb2xvcjogcmdiKDIyMiwgMjIyLCAyMjIpOwogfQogCkBAIC0xNDQsMTAgKzIw NiwxMCBAQAogICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCByZ2IoMTUzLCAxNTMsIDE1Myk7CiB9 CiAKLS5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDpudGgtY2hpbGQoZXZlbikg PiAucm93Om5vdCguc2ltcGxlKTpsYXN0LWNoaWxkLAotLmRldGFpbHMtc2VjdGlvbiA+IC5jb250 ZW50ID4gLmdyb3VwOmxhc3QtY2hpbGQgPiAucm93Om5vdCguc2ltcGxlKTpsYXN0LWNoaWxkLAot LmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwOm50aC1jaGlsZChldmVuKSA+IC5y b3cuc2ltcGxlOmxhc3QtY2hpbGQgPiAqLAotLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4g Lmdyb3VwOmxhc3QtY2hpbGQgPiAucm93LnNpbXBsZTpsYXN0LWNoaWxkID4gKiB7Citib2R5Lm1h Yy1wbGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwOm50 aC1jaGlsZChldmVuKSA+IC5yb3c6bm90KC5zaW1wbGUpOmxhc3QtY2hpbGQsCitib2R5Lm1hYy1w bGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwOmxhc3Qt Y2hpbGQgPiAucm93Om5vdCguc2ltcGxlKTpsYXN0LWNoaWxkLAorYm9keS5tYWMtcGxhdGZvcm0u bGVnYWN5IC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDpudGgtY2hpbGQoZXZl bikgPiAucm93LnNpbXBsZTpsYXN0LWNoaWxkID4gKiwKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2Fj eSAuZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bGFzdC1jaGlsZCA+IC5yb3cu c2ltcGxlOmxhc3QtY2hpbGQgPiAqIHsKICAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgcmdi KDE1MywgMTUzLCAxNTMpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9GaWx0ZXJCYXIuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvRmlsdGVyQmFyLmNzcwppbmRleCBkODlmMjY4Li5hYjYxY2U5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9G aWx0ZXJCYXIuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0ZpbHRlckJhci5jc3MKQEAgLTQzLDcgKzQzLDcgQEAKICAgICAtd2Via2l0LWFwcGVhcmFu Y2U6IG5vbmU7CiAKICAgICBib3JkZXI6IDFweCBzb2xpZCByZ2JhKDAsIDAsIDAsIDAuMzUpOwot ICAgIGJvcmRlci1yYWRpdXM6IDEwcHg7CisgICAgYm9yZGVyLXJhZGl1czogM3B4OwogICAgIGJh Y2tncm91bmQtY29sb3I6IHJnYmEoMjU1LCAyNTUsIDI1NSwgMC4yKTsKICAgICBib3gtc2hhZG93 OiBpbnNldCByZ2JhKDAsIDAsIDAsIDAuMSkgMCAxcHggMDsKICAgICBiYWNrZ3JvdW5kLWNsaXA6 IHBhZGRpbmctYm94OwpAQCAtNTMsNiArNTMsMTAgQEAKICAgICB0cmFuc2l0aW9uOiBiYWNrZ3Jv dW5kLWNvbG9yIDIwMG1zIGVhc2UtaW4tb3V0OwogfQogCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdh Y3kgLmZpbHRlci1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSB7CisgICAgYm9yZGVyLXJhZGl1 czogMTBweDsKK30KKwogLmZpbHRlci1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXTo6LXdlYmtp dC1pbnB1dC1wbGFjZWhvbGRlciB7CiAgICAgY29sb3I6IHJnYmEoMCwgMCwgMCwgMC4zNSk7CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9G aW5kQmFubmVyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RmluZEJhbm5lci5qcwppbmRleCBkNjc2YWJhLi5kYTNmMjlhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZpbmRCYW5uZXIuanMKQEAg LTMyNiw4ICszMjYsMTcgQEAgV2ViSW5zcGVjdG9yLkZpbmRCYW5uZXIucHJvdG90eXBlID0gewog ICAgICAgICBzcGVjaWZpY2F0aW9uc1sibm9ybWFsIl0gPSB7ZmlsbENvbG9yOiBbODEsIDgxLCA4 MV19OwogICAgICAgICBzcGVjaWZpY2F0aW9uc1sibm9ybWFsLWFjdGl2ZSJdID0ge2ZpbGxDb2xv cjogWzM3LCAzNywgMzddfTsKIAotICAgICAgICBnZW5lcmF0ZUNvbG9yZWRJbWFnZXNGb3JDU1Mo IkltYWdlcy9CYWNrQXJyb3cuc3ZnIiwgc3BlY2lmaWNhdGlvbnMsIDcsIDcsICJmaW5kLWJhbm5l ci1wcmV2aW91cy1hcnJvdy0iKTsKLSAgICAgICAgZ2VuZXJhdGVDb2xvcmVkSW1hZ2VzRm9yQ1NT KCJJbWFnZXMvRm9yd2FyZEFycm93LnN2ZyIsIHNwZWNpZmljYXRpb25zLCA3LCA3LCAiZmluZC1i YW5uZXItbmV4dC1hcnJvdy0iKTsKKyAgICAgICAgdmFyIGZvcndhcmRBcnJvdywgYmFja0Fycm93 OworICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLlBsYXRmb3JtLm5hbWUgPT09ICJtYWMiICYmIFdl Ykluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLnJlbGVhc2UgPCAxMCkgeworICAgICAgICAgICAg Zm9yd2FyZEFycm93ID0gIkltYWdlcy9Gb3J3YXJkQXJyb3dMZWdhY3kuc3ZnIjsKKyAgICAgICAg ICAgIGJhY2tBcnJvdyA9ICJJbWFnZXMvQmFja0Fycm93TGVnYWN5LnN2ZyI7CisgICAgICAgIH0g ZWxzZSB7CisgICAgICAgICAgICBmb3J3YXJkQXJyb3cgPSAiSW1hZ2VzL0ZvcndhcmRBcnJvdy5z dmciOworICAgICAgICAgICAgYmFja0Fycm93ID0gIkltYWdlcy9CYWNrQXJyb3cuc3ZnIjsKKyAg ICAgICAgfQorCisgICAgICAgIGdlbmVyYXRlQ29sb3JlZEltYWdlc0ZvckNTUyhiYWNrQXJyb3cs IHNwZWNpZmljYXRpb25zLCA3LCA3LCAiZmluZC1iYW5uZXItcHJldmlvdXMtYXJyb3ctIik7Cisg ICAgICAgIGdlbmVyYXRlQ29sb3JlZEltYWdlc0ZvckNTUyhmb3J3YXJkQXJyb3csIHNwZWNpZmlj YXRpb25zLCA3LCA3LCAiZmluZC1iYW5uZXItbmV4dC1hcnJvdy0iKTsKICAgICB9CiB9OwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZp Z2F0aW9uU2lkZWJhclBhbmVsLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL05hdmlnYXRpb25TaWRlYmFyUGFuZWwuY3NzCmluZGV4IDdhY2UyMWEuLjkxNmE0 MGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L05hdmlnYXRpb25TaWRlYmFyUGFuZWwuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25TaWRlYmFyUGFuZWwuY3NzCkBAIC0yMTMsMTkg KzIxMywzNCBAQAogLm5hdmlnYXRpb24tc2lkZWJhci1wYW5lbC1jb250ZW50LXRyZWUtb3V0bGlu ZSAuaXRlbS5zZWxlY3RlZCB7CiAgICAgY29sb3I6IHdoaXRlOwogCisgICAgYmFja2dyb3VuZC1j b2xvcjogcmdiKDE4NSwgMTg0LCAxODUpOworfQorCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kg Lm5hdmlnYXRpb24tc2lkZWJhci1wYW5lbC1jb250ZW50LXRyZWUtb3V0bGluZSAuaXRlbS5zZWxl Y3RlZCB7CiAgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIHJnYigxNjIsIDE3NywgMjAxKTsKIAor ICAgIGJhY2tncm91bmQtY29sb3I6IHRyYW5zcGFyZW50OwogICAgIGJhY2tncm91bmQtaW1hZ2U6 IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHJnYigxNzUsIDE5MCwgMjEzKSwgcmdiKDEzMCwg MTUxLCAxODIpKTsKICAgICBiYWNrZ3JvdW5kLW9yaWdpbjogcGFkZGluZzsKICAgICBiYWNrZ3Jv dW5kLWNsaXA6IHBhZGRpbmc7CiB9CiAKIC5uYXZpZ2F0aW9uLXNpZGViYXItcGFuZWwtY29udGVu dC10cmVlLW91dGxpbmU6Zm9jdXMgLml0ZW0uc2VsZWN0ZWQgeworICAgIGJhY2tncm91bmQtY29s b3I6IHJnYigwLCAxMjgsIDI1Mik7Cit9CisKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAubmF2 aWdhdGlvbi1zaWRlYmFyLXBhbmVsLWNvbnRlbnQtdHJlZS1vdXRsaW5lOmZvY3VzIC5pdGVtLnNl bGVjdGVkIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsKICAgICBib3JkZXIt dG9wOiAxcHggc29saWQgcmdiKDE0OCwgMTc0LCAxOTMpOwogICAgIGJhY2tncm91bmQtaW1hZ2U6 IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHJnYigxNTQsIDE4MCwgMjAzKSwgcmdiKDExMiwg MTM5LCAxNzYpKTsKIH0KIAogYm9keS53aW5kb3ctaW5hY3RpdmUgLm5hdmlnYXRpb24tc2lkZWJh ci1wYW5lbC1jb250ZW50LXRyZWUtb3V0bGluZSAuaXRlbS5zZWxlY3RlZCB7CisgICAgYmFja2dy b3VuZC1jb2xvcjogcmdiKDIxMiwgMjEyLCAyMTIpOworfQorCitib2R5Lm1hYy1wbGF0Zm9ybS5s ZWdhY3kud2luZG93LWluYWN0aXZlIC5uYXZpZ2F0aW9uLXNpZGViYXItcGFuZWwtY29udGVudC10 cmVlLW91dGxpbmUgLml0ZW0uc2VsZWN0ZWQgeworICAgIGJhY2tncm91bmQtY29sb3I6IHRyYW5z cGFyZW50OwogICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCByZ2IoMTY4LCAxNjgsIDE2OCk7CiAg ICAgYmFja2dyb3VuZC1pbWFnZTogbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgcmdiKDE5NCwg MTk0LCAxOTQpLCByZ2IoMTU4LCAxNTgsIDE1OCkpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmFkaW9CdXR0b25OYXZpZ2F0aW9uSXRl bS5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SYWRpb0J1 dHRvbk5hdmlnYXRpb25JdGVtLmNzcwppbmRleCA1MWUwNGY0Li4yMjE5OTkwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SYWRpb0J1dHRvbk5h dmlnYXRpb25JdGVtLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9SYWRpb0J1dHRvbk5hdmlnYXRpb25JdGVtLmNzcwpAQCAtMzIsMTEgKzMyLDE2IEBA CiB9CiAKIC5uYXZpZ2F0aW9uLWJhciAuaXRlbS5yYWRpby5idXR0b24udGV4dC1vbmx5LnNlbGVj dGVkIHsKKyAgICBjb2xvcjogcmdiKDUyLCAxNDEsIDIyMCk7CisgICAgZm9udC13ZWlnaHQ6IGJv bGQ7Cit9CisKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAubmF2aWdhdGlvbi1iYXIgLml0ZW0u cmFkaW8uYnV0dG9uLnRleHQtb25seS5zZWxlY3RlZCB7CisgICAgY29sb3I6IHJnYigwLCAwLCAw KTsKKwogICAgIGJhY2tncm91bmQtcmVwZWF0OiBuby1yZXBlYXQ7CiAgICAgYmFja2dyb3VuZC1p bWFnZTogbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgcmdiYSgwLCAwLCAwLCAwLjE1KSwgcmdi YSgwLCAwLCAwLCAwLjA5KSAxMiUsIHJnYmEoMCwgMCwgMCwgMC4wNikgMTIlLCB0cmFuc3BhcmVu dCksIGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHJnYmEoMCwgMCwgMCwgMC40NSksIHRyYW5z cGFyZW50KSwKICAgICAgICAgbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgcmdiYSgwLCAwLCAw LCAwLjQ1KSwgdHJhbnNwYXJlbnQpOwogICAgIGJhY2tncm91bmQtc2l6ZTogMTAwJSAxMDAlLCAx cHggMTAwJSwgMXB4IDEwMCU7CiAgICAgYmFja2dyb3VuZC1wb3NpdGlvbjogbGVmdCB0b3AsIGxl ZnQgdG9wLCByaWdodCB0b3A7Ci0KLSAgICBmb250LXdlaWdodDogYm9sZDsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1J1bGVzU3R5bGVE ZXRhaWxzUGFuZWwuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvUnVsZXNTdHlsZURldGFpbHNQYW5lbC5jc3MKaW5kZXggODExYjA1My4uMjIwNjU2YiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUnVsZXNT dHlsZURldGFpbHNQYW5lbC5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvUnVsZXNTdHlsZURldGFpbHNQYW5lbC5jc3MKQEAgLTM2LDYgKzM2LDExIEBA CiAKIC5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlIC5ydWxlcyAubGFiZWwgKyAu c3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbiB7CiAgICAgbWFyZ2luLXRvcDogNXB4OworICAgIGJv cmRlci10b3A6IDFweCBzb2xpZCByZ2IoMjEwLCAyMTAsIDIxMCk7Cit9CisKK2JvZHkubWFjLXBs YXRmb3JtLmxlZ2FjeSAuc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSAucnVsZXMg LmxhYmVsICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24geworICAgIGJvcmRlci10b3A6IG5v bmU7CiB9CiAKIC5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlIC5ydWxlcyAubmV3 LXJ1bGUgewpAQCAtNDMsNyArNDgsNiBAQAogICAgIGZvbnQtd2VpZ2h0OiBib2xkOwogCiAgICAg Y29sb3I6IGJsYWNrOwotICAgIHRleHQtc2hhZG93OiB3aGl0ZSAwIDFweCAwOwogCiAgICAgcGFk ZGluZzogNXB4IDEwcHg7CiAKQEAgLTUzLDYgKzU3LDE5IEBACiAgICAgb3BhY2l0eTogMC41Owog fQogCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5j c3Mtc3R5bGUgLnJ1bGVzIC5uZXctcnVsZSB7CisgICAgdGV4dC1zaGFkb3c6IHdoaXRlIDAgMXB4 IDA7CisgICAgYm9yZGVyLWJvdHRvbTogbm9uZTsKK30KKworLnNpZGViYXIgPiAucGFuZWwuZGV0 YWlscy5jc3Mtc3R5bGUgLnJ1bGVzIC5uZXctcnVsZSArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0 aW9uIHsKKyAgICBib3JkZXItdG9wOiAxcHggc29saWQgcmdiKDIxMCwgMjEwLCAyMTApOworfQor Citib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mt c3R5bGUgLnJ1bGVzIC5uZXctcnVsZSArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uIHsKKyAg ICBib3JkZXItdG9wOiBub25lOworfQorCiAuc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1z dHlsZSAucnVsZXMgLm5ldy1ydWxlIGltZyB7CiAgICAgY29udGVudDogdXJsKC4uL0ltYWdlcy9Q bHVzLnN2Zyk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1Njb3BlQmFyLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1Njb3BlQmFyLmNzcwppbmRleCBhMTc4OWQ2Li4zYzcwNTQ3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUJhci5jc3MK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVCYXIu Y3NzCkBAIC0zMyw3ICszMyw2IEBACiAgICAgbWFyZ2luOiAwIDJweDsKICAgICBwYWRkaW5nOiAw IDhweCAzcHg7CiAgICAgZm9udC1zaXplOiAxMXB4OwotICAgIGZvbnQtd2VpZ2h0OiBib2xkOwog ICAgIGxpbmUtaGVpZ2h0OiAxMXB4OwogICAgIGNvbG9yOiByZ2IoNDYsIDQ2LCA0Nik7CiAgICAg YmFja2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7CkBAIC00NSw2ICs0NCwxMCBAQAogICAgIHRy YW5zaXRpb24tcHJvcGVydHk6IGJhY2tncm91bmQtY29sb3IsIGJvcmRlci1jb2xvcjsKIH0KIAor Ym9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zY29wZS1iYXIgPiBsaSB7CisgICAgZm9udC13ZWln aHQ6IGJvbGQ7Cit9CisKIC5zY29wZS1iYXIgPiBsaS5zZWxlY3RlZCwKIC5zY29wZS1iYXIgPiBs aTphY3RpdmUgewogICAgIHRyYW5zaXRpb24tZHVyYXRpb246IDc1bXM7CkBAIC01NSw2ICs1OCwx MyBAQAogfQogCiAuc2NvcGUtYmFyID4gbGkuc2VsZWN0ZWQgeworICAgIGNvbG9yOiByZ2IoNTIs IDE0MSwgMjIwKTsKKyAgICBib3JkZXItY29sb3I6IHJnYmEoNTIsIDE0MSwgMjIwLCAxKTsKKyAg ICBmb250LXdlaWdodDogYm9sZDsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zY29w ZS1iYXIgPiBsaS5zZWxlY3RlZCB7CisgICAgY29sb3I6IGluaGVyaXQ7CiAgICAgYmFja2dyb3Vu ZC1jb2xvcjogcmdiYSgwLCAwLCAwLCAwLjA2KTsKICAgICBib3JkZXItY29sb3I6IHJnYmEoMCwg MCwgMCwgMC4zMCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9TZWFyY2hCYXIuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvU2VhcmNoQmFyLmNzcwppbmRleCA3Mjc1ZTRjLi4xNjA1ZWU0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZWFyY2hC YXIuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Nl YXJjaEJhci5jc3MKQEAgLTMxLDcgKzMxLDcgQEAKICAgICAtd2Via2l0LWFwcGVhcmFuY2U6IG5v bmU7CiAKICAgICBib3JkZXI6IDFweCBzb2xpZCByZ2JhKDAsIDAsIDAsIDAuMzUpOwotICAgIGJv cmRlci1yYWRpdXM6IDEwcHg7CisgICAgYm9yZGVyLXJhZGl1czogM3B4OwogICAgIGJhY2tncm91 bmQtY29sb3I6IHJnYmEoMjU1LCAyNTUsIDI1NSwgMC4yKTsKICAgICBib3gtc2hhZG93OiBpbnNl dCByZ2JhKDAsIDAsIDAsIDAuMSkgMCAxcHggMDsKICAgICBiYWNrZ3JvdW5kLWNsaXA6IHBhZGRp bmctYm94OwpAQCAtNDEsNiArNDEsMTAgQEAKICAgICB0cmFuc2l0aW9uOiBiYWNrZ3JvdW5kLWNv bG9yIDIwMG1zIGVhc2UtaW4tb3V0OwogfQogCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnNl YXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSB7CisgICAgYm9yZGVyLXJhZGl1czogMTBw eDsKK30KKwogLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXTo6LXdlYmtpdC1pbnB1 dC1wbGFjZWhvbGRlciB7CiAgICAgY29sb3I6IHJnYmEoMCwgMCwgMCwgMC4zNSk7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TaWRlYmFy LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NpZGViYXIu Y3NzCmluZGV4IDNhMWY3NTIuLjg1NmZhM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NpZGViYXIuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NpZGViYXIuY3NzCkBAIC0yNiw2ICsyNiwxMCBA QAogLnNpZGViYXIgewogICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKIAorICAgIGJhY2tncm91bmQt Y29sb3I6IHJnYigyNDIsIDI0MiwgMjQyKTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5 IC5zaWRlYmFyIHsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjI3LCAyMzEsIDIzNSk7CiB9 CiAKQEAgLTM0LDcgKzM4LDcgQEAKICAgICBib3JkZXI6IG5vbmUgIWltcG9ydGFudDsKIH0KIAot Ym9keS53aW5kb3ctaW5hY3RpdmUgLnNpZGViYXIgeworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5 LndpbmRvdy1pbmFjdGl2ZSAuc2lkZWJhciB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDIz MSwgMjMxLCAyMzEpOwogfQogCkBAIC04OCw2ICs5Miw5IEBAIGJvZHkud2luZG93LWluYWN0aXZl IC5zaWRlYmFyIHsKIH0KIAogLnNpZGViYXIucmlnaHQgewotICAgIGJhY2tncm91bmQtY29sb3I6 IHJnYigyMzEsIDIzMSwgMjMxKTsKICAgICBib3JkZXItbGVmdDogMXB4IHNvbGlkIHJnYigxNTMs IDE1MywgMTUzKTsKIH0KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zaWRlYmFyLnJpZ2h0 IHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjMxLCAyMzEsIDIzMSk7Cit9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNp ZGViYXJQYW5lbC5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZVNpZGViYXJQYW5lbC5jc3MKaW5kZXggZThiNzgwZi4uYzNiYzU0NiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVT aWRlYmFyUGFuZWwuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1RpbWVsaW5lU2lkZWJhclBhbmVsLmNzcwpAQCAtOTUsMTAgKzk1LDggQEAKICAgICBo ZWlnaHQ6IDIycHg7CiAKICAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgcmdiKDE3OSwgMTc5 LCAxNzkpOwotICAgIGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20s IHJnYigyMzgsIDI0MCwgMjQ0KSwgcmdiKDIyNCwgMjI2LCAyMzApKTsKLQorICAgIGJhY2tncm91 bmQtY29sb3I6IHJnYigyNDIsIDI0MiwgMjQyKTsKICAgICBjb2xvcjogcmdiKDU3LCA1NywgNTcp OwotICAgIHRleHQtc2hhZG93OiByZ2JhKDI1NSwgMjU1LCAyNTUsIDAuNSkgMCAxcHggMDsKIAog ICAgIHdoaXRlLXNwYWNlOiBub3dyYXA7CiAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKQEAgLTExMiw2 ICsxMTAsMTIgQEAKICAgICBvdmVyZmxvdzogaGlkZGVuOwogfQogCitib2R5Lm1hYy1wbGF0Zm9y bS5sZWdhY3kgLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi50aW1lbGluZSA+IC50aXRsZS1i YXIgeworICAgIGJhY2tncm91bmQtY29sb3I6IHRyYW5zcGFyZW50OworICAgIGJhY2tncm91bmQt aW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHJnYigyMzgsIDI0MCwgMjQ0KSwgcmdi KDIyNCwgMjI2LCAyMzApKTsKKyAgICB0ZXh0LXNoYWRvdzogcmdiYSgyNTUsIDI1NSwgMjU1LCAw LjUpIDAgMXB4IDA7Cit9CisKIC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24udGltZWxpbmUg PiAudGl0bGUtYmFyLnRpbWVsaW5lcyB7CiAgICAgdG9wOiAyMnB4OwogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVG9vbGJhci5jc3MgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Ub29sYmFyLmNzcwppbmRl eCA1NWQ3M2RiLi40MGZlMGI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Ub29sYmFyLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Ub29sYmFyLmNzcwpAQCAtNTksOCArNTksNyBAQCBib2R5Om5v dCgubWFjLXBsYXRmb3JtKSAudG9vbGJhciB7CiAgICAgYm94LXNoYWRvdzogaW5zZXQgcmdiKDI1 MiwgMjUyLCAyNTIpIDAgMXB4IDA7CiB9CiAKLWJvZHkuZG9ja2VkLm1hYy1wbGF0Zm9ybS5tb3Vu dGFpbi1saW9uIC50b29sYmFyLAotYm9keS5kb2NrZWQubWFjLXBsYXRmb3JtLm1hdmVyaWNrcyAu dG9vbGJhciB7Citib2R5LmRvY2tlZC5tYWMtcGxhdGZvcm0ubGVnYWN5IC50b29sYmFyIHsKICAg ICBiYWNrZ3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2IoMjE2LCAy MTYsIDIxNiksIHJnYigxOTAsIDE5MCwgMTkwKSk7CiAgICAgYm94LXNoYWRvdzogaW5zZXQgcmdi YSgyNTUsIDI1NSwgMjU1LCAwLjEpIDAgMXB4IDAsIGluc2V0IHJnYmEoMCwgMCwgMCwgMC4wMikg MCAtMXB4IDA7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvV2ViSW5zcGVj dG9yVUkudmN4cHJvai9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1dlYkluc3BlY3RvclVJLnZjeHByb2ovV2ViSW5zcGVjdG9yVUkudmN4cHJvagppbmRleCA1 NWI5YjllLi44YzEyM2YyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvV2ViSW5z cGVjdG9yVUkudmN4cHJvai9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qL1dlYkluc3BlY3RvclVJLnZjeHByb2oK QEAgLTQyNyw2ICs0MjcsNyBAQAogICAgIDxOb25lIEluY2x1ZGU9Ii4uXFVzZXJJbnRlcmZhY2Vc SW1hZ2VzXEFwcGxpY2F0aW9uQ2FjaGVNYW5pZmVzdCU0MDJ4LnBuZyIgLz4KICAgICA8Tm9uZSBJ bmNsdWRlPSIuLlxVc2VySW50ZXJmYWNlXEltYWdlc1xBcHBsaWNhdGlvbkNhY2hlTWFuaWZlc3Qu cG5nIiAvPgogICAgIDxOb25lIEluY2x1ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEJhY2tB cnJvdy5zdmciIC8+CisgICAgPE5vbmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNc QmFja0Fycm93TGVnYWN5LnN2ZyIgLz4KICAgICA8Tm9uZSBJbmNsdWRlPSIuLlxVc2VySW50ZXJm YWNlXEltYWdlc1xCb3R0b21VcFRyZWUuc3ZnIiAvPgogICAgIDxOb25lIEluY2x1ZGU9Ii4uXFVz ZXJJbnRlcmZhY2VcSW1hZ2VzXEJyZWFrcG9pbnQlNDAyeC5wbmciIC8+CiAgICAgPE5vbmUgSW5j bHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNcQnJlYWtwb2ludC5wbmciIC8+CkBAIC00ODYs NiArNDg3LDcgQEAKICAgICA8Tm9uZSBJbmNsdWRlPSIuLlxVc2VySW50ZXJmYWNlXEltYWdlc1xG b2xkZXJHZW5lcmljJTQwMngucG5nIiAvPgogICAgIDxOb25lIEluY2x1ZGU9Ii4uXFVzZXJJbnRl cmZhY2VcSW1hZ2VzXEZvbGRlckdlbmVyaWMucG5nIiAvPgogICAgIDxOb25lIEluY2x1ZGU9Ii4u XFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEZvcndhcmRBcnJvdy5zdmciIC8+CisgICAgPE5vbmUgSW5j bHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNcRm9yd2FyZEFycm93TGVnYWN5LnN2ZyIgLz4K ICAgICA8Tm9uZSBJbmNsdWRlPSIuLlxVc2VySW50ZXJmYWNlXEltYWdlc1xGdW5jdGlvbi5zdmci IC8+CiAgICAgPE5vbmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNcR29Ub0Fycm93 LnN2ZyIgLz4KICAgICA8Tm9uZSBJbmNsdWRlPSIuLlxVc2VySW50ZXJmYWNlXEltYWdlc1xIaWVy YXJjaGljYWxOYXZpZ2F0aW9uSXRlbUNoZXZyb24uc3ZnIiAvPgpAQCAtNzg0LDQgKzc4Niw0IEBA CiAgIDxJbXBvcnQgUHJvamVjdD0iJChWQ1RhcmdldHNQYXRoKVxNaWNyb3NvZnQuQ3BwLnRhcmdl dHMiIC8+CiAgIDxJbXBvcnRHcm91cCBMYWJlbD0iRXh0ZW5zaW9uVGFyZ2V0cyI+CiAgIDwvSW1w b3J0R3JvdXA+Ci08L1Byb2plY3Q+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorPC9Qcm9q ZWN0PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1dlYkluc3BlY3RvclVJLnZj eHByb2ovV2ViSW5zcGVjdG9yVUkudmN4cHJvai5maWx0ZXJzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1dlYkluc3BlY3RvclVJLnZjeHByb2ovV2ViSW5zcGVjdG9yVUkudmN4cHJvai5maWx0ZXJz CmluZGV4IDQ5MmZkNWMuLjFlY2I3ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qL1dlYkluc3BlY3RvclVJLnZjeHByb2ouZmlsdGVycwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvV2ViSW5zcGVjdG9yVUkudmN4cHJvai9XZWJJbnNw ZWN0b3JVSS52Y3hwcm9qLmZpbHRlcnMKQEAgLTEsNCArMSw0IEBACi3vu788P3htbCB2ZXJzaW9u PSIxLjAiIGVuY29kaW5nPSJ1dGYtOCI/PgorPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0i dXRmLTgiPz4KIDxQcm9qZWN0IFRvb2xzVmVyc2lvbj0iNC4wIiB4bWxucz0iaHR0cDovL3NjaGVt YXMubWljcm9zb2Z0LmNvbS9kZXZlbG9wZXIvbXNidWlsZC8yMDAzIj4KICAgPEl0ZW1Hcm91cD4K ICAgICA8RmlsdGVyIEluY2x1ZGU9IlJlc291cmNlIEZpbGVzIj4KQEAgLTExMTksNiArMTExOSw5 IEBACiAgICAgPE5vbmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNcQmFja0Fycm93 LnN2ZyI+CiAgICAgICA8RmlsdGVyPkltYWdlczwvRmlsdGVyPgogICAgIDwvTm9uZT4KKyAgICA8 Tm9uZSBJbmNsdWRlPSIuLlxVc2VySW50ZXJmYWNlXEltYWdlc1xCYWNrQXJyb3dMZWdhY3kuc3Zn Ij4KKyAgICAgIDxGaWx0ZXI+SW1hZ2VzPC9GaWx0ZXI+CisgICAgPC9Ob25lPgogICAgIDxOb25l IEluY2x1ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEJvdHRvbVVwVHJlZS5zdmciPgogICAg ICAgPEZpbHRlcj5JbWFnZXM8L0ZpbHRlcj4KICAgICA8L05vbmU+CkBAIC0xMjk2LDYgKzEyOTks OSBAQAogICAgIDxOb25lIEluY2x1ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEZvcndhcmRB cnJvdy5zdmciPgogICAgICAgPEZpbHRlcj5JbWFnZXM8L0ZpbHRlcj4KICAgICA8L05vbmU+Cisg ICAgPE5vbmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNcRm9yd2FyZEFycm93TGVn YWN5LnN2ZyI+CisgICAgICA8RmlsdGVyPkltYWdlczwvRmlsdGVyPgorICAgIDwvTm9uZT4KICAg ICA8Tm9uZSBJbmNsdWRlPSIuLlxVc2VySW50ZXJmYWNlXEltYWdlc1xGdW5jdGlvbi5zdmciPgog ICAgICAgPEZpbHRlcj5JbWFnZXM8L0ZpbHRlcj4KICAgICA8L05vbmU+CkBAIC0xNzIyLDQgKzE3 MjgsNCBAQAogICAgIDxOb25lIEluY2x1ZGU9IldlYkluc3BlY3RvclVJLm1ha2UiIC8+CiAgICAg PE5vbmUgSW5jbHVkZT0iYnVpbGQtd2ViaW5zcGVjdG9ydWkucGwiIC8+CiAgIDwvSXRlbUdyb3Vw PgotPC9Qcm9qZWN0PgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKKzwvUHJvamVjdD4K 234966 2014-07-15 17:05:06 -0700 2014-07-15 19:00:19 -0700 [PATCH] Styles update v3, reviewed. ui.diff text/plain 56825 jonowells ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGI0ZjljNzUuLjk2MzhmODMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0MyBAQAorMjAxNC0wNy0xNSAgSm9uYXRoYW4gV2Vs bHMgIDxqb25vd2VsbHNAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IE1vZGVy bml6ZSBVSSBzdHlsZXMgYW5kIGJldHRlciBzeW5jIHdpdGggcGxhdGZvcm0gc3R5bGVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQ4NDYKKworICAg ICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCisKKyAgICAgICAgVXBkYXRlZCBzdHls ZXMgdG8gYmV0dGVyIG1hdGNoIHRoZSBPUyBVSSBkZXNpZ24uIFVwZGF0ZWQgdGhlIGZvcndhcmQv YmFjayBidXR0b24uIAorICAgICAgICBNb3ZlZCBzZXZlcmFsIHJ1bGVzIHRvIHNlbGVjdG9ycyB0 aGF0IHN1cHBvcnQgb2xkZXIgT1MgZGVzaWducy4gQWRkZWQgZ2xvYmFsIHBsYXRmb3JtCisgICAg ICAgIGRhdGEgdG8gc3VwcG9ydCB0aGlzIHBhdGNoLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9JbWFnZXMvQmFja0Fycm93LnN2ZzogQWRkZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9J bWFnZXMvQmFja0Fycm93TGVnYWN5LnN2ZzogQ29waWVkIGZyb20gU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0JhY2tBcnJvdy5zdmcuCisgICAgICAgICogVXNlcklu dGVyZmFjZS9JbWFnZXMvRm9yd2FyZEFycm93LnN2ZzogQWRkZWQuCisgICAgICAgICogVXNlcklu dGVyZmFjZS9JbWFnZXMvRm9yd2FyZEFycm93TGVnYWN5LnN2ZzogQ29waWVkIGZyb20gU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0ZvcndhcmRBcnJvdy5zdmcuCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvSW1hZ2VVdGlsaXRpZXMuanM6IFVwZGF0ZWQg aW1hZ2UgdmVyc2lvbgorICAgICAgICAoLmdlbmVyYXRlSW1hZ2UuZ2VuZXJhdGVNb2Rlcm5JbWFn ZSk6CisgICAgICAgICguZ2VuZXJhdGVJbWFnZS5nZW5lcmF0ZUxlZ2FjeUltYWdlKToKKyAgICAg ICAgKC5nZW5lcmF0ZUltYWdlKToKKyAgICAgICAgVXBkYXRlZCBpbWFnZSBnZW5lcmF0aW9uIHRv IHN1cHBvcnQgbW9kZXJuIGxvb2suIFVwZGF0ZWQgdmVyc2lvbmluZyBzY2hlbWUgYW5kIHZlcnNp b24uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5sb2FkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmNvbnRlbnRMb2FkZWQu V2ViSW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24udG9TdHJpbmcpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLmNvbnRlbnRMb2FkZWQuV2ViSW5zcGVjdG9yLlBsYXRmb3JtLnRvU3RyaW5nKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5jb250ZW50TG9hZGVkKToKKyAgICAgICAgQWRkZWQgZ2xvYmFs IHBsYXRmb3JtIGluZm9ybWF0aW9uLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9D b250ZW50QnJvd3Nlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3Nlcik6 CisgICAgICAgIFVwZGF0ZWQgYmFjayBhbmQgZm9yd2FyZCBidXR0b25zLgorCisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkZpbmRCYW5uZXIucHJvdG90eXBlLl9nZW5lcmF0ZUJ1dHRvbnNHbHlwaHNJZk5lZWRlZCk6Cisg ICAgICAgIFVwZGF0ZWQgaW1hZ2VzIGZvciB0aGUgZmluZCBiYW5uZXIuCisKKyAgICAgICAgKiBX ZWJJbnNwZWN0b3JVSS52Y3hwcm9qL1dlYkluc3BlY3RvclVJLnZjeHByb2o6CisgICAgICAgICog V2ViSW5zcGVjdG9yVUkudmN4cHJvai9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qLmZpbHRlcnM6Cisg ICAgICAgIEFkZGVkIG5ldyBpbWFnZXMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L0J1dHRvblRvb2xiYXJJdGVtLmNzczoKKyAgICAgICAgKC50b29sYmFyIC5pdGVtLmJ1dHRvbiA+ IC5sYWJlbCk6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnRvb2xiYXIgLml0 ZW0uYnV0dG9uID4gLmxhYmVsKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0 eWxlRGVjbGFyYXRpb25TZWN0aW9uLmNzczoKKyAgICAgICAgKC5zdHlsZS1kZWNsYXJhdGlvbi1z ZWN0aW9uKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc3R5bGUtZGVjbGFy YXRpb24tc2VjdGlvbik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnN0eWxl LWRlY2xhcmF0aW9uLXNlY3Rpb24gKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbik6CisgICAg ICAgICguc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3VwKToKKyAgICAgICAg KGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0 LWluLWdyb3VwKToKKyAgICAgICAgKC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uLmxhc3QtaW4t Z3JvdXAgKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbik6CisgICAgICAgIChib2R5Lm1hYy1w bGF0Zm9ybS5sZWdhY3kgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1pbi1ncm91cCAr IC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3Jt LmxlZ2FjeSAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3VwICsgLnN0eWxl LWRlY2xhcmF0aW9uLXNlY3Rpb246bGFzdC1jaGlsZCk6CisgICAgICAgICguc3R5bGUtZGVjbGFy YXRpb24tc2VjdGlvbiArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uKTogRGVsZXRlZC4KKyAg ICAgICAgKC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAgKyAuc3R5bGUt ZGVjbGFyYXRpb24tc2VjdGlvbjpsYXN0LWNoaWxkKTogRGVsZXRlZC4KKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5jc3M6CisgICAgICAg ICguc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSA+IC5jb250ZW50ID4gLnBzZXVk by1jbGFzc2VzKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5l LmNzczoKKyAgICAgICAgKC5kb20tdHJlZS1vdXRsaW5lIGxpLmhvdmVyZWQ6bm90KC5zZWxlY3Rl ZCkgLnNlbGVjdGlvbik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRvbS10 cmVlLW91dGxpbmUgbGkuaG92ZXJlZDpub3QoLnNlbGVjdGVkKSAuc2VsZWN0aW9uKToKKyAgICAg ICAgKC5kb20tdHJlZS1vdXRsaW5lIGxpLmVsZW1lbnRzLWRyYWctb3ZlciAuc2VsZWN0aW9uKToK KyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZG9tLXRyZWUtb3V0bGluZSBsaS5l bGVtZW50cy1kcmFnLW92ZXIgLnNlbGVjdGlvbik6CisgICAgICAgICguZG9tLXRyZWUtb3V0bGlu ZTpmb2N1cyBsaS5zZWxlY3RlZCAuc2VsZWN0aW9uKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRm b3JtLmxlZ2FjeSAuZG9tLXRyZWUtb3V0bGluZTpmb2N1cyBsaS5zZWxlY3RlZCAuc2VsZWN0aW9u KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0Rhc2hib2FyZENvbnRhaW5lclZpZXcu Y3NzOgorICAgICAgICAoLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIpOgorICAgICAgICAo Ym9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyKToK KyAgICAgICAgKGJvZHkud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFp bmVyKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeS53aW5kb3ctaW5hY3RpdmUg LnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIpOgorICAgICAgICAoLnRvb2xiYXIgLmRhc2hi b2FyZCk6CisgICAgICAgIChib2R5LndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJk KToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeS53aW5kb3ctaW5hY3RpdmUgLnRv b2xiYXIgLmRhc2hib2FyZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3Jp ZC5jc3M6CisgICAgICAgICguZGF0YS1ncmlkIHRoKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRm b3JtLmxlZ2FjeSAuZGF0YS1ncmlkIHRoKToKKyAgICAgICAgKC5kYXRhLWdyaWQgdHIuc2VsZWN0 ZWQpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kYXRhLWdyaWQgdHIuc2Vs ZWN0ZWQpOgorICAgICAgICAoLmRhdGEtZ3JpZDpmb2N1cyB0ci5zZWxlY3RlZCk6CisgICAgICAg IChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRhdGEtZ3JpZDpmb2N1cyB0ci5zZWxlY3RlZCk6 CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbi5jc3M6CisgICAg ICAgICguZGV0YWlscy1zZWN0aW9uKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2Fj eSAuZGV0YWlscy1zZWN0aW9uKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMt c2VjdGlvbik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMtc2Vj dGlvbiAuZGV0YWlscy1zZWN0aW9uKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gLmRldGFp bHMtc2VjdGlvbjpsYXN0LWNoaWxkKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gLmRldGFp bHMtc2VjdGlvbjpmaXJzdC1jaGlsZCk6CisgICAgICAgICguZGV0YWlscy1zZWN0aW9uID4gLmhl YWRlcik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMtc2VjdGlv biA+IC5oZWFkZXIpOgorICAgICAgICAoLmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0aW9u ID4gLmhlYWRlcik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5tb3VudGFpbi1saW9uIC5k ZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXIpOgorICAgICAgICAoLmRl dGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0aW9uLmNvbGxhc3BzZWQgPiAuaGVhZGVyKToKKyAg ICAgICAgKC5kZXRhaWxzLXNlY3Rpb24uY29tcHV0ZWQtc3R5bGUtcHJvcGVydGllczpub3QoLmNv bGxhcHNlZCkgPiAuaGVhZGVyKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAu ZGV0YWlscy1zZWN0aW9uLmNvbXB1dGVkLXN0eWxlLXByb3BlcnRpZXM6bm90KC5jb2xsYXBzZWQp ID4gLmhlYWRlcik6CisgICAgICAgICguZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3Jv dXApOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kZXRhaWxzLXNlY3Rpb24g PiAuY29udGVudCA+IC5ncm91cCk6CisgICAgICAgICguZGV0YWlscy1zZWN0aW9uID4gLmNvbnRl bnQgPiAuZ3JvdXA6bGFzdC1jaGlsZCk6CisgICAgICAgICguZGV0YWlscy1zZWN0aW9uID4gLmNv bnRlbnQgPiAuZ3JvdXA6bnRoLWNoaWxkKGV2ZW4pKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRm b3JtLmxlZ2FjeSAuZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bnRoLWNoaWxk KGV2ZW4pKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZGV0YWlscy1zZWN0 aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bGFzdC1jaGlsZCA+IC5yb3cuc2ltcGxlOmxhc3QtY2hp bGQgPiAqKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDps YXN0LWNoaWxkID4gLnJvdy5zaW1wbGU6bGFzdC1jaGlsZCA+ICopOiBEZWxldGVkLgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRmlsdGVyQmFyLmNzczoKKyAgICAgICAgKC5maWx0ZXIt YmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0pOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0u bGVnYWN5IC5maWx0ZXItYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0pOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5jc3M6CisgICAgICAgICgu bmF2aWdhdGlvbi1zaWRlYmFyLXBhbmVsLWNvbnRlbnQtdHJlZS1vdXRsaW5lIC5pdGVtLnNlbGVj dGVkKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAubmF2aWdhdGlvbi1zaWRl YmFyLXBhbmVsLWNvbnRlbnQtdHJlZS1vdXRsaW5lIC5pdGVtLnNlbGVjdGVkKToKKyAgICAgICAg KC5uYXZpZ2F0aW9uLXNpZGViYXItcGFuZWwtY29udGVudC10cmVlLW91dGxpbmU6Zm9jdXMgLml0 ZW0uc2VsZWN0ZWQpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5uYXZpZ2F0 aW9uLXNpZGViYXItcGFuZWwtY29udGVudC10cmVlLW91dGxpbmU6Zm9jdXMgLml0ZW0uc2VsZWN0 ZWQpOgorICAgICAgICAoYm9keS53aW5kb3ctaW5hY3RpdmUgLm5hdmlnYXRpb24tc2lkZWJhci1w YW5lbC1jb250ZW50LXRyZWUtb3V0bGluZSAuaXRlbS5zZWxlY3RlZCk6CisgICAgICAgIChib2R5 Lm1hYy1wbGF0Zm9ybS5sZWdhY3kud2luZG93LWluYWN0aXZlIC5uYXZpZ2F0aW9uLXNpZGViYXIt cGFuZWwtY29udGVudC10cmVlLW91dGxpbmUgLml0ZW0uc2VsZWN0ZWQpOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvUmFkaW9CdXR0b25OYXZpZ2F0aW9uSXRlbS5jc3M6CisgICAgICAg ICgubmF2aWdhdGlvbi1iYXIgLml0ZW0ucmFkaW8uYnV0dG9uLnRleHQtb25seS5zZWxlY3RlZCk6 CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLm5hdmlnYXRpb24tYmFyIC5pdGVt LnJhZGlvLmJ1dHRvbi50ZXh0LW9ubHkuc2VsZWN0ZWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvUnVsZXNTdHlsZURldGFpbHNQYW5lbC5jc3M6CisgICAgICAgICguc2lkZWJhciA+ IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSAucnVsZXMgLmxhYmVsICsgLnN0eWxlLWRlY2xhcmF0 aW9uLXNlY3Rpb24pOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zaWRlYmFy ID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlIC5ydWxlcyAubGFiZWwgKyAuc3R5bGUtZGVjbGFy YXRpb24tc2VjdGlvbik6CisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1z dHlsZSAucnVsZXMgLm5ldy1ydWxlKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2Fj eSAuc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSAucnVsZXMgLm5ldy1ydWxlKToK KyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlIC5ydWxlcyAubmV3 LXJ1bGUgKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbik6CisgICAgICAgIChib2R5Lm1hYy1w bGF0Zm9ybS5sZWdhY3kgLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnJ1bGVz IC5uZXctcnVsZSArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uKToKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL1Njb3BlQmFyLmNzczoKKyAgICAgICAgKC5zY29wZS1iYXIgPiBsaSk6 CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnNjb3BlLWJhciA+IGxpKToKKyAg ICAgICAgKC5zY29wZS1iYXIgPiBsaS5zZWxlY3RlZCk6CisgICAgICAgIChib2R5Lm1hYy1wbGF0 Zm9ybS5sZWdhY3kgLnNjb3BlLWJhciA+IGxpLnNlbGVjdGVkKToKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL1NlYXJjaEJhci5jc3M6CisgICAgICAgICguc2VhcmNoLWJhciA+IGlucHV0 W3R5cGU9InNlYXJjaCJdKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc2Vh cmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL1NpZGViYXIuY3NzOgorICAgICAgICAoLnNpZGViYXIpOgorICAgICAgICAoYm9keS5t YWMtcGxhdGZvcm0ubGVnYWN5IC5zaWRlYmFyKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3Jt LmxlZ2FjeS53aW5kb3ctaW5hY3RpdmUgLnNpZGViYXIpOgorICAgICAgICAoYm9keS5tYWMtcGxh dGZvcm0ubGVnYWN5IC5zaWRlYmFyLnJpZ2h0KToKKyAgICAgICAgKGJvZHkud2luZG93LWluYWN0 aXZlIC5zaWRlYmFyKTogRGVsZXRlZC4KKyAgICAgICAgKC5zaWRlYmFyLnJpZ2h0KTogRGVsZXRl ZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lU2lkZWJhclBhbmVsLmNz czoKKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24udGltZWxpbmUgPiAudGl0 bGUtYmFyKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc2lkZWJhciA+IC5w YW5lbC5uYXZpZ2F0aW9uLnRpbWVsaW5lID4gLnRpdGxlLWJhcik6CisgICAgICAgIFN0eWxlIHVw ZGF0ZXMgZm9yIG5ldyBsb29rIGFuZCBmZWVsLgorCiAyMDE0LTA3LTExICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogRGVidWdn ZXIgUGF1c2UgYnV0dG9uIGRvZXMgbm90IHdvcmsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvSW1hZ2VVdGlsaXRpZXMuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL0ltYWdlVXRpbGl0aWVzLmpzCmluZGV4IDQy ZGJjNmUuLjllZTA4NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0Jhc2UvSW1hZ2VVdGlsaXRpZXMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQmFzZS9JbWFnZVV0aWxpdGllcy5qcwpAQCAtMzkzLDggKzM5Myw5IEBA IGZ1bmN0aW9uIGdlbmVyYXRlRW1ib3NzZWRJbWFnZXMoc3JjLCB3aWR0aCwgaGVpZ2h0LCBzdGF0 ZXMsIGNhbnZhc0lkZW50aWZpZXJDYWxsCiAgICAgdmFyIHNjYWxlZFdpZHRoID0gd2lkdGggKiBz Y2FsZUZhY3RvcjsKICAgICB2YXIgc2NhbGVkSGVpZ2h0ID0gaGVpZ2h0ICogc2NhbGVGYWN0b3I7 CiAKLSAgICAvLyBCdW1wIHRoaXMgdmVyc2lvbiB3aGVuIG1ha2luZyBjaGFuZ2VzIHRoYXQgYWZm ZWN0IHRoZSByZXN1bHQgaW1hZ2UuCi0gICAgY29uc3QgaW1hZ2VWZXJzaW9uID0gMjsKKyAgICAv LyBCdW1wIHRoZSBiYXNlIHZlcnNpb24gd2hlbiBtYWtpbmcgY2hhbmdlcyB0aGF0IGFmZmVjdCB0 aGUgcmVzdWx0IGltYWdlLgorICAgIGNvbnN0IGJhc2VJbWFnZVZlcnNpb24gPSAzOworICAgIGNv bnN0IGltYWdlVmVyc2lvbiA9IGJhc2VJbWFnZVZlcnNpb24gKyAwLjAxICogV2ViSW5zcGVjdG9y LlBsYXRmb3JtLnZlcnNpb24uYmFzZSArIDAuMDAwMSAqIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52 ZXJzaW9uLnJlbGVhc2U7CiAKICAgICBjb25zdCBzdG9yYWdlS2V5UHJlZml4ID0gImdlbmVyYXRl ZC1lbWJvc3NlZC1pbWFnZS0iOwogCkBAIC00ODcsMTAzICs0ODgsMTQ4IEBAIGZ1bmN0aW9uIGdl bmVyYXRlRW1ib3NzZWRJbWFnZXMoc3JjLCB3aWR0aCwgaGVpZ2h0LCBzdGF0ZXMsIGNhbnZhc0lk ZW50aWZpZXJDYWxsCiAKICAgICBmdW5jdGlvbiBnZW5lcmF0ZUltYWdlKHN0YXRlKQogICAgIHsK LSAgICAgICAgY29uc3QgZGVwdGggPSAxICogc2NhbGVGYWN0b3I7Ci0gICAgICAgIGNvbnN0IHNo YWRvd0RlcHRoID0gZGVwdGg7Ci0gICAgICAgIGNvbnN0IHNoYWRvd0JsdXIgPSBkZXB0aCAtIDE7 Ci0gICAgICAgIGNvbnN0IGdsb3dCbHVyID0gMjsKKyAgICAgICAgZnVuY3Rpb24gZ2VuZXJhdGVN b2Rlcm5JbWFnZSgpCisgICAgICAgIHsKKyAgICAgICAgICAgIGNvbnN0IGNvbnRleHQgPSBkb2N1 bWVudC5nZXRDU1NDYW52YXNDb250ZXh0KCIyZCIsIGNhbnZhc0lkZW50aWZpZXJDYWxsYmFjayhz dGF0ZSksIHNjYWxlZFdpZHRoLCBzY2FsZWRIZWlnaHQpOworICAgICAgICAgICAgY29udGV4dC5z YXZlKCk7CisgICAgICAgICAgICBjb250ZXh0LnNjYWxlKHNjYWxlRmFjdG9yLCBzY2FsZUZhY3Rv cik7CisKKyAgICAgICAgICAgIGNvbnRleHQuY2xlYXJSZWN0KDAsIDAsIHdpZHRoLCBoZWlnaHQp OworCisgICAgICAgICAgICB2YXIgZ3JhZGllbnQgPSBjb250ZXh0LmNyZWF0ZUxpbmVhckdyYWRp ZW50KDAsIDAsIDAsIGhlaWdodCk7CisgICAgICAgICAgICBpZiAoc3RhdGUgPT09IHN0YXRlcy5B Y3RpdmUpIHsKKyAgICAgICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMCwgInJnYig2 NSwgNjUsIDY1KSIpOworICAgICAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9yU3RvcCgxLCAi cmdiKDcwLCA3MCwgNzApIik7CisgICAgICAgICAgICB9IGVsc2UgaWYgKHN0YXRlID09PSBzdGF0 ZXMuRm9jdXMpIHsKKyAgICAgICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMCwgInJn YigwLCAxMjMsIDI0NykiKTsKKyAgICAgICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3Ao MSwgInJnYigwLCAxMjgsIDI1MikiKTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAoc3RhdGUgPT09 IHN0YXRlcy5BY3RpdmVGb2N1cykgeworICAgICAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9y U3RvcCgwLCAicmdiKDAsIDYyLCAyMTApIik7CisgICAgICAgICAgICAgICAgZ3JhZGllbnQuYWRk Q29sb3JTdG9wKDEsICJyZ2IoMCwgNjcsIDIxNSkiKTsKKyAgICAgICAgICAgIH0gZWxzZSB7Cisg ICAgICAgICAgICAgICAgZ3JhZGllbnQuYWRkQ29sb3JTdG9wKDAsICJyZ2IoNzUsIDc1LCA3NSki KTsKKyAgICAgICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMSwgInJnYig4MCwgODAs IDgwKSIpOworICAgICAgICAgICAgfQogCi0gICAgICAgIGNvbnN0IGNvbnRleHQgPSBkb2N1bWVu dC5nZXRDU1NDYW52YXNDb250ZXh0KCIyZCIsIGNhbnZhc0lkZW50aWZpZXJDYWxsYmFjayhzdGF0 ZSksIHNjYWxlZFdpZHRoLCBzY2FsZWRIZWlnaHQpOwotICAgICAgICBjb250ZXh0LnNhdmUoKTsK LSAgICAgICAgY29udGV4dC5zY2FsZShzY2FsZUZhY3Rvciwgc2NhbGVGYWN0b3IpOworICAgICAg ICAgICAgY29udGV4dC5maWxsU3R5bGUgPSBncmFkaWVudDsKKyAgICAgICAgICAgIGNvbnRleHQu ZmlsbFJlY3QoMCwgMCwgd2lkdGgsIGhlaWdodCk7CiAKLSAgICAgICAgY29udGV4dC5jbGVhclJl Y3QoMCwgMCwgd2lkdGgsIGhlaWdodCk7Ci0KLSAgICAgICAgaWYgKGRlcHRoID4gMCkgewotICAg ICAgICAgICAgLy8gVXNlIHNjcmF0Y2ggY2FudmFzIHNvIHdlIGNhbiBhcHBseSB0aGUgZHJhdyB0 aGUgd2hpdGUgZHJvcCBzaGFkb3cKLSAgICAgICAgICAgIC8vIHRvIHRoZSB3aG9sZSBnbHlwaCBh dCB0aGUgZW5kLgotCi0gICAgICAgICAgICB2YXIgc2NyYXRjaENhbnZhcyA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImNhbnZhcyIpOwotICAgICAgICAgICAgc2NyYXRjaENhbnZhcy53aWR0aCA9 IHNjYWxlZFdpZHRoOwotICAgICAgICAgICAgc2NyYXRjaENhbnZhcy5oZWlnaHQgPSBzY2FsZWRI ZWlnaHQ7Ci0KLSAgICAgICAgICAgIHZhciBzY3JhdGNoQ29udGV4dCA9IHNjcmF0Y2hDYW52YXMu Z2V0Q29udGV4dCgiMmQiKTsKLSAgICAgICAgICAgIHNjcmF0Y2hDb250ZXh0LnNjYWxlKHNjYWxl RmFjdG9yLCBzY2FsZUZhY3Rvcik7Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAgICAgdmFyIHNj cmF0Y2hDb250ZXh0ID0gY29udGV4dDsKLQotICAgICAgICB2YXIgZ3JhZGllbnQgPSBzY3JhdGNo Q29udGV4dC5jcmVhdGVMaW5lYXJHcmFkaWVudCgwLCAwLCAwLCBoZWlnaHQpOwotICAgICAgICBp ZiAoc3RhdGUgPT09IHN0YXRlcy5BY3RpdmUpIHsKLSAgICAgICAgICAgIGdyYWRpZW50LmFkZENv bG9yU3RvcCgwLCAicmdiKDYwLCA2MCwgNjApIik7Ci0gICAgICAgICAgICBncmFkaWVudC5hZGRD b2xvclN0b3AoMSwgInJnYigxMDAsIDEwMCwgMTAwKSIpOwotICAgICAgICB9IGVsc2UgaWYgKHN0 YXRlID09PSBzdGF0ZXMuRm9jdXMpIHsKLSAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9yU3Rv cCgwLCAicmdiKDUwLCAxMzUsIDIwMCkiKTsKLSAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9y U3RvcCgxLCAicmdiKDYwLCAxNTUsIDIyNSkiKTsKLSAgICAgICAgfSBlbHNlIGlmIChzdGF0ZSA9 PT0gc3RhdGVzLkFjdGl2ZUZvY3VzKSB7Ci0gICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0 b3AoMCwgInJnYigzMCwgMTE1LCAxODUpIik7Ci0gICAgICAgICAgICBncmFkaWVudC5hZGRDb2xv clN0b3AoMSwgInJnYig0MCwgMTM1LCAyMDApIik7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAg ICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMCwgInJnYig5MCwgOTAsIDkwKSIpOwotICAgICAg ICAgICAgZ3JhZGllbnQuYWRkQ29sb3JTdG9wKDEsICJyZ2IoMTQ1LCAxNDUsIDE0NSkiKTsKKyAg ICAgICAgICAgIC8vIEFwcGx5IHRoZSBtYXNrIHRvIGtlZXAganVzdCB0aGUgaW5uZXIgc2hhcGUg b2YgdGhlIGdseXBoLgorICAgICAgICAgICAgX2FwcGx5SW1hZ2VNYXNrKGNvbnRleHQsIGltYWdl KTsKKworICAgICAgICAgICAgaWYgKCFpZ25vcmVDYWNoZSkgeworICAgICAgICAgICAgICAgIGNv bnN0IHN0b3JhZ2VLZXkgPSBzdG9yYWdlS2V5UHJlZml4ICsgY2FudmFzSWRlbnRpZmllckNhbGxi YWNrKHN0YXRlKTsKKyAgICAgICAgICAgICAgICBzYXZlSW1hZ2VUb1N0b3JhZ2Uoc3RvcmFnZUtl eSwgY29udGV4dCwgc2NhbGVkV2lkdGgsIHNjYWxlZEhlaWdodCwgaW1hZ2VWZXJzaW9uKTsKKyAg ICAgICAgICAgIH0KKworICAgICAgICAgICAgY29udGV4dC5yZXN0b3JlKCk7CiAgICAgICAgIH0K IAotICAgICAgICBzY3JhdGNoQ29udGV4dC5maWxsU3R5bGUgPSBncmFkaWVudDsKLSAgICAgICAg c2NyYXRjaENvbnRleHQuZmlsbFJlY3QoMCwgMCwgd2lkdGgsIGhlaWdodCk7Ci0KLSAgICAgICAg aWYgKGRlcHRoID4gMCkgewotICAgICAgICAgICAgLy8gSW52ZXJ0IHRoZSBpbWFnZSB0byB1c2Ug YXMgYSByZXZlcnNlIGltYWdlIG1hc2sgZm9yIHRoZSBpbm5lciBzaGFkb3dzLgotICAgICAgICAg ICAgLy8gUGFzcyBpbiB0aGUgY29sb3IgdG8gdXNlIGZvciB0aGUgb3BhcXVlIGFyZWFzIHRvIHBy ZXZlbnQgImJsYWNrIGhhbG9zIgotICAgICAgICAgICAgLy8gbGF0ZXIgd2hlbiBhcHBseWluZyB0 aGUgZmluYWwgaW1hZ2UgbWFzay4KLQotICAgICAgICAgICAgaWYgKHN0YXRlID09PSBzdGF0ZXMu QWN0aXZlKQotICAgICAgICAgICAgICAgIHZhciBpbnZlcnRlZEltYWdlID0gX2ludmVydE1hc2tJ bWFnZShpbWFnZSwgNjAsIDYwLCA2MCk7Ci0gICAgICAgICAgICBlbHNlIGlmIChzdGF0ZSA9PT0g c3RhdGVzLkZvY3VzKQotICAgICAgICAgICAgICAgIHZhciBpbnZlcnRlZEltYWdlID0gX2ludmVy dE1hc2tJbWFnZShpbWFnZSwgNDUsIDE0NSwgMjEwKTsKLSAgICAgICAgICAgIGVsc2UgaWYgKHN0 YXRlID09PSBzdGF0ZXMuQWN0aXZlRm9jdXMpCi0gICAgICAgICAgICAgICAgdmFyIGludmVydGVk SW1hZ2UgPSBfaW52ZXJ0TWFza0ltYWdlKGltYWdlLCAzNSwgMTI1LCAxOTUpOwotICAgICAgICAg ICAgZWxzZQotICAgICAgICAgICAgICAgIHZhciBpbnZlcnRlZEltYWdlID0gX2ludmVydE1hc2tJ bWFnZShpbWFnZSwgOTAsIDkwLCA5MCk7Ci0KLSAgICAgICAgICAgIGlmIChzdGF0ZSA9PT0gc3Rh dGVzLkZvY3VzKSB7Ci0gICAgICAgICAgICAgICAgLy8gRG91YmxlIGRyYXcgdGhlIGJsdXJyeSBp bm5lciBzaGFkb3cgdG8gZ2V0IHRoZSByaWdodCBlZmZlY3QuCi0gICAgICAgICAgICAgICAgX2Ry YXdJbWFnZVNoYWRvdyhzY3JhdGNoQ29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2IoMTAs IDk1LCAxNTApIiwgaW52ZXJ0ZWRJbWFnZSk7Ci0gICAgICAgICAgICAgICAgX2RyYXdJbWFnZVNo YWRvdyhzY3JhdGNoQ29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2IoMTAsIDk1LCAxNTAp IiwgaW52ZXJ0ZWRJbWFnZSk7Ci0KLSAgICAgICAgICAgICAgICAvLyBEcmF3IHRoZSBpbm5lciBz aGFkb3cuCi0gICAgICAgICAgICAgICAgX2RyYXdJbWFnZVNoYWRvdyhzY3JhdGNoQ29udGV4dCwg MCwgc2hhZG93RGVwdGgsIHNoYWRvd0JsdXIsICJyZ2IoMCwgODAsIDE3MCkiLCBpbnZlcnRlZElt YWdlKTsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAoc3RhdGUgPT09IHN0YXRlcy5BY3RpdmVGb2N1 cykgewotICAgICAgICAgICAgICAgIC8vIERvdWJsZSBkcmF3IHRoZSBibHVycnkgaW5uZXIgc2hh ZG93IHRvIGdldCB0aGUgcmlnaHQgZWZmZWN0LgotICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VT aGFkb3coc2NyYXRjaENvbnRleHQsIDAsIDAsIHNoYWRvd0RlcHRoLCAicmdiKDAsIDgwLCAxMDAp IiwgaW52ZXJ0ZWRJbWFnZSk7Ci0gICAgICAgICAgICAgICAgX2RyYXdJbWFnZVNoYWRvdyhzY3Jh dGNoQ29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2IoMCwgODAsIDEwMCkiLCBpbnZlcnRl ZEltYWdlKTsKKyAgICAgICAgZnVuY3Rpb24gZ2VuZXJhdGVMZWdhY3lJbWFnZSgpCisgICAgICAg IHsKKyAgICAgICAgICAgIGNvbnN0IGRlcHRoID0gMSAqIHNjYWxlRmFjdG9yOworICAgICAgICAg ICAgY29uc3Qgc2hhZG93RGVwdGggPSBkZXB0aDsKKyAgICAgICAgICAgIGNvbnN0IHNoYWRvd0Js dXIgPSBkZXB0aCAtIDE7CisgICAgICAgICAgICBjb25zdCBnbG93Qmx1ciA9IDI7CisKKyAgICAg ICAgICAgIGNvbnN0IGNvbnRleHQgPSBkb2N1bWVudC5nZXRDU1NDYW52YXNDb250ZXh0KCIyZCIs IGNhbnZhc0lkZW50aWZpZXJDYWxsYmFjayhzdGF0ZSksIHNjYWxlZFdpZHRoLCBzY2FsZWRIZWln aHQpOworICAgICAgICAgICAgY29udGV4dC5zYXZlKCk7CisgICAgICAgICAgICBjb250ZXh0LnNj YWxlKHNjYWxlRmFjdG9yLCBzY2FsZUZhY3Rvcik7CiAKLSAgICAgICAgICAgICAgICAvLyBEcmF3 IHRoZSBpbm5lciBzaGFkb3cuCi0gICAgICAgICAgICAgICAgX2RyYXdJbWFnZVNoYWRvdyhzY3Jh dGNoQ29udGV4dCwgMCwgc2hhZG93RGVwdGgsIHNoYWRvd0JsdXIsICJyZ2IoMCwgNjUsIDE1MCki LCBpbnZlcnRlZEltYWdlKTsKKyAgICAgICAgICAgIGNvbnRleHQuY2xlYXJSZWN0KDAsIDAsIHdp ZHRoLCBoZWlnaHQpOworCisgICAgICAgICAgICBpZiAoZGVwdGggPiAwKSB7CisgICAgICAgICAg ICAgICAgLy8gVXNlIHNjcmF0Y2ggY2FudmFzIHNvIHdlIGNhbiBhcHBseSB0aGUgZHJhdyB0aGUg d2hpdGUgZHJvcCBzaGFkb3cKKyAgICAgICAgICAgICAgICAvLyB0byB0aGUgd2hvbGUgZ2x5cGgg YXQgdGhlIGVuZC4KKworICAgICAgICAgICAgICAgIHZhciBzY3JhdGNoQ2FudmFzID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgiY2FudmFzIik7CisgICAgICAgICAgICAgICAgc2NyYXRjaENhbnZh cy53aWR0aCA9IHNjYWxlZFdpZHRoOworICAgICAgICAgICAgICAgIHNjcmF0Y2hDYW52YXMuaGVp Z2h0ID0gc2NhbGVkSGVpZ2h0OworCisgICAgICAgICAgICAgICAgdmFyIHNjcmF0Y2hDb250ZXh0 ID0gc2NyYXRjaENhbnZhcy5nZXRDb250ZXh0KCIyZCIpOworICAgICAgICAgICAgICAgIHNjcmF0 Y2hDb250ZXh0LnNjYWxlKHNjYWxlRmFjdG9yLCBzY2FsZUZhY3Rvcik7CisgICAgICAgICAgICB9 IGVsc2UKKyAgICAgICAgICAgICAgICB2YXIgc2NyYXRjaENvbnRleHQgPSBjb250ZXh0OworCisg ICAgICAgICAgICB2YXIgZ3JhZGllbnQgPSBzY3JhdGNoQ29udGV4dC5jcmVhdGVMaW5lYXJHcmFk aWVudCgwLCAwLCAwLCBoZWlnaHQpOworICAgICAgICAgICAgaWYgKHN0YXRlID09PSBzdGF0ZXMu QWN0aXZlKSB7CisgICAgICAgICAgICAgICAgZ3JhZGllbnQuYWRkQ29sb3JTdG9wKDAsICJyZ2Io NjAsIDYwLCA2MCkiKTsKKyAgICAgICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMSwg InJnYigxMDAsIDEwMCwgMTAwKSIpOworICAgICAgICAgICAgfSBlbHNlIGlmIChzdGF0ZSA9PT0g c3RhdGVzLkZvY3VzKSB7CisgICAgICAgICAgICAgICAgZ3JhZGllbnQuYWRkQ29sb3JTdG9wKDAs ICJyZ2IoNTAsIDEzNSwgMjAwKSIpOworICAgICAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9y U3RvcCgxLCAicmdiKDYwLCAxNTUsIDIyNSkiKTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAoc3Rh dGUgPT09IHN0YXRlcy5BY3RpdmVGb2N1cykgeworICAgICAgICAgICAgICAgIGdyYWRpZW50LmFk ZENvbG9yU3RvcCgwLCAicmdiKDMwLCAxMTUsIDE4NSkiKTsKKyAgICAgICAgICAgICAgICBncmFk aWVudC5hZGRDb2xvclN0b3AoMSwgInJnYig0MCwgMTM1LCAyMDApIik7CiAgICAgICAgICAgICB9 IGVsc2UgewotICAgICAgICAgICAgICAgIC8vIERvdWJsZSBkcmF3IHRoZSBibHVycnkgaW5uZXIg c2hhZG93IHRvIGdldCB0aGUgcmlnaHQgZWZmZWN0LgotICAgICAgICAgICAgICAgIF9kcmF3SW1h Z2VTaGFkb3coc2NyYXRjaENvbnRleHQsIDAsIDAsIHNoYWRvd0RlcHRoLCAicmdiYSgwLCAwLCAw LCAxKSIsIGludmVydGVkSW1hZ2UpOwotICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VTaGFkb3co c2NyYXRjaENvbnRleHQsIDAsIDAsIHNoYWRvd0RlcHRoLCAicmdiYSgwLCAwLCAwLCAxKSIsIGlu dmVydGVkSW1hZ2UpOworICAgICAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9yU3RvcCgwLCAi cmdiKDkwLCA5MCwgOTApIik7CisgICAgICAgICAgICAgICAgZ3JhZGllbnQuYWRkQ29sb3JTdG9w KDEsICJyZ2IoMTQ1LCAxNDUsIDE0NSkiKTsKKyAgICAgICAgICAgIH0KIAotICAgICAgICAgICAg ICAgIC8vIERyYXcgdGhlIGlubmVyIHNoYWRvdy4KLSAgICAgICAgICAgICAgICBfZHJhd0ltYWdl U2hhZG93KHNjcmF0Y2hDb250ZXh0LCAwLCBzaGFkb3dEZXB0aCwgc2hhZG93Qmx1ciwgInJnYmEo MCwgMCwgMCwgMC42KSIsIGludmVydGVkSW1hZ2UpOworICAgICAgICAgICAgc2NyYXRjaENvbnRl eHQuZmlsbFN0eWxlID0gZ3JhZGllbnQ7CisgICAgICAgICAgICBzY3JhdGNoQ29udGV4dC5maWxs UmVjdCgwLCAwLCB3aWR0aCwgaGVpZ2h0KTsKKworICAgICAgICAgICAgaWYgKGRlcHRoID4gMCkg eworICAgICAgICAgICAgICAgIC8vIEludmVydCB0aGUgaW1hZ2UgdG8gdXNlIGFzIGEgcmV2ZXJz ZSBpbWFnZSBtYXNrIGZvciB0aGUgaW5uZXIgc2hhZG93cy4KKyAgICAgICAgICAgICAgICAvLyBQ YXNzIGluIHRoZSBjb2xvciB0byB1c2UgZm9yIHRoZSBvcGFxdWUgYXJlYXMgdG8gcHJldmVudCAi YmxhY2sgaGFsb3MiCisgICAgICAgICAgICAgICAgLy8gbGF0ZXIgd2hlbiBhcHBseWluZyB0aGUg ZmluYWwgaW1hZ2UgbWFzay4KKworICAgICAgICAgICAgICAgIGlmIChzdGF0ZSA9PT0gc3RhdGVz LkFjdGl2ZSkKKyAgICAgICAgICAgICAgICAgICAgdmFyIGludmVydGVkSW1hZ2UgPSBfaW52ZXJ0 TWFza0ltYWdlKGltYWdlLCA2MCwgNjAsIDYwKTsKKyAgICAgICAgICAgICAgICBlbHNlIGlmIChz dGF0ZSA9PT0gc3RhdGVzLkZvY3VzKQorICAgICAgICAgICAgICAgICAgICB2YXIgaW52ZXJ0ZWRJ bWFnZSA9IF9pbnZlcnRNYXNrSW1hZ2UoaW1hZ2UsIDQ1LCAxNDUsIDIxMCk7CisgICAgICAgICAg ICAgICAgZWxzZSBpZiAoc3RhdGUgPT09IHN0YXRlcy5BY3RpdmVGb2N1cykKKyAgICAgICAgICAg ICAgICAgICAgdmFyIGludmVydGVkSW1hZ2UgPSBfaW52ZXJ0TWFza0ltYWdlKGltYWdlLCAzNSwg MTI1LCAxOTUpOworICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgdmFy IGludmVydGVkSW1hZ2UgPSBfaW52ZXJ0TWFza0ltYWdlKGltYWdlLCA5MCwgOTAsIDkwKTsKKwor ICAgICAgICAgICAgICAgIGlmIChzdGF0ZSA9PT0gc3RhdGVzLkZvY3VzKSB7CisgICAgICAgICAg ICAgICAgICAgIC8vIERvdWJsZSBkcmF3IHRoZSBibHVycnkgaW5uZXIgc2hhZG93IHRvIGdldCB0 aGUgcmlnaHQgZWZmZWN0LgorICAgICAgICAgICAgICAgICAgICBfZHJhd0ltYWdlU2hhZG93KHNj cmF0Y2hDb250ZXh0LCAwLCAwLCBzaGFkb3dEZXB0aCwgInJnYigxMCwgOTUsIDE1MCkiLCBpbnZl cnRlZEltYWdlKTsKKyAgICAgICAgICAgICAgICAgICAgX2RyYXdJbWFnZVNoYWRvdyhzY3JhdGNo Q29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2IoMTAsIDk1LCAxNTApIiwgaW52ZXJ0ZWRJ bWFnZSk7CisKKyAgICAgICAgICAgICAgICAgICAgLy8gRHJhdyB0aGUgaW5uZXIgc2hhZG93Lgor ICAgICAgICAgICAgICAgICAgICBfZHJhd0ltYWdlU2hhZG93KHNjcmF0Y2hDb250ZXh0LCAwLCBz aGFkb3dEZXB0aCwgc2hhZG93Qmx1ciwgInJnYigwLCA4MCwgMTcwKSIsIGludmVydGVkSW1hZ2Up OworICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoc3RhdGUgPT09IHN0YXRlcy5BY3RpdmVGb2N1 cykgeworICAgICAgICAgICAgICAgICAgICAvLyBEb3VibGUgZHJhdyB0aGUgYmx1cnJ5IGlubmVy IHNoYWRvdyB0byBnZXQgdGhlIHJpZ2h0IGVmZmVjdC4KKyAgICAgICAgICAgICAgICAgICAgX2Ry YXdJbWFnZVNoYWRvdyhzY3JhdGNoQ29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2IoMCwg ODAsIDEwMCkiLCBpbnZlcnRlZEltYWdlKTsKKyAgICAgICAgICAgICAgICAgICAgX2RyYXdJbWFn ZVNoYWRvdyhzY3JhdGNoQ29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2IoMCwgODAsIDEw MCkiLCBpbnZlcnRlZEltYWdlKTsKKworICAgICAgICAgICAgICAgICAgICAvLyBEcmF3IHRoZSBp bm5lciBzaGFkb3cuCisgICAgICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VTaGFkb3coc2NyYXRj aENvbnRleHQsIDAsIHNoYWRvd0RlcHRoLCBzaGFkb3dCbHVyLCAicmdiKDAsIDY1LCAxNTApIiwg aW52ZXJ0ZWRJbWFnZSk7CisgICAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAg ICAgICAgLy8gRG91YmxlIGRyYXcgdGhlIGJsdXJyeSBpbm5lciBzaGFkb3cgdG8gZ2V0IHRoZSBy aWdodCBlZmZlY3QuCisgICAgICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VTaGFkb3coc2NyYXRj aENvbnRleHQsIDAsIDAsIHNoYWRvd0RlcHRoLCAicmdiYSgwLCAwLCAwLCAxKSIsIGludmVydGVk SW1hZ2UpOworICAgICAgICAgICAgICAgICAgICBfZHJhd0ltYWdlU2hhZG93KHNjcmF0Y2hDb250 ZXh0LCAwLCAwLCBzaGFkb3dEZXB0aCwgInJnYmEoMCwgMCwgMCwgMSkiLCBpbnZlcnRlZEltYWdl KTsKKworICAgICAgICAgICAgICAgICAgICAvLyBEcmF3IHRoZSBpbm5lciBzaGFkb3cuCisgICAg ICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VTaGFkb3coc2NyYXRjaENvbnRleHQsIDAsIHNoYWRv d0RlcHRoLCBzaGFkb3dCbHVyLCAicmdiYSgwLCAwLCAwLCAwLjYpIiwgaW52ZXJ0ZWRJbWFnZSk7 CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQotICAgICAgICB9CiAKLSAgICAgICAg Ly8gQXBwbHkgdGhlIG1hc2sgdG8ga2VlcCBqdXN0IHRoZSBpbm5lciBzaGFwZSBvZiB0aGUgZ2x5 cGguCi0gICAgICAgIF9hcHBseUltYWdlTWFzayhzY3JhdGNoQ29udGV4dCwgaW1hZ2UpOworICAg ICAgICAgICAgLy8gQXBwbHkgdGhlIG1hc2sgdG8ga2VlcCBqdXN0IHRoZSBpbm5lciBzaGFwZSBv ZiB0aGUgZ2x5cGguCisgICAgICAgICAgICBfYXBwbHlJbWFnZU1hc2soc2NyYXRjaENvbnRleHQs IGltYWdlKTsKKworICAgICAgICAgICAgLy8gRHJhdyB0aGUgd2hpdGUgZHJvcCBzaGFkb3cuCisg ICAgICAgICAgICBpZiAoZGVwdGggPiAwKQorICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VTaGFk b3coY29udGV4dCwgMCwgc2hhZG93RGVwdGgsIHNoYWRvd0JsdXIsICJyZ2JhKDI1NSwgMjU1LCAy NTUsIDAuNikiLCBzY3JhdGNoQ2FudmFzKTsKIAotICAgICAgICAvLyBEcmF3IHRoZSB3aGl0ZSBk cm9wIHNoYWRvdy4KLSAgICAgICAgaWYgKGRlcHRoID4gMCkKLSAgICAgICAgICAgIF9kcmF3SW1h Z2VTaGFkb3coY29udGV4dCwgMCwgc2hhZG93RGVwdGgsIHNoYWRvd0JsdXIsICJyZ2JhKDI1NSwg MjU1LCAyNTUsIDAuNikiLCBzY3JhdGNoQ2FudmFzKTsKKyAgICAgICAgICAgIC8vIERyYXcgYSBz dWJ0bGUgZ2xvdyBmb3IgdGhlIGZvY3VzIHN0YXRlcy4KKyAgICAgICAgICAgIGlmIChzdGF0ZSA9 PT0gc3RhdGVzLkZvY3VzIHx8IHN0YXRlID09PSBzdGF0ZXMuQWN0aXZlRm9jdXMpCisgICAgICAg ICAgICAgICAgX2RyYXdJbWFnZVNoYWRvdyhjb250ZXh0LCAwLCAwLCBnbG93Qmx1ciwgInJnYmEo MjAsIDEwMCwgMjIwLCAwLjQpIiwgc2NyYXRjaENhbnZhcyk7CiAKLSAgICAgICAgLy8gRHJhdyBh IHN1YnRsZSBnbG93IGZvciB0aGUgZm9jdXMgc3RhdGVzLgotICAgICAgICBpZiAoc3RhdGUgPT09 IHN0YXRlcy5Gb2N1cyB8fCBzdGF0ZSA9PT0gc3RhdGVzLkFjdGl2ZUZvY3VzKQotICAgICAgICAg ICAgX2RyYXdJbWFnZVNoYWRvdyhjb250ZXh0LCAwLCAwLCBnbG93Qmx1ciwgInJnYmEoMjAsIDEw MCwgMjIwLCAwLjQpIiwgc2NyYXRjaENhbnZhcyk7CisgICAgICAgICAgICBpZiAoIWlnbm9yZUNh Y2hlKSB7CisgICAgICAgICAgICAgICAgY29uc3Qgc3RvcmFnZUtleSA9IHN0b3JhZ2VLZXlQcmVm aXggKyBjYW52YXNJZGVudGlmaWVyQ2FsbGJhY2soc3RhdGUpOworICAgICAgICAgICAgICAgIHNh dmVJbWFnZVRvU3RvcmFnZShzdG9yYWdlS2V5LCBjb250ZXh0LCBzY2FsZWRXaWR0aCwgc2NhbGVk SGVpZ2h0LCBpbWFnZVZlcnNpb24pOworICAgICAgICAgICAgfQogCi0gICAgICAgIGlmICghaWdu b3JlQ2FjaGUpIHsKLSAgICAgICAgICAgIGNvbnN0IHN0b3JhZ2VLZXkgPSBzdG9yYWdlS2V5UHJl Zml4ICsgY2FudmFzSWRlbnRpZmllckNhbGxiYWNrKHN0YXRlKTsKLSAgICAgICAgICAgIHNhdmVJ bWFnZVRvU3RvcmFnZShzdG9yYWdlS2V5LCBjb250ZXh0LCBzY2FsZWRXaWR0aCwgc2NhbGVkSGVp Z2h0LCBpbWFnZVZlcnNpb24pOworICAgICAgICAgICAgY29udGV4dC5yZXN0b3JlKCk7CiAgICAg ICAgIH0KIAotICAgICAgICBjb250ZXh0LnJlc3RvcmUoKTsKKyAgICAgICAgaWYgKFdlYkluc3Bl Y3Rvci5QbGF0Zm9ybS5uYW1lID09PSAibWFjIiAmJiBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVy c2lvbi5iYXNlID09PSAxMCAmJiBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5yZWxlYXNl IDwgMTApCisgICAgICAgICAgICBnZW5lcmF0ZUxlZ2FjeUltYWdlKCk7CisgICAgICAgIGVsc2UK KyAgICAgICAgICAgIGdlbmVyYXRlTW9kZXJuSW1hZ2UoKTsKICAgICB9CiAKICAgICBmdW5jdGlv biBfZHJhd0ltYWdlU2hhZG93KGNvbnRleHQsIHhPZmZzZXQsIHlPZmZzZXQsIGJsdXIsIGNvbG9y LCBpbWFnZSkgewpAQCAtNjUzLDcgKzY5OSw2IEBAIGZ1bmN0aW9uIGdlbmVyYXRlRW1ib3NzZWRJ bWFnZXMoc3JjLCB3aWR0aCwgaGVpZ2h0LCBzdGF0ZXMsIGNhbnZhc0lkZW50aWZpZXJDYWxsCiAg ICAgfQogfQogCi0KIHZhciBzdmdJbWFnZUNhY2hlID0ge307CiAKIGZ1bmN0aW9uIGxvYWRTVkdJ bWFnZURvY3VtZW50RWxlbWVudCh1cmwsIGNhbGxiYWNrKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCmluZGV4IGE0YTZjY2UuLjA1NzQwYmIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFp bi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4u anMKQEAgLTE2Nyw3ICsxNjcsNyBAQCBXZWJJbnNwZWN0b3IubG9hZGVkID0gZnVuY3Rpb24oKQog ICAgIH07CiAKICAgICB0aGlzLl93aW5kb3dLZXlkb3duTGlzdGVuZXJzID0gW107Ci19Cit9Owog CiBXZWJJbnNwZWN0b3IuY29udGVudExvYWRlZCA9IGZ1bmN0aW9uKCkKIHsKQEAgLTE5MywxNiAr MTkzLDUwIEBAIFdlYkluc3BlY3Rvci5jb250ZW50TG9hZGVkID0gZnVuY3Rpb24oKQogICAgICAg ICBkb2N1bWVudC5ib2R5LmNsYXNzTGlzdC5hZGQoIm5pZ2h0bHktYnVpbGQiKTsKIAogICAgIC8v IEFkZCBwbGF0Zm9ybSBzdHlsZSBjbGFzc2VzIHNvIHRoZSBVSSBjYW4gYmUgdHdlYWtlZCBwZXIt cGxhdGZvcm0uCi0gICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QuYWRkKEluc3BlY3RvckZyb250 ZW5kSG9zdC5wbGF0Zm9ybSgpICsgIi1wbGF0Zm9ybSIpOwotCi0gICAgaWYgKEluc3BlY3RvckZy b250ZW5kSG9zdC5wbGF0Zm9ybSgpID09PSAibWFjIikgewotICAgICAgICB2YXIgdmVyc2lvbk1h dGNoID0gLyBNYWMgT1MgWCAoXGQrKV8oXGQrKS8uZXhlYyhuYXZpZ2F0b3IuYXBwVmVyc2lvbik7 Ci0gICAgICAgIGlmICh2ZXJzaW9uTWF0Y2ggJiYgdmVyc2lvbk1hdGNoWzFdID09IDEwICYmIHZl cnNpb25NYXRjaFsyXSA9PSA4KQotICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3Qu YWRkKCJtb3VudGFpbi1saW9uIik7Ci0gICAgICAgIGVsc2UgaWYgKHZlcnNpb25NYXRjaCAmJiB2 ZXJzaW9uTWF0Y2hbMV0gPT0gMTAgJiYgdmVyc2lvbk1hdGNoWzJdID09IDkpCi0gICAgICAgICAg ICBkb2N1bWVudC5ib2R5LmNsYXNzTGlzdC5hZGQoIm1hdmVyaWNrcyIpOworICAgIFdlYkluc3Bl Y3Rvci5QbGF0Zm9ybSA9IHsKKyAgICAgICAgbmFtZTogSW5zcGVjdG9yRnJvbnRlbmRIb3N0LnBs YXRmb3JtKCksCisgICAgICAgIGNvZGVOYW1lOiAiIiwKKyAgICAgICAgdmVyc2lvbjogeworICAg ICAgICAgICAgYmFzZTogMCwKKyAgICAgICAgICAgIHJlbGVhc2U6IDAsCisgICAgICAgICAgICB0 b1N0cmluZzogZnVuY3Rpb24oKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHJldHVy biB0aGlzLmJhc2UgKyAiLiIgKyB0aGlzLnZlcnNpb247CisgICAgICAgICAgICB9CisgICAgICAg IH0sCisgICAgICAgIHRvU3RyaW5nOiBmdW5jdGlvbigpCisgICAgICAgIHsKKyAgICAgICAgICAg IHJldHVybiB0aGlzLm5hbWU7CisgICAgICAgIH0KKyAgICB9OworCisgICAgdmFyIGlzTGVnYWN5 TWFjT1MgPSBmYWxzZTsKKyAgICB2YXIgb3NWZXJzaW9uTWF0Y2ggPSAvIE1hYyBPUyBYIChcZCsp XyhcZCspLy5leGVjKG5hdmlnYXRvci5hcHBWZXJzaW9uKTsKKyAgICBpZiAob3NWZXJzaW9uTWF0 Y2ggJiYgb3NWZXJzaW9uTWF0Y2hbMV0gPT09ICIxMCIpIHsKKyAgICAgICAgV2ViSW5zcGVjdG9y LlBsYXRmb3JtLnZlcnNpb24uYmFzZSA9IDEwOworICAgICAgICBzd2l0Y2gob3NWZXJzaW9uTWF0 Y2hbMl0pIHsKKyAgICAgICAgICAgIGNhc2UgIjEwIjoKKyAgICAgICAgICAgICAgICBXZWJJbnNw ZWN0b3IuUGxhdGZvcm0uY29kZU5hbWUgPSAieW9zZW1pdGUiOworICAgICAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLnJlbGVhc2UgPSAxMDsKKyAgICAgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgIjkiOgorICAgICAgICAgICAgICAgIFdlYkluc3Bl Y3Rvci5QbGF0Zm9ybS5jb2RlTmFtZSA9ICJtYXZlcmlja3MiOworICAgICAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLnJlbGVhc2UgPSA5OworICAgICAgICAgICAgICAg IGlzTGVnYWN5TWFjT1MgPSB0cnVlOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAg ICAgY2FzZSAiOCI6CisgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLlBsYXRmb3JtLmNvZGVO YW1lID0gIm1vdW50YWluLWxpb24iOworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0 Zm9ybS52ZXJzaW9uLnJlbGVhc2UgPSA4OworICAgICAgICAgICAgICAgIGlzTGVnYWN5TWFjT1Mg PSB0cnVlOworICAgICAgICB9CiAgICAgfQogCisgICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3Qu YWRkKFdlYkluc3BlY3Rvci5QbGF0Zm9ybSArICItcGxhdGZvcm0iKTsKKyAgICBpZiAoV2ViSW5z cGVjdG9yLlBsYXRmb3JtLmNvZGVOYW1lKQorICAgICAgICBkb2N1bWVudC5ib2R5LmNsYXNzTGlz dC5hZGQoV2ViSW5zcGVjdG9yLlBsYXRmb3JtLmNvZGVOYW1lKTsKKyAgICBpZiAoaXNMZWdhY3lN YWNPUykKKyAgICAgICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QuYWRkKCJsZWdhY3kiKTsKKwog ICAgIHRoaXMuZGVidWdnYWJsZVR5cGUgPSBJbnNwZWN0b3JGcm9udGVuZEhvc3QuZGVidWdnYWJs ZVR5cGUoKSA9PT0gIndlYiIgPyBXZWJJbnNwZWN0b3IuRGVidWdnYWJsZVR5cGUuV2ViIDogV2Vi SW5zcGVjdG9yLkRlYnVnZ2FibGVUeXBlLkphdmFTY3JpcHQ7CiAgICAgZG9jdW1lbnQuYm9keS5j bGFzc0xpc3QuYWRkKHRoaXMuZGVidWdnYWJsZVR5cGUpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvQmFja0Fycm93LnN2ZyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9CYWNrQXJyb3cuc3ZnCmluZGV4 IGUxZjU5MGUuLjE4MDUzMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0ltYWdlcy9CYWNrQXJyb3cuc3ZnCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9CYWNrQXJyb3cuc3ZnCkBAIC0xLDUgKzEsNSBAQAogPD94 bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KIDwhLS0gQ29weXJpZ2h0IMKpIDIw MTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLiAtLT4KLTxzdmcgdmVyc2lvbj0iMS4x IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA5IDkiPgot ICAgIDxwYXRoIGQ9Ik0gOSAwIEwgMC40ODQzNzUgNC40ODQzNzUgTCA5IDkgWiIvPgorPHN2ZyB2 ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0i MCAwIDEwIDE2Ij4KKyAgICA8cGF0aCBkPSJNIDMuMjA1NDAwNjQgNy43NTk4MzI4MyBMIDkuMzQ0 OCAxLjYyNDQgTCA3LjczODggMC4wMTc0IEwgLTAuMDAwMiA3Ljc1MTQgTCAwLjAwOTE5OTM3NTkg Ny43NjA4MDUyMyBMIDAuMDAxOCA3Ljc2ODIgTCA3LjczNTggMTUuNTA3MiBMIDkuMzQyOCAxMy45 MDEyIEwgMy4yMDU0MDA2NCA3Ljc1OTgzMjgzIFoiPjwvcGF0aD4KIDwvc3ZnPgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0JhY2tBcnJvd0xl Z2FjeS5zdmcgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvQmFj a0Fycm93TGVnYWN5LnN2ZwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lMWY1 OTBlCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvSW1hZ2VzL0JhY2tBcnJvd0xlZ2FjeS5zdmcKQEAgLTAsMCArMSw1IEBACis8P3htbCB2ZXJz aW9uPSIxLjAiIGVuY29kaW5nPSJ1dGYtOCI/PgorPCEtLSBDb3B5cmlnaHQgwqkgMjAxMyBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuIC0tPgorPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5z PSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDkgOSI+CisgICAgPHBh dGggZD0iTSA5IDAgTCAwLjQ4NDM3NSA0LjQ4NDM3NSBMIDkgOSBaIi8+Cis8L3N2Zz4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9Gb3J3YXJk QXJyb3cuc3ZnIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0Zv cndhcmRBcnJvdy5zdmcKaW5kZXggYzE2YmM2NS4uNjhiOGYxNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0ZvcndhcmRBcnJvdy5zdmcKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0ZvcndhcmRBcnJv dy5zdmcKQEAgLTEsNSArMSw1IEBACiA8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJ1dGYt OCI/PgogPCEtLSBDb3B5cmlnaHQgwqkgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuIC0tPgotPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw L3N2ZyIgdmlld0JveD0iMCAwIDkgOSI+Ci0gICAgPHBhdGggZD0iTSAwIDAgTCA4LjUxNTYyNSA0 LjQ4NDM3NSBMIDAgOSBaIi8+Cis8c3ZnIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cu dzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgMTAgMTYiPgorICAgIDxwYXRoIGQ9Ik0gNi4x MzkyNDkzMyA3Ljc1OTc4MjgzIEwgMC4wMDE4IDEzLjkwMTIgTCAxLjYwODggMTUuNTA3MiBMIDku MzQyOCA3Ljc2ODIgTCA5LjMzNTQ1MDY2IDcuNzYwODU1MjMgTCA5LjM0NDkgNy43NTE0IEwgMS42 MDU5IDAuMDE3NCBMIC0wLjAwMDEgMS42MjQ0IEwgNi4xMzkyNDkzMyA3Ljc1OTc4MjgzIFoiPjwv cGF0aD4KIDwvc3ZnPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvSW1hZ2VzL0ZvcndhcmRBcnJvd0xlZ2FjeS5zdmcgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9JbWFnZXMvRm9yd2FyZEFycm93TGVnYWN5LnN2ZwpuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jMTZiYzY1Ci0tLSAvZGV2L251bGwKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0ZvcndhcmRBcnJvd0xlZ2Fj eS5zdmcKQEAgLTAsMCArMSw1IEBACis8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJ1dGYt OCI/PgorPCEtLSBDb3B5cmlnaHQgwqkgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuIC0tPgorPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw L3N2ZyIgdmlld0JveD0iMCAwIDkgOSI+CisgICAgPHBhdGggZD0iTSAwIDAgTCA4LjUxNTYyNSA0 LjQ4NDM3NSBMIDAgOSBaIi8+Cis8L3N2Zz4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0J1dHRvblRvb2xiYXJJdGVtLmNzcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0J1dHRvblRvb2xiYXJJdGVtLmNzcwpp bmRleCBkNjJhMTg5Li5jZGRlZWIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9CdXR0b25Ub29sYmFySXRlbS5jc3MKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQnV0dG9uVG9vbGJhckl0ZW0uY3NzCkBA IC01OSw2ICs1OSwxMCBAQAogCiAudG9vbGJhciAuaXRlbS5idXR0b24gPiAubGFiZWwgewogICAg IHRleHQtYWxpZ246IGNlbnRlcjsKKyAgICBjb2xvcjogcmdiKDgwLCA4MCwgODApOworfQorCiti b2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnRvb2xiYXIgLml0ZW0uYnV0dG9uID4gLmxhYmVsIHsK ICAgICB0ZXh0LXNoYWRvdzogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjUpIDAgMXB4IDA7CiAgICAg Y29sb3I6IHJnYig2MCwgNjAsIDYwKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmNzcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFy YXRpb25TZWN0aW9uLmNzcwppbmRleCA1YjM2ZmIzLi40ODJlNzhjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9u U2VjdGlvbi5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uY3NzCkBAIC0zMCwzMCArMzAsNDIgQEAKICAg ICBwYWRkaW5nOiA1cHg7CiAKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsKKyAgICBib3Jk ZXItYm90dG9tOiAxcHggc29saWQgcmdiKDIxMCwgMjEwLCAyMTApOwogfQogCi0uc3R5bGUtZGVj bGFyYXRpb24tc2VjdGlvbiArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uIHsKK2JvZHkubWFj LXBsYXRmb3JtLmxlZ2FjeSAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbiB7CisgICAgYm9yZGVy LWJvdHRvbTogbm9uZTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zdHlsZS1kZWNs YXJhdGlvbi1zZWN0aW9uICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24gewogICAgIGJvcmRl ci10b3A6IDFweCBzb2xpZCByZ2IoMjEwLCAyMTAsIDIxMCk7CiB9CiAKIC5zdHlsZS1kZWNsYXJh dGlvbi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAgewogICAgIG1hcmdpbi1ib3R0b206IDE1cHg7CiAK KyAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgcmdiKDIxMCwgMjEwLCAyMTApOworfQorCiti b2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1p bi1ncm91cCB7CiAgICAgYm94LXNoYWRvdzogcmdiYSgwLCAwLCAwLCAwLjMpIDAgMnB4IDJweCAw OwogfQogCiAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3VwICsgLnN0eWxl LWRlY2xhcmF0aW9uLXNlY3Rpb24gewogICAgIG1hcmdpbi10b3A6IDE1cHg7CiAKLSAgICBib3Jk ZXItdG9wOiBub25lOworICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCByZ2IoMjEwLCAyMTAsIDIx MCk7Cit9CiAKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc3R5bGUtZGVjbGFyYXRpb24tc2Vj dGlvbi5sYXN0LWluLWdyb3VwICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24gewogICAgIGJv eC1zaGFkb3c6IHJnYmEoMCwgMCwgMCwgMC4zKSAwIDAgMnB4IDA7CisgICAgYm9yZGVyLXRvcDog bm9uZTsKIH0KIAotLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb246Zmlyc3QtY2hpbGQsCi1kaXY6 bm90KC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uKSArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0 aW9uLAotLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1pbi1ncm91cCArIC5zdHlsZS1k ZWNsYXJhdGlvbi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAsCi0uc3R5bGUtZGVjbGFyYXRpb24tc2Vj dGlvbi5sYXN0LWluLWdyb3VwICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb246bGFzdC1jaGls ZCB7Citib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb246 Zmlyc3QtY2hpbGQsCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgZGl2Om5vdCguc3R5bGUtZGVj bGFyYXRpb24tc2VjdGlvbikgKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbiwKK2JvZHkubWFj LXBsYXRmb3JtLmxlZ2FjeSAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3Vw ICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1pbi1ncm91cCwKK2JvZHkubWFjLXBs YXRmb3JtLmxlZ2FjeSAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3VwICsg LnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb246bGFzdC1jaGlsZCB7CiAgICAgYm94LXNoYWRvdzog cmdiYSgwLCAwLCAwLCAwLjMpIDAgMXB4IDNweCAxcHg7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGV0YWlsc1NpZGVi YXJQYW5lbC5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9D U1NTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwuY3NzCmluZGV4IDlkZjg4MmIuLjc2ZGYzYTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0 eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLmNzcwpAQCAtNDMs NiArNDMsNyBAQAogCiAuc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSA+IC5jb250 ZW50ID4gLnBzZXVkby1jbGFzc2VzIHsKICAgICBwYWRkaW5nOiAxMHB4OworICAgIGJvcmRlci1i b3R0b206IDFweCBzb2xpZCByZ2IoMTUzLCAxNTMsIDE1Myk7CiAKICAgICBkaXNwbGF5OiAtd2Vi a2l0LWZsZXg7CiAgICAgLXdlYmtpdC1mbGV4LWZsb3c6IHJvdyB3cmFwOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJv d3Nlci5qcwppbmRleCA3ZjU4N2ExLi44YjE1ZWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcwpA QCAtNDksMTIgKzQ5LDIyIEBAIFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlciA9IGZ1bmN0aW9u KGVsZW1lbnQsIGRlbGVnYXRlLCBkaXNhYmxlQmFja0ZvcndhcmQpCiAgICAgICAgIHRoaXMuX2Jh Y2tLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wgfCBX ZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db250cm9sLCBXZWJJbnNwZWN0 b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuTGVmdCwgdGhpcy5fYmFja0J1dHRvbkNsaWNrZWQuYmlu ZCh0aGlzKSk7CiAgICAgICAgIHRoaXMuX2ZvcndhcmRLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0 Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wgfCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1 dC5Nb2RpZmllci5Db250cm9sLCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuUmln aHQsIHRoaXMuX2ZvcndhcmRCdXR0b25DbGlja2VkLmJpbmQodGhpcykpOwogCi0gICAgICAgIHRo aXMuX2JhY2tCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuQnV0dG9uTmF2 aWdhdGlvbkl0ZW0oImJhY2siLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkJhY2sgKCVzKSIpLmZv cm1hdCh0aGlzLl9iYWNrS2V5Ym9hcmRTaG9ydGN1dC5kaXNwbGF5TmFtZSksICJJbWFnZXMvQmFj a0Fycm93LnN2ZyIsIDksIDkpOworICAgICAgICB2YXIgZm9yd2FyZEFycm93LCBiYWNrQXJyb3c7 CisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IuUGxhdGZvcm0ubmFtZSA9PT0gIm1hYyIgJiYgV2Vi SW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24ucmVsZWFzZSA8IDEwKSB7CisgICAgICAgICAgICBm b3J3YXJkQXJyb3cgPSB7c3JjOiAiSW1hZ2VzL0ZvcndhcmRBcnJvd0xlZ2FjeS5zdmciLCB3aWR0 aDogOSwgaGVpZ2h0OiA5fTsKKyAgICAgICAgICAgIGJhY2tBcnJvdyA9IHtzcmM6ICJJbWFnZXMv QmFja0Fycm93TGVnYWN5LnN2ZyIsIHdpZHRoOiA5LCBoZWlnaHQ6IDl9OworICAgICAgICB9Cisg ICAgICAgIGVsc2UgeworICAgICAgICAgICAgZm9yd2FyZEFycm93ID0ge3NyYzogIkltYWdlcy9G b3J3YXJkQXJyb3cuc3ZnIiwgd2lkdGg6IDEwLCBoZWlnaHQ6IDE2fTsKKyAgICAgICAgICAgIGJh Y2tBcnJvdyA9IHtzcmM6ICJJbWFnZXMvQmFja0Fycm93LnN2ZyIsIHdpZHRoOiAxMCwgaGVpZ2h0 OiAxNn07CisgICAgICAgIH0KKworICAgICAgICB0aGlzLl9iYWNrQnV0dG9uTmF2aWdhdGlvbkl0 ZW0gPSBuZXcgV2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVtKCJiYWNrIiwgV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJCYWNrICglcykiKS5mb3JtYXQodGhpcy5fYmFja0tleWJvYXJkU2hv cnRjdXQuZGlzcGxheU5hbWUpLCBiYWNrQXJyb3cuc3JjLCBiYWNrQXJyb3cud2lkdGgsIGJhY2tB cnJvdy5oZWlnaHQpOwogICAgICAgICB0aGlzLl9iYWNrQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWRk RXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xp Y2tlZCwgdGhpcy5fYmFja0J1dHRvbkNsaWNrZWQsIHRoaXMpOwogICAgICAgICB0aGlzLl9iYWNr QnV0dG9uTmF2aWdhdGlvbkl0ZW0uZW5hYmxlZCA9IGZhbHNlOwogICAgICAgICB0aGlzLl9uYXZp Z2F0aW9uQmFyLmFkZE5hdmlnYXRpb25JdGVtKHRoaXMuX2JhY2tCdXR0b25OYXZpZ2F0aW9uSXRl bSk7CiAKLSAgICAgICAgdGhpcy5fZm9yd2FyZEJ1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdl Ykluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbSgiZm9yd2FyZCIsIFdlYkluc3BlY3Rvci5V SVN0cmluZygiRm9yd2FyZCAoJXMpIikuZm9ybWF0KHRoaXMuX2ZvcndhcmRLZXlib2FyZFNob3J0 Y3V0LmRpc3BsYXlOYW1lKSwgIkltYWdlcy9Gb3J3YXJkQXJyb3cuc3ZnIiwgOSwgOSk7CisgICAg ICAgIHRoaXMuX2ZvcndhcmRCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXZWJJbnNwZWN0b3Iu QnV0dG9uTmF2aWdhdGlvbkl0ZW0oImZvcndhcmQiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkZv cndhcmQgKCVzKSIpLmZvcm1hdCh0aGlzLl9mb3J3YXJkS2V5Ym9hcmRTaG9ydGN1dC5kaXNwbGF5 TmFtZSksIGZvcndhcmRBcnJvdy5zcmMsIGZvcndhcmRBcnJvdy53aWR0aCwgZm9yd2FyZEFycm93 LmhlaWdodCk7CiAgICAgICAgIHRoaXMuX2ZvcndhcmRCdXR0b25OYXZpZ2F0aW9uSXRlbS5hZGRF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlj a2VkLCB0aGlzLl9mb3J3YXJkQnV0dG9uQ2xpY2tlZCwgdGhpcyk7CiAgICAgICAgIHRoaXMuX2Zv cndhcmRCdXR0b25OYXZpZ2F0aW9uSXRlbS5lbmFibGVkID0gZmFsc2U7CiAgICAgICAgIHRoaXMu X25hdmlnYXRpb25CYXIuYWRkTmF2aWdhdGlvbkl0ZW0odGhpcy5fZm9yd2FyZEJ1dHRvbk5hdmln YXRpb25JdGVtKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmNzcwppbmRleCAzMTk0YjU5Li5jNGMxZDky IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9E T01UcmVlT3V0bGluZS5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRE9NVHJlZU91dGxpbmUuY3NzCkBAIC00NCwxMCArNDQsMTQgQEAKICAgICBsZWZ0 OiAzcHg7CiAgICAgcmlnaHQ6IDNweDsKIAotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYmEoNTYs IDEyMSwgMjE3LCAwLjEpOworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYmEoMCwgMTI4LCAyNTIs IDAuMSk7CiAgICAgYm9yZGVyLXJhZGl1czogNXB4OwogfQogCitib2R5Lm1hYy1wbGF0Zm9ybS5s ZWdhY3kgLmRvbS10cmVlLW91dGxpbmUgbGkuaG92ZXJlZDpub3QoLnNlbGVjdGVkKSAuc2VsZWN0 aW9uIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2JhKDU2LCAxMjEsIDIxNywgMC4xKTsKK30K KwogLmRvbS10cmVlLW91dGxpbmUgbGkgLnNlbGVjdGlvbiB7CiAgICAgZGlzcGxheTogbm9uZTsK ICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CkBAIC02NSwxMCArNjksMTggQEAKIC5kb20tdHJlZS1v dXRsaW5lIGxpLmVsZW1lbnRzLWRyYWctb3ZlciAuc2VsZWN0aW9uIHsKICAgICBkaXNwbGF5OiBi bG9jazsKICAgICBtYXJnaW4tdG9wOiAtMnB4OworICAgIGJvcmRlci10b3A6IDJweCBzb2xpZCBy Z2IoMCwgMTI4LCAyNTIpOworfQorCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRvbS10cmVl LW91dGxpbmUgbGkuZWxlbWVudHMtZHJhZy1vdmVyIC5zZWxlY3Rpb24gewogICAgIGJvcmRlci10 b3A6IDJweCBzb2xpZCByZ2IoNTYsIDEyMSwgMjE3KTsKIH0KIAogLmRvbS10cmVlLW91dGxpbmU6 Zm9jdXMgbGkuc2VsZWN0ZWQgLnNlbGVjdGlvbiB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdi KDAsIDEyOCwgMjUyKTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kb20tdHJlZS1v dXRsaW5lOmZvY3VzIGxpLnNlbGVjdGVkIC5zZWxlY3Rpb24gewogICAgIGJhY2tncm91bmQtY29s b3I6IHJnYig1NiwgMTIxLCAyMTcpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXNoYm9hcmRDb250YWluZXJWaWV3LmNzcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Rhc2hib2FyZENvbnRhaW5l clZpZXcuY3NzCmluZGV4IDI2OTg2ZGEuLjZjOTA5YmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Rhc2hib2FyZENvbnRhaW5lclZpZXcuY3Nz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Rhc2hib2Fy ZENvbnRhaW5lclZpZXcuY3NzCkBAIC0yOCwxOSArMjgsMzMgQEAKIAogICAgIHdpZHRoOiAzNzVw eDsKIAotICAgIGJvcmRlcjogMXB4IHNvbGlkIHJnYigxNjMsIDE2MywgMTYzKTsKKyAgICBib3Jk ZXI6IDFweCBzb2xpZCByZ2IoMjU1LCAyNTUsIDI1NSk7CiAgICAgYm9yZGVyLXJhZGl1czogNHB4 OworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyNTUsIDI1NSwgMjU1KTsKIAotICAgIGJveC1z aGFkb3c6IHJnYmEoMjU1LCAyNTUsIDI1NSwgMC40NSkgMCAxcHggMDsKKyAgICBib3gtc2hhZG93 OiByZ2JhKDAsIDAsIDAsIDAuMTUpIDAgMXB4IDA7CiAKICAgICBtYXJnaW46IDRweCAxMHB4Owog ICAgIG92ZXJmbG93OiBoaWRkZW47CiB9CiAKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAudG9v bGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lciB7CisgICAgYm9yZGVyLWNvbG9yOiByZ2IoMTYzLCAx NjMsIDE2Myk7CisgICAgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7CisgICAgYm94LXNo YWRvdzogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjQ1KSAwIDFweCAwOworfQorCiBib2R5LndpbmRv dy1pbmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lciB7CisgICAgYm9yZGVyLWNv bG9yOiByZ2IoMjIwLCAyMjAsIDIyMCk7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDI0Niwg MjQ2LCAyNDYpOworICAgIGJveC1zaGFkb3c6IG5vbmU7Cit9CisKK2JvZHkubWFjLXBsYXRmb3Jt LmxlZ2FjeS53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIgewog ICAgIGJvcmRlci1jb2xvcjogcmdiKDE5NiwgMTk2LCAxOTYpOwogICAgIGJhY2tncm91bmQtaW1h Z2U6IG5vbmU7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDIzOSwgMjM5LCAyMzkpOworICAg IGJveC1zaGFkb3c6IHJnYmEoMjU1LCAyNTUsIDI1NSwgMC40NSkgMCAxcHggMDsKIH0KIAogLnRv b2xiYXIuY29sbGFwc2VkIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKQEAgLTc4LDE2ICs5MiwyNiBA QCBib2R5LndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lciB7CiAg ICAgbGVmdDogMDsKICAgICByaWdodDogMDsKIAorICAgIHBhZGRpbmc6IDAgNXB4OworCisgICAg YmFja2dyb3VuZC1jb2xvcjogcmdiKDI1NSwgMjU1LCAyNTUpOworCisgICAgLXdlYmtpdC1hbmlt YXRpb24tZHVyYXRpb246IDAuNHM7Cit9CisKK2JvZHkud2luZG93LWluYWN0aXZlIC50b29sYmFy IC5kYXNoYm9hcmQgeworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyNDYsIDI0NiwgMjQ2KTsK K30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC50b29sYmFyIC5kYXNoYm9hcmQsCitib2R5 Lm1hYy1wbGF0Zm9ybS5sZWdhY3kud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5kYXNoYm9hcmQg ewogICAgIGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHJnYmEo MCwgMTI4LCAyNTUsIDApLCByZ2JhKDAsIDEyOCwgMjU1LCAwLjA3NSkpLAogICAgICAgICBsaW5l YXItZ3JhZGllbnQodG8gcmlnaHQsIHJnYmEoMCwgMCwgMCwgMC4wOSksIHRyYW5zcGFyZW50LCBy Z2JhKDAsIDAsIDAsIDAuMDkpKSwKICAgICAgICAgbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwg cmdiKDI0MCwgMjQ0LCAyNTEpLCByZ2IoMjUwLCAyNTMsIDI1NSkpOwogICAgIGJhY2tncm91bmQt c2l6ZTogMTAwJSA2cHgsIGF1dG8sIGF1dG87CiAgICAgYmFja2dyb3VuZC1wb3NpdGlvbjogYm90 dG9tLCBjZW50ZXIsIGNlbnRlcjsKICAgICBiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0Owot Ci0gICAgcGFkZGluZzogMCA1cHg7Ci0KLSAgICAtd2Via2l0LWFuaW1hdGlvbi1kdXJhdGlvbjog MC40czsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsKIH0KIAogLnRvb2xiYXIg LmRhc2hib2FyZC52aXNpYmxlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmNzcwppbmRleCAzOTU3N2M0Li45YWMzZGQ2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXRh R3JpZC5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RGF0YUdyaWQuY3NzCkBAIC03NSwyMCArNzUsMjYgQEAKICAgICB0ZXh0LWFsaWduOiBsZWZ0Owog ICAgIHZlcnRpY2FsLWFsaWduOiBtaWRkbGU7CiAKKyAgICBib3JkZXItdG9wOiAxcHggc29saWQg cmdiKDE3OSwgMTc5LCAxNzkpOworICAgIGJvcmRlci1ib3R0b206IDFweCBzb2xpZCByZ2IoMTgy LCAxODIsIDE4Mik7CisKKyAgICBoZWlnaHQ6IDE1cHg7CisgICAgZm9udC13ZWlnaHQ6IG5vcm1h bDsKKyAgICBwYWRkaW5nOiAwIDRweDsKKyAgICB3aGl0ZS1zcGFjZTogbm93cmFwOworICAgIG92 ZXJmbG93OiBoaWRkZW47Cit9CisKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZGF0YS1ncmlk IHRoIHsKICAgICBiYWNrZ3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCBy Z2JhKDAsIDAsIDAsIDAuMiksIHJnYmEoMCwgMCwgMCwgMC4yKSksIGxpbmVhci1ncmFkaWVudCh0 byBib3R0b20sIHRyYW5zcGFyZW50LCB0cmFuc3BhcmVudCksCiAgICAgICAgIGxpbmVhci1ncmFk aWVudCh0byBib3R0b20sIHdoaXRlLCB3aGl0ZSAyNSUsIHJnYigyNDQsIDI0NCwgMjQ0KSA1MCUs IHJnYigyMzYsIDIzNiwgMjM2KSA1MCUsIHJnYigyMzcsIDIzNywgMjM3KSk7CisKICAgICBiYWNr Z3JvdW5kLXNpemU6IDFweCAxMXB4LCAwIDAsIDEwMCUgMTAwJTsKICAgICBiYWNrZ3JvdW5kLXBv c2l0aW9uOiBsZWZ0IDJweCwgcmlnaHQgMnB4LCBjZW50ZXI7CiAgICAgYmFja2dyb3VuZC1yZXBl YXQ6IG5vLXJlcGVhdDsKIAogICAgIGJveC1zaGFkb3c6IGluc2V0IHJnYmEoMjU1LCAyNTUsIDI1 NSwgMC4zKSAwIC0xcHggMDsKICAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgcmdiKDE4Miwg MTgyLCAxODIpOwotCi0gICAgaGVpZ2h0OiAxNXB4OwotICAgIGZvbnQtd2VpZ2h0OiBub3JtYWw7 Ci0gICAgcGFkZGluZzogMCA0cHg7Ci0gICAgd2hpdGUtc3BhY2U6IG5vd3JhcDsKLSAgICBvdmVy ZmxvdzogaGlkZGVuOwogfQogCiAuZGF0YS1ncmlkIHRoOmZpcnN0LWNoaWxkIHsKQEAgLTMxMywx NSArMzE5LDIzIEBAIGJvZHkud2luZG93LWluYWN0aXZlIC5kYXRhLWdyaWQgdGguc29ydC1kZXNj ZW5kaW5nIHsKIH0KIAogLmRhdGEtZ3JpZCB0ci5zZWxlY3RlZCB7Ci0gICAgYmFja2dyb3VuZC1j b2xvcjogcmdiKDIxMiwgMjEyLCAyMTIpICFpbXBvcnRhbnQ7CisgICAgYmFja2dyb3VuZC1jb2xv cjogcmdiKDE4NSwgMTg0LCAxODUpICFpbXBvcnRhbnQ7CiAgICAgY29sb3I6IGluaGVyaXQgIWlt cG9ydGFudDsKIH0KIAorYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kYXRhLWdyaWQgdHIuc2Vs ZWN0ZWQgeworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyMTIsIDIxMiwgMjEyKSAhaW1wb3J0 YW50OworfQorCiAuZGF0YS1ncmlkOmZvY3VzIHRyLnNlbGVjdGVkIHsKLSAgICBiYWNrZ3JvdW5k LWNvbG9yOiByZ2IoNTYsIDEyMSwgMjE3KSAhaW1wb3J0YW50OworICAgIGJhY2tncm91bmQtY29s b3I6IHJnYigwLCAxMjgsIDI1MikgIWltcG9ydGFudDsKICAgICBjb2xvcjogd2hpdGUgIWltcG9y dGFudDsKIH0KIAorYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kYXRhLWdyaWQ6Zm9jdXMgdHIu c2VsZWN0ZWQgeworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYig1NiwgMTIxLCAyMTcpICFpbXBv cnRhbnQ7Cit9CisKIC5kYXRhLWdyaWQgdHI6bm90KC5wYXJlbnQpIHRkLmRpc2Nsb3N1cmUgewog ICAgIHRleHQtaW5kZW50OiAxMHB4OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb24uY3NzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb24uY3NzCmluZGV4IDIz YzYwMDUuLjljOTFmZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbi5jc3MKQEAgLTI0LDEwICsyNCwz MyBAQAogICovCiAKIC5kZXRhaWxzLXNlY3Rpb24geworICAgIGZvbnQtc2l6ZTogMTBweDsKKyAg ICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjQyLCAyNDIsIDI0Mik7CisgICAgYm9yZGVyLWJvdHRv bTogMXB4IHNvbGlkIHJnYigxNTMsIDE1MywgMTUzKTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0u bGVnYWN5IC5kZXRhaWxzLXNlY3Rpb24gewogICAgIG1hcmdpbi10b3A6IC0xcHg7CiAgICAgbWFy Z2luLWJvdHRvbTogLTFweDsKIAotICAgIGZvbnQtc2l6ZTogMTBweDsKKyAgICBib3JkZXItYm90 dG9tOiBub25lOworICAgIGJhY2tncm91bmQtY29sb3I6IHRyYW5zcGFyZW50OworfQorCisuZGV0 YWlscy1zZWN0aW9uIC5kZXRhaWxzLXNlY3Rpb24geworICAgIGJhY2tncm91bmQtY29sb3I6IHJn YigyNTUsIDI1NSwgMjU1KTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kZXRhaWxz LXNlY3Rpb24gLmRldGFpbHMtc2VjdGlvbiB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNw YXJlbnQ7Cit9CisKKy5kZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMtc2VjdGlvbjpsYXN0LWNoaWxk IHsKKyAgICBib3JkZXItYm90dG9tOiBub25lOworfQorCisuZGV0YWlscy1zZWN0aW9uIC5kZXRh aWxzLXNlY3Rpb246Zmlyc3QtY2hpbGQgeworICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCByZ2Io MTUzLCAxNTMsIDE1Myk7CiB9CiAKIC5kZXRhaWxzLXNlY3Rpb24gPiAuaGVhZGVyIHsKQEAgLTM1 LDEzICs1OCw4IEBACiAgICAgdG9wOiAtMXB4OwogICAgIGhlaWdodDogMjNweDsKIAotICAgIGJv cmRlci10b3A6IDFweCBzb2xpZCByZ2IoMTUzLCAxNTMsIDE1Myk7Ci0gICAgYm9yZGVyLWJvdHRv bTogMXB4IHNvbGlkIHJnYigxNTMsIDE1MywgMTUzKTsKLSAgICBib3gtc2hhZG93OiBpbnNldCBy Z2JhKDI1NSwgMjU1LCAyNTUsIDAuMikgMCAxcHggMDsKLSAgICBiYWNrZ3JvdW5kLWltYWdlOiBs aW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2IoMjM4LCAyNDAsIDI0NCksIHJnYigyMjQsIDIy NiwgMjMwKSk7Ci0KKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjQyLCAyNDIsIDI0Mik7CiAg ICAgY29sb3I6IHJnYig1NywgNTcsIDU3KTsKLSAgICB0ZXh0LXNoYWRvdzogcmdiYSgyNTUsIDI1 NSwgMjU1LCAwLjUpIDAgMXB4IDA7CiAKICAgICB3aGl0ZS1zcGFjZTogbm93cmFwOwogICAgIG92 ZXJmbG93OiBoaWRkZW47CkBAIC01NiwxMyArNzQsNDQgQEAKICAgICB6LWluZGV4OiAyMDA7CiB9 CiAKLS5kZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXIgewotICAgIGJh Y2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHJnYigyNTAsIDI1MCwg MjUwKSwgcmdiKDI0MCwgMjQwLCAyNDApKTsKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZGV0 YWlscy1zZWN0aW9uID4gLmhlYWRlciB7CisgICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHJn YigxNTMsIDE1MywgMTUzKTsKKyAgICBib3gtc2hhZG93OiBpbnNldCByZ2JhKDI1NSwgMjU1LCAy NTUsIDAuMikgMCAxcHggMDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsKKyAg ICBiYWNrZ3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2IoMjM4LCAy NDAsIDI0NCksIHJnYigyMjQsIDIyNiwgMjMwKSk7CiAKKyAgICBib3JkZXItdG9wOiAxcHggc29s aWQgcmdiKDE1MywgMTUzLCAxNTMpOworCisgICAgdGV4dC1zaGFkb3c6IHJnYmEoMjU1LCAyNTUs IDI1NSwgMC41KSAwIDFweCAwOworfQorCisuZGV0YWlscy1zZWN0aW9uIC5kZXRhaWxzLXNlY3Rp b24gPiAuaGVhZGVyIHsKICAgICB0b3A6IDIxcHg7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdi KDI1NSwgMjU1LCAyNTUpOworCisgICAgYm94LXNoYWRvdzogcmdiYSgwLCAwLCAwLCAwLjEpIDAg MXB4IDA7CiAKICAgICAvKiBFbnN1cmUgdGhlc2UgaGVhZGVycyBhcmUgZGlzcGxheWVkIGJlbG93 IHRoZSBwYXJlbnQgaGVhZGVyIGJ1dCBhYm92ZSBzY3JvbGxiYXJzLiAqLwogICAgIHotaW5kZXg6 IDEwMDsKKworfQorCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMtc2VjdGlvbiAu ZGV0YWlscy1zZWN0aW9uID4gLmhlYWRlciB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNw YXJlbnQ7CisgICAgYmFja2dyb3VuZC1pbWFnZTogbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwg cmdiKDI1MCwgMjUwLCAyNTApLCByZ2IoMjQwLCAyNDAsIDI0MCkpOworICAgIGJveC1zaGFkb3c6 IG5vbmU7Cit9CisKKy5kZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMtc2VjdGlvbi5jb2xsYXNwc2Vk ID4gLmhlYWRlciB7CisgICAgYm94LXNoYWRvdzogbm9uZTsKK30KKworLmRldGFpbHMtc2VjdGlv bi5jb21wdXRlZC1zdHlsZS1wcm9wZXJ0aWVzOm5vdCguY29sbGFwc2VkKSA+IC5oZWFkZXIgewor ICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyNTUsIDI1NSwgMjU1KTsKK30KKworYm9keS5tYWMt cGxhdGZvcm0ubGVnYWN5IC5kZXRhaWxzLXNlY3Rpb24uY29tcHV0ZWQtc3R5bGUtcHJvcGVydGll czpub3QoLmNvbGxhcHNlZCkgPiAuaGVhZGVyIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFu c3BhcmVudDsKIH0KIAogLmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXI6OmJlZm9yZSB7CkBAIC0x MzMsOSArMTgyLDIyIEBACiAKIC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cCB7 CiAgICAgZGlzcGxheTogdGFibGUtcm93LWdyb3VwOworICAgIGJvcmRlci1ib3R0b206IDFweCBz b2xpZCByZ2IoMTUzLCAxNTMsIDE1Myk7Cit9CisKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAu ZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXAgeworICAgIGJvcmRlci1ib3R0b206 IG5vbmU7Cit9CisKKy5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDpsYXN0LWNo aWxkIHsKKyAgICBib3JkZXItYm90dG9tOiBub25lOwogfQogCiAuZGV0YWlscy1zZWN0aW9uID4g LmNvbnRlbnQgPiAuZ3JvdXA6bnRoLWNoaWxkKGV2ZW4pIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9y OiByZ2IoMjMzLCAyMzMsIDIzMyk7Cit9CisKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZGV0 YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bnRoLWNoaWxkKGV2ZW4pIHsKICAgICBi YWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjIyLCAyMjIsIDIyMik7CiB9CiAKQEAgLTE0NCwxMCArMjA2 LDEwIEBACiAgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIHJnYigxNTMsIDE1MywgMTUzKTsKIH0K IAotLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwOm50aC1jaGlsZChldmVuKSA+ IC5yb3c6bm90KC5zaW1wbGUpOmxhc3QtY2hpbGQsCi0uZGV0YWlscy1zZWN0aW9uID4gLmNvbnRl bnQgPiAuZ3JvdXA6bGFzdC1jaGlsZCA+IC5yb3c6bm90KC5zaW1wbGUpOmxhc3QtY2hpbGQsCi0u ZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bnRoLWNoaWxkKGV2ZW4pID4gLnJv dy5zaW1wbGU6bGFzdC1jaGlsZCA+ICosCi0uZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAu Z3JvdXA6bGFzdC1jaGlsZCA+IC5yb3cuc2ltcGxlOmxhc3QtY2hpbGQgPiAqIHsKK2JvZHkubWFj LXBsYXRmb3JtLmxlZ2FjeSAuZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bnRo LWNoaWxkKGV2ZW4pID4gLnJvdzpub3QoLnNpbXBsZSk6bGFzdC1jaGlsZCwKK2JvZHkubWFjLXBs YXRmb3JtLmxlZ2FjeSAuZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bGFzdC1j aGlsZCA+IC5yb3c6bm90KC5zaW1wbGUpOmxhc3QtY2hpbGQsCitib2R5Lm1hYy1wbGF0Zm9ybS5s ZWdhY3kgLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwOm50aC1jaGlsZChldmVu KSA+IC5yb3cuc2ltcGxlOmxhc3QtY2hpbGQgPiAqLAorYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5 IC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDpsYXN0LWNoaWxkID4gLnJvdy5z aW1wbGU6bGFzdC1jaGlsZCA+ICogewogICAgIGJvcmRlci1ib3R0b206IDFweCBzb2xpZCByZ2Io MTUzLCAxNTMsIDE1Myk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0ZpbHRlckJhci5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9GaWx0ZXJCYXIuY3NzCmluZGV4IGQ4OWYyNjguLmFiNjFjZTkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Zp bHRlckJhci5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRmlsdGVyQmFyLmNzcwpAQCAtNDMsNyArNDMsNyBAQAogICAgIC13ZWJraXQtYXBwZWFyYW5j ZTogbm9uZTsKIAogICAgIGJvcmRlcjogMXB4IHNvbGlkIHJnYmEoMCwgMCwgMCwgMC4zNSk7Ci0g ICAgYm9yZGVyLXJhZGl1czogMTBweDsKKyAgICBib3JkZXItcmFkaXVzOiAzcHg7CiAgICAgYmFj a2dyb3VuZC1jb2xvcjogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjIpOwogICAgIGJveC1zaGFkb3c6 IGluc2V0IHJnYmEoMCwgMCwgMCwgMC4xKSAwIDFweCAwOwogICAgIGJhY2tncm91bmQtY2xpcDog cGFkZGluZy1ib3g7CkBAIC01Myw2ICs1MywxMCBAQAogICAgIHRyYW5zaXRpb246IGJhY2tncm91 bmQtY29sb3IgMjAwbXMgZWFzZS1pbi1vdXQ7CiB9CiAKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2Fj eSAuZmlsdGVyLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdIHsKKyAgICBib3JkZXItcmFkaXVz OiAxMHB4OworfQorCiAuZmlsdGVyLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdOjotd2Via2l0 LWlucHV0LXBsYWNlaG9sZGVyIHsKICAgICBjb2xvcjogcmdiYSgwLCAwLCAwLCAwLjM1KTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Zp bmRCYW5uZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9G aW5kQmFubmVyLmpzCmluZGV4IGQ2NzZhYmEuLmRhM2YyOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZpbmRCYW5uZXIuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5qcwpAQCAt MzI2LDggKzMyNiwxNyBAQCBXZWJJbnNwZWN0b3IuRmluZEJhbm5lci5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHNwZWNpZmljYXRpb25zWyJub3JtYWwiXSA9IHtmaWxsQ29sb3I6IFs4MSwgODEsIDgx XX07CiAgICAgICAgIHNwZWNpZmljYXRpb25zWyJub3JtYWwtYWN0aXZlIl0gPSB7ZmlsbENvbG9y OiBbMzcsIDM3LCAzN119OwogCi0gICAgICAgIGdlbmVyYXRlQ29sb3JlZEltYWdlc0ZvckNTUygi SW1hZ2VzL0JhY2tBcnJvdy5zdmciLCBzcGVjaWZpY2F0aW9ucywgNywgNywgImZpbmQtYmFubmVy LXByZXZpb3VzLWFycm93LSIpOwotICAgICAgICBnZW5lcmF0ZUNvbG9yZWRJbWFnZXNGb3JDU1Mo IkltYWdlcy9Gb3J3YXJkQXJyb3cuc3ZnIiwgc3BlY2lmaWNhdGlvbnMsIDcsIDcsICJmaW5kLWJh bm5lci1uZXh0LWFycm93LSIpOworICAgICAgICB2YXIgZm9yd2FyZEFycm93LCBiYWNrQXJyb3c7 CisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IuUGxhdGZvcm0ubmFtZSA9PT0gIm1hYyIgJiYgV2Vi SW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24ucmVsZWFzZSA8IDEwKSB7CisgICAgICAgICAgICBm b3J3YXJkQXJyb3cgPSAiSW1hZ2VzL0ZvcndhcmRBcnJvd0xlZ2FjeS5zdmciOworICAgICAgICAg ICAgYmFja0Fycm93ID0gIkltYWdlcy9CYWNrQXJyb3dMZWdhY3kuc3ZnIjsKKyAgICAgICAgfSBl bHNlIHsKKyAgICAgICAgICAgIGZvcndhcmRBcnJvdyA9ICJJbWFnZXMvRm9yd2FyZEFycm93LnN2 ZyI7CisgICAgICAgICAgICBiYWNrQXJyb3cgPSAiSW1hZ2VzL0JhY2tBcnJvdy5zdmciOworICAg ICAgICB9CisKKyAgICAgICAgZ2VuZXJhdGVDb2xvcmVkSW1hZ2VzRm9yQ1NTKGJhY2tBcnJvdywg c3BlY2lmaWNhdGlvbnMsIDcsIDcsICJmaW5kLWJhbm5lci1wcmV2aW91cy1hcnJvdy0iKTsKKyAg ICAgICAgZ2VuZXJhdGVDb2xvcmVkSW1hZ2VzRm9yQ1NTKGZvcndhcmRBcnJvdywgc3BlY2lmaWNh dGlvbnMsIDcsIDcsICJmaW5kLWJhbm5lci1uZXh0LWFycm93LSIpOwogICAgIH0KIH07CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05hdmln YXRpb25TaWRlYmFyUGFuZWwuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5jc3MKaW5kZXggN2FjZTIxYS4uOTE2YTQw YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv TmF2aWdhdGlvblNpZGViYXJQYW5lbC5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5jc3MKQEAgLTIxMywxOSAr MjEzLDM0IEBACiAubmF2aWdhdGlvbi1zaWRlYmFyLXBhbmVsLWNvbnRlbnQtdHJlZS1vdXRsaW5l IC5pdGVtLnNlbGVjdGVkIHsKICAgICBjb2xvcjogd2hpdGU7CiAKKyAgICBiYWNrZ3JvdW5kLWNv bG9yOiByZ2IoMTg1LCAxODQsIDE4NSk7Cit9CisKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAu bmF2aWdhdGlvbi1zaWRlYmFyLXBhbmVsLWNvbnRlbnQtdHJlZS1vdXRsaW5lIC5pdGVtLnNlbGVj dGVkIHsKICAgICBib3JkZXItdG9wOiAxcHggc29saWQgcmdiKDE2MiwgMTc3LCAyMDEpOwogCisg ICAgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7CiAgICAgYmFja2dyb3VuZC1pbWFnZTog bGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgcmdiKDE3NSwgMTkwLCAyMTMpLCByZ2IoMTMwLCAx NTEsIDE4MikpOwogICAgIGJhY2tncm91bmQtb3JpZ2luOiBwYWRkaW5nOwogICAgIGJhY2tncm91 bmQtY2xpcDogcGFkZGluZzsKIH0KIAogLm5hdmlnYXRpb24tc2lkZWJhci1wYW5lbC1jb250ZW50 LXRyZWUtb3V0bGluZTpmb2N1cyAuaXRlbS5zZWxlY3RlZCB7CisgICAgYmFja2dyb3VuZC1jb2xv cjogcmdiKDAsIDEyOCwgMjUyKTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5uYXZp Z2F0aW9uLXNpZGViYXItcGFuZWwtY29udGVudC10cmVlLW91dGxpbmU6Zm9jdXMgLml0ZW0uc2Vs ZWN0ZWQgeworICAgIGJhY2tncm91bmQtY29sb3I6IHRyYW5zcGFyZW50OwogICAgIGJvcmRlci10 b3A6IDFweCBzb2xpZCByZ2IoMTQ4LCAxNzQsIDE5Myk7CiAgICAgYmFja2dyb3VuZC1pbWFnZTog bGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgcmdiKDE1NCwgMTgwLCAyMDMpLCByZ2IoMTEyLCAx MzksIDE3NikpOwogfQogCiBib2R5LndpbmRvdy1pbmFjdGl2ZSAubmF2aWdhdGlvbi1zaWRlYmFy LXBhbmVsLWNvbnRlbnQtdHJlZS1vdXRsaW5lIC5pdGVtLnNlbGVjdGVkIHsKKyAgICBiYWNrZ3Jv dW5kLWNvbG9yOiByZ2IoMjEyLCAyMTIsIDIxMik7Cit9CisKK2JvZHkubWFjLXBsYXRmb3JtLmxl Z2FjeS53aW5kb3ctaW5hY3RpdmUgLm5hdmlnYXRpb24tc2lkZWJhci1wYW5lbC1jb250ZW50LXRy ZWUtb3V0bGluZSAuaXRlbS5zZWxlY3RlZCB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNw YXJlbnQ7CiAgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIHJnYigxNjgsIDE2OCwgMTY4KTsKICAg ICBiYWNrZ3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2IoMTk0LCAx OTQsIDE5NCksIHJnYigxNTgsIDE1OCwgMTU4KSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SYWRpb0J1dHRvbk5hdmlnYXRpb25JdGVt LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JhZGlvQnV0 dG9uTmF2aWdhdGlvbkl0ZW0uY3NzCmluZGV4IDUxZTA0ZjQuLjIyMTk5OTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JhZGlvQnV0dG9uTmF2 aWdhdGlvbkl0ZW0uY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1JhZGlvQnV0dG9uTmF2aWdhdGlvbkl0ZW0uY3NzCkBAIC0zMiwxMSArMzIsMTYgQEAK IH0KIAogLm5hdmlnYXRpb24tYmFyIC5pdGVtLnJhZGlvLmJ1dHRvbi50ZXh0LW9ubHkuc2VsZWN0 ZWQgeworICAgIGNvbG9yOiByZ2IoNTIsIDE0MSwgMjIwKTsKKyAgICBmb250LXdlaWdodDogYm9s ZDsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5uYXZpZ2F0aW9uLWJhciAuaXRlbS5y YWRpby5idXR0b24udGV4dC1vbmx5LnNlbGVjdGVkIHsKKyAgICBjb2xvcjogcmdiKDAsIDAsIDAp OworCiAgICAgYmFja2dyb3VuZC1yZXBlYXQ6IG5vLXJlcGVhdDsKICAgICBiYWNrZ3JvdW5kLWlt YWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2JhKDAsIDAsIDAsIDAuMTUpLCByZ2Jh KDAsIDAsIDAsIDAuMDkpIDEyJSwgcmdiYSgwLCAwLCAwLCAwLjA2KSAxMiUsIHRyYW5zcGFyZW50 KSwgbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgcmdiYSgwLCAwLCAwLCAwLjQ1KSwgdHJhbnNw YXJlbnQpLAogICAgICAgICBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2JhKDAsIDAsIDAs IDAuNDUpLCB0cmFuc3BhcmVudCk7CiAgICAgYmFja2dyb3VuZC1zaXplOiAxMDAlIDEwMCUsIDFw eCAxMDAlLCAxcHggMTAwJTsKICAgICBiYWNrZ3JvdW5kLXBvc2l0aW9uOiBsZWZ0IHRvcCwgbGVm dCB0b3AsIHJpZ2h0IHRvcDsKLQotICAgIGZvbnQtd2VpZ2h0OiBib2xkOwogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUnVsZXNTdHlsZURl dGFpbHNQYW5lbC5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9SdWxlc1N0eWxlRGV0YWlsc1BhbmVsLmNzcwppbmRleCA4MTFiMDUzLi4yMjA2NTZiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SdWxlc1N0 eWxlRGV0YWlsc1BhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9SdWxlc1N0eWxlRGV0YWlsc1BhbmVsLmNzcwpAQCAtMzYsNiArMzYsMTEgQEAK IAogLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnJ1bGVzIC5sYWJlbCArIC5z dHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uIHsKICAgICBtYXJnaW4tdG9wOiA1cHg7CisgICAgYm9y ZGVyLXRvcDogMXB4IHNvbGlkIHJnYigyMTAsIDIxMCwgMjEwKTsKK30KKworYm9keS5tYWMtcGxh dGZvcm0ubGVnYWN5IC5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlIC5ydWxlcyAu bGFiZWwgKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbiB7CisgICAgYm9yZGVyLXRvcDogbm9u ZTsKIH0KIAogLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnJ1bGVzIC5uZXct cnVsZSB7CkBAIC00Myw3ICs0OCw2IEBACiAgICAgZm9udC13ZWlnaHQ6IGJvbGQ7CiAKICAgICBj b2xvcjogYmxhY2s7Ci0gICAgdGV4dC1zaGFkb3c6IHdoaXRlIDAgMXB4IDA7CiAKICAgICBwYWRk aW5nOiA1cHggMTBweDsKIApAQCAtNTMsNiArNTcsMTkgQEAKICAgICBvcGFjaXR5OiAwLjU7CiB9 CiAKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNz cy1zdHlsZSAucnVsZXMgLm5ldy1ydWxlIHsKKyAgICB0ZXh0LXNoYWRvdzogd2hpdGUgMCAxcHgg MDsKKyAgICBib3JkZXItYm90dG9tOiBub25lOworfQorCisuc2lkZWJhciA+IC5wYW5lbC5kZXRh aWxzLmNzcy1zdHlsZSAucnVsZXMgLm5ldy1ydWxlICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rp b24geworICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCByZ2IoMjEwLCAyMTAsIDIxMCk7Cit9CisK K2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1z dHlsZSAucnVsZXMgLm5ldy1ydWxlICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24geworICAg IGJvcmRlci10b3A6IG5vbmU7Cit9CisKIC5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0 eWxlIC5ydWxlcyAubmV3LXJ1bGUgaW1nIHsKICAgICBjb250ZW50OiB1cmwoLi4vSW1hZ2VzL1Bs dXMuc3ZnKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvU2NvcGVCYXIuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvU2NvcGVCYXIuY3NzCmluZGV4IGExNzg5ZDYuLjNjNzA1NDcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Njb3BlQmFyLmNzcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUJhci5j c3MKQEAgLTMzLDcgKzMzLDYgQEAKICAgICBtYXJnaW46IDAgMnB4OwogICAgIHBhZGRpbmc6IDAg OHB4IDNweDsKICAgICBmb250LXNpemU6IDExcHg7Ci0gICAgZm9udC13ZWlnaHQ6IGJvbGQ7CiAg ICAgbGluZS1oZWlnaHQ6IDExcHg7CiAgICAgY29sb3I6IHJnYig0NiwgNDYsIDQ2KTsKICAgICBi YWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsKQEAgLTQ1LDYgKzQ0LDEwIEBACiAgICAgdHJh bnNpdGlvbi1wcm9wZXJ0eTogYmFja2dyb3VuZC1jb2xvciwgYm9yZGVyLWNvbG9yOwogfQogCiti b2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnNjb3BlLWJhciA+IGxpIHsKKyAgICBmb250LXdlaWdo dDogYm9sZDsKK30KKwogLnNjb3BlLWJhciA+IGxpLnNlbGVjdGVkLAogLnNjb3BlLWJhciA+IGxp OmFjdGl2ZSB7CiAgICAgdHJhbnNpdGlvbi1kdXJhdGlvbjogNzVtczsKQEAgLTU1LDYgKzU4LDEz IEBACiB9CiAKIC5zY29wZS1iYXIgPiBsaS5zZWxlY3RlZCB7CisgICAgY29sb3I6IHJnYig1Miwg MTQxLCAyMjApOworICAgIGJvcmRlci1jb2xvcjogcmdiYSg1MiwgMTQxLCAyMjAsIDEpOworICAg IGZvbnQtd2VpZ2h0OiBib2xkOworfQorCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnNjb3Bl LWJhciA+IGxpLnNlbGVjdGVkIHsKKyAgICBjb2xvcjogaW5oZXJpdDsKICAgICBiYWNrZ3JvdW5k LWNvbG9yOiByZ2JhKDAsIDAsIDAsIDAuMDYpOwogICAgIGJvcmRlci1jb2xvcjogcmdiYSgwLCAw LCAwLCAwLjMwKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NlYXJjaEJhci5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9TZWFyY2hCYXIuY3NzCmluZGV4IDcyNzVlNGMuLjE2MDVlZTQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NlYXJjaEJh ci5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2Vh cmNoQmFyLmNzcwpAQCAtMzEsNyArMzEsNyBAQAogICAgIC13ZWJraXQtYXBwZWFyYW5jZTogbm9u ZTsKIAogICAgIGJvcmRlcjogMXB4IHNvbGlkIHJnYmEoMCwgMCwgMCwgMC4zNSk7Ci0gICAgYm9y ZGVyLXJhZGl1czogMTBweDsKKyAgICBib3JkZXItcmFkaXVzOiAzcHg7CiAgICAgYmFja2dyb3Vu ZC1jb2xvcjogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjIpOwogICAgIGJveC1zaGFkb3c6IGluc2V0 IHJnYmEoMCwgMCwgMCwgMC4xKSAwIDFweCAwOwogICAgIGJhY2tncm91bmQtY2xpcDogcGFkZGlu Zy1ib3g7CkBAIC00MSw2ICs0MSwxMCBAQAogICAgIHRyYW5zaXRpb246IGJhY2tncm91bmQtY29s b3IgMjAwbXMgZWFzZS1pbi1vdXQ7CiB9CiAKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc2Vh cmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdIHsKKyAgICBib3JkZXItcmFkaXVzOiAxMHB4 OworfQorCiAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdOjotd2Via2l0LWlucHV0 LXBsYWNlaG9sZGVyIHsKICAgICBjb2xvcjogcmdiYSgwLCAwLCAwLCAwLjM1KTsKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NpZGViYXIu Y3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2lkZWJhci5j c3MKaW5kZXggM2ExZjc1Mi4uODU2ZmEzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2lkZWJhci5jc3MKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2lkZWJhci5jc3MKQEAgLTI2LDYgKzI2LDEwIEBA CiAuc2lkZWJhciB7CiAgICAgcG9zaXRpb246IHJlbGF0aXZlOwogCisgICAgYmFja2dyb3VuZC1j b2xvcjogcmdiKDI0MiwgMjQyLCAyNDIpOworfQorCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kg LnNpZGViYXIgewogICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyMjcsIDIzMSwgMjM1KTsKIH0K IApAQCAtMzQsNyArMzgsNyBAQAogICAgIGJvcmRlcjogbm9uZSAhaW1wb3J0YW50OwogfQogCi1i b2R5LndpbmRvdy1pbmFjdGl2ZSAuc2lkZWJhciB7Citib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3ku d2luZG93LWluYWN0aXZlIC5zaWRlYmFyIHsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjMx LCAyMzEsIDIzMSk7CiB9CiAKQEAgLTg4LDYgKzkyLDkgQEAgYm9keS53aW5kb3ctaW5hY3RpdmUg LnNpZGViYXIgewogfQogCiAuc2lkZWJhci5yaWdodCB7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjog cmdiKDIzMSwgMjMxLCAyMzEpOwogICAgIGJvcmRlci1sZWZ0OiAxcHggc29saWQgcmdiKDE1Mywg MTUzLCAxNTMpOwogfQorCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnNpZGViYXIucmlnaHQg eworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyMzEsIDIzMSwgMjMxKTsKK30KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lU2lk ZWJhclBhbmVsLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RpbWVsaW5lU2lkZWJhclBhbmVsLmNzcwppbmRleCBlOGI3ODBmLi5jM2JjNTQ2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNp ZGViYXJQYW5lbC5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVGltZWxpbmVTaWRlYmFyUGFuZWwuY3NzCkBAIC05NSwxMCArOTUsOCBAQAogICAgIGhl aWdodDogMjJweDsKIAogICAgIGJvcmRlci1ib3R0b206IDFweCBzb2xpZCByZ2IoMTc5LCAxNzks IDE3OSk7Ci0gICAgYmFja2dyb3VuZC1pbWFnZTogbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwg cmdiKDIzOCwgMjQwLCAyNDQpLCByZ2IoMjI0LCAyMjYsIDIzMCkpOwotCisgICAgYmFja2dyb3Vu ZC1jb2xvcjogcmdiKDI0MiwgMjQyLCAyNDIpOwogICAgIGNvbG9yOiByZ2IoNTcsIDU3LCA1Nyk7 Ci0gICAgdGV4dC1zaGFkb3c6IHJnYmEoMjU1LCAyNTUsIDI1NSwgMC41KSAwIDFweCAwOwogCiAg ICAgd2hpdGUtc3BhY2U6IG5vd3JhcDsKICAgICBvdmVyZmxvdzogaGlkZGVuOwpAQCAtMTEyLDYg KzExMCwxMiBAQAogICAgIG92ZXJmbG93OiBoaWRkZW47CiB9CiAKK2JvZHkubWFjLXBsYXRmb3Jt LmxlZ2FjeSAuc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnRpbWVsaW5lID4gLnRpdGxlLWJh ciB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7CisgICAgYmFja2dyb3VuZC1p bWFnZTogbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgcmdiKDIzOCwgMjQwLCAyNDQpLCByZ2Io MjI0LCAyMjYsIDIzMCkpOworICAgIHRleHQtc2hhZG93OiByZ2JhKDI1NSwgMjU1LCAyNTUsIDAu NSkgMCAxcHggMDsKK30KKwogLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi50aW1lbGluZSA+ IC50aXRsZS1iYXIudGltZWxpbmVzIHsKICAgICB0b3A6IDIycHg7CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Ub29sYmFyLmNzcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Rvb2xiYXIuY3NzCmluZGV4 IDU1ZDczZGIuLjQwZmUwYjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1Rvb2xiYXIuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1Rvb2xiYXIuY3NzCkBAIC01OSw4ICs1OSw3IEBAIGJvZHk6bm90 KC5tYWMtcGxhdGZvcm0pIC50b29sYmFyIHsKICAgICBib3gtc2hhZG93OiBpbnNldCByZ2IoMjUy LCAyNTIsIDI1MikgMCAxcHggMDsKIH0KIAotYm9keS5kb2NrZWQubWFjLXBsYXRmb3JtLm1vdW50 YWluLWxpb24gLnRvb2xiYXIsCi1ib2R5LmRvY2tlZC5tYWMtcGxhdGZvcm0ubWF2ZXJpY2tzIC50 b29sYmFyIHsKK2JvZHkuZG9ja2VkLm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnRvb2xiYXIgewogICAg IGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHJnYigyMTYsIDIx NiwgMjE2KSwgcmdiKDE5MCwgMTkwLCAxOTApKTsKICAgICBib3gtc2hhZG93OiBpbnNldCByZ2Jh KDI1NSwgMjU1LCAyNTUsIDAuMSkgMCAxcHggMCwgaW5zZXQgcmdiYSgwLCAwLCAwLCAwLjAyKSAw IC0xcHggMDsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9XZWJJbnNwZWN0 b3JVSS52Y3hwcm9qL1dlYkluc3BlY3RvclVJLnZjeHByb2ogYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvV2ViSW5zcGVjdG9yVUkudmN4cHJvai9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qCmluZGV4IDU1 YjliOWUuLjhjMTIzZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9XZWJJbnNw ZWN0b3JVSS52Y3hwcm9qL1dlYkluc3BlY3RvclVJLnZjeHByb2oKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1dlYkluc3BlY3RvclVJLnZjeHByb2ovV2ViSW5zcGVjdG9yVUkudmN4cHJvagpA QCAtNDI3LDYgKzQyNyw3IEBACiAgICAgPE5vbmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJ bWFnZXNcQXBwbGljYXRpb25DYWNoZU1hbmlmZXN0JTQwMngucG5nIiAvPgogICAgIDxOb25lIElu Y2x1ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEFwcGxpY2F0aW9uQ2FjaGVNYW5pZmVzdC5w bmciIC8+CiAgICAgPE5vbmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNcQmFja0Fy cm93LnN2ZyIgLz4KKyAgICA8Tm9uZSBJbmNsdWRlPSIuLlxVc2VySW50ZXJmYWNlXEltYWdlc1xC YWNrQXJyb3dMZWdhY3kuc3ZnIiAvPgogICAgIDxOb25lIEluY2x1ZGU9Ii4uXFVzZXJJbnRlcmZh Y2VcSW1hZ2VzXEJvdHRvbVVwVHJlZS5zdmciIC8+CiAgICAgPE5vbmUgSW5jbHVkZT0iLi5cVXNl ckludGVyZmFjZVxJbWFnZXNcQnJlYWtwb2ludCU0MDJ4LnBuZyIgLz4KICAgICA8Tm9uZSBJbmNs dWRlPSIuLlxVc2VySW50ZXJmYWNlXEltYWdlc1xCcmVha3BvaW50LnBuZyIgLz4KQEAgLTQ4Niw2 ICs0ODcsNyBAQAogICAgIDxOb25lIEluY2x1ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEZv bGRlckdlbmVyaWMlNDAyeC5wbmciIC8+CiAgICAgPE5vbmUgSW5jbHVkZT0iLi5cVXNlckludGVy ZmFjZVxJbWFnZXNcRm9sZGVyR2VuZXJpYy5wbmciIC8+CiAgICAgPE5vbmUgSW5jbHVkZT0iLi5c VXNlckludGVyZmFjZVxJbWFnZXNcRm9yd2FyZEFycm93LnN2ZyIgLz4KKyAgICA8Tm9uZSBJbmNs dWRlPSIuLlxVc2VySW50ZXJmYWNlXEltYWdlc1xGb3J3YXJkQXJyb3dMZWdhY3kuc3ZnIiAvPgog ICAgIDxOb25lIEluY2x1ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEZ1bmN0aW9uLnN2ZyIg Lz4KICAgICA8Tm9uZSBJbmNsdWRlPSIuLlxVc2VySW50ZXJmYWNlXEltYWdlc1xHb1RvQXJyb3cu c3ZnIiAvPgogICAgIDxOb25lIEluY2x1ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEhpZXJh cmNoaWNhbE5hdmlnYXRpb25JdGVtQ2hldnJvbi5zdmciIC8+CkBAIC03ODQsNCArNzg2LDQgQEAK ICAgPEltcG9ydCBQcm9qZWN0PSIkKFZDVGFyZ2V0c1BhdGgpXE1pY3Jvc29mdC5DcHAudGFyZ2V0 cyIgLz4KICAgPEltcG9ydEdyb3VwIExhYmVsPSJFeHRlbnNpb25UYXJnZXRzIj4KICAgPC9JbXBv cnRHcm91cD4KLTwvUHJvamVjdD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCis8L1Byb2pl Y3Q+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvV2ViSW5zcGVjdG9yVUkudmN4 cHJvai9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qLmZpbHRlcnMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvV2ViSW5zcGVjdG9yVUkudmN4cHJvai9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qLmZpbHRlcnMK aW5kZXggNDkyZmQ1Yy4uMWVjYjdmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1dlYkluc3BlY3RvclVJLnZjeHByb2ovV2ViSW5zcGVjdG9yVUkudmN4cHJvai5maWx0ZXJzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qL1dlYkluc3Bl Y3RvclVJLnZjeHByb2ouZmlsdGVycwpAQCAtMSw0ICsxLDQgQEAKLe+7vzw/eG1sIHZlcnNpb249 IjEuMCIgZW5jb2Rpbmc9InV0Zi04Ij8+Cis8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJ1 dGYtOCI/PgogPFByb2plY3QgVG9vbHNWZXJzaW9uPSI0LjAiIHhtbG5zPSJodHRwOi8vc2NoZW1h cy5taWNyb3NvZnQuY29tL2RldmVsb3Blci9tc2J1aWxkLzIwMDMiPgogICA8SXRlbUdyb3VwPgog ICAgIDxGaWx0ZXIgSW5jbHVkZT0iUmVzb3VyY2UgRmlsZXMiPgpAQCAtMTExOSw2ICsxMTE5LDkg QEAKICAgICA8Tm9uZSBJbmNsdWRlPSIuLlxVc2VySW50ZXJmYWNlXEltYWdlc1xCYWNrQXJyb3cu c3ZnIj4KICAgICAgIDxGaWx0ZXI+SW1hZ2VzPC9GaWx0ZXI+CiAgICAgPC9Ob25lPgorICAgIDxO b25lIEluY2x1ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEJhY2tBcnJvd0xlZ2FjeS5zdmci PgorICAgICAgPEZpbHRlcj5JbWFnZXM8L0ZpbHRlcj4KKyAgICA8L05vbmU+CiAgICAgPE5vbmUg SW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNcQm90dG9tVXBUcmVlLnN2ZyI+CiAgICAg ICA8RmlsdGVyPkltYWdlczwvRmlsdGVyPgogICAgIDwvTm9uZT4KQEAgLTEyOTYsNiArMTI5OSw5 IEBACiAgICAgPE5vbmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNcRm9yd2FyZEFy cm93LnN2ZyI+CiAgICAgICA8RmlsdGVyPkltYWdlczwvRmlsdGVyPgogICAgIDwvTm9uZT4KKyAg ICA8Tm9uZSBJbmNsdWRlPSIuLlxVc2VySW50ZXJmYWNlXEltYWdlc1xGb3J3YXJkQXJyb3dMZWdh Y3kuc3ZnIj4KKyAgICAgIDxGaWx0ZXI+SW1hZ2VzPC9GaWx0ZXI+CisgICAgPC9Ob25lPgogICAg IDxOb25lIEluY2x1ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEZ1bmN0aW9uLnN2ZyI+CiAg ICAgICA8RmlsdGVyPkltYWdlczwvRmlsdGVyPgogICAgIDwvTm9uZT4KQEAgLTE3MjIsNCArMTcy OCw0IEBACiAgICAgPE5vbmUgSW5jbHVkZT0iV2ViSW5zcGVjdG9yVUkubWFrZSIgLz4KICAgICA8 Tm9uZSBJbmNsdWRlPSJidWlsZC13ZWJpbnNwZWN0b3J1aS5wbCIgLz4KICAgPC9JdGVtR3JvdXA+ Ci08L1Byb2plY3Q+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorPC9Qcm9qZWN0Pgo= 234971 2014-07-15 19:00:19 -0700 2014-07-15 20:07:25 -0700 [PATCH] Styles update v3, reviewed, shadow tweak. ui.diff text/plain 56938 jonowells ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGI0ZjljNzUuLjk2MzhmODMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0MyBAQAorMjAxNC0wNy0xNSAgSm9uYXRoYW4gV2Vs bHMgIDxqb25vd2VsbHNAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IE1vZGVy bml6ZSBVSSBzdHlsZXMgYW5kIGJldHRlciBzeW5jIHdpdGggcGxhdGZvcm0gc3R5bGVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQ4NDYKKworICAg ICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCisKKyAgICAgICAgVXBkYXRlZCBzdHls ZXMgdG8gYmV0dGVyIG1hdGNoIHRoZSBPUyBVSSBkZXNpZ24uIFVwZGF0ZWQgdGhlIGZvcndhcmQv YmFjayBidXR0b24uIAorICAgICAgICBNb3ZlZCBzZXZlcmFsIHJ1bGVzIHRvIHNlbGVjdG9ycyB0 aGF0IHN1cHBvcnQgb2xkZXIgT1MgZGVzaWducy4gQWRkZWQgZ2xvYmFsIHBsYXRmb3JtCisgICAg ICAgIGRhdGEgdG8gc3VwcG9ydCB0aGlzIHBhdGNoLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9JbWFnZXMvQmFja0Fycm93LnN2ZzogQWRkZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9J bWFnZXMvQmFja0Fycm93TGVnYWN5LnN2ZzogQ29waWVkIGZyb20gU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0JhY2tBcnJvdy5zdmcuCisgICAgICAgICogVXNlcklu dGVyZmFjZS9JbWFnZXMvRm9yd2FyZEFycm93LnN2ZzogQWRkZWQuCisgICAgICAgICogVXNlcklu dGVyZmFjZS9JbWFnZXMvRm9yd2FyZEFycm93TGVnYWN5LnN2ZzogQ29waWVkIGZyb20gU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0ZvcndhcmRBcnJvdy5zdmcuCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvSW1hZ2VVdGlsaXRpZXMuanM6IFVwZGF0ZWQg aW1hZ2UgdmVyc2lvbgorICAgICAgICAoLmdlbmVyYXRlSW1hZ2UuZ2VuZXJhdGVNb2Rlcm5JbWFn ZSk6CisgICAgICAgICguZ2VuZXJhdGVJbWFnZS5nZW5lcmF0ZUxlZ2FjeUltYWdlKToKKyAgICAg ICAgKC5nZW5lcmF0ZUltYWdlKToKKyAgICAgICAgVXBkYXRlZCBpbWFnZSBnZW5lcmF0aW9uIHRv IHN1cHBvcnQgbW9kZXJuIGxvb2suIFVwZGF0ZWQgdmVyc2lvbmluZyBzY2hlbWUgYW5kIHZlcnNp b24uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5sb2FkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmNvbnRlbnRMb2FkZWQu V2ViSW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24udG9TdHJpbmcpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLmNvbnRlbnRMb2FkZWQuV2ViSW5zcGVjdG9yLlBsYXRmb3JtLnRvU3RyaW5nKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5jb250ZW50TG9hZGVkKToKKyAgICAgICAgQWRkZWQgZ2xvYmFs IHBsYXRmb3JtIGluZm9ybWF0aW9uLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9D b250ZW50QnJvd3Nlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3Nlcik6 CisgICAgICAgIFVwZGF0ZWQgYmFjayBhbmQgZm9yd2FyZCBidXR0b25zLgorCisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkZpbmRCYW5uZXIucHJvdG90eXBlLl9nZW5lcmF0ZUJ1dHRvbnNHbHlwaHNJZk5lZWRlZCk6Cisg ICAgICAgIFVwZGF0ZWQgaW1hZ2VzIGZvciB0aGUgZmluZCBiYW5uZXIuCisKKyAgICAgICAgKiBX ZWJJbnNwZWN0b3JVSS52Y3hwcm9qL1dlYkluc3BlY3RvclVJLnZjeHByb2o6CisgICAgICAgICog V2ViSW5zcGVjdG9yVUkudmN4cHJvai9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qLmZpbHRlcnM6Cisg ICAgICAgIEFkZGVkIG5ldyBpbWFnZXMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L0J1dHRvblRvb2xiYXJJdGVtLmNzczoKKyAgICAgICAgKC50b29sYmFyIC5pdGVtLmJ1dHRvbiA+ IC5sYWJlbCk6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnRvb2xiYXIgLml0 ZW0uYnV0dG9uID4gLmxhYmVsKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0 eWxlRGVjbGFyYXRpb25TZWN0aW9uLmNzczoKKyAgICAgICAgKC5zdHlsZS1kZWNsYXJhdGlvbi1z ZWN0aW9uKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc3R5bGUtZGVjbGFy YXRpb24tc2VjdGlvbik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnN0eWxl LWRlY2xhcmF0aW9uLXNlY3Rpb24gKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbik6CisgICAg ICAgICguc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3VwKToKKyAgICAgICAg KGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0 LWluLWdyb3VwKToKKyAgICAgICAgKC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uLmxhc3QtaW4t Z3JvdXAgKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbik6CisgICAgICAgIChib2R5Lm1hYy1w bGF0Zm9ybS5sZWdhY3kgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1pbi1ncm91cCAr IC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3Jt LmxlZ2FjeSAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3VwICsgLnN0eWxl LWRlY2xhcmF0aW9uLXNlY3Rpb246bGFzdC1jaGlsZCk6CisgICAgICAgICguc3R5bGUtZGVjbGFy YXRpb24tc2VjdGlvbiArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uKTogRGVsZXRlZC4KKyAg ICAgICAgKC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAgKyAuc3R5bGUt ZGVjbGFyYXRpb24tc2VjdGlvbjpsYXN0LWNoaWxkKTogRGVsZXRlZC4KKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5jc3M6CisgICAgICAg ICguc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSA+IC5jb250ZW50ID4gLnBzZXVk by1jbGFzc2VzKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5l LmNzczoKKyAgICAgICAgKC5kb20tdHJlZS1vdXRsaW5lIGxpLmhvdmVyZWQ6bm90KC5zZWxlY3Rl ZCkgLnNlbGVjdGlvbik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRvbS10 cmVlLW91dGxpbmUgbGkuaG92ZXJlZDpub3QoLnNlbGVjdGVkKSAuc2VsZWN0aW9uKToKKyAgICAg ICAgKC5kb20tdHJlZS1vdXRsaW5lIGxpLmVsZW1lbnRzLWRyYWctb3ZlciAuc2VsZWN0aW9uKToK KyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZG9tLXRyZWUtb3V0bGluZSBsaS5l bGVtZW50cy1kcmFnLW92ZXIgLnNlbGVjdGlvbik6CisgICAgICAgICguZG9tLXRyZWUtb3V0bGlu ZTpmb2N1cyBsaS5zZWxlY3RlZCAuc2VsZWN0aW9uKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRm b3JtLmxlZ2FjeSAuZG9tLXRyZWUtb3V0bGluZTpmb2N1cyBsaS5zZWxlY3RlZCAuc2VsZWN0aW9u KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0Rhc2hib2FyZENvbnRhaW5lclZpZXcu Y3NzOgorICAgICAgICAoLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIpOgorICAgICAgICAo Ym9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyKToK KyAgICAgICAgKGJvZHkud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFp bmVyKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeS53aW5kb3ctaW5hY3RpdmUg LnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIpOgorICAgICAgICAoLnRvb2xiYXIgLmRhc2hi b2FyZCk6CisgICAgICAgIChib2R5LndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJk KToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeS53aW5kb3ctaW5hY3RpdmUgLnRv b2xiYXIgLmRhc2hib2FyZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EYXRhR3Jp ZC5jc3M6CisgICAgICAgICguZGF0YS1ncmlkIHRoKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRm b3JtLmxlZ2FjeSAuZGF0YS1ncmlkIHRoKToKKyAgICAgICAgKC5kYXRhLWdyaWQgdHIuc2VsZWN0 ZWQpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kYXRhLWdyaWQgdHIuc2Vs ZWN0ZWQpOgorICAgICAgICAoLmRhdGEtZ3JpZDpmb2N1cyB0ci5zZWxlY3RlZCk6CisgICAgICAg IChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRhdGEtZ3JpZDpmb2N1cyB0ci5zZWxlY3RlZCk6 CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbi5jc3M6CisgICAg ICAgICguZGV0YWlscy1zZWN0aW9uKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2Fj eSAuZGV0YWlscy1zZWN0aW9uKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMt c2VjdGlvbik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMtc2Vj dGlvbiAuZGV0YWlscy1zZWN0aW9uKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gLmRldGFp bHMtc2VjdGlvbjpsYXN0LWNoaWxkKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gLmRldGFp bHMtc2VjdGlvbjpmaXJzdC1jaGlsZCk6CisgICAgICAgICguZGV0YWlscy1zZWN0aW9uID4gLmhl YWRlcik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMtc2VjdGlv biA+IC5oZWFkZXIpOgorICAgICAgICAoLmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0aW9u ID4gLmhlYWRlcik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5tb3VudGFpbi1saW9uIC5k ZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXIpOgorICAgICAgICAoLmRl dGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0aW9uLmNvbGxhc3BzZWQgPiAuaGVhZGVyKToKKyAg ICAgICAgKC5kZXRhaWxzLXNlY3Rpb24uY29tcHV0ZWQtc3R5bGUtcHJvcGVydGllczpub3QoLmNv bGxhcHNlZCkgPiAuaGVhZGVyKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAu ZGV0YWlscy1zZWN0aW9uLmNvbXB1dGVkLXN0eWxlLXByb3BlcnRpZXM6bm90KC5jb2xsYXBzZWQp ID4gLmhlYWRlcik6CisgICAgICAgICguZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3Jv dXApOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kZXRhaWxzLXNlY3Rpb24g PiAuY29udGVudCA+IC5ncm91cCk6CisgICAgICAgICguZGV0YWlscy1zZWN0aW9uID4gLmNvbnRl bnQgPiAuZ3JvdXA6bGFzdC1jaGlsZCk6CisgICAgICAgICguZGV0YWlscy1zZWN0aW9uID4gLmNv bnRlbnQgPiAuZ3JvdXA6bnRoLWNoaWxkKGV2ZW4pKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRm b3JtLmxlZ2FjeSAuZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bnRoLWNoaWxk KGV2ZW4pKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZGV0YWlscy1zZWN0 aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bGFzdC1jaGlsZCA+IC5yb3cuc2ltcGxlOmxhc3QtY2hp bGQgPiAqKToKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDps YXN0LWNoaWxkID4gLnJvdy5zaW1wbGU6bGFzdC1jaGlsZCA+ICopOiBEZWxldGVkLgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRmlsdGVyQmFyLmNzczoKKyAgICAgICAgKC5maWx0ZXIt YmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0pOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0u bGVnYWN5IC5maWx0ZXItYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0pOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5jc3M6CisgICAgICAgICgu bmF2aWdhdGlvbi1zaWRlYmFyLXBhbmVsLWNvbnRlbnQtdHJlZS1vdXRsaW5lIC5pdGVtLnNlbGVj dGVkKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAubmF2aWdhdGlvbi1zaWRl YmFyLXBhbmVsLWNvbnRlbnQtdHJlZS1vdXRsaW5lIC5pdGVtLnNlbGVjdGVkKToKKyAgICAgICAg KC5uYXZpZ2F0aW9uLXNpZGViYXItcGFuZWwtY29udGVudC10cmVlLW91dGxpbmU6Zm9jdXMgLml0 ZW0uc2VsZWN0ZWQpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5uYXZpZ2F0 aW9uLXNpZGViYXItcGFuZWwtY29udGVudC10cmVlLW91dGxpbmU6Zm9jdXMgLml0ZW0uc2VsZWN0 ZWQpOgorICAgICAgICAoYm9keS53aW5kb3ctaW5hY3RpdmUgLm5hdmlnYXRpb24tc2lkZWJhci1w YW5lbC1jb250ZW50LXRyZWUtb3V0bGluZSAuaXRlbS5zZWxlY3RlZCk6CisgICAgICAgIChib2R5 Lm1hYy1wbGF0Zm9ybS5sZWdhY3kud2luZG93LWluYWN0aXZlIC5uYXZpZ2F0aW9uLXNpZGViYXIt cGFuZWwtY29udGVudC10cmVlLW91dGxpbmUgLml0ZW0uc2VsZWN0ZWQpOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvUmFkaW9CdXR0b25OYXZpZ2F0aW9uSXRlbS5jc3M6CisgICAgICAg ICgubmF2aWdhdGlvbi1iYXIgLml0ZW0ucmFkaW8uYnV0dG9uLnRleHQtb25seS5zZWxlY3RlZCk6 CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLm5hdmlnYXRpb24tYmFyIC5pdGVt LnJhZGlvLmJ1dHRvbi50ZXh0LW9ubHkuc2VsZWN0ZWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvUnVsZXNTdHlsZURldGFpbHNQYW5lbC5jc3M6CisgICAgICAgICguc2lkZWJhciA+ IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSAucnVsZXMgLmxhYmVsICsgLnN0eWxlLWRlY2xhcmF0 aW9uLXNlY3Rpb24pOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zaWRlYmFy ID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlIC5ydWxlcyAubGFiZWwgKyAuc3R5bGUtZGVjbGFy YXRpb24tc2VjdGlvbik6CisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1z dHlsZSAucnVsZXMgLm5ldy1ydWxlKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2Fj eSAuc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSAucnVsZXMgLm5ldy1ydWxlKToK KyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlIC5ydWxlcyAubmV3 LXJ1bGUgKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbik6CisgICAgICAgIChib2R5Lm1hYy1w bGF0Zm9ybS5sZWdhY3kgLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnJ1bGVz IC5uZXctcnVsZSArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uKToKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL1Njb3BlQmFyLmNzczoKKyAgICAgICAgKC5zY29wZS1iYXIgPiBsaSk6 CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnNjb3BlLWJhciA+IGxpKToKKyAg ICAgICAgKC5zY29wZS1iYXIgPiBsaS5zZWxlY3RlZCk6CisgICAgICAgIChib2R5Lm1hYy1wbGF0 Zm9ybS5sZWdhY3kgLnNjb3BlLWJhciA+IGxpLnNlbGVjdGVkKToKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL1NlYXJjaEJhci5jc3M6CisgICAgICAgICguc2VhcmNoLWJhciA+IGlucHV0 W3R5cGU9InNlYXJjaCJdKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc2Vh cmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL1NpZGViYXIuY3NzOgorICAgICAgICAoLnNpZGViYXIpOgorICAgICAgICAoYm9keS5t YWMtcGxhdGZvcm0ubGVnYWN5IC5zaWRlYmFyKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3Jt LmxlZ2FjeS53aW5kb3ctaW5hY3RpdmUgLnNpZGViYXIpOgorICAgICAgICAoYm9keS5tYWMtcGxh dGZvcm0ubGVnYWN5IC5zaWRlYmFyLnJpZ2h0KToKKyAgICAgICAgKGJvZHkud2luZG93LWluYWN0 aXZlIC5zaWRlYmFyKTogRGVsZXRlZC4KKyAgICAgICAgKC5zaWRlYmFyLnJpZ2h0KTogRGVsZXRl ZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lU2lkZWJhclBhbmVsLmNz czoKKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24udGltZWxpbmUgPiAudGl0 bGUtYmFyKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc2lkZWJhciA+IC5w YW5lbC5uYXZpZ2F0aW9uLnRpbWVsaW5lID4gLnRpdGxlLWJhcik6CisgICAgICAgIFN0eWxlIHVw ZGF0ZXMgZm9yIG5ldyBsb29rIGFuZCBmZWVsLgorCiAyMDE0LTA3LTExICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogRGVidWdn ZXIgUGF1c2UgYnV0dG9uIGRvZXMgbm90IHdvcmsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvSW1hZ2VVdGlsaXRpZXMuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL0ltYWdlVXRpbGl0aWVzLmpzCmluZGV4IDQy ZGJjNmUuLjllZTA4NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0Jhc2UvSW1hZ2VVdGlsaXRpZXMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQmFzZS9JbWFnZVV0aWxpdGllcy5qcwpAQCAtMzkzLDggKzM5Myw5IEBA IGZ1bmN0aW9uIGdlbmVyYXRlRW1ib3NzZWRJbWFnZXMoc3JjLCB3aWR0aCwgaGVpZ2h0LCBzdGF0 ZXMsIGNhbnZhc0lkZW50aWZpZXJDYWxsCiAgICAgdmFyIHNjYWxlZFdpZHRoID0gd2lkdGggKiBz Y2FsZUZhY3RvcjsKICAgICB2YXIgc2NhbGVkSGVpZ2h0ID0gaGVpZ2h0ICogc2NhbGVGYWN0b3I7 CiAKLSAgICAvLyBCdW1wIHRoaXMgdmVyc2lvbiB3aGVuIG1ha2luZyBjaGFuZ2VzIHRoYXQgYWZm ZWN0IHRoZSByZXN1bHQgaW1hZ2UuCi0gICAgY29uc3QgaW1hZ2VWZXJzaW9uID0gMjsKKyAgICAv LyBCdW1wIHRoZSBiYXNlIHZlcnNpb24gd2hlbiBtYWtpbmcgY2hhbmdlcyB0aGF0IGFmZmVjdCB0 aGUgcmVzdWx0IGltYWdlLgorICAgIGNvbnN0IGJhc2VJbWFnZVZlcnNpb24gPSAzOworICAgIGNv bnN0IGltYWdlVmVyc2lvbiA9IGJhc2VJbWFnZVZlcnNpb24gKyAwLjAxICogV2ViSW5zcGVjdG9y LlBsYXRmb3JtLnZlcnNpb24uYmFzZSArIDAuMDAwMSAqIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52 ZXJzaW9uLnJlbGVhc2U7CiAKICAgICBjb25zdCBzdG9yYWdlS2V5UHJlZml4ID0gImdlbmVyYXRl ZC1lbWJvc3NlZC1pbWFnZS0iOwogCkBAIC00ODcsMTAzICs0ODgsMTQ4IEBAIGZ1bmN0aW9uIGdl bmVyYXRlRW1ib3NzZWRJbWFnZXMoc3JjLCB3aWR0aCwgaGVpZ2h0LCBzdGF0ZXMsIGNhbnZhc0lk ZW50aWZpZXJDYWxsCiAKICAgICBmdW5jdGlvbiBnZW5lcmF0ZUltYWdlKHN0YXRlKQogICAgIHsK LSAgICAgICAgY29uc3QgZGVwdGggPSAxICogc2NhbGVGYWN0b3I7Ci0gICAgICAgIGNvbnN0IHNo YWRvd0RlcHRoID0gZGVwdGg7Ci0gICAgICAgIGNvbnN0IHNoYWRvd0JsdXIgPSBkZXB0aCAtIDE7 Ci0gICAgICAgIGNvbnN0IGdsb3dCbHVyID0gMjsKKyAgICAgICAgZnVuY3Rpb24gZ2VuZXJhdGVN b2Rlcm5JbWFnZSgpCisgICAgICAgIHsKKyAgICAgICAgICAgIGNvbnN0IGNvbnRleHQgPSBkb2N1 bWVudC5nZXRDU1NDYW52YXNDb250ZXh0KCIyZCIsIGNhbnZhc0lkZW50aWZpZXJDYWxsYmFjayhz dGF0ZSksIHNjYWxlZFdpZHRoLCBzY2FsZWRIZWlnaHQpOworICAgICAgICAgICAgY29udGV4dC5z YXZlKCk7CisgICAgICAgICAgICBjb250ZXh0LnNjYWxlKHNjYWxlRmFjdG9yLCBzY2FsZUZhY3Rv cik7CisKKyAgICAgICAgICAgIGNvbnRleHQuY2xlYXJSZWN0KDAsIDAsIHdpZHRoLCBoZWlnaHQp OworCisgICAgICAgICAgICB2YXIgZ3JhZGllbnQgPSBjb250ZXh0LmNyZWF0ZUxpbmVhckdyYWRp ZW50KDAsIDAsIDAsIGhlaWdodCk7CisgICAgICAgICAgICBpZiAoc3RhdGUgPT09IHN0YXRlcy5B Y3RpdmUpIHsKKyAgICAgICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMCwgInJnYig2 NSwgNjUsIDY1KSIpOworICAgICAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9yU3RvcCgxLCAi cmdiKDcwLCA3MCwgNzApIik7CisgICAgICAgICAgICB9IGVsc2UgaWYgKHN0YXRlID09PSBzdGF0 ZXMuRm9jdXMpIHsKKyAgICAgICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMCwgInJn YigwLCAxMjMsIDI0NykiKTsKKyAgICAgICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3Ao MSwgInJnYigwLCAxMjgsIDI1MikiKTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAoc3RhdGUgPT09 IHN0YXRlcy5BY3RpdmVGb2N1cykgeworICAgICAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9y U3RvcCgwLCAicmdiKDAsIDYyLCAyMTApIik7CisgICAgICAgICAgICAgICAgZ3JhZGllbnQuYWRk Q29sb3JTdG9wKDEsICJyZ2IoMCwgNjcsIDIxNSkiKTsKKyAgICAgICAgICAgIH0gZWxzZSB7Cisg ICAgICAgICAgICAgICAgZ3JhZGllbnQuYWRkQ29sb3JTdG9wKDAsICJyZ2IoNzUsIDc1LCA3NSki KTsKKyAgICAgICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMSwgInJnYig4MCwgODAs IDgwKSIpOworICAgICAgICAgICAgfQogCi0gICAgICAgIGNvbnN0IGNvbnRleHQgPSBkb2N1bWVu dC5nZXRDU1NDYW52YXNDb250ZXh0KCIyZCIsIGNhbnZhc0lkZW50aWZpZXJDYWxsYmFjayhzdGF0 ZSksIHNjYWxlZFdpZHRoLCBzY2FsZWRIZWlnaHQpOwotICAgICAgICBjb250ZXh0LnNhdmUoKTsK LSAgICAgICAgY29udGV4dC5zY2FsZShzY2FsZUZhY3Rvciwgc2NhbGVGYWN0b3IpOworICAgICAg ICAgICAgY29udGV4dC5maWxsU3R5bGUgPSBncmFkaWVudDsKKyAgICAgICAgICAgIGNvbnRleHQu ZmlsbFJlY3QoMCwgMCwgd2lkdGgsIGhlaWdodCk7CiAKLSAgICAgICAgY29udGV4dC5jbGVhclJl Y3QoMCwgMCwgd2lkdGgsIGhlaWdodCk7Ci0KLSAgICAgICAgaWYgKGRlcHRoID4gMCkgewotICAg ICAgICAgICAgLy8gVXNlIHNjcmF0Y2ggY2FudmFzIHNvIHdlIGNhbiBhcHBseSB0aGUgZHJhdyB0 aGUgd2hpdGUgZHJvcCBzaGFkb3cKLSAgICAgICAgICAgIC8vIHRvIHRoZSB3aG9sZSBnbHlwaCBh dCB0aGUgZW5kLgotCi0gICAgICAgICAgICB2YXIgc2NyYXRjaENhbnZhcyA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImNhbnZhcyIpOwotICAgICAgICAgICAgc2NyYXRjaENhbnZhcy53aWR0aCA9 IHNjYWxlZFdpZHRoOwotICAgICAgICAgICAgc2NyYXRjaENhbnZhcy5oZWlnaHQgPSBzY2FsZWRI ZWlnaHQ7Ci0KLSAgICAgICAgICAgIHZhciBzY3JhdGNoQ29udGV4dCA9IHNjcmF0Y2hDYW52YXMu Z2V0Q29udGV4dCgiMmQiKTsKLSAgICAgICAgICAgIHNjcmF0Y2hDb250ZXh0LnNjYWxlKHNjYWxl RmFjdG9yLCBzY2FsZUZhY3Rvcik7Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAgICAgdmFyIHNj cmF0Y2hDb250ZXh0ID0gY29udGV4dDsKLQotICAgICAgICB2YXIgZ3JhZGllbnQgPSBzY3JhdGNo Q29udGV4dC5jcmVhdGVMaW5lYXJHcmFkaWVudCgwLCAwLCAwLCBoZWlnaHQpOwotICAgICAgICBp ZiAoc3RhdGUgPT09IHN0YXRlcy5BY3RpdmUpIHsKLSAgICAgICAgICAgIGdyYWRpZW50LmFkZENv bG9yU3RvcCgwLCAicmdiKDYwLCA2MCwgNjApIik7Ci0gICAgICAgICAgICBncmFkaWVudC5hZGRD b2xvclN0b3AoMSwgInJnYigxMDAsIDEwMCwgMTAwKSIpOwotICAgICAgICB9IGVsc2UgaWYgKHN0 YXRlID09PSBzdGF0ZXMuRm9jdXMpIHsKLSAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9yU3Rv cCgwLCAicmdiKDUwLCAxMzUsIDIwMCkiKTsKLSAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9y U3RvcCgxLCAicmdiKDYwLCAxNTUsIDIyNSkiKTsKLSAgICAgICAgfSBlbHNlIGlmIChzdGF0ZSA9 PT0gc3RhdGVzLkFjdGl2ZUZvY3VzKSB7Ci0gICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0 b3AoMCwgInJnYigzMCwgMTE1LCAxODUpIik7Ci0gICAgICAgICAgICBncmFkaWVudC5hZGRDb2xv clN0b3AoMSwgInJnYig0MCwgMTM1LCAyMDApIik7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAg ICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMCwgInJnYig5MCwgOTAsIDkwKSIpOwotICAgICAg ICAgICAgZ3JhZGllbnQuYWRkQ29sb3JTdG9wKDEsICJyZ2IoMTQ1LCAxNDUsIDE0NSkiKTsKKyAg ICAgICAgICAgIC8vIEFwcGx5IHRoZSBtYXNrIHRvIGtlZXAganVzdCB0aGUgaW5uZXIgc2hhcGUg b2YgdGhlIGdseXBoLgorICAgICAgICAgICAgX2FwcGx5SW1hZ2VNYXNrKGNvbnRleHQsIGltYWdl KTsKKworICAgICAgICAgICAgaWYgKCFpZ25vcmVDYWNoZSkgeworICAgICAgICAgICAgICAgIGNv bnN0IHN0b3JhZ2VLZXkgPSBzdG9yYWdlS2V5UHJlZml4ICsgY2FudmFzSWRlbnRpZmllckNhbGxi YWNrKHN0YXRlKTsKKyAgICAgICAgICAgICAgICBzYXZlSW1hZ2VUb1N0b3JhZ2Uoc3RvcmFnZUtl eSwgY29udGV4dCwgc2NhbGVkV2lkdGgsIHNjYWxlZEhlaWdodCwgaW1hZ2VWZXJzaW9uKTsKKyAg ICAgICAgICAgIH0KKworICAgICAgICAgICAgY29udGV4dC5yZXN0b3JlKCk7CiAgICAgICAgIH0K IAotICAgICAgICBzY3JhdGNoQ29udGV4dC5maWxsU3R5bGUgPSBncmFkaWVudDsKLSAgICAgICAg c2NyYXRjaENvbnRleHQuZmlsbFJlY3QoMCwgMCwgd2lkdGgsIGhlaWdodCk7Ci0KLSAgICAgICAg aWYgKGRlcHRoID4gMCkgewotICAgICAgICAgICAgLy8gSW52ZXJ0IHRoZSBpbWFnZSB0byB1c2Ug YXMgYSByZXZlcnNlIGltYWdlIG1hc2sgZm9yIHRoZSBpbm5lciBzaGFkb3dzLgotICAgICAgICAg ICAgLy8gUGFzcyBpbiB0aGUgY29sb3IgdG8gdXNlIGZvciB0aGUgb3BhcXVlIGFyZWFzIHRvIHBy ZXZlbnQgImJsYWNrIGhhbG9zIgotICAgICAgICAgICAgLy8gbGF0ZXIgd2hlbiBhcHBseWluZyB0 aGUgZmluYWwgaW1hZ2UgbWFzay4KLQotICAgICAgICAgICAgaWYgKHN0YXRlID09PSBzdGF0ZXMu QWN0aXZlKQotICAgICAgICAgICAgICAgIHZhciBpbnZlcnRlZEltYWdlID0gX2ludmVydE1hc2tJ bWFnZShpbWFnZSwgNjAsIDYwLCA2MCk7Ci0gICAgICAgICAgICBlbHNlIGlmIChzdGF0ZSA9PT0g c3RhdGVzLkZvY3VzKQotICAgICAgICAgICAgICAgIHZhciBpbnZlcnRlZEltYWdlID0gX2ludmVy dE1hc2tJbWFnZShpbWFnZSwgNDUsIDE0NSwgMjEwKTsKLSAgICAgICAgICAgIGVsc2UgaWYgKHN0 YXRlID09PSBzdGF0ZXMuQWN0aXZlRm9jdXMpCi0gICAgICAgICAgICAgICAgdmFyIGludmVydGVk SW1hZ2UgPSBfaW52ZXJ0TWFza0ltYWdlKGltYWdlLCAzNSwgMTI1LCAxOTUpOwotICAgICAgICAg ICAgZWxzZQotICAgICAgICAgICAgICAgIHZhciBpbnZlcnRlZEltYWdlID0gX2ludmVydE1hc2tJ bWFnZShpbWFnZSwgOTAsIDkwLCA5MCk7Ci0KLSAgICAgICAgICAgIGlmIChzdGF0ZSA9PT0gc3Rh dGVzLkZvY3VzKSB7Ci0gICAgICAgICAgICAgICAgLy8gRG91YmxlIGRyYXcgdGhlIGJsdXJyeSBp bm5lciBzaGFkb3cgdG8gZ2V0IHRoZSByaWdodCBlZmZlY3QuCi0gICAgICAgICAgICAgICAgX2Ry YXdJbWFnZVNoYWRvdyhzY3JhdGNoQ29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2IoMTAs IDk1LCAxNTApIiwgaW52ZXJ0ZWRJbWFnZSk7Ci0gICAgICAgICAgICAgICAgX2RyYXdJbWFnZVNo YWRvdyhzY3JhdGNoQ29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2IoMTAsIDk1LCAxNTAp IiwgaW52ZXJ0ZWRJbWFnZSk7Ci0KLSAgICAgICAgICAgICAgICAvLyBEcmF3IHRoZSBpbm5lciBz aGFkb3cuCi0gICAgICAgICAgICAgICAgX2RyYXdJbWFnZVNoYWRvdyhzY3JhdGNoQ29udGV4dCwg MCwgc2hhZG93RGVwdGgsIHNoYWRvd0JsdXIsICJyZ2IoMCwgODAsIDE3MCkiLCBpbnZlcnRlZElt YWdlKTsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAoc3RhdGUgPT09IHN0YXRlcy5BY3RpdmVGb2N1 cykgewotICAgICAgICAgICAgICAgIC8vIERvdWJsZSBkcmF3IHRoZSBibHVycnkgaW5uZXIgc2hh ZG93IHRvIGdldCB0aGUgcmlnaHQgZWZmZWN0LgotICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VT aGFkb3coc2NyYXRjaENvbnRleHQsIDAsIDAsIHNoYWRvd0RlcHRoLCAicmdiKDAsIDgwLCAxMDAp IiwgaW52ZXJ0ZWRJbWFnZSk7Ci0gICAgICAgICAgICAgICAgX2RyYXdJbWFnZVNoYWRvdyhzY3Jh dGNoQ29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2IoMCwgODAsIDEwMCkiLCBpbnZlcnRl ZEltYWdlKTsKKyAgICAgICAgZnVuY3Rpb24gZ2VuZXJhdGVMZWdhY3lJbWFnZSgpCisgICAgICAg IHsKKyAgICAgICAgICAgIGNvbnN0IGRlcHRoID0gMSAqIHNjYWxlRmFjdG9yOworICAgICAgICAg ICAgY29uc3Qgc2hhZG93RGVwdGggPSBkZXB0aDsKKyAgICAgICAgICAgIGNvbnN0IHNoYWRvd0Js dXIgPSBkZXB0aCAtIDE7CisgICAgICAgICAgICBjb25zdCBnbG93Qmx1ciA9IDI7CisKKyAgICAg ICAgICAgIGNvbnN0IGNvbnRleHQgPSBkb2N1bWVudC5nZXRDU1NDYW52YXNDb250ZXh0KCIyZCIs IGNhbnZhc0lkZW50aWZpZXJDYWxsYmFjayhzdGF0ZSksIHNjYWxlZFdpZHRoLCBzY2FsZWRIZWln aHQpOworICAgICAgICAgICAgY29udGV4dC5zYXZlKCk7CisgICAgICAgICAgICBjb250ZXh0LnNj YWxlKHNjYWxlRmFjdG9yLCBzY2FsZUZhY3Rvcik7CiAKLSAgICAgICAgICAgICAgICAvLyBEcmF3 IHRoZSBpbm5lciBzaGFkb3cuCi0gICAgICAgICAgICAgICAgX2RyYXdJbWFnZVNoYWRvdyhzY3Jh dGNoQ29udGV4dCwgMCwgc2hhZG93RGVwdGgsIHNoYWRvd0JsdXIsICJyZ2IoMCwgNjUsIDE1MCki LCBpbnZlcnRlZEltYWdlKTsKKyAgICAgICAgICAgIGNvbnRleHQuY2xlYXJSZWN0KDAsIDAsIHdp ZHRoLCBoZWlnaHQpOworCisgICAgICAgICAgICBpZiAoZGVwdGggPiAwKSB7CisgICAgICAgICAg ICAgICAgLy8gVXNlIHNjcmF0Y2ggY2FudmFzIHNvIHdlIGNhbiBhcHBseSB0aGUgZHJhdyB0aGUg d2hpdGUgZHJvcCBzaGFkb3cKKyAgICAgICAgICAgICAgICAvLyB0byB0aGUgd2hvbGUgZ2x5cGgg YXQgdGhlIGVuZC4KKworICAgICAgICAgICAgICAgIHZhciBzY3JhdGNoQ2FudmFzID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgiY2FudmFzIik7CisgICAgICAgICAgICAgICAgc2NyYXRjaENhbnZh cy53aWR0aCA9IHNjYWxlZFdpZHRoOworICAgICAgICAgICAgICAgIHNjcmF0Y2hDYW52YXMuaGVp Z2h0ID0gc2NhbGVkSGVpZ2h0OworCisgICAgICAgICAgICAgICAgdmFyIHNjcmF0Y2hDb250ZXh0 ID0gc2NyYXRjaENhbnZhcy5nZXRDb250ZXh0KCIyZCIpOworICAgICAgICAgICAgICAgIHNjcmF0 Y2hDb250ZXh0LnNjYWxlKHNjYWxlRmFjdG9yLCBzY2FsZUZhY3Rvcik7CisgICAgICAgICAgICB9 IGVsc2UKKyAgICAgICAgICAgICAgICB2YXIgc2NyYXRjaENvbnRleHQgPSBjb250ZXh0OworCisg ICAgICAgICAgICB2YXIgZ3JhZGllbnQgPSBzY3JhdGNoQ29udGV4dC5jcmVhdGVMaW5lYXJHcmFk aWVudCgwLCAwLCAwLCBoZWlnaHQpOworICAgICAgICAgICAgaWYgKHN0YXRlID09PSBzdGF0ZXMu QWN0aXZlKSB7CisgICAgICAgICAgICAgICAgZ3JhZGllbnQuYWRkQ29sb3JTdG9wKDAsICJyZ2Io NjAsIDYwLCA2MCkiKTsKKyAgICAgICAgICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMSwg InJnYigxMDAsIDEwMCwgMTAwKSIpOworICAgICAgICAgICAgfSBlbHNlIGlmIChzdGF0ZSA9PT0g c3RhdGVzLkZvY3VzKSB7CisgICAgICAgICAgICAgICAgZ3JhZGllbnQuYWRkQ29sb3JTdG9wKDAs ICJyZ2IoNTAsIDEzNSwgMjAwKSIpOworICAgICAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9y U3RvcCgxLCAicmdiKDYwLCAxNTUsIDIyNSkiKTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAoc3Rh dGUgPT09IHN0YXRlcy5BY3RpdmVGb2N1cykgeworICAgICAgICAgICAgICAgIGdyYWRpZW50LmFk ZENvbG9yU3RvcCgwLCAicmdiKDMwLCAxMTUsIDE4NSkiKTsKKyAgICAgICAgICAgICAgICBncmFk aWVudC5hZGRDb2xvclN0b3AoMSwgInJnYig0MCwgMTM1LCAyMDApIik7CiAgICAgICAgICAgICB9 IGVsc2UgewotICAgICAgICAgICAgICAgIC8vIERvdWJsZSBkcmF3IHRoZSBibHVycnkgaW5uZXIg c2hhZG93IHRvIGdldCB0aGUgcmlnaHQgZWZmZWN0LgotICAgICAgICAgICAgICAgIF9kcmF3SW1h Z2VTaGFkb3coc2NyYXRjaENvbnRleHQsIDAsIDAsIHNoYWRvd0RlcHRoLCAicmdiYSgwLCAwLCAw LCAxKSIsIGludmVydGVkSW1hZ2UpOwotICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VTaGFkb3co c2NyYXRjaENvbnRleHQsIDAsIDAsIHNoYWRvd0RlcHRoLCAicmdiYSgwLCAwLCAwLCAxKSIsIGlu dmVydGVkSW1hZ2UpOworICAgICAgICAgICAgICAgIGdyYWRpZW50LmFkZENvbG9yU3RvcCgwLCAi cmdiKDkwLCA5MCwgOTApIik7CisgICAgICAgICAgICAgICAgZ3JhZGllbnQuYWRkQ29sb3JTdG9w KDEsICJyZ2IoMTQ1LCAxNDUsIDE0NSkiKTsKKyAgICAgICAgICAgIH0KIAotICAgICAgICAgICAg ICAgIC8vIERyYXcgdGhlIGlubmVyIHNoYWRvdy4KLSAgICAgICAgICAgICAgICBfZHJhd0ltYWdl U2hhZG93KHNjcmF0Y2hDb250ZXh0LCAwLCBzaGFkb3dEZXB0aCwgc2hhZG93Qmx1ciwgInJnYmEo MCwgMCwgMCwgMC42KSIsIGludmVydGVkSW1hZ2UpOworICAgICAgICAgICAgc2NyYXRjaENvbnRl eHQuZmlsbFN0eWxlID0gZ3JhZGllbnQ7CisgICAgICAgICAgICBzY3JhdGNoQ29udGV4dC5maWxs UmVjdCgwLCAwLCB3aWR0aCwgaGVpZ2h0KTsKKworICAgICAgICAgICAgaWYgKGRlcHRoID4gMCkg eworICAgICAgICAgICAgICAgIC8vIEludmVydCB0aGUgaW1hZ2UgdG8gdXNlIGFzIGEgcmV2ZXJz ZSBpbWFnZSBtYXNrIGZvciB0aGUgaW5uZXIgc2hhZG93cy4KKyAgICAgICAgICAgICAgICAvLyBQ YXNzIGluIHRoZSBjb2xvciB0byB1c2UgZm9yIHRoZSBvcGFxdWUgYXJlYXMgdG8gcHJldmVudCAi YmxhY2sgaGFsb3MiCisgICAgICAgICAgICAgICAgLy8gbGF0ZXIgd2hlbiBhcHBseWluZyB0aGUg ZmluYWwgaW1hZ2UgbWFzay4KKworICAgICAgICAgICAgICAgIGlmIChzdGF0ZSA9PT0gc3RhdGVz LkFjdGl2ZSkKKyAgICAgICAgICAgICAgICAgICAgdmFyIGludmVydGVkSW1hZ2UgPSBfaW52ZXJ0 TWFza0ltYWdlKGltYWdlLCA2MCwgNjAsIDYwKTsKKyAgICAgICAgICAgICAgICBlbHNlIGlmIChz dGF0ZSA9PT0gc3RhdGVzLkZvY3VzKQorICAgICAgICAgICAgICAgICAgICB2YXIgaW52ZXJ0ZWRJ bWFnZSA9IF9pbnZlcnRNYXNrSW1hZ2UoaW1hZ2UsIDQ1LCAxNDUsIDIxMCk7CisgICAgICAgICAg ICAgICAgZWxzZSBpZiAoc3RhdGUgPT09IHN0YXRlcy5BY3RpdmVGb2N1cykKKyAgICAgICAgICAg ICAgICAgICAgdmFyIGludmVydGVkSW1hZ2UgPSBfaW52ZXJ0TWFza0ltYWdlKGltYWdlLCAzNSwg MTI1LCAxOTUpOworICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgdmFy IGludmVydGVkSW1hZ2UgPSBfaW52ZXJ0TWFza0ltYWdlKGltYWdlLCA5MCwgOTAsIDkwKTsKKwor ICAgICAgICAgICAgICAgIGlmIChzdGF0ZSA9PT0gc3RhdGVzLkZvY3VzKSB7CisgICAgICAgICAg ICAgICAgICAgIC8vIERvdWJsZSBkcmF3IHRoZSBibHVycnkgaW5uZXIgc2hhZG93IHRvIGdldCB0 aGUgcmlnaHQgZWZmZWN0LgorICAgICAgICAgICAgICAgICAgICBfZHJhd0ltYWdlU2hhZG93KHNj cmF0Y2hDb250ZXh0LCAwLCAwLCBzaGFkb3dEZXB0aCwgInJnYigxMCwgOTUsIDE1MCkiLCBpbnZl cnRlZEltYWdlKTsKKyAgICAgICAgICAgICAgICAgICAgX2RyYXdJbWFnZVNoYWRvdyhzY3JhdGNo Q29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2IoMTAsIDk1LCAxNTApIiwgaW52ZXJ0ZWRJ bWFnZSk7CisKKyAgICAgICAgICAgICAgICAgICAgLy8gRHJhdyB0aGUgaW5uZXIgc2hhZG93Lgor ICAgICAgICAgICAgICAgICAgICBfZHJhd0ltYWdlU2hhZG93KHNjcmF0Y2hDb250ZXh0LCAwLCBz aGFkb3dEZXB0aCwgc2hhZG93Qmx1ciwgInJnYigwLCA4MCwgMTcwKSIsIGludmVydGVkSW1hZ2Up OworICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoc3RhdGUgPT09IHN0YXRlcy5BY3RpdmVGb2N1 cykgeworICAgICAgICAgICAgICAgICAgICAvLyBEb3VibGUgZHJhdyB0aGUgYmx1cnJ5IGlubmVy IHNoYWRvdyB0byBnZXQgdGhlIHJpZ2h0IGVmZmVjdC4KKyAgICAgICAgICAgICAgICAgICAgX2Ry YXdJbWFnZVNoYWRvdyhzY3JhdGNoQ29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2IoMCwg ODAsIDEwMCkiLCBpbnZlcnRlZEltYWdlKTsKKyAgICAgICAgICAgICAgICAgICAgX2RyYXdJbWFn ZVNoYWRvdyhzY3JhdGNoQ29udGV4dCwgMCwgMCwgc2hhZG93RGVwdGgsICJyZ2IoMCwgODAsIDEw MCkiLCBpbnZlcnRlZEltYWdlKTsKKworICAgICAgICAgICAgICAgICAgICAvLyBEcmF3IHRoZSBp bm5lciBzaGFkb3cuCisgICAgICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VTaGFkb3coc2NyYXRj aENvbnRleHQsIDAsIHNoYWRvd0RlcHRoLCBzaGFkb3dCbHVyLCAicmdiKDAsIDY1LCAxNTApIiwg aW52ZXJ0ZWRJbWFnZSk7CisgICAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAg ICAgICAgLy8gRG91YmxlIGRyYXcgdGhlIGJsdXJyeSBpbm5lciBzaGFkb3cgdG8gZ2V0IHRoZSBy aWdodCBlZmZlY3QuCisgICAgICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VTaGFkb3coc2NyYXRj aENvbnRleHQsIDAsIDAsIHNoYWRvd0RlcHRoLCAicmdiYSgwLCAwLCAwLCAxKSIsIGludmVydGVk SW1hZ2UpOworICAgICAgICAgICAgICAgICAgICBfZHJhd0ltYWdlU2hhZG93KHNjcmF0Y2hDb250 ZXh0LCAwLCAwLCBzaGFkb3dEZXB0aCwgInJnYmEoMCwgMCwgMCwgMSkiLCBpbnZlcnRlZEltYWdl KTsKKworICAgICAgICAgICAgICAgICAgICAvLyBEcmF3IHRoZSBpbm5lciBzaGFkb3cuCisgICAg ICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VTaGFkb3coc2NyYXRjaENvbnRleHQsIDAsIHNoYWRv d0RlcHRoLCBzaGFkb3dCbHVyLCAicmdiYSgwLCAwLCAwLCAwLjYpIiwgaW52ZXJ0ZWRJbWFnZSk7 CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQotICAgICAgICB9CiAKLSAgICAgICAg Ly8gQXBwbHkgdGhlIG1hc2sgdG8ga2VlcCBqdXN0IHRoZSBpbm5lciBzaGFwZSBvZiB0aGUgZ2x5 cGguCi0gICAgICAgIF9hcHBseUltYWdlTWFzayhzY3JhdGNoQ29udGV4dCwgaW1hZ2UpOworICAg ICAgICAgICAgLy8gQXBwbHkgdGhlIG1hc2sgdG8ga2VlcCBqdXN0IHRoZSBpbm5lciBzaGFwZSBv ZiB0aGUgZ2x5cGguCisgICAgICAgICAgICBfYXBwbHlJbWFnZU1hc2soc2NyYXRjaENvbnRleHQs IGltYWdlKTsKKworICAgICAgICAgICAgLy8gRHJhdyB0aGUgd2hpdGUgZHJvcCBzaGFkb3cuCisg ICAgICAgICAgICBpZiAoZGVwdGggPiAwKQorICAgICAgICAgICAgICAgIF9kcmF3SW1hZ2VTaGFk b3coY29udGV4dCwgMCwgc2hhZG93RGVwdGgsIHNoYWRvd0JsdXIsICJyZ2JhKDI1NSwgMjU1LCAy NTUsIDAuNikiLCBzY3JhdGNoQ2FudmFzKTsKIAotICAgICAgICAvLyBEcmF3IHRoZSB3aGl0ZSBk cm9wIHNoYWRvdy4KLSAgICAgICAgaWYgKGRlcHRoID4gMCkKLSAgICAgICAgICAgIF9kcmF3SW1h Z2VTaGFkb3coY29udGV4dCwgMCwgc2hhZG93RGVwdGgsIHNoYWRvd0JsdXIsICJyZ2JhKDI1NSwg MjU1LCAyNTUsIDAuNikiLCBzY3JhdGNoQ2FudmFzKTsKKyAgICAgICAgICAgIC8vIERyYXcgYSBz dWJ0bGUgZ2xvdyBmb3IgdGhlIGZvY3VzIHN0YXRlcy4KKyAgICAgICAgICAgIGlmIChzdGF0ZSA9 PT0gc3RhdGVzLkZvY3VzIHx8IHN0YXRlID09PSBzdGF0ZXMuQWN0aXZlRm9jdXMpCisgICAgICAg ICAgICAgICAgX2RyYXdJbWFnZVNoYWRvdyhjb250ZXh0LCAwLCAwLCBnbG93Qmx1ciwgInJnYmEo MjAsIDEwMCwgMjIwLCAwLjQpIiwgc2NyYXRjaENhbnZhcyk7CiAKLSAgICAgICAgLy8gRHJhdyBh IHN1YnRsZSBnbG93IGZvciB0aGUgZm9jdXMgc3RhdGVzLgotICAgICAgICBpZiAoc3RhdGUgPT09 IHN0YXRlcy5Gb2N1cyB8fCBzdGF0ZSA9PT0gc3RhdGVzLkFjdGl2ZUZvY3VzKQotICAgICAgICAg ICAgX2RyYXdJbWFnZVNoYWRvdyhjb250ZXh0LCAwLCAwLCBnbG93Qmx1ciwgInJnYmEoMjAsIDEw MCwgMjIwLCAwLjQpIiwgc2NyYXRjaENhbnZhcyk7CisgICAgICAgICAgICBpZiAoIWlnbm9yZUNh Y2hlKSB7CisgICAgICAgICAgICAgICAgY29uc3Qgc3RvcmFnZUtleSA9IHN0b3JhZ2VLZXlQcmVm aXggKyBjYW52YXNJZGVudGlmaWVyQ2FsbGJhY2soc3RhdGUpOworICAgICAgICAgICAgICAgIHNh dmVJbWFnZVRvU3RvcmFnZShzdG9yYWdlS2V5LCBjb250ZXh0LCBzY2FsZWRXaWR0aCwgc2NhbGVk SGVpZ2h0LCBpbWFnZVZlcnNpb24pOworICAgICAgICAgICAgfQogCi0gICAgICAgIGlmICghaWdu b3JlQ2FjaGUpIHsKLSAgICAgICAgICAgIGNvbnN0IHN0b3JhZ2VLZXkgPSBzdG9yYWdlS2V5UHJl Zml4ICsgY2FudmFzSWRlbnRpZmllckNhbGxiYWNrKHN0YXRlKTsKLSAgICAgICAgICAgIHNhdmVJ bWFnZVRvU3RvcmFnZShzdG9yYWdlS2V5LCBjb250ZXh0LCBzY2FsZWRXaWR0aCwgc2NhbGVkSGVp Z2h0LCBpbWFnZVZlcnNpb24pOworICAgICAgICAgICAgY29udGV4dC5yZXN0b3JlKCk7CiAgICAg ICAgIH0KIAotICAgICAgICBjb250ZXh0LnJlc3RvcmUoKTsKKyAgICAgICAgaWYgKFdlYkluc3Bl Y3Rvci5QbGF0Zm9ybS5uYW1lID09PSAibWFjIiAmJiBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVy c2lvbi5iYXNlID09PSAxMCAmJiBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5yZWxlYXNl IDwgMTApCisgICAgICAgICAgICBnZW5lcmF0ZUxlZ2FjeUltYWdlKCk7CisgICAgICAgIGVsc2UK KyAgICAgICAgICAgIGdlbmVyYXRlTW9kZXJuSW1hZ2UoKTsKICAgICB9CiAKICAgICBmdW5jdGlv biBfZHJhd0ltYWdlU2hhZG93KGNvbnRleHQsIHhPZmZzZXQsIHlPZmZzZXQsIGJsdXIsIGNvbG9y LCBpbWFnZSkgewpAQCAtNjUzLDcgKzY5OSw2IEBAIGZ1bmN0aW9uIGdlbmVyYXRlRW1ib3NzZWRJ bWFnZXMoc3JjLCB3aWR0aCwgaGVpZ2h0LCBzdGF0ZXMsIGNhbnZhc0lkZW50aWZpZXJDYWxsCiAg ICAgfQogfQogCi0KIHZhciBzdmdJbWFnZUNhY2hlID0ge307CiAKIGZ1bmN0aW9uIGxvYWRTVkdJ bWFnZURvY3VtZW50RWxlbWVudCh1cmwsIGNhbGxiYWNrKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCmluZGV4IGE0YTZjY2UuLjA1NzQwYmIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFp bi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4u anMKQEAgLTE2Nyw3ICsxNjcsNyBAQCBXZWJJbnNwZWN0b3IubG9hZGVkID0gZnVuY3Rpb24oKQog ICAgIH07CiAKICAgICB0aGlzLl93aW5kb3dLZXlkb3duTGlzdGVuZXJzID0gW107Ci19Cit9Owog CiBXZWJJbnNwZWN0b3IuY29udGVudExvYWRlZCA9IGZ1bmN0aW9uKCkKIHsKQEAgLTE5MywxNiAr MTkzLDUwIEBAIFdlYkluc3BlY3Rvci5jb250ZW50TG9hZGVkID0gZnVuY3Rpb24oKQogICAgICAg ICBkb2N1bWVudC5ib2R5LmNsYXNzTGlzdC5hZGQoIm5pZ2h0bHktYnVpbGQiKTsKIAogICAgIC8v IEFkZCBwbGF0Zm9ybSBzdHlsZSBjbGFzc2VzIHNvIHRoZSBVSSBjYW4gYmUgdHdlYWtlZCBwZXIt cGxhdGZvcm0uCi0gICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QuYWRkKEluc3BlY3RvckZyb250 ZW5kSG9zdC5wbGF0Zm9ybSgpICsgIi1wbGF0Zm9ybSIpOwotCi0gICAgaWYgKEluc3BlY3RvckZy b250ZW5kSG9zdC5wbGF0Zm9ybSgpID09PSAibWFjIikgewotICAgICAgICB2YXIgdmVyc2lvbk1h dGNoID0gLyBNYWMgT1MgWCAoXGQrKV8oXGQrKS8uZXhlYyhuYXZpZ2F0b3IuYXBwVmVyc2lvbik7 Ci0gICAgICAgIGlmICh2ZXJzaW9uTWF0Y2ggJiYgdmVyc2lvbk1hdGNoWzFdID09IDEwICYmIHZl cnNpb25NYXRjaFsyXSA9PSA4KQotICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3Qu YWRkKCJtb3VudGFpbi1saW9uIik7Ci0gICAgICAgIGVsc2UgaWYgKHZlcnNpb25NYXRjaCAmJiB2 ZXJzaW9uTWF0Y2hbMV0gPT0gMTAgJiYgdmVyc2lvbk1hdGNoWzJdID09IDkpCi0gICAgICAgICAg ICBkb2N1bWVudC5ib2R5LmNsYXNzTGlzdC5hZGQoIm1hdmVyaWNrcyIpOworICAgIFdlYkluc3Bl Y3Rvci5QbGF0Zm9ybSA9IHsKKyAgICAgICAgbmFtZTogSW5zcGVjdG9yRnJvbnRlbmRIb3N0LnBs YXRmb3JtKCksCisgICAgICAgIGNvZGVOYW1lOiAiIiwKKyAgICAgICAgdmVyc2lvbjogeworICAg ICAgICAgICAgYmFzZTogMCwKKyAgICAgICAgICAgIHJlbGVhc2U6IDAsCisgICAgICAgICAgICB0 b1N0cmluZzogZnVuY3Rpb24oKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHJldHVy biB0aGlzLmJhc2UgKyAiLiIgKyB0aGlzLnZlcnNpb247CisgICAgICAgICAgICB9CisgICAgICAg IH0sCisgICAgICAgIHRvU3RyaW5nOiBmdW5jdGlvbigpCisgICAgICAgIHsKKyAgICAgICAgICAg IHJldHVybiB0aGlzLm5hbWU7CisgICAgICAgIH0KKyAgICB9OworCisgICAgdmFyIGlzTGVnYWN5 TWFjT1MgPSBmYWxzZTsKKyAgICB2YXIgb3NWZXJzaW9uTWF0Y2ggPSAvIE1hYyBPUyBYIChcZCsp XyhcZCspLy5leGVjKG5hdmlnYXRvci5hcHBWZXJzaW9uKTsKKyAgICBpZiAob3NWZXJzaW9uTWF0 Y2ggJiYgb3NWZXJzaW9uTWF0Y2hbMV0gPT09ICIxMCIpIHsKKyAgICAgICAgV2ViSW5zcGVjdG9y LlBsYXRmb3JtLnZlcnNpb24uYmFzZSA9IDEwOworICAgICAgICBzd2l0Y2gob3NWZXJzaW9uTWF0 Y2hbMl0pIHsKKyAgICAgICAgICAgIGNhc2UgIjEwIjoKKyAgICAgICAgICAgICAgICBXZWJJbnNw ZWN0b3IuUGxhdGZvcm0uY29kZU5hbWUgPSAieW9zZW1pdGUiOworICAgICAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLnJlbGVhc2UgPSAxMDsKKyAgICAgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgIjkiOgorICAgICAgICAgICAgICAgIFdlYkluc3Bl Y3Rvci5QbGF0Zm9ybS5jb2RlTmFtZSA9ICJtYXZlcmlja3MiOworICAgICAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLnJlbGVhc2UgPSA5OworICAgICAgICAgICAgICAg IGlzTGVnYWN5TWFjT1MgPSB0cnVlOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAg ICAgY2FzZSAiOCI6CisgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLlBsYXRmb3JtLmNvZGVO YW1lID0gIm1vdW50YWluLWxpb24iOworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0 Zm9ybS52ZXJzaW9uLnJlbGVhc2UgPSA4OworICAgICAgICAgICAgICAgIGlzTGVnYWN5TWFjT1Mg PSB0cnVlOworICAgICAgICB9CiAgICAgfQogCisgICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3Qu YWRkKFdlYkluc3BlY3Rvci5QbGF0Zm9ybSArICItcGxhdGZvcm0iKTsKKyAgICBpZiAoV2ViSW5z cGVjdG9yLlBsYXRmb3JtLmNvZGVOYW1lKQorICAgICAgICBkb2N1bWVudC5ib2R5LmNsYXNzTGlz dC5hZGQoV2ViSW5zcGVjdG9yLlBsYXRmb3JtLmNvZGVOYW1lKTsKKyAgICBpZiAoaXNMZWdhY3lN YWNPUykKKyAgICAgICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QuYWRkKCJsZWdhY3kiKTsKKwog ICAgIHRoaXMuZGVidWdnYWJsZVR5cGUgPSBJbnNwZWN0b3JGcm9udGVuZEhvc3QuZGVidWdnYWJs ZVR5cGUoKSA9PT0gIndlYiIgPyBXZWJJbnNwZWN0b3IuRGVidWdnYWJsZVR5cGUuV2ViIDogV2Vi SW5zcGVjdG9yLkRlYnVnZ2FibGVUeXBlLkphdmFTY3JpcHQ7CiAgICAgZG9jdW1lbnQuYm9keS5j bGFzc0xpc3QuYWRkKHRoaXMuZGVidWdnYWJsZVR5cGUpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvQmFja0Fycm93LnN2ZyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9CYWNrQXJyb3cuc3ZnCmluZGV4 IGUxZjU5MGUuLjE4MDUzMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0ltYWdlcy9CYWNrQXJyb3cuc3ZnCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9CYWNrQXJyb3cuc3ZnCkBAIC0xLDUgKzEsNSBAQAogPD94 bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KIDwhLS0gQ29weXJpZ2h0IMKpIDIw MTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLiAtLT4KLTxzdmcgdmVyc2lvbj0iMS4x IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA5IDkiPgot ICAgIDxwYXRoIGQ9Ik0gOSAwIEwgMC40ODQzNzUgNC40ODQzNzUgTCA5IDkgWiIvPgorPHN2ZyB2 ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0i MCAwIDEwIDE2Ij4KKyAgICA8cGF0aCBkPSJNIDMuMjA1NDAwNjQgNy43NTk4MzI4MyBMIDkuMzQ0 OCAxLjYyNDQgTCA3LjczODggMC4wMTc0IEwgLTAuMDAwMiA3Ljc1MTQgTCAwLjAwOTE5OTM3NTkg Ny43NjA4MDUyMyBMIDAuMDAxOCA3Ljc2ODIgTCA3LjczNTggMTUuNTA3MiBMIDkuMzQyOCAxMy45 MDEyIEwgMy4yMDU0MDA2NCA3Ljc1OTgzMjgzIFoiPjwvcGF0aD4KIDwvc3ZnPgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0JhY2tBcnJvd0xl Z2FjeS5zdmcgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvQmFj a0Fycm93TGVnYWN5LnN2ZwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lMWY1 OTBlCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvSW1hZ2VzL0JhY2tBcnJvd0xlZ2FjeS5zdmcKQEAgLTAsMCArMSw1IEBACis8P3htbCB2ZXJz aW9uPSIxLjAiIGVuY29kaW5nPSJ1dGYtOCI/PgorPCEtLSBDb3B5cmlnaHQgwqkgMjAxMyBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuIC0tPgorPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5z PSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDkgOSI+CisgICAgPHBh dGggZD0iTSA5IDAgTCAwLjQ4NDM3NSA0LjQ4NDM3NSBMIDkgOSBaIi8+Cis8L3N2Zz4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9Gb3J3YXJk QXJyb3cuc3ZnIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0Zv cndhcmRBcnJvdy5zdmcKaW5kZXggYzE2YmM2NS4uNjhiOGYxNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0ZvcndhcmRBcnJvdy5zdmcKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0ZvcndhcmRBcnJv dy5zdmcKQEAgLTEsNSArMSw1IEBACiA8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJ1dGYt OCI/PgogPCEtLSBDb3B5cmlnaHQgwqkgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuIC0tPgotPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw L3N2ZyIgdmlld0JveD0iMCAwIDkgOSI+Ci0gICAgPHBhdGggZD0iTSAwIDAgTCA4LjUxNTYyNSA0 LjQ4NDM3NSBMIDAgOSBaIi8+Cis8c3ZnIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cu dzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgMTAgMTYiPgorICAgIDxwYXRoIGQ9Ik0gNi4x MzkyNDkzMyA3Ljc1OTc4MjgzIEwgMC4wMDE4IDEzLjkwMTIgTCAxLjYwODggMTUuNTA3MiBMIDku MzQyOCA3Ljc2ODIgTCA5LjMzNTQ1MDY2IDcuNzYwODU1MjMgTCA5LjM0NDkgNy43NTE0IEwgMS42 MDU5IDAuMDE3NCBMIC0wLjAwMDEgMS42MjQ0IEwgNi4xMzkyNDkzMyA3Ljc1OTc4MjgzIFoiPjwv cGF0aD4KIDwvc3ZnPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvSW1hZ2VzL0ZvcndhcmRBcnJvd0xlZ2FjeS5zdmcgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9JbWFnZXMvRm9yd2FyZEFycm93TGVnYWN5LnN2ZwpuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jMTZiYzY1Ci0tLSAvZGV2L251bGwKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0ZvcndhcmRBcnJvd0xlZ2Fj eS5zdmcKQEAgLTAsMCArMSw1IEBACis8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJ1dGYt OCI/PgorPCEtLSBDb3B5cmlnaHQgwqkgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuIC0tPgorPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw L3N2ZyIgdmlld0JveD0iMCAwIDkgOSI+CisgICAgPHBhdGggZD0iTSAwIDAgTCA4LjUxNTYyNSA0 LjQ4NDM3NSBMIDAgOSBaIi8+Cis8L3N2Zz4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0J1dHRvblRvb2xiYXJJdGVtLmNzcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0J1dHRvblRvb2xiYXJJdGVtLmNzcwpp bmRleCBkNjJhMTg5Li5jZGRlZWIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9CdXR0b25Ub29sYmFySXRlbS5jc3MKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQnV0dG9uVG9vbGJhckl0ZW0uY3NzCkBA IC01OSw2ICs1OSwxMCBAQAogCiAudG9vbGJhciAuaXRlbS5idXR0b24gPiAubGFiZWwgewogICAg IHRleHQtYWxpZ246IGNlbnRlcjsKKyAgICBjb2xvcjogcmdiKDgwLCA4MCwgODApOworfQorCiti b2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnRvb2xiYXIgLml0ZW0uYnV0dG9uID4gLmxhYmVsIHsK ICAgICB0ZXh0LXNoYWRvdzogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjUpIDAgMXB4IDA7CiAgICAg Y29sb3I6IHJnYig2MCwgNjAsIDYwKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmNzcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFy YXRpb25TZWN0aW9uLmNzcwppbmRleCA1YjM2ZmIzLi40ODJlNzhjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9u U2VjdGlvbi5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uY3NzCkBAIC0zMCwzMCArMzAsNDIgQEAKICAg ICBwYWRkaW5nOiA1cHg7CiAKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsKKyAgICBib3Jk ZXItYm90dG9tOiAxcHggc29saWQgcmdiKDIxMCwgMjEwLCAyMTApOwogfQogCi0uc3R5bGUtZGVj bGFyYXRpb24tc2VjdGlvbiArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uIHsKK2JvZHkubWFj LXBsYXRmb3JtLmxlZ2FjeSAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbiB7CisgICAgYm9yZGVy LWJvdHRvbTogbm9uZTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zdHlsZS1kZWNs YXJhdGlvbi1zZWN0aW9uICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24gewogICAgIGJvcmRl ci10b3A6IDFweCBzb2xpZCByZ2IoMjEwLCAyMTAsIDIxMCk7CiB9CiAKIC5zdHlsZS1kZWNsYXJh dGlvbi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAgewogICAgIG1hcmdpbi1ib3R0b206IDE1cHg7CiAK KyAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgcmdiKDIxMCwgMjEwLCAyMTApOworfQorCiti b2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1p bi1ncm91cCB7CiAgICAgYm94LXNoYWRvdzogcmdiYSgwLCAwLCAwLCAwLjMpIDAgMnB4IDJweCAw OwogfQogCiAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3VwICsgLnN0eWxl LWRlY2xhcmF0aW9uLXNlY3Rpb24gewogICAgIG1hcmdpbi10b3A6IDE1cHg7CiAKLSAgICBib3Jk ZXItdG9wOiBub25lOworICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCByZ2IoMjEwLCAyMTAsIDIx MCk7Cit9CiAKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc3R5bGUtZGVjbGFyYXRpb24tc2Vj dGlvbi5sYXN0LWluLWdyb3VwICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24gewogICAgIGJv eC1zaGFkb3c6IHJnYmEoMCwgMCwgMCwgMC4zKSAwIDAgMnB4IDA7CisgICAgYm9yZGVyLXRvcDog bm9uZTsKIH0KIAotLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb246Zmlyc3QtY2hpbGQsCi1kaXY6 bm90KC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uKSArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0 aW9uLAotLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1pbi1ncm91cCArIC5zdHlsZS1k ZWNsYXJhdGlvbi1zZWN0aW9uLmxhc3QtaW4tZ3JvdXAsCi0uc3R5bGUtZGVjbGFyYXRpb24tc2Vj dGlvbi5sYXN0LWluLWdyb3VwICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb246bGFzdC1jaGls ZCB7Citib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb246 Zmlyc3QtY2hpbGQsCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgZGl2Om5vdCguc3R5bGUtZGVj bGFyYXRpb24tc2VjdGlvbikgKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbiwKK2JvZHkubWFj LXBsYXRmb3JtLmxlZ2FjeSAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3Vw ICsgLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ubGFzdC1pbi1ncm91cCwKK2JvZHkubWFjLXBs YXRmb3JtLmxlZ2FjeSAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5sYXN0LWluLWdyb3VwICsg LnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb246bGFzdC1jaGlsZCB7CiAgICAgYm94LXNoYWRvdzog cmdiYSgwLCAwLCAwLCAwLjMpIDAgMXB4IDNweCAxcHg7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGV0YWlsc1NpZGVi YXJQYW5lbC5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9D U1NTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwuY3NzCmluZGV4IDlkZjg4MmIuLjc2ZGYzYTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0 eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLmNzcwpAQCAtNDMs NiArNDMsNyBAQAogCiAuc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSA+IC5jb250 ZW50ID4gLnBzZXVkby1jbGFzc2VzIHsKICAgICBwYWRkaW5nOiAxMHB4OworICAgIGJvcmRlci1i b3R0b206IDFweCBzb2xpZCByZ2IoMTUzLCAxNTMsIDE1Myk7CiAKICAgICBkaXNwbGF5OiAtd2Vi a2l0LWZsZXg7CiAgICAgLXdlYmtpdC1mbGV4LWZsb3c6IHJvdyB3cmFwOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJv d3Nlci5qcwppbmRleCA3ZjU4N2ExLi44YjE1ZWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcwpA QCAtNDksMTIgKzQ5LDIyIEBAIFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlciA9IGZ1bmN0aW9u KGVsZW1lbnQsIGRlbGVnYXRlLCBkaXNhYmxlQmFja0ZvcndhcmQpCiAgICAgICAgIHRoaXMuX2Jh Y2tLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wgfCBX ZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db250cm9sLCBXZWJJbnNwZWN0 b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuTGVmdCwgdGhpcy5fYmFja0J1dHRvbkNsaWNrZWQuYmlu ZCh0aGlzKSk7CiAgICAgICAgIHRoaXMuX2ZvcndhcmRLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0 Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wgfCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1 dC5Nb2RpZmllci5Db250cm9sLCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuUmln aHQsIHRoaXMuX2ZvcndhcmRCdXR0b25DbGlja2VkLmJpbmQodGhpcykpOwogCi0gICAgICAgIHRo aXMuX2JhY2tCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuQnV0dG9uTmF2 aWdhdGlvbkl0ZW0oImJhY2siLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkJhY2sgKCVzKSIpLmZv cm1hdCh0aGlzLl9iYWNrS2V5Ym9hcmRTaG9ydGN1dC5kaXNwbGF5TmFtZSksICJJbWFnZXMvQmFj a0Fycm93LnN2ZyIsIDksIDkpOworICAgICAgICB2YXIgZm9yd2FyZEFycm93LCBiYWNrQXJyb3c7 CisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IuUGxhdGZvcm0ubmFtZSA9PT0gIm1hYyIgJiYgV2Vi SW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24ucmVsZWFzZSA8IDEwKSB7CisgICAgICAgICAgICBm b3J3YXJkQXJyb3cgPSB7c3JjOiAiSW1hZ2VzL0ZvcndhcmRBcnJvd0xlZ2FjeS5zdmciLCB3aWR0 aDogOSwgaGVpZ2h0OiA5fTsKKyAgICAgICAgICAgIGJhY2tBcnJvdyA9IHtzcmM6ICJJbWFnZXMv QmFja0Fycm93TGVnYWN5LnN2ZyIsIHdpZHRoOiA5LCBoZWlnaHQ6IDl9OworICAgICAgICB9Cisg ICAgICAgIGVsc2UgeworICAgICAgICAgICAgZm9yd2FyZEFycm93ID0ge3NyYzogIkltYWdlcy9G b3J3YXJkQXJyb3cuc3ZnIiwgd2lkdGg6IDEwLCBoZWlnaHQ6IDE2fTsKKyAgICAgICAgICAgIGJh Y2tBcnJvdyA9IHtzcmM6ICJJbWFnZXMvQmFja0Fycm93LnN2ZyIsIHdpZHRoOiAxMCwgaGVpZ2h0 OiAxNn07CisgICAgICAgIH0KKworICAgICAgICB0aGlzLl9iYWNrQnV0dG9uTmF2aWdhdGlvbkl0 ZW0gPSBuZXcgV2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVtKCJiYWNrIiwgV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJCYWNrICglcykiKS5mb3JtYXQodGhpcy5fYmFja0tleWJvYXJkU2hv cnRjdXQuZGlzcGxheU5hbWUpLCBiYWNrQXJyb3cuc3JjLCBiYWNrQXJyb3cud2lkdGgsIGJhY2tB cnJvdy5oZWlnaHQpOwogICAgICAgICB0aGlzLl9iYWNrQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWRk RXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xp Y2tlZCwgdGhpcy5fYmFja0J1dHRvbkNsaWNrZWQsIHRoaXMpOwogICAgICAgICB0aGlzLl9iYWNr QnV0dG9uTmF2aWdhdGlvbkl0ZW0uZW5hYmxlZCA9IGZhbHNlOwogICAgICAgICB0aGlzLl9uYXZp Z2F0aW9uQmFyLmFkZE5hdmlnYXRpb25JdGVtKHRoaXMuX2JhY2tCdXR0b25OYXZpZ2F0aW9uSXRl bSk7CiAKLSAgICAgICAgdGhpcy5fZm9yd2FyZEJ1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdl Ykluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbSgiZm9yd2FyZCIsIFdlYkluc3BlY3Rvci5V SVN0cmluZygiRm9yd2FyZCAoJXMpIikuZm9ybWF0KHRoaXMuX2ZvcndhcmRLZXlib2FyZFNob3J0 Y3V0LmRpc3BsYXlOYW1lKSwgIkltYWdlcy9Gb3J3YXJkQXJyb3cuc3ZnIiwgOSwgOSk7CisgICAg ICAgIHRoaXMuX2ZvcndhcmRCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXZWJJbnNwZWN0b3Iu QnV0dG9uTmF2aWdhdGlvbkl0ZW0oImZvcndhcmQiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkZv cndhcmQgKCVzKSIpLmZvcm1hdCh0aGlzLl9mb3J3YXJkS2V5Ym9hcmRTaG9ydGN1dC5kaXNwbGF5 TmFtZSksIGZvcndhcmRBcnJvdy5zcmMsIGZvcndhcmRBcnJvdy53aWR0aCwgZm9yd2FyZEFycm93 LmhlaWdodCk7CiAgICAgICAgIHRoaXMuX2ZvcndhcmRCdXR0b25OYXZpZ2F0aW9uSXRlbS5hZGRF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlj a2VkLCB0aGlzLl9mb3J3YXJkQnV0dG9uQ2xpY2tlZCwgdGhpcyk7CiAgICAgICAgIHRoaXMuX2Zv cndhcmRCdXR0b25OYXZpZ2F0aW9uSXRlbS5lbmFibGVkID0gZmFsc2U7CiAgICAgICAgIHRoaXMu X25hdmlnYXRpb25CYXIuYWRkTmF2aWdhdGlvbkl0ZW0odGhpcy5fZm9yd2FyZEJ1dHRvbk5hdmln YXRpb25JdGVtKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmNzcwppbmRleCAzMTk0YjU5Li5jNGMxZDky IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9E T01UcmVlT3V0bGluZS5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRE9NVHJlZU91dGxpbmUuY3NzCkBAIC00NCwxMCArNDQsMTQgQEAKICAgICBsZWZ0 OiAzcHg7CiAgICAgcmlnaHQ6IDNweDsKIAotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYmEoNTYs IDEyMSwgMjE3LCAwLjEpOworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYmEoMCwgMTI4LCAyNTIs IDAuMSk7CiAgICAgYm9yZGVyLXJhZGl1czogNXB4OwogfQogCitib2R5Lm1hYy1wbGF0Zm9ybS5s ZWdhY3kgLmRvbS10cmVlLW91dGxpbmUgbGkuaG92ZXJlZDpub3QoLnNlbGVjdGVkKSAuc2VsZWN0 aW9uIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2JhKDU2LCAxMjEsIDIxNywgMC4xKTsKK30K KwogLmRvbS10cmVlLW91dGxpbmUgbGkgLnNlbGVjdGlvbiB7CiAgICAgZGlzcGxheTogbm9uZTsK ICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CkBAIC02NSwxMCArNjksMTggQEAKIC5kb20tdHJlZS1v dXRsaW5lIGxpLmVsZW1lbnRzLWRyYWctb3ZlciAuc2VsZWN0aW9uIHsKICAgICBkaXNwbGF5OiBi bG9jazsKICAgICBtYXJnaW4tdG9wOiAtMnB4OworICAgIGJvcmRlci10b3A6IDJweCBzb2xpZCBy Z2IoMCwgMTI4LCAyNTIpOworfQorCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRvbS10cmVl LW91dGxpbmUgbGkuZWxlbWVudHMtZHJhZy1vdmVyIC5zZWxlY3Rpb24gewogICAgIGJvcmRlci10 b3A6IDJweCBzb2xpZCByZ2IoNTYsIDEyMSwgMjE3KTsKIH0KIAogLmRvbS10cmVlLW91dGxpbmU6 Zm9jdXMgbGkuc2VsZWN0ZWQgLnNlbGVjdGlvbiB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdi KDAsIDEyOCwgMjUyKTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kb20tdHJlZS1v dXRsaW5lOmZvY3VzIGxpLnNlbGVjdGVkIC5zZWxlY3Rpb24gewogICAgIGJhY2tncm91bmQtY29s b3I6IHJnYig1NiwgMTIxLCAyMTcpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EYXNoYm9hcmRDb250YWluZXJWaWV3LmNzcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Rhc2hib2FyZENvbnRhaW5l clZpZXcuY3NzCmluZGV4IDI2OTg2ZGEuLjMwNDU5ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Rhc2hib2FyZENvbnRhaW5lclZpZXcuY3Nz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Rhc2hib2Fy ZENvbnRhaW5lclZpZXcuY3NzCkBAIC0yOCwxOSArMjgsMzIgQEAKIAogICAgIHdpZHRoOiAzNzVw eDsKIAotICAgIGJvcmRlcjogMXB4IHNvbGlkIHJnYigxNjMsIDE2MywgMTYzKTsKICAgICBib3Jk ZXItcmFkaXVzOiA0cHg7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDI1MiwgMjUyLCAyNTIp OwogCi0gICAgYm94LXNoYWRvdzogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjQ1KSAwIDFweCAwOwor ICAgIGJveC1zaGFkb3c6IHJnYmEoMCwgMCwgMCwgMC4xNSkgMCAxcHggMCwgaW5zZXQgd2hpdGUg MCAxcHggMDsKIAogICAgIG1hcmdpbjogNHB4IDEwcHg7CiAgICAgb3ZlcmZsb3c6IGhpZGRlbjsK IH0KIAorYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFp bmVyIHsKKyAgICBib3JkZXI6IDFweCBzb2xpZCByZ2IoMTYzLCAxNjMsIDE2Myk7CisgICAgYmFj a2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7CisgICAgYm94LXNoYWRvdzogcmdiYSgyNTUsIDI1 NSwgMjU1LCAwLjQ1KSAwIDBweCAwOworfQorCiBib2R5LndpbmRvdy1pbmFjdGl2ZSAudG9vbGJh ciAuZGFzaGJvYXJkLWNvbnRhaW5lciB7Ci0gICAgYm9yZGVyLWNvbG9yOiByZ2IoMTk2LCAxOTYs IDE5Nik7CisgICAgYm9yZGVyOiAxcHggc29saWQgcmdiKDIyMCwgMjIwLCAyMjApOworICAgIGJh Y2tncm91bmQtY29sb3I6IHJnYigyNDYsIDI0NiwgMjQ2KTsKKyAgICBib3gtc2hhZG93OiBub25l OworfQorCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kud2luZG93LWluYWN0aXZlIC50b29sYmFy IC5kYXNoYm9hcmQtY29udGFpbmVyIHsKKyAgICBib3JkZXI6IDFweCBzb2xpZCByZ2IoMTk2LCAx OTYsIDE5Nik7CiAgICAgYmFja2dyb3VuZC1pbWFnZTogbm9uZTsKICAgICBiYWNrZ3JvdW5kLWNv bG9yOiByZ2IoMjM5LCAyMzksIDIzOSk7CisgICAgYm94LXNoYWRvdzogcmdiYSgyNTUsIDI1NSwg MjU1LCAwLjQ1KSAwIDFweCAwOwogfQogCiAudG9vbGJhci5jb2xsYXBzZWQgLmRhc2hib2FyZC1j b250YWluZXIgewpAQCAtNzgsMTYgKzkxLDI5IEBAIGJvZHkud2luZG93LWluYWN0aXZlIC50b29s YmFyIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKICAgICBsZWZ0OiAwOwogICAgIHJpZ2h0OiAwOwog CisgICAgcGFkZGluZzogMCA1cHg7CisKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjUyLCAy NTIsIDI1Mik7CisgICAgYm94LXNoYWRvdzogaW5zZXQgd2hpdGUgMCAxcHggMDsKKworICAgIC13 ZWJraXQtYW5pbWF0aW9uLWR1cmF0aW9uOiAwLjRzOworfQorCitib2R5LndpbmRvdy1pbmFjdGl2 ZSAudG9vbGJhciAuZGFzaGJvYXJkIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjQ2LCAy NDYsIDI0Nik7CisgICAgYm94LXNoYWRvdzogbm9uZTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0u bGVnYWN5IC50b29sYmFyIC5kYXNoYm9hcmQsCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kud2lu ZG93LWluYWN0aXZlIC50b29sYmFyIC5kYXNoYm9hcmQgewogICAgIGJhY2tncm91bmQtaW1hZ2U6 IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHJnYmEoMCwgMTI4LCAyNTUsIDApLCByZ2JhKDAs IDEyOCwgMjU1LCAwLjA3NSkpLAogICAgICAgICBsaW5lYXItZ3JhZGllbnQodG8gcmlnaHQsIHJn YmEoMCwgMCwgMCwgMC4wOSksIHRyYW5zcGFyZW50LCByZ2JhKDAsIDAsIDAsIDAuMDkpKSwKICAg ICAgICAgbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgcmdiKDI0MCwgMjQ0LCAyNTEpLCByZ2Io MjUwLCAyNTMsIDI1NSkpOwogICAgIGJhY2tncm91bmQtc2l6ZTogMTAwJSA2cHgsIGF1dG8sIGF1 dG87CiAgICAgYmFja2dyb3VuZC1wb3NpdGlvbjogYm90dG9tLCBjZW50ZXIsIGNlbnRlcjsKICAg ICBiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0OwotCi0gICAgcGFkZGluZzogMCA1cHg7Ci0K LSAgICAtd2Via2l0LWFuaW1hdGlvbi1kdXJhdGlvbjogMC40czsKKyAgICBiYWNrZ3JvdW5kLWNv bG9yOiB0cmFuc3BhcmVudDsKKyAgICBib3gtc2hhZG93OiBub25lOwogfQogCiAudG9vbGJhciAu ZGFzaGJvYXJkLnZpc2libGUgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuY3NzCmluZGV4IDM5NTc3YzQuLjlhYzNkZDYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFH cmlkLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9E YXRhR3JpZC5jc3MKQEAgLTc1LDIwICs3NSwyNiBAQAogICAgIHRleHQtYWxpZ246IGxlZnQ7CiAg ICAgdmVydGljYWwtYWxpZ246IG1pZGRsZTsKIAorICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCBy Z2IoMTc5LCAxNzksIDE3OSk7CisgICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHJnYigxODIs IDE4MiwgMTgyKTsKKworICAgIGhlaWdodDogMTVweDsKKyAgICBmb250LXdlaWdodDogbm9ybWFs OworICAgIHBhZGRpbmc6IDAgNHB4OworICAgIHdoaXRlLXNwYWNlOiBub3dyYXA7CisgICAgb3Zl cmZsb3c6IGhpZGRlbjsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kYXRhLWdyaWQg dGggewogICAgIGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHJn YmEoMCwgMCwgMCwgMC4yKSwgcmdiYSgwLCAwLCAwLCAwLjIpKSwgbGluZWFyLWdyYWRpZW50KHRv IGJvdHRvbSwgdHJhbnNwYXJlbnQsIHRyYW5zcGFyZW50KSwKICAgICAgICAgbGluZWFyLWdyYWRp ZW50KHRvIGJvdHRvbSwgd2hpdGUsIHdoaXRlIDI1JSwgcmdiKDI0NCwgMjQ0LCAyNDQpIDUwJSwg cmdiKDIzNiwgMjM2LCAyMzYpIDUwJSwgcmdiKDIzNywgMjM3LCAyMzcpKTsKKwogICAgIGJhY2tn cm91bmQtc2l6ZTogMXB4IDExcHgsIDAgMCwgMTAwJSAxMDAlOwogICAgIGJhY2tncm91bmQtcG9z aXRpb246IGxlZnQgMnB4LCByaWdodCAycHgsIGNlbnRlcjsKICAgICBiYWNrZ3JvdW5kLXJlcGVh dDogbm8tcmVwZWF0OwogCiAgICAgYm94LXNoYWRvdzogaW5zZXQgcmdiYSgyNTUsIDI1NSwgMjU1 LCAwLjMpIDAgLTFweCAwOwogICAgIGJvcmRlci1ib3R0b206IDFweCBzb2xpZCByZ2IoMTgyLCAx ODIsIDE4Mik7Ci0KLSAgICBoZWlnaHQ6IDE1cHg7Ci0gICAgZm9udC13ZWlnaHQ6IG5vcm1hbDsK LSAgICBwYWRkaW5nOiAwIDRweDsKLSAgICB3aGl0ZS1zcGFjZTogbm93cmFwOwotICAgIG92ZXJm bG93OiBoaWRkZW47CiB9CiAKIC5kYXRhLWdyaWQgdGg6Zmlyc3QtY2hpbGQgewpAQCAtMzEzLDE1 ICszMTksMjMgQEAgYm9keS53aW5kb3ctaW5hY3RpdmUgLmRhdGEtZ3JpZCB0aC5zb3J0LWRlc2Nl bmRpbmcgewogfQogCiAuZGF0YS1ncmlkIHRyLnNlbGVjdGVkIHsKLSAgICBiYWNrZ3JvdW5kLWNv bG9yOiByZ2IoMjEyLCAyMTIsIDIxMikgIWltcG9ydGFudDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9y OiByZ2IoMTg1LCAxODQsIDE4NSkgIWltcG9ydGFudDsKICAgICBjb2xvcjogaW5oZXJpdCAhaW1w b3J0YW50OwogfQogCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRhdGEtZ3JpZCB0ci5zZWxl Y3RlZCB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDIxMiwgMjEyLCAyMTIpICFpbXBvcnRh bnQ7Cit9CisKIC5kYXRhLWdyaWQ6Zm9jdXMgdHIuc2VsZWN0ZWQgewotICAgIGJhY2tncm91bmQt Y29sb3I6IHJnYig1NiwgMTIxLCAyMTcpICFpbXBvcnRhbnQ7CisgICAgYmFja2dyb3VuZC1jb2xv cjogcmdiKDAsIDEyOCwgMjUyKSAhaW1wb3J0YW50OwogICAgIGNvbG9yOiB3aGl0ZSAhaW1wb3J0 YW50OwogfQogCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRhdGEtZ3JpZDpmb2N1cyB0ci5z ZWxlY3RlZCB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDU2LCAxMjEsIDIxNykgIWltcG9y dGFudDsKK30KKwogLmRhdGEtZ3JpZCB0cjpub3QoLnBhcmVudCkgdGQuZGlzY2xvc3VyZSB7CiAg ICAgdGV4dC1pbmRlbnQ6IDEwcHg7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbi5jc3MgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbi5jc3MKaW5kZXggMjNj NjAwNS4uOWM5MWZkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb24uY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uLmNzcwpAQCAtMjQsMTAgKzI0LDMz IEBACiAgKi8KIAogLmRldGFpbHMtc2VjdGlvbiB7CisgICAgZm9udC1zaXplOiAxMHB4OworICAg IGJhY2tncm91bmQtY29sb3I6IHJnYigyNDIsIDI0MiwgMjQyKTsKKyAgICBib3JkZXItYm90dG9t OiAxcHggc29saWQgcmdiKDE1MywgMTUzLCAxNTMpOworfQorCitib2R5Lm1hYy1wbGF0Zm9ybS5s ZWdhY3kgLmRldGFpbHMtc2VjdGlvbiB7CiAgICAgbWFyZ2luLXRvcDogLTFweDsKICAgICBtYXJn aW4tYm90dG9tOiAtMXB4OwogCi0gICAgZm9udC1zaXplOiAxMHB4OworICAgIGJvcmRlci1ib3R0 b206IG5vbmU7CisgICAgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7Cit9CisKKy5kZXRh aWxzLXNlY3Rpb24gLmRldGFpbHMtc2VjdGlvbiB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdi KDI1NSwgMjU1LCAyNTUpOworfQorCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMt c2VjdGlvbiAuZGV0YWlscy1zZWN0aW9uIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3Bh cmVudDsKK30KKworLmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0aW9uOmxhc3QtY2hpbGQg eworICAgIGJvcmRlci1ib3R0b206IG5vbmU7Cit9CisKKy5kZXRhaWxzLXNlY3Rpb24gLmRldGFp bHMtc2VjdGlvbjpmaXJzdC1jaGlsZCB7CisgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIHJnYigx NTMsIDE1MywgMTUzKTsKIH0KIAogLmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXIgewpAQCAtMzUs MTMgKzU4LDggQEAKICAgICB0b3A6IC0xcHg7CiAgICAgaGVpZ2h0OiAyM3B4OwogCi0gICAgYm9y ZGVyLXRvcDogMXB4IHNvbGlkIHJnYigxNTMsIDE1MywgMTUzKTsKLSAgICBib3JkZXItYm90dG9t OiAxcHggc29saWQgcmdiKDE1MywgMTUzLCAxNTMpOwotICAgIGJveC1zaGFkb3c6IGluc2V0IHJn YmEoMjU1LCAyNTUsIDI1NSwgMC4yKSAwIDFweCAwOwotICAgIGJhY2tncm91bmQtaW1hZ2U6IGxp bmVhci1ncmFkaWVudCh0byBib3R0b20sIHJnYigyMzgsIDI0MCwgMjQ0KSwgcmdiKDIyNCwgMjI2 LCAyMzApKTsKLQorICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyNDIsIDI0MiwgMjQyKTsKICAg ICBjb2xvcjogcmdiKDU3LCA1NywgNTcpOwotICAgIHRleHQtc2hhZG93OiByZ2JhKDI1NSwgMjU1 LCAyNTUsIDAuNSkgMCAxcHggMDsKIAogICAgIHdoaXRlLXNwYWNlOiBub3dyYXA7CiAgICAgb3Zl cmZsb3c6IGhpZGRlbjsKQEAgLTU2LDEzICs3NCw0NCBAQAogICAgIHotaW5kZXg6IDIwMDsKIH0K IAotLmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0aW9uID4gLmhlYWRlciB7Ci0gICAgYmFj a2dyb3VuZC1pbWFnZTogbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgcmdiKDI1MCwgMjUwLCAy NTApLCByZ2IoMjQwLCAyNDAsIDI0MCkpOworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kZXRh aWxzLXNlY3Rpb24gPiAuaGVhZGVyIHsKKyAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgcmdi KDE1MywgMTUzLCAxNTMpOworICAgIGJveC1zaGFkb3c6IGluc2V0IHJnYmEoMjU1LCAyNTUsIDI1 NSwgMC4yKSAwIDFweCAwOworICAgIGJhY2tncm91bmQtY29sb3I6IHRyYW5zcGFyZW50OworICAg IGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHJnYigyMzgsIDI0 MCwgMjQ0KSwgcmdiKDIyNCwgMjI2LCAyMzApKTsKIAorICAgIGJvcmRlci10b3A6IDFweCBzb2xp ZCByZ2IoMTUzLCAxNTMsIDE1Myk7CisKKyAgICB0ZXh0LXNoYWRvdzogcmdiYSgyNTUsIDI1NSwg MjU1LCAwLjUpIDAgMXB4IDA7Cit9CisKKy5kZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMtc2VjdGlv biA+IC5oZWFkZXIgewogICAgIHRvcDogMjFweDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2Io MjU1LCAyNTUsIDI1NSk7CisKKyAgICBib3gtc2hhZG93OiByZ2JhKDAsIDAsIDAsIDAuMSkgMCAx cHggMDsKIAogICAgIC8qIEVuc3VyZSB0aGVzZSBoZWFkZXJzIGFyZSBkaXNwbGF5ZWQgYmVsb3cg dGhlIHBhcmVudCBoZWFkZXIgYnV0IGFib3ZlIHNjcm9sbGJhcnMuICovCiAgICAgei1pbmRleDog MTAwOworCit9CisKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZGV0YWlscy1zZWN0aW9uIC5k ZXRhaWxzLXNlY3Rpb24gPiAuaGVhZGVyIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3Bh cmVudDsKKyAgICBiYWNrZ3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCBy Z2IoMjUwLCAyNTAsIDI1MCksIHJnYigyNDAsIDI0MCwgMjQwKSk7CisgICAgYm94LXNoYWRvdzog bm9uZTsKK30KKworLmRldGFpbHMtc2VjdGlvbiAuZGV0YWlscy1zZWN0aW9uLmNvbGxhc3BzZWQg PiAuaGVhZGVyIHsKKyAgICBib3gtc2hhZG93OiBub25lOworfQorCisuZGV0YWlscy1zZWN0aW9u LmNvbXB1dGVkLXN0eWxlLXByb3BlcnRpZXM6bm90KC5jb2xsYXBzZWQpID4gLmhlYWRlciB7Cisg ICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDI1NSwgMjU1LCAyNTUpOworfQorCitib2R5Lm1hYy1w bGF0Zm9ybS5sZWdhY3kgLmRldGFpbHMtc2VjdGlvbi5jb21wdXRlZC1zdHlsZS1wcm9wZXJ0aWVz Om5vdCguY29sbGFwc2VkKSA+IC5oZWFkZXIgeworICAgIGJhY2tncm91bmQtY29sb3I6IHRyYW5z cGFyZW50OwogfQogCiAuZGV0YWlscy1zZWN0aW9uID4gLmhlYWRlcjo6YmVmb3JlIHsKQEAgLTEz Myw5ICsxODIsMjIgQEAKIAogLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwIHsK ICAgICBkaXNwbGF5OiB0YWJsZS1yb3ctZ3JvdXA7CisgICAgYm9yZGVyLWJvdHRvbTogMXB4IHNv bGlkIHJnYigxNTMsIDE1MywgMTUzKTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5k ZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cCB7CisgICAgYm9yZGVyLWJvdHRvbTog bm9uZTsKK30KKworLmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwOmxhc3QtY2hp bGQgeworICAgIGJvcmRlci1ib3R0b206IG5vbmU7CiB9CiAKIC5kZXRhaWxzLXNlY3Rpb24gPiAu Y29udGVudCA+IC5ncm91cDpudGgtY2hpbGQoZXZlbikgeworICAgIGJhY2tncm91bmQtY29sb3I6 IHJnYigyMzMsIDIzMywgMjMzKTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5kZXRh aWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDpudGgtY2hpbGQoZXZlbikgewogICAgIGJh Y2tncm91bmQtY29sb3I6IHJnYigyMjIsIDIyMiwgMjIyKTsKIH0KIApAQCAtMTQ0LDEwICsyMDYs MTAgQEAKICAgICBib3JkZXItdG9wOiAxcHggc29saWQgcmdiKDE1MywgMTUzLCAxNTMpOwogfQog Ci0uZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bnRoLWNoaWxkKGV2ZW4pID4g LnJvdzpub3QoLnNpbXBsZSk6bGFzdC1jaGlsZCwKLS5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVu dCA+IC5ncm91cDpsYXN0LWNoaWxkID4gLnJvdzpub3QoLnNpbXBsZSk6bGFzdC1jaGlsZCwKLS5k ZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDpudGgtY2hpbGQoZXZlbikgPiAucm93 LnNpbXBsZTpsYXN0LWNoaWxkID4gKiwKLS5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5n cm91cDpsYXN0LWNoaWxkID4gLnJvdy5zaW1wbGU6bGFzdC1jaGlsZCA+ICogeworYm9keS5tYWMt cGxhdGZvcm0ubGVnYWN5IC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDpudGgt Y2hpbGQoZXZlbikgPiAucm93Om5vdCguc2ltcGxlKTpsYXN0LWNoaWxkLAorYm9keS5tYWMtcGxh dGZvcm0ubGVnYWN5IC5kZXRhaWxzLXNlY3Rpb24gPiAuY29udGVudCA+IC5ncm91cDpsYXN0LWNo aWxkID4gLnJvdzpub3QoLnNpbXBsZSk6bGFzdC1jaGlsZCwKK2JvZHkubWFjLXBsYXRmb3JtLmxl Z2FjeSAuZGV0YWlscy1zZWN0aW9uID4gLmNvbnRlbnQgPiAuZ3JvdXA6bnRoLWNoaWxkKGV2ZW4p ID4gLnJvdy5zaW1wbGU6bGFzdC1jaGlsZCA+ICosCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kg LmRldGFpbHMtc2VjdGlvbiA+IC5jb250ZW50ID4gLmdyb3VwOmxhc3QtY2hpbGQgPiAucm93LnNp bXBsZTpsYXN0LWNoaWxkID4gKiB7CiAgICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHJnYigx NTMsIDE1MywgMTUzKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRmlsdGVyQmFyLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0ZpbHRlckJhci5jc3MKaW5kZXggZDg5ZjI2OC4uYWI2MWNlOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmls dGVyQmFyLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9GaWx0ZXJCYXIuY3NzCkBAIC00Myw3ICs0Myw3IEBACiAgICAgLXdlYmtpdC1hcHBlYXJhbmNl OiBub25lOwogCiAgICAgYm9yZGVyOiAxcHggc29saWQgcmdiYSgwLCAwLCAwLCAwLjM1KTsKLSAg ICBib3JkZXItcmFkaXVzOiAxMHB4OworICAgIGJvcmRlci1yYWRpdXM6IDNweDsKICAgICBiYWNr Z3JvdW5kLWNvbG9yOiByZ2JhKDI1NSwgMjU1LCAyNTUsIDAuMik7CiAgICAgYm94LXNoYWRvdzog aW5zZXQgcmdiYSgwLCAwLCAwLCAwLjEpIDAgMXB4IDA7CiAgICAgYmFja2dyb3VuZC1jbGlwOiBw YWRkaW5nLWJveDsKQEAgLTUzLDYgKzUzLDEwIEBACiAgICAgdHJhbnNpdGlvbjogYmFja2dyb3Vu ZC1jb2xvciAyMDBtcyBlYXNlLWluLW91dDsKIH0KIAorYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5 IC5maWx0ZXItYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0geworICAgIGJvcmRlci1yYWRpdXM6 IDEwcHg7Cit9CisKIC5maWx0ZXItYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06Oi13ZWJraXQt aW5wdXQtcGxhY2Vob2xkZXIgewogICAgIGNvbG9yOiByZ2JhKDAsIDAsIDAsIDAuMzUpOwogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmlu ZEJhbm5lci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Zp bmRCYW5uZXIuanMKaW5kZXggZDY3NmFiYS4uZGEzZjI5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmpzCkBAIC0z MjYsOCArMzI2LDE3IEBAIFdlYkluc3BlY3Rvci5GaW5kQmFubmVyLnByb3RvdHlwZSA9IHsKICAg ICAgICAgc3BlY2lmaWNhdGlvbnNbIm5vcm1hbCJdID0ge2ZpbGxDb2xvcjogWzgxLCA4MSwgODFd fTsKICAgICAgICAgc3BlY2lmaWNhdGlvbnNbIm5vcm1hbC1hY3RpdmUiXSA9IHtmaWxsQ29sb3I6 IFszNywgMzcsIDM3XX07CiAKLSAgICAgICAgZ2VuZXJhdGVDb2xvcmVkSW1hZ2VzRm9yQ1NTKCJJ bWFnZXMvQmFja0Fycm93LnN2ZyIsIHNwZWNpZmljYXRpb25zLCA3LCA3LCAiZmluZC1iYW5uZXIt cHJldmlvdXMtYXJyb3ctIik7Ci0gICAgICAgIGdlbmVyYXRlQ29sb3JlZEltYWdlc0ZvckNTUygi SW1hZ2VzL0ZvcndhcmRBcnJvdy5zdmciLCBzcGVjaWZpY2F0aW9ucywgNywgNywgImZpbmQtYmFu bmVyLW5leHQtYXJyb3ctIik7CisgICAgICAgIHZhciBmb3J3YXJkQXJyb3csIGJhY2tBcnJvdzsK KyAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5QbGF0Zm9ybS5uYW1lID09PSAibWFjIiAmJiBXZWJJ bnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5yZWxlYXNlIDwgMTApIHsKKyAgICAgICAgICAgIGZv cndhcmRBcnJvdyA9ICJJbWFnZXMvRm9yd2FyZEFycm93TGVnYWN5LnN2ZyI7CisgICAgICAgICAg ICBiYWNrQXJyb3cgPSAiSW1hZ2VzL0JhY2tBcnJvd0xlZ2FjeS5zdmciOworICAgICAgICB9IGVs c2UgeworICAgICAgICAgICAgZm9yd2FyZEFycm93ID0gIkltYWdlcy9Gb3J3YXJkQXJyb3cuc3Zn IjsKKyAgICAgICAgICAgIGJhY2tBcnJvdyA9ICJJbWFnZXMvQmFja0Fycm93LnN2ZyI7CisgICAg ICAgIH0KKworICAgICAgICBnZW5lcmF0ZUNvbG9yZWRJbWFnZXNGb3JDU1MoYmFja0Fycm93LCBz cGVjaWZpY2F0aW9ucywgNywgNywgImZpbmQtYmFubmVyLXByZXZpb3VzLWFycm93LSIpOworICAg ICAgICBnZW5lcmF0ZUNvbG9yZWRJbWFnZXNGb3JDU1MoZm9yd2FyZEFycm93LCBzcGVjaWZpY2F0 aW9ucywgNywgNywgImZpbmQtYmFubmVyLW5leHQtYXJyb3ctIik7CiAgICAgfQogfTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdh dGlvblNpZGViYXJQYW5lbC5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmNzcwppbmRleCA3YWNlMjFhLi45MTZhNDBi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9O YXZpZ2F0aW9uU2lkZWJhclBhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmNzcwpAQCAtMjEzLDE5ICsy MTMsMzQgQEAKIC5uYXZpZ2F0aW9uLXNpZGViYXItcGFuZWwtY29udGVudC10cmVlLW91dGxpbmUg Lml0ZW0uc2VsZWN0ZWQgewogICAgIGNvbG9yOiB3aGl0ZTsKIAorICAgIGJhY2tncm91bmQtY29s b3I6IHJnYigxODUsIDE4NCwgMTg1KTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5u YXZpZ2F0aW9uLXNpZGViYXItcGFuZWwtY29udGVudC10cmVlLW91dGxpbmUgLml0ZW0uc2VsZWN0 ZWQgewogICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCByZ2IoMTYyLCAxNzcsIDIwMSk7CiAKKyAg ICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsKICAgICBiYWNrZ3JvdW5kLWltYWdlOiBs aW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2IoMTc1LCAxOTAsIDIxMyksIHJnYigxMzAsIDE1 MSwgMTgyKSk7CiAgICAgYmFja2dyb3VuZC1vcmlnaW46IHBhZGRpbmc7CiAgICAgYmFja2dyb3Vu ZC1jbGlwOiBwYWRkaW5nOwogfQogCiAubmF2aWdhdGlvbi1zaWRlYmFyLXBhbmVsLWNvbnRlbnQt dHJlZS1vdXRsaW5lOmZvY3VzIC5pdGVtLnNlbGVjdGVkIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9y OiByZ2IoMCwgMTI4LCAyNTIpOworfQorCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLm5hdmln YXRpb24tc2lkZWJhci1wYW5lbC1jb250ZW50LXRyZWUtb3V0bGluZTpmb2N1cyAuaXRlbS5zZWxl Y3RlZCB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7CiAgICAgYm9yZGVyLXRv cDogMXB4IHNvbGlkIHJnYigxNDgsIDE3NCwgMTkzKTsKICAgICBiYWNrZ3JvdW5kLWltYWdlOiBs aW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2IoMTU0LCAxODAsIDIwMyksIHJnYigxMTIsIDEz OSwgMTc2KSk7CiB9CiAKIGJvZHkud2luZG93LWluYWN0aXZlIC5uYXZpZ2F0aW9uLXNpZGViYXIt cGFuZWwtY29udGVudC10cmVlLW91dGxpbmUgLml0ZW0uc2VsZWN0ZWQgeworICAgIGJhY2tncm91 bmQtY29sb3I6IHJnYigyMTIsIDIxMiwgMjEyKTsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVn YWN5LndpbmRvdy1pbmFjdGl2ZSAubmF2aWdhdGlvbi1zaWRlYmFyLXBhbmVsLWNvbnRlbnQtdHJl ZS1vdXRsaW5lIC5pdGVtLnNlbGVjdGVkIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3Bh cmVudDsKICAgICBib3JkZXItdG9wOiAxcHggc29saWQgcmdiKDE2OCwgMTY4LCAxNjgpOwogICAg IGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHJnYigxOTQsIDE5 NCwgMTk0KSwgcmdiKDE1OCwgMTU4LCAxNTgpKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JhZGlvQnV0dG9uTmF2aWdhdGlvbkl0ZW0u Y3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmFkaW9CdXR0 b25OYXZpZ2F0aW9uSXRlbS5jc3MKaW5kZXggNTFlMDRmNC4uMjIxOTk5MCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmFkaW9CdXR0b25OYXZp Z2F0aW9uSXRlbS5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvUmFkaW9CdXR0b25OYXZpZ2F0aW9uSXRlbS5jc3MKQEAgLTMyLDExICszMiwxNiBAQAog fQogCiAubmF2aWdhdGlvbi1iYXIgLml0ZW0ucmFkaW8uYnV0dG9uLnRleHQtb25seS5zZWxlY3Rl ZCB7CisgICAgY29sb3I6IHJnYig1MiwgMTQxLCAyMjApOworICAgIGZvbnQtd2VpZ2h0OiBib2xk OworfQorCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLm5hdmlnYXRpb24tYmFyIC5pdGVtLnJh ZGlvLmJ1dHRvbi50ZXh0LW9ubHkuc2VsZWN0ZWQgeworICAgIGNvbG9yOiByZ2IoMCwgMCwgMCk7 CisKICAgICBiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0OwogICAgIGJhY2tncm91bmQtaW1h Z2U6IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHJnYmEoMCwgMCwgMCwgMC4xNSksIHJnYmEo MCwgMCwgMCwgMC4wOSkgMTIlLCByZ2JhKDAsIDAsIDAsIDAuMDYpIDEyJSwgdHJhbnNwYXJlbnQp LCBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2JhKDAsIDAsIDAsIDAuNDUpLCB0cmFuc3Bh cmVudCksCiAgICAgICAgIGxpbmVhci1ncmFkaWVudCh0byBib3R0b20sIHJnYmEoMCwgMCwgMCwg MC40NSksIHRyYW5zcGFyZW50KTsKICAgICBiYWNrZ3JvdW5kLXNpemU6IDEwMCUgMTAwJSwgMXB4 IDEwMCUsIDFweCAxMDAlOwogICAgIGJhY2tncm91bmQtcG9zaXRpb246IGxlZnQgdG9wLCBsZWZ0 IHRvcCwgcmlnaHQgdG9wOwotCi0gICAgZm9udC13ZWlnaHQ6IGJvbGQ7CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SdWxlc1N0eWxlRGV0 YWlsc1BhbmVsLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1J1bGVzU3R5bGVEZXRhaWxzUGFuZWwuY3NzCmluZGV4IDgxMWIwNTMuLjIyMDY1NmIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1J1bGVzU3R5 bGVEZXRhaWxzUGFuZWwuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1J1bGVzU3R5bGVEZXRhaWxzUGFuZWwuY3NzCkBAIC0zNiw2ICszNiwxMSBAQAog CiAuc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSAucnVsZXMgLmxhYmVsICsgLnN0 eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24gewogICAgIG1hcmdpbi10b3A6IDVweDsKKyAgICBib3Jk ZXItdG9wOiAxcHggc29saWQgcmdiKDIxMCwgMjEwLCAyMTApOworfQorCitib2R5Lm1hYy1wbGF0 Zm9ybS5sZWdhY3kgLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnJ1bGVzIC5s YWJlbCArIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uIHsKKyAgICBib3JkZXItdG9wOiBub25l OwogfQogCiAuc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSAucnVsZXMgLm5ldy1y dWxlIHsKQEAgLTQzLDcgKzQ4LDYgQEAKICAgICBmb250LXdlaWdodDogYm9sZDsKIAogICAgIGNv bG9yOiBibGFjazsKLSAgICB0ZXh0LXNoYWRvdzogd2hpdGUgMCAxcHggMDsKIAogICAgIHBhZGRp bmc6IDVweCAxMHB4OwogCkBAIC01Myw2ICs1NywxOSBAQAogICAgIG9wYWNpdHk6IDAuNTsKIH0K IAorYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3Nz LXN0eWxlIC5ydWxlcyAubmV3LXJ1bGUgeworICAgIHRleHQtc2hhZG93OiB3aGl0ZSAwIDFweCAw OworICAgIGJvcmRlci1ib3R0b206IG5vbmU7Cit9CisKKy5zaWRlYmFyID4gLnBhbmVsLmRldGFp bHMuY3NzLXN0eWxlIC5ydWxlcyAubmV3LXJ1bGUgKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlv biB7CisgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIHJnYigyMTAsIDIxMCwgMjEwKTsKK30KKwor Ym9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0 eWxlIC5ydWxlcyAubmV3LXJ1bGUgKyAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbiB7CisgICAg Ym9yZGVyLXRvcDogbm9uZTsKK30KKwogLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5 bGUgLnJ1bGVzIC5uZXctcnVsZSBpbWcgewogICAgIGNvbnRlbnQ6IHVybCguLi9JbWFnZXMvUGx1 cy5zdmcpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9TY29wZUJhci5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9TY29wZUJhci5jc3MKaW5kZXggYTE3ODlkNi4uM2M3MDU0NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVCYXIuY3NzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Njb3BlQmFyLmNz cwpAQCAtMzMsNyArMzMsNiBAQAogICAgIG1hcmdpbjogMCAycHg7CiAgICAgcGFkZGluZzogMCA4 cHggM3B4OwogICAgIGZvbnQtc2l6ZTogMTFweDsKLSAgICBmb250LXdlaWdodDogYm9sZDsKICAg ICBsaW5lLWhlaWdodDogMTFweDsKICAgICBjb2xvcjogcmdiKDQ2LCA0NiwgNDYpOwogICAgIGJh Y2tncm91bmQtY29sb3I6IHRyYW5zcGFyZW50OwpAQCAtNDUsNiArNDQsMTAgQEAKICAgICB0cmFu c2l0aW9uLXByb3BlcnR5OiBiYWNrZ3JvdW5kLWNvbG9yLCBib3JkZXItY29sb3I7CiB9CiAKK2Jv ZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc2NvcGUtYmFyID4gbGkgeworICAgIGZvbnQtd2VpZ2h0 OiBib2xkOworfQorCiAuc2NvcGUtYmFyID4gbGkuc2VsZWN0ZWQsCiAuc2NvcGUtYmFyID4gbGk6 YWN0aXZlIHsKICAgICB0cmFuc2l0aW9uLWR1cmF0aW9uOiA3NW1zOwpAQCAtNTUsNiArNTgsMTMg QEAKIH0KIAogLnNjb3BlLWJhciA+IGxpLnNlbGVjdGVkIHsKKyAgICBjb2xvcjogcmdiKDUyLCAx NDEsIDIyMCk7CisgICAgYm9yZGVyLWNvbG9yOiByZ2JhKDUyLCAxNDEsIDIyMCwgMSk7CisgICAg Zm9udC13ZWlnaHQ6IGJvbGQ7Cit9CisKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc2NvcGUt YmFyID4gbGkuc2VsZWN0ZWQgeworICAgIGNvbG9yOiBpbmhlcml0OwogICAgIGJhY2tncm91bmQt Y29sb3I6IHJnYmEoMCwgMCwgMCwgMC4wNik7CiAgICAgYm9yZGVyLWNvbG9yOiByZ2JhKDAsIDAs IDAsIDAuMzApOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU2VhcmNoQmFyLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NlYXJjaEJhci5jc3MKaW5kZXggNzI3NWU0Yy4uMTYwNWVlNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNoQmFy LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZWFy Y2hCYXIuY3NzCkBAIC0zMSw3ICszMSw3IEBACiAgICAgLXdlYmtpdC1hcHBlYXJhbmNlOiBub25l OwogCiAgICAgYm9yZGVyOiAxcHggc29saWQgcmdiYSgwLCAwLCAwLCAwLjM1KTsKLSAgICBib3Jk ZXItcmFkaXVzOiAxMHB4OworICAgIGJvcmRlci1yYWRpdXM6IDNweDsKICAgICBiYWNrZ3JvdW5k LWNvbG9yOiByZ2JhKDI1NSwgMjU1LCAyNTUsIDAuMik7CiAgICAgYm94LXNoYWRvdzogaW5zZXQg cmdiYSgwLCAwLCAwLCAwLjEpIDAgMXB4IDA7CiAgICAgYmFja2dyb3VuZC1jbGlwOiBwYWRkaW5n LWJveDsKQEAgLTQxLDYgKzQxLDEwIEBACiAgICAgdHJhbnNpdGlvbjogYmFja2dyb3VuZC1jb2xv ciAyMDBtcyBlYXNlLWluLW91dDsKIH0KIAorYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zZWFy Y2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0geworICAgIGJvcmRlci1yYWRpdXM6IDEwcHg7 Cit9CisKIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06Oi13ZWJraXQtaW5wdXQt cGxhY2Vob2xkZXIgewogICAgIGNvbG9yOiByZ2JhKDAsIDAsIDAsIDAuMzUpOwogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2lkZWJhci5j c3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TaWRlYmFyLmNz cwppbmRleCAzYTFmNzUyLi44NTZmYTNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9TaWRlYmFyLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TaWRlYmFyLmNzcwpAQCAtMjYsNiArMjYsMTAgQEAK IC5zaWRlYmFyIHsKICAgICBwb3NpdGlvbjogcmVsYXRpdmU7CiAKKyAgICBiYWNrZ3JvdW5kLWNv bG9yOiByZ2IoMjQyLCAyNDIsIDI0Mik7Cit9CisKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAu c2lkZWJhciB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDIyNywgMjMxLCAyMzUpOwogfQog CkBAIC0zNCw3ICszOCw3IEBACiAgICAgYm9yZGVyOiBub25lICFpbXBvcnRhbnQ7CiB9CiAKLWJv ZHkud2luZG93LWluYWN0aXZlIC5zaWRlYmFyIHsKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeS53 aW5kb3ctaW5hY3RpdmUgLnNpZGViYXIgewogICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyMzEs IDIzMSwgMjMxKTsKIH0KIApAQCAtODgsNiArOTIsOSBAQCBib2R5LndpbmRvdy1pbmFjdGl2ZSAu c2lkZWJhciB7CiB9CiAKIC5zaWRlYmFyLnJpZ2h0IHsKLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiBy Z2IoMjMxLCAyMzEsIDIzMSk7CiAgICAgYm9yZGVyLWxlZnQ6IDFweCBzb2xpZCByZ2IoMTUzLCAx NTMsIDE1Myk7CiB9CisKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc2lkZWJhci5yaWdodCB7 CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDIzMSwgMjMxLCAyMzEpOworfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVTaWRl YmFyUGFuZWwuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv VGltZWxpbmVTaWRlYmFyUGFuZWwuY3NzCmluZGV4IGU4Yjc4MGYuLmMzYmM1NDYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lU2lk ZWJhclBhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5jc3MKQEAgLTk1LDEwICs5NSw4IEBACiAgICAgaGVp Z2h0OiAyMnB4OwogCiAgICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHJnYigxNzksIDE3OSwg MTc5KTsKLSAgICBiYWNrZ3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCBy Z2IoMjM4LCAyNDAsIDI0NCksIHJnYigyMjQsIDIyNiwgMjMwKSk7Ci0KKyAgICBiYWNrZ3JvdW5k LWNvbG9yOiByZ2IoMjQyLCAyNDIsIDI0Mik7CiAgICAgY29sb3I6IHJnYig1NywgNTcsIDU3KTsK LSAgICB0ZXh0LXNoYWRvdzogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjUpIDAgMXB4IDA7CiAKICAg ICB3aGl0ZS1zcGFjZTogbm93cmFwOwogICAgIG92ZXJmbG93OiBoaWRkZW47CkBAIC0xMTIsNiAr MTEwLDEyIEBACiAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKIH0KIAorYm9keS5tYWMtcGxhdGZvcm0u bGVnYWN5IC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24udGltZWxpbmUgPiAudGl0bGUtYmFy IHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsKKyAgICBiYWNrZ3JvdW5kLWlt YWdlOiBsaW5lYXItZ3JhZGllbnQodG8gYm90dG9tLCByZ2IoMjM4LCAyNDAsIDI0NCksIHJnYigy MjQsIDIyNiwgMjMwKSk7CisgICAgdGV4dC1zaGFkb3c6IHJnYmEoMjU1LCAyNTUsIDI1NSwgMC41 KSAwIDFweCAwOworfQorCiAuc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnRpbWVsaW5lID4g LnRpdGxlLWJhci50aW1lbGluZXMgewogICAgIHRvcDogMjJweDsKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Rvb2xiYXIuY3NzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVG9vbGJhci5jc3MKaW5kZXgg NTVkNzNkYi4uNDBmZTBiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVG9vbGJhci5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVG9vbGJhci5jc3MKQEAgLTU5LDggKzU5LDcgQEAgYm9keTpub3Qo Lm1hYy1wbGF0Zm9ybSkgLnRvb2xiYXIgewogICAgIGJveC1zaGFkb3c6IGluc2V0IHJnYigyNTIs IDI1MiwgMjUyKSAwIDFweCAwOwogfQogCi1ib2R5LmRvY2tlZC5tYWMtcGxhdGZvcm0ubW91bnRh aW4tbGlvbiAudG9vbGJhciwKLWJvZHkuZG9ja2VkLm1hYy1wbGF0Zm9ybS5tYXZlcmlja3MgLnRv b2xiYXIgeworYm9keS5kb2NrZWQubWFjLXBsYXRmb3JtLmxlZ2FjeSAudG9vbGJhciB7CiAgICAg YmFja2dyb3VuZC1pbWFnZTogbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgcmdiKDIxNiwgMjE2 LCAyMTYpLCByZ2IoMTkwLCAxOTAsIDE5MCkpOwogICAgIGJveC1zaGFkb3c6IGluc2V0IHJnYmEo MjU1LCAyNTUsIDI1NSwgMC4xKSAwIDFweCAwLCBpbnNldCByZ2JhKDAsIDAsIDAsIDAuMDIpIDAg LTFweCAwOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1dlYkluc3BlY3Rv clVJLnZjeHByb2ovV2ViSW5zcGVjdG9yVUkudmN4cHJvaiBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qL1dlYkluc3BlY3RvclVJLnZjeHByb2oKaW5kZXggNTVi OWI5ZS4uOGMxMjNmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1dlYkluc3Bl Y3RvclVJLnZjeHByb2ovV2ViSW5zcGVjdG9yVUkudmN4cHJvagorKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvV2ViSW5zcGVjdG9yVUkudmN4cHJvai9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qCkBA IC00MjcsNiArNDI3LDcgQEAKICAgICA8Tm9uZSBJbmNsdWRlPSIuLlxVc2VySW50ZXJmYWNlXElt YWdlc1xBcHBsaWNhdGlvbkNhY2hlTWFuaWZlc3QlNDAyeC5wbmciIC8+CiAgICAgPE5vbmUgSW5j bHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNcQXBwbGljYXRpb25DYWNoZU1hbmlmZXN0LnBu ZyIgLz4KICAgICA8Tm9uZSBJbmNsdWRlPSIuLlxVc2VySW50ZXJmYWNlXEltYWdlc1xCYWNrQXJy b3cuc3ZnIiAvPgorICAgIDxOb25lIEluY2x1ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEJh Y2tBcnJvd0xlZ2FjeS5zdmciIC8+CiAgICAgPE5vbmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFj ZVxJbWFnZXNcQm90dG9tVXBUcmVlLnN2ZyIgLz4KICAgICA8Tm9uZSBJbmNsdWRlPSIuLlxVc2Vy SW50ZXJmYWNlXEltYWdlc1xCcmVha3BvaW50JTQwMngucG5nIiAvPgogICAgIDxOb25lIEluY2x1 ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEJyZWFrcG9pbnQucG5nIiAvPgpAQCAtNDg2LDYg KzQ4Nyw3IEBACiAgICAgPE5vbmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNcRm9s ZGVyR2VuZXJpYyU0MDJ4LnBuZyIgLz4KICAgICA8Tm9uZSBJbmNsdWRlPSIuLlxVc2VySW50ZXJm YWNlXEltYWdlc1xGb2xkZXJHZW5lcmljLnBuZyIgLz4KICAgICA8Tm9uZSBJbmNsdWRlPSIuLlxV c2VySW50ZXJmYWNlXEltYWdlc1xGb3J3YXJkQXJyb3cuc3ZnIiAvPgorICAgIDxOb25lIEluY2x1 ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEZvcndhcmRBcnJvd0xlZ2FjeS5zdmciIC8+CiAg ICAgPE5vbmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNcRnVuY3Rpb24uc3ZnIiAv PgogICAgIDxOb25lIEluY2x1ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEdvVG9BcnJvdy5z dmciIC8+CiAgICAgPE5vbmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNcSGllcmFy Y2hpY2FsTmF2aWdhdGlvbkl0ZW1DaGV2cm9uLnN2ZyIgLz4KQEAgLTc4NCw0ICs3ODYsNCBAQAog ICA8SW1wb3J0IFByb2plY3Q9IiQoVkNUYXJnZXRzUGF0aClcTWljcm9zb2Z0LkNwcC50YXJnZXRz IiAvPgogICA8SW1wb3J0R3JvdXAgTGFiZWw9IkV4dGVuc2lvblRhcmdldHMiPgogICA8L0ltcG9y dEdyb3VwPgotPC9Qcm9qZWN0PgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKKzwvUHJvamVj dD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9XZWJJbnNwZWN0b3JVSS52Y3hw cm9qL1dlYkluc3BlY3RvclVJLnZjeHByb2ouZmlsdGVycyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qL1dlYkluc3BlY3RvclVJLnZjeHByb2ouZmlsdGVycwpp bmRleCA0OTJmZDVjLi4xZWNiN2Y2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv V2ViSW5zcGVjdG9yVUkudmN4cHJvai9XZWJJbnNwZWN0b3JVSS52Y3hwcm9qLmZpbHRlcnMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1dlYkluc3BlY3RvclVJLnZjeHByb2ovV2ViSW5zcGVj dG9yVUkudmN4cHJvai5maWx0ZXJzCkBAIC0xLDQgKzEsNCBAQAot77u/PD94bWwgdmVyc2lvbj0i MS4wIiBlbmNvZGluZz0idXRmLTgiPz4KKzw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0 Zi04Ij8+CiA8UHJvamVjdCBUb29sc1ZlcnNpb249IjQuMCIgeG1sbnM9Imh0dHA6Ly9zY2hlbWFz Lm1pY3Jvc29mdC5jb20vZGV2ZWxvcGVyL21zYnVpbGQvMjAwMyI+CiAgIDxJdGVtR3JvdXA+CiAg ICAgPEZpbHRlciBJbmNsdWRlPSJSZXNvdXJjZSBGaWxlcyI+CkBAIC0xMTE5LDYgKzExMTksOSBA QAogICAgIDxOb25lIEluY2x1ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEJhY2tBcnJvdy5z dmciPgogICAgICAgPEZpbHRlcj5JbWFnZXM8L0ZpbHRlcj4KICAgICA8L05vbmU+CisgICAgPE5v bmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNcQmFja0Fycm93TGVnYWN5LnN2ZyI+ CisgICAgICA8RmlsdGVyPkltYWdlczwvRmlsdGVyPgorICAgIDwvTm9uZT4KICAgICA8Tm9uZSBJ bmNsdWRlPSIuLlxVc2VySW50ZXJmYWNlXEltYWdlc1xCb3R0b21VcFRyZWUuc3ZnIj4KICAgICAg IDxGaWx0ZXI+SW1hZ2VzPC9GaWx0ZXI+CiAgICAgPC9Ob25lPgpAQCAtMTI5Niw2ICsxMjk5LDkg QEAKICAgICA8Tm9uZSBJbmNsdWRlPSIuLlxVc2VySW50ZXJmYWNlXEltYWdlc1xGb3J3YXJkQXJy b3cuc3ZnIj4KICAgICAgIDxGaWx0ZXI+SW1hZ2VzPC9GaWx0ZXI+CiAgICAgPC9Ob25lPgorICAg IDxOb25lIEluY2x1ZGU9Ii4uXFVzZXJJbnRlcmZhY2VcSW1hZ2VzXEZvcndhcmRBcnJvd0xlZ2Fj eS5zdmciPgorICAgICAgPEZpbHRlcj5JbWFnZXM8L0ZpbHRlcj4KKyAgICA8L05vbmU+CiAgICAg PE5vbmUgSW5jbHVkZT0iLi5cVXNlckludGVyZmFjZVxJbWFnZXNcRnVuY3Rpb24uc3ZnIj4KICAg ICAgIDxGaWx0ZXI+SW1hZ2VzPC9GaWx0ZXI+CiAgICAgPC9Ob25lPgpAQCAtMTcyMiw0ICsxNzI4 LDQgQEAKICAgICA8Tm9uZSBJbmNsdWRlPSJXZWJJbnNwZWN0b3JVSS5tYWtlIiAvPgogICAgIDxO b25lIEluY2x1ZGU9ImJ1aWxkLXdlYmluc3BlY3RvcnVpLnBsIiAvPgogICA8L0l0ZW1Hcm91cD4K LTwvUHJvamVjdD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCis8L1Byb2plY3Q+Cg==