36676 2010-03-26 14:35:01 -0700 Refactor IRCBot controller logic to allow for commands 2010-03-26 14:46:18 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth webkit-unassigned eric oldest_to_newest 204783 0 abarth 2010-03-26 14:35:01 -0700 Refactor IRCBot controller logic to allow for commands 204784 1 51778 abarth 2010-03-26 14:36:25 -0700 Created attachment 51778 Patch 204788 2 51778 eric 2010-03-26 14:43:02 -0700 Comment on attachment 51778 Patch OK. 204794 3 51778 abarth 2010-03-26 14:46:12 -0700 Comment on attachment 51778 Patch Clearing flags on attachment: 51778 Committed r56642: <http://trac.webkit.org/changeset/56642> 204795 4 abarth 2010-03-26 14:46:18 -0700 All reviewed patches have been landed. Closing bug. 51778 2010-03-26 14:36:25 -0700 2010-03-26 14:46:12 -0700 Patch bug-36676-20100326143623.patch text/plain 14190 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA1MzhkODI2Li5mY2FiOWRhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjUgQEAKIDIwMTAtMDMt MjYgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZWZhY3RvciBJUkNCb3QgY29udHJvbGxlciBs b2dpYyB0byBhbGxvdyBmb3IgY29tbWFuZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM2Njc2CisKKyAgICAgICAgV2UgbmVlZCB0byBtb3ZlIHRoZSBj b250cm9sbGVyIGxvZ2ljIGludG8gdGhlIHRvb2wgcGFja2FnZSBzbyBpdCBjYW4KKyAgICAgICAg a25vdyBhYm91dCBjb21tYW5kcy4gIFRoZSBjaGFuZ2VzIHRvIHF1ZXVlZW5naW5lIGNvdWxkIGdv IGluIGEKKyAgICAgICAgZGlmZmVyZW50IHBhdGNoLCBidXQgd2UncmUgZ29pbmcgdG8gbmVlZCBp dCBhbnl3YXkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvaXJj LnB5OiBBZGRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvaXJjL2ly Y2JvdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvaXJjL2lyY3By b3h5LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvcXVldWVlbmdpbmUu cHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9zaGVyaWZmaXJjYm90LnB5 OiBBZGRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvc2hlcmlm ZmJvdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbWFpbi5weToKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbW9ja3Rvb2wucHk6CisKKzIwMTAtMDMtMjYgIEFk YW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKwogICAgICAgICBSdWJiZXIgc3RhbXBlZCBi eSBFcmljIFNlaWRlbC4KIAogICAgICAgICBNb3ZlIHRoZSB0aHJlYWRpbmcgY29kZSBpbnRvIGl0 cyBvd24gbW9kdWxlLiAgKEl0IGhhcyBub3RoaW5nIHRvIGRvIHdpdGggSVJDLikKZGlmZiAtLWdp dCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9pcmMucHkgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvaXJjLnB5Cm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjk1MGM1NzMKLS0tIC9kZXYvbnVsbAorKysgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvaXJjLnB5CkBAIC0wLDAg KzEsMzEgQEAKKyMgQ29weXJpZ2h0IChjKSAyMDA5IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCisjCisjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dAorIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisjIG1ldDoKKyMKKyMgICAg ICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBj b3B5cmlnaHQKKyMgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyLgorIyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0g bXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisjIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyMgaW4gdGhlIGRvY3Vt ZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorIyBkaXN0 cmlidXRpb24uCisjICAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRo ZSBuYW1lcyBvZiBpdHMKKyMgY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3Ig cHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNw ZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQ Uk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworIyAiQVMg SVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVU IE5PVAorIyBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJ TElUWSBBTkQgRklUTkVTUyBGT1IKKyMgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlN RUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyMgT1dORVIgT1IgQ09OVFJJQlVU T1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisjIFNQ RUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJV VCBOT1QKKyMgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBT RVJWSUNFUzsgTE9TUyBPRiBVU0UsCisjIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElO VEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQorIyBUSEVPUlkgT0YgTElBQklM SVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisjIChJ TkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQg T0YgVEhFIFVTRQorIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBP U1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorCitzZXJ2ZXI9ImlyYy5mcmVlbm9kZS5uZXQiCitw b3J0PTY2NjcKK2NoYW5uZWw9IiN3ZWJraXQiCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvaXJjL2lyY2JvdC5weSBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL25ldC9pcmMvaXJjYm90LnB5CmluZGV4IDVjNzhhMDUuLjVhYjhk YmQgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9p cmMvaXJjYm90LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25l dC9pcmMvaXJjYm90LnB5CkBAIC0yNiwyMyArMjYsNDEgQEAKICMgKElOQ0xVRElORyBORUdMSUdF TkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9G IFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VD SCBEQU1BR0UuCiAKK2ltcG9ydCB3ZWJraXRweS5jb21tb24uY29uZmlnIGFzIGNvbmZpZworCiBm cm9tIHdlYmtpdHB5LmNvbW1vbi50aHJlYWQubWVzc2FnZXB1bXAgaW1wb3J0IE1lc3NhZ2VQdW1w LCBNZXNzYWdlUHVtcERlbGVnYXRlCiBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3Rh bGxlZCBpbXBvcnQgaXJjYm90CiBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxl ZCBpbXBvcnQgaXJjbGliCiAKIAorY2xhc3MgSVJDQm90RGVsZWdhdGUob2JqZWN0KToKKyAgICBk ZWYgaXJjX21lc3NhZ2VfcmVjZWl2ZWQoc2VsZiwgbWVzc2FnZSk6CisgICAgICAgIHJhaXNlIE5v dEltcGxlbWVudGVkRXJyb3IsICJzdWJjbGFzc2VzIG11c3QgaW1wbGVtZW50IgorCisgICAgZGVm IGlyY19uaWNrbmFtZShzZWxmKToKKyAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvciwg InN1YmNsYXNzZXMgbXVzdCBpbXBsZW1lbnQiCisKKyAgICBkZWYgaXJjX3Bhc3N3b3JkKHNlbGYp OgorICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yLCAic3ViY2xhc3NlcyBtdXN0IGlt cGxlbWVudCIKKworCiBjbGFzcyBJUkNCb3QoaXJjYm90LlNpbmdsZVNlcnZlcklSQ0JvdCwgTWVz c2FnZVB1bXBEZWxlZ2F0ZSk6CiAgICAgIyBGSVhNRTogV2Ugc2hvdWxkIGdldCB0aGlzIGluZm9y bWF0aW9uIGZyb20gYSBjb25maWcgZmlsZS4KICAgICBkZWYgX19pbml0X18oc2VsZiwKICAgICAg ICAgICAgICAgICAgbWVzc2FnZV9xdWV1ZSwKLSAgICAgICAgICAgICAgICAgc2VydmVyPSJpcmMu ZnJlZW5vZGUubmV0IiwKLSAgICAgICAgICAgICAgICAgcG9ydD02NjY3LAotICAgICAgICAgICAg ICAgICBuaWNrbmFtZT0ic2hlcmlmZmJvdCIsCi0gICAgICAgICAgICAgICAgIHBhc3N3b3JkPU5v bmUsICMgc2hlcmlmZmJvdCBhY3R1YWxseSBuZWVkcyBhIHBhc3N3b3JkLgotICAgICAgICAgICAg ICAgICBjaGFubmVsPSIjd2Via2l0Iik6CisgICAgICAgICAgICAgICAgIGRlbGVnYXRlKToKICAg ICAgICAgc2VsZi5fbWVzc2FnZV9xdWV1ZSA9IG1lc3NhZ2VfcXVldWUKLSAgICAgICAgaXJjYm90 LlNpbmdsZVNlcnZlcklSQ0JvdC5fX2luaXRfXyhzZWxmLCBbKHNlcnZlciwgcG9ydCwgcGFzc3dv cmQpXSwgbmlja25hbWUsIG5pY2tuYW1lKQotICAgICAgICBzZWxmLl9jaGFubmVsID0gY2hhbm5l bAorICAgICAgICBzZWxmLl9kZWxlZ2F0ZSA9IGRlbGVnYXRlCisgICAgICAgIGlyY2JvdC5TaW5n bGVTZXJ2ZXJJUkNCb3QuX19pbml0X18oCisgICAgICAgICAgICBzZWxmLAorICAgICAgICAgICAg WygKKyAgICAgICAgICAgICAgICBjb25maWcuaXJjLnNlcnZlciwKKyAgICAgICAgICAgICAgICBj b25maWcuaXJjLnBvcnQsCisgICAgICAgICAgICAgICAgc2VsZi5fZGVsZWdhdGUuaXJjX3Bhc3N3 b3JkKCkKKyAgICAgICAgICAgICldLAorICAgICAgICAgICAgc2VsZi5fZGVsZWdhdGUuaXJjX25p Y2tuYW1lLAorICAgICAgICAgICAgc2VsZi5fZGVsZWdhdGUuaXJjX25pY2tuYW1lKQorICAgICAg ICBzZWxmLl9jaGFubmVsID0gY29uZmlnLmlyYy5jaGFubmVsCiAKICAgICAjIGlyY2JvdC5TaW5n bGVTZXJ2ZXJJUkNCb3QgbWV0aG9kcwogCkBAIC01NCw5ICs3MiwxMSBAQCBjbGFzcyBJUkNCb3Qo aXJjYm90LlNpbmdsZVNlcnZlcklSQ0JvdCwgTWVzc2FnZVB1bXBEZWxlZ2F0ZSk6CiAgICAgICAg IHNlbGYuX21lc3NhZ2VfcHVtcCA9IE1lc3NhZ2VQdW1wKHNlbGYsIHNlbGYuX21lc3NhZ2VfcXVl dWUpCiAKICAgICBkZWYgb25fcHVibXNnKHNlbGYsIGNvbm5lY3Rpb24sIGV2ZW50KToKLSAgICAg ICAgc2FsdXRlID0gZXZlbnQuYXJndW1lbnRzKClbMF0uc3BsaXQoIjoiLCAxKQotICAgICAgICBp ZiBsZW4oc2FsdXRlKSA+IDEgYW5kIGlyY2xpYi5pcmNfbG93ZXIoc2FsdXRlWzBdKSA9PSBpcmNs aWIuaXJjX2xvd2VyKHNlbGYuY29ubmVjdGlvbi5nZXRfbmlja25hbWUoKSk6Ci0gICAgICAgICAg ICBjb25uZWN0aW9uLnByaXZtc2coc2VsZi5fY2hhbm5lbCwgJyJPbmx5IHlvdSBjYW4gcHJldmVu dCBmb3Jlc3QgZmlyZXMuIiAtLSBTbW9rZXkgdGhlIEJlYXInKQorICAgICAgICByZXF1ZXN0ID0g ZXZlbnQuYXJndW1lbnRzKClbMF0uc3BsaXQoIjoiLCAxKQorICAgICAgICBpZiBsZW4ocmVxdWVz dCkgPiAxIGFuZCBpcmNsaWIuaXJjX2xvd2VyKHJlcXVlc3RbMF0pID09IGlyY2xpYi5pcmNfbG93 ZXIoc2VsZi5jb25uZWN0aW9uLmdldF9uaWNrbmFtZSgpKToKKyAgICAgICAgICAgIHJlc3BvbnNl ID0gc2VsZi5fZGVsZWdhdGUuaXJjX21lc3NhZ2VfcmVjZWl2ZWQocmVxdWVzdFsxXSkKKyAgICAg ICAgICAgIGlmIHJlc3BvbnNlOgorICAgICAgICAgICAgICAgIGNvbm5lY3Rpb24ucHJpdm1zZyhz ZWxmLl9jaGFubmVsLCByZXNwb25zZSkKIAogICAgICMgTWVzc2FnZVB1bXBEZWxlZ2F0ZSBtZXRo b2RzCiAKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25l dC9pcmMvaXJjcHJveHkucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9u ZXQvaXJjL2lyY3Byb3h5LnB5CmluZGV4IGMyNTllOTcuLjk4NWZlZGEgMTAwNjQ0Ci0tLSBhL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9pcmMvaXJjcHJveHkucHkKKysr IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2lyYy9pcmNwcm94eS5w eQpAQCAtMzQsMjMgKzM0LDIyIEBAIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5kZXByZWNh dGVkX2xvZ2dpbmcgaW1wb3J0IGxvZwogCiAKIGNsYXNzIF9JUkNUaHJlYWQodGhyZWFkaW5nLlRo cmVhZCk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIG1lc3NhZ2VfcXVldWUsIGJvdF9jbGFzcywg cGFzc3dvcmQpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBtZXNzYWdlX3F1ZXVlLCBpcmNfZGVs ZWdhdGUpOgogICAgICAgICB0aHJlYWRpbmcuVGhyZWFkLl9faW5pdF9fKHNlbGYpCiAgICAgICAg IHNlbGYuc2V0RGFlbW9uKFRydWUpCiAgICAgICAgIHNlbGYuX21lc3NhZ2VfcXVldWUgPSBtZXNz YWdlX3F1ZXVlCi0gICAgICAgIHNlbGYuX2JvdF9jbGFzcyA9IGJvdF9jbGFzcwotICAgICAgICBz ZWxmLl9wYXNzd29yZCA9IHBhc3N3b3JkCisgICAgICAgIHNlbGYuX2lyY19kZWxlZ2F0ZSA9IGly Y19kZWxlZ2F0ZQogCiAgICAgZGVmIHJ1bihzZWxmKToKLSAgICAgICAgYm90ID0gc2VsZi5fYm90 X2NsYXNzKHNlbGYuX21lc3NhZ2VfcXVldWUsIHBhc3N3b3JkPXNlbGYuX3Bhc3N3b3JkKQorICAg ICAgICBib3QgPSBJUkNCb3Qoc2VsZi5fbWVzc2FnZV9xdWV1ZSwgc2VsZi5pcmNfZGVsZWdhdGUp CiAgICAgICAgIGJvdC5zdGFydCgpCiAKIAogY2xhc3MgSVJDUHJveHkob2JqZWN0KToKLSAgICBk ZWYgX19pbml0X18oc2VsZiwgYm90X2NsYXNzPUlSQ0JvdCwgcGFzc3dvcmQ9Tm9uZSk6CisgICAg ZGVmIF9faW5pdF9fKHNlbGYsIGlyY19kZWxlZ2F0ZSk6CiAgICAgICAgIGxvZygiQ29ubmVjdGlu ZyB0byBJUkMiKQogICAgICAgICBzZWxmLl9tZXNzYWdlX3F1ZXVlID0gVGhyZWFkZWRNZXNzYWdl UXVldWUoKQotICAgICAgICBzZWxmLl9jaGlsZF90aHJlYWQgPSBfSVJDVGhyZWFkKHNlbGYuX21l c3NhZ2VfcXVldWUsIGJvdF9jbGFzcywgcGFzc3dvcmQ9cGFzc3dvcmQpCisgICAgICAgIHNlbGYu X2NoaWxkX3RocmVhZCA9IF9JUkNUaHJlYWQoc2VsZi5fbWVzc2FnZV9xdWV1ZSwgaXJjX2RlbGVn YXRlKQogICAgICAgICBzZWxmLl9jaGlsZF90aHJlYWQuc3RhcnQoKQogCiAgICAgZGVmIHBvc3Qo c2VsZiwgbWVzc2FnZSk6CkBAIC02MCw0ICs1OSwzIEBAIGNsYXNzIElSQ1Byb3h5KG9iamVjdCk6 CiAgICAgICAgIGxvZygiRGlzY29ubmVjdGluZyBmcm9tIElSQy4uLiIpCiAgICAgICAgIHNlbGYu X21lc3NhZ2VfcXVldWUuc3RvcCgpCiAgICAgICAgIHNlbGYuX2NoaWxkX3RocmVhZC5qb2luKCkK LQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9xdWV1 ZWVuZ2luZS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvcXVldWVl bmdpbmUucHkKaW5kZXggZTI2MDVmMi4uNDg2NjhhZiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9xdWV1ZWVuZ2luZS5weQorKysgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L3F1ZXVlZW5naW5lLnB5CkBAIC02NSw5ICs2NSwx MCBAQCBjbGFzcyBRdWV1ZUVuZ2luZURlbGVnYXRlOgogCiAKIGNsYXNzIFF1ZXVlRW5naW5lOgot ICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuYW1lLCBkZWxlZ2F0ZSk6CisgICAgZGVmIF9faW5pdF9f KHNlbGYsIG5hbWUsIGRlbGVnYXRlLCBtZXNzYWdlX3F1ZXVlPU5vbmUpOgogICAgICAgICBzZWxm Ll9uYW1lID0gbmFtZQogICAgICAgICBzZWxmLl9kZWxlZ2F0ZSA9IGRlbGVnYXRlCisgICAgICAg IHNlbGYuX21lc3NhZ2VfcXVldWUgPSBtZXNzYWdlX3F1ZXVlCiAgICAgICAgIHNlbGYuX291dHB1 dF90ZWUgPSBPdXRwdXRUZWUoKQogCiAgICAgbG9nX2RhdGVfZm9ybWF0ID0gIiVZLSVtLSVkICVI OiVNOiVTIgpAQCAtMTMyLDEyICsxMzMsMTMgQEAgY2xhc3MgUXVldWVFbmdpbmU6CiAgICAgICAg ICAgICBzZWxmLl9vdXRwdXRfdGVlLnJlbW92ZV9sb2coc2VsZi5fd29ya19sb2cpCiAgICAgICAg ICAgICBzZWxmLl93b3JrX2xvZyA9IE5vbmUKIAotICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBf c2xlZXBfbWVzc2FnZShjbHMsIG1lc3NhZ2UpOgorICAgIGRlZiBfc2xlZXBfbWVzc2FnZShzZWxm LCBtZXNzYWdlKToKICAgICAgICAgd2FrZV90aW1lID0gZGF0ZXRpbWUubm93KCkgKyB0aW1lZGVs dGEoc2Vjb25kcz1jbHMuc2Vjb25kc190b19zbGVlcCkKICAgICAgICAgcmV0dXJuICIlcyBTbGVl cGluZyB1bnRpbCAlcyAoJXMpLiIgJSAobWVzc2FnZSwgd2FrZV90aW1lLnN0cmZ0aW1lKGNscy5s b2dfZGF0ZV9mb3JtYXQpLCBjbHMuc2xlZXBfZHVyYXRpb25fdGV4dCkKIAotICAgIEBjbGFzc21l dGhvZAotICAgIGRlZiBfc2xlZXAoY2xzLCBtZXNzYWdlKToKLSAgICAgICAgbG9nKGNscy5fc2xl ZXBfbWVzc2FnZShtZXNzYWdlKSkKLSAgICAgICAgdGltZS5zbGVlcChjbHMuc2Vjb25kc190b19z bGVlcCkKKyAgICBkZWYgX3NsZWVwKHNlbGYsIG1lc3NhZ2UpOgorICAgICAgICBsb2coc2VsZi5f c2xlZXBfbWVzc2FnZShtZXNzYWdlKSkKKyAgICAgICAgaWYgc2VsZi5fbWVzc2FnZV9xdWV1ZToK KyAgICAgICAgICAgIHNlbGYuX21lc3NhZ2VfcXVldWUud2FpdChzZWxmLnNlY29uZHNfdG9fc2xl ZXApCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICB0aW1lLnNsZWVwKHNlbGYuc2Vjb25kc190 b19zbGVlcCkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9i b3Qvc2hlcmlmZmlyY2JvdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9i b3Qvc2hlcmlmZmlyY2JvdC5weQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5j MDExNDEwCi0tLSAvZGV2L251bGwKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL2JvdC9zaGVyaWZmaXJjYm90LnB5CkBAIC0wLDAgKzEsNDQgQEAKKyMgQ29weXJpZ2h0IChj KSAyMDEwIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAor IyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5n IGNvbmRpdGlvbnMgYXJlCisjIG1ldDoKKyMKKyMgICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNv dXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgbm90aWNlLCB0aGlz IGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorIyAgICAg KiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3Zl CisjIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIKKyMgaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1h dGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorIyBkaXN0cmlidXRpb24uCisjICAgICAqIE5laXRo ZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyMgY29udHJp YnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVk IGZyb20KKyMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVy bWlzc2lvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hU IEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworIyAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJ TVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBUSEUg SU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKyMg QSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRI RSBDT1BZUklHSFQKKyMgT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJ UkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisjIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09O U0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRFRCBUTywgUFJP Q1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisj IERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVT RUQgQU5EIE9OIEFOWQorIyBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNU LCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBP VEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBPRiBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LgorCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5uZXQuaXJjLmlyY2JvdCBpbXBvcnQgSVJDQm90RGVs ZWdhdGUKKworY2xhc3MgU2hlcmlmZklSQ0JvdChJUkNCb3REZWxlZ2F0ZSk6CisgICAgZGVmIF9f aW5pdF9fKHNlbGYsIHBhc3N3b3JkKToKKyAgICAgICAgc2VsZi5fcGFzc3dvcmQgPSBwYXNzd29y ZAorCisgICAgIyBJUkNCb3REZWxlZ2F0ZSBtZXRob2RzCisKKyAgICBkZWYgaXJjX21lc3NhZ2Vf cmVjZWl2ZWQoc2VsZiwgbWVzc2FnZSk6CisgICAgICAgIHJldHVybiAnIk9ubHkgeW91IGNhbiBw cmV2ZW50IGZvcmVzdCBmaXJlcy4iIC0tIFNtb2tleSB0aGUgQmVhcicKKworICAgIGRlZiBpcmNf bmlja25hbWUoc2VsZik6CisgICAgICAgIHJldHVybiAic2hlcmlmZmJvdCIKKworICAgIGRlZiBp cmNfcGFzc3dvcmQoc2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLl9wYXNzd29yZApkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3NoZXJpZmZi b3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvc2hlcmlm ZmJvdC5weQppbmRleCA1ODViOGJiLi5iZjExOGI4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvc2hlcmlmZmJvdC5weQorKysgYi9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvc2hlcmlmZmJvdC5weQpAQCAtMjgs MTAgKzI4LDEwIEBACiAKIGltcG9ydCBvcwogCi1mcm9tIHdlYmtpdHB5LnRvb2wuY29tbWFuZHMu cXVldWVzIGltcG9ydCBBYnN0cmFjdFF1ZXVlCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0u ZGVwcmVjYXRlZF9sb2dnaW5nIGltcG9ydCBsb2cKIGZyb20gd2Via2l0cHkuY29tbW9uLmNvbmZp Zy5wb3J0cyBpbXBvcnQgV2ViS2l0UG9ydAotCitmcm9tIHdlYmtpdHB5LnRvb2wuYm90LnNoZXJp ZmZpcmNib3QgaW1wb3J0IFNoZXJpZmZJUkNCb3QKK2Zyb20gd2Via2l0cHkudG9vbC5jb21tYW5k cy5xdWV1ZXMgaW1wb3J0IEFic3RyYWN0UXVldWUKIAogY2xhc3MgU2hlcmlmZkJvdChBYnN0cmFj dFF1ZXVlKToKICAgICBuYW1lID0gInNoZXJpZmYtYm90IgpAQCAtNDMsNyArNDMsOCBAQCBjbGFz cyBTaGVyaWZmQm90KEFic3RyYWN0UXVldWUpOgogCiAgICAgZGVmIGJlZ2luX3dvcmtfcXVldWUo c2VsZik6CiAgICAgICAgIEFic3RyYWN0UXVldWUuYmVnaW5fd29ya19xdWV1ZShzZWxmKQotICAg ICAgICBzZWxmLnRvb2wuZW5zdXJlX2lyY19jb25uZWN0ZWQoKQorICAgICAgICBzZWxmLl9pcmNf ZGVsZWdhdGUgPSBTaGVyaWZmSVJDQm90KHNlbGYudG9vbC5pcmNfcGFzc3dvcmQpCisgICAgICAg IHNlbGYudG9vbC5lbnN1cmVfaXJjX2Nvbm5lY3RlZChzZWxmLl9pcmNfZGVsZWdhdGUpCiAKICAg ICBkZWYgd29ya19pdGVtX2xvZ19wYXRoKHNlbGYsIGZhaWx1cmVfaW5mbyk6CiAgICAgICAgIHJl dHVybiBvcy5wYXRoLmpvaW4oIiVzLWxvZ3MiICUgc2VsZi5uYW1lLCAiJXMubG9nIiAlIGZhaWx1 cmVfaW5mb1sic3ZuX3JldmlzaW9uIl0pCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvbWFpbi5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9v bC9tYWluLnB5CmluZGV4IDU5MjcwMWIuLjAzMjc0NmUgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvdG9vbC9tYWluLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9tYWluLnB5CkBAIC05MCwxMCArOTAsOSBAQCBjbGFzcyBXZWJLaXRQYXRj aChNdWx0aUNvbW1hbmRUb29sKToKICAgICAgICAgICAgIHNlbGYuX2NoZWNrb3V0ID0gQ2hlY2tv dXQoc2VsZi5zY20oKSkKICAgICAgICAgcmV0dXJuIHNlbGYuX2NoZWNrb3V0CiAKLSAgICAjIEZJ WE1FOiBBZGQgYSBwYXJhbWV0ZXIgZm9yIG5pY2tuYW1lPwotICAgIGRlZiBlbnN1cmVfaXJjX2Nv bm5lY3RlZChzZWxmKToKKyAgICBkZWYgZW5zdXJlX2lyY19jb25uZWN0ZWQoc2VsZiwgaXJjX2Rl bGVnYXRlKToKICAgICAgICAgaWYgbm90IHNlbGYuX2lyYzoKLSAgICAgICAgICAgIHNlbGYuX2ly YyA9IElSQ1Byb3h5KHBhc3N3b3JkPXNlbGYuX2lyY19wYXNzd29yZCkKKyAgICAgICAgICAgIHNl bGYuX2lyYyA9IElSQ1Byb3h5KGlyY19kZWxlZ2F0ZSkKIAogICAgIGRlZiBpcmMoc2VsZik6CiAg ICAgICAgICMgV2UgZG9uJ3QgYXV0b21hdGljYWxseSBjb25zdHJ1Y3QgSVJDUHJveHkgaGVyZSBi ZWNhdXNlIGNvbnN0cnVjdGluZwpAQCAtMTIzLDcgKzEyMiw3IEBAIGNsYXNzIFdlYktpdFBhdGNo KE11bHRpQ29tbWFuZFRvb2wpOgogICAgICAgICBpZiBvcHRpb25zLnN0YXR1c19ob3N0OgogICAg ICAgICAgICAgc2VsZi5zdGF0dXNfc2VydmVyLnNldF9ob3N0KG9wdGlvbnMuc3RhdHVzX2hvc3Qp CiAgICAgICAgIGlmIG9wdGlvbnMuaXJjX3Bhc3N3b3JkOgotICAgICAgICAgICAgc2VsZi5faXJj X3Bhc3N3b3JkID0gb3B0aW9ucy5pcmNfcGFzc3dvcmQKKyAgICAgICAgICAgIHNlbGYuaXJjX3Bh c3N3b3JkID0gb3B0aW9ucy5pcmNfcGFzc3dvcmQKIAogICAgIGRlZiBzaG91bGRfZXhlY3V0ZV9j b21tYW5kKHNlbGYsIGNvbW1hbmQpOgogICAgICAgICBpZiBjb21tYW5kLnJlcXVpcmVzX2xvY2Fs X2NvbW1pdHMgYW5kIG5vdCBzZWxmLnNjbSgpLnN1cHBvcnRzX2xvY2FsX2NvbW1pdHMoKToKZGlm ZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9tb2NrdG9vbC5weSBi L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9tb2NrdG9vbC5weQppbmRleCBjZmYz YTU1Li4yM2JiMzg2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvbW9ja3Rvb2wucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL21v Y2t0b29sLnB5CkBAIC00NDUsNiArNDQ1LDcgQEAgY2xhc3MgTW9ja1Rvb2woKToKICAgICAgICAg c2VsZi5fc2NtID0gTW9ja1NDTSgpCiAgICAgICAgIHNlbGYuX2NoZWNrb3V0ID0gTW9ja0NoZWNr b3V0KCkKICAgICAgICAgc2VsZi5zdGF0dXNfc2VydmVyID0gTW9ja1N0YXR1c1NlcnZlcigpCisg ICAgICAgIHNlbGYuaXJjX3Bhc3N3b3JkID0gIk1PQ0sgaXJjIHBhc3N3b3JkIgogCiAgICAgZGVm IHNjbShzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX3NjbQpAQCAtNDUyLDcgKzQ1Myw3IEBA IGNsYXNzIE1vY2tUb29sKCk6CiAgICAgZGVmIGNoZWNrb3V0KHNlbGYpOgogICAgICAgICByZXR1 cm4gc2VsZi5fY2hlY2tvdXQKIAotICAgIGRlZiBlbnN1cmVfaXJjX2Nvbm5lY3RlZChzZWxmKToK KyAgICBkZWYgZW5zdXJlX2lyY19jb25uZWN0ZWQoc2VsZiwgZGVsZWdhdGUpOgogICAgICAgICBp ZiBub3Qgc2VsZi5faXJjOgogICAgICAgICAgICAgc2VsZi5faXJjID0gTW9ja0lSQygpCiAK