47783 2010-10-17 14:13:23 -0700 Need a WebKit2 equivalent of the WebKit1 WebUserContentURLPattern 2010-10-18 14:33:54 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jberlin jberlin aroben jberlin sam webkit.review.bot oldest_to_newest 295279 0 jberlin 2010-10-17 14:13:23 -0700 The WebKit2 equivalent would also be a wrapper around the WebCore::UserContentURLPattern class, just like the WebKit1 WebUserContentURLPattern. <rdar://problem/8559331> 295723 1 71077 jberlin 2010-10-18 13:52:31 -0700 Created attachment 71077 Adds WebUserContentURLPattern and WKUserContentURLPattern to WebKit2 295725 2 webkit.review.bot 2010-10-18 13:53:46 -0700 Attachment 71077 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/Shared/API/c/WKUserContentURLPattern.cpp:26: Found header this file implements before WebCore config.h. Should be: config.h, primary header, blank line, and then alphabetically sorted. [build/include_order] [4] Total errors found: 1 in 11 files If any of these errors are false positives, please file a bug against check-webkit-style. 295730 3 71077 sam 2010-10-18 14:01:45 -0700 Comment on attachment 71077 Adds WebUserContentURLPattern and WKUserContentURLPattern to WebKit2 You probably need to add the new files to WebKit2.pro as well. 295739 4 jberlin 2010-10-18 14:12:10 -0700 (In reply to comment #3) > (From update of attachment 71077 [details]) > You probably need to add the new files to WebKit2.pro as well. Done. Thanks for the review! 295757 5 71077 jberlin 2010-10-18 14:33:46 -0700 Comment on attachment 71077 Adds WebUserContentURLPattern and WKUserContentURLPattern to WebKit2 Committed in r69991 http://trac.webkit.org/changeset/69991 71077 2010-10-18 13:52:31 -0700 2010-10-18 14:33:46 -0700 Adds WebUserContentURLPattern and WKUserContentURLPattern to WebKit2 addWebKit2UserContentURLPattern.patch text/plain 18863 jberlin SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2OTk4OCkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDQgQEAKKzIwMTAtMTAtMTggIEplc3NpZSBCZXJsaW4gIDxqYmVybGluQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBO ZWVkIGEgV2ViS2l0MiBlcXVpdmFsZW50IG9mIHRoZSBXZWJLaXQxIFdlYlVzZXJDb250ZW50VVJM UGF0dGVybi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQ3NzgzCisKKyAgICAgICAgKiBTaGFyZWQvQVBJL2MvV0tCYXNlLmg6CisKKyAgICAgICAgKiBT aGFyZWQvQVBJL2MvV0tTaGFyZWRBUElDYXN0Lmg6CisKKyAgICAgICAgKiBTaGFyZWQvQVBJL2Mv V0tVc2VyQ29udGVudFVSTFBhdHRlcm4uY3BwOiBBZGRlZC4KKyAgICAgICAgKFdLVXNlckNvbnRl bnRVUkxQYXR0ZXJuR2V0VHlwZUlEKToKKyAgICAgICAgKFdLVXNlckNvbnRlbnRVUkxQYXR0ZXJu Q3JlYXRlKToKKyAgICAgICAgKFdLVXNlckNvbnRlbnRVUkxQYXR0ZXJuTWF0Y2hlc1VSTCk6Cisg ICAgICAgICogU2hhcmVkL0FQSS9jL1dLVXNlckNvbnRlbnRVUkxQYXR0ZXJuLmg6IEFkZGVkLgor CisgICAgICAgICogU2hhcmVkL0FQSU9iamVjdC5oOgorCisgICAgICAgICogU2hhcmVkL1VzZXJN ZXNzYWdlQ29kZXJzLmg6CisgICAgICAgIFVzZSB0aGUgb3JpZ2luYWwgcGF0dGVybiBzdHJpbmcg dG8gZW5jb2RlIGFuZCBkZWNvZGUgYSBVc2VyQ29udGVudFVSTFBhdHRlcm4uCisgICAgICAgIChX ZWJLaXQ6OlVzZXJNZXNzYWdlRW5jb2Rlcjo6YmFzZUVuY29kZSk6CisgICAgICAgIChXZWJLaXQ6 OlVzZXJNZXNzYWdlRGVjb2Rlcjo6YmFzZURlY29kZSk6CisKKyAgICAgICAgKiBTaGFyZWQvV2Vi VXNlckNvbnRlbnRVUkxQYXR0ZXJuLmg6IEFkZGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJVc2Vy Q29udGVudFVSTFBhdHRlcm46OmNyZWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlVzZXJDb250 ZW50VVJMUGF0dGVybjo6bWF0Y2hlc1VSTCk6CisgICAgICAgIFVzZSBXZWJDb3JlOjpVc2VyQ29u dGVudFVSTFBhdHRlcm46Om1hdGNoZXMuCisgICAgICAgIChXZWJLaXQ6OldlYlVzZXJDb250ZW50 VVJMUGF0dGVybjo6cGF0dGVyblN0cmluZyk6CisgICAgICAgIEV4cG9zZSB0aGUgcGF0dGVybiBz dHJpbmcgdXNlZCB0byBjcmVhdGUgdGhlIFVzZXJDb250ZW50VVJMUGF0dGVybiBmb3IgdGhlIHB1 cnBvc2Ugb2YKKyAgICAgICAgZW5jb2RpbmcgYW5kIGRlY29kaW5nLgorICAgICAgICAoV2ViS2l0 OjpXZWJVc2VyQ29udGVudFVSTFBhdHRlcm46OldlYlVzZXJDb250ZW50VVJMUGF0dGVybik6Cisg ICAgICAgIChXZWJLaXQ6OldlYlVzZXJDb250ZW50VVJMUGF0dGVybjo6dHlwZSk6CisKKyAgICAg ICAgKiBXZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICogd2luL1dl YktpdDIudmNwcm9qOgorICAgICAgICBBZGQgV0tVc2VyQ29udGVudFVSTFBhdHRlcm4uaC8uY3Bw IGFuZCBXZWJVc2VyQ29udGVudFVSTFBhdHRlcm4uaAorCisgICAgICAgICogd2luL1dlYktpdDJH ZW5lcmF0ZWQubWFrZToKKyAgICAgICAgQ29weSBvdmVyIFdLVXNlcmNvbnRlbnRVUkxQYXR0ZXJu IGludG8gdGhlIG91dHB1dCBkaXJlY3RvcnkuCisKIDIwMTAtMTAtMTggIEFuZGVycyBDYXJsc3Nv biAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggYnVpbGQuCkluZGV4OiBXZWJL aXQyL1NoYXJlZC9BUElPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1NoYXJlZC9BUElP YmplY3QuaAkocmV2aXNpb24gNjk5NjEpCisrKyBXZWJLaXQyL1NoYXJlZC9BUElPYmplY3QuaAko d29ya2luZyBjb3B5KQpAQCAtNDUsNiArNDUsNyBAQCBwdWJsaWM6CiAgICAgICAgIFR5cGVVUkws CiAgICAgICAgIFR5cGVVUkxSZXF1ZXN0LAogICAgICAgICBUeXBlVVJMUmVzcG9uc2UsCisgICAg ICAgIFR5cGVVc2VyQ29udGVudFVSTFBhdHRlcm4sCiAKICAgICAgICAgLy8gQmFzZSBudW1lcmlj IHR5cGVzCiAgICAgICAgIFR5cGVCb29sZWFuLApJbmRleDogV2ViS2l0Mi9TaGFyZWQvVXNlck1l c3NhZ2VDb2RlcnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1NoYXJlZC9Vc2VyTWVzc2FnZUNv ZGVycy5oCShyZXZpc2lvbiA2OTk2MSkKKysrIFdlYktpdDIvU2hhcmVkL1VzZXJNZXNzYWdlQ29k ZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTMyLDYgKzMyLDcgQEAKICNpbmNsdWRlICJXZWJTZXJp YWxpemVkU2NyaXB0VmFsdWUuaCIKICNpbmNsdWRlICJXZWJTdHJpbmcuaCIKICNpbmNsdWRlICJX ZWJVUkwuaCIKKyNpbmNsdWRlICJXZWJVc2VyQ29udGVudFVSTFBhdHRlcm4uaCIKIAogbmFtZXNw YWNlIFdlYktpdCB7CiAKQEAgLTQwLDYgKzQxLDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAvLyAg IC0gRGljdGlvbmFyeSAtPiBEaWN0aW9uYXJ5CiAvLyAgIC0gU3RyaW5nIC0+IFN0cmluZwogLy8g ICAtIFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSAtPiBTZXJpYWxpemVkU2NyaXB0VmFsdWUKKy8vICAg LSBVc2VyQ29udGVudFVSTFBhdHRlcm4gLT4gVXNlckNvbnRlbnRVUkxQYXR0ZXJuCiAvLyAgIC0g V2ViRG91YmxlIC0+IFdlYkRvdWJsZQogLy8gICAtIFdlYlVJbnQ2NCAtPiBXZWJVSW50NjQKIC8v ICAgLSBXZWJVUkwgLT4gV2ViVVJMCkBAIC0xMDgsNiArMTEwLDExIEBAIHB1YmxpYzoKICAgICAg ICAgICAgIGVuY29kZXItPmVuY29kZSh1cmxPYmplY3QtPnN0cmluZygpKTsKICAgICAgICAgICAg IHJldHVybiB0cnVlOwogICAgICAgICB9CisgICAgICAgIGNhc2UgQVBJT2JqZWN0OjpUeXBlVXNl ckNvbnRlbnRVUkxQYXR0ZXJuOiB7CisgICAgICAgICAgICBXZWJVc2VyQ29udGVudFVSTFBhdHRl cm4qIHVybFBhdHRlcm4gPSBzdGF0aWNfY2FzdDxXZWJVc2VyQ29udGVudFVSTFBhdHRlcm4qPiht X3Jvb3QpOworICAgICAgICAgICAgZW5jb2Rlci0+ZW5jb2RlKHVybFBhdHRlcm4tPnBhdHRlcm5T dHJpbmcoKSk7CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQogICAgICAgICBk ZWZhdWx0OgogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KQEAgLTEzMSw2ICsxMzgsNyBA QCBwcm90ZWN0ZWQ6CiAvLyAgIC0gRGljdGlvbmFyeSAtPiBEaWN0aW9uYXJ5CiAvLyAgIC0gU3Ry aW5nIC0+IFN0cmluZwogLy8gICAtIFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSAtPiBTZXJpYWxpemVk U2NyaXB0VmFsdWUKKy8vICAgLSBVc2VyQ29udGVudFVSTFBhdHRlcm4gLT4gVXNlckNvbnRlbnRV UkxQYXR0ZXJuCiAvLyAgIC0gV2ViRG91YmxlIC0+IFdlYkRvdWJsZQogLy8gICAtIFdlYlVJbnQ2 NCAtPiBXZWJVSW50NjQKIC8vICAgLSBXZWJVUkwgLT4gV2ViVVJMCkBAIC0yMzAsNiArMjM4LDEz IEBAIHB1YmxpYzoKICAgICAgICAgICAgIGNvZGVyLm1fcm9vdCA9IFdlYlVSTDo6Y3JlYXRlKHN0 cmluZyk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQorICAgICAgICBjYXNlIEFQSU9i amVjdDo6VHlwZVVzZXJDb250ZW50VVJMUGF0dGVybjogeworICAgICAgICAgICAgU3RyaW5nIHN0 cmluZzsKKyAgICAgICAgICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHN0cmluZykpCisgICAgICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgY29kZXIubV9yb290ID0gV2ViVXNl ckNvbnRlbnRVUkxQYXR0ZXJuOjpjcmVhdGUoc3RyaW5nKTsKKyAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICB9CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg fQpJbmRleDogV2ViS2l0Mi9TaGFyZWQvV2ViVXNlckNvbnRlbnRVUkxQYXR0ZXJuLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0Mi9TaGFyZWQvV2ViVXNlckNvbnRlbnRVUkxQYXR0ZXJuLmgJKHJldmlz aW9uIDApCisrKyBXZWJLaXQyL1NoYXJlZC9XZWJVc2VyQ29udGVudFVSTFBhdHRlcm4uaAkocmV2 aXNpb24gMCkKQEAgLTAsMCArMSw2NSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMCBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVz ZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmlj YXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlv bnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVz dCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmli dXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQK KyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg ZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVy aWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FS RSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMn JworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBC VVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5U QUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVND TEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMK KyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJ QUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBC VVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9S IFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAq IElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklM SVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAo SU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZ IE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICog VEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpZm5kZWYgV2ViVXNlckNv bnRlbnRVUkxQYXR0ZXJuX2gKKyNkZWZpbmUgV2ViVXNlckNvbnRlbnRVUkxQYXR0ZXJuX2gKKwor I2luY2x1ZGUgIkFQSU9iamVjdC5oIgorCisjaW5jbHVkZSA8V2ViQ29yZS9LVVJMLmg+CisjaW5j bHVkZSA8V2ViQ29yZS9Vc2VyQ29udGVudFVSTFBhdHRlcm4uaD4KKyNpbmNsdWRlIDx3dGYvUmVm UHRyLmg+CisKK25hbWVzcGFjZSBXZWJLaXQgeworCitjbGFzcyBXZWJVc2VyQ29udGVudFVSTFBh dHRlcm4gOiBwdWJsaWMgQVBJT2JqZWN0IHsKK3B1YmxpYzoKKyAgICBzdGF0aWMgY29uc3QgVHlw ZSBBUElUeXBlID0gVHlwZVVzZXJDb250ZW50VVJMUGF0dGVybjsKKworICAgIHN0YXRpYyBQYXNz UmVmUHRyPFdlYlVzZXJDb250ZW50VVJMUGF0dGVybj4gY3JlYXRlKGNvbnN0IFN0cmluZyYgcGF0 dGVybikKKyAgICB7CisgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgV2ViVXNlckNvbnRlbnRV UkxQYXR0ZXJuKHBhdHRlcm4pKTsKKyAgICB9CisKKyAgICBib29sIG1hdGNoZXNVUkwoY29uc3Qg U3RyaW5nJiB1cmwpIGNvbnN0IHsgcmV0dXJuIG1fcGF0dGVybi5tYXRjaGVzKFdlYkNvcmU6OktV UkwoV2ViQ29yZTo6UGFyc2VkVVJMU3RyaW5nLCB1cmwpKTsgfQorCisgICAgY29uc3QgU3RyaW5n JiBwYXR0ZXJuU3RyaW5nKCkgY29uc3QgeyByZXR1cm4gbV9wYXR0ZXJuU3RyaW5nOyB9CisKK3By aXZhdGU6CisgICAgZXhwbGljaXQgV2ViVXNlckNvbnRlbnRVUkxQYXR0ZXJuKGNvbnN0IFN0cmlu ZyYgcGF0dGVybikKKyAgICAgICAgOiBtX3BhdHRlcm4oV2ViQ29yZTo6VXNlckNvbnRlbnRVUkxQ YXR0ZXJuKHBhdHRlcm4pKQorICAgICAgICAsIG1fcGF0dGVyblN0cmluZyhwYXR0ZXJuKQorICAg IHsKKyAgICB9CisKKyAgICB2aXJ0dWFsIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIEFQSVR5 cGU7IH0KKworICAgIFdlYkNvcmU6OlVzZXJDb250ZW50VVJMUGF0dGVybiBtX3BhdHRlcm47Cisg ICAgU3RyaW5nIG1fcGF0dGVyblN0cmluZzsKK307CisKK30KKworI2VuZGlmIC8vIFdlYlVzZXJD b250ZW50VVJMUGF0dGVybl9oCkluZGV4OiBXZWJLaXQyL1NoYXJlZC9BUEkvYy9XS0Jhc2UuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQyL1NoYXJlZC9BUEkvYy9XS0Jhc2UuaAkocmV2aXNpb24gNjk5 NjEpCisrKyBXZWJLaXQyL1NoYXJlZC9BUEkvYy9XS0Jhc2UuaAkod29ya2luZyBjb3B5KQpAQCAt NTQsNiArNTQsNyBAQCB0eXBlZGVmIGNvbnN0IHN0cnVjdCBPcGFxdWVXS1VJbnQ2NCogV0tVCiB0 eXBlZGVmIGNvbnN0IHN0cnVjdCBPcGFxdWVXS1VSTCogV0tVUkxSZWY7CiB0eXBlZGVmIGNvbnN0 IHN0cnVjdCBPcGFxdWVXS1VSTFJlcXVlc3QqIFdLVVJMUmVxdWVzdFJlZjsKIHR5cGVkZWYgY29u c3Qgc3RydWN0IE9wYXF1ZVdLVVJMUmVzcG9uc2UqIFdLVVJMUmVzcG9uc2VSZWY7Cit0eXBlZGVm IGNvbnN0IHN0cnVjdCBPcGFxdWVXS1VzZXJDb250ZW50VVJMUGF0dGVybiogV0tVc2VyQ29udGVu dFVSTFBhdHRlcm5SZWY7CiAKIC8qIFdlYktpdDIgbWFpbiBBUEkgdHlwZXMgKi8KIApJbmRleDog V2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tTaGFyZWRBUElDYXN0LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0Mi9TaGFyZWQvQVBJL2MvV0tTaGFyZWRBUElDYXN0LmgJKHJldmlzaW9uIDY5OTYxKQorKysg V2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tTaGFyZWRBUElDYXN0LmgJKHdvcmtpbmcgY29weSkKQEAg LTQ4LDYgKzQ4LDcgQEAgY2xhc3MgV2ViRXJyb3I7CiBjbGFzcyBXZWJTZXJpYWxpemVkU2NyaXB0 VmFsdWU7CiBjbGFzcyBXZWJVUkxSZXF1ZXN0OwogY2xhc3MgV2ViVVJMUmVzcG9uc2U7CitjbGFz cyBXZWJVc2VyQ29udGVudFVSTFBhdHRlcm47CiAKIHRlbXBsYXRlPHR5cGVuYW1lIEFQSVR5cGU+ IHN0cnVjdCBBUElUeXBlSW5mbyB7IH07CiB0ZW1wbGF0ZTx0eXBlbmFtZSBJbXBsVHlwZT4gc3Ry dWN0IEltcGxUeXBlSW5mbyB7IH07CkBAIC03Miw2ICs3Myw3IEBAIFdLX0FERF9BUElfTUFQUElO RyhXS1VJbnQ2NFJlZiwgV2ViVUludDYKIFdLX0FERF9BUElfTUFQUElORyhXS1VSTFJlZiwgV2Vi VVJMKQogV0tfQUREX0FQSV9NQVBQSU5HKFdLVVJMUmVxdWVzdFJlZiwgV2ViVVJMUmVxdWVzdCkK IFdLX0FERF9BUElfTUFQUElORyhXS1VSTFJlc3BvbnNlUmVmLCBXZWJVUkxSZXNwb25zZSkKK1dL X0FERF9BUElfTUFQUElORyhXS1VzZXJDb250ZW50VVJMUGF0dGVyblJlZiwgV2ViVXNlckNvbnRl bnRVUkxQYXR0ZXJuKQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBJbXBsVHlwZSwgdHlwZW5hbWUgQVBJ VHlwZSA9IHR5cGVuYW1lIEltcGxUeXBlSW5mbzxJbXBsVHlwZSo+OjpBUElUeXBlPgogY2xhc3Mg UHJveHlpbmdSZWZQdHIgewpJbmRleDogV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tVc2VyQ29udGVu dFVSTFBhdHRlcm4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvU2hhcmVkL0FQSS9jL1dLVXNl ckNvbnRlbnRVUkxQYXR0ZXJuLmNwcAkocmV2aXNpb24gMCkKKysrIFdlYktpdDIvU2hhcmVkL0FQ SS9jL1dLVXNlckNvbnRlbnRVUkxQYXR0ZXJuLmNwcAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw0 NyBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQg cHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAx LiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNv cHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3Jt IG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBs aXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAq ICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRo ZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBM RSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNT IE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisg KiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBG T1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBT SEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5Z IERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAq IENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBS T0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVT RSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZF UiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBD T05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0Ug T1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRI SVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNV Q0ggREFNQUdFLgorICovCisKKyNpbmNsdWRlICJXS1VzZXJDb250ZW50VVJMUGF0dGVybi5oIgor CisjaW5jbHVkZSAiV0tBUElDYXN0LmgiCisjaW5jbHVkZSAiV2ViVXNlckNvbnRlbnRVUkxQYXR0 ZXJuLmgiCisKK3VzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CisKK1dLVHlwZUlEIFdLVXNlckNvbnRl bnRVUkxQYXR0ZXJuR2V0VHlwZUlEKCkKK3sKKyAgICByZXR1cm4gdG9BUEkoV2ViVXNlckNvbnRl bnRVUkxQYXR0ZXJuOjpBUElUeXBlKTsKK30KKworV0tVc2VyQ29udGVudFVSTFBhdHRlcm5SZWYg V0tVc2VyQ29udGVudFVSTFBhdHRlcm5DcmVhdGUoV0tTdHJpbmdSZWYgcGF0dGVyblJlZikKK3sK KyAgICBSZWZQdHI8V2ViVXNlckNvbnRlbnRVUkxQYXR0ZXJuPiB1c2VyQ29udGVudFVSTFBhdHRl cm4gPSBXZWJVc2VyQ29udGVudFVSTFBhdHRlcm46OmNyZWF0ZSh0b0ltcGwocGF0dGVyblJlZikt PnN0cmluZygpKTsKKyAgICByZXR1cm4gdG9BUEkodXNlckNvbnRlbnRVUkxQYXR0ZXJuLnJlbGVh c2UoKS5sZWFrUmVmKCkpOworfQorCitib29sIFdLVXNlckNvbnRlbnRVUkxQYXR0ZXJuTWF0Y2hl c1VSTChXS1VzZXJDb250ZW50VVJMUGF0dGVyblJlZiB1cmxQYXR0ZXJuUmVmLCBXS1VSTFJlZiB1 cmxSZWYpCit7CisgICAgcmV0dXJuIHRvSW1wbCh1cmxQYXR0ZXJuUmVmKS0+bWF0Y2hlc1VSTCh0 b1dURlN0cmluZyh1cmxSZWYpKTsKK30KSW5kZXg6IFdlYktpdDIvU2hhcmVkL0FQSS9jL1dLVXNl ckNvbnRlbnRVUkxQYXR0ZXJuLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9TaGFyZWQvQVBJL2Mv V0tVc2VyQ29udGVudFVSTFBhdHRlcm4uaAkocmV2aXNpb24gMCkKKysrIFdlYktpdDIvU2hhcmVk L0FQSS9jL1dLVXNlckNvbnRlbnRVUkxQYXR0ZXJuLmgJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEs NDYgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJl c2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVk IHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICog MS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBj b3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBm b2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9y bSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMg bGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisg KiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0 aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQ TEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVT UyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAor ICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1Mg Rk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQg U0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFO WSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisg KiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQ Uk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBV U0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VW RVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICog Q09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNF IE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBU SElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBT VUNIIERBTUFHRS4KKyAqLworCisjaWZuZGVmIFdLVXNlckNvbnRlbnRVUkxQYXR0ZXJuX2gKKyNk ZWZpbmUgV0tVc2VyQ29udGVudFVSTFBhdHRlcm5faAorCisjaW5jbHVkZSA8SmF2YVNjcmlwdENv cmUvSmF2YVNjcmlwdC5oPgorI2luY2x1ZGUgPFdlYktpdDIvV0tCYXNlLmg+CisKKyNpZmRlZiBf X2NwbHVzcGx1cworZXh0ZXJuICJDIiB7CisjZW5kaWYKKworV0tfRVhQT1JUIFdLVHlwZUlEIFdL VXNlckNvbnRlbnRVUkxQYXR0ZXJuR2V0VHlwZUlEKCk7CisKK1dLX0VYUE9SVCBXS1VzZXJDb250 ZW50VVJMUGF0dGVyblJlZiBXS1VzZXJDb250ZW50VVJMUGF0dGVybkNyZWF0ZShXS1N0cmluZ1Jl ZiBwYXR0ZXJuUmVmKTsKKworV0tfRVhQT1JUIGJvb2wgV0tVc2VyQ29udGVudFVSTFBhdHRlcm5N YXRjaGVzVVJMKFdLVXNlckNvbnRlbnRVUkxQYXR0ZXJuUmVmIHVybFBhdHRlcm5SZWYsIFdLVVJM UmVmIHVybFJlZik7CisKKyNpZmRlZiBfX2NwbHVzcGx1cworfQorI2VuZGlmCisKKyNlbmRpZiAv KiBXS1VzZXJDb250ZW50VVJMUGF0dGVybl9oICovCkluZGV4OiBXZWJLaXQyL1dlYktpdDIueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1dlYktpdDIueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24gNjk5NjEpCisrKyBXZWJLaXQyL1dlYktp dDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtNDU0LDYgKzQ1 NCw5IEBACiAJCUQzQjk0ODQ5MTFGRjRCNjUwMDAzMkIzOSAvKiBXZWJTZWFyY2hQb3B1cE1lbnUu aCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEQzQjk0ODQ1 MTFGRjRCNjUwMDAzMkIzOSAvKiBXZWJTZWFyY2hQb3B1cE1lbnUuaCAqLzsgfTsKIAkJRTFFRTUz RTMxMUY4Q0ZDMDAwQ0NCRUU0IC8qIEluamVjdGVkQnVuZGxlUGFnZUVkaXRvckNsaWVudC5oIGlu IEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRTFFRTUzREMxMUY4 Q0Y5RjAwQ0NCRUU0IC8qIEluamVjdGVkQnVuZGxlUGFnZUVkaXRvckNsaWVudC5oICovOyB9Owog CQlFMUVFNTNFNzExRjhDRkZCMDBDQ0JFRTQgLyogSW5qZWN0ZWRCdW5kbGVQYWdlRWRpdG9yQ2xp ZW50LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEUx RUU1M0U2MTFGOENGRkIwMENDQkVFNCAvKiBJbmplY3RlZEJ1bmRsZVBhZ2VFZGl0b3JDbGllbnQu Y3BwICovOyB9OworCQlGNjExM0UyNTEyNkNFMTgyMDA1N0QwQTcgLyogV2ViVXNlckNvbnRlbnRV UkxQYXR0ZXJuLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSBGNjExM0UyNDEyNkNFMTgyMDA1N0QwQTcgLyogV2ViVXNlckNvbnRlbnRVUkxQYXR0ZXJuLmgg Ki87IH07CisJCUY2MTEzRTI4MTI2Q0UxOUIwMDU3RDBBNyAvKiBXS1VzZXJDb250ZW50VVJMUGF0 dGVybi5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBG NjExM0UyNjEyNkNFMTlCMDA1N0QwQTcgLyogV0tVc2VyQ29udGVudFVSTFBhdHRlcm4uY3BwICov OyB9OworCQlGNjExM0UyOTEyNkNFMTlCMDA1N0QwQTcgLyogV0tVc2VyQ29udGVudFVSTFBhdHRl cm4uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEY2MTEz RTI3MTI2Q0UxOUIwMDU3RDBBNyAvKiBXS1VzZXJDb250ZW50VVJMUGF0dGVybi5oICovOyBzZXR0 aW5ncyA9IHtBVFRSSUJVVEVTID0gKFB1YmxpYywgKTsgfTsgfTsKIAkJRjY3REQ3QkExMjVFNDBE OTAwN0JEQ0I4IC8qIFdLU2VyaWFsaXplZFNjcmlwdFZhbHVlUHJpdmF0ZS5oIGluIEhlYWRlcnMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRjY3REQ3QjkxMjVFNDBEOTAwN0JE Q0I4IC8qIFdLU2VyaWFsaXplZFNjcmlwdFZhbHVlUHJpdmF0ZS5oICovOyBzZXR0aW5ncyA9IHtB VFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAvKiBFbmQgUEJYQnVpbGRGaWxlIHNlY3Rp b24gKi8KIApAQCAtOTQ5LDYgKzk1Miw5IEBACiAJCUQzQjk0ODQ1MTFGRjRCNjUwMDAzMkIzOSAv KiBXZWJTZWFyY2hQb3B1cE1lbnUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0g V2ViU2VhcmNoUG9wdXBNZW51Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUUxRUU1 M0RDMTFGOENGOUYwMENDQkVFNCAvKiBJbmplY3RlZEJ1bmRsZVBhZ2VFZGl0b3JDbGllbnQuaCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSW5qZWN0ZWRCdW5kbGVQYWdlRWRpdG9y Q2xpZW50Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUUxRUU1M0U2MTFGOENGRkIw MENDQkVFNCAvKiBJbmplY3RlZEJ1bmRsZVBhZ2VFZGl0b3JDbGllbnQuY3BwICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSW5qZWN0ZWRCdW5kbGVQYWdlRWRpdG9yQ2xpZW50 LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJRjYxMTNFMjQxMjZDRTE4MjAwNTdE MEE3IC8qIFdlYlVzZXJDb250ZW50VVJMUGF0dGVybi5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j Lmg7IHBhdGggPSBXZWJVc2VyQ29udGVudFVSTFBhdHRlcm4uaDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKKwkJRjYxMTNFMjYxMjZDRTE5QjAwNTdEMEE3IC8qIFdLVXNlckNvbnRlbnRVUkxQ YXR0ZXJuLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFdLVXNlckNv bnRlbnRVUkxQYXR0ZXJuLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJRjYxMTNF MjcxMjZDRTE5QjAwNTdEMEE3IC8qIFdLVXNlckNvbnRlbnRVUkxQYXR0ZXJuLmggKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdLVXNlckNvbnRlbnRVUkxQYXR0ZXJuLmg7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUY2N0REN0I5MTI1RTQwRDkwMDdCRENCOCAvKiBXS1Nl cmlhbGl6ZWRTY3JpcHRWYWx1ZVByaXZhdGUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBw YXRoID0gV0tTZXJpYWxpemVkU2NyaXB0VmFsdWVQcml2YXRlLmg7IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CiAvKiBFbmQgUEJYRmlsZVJlZmVyZW5jZSBzZWN0aW9uICovCiAKQEAgLTEyMTUs NiArMTIyMSw3IEBACiAJCQkJQkNFMjMxNUIxMjJDMzBDQTAwRDVDMzVBIC8qIFdlYlVSTFJlcXVl c3QuaCAqLywKIAkJCQlCQzkwQTFEMTEyMkRENTVFMDBDQzhDNTAgLyogV2ViVVJMUmVzcG9uc2Uu Y3BwICovLAogCQkJCUJDOTBBMUQwMTIyREQ1NUUwMENDOEM1MCAvKiBXZWJVUkxSZXNwb25zZS5o ICovLAorCQkJCUY2MTEzRTI0MTI2Q0UxODIwMDU3RDBBNyAvKiBXZWJVc2VyQ29udGVudFVSTFBh dHRlcm4uaCAqLywKIAkJCSk7CiAJCQlwYXRoID0gU2hhcmVkOwogCQkJc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsKQEAgLTE3ODAsNiArMTc4Nyw4IEBACiAJCQkJQkM0MDc1RjAxMjRGRjAyNzAwNjhG MjBBIC8qIFdLVVJMUmVxdWVzdC5oICovLAogCQkJCUJDNDA3NUYxMTI0RkYwMjcwMDY4RjIwQSAv KiBXS1VSTFJlc3BvbnNlLmNwcCAqLywKIAkJCQlCQzQwNzVGMjEyNEZGMDI3MDA2OEYyMEEgLyog V0tVUkxSZXNwb25zZS5oICovLAorCQkJCUY2MTEzRTI2MTI2Q0UxOUIwMDU3RDBBNyAvKiBXS1Vz ZXJDb250ZW50VVJMUGF0dGVybi5jcHAgKi8sCisJCQkJRjYxMTNFMjcxMjZDRTE5QjAwNTdEMEE3 IC8qIFdLVXNlckNvbnRlbnRVUkxQYXR0ZXJuLmggKi8sCiAJCQkpOwogCQkJcGF0aCA9IGM7CiAJ CQlzb3VyY2VUcmVlID0gIjxncm91cD4iOwpAQCAtMjA1OSw2ICsyMDY4LDggQEAKIAkJCQlCQzU3 NTA5NzEyNjhGM0M2MDA2RjBGMTIgLyogV2ViUG9wdXBNZW51UHJveHlNYWMuaCBpbiBIZWFkZXJz ICovLAogCQkJCTFBOTEwMDcxMTI2Njc1QzQwMDE4NDJGNSAvKiBGaW5kSW5kaWNhdG9yLmggaW4g SGVhZGVycyAqLywKIAkJCQkxQTkxMDEwQTEyNjhDOENBMDAxODQyRjUgLyogRmluZEluZGljYXRv cldpbmRvdy5oIGluIEhlYWRlcnMgKi8sCisJCQkJRjYxMTNFMjUxMjZDRTE4MjAwNTdEMEE3IC8q IFdlYlVzZXJDb250ZW50VVJMUGF0dGVybi5oIGluIEhlYWRlcnMgKi8sCisJCQkJRjYxMTNFMjkx MjZDRTE5QjAwNTdEMEE3IC8qIFdLVXNlckNvbnRlbnRVUkxQYXR0ZXJuLmggaW4gSGVhZGVycyAq LywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJ fTsKQEAgLTIzNjksNiArMjM4MCw3IEBACiAJCQkJQkM1NzUwOTgxMjY4RjNDNjAwNkYwRjEyIC8q IFdlYlBvcHVwTWVudVByb3h5TWFjLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJMUE5MTAwNzIxMjY2 NzVDNDAwMTg0MkY1IC8qIEZpbmRJbmRpY2F0b3IuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJMUE5 MTAxMEIxMjY4QzhDQTAwMTg0MkY1IC8qIEZpbmRJbmRpY2F0b3JXaW5kb3cubW0gaW4gU291cmNl cyAqLywKKwkJCQlGNjExM0UyODEyNkNFMTlCMDA1N0QwQTcgLyogV0tVc2VyQ29udGVudFVSTFBh dHRlcm4uY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1lbnRQ b3N0cHJvY2Vzc2luZyA9IDA7CiAJCX07CkluZGV4OiBXZWJLaXQyL3dpbi9XZWJLaXQyLnZjcHJv ago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL3dpbi9XZWJLaXQyLnZjcHJvagkocmV2aXNpb24gNjk5 NjEpCisrKyBXZWJLaXQyL3dpbi9XZWJLaXQyLnZjcHJvagkod29ya2luZyBjb3B5KQpAQCAtNTgw LDYgKzU4MCwxMCBAQAogCQkJCVJlbGF0aXZlUGF0aD0iLi5cU2hhcmVkXFdlYlVSTFJlc3BvbnNl LmgiDQogCQkJCT4NCiAJCQk8L0ZpbGU+DQorCQkJPEZpbGUNCisJCQkJUmVsYXRpdmVQYXRoPSIu LlxTaGFyZWRcV2ViVXNlckNvbnRlbnRVUkxQYXR0ZXJuLmgiDQorCQkJCT4NCisJCQk8L0ZpbGU+ DQogCQkJPEZpbHRlcg0KIAkJCQlOYW1lPSJBUEkiDQogCQkJCT4NCkBAIC03MjcsNiArNzMxLDE0 IEBACiAJCQkJCVJlbGF0aXZlUGF0aD0iLi5cU2hhcmVkXEFQSVxjXFdLVVJMUmVzcG9uc2UuaCIN CiAJCQkJCT4NCiAJCQkJPC9GaWxlPg0KKwkJCQk8RmlsZQ0KKwkJCQkJUmVsYXRpdmVQYXRoPSIu LlxTaGFyZWRcQVBJXGNcV0tVc2VyQ29udGVudFVSTFBhdHRlcm4uY3BwIg0KKwkJCQkJPg0KKwkJ CQk8L0ZpbGU+DQorCQkJCTxGaWxlDQorCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXFNoYXJlZFxBUElc Y1xXS1VzZXJDb250ZW50VVJMUGF0dGVybi5oIg0KKwkJCQkJPg0KKwkJCQk8L0ZpbGU+DQogCQkJ CTxGaWx0ZXINCiAJCQkJCU5hbWU9ImNmIg0KIAkJCQkJPg0KSW5kZXg6IFdlYktpdDIvd2luL1dl YktpdDJHZW5lcmF0ZWQubWFrZQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL3dpbi9XZWJLaXQyR2Vu ZXJhdGVkLm1ha2UJKHJldmlzaW9uIDY5OTYxKQorKysgV2ViS2l0Mi93aW4vV2ViS2l0MkdlbmVy YXRlZC5tYWtlCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw2ICsyNiw3IEBAIGFsbDoKICAgICB4Y29w eSAveSAvZCAiLi5cU2hhcmVkXEFQSVxjXFdLVVJMLmgiICIkKFdFQktJVE9VVFBVVERJUilcaW5j bHVkZVxXZWJLaXQyIgogICAgIHhjb3B5IC95IC9kICIuLlxTaGFyZWRcQVBJXGNcV0tVUkxSZXF1 ZXN0LmgiICIkKFdFQktJVE9VVFBVVERJUilcaW5jbHVkZVxXZWJLaXQyIgogICAgIHhjb3B5IC95 IC9kICIuLlxTaGFyZWRcQVBJXGNcV0tVUkxSZXNwb25zZS5oIiAiJChXRUJLSVRPVVRQVVRESVIp XGluY2x1ZGVcV2ViS2l0MiIKKyAgICB4Y29weSAveSAvZCAiLi5cU2hhcmVkXEFQSVxjXFdLVXNl ckNvbnRlbnRVUkxQYXR0ZXJuLmgiICIkKFdFQktJVE9VVFBVVERJUilcaW5jbHVkZVxXZWJLaXQy IgogICAgIHhjb3B5IC95IC9kICIuLlxVSVByb2Nlc3NcQVBJXENcV2ViS2l0Mi5oIiAiJChXRUJL SVRPVVRQVVRESVIpXGluY2x1ZGVcV2ViS2l0MiIKICAgICB4Y29weSAveSAvZCAiLi5cVUlQcm9j ZXNzXEFQSVxDXFdLQmFja0ZvcndhcmRMaXN0LmgiICIkKFdFQktJVE9VVFBVVERJUilcaW5jbHVk ZVxXZWJLaXQyIgogICAgIHhjb3B5IC95IC9kICIuLlxVSVByb2Nlc3NcQVBJXENcV0tCYWNrRm9y d2FyZExpc3RJdGVtLmgiICIkKFdFQktJVE9VVFBVVERJUilcaW5jbHVkZVxXZWJLaXQyIgo=