118348 2013-07-03 03:02:36 -0700 Name resources related to snapshotted plug-ins more accurately 2013-07-03 05:00:54 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 1 graouts graouts buildbot commit-queue dino eflews.bot esprehn+autocc glenn gtk-ews gyuyoung.kim macpherson menard rakuco rego+ews rniwa webkit-ews xan.lopez zan oldest_to_newest 905779 0 graouts 2013-07-03 03:02:36 -0700 To support https://bugs.webkit.org/show_bug.cgi?id=118347, we'll add a new CSS file to style the content of the missing/blocked plug-in content. Since we'll want to load this CSS file independently of any CSS file related to snapshotted plug-ins, we need to rename the plugIns.css and plugIns.js files to have less of a generic name. 905781 1 205989 graouts 2013-07-03 03:04:54 -0700 Created attachment 205989 Patch 905785 2 205989 buildbot 2013-07-03 03:10:22 -0700 Comment on attachment 205989 Patch Attachment 205989 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.appspot.com/results/1014773 905786 3 205989 webkit-ews 2013-07-03 03:12:28 -0700 Comment on attachment 205989 Patch Attachment 205989 did not pass qt-ews (qt): Output: http://webkit-queues.appspot.com/results/1016592 905787 4 205989 webkit-ews 2013-07-03 03:13:12 -0700 Comment on attachment 205989 Patch Attachment 205989 did not pass qt-wk2-ews (qt-wk2): Output: http://webkit-queues.appspot.com/results/1013824 905791 5 205989 eflews.bot 2013-07-03 03:18:29 -0700 Comment on attachment 205989 Patch Attachment 205989 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/1018394 905794 6 205989 eflews.bot 2013-07-03 03:20:18 -0700 Comment on attachment 205989 Patch Attachment 205989 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/1009990 905797 7 205989 buildbot 2013-07-03 03:24:50 -0700 Comment on attachment 205989 Patch Attachment 205989 did not pass mac-ews (mac): Output: http://webkit-queues.appspot.com/results/1025047 905807 8 205989 gtk-ews 2013-07-03 04:01:17 -0700 Comment on attachment 205989 Patch Attachment 205989 did not pass gtk-ews (gtk): Output: http://webkit-queues.appspot.com/results/1012905 905813 9 205989 dino 2013-07-03 04:25:46 -0700 Comment on attachment 205989 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=205989&action=review > Source/WebCore/ChangeLog:27 > + (object::-webkit-snapshotted-plugin-content): > + (object::-webkit-snapshotted-plugin-content > .snapshot-overlay): > + (object::-webkit-snapshotted-plugin-content > .snapshot-overlay > .snapshot-label): > + (object::-webkit-snapshotted-plugin-content > .snapshot-overlay > .snapshot-label > div): > + (object::-webkit-snapshotted-plugin-content > .snapshot-overlay > .snapshot-label > .snapshot-title): > + (object::-webkit-snapshotted-plugin-content > .snapshot-overlay > .snapshot-label > .snapshot-subtitle): No need for all this if it is just a rename. > Source/WebCore/WebCore.xcodeproj/project.pbxproj:8082 > + 5A91469E8E9F8485C37A2876 /* JSSVGGraphicsElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGGraphicsElement.cpp; sourceTree = "<group>"; }; This is just Xcode screwing around with the file, but I generally remove these changes by hand. > Source/WebCore/WebCore.xcodeproj/project.pbxproj:9367 > + 950C4C02BED8936F818E2F99 /* JSSVGGraphicsElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGGraphicsElement.h; sourceTree = "<group>"; }; Same. > Source/WebCore/WebCore.xcodeproj/project.pbxproj:-11071 > - 5A91469E8E9F8485C37A2876 /* JSSVGGraphicsElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGGraphicsElement.cpp; sourceTree = "<group>"; }; > - 950C4C02BED8936F818E2F99 /* JSSVGGraphicsElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGGraphicsElement.h; sourceTree = "<group>"; }; And here's where they came from. > Source/WebCore/css/CSSDefaultStyleSheets.cpp:208 > - plugInsRules = String(plugInsUserAgentStyleSheet, sizeof(plugInsUserAgentStyleSheet)); > + plugInsRules = String(snapshottedPlugInsUserAgentStyleSheet, sizeof(snapshottedPlugInsUserAgentStyleSheet)); This is where the change of name doesn't look right. I'm not sure if this is where you're intending to load the blockedPlugins.css, but if not, then I think you should just leave plugins.css named as it is. Otherwise plugInsRules has a generic name for what it is. > Source/WebCore/rendering/RenderTheme.h:92 > - // adjust the default CSS rules in html.css, quirks.css, mediaControls.css, or plugIns.css > + // adjust the default CSS rules in html.css, quirks.css, mediaControls.css, or snapshottedPlugIns.css > virtual String extraDefaultStyleSheet() { return String(); } > virtual String extraQuirksStyleSheet() { return String(); } > virtual String extraPlugInsStyleSheet() { return String(); } It's now a bit weird that the method name is fairly different from the file it is replacing. 905814 10 205989 dino 2013-07-03 04:28:41 -0700 Comment on attachment 205989 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=205989&action=review > Source/WebCore/ChangeLog:14 > + * Resources/snapshottedPlugIns.js: Renamed from Source/WebCore/Resources/plugIns.js. This breaks compilation in Document.cpp. 905815 11 dino 2013-07-03 04:29:57 -0700 Source/WebCore/dom/Document.cpp:6011:20: error: use of undeclared identifier 'plugInsJavaScript' jsString = plugInsJavaScript; ^ 1 error generated. 905824 12 graouts 2013-07-03 05:00:54 -0700 Yeah, I think we might as well just keep plugIns.css and plugIns.js and have an extra unavailablePlugIns.css to complement it. 205989 2013-07-03 03:04:54 -0700 2013-07-03 04:28:40 -0700 Patch 118348.patch text/plain 33298 graouts ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHMudHh0IGIvU291cmNlL1dlYkNv cmUvQ01ha2VMaXN0cy50eHQKaW5kZXggYmY4ODc1YS4uMjQ4ZTE4MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ01ha2VMaXN0cy50eHQKKysrIGIvU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0 cy50eHQKQEAgLTI1ODEsMTQgKzI1ODEsMTQgQEAgc2V0KFdlYkNvcmVfVVNFUl9BR0VOVF9TVFlM RV9TSEVFVFMKICAgICAke1dFQkNPUkVfRElSfS9jc3MvZnVsbHNjcmVlbi5jc3MKICAgICAke1dF QkNPUkVfRElSfS9jc3MvbWF0aG1sLmNzcwogICAgICR7V0VCQ09SRV9ESVJ9L2Nzcy9tZWRpYUNv bnRyb2xzLmNzcwotICAgICR7V0VCQ09SRV9ESVJ9L2Nzcy9wbHVnSW5zLmNzcwogICAgICR7V0VC Q09SRV9ESVJ9L2Nzcy9xdWlya3MuY3NzCisgICAgJHtXRUJDT1JFX0RJUn0vY3NzL3NuYXBzaG90 dGVkUGx1Z0lucy5jc3MKICAgICAke1dFQkNPUkVfRElSfS9jc3Mvc3ZnLmNzcwogICAgICR7V0VC Q09SRV9ESVJ9L2Nzcy92aWV3LXNvdXJjZS5jc3MKICkKIAogc2V0KFdlYkNvcmVfUExVR19JTlNf UkVTT1VSQ0VTCi0gICAgJHtXRUJDT1JFX0RJUn0vUmVzb3VyY2VzL3BsdWdJbnMuanMKKyAgICAk e1dFQkNPUkVfRElSfS9SZXNvdXJjZXMvc25hcHNob3R0ZWRQbHVnSW5zLmpzCiApCiAKIHNldChX ZWJDb3JlX0xJQlJBUklFUwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGRiZjAxNWIuLmVlZDExNDQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwzMiBAQAorMjAxMy0wNy0wMyAgQW50b2luZSBRdWludCAgPGdyYW91dHNA YXBwbGUuY29tPgorCisgICAgICAgIE5hbWUgcmVzb3VyY2VzIHJlbGF0ZWQgdG8gc25hcHNob3R0 ZWQgcGx1Zy1pbnMgbW9yZSBhY2N1cmF0ZWx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTgzNDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBSZW5hbWUgcGx1Z0lucy5jc3MgYW5kIHBsdWdJbnMuanMgdG8g aGF2ZSBtb3JlIHNwZWNpZmljIG5hbWVzLgorCisgICAgICAgICogQ01ha2VMaXN0cy50eHQ6Cisg ICAgICAgICogRGVyaXZlZFNvdXJjZXMubWFrZToKKyAgICAgICAgKiBEZXJpdmVkU291cmNlcy5w cmk6CisgICAgICAgICogR05VbWFrZWZpbGUuYW06CisgICAgICAgICogUmVzb3VyY2VzL3NuYXBz aG90dGVkUGx1Z0lucy5qczogUmVuYW1lZCBmcm9tIFNvdXJjZS9XZWJDb3JlL1Jlc291cmNlcy9w bHVnSW5zLmpzLgorICAgICAgICAoY3JlYXRlT3ZlcmxheSk6CisgICAgICAgICogV2ViQ29yZS52 Y3hwcm9qL1dlYkNvcmUudmN4cHJvajoKKyAgICAgICAgKiBXZWJDb3JlLnZjeHByb2ovV2ViQ29y ZS52Y3hwcm9qLmZpbHRlcnM6CisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5w Ynhwcm9qOgorICAgICAgICAqIGNzcy9DU1NEZWZhdWx0U3R5bGVTaGVldHMuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q1NTRGVmYXVsdFN0eWxlU2hlZXRzOjplbnN1cmVEZWZhdWx0U3R5bGVTaGVl dHNGb3JFbGVtZW50KToKKyAgICAgICAgKiBjc3Mvc25hcHNob3R0ZWRQbHVnSW5zLmNzczogUmVu YW1lZCBmcm9tIFNvdXJjZS9XZWJDb3JlL2Nzcy9wbHVnSW5zLmNzcy4KKyAgICAgICAgKG9iamVj dDo6LXdlYmtpdC1zbmFwc2hvdHRlZC1wbHVnaW4tY29udGVudCk6CisgICAgICAgIChvYmplY3Q6 Oi13ZWJraXQtc25hcHNob3R0ZWQtcGx1Z2luLWNvbnRlbnQgPiAuc25hcHNob3Qtb3ZlcmxheSk6 CisgICAgICAgIChvYmplY3Q6Oi13ZWJraXQtc25hcHNob3R0ZWQtcGx1Z2luLWNvbnRlbnQgPiAu c25hcHNob3Qtb3ZlcmxheSA+IC5zbmFwc2hvdC1sYWJlbCk6CisgICAgICAgIChvYmplY3Q6Oi13 ZWJraXQtc25hcHNob3R0ZWQtcGx1Z2luLWNvbnRlbnQgPiAuc25hcHNob3Qtb3ZlcmxheSA+IC5z bmFwc2hvdC1sYWJlbCA+IGRpdik6CisgICAgICAgIChvYmplY3Q6Oi13ZWJraXQtc25hcHNob3R0 ZWQtcGx1Z2luLWNvbnRlbnQgPiAuc25hcHNob3Qtb3ZlcmxheSA+IC5zbmFwc2hvdC1sYWJlbCA+ IC5zbmFwc2hvdC10aXRsZSk6CisgICAgICAgIChvYmplY3Q6Oi13ZWJraXQtc25hcHNob3R0ZWQt cGx1Z2luLWNvbnRlbnQgPiAuc25hcHNob3Qtb3ZlcmxheSA+IC5zbmFwc2hvdC1sYWJlbCA+IC5z bmFwc2hvdC1zdWJ0aXRsZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmg6CisK IDIwMTMtMDctMDIgIENhdGFsaW4gQmFkZWEgIDxiYWRlYUBhZG9iZS5jb20+CiAKICAgICAgICAg W0NTUy1SZWdpb25zXSBPdmVycmlkZUxvZ2ljYWxIZWlnaHQgdXNlZCBieSBib3RoIHJlZ2lvbnMg YW5kIGZsZXhib3gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0Rlcml2ZWRTb3VyY2VzLm1h a2UgYi9Tb3VyY2UvV2ViQ29yZS9EZXJpdmVkU291cmNlcy5tYWtlCmluZGV4IGIyYWU2MmIuLmNi MWJmZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0Rlcml2ZWRTb3VyY2VzLm1ha2UKKysr IGIvU291cmNlL1dlYkNvcmUvRGVyaXZlZFNvdXJjZXMubWFrZQpAQCAtODEyLDcgKzgxMiw3IEBA IFhQYXRoR3JhbW1hci5jcHAgOiB4bWwvWFBhdGhHcmFtbWFyLnkgJChQUk9KRUNUX0ZJTEUpCiAK ICMgdXNlciBhZ2VudCBzdHlsZSBzaGVldHMKIAotVVNFUl9BR0VOVF9TVFlMRV9TSEVFVFMgPSAk KFdlYkNvcmUpL2Nzcy9odG1sLmNzcyAkKFdlYkNvcmUpL2Nzcy9xdWlya3MuY3NzICQoV2ViQ29y ZSkvY3NzL3ZpZXctc291cmNlLmNzcyAkKFdlYkNvcmUpL2Nzcy90aGVtZVdpbi5jc3MgJChXZWJD b3JlKS9jc3MvdGhlbWVXaW5RdWlya3MuY3NzICQoV2ViQ29yZSkvY3NzL3BsdWdJbnMuY3NzCitV U0VSX0FHRU5UX1NUWUxFX1NIRUVUUyA9ICQoV2ViQ29yZSkvY3NzL2h0bWwuY3NzICQoV2ViQ29y ZSkvY3NzL3F1aXJrcy5jc3MgJChXZWJDb3JlKS9jc3Mvdmlldy1zb3VyY2UuY3NzICQoV2ViQ29y ZSkvY3NzL3RoZW1lV2luLmNzcyAkKFdlYkNvcmUpL2Nzcy90aGVtZVdpblF1aXJrcy5jc3MgJChX ZWJDb3JlKS9jc3Mvc25hcHNob3R0ZWRQbHVnSW5zLmNzcwogCiBpZmVxICgkKGZpbmRzdHJpbmcg RU5BQkxFX1NWRywkKEZFQVRVUkVfREVGSU5FUykpLCBFTkFCTEVfU1ZHKQogICAgIFVTRVJfQUdF TlRfU1RZTEVfU0hFRVRTIDo9ICQoVVNFUl9BR0VOVF9TVFlMRV9TSEVFVFMpICQoV2ViQ29yZSkv Y3NzL3N2Zy5jc3MKQEAgLTgzOCw3ICs4MzgsNyBAQCBVc2VyQWdlbnRTdHlsZVNoZWV0cy5oIDog Y3NzL21ha2UtY3NzLWZpbGUtYXJyYXlzLnBsIGJpbmRpbmdzL3NjcmlwdHMvcHJlcHJvY2Vzcwog CiAjIHBsdWdJbnMgcmVzb3VyY2VzCiAKLVBMVUdfSU5TX1JFU09VUkNFUyA9ICQoV2ViQ29yZSkv UmVzb3VyY2VzL3BsdWdJbnMuanMKK1BMVUdfSU5TX1JFU09VUkNFUyA9ICQoV2ViQ29yZSkvUmVz b3VyY2VzL3NuYXBzaG90dGVkUGx1Z0lucy5qcwogCiBQbHVnSW5zUmVzb3VyY2VzLmggOiBjc3Mv bWFrZS1jc3MtZmlsZS1hcnJheXMucGwgYmluZGluZ3Mvc2NyaXB0cy9wcmVwcm9jZXNzb3IucG0g JChQTFVHX0lOU19SRVNPVVJDRVMpICQoUExBVEZPUk1fRkVBVFVSRV9ERUZJTkVTKQogCXBlcmwg LUkkKFdlYkNvcmUpL2JpbmRpbmdzL3NjcmlwdHMgJDwgLS1kZWZpbmVzICIkKEZFQVRVUkVfREVG SU5FUykiICRAIFBsdWdJbnNSZXNvdXJjZXNEYXRhLmNwcCAkKFBMVUdfSU5TX1JFU09VUkNFUykK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0Rlcml2ZWRTb3VyY2VzLnByaSBiL1NvdXJjZS9X ZWJDb3JlL0Rlcml2ZWRTb3VyY2VzLnByaQppbmRleCA5NGE4NGJiLi4zMTdhNWEzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9EZXJpdmVkU291cmNlcy5wcmkKKysrIGIvU291cmNlL1dlYkNv cmUvRGVyaXZlZFNvdXJjZXMucHJpCkBAIC04MiwxMiArODIsMTIgQEAgU1RZTEVTSEVFVFNfRU1C RUQgPSBcCiAgICAgJCRQV0QvY3NzL21lZGlhQ29udHJvbHMuY3NzIFwKICAgICAkJFBXRC9jc3Mv bWVkaWFDb250cm9sc1F0LmNzcyBcCiAgICAgJCRQV0QvY3NzL21lZGlhQ29udHJvbHNRdEZ1bGxz Y3JlZW4uY3NzIFwKLSAgICAkJFBXRC9jc3MvcGx1Z0lucy5jc3MgXAorICAgICQkUFdEL2Nzcy9z bmFwc2hvdHRlZFBsdWdJbnMgXAogICAgICQkUFdEL2Nzcy90aGVtZVF0Tm9MaXN0Ym94ZXMuY3Nz IFwKICAgICAkJFBXRC9jc3MvbW9iaWxlVGhlbWVRdC5jc3MKIAogUExVR0lOU19FTUJFRCA9IFwK LSAgICAkJFBXRC9SZXNvdXJjZXMvcGx1Z0lucy5qcworICAgICQkUFdEL1Jlc291cmNlcy9zbmFw c2hvdHRlZFBsdWdJbnMuanMKIAogSURMX0JJTkRJTkdTICs9IFwKICAgICAkJFBXRC9Nb2R1bGVz L2ZpbGVzeXN0ZW0vRE9NRmlsZVN5c3RlbS5pZGwgXApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvR05VbWFrZWZpbGUuYW0gYi9Tb3VyY2UvV2ViQ29yZS9HTlVtYWtlZmlsZS5hbQppbmRleCBh Y2Y0YzYzLi40NmVkOGQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9HTlVtYWtlZmlsZS5h bQorKysgYi9Tb3VyY2UvV2ViQ29yZS9HTlVtYWtlZmlsZS5hbQpAQCAtMjY2LDExICsyNjYsMTEg QEAgVVNFUl9BR0VOVF9TVFlMRV9TSEVFVFMgPSBcCiAJJChXZWJDb3JlKS9jc3MvbWVkaWFDb250 cm9scy5jc3MgXAogCSQoV2ViQ29yZSkvY3NzL21lZGlhQ29udHJvbHNHdGsuY3NzIFwKIAkkKFdl YkNvcmUpL2Nzcy9mdWxsc2NyZWVuLmNzcyBcCi0JJChXZWJDb3JlKS9jc3MvcGx1Z0lucy5jc3MK KwkkKFdlYkNvcmUpL2Nzcy9zbmFwc2hvdHRlZFBsdWdJbnMuY3NzCiAKICMgcGx1Zy1pbiByZXNv dXJjZXMKIFBMVUdfSU5TX1JFU09VUkNFUyA9IFwKLQkkKFdlYkNvcmUpL1Jlc291cmNlcy9wbHVn SW5zLmpzCisJJChXZWJDb3JlKS9SZXNvdXJjZXMvc25hcHNob3R0ZWRQbHVnSW5zLmpzCiAKICMg bmV3LXN0eWxlIEphdmFTY3JpcHQgYmluZGluZ3MKIFNDUklQVFNfRk9SX0dFTkVSQVRFX0JJTkRJ TkdTID0gXApAQCAtNjU1LDggKzY1NSw4IEBAIEVYVFJBX0RJU1QgKz0gXAogCVNvdXJjZS9XZWJD b3JlL2Nzcy9tYXRobWwuY3NzIFwKIAlTb3VyY2UvV2ViQ29yZS9jc3MvbWVkaWFDb250cm9scy5j c3MgXAogCVNvdXJjZS9XZWJDb3JlL2Nzcy9tZWRpYUNvbnRyb2xzR3RrLmNzcyBcCi0JU291cmNl L1dlYkNvcmUvY3NzL3BsdWdJbnMuY3NzIFwKIAlTb3VyY2UvV2ViQ29yZS9jc3MvcXVpcmtzLmNz cyBcCisJU291cmNlL1dlYkNvcmUvY3NzL3NuYXBzaG90dGVkUGx1Z0lucy5jc3MgXAogCVNvdXJj ZS9XZWJDb3JlL2Nzcy9zdmcuY3NzIFwKIAlTb3VyY2UvV2ViQ29yZS9jc3MvU1ZHQ1NTUHJvcGVy dHlOYW1lcy5pbiBcCiAJU291cmNlL1dlYkNvcmUvY3NzL1NWR0NTU1ZhbHVlS2V5d29yZHMuaW4g XApAQCAtNjkxLDcgKzY5MSw3IEBAIEVYVFJBX0RJU1QgKz0gXAogCVNvdXJjZS9XZWJDb3JlL3Bh Z2UvU2V0dGluZ3MuaW4gXAogCVNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0NvbG9yRGF0YS5ncGVy ZiBcCiAJU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9tYWMvbWFrZS1jaGFyc2V0LXRhYmxl LnBsIFwKLQlTb3VyY2UvV2ViQ29yZS9SZXNvdXJjZXMvcGx1Z0lucy5qcyBcCisJU291cmNlL1dl YkNvcmUvUmVzb3VyY2VzL3NuYXBzaG90dGVkUGx1Z0lucy5qcyBcCiAJU291cmNlL1dlYkNvcmUv c3ZnL3N2Z2F0dHJzLmluIFwKIAlTb3VyY2UvV2ViQ29yZS9zdmcvc3ZndGFncy5pbiBcCiAJU291 cmNlL1dlYkNvcmUvc3ZnL3hsaW5rYXR0cnMuaW4gXApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvUmVzb3VyY2VzL3BsdWdJbnMuanMgYi9Tb3VyY2UvV2ViQ29yZS9SZXNvdXJjZXMvcGx1Z0lu cy5qcwpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggODY0MTkzZi4uMDAwMDAwMAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9SZXNvdXJjZXMvcGx1Z0lucy5qcworKysgL2Rldi9udWxsCkBAIC0x LDM2ICswLDAgQEAKLQotLy8gRnVuY3Rpb24gY2FsbGVkIGZyb20gV2ViQ29yZS4KLWZ1bmN0aW9u IGNyZWF0ZU92ZXJsYXkoc2hhZG93Um9vdCwgdGl0bGVUZXh0LCBzdWJ0aXRsZVRleHQpCi17Ci0g ICAgLy8gR2VuZXJhdGUgdGhlIGZvbGxvd2luZyBzdHJ1Y3R1cmU6Ci0gICAgLy8KLSAgICAvLyA8 ZGl2IHBzZXVkbz0iLXdlYmtpdC1zbmFwc2hvdHRlZC1wbHVnaW4tY29udGVudCI+Ci0gICAgLy8g ICAgIDxkaXYgY2xhc3M9InNuYXBzaG90LW92ZXJsYXkiIGFyaWEtbGFiZWw9IltUaXRsZV06IFtT dWJ0aXRsZV0iIHJvbGU9ImJ1dHRvbiI+Ci0gICAgLy8gICAgICAgICA8ZGl2IGNsYXNzPSJzbmFw c2hvdC1sYWJlbCI+Ci0gICAgLy8gICAgICAgICAgICAgPGRpdiBjbGFzcz0ic25hcHNob3QtdGl0 bGUiPltUaXRsZV08L2Rpdj4KLSAgICAvLyAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJzbmFwc2hv dC1zdWJ0aXRsZSI+W1N1YnRpdGxlXTwvZGl2PgotICAgIC8vICAgICAgICAgPC9kaXY+Ci0gICAg Ly8gICAgIDwvZGl2PgotICAgIC8vIDwvZGl2PgotCi0gICAgdmFyIHNoYWRvd0NvbnRhaW5lciA9 IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgIHNoYWRvd0NvbnRhaW5lci5zZXRB dHRyaWJ1dGUoInBzZXVkbyIsICItd2Via2l0LXNuYXBzaG90dGVkLXBsdWdpbi1jb250ZW50Iik7 Ci0KLSAgICB2YXIgb3ZlcmxheSA9IHNoYWRvd0NvbnRhaW5lci5hcHBlbmRDaGlsZChkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJkaXYiKSk7Ci0gICAgb3ZlcmxheS5zZXRBdHRyaWJ1dGUoImFyaWEt bGFiZWwiLCB0aXRsZVRleHQgKyAiOiAiICsgc3VidGl0bGVUZXh0KTsKLSAgICBvdmVybGF5LnNl dEF0dHJpYnV0ZSgicm9sZSIsICJidXR0b24iKTsKLSAgICBvdmVybGF5LmNsYXNzTmFtZSA9ICJz bmFwc2hvdC1vdmVybGF5IjsKLQotICAgIHZhciBzbmFwc2hvdExhYmVsID0gb3ZlcmxheS5hcHBl bmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKSk7Ci0gICAgc25hcHNob3RMYWJl bC5jbGFzc05hbWUgPSAic25hcHNob3QtbGFiZWwiOwotCi0gICAgdmFyIHRpdGxlID0gc25hcHNo b3RMYWJlbC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKSk7Ci0gICAg dGl0bGUuY2xhc3NOYW1lID0gInNuYXBzaG90LXRpdGxlIjsKLSAgICB0aXRsZS50ZXh0Q29udGVu dCA9IHRpdGxlVGV4dDsKLQotICAgIHZhciBzdWJ0aXRsZSA9IHNuYXBzaG90TGFiZWwuYXBwZW5k Q2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2IikpOwotICAgIHN1YnRpdGxlLmNsYXNz TmFtZSA9ICJzbmFwc2hvdC1zdWJ0aXRsZSI7Ci0gICAgc3VidGl0bGUudGV4dENvbnRlbnQgPSBz dWJ0aXRsZVRleHQ7Ci0KLSAgICBzaGFkb3dSb290LmFwcGVuZENoaWxkKHNoYWRvd0NvbnRhaW5l cik7Ci19OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL3NuYXBzaG90dGVk UGx1Z0lucy5qcyBiL1NvdXJjZS9XZWJDb3JlL1Jlc291cmNlcy9zbmFwc2hvdHRlZFBsdWdJbnMu anMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODY0MTkzZgotLS0gL2Rldi9u dWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL1Jlc291cmNlcy9zbmFwc2hvdHRlZFBsdWdJbnMuanMK QEAgLTAsMCArMSwzNiBAQAorCisvLyBGdW5jdGlvbiBjYWxsZWQgZnJvbSBXZWJDb3JlLgorZnVu Y3Rpb24gY3JlYXRlT3ZlcmxheShzaGFkb3dSb290LCB0aXRsZVRleHQsIHN1YnRpdGxlVGV4dCkK K3sKKyAgICAvLyBHZW5lcmF0ZSB0aGUgZm9sbG93aW5nIHN0cnVjdHVyZToKKyAgICAvLworICAg IC8vIDxkaXYgcHNldWRvPSItd2Via2l0LXNuYXBzaG90dGVkLXBsdWdpbi1jb250ZW50Ij4KKyAg ICAvLyAgICAgPGRpdiBjbGFzcz0ic25hcHNob3Qtb3ZlcmxheSIgYXJpYS1sYWJlbD0iW1RpdGxl XTogW1N1YnRpdGxlXSIgcm9sZT0iYnV0dG9uIj4KKyAgICAvLyAgICAgICAgIDxkaXYgY2xhc3M9 InNuYXBzaG90LWxhYmVsIj4KKyAgICAvLyAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJzbmFwc2hv dC10aXRsZSI+W1RpdGxlXTwvZGl2PgorICAgIC8vICAgICAgICAgICAgIDxkaXYgY2xhc3M9InNu YXBzaG90LXN1YnRpdGxlIj5bU3VidGl0bGVdPC9kaXY+CisgICAgLy8gICAgICAgICA8L2Rpdj4K KyAgICAvLyAgICAgPC9kaXY+CisgICAgLy8gPC9kaXY+CisKKyAgICB2YXIgc2hhZG93Q29udGFp bmVyID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgc2hhZG93Q29udGFpbmVy LnNldEF0dHJpYnV0ZSgicHNldWRvIiwgIi13ZWJraXQtc25hcHNob3R0ZWQtcGx1Z2luLWNvbnRl bnQiKTsKKworICAgIHZhciBvdmVybGF5ID0gc2hhZG93Q29udGFpbmVyLmFwcGVuZENoaWxkKGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpKTsKKyAgICBvdmVybGF5LnNldEF0dHJpYnV0ZSgi YXJpYS1sYWJlbCIsIHRpdGxlVGV4dCArICI6ICIgKyBzdWJ0aXRsZVRleHQpOworICAgIG92ZXJs YXkuc2V0QXR0cmlidXRlKCJyb2xlIiwgImJ1dHRvbiIpOworICAgIG92ZXJsYXkuY2xhc3NOYW1l ID0gInNuYXBzaG90LW92ZXJsYXkiOworCisgICAgdmFyIHNuYXBzaG90TGFiZWwgPSBvdmVybGF5 LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpKTsKKyAgICBzbmFwc2hv dExhYmVsLmNsYXNzTmFtZSA9ICJzbmFwc2hvdC1sYWJlbCI7CisKKyAgICB2YXIgdGl0bGUgPSBz bmFwc2hvdExhYmVsLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpKTsK KyAgICB0aXRsZS5jbGFzc05hbWUgPSAic25hcHNob3QtdGl0bGUiOworICAgIHRpdGxlLnRleHRD b250ZW50ID0gdGl0bGVUZXh0OworCisgICAgdmFyIHN1YnRpdGxlID0gc25hcHNob3RMYWJlbC5h cHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKSk7CisgICAgc3VidGl0bGUu Y2xhc3NOYW1lID0gInNuYXBzaG90LXN1YnRpdGxlIjsKKyAgICBzdWJ0aXRsZS50ZXh0Q29udGVu dCA9IHN1YnRpdGxlVGV4dDsKKworICAgIHNoYWRvd1Jvb3QuYXBwZW5kQ2hpbGQoc2hhZG93Q29u dGFpbmVyKTsKK307CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjeHByb2ov V2ViQ29yZS52Y3hwcm9qIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3hwcm9qL1dlYkNvcmUu dmN4cHJvagppbmRleCAxOTU2ZTc5Li45ODQ1M2NiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9XZWJDb3JlLnZjeHByb2ovV2ViQ29yZS52Y3hwcm9qCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUudmN4cHJvai9XZWJDb3JlLnZjeHByb2oKQEAgLTEzNjU2LDggKzEzNjU2LDggQEAKICAg ICA8Tm9uZSBJbmNsdWRlPSIuLlxjc3NcZnVsbHNjcmVlblF1aWNrVGltZS5jc3MiIC8+CiAgICAg PE5vbmUgSW5jbHVkZT0iLi5cY3NzXGh0bWwuY3NzIiAvPgogICAgIDxOb25lIEluY2x1ZGU9Ii4u XGNzc1xtZWRpYUNvbnRyb2xzLmNzcyIgLz4KLSAgICA8Tm9uZSBJbmNsdWRlPSIuLlxjc3NccGx1 Z0lucy5jc3MiIC8+CiAgICAgPE5vbmUgSW5jbHVkZT0iLi5cY3NzXHF1aXJrcy5jc3MiIC8+Cisg ICAgPE5vbmUgSW5jbHVkZT0iLi5cY3NzXHNuYXBzaG90dGVkUGx1Z0lucy5jc3MiIC8+CiAgICAg PE5vbmUgSW5jbHVkZT0iLi5ceG1sXFhQYXRoR3JhbW1hci55IiAvPgogICAgIDxOb25lIEluY2x1 ZGU9Ii4uXGJpbmRpbmdzXHNjcmlwdHNcQ29kZUdlbmVyYXRvci5wbSIgLz4KICAgICA8Tm9uZSBJ bmNsdWRlPSIuLlxiaW5kaW5nc1xzY3JpcHRzXENvZGVHZW5lcmF0b3JKUy5wbSIgLz4KQEAgLTEz OTI0LDcgKzEzOTI0LDcgQEAKICAgICA8Tm9uZSBJbmNsdWRlPSIuLlxpbnNwZWN0b3JcZnJvbnQt ZW5kXFdvcmtlcnNTaWRlYmFyUGFuZS5qcyIgLz4KICAgICA8Tm9uZSBJbmNsdWRlPSIuLlxpbnNw ZWN0b3JcZnJvbnQtZW5kXFdvcmtzcGFjZS5qcyIgLz4KICAgICA8Tm9uZSBJbmNsdWRlPSIuLlxp bnNwZWN0b3JcZnJvbnQtZW5kXGNtXHhtbC5qcyIgLz4KLSAgICA8Tm9uZSBJbmNsdWRlPSIuLlxS ZXNvdXJjZXNccGx1Z0lucy5qcyIgLz4KKyAgICA8Tm9uZSBJbmNsdWRlPSIuLlxSZXNvdXJjZXNc c25hcHNob3R0ZWRQbHVnSW5zLmpzIiAvPgogICAgIDxOb25lIEluY2x1ZGU9IldlYkNvcmVQb3N0 QnVpbGQuY21kIiAvPgogICAgIDxOb25lIEluY2x1ZGU9IldlYkNvcmVQcmVCdWlsZC5jbWQiIC8+ CiAgIDwvSXRlbUdyb3VwPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3hw cm9qL1dlYkNvcmUudmN4cHJvai5maWx0ZXJzIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3hw cm9qL1dlYkNvcmUudmN4cHJvai5maWx0ZXJzCmluZGV4IGE5ZjE4MjQuLmFlMDhlM2MgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmN4cHJvai9XZWJDb3JlLnZjeHByb2ouZmls dGVycworKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjeHByb2ovV2ViQ29yZS52Y3hwcm9q LmZpbHRlcnMKQEAgLTE0Nzk0LDEwICsxNDc5NCwxMCBAQAogICAgIDxOb25lIEluY2x1ZGU9Ii4u XGNzc1xtZWRpYUNvbnRyb2xzLmNzcyI+CiAgICAgICA8RmlsdGVyPmNzczwvRmlsdGVyPgogICAg IDwvTm9uZT4KLSAgICA8Tm9uZSBJbmNsdWRlPSIuLlxjc3NccGx1Z0lucy5jc3MiPgorICAgIDxO b25lIEluY2x1ZGU9Ii4uXGNzc1xxdWlya3MuY3NzIj4KICAgICAgIDxGaWx0ZXI+Y3NzPC9GaWx0 ZXI+CiAgICAgPC9Ob25lPgotICAgIDxOb25lIEluY2x1ZGU9Ii4uXGNzc1xxdWlya3MuY3NzIj4K KyAgICA8Tm9uZSBJbmNsdWRlPSIuLlxjc3Ncc25hcHNob3R0ZWRQbHVnSW5zLmNzcyI+CiAgICAg ICA8RmlsdGVyPmNzczwvRmlsdGVyPgogICAgIDwvTm9uZT4KICAgICA8Tm9uZSBJbmNsdWRlPSIu Llx4bWxcWFBhdGhHcmFtbWFyLnkiPgpAQCAtMTU2MDAsNyArMTU2MDAsNyBAQAogICAgIDwvTm9u ZT4KICAgICA8Tm9uZSBJbmNsdWRlPSJXZWJDb3JlUG9zdEJ1aWxkLmNtZCIgLz4KICAgICA8Tm9u ZSBJbmNsdWRlPSJXZWJDb3JlUHJlQnVpbGQuY21kIiAvPgotICAgIDxOb25lIEluY2x1ZGU9Ii4u XFJlc291cmNlc1xwbHVnSW5zLmpzIiAvPgorICAgIDxOb25lIEluY2x1ZGU9Ii4uXFJlc291cmNl c1xzbmFwc2hvdHRlZFBsdWdJbnMuanMiIC8+CiAgIDwvSXRlbUdyb3VwPgogICA8SXRlbUdyb3Vw PgogICAgIDxDdXN0b21CdWlsZFN0ZXAgSW5jbHVkZT0iLi5ccGxhdGZvcm1cZ3JhcGhpY3Ncd2lu XE1lZGlhUGxheWVyUHJpdmF0ZUZ1bGxzY3JlZW5XaW5kb3cuaCI+CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggMDRmNDBhMS4uODEy MTUzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVj dC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvagpAQCAtMTk2Nyw2ICsxOTY3LDcgQEAKIAkJN0FGMTFBNUExMkU3Mjc0OTAwNjFGMjND IC8qIEluc3BlY3RvclJ1bnRpbWVBZ2VudC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gN0FGMTFBNTkxMkU3Mjc0OTAwNjFGMjNDIC8qIEluc3BlY3RvclJ1 bnRpbWVBZ2VudC5oICovOyB9OwogCQk3QUZENEE4QjExMzFDMjc2MDAzNUI4ODMgLyogU2NyaXB0 QnJlYWtwb2ludC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gN0FGRDRBOEExMTMxQzI3NjAwMzVCODgzIC8qIFNjcmlwdEJyZWFrcG9pbnQuaCAqLzsgc2V0 dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQk3QUZENEZGNDExMzI3 N0I2MDAzNUI4ODMgLyogU2NyaXB0RGVidWdMaXN0ZW5lci5oIGluIEhlYWRlcnMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gN0FGRDRGRjMxMTMyNzdCNjAwMzVCODgzIC8qIFNj cmlwdERlYnVnTGlzdGVuZXIuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRl LCApOyB9OyB9OworCQk3QkU3NDI3MzgxRkE5MDZGQkI0RjBGMkMgLyogSlNTVkdHcmFwaGljc0Vs ZW1lbnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDk1 MEM0QzAyQkVEODkzNkY4MThFMkY5OSAvKiBKU1NWR0dyYXBoaWNzRWxlbWVudC5oICovOyB9Owog CQk3QzUyMkQ0QjE1QjQ3N0U4MDA5QjdDOTUgLyogSW5zcGVjdG9yT3ZlcmxheS5jcHAgaW4gU291 cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3QzUyMkQ0OTE1QjQ3N0U4 MDA5QjdDOTUgLyogSW5zcGVjdG9yT3ZlcmxheS5jcHAgKi87IH07CiAJCTdDQzdFM0Q3MTcyMDhD MEYwMDNDNTI3NyAvKiBJRE5TY3JpcHRXaGl0ZUxpc3QudHh0IGluIFJlc291cmNlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3Q0M3RTNENjE3MjA4QzBGMDAzQzUyNzcgLyog SUROU2NyaXB0V2hpdGVMaXN0LnR4dCAqLzsgfTsKIAkJN0NFMzBEQTkxNzFCNjNEMjAwRUMzM0Ux IC8qIEZyYW1lU25hcHNob3R0aW5nTWFjLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gN0NFMzBEQTcxNzFCNjNEMjAwRUMzM0UxIC8qIEZyYW1lU25hcHNo b3R0aW5nTWFjLm1tICovOyB9OwpAQCAtMjE3NSw2ICsyMTc2LDcgQEAKIAkJODUxMzZDQTYwQUVE NjY1OTAwRjkwQTNEIC8qIHNvdXRoV2VzdFJlc2l6ZUN1cnNvci5wbmcgaW4gUmVzb3VyY2VzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDg1MTM2Qzk2MEFFRDY2NTkwMEY5MEEz RCAvKiBzb3V0aFdlc3RSZXNpemVDdXJzb3IucG5nICovOyB9OwogCQk4NTEzNkNBNzBBRUQ2NjU5 MDBGOTBBM0QgLyogd2FpdEN1cnNvci5wbmcgaW4gUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IDg1MTM2Qzk3MEFFRDY2NTkwMEY5MEEzRCAvKiB3YWl0Q3Vyc29y LnBuZyAqLzsgfTsKIAkJODUxMzZDQTgwQUVENjY1OTAwRjkwQTNEIC8qIHdlc3RSZXNpemVDdXJz b3IucG5nIGluIFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA4 NTEzNkM5ODBBRUQ2NjU5MDBGOTBBM0QgLyogd2VzdFJlc2l6ZUN1cnNvci5wbmcgKi87IH07CisJ CTg1MTc0RUMyQkNDQUYxN0VBRTNGNDZGOCAvKiBKU1NWR0dyYXBoaWNzRWxlbWVudC5jcHAgaW4g U291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1QTkxNDY5RThFOUY4 NDg1QzM3QTI4NzYgLyogSlNTVkdHcmFwaGljc0VsZW1lbnQuY3BwICovOyB9OwogCQk4NTE4M0I0 MjBBQTY5MjYxMDBGMTlGQTMgLyogRE9NSFRNTEJSRWxlbWVudC5oIGluIEhlYWRlcnMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gODUxODNCMzgwQUE2OTI2MTAwRjE5RkEzIC8q IERPTUhUTUxCUkVsZW1lbnQuaCAqLzsgfTsKIAkJODUxODNCNDMwQUE2OTI2MTAwRjE5RkEzIC8q IERPTUhUTUxCUkVsZW1lbnQubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSA4NTE4M0IzOTBBQTY5MjYxMDBGMTlGQTMgLyogRE9NSFRNTEJSRWxlbWVudC5t bSAqLzsgfTsKIAkJODUxODNCNDQwQUE2OTI2MTAwRjE5RkEzIC8qIERPTUhUTUxIZWFkaW5nRWxl bWVudC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gODUx ODNCM0EwQUE2OTI2MTAwRjE5RkEzIC8qIERPTUhUTUxIZWFkaW5nRWxlbWVudC5oICovOyB9OwpA QCAtNDM5Myw4ICs0Mzk1LDYgQEAKIAkJQjJGQTNEOUIwQUI3NUE2RjAwMEU1QUM0IC8qIEpTU1ZH R0VsZW1lbnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IEIyRkEzQ0IzMEFCNzVBNkUwMDBFNUFDNCAvKiBKU1NWR0dFbGVtZW50LmggKi87IH07CiAJCUIy RkEzRDlDMEFCNzVBNkYwMDBFNUFDNCAvKiBKU1NWR0dyYWRpZW50RWxlbWVudC5jcHAgaW4gU291 cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCMkZBM0NCNDBBQjc1QTZF MDAwRTVBQzQgLyogSlNTVkdHcmFkaWVudEVsZW1lbnQuY3BwICovOyB9OwogCQlCMkZBM0Q5RDBB Qjc1QTZGMDAwRTVBQzQgLyogSlNTVkdHcmFkaWVudEVsZW1lbnQuaCBpbiBIZWFkZXJzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEIyRkEzQ0I1MEFCNzVBNkUwMDBFNUFDNCAv KiBKU1NWR0dyYWRpZW50RWxlbWVudC5oICovOyB9OwotCQk4NTE3NEVDMkJDQ0FGMTdFQUUzRjQ2 RjggLyogSlNTVkdHcmFwaGljc0VsZW1lbnQuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gNUE5MTQ2OUU4RTlGODQ4NUMzN0EyODc2IC8qIEpTU1ZHR3Jh cGhpY3NFbGVtZW50LmNwcCAqLzsgfTsKLQkJN0JFNzQyNzM4MUZBOTA2RkJCNEYwRjJDIC8qIEpT U1ZHR3JhcGhpY3NFbGVtZW50LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSA5NTBDNEMwMkJFRDg5MzZGODE4RTJGOTkgLyogSlNTVkdHcmFwaGljc0VsZW1l bnQuaCAqLzsgfTsKIAkJQjJGQTNEOUUwQUI3NUE2RjAwMEU1QUM0IC8qIEpTU1ZHSW1hZ2VFbGVt ZW50LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEIy RkEzQ0I2MEFCNzVBNkUwMDBFNUFDNCAvKiBKU1NWR0ltYWdlRWxlbWVudC5jcHAgKi87IH07CiAJ CUIyRkEzRDlGMEFCNzVBNkYwMDBFNUFDNCAvKiBKU1NWR0ltYWdlRWxlbWVudC5oIGluIEhlYWRl cnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQjJGQTNDQjcwQUI3NUE2RTAw MEU1QUM0IC8qIEpTU1ZHSW1hZ2VFbGVtZW50LmggKi87IH07CiAJCUIyRkEzREEwMEFCNzVBNkYw MDBFNUFDNCAvKiBKU1NWR0xlbmd0aC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSBCMkZBM0NCODBBQjc1QTZFMDAwRTVBQzQgLyogSlNTVkdMZW5ndGgu Y3BwICovOyB9OwpAQCAtNzIxMCw3ICs3MjEwLDcgQEAKIAkJMzE2RkUxMEYwRTZFMURBNzAwQkY2 MDg4IC8qIEtleWZyYW1lQW5pbWF0aW9uLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNw cDsgbmFtZSA9IEtleWZyYW1lQW5pbWF0aW9uLmNwcDsgcGF0aCA9IGFuaW1hdGlvbi9LZXlmcmFt ZUFuaW1hdGlvbi5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTMxNkZFMTEwMEU2 RTFEQTcwMEJGNjA4OCAvKiBLZXlmcmFtZUFuaW1hdGlvbi5oICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jLmg7IG5hbWUgPSBLZXlmcmFtZUFuaW1hdGlvbi5oOyBwYXRoID0gYW5pbWF0aW9uL0tleWZy YW1lQW5pbWF0aW9uLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTMxNzQxQUFCMTY2 MzVFNDUwMDhBNUI3RSAvKiBTaW11bGF0ZWRDbGlja09wdGlvbnMuaCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0g U2ltdWxhdGVkQ2xpY2tPcHRpb25zLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07Ci0JCTMx ODlFNkRCMTZCMjEwMzUwMDM4NkVBMyAvKiBwbHVnSW5zLmNzcyAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQuY3Nz OyBwYXRoID0gcGx1Z0lucy5jc3M7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTMxODlF NkRCMTZCMjEwMzUwMDM4NkVBMyAvKiBzbmFwc2hvdHRlZFBsdWdJbnMuY3NzICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g dGV4dC5jc3M7IHBhdGggPSBzbmFwc2hvdHRlZFBsdWdJbnMuY3NzOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQkzMTlBRTA2MTE0MkQ2QjI0MDA2NTYzQTEgLyogU3R5bGVGaWx0ZXJEYXRh LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgbmFtZSA9IFN0eWxlRmlsdGVyRGF0 YS5jcHA7IHBhdGggPSBzdHlsZS9TdHlsZUZpbHRlckRhdGEuY3BwOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQkzMTlBRTA2MjE0MkQ2QjI0MDA2NTYzQTEgLyogU3R5bGVGaWx0ZXJEYXRh LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbmFtZSA9IFN0eWxlRmlsdGVyRGF0YS5oOyBw YXRoID0gc3R5bGUvU3R5bGVGaWx0ZXJEYXRhLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTMxOUZCRDVEMTVEMkY0NDQwMDk2NDBBNiAvKiBDYWNoZWRJbWFnZUNsaWVudC5oICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBDYWNoZWRJbWFnZUNsaWVudC5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwpAQCAtODA3OSw2ICs4MDc5LDcgQEAKIAkJNUE1NzRGMjMxMzFE QjkzOTAwNDcxQjg4IC8qIFJlbmRlclF1b3RlLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsg cGF0aCA9IFJlbmRlclF1b3RlLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTVBNTc0 RjI2MTMxREI5NkQwMDQ3MUI4OCAvKiBRdW90ZXNEYXRhLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuY3BwLmNwcDsgbmFtZSA9IFF1b3Rlc0RhdGEuY3BwOyBwYXRoID0gc3R5bGUvUXVvdGVzRGF0 YS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTVBNTc0RjI3MTMxREI5NkQwMDQ3 MUI4OCAvKiBRdW90ZXNEYXRhLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbmFtZSA9IFF1 b3Rlc0RhdGEuaDsgcGF0aCA9IHN0eWxlL1F1b3Rlc0RhdGEuaDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKKwkJNUE5MTQ2OUU4RTlGODQ4NUMzN0EyODc2IC8qIEpTU1ZHR3JhcGhpY3NFbGVt ZW50LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSAzMDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBKU1NWR0dyYXBo aWNzRWxlbWVudC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTVEMjFBODAwMTNF Q0U1REYwMEJCNzA2NCAvKiBXZWJWVFRQYXJzZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j cHAuY3BwOyBwYXRoID0gV2ViVlRUUGFyc2VyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKIAkJNUQyMUE4MDExM0VDRTVERjAwQkI3MDY0IC8qIFdlYlZUVFBhcnNlci5oICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXZWJWVFRQYXJzZXIuaDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKIAkJNUQ0QjhDNTIxMUU1MkM4QjAwQkJCNjJGIC8qIFdlYkNvcmUuZXhwLmlu ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93 bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9IFdlYkNvcmUuZXhwLmluOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwpAQCAtODI2MCw3ICs4MjYxLDcgQEAKIAkJNzExOEZFRDMxNTY4NUNDNjAwMzBC NzlBIC8qIEpTU1ZHVmlld1NwZWMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0g SlNTVkdWaWV3U3BlYy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk3MTM0NDk2QjE0 Njk0MUIzMDA3MjAzMTIgLyogU1ZHTGVuZ3RoQ29udGV4dC5jcHAgKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj b2RlLmNwcC5jcHA7IHBhdGggPSBTVkdMZW5ndGhDb250ZXh0LmNwcDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKIAkJNzEzNDQ5NkMxNDY5NDFCMzAwNzIwMzEyIC8qIFNWR0xlbmd0aENvbnRl eHQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gU1ZHTGVuZ3RoQ29udGV4dC5o OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwotCQk3MTNFNzBBRjE3MzNFOEIzMDBBMjJEMDAg LyogcGx1Z0lucy5qcyAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuamF2YXNjcmlwdDsgcGF0aCA9IHBsdWdJbnMuanM7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CisJCTcxM0U3MEFGMTczM0U4QjMwMEEyMkQwMCAvKiBzbmFwc2hv dHRlZFBsdWdJbnMuanMgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmphdmFzY3JpcHQ7IHBhdGggPSBzbmFwc2hvdHRlZFBsdWdJbnMu anM7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTcxNTM3OUZFMTQ2QkQ5RDYwMDhCRDYx NSAvKiBTVkdQYXRoRGF0YS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGgg PSBTVkdQYXRoRGF0YS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTcxNTM3OUZG MTQ2QkQ5RDYwMDhCRDYxNSAvKiBTVkdQYXRoRGF0YS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j Lmg7IHBhdGggPSBTVkdQYXRoRGF0YS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk3 MTU3RjA2MTE1MEI2NTY0MDA2RUFBQkQgLyogU1ZHQW5pbWF0ZWRUcmFuc2Zvcm1MaXN0LmNwcCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFNWR0FuaW1hdGVkVHJhbnNmb3Jt TGlzdC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC05MzYzLDYgKzkzNjQsNyBA QAogCQk5M0Y5Qjc5RTBCQTYwMzI2MDA4NTQwNjQgLyogSlNDREFUQVNlY3Rpb24uY3BwICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSlNDREFUQVNlY3Rpb24uY3BwOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk5M0Y5Qjc5RjBCQTYwMzI2MDA4NTQwNjQgLyogSlND REFUQVNlY3Rpb24uaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSlNDREFUQVNl Y3Rpb24uaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTNGREFGQzkwQjExMzA3NDAw RTI3NDZGIC8qIEVkaXRvckluc2VydEFjdGlvbi5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDMwOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gRWRpdG9ySW5zZXJ0QWN0aW9uLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CisJCTk1MEM0QzAyQkVEODkzNkY4MThFMkY5OSAvKiBKU1NWR0dyYXBoaWNzRWxlbWVudC5oICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDMwOyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSlNTVkdHcmFwaGljc0VsZW1lbnQuaDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTZBQkE0MjIxNEJDQjgwRTAwRDU2MjA0IC8q IEdyYXBoaWNzQ29udGV4dDNET3BlbkdMQ29tbW9uLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Y3BwLmNwcDsgcGF0aCA9IEdyYXBoaWNzQ29udGV4dDNET3BlbkdMQ29tbW9uLmNwcDsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTcwNTk5NzMxMDdEOTc1MjAwQTUwQTdDIC8qIFBvbGlj eUNhbGxiYWNrLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFBvbGlj eUNhbGxiYWNrLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTcwNTk5NzQxMDdE OTc1MjAwQTUwQTdDIC8qIFBvbGljeUNhbGxiYWNrLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMu aDsgcGF0aCA9IFBvbGljeUNhbGxiYWNrLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBA IC0xMTA2Nyw4ICsxMTA2OSw2IEBACiAJCUIyRkEzQ0IzMEFCNzVBNkUwMDBFNUFDNCAvKiBKU1NW R0dFbGVtZW50LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g MzA7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBKU1NWR0dFbGVt ZW50Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUIyRkEzQ0I0MEFCNzVBNkUwMDBF NUFDNCAvKiBKU1NWR0dyYWRpZW50RWxlbWVudC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j cHAuY3BwOyBwYXRoID0gSlNTVkdHcmFkaWVudEVsZW1lbnQuY3BwOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQlCMkZBM0NCNTBBQjc1QTZFMDAwRTVBQzQgLyogSlNTVkdHcmFkaWVudEVs ZW1lbnQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSAzMDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEpTU1ZHR3JhZGllbnRF bGVtZW50Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07Ci0JCTVBOTE0NjlFOEU5Rjg0ODVD MzdBMjg3NiAvKiBKU1NWR0dyYXBoaWNzRWxlbWVudC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jcHAuY3BwOyBwYXRoID0gSlNTVkdHcmFwaGljc0VsZW1lbnQuY3BwOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwotCQk5NTBDNEMwMkJFRDg5MzZGODE4RTJGOTkgLyogSlNTVkdHcmFwaGlj c0VsZW1lbnQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSAz MDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEpTU1ZHR3JhcGhp Y3NFbGVtZW50Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUIyRkEzQ0I2MEFCNzVB NkUwMDBFNUFDNCAvKiBKU1NWR0ltYWdlRWxlbWVudC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jcHAuY3BwOyBwYXRoID0gSlNTVkdJbWFnZUVsZW1lbnQuY3BwOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQlCMkZBM0NCNzBBQjc1QTZFMDAwRTVBQzQgLyogSlNTVkdJbWFnZUVsZW1l bnQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSAzMDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEpTU1ZHSW1hZ2VFbGVtZW50 Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUIyRkEzQ0I4MEFCNzVBNkUwMDBFNUFD NCAvKiBKU1NWR0xlbmd0aC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRo ID0gSlNTVkdMZW5ndGguY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtMTMyMTYs OCArMTMyMTYsOCBAQAogCQkJCTg1MTM2QzkxMEFFRDY2NTkwMEY5MEEzRCAvKiBub3J0aFNvdXRo UmVzaXplQ3Vyc29yLnBuZyAqLywKIAkJCQk4NTEzNkM5MjBBRUQ2NjU5MDBGOTBBM0QgLyogbm9y dGhXZXN0UmVzaXplQ3Vyc29yLnBuZyAqLywKIAkJCQk4NTEzNkM5MzBBRUQ2NjU5MDBGOTBBM0Qg Lyogbm9ydGhXZXN0U291dGhFYXN0UmVzaXplQ3Vyc29yLnBuZyAqLywKLQkJCQk3MTNFNzBBRjE3 MzNFOEIzMDBBMjJEMDAgLyogcGx1Z0lucy5qcyAqLywKIAkJCQk0NkY5RDVEQzBCMEQ2MDE3MDAy OEVFMzYgLyogcHJvZ3Jlc3NDdXJzb3IucG5nICovLAorCQkJCTcxM0U3MEFGMTczM0U4QjMwMEEy MkQwMCAvKiBzbmFwc2hvdHRlZFBsdWdJbnMuanMgKi8sCiAJCQkJODUxMzZDOTQwQUVENjY1OTAw RjkwQTNEIC8qIHNvdXRoRWFzdFJlc2l6ZUN1cnNvci5wbmcgKi8sCiAJCQkJODUxMzZDOTUwQUVE NjY1OTAwRjkwQTNEIC8qIHNvdXRoUmVzaXplQ3Vyc29yLnBuZyAqLywKIAkJCQk4NTEzNkM5NjBB RUQ2NjU5MDBGOTBBM0QgLyogc291dGhXZXN0UmVzaXplQ3Vyc29yLnBuZyAqLywKQEAgLTE5ODA1 LDcgKzE5ODA1LDYgQEAKIAkJCQlGQkRCNjE5QzE2RDYwMzQ2MDBCQjMzOTQgLyogUGFnZVJ1bGVD b2xsZWN0b3IuY3BwICovLAogCQkJCUZCREI2MUEwMTZENjAzN0UwMEJCMzM5NCAvKiBQYWdlUnVs ZUNvbGxlY3Rvci5oICovLAogCQkJCUE4MEU2Q0QxMEExOTg5Q0EwMDdGQjhDNSAvKiBQYWlyLmgg Ki8sCi0JCQkJMzE4OUU2REIxNkIyMTAzNTAwMzg2RUEzIC8qIHBsdWdJbnMuY3NzICovLAogCQkJ CUU0QkJFRDBDMTRGNDAyNUQwMDNGMEI5OCAvKiBQcm9wZXJ0eVNldENTU1N0eWxlRGVjbGFyYXRp b24uY3BwICovLAogCQkJCUU0QkJFRDBEMTRGNDAyNUQwMDNGMEI5OCAvKiBQcm9wZXJ0eVNldENT U1N0eWxlRGVjbGFyYXRpb24uaCAqLywKIAkJCQk5M0NBNEM5RjA5REY5M0ZBMDBERjg2NzcgLyog cXVpcmtzLmNzcyAqLywKQEAgLTE5ODI2LDYgKzE5ODI1LDcgQEAKIAkJCQk0MTUwNzE1NjE2ODUw NjczMDBDM0M3QjMgLyogU2VsZWN0b3JGaWx0ZXIuaCAqLywKIAkJCQlBODBFNkNDQTBBMTk4OUNB MDA3RkI4QzUgLyogU2hhZG93VmFsdWUuY3BwICovLAogCQkJCUE4MEU2Q0JFMEExOTg5Q0EwMDdG QjhDNSAvKiBTaGFkb3dWYWx1ZS5oICovLAorCQkJCTMxODlFNkRCMTZCMjEwMzUwMDM4NkVBMyAv KiBzbmFwc2hvdHRlZFBsdWdJbnMuY3NzICovLAogCQkJCUU0N0E5N0NFMTYzMDU5RkMwMDVEQ0Q5 OSAvKiBTdHlsZUludmFsaWRhdGlvbkFuYWx5c2lzLmNwcCAqLywKIAkJCQlFNDdBOTdDRjE2MzA1 OUZDMDA1RENEOTkgLyogU3R5bGVJbnZhbGlkYXRpb25BbmFseXNpcy5oICovLAogCQkJCTBGRjUw MjZFMTAyQkE5NjYwMDY2RjM5QSAvKiBTdHlsZU1lZGlhLmNwcCAqLywKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NEZWZhdWx0U3R5bGVTaGVldHMuY3BwIGIvU291cmNlL1dlYkNv cmUvY3NzL0NTU0RlZmF1bHRTdHlsZVNoZWV0cy5jcHAKaW5kZXggNDg3MzVkNi4uOTZmMzM0ZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0RlZmF1bHRTdHlsZVNoZWV0cy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0RlZmF1bHRTdHlsZVNoZWV0cy5jcHAKQEAgLTIw NSw3ICsyMDUsNyBAQCB2b2lkIENTU0RlZmF1bHRTdHlsZVNoZWV0czo6ZW5zdXJlRGVmYXVsdFN0 eWxlU2hlZXRzRm9yRWxlbWVudChFbGVtZW50KiBlbGVtZW50LAogICAgIGlmICghcGx1Z0luc1N0 eWxlU2hlZXQgJiYgKGVsZW1lbnQtPmhhc1RhZ05hbWUob2JqZWN0VGFnKSB8fCBlbGVtZW50LT5o YXNUYWdOYW1lKGVtYmVkVGFnKSkpIHsKICAgICAgICAgU3RyaW5nIHBsdWdJbnNSdWxlcyA9IFJl bmRlclRoZW1lOjp0aGVtZUZvclBhZ2UoZWxlbWVudC0+ZG9jdW1lbnQoKS0+cGFnZSgpKS0+ZXh0 cmFQbHVnSW5zU3R5bGVTaGVldCgpICsgZWxlbWVudC0+ZG9jdW1lbnQoKS0+cGFnZSgpLT5jaHJv bWUoKS5jbGllbnQoKS0+cGx1Z0luRXh0cmFTdHlsZVNoZWV0KCk7CiAgICAgICAgIGlmIChwbHVn SW5zUnVsZXMuaXNFbXB0eSgpKQotICAgICAgICAgICAgcGx1Z0luc1J1bGVzID0gU3RyaW5nKHBs dWdJbnNVc2VyQWdlbnRTdHlsZVNoZWV0LCBzaXplb2YocGx1Z0luc1VzZXJBZ2VudFN0eWxlU2hl ZXQpKTsKKyAgICAgICAgICAgIHBsdWdJbnNSdWxlcyA9IFN0cmluZyhzbmFwc2hvdHRlZFBsdWdJ bnNVc2VyQWdlbnRTdHlsZVNoZWV0LCBzaXplb2Yoc25hcHNob3R0ZWRQbHVnSW5zVXNlckFnZW50 U3R5bGVTaGVldCkpOwogICAgICAgICBwbHVnSW5zU3R5bGVTaGVldCA9IHBhcnNlVUFTaGVldChw bHVnSW5zUnVsZXMpOwogICAgICAgICBkZWZhdWx0U3R5bGUtPmFkZFJ1bGVzRnJvbVNoZWV0KHBs dWdJbnNTdHlsZVNoZWV0LCBzY3JlZW5FdmFsKCkpOwogICAgICAgICBjaGFuZ2VkRGVmYXVsdFN0 eWxlID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wbHVnSW5zLmNzcyBi L1NvdXJjZS9XZWJDb3JlL2Nzcy9wbHVnSW5zLmNzcwpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMzkzMjE4Zi4uMDAwMDAwMAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcGx1Z0lucy5j c3MKKysrIC9kZXYvbnVsbApAQCAtMSw5MyArMCwwIEBACi0vKgotICogQ29weXJpZ2h0IChDKSAy MDEzIEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKgotICogUmVkaXN0cmlidXRp b24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0Ci0g KiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5n IGNvbmRpdGlvbnMKLSAqIGFyZSBtZXQ6Ci0gKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNl IGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgbm90aWNlLCB0aGlz IGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgotICogMi4g UmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBj b3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBm b2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKLSAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90 aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCi0gKgotICogVEhJ UyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSwgSU5DLiBgYEFTIElTJycgQU5EIEFOWQot ICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1J VEVEIFRPLCBUSEUKLSAqIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5E IEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgotICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gIElO IE5PIEVWRU5UIFNIQUxMIEFQUExFLCBJTkMuIE9SCi0gKiBDT05UUklCVVRPUlMgQkUgTElBQkxF IEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKLSAqIEVYRU1Q TEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRF RCBUTywKLSAqIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVT RUQgQU5EIE9OIEFOWSBUSEVPUlkKLSAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFD VCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAotICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9S IE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCi0gKiBPRiBUSElT IFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFN QUdFLgotICovCi0KLS8qCi0gKiBUaGlzIGlzIHRoZSBVQSBTdHlsZVNoZWV0IGZvciA8b2JqZWN0 PiBhbmQgPGVtYmVkPiBlbGVtZW50cy4KLSAqCi0gKiBTdWNoIGVsZW1lbnRzLCB3aGVuIHNuYXBz aG90dGVkIChwYXVzZWQpLCB3aWxsIGNvbnRhaW4gYSBTaGFkb3dSb290Ci0gKiB3aXRoIHRoZSBm b2xsb3dpbmcgc3RydWN0dXJlOgotICoKLSAqIDxvYmplY3Q+Ci0gKiAgICAgI1NoYWRvd1Jvb3QK LSAqICAgICAgICAgPGRpdiBwc2V1ZG89Ii13ZWJraXQtc25hcHNob3R0ZWQtcGx1Z2luLWNvbnRl bnQiPgotICogICAgICAgICAgICAgPGRpdiBjbGFzcz0ic25hcHNob3Qtb3ZlcmxheSIgYXJpYS1s YWJlbD0iW1RpdGxlXTogW1N1YnRpdGxlXSIgcm9sZT0iYnV0dG9uIj4KLSAqICAgICAgICAgICAg ICAgICA8ZGl2IGNsYXNzPSJzbmFwc2hvdC1sYWJlbCI+Ci0gKiAgICAgICAgICAgICAgICAgICAg IDxkaXYgY2xhc3M9InNuYXBzaG90LXRpdGxlIj5bVGl0bGVdPC9kaXY+Ci0gKiAgICAgICAgICAg ICAgICAgICAgIDxkaXYgY2xhc3M9InNuYXBzaG90LXN1YnRpdGxlIj5bU3VidGl0bGVdPC9kaXY+ Ci0gKiAgICAgICAgICAgICAgICAgPC9kaXY+Ci0gKiAgICAgICAgICAgICA8L2Rpdj4KLSAqICAg ICAgICAgPC9kaXY+Ci0gKi8KLQotZW1iZWQ6Oi13ZWJraXQtc25hcHNob3R0ZWQtcGx1Z2luLWNv bnRlbnQsCi1vYmplY3Q6Oi13ZWJraXQtc25hcHNob3R0ZWQtcGx1Z2luLWNvbnRlbnQKLXsKLSAg ICBwb3NpdGlvbjogcmVsYXRpdmU7Ci0gICAgZGlzcGxheTogaW5saW5lLWJsb2NrOwotICAgIHdp ZHRoOiAxMDAlOwotICAgIGhlaWdodDogMTAwJTsKLX0KLQotZW1iZWQ6Oi13ZWJraXQtc25hcHNo b3R0ZWQtcGx1Z2luLWNvbnRlbnQgPiAuc25hcHNob3Qtb3ZlcmxheSwKLW9iamVjdDo6LXdlYmtp dC1zbmFwc2hvdHRlZC1wbHVnaW4tY29udGVudCA+IC5zbmFwc2hvdC1vdmVybGF5Ci17Ci0gICAg cG9zaXRpb246IGFic29sdXRlOwotICAgIHRvcDogNXB4OwotICAgIHJpZ2h0OiA1cHg7Ci0gICAg Ym90dG9tOiA1cHg7Ci0gICAgbGVmdDogNXB4OwotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYmEo MjU1LCAyNTUsIDI1NSwgMC43NSk7Ci0gICAgY3Vyc29yOiBwb2ludGVyOwotICAgIGRpc3BsYXk6 IC13ZWJraXQtZmxleDsKLSAgICAtd2Via2l0LWp1c3RpZnktY29udGVudDogY2VudGVyOwotICAg IC13ZWJraXQtYWxpZ24taXRlbXM6IGNlbnRlcjsKLX0KLQotZW1iZWQ6Oi13ZWJraXQtc25hcHNo b3R0ZWQtcGx1Z2luLWNvbnRlbnQgPiAuc25hcHNob3Qtb3ZlcmxheSA+IC5zbmFwc2hvdC1sYWJl bCwKLW9iamVjdDo6LXdlYmtpdC1zbmFwc2hvdHRlZC1wbHVnaW4tY29udGVudCA+IC5zbmFwc2hv dC1vdmVybGF5ID4gLnNuYXBzaG90LWxhYmVsCi17Ci0gICAgY29sb3I6IGJsYWNrOwotICAgIC13 ZWJraXQtdXNlci1zZWxlY3Q6IG5vbmU7Ci19Ci0KLWVtYmVkOjotd2Via2l0LXNuYXBzaG90dGVk LXBsdWdpbi1jb250ZW50ID4gLnNuYXBzaG90LW92ZXJsYXkgPiAuc25hcHNob3QtbGFiZWwgPiBk aXYsCi1vYmplY3Q6Oi13ZWJraXQtc25hcHNob3R0ZWQtcGx1Z2luLWNvbnRlbnQgPiAuc25hcHNo b3Qtb3ZlcmxheSA+IC5zbmFwc2hvdC1sYWJlbCA+IGRpdgotewotICAgIG92ZXJmbG93OiBoaWRk ZW47Ci0gICAgd2hpdGUtc3BhY2U6IG5vd3JhcDsKLSAgICB0ZXh0LW92ZXJmbG93OiBlbGxpcHNp czsKLX0KLQotZW1iZWQ6Oi13ZWJraXQtc25hcHNob3R0ZWQtcGx1Z2luLWNvbnRlbnQgPiAuc25h cHNob3Qtb3ZlcmxheSA+IC5zbmFwc2hvdC1sYWJlbCA+IC5zbmFwc2hvdC10aXRsZSwKLW9iamVj dDo6LXdlYmtpdC1zbmFwc2hvdHRlZC1wbHVnaW4tY29udGVudCA+IC5zbmFwc2hvdC1vdmVybGF5 ID4gLnNuYXBzaG90LWxhYmVsID4gLnNuYXBzaG90LXRpdGxlCi17Ci0gICAgZm9udC13ZWlnaHQ6 IGJvbGQ7Ci19Ci0KLWVtYmVkOjotd2Via2l0LXNuYXBzaG90dGVkLXBsdWdpbi1jb250ZW50ID4g LnNuYXBzaG90LW92ZXJsYXkgPiAuc25hcHNob3QtbGFiZWwgPiAuc25hcHNob3Qtc3VidGl0bGUs Ci1vYmplY3Q6Oi13ZWJraXQtc25hcHNob3R0ZWQtcGx1Z2luLWNvbnRlbnQgPiAuc25hcHNob3Qt b3ZlcmxheSA+IC5zbmFwc2hvdC1sYWJlbCA+IC5zbmFwc2hvdC1zdWJ0aXRsZQotewotICAgIGZv bnQtc3R5bGU6IGl0YWxpYzsKLSAgICBjb2xvcjogIzQ0NDsKLX0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9zbmFwc2hvdHRlZFBsdWdJbnMuY3NzIGIvU291cmNlL1dlYkNvcmUvY3Nz L3NuYXBzaG90dGVkUGx1Z0lucy5jc3MKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MC4uMzkzMjE4ZgotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9zbmFwc2hv dHRlZFBsdWdJbnMuY3NzCkBAIC0wLDAgKzEsOTMgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIw MTMgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlv biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAq IG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcg Y29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2Ug Y29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMg bGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBS ZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNv cHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3Ro ZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElT IFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFLCBJTkMuIGBgQVMgSVMnJyBBTkQgQU5ZCisg KiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlU RUQgVE8sIFRIRQorICogSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQg RklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiAgSU4g Tk8gRVZFTlQgU0hBTEwgQVBQTEUsIElOQy4gT1IKKyAqIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUg Rk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLAorICogRVhFTVBM QVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE IFRPLAorICogUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNF RCBBTkQgT04gQU5ZIFRIRU9SWQorICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNU LCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1Ig T1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMg U09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCisgKi8KKworLyoKKyAqIFRoaXMgaXMgdGhlIFVBIFN0eWxlU2hlZXQgZm9yIDxvYmplY3Q+ IGFuZCA8ZW1iZWQ+IGVsZW1lbnRzLgorICoKKyAqIFN1Y2ggZWxlbWVudHMsIHdoZW4gc25hcHNo b3R0ZWQgKHBhdXNlZCksIHdpbGwgY29udGFpbiBhIFNoYWRvd1Jvb3QKKyAqIHdpdGggdGhlIGZv bGxvd2luZyBzdHJ1Y3R1cmU6CisgKgorICogPG9iamVjdD4KKyAqICAgICAjU2hhZG93Um9vdAor ICogICAgICAgICA8ZGl2IHBzZXVkbz0iLXdlYmtpdC1zbmFwc2hvdHRlZC1wbHVnaW4tY29udGVu dCI+CisgKiAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJzbmFwc2hvdC1vdmVybGF5IiBhcmlhLWxh YmVsPSJbVGl0bGVdOiBbU3VidGl0bGVdIiByb2xlPSJidXR0b24iPgorICogICAgICAgICAgICAg ICAgIDxkaXYgY2xhc3M9InNuYXBzaG90LWxhYmVsIj4KKyAqICAgICAgICAgICAgICAgICAgICAg PGRpdiBjbGFzcz0ic25hcHNob3QtdGl0bGUiPltUaXRsZV08L2Rpdj4KKyAqICAgICAgICAgICAg ICAgICAgICAgPGRpdiBjbGFzcz0ic25hcHNob3Qtc3VidGl0bGUiPltTdWJ0aXRsZV08L2Rpdj4K KyAqICAgICAgICAgICAgICAgICA8L2Rpdj4KKyAqICAgICAgICAgICAgIDwvZGl2PgorICogICAg ICAgICA8L2Rpdj4KKyAqLworCitlbWJlZDo6LXdlYmtpdC1zbmFwc2hvdHRlZC1wbHVnaW4tY29u dGVudCwKK29iamVjdDo6LXdlYmtpdC1zbmFwc2hvdHRlZC1wbHVnaW4tY29udGVudAoreworICAg IHBvc2l0aW9uOiByZWxhdGl2ZTsKKyAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7CisgICAgd2lk dGg6IDEwMCU7CisgICAgaGVpZ2h0OiAxMDAlOworfQorCitlbWJlZDo6LXdlYmtpdC1zbmFwc2hv dHRlZC1wbHVnaW4tY29udGVudCA+IC5zbmFwc2hvdC1vdmVybGF5LAorb2JqZWN0Ojotd2Via2l0 LXNuYXBzaG90dGVkLXBsdWdpbi1jb250ZW50ID4gLnNuYXBzaG90LW92ZXJsYXkKK3sKKyAgICBw b3NpdGlvbjogYWJzb2x1dGU7CisgICAgdG9wOiA1cHg7CisgICAgcmlnaHQ6IDVweDsKKyAgICBi b3R0b206IDVweDsKKyAgICBsZWZ0OiA1cHg7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiYSgy NTUsIDI1NSwgMjU1LCAwLjc1KTsKKyAgICBjdXJzb3I6IHBvaW50ZXI7CisgICAgZGlzcGxheTog LXdlYmtpdC1mbGV4OworICAgIC13ZWJraXQtanVzdGlmeS1jb250ZW50OiBjZW50ZXI7CisgICAg LXdlYmtpdC1hbGlnbi1pdGVtczogY2VudGVyOworfQorCitlbWJlZDo6LXdlYmtpdC1zbmFwc2hv dHRlZC1wbHVnaW4tY29udGVudCA+IC5zbmFwc2hvdC1vdmVybGF5ID4gLnNuYXBzaG90LWxhYmVs LAorb2JqZWN0Ojotd2Via2l0LXNuYXBzaG90dGVkLXBsdWdpbi1jb250ZW50ID4gLnNuYXBzaG90 LW92ZXJsYXkgPiAuc25hcHNob3QtbGFiZWwKK3sKKyAgICBjb2xvcjogYmxhY2s7CisgICAgLXdl YmtpdC11c2VyLXNlbGVjdDogbm9uZTsKK30KKworZW1iZWQ6Oi13ZWJraXQtc25hcHNob3R0ZWQt cGx1Z2luLWNvbnRlbnQgPiAuc25hcHNob3Qtb3ZlcmxheSA+IC5zbmFwc2hvdC1sYWJlbCA+IGRp diwKK29iamVjdDo6LXdlYmtpdC1zbmFwc2hvdHRlZC1wbHVnaW4tY29udGVudCA+IC5zbmFwc2hv dC1vdmVybGF5ID4gLnNuYXBzaG90LWxhYmVsID4gZGl2Cit7CisgICAgb3ZlcmZsb3c6IGhpZGRl bjsKKyAgICB3aGl0ZS1zcGFjZTogbm93cmFwOworICAgIHRleHQtb3ZlcmZsb3c6IGVsbGlwc2lz OworfQorCitlbWJlZDo6LXdlYmtpdC1zbmFwc2hvdHRlZC1wbHVnaW4tY29udGVudCA+IC5zbmFw c2hvdC1vdmVybGF5ID4gLnNuYXBzaG90LWxhYmVsID4gLnNuYXBzaG90LXRpdGxlLAorb2JqZWN0 Ojotd2Via2l0LXNuYXBzaG90dGVkLXBsdWdpbi1jb250ZW50ID4gLnNuYXBzaG90LW92ZXJsYXkg PiAuc25hcHNob3QtbGFiZWwgPiAuc25hcHNob3QtdGl0bGUKK3sKKyAgICBmb250LXdlaWdodDog Ym9sZDsKK30KKworZW1iZWQ6Oi13ZWJraXQtc25hcHNob3R0ZWQtcGx1Z2luLWNvbnRlbnQgPiAu c25hcHNob3Qtb3ZlcmxheSA+IC5zbmFwc2hvdC1sYWJlbCA+IC5zbmFwc2hvdC1zdWJ0aXRsZSwK K29iamVjdDo6LXdlYmtpdC1zbmFwc2hvdHRlZC1wbHVnaW4tY29udGVudCA+IC5zbmFwc2hvdC1v dmVybGF5ID4gLnNuYXBzaG90LWxhYmVsID4gLnNuYXBzaG90LXN1YnRpdGxlCit7CisgICAgZm9u dC1zdHlsZTogaXRhbGljOworICAgIGNvbG9yOiAjNDQ0OworfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGhlbWUuaAppbmRleCBkM2I5MmIyLi4zZTJlZTgxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGhlbWUuaApAQCAtODYsNyArODYsNyBAQCBwdWJsaWM6CiAgICAgLy8g UmVuZGVyVGhlbWVNYWMuY3BwIGZvciBNYWMgT1MgWC4KIAogICAgIC8vIFRoZXNlIG1ldGhvZHMg cmV0dXJuIHRoZSB0aGVtZSdzIGV4dHJhIHN0eWxlIHNoZWV0cyBydWxlcywgdG8gbGV0IGVhY2gg cGxhdGZvcm0KLSAgICAvLyBhZGp1c3QgdGhlIGRlZmF1bHQgQ1NTIHJ1bGVzIGluIGh0bWwuY3Nz LCBxdWlya3MuY3NzLCBtZWRpYUNvbnRyb2xzLmNzcywgb3IgcGx1Z0lucy5jc3MKKyAgICAvLyBh ZGp1c3QgdGhlIGRlZmF1bHQgQ1NTIHJ1bGVzIGluIGh0bWwuY3NzLCBxdWlya3MuY3NzLCBtZWRp YUNvbnRyb2xzLmNzcywgb3Igc25hcHNob3R0ZWRQbHVnSW5zLmNzcwogICAgIHZpcnR1YWwgU3Ry aW5nIGV4dHJhRGVmYXVsdFN0eWxlU2hlZXQoKSB7IHJldHVybiBTdHJpbmcoKTsgfQogICAgIHZp cnR1YWwgU3RyaW5nIGV4dHJhUXVpcmtzU3R5bGVTaGVldCgpIHsgcmV0dXJuIFN0cmluZygpOyB9 CiAgICAgdmlydHVhbCBTdHJpbmcgZXh0cmFQbHVnSW5zU3R5bGVTaGVldCgpIHsgcmV0dXJuIFN0 cmluZygpOyB9Cg==