55991 2011-03-08 19:16:54 -0800 Change plugins to use their own executable on Mac OS X 2011-03-09 10:07:11 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 sam sam oldest_to_newest 364285 0 sam 2011-03-08 19:16:54 -0800 Change plugins to use their own executable on Mac OS X 364286 1 sam 2011-03-08 19:18:53 -0800 <rdar://problem/9049659> 364288 2 85125 sam 2011-03-08 19:21:18 -0800 Created attachment 85125 Patch 364292 3 85125 mitz 2011-03-08 20:06:54 -0800 Comment on attachment 85125 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=85125&action=review > Source/WebKit2/Configurations/PluginProcess.xcconfig:1 > +// Copyright (C) 2011 Apple Inc. All rights reserved. I think this should say 2010-2011, since the original was first published in 2010. > Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm:217 > + const char* args[] = { [processAppExecutablePath fileSystemRepresentation], frameworkExecutablePath, "-type", processTypeAsString(m_launchOptions.processType), "-servicename", serviceName.data(), "-localization", localization.data(), 0 }; Seems like the type can be inferred from the name now. 364358 4 ap 2011-03-09 00:56:47 -0800 > I think this should say 2010-2011 "2010, 2011", that is. 364563 5 sam 2011-03-09 10:07:11 -0800 Fixed in r80646. I kept the -type since Anders thinks it is ok, we can remove it later if necessary. 85125 2011-03-08 19:21:18 -0800 2011-03-09 09:23:38 -0800 Patch bug-55991-20110308192116.patch text/plain 29933 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwNjE3KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDMtMDggIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBDaGFuZ2UgcGx1Z2lucyB0byB1c2UgdGhlaXIgb3duIGV4ZWN1dGFibGUg b24gTWFjIE9TIFgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTU1OTkxCisKKyAgICAgICAgKiBDb25maWd1cmF0aW9ucy9QbHVnaW5Qcm9jZXNzLnhjY29u ZmlnOiBDb3BpZWQgZnJvbSBTb3VyY2UvV2ViS2l0Mi9Db25maWd1cmF0aW9ucy9XZWJQcm9jZXNz LnhjY29uZmlnLgorICAgICAgICAqIFBsdWdpblByb2Nlc3MvSW5mby5wbGlzdDogQ29waWVkIGZy b20gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmZvLnBsaXN0LgorICAgICAgICBBZGQgZmls ZXMgbmVjZXNzYXJ5IGZvciBhZGRpbmcgUGx1Z2luUHJvY2Vzcy5hcHAuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvTGF1bmNoZXIvbWFjL1Byb2Nlc3NMYXVuY2hlck1hYy5tbToKKyAgICAgICAgKFdl YktpdDo6UHJvY2Vzc0xhdW5jaGVyOjpsYXVuY2hQcm9jZXNzKToKKyAgICAgICAgTGF1bmNoIHRo ZSBQbHVnaW5Qcm9jZXNzLmFwcCB3aGVuIGxhdW5jaGluZyBhIHBsdWdpbiBwcm9jZXNzLgorCisg ICAgICAgICogV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICBBZGQg bmV3IGV4ZWN1dGFibGUgYW5kIG5ldyBmaWxlcywgcmVtb3ZlcyBzb21lIHVubmVlZGVkIGNvcHlp bmcKKyAgICAgICAgYW5kIGR1cGxpY2F0ZSBjb21waWxpbmcgb2YgZmlsZXMuCisKKyAgICAgICAg KiBXZWJQcm9jZXNzL0luZm8ucGxpc3Q6CisgICAgICAgIFNvcnRlZC4KKwogMjAxMS0wMy0wOCAg SmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBT YW0gV2VpbmlnLgpJbmRleDogU291cmNlL1dlYktpdDIvQ29uZmlndXJhdGlvbnMvUGx1Z2luUHJv Y2Vzcy54Y2NvbmZpZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9Db25maWd1cmF0aW9u cy9QbHVnaW5Qcm9jZXNzLnhjY29uZmlnCShyZXZpc2lvbiA4MDU3MikJKGZyb20gU291cmNlL1dl YktpdDIvQ29uZmlndXJhdGlvbnMvV2ViUHJvY2Vzcy54Y2NvbmZpZzo4MDU3MikKKysrIFNvdXJj ZS9XZWJLaXQyL0NvbmZpZ3VyYXRpb25zL1BsdWdpblByb2Nlc3MueGNjb25maWcJKHdvcmtpbmcg Y29weSkKQEAgLTAsMCArMSwyOSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEwIEFwcGxlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KKy8vCisvLyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNv dXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKy8vIG1vZGlmaWNhdGlvbiwg YXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworLy8g YXJlIG1ldDoKKy8vIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFp biB0aGUgYWJvdmUgY29weXJpZ2h0CisvLyAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisvLyAyLiBSZWRpc3RyaWJ1dGlvbnMg aW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorLy8gICAg bm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFp bWVyIGluIHRoZQorLy8gICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHBy b3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKy8vCisvLyBUSElTIFNPRlRXQVJFIElTIFBS T1ZJREVEIEJZIEFQUExFIElOQy4gYGBBUyBJUycnIEFORCBBTlkKKy8vIEVYUFJFU1MgT1IgSU1Q TElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCisvLyBJ TVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBB UlRJQ1VMQVIKKy8vIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBB UFBMRSBJTkMuIE9SCisvLyBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJ TkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKKy8vIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVO VElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKy8vIFBST0NVUkVN RU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBP UgorLy8gUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBB TkQgT04gQU5ZIFRIRU9SWQorLy8gT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBT VFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisvLyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RI RVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKy8vIE9GIFRISVMgU09G VFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0Uu IAorCisjaW5jbHVkZSAiQmFzZVRhcmdldC54Y2NvbmZpZyIKKworR0NDX0VOQUJMRV9PQkpDX0dD ID0gTk87CitQUk9EVUNUX05BTUUgPSBXZWJQcm9jZXNzOworSU5GT1BMSVNUX0ZJTEUgPSBXZWJQ cm9jZXNzL0luZm8ucGxpc3Q7CitJTlNUQUxMX1BBVEggPSAkKFNZU1RFTV9MSUJSQVJZX0RJUikv UHJpdmF0ZUZyYW1ld29ya3MvV2ViS2l0Mi5mcmFtZXdvcms7CkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9Db25maWd1cmF0aW9ucy9QbHVnaW5Qcm9jZXNzLnhjY29uZmlnCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL0NvbmZpZ3VyYXRpb25zL1BsdWdpblByb2Nlc3MueGNjb25maWcJKHJldmlz aW9uIDgwNTcyKQorKysgU291cmNlL1dlYktpdDIvQ29uZmlndXJhdGlvbnMvUGx1Z2luUHJvY2Vz cy54Y2NvbmZpZwkod29ya2luZyBjb3B5KQpAQCAtMSw0ICsxLDQgQEAKLS8vIENvcHlyaWdodCAo QykgMjAxMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisvLyBDb3B5cmlnaHQgKEMp IDIwMTEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogLy8KIC8vIFJlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAog Ly8gbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zCkBAIC0yNCw2ICsyNCw2IEBACiAjaW5jbHVkZSAiQmFzZVRhcmdldC54Y2Nv bmZpZyIKIAogR0NDX0VOQUJMRV9PQkpDX0dDID0gTk87Ci1QUk9EVUNUX05BTUUgPSBXZWJQcm9j ZXNzOwotSU5GT1BMSVNUX0ZJTEUgPSBXZWJQcm9jZXNzL0luZm8ucGxpc3Q7CitQUk9EVUNUX05B TUUgPSBQbHVnaW5Qcm9jZXNzOworSU5GT1BMSVNUX0ZJTEUgPSBQbHVnaW5Qcm9jZXNzL0luZm8u cGxpc3Q7CiBJTlNUQUxMX1BBVEggPSAkKFNZU1RFTV9MSUJSQVJZX0RJUikvUHJpdmF0ZUZyYW1l d29ya3MvV2ViS2l0Mi5mcmFtZXdvcms7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9j ZXNzL0luZm8ucGxpc3QKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vz cy9JbmZvLnBsaXN0CShyZXZpc2lvbiA4MDU3MikJKGZyb20gU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9JbmZvLnBsaXN0OjgwNTcyKQorKysgU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9J bmZvLnBsaXN0CSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMzIgQEAKKzw/eG1sIHZlcnNpb249 IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+Cis8IURPQ1RZUEUgcGxpc3QgUFVCTElDICItLy9BcHBs ZS8vRFREIFBMSVNUIDEuMC8vRU4iICJodHRwOi8vd3d3LmFwcGxlLmNvbS9EVERzL1Byb3BlcnR5 TGlzdC0xLjAuZHRkIj4KKzxwbGlzdCB2ZXJzaW9uPSIxLjAiPgorPGRpY3Q+CisJPGtleT5MU0Zp bGVRdWFyYW50aW5lRW5hYmxlZDwva2V5PgorCTx0cnVlLz4KKwk8a2V5PkNGQnVuZGxlRGV2ZWxv cG1lbnRSZWdpb248L2tleT4KKwk8c3RyaW5nPkVuZ2xpc2g8L3N0cmluZz4KKwk8a2V5PkNGQnVu ZGxlRXhlY3V0YWJsZTwva2V5PgorCTxzdHJpbmc+JHtQUk9EVUNUX05BTUV9PC9zdHJpbmc+CisJ PGtleT5DRkJ1bmRsZUdldEluZm9TdHJpbmc8L2tleT4KKwk8c3RyaW5nPiR7QlVORExFX1ZFUlNJ T059LCBDb3B5cmlnaHQgMjAwMy0yMDExIEFwcGxlIEluYy48L3N0cmluZz4KKwk8a2V5PkNGQnVu ZGxlSWRlbnRpZmllcjwva2V5PgorCTxzdHJpbmc+Y29tLmFwcGxlLiR7UFJPRFVDVF9OQU1FfTwv c3RyaW5nPgorCTxrZXk+Q0ZCdW5kbGVJbmZvRGljdGlvbmFyeVZlcnNpb248L2tleT4KKwk8c3Ry aW5nPjYuMDwvc3RyaW5nPgorCTxrZXk+Q0ZCdW5kbGVOYW1lPC9rZXk+CisJPHN0cmluZz4ke1BS T0RVQ1RfTkFNRX08L3N0cmluZz4KKwk8a2V5PkNGQnVuZGxlUGFja2FnZVR5cGU8L2tleT4KKwk8 c3RyaW5nPkFQUEw8L3N0cmluZz4KKwk8a2V5PkNGQnVuZGxlU2hvcnRWZXJzaW9uU3RyaW5nPC9r ZXk+CisJPHN0cmluZz4ke1NIT1JUX1ZFUlNJT05fU1RSSU5HfTwvc3RyaW5nPgorCTxrZXk+Q0ZC dW5kbGVWZXJzaW9uPC9rZXk+CisJPHN0cmluZz4ke0JVTkRMRV9WRVJTSU9OfTwvc3RyaW5nPgor CTxrZXk+TFNNaW5pbXVtU3lzdGVtVmVyc2lvbjwva2V5PgorCTxzdHJpbmc+JHtNQUNPU1hfREVQ TE9ZTUVOVF9UQVJHRVR9PC9zdHJpbmc+CisJPGtleT5OU1ByaW5jaXBhbENsYXNzPC9rZXk+CisJ PHN0cmluZz5OU0FwcGxpY2F0aW9uPC9zdHJpbmc+CisJPGtleT5MU1VJRWxlbWVudDwva2V5Pgor CTx0cnVlLz4KKzwvZGljdD4KKzwvcGxpc3Q+CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvTGF1bmNoZXIvbWFjL1Byb2Nlc3NMYXVuY2hlck1hYy5tbQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvbWFjL1Byb2Nlc3NMYXVuY2hlck1hYy5tbQko cmV2aXNpb24gODA1NzIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvbWFj L1Byb2Nlc3NMYXVuY2hlck1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMjAwLDggKzIwMCwxMyBA QCB2b2lkIFByb2Nlc3NMYXVuY2hlcjo6bGF1bmNoUHJvY2VzcygpCiAgICAgTlNTdHJpbmcgKmZy YW1ld29ya3NQYXRoID0gW1t3ZWJLaXQyQnVuZGxlIGJ1bmRsZVBhdGhdIHN0cmluZ0J5RGVsZXRp bmdMYXN0UGF0aENvbXBvbmVudF07CiAgICAgY29uc3QgY2hhciogZnJhbWV3b3JrRXhlY3V0YWJs ZVBhdGggPSBbW3dlYktpdDJCdW5kbGUgZXhlY3V0YWJsZVBhdGhdIGZpbGVTeXN0ZW1SZXByZXNl bnRhdGlvbl07CiAKLSAgICBOU1N0cmluZyAqd2ViUHJvY2Vzc0FwcFBhdGggPSBbd2ViS2l0MkJ1 bmRsZSBwYXRoRm9yQXV4aWxpYXJ5RXhlY3V0YWJsZTpAIldlYlByb2Nlc3MuYXBwIl07Ci0gICAg TlNTdHJpbmcgKndlYlByb2Nlc3NBcHBFeGVjdXRhYmxlUGF0aCA9IFtbTlNCdW5kbGUgYnVuZGxl V2l0aFBhdGg6d2ViUHJvY2Vzc0FwcFBhdGhdIGV4ZWN1dGFibGVQYXRoXTsKKyAgICBOU1N0cmlu ZyAqcHJvY2Vzc1BhdGg7CisgICAgaWYgKG1fbGF1bmNoT3B0aW9ucy5wcm9jZXNzVHlwZSA9PSBQ cm9jZXNzTGF1bmNoZXI6OlBsdWdpblByb2Nlc3MpCisgICAgICAgIHByb2Nlc3NQYXRoID0gW3dl YktpdDJCdW5kbGUgcGF0aEZvckF1eGlsaWFyeUV4ZWN1dGFibGU6QCJQbHVnaW5Qcm9jZXNzLmFw cCJdOworICAgIGVsc2UKKyAgICAgICAgcHJvY2Vzc1BhdGggPSBbd2ViS2l0MkJ1bmRsZSBwYXRo Rm9yQXV4aWxpYXJ5RXhlY3V0YWJsZTpAIldlYlByb2Nlc3MuYXBwIl07CisKKyAgICBOU1N0cmlu ZyAqcHJvY2Vzc0FwcEV4ZWN1dGFibGVQYXRoID0gW1tOU0J1bmRsZSBidW5kbGVXaXRoUGF0aDpw cm9jZXNzUGF0aF0gZXhlY3V0YWJsZVBhdGhdOwogCiAgICAgUmV0YWluUHRyPENGU3RyaW5nUmVm PiBjZkxvY2FsaXphdGlvbihBZG9wdENGLCBXS0NvcHlDRkxvY2FsaXphdGlvblByZWZlcnJlZE5h bWUoTlVMTCkpOwogICAgIENTdHJpbmcgbG9jYWxpemF0aW9uID0gU3RyaW5nKGNmTG9jYWxpemF0 aW9uLmdldCgpKS51dGY4KCk7CkBAIC0yMDksNyArMjE0LDcgQEAgdm9pZCBQcm9jZXNzTGF1bmNo ZXI6OmxhdW5jaFByb2Nlc3MoKQogICAgIC8vIE1ha2UgYSB1bmlxdWUsIHBlciBwaWQsIHBlciBw cm9jZXNzIGxhdW5jaGVyIHdlYiBwcm9jZXNzIHNlcnZpY2UgbmFtZS4KICAgICBDU3RyaW5nIHNl cnZpY2VOYW1lID0gU3RyaW5nOjpmb3JtYXQoImNvbS5hcHBsZS5XZWJLaXQuV2ViUHJvY2Vzcy0l ZC0lcCIsIGdldHBpZCgpLCB0aGlzKS51dGY4KCk7CiAKLSAgICBjb25zdCBjaGFyKiBhcmdzW10g PSB7IFt3ZWJQcm9jZXNzQXBwRXhlY3V0YWJsZVBhdGggZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9u XSwgZnJhbWV3b3JrRXhlY3V0YWJsZVBhdGgsICItdHlwZSIsIHByb2Nlc3NUeXBlQXNTdHJpbmco bV9sYXVuY2hPcHRpb25zLnByb2Nlc3NUeXBlKSwgIi1zZXJ2aWNlbmFtZSIsIHNlcnZpY2VOYW1l LmRhdGEoKSwgIi1sb2NhbGl6YXRpb24iLCBsb2NhbGl6YXRpb24uZGF0YSgpLCAwIH07CisgICAg Y29uc3QgY2hhciogYXJnc1tdID0geyBbcHJvY2Vzc0FwcEV4ZWN1dGFibGVQYXRoIGZpbGVTeXN0 ZW1SZXByZXNlbnRhdGlvbl0sIGZyYW1ld29ya0V4ZWN1dGFibGVQYXRoLCAiLXR5cGUiLCBwcm9j ZXNzVHlwZUFzU3RyaW5nKG1fbGF1bmNoT3B0aW9ucy5wcm9jZXNzVHlwZSksICItc2VydmljZW5h bWUiLCBzZXJ2aWNlTmFtZS5kYXRhKCksICItbG9jYWxpemF0aW9uIiwgbG9jYWxpemF0aW9uLmRh dGEoKSwgMCB9OwogCiAgICAgLy8gUmVnaXN0ZXIgb3Vyc2VsdmVzLgogICAgIGtlcm5fcmV0dXJu X3Qga3IgPSBib290c3RyYXBfcmVnaXN0ZXIyKGJvb3RzdHJhcF9wb3J0LCBjb25zdF9jYXN0PGNo YXIqPihzZXJ2aWNlTmFtZS5kYXRhKCkpLCBsaXN0ZW5pbmdQb3J0LCAwKTsKQEAgLTI1OSw3ICsy NjQsNyBAQCB2b2lkIFByb2Nlc3NMYXVuY2hlcjo6bGF1bmNoUHJvY2VzcygpCiAKICAgICBpZiAo bV9sYXVuY2hPcHRpb25zLnByb2Nlc3NUeXBlID09IFByb2Nlc3NMYXVuY2hlcjo6UGx1Z2luUHJv Y2VzcykgewogICAgICAgICAvLyBXZSBuZWVkIHRvIGluc2VydCB0aGUgcGx1Zy1pbiBwcm9jZXNz IHNoaW0uCi0gICAgICAgIE5TU3RyaW5nICpwbHVnaW5Qcm9jZXNzU2hpbVBhdGhOU1N0cmluZyA9 IFtbd2ViUHJvY2Vzc0FwcEV4ZWN1dGFibGVQYXRoIHN0cmluZ0J5RGVsZXRpbmdMYXN0UGF0aENv bXBvbmVudF0gc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiUGx1Z2luUHJvY2Vzc1No aW0uZHlsaWIiXTsKKyAgICAgICAgTlNTdHJpbmcgKnBsdWdpblByb2Nlc3NTaGltUGF0aE5TU3Ry aW5nID0gW1twcm9jZXNzQXBwRXhlY3V0YWJsZVBhdGggc3RyaW5nQnlEZWxldGluZ0xhc3RQYXRo Q29tcG9uZW50XSBzdHJpbmdCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6QCJQbHVnaW5Qcm9jZXNz U2hpbS5keWxpYiJdOwogICAgICAgICBjb25zdCBjaGFyKiBwbHVnaW5Qcm9jZXNzU2hpbVBhdGgg PSBbcGx1Z2luUHJvY2Vzc1NoaW1QYXRoTlNTdHJpbmcgZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9u XTsKIAogICAgICAgICAvLyBNYWtlIHN1cmUgdGhhdCB0aGUgZmlsZSBleGlzdHMuCkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShy ZXZpc2lvbiA4MDU3MikKKysrIFNvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtMTUsNiArMTUsNyBAQAogCQkJKTsKIAkJCWRl cGVuZGVuY2llcyA9ICgKIAkJCQkxQTUwREIzQzExMEEzQzE5MDAwRDNGRTUgLyogUEJYVGFyZ2V0 RGVwZW5kZW5jeSAqLywKKwkJCQlCQ0RFMEFDMTEzMjcyNzEyMDAxMjU5RkIgLyogUEJYVGFyZ2V0 RGVwZW5kZW5jeSAqLywKIAkJCSk7CiAJCQluYW1lID0gQWxsOwogCQkJcHJvZHVjdE5hbWUgPSBX ZWJLaXQyOwpAQCAtNjYsOCArNjcsNiBAQAogCQkxQTE4NzE4NTEyRUY5ODc3MDA4RTVGMzcgLyog TGF5ZXJUcmVlSG9zdE1hYy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDFBMTg3MTg0MTJFRjk4NzcwMDhFNUYzNyAvKiBMYXllclRyZWVIb3N0TWFjLm1t ICovOyB9OwogCQkxQTFDNEVDODEwRDA2MDk5MDA1RTY3RTcgLyogV2ViQ29yZS5mcmFtZXdvcmsg aW4gRnJhbWV3b3JrcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQUExQzc5 QTEwMEU3RkM1MDA3OERFQkMgLyogV2ViQ29yZS5mcmFtZXdvcmsgKi87IH07CiAJCTFBMUM2NDlC MTFGNDE3NDIwMDU1M0MxOSAvKiBXZWJDb250ZXh0TWFjLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUExQzY0ODYxMUY0MTVCNzAwNTUzQzE5IC8qIFdl YkNvbnRleHRNYWMubW0gKi87IH07Ci0JCTFBMUZBMjg1MTI3QTEzQkMwMDUwRTcwOSAvKiBOUE9i amVjdFByb3h5LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDFBMUZBMjg0MTI3QTEzQkMwMDUwRTcwOSAvKiBOUE9iamVjdFByb3h5LmNwcCAqLzsgfTsK LQkJMUExRkEzNUQxMjdBNDVCRjAwNTBFNzA5IC8qIE5QT2JqZWN0TWVzc2FnZVJlY2VpdmVyLmNw cCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBMUZBMzVD MTI3QTQ1QkYwMDUwRTcwOSAvKiBOUE9iamVjdE1lc3NhZ2VSZWNlaXZlci5jcHAgKi87IH07CiAJ CTFBMjE2MUIwMTFGMzc2NjQwMDhBRDBGNSAvKiBOUFJ1bnRpbWVPYmplY3RNYXAuaCBpbiBIZWFk ZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBMjE2MUFFMTFGMzc2NjQw MDhBRDBGNSAvKiBOUFJ1bnRpbWVPYmplY3RNYXAuaCAqLzsgfTsKIAkJMUEyMTYxQjExMUYzNzY2 NDAwOEFEMEY1IC8qIE5QUnVudGltZU9iamVjdE1hcC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTIxNjFBRjExRjM3NjY0MDA4QUQwRjUgLyogTlBS dW50aW1lT2JqZWN0TWFwLmNwcCAqLzsgfTsKIAkJMUEyMTYyQjAxMUYzODk3MTAwOEFEMEY1IC8q IE5QUnVudGltZVV0aWxpdGllcy5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSAxQTIxNjJBRTExRjM4OTcxMDA4QUQwRjUgLyogTlBSdW50aW1lVXRpbGl0 aWVzLmNwcCAqLzsgfTsKQEAgLTEyNSw3ICsxMjQsNiBAQAogCQkxQTY0MjE4NzEyRENGNDkyMDBD QUFFMkMgLyogRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUE2NDIxODUxMkRDRjQ5MjAwQ0FBRTJDIC8qIERyYXdp bmdBcmVhUHJveHlJbXBsLmNwcCAqLzsgfTsKIAkJMUE2NDIxRjYxMkRDRkJBQjAwQ0FBRTJDIC8q IERyYXdpbmdBcmVhSW1wbC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gMUE2NDIxRjQxMkRDRkJBQjAwQ0FBRTJDIC8qIERyYXdpbmdBcmVhSW1wbC5oICov OyB9OwogCQkxQTY0MjFGNzEyRENGQkFCMDBDQUFFMkMgLyogRHJhd2luZ0FyZWFJbXBsLmNwcCBp biBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBNjQyMUY1MTJE Q0ZCQUIwMENBQUUyQyAvKiBEcmF3aW5nQXJlYUltcGwuY3BwICovOyB9OwotCQkxQTY0MjI4QjEy REQwMjQ3MDBDQUFFMkMgLyogRHJhd2luZ0FyZWEubWVzc2FnZXMuaW4gaW4gQ29weUZpbGVzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBNjQyMjhBMTJERDAyNDcwMENBQUUy QyAvKiBEcmF3aW5nQXJlYS5tZXNzYWdlcy5pbiAqLzsgfTsKIAkJMUE2NDIyOTkxMkREMDI5MjAw Q0FBRTJDIC8qIERyYXdpbmdBcmVhTWVzc2FnZVJlY2VpdmVyLmNwcCBpbiBTb3VyY2VzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBNjQyMjk3MTJERDAyOTIwMENBQUUyQyAv KiBEcmF3aW5nQXJlYU1lc3NhZ2VSZWNlaXZlci5jcHAgKi87IH07CiAJCTFBNjQyMjlBMTJERDAy OTIwMENBQUUyQyAvKiBEcmF3aW5nQXJlYU1lc3NhZ2VzLmggaW4gSGVhZGVycyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTY0MjI5ODEyREQwMjkyMDBDQUFFMkMgLyogRHJh d2luZ0FyZWFNZXNzYWdlcy5oICovOyB9OwogCQkxQTY0MjMwODEyREQwOUVCMDBDQUFFMkMgLyog RHJhd2luZ0FyZWFQcm94eU1lc3NhZ2VSZWNlaXZlci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTY0MjMwNjEyREQwOUVCMDBDQUFFMkMgLyogRHJh d2luZ0FyZWFQcm94eU1lc3NhZ2VSZWNlaXZlci5jcHAgKi87IH07CkBAIC0yMDMsNyArMjAxLDYg QEAKIAkJMUFCN0Q3OEQxMjg4Q0Q5QTAwQ0ZEMDhDIC8qIFdLRG93bmxvYWQuaCBpbiBIZWFkZXJz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBQjdENzhCMTI4OENEOUEwMENG RDA4QyAvKiBXS0Rvd25sb2FkLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHVibGlj LCApOyB9OyB9OwogCQkxQUI3RDc4RTEyODhDRDlBMDBDRkQwOEMgLyogV0tEb3dubG9hZC5jcHAg aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQUI3RDc4QzEy ODhDRDlBMDBDRkQwOEMgLyogV0tEb3dubG9hZC5jcHAgKi87IH07CiAJCTFBQzI1RkMyMTJBNDhG NjAwMEJEMjY3MSAvKiBQbHVnaW5Qcm9jZXNzU2hpbS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQUMyNUY4QTEyQTQ4RTAzMDBCRDI2NzEgLyogUGx1 Z2luUHJvY2Vzc1NoaW0uY3BwICovOyB9OwotCQkxQUMyNUZEQzEyQTQ5MDI3MDBCRDI2NzEgLyog UGx1Z2luUHJvY2Vzc1NoaW0uZHlsaWIgaW4gQ29weSBQbHVnLWluIFByb2Nlc3MgU2hpbSAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQUMyNUZCMDEyQTQ4RUE3MDBCRDI2NzEg LyogUGx1Z2luUHJvY2Vzc1NoaW0uZHlsaWIgKi87IH07CiAJCTFBQzQxQUM3MTI2M0M4ODMwMDA1 NEU5NCAvKiBCaW5hcnlTZW1hcGhvcmUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDFBQzQxQUM1MTI2M0M4ODMwMDA1NEU5NCAvKiBCaW5hcnlTZW1hcGhv cmUuaCAqLzsgfTsKIAkJMUFDNDFBQzgxMjYzQzg4MzAwMDU0RTk0IC8qIEJpbmFyeVNlbWFwaG9y ZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQUM0 MUFDNjEyNjNDODgzMDAwNTRFOTQgLyogQmluYXJ5U2VtYXBob3JlLmNwcCAqLzsgfTsKIAkJMUFD ODZGRjMxMzBCNDZEMzAwMkMxMjU3IC8qIFdLUGx1Z2luU2l0ZURhdGFNYW5hZ2VyLmNwcCBpbiBT b3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBQzg2RkYxMTMwQjQ2 RDMwMDJDMTI1NyAvKiBXS1BsdWdpblNpdGVEYXRhTWFuYWdlci5jcHAgKi87IH07CkBAIC0zMzcs NyArMzM0LDYgQEAKIAkJNTFCMzAwNTAxMjUyOUQwRTAwMEI1Q0EwIC8qIFdlYkJhY2tGb3J3YXJk TGlzdENGLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDUxQjMwMDRFMTI1MjlEMEUwMDBCNUNBMCAvKiBXZWJCYWNrRm9yd2FyZExpc3RDRi5jcHAgKi87 IH07CiAJCTUxQjMwMDUxMTI1MjlEMEUwMDBCNUNBMCAvKiBXZWJQYWdlUHJveHlDRi5jcHAgaW4g U291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1MUIzMDA0RjEyNTI5 RDBFMDAwQjVDQTAgLyogV2ViUGFnZVByb3h5Q0YuY3BwICovOyB9OwogCQk2NTAxQkQxQTEyRjEy NDM0MDBFOUYyNDggLyogV0tCdW5kbGVJbnNwZWN0b3IuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNjVCODZGMTcxMkYxMUQ3QjAwQjdERDhBIC8qIFdL QnVuZGxlSW5zcGVjdG9yLmNwcCAqLzsgfTsKLQkJNjU0NkE4MkMxMzAwMDE2NDAwMENFQjFDIC8q IEluamVjdGVkQnVuZGxlUGFnZVJlc291cmNlTG9hZENsaWVudC5oIGluIENvcHlGaWxlcyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA2NTQ2QTgyQTEzMDAwMTY0MDAwQ0VCMUMg LyogSW5qZWN0ZWRCdW5kbGVQYWdlUmVzb3VyY2VMb2FkQ2xpZW50LmggKi87IH07CiAJCTY1OUM1 NTFFMTMwMDA2NDEwMDI1QzBDMiAvKiBJbmplY3RlZEJ1bmRsZVBhZ2VSZXNvdXJjZUxvYWRDbGll bnQuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNjU0 NkE4MjkxMzAwMDE2NDAwMENFQjFDIC8qIEluamVjdGVkQnVuZGxlUGFnZVJlc291cmNlTG9hZENs aWVudC5jcHAgKi87IH07CiAJCTY1Qjg2RjFFMTJGMTFERTMwMEI3REQ4QSAvKiBXS0J1bmRsZUlu c3BlY3Rvci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g NjVCODZGMTgxMkYxMUQ3QjAwQjdERDhBIC8qIFdLQnVuZGxlSW5zcGVjdG9yLmggKi87IHNldHRp bmdzID0ge0FUVFJJQlVURVMgPSAoUHVibGljLCApOyB9OyB9OwogCQk2RDhBOTFBNjExRjBFRkQx MDBERDAxRkUgLyogY29tLmFwcGxlLldlYlByb2Nlc3Muc2IgaW4gUmVzb3VyY2VzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDZEOEE5MUE1MTFGMEVGRDEwMEREMDFGRSAvKiBj b20uYXBwbGUuV2ViUHJvY2Vzcy5zYiAqLzsgfTsKQEAgLTY3Niw2ICs2NzIsMTAgQEAKIAkJQkNE REIzMkQxMjRFQzJFMTAwNDhEMTNDIC8qIFdLQVBJQ2FzdC5oIGluIEhlYWRlcnMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkNEREIzMkMxMjRFQzJFMTAwNDhEMTNDIC8qIFdL QVBJQ2FzdC5oICovOyB9OwogCQlCQ0RFMDU5QjExQ0RBOEFFMDBFNDFBRjEgLyogV2ViQ29udGV4 dEluamVjdGVkQnVuZGxlQ2xpZW50LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSBCQ0RFMDU5OTExQ0RBOEFFMDBFNDFBRjEgLyogV2ViQ29udGV4dEluamVj dGVkQnVuZGxlQ2xpZW50LmggKi87IH07CiAJCUJDREUwNTlDMTFDREE4QUUwMEU0MUFGMSAvKiBX ZWJDb250ZXh0SW5qZWN0ZWRCdW5kbGVDbGllbnQuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkNERTA1OUExMUNEQThBRTAwRTQxQUYxIC8qIFdlYkNv bnRleHRJbmplY3RlZEJ1bmRsZUNsaWVudC5jcHAgKi87IH07CisJCUJDREUwOTM5MTMyNzI0OTYw MDEyNTlGQiAvKiBjb20uYXBwbGUuV2ViUHJvY2Vzcy5zYiBpbiBSZXNvdXJjZXMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNkQ4QTkxQTUxMUYwRUZEMTAwREQwMUZFIC8qIGNv bS5hcHBsZS5XZWJQcm9jZXNzLnNiICovOyB9OworCQlCQ0RFMDkzQjEzMjcyNDk2MDAxMjU5RkIg LyogTWFpbk1hYy5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSAxQTZGQTMxMDExRTM5MjFFMDBEQjEzNzEgLyogTWFpbk1hYy5jcHAgKi87IH07CisJCUJD REUwOTNEMTMyNzI0OTYwMDEyNTlGQiAvKiBQbHVnaW5Qcm9jZXNzU2hpbS5keWxpYiBpbiBDb3B5 IFBsdWctaW4gUHJvY2VzcyBTaGltICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDFBQzI1RkIwMTJBNDhFQTcwMEJEMjY3MSAvKiBQbHVnaW5Qcm9jZXNzU2hpbS5keWxpYiAqLzsg fTsKKwkJQkNERTBBQkYxMzI3MjcwODAwMTI1OUZCIC8qIFBsdWdpblByb2Nlc3MuYXBwIGluIENv cHlGaWxlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCQ0RFMDk0MjEzMjcy NDk2MDAxMjU5RkIgLyogUGx1Z2luUHJvY2Vzcy5hcHAgKi87IH07CiAJCUJDRTIzMTVEMTIyQzMw Q0EwMEQ1QzM1QSAvKiBXZWJVUkxSZXF1ZXN0LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSBCQ0UyMzE1QjEyMkMzMENBMDBENUMzNUEgLyogV2ViVVJMUmVx dWVzdC5oICovOyB9OwogCQlCQ0UyMzE1RTEyMkMzMENBMDBENUMzNUEgLyogV2ViVVJMUmVxdWVz dC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCQ0Uy MzE1QzEyMkMzMENBMDBENUMzNUEgLyogV2ViVVJMUmVxdWVzdC5jcHAgKi87IH07CiAJCUJDRTIz MUMyMTIyQzQ2NkUwMEQ1QzM1QSAvKiBXZWJVUkxSZXF1ZXN0TWFjLm1tIGluIFNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkNFMjMxQzAxMjJDNDY2RTAwRDVDMzVB IC8qIFdlYlVSTFJlcXVlc3RNYWMubW0gKi87IH07CkBAIC03NDUsOCArNzQ1LDYgQEAKIAkJRTEz NEYwMTcxMkVBNUQzMzAwNEVDNThEIC8qIFdLUHJpbnRpbmdWaWV3LmggaW4gSGVhZGVycyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBFMTM0RjAxNTEyRUE1RDExMDA0RUM1OEQg LyogV0tQcmludGluZ1ZpZXcuaCAqLzsgfTsKIAkJRTEzNEYwMUExMkVBNUQ5OTAwNEVDNThEIC8q IFdLUHJpbnRpbmdWaWV3Lm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gRTEzNEYwMTkxMkVBNUQ5OTAwNEVDNThEIC8qIFdLUHJpbnRpbmdWaWV3Lm1tICov OyB9OwogCQlFMThDOTJGNDEyREI5RTcxMDBDRjJBRUIgLyogUHJpbnRJbmZvLmNwcCBpbiBTb3Vy Y2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEUxOEM5MkYzMTJEQjlFNzEw MENGMkFFQiAvKiBQcmludEluZm8uY3BwICovOyB9OwotCQlFMThDOTJGNTEyREI5RTdBMDBDRjJB RUIgLyogUHJpbnRJbmZvLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IEUxOEM5MkYzMTJEQjlFNzEwMENGMkFFQiAvKiBQcmludEluZm8uY3BwICovOyB9 OwotCQlFMThDOTJGNjEyREI5RTk0MDBDRjJBRUIgLyogUHJpbnRJbmZvTWFjLm1tIGluIFNvdXJj ZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRTFDQzFCOEYxMkQ3RUFERjAw NjI1ODM4IC8qIFByaW50SW5mb01hYy5tbSAqLzsgfTsKIAkJRTFCQjE2QTQxMzIwMUI5QjAwRjQ5 NDMxIC8qIEZ1bGxLZXlib2FyZEFjY2Vzc1dhdGNoZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEUxQkIxNjg4MTMyMDE4QkEwMEY0OTQzMSAvKiBGdWxs S2V5Ym9hcmRBY2Nlc3NXYXRjaGVyLmggKi87IH07CiAJCUUxQkIxNkE1MTMyMDFCOUIwMEY0OTQz MSAvKiBGdWxsS2V5Ym9hcmRBY2Nlc3NXYXRjaGVyLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRTFCQjE2ODkxMzIwMThCQTAwRjQ5NDMxIC8qIEZ1bGxL ZXlib2FyZEFjY2Vzc1dhdGNoZXIubW0gKi87IH07CiAJCUUxQ0MxQjkwMTJEN0VBREYwMDYyNTgz OCAvKiBQcmludEluZm8uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IEUxQ0MxQjhFMTJEN0VBREYwMDYyNTgzOCAvKiBQcmludEluZm8uaCAqLzsgfTsKQEAg LTc4OSwxOSArNzg3LDMzIEBACiAJCQlyZW1vdGVHbG9iYWxJRFN0cmluZyA9IDFBNTBEQjFEMTEw QTNCREMwMDBEM0ZFNTsKIAkJCXJlbW90ZUluZm8gPSBXZWJQcm9jZXNzOwogCQl9OwotCQkxQUMy NUZENzEyQTQ4RkQ1MDBCRDI2NzEgLyogUEJYQ29udGFpbmVySXRlbVByb3h5ICovID0geworCQkz N0Y3NDA3ODEyNzIxRjc0MDA5Mzg2OUIgLyogUEJYQ29udGFpbmVySXRlbVByb3h5ICovID0gewor CQkJaXNhID0gUEJYQ29udGFpbmVySXRlbVByb3h5OworCQkJY29udGFpbmVyUG9ydGFsID0gMDg2 N0Q2OTBGRTg0MDI4RkMwMkFBQzA3IC8qIFByb2plY3Qgb2JqZWN0ICovOworCQkJcHJveHlUeXBl ID0gMTsKKwkJCXJlbW90ZUdsb2JhbElEU3RyaW5nID0gQzBDRTcyODUxMjQ3RTY2ODAwQkMwRUM0 OworCQkJcmVtb3RlSW5mbyA9ICJEZXJpdmVkIFNvdXJjZXMiOworCQl9OworCQlCQ0RFMDkzNTEz MjcyNDk2MDAxMjU5RkIgLyogUEJYQ29udGFpbmVySXRlbVByb3h5ICovID0gewogCQkJaXNhID0g UEJYQ29udGFpbmVySXRlbVByb3h5OwogCQkJY29udGFpbmVyUG9ydGFsID0gMDg2N0Q2OTBGRTg0 MDI4RkMwMkFBQzA3IC8qIFByb2plY3Qgb2JqZWN0ICovOwogCQkJcHJveHlUeXBlID0gMTsKIAkJ CXJlbW90ZUdsb2JhbElEU3RyaW5nID0gMUFDMjVGQUYxMkE0OEVBNzAwQkQyNjcxOwogCQkJcmVt b3RlSW5mbyA9IFBsdWdpblByb2Nlc3NTaGltOwogCQl9OwotCQkzN0Y3NDA3ODEyNzIxRjc0MDA5 Mzg2OUIgLyogUEJYQ29udGFpbmVySXRlbVByb3h5ICovID0geworCQlCQ0RFMDkzNzEzMjcyNDk2 MDAxMjU5RkIgLyogUEJYQ29udGFpbmVySXRlbVByb3h5ICovID0gewogCQkJaXNhID0gUEJYQ29u dGFpbmVySXRlbVByb3h5OwogCQkJY29udGFpbmVyUG9ydGFsID0gMDg2N0Q2OTBGRTg0MDI4RkMw MkFBQzA3IC8qIFByb2plY3Qgb2JqZWN0ICovOwogCQkJcHJveHlUeXBlID0gMTsKLQkJCXJlbW90 ZUdsb2JhbElEU3RyaW5nID0gQzBDRTcyODUxMjQ3RTY2ODAwQkMwRUM0OwotCQkJcmVtb3RlSW5m byA9ICJEZXJpdmVkIFNvdXJjZXMiOworCQkJcmVtb3RlR2xvYmFsSURTdHJpbmcgPSA4REMyRUY0 RjA0ODZBNjk0MDA5OEIyMTY7CisJCQlyZW1vdGVJbmZvID0gV2ViS2l0MjsKKwkJfTsKKwkJQkNE RTBBQzAxMzI3MjcxMjAwMTI1OUZCIC8qIFBCWENvbnRhaW5lckl0ZW1Qcm94eSAqLyA9IHsKKwkJ CWlzYSA9IFBCWENvbnRhaW5lckl0ZW1Qcm94eTsKKwkJCWNvbnRhaW5lclBvcnRhbCA9IDA4NjdE NjkwRkU4NDAyOEZDMDJBQUMwNyAvKiBQcm9qZWN0IG9iamVjdCAqLzsKKwkJCXByb3h5VHlwZSA9 IDE7CisJCQlyZW1vdGVHbG9iYWxJRFN0cmluZyA9IEJDREUwOTMzMTMyNzI0OTYwMDEyNTlGQiAv KiBQbHVnaW4gUHJvY2VzcyAqLzsKKwkJCXJlbW90ZUluZm8gPSAiUGx1Z2luIFByb2Nlc3MiOwog CQl9OwogLyogRW5kIFBCWENvbnRhaW5lckl0ZW1Qcm94eSBzZWN0aW9uICovCiAKQEAgLTgxMywx OCArODI1LDE3IEBACiAJCQlkc3RTdWJmb2xkZXJTcGVjID0gMTsKIAkJCWZpbGVzID0gKAogCQkJ CTFBNTBEQjY2MTEwQTNENTcwMDBEM0ZFNSAvKiBXZWJQcm9jZXNzLmFwcCBpbiBDb3B5RmlsZXMg Ki8sCi0JCQkJMUE2NDIyOEIxMkREMDI0NzAwQ0FBRTJDIC8qIERyYXdpbmdBcmVhLm1lc3NhZ2Vz LmluIGluIENvcHlGaWxlcyAqLywKLQkJCQk2NTQ2QTgyQzEzMDAwMTY0MDAwQ0VCMUMgLyogSW5q ZWN0ZWRCdW5kbGVQYWdlUmVzb3VyY2VMb2FkQ2xpZW50LmggaW4gQ29weUZpbGVzICovLAorCQkJ CUJDREUwQUJGMTMyNzI3MDgwMDEyNTlGQiAvKiBQbHVnaW5Qcm9jZXNzLmFwcCBpbiBDb3B5Rmls ZXMgKi8sCiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7 CiAJCX07Ci0JCTFBQzI1RkREMTJBNDkwNDUwMEJEMjY3MSAvKiBDb3B5IFBsdWctaW4gUHJvY2Vz cyBTaGltICovID0geworCQlCQ0RFMDkzQzEzMjcyNDk2MDAxMjU5RkIgLyogQ29weSBQbHVnLWlu IFByb2Nlc3MgU2hpbSAqLyA9IHsKIAkJCWlzYSA9IFBCWENvcHlGaWxlc0J1aWxkUGhhc2U7CiAJ CQlidWlsZEFjdGlvbk1hc2sgPSAyMTQ3NDgzNjQ3OwotCQkJZHN0UGF0aCA9IFdlYlByb2Nlc3Mu YXBwL0NvbnRlbnRzL01hY09TOworCQkJZHN0UGF0aCA9IFBsdWdpblByb2Nlc3MuYXBwL0NvbnRl bnRzL01hY09TOwogCQkJZHN0U3ViZm9sZGVyU3BlYyA9IDE2OwogCQkJZmlsZXMgPSAoCi0JCQkJ MUFDMjVGREMxMkE0OTAyNzAwQkQyNjcxIC8qIFBsdWdpblByb2Nlc3NTaGltLmR5bGliIGluIENv cHkgUGx1Zy1pbiBQcm9jZXNzIFNoaW0gKi8sCisJCQkJQkNERTA5M0QxMzI3MjQ5NjAwMTI1OUZC IC8qIFBsdWdpblByb2Nlc3NTaGltLmR5bGliIGluIENvcHkgUGx1Zy1pbiBQcm9jZXNzIFNoaW0g Ki8sCiAJCQkpOwogCQkJbmFtZSA9ICJDb3B5IFBsdWctaW4gUHJvY2VzcyBTaGltIjsKIAkJCXJ1 bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwpAQCAtMTI1Nyw2ICsxMjY4LDgg QEAKIAkJQkMxMTFCNEMxMTJGNjE5MjAwMzM3QkFCIC8qIFBhZ2VDbGllbnRJbXBsLm1tICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gUGFnZUNsaWVudEltcGwubW07IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUJDMTExQjVCMTEyRjYyOTgwMDMzN0JBQiAvKiBX ZWJFdmVudEZhY3RvcnkuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViRXZl bnRGYWN0b3J5Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUJDMTExQjVDMTEyRjYy OTgwMDMzN0JBQiAvKiBXZWJFdmVudEZhY3RvcnkubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNw cC5vYmpjcHA7IHBhdGggPSBXZWJFdmVudEZhY3RvcnkubW07IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CisJCUJDMTIyRkEzMTMyNzA3RjMwMEY3RUFDMSAvKiBQbHVnaW5Qcm9jZXNzLnhjY29u ZmlnICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4 dC54Y2NvbmZpZzsgcGF0aCA9IFBsdWdpblByb2Nlc3MueGNjb25maWc7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CisJCUJDMTIyRkE2MTMyNzA4NzQwMEY3RUFDMSAvKiBJbmZvLnBsaXN0ICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5wbGlz dC54bWw7IG5hbWUgPSBJbmZvLnBsaXN0OyBwYXRoID0gUGx1Z2luUHJvY2Vzcy9JbmZvLnBsaXN0 OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlCQzEzMUJDODExNzI2QzI4MDBCNjk3Mjcg LyogQ29yZUlQQ01lc3NhZ2VLaW5kcy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGgg PSBDb3JlSVBDTWVzc2FnZUtpbmRzLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUJD MTRERjc1MTIwQjVCNzkwMDgyNkMwQyAvKiBJbmplY3RlZEJ1bmRsZVNjcmlwdFdvcmxkLmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEluamVjdGVkQnVuZGxlU2NyaXB0V29ybGQu aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQkMxNERGNzYxMjBCNUI3OTAwODI2QzBD IC8qIEluamVjdGVkQnVuZGxlU2NyaXB0V29ybGQuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j cHAuY3BwOyBwYXRoID0gSW5qZWN0ZWRCdW5kbGVTY3JpcHRXb3JsZC5jcHA7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CkBAIC0xNTEzLDYgKzE1MjYsNyBAQAogCQlCQ0REQjMyQzEyNEVDMkUx MDA0OEQxM0MgLyogV0tBUElDYXN0LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9 IFdLQVBJQ2FzdC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlCQ0RFMDU5OTExQ0RB OEFFMDBFNDFBRjEgLyogV2ViQ29udGV4dEluamVjdGVkQnVuZGxlQ2xpZW50LmggKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdlYkNvbnRleHRJbmplY3RlZEJ1bmRsZUNsaWVudC5o OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlCQ0RFMDU5QTExQ0RBOEFFMDBFNDFBRjEg LyogV2ViQ29udGV4dEluamVjdGVkQnVuZGxlQ2xpZW50LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuY3BwLmNwcDsgcGF0aCA9IFdlYkNvbnRleHRJbmplY3RlZEJ1bmRsZUNsaWVudC5jcHA7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCUJDREUwOTQyMTMyNzI0OTYwMDEyNTlGQiAvKiBQ bHVnaW5Qcm9jZXNzLmFwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBleHBsaWNpdEZp bGVUeXBlID0gd3JhcHBlci5hcHBsaWNhdGlvbjsgaW5jbHVkZUluSW5kZXggPSAwOyBwYXRoID0g UGx1Z2luUHJvY2Vzcy5hcHA7IHNvdXJjZVRyZWUgPSBCVUlMVF9QUk9EVUNUU19ESVI7IH07CiAJ CUJDRTIzMTVCMTIyQzMwQ0EwMEQ1QzM1QSAvKiBXZWJVUkxSZXF1ZXN0LmggKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdlYlVSTFJlcXVlc3QuaDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKIAkJQkNFMjMxNUMxMjJDMzBDQTAwRDVDMzVBIC8qIFdlYlVSTFJlcXVlc3QuY3Bw ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93 bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gV2ViVVJMUmVxdWVzdC5jcHA7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUJDRTIzMUMwMTIyQzQ2NkUwMEQ1QzM1QSAv KiBXZWJVUkxSZXF1ZXN0TWFjLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVF bmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBw YXRoID0gV2ViVVJMUmVxdWVzdE1hYy5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAg LTE2NTYsNiArMTY3MCw3IEBACiAJCQkJOERDMkVGNUIwNDg2QTY5NDAwOThCMjE2IC8qIFdlYktp dDIuZnJhbWV3b3JrICovLAogCQkJCTFBNTBEQjFFMTEwQTNCREMwMDBEM0ZFNSAvKiBXZWJQcm9j ZXNzLmFwcCAqLywKIAkJCQkxQUMyNUZCMDEyQTQ4RUE3MDBCRDI2NzEgLyogUGx1Z2luUHJvY2Vz c1NoaW0uZHlsaWIgKi8sCisJCQkJQkNERTA5NDIxMzI3MjQ5NjAwMTI1OUZCIC8qIFBsdWdpblBy b2Nlc3MuYXBwICovLAogCQkJKTsKIAkJCW5hbWUgPSBQcm9kdWN0czsKIAkJCXNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7CkBAIC0xNjk3LDYgKzE3MTIsNyBAQAogCQkwODlDMTY2NUZFODQxMTU4QzAy QUFDMDcgLyogUmVzb3VyY2VzICovID0gewogCQkJaXNhID0gUEJYR3JvdXA7CiAJCQljaGlsZHJl biA9ICgKKwkJCQlCQzEyMkZBNTEzMjcwODVEMDBGN0VBQzEgLyogUGx1Z2luUHJvY2VzcyAqLywK IAkJCQlCQzhBNTAwRTExNzY1QUQ0MDA3NTc1NzMgLyogV2ViS2l0MiAqLywKIAkJCQlCQzhBNTAw RjExNzY1QUUzMDA3NTc1NzMgLyogV2ViUHJvY2VzcyAqLywKIAkJCQk2RDhBOTFBNTExRjBFRkQx MDBERDAxRkUgLyogY29tLmFwcGxlLldlYlByb2Nlc3Muc2IgKi8sCkBAIC0xNzg4LDYgKzE4MDQs NyBAQAogCQkJCTVEQUQ3M0YxMTE2RkY5MEMwMEVFNTM5NiAvKiBCYXNlVGFyZ2V0LnhjY29uZmln ICovLAogCQkJCTFBNEY5NzZCMTAwRTdCNjYwMDYzN0ExOCAvKiBEZWJ1Z1JlbGVhc2UueGNjb25m aWcgKi8sCiAJCQkJMUE0Rjk3NkMxMDBFN0I2NjAwNjM3QTE4IC8qIEZlYXR1cmVEZWZpbmVzLnhj Y29uZmlnICovLAorCQkJCUJDMTIyRkEzMTMyNzA3RjMwMEY3RUFDMSAvKiBQbHVnaW5Qcm9jZXNz LnhjY29uZmlnICovLAogCQkJCTFBQzI1RkJCMTJBNDhFREEwMEJEMjY3MSAvKiBQbHVnaW5Qcm9j ZXNzU2hpbS54Y2NvbmZpZyAqLywKIAkJCQkxQTRGOTc2RTEwMEU3QjY2MDA2MzdBMTggLyogVmVy c2lvbi54Y2NvbmZpZyAqLywKIAkJCQlCQ0I4NkY0QjExNkFBQUNEMDBDRTIwQjcgLyogV2ViS2l0 Mi54Y2NvbmZpZyAqLywKQEAgLTI2MjAsNiArMjYzNywxNCBAQAogCQkJcGF0aCA9IENvcmVJUENT dXBwb3J0OwogCQkJc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsKIAkJfTsKKwkJQkMxMjJGQTUxMzI3 MDg1RDAwRjdFQUMxIC8qIFBsdWdpblByb2Nlc3MgKi8gPSB7CisJCQlpc2EgPSBQQlhHcm91cDsK KwkJCWNoaWxkcmVuID0gKAorCQkJCUJDMTIyRkE2MTMyNzA4NzQwMEY3RUFDMSAvKiBJbmZvLnBs aXN0ICovLAorCQkJKTsKKwkJCW5hbWUgPSBQbHVnaW5Qcm9jZXNzOworCQkJc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsKKwkJfTsKIAkJQkMyMDRFREYxMUM4M0U3MjAwOEYzMzc1IC8qIEluamVjdGVk QnVuZGxlICovID0gewogCQkJaXNhID0gUEJYR3JvdXA7CiAJCQljaGlsZHJlbiA9ICgKQEAgLTM0 MDksMTIgKzM0MzQsMTAgQEAKIAkJCWJ1aWxkUGhhc2VzID0gKAogCQkJCTFBNTBEQjFBMTEwQTNC REMwMDBEM0ZFNSAvKiBSZXNvdXJjZXMgKi8sCiAJCQkJMUE1MERCMUIxMTBBM0JEQzAwMEQzRkU1 IC8qIFNvdXJjZXMgKi8sCi0JCQkJMUFDMjVGREQxMkE0OTA0NTAwQkQyNjcxIC8qIENvcHkgUGx1 Zy1pbiBQcm9jZXNzIFNoaW0gKi8sCiAJCQkpOwogCQkJYnVpbGRSdWxlcyA9ICgKIAkJCSk7CiAJ CQlkZXBlbmRlbmNpZXMgPSAoCi0JCQkJMUFDMjVGRDgxMkE0OEZENTAwQkQyNjcxIC8qIFBCWFRh cmdldERlcGVuZGVuY3kgKi8sCiAJCQkJMUE1MERCMjcxMTBBM0JFRjAwMEQzRkU1IC8qIFBCWFRh cmdldERlcGVuZGVuY3kgKi8sCiAJCQkpOwogCQkJbmFtZSA9IFdlYlByb2Nlc3M7CkBAIC0zNDY0 LDYgKzM0ODcsMjUgQEAKIAkJCXByb2R1Y3RSZWZlcmVuY2UgPSA4REMyRUY1QjA0ODZBNjk0MDA5 OEIyMTYgLyogV2ViS2l0Mi5mcmFtZXdvcmsgKi87CiAJCQlwcm9kdWN0VHlwZSA9ICJjb20uYXBw bGUucHJvZHVjdC10eXBlLmZyYW1ld29yayI7CiAJCX07CisJCUJDREUwOTMzMTMyNzI0OTYwMDEy NTlGQiAvKiBQbHVnaW4gUHJvY2VzcyAqLyA9IHsKKwkJCWlzYSA9IFBCWE5hdGl2ZVRhcmdldDsK KwkJCWJ1aWxkQ29uZmlndXJhdGlvbkxpc3QgPSBCQ0RFMDkzRTEzMjcyNDk2MDAxMjU5RkIgLyog QnVpbGQgY29uZmlndXJhdGlvbiBsaXN0IGZvciBQQlhOYXRpdmVUYXJnZXQgIlBsdWdpbiBQcm9j ZXNzIiAqLzsKKwkJCWJ1aWxkUGhhc2VzID0gKAorCQkJCUJDREUwOTM4MTMyNzI0OTYwMDEyNTlG QiAvKiBSZXNvdXJjZXMgKi8sCisJCQkJQkNERTA5M0ExMzI3MjQ5NjAwMTI1OUZCIC8qIFNvdXJj ZXMgKi8sCisJCQkJQkNERTA5M0MxMzI3MjQ5NjAwMTI1OUZCIC8qIENvcHkgUGx1Zy1pbiBQcm9j ZXNzIFNoaW0gKi8sCisJCQkpOworCQkJYnVpbGRSdWxlcyA9ICgKKwkJCSk7CisJCQlkZXBlbmRl bmNpZXMgPSAoCisJCQkJQkNERTA5MzQxMzI3MjQ5NjAwMTI1OUZCIC8qIFBCWFRhcmdldERlcGVu ZGVuY3kgKi8sCisJCQkJQkNERTA5MzYxMzI3MjQ5NjAwMTI1OUZCIC8qIFBCWFRhcmdldERlcGVu ZGVuY3kgKi8sCisJCQkpOworCQkJbmFtZSA9ICJQbHVnaW4gUHJvY2VzcyI7CisJCQlwcm9kdWN0 TmFtZSA9IFdlYlByb2Nlc3M7CisJCQlwcm9kdWN0UmVmZXJlbmNlID0gQkNERTA5NDIxMzI3MjQ5 NjAwMTI1OUZCIC8qIFBsdWdpblByb2Nlc3MuYXBwICovOworCQkJcHJvZHVjdFR5cGUgPSAiY29t LmFwcGxlLnByb2R1Y3QtdHlwZS5hcHBsaWNhdGlvbiI7CisJCX07CiAvKiBFbmQgUEJYTmF0aXZl VGFyZ2V0IHNlY3Rpb24gKi8KIAogLyogQmVnaW4gUEJYUHJvamVjdCBzZWN0aW9uICovCkBAIC0z NDg3LDYgKzM1MjksNyBAQAogCQkJCTFBNTBEQjM4MTEwQTNDMTMwMDBEM0ZFNSAvKiBBbGwgKi8s CiAJCQkJOERDMkVGNEYwNDg2QTY5NDAwOThCMjE2IC8qIFdlYktpdDIgKi8sCiAJCQkJMUE1MERC MUQxMTBBM0JEQzAwMEQzRkU1IC8qIFdlYlByb2Nlc3MgKi8sCisJCQkJQkNERTA5MzMxMzI3MjQ5 NjAwMTI1OUZCIC8qIFBsdWdpbiBQcm9jZXNzICovLAogCQkJCUMwQ0U3Mjg1MTI0N0U2NjgwMEJD MEVDNCAvKiBEZXJpdmVkIFNvdXJjZXMgKi8sCiAJCQkJMUFDMjVGQUYxMkE0OEVBNzAwQkQyNjcx IC8qIFBsdWdpblByb2Nlc3NTaGltICovLAogCQkJKTsKQEAgLTM1MTAsNiArMzU1MywxNCBAQAog CQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQl9Owor CQlCQ0RFMDkzODEzMjcyNDk2MDAxMjU5RkIgLyogUmVzb3VyY2VzICovID0geworCQkJaXNhID0g UEJYUmVzb3VyY2VzQnVpbGRQaGFzZTsKKwkJCWJ1aWxkQWN0aW9uTWFzayA9IDIxNDc0ODM2NDc7 CisJCQlmaWxlcyA9ICgKKwkJCQlCQ0RFMDkzOTEzMjcyNDk2MDAxMjU5RkIgLyogY29tLmFwcGxl LldlYlByb2Nlc3Muc2IgaW4gUmVzb3VyY2VzICovLAorCQkJKTsKKwkJCXJ1bk9ubHlGb3JEZXBs b3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOworCQl9OwogLyogRW5kIFBCWFJlc291cmNlc0J1aWxk UGhhc2Ugc2VjdGlvbiAqLwogCiAvKiBCZWdpbiBQQlhTaGVsbFNjcmlwdEJ1aWxkUGhhc2Ugc2Vj dGlvbiAqLwpAQCAtMzYwOCwxMCArMzY1OSw2IEBACiAJCQlidWlsZEFjdGlvbk1hc2sgPSAyMTQ3 NDgzNjQ3OwogCQkJZmlsZXMgPSAoCiAJCQkJMUE2RkEzMTExMUUzOTIxRTAwREIxMzcxIC8qIE1h aW5NYWMuY3BwIGluIFNvdXJjZXMgKi8sCi0JCQkJMUExRkEyODUxMjdBMTNCQzAwNTBFNzA5IC8q IE5QT2JqZWN0UHJveHkuY3BwIGluIFNvdXJjZXMgKi8sCi0JCQkJMUExRkEzNUQxMjdBNDVCRjAw NTBFNzA5IC8qIE5QT2JqZWN0TWVzc2FnZVJlY2VpdmVyLmNwcCBpbiBTb3VyY2VzICovLAotCQkJ CUUxOEM5MkY1MTJEQjlFN0EwMENGMkFFQiAvKiBQcmludEluZm8uY3BwIGluIFNvdXJjZXMgKi8s Ci0JCQkJRTE4QzkyRjYxMkRCOUU5NDAwQ0YyQUVCIC8qIFByaW50SW5mb01hYy5tbSBpbiBTb3Vy Y2VzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAw OwogCQl9OwpAQCAtMzk3OSw2ICs0MDI2LDE0IEBACiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxv eW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7CiAJCX07CisJCUJDREUwOTNBMTMyNzI0OTYwMDEyNTlG QiAvKiBTb3VyY2VzICovID0geworCQkJaXNhID0gUEJYU291cmNlc0J1aWxkUGhhc2U7CisJCQli dWlsZEFjdGlvbk1hc2sgPSAyMTQ3NDgzNjQ3OworCQkJZmlsZXMgPSAoCisJCQkJQkNERTA5M0Ix MzI3MjQ5NjAwMTI1OUZCIC8qIE1haW5NYWMuY3BwIGluIFNvdXJjZXMgKi8sCisJCQkpOworCQkJ cnVuT25seUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7CisJCX07CiAvKiBFbmQgUEJY U291cmNlc0J1aWxkUGhhc2Ugc2VjdGlvbiAqLwogCiAvKiBCZWdpbiBQQlhUYXJnZXREZXBlbmRl bmN5IHNlY3Rpb24gKi8KQEAgLTM5OTIsMTYgKzQwNDcsMjYgQEAKIAkJCXRhcmdldCA9IDFBNTBE QjFEMTEwQTNCREMwMDBEM0ZFNSAvKiBXZWJQcm9jZXNzICovOwogCQkJdGFyZ2V0UHJveHkgPSAx QTUwREIzQjExMEEzQzE5MDAwRDNGRTUgLyogUEJYQ29udGFpbmVySXRlbVByb3h5ICovOwogCQl9 OwotCQkxQUMyNUZEODEyQTQ4RkQ1MDBCRDI2NzEgLyogUEJYVGFyZ2V0RGVwZW5kZW5jeSAqLyA9 IHsKLQkJCWlzYSA9IFBCWFRhcmdldERlcGVuZGVuY3k7Ci0JCQl0YXJnZXQgPSAxQUMyNUZBRjEy QTQ4RUE3MDBCRDI2NzEgLyogUGx1Z2luUHJvY2Vzc1NoaW0gKi87Ci0JCQl0YXJnZXRQcm94eSA9 IDFBQzI1RkQ3MTJBNDhGRDUwMEJEMjY3MSAvKiBQQlhDb250YWluZXJJdGVtUHJveHkgKi87Ci0J CX07CiAJCTM3Rjc0MDc5MTI3MjFGNzQwMDkzODY5QiAvKiBQQlhUYXJnZXREZXBlbmRlbmN5ICov ID0gewogCQkJaXNhID0gUEJYVGFyZ2V0RGVwZW5kZW5jeTsKIAkJCXRhcmdldCA9IEMwQ0U3Mjg1 MTI0N0U2NjgwMEJDMEVDNCAvKiBEZXJpdmVkIFNvdXJjZXMgKi87CiAJCQl0YXJnZXRQcm94eSA9 IDM3Rjc0MDc4MTI3MjFGNzQwMDkzODY5QiAvKiBQQlhDb250YWluZXJJdGVtUHJveHkgKi87CiAJ CX07CisJCUJDREUwOTM0MTMyNzI0OTYwMDEyNTlGQiAvKiBQQlhUYXJnZXREZXBlbmRlbmN5ICov ID0geworCQkJaXNhID0gUEJYVGFyZ2V0RGVwZW5kZW5jeTsKKwkJCXRhcmdldCA9IDFBQzI1RkFG MTJBNDhFQTcwMEJEMjY3MSAvKiBQbHVnaW5Qcm9jZXNzU2hpbSAqLzsKKwkJCXRhcmdldFByb3h5 ID0gQkNERTA5MzUxMzI3MjQ5NjAwMTI1OUZCIC8qIFBCWENvbnRhaW5lckl0ZW1Qcm94eSAqLzsK KwkJfTsKKwkJQkNERTA5MzYxMzI3MjQ5NjAwMTI1OUZCIC8qIFBCWFRhcmdldERlcGVuZGVuY3kg Ki8gPSB7CisJCQlpc2EgPSBQQlhUYXJnZXREZXBlbmRlbmN5OworCQkJdGFyZ2V0ID0gOERDMkVG NEYwNDg2QTY5NDAwOThCMjE2IC8qIFdlYktpdDIgKi87CisJCQl0YXJnZXRQcm94eSA9IEJDREUw OTM3MTMyNzI0OTYwMDEyNTlGQiAvKiBQQlhDb250YWluZXJJdGVtUHJveHkgKi87CisJCX07CisJ CUJDREUwQUMxMTMyNzI3MTIwMDEyNTlGQiAvKiBQQlhUYXJnZXREZXBlbmRlbmN5ICovID0gewor CQkJaXNhID0gUEJYVGFyZ2V0RGVwZW5kZW5jeTsKKwkJCXRhcmdldCA9IEJDREUwOTMzMTMyNzI0 OTYwMDEyNTlGQiAvKiBQbHVnaW4gUHJvY2VzcyAqLzsKKwkJCXRhcmdldFByb3h5ID0gQkNERTBB QzAxMzI3MjcxMjAwMTI1OUZCIC8qIFBCWENvbnRhaW5lckl0ZW1Qcm94eSAqLzsKKwkJfTsKIC8q IEVuZCBQQlhUYXJnZXREZXBlbmRlbmN5IHNlY3Rpb24gKi8KIAogLyogQmVnaW4gUEJYVmFyaWFu dEdyb3VwIHNlY3Rpb24gKi8KQEAgLTQxMzcsNiArNDIwMiwyNyBAQAogCQkJfTsKIAkJCW5hbWUg PSBQcm9kdWN0aW9uOwogCQl9OworCQlCQ0RFMDkzRjEzMjcyNDk2MDAxMjU5RkIgLyogRGVidWcg Ki8gPSB7CisJCQlpc2EgPSBYQ0J1aWxkQ29uZmlndXJhdGlvbjsKKwkJCWJhc2VDb25maWd1cmF0 aW9uUmVmZXJlbmNlID0gQkMxMjJGQTMxMzI3MDdGMzAwRjdFQUMxIC8qIFBsdWdpblByb2Nlc3Mu eGNjb25maWcgKi87CisJCQlidWlsZFNldHRpbmdzID0geworCQkJfTsKKwkJCW5hbWUgPSBEZWJ1 ZzsKKwkJfTsKKwkJQkNERTA5NDAxMzI3MjQ5NjAwMTI1OUZCIC8qIFJlbGVhc2UgKi8gPSB7CisJ CQlpc2EgPSBYQ0J1aWxkQ29uZmlndXJhdGlvbjsKKwkJCWJhc2VDb25maWd1cmF0aW9uUmVmZXJl bmNlID0gNURBRDcyOTQxMTZGRjcwQjAwRUU1Mzk2IC8qIFdlYlByb2Nlc3MueGNjb25maWcgKi87 CisJCQlidWlsZFNldHRpbmdzID0geworCQkJfTsKKwkJCW5hbWUgPSBSZWxlYXNlOworCQl9Owor CQlCQ0RFMDk0MTEzMjcyNDk2MDAxMjU5RkIgLyogUHJvZHVjdGlvbiAqLyA9IHsKKwkJCWlzYSA9 IFhDQnVpbGRDb25maWd1cmF0aW9uOworCQkJYmFzZUNvbmZpZ3VyYXRpb25SZWZlcmVuY2UgPSA1 REFENzI5NDExNkZGNzBCMDBFRTUzOTYgLyogV2ViUHJvY2Vzcy54Y2NvbmZpZyAqLzsKKwkJCWJ1 aWxkU2V0dGluZ3MgPSB7CisJCQl9OworCQkJbmFtZSA9IFByb2R1Y3Rpb247CisJCX07CiAJCUMw Q0U3Mjg2MTI0N0U2NjgwMEJDMEVDNCAvKiBEZWJ1ZyAqLyA9IHsKIAkJCWlzYSA9IFhDQnVpbGRD b25maWd1cmF0aW9uOwogCQkJYnVpbGRTZXR0aW5ncyA9IHsKQEAgLTQyMTgsNiArNDMwNCwxNiBA QAogCQkJZGVmYXVsdENvbmZpZ3VyYXRpb25Jc1Zpc2libGUgPSAwOwogCQkJZGVmYXVsdENvbmZp Z3VyYXRpb25OYW1lID0gUHJvZHVjdGlvbjsKIAkJfTsKKwkJQkNERTA5M0UxMzI3MjQ5NjAwMTI1 OUZCIC8qIEJ1aWxkIGNvbmZpZ3VyYXRpb24gbGlzdCBmb3IgUEJYTmF0aXZlVGFyZ2V0ICJQbHVn aW4gUHJvY2VzcyIgKi8gPSB7CisJCQlpc2EgPSBYQ0NvbmZpZ3VyYXRpb25MaXN0OworCQkJYnVp bGRDb25maWd1cmF0aW9ucyA9ICgKKwkJCQlCQ0RFMDkzRjEzMjcyNDk2MDAxMjU5RkIgLyogRGVi dWcgKi8sCisJCQkJQkNERTA5NDAxMzI3MjQ5NjAwMTI1OUZCIC8qIFJlbGVhc2UgKi8sCisJCQkJ QkNERTA5NDExMzI3MjQ5NjAwMTI1OUZCIC8qIFByb2R1Y3Rpb24gKi8sCisJCQkpOworCQkJZGVm YXVsdENvbmZpZ3VyYXRpb25Jc1Zpc2libGUgPSAwOworCQkJZGVmYXVsdENvbmZpZ3VyYXRpb25O YW1lID0gUHJvZHVjdGlvbjsKKwkJfTsKIAkJQzBDRTcyODkxMjQ3RTY4NjAwQkMwRUM0IC8qIEJ1 aWxkIGNvbmZpZ3VyYXRpb24gbGlzdCBmb3IgUEJYQWdncmVnYXRlVGFyZ2V0ICJEZXJpdmVkIFNv dXJjZXMiICovID0gewogCQkJaXNhID0gWENDb25maWd1cmF0aW9uTGlzdDsKIAkJCWJ1aWxkQ29u ZmlndXJhdGlvbnMgPSAoCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luZm8ucGxp c3QKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmZvLnBsaXN0CShy ZXZpc2lvbiA4MDU3MikKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5mby5wbGlzdAko d29ya2luZyBjb3B5KQpAQCAtMiw4ICsyLDYgQEAKIDwhRE9DVFlQRSBwbGlzdCBQVUJMSUMgIi0v L0FwcGxlLy9EVEQgUExJU1QgMS4wLy9FTiIgImh0dHA6Ly93d3cuYXBwbGUuY29tL0RURHMvUHJv cGVydHlMaXN0LTEuMC5kdGQiPgogPHBsaXN0IHZlcnNpb249IjEuMCI+CiA8ZGljdD4KLQk8a2V5 PkxTRmlsZVF1YXJhbnRpbmVFbmFibGVkPC9rZXk+Ci0JPHRydWUvPgogCTxrZXk+Q0ZCdW5kbGVE ZXZlbG9wbWVudFJlZ2lvbjwva2V5PgogCTxzdHJpbmc+RW5nbGlzaDwvc3RyaW5nPgogCTxrZXk+ Q0ZCdW5kbGVFeGVjdXRhYmxlPC9rZXk+CkBAIC0yMiwxMSArMjAsMTMgQEAKIAk8c3RyaW5nPiR7 U0hPUlRfVkVSU0lPTl9TVFJJTkd9PC9zdHJpbmc+CiAJPGtleT5DRkJ1bmRsZVZlcnNpb248L2tl eT4KIAk8c3RyaW5nPiR7QlVORExFX1ZFUlNJT059PC9zdHJpbmc+CisJPGtleT5MU0ZpbGVRdWFy YW50aW5lRW5hYmxlZDwva2V5PgorCTx0cnVlLz4KIAk8a2V5PkxTTWluaW11bVN5c3RlbVZlcnNp b248L2tleT4KIAk8c3RyaW5nPiR7TUFDT1NYX0RFUExPWU1FTlRfVEFSR0VUfTwvc3RyaW5nPgot CTxrZXk+TlNQcmluY2lwYWxDbGFzczwva2V5PgotCTxzdHJpbmc+TlNBcHBsaWNhdGlvbjwvc3Ry aW5nPgogCTxrZXk+TFNVSUVsZW1lbnQ8L2tleT4KIAk8dHJ1ZS8+CisJPGtleT5OU1ByaW5jaXBh bENsYXNzPC9rZXk+CisJPHN0cmluZz5OU0FwcGxpY2F0aW9uPC9zdHJpbmc+CiA8L2RpY3Q+CiA8 L3BsaXN0Pgo=