185146 2018-04-30 15:15:34 -0700 Remove unused mac/CookieStorageShimLibrary 2018-04-30 17:43:20 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 msaboff msaboff achristensen commit-queue webkit-bug-importer oldest_to_newest 1419137 0 msaboff 2018-04-30 15:15:34 -0700 The shim library code in WebKit/Shared/mac/CookieStorageShimLibrary.{h, cpp} is not referenced in the source tree and can be removed. 1419139 1 339154 msaboff 2018-04-30 15:17:24 -0700 Created attachment 339154 Patch 1419195 2 339154 commit-queue 2018-04-30 17:42:37 -0700 Comment on attachment 339154 Patch Clearing flags on attachment: 339154 Committed r231189: <https://trac.webkit.org/changeset/231189> 1419196 3 commit-queue 2018-04-30 17:42:38 -0700 All reviewed patches have been landed. Closing bug. 1419197 4 webkit-bug-importer 2018-04-30 17:43:20 -0700 <rdar://problem/39856329> 339154 2018-04-30 15:17:24 -0700 2018-04-30 17:42:37 -0700 Patch 185146.patch text/plain 11595 msaboff SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzExNzEpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE4LTA0LTMwICBNaWNoYWVsIFNh Ym9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSB1bnVzZWQgbWFjL0Nv b2tpZVN0b3JhZ2VTaGltTGlicmFyeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTg1MTQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBTaGFyZWQvbWFjL0Nvb2tpZVN0b3JhZ2VTaGltTGlicmFyeS5jcHA6 IFJlbW92ZWQuCisgICAgICAgICogU2hhcmVkL21hYy9Db29raWVTdG9yYWdlU2hpbUxpYnJhcnku aDogUmVtb3ZlZC4KKyAgICAgICAgKiBXZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoK KwogMjAxOC0wNC0zMCAgSkYgQmFzdGllbiAgPGpmYmFzdGllbkBhcHBsZS5jb20+CiAKICAgICAg ICAgVXNlIHNvbWUgQysrMTcgZmVhdHVyZXMKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL21h Yy9Db29raWVTdG9yYWdlU2hpbUxpYnJhcnkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvU2hhcmVkL21hYy9Db29raWVTdG9yYWdlU2hpbUxpYnJhcnkuY3BwCShyZXZpc2lvbiAyMzA4 NDcpCisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvQ29va2llU3RvcmFnZVNoaW1MaWJyYXJ5 LmNwcAkobm9uZXhpc3RlbnQpCkBAIC0xLDkwICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKEMp IDIwMTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICoKLSAqIFJlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAot ICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zCi0gKiBhcmUgbWV0OgotICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJj ZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KLSAqIDIu IFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUg Y29weXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCi0gKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBv dGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgotICoKLSAqIFRI SVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9S UyBgYEFTIElTJycKLSAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElO Q0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAotICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBP RiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgotICogUFVSUE9T RSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09O VFJJQlVUT1JTCi0gKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVO VEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCi0gKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElO Q0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgotICogU1VCU1RJVFVU RSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJV U0lORVNTCi0gKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZ IE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgotICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFks IE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKLSAqIEFSSVNJTkcg SU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YKLSAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KLSAqLwotCi0jaW5jbHVk ZSAiY29uZmlnLmgiCi0jaW5jbHVkZSAiQ29va2llU3RvcmFnZVNoaW1MaWJyYXJ5LmgiCi0KLSNp ZiAhUExBVEZPUk0oSU9TKQotCi0jaW5jbHVkZSA8V2ViQ29yZS9EeW5hbWljTGlua2VySW50ZXJw b3NpbmcuaD4KLSNpbmNsdWRlIDxtdXRleD4KLQotZXh0ZXJuICJDIiBDRkRpY3Rpb25hcnlSZWYg X0NGSFRUUENvb2tpZVN0b3JhZ2VDb3B5UmVxdWVzdEhlYWRlckZpZWxkc0ZvclVSTChDRkFsbG9j YXRvclJlZiBpbkFsbG9jYXRvciwgQ0ZIVFRQQ29va2llU3RvcmFnZVJlZiBpbkNvb2tpZVN0b3Jh Z2UsIENGVVJMUmVmIGluUmVxdWVzdFVSTCk7Ci0KLW5hbWVzcGFjZSBXZWJLaXQgewotCi1leHRl cm4gIkMiIHZvaWQgV2ViS2l0Q29va2llU3RvcmFnZVNoaW1Jbml0aWFsaXplKGNvbnN0IENvb2tp ZVN0b3JhZ2VTaGltQ2FsbGJhY2tzJik7Ci0KLXN0YXRpYyBDb29raWVTdG9yYWdlU2hpbUNhbGxi YWNrcyBjb29raWVTdG9yYWdlU2hpbUNhbGxiYWNrczsKLQotY2xhc3MgU2hpbVByb3RlY3RvciB7 Ci1wdWJsaWM6Ci0gICAgU2hpbVByb3RlY3RvcigpIHsgKyttX2NvdW50OyB9Ci0gICAgflNoaW1Q cm90ZWN0b3IoKSB7IC0tbV9jb3VudDsgfQotICAgIHN0YXRpYyB1bnNpZ25lZCBjb3VudCgpIHsg cmV0dXJuIG1fY291bnQ7IH0KLXByaXZhdGU6Ci0gICAgX190aHJlYWQgc3RhdGljIHVuc2lnbmVk IG1fY291bnQ7Ci19OwotCi1fX3RocmVhZCB1bnNpZ25lZCBTaGltUHJvdGVjdG9yOjptX2NvdW50 ID0gMDsKLQotc3RhdGljIENGRGljdGlvbmFyeVJlZiBzaGltQ0ZIVFRQQ29va2llU3RvcmFnZUNv cHlSZXF1ZXN0SGVhZGVyRmllbGRzRm9yVVJMKENGQWxsb2NhdG9yUmVmIGluQWxsb2NhdG9yLCBD RkhUVFBDb29raWVTdG9yYWdlUmVmIGluQ29va2llU3RvcmFnZSwgQ0ZVUkxSZWYgaW5SZXF1ZXN0 VVJMKQotewotICAgIFNoaW1Qcm90ZWN0b3IgcHJvdGVjdG9yOwotCi0gICAgZG8gewotICAgICAg ICAvLyBQcm90ZWN0IGFnYWluc3QgdW5pbml0aWFsaXplZCBjYWxsYmFja3M6Ci0gICAgICAgIGlm ICghY29va2llU3RvcmFnZVNoaW1DYWxsYmFja3MuY29va2llU3RvcmFnZUNvcHlSZXF1ZXN0SGVh ZGVyRmllbGRzRm9yVVJMKQotICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgLy8gUHJvdGVj dCBhZ2FpbnN0IGFjY2lkZW50YWwgcmVjdXJzaW9uOgotICAgICAgICBpZiAoU2hpbVByb3RlY3Rv cjo6Y291bnQoKSA+IDEpCi0gICAgICAgICAgICBicmVhazsKLQotICAgICAgICBDRkRpY3Rpb25h cnlSZWYgcmVzdWx0cyA9IGNvb2tpZVN0b3JhZ2VTaGltQ2FsbGJhY2tzLmNvb2tpZVN0b3JhZ2VD b3B5UmVxdWVzdEhlYWRlckZpZWxkc0ZvclVSTChpbkNvb2tpZVN0b3JhZ2UsIGluUmVxdWVzdFVS TCk7Ci0gICAgICAgIGlmICghcmVzdWx0cykKLSAgICAgICAgICAgIGJyZWFrOwotCi0gICAgICAg IHJldHVybiByZXN1bHRzOwotICAgIH0gd2hpbGUgKDApOwotCi0gICAgLy8gSWYgd2UndmUgZmFp bGVkIHRvIHJldHJpZXZlIHRoZSBjb29raWVzIG1hbnVhbGx5LCBmYWxsIGJhY2sgdG8gdGhlIG9y aWdpbmFsIGltcG9zZWQgZnVuY3Rpb246Ci0gICAgcmV0dXJuIF9DRkhUVFBDb29raWVTdG9yYWdl Q29weVJlcXVlc3RIZWFkZXJGaWVsZHNGb3JVUkwoaW5BbGxvY2F0b3IsIGluQ29va2llU3RvcmFn ZSwgaW5SZXF1ZXN0VVJMKTsKLX0KLQotRFlMRF9JTlRFUlBPU0Uoc2hpbUNGSFRUUENvb2tpZVN0 b3JhZ2VDb3B5UmVxdWVzdEhlYWRlckZpZWxkc0ZvclVSTCwgX0NGSFRUUENvb2tpZVN0b3JhZ2VD b3B5UmVxdWVzdEhlYWRlckZpZWxkc0ZvclVSTCk7Ci0KLV9fYXR0cmlidXRlX18oKHZpc2liaWxp dHkoImRlZmF1bHQiKSkpCi12b2lkIFdlYktpdENvb2tpZVN0b3JhZ2VTaGltSW5pdGlhbGl6ZShj b25zdCBDb29raWVTdG9yYWdlU2hpbUNhbGxiYWNrcyYgY2FsbGJhY2tzKQotewotICAgIC8vIEJl Y2F1c2UgdGhlIHZhbHVlIG9mIGNvb2tpZVN0b3JhZ2VTaGltQ2FsbGJhY2tzIHdpbGwgYmUgcmVh ZCBmcm9tIG11bGl0cGxlIHRocmVhZHMsCi0gICAgLy8gb25seSBhbGxvdyBpdCB0byBiZSBpbml0 aWFsaXplZCBvbmNlLgotICAgIHN0YXRpYyBzdGQ6Om9uY2VfZmxhZyBpbml0aWFsaXplQ2FsbGJh Y2tzT25jZUZsYWc7Ci0gICAgc3RkOjpjYWxsX29uY2UoaW5pdGlhbGl6ZUNhbGxiYWNrc09uY2VG bGFnLCBbJmNhbGxiYWNrc10geyBjb29raWVTdG9yYWdlU2hpbUNhbGxiYWNrcyA9IGNhbGxiYWNr czsgfSk7Ci19Ci0gICAgCi19Ci0KLSNlbmRpZiAvLyAhUExBVEZPUk0oSU9TKQpJbmRleDogU291 cmNlL1dlYktpdC9TaGFyZWQvbWFjL0Nvb2tpZVN0b3JhZ2VTaGltTGlicmFyeS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9Db29raWVTdG9yYWdlU2hpbUxpYnJhcnku aAkocmV2aXNpb24gMjMwODQ3KQorKysgU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL0Nvb2tpZVN0 b3JhZ2VTaGltTGlicmFyeS5oCShub25leGlzdGVudCkKQEAgLTEsNDEgKzAsMCBAQAotLyoKLSAq IENvcHlyaWdodCAoQykgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKgot ICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0 aCBvciB3aXRob3V0Ci0gKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhh dCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKLSAqIGFyZSBtZXQ6Ci0gKiAxLiBSZWRpc3RyaWJ1 dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAotICog ICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyLgotICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9k dWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKLSAqICAgIGRvY3VtZW50 YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRp b24uCi0gKgotICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJ VFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJwotICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQg V0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCi0gKiBUSEUgSU1QTElF RCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNV TEFSCi0gKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJ TkMuIE9SIElUUyBDT05UUklCVVRPUlMKLSAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5E SVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKLSAqIENPTlNFUVVFTlRJ QUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9G Ci0gKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1Ig UFJPRklUUzsgT1IgQlVTSU5FU1MKLSAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5E IE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCi0gKiBDT05UUkFDVCwgU1RS SUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNF KQotICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUs IEVWRU4gSUYgQURWSVNFRCBPRgotICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgot ICovCi0KLSNpZm5kZWYgQ29va2llU3RvcmFnZVNoaW1MaWJyYXJ5X2gKLSNkZWZpbmUgQ29va2ll U3RvcmFnZVNoaW1MaWJyYXJ5X2gKLQotdHlwZWRlZiBzdHJ1Y3QgT3BhcXVlQ0ZIVFRQQ29va2ll U3RvcmFnZSogIENGSFRUUENvb2tpZVN0b3JhZ2VSZWY7Ci0KLW5hbWVzcGFjZSBXZWJLaXQgewot Ci1zdHJ1Y3QgQ29va2llU3RvcmFnZVNoaW1DYWxsYmFja3MgewotICAgIENGRGljdGlvbmFyeVJl ZiAoKmNvb2tpZVN0b3JhZ2VDb3B5UmVxdWVzdEhlYWRlckZpZWxkc0ZvclVSTCkoQ0ZIVFRQQ29v a2llU3RvcmFnZVJlZiwgQ0ZVUkxSZWYpOwotfTsKLQotdHlwZWRlZiB2b2lkICgqQ29va2llU3Rv cmFnZVNoaW1Jbml0aWFsaXplRnVuYykoY29uc3QgQ29va2llU3RvcmFnZVNoaW1DYWxsYmFja3Mm KTsKLQotfQotCi0jZW5kaWYgLy8gQ29va2llU3RvcmFnZVNoaW1MaWJyYXJ5X2gKSW5kZXg6IFNv dXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNp b24gMjMwODQ3KQorKysgU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvagkod29ya2luZyBjb3B5KQpAQCAtMjA2OSw4ICsyMDY5LDYgQEAKIAkJQ0RDMjgzMUQyMDFC RDc5RDAwRTZFNzQ1IC8qIFdLRnVsbHNjcmVlblN0YWNrVmlldy5oIGluIEhlYWRlcnMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQ0RDMjgzMUIyMDFCRDc5RDAwRTZFNzQ1IC8q IFdLRnVsbHNjcmVlblN0YWNrVmlldy5oICovOyB9OwogCQlDREMyODMxRTIwMUJENzlEMDBFNkU3 NDUgLyogV0tGdWxsc2NyZWVuU3RhY2tWaWV3Lm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gQ0RDMjgzMUMyMDFCRDc5RDAwRTZFNzQ1IC8qIFdLRnVsbHNj cmVlblN0YWNrVmlldy5tbSAqLzsgfTsKIAkJQ0RDMzgyRkUxNzIxMTc5OTAwOEEyRkMzIC8qIFNl Y0l0ZW1TaGltTGlicmFyeS5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDUxMUY4QTc4MTM4QjQ2MDkwMEE5NUY0NCAvKiBTZWNJdGVtU2hpbUxpYnJhcnku bW0gKi87IH07Ci0JCUNEQzM4MzA3MTcyMTE3REQwMDhBMkZDMyAvKiBDb29raWVTdG9yYWdlU2hp bUxpYnJhcnkuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gQ0RDMzgyRjkxNzIxMTZEMzAwOEEyRkMzIC8qIENvb2tpZVN0b3JhZ2VTaGltTGlicmFyeS5j cHAgKi87IH07Ci0JCUNEQzM4MzBDMTcyMTIyODIwMDhBMkZDMyAvKiBDb29raWVTdG9yYWdlU2hp bUxpYnJhcnkuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IENEQzM4MzBCMTcyMTIxQ0UwMDhBMkZDMyAvKiBDb29raWVTdG9yYWdlU2hpbUxpYnJhcnkuaCAq LzsgfTsKIAkJQ0RDQTg1QzgxMzJBQkE0RTAwRTk2MURGIC8qIFdLRnVsbFNjcmVlbldpbmRvd0Nv bnRyb2xsZXIubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSBDRENBODVDNjEzMkFCQTRFMDBFOTYxREYgLyogV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxl ci5tbSAqLzsgfTsKIAkJQ0RDQTg1QzkxMzJBQkE0RTAwRTk2MURGIC8qIFdLRnVsbFNjcmVlbldp bmRvd0NvbnRyb2xsZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IENEQ0E4NUM3MTMyQUJBNEUwMEU5NjFERiAvKiBXS0Z1bGxTY3JlZW5XaW5kb3dDb250 cm9sbGVyLmggKi87IH07CiAJCUNFMTFBRDUwMUNCQzQ3RjgwMDY4MUVFNSAvKiBDb2RlU2lnbmlu Zy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IENFMTFB RDRGMUNCQzQ3RjgwMDY4MUVFNSAvKiBDb2RlU2lnbmluZy5tbSAqLzsgfTsKQEAgLTQ2MDYsOSAr NDYwNCw3IEBACiAJCUNEQzI4MzFCMjAxQkQ3OUQwMEU2RTc0NSAvKiBXS0Z1bGxzY3JlZW5TdGFj a1ZpZXcuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuYy5oOyBuYW1lID0gV0tGdWxsc2NyZWVuU3RhY2tWaWV3Lmg7IHBhdGggPSBp b3MvZnVsbHNjcmVlbi9XS0Z1bGxzY3JlZW5TdGFja1ZpZXcuaDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKIAkJQ0RDMjgzMUMyMDFCRDc5RDAwRTZFNzQ1IC8qIFdLRnVsbHNjcmVlblN0YWNr Vmlldy5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgbmFtZSA9IFdLRnVsbHNjcmVlblN0YWNrVmlldy5tbTsg cGF0aCA9IGlvcy9mdWxsc2NyZWVuL1dLRnVsbHNjcmVlblN0YWNrVmlldy5tbTsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQ0RDMzgyRjcxNzIxMTUwNjAwOEEyRkMzIC8qIENGTmV0d29y ay5mcmFtZXdvcmsgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5 cGUgPSB3cmFwcGVyLmZyYW1ld29yazsgbmFtZSA9IENGTmV0d29yay5mcmFtZXdvcms7IHBhdGgg PSAvU3lzdGVtL0xpYnJhcnkvRnJhbWV3b3Jrcy9DRk5ldHdvcmsuZnJhbWV3b3JrOyBzb3VyY2VU cmVlID0gIjxhYnNvbHV0ZT4iOyB9OwotCQlDREMzODJGOTE3MjExNkQzMDA4QTJGQzMgLyogQ29v a2llU3RvcmFnZVNoaW1MaWJyYXJ5LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IENvb2tpZVN0b3Jh Z2VTaGltTGlicmFyeS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUNEQzM4MzA2 MTcyMTE3OTkwMDhBMkZDMyAvKiBXZWJQcm9jZXNzU2hpbS5keWxpYiAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBleHBsaWNpdEZpbGVUeXBlID0gImNvbXBpbGVkLm1hY2gtby5keWxpYiI7 IGluY2x1ZGVJbkluZGV4ID0gMDsgcGF0aCA9IFdlYlByb2Nlc3NTaGltLmR5bGliOyBzb3VyY2VU cmVlID0gQlVJTFRfUFJPRFVDVFNfRElSOyB9OwotCQlDREMzODMwQjE3MjEyMUNFMDA4QTJGQzMg LyogQ29va2llU3RvcmFnZVNoaW1MaWJyYXJ5LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IENvb2tpZVN0b3Jh Z2VTaGltTGlicmFyeS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlDREM4RjQ4ODE3 MjVFNjc4MDAxNjZGNkUgLyogQ29yZUZvdW5kYXRpb24uZnJhbWV3b3JrICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gd3JhcHBlci5mcmFtZXdvcms7IG5h bWUgPSBDb3JlRm91bmRhdGlvbi5mcmFtZXdvcms7IHBhdGggPSAvU3lzdGVtL0xpYnJhcnkvRnJh bWV3b3Jrcy9Db3JlRm91bmRhdGlvbi5mcmFtZXdvcms7IHNvdXJjZVRyZWUgPSAiPGFic29sdXRl PiI7IH07CiAJCUNEQ0E4NUM2MTMyQUJBNEUwMEU5NjFERiAvKiBXS0Z1bGxTY3JlZW5XaW5kb3dD b250cm9sbGVyLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gV0tG dWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK IAkJQ0RDQTg1QzcxMzJBQkE0RTAwRTk2MURGIC8qIFdLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xs ZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV0tGdWxsU2NyZWVuV2luZG93 Q29udHJvbGxlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtNzY3OCw4ICs3Njc0 LDYgQEAKIAkJCQlDRTExQUQ0RjFDQkM0N0Y4MDA2ODFFRTUgLyogQ29kZVNpZ25pbmcubW0gKi8s CiAJCQkJMUEyQTRBRkUxNTg2OTM5MjAwOTBDOUU5IC8qIENvbG9yU3BhY2VEYXRhLmggKi8sCiAJ CQkJMUEyQTRBRkQxNTg2OTM5MjAwOTBDOUU5IC8qIENvbG9yU3BhY2VEYXRhLm1tICovLAotCQkJ CUNEQzM4MkY5MTcyMTE2RDMwMDhBMkZDMyAvKiBDb29raWVTdG9yYWdlU2hpbUxpYnJhcnkuY3Bw ICovLAotCQkJCUNEQzM4MzBCMTcyMTIxQ0UwMDhBMkZDMyAvKiBDb29raWVTdG9yYWdlU2hpbUxp YnJhcnkuaCAqLywKIAkJCQkxQUM3NUExQzFCMzM2OTVFMDA1Njc0NUIgLyogSGFuZ0RldGVjdGlv bkRpc2FibGVyTWFjLm1tICovLAogCQkJCTJENTAzNjVEMUJDQzc5M0YwMEUyMEJCMyAvKiBOYXRp dmVXZWJHZXN0dXJlRXZlbnRNYWMubW0gKi8sCiAJCQkJQzAyQkZGMUQxMjUxNTAyRTAwOUNDQkVB IC8qIE5hdGl2ZVdlYktleWJvYXJkRXZlbnRNYWMubW0gKi8sCkBAIC04ODk2LDcgKzg4OTAsNiBA QAogCQkJCTM3QzRFOUY2MTMxQzZFN0UwMDI5QkQ1QSAvKiBjb25maWcuaCBpbiBIZWFkZXJzICov LAogCQkJCUJDMDMyREFCMTBGNDM3RDEwMDU4QzE1QSAvKiBDb25uZWN0aW9uLmggaW4gSGVhZGVy cyAqLywKIAkJCQk1MTA2RDdDNDE4QkRCRTczMDAwQUIxNjYgLyogQ29udGV4dE1lbnVDb250ZXh0 RGF0YS5oIGluIEhlYWRlcnMgKi8sCi0JCQkJQ0RDMzgzMEMxNzIxMjI4MjAwOEEyRkMzIC8qIENv b2tpZVN0b3JhZ2VTaGltTGlicmFyeS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQ0UxQTBCRDMxQTQ4 RTZDNjAwNTRFRjc0IC8qIENvcmVQREZTUEkuaCBpbiBIZWFkZXJzICovLAogCQkJCTM3QzIxQ0FF MUU5OTRDMEMwMDI5RDVGOSAvKiBDb3JlUHJlZGljdGlvblNQSS5oIGluIEhlYWRlcnMgKi8sCiAJ CQkJQjg3OEI2MTUxMzM0MjhEQzAwNjg4OEU5IC8qIENvcnJlY3Rpb25QYW5lbC5oIGluIEhlYWRl cnMgKi8sCkBAIC0xMTQ4NCw3ICsxMTQ3Nyw2IEBACiAJCQlpc2EgPSBQQlhTb3VyY2VzQnVpbGRQ aGFzZTsKIAkJCWJ1aWxkQWN0aW9uTWFzayA9IDIxNDc0ODM2NDc7CiAJCQlmaWxlcyA9ICgKLQkJ CQlDREMzODMwNzE3MjExN0REMDA4QTJGQzMgLyogQ29va2llU3RvcmFnZVNoaW1MaWJyYXJ5LmNw cCBpbiBTb3VyY2VzICovLAogCQkJCUNEQzM4MkZFMTcyMTE3OTkwMDhBMkZDMyAvKiBTZWNJdGVt U2hpbUxpYnJhcnkubW0gaW4gU291cmNlcyAqLywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95 bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsK