46668 2010-09-27 15:53:55 -0700 Add WebProcessConnection CreatePlugin message 2010-09-27 16:38:48 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 285834 0 andersca 2010-09-27 15:53:55 -0700 Add WebProcessConnection CreatePlugin message 285838 1 68983 andersca 2010-09-27 15:57:12 -0700 Created attachment 68983 Patch 285843 2 68983 aroben 2010-09-27 16:03:13 -0700 Comment on attachment 68983 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=68983&action=review > WebKit2/PluginProcess/WebProcessConnection.messages.in:26 > + # Creates a plug-in instance with the given instance ID. I think // comments will work just fine, if that's what you'd prefer. > WebKit2/Scripts/webkit2/messages.py:219 > +def headers_for_type(type): > + special_cases = { > + 'WTF::String': '<wtf/text/WTFString.h>', > + 'WebKit::WebKeyboardEvent': '"WebEvent.h"', > + 'WebKit::WebMouseEvent': '"WebEvent.h"', > + 'WebKit::WebWheelEvent': '"WebEvent.h"', > + 'WebKit::WebTouchEvent': '"WebEvent.h"', > + } > + if type in special_cases: > + return [special_cases[type]] > + > + # We assume that we must include a header for a type iff it has a scope > + # resolution operator (::). > + split = type.split('::') > + if len(split) < 2: > + return [] > + if split[0] == 'WebKit' or split[0] == 'CoreIPC': > + return ['"%s.h"' % split[1]] > + return ['<%s/%s.h>' % tuple(split)] Why did you move this? 285873 3 andersca 2010-09-27 16:38:48 -0700 Committed r68445: <http://trac.webkit.org/changeset/68445> 68983 2010-09-27 15:57:12 -0700 2010-09-27 16:03:13 -0700 Patch bug-46668-20100927155711.patch text/plain 20900 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg YWM1ZTZkMjI2Mjk5ZWJhYjNjZmUwNTE3MWI5NjhlYmZjYjhjYjg5NS4uOWYxYjQxN2NmYjczNjRj ZWU2MTRmOTFjNDU3MzM3MGNkMGU4NjFkYyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzNyBAQAogMjAxMC0wOS0yNyAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBXZWJQcm9jZXNzQ29ubmVjdGlvbiBDcmVh dGVQbHVnaW4gbWVzc2FnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDY2NjgKKworICAgICAgICAqIERlcml2ZWRTb3VyY2VzLm1ha2U6CisgICAgICAg IEFkZCBXZWJQcm9jZXNzQ29ubmVjdGlvbi4KKworICAgICAgICAqIFBsYXRmb3JtL0NvcmVJUEMv SGFuZGxlTWVzc2FnZS5oOgorICAgICAgICBBZGQgaGFuZGxlTWVzc2FnZSBvdmVybG9hZCBmb3Ig YSBzeW5jIG1lc3NhZ2Ugd2l0aCB0d28gaW5wdXQgcGFyYW1ldGVycworICAgICAgICBhbmQgb25l IG91dHB1dCBwYXJhbWV0ZXIuCisKKyAgICAgICAgKENvcmVJUEM6OmhhbmRsZU1lc3NhZ2UpOgor ICAgICAgICAqIFBsYXRmb3JtL0NvcmVJUEMvTWVzc2FnZUlELmg6CisgICAgICAgIEFkZCBNZXNz YWdlQ2xhc3NXZWJQcm9jZXNzQ29ubmVjdGlvbi4KKworICAgICAgICAqIFBsdWdpblByb2Nlc3Mv V2ViUHJvY2Vzc0Nvbm5lY3Rpb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ29u bmVjdGlvbjo6Y3JlYXRlUGx1Z2luKToKKyAgICAgICAgQWRkIHN0dWIuCisKKyAgICAgICAgKiBQ bHVnaW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9uLm1lc3NhZ2VzLmluOiBBZGRlZC4KKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXMucHk6CisgICAgICAgIEluY2x1ZGUgaGVh ZGVycyBkaXJlY3RseSBmb3IgdHlwZXMgdGhhdCB3ZSBiZWxpZXZlIGFyZSBuZXN0ZWQgc3RydWN0 cy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0Mi9tZXNzYWdlc191bml0dGVzdC5weToKKyAg ICAgICAgVXBkYXRlIGV4cGVjdGVkIHJlc3VsdHMuCisKKyAgICAgICAgKiBXZWJLaXQyLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgIEFkZCBuZXcgZmlsZXMuCisKKzIwMTAtMDkt MjcgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBSZXZp ZXdlZCBieSBBZGFtIFJvYmVuLgogCiAgICAgICAgIEFkZCBzdXBwb3J0IGZvciBhdXRvZ2VuZXJh dGluZyBzeW5jaHJvbm91cyBtZXNzYWdlIGhhbmRsZXJzCmRpZmYgLS1naXQgYS9XZWJLaXQyL0Rl cml2ZWRTb3VyY2VzLm1ha2UgYi9XZWJLaXQyL0Rlcml2ZWRTb3VyY2VzLm1ha2UKaW5kZXggZGMx YzA0NjIxOTE2Yzk4YmRiZGVjNTRlMTc3NmY2ZDZhNDdjOThlYy4uMDM2YWRiMjE5MzU5MWM0MThl MzE1NTliOWQ0MzJiYjhkNmI4NDE1YyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9EZXJpdmVkU291cmNl cy5tYWtlCisrKyBiL1dlYktpdDIvRGVyaXZlZFNvdXJjZXMubWFrZQpAQCAtOCw2ICs4LDcgQEAg TUVTU0FHRV9SRUNFSVZFUlMgPSBcCiAgICAgUGx1Z2luUHJvY2VzcyBcCiAgICAgUGx1Z2luUHJv Y2Vzc1Byb3h5IFwKICAgICBXZWJQYWdlIFwKKyAgICBXZWJQcm9jZXNzQ29ubmVjdGlvbiBcCiAj CiAKIFNDUklQVFMgPSBcCmRpZmYgLS1naXQgYS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvSGFu ZGxlTWVzc2FnZS5oIGIvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0hhbmRsZU1lc3NhZ2UuaApp bmRleCA3MTI3YWQ3NjMxMzQ5NzYyMDYzODM1MzZkNDU4M2YwMDY1MGI3NmUxLi5hNTIxZGYzNzkw ZTFkYTcyOTEwOWY5ZjZjMjViYjhlODhkYTQwODc3IDEwMDY0NAotLS0gYS9XZWJLaXQyL1BsYXRm b3JtL0NvcmVJUEMvSGFuZGxlTWVzc2FnZS5oCisrKyBiL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQ Qy9IYW5kbGVNZXNzYWdlLmgKQEAgLTQ4LDYgKzQ4LDIyIEBAIHZvaWQgaGFuZGxlTWVzc2FnZShB cmd1bWVudERlY29kZXIqIGFyZ3VtZW50cywgQyogb2JqZWN0LCB2b2lkIChDOjoqZnVuY3Rpb24p KFAxCiAgICAgKG9iamVjdC0+KmZ1bmN0aW9uKShmaXJzdEFyZ3VtZW50LCBzZWNvbmRBcmd1bWVu dCwgdGhpcmRBcmd1bWVudCk7CiB9CiAKK3RlbXBsYXRlPHR5cGVuYW1lIFQsIHR5cGVuYW1lIEMs IHR5cGVuYW1lIFAxLCB0eXBlbmFtZSBQMiwgdHlwZW5hbWUgUjE+Cit2b2lkIGhhbmRsZU1lc3Nh Z2UoQXJndW1lbnREZWNvZGVyKiBhcmd1bWVudHMsIEFyZ3VtZW50RW5jb2RlciogcmVwbHksIEMq IG9iamVjdCwgdm9pZCAoQzo6KmZ1bmN0aW9uKShQMSwgUDIsIFIxJikpCit7CisgICAgdHlwZW5h bWUgUmVtb3ZlUmVmZXJlbmNlPHR5cGVuYW1lIFQ6OkZpcnN0QXJndW1lbnRUeXBlPjo6VHlwZSBm aXJzdEFyZ3VtZW50OworICAgIGlmICghYXJndW1lbnRzLT5kZWNvZGUoZmlyc3RBcmd1bWVudCkp CisgICAgICAgIHJldHVybjsKKworICAgIHR5cGVuYW1lIFJlbW92ZVJlZmVyZW5jZTx0eXBlbmFt ZSBUOjpTZWNvbmRBcmd1bWVudFR5cGU+OjpUeXBlIHNlY29uZEFyZ3VtZW50OworICAgIGlmICgh YXJndW1lbnRzLT5kZWNvZGUoc2Vjb25kQXJndW1lbnQpKQorICAgICAgICByZXR1cm47CisgICAg CisgICAgdHlwZW5hbWUgUmVtb3ZlUmVmZXJlbmNlPHR5cGVuYW1lIFQ6OlJlcGx5OjpGaXJzdEFy Z3VtZW50VHlwZT46OlR5cGUgZmlyc3RSZXBseUFyZ3VtZW50OworICAgIChvYmplY3QtPipmdW5j dGlvbikoZmlyc3RBcmd1bWVudCwgc2Vjb25kQXJndW1lbnQsIGZpcnN0UmVwbHlBcmd1bWVudCk7 CisgICAgcmVwbHktPmVuY29kZShmaXJzdFJlcGx5QXJndW1lbnQpOworfQorCiB9IC8vIG5hbWVz cGFjZSBDb3JlSVBDCiAKICNlbmRpZiAvLyBIYW5kbGVNZXNzYWdlX2gKZGlmZiAtLWdpdCBhL1dl YktpdDIvUGxhdGZvcm0vQ29yZUlQQy9NZXNzYWdlSUQuaCBiL1dlYktpdDIvUGxhdGZvcm0vQ29y ZUlQQy9NZXNzYWdlSUQuaAppbmRleCBlNmE1MGEwNmQ1NzRkZjEyZjA2YWFiNTg3NjRhZDQ1MDYz MjczZTNlLi5kZGQ5ODhkY2MwNzY2Yjc5OTI0NGU4YzBlMTA5YzkzYzliYmVmYjUyIDEwMDY0NAot LS0gYS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvTWVzc2FnZUlELmgKKysrIGIvV2ViS2l0Mi9Q bGF0Zm9ybS9Db3JlSVBDL01lc3NhZ2VJRC5oCkBAIC01MSw2ICs1MSw5IEBAIGVudW0gTWVzc2Fn ZUNsYXNzIHsKIAogICAgIC8vIE1lc3NhZ2VzIHNlbnQgYnkgdGhlIHBsdWctaW4gcHJvY2VzcyB0 byB0aGUgVUkgcHJvY2Vzcy4KICAgICBNZXNzYWdlQ2xhc3NQbHVnaW5Qcm9jZXNzUHJveHksCisK KyAgICAvLyBNZXNzYWdlcyBzZW50IGJ5IHRoZSB3ZWIgcHJvY2VzcyB0byB0aGUgcGx1Zy1pbiBw cm9jZXNzLgorICAgIE1lc3NhZ2VDbGFzc1dlYlByb2Nlc3NDb25uZWN0aW9uLAogfTsKIAogdGVt cGxhdGU8dHlwZW5hbWU+IHN0cnVjdCBNZXNzYWdlS2luZFRyYWl0cyB7IH07CmRpZmYgLS1naXQg YS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvV2ViUHJvY2Vzc0Nvbm5lY3Rpb24uY3BwIGIvV2ViS2l0 Mi9QbHVnaW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9uLmNwcAppbmRleCA0MjUxMTkzN2I2 YzNjMGU1MDE2MDVjODY3MDY0ZTRmNmU4Nzk2NWMwLi4yNTMyYTQwYWQwZjJlNTY4N2UxYjhlN2Vk Njk4ZTE3MzBjZTQzZTQ3IDEwMDY0NAotLS0gYS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvV2ViUHJv Y2Vzc0Nvbm5lY3Rpb24uY3BwCisrKyBiL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9XZWJQcm9jZXNz Q29ubmVjdGlvbi5jcHAKQEAgLTY3LDYgKzY3LDkgQEAgdm9pZCBXZWJQcm9jZXNzQ29ubmVjdGlv bjo6ZGlkUmVjZWl2ZUludmFsaWRNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qLCBDb3JlSVAK ICAgICAvLyBGSVhNRTogSW1wbGVtZW50LgogfQogCit2b2lkIFdlYlByb2Nlc3NDb25uZWN0aW9u OjpjcmVhdGVQbHVnaW4odWludDY0X3QgcGx1Z2luSW5zdGFuY2VJRCwgY29uc3QgUGx1Z2luOjpQ YXJhbWV0ZXJzJiwgYm9vbCYgcmVzdWx0KQoreworfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK IApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9u LmggYi9XZWJLaXQyL1BsdWdpblByb2Nlc3MvV2ViUHJvY2Vzc0Nvbm5lY3Rpb24uaAppbmRleCA2 NWJkMWQyZDczN2ExYjhjZDQyYzc1NDZmMmExZTY0NjQzNzNmOGZkLi5jN2Y0ZTc5ZjhkOWZlYzk3 MDdhMmQ2ZWNmYTEyMjdjYTk4MjQyM2YxIDEwMDY0NAotLS0gYS9XZWJLaXQyL1BsdWdpblByb2Nl c3MvV2ViUHJvY2Vzc0Nvbm5lY3Rpb24uaAorKysgYi9XZWJLaXQyL1BsdWdpblByb2Nlc3MvV2Vi UHJvY2Vzc0Nvbm5lY3Rpb24uaApAQCAtMjksNiArMjksNyBAQAogI2lmIEVOQUJMRShQTFVHSU5f UFJPQ0VTUykKIAogI2luY2x1ZGUgIkNvbm5lY3Rpb24uaCIKKyNpbmNsdWRlICJQbHVnaW4uaCIK ICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTUx LDYgKzUyLDEwIEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGRpZENsb3NlKENvcmVJUEM6 OkNvbm5lY3Rpb24qKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZUludmFsaWRNZXNzYWdl KENvcmVJUEM6OkNvbm5lY3Rpb24qLCBDb3JlSVBDOjpNZXNzYWdlSUQpOwogCisgICAgLy8gTWVz c2FnZSBoYW5kbGVycy4KKyAgICBDb3JlSVBDOjpTeW5jUmVwbHlNb2RlIGRpZFJlY2VpdmVTeW5j V2ViUHJvY2Vzc0Nvbm5lY3Rpb25NZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qLCBDb3JlSVBD OjpNZXNzYWdlSUQsIENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciosIENvcmVJUEM6OkFyZ3VtZW50 RW5jb2RlciopOworICAgIHZvaWQgY3JlYXRlUGx1Z2luKHVpbnQ2NF90IHBsdWdpbkluc3RhbmNl SUQsIGNvbnN0IFBsdWdpbjo6UGFyYW1ldGVycyYsIGJvb2wmIHJlc3VsdCk7CisKICAgICBSZWZQ dHI8Q29yZUlQQzo6Q29ubmVjdGlvbj4gbV9jb25uZWN0aW9uOwogfTsKIApkaWZmIC0tZ2l0IGEv V2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9uLm1lc3NhZ2VzLmluIGIv V2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9uLm1lc3NhZ2VzLmluCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLjVjNmU1MmJhMWU4ZWY5ZWQwZDE5MzExNzZkM2FhNjkxZjM4MmMwMDQKLS0tIC9k ZXYvbnVsbAorKysgYi9XZWJLaXQyL1BsdWdpblByb2Nlc3MvV2ViUHJvY2Vzc0Nvbm5lY3Rpb24u bWVzc2FnZXMuaW4KQEAgLTAsMCArMSwzMCBAQAorIyBDb3B5cmlnaHQgKEMpIDIwMTAgQXBwbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIworIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisj IGFyZSBtZXQ6CisjIDEuICBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRh aW4gdGhlIGFib3ZlIGNvcHlyaWdodAorIyAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0 aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorIyAyLiAgUmVkaXN0cmlidXRpb25z IGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAg IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lciBpbiB0aGUKKyMgICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBw cm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisjCisjIFRISVMgU09GVFdBUkUgSVMgUFJP VklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycgQU5ECisj IEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJ TUlURUQgVE8sIFRIRSBJTVBMSUVECisjIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFO RCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUKKyMgRElTQ0xBSU1FRC4gSU4g Tk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBG T1IKKyMgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFS WSwgT1IgQ09OU0VRVUVOVElBTAorIyBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRF RCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUgorIyBTRVJWSUNFUzsgTE9T UyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9X RVZFUgorIyBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElO IENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLAorIyBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElH RU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBP RiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNV Q0ggREFNQUdFLgorCisjaWYgRU5BQkxFKFBMVUdJTl9QUk9DRVNTKQorCittZXNzYWdlcyAtPiBX ZWJQcm9jZXNzQ29ubmVjdGlvbiB7CisgICAgIyBDcmVhdGVzIGEgcGx1Zy1pbiBpbnN0YW5jZSB3 aXRoIHRoZSBnaXZlbiBpbnN0YW5jZSBJRC4KKyAgICBDcmVhdGVQbHVnaW4odWludDY0X3QgcGx1 Z2luSW5zdGFuY2VJRCwgV2ViS2l0OjpQbHVnaW46OlBhcmFtZXRlcnMgcGFyYW1ldGVycykgLT4g KGJvb2wgcmVzdWx0KQorfQorCisjZW5kaWYKZGlmZiAtLWdpdCBhL1dlYktpdDIvU2NyaXB0cy93 ZWJraXQyL21lc3NhZ2VzLnB5IGIvV2ViS2l0Mi9TY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXMucHkK aW5kZXggYjc3ZmE0ODBjNGNmZGZlYThjZjcwOWRmZDczMGMzYjI5NDU2NWViOC4uODgyOTE4YWQz MzI3ZjliOWZiOTdjZjkwYjU2OWY3YzgzZjk5NTBmNyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9TY3Jp cHRzL3dlYmtpdDIvbWVzc2FnZXMucHkKKysrIGIvV2ViS2l0Mi9TY3JpcHRzL3dlYmtpdDIvbWVz c2FnZXMucHkKQEAgLTE5OCw2ICsxOTgsMjcgQEAgZGVmIG1lc3NhZ2VfdG9fc3RydWN0X2RlY2xh cmF0aW9uKG1lc3NhZ2UpOgogICAgIHJldHVybiBzdXJyb3VuZF9pbl9jb25kaXRpb24oJycuam9p bihyZXN1bHQpLCBtZXNzYWdlLmNvbmRpdGlvbikKIAogCitkZWYgaGVhZGVyc19mb3JfdHlwZSh0 eXBlKToKKyAgICBzcGVjaWFsX2Nhc2VzID0geworICAgICAgICAnV1RGOjpTdHJpbmcnOiAnPHd0 Zi90ZXh0L1dURlN0cmluZy5oPicsCisgICAgICAgICdXZWJLaXQ6OldlYktleWJvYXJkRXZlbnQn OiAnIldlYkV2ZW50LmgiJywKKyAgICAgICAgJ1dlYktpdDo6V2ViTW91c2VFdmVudCc6ICciV2Vi RXZlbnQuaCInLAorICAgICAgICAnV2ViS2l0OjpXZWJXaGVlbEV2ZW50JzogJyJXZWJFdmVudC5o IicsCisgICAgICAgICdXZWJLaXQ6OldlYlRvdWNoRXZlbnQnOiAnIldlYkV2ZW50LmgiJywKKyAg ICB9CisgICAgaWYgdHlwZSBpbiBzcGVjaWFsX2Nhc2VzOgorICAgICAgICByZXR1cm4gW3NwZWNp YWxfY2FzZXNbdHlwZV1dCisKKyAgICAjIFdlIGFzc3VtZSB0aGF0IHdlIG11c3QgaW5jbHVkZSBh IGhlYWRlciBmb3IgYSB0eXBlIGlmZiBpdCBoYXMgYSBzY29wZQorICAgICMgcmVzb2x1dGlvbiBv cGVyYXRvciAoOjopLgorICAgIHNwbGl0ID0gdHlwZS5zcGxpdCgnOjonKQorICAgIGlmIGxlbihz cGxpdCkgPCAyOgorICAgICAgICByZXR1cm4gW10KKyAgICBpZiBzcGxpdFswXSA9PSAnV2ViS2l0 JyBvciBzcGxpdFswXSA9PSAnQ29yZUlQQyc6CisgICAgICAgIHJldHVybiBbJyIlcy5oIicgJSBz cGxpdFsxXV0KKyAgICByZXR1cm4gWyc8JXMvJXMuaD4nICUgdHVwbGUoc3BsaXQpXQorCisKIGRl ZiBmb3J3YXJkX2RlY2xhcmF0aW9uc19mb3JfbmFtZXNwYWNlKG5hbWVzcGFjZSwgdHlwZXMpOgog ICAgIHJlc3VsdCA9IFtdCiAgICAgcmVzdWx0LmFwcGVuZCgnbmFtZXNwYWNlICVzIHtcbicgJSBu YW1lc3BhY2UpCkBAIC0yMDYsMjggKzIyNywzNiBAQCBkZWYgZm9yd2FyZF9kZWNsYXJhdGlvbnNf Zm9yX25hbWVzcGFjZShuYW1lc3BhY2UsIHR5cGVzKToKICAgICByZXR1cm4gJycuam9pbihyZXN1 bHQpCiAKIAotZGVmIGZvcndhcmRfZGVjbGFyYXRpb25zKHJlY2VpdmVyKToKK2RlZiBmb3J3YXJk X2RlY2xhcmF0aW9uc19hbmRfaGVhZGVycyhyZWNlaXZlcik6CiAgICAgdHlwZXNfYnlfbmFtZXNw YWNlID0gY29sbGVjdGlvbnMuZGVmYXVsdGRpY3Qoc2V0KQorCisgICAgaGVhZGVycyA9IHNldChb CisgICAgICAgICciQXJndW1lbnRzLmgiJywKKyAgICAgICAgJyJNZXNzYWdlSUQuaCInLAorICAg IF0pCisKICAgICBmb3IgcGFyYW1ldGVyIGluIHJlY2VpdmVyLml0ZXJwYXJhbWV0ZXJzKCk6CiAg ICAgICAgIHR5cGUgPSBwYXJhbWV0ZXIudHlwZQogICAgICAgICBzcGxpdCA9IHR5cGUuc3BsaXQo Jzo6JykKLSAgICAgICAgaWYgbGVuKHNwbGl0KSAhPSAyOgotICAgICAgICAgICAgY29udGludWUK LSAgICAgICAgbmFtZXNwYWNlID0gc3BsaXRbMF0KLSAgICAgICAgaW5uZXJfdHlwZSA9IHNwbGl0 WzFdCi0gICAgICAgIHR5cGVzX2J5X25hbWVzcGFjZVtuYW1lc3BhY2VdLmFkZChpbm5lcl90eXBl KQotICAgIHJldHVybiAnXG4nLmpvaW4oW2ZvcndhcmRfZGVjbGFyYXRpb25zX2Zvcl9uYW1lc3Bh Y2UobmFtZXNwYWNlLCB0eXBlcykgZm9yIChuYW1lc3BhY2UsIHR5cGVzKSBpbiBzb3J0ZWQodHlw ZXNfYnlfbmFtZXNwYWNlLml0ZXJpdGVtcygpKV0pCiAKKyAgICAgICAgaWYgbGVuKHNwbGl0KSA9 PSAyOgorICAgICAgICAgICAgbmFtZXNwYWNlID0gc3BsaXRbMF0KKyAgICAgICAgICAgIGlubmVy X3R5cGUgPSBzcGxpdFsxXQorICAgICAgICAgICAgdHlwZXNfYnlfbmFtZXNwYWNlW25hbWVzcGFj ZV0uYWRkKGlubmVyX3R5cGUpCisgICAgICAgIGVsaWYgbGVuKHNwbGl0KSA+IDI6CisgICAgICAg ICAgICAjIFdlIHByb2JhYmx5IGhhdmUgYSBuZXN0ZWQgc3RydWN0LCB3aGljaCBtZWFucyB3ZSBj YW4ndCBmb3J3YXJkIGRlY2xhcmUgaXQuCisgICAgICAgICAgICAjIEluY2x1ZGUgaXRzIGhlYWRl ciBpbnN0ZWFkLgorICAgICAgICAgICAgaGVhZGVycy51cGRhdGUoaGVhZGVyc19mb3JfdHlwZSh0 eXBlKSkKKworICAgIGZvcndhcmRfZGVjbGFyYXRpb25zID0gJ1xuJy5qb2luKFtmb3J3YXJkX2Rl Y2xhcmF0aW9uc19mb3JfbmFtZXNwYWNlKG5hbWVzcGFjZSwgdHlwZXMpIGZvciAobmFtZXNwYWNl LCB0eXBlcykgaW4gc29ydGVkKHR5cGVzX2J5X25hbWVzcGFjZS5pdGVyaXRlbXMoKSldKQorICAg IGhlYWRlcnMgPSBbJyNpbmNsdWRlICVzXG4nICUgaGVhZGVyIGZvciBoZWFkZXIgaW4gc29ydGVk KGhlYWRlcnMpXQorCisgICAgcmV0dXJuIChmb3J3YXJkX2RlY2xhcmF0aW9ucywgaGVhZGVycykK IAogZGVmIGdlbmVyYXRlX21lc3NhZ2VzX2hlYWRlcihmaWxlKToKICAgICByZWNlaXZlciA9IE1l c3NhZ2VSZWNlaXZlci5wYXJzZShmaWxlKQogICAgIGhlYWRlcl9ndWFyZCA9IG1lc3NhZ2VzX2hl YWRlcl9maWxlbmFtZShyZWNlaXZlcikucmVwbGFjZSgnLicsICdfJykKIAotICAgIGhlYWRlcnMg PSBzZXQoWwotICAgICAgICAnIkFyZ3VtZW50cy5oIicsCi0gICAgICAgICciTWVzc2FnZUlELmgi JywKLSAgICBdKQotCiAgICAgcmVzdWx0ID0gW10KIAogICAgIHJlc3VsdC5hcHBlbmQoX2xpY2Vu c2VfaGVhZGVyKQpAQCAtMjM5LDEwICsyNjgsMTIgQEAgZGVmIGdlbmVyYXRlX21lc3NhZ2VzX2hl YWRlcihmaWxlKToKICAgICBpZiByZWNlaXZlci5jb25kaXRpb246CiAgICAgICAgIHJlc3VsdC5h cHBlbmQoJyNpZiAlc1xuXG4nICUgcmVjZWl2ZXIuY29uZGl0aW9uKQogCi0gICAgcmVzdWx0ICs9 IFsnI2luY2x1ZGUgJXNcbicgJSBoZWFkZXIgZm9yIGhlYWRlciBpbiBzb3J0ZWQoaGVhZGVycyld CisgICAgZm9yd2FyZF9kZWNsYXJhdGlvbnMsIGhlYWRlcnMgPSBmb3J3YXJkX2RlY2xhcmF0aW9u c19hbmRfaGVhZGVycyhyZWNlaXZlcikKKworICAgIHJlc3VsdCArPSBoZWFkZXJzCiAgICAgcmVz dWx0LmFwcGVuZCgnXG4nKQogCi0gICAgcmVzdWx0LmFwcGVuZChmb3J3YXJkX2RlY2xhcmF0aW9u cyhyZWNlaXZlcikpCisgICAgcmVzdWx0LmFwcGVuZChmb3J3YXJkX2RlY2xhcmF0aW9ucykKICAg ICByZXN1bHQuYXBwZW5kKCdcbicpCiAKICAgICByZXN1bHQuYXBwZW5kKCduYW1lc3BhY2UgTWVz c2FnZXMge1xuXG5uYW1lc3BhY2UgJXMge1xuXG4nICUgcmVjZWl2ZXIubmFtZSkKQEAgLTI5Nywy OCArMzI4LDYgQEAgZGVmIGFyZ3VtZW50X2NvZGVyX2hlYWRlcnNfZm9yX3R5cGUodHlwZSk6CiAg ICAgcmV0dXJuIFtdCiAKIAotZGVmIGhlYWRlcnNfZm9yX3R5cGUodHlwZSk6Ci0gICAgc3BlY2lh bF9jYXNlcyA9IHsKLSAgICAgICAgJ0NvcmVJUEM6Ok1hY2hQb3J0JzogJyJNYWNoUG9ydC5oIics Ci0gICAgICAgICdXVEY6OlN0cmluZyc6ICc8d3RmL3RleHQvV1RGU3RyaW5nLmg+JywKLSAgICAg ICAgJ1dlYktpdDo6V2ViS2V5Ym9hcmRFdmVudCc6ICciV2ViRXZlbnQuaCInLAotICAgICAgICAn V2ViS2l0OjpXZWJNb3VzZUV2ZW50JzogJyJXZWJFdmVudC5oIicsCi0gICAgICAgICdXZWJLaXQ6 OldlYldoZWVsRXZlbnQnOiAnIldlYkV2ZW50LmgiJywKLSAgICAgICAgJ1dlYktpdDo6V2ViVG91 Y2hFdmVudCc6ICciV2ViRXZlbnQuaCInLAotICAgIH0KLSAgICBpZiB0eXBlIGluIHNwZWNpYWxf Y2FzZXM6Ci0gICAgICAgIHJldHVybiBbc3BlY2lhbF9jYXNlc1t0eXBlXV0KLQotICAgICMgV2Ug YXNzdW1lIHRoYXQgd2UgbXVzdCBpbmNsdWRlIGEgaGVhZGVyIGZvciBhIHR5cGUgaWZmIGl0IGhh cyBhIHNjb3BlCi0gICAgIyByZXNvbHV0aW9uIG9wZXJhdG9yICg6OikuCi0gICAgc3BsaXQgPSB0 eXBlLnNwbGl0KCc6OicpCi0gICAgaWYgbGVuKHNwbGl0KSAhPSAyOgotICAgICAgICByZXR1cm4g W10KLSAgICBpZiBzcGxpdFswXSA9PSAnV2ViS2l0JzoKLSAgICAgICAgcmV0dXJuIFsnIiVzLmgi JyAlIHNwbGl0WzFdXQotICAgIHJldHVybiBbJzwlcy8lcy5oPicgJSB0dXBsZShzcGxpdCldCi0K LQogZGVmIGdlbmVyYXRlX21lc3NhZ2VfaGFuZGxlcihmaWxlKToKICAgICByZWNlaXZlciA9IE1l c3NhZ2VSZWNlaXZlci5wYXJzZShmaWxlKQogICAgIGhlYWRlcnMgPSBzZXQoWwpkaWZmIC0tZ2l0 IGEvV2ViS2l0Mi9TY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXNfdW5pdHRlc3QucHkgYi9XZWJLaXQy L1NjcmlwdHMvd2Via2l0Mi9tZXNzYWdlc191bml0dGVzdC5weQppbmRleCBmNTViOGIyN2Q3MjE0 ZDAzNGQ1ZjJlNGFhYjU4Njc2MWI2NjE5MTg4Li4zZjZlMWNmYWM2ODViMjZhZjQzNjQyMGEwYzRj YjllNjg2NjViOGJlIDEwMDY0NAotLS0gYS9XZWJLaXQyL1NjcmlwdHMvd2Via2l0Mi9tZXNzYWdl c191bml0dGVzdC5weQorKysgYi9XZWJLaXQyL1NjcmlwdHMvd2Via2l0Mi9tZXNzYWdlc191bml0 dGVzdC5weQpAQCAtNjAsNiArNjAsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlIHsKICAgICBTZW5k RG91YmxlQW5kRmxvYXQoZG91YmxlIGQsIGZsb2F0IGYpCiAgICAgU2VuZEludHMoVmVjdG9yPHVp bnQ2NF90PiBpbnRzKQogCisgICAgQ3JlYXRlUGx1Z2luKHVpbnQ2NF90IHBsdWdpbkluc3RhbmNl SUQsIFdlYktpdDo6UGx1Z2luOjpQYXJhbWV0ZXJzIHBhcmFtZXRlcnMpIC0+IChib29sIHJlc3Vs dCkKICAgICBSdW5KYXZhU2NyaXB0QWxlcnQodWludDY0X3QgZnJhbWVJRCwgV1RGOjpTdHJpbmcg bWVzc2FnZSkgLT4gKCkKICAgICBHZXRQbHVnaW5zKGJvb2wgcmVmcmVzaCkgLT4gKFZlY3RvcjxX ZWJDb3JlOjpQbHVnaW5JbmZvPiBwbHVnaW5zKQogICAgIEdldFBsdWdpblByb2Nlc3NDb25uZWN0 aW9uKFdURjo6U3RyaW5nIHBsdWdpblBhdGgpIC0+IChDb3JlSVBDOjpDb25uZWN0aW9uOjpIYW5k bGUgY29ubmVjdGlvbkhhbmRsZSkgZGVsYXllZApAQCAtMTI0LDYgKzEyNSwxOSBAQCBfZXhwZWN0 ZWRfcmVzdWx0cyA9IHsKICAgICAgICAgICAgICdiYXNlX2NsYXNzJzogJ0NvcmVJUEM6OkFyZ3Vt ZW50czE8Y29uc3QgVmVjdG9yPHVpbnQ2NF90PiY+JywKICAgICAgICAgfSwKICAgICAgICAgewor ICAgICAgICAgICAgJ25hbWUnOiAnQ3JlYXRlUGx1Z2luJywKKyAgICAgICAgICAgICdwYXJhbWV0 ZXJzJzogKAorICAgICAgICAgICAgICAgICgndWludDY0X3QnLCAncGx1Z2luSW5zdGFuY2VJRCcp LAorICAgICAgICAgICAgICAgICgnV2ViS2l0OjpQbHVnaW46OlBhcmFtZXRlcnMnLCAncGFyYW1l dGVycycpCisgICAgICAgICAgICApLAorICAgICAgICAgICAgJ3JlcGx5X3BhcmFtZXRlcnMnOiAo CisgICAgICAgICAgICAgICAgKCdib29sJywgJ3Jlc3VsdCcpLAorICAgICAgICAgICAgKSwKKyAg ICAgICAgICAgICdjb25kaXRpb24nOiBOb25lLAorICAgICAgICAgICAgJ2Jhc2VfY2xhc3MnOiAn Q29yZUlQQzo6QXJndW1lbnRzMjx1aW50NjRfdCwgY29uc3QgV2ViS2l0OjpQbHVnaW46OlBhcmFt ZXRlcnMmPicsCisgICAgICAgICAgICAncmVwbHlfYmFzZV9jbGFzcyc6ICdDb3JlSVBDOjpBcmd1 bWVudHMxPGJvb2w+JywKKyAgICAgICAgfSwKKyAgICAgICAgewogICAgICAgICAgICAgJ25hbWUn OiAnUnVuSmF2YVNjcmlwdEFsZXJ0JywKICAgICAgICAgICAgICdwYXJhbWV0ZXJzJzogKAogICAg ICAgICAgICAgICAgICgndWludDY0X3QnLCAnZnJhbWVJRCcpLApAQCAtMjMwLDYgKzI0NCw3IEBA IF9leHBlY3RlZF9oZWFkZXIgPSAiIiIvKgogCiAjaW5jbHVkZSAiQXJndW1lbnRzLmgiCiAjaW5j bHVkZSAiTWVzc2FnZUlELmgiCisjaW5jbHVkZSAiUGx1Z2luLmgiCiAKIG5hbWVzcGFjZSBDb3Jl SVBDIHsKICAgICBjbGFzcyBNYWNoUG9ydDsKQEAgLTI1Niw2ICsyNzEsNyBAQCBlbnVtIEtpbmQg ewogICAgIENsb3NlSUQsCiAgICAgU2VuZERvdWJsZUFuZEZsb2F0SUQsCiAgICAgU2VuZEludHNJ RCwKKyAgICBDcmVhdGVQbHVnaW5JRCwKICAgICBSdW5KYXZhU2NyaXB0QWxlcnRJRCwKICAgICBH ZXRQbHVnaW5zSUQsCiAgICAgR2V0UGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb25JRCwKQEAgLTMwOCw2 ICszMjQsMTUgQEAgc3RydWN0IFNlbmRJbnRzIDogQ29yZUlQQzo6QXJndW1lbnRzMTxjb25zdCBW ZWN0b3I8dWludDY0X3Q+Jj4gewogICAgIH0KIH07CiAKK3N0cnVjdCBDcmVhdGVQbHVnaW4gOiBD b3JlSVBDOjpBcmd1bWVudHMyPHVpbnQ2NF90LCBjb25zdCBXZWJLaXQ6OlBsdWdpbjo6UGFyYW1l dGVycyY+IHsKKyAgICBzdGF0aWMgY29uc3QgS2luZCBtZXNzYWdlSUQgPSBDcmVhdGVQbHVnaW5J RDsKKyAgICB0eXBlZGVmIENvcmVJUEM6OkFyZ3VtZW50czE8Ym9vbCY+IFJlcGx5OworICAgIENy ZWF0ZVBsdWdpbih1aW50NjRfdCBwbHVnaW5JbnN0YW5jZUlELCBjb25zdCBXZWJLaXQ6OlBsdWdp bjo6UGFyYW1ldGVycyYgcGFyYW1ldGVycykKKyAgICAgICAgOiBDb3JlSVBDOjpBcmd1bWVudHMy PHVpbnQ2NF90LCBjb25zdCBXZWJLaXQ6OlBsdWdpbjo6UGFyYW1ldGVycyY+KHBsdWdpbkluc3Rh bmNlSUQsIHBhcmFtZXRlcnMpCisgICAgeworICAgIH0KK307CisKIHN0cnVjdCBSdW5KYXZhU2Ny aXB0QWxlcnQgOiBDb3JlSVBDOjpBcmd1bWVudHMyPHVpbnQ2NF90LCBjb25zdCBXVEY6OlN0cmlu ZyY+IHsKICAgICBzdGF0aWMgY29uc3QgS2luZCBtZXNzYWdlSUQgPSBSdW5KYXZhU2NyaXB0QWxl cnRJRDsKICAgICB0eXBlZGVmIENvcmVJUEM6OkFyZ3VtZW50czAgUmVwbHk7CkBAIC0zOTEsNiAr NDE2LDcgQEAgX2V4cGVjdGVkX3JlY2VpdmVyX2ltcGxlbWVudGF0aW9uID0gIiIiLyoKICNpbmNs dWRlICJBcmd1bWVudERlY29kZXIuaCIKICNpbmNsdWRlICJIYW5kbGVNZXNzYWdlLmgiCiAjaW5j bHVkZSAiTWFjaFBvcnQuaCIKKyNpbmNsdWRlICJQbHVnaW4uaCIKICNpbmNsdWRlICJXZWJDb3Jl QXJndW1lbnRDb2RlcnMuaCIKICNpbmNsdWRlICJXZWJFdmVudC5oIgogI2luY2x1ZGUgIldlYlBh Z2VNZXNzYWdlcy5oIgpAQCAtNDMzLDYgKzQ1OSw5IEBAIHZvaWQgV2ViUGFnZTo6ZGlkUmVjZWl2 ZVdlYlBhZ2VNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qLCBDb3JlSVBDOjpNZXNzYWdlSUQK IENvcmVJUEM6OlN5bmNSZXBseU1vZGUgV2ViUGFnZTo6ZGlkUmVjZWl2ZVN5bmNXZWJQYWdlTWVz c2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2FnZUlEIG1lc3NhZ2VJRCwg Q29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiBhcmd1bWVudHMsIENvcmVJUEM6OkFyZ3VtZW50RW5j b2RlciogcmVwbHkpCiB7CiAgICAgc3dpdGNoIChtZXNzYWdlSUQuZ2V0PE1lc3NhZ2VzOjpXZWJQ YWdlOjpLaW5kPigpKSB7CisgICAgY2FzZSBNZXNzYWdlczo6V2ViUGFnZTo6Q3JlYXRlUGx1Z2lu SUQ6CisgICAgICAgIENvcmVJUEM6OmhhbmRsZU1lc3NhZ2U8TWVzc2FnZXM6OldlYlBhZ2U6OkNy ZWF0ZVBsdWdpbj4oYXJndW1lbnRzLCByZXBseSwgdGhpcywgJldlYlBhZ2U6OmNyZWF0ZVBsdWdp bik7CisgICAgICAgIHJldHVybiBDb3JlSVBDOjpBdXRvbWF0aWNSZXBseTsKICAgICBjYXNlIE1l c3NhZ2VzOjpXZWJQYWdlOjpSdW5KYXZhU2NyaXB0QWxlcnRJRDoKICAgICAgICAgQ29yZUlQQzo6 aGFuZGxlTWVzc2FnZTxNZXNzYWdlczo6V2ViUGFnZTo6UnVuSmF2YVNjcmlwdEFsZXJ0Pihhcmd1 bWVudHMsIHJlcGx5LCB0aGlzLCAmV2ViUGFnZTo6cnVuSmF2YVNjcmlwdEFsZXJ0KTsKICAgICAg ICAgcmV0dXJuIENvcmVJUEM6OkF1dG9tYXRpY1JlcGx5OwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9X ZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9XZWJLaXQyL1dlYktpdDIueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvagppbmRleCAyMzNhMjA2NGFlYmU2OWYyZWQ4ZjVmNzc1NTc2Njlj MTYwYWJhNjljLi4zYjU5NGU5YTU5ODY5YzgxNzY3OTkyNzU1ODk1ZjY2ZTVjODkyOTE4IDEwMDY0 NAotLS0gYS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9X ZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtNTYsNiArNTYsOSBA QAogCQkxQTA0M0Q5MjEyNEZGMDJCMDBGRkJGQjUgLyogQmFja2luZ1N0b3JlTWFjLm1tIGluIFNv dXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUEwNDNEOTAxMjRGRjAy QjAwRkZCRkI1IC8qIEJhY2tpbmdTdG9yZU1hYy5tbSAqLzsgfTsKIAkJMUEwNDNEQzExMjRGRjg3 NTAwRkZCRkI1IC8qIFBsdWdpblByb3h5LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSAxQTA0M0RCRjEyNEZGODc1MDBGRkJGQjUgLyogUGx1Z2luUHJveHku aCAqLzsgfTsKIAkJMUEwNDNEQzIxMjRGRjg3NTAwRkZCRkI1IC8qIFBsdWdpblByb3h5LmNwcCBp biBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBMDQzREMwMTI0 RkY4NzUwMEZGQkZCNSAvKiBQbHVnaW5Qcm94eS5jcHAgKi87IH07CisJCTFBMDQzRjVBMTI1MTRD RjMwMEZGQkZCNSAvKiBXZWJQcm9jZXNzQ29ubmVjdGlvbi5tZXNzYWdlcy5pbiBpbiBSZXNvdXJj ZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUEwNDNGNTkxMjUxNENGMzAw RkZCRkI1IC8qIFdlYlByb2Nlc3NDb25uZWN0aW9uLm1lc3NhZ2VzLmluICovOyB9OworCQkxQTA0 M0Y2OTEyNTE0RDhCMDBGRkJGQjUgLyogV2ViUHJvY2Vzc0Nvbm5lY3Rpb25NZXNzYWdlUmVjZWl2 ZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUEw NDNGNjcxMjUxNEQ4QjAwRkZCRkI1IC8qIFdlYlByb2Nlc3NDb25uZWN0aW9uTWVzc2FnZVJlY2Vp dmVyLmNwcCAqLzsgfTsKKwkJMUEwNDNGNkExMjUxNEQ4QjAwRkZCRkI1IC8qIFdlYlByb2Nlc3ND b25uZWN0aW9uTWVzc2FnZXMuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDFBMDQzRjY4MTI1MTREOEIwMEZGQkZCNSAvKiBXZWJQcm9jZXNzQ29ubmVjdGlv bk1lc3NhZ2VzLmggKi87IH07CiAJCTFBMEVDNjAzMTI0QTlGMkMwMDdFRjRBNSAvKiBQbHVnaW5Q cm9jZXNzTWFuYWdlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gMUEwRUM2MDExMjRBOUYyQzAwN0VGNEE1IC8qIFBsdWdpblByb2Nlc3NNYW5hZ2VyLmgg Ki87IH07CiAJCTFBMEVDNjA0MTI0QTlGMkMwMDdFRjRBNSAvKiBQbHVnaW5Qcm9jZXNzTWFuYWdl ci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTBF QzYwMjEyNEE5RjJDMDA3RUY0QTUgLyogUGx1Z2luUHJvY2Vzc01hbmFnZXIuY3BwICovOyB9Owog CQkxQTBFQzZDMDEyNEJCRDlCMDA3RUY0QTUgLyogUGx1Z2luUHJvY2Vzc01lc3NhZ2VzLmggaW4g SGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTBFQzZCRTEyNEJC RDlCMDA3RUY0QTUgLyogUGx1Z2luUHJvY2Vzc01lc3NhZ2VzLmggKi87IH07CkBAIC00NzUsNiAr NDc4LDkgQEAKIAkJMUEwNDNEOTAxMjRGRjAyQjAwRkZCRkI1IC8qIEJhY2tpbmdTdG9yZU1hYy5t bSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IEJhY2tpbmdTdG9yZU1h Yy5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUEwNDNEQkYxMjRGRjg3NTAwRkZC RkI1IC8qIFBsdWdpblByb3h5LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFBs dWdpblByb3h5Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBMDQzREMwMTI0RkY4 NzUwMEZGQkZCNSAvKiBQbHVnaW5Qcm94eS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5j cHA7IHBhdGggPSBQbHVnaW5Qcm94eS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJ CTFBMDQzRjU5MTI1MTRDRjMwMEZGQkZCNSAvKiBXZWJQcm9jZXNzQ29ubmVjdGlvbi5tZXNzYWdl cy5pbiAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHRleHQ7IHBhdGggPSBXZWJQcm9jZXNzQ29ubmVjdGlvbi5tZXNzYWdl cy5pbjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJMUEwNDNGNjcxMjUxNEQ4QjAwRkZC RkI1IC8qIFdlYlByb2Nlc3NDb25uZWN0aW9uTWVzc2FnZVJlY2VpdmVyLmNwcCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuY3BwLmNwcDsgbmFtZSA9IFdlYlByb2Nlc3NDb25uZWN0aW9uTWVzc2FnZVJl Y2VpdmVyLmNwcDsgcGF0aCA9IC9Vc2Vycy9hbmRlcnNjYS9CdWlsZC9EZWJ1Zy9EZXJpdmVkU291 cmNlcy9XZWJLaXQyL1dlYlByb2Nlc3NDb25uZWN0aW9uTWVzc2FnZVJlY2VpdmVyLmNwcDsgc291 cmNlVHJlZSA9ICI8YWJzb2x1dGU+IjsgfTsKKwkJMUEwNDNGNjgxMjUxNEQ4QjAwRkZCRkI1IC8q IFdlYlByb2Nlc3NDb25uZWN0aW9uTWVzc2FnZXMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBuYW1lID0gV2ViUHJvY2Vzc0Nvbm5lY3Rpb25NZXNzYWdlcy5oOyBwYXRoID0gL1VzZXJzL2Fu ZGVyc2NhL0J1aWxkL0RlYnVnL0Rlcml2ZWRTb3VyY2VzL1dlYktpdDIvV2ViUHJvY2Vzc0Nvbm5l Y3Rpb25NZXNzYWdlcy5oOyBzb3VyY2VUcmVlID0gIjxhYnNvbHV0ZT4iOyB9OwogCQkxQTBFQzYw MTEyNEE5RjJDMDA3RUY0QTUgLyogUGx1Z2luUHJvY2Vzc01hbmFnZXIuaCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuYy5oOyBwYXRoID0gUGx1Z2luUHJvY2Vzc01hbmFnZXIuaDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJMUEwRUM2MDIxMjRBOUYyQzAwN0VGNEE1IC8qIFBsdWdpblByb2Nl c3NNYW5hZ2VyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFBsdWdp blByb2Nlc3NNYW5hZ2VyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUEwRUM2 QjExMjRCQkQzNjAwN0VGNEE1IC8qIFBsdWdpblByb2Nlc3MubWVzc2FnZXMuaW4gKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSB0ZXh0OyBwYXRoID0gUGx1Z2luUHJvY2Vzcy5tZXNzYWdlcy5pbjsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKQEAgLTk1Miw2ICs5NTgsNyBAQAogCQkJCTFBMEVDN0ZBMTI0QkQzQjYwMDdF RjRBNSAvKiBQbHVnaW5Qcm9jZXNzTWFpbi5oICovLAogCQkJCTFBMDQzQTA4MTI0RDExQTkwMEZG QkZCNSAvKiBXZWJQcm9jZXNzQ29ubmVjdGlvbi5jcHAgKi8sCiAJCQkJMUEwNDNBMDcxMjREMTFB OTAwRkZCRkI1IC8qIFdlYlByb2Nlc3NDb25uZWN0aW9uLmggKi8sCisJCQkJMUEwNDNGNTkxMjUx NENGMzAwRkZCRkI1IC8qIFdlYlByb2Nlc3NDb25uZWN0aW9uLm1lc3NhZ2VzLmluICovLAogCQkJ KTsKIAkJCXBhdGggPSBQbHVnaW5Qcm9jZXNzOwogCQkJc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsK QEAgLTE2MzksNiArMTY0Niw4IEBACiAJCQkJMUEwNDNCNUMxMjRENUU5RDAwRkZCRkI1IC8qIFBs dWdpblByb2Nlc3NQcm94eU1lc3NhZ2VzLmggKi8sCiAJCQkJQzBDRTcyOUUxMjQ3RTcxRDAwQkMw RUM0IC8qIFdlYlBhZ2VNZXNzYWdlUmVjZWl2ZXIuY3BwICovLAogCQkJCUMwQ0U3MjlGMTI0N0U3 MUQwMEJDMEVDNCAvKiBXZWJQYWdlTWVzc2FnZXMuaCAqLywKKwkJCQkxQTA0M0Y2NzEyNTE0RDhC MDBGRkJGQjUgLyogV2ViUHJvY2Vzc0Nvbm5lY3Rpb25NZXNzYWdlUmVjZWl2ZXIuY3BwICovLAor CQkJCTFBMDQzRjY4MTI1MTREOEIwMEZGQkZCNSAvKiBXZWJQcm9jZXNzQ29ubmVjdGlvbk1lc3Nh Z2VzLmggKi8sCiAJCQkpOwogCQkJbmFtZSA9ICJEZXJpdmVkIFNvdXJjZXMiOwogCQkJcGF0aCA9 IERlcml2ZWRTb3VyY2VzL1dlYktpdDI7CkBAIC0xODYxLDYgKzE4NzAsNyBAQAogCQkJCTFBMDQz RDdBMTI0RkVGQzEwMEZGQkZCNSAvKiBCYWNraW5nU3RvcmUuaCBpbiBIZWFkZXJzICovLAogCQkJ CUJDNDA3ODNEMTI1MEZBREQwMDY4RjIwQSAvKiBXS0V2ZW50LmggaW4gSGVhZGVycyAqLywKIAkJ CQkxQTA0M0RDMTEyNEZGODc1MDBGRkJGQjUgLyogUGx1Z2luUHJveHkuaCBpbiBIZWFkZXJzICov LAorCQkJCTFBMDQzRjZBMTI1MTREOEIwMEZGQkZCNSAvKiBXZWJQcm9jZXNzQ29ubmVjdGlvbk1l c3NhZ2VzLmggaW4gSGVhZGVycyAqLywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBv c3Rwcm9jZXNzaW5nID0gMDsKIAkJfTsKQEAgLTE5MTAsNiArMTkyMCw3IEBACiAJCQlpc2EgPSBQ QlhQcm9qZWN0OwogCQkJYnVpbGRDb25maWd1cmF0aW9uTGlzdCA9IDFERUI5MUIxMDg3MzNEQTUw MDEwRTlDRCAvKiBCdWlsZCBjb25maWd1cmF0aW9uIGxpc3QgZm9yIFBCWFByb2plY3QgIldlYktp dDIiICovOwogCQkJY29tcGF0aWJpbGl0eVZlcnNpb24gPSAiWGNvZGUgMy4xIjsKKwkJCWRldmVs b3BtZW50UmVnaW9uID0gRW5nbGlzaDsKIAkJCWhhc1NjYW5uZWRGb3JFbmNvZGluZ3MgPSAxOwog CQkJa25vd25SZWdpb25zID0gKAogCQkJCUVuZ2xpc2gsCkBAIC0xOTQ1LDYgKzE5NTYsNyBAQAog CQkJZmlsZXMgPSAoCiAJCQkJOERDMkVGNTMwNDg2QTY5NDAwOThCMjE2IC8qIEluZm9QbGlzdC5z dHJpbmdzIGluIFJlc291cmNlcyAqLywKIAkJCQkxQTA0M0I0RDEyNEQ1RTM2MDBGRkJGQjUgLyog UGx1Z2luUHJvY2Vzc1Byb3h5Lm1lc3NhZ2VzLmluIGluIFJlc291cmNlcyAqLywKKwkJCQkxQTA0 M0Y1QTEyNTE0Q0YzMDBGRkJGQjUgLyogV2ViUHJvY2Vzc0Nvbm5lY3Rpb24ubWVzc2FnZXMuaW4g aW4gUmVzb3VyY2VzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nl c3NpbmcgPSAwOwogCQl9OwpAQCAtMjE0Niw2ICsyMTU4LDcgQEAKIAkJCQkxQTA0M0Q3QjEyNEZF RkMxMDBGRkJGQjUgLyogQmFja2luZ1N0b3JlLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTFBMDQz RDkyMTI0RkYwMkIwMEZGQkZCNSAvKiBCYWNraW5nU3RvcmVNYWMubW0gaW4gU291cmNlcyAqLywK IAkJCQkxQTA0M0RDMjEyNEZGODc1MDBGRkJGQjUgLyogUGx1Z2luUHJveHkuY3BwIGluIFNvdXJj ZXMgKi8sCisJCQkJMUEwNDNGNjkxMjUxNEQ4QjAwRkZCRkI1IC8qIFdlYlByb2Nlc3NDb25uZWN0 aW9uTWVzc2FnZVJlY2VpdmVyLmNwcCBpbiBTb3VyY2VzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlG b3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQl9Owo=