47869 2010-10-18 18:55:13 -0700 Make it possible to submit patches to the EWS bots 2010-10-19 14:23:19 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 35460 1 eric eric abarth dpranke mihaip oldest_to_newest 295899 0 eric 2010-10-18 18:55:13 -0700 Make it possible to submit patches to the EWS bots 295905 1 71113 eric 2010-10-18 18:59:59 -0700 Created attachment 71113 Patch 295915 2 71116 eric 2010-10-18 19:15:36 -0700 Created attachment 71116 should apply now 295918 3 71116 abarth 2010-10-18 19:24:33 -0700 Comment on attachment 71116 should apply now View in context: https://bugs.webkit.org/attachment.cgi?id=71116&action=review ok > WebKitTools/QueueStatusServer/handlers/submittoews.py:43 > + if not queue.is_ews(): > + return False Should this be an assert? > WebKitTools/QueueStatusServer/model/queues.py:75 > + # FIXME: active_work_items is a bad name for this lock-table. no - 296404 4 eric 2010-10-19 14:23:10 -0700 This must have landed. 71113 2010-10-18 18:59:59 -0700 2010-10-18 19:15:32 -0700 Patch bug-47869-20101018185958.patch text/plain 13282 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBjZDUxMjQ1OWQ2ODFjZjRmNTdkNjljMDI1MWY1MWZiZGNmNzIyZjRmLi4zYjBjMDlh MzUxMWEwYmI1NGNlYTdkM2U4ZGY2MGFkYWM2YjQ1ZTQ3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMgQEAK IDIwMTAtMTAtMTggIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgaXQgcG9zc2libGUgdG8g c3VibWl0IHBhdGNoZXMgdG8gdGhlIEVXUyBib3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Nzg2OQorCisgICAgICAgICogUXVldWVTdGF0dXNTZXJ2 ZXIvaGFuZGxlcnMvbmV4dHBhdGNoLnB5OgorICAgICAgICAqIFF1ZXVlU3RhdHVzU2VydmVyL2hh bmRsZXJzL3F1ZXVlc3RhdHVzLnB5OgorICAgICAgICAqIFF1ZXVlU3RhdHVzU2VydmVyL2hhbmRs ZXJzL3N1Ym1pdHRvZXdzLnB5OiBBZGRlZC4KKyAgICAgICAgKiBRdWV1ZVN0YXR1c1NlcnZlci9o YW5kbGVycy91cGRhdGVzdGF0dXMucHk6CisgICAgICAgICogUXVldWVTdGF0dXNTZXJ2ZXIvbWFp bi5weToKKyAgICAgICAgKiBRdWV1ZVN0YXR1c1NlcnZlci9tb2RlbC9xdWV1ZXByb3BlcnR5bWl4 aW4ucHk6CisgICAgICAgICogUXVldWVTdGF0dXNTZXJ2ZXIvbW9kZWwvcXVldWVzLnB5OgorICAg ICAgICAqIFF1ZXVlU3RhdHVzU2VydmVyL21vZGVsL3F1ZXVlc3RhdHVzLnB5OgorICAgICAgICAq IFF1ZXVlU3RhdHVzU2VydmVyL21vZGVsL3dvcmtpdGVtcy5weToKKyAgICAgICAgKiBRdWV1ZVN0 YXR1c1NlcnZlci90ZW1wbGF0ZXMvc3VibWl0dG9ld3MuaHRtbDogQWRkZWQuCisKKzIwMTAtMTAt MTggIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5 IEFkYW0gQmFydGguCiAKICAgICAgICAgRGVwbG95IFF1ZXVlIGNsYXNzIGluIG1vcmUgcGxhY2Vz IHRocm91Z2hvdXQgUXVldWVTdGF0dXNTZXJ2ZXIKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F1 ZXVlU3RhdHVzU2VydmVyL2hhbmRsZXJzL25leHRwYXRjaC5weSBiL1dlYktpdFRvb2xzL1F1ZXVl U3RhdHVzU2VydmVyL2hhbmRsZXJzL25leHRwYXRjaC5weQppbmRleCBlZGI3MDJhZjlmN2IzOTlk MjIzYmQ4YzgzNzZkNzRkOGFmZjBjNzhjLi41MzA0YTczOTIzZDcxYzJmMDUyMDhmNmJjZjU0ZWRl NDBhMTBmYmYxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9oYW5k bGVycy9uZXh0cGF0Y2gucHkKKysrIGIvV2ViS2l0VG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvaGFu ZGxlcnMvbmV4dHBhdGNoLnB5CkBAIC0yNiwyNiArMjYsMjIgQEAKICMgKElOQ0xVRElORyBORUdM SUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAj IE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuCiAKK2Zyb20gZGF0ZXRpbWUgaW1wb3J0IGRhdGV0aW1lCisKIGZyb20gZ29v Z2xlLmFwcGVuZ2luZS5leHQgaW1wb3J0IGRiCiBmcm9tIGdvb2dsZS5hcHBlbmdpbmUuZXh0IGlt cG9ydCB3ZWJhcHAKIAotZnJvbSBtb2RlbC53b3JraXRlbXMgaW1wb3J0IFdvcmtJdGVtcwotZnJv bSBtb2RlbC5hY3RpdmV3b3JraXRlbXMgaW1wb3J0IEFjdGl2ZVdvcmtJdGVtcwotZnJvbSBtb2Rl bCBpbXBvcnQgcXVldWVzdGF0dXMKLQotZnJvbSBkYXRldGltZSBpbXBvcnQgZGF0ZXRpbWUsIHRp bWVkZWx0YQorZnJvbSBtb2RlbC5xdWV1ZXMgaW1wb3J0IFF1ZXVlCiAKIAogY2xhc3MgTmV4dFBh dGNoKHdlYmFwcC5SZXF1ZXN0SGFuZGxlcik6Ci0gICAgZGVmIF9nZXRfbmV4dF9wYXRjaF9pZChz ZWxmLCBxdWV1ZV9uYW1lKToKLSAgICAgICAgd29ya19pdGVtcyA9IFdvcmtJdGVtcy5hbGwoKS5m aWx0ZXIoInF1ZXVlX25hbWUgPSIsIHF1ZXVlX25hbWUpLmdldCgpCi0gICAgICAgIGlmIG5vdCB3 b3JrX2l0ZW1zOgotICAgICAgICAgICAgcmV0dXJuIE5vbmUKLSAgICAgICAgYWN0aXZlX3dvcmtf aXRlbXMgPSBBY3RpdmVXb3JrSXRlbXMuZ2V0X29yX2luc2VydChrZXlfbmFtZT1xdWV1ZV9uYW1l LCBxdWV1ZV9uYW1lPXF1ZXVlX25hbWUpCi0gICAgICAgIHJldHVybiBkYi5ydW5faW5fdHJhbnNh Y3Rpb24oc2VsZi5fYXNzaWduX3BhdGNoLCBhY3RpdmVfd29ya19pdGVtcy5rZXkoKSwgd29ya19p dGVtcy5pdGVtX2lkcykKLQogICAgIGRlZiBnZXQoc2VsZiwgcXVldWVfbmFtZSk6Ci0gICAgICAg IHBhdGNoX2lkID0gc2VsZi5fZ2V0X25leHRfcGF0Y2hfaWQocXVldWVfbmFtZSkKKyAgICAgICAg cXVldWUgPSBRdWV1ZS5xdWV1ZV9mb3JfbmFtZShxdWV1ZV9uYW1lKQorICAgICAgICBpZiBub3Qg cXVldWU6CisgICAgICAgICAgICBzZWxmLmVycm9yKDQwNCkKKyAgICAgICAgICAgIHJldHVybgor ICAgICAgICAjIEZJWE1FOiBQYXRjaCBhc3NpZ25tZW50IHNob3VsZCBwcm9iYWJseSBtb3ZlIGlu dG8gUXVldWUuCisgICAgICAgIHBhdGNoX2lkID0gZGIucnVuX2luX3RyYW5zYWN0aW9uKHNlbGYu X2Fzc2lnbl9wYXRjaCwgcXVldWUuYWN0aXZlX3dvcmtfaXRlbXMoKS5rZXkoKSwgcXVldWUud29y a19pdGVtcygpLml0ZW1faWRzKQogICAgICAgICBpZiBub3QgcGF0Y2hfaWQ6CiAgICAgICAgICAg ICBzZWxmLmVycm9yKDQwNCkKICAgICAgICAgICAgIHJldHVybgpkaWZmIC0tZ2l0IGEvV2ViS2l0 VG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMvcXVldWVzdGF0dXMucHkgYi9XZWJLaXRU b29scy9RdWV1ZVN0YXR1c1NlcnZlci9oYW5kbGVycy9xdWV1ZXN0YXR1cy5weQppbmRleCAyYjlh Mzc4NDU5ZmVmYTY1ZjE5ZWQ3ODE5ZWQ0ZDZiNzk3YTFkYmI1Li41MmE5MjZlODY1MzI2YTRhOWY2 OWViYzUyMDQyN2Q1YTk1MDM1ZjIyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9RdWV1ZVN0YXR1 c1NlcnZlci9oYW5kbGVycy9xdWV1ZXN0YXR1cy5weQorKysgYi9XZWJLaXRUb29scy9RdWV1ZVN0 YXR1c1NlcnZlci9oYW5kbGVycy9xdWV1ZXN0YXR1cy5weQpAQCAtNTAsMTAgKzUwLDExIEBAIGNs YXNzIFF1ZXVlU3RhdHVzKHdlYmFwcC5SZXF1ZXN0SGFuZGxlcik6CiAgICAgICAgIHJldHVybiBy b3dzCiAKICAgICBkZWYgZ2V0KHNlbGYsIHF1ZXVlX25hbWUpOgotICAgICAgICBxdWV1ZV9uYW1l ID0gcXVldWVfbmFtZS5sb3dlcmNhc2UoKQorICAgICAgICBxdWV1ZV9uYW1lID0gcXVldWVfbmFt ZS5sb3dlcigpCiAgICAgICAgIHF1ZXVlID0gUXVldWUucXVldWVfd2l0aF9uYW1lKHF1ZXVlX25h bWUpCiAgICAgICAgIGlmIG5vdCBxdWV1ZToKICAgICAgICAgICAgIHNlbGYuZXJyb3IoNDA0KQor ICAgICAgICAgICAgcmV0dXJuCiAKICAgICAgICAgcXVldWVkX2l0ZW1zID0gV29ya0l0ZW1zLmFs bCgpLmZpbHRlcigicXVldWVfbmFtZSA9IiwgcXVldWUubmFtZSgpKS5nZXQoKQogICAgICAgICBh Y3RpdmVfaXRlbXMgPSBBY3RpdmVXb3JrSXRlbXMuYWxsKCkuZmlsdGVyKCJxdWV1ZV9uYW1lID0i LCBxdWV1ZS5uYW1lKCkpLmdldCgpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9RdWV1ZVN0YXR1 c1NlcnZlci9oYW5kbGVycy9zdWJtaXR0b2V3cy5weSBiL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVz U2VydmVyL2hhbmRsZXJzL3N1Ym1pdHRvZXdzLnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmMxN2NmNTU1Njk4YTVh NWY2ZDlhZjljNWI1NDgyOTJhNGY1MDVlNDQKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJLaXRUb29s cy9RdWV1ZVN0YXR1c1NlcnZlci9oYW5kbGVycy9zdWJtaXR0b2V3cy5weQpAQCAtMCwwICsxLDYy IEBACisjIENvcHlyaWdodCAoQykgMjAxMCBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgorIworIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQorIyBtZXQ6CisjCisjICAgICAqIFJl ZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJp Z2h0CisjIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg ZGlzY2xhaW1lci4KKyMgICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3Qg cmVwcm9kdWNlIHRoZSBhYm92ZQorIyBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29u ZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCisjIGluIHRoZSBkb2N1bWVudGF0 aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyMgZGlzdHJpYnV0 aW9uLgorIyAgICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFt ZXMgb2YgaXRzCisjIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21v dGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tCisjIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZp YyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisjCisjIFRISVMgU09GVFdBUkUgSVMgUFJPVklE RUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyMgIkFTIElTIiBB TkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QK KyMgTElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkg QU5EIEZJVE5FU1MgRk9SCisjIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJ TiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisjIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBC RSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAorIyBTUEVDSUFM LCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9U CisjIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklD RVM7IExPU1MgT0YgVVNFLAorIyBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJV UFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyMgVEhFT1JZIE9GIExJQUJJTElUWSwg V0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorIyAoSU5DTFVE SU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRI RSBVU0UKKyMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KKworZnJvbSBnb29nbGUuYXBwZW5naW5lLmV4dCBpbXBvcnQg d2ViYXBwLCBkYgorZnJvbSBnb29nbGUuYXBwZW5naW5lLmV4dC53ZWJhcHAgaW1wb3J0IHRlbXBs YXRlCisKK2Zyb20gaGFuZGxlcnMudXBkYXRlYmFzZSBpbXBvcnQgVXBkYXRlQmFzZQorZnJvbSBt b2RlbC5hdHRhY2htZW50IGltcG9ydCBBdHRhY2htZW50Citmcm9tIG1vZGVsLnF1ZXVlcyBpbXBv cnQgUXVldWUKKworCitjbGFzcyBTdWJtaXRUb0VXUyhVcGRhdGVCYXNlKToKKyAgICBkZWYgZ2V0 KHNlbGYpOgorICAgICAgICBzZWxmLnJlc3BvbnNlLm91dC53cml0ZSh0ZW1wbGF0ZS5yZW5kZXIo InRlbXBsYXRlcy9zdWJtaXR0b2V3cy5odG1sIiwgTm9uZSkpCisKKyAgICBkZWYgX3Nob3VsZF9h ZGRfdG9fZXdzX3F1ZXVlKHNlbGYsIHF1ZXVlLCBhdHRhY2htZW50KToKKyAgICAgICAgaWYgbm90 IHF1ZXVlLmlzX2V3cygpOgorICAgICAgICAgICAgcmV0dXJuIEZhbHNlCisgICAgICAgIGxhdGVz dF9zdGF0dXMgPSBhdHRhY2htZW50LnN0YXR1c19mb3JfcXVldWUocXVldWUpCisgICAgICAgIGlm IG5vdCBsYXRlc3Rfc3RhdHVzOgorICAgICAgICAgICAgcmV0dXJuIFRydWUKKyAgICAgICAgIyBP bmx5IGV2ZXIgcmUtc3VibWl0IHRvIHRoZSBFV1MgaWYgdGhlIEVXUyBzcGVjaWZpY2FsbHkgcmVx dWVzdGVkIGEgcmV0cnkuCisgICAgICAgICMgVGhpcyBhbGxvd3MgdXMgdG8gcmVzdGFydCB0aGUg RVdTIGZlZWRlciBxdWV1ZSwgd2l0aG91dCBhbGwgcj8gcGF0Y2hlcworICAgICAgICAjIGJlaW5n IHJldHJpZWQgYXMgYSByZXN1bHQgb2YgdGhhdCByZXN0YXJ0IQorICAgICAgICAjIEluIHNvbWUg ZnV0dXJlIHZlcnNpb24gd2UgbWlnaHQgYWRkIGEgImZvcmNlIiBidXR0b24gdG8gYWxsb3cgdGhl IHVzZXIKKyAgICAgICAgIyB0byBvdmVycmlkZSB0aGlzIHJlc3RyaWN0aW9uLgorICAgICAgICBy ZXR1cm4gbGF0ZXN0X3N0YXR1cy5pc19yZXRyeV9yZXF1ZXN0KCkKKworICAgIGRlZiBfYWRkX2F0 dGFjaG1lbnRfdG9fZXdzX3F1ZXVlcyhzZWxmLCBhdHRhY2htZW50KToKKyAgICAgICAgZm9yIHF1 ZXVlIGluIFF1ZXVlLmFsbF9ld3MoKToKKyAgICAgICAgICAgIGlmIHNlbGYuX3Nob3VsZF9hZGRf dG9fZXdzX3F1ZXVlKHF1ZXVlLCBhdHRhY2htZW50KToKKyAgICAgICAgICAgICAgICBxdWV1ZS53 b3JrX2l0ZW1zKCkuYWRkX3dvcmtfaXRlbShhdHRhY2htZW50LmlkKQorCisgICAgZGVmIHBvc3Qo c2VsZik6CisgICAgICAgIGF0dGFjaG1lbnRfaWQgPSBzZWxmLl9pbnRfZnJvbV9yZXF1ZXN0KCJh dHRhY2htZW50X2lkIikKKyAgICAgICAgYXR0YWNobWVudCA9IEF0dGFjaG1lbnQoYXR0YWNobWVu dF9pZCkKKyAgICAgICAgc2VsZi5fYWRkX2F0dGFjaG1lbnRfdG9fZXdzX3F1ZXVlcyhhdHRhY2ht ZW50KQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMv dXBkYXRlc3RhdHVzLnB5IGIvV2ViS2l0VG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMv dXBkYXRlc3RhdHVzLnB5CmluZGV4IDdmMjdjYzYxODViM2MzODM1NzViYjYyOGI5MGExNDU1OGVm ZGMxZTMuLjJhNDZmZDM1NTg0MDViYzRlYTBjYzE1Y2MzYmM4ZmI2NDJmYzU5NzkgMTAwNjQ0Ci0t LSBhL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL2hhbmRsZXJzL3VwZGF0ZXN0YXR1cy5w eQorKysgYi9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9oYW5kbGVycy91cGRhdGVzdGF0 dXMucHkKQEAgLTY3LDcgKzY3LDcgQEAgY2xhc3MgVXBkYXRlU3RhdHVzKFVwZGF0ZUJhc2UpOgog CiAgICAgIyBGSVhNRTogQW4gZXhwbGljaXQgbG9ja19yZWxlYXNlIHJlcXVlc3Qgd291bGQgYmUg Y2xlYW5lciB0aGFuIHRoaXMgbWFnaWNhbCAiUmV0cnkiIHN0YXR1cy4KICAgICBkZWYgX3VwZGF0 ZV9hY3RpdmVfd29ya19pdGVtcyhzZWxmLCBxdWV1ZV9zdGF0dXMpOgotICAgICAgICBpZiBxdWV1 ZV9zdGF0dXMubWVzc2FnZSAhPSAiUmV0cnkiOiAgIyBGcm9tIEFic3RyYWN0UXVldWUuX3JldHJ5 X3N0YXR1cworICAgICAgICBpZiBub3QgcXVldWVfc3RhdHVzLmlzX3JldHJ5X3JlcXVlc3QoKToK ICAgICAgICAgICAgIHJldHVybgogICAgICAgICBhY3RpdmVfaXRlbXMgPSBBY3RpdmVXb3JrSXRl bXMuYWxsKCkuZmlsdGVyKCJxdWV1ZV9uYW1lID0iLCBxdWV1ZV9zdGF0dXMucXVldWVfbmFtZSku Z2V0KCkKICAgICAgICAgaWYgbm90IGFjdGl2ZV9pdGVtczoKZGlmZiAtLWdpdCBhL1dlYktpdFRv b2xzL1F1ZXVlU3RhdHVzU2VydmVyL21haW4ucHkgYi9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1Nl cnZlci9tYWluLnB5CmluZGV4IDkzMjI3Y2E4MDE0MTJjZWI2Y2M1NWMzOWI5ZjRiOTYzZGNlMmRl ZTkuLmM4NWM5YWY1NDUxZjhlMmUzNGNiYzZlNzU3OTc5ZmEyMTNlN2JlOTIgMTAwNjQ0Ci0tLSBh L1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL21haW4ucHkKKysrIGIvV2ViS2l0VG9vbHMv UXVldWVTdGF0dXNTZXJ2ZXIvbWFpbi5weQpAQCAtNDIsNiArNDIsNyBAQCBmcm9tIGhhbmRsZXJz LnF1ZXVlc3RhdHVzIGltcG9ydCBRdWV1ZVN0YXR1cwogZnJvbSBoYW5kbGVycy5yZWNlbnRzdGF0 dXMgaW1wb3J0IFF1ZXVlc092ZXJ2aWV3CiBmcm9tIGhhbmRsZXJzLnNob3dyZXN1bHRzIGltcG9y dCBTaG93UmVzdWx0cwogZnJvbSBoYW5kbGVycy5zdGF0dXNidWJibGUgaW1wb3J0IFN0YXR1c0J1 YmJsZQorZnJvbSBoYW5kbGVycy5zdWJtaXR0b2V3cyBpbXBvcnQgU3VibWl0VG9FV1MKIGZyb20g aGFuZGxlcnMuc3ZucmV2aXNpb24gaW1wb3J0IFNWTlJldmlzaW9uCiBmcm9tIGhhbmRsZXJzLnVw ZGF0ZXN0YXR1cyBpbXBvcnQgVXBkYXRlU3RhdHVzCiBmcm9tIGhhbmRsZXJzLnVwZGF0ZXN2bnJl dmlzaW9uIGltcG9ydCBVcGRhdGVTVk5SZXZpc2lvbgpAQCAtNTYsNiArNTcsNyBAQCByb3V0ZXMg PSBbCiAgICAgKCcvZ2MnLCBHQyksCiAgICAgKHInL3BhdGNoLXN0YXR1cy8oLiopLyguKiknLCBQ YXRjaFN0YXR1cyksCiAgICAgKHInL3BhdGNoLyguKiknLCBQYXRjaCksCisgICAgKHInL3N1Ym1p dC10by1ld3MnLCBTdWJtaXRUb0VXUyksCiAgICAgKHInL3Jlc3VsdHMvKC4qKScsIFNob3dSZXN1 bHRzKSwKICAgICAocicvc3RhdHVzLWJ1YmJsZS8oLiopJywgU3RhdHVzQnViYmxlKSwKICAgICAo cicvc3ZuLXJldmlzaW9uLyguKiknLCBTVk5SZXZpc2lvbiksCmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9RdWV1ZVN0YXR1c1NlcnZlci9tb2RlbC9xdWV1ZXByb3BlcnR5bWl4aW4ucHkgYi9XZWJL aXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9tb2RlbC9xdWV1ZXByb3BlcnR5bWl4aW4ucHkKaW5k ZXggMWUzODUzZWQ3Y2MzM2QyMGI4ZmFlYTYzZjg1ODFlMWY3YjAwZTM3YS4uOGY5Y2MyOTc3MTI0 ZjQxZWVkMTBiMTJjMWMyZGI5NDdkODkzNjhkNiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvUXVl dWVTdGF0dXNTZXJ2ZXIvbW9kZWwvcXVldWVwcm9wZXJ0eW1peGluLnB5CisrKyBiL1dlYktpdFRv b2xzL1F1ZXVlU3RhdHVzU2VydmVyL21vZGVsL3F1ZXVlcHJvcGVydHltaXhpbi5weQpAQCAtMjYs MTEgKzI2LDExIEBACiAjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJ TkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElG IEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCi1mcm9tIG1vZGVs LnF1ZXVlcyBpbXBvcnQgUXVldWUKLQogCiBjbGFzcyBRdWV1ZVByb3BlcnR5TWl4aW4ob2JqZWN0 KToKICAgICBkZWYgX3F1ZXVlX2dldHRlcihzZWxmKToKKyAgICAgICAgIyBJbXBvcnQgYXQgcnVu dGltZSB0byBhdm9pZCBjaXJjdWxhciBpbXBvcnRzCisgICAgICAgIGZyb20gbW9kZWwucXVldWVz IGltcG9ydCBRdWV1ZQogICAgICAgICByZXR1cm4gUXVldWUucXVldWVfZnJvbV9uYW1lKHNlbGYu cXVldWVfbmFtZSkKIAogICAgIGRlZiBfcXVldWVfc2V0dGVyKHNlbGYsIHF1ZXVlKToKZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL21vZGVsL3F1ZXVlcy5weSBiL1dl YktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL21vZGVsL3F1ZXVlcy5weQppbmRleCA5Y2ExZTFl NjNmMzUzYjNhYmQwYjljODdiYjdhODA5ZDRiOWM5YzBjLi40NmVkNGUxZTJiYzRjOTEzNzVjNDJm OWZiMDRkMTg0ZmJkOTlhY2M2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1Nl cnZlci9tb2RlbC9xdWV1ZXMucHkKKysrIGIvV2ViS2l0VG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIv bW9kZWwvcXVldWVzLnB5CkBAIC0yOSw2ICsyOSw5IEBACiAKIGltcG9ydCByZQogCitmcm9tIG1v ZGVsLmFjdGl2ZXdvcmtpdGVtcyBpbXBvcnQgQWN0aXZlV29ya0l0ZW1zCitmcm9tIG1vZGVsLndv cmtpdGVtcyBpbXBvcnQgV29ya0l0ZW1zCisKIAogY2xhc3MgUXVldWUob2JqZWN0KToKIApAQCAt NTgsOSArNjEsMjIgQEAgY2xhc3MgUXVldWUob2JqZWN0KToKICAgICBkZWYgYWxsKGNscyk6CiAg ICAgICAgIHJldHVybiBbUXVldWUobmFtZSkgZm9yIG5hbWUgaW4gY2xzLl9hbGxfcXVldWVfbmFt ZXNdCiAKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgYWxsX2V3cyhjbHMpOgorICAgICAgICBy ZXR1cm4gW3F1ZXVlIGZvciBxdWV1ZSBpbiBjbHMuYWxsKCkgaWYgcXVldWUuaXNfZXdzKCldCisK ICAgICBkZWYgbmFtZShzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX25hbWUKIAorICAgIGRl ZiB3b3JrX2l0ZW1zKHNlbGYpOgorICAgICAgICBrZXlfbmFtZSA9ICJ3b3JrLWl0ZW1zLSVzIiAl IChzZWxmLl9uYW1lKQorICAgICAgICByZXR1cm4gV29ya0l0ZW1zLmdldF9vcl9pbnNlcnQoa2V5 X25hbWU9a2V5X25hbWUsIHF1ZXVlX25hbWU9c2VsZi5fbmFtZSkKKworICAgICMgRklYTUU6IGFj dGl2ZV93b3JrX2l0ZW1zIGlzIGEgYmFkIG5hbWUgZm9yIHRoaXMgbG9jay10YWJsZS4KKyAgICBk ZWYgYWN0aXZlX3dvcmtfaXRlbXMoc2VsZik6CisgICAgICAgIGtleV9uYW1lID0gImFjdGl2ZS13 b3JrLWl0ZW1zLSVzIiAlIChzZWxmLl9uYW1lKQorICAgICAgICByZXR1cm4gQWN0aXZlV29ya0l0 ZW1zLmdldF9vcl9pbnNlcnQoa2V5X25hbWU9a2V5X25hbWUsIHF1ZXVlX25hbWU9c2VsZi5fbmFt ZSkKKwogICAgIGRlZiBfY2FwbGl0YWxpemVfYWZ0ZXJfZGFzaChzZWxmLCBzdHJpbmcpOgogICAg ICAgICByZXR1cm4gIi0iLmpvaW4oW3dvcmRbMF0udXBwZXIoKSArIHdvcmRbMTpdIGZvciB3b3Jk IGluIHN0cmluZy5zcGxpdCgiLSIpXSkKIApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvUXVldWVT dGF0dXNTZXJ2ZXIvbW9kZWwvcXVldWVzdGF0dXMucHkgYi9XZWJLaXRUb29scy9RdWV1ZVN0YXR1 c1NlcnZlci9tb2RlbC9xdWV1ZXN0YXR1cy5weQppbmRleCA2OGI1MGRhZWY2MWRkNTUzNzFhOTM4 YWQ0ZDdlMTc4NGZlNDhmYzY3Li4xMTgwMjA5NGEzYTlmM2U2MDJkYzExNmIzMTZlMTY3NzVlZGU5 M2E0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9tb2RlbC9xdWV1 ZXN0YXR1cy5weQorKysgYi9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9tb2RlbC9xdWV1 ZXN0YXR1cy5weQpAQCAtMzksMyArMzksNiBAQCBjbGFzcyBRdWV1ZVN0YXR1cyhkYi5Nb2RlbCwg UXVldWVQcm9wZXJ0eU1peGluKToKICAgICBtZXNzYWdlID0gZGIuU3RyaW5nUHJvcGVydHkobXVs dGlsaW5lPVRydWUpCiAgICAgZGF0ZSA9IGRiLkRhdGVUaW1lUHJvcGVydHkoYXV0b19ub3dfYWRk PVRydWUpCiAgICAgcmVzdWx0c19maWxlID0gZGIuQmxvYlByb3BlcnR5KCkKKworICAgIGRlZiBp c19yZXRyeV9yZXF1ZXN0KHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi5tZXNzYWdlICE9ICJS ZXRyeSIKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL21vZGVsL3dv cmtpdGVtcy5weSBiL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL21vZGVsL3dvcmtpdGVt cy5weQppbmRleCA0NTEyNWM5NDFiNTg2NzM4NTdmNGZjNzQ0Yjg3Mjc4ZTFiNmFhNjk1Li5jMzlm NzkwNDY5MzM5MjUzY2VhNjY2ZWU0M2JjYmM1MjU1YzcyYTI0IDEwMDY0NAotLS0gYS9XZWJLaXRU b29scy9RdWV1ZVN0YXR1c1NlcnZlci9tb2RlbC93b3JraXRlbXMucHkKKysrIGIvV2ViS2l0VG9v bHMvUXVldWVTdGF0dXNTZXJ2ZXIvbW9kZWwvd29ya2l0ZW1zLnB5CkBAIC00MywzICs0MywyNCBA QCBjbGFzcyBXb3JrSXRlbXMoZGIuTW9kZWwsIFF1ZXVlUHJvcGVydHlNaXhpbik6CiAgICAgICAg IGlmIGF0dGFjaG1lbnRfaWQgaW4gYXR0YWNobWVudF9pZDoKICAgICAgICAgICAgIHJldHVybiBz ZWxmLml0ZW1faWRzLmluZGV4KGF0dGFjaG1lbnRfaWQpICsgMQogICAgICAgICByZXR1cm4gTm9u ZQorCisgICAgQHN0YXRpY21ldGhvZAorICAgIGRlZiBfdW5ndWFyZGVkX2FkZChrZXksIGF0dGFj aG1lbnRfaWQpOgorICAgICAgICB3b3JrX2l0ZW1zID0gZGIuZ2V0KGtleSkKKyAgICAgICAgaWYg YXR0YWNobWVudF9pZCBpbiB3b3JrX2l0ZW1zLml0ZW1faWRzOgorICAgICAgICAgICAgcmV0dXJu CisgICAgICAgIHdvcmtfaXRlbXMuaXRlbV9pZHMuYXBwZW5kKGF0dGFjaG1lbnRfaWQpCisgICAg ICAgIHdvcmtfaXRlbXMucHV0KCkKKworICAgIGRlZiBhZGRfd29ya19pdGVtKHNlbGYsIGF0dGFj aG1lbnRfaWQpOgorICAgICAgICBkYi5ydW5faW5fdHJhbnNhY3Rpb24oc2VsZi5fdW5ndWFyZGVk X2FkZCwgc2VsZi5rZXkoKSwgYXR0YWNobWVudF9pZCkKKworICAgIEBzdGF0aWNtZXRob2QKKyAg ICBkZWYgX3VuZ3VhcmRlZF9yZW1vdmUoa2V5LCBhdHRhY2htZW50X2lkKToKKyAgICAgICAgd29y a19pdGVtcyA9IGRiLmdldChrZXkpCisgICAgICAgICMgV2Ugc2hvdWxkIG5ldmVyIGhhdmUgbW9y ZSB0aGFuIG9uZSBlbnRyeSBmb3IgYSB3b3JrIGl0ZW0sIHNvIHdlIG9ubHkgbmVlZCByZW1vdmUg dGhlIGZpcnN0LgorICAgICAgICB3b3JrX2l0ZW1zLml0ZW1faWRzLnJlbW92ZShhdHRhY2htZW50 X2lkKQorICAgICAgICB3b3JrX2l0ZW1zLnB1dCgpCisKKyAgICBkZWYgcmVtb3ZlX3dvcmtfaXRl bShzZWxmLCBhdHRhY2htZW50X2lkKToKKyAgICAgICAgZGIucnVuX2luX3RyYW5zYWN0aW9uKHNl bGYuX3VuZ3VhcmRlZF9yZW1vdmUsIHNlbGYua2V5KCksIGF0dGFjaG1lbnRfaWQpCmRpZmYgLS1n aXQgYS9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci90ZW1wbGF0ZXMvc3VibWl0dG9ld3Mu aHRtbCBiL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL3RlbXBsYXRlcy9zdWJtaXR0b2V3 cy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLmZiOWQ4YWE1YmVhODYyYmVkM2Y4ZDliYjk5ZmY2OWQzMGY2NTli MDIKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci90ZW1w bGF0ZXMvc3VibWl0dG9ld3MuaHRtbApAQCAtMCwwICsxLDMgQEAKKzxmb3JtIG5hbWU9InN1Ym1p dF90b19ld3MiIGVuY3R5cGU9Im11bHRpcGFydC9mb3JtLWRhdGEiIG1ldGhvZD0icG9zdCI+CitQ YXRjaCB0byBzdWJtaXQ6IDxpbnB1dCBuYW1lPSJhdHRhY2htZW50X2lkIj48aW5wdXQgdHlwZT0i c3VibWl0IiB2YWx1ZT0iU3VibWl0IGZvciBFV1MgUHJvY2Vzc2luZyI+PC9kaXY+Cis8L2Zvcm0+ Cg== 71116 2010-10-18 19:15:36 -0700 2010-10-19 14:23:19 -0700 should apply now bug-47869-20101018191535.patch text/plain 13749 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA2MGNmZTExMjQ4NzA2NjRjZjZhNTVmNTkyMjc0YTc1NzM0MDdjMjRkLi45YTIyMTYx MzAxMTAyNjU4ZWIzZDE3YTZmNWVjOWFiMGQwOWUyYjIyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzAgQEAK IDIwMTAtMTAtMTggIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgaXQgcG9zc2libGUgdG8g c3VibWl0IHBhdGNoZXMgdG8gdGhlIEVXUyBib3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Nzg2OQorCisgICAgICAgICogUXVldWVTdGF0dXNTZXJ2 ZXIvaGFuZGxlcnMvbmV4dHBhdGNoLnB5OgorICAgICAgICAgLSBNb3ZlIG1vcmUgbG9naWMgaW50 byBRdWV1ZSwgc28gdGhhdCBpdCBjYW4gYmUgc2hhcmVkIHdpdGggU3VibWl0VG9FV1MuCisgICAg ICAgICogUXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMvcXVldWVzdGF0dXMucHk6CisgICAgICAg ICAtIEZpeCB0d28gdHlwb3MgZnJvbSBhIHByZXZpb3VzIGNvbW1pdC4KKyAgICAgICAgKiBRdWV1 ZVN0YXR1c1NlcnZlci9oYW5kbGVycy9zdWJtaXR0b2V3cy5weTogQWRkZWQuCisgICAgICAgICog UXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMvdXBkYXRlc3RhdHVzLnB5OgorICAgICAgICAgLSBV c2UgdGhlIG5ldyBpc19yZXRyeV9yZXF1ZXN0IG1ldGhvZCB0byBzaGFyZSB0aGlzIChoYWNreSkg Y29kZSB3aXRoIFN1Ym1pdFRvRVdTCisgICAgICAgICogUXVldWVTdGF0dXNTZXJ2ZXIvbWFpbi5w eToKKyAgICAgICAgIC0gQWRkIC9zdWJtaXQtdG8tZXdzCisgICAgICAgICogUXVldWVTdGF0dXNT ZXJ2ZXIvbW9kZWwvcXVldWVwcm9wZXJ0eW1peGluLnB5OgorICAgICAgICAgLSBGaXggY2lyY3Vs YXIgaW1wb3J0cyBjYXVzZWQgYnkgYWRkaW5nIFF1ZXVlLndvcmtfaXRlbXMoKQorICAgICAgICAq IFF1ZXVlU3RhdHVzU2VydmVyL21vZGVsL3F1ZXVlcy5weToKKyAgICAgICAgIC0gQWRkIHdvcmtf aXRlbXMoKSBhbmQgYWN0aXZlX3dvcmtfaXRlbXMoKQorICAgICAgICAqIFF1ZXVlU3RhdHVzU2Vy dmVyL21vZGVsL3F1ZXVlc3RhdHVzLnB5OgorICAgICAgICAqIFF1ZXVlU3RhdHVzU2VydmVyL21v ZGVsL3dvcmtpdGVtcy5weToKKyAgICAgICAgIC0gQWRkIHRyYW5zYWN0aW9uLXNhZmUgYWRkL3Jl bW92ZSBtZXRob2RzLgorICAgICAgICAqIFF1ZXVlU3RhdHVzU2VydmVyL3RlbXBsYXRlcy9zdWJt aXR0b2V3cy5odG1sOiBBZGRlZC4KKworMjAxMC0xMC0xOCAgRXJpYyBTZWlkZWwgIDxlcmljQHdl YmtpdC5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KIAogICAgICAgICBE ZXBsb3kgUXVldWUgY2xhc3MgaW4gbW9yZSBwbGFjZXMgdGhyb3VnaG91dCBRdWV1ZVN0YXR1c1Nl cnZlcgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMv bmV4dHBhdGNoLnB5IGIvV2ViS2l0VG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMvbmV4 dHBhdGNoLnB5CmluZGV4IGVkYjcwMmFmOWY3YjM5OWQyMjNiZDhjODM3NmQ3NGQ4YWZmMGM3OGMu LjUzMDRhNzM5MjNkNzFjMmYwNTIwOGY2YmNmNTRlZGU0MGExMGZiZjEgMTAwNjQ0Ci0tLSBhL1dl YktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL2hhbmRsZXJzL25leHRwYXRjaC5weQorKysgYi9X ZWJLaXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9oYW5kbGVycy9uZXh0cGF0Y2gucHkKQEAgLTI2 LDI2ICsyNiwyMiBAQAogIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklT SU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJ RiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAorZnJvbSBkYXRl dGltZSBpbXBvcnQgZGF0ZXRpbWUKKwogZnJvbSBnb29nbGUuYXBwZW5naW5lLmV4dCBpbXBvcnQg ZGIKIGZyb20gZ29vZ2xlLmFwcGVuZ2luZS5leHQgaW1wb3J0IHdlYmFwcAogCi1mcm9tIG1vZGVs LndvcmtpdGVtcyBpbXBvcnQgV29ya0l0ZW1zCi1mcm9tIG1vZGVsLmFjdGl2ZXdvcmtpdGVtcyBp bXBvcnQgQWN0aXZlV29ya0l0ZW1zCi1mcm9tIG1vZGVsIGltcG9ydCBxdWV1ZXN0YXR1cwotCi1m cm9tIGRhdGV0aW1lIGltcG9ydCBkYXRldGltZSwgdGltZWRlbHRhCitmcm9tIG1vZGVsLnF1ZXVl cyBpbXBvcnQgUXVldWUKIAogCiBjbGFzcyBOZXh0UGF0Y2god2ViYXBwLlJlcXVlc3RIYW5kbGVy KToKLSAgICBkZWYgX2dldF9uZXh0X3BhdGNoX2lkKHNlbGYsIHF1ZXVlX25hbWUpOgotICAgICAg ICB3b3JrX2l0ZW1zID0gV29ya0l0ZW1zLmFsbCgpLmZpbHRlcigicXVldWVfbmFtZSA9IiwgcXVl dWVfbmFtZSkuZ2V0KCkKLSAgICAgICAgaWYgbm90IHdvcmtfaXRlbXM6Ci0gICAgICAgICAgICBy ZXR1cm4gTm9uZQotICAgICAgICBhY3RpdmVfd29ya19pdGVtcyA9IEFjdGl2ZVdvcmtJdGVtcy5n ZXRfb3JfaW5zZXJ0KGtleV9uYW1lPXF1ZXVlX25hbWUsIHF1ZXVlX25hbWU9cXVldWVfbmFtZSkK LSAgICAgICAgcmV0dXJuIGRiLnJ1bl9pbl90cmFuc2FjdGlvbihzZWxmLl9hc3NpZ25fcGF0Y2gs IGFjdGl2ZV93b3JrX2l0ZW1zLmtleSgpLCB3b3JrX2l0ZW1zLml0ZW1faWRzKQotCiAgICAgZGVm IGdldChzZWxmLCBxdWV1ZV9uYW1lKToKLSAgICAgICAgcGF0Y2hfaWQgPSBzZWxmLl9nZXRfbmV4 dF9wYXRjaF9pZChxdWV1ZV9uYW1lKQorICAgICAgICBxdWV1ZSA9IFF1ZXVlLnF1ZXVlX2Zvcl9u YW1lKHF1ZXVlX25hbWUpCisgICAgICAgIGlmIG5vdCBxdWV1ZToKKyAgICAgICAgICAgIHNlbGYu ZXJyb3IoNDA0KQorICAgICAgICAgICAgcmV0dXJuCisgICAgICAgICMgRklYTUU6IFBhdGNoIGFz c2lnbm1lbnQgc2hvdWxkIHByb2JhYmx5IG1vdmUgaW50byBRdWV1ZS4KKyAgICAgICAgcGF0Y2hf aWQgPSBkYi5ydW5faW5fdHJhbnNhY3Rpb24oc2VsZi5fYXNzaWduX3BhdGNoLCBxdWV1ZS5hY3Rp dmVfd29ya19pdGVtcygpLmtleSgpLCBxdWV1ZS53b3JrX2l0ZW1zKCkuaXRlbV9pZHMpCiAgICAg ICAgIGlmIG5vdCBwYXRjaF9pZDoKICAgICAgICAgICAgIHNlbGYuZXJyb3IoNDA0KQogICAgICAg ICAgICAgcmV0dXJuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9o YW5kbGVycy9xdWV1ZXN0YXR1cy5weSBiL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL2hh bmRsZXJzL3F1ZXVlc3RhdHVzLnB5CmluZGV4IDJiOWEzNzg0NTlmZWZhNjVmMTllZDc4MTllZDRk NmI3OTdhMWRiYjUuLjUyYTkyNmU4NjUzMjZhNGE5ZjY5ZWJjNTIwNDI3ZDVhOTUwMzVmMjIgMTAw NjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL2hhbmRsZXJzL3F1ZXVlc3Rh dHVzLnB5CisrKyBiL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL2hhbmRsZXJzL3F1ZXVl c3RhdHVzLnB5CkBAIC01MCwxMCArNTAsMTEgQEAgY2xhc3MgUXVldWVTdGF0dXMod2ViYXBwLlJl cXVlc3RIYW5kbGVyKToKICAgICAgICAgcmV0dXJuIHJvd3MKIAogICAgIGRlZiBnZXQoc2VsZiwg cXVldWVfbmFtZSk6Ci0gICAgICAgIHF1ZXVlX25hbWUgPSBxdWV1ZV9uYW1lLmxvd2VyY2FzZSgp CisgICAgICAgIHF1ZXVlX25hbWUgPSBxdWV1ZV9uYW1lLmxvd2VyKCkKICAgICAgICAgcXVldWUg PSBRdWV1ZS5xdWV1ZV93aXRoX25hbWUocXVldWVfbmFtZSkKICAgICAgICAgaWYgbm90IHF1ZXVl OgogICAgICAgICAgICAgc2VsZi5lcnJvcig0MDQpCisgICAgICAgICAgICByZXR1cm4KIAogICAg ICAgICBxdWV1ZWRfaXRlbXMgPSBXb3JrSXRlbXMuYWxsKCkuZmlsdGVyKCJxdWV1ZV9uYW1lID0i LCBxdWV1ZS5uYW1lKCkpLmdldCgpCiAgICAgICAgIGFjdGl2ZV9pdGVtcyA9IEFjdGl2ZVdvcmtJ dGVtcy5hbGwoKS5maWx0ZXIoInF1ZXVlX25hbWUgPSIsIHF1ZXVlLm5hbWUoKSkuZ2V0KCkKZGlm ZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL2hhbmRsZXJzL3N1Ym1pdHRv ZXdzLnB5IGIvV2ViS2l0VG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMvc3VibWl0dG9l d3MucHkKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uYzE3Y2Y1NTU2OThhNWE1ZjZkOWFmOWM1YjU0ODI5MmE0ZjUwNWU0 NAotLS0gL2Rldi9udWxsCisrKyBiL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL2hhbmRs ZXJzL3N1Ym1pdHRvZXdzLnB5CkBAIC0wLDAgKzEsNjIgQEAKKyMgQ29weXJpZ2h0IChDKSAyMDEw IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlzdHJpYnV0aW9uIGFu ZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorIyBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMgYXJlCisjIG1ldDoKKyMKKyMgICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBj b2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgbm90aWNlLCB0aGlzIGxpc3Qg b2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorIyAgICAgKiBSZWRp c3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisjIGNv cHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIKKyMgaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFs cyBwcm92aWRlZCB3aXRoIHRoZQorIyBkaXN0cmlidXRpb24uCisjICAgICAqIE5laXRoZXIgdGhl IG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyMgY29udHJpYnV0b3Jz IG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20K KyMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lv bi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERF UlMgQU5EIENPTlRSSUJVVE9SUworIyAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVE IFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBUSEUgSU1QTElF RCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKyMgQSBQQVJU SUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZ UklHSFQKKyMgT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwg SU5ESVJFQ1QsIElOQ0lERU5UQUwsCisjIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVO VElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRFRCBUTywgUFJPQ1VSRU1F TlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisjIERBVEEs IE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5E IE9OIEFOWQorIyBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJ Q1QgTElBQklMSVRZLCBPUiBUT1JUCisjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJ U0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBPRiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorCitm cm9tIGdvb2dsZS5hcHBlbmdpbmUuZXh0IGltcG9ydCB3ZWJhcHAsIGRiCitmcm9tIGdvb2dsZS5h cHBlbmdpbmUuZXh0LndlYmFwcCBpbXBvcnQgdGVtcGxhdGUKKworZnJvbSBoYW5kbGVycy51cGRh dGViYXNlIGltcG9ydCBVcGRhdGVCYXNlCitmcm9tIG1vZGVsLmF0dGFjaG1lbnQgaW1wb3J0IEF0 dGFjaG1lbnQKK2Zyb20gbW9kZWwucXVldWVzIGltcG9ydCBRdWV1ZQorCisKK2NsYXNzIFN1Ym1p dFRvRVdTKFVwZGF0ZUJhc2UpOgorICAgIGRlZiBnZXQoc2VsZik6CisgICAgICAgIHNlbGYucmVz cG9uc2Uub3V0LndyaXRlKHRlbXBsYXRlLnJlbmRlcigidGVtcGxhdGVzL3N1Ym1pdHRvZXdzLmh0 bWwiLCBOb25lKSkKKworICAgIGRlZiBfc2hvdWxkX2FkZF90b19ld3NfcXVldWUoc2VsZiwgcXVl dWUsIGF0dGFjaG1lbnQpOgorICAgICAgICBpZiBub3QgcXVldWUuaXNfZXdzKCk6CisgICAgICAg ICAgICByZXR1cm4gRmFsc2UKKyAgICAgICAgbGF0ZXN0X3N0YXR1cyA9IGF0dGFjaG1lbnQuc3Rh dHVzX2Zvcl9xdWV1ZShxdWV1ZSkKKyAgICAgICAgaWYgbm90IGxhdGVzdF9zdGF0dXM6CisgICAg ICAgICAgICByZXR1cm4gVHJ1ZQorICAgICAgICAjIE9ubHkgZXZlciByZS1zdWJtaXQgdG8gdGhl IEVXUyBpZiB0aGUgRVdTIHNwZWNpZmljYWxseSByZXF1ZXN0ZWQgYSByZXRyeS4KKyAgICAgICAg IyBUaGlzIGFsbG93cyB1cyB0byByZXN0YXJ0IHRoZSBFV1MgZmVlZGVyIHF1ZXVlLCB3aXRob3V0 IGFsbCByPyBwYXRjaGVzCisgICAgICAgICMgYmVpbmcgcmV0cmllZCBhcyBhIHJlc3VsdCBvZiB0 aGF0IHJlc3RhcnQhCisgICAgICAgICMgSW4gc29tZSBmdXR1cmUgdmVyc2lvbiB3ZSBtaWdodCBh ZGQgYSAiZm9yY2UiIGJ1dHRvbiB0byBhbGxvdyB0aGUgdXNlcgorICAgICAgICAjIHRvIG92ZXJy aWRlIHRoaXMgcmVzdHJpY3Rpb24uCisgICAgICAgIHJldHVybiBsYXRlc3Rfc3RhdHVzLmlzX3Jl dHJ5X3JlcXVlc3QoKQorCisgICAgZGVmIF9hZGRfYXR0YWNobWVudF90b19ld3NfcXVldWVzKHNl bGYsIGF0dGFjaG1lbnQpOgorICAgICAgICBmb3IgcXVldWUgaW4gUXVldWUuYWxsX2V3cygpOgor ICAgICAgICAgICAgaWYgc2VsZi5fc2hvdWxkX2FkZF90b19ld3NfcXVldWUocXVldWUsIGF0dGFj aG1lbnQpOgorICAgICAgICAgICAgICAgIHF1ZXVlLndvcmtfaXRlbXMoKS5hZGRfd29ya19pdGVt KGF0dGFjaG1lbnQuaWQpCisKKyAgICBkZWYgcG9zdChzZWxmKToKKyAgICAgICAgYXR0YWNobWVu dF9pZCA9IHNlbGYuX2ludF9mcm9tX3JlcXVlc3QoImF0dGFjaG1lbnRfaWQiKQorICAgICAgICBh dHRhY2htZW50ID0gQXR0YWNobWVudChhdHRhY2htZW50X2lkKQorICAgICAgICBzZWxmLl9hZGRf YXR0YWNobWVudF90b19ld3NfcXVldWVzKGF0dGFjaG1lbnQpCmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9RdWV1ZVN0YXR1c1NlcnZlci9oYW5kbGVycy91cGRhdGVzdGF0dXMucHkgYi9XZWJLaXRU b29scy9RdWV1ZVN0YXR1c1NlcnZlci9oYW5kbGVycy91cGRhdGVzdGF0dXMucHkKaW5kZXggN2Yy N2NjNjE4NWIzYzM4MzU3NWJiNjI4YjkwYTE0NTU4ZWZkYzFlMy4uMmE0NmZkMzU1ODQwNWJjNGVh MGNjMTVjYzNiYzhmYjY0MmZjNTk3OSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvUXVldWVTdGF0 dXNTZXJ2ZXIvaGFuZGxlcnMvdXBkYXRlc3RhdHVzLnB5CisrKyBiL1dlYktpdFRvb2xzL1F1ZXVl U3RhdHVzU2VydmVyL2hhbmRsZXJzL3VwZGF0ZXN0YXR1cy5weQpAQCAtNjcsNyArNjcsNyBAQCBj bGFzcyBVcGRhdGVTdGF0dXMoVXBkYXRlQmFzZSk6CiAKICAgICAjIEZJWE1FOiBBbiBleHBsaWNp dCBsb2NrX3JlbGVhc2UgcmVxdWVzdCB3b3VsZCBiZSBjbGVhbmVyIHRoYW4gdGhpcyBtYWdpY2Fs ICJSZXRyeSIgc3RhdHVzLgogICAgIGRlZiBfdXBkYXRlX2FjdGl2ZV93b3JrX2l0ZW1zKHNlbGYs IHF1ZXVlX3N0YXR1cyk6Ci0gICAgICAgIGlmIHF1ZXVlX3N0YXR1cy5tZXNzYWdlICE9ICJSZXRy eSI6ICAjIEZyb20gQWJzdHJhY3RRdWV1ZS5fcmV0cnlfc3RhdHVzCisgICAgICAgIGlmIG5vdCBx dWV1ZV9zdGF0dXMuaXNfcmV0cnlfcmVxdWVzdCgpOgogICAgICAgICAgICAgcmV0dXJuCiAgICAg ICAgIGFjdGl2ZV9pdGVtcyA9IEFjdGl2ZVdvcmtJdGVtcy5hbGwoKS5maWx0ZXIoInF1ZXVlX25h bWUgPSIsIHF1ZXVlX3N0YXR1cy5xdWV1ZV9uYW1lKS5nZXQoKQogICAgICAgICBpZiBub3QgYWN0 aXZlX2l0ZW1zOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvbWFp bi5weSBiL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL21haW4ucHkKaW5kZXggOTMyMjdj YTgwMTQxMmNlYjZjYzU1YzM5YjlmNGI5NjNkY2UyZGVlOS4uYzg1YzlhZjU0NTFmOGUyZTM0Y2Jj NmU3NTc5NzlmYTIxM2U3YmU5MiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvUXVldWVTdGF0dXNT ZXJ2ZXIvbWFpbi5weQorKysgYi9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9tYWluLnB5 CkBAIC00Miw2ICs0Miw3IEBAIGZyb20gaGFuZGxlcnMucXVldWVzdGF0dXMgaW1wb3J0IFF1ZXVl U3RhdHVzCiBmcm9tIGhhbmRsZXJzLnJlY2VudHN0YXR1cyBpbXBvcnQgUXVldWVzT3ZlcnZpZXcK IGZyb20gaGFuZGxlcnMuc2hvd3Jlc3VsdHMgaW1wb3J0IFNob3dSZXN1bHRzCiBmcm9tIGhhbmRs ZXJzLnN0YXR1c2J1YmJsZSBpbXBvcnQgU3RhdHVzQnViYmxlCitmcm9tIGhhbmRsZXJzLnN1Ym1p dHRvZXdzIGltcG9ydCBTdWJtaXRUb0VXUwogZnJvbSBoYW5kbGVycy5zdm5yZXZpc2lvbiBpbXBv cnQgU1ZOUmV2aXNpb24KIGZyb20gaGFuZGxlcnMudXBkYXRlc3RhdHVzIGltcG9ydCBVcGRhdGVT dGF0dXMKIGZyb20gaGFuZGxlcnMudXBkYXRlc3ZucmV2aXNpb24gaW1wb3J0IFVwZGF0ZVNWTlJl dmlzaW9uCkBAIC01Niw2ICs1Nyw3IEBAIHJvdXRlcyA9IFsKICAgICAoJy9nYycsIEdDKSwKICAg ICAocicvcGF0Y2gtc3RhdHVzLyguKikvKC4qKScsIFBhdGNoU3RhdHVzKSwKICAgICAocicvcGF0 Y2gvKC4qKScsIFBhdGNoKSwKKyAgICAocicvc3VibWl0LXRvLWV3cycsIFN1Ym1pdFRvRVdTKSwK ICAgICAocicvcmVzdWx0cy8oLiopJywgU2hvd1Jlc3VsdHMpLAogICAgIChyJy9zdGF0dXMtYnVi YmxlLyguKiknLCBTdGF0dXNCdWJibGUpLAogICAgIChyJy9zdm4tcmV2aXNpb24vKC4qKScsIFNW TlJldmlzaW9uKSwKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL21v ZGVsL3F1ZXVlcHJvcGVydHltaXhpbi5weSBiL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVy L21vZGVsL3F1ZXVlcHJvcGVydHltaXhpbi5weQppbmRleCAxZTM4NTNlZDdjYzMzZDIwYjhmYWVh NjNmODU4MWUxZjdiMDBlMzdhLi44ZjljYzI5NzcxMjRmNDFlZWQxMGIxMmMxYzJkYjk0N2Q4OTM2 OGQ2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9tb2RlbC9xdWV1 ZXByb3BlcnR5bWl4aW4ucHkKKysrIGIvV2ViS2l0VG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvbW9k ZWwvcXVldWVwcm9wZXJ0eW1peGluLnB5CkBAIC0yNiwxMSArMjYsMTEgQEAKICMgKElOQ0xVRElO RyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUg VVNFCiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJ VFkgT0YgU1VDSCBEQU1BR0UuCiAKLWZyb20gbW9kZWwucXVldWVzIGltcG9ydCBRdWV1ZQotCiAK IGNsYXNzIFF1ZXVlUHJvcGVydHlNaXhpbihvYmplY3QpOgogICAgIGRlZiBfcXVldWVfZ2V0dGVy KHNlbGYpOgorICAgICAgICAjIEltcG9ydCBhdCBydW50aW1lIHRvIGF2b2lkIGNpcmN1bGFyIGlt cG9ydHMKKyAgICAgICAgZnJvbSBtb2RlbC5xdWV1ZXMgaW1wb3J0IFF1ZXVlCiAgICAgICAgIHJl dHVybiBRdWV1ZS5xdWV1ZV9mcm9tX25hbWUoc2VsZi5xdWV1ZV9uYW1lKQogCiAgICAgZGVmIF9x dWV1ZV9zZXR0ZXIoc2VsZiwgcXVldWUpOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvUXVldWVT dGF0dXNTZXJ2ZXIvbW9kZWwvcXVldWVzLnB5IGIvV2ViS2l0VG9vbHMvUXVldWVTdGF0dXNTZXJ2 ZXIvbW9kZWwvcXVldWVzLnB5CmluZGV4IDljYTFlMWU2M2YzNTNiM2FiZDBiOWM4N2JiN2E4MDlk NGI5YzljMGMuLjQ2ZWQ0ZTFlMmJjNGM5MTM3NWM0MmY5ZmIwNGQxODRmYmQ5OWFjYzYgMTAwNjQ0 Ci0tLSBhL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL21vZGVsL3F1ZXVlcy5weQorKysg Yi9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9tb2RlbC9xdWV1ZXMucHkKQEAgLTI5LDYg KzI5LDkgQEAKIAogaW1wb3J0IHJlCiAKK2Zyb20gbW9kZWwuYWN0aXZld29ya2l0ZW1zIGltcG9y dCBBY3RpdmVXb3JrSXRlbXMKK2Zyb20gbW9kZWwud29ya2l0ZW1zIGltcG9ydCBXb3JrSXRlbXMK KwogCiBjbGFzcyBRdWV1ZShvYmplY3QpOgogCkBAIC01OCw5ICs2MSwyMiBAQCBjbGFzcyBRdWV1 ZShvYmplY3QpOgogICAgIGRlZiBhbGwoY2xzKToKICAgICAgICAgcmV0dXJuIFtRdWV1ZShuYW1l KSBmb3IgbmFtZSBpbiBjbHMuX2FsbF9xdWV1ZV9uYW1lc10KIAorICAgIEBjbGFzc21ldGhvZAor ICAgIGRlZiBhbGxfZXdzKGNscyk6CisgICAgICAgIHJldHVybiBbcXVldWUgZm9yIHF1ZXVlIGlu IGNscy5hbGwoKSBpZiBxdWV1ZS5pc19ld3MoKV0KKwogICAgIGRlZiBuYW1lKHNlbGYpOgogICAg ICAgICByZXR1cm4gc2VsZi5fbmFtZQogCisgICAgZGVmIHdvcmtfaXRlbXMoc2VsZik6CisgICAg ICAgIGtleV9uYW1lID0gIndvcmstaXRlbXMtJXMiICUgKHNlbGYuX25hbWUpCisgICAgICAgIHJl dHVybiBXb3JrSXRlbXMuZ2V0X29yX2luc2VydChrZXlfbmFtZT1rZXlfbmFtZSwgcXVldWVfbmFt ZT1zZWxmLl9uYW1lKQorCisgICAgIyBGSVhNRTogYWN0aXZlX3dvcmtfaXRlbXMgaXMgYSBiYWQg bmFtZSBmb3IgdGhpcyBsb2NrLXRhYmxlLgorICAgIGRlZiBhY3RpdmVfd29ya19pdGVtcyhzZWxm KToKKyAgICAgICAga2V5X25hbWUgPSAiYWN0aXZlLXdvcmstaXRlbXMtJXMiICUgKHNlbGYuX25h bWUpCisgICAgICAgIHJldHVybiBBY3RpdmVXb3JrSXRlbXMuZ2V0X29yX2luc2VydChrZXlfbmFt ZT1rZXlfbmFtZSwgcXVldWVfbmFtZT1zZWxmLl9uYW1lKQorCiAgICAgZGVmIF9jYXBsaXRhbGl6 ZV9hZnRlcl9kYXNoKHNlbGYsIHN0cmluZyk6CiAgICAgICAgIHJldHVybiAiLSIuam9pbihbd29y ZFswXS51cHBlcigpICsgd29yZFsxOl0gZm9yIHdvcmQgaW4gc3RyaW5nLnNwbGl0KCItIildKQog CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9tb2RlbC9xdWV1ZXN0 YXR1cy5weSBiL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL21vZGVsL3F1ZXVlc3RhdHVz LnB5CmluZGV4IDY4YjUwZGFlZjYxZGQ1NTM3MWE5MzhhZDRkN2UxNzg0ZmU0OGZjNjcuLjgwMDJm ODkyMTg1ZTQzMDIxZmE1YWJkZjkzYjc1NDE2Y2E5YzU0OWUgMTAwNjQ0Ci0tLSBhL1dlYktpdFRv b2xzL1F1ZXVlU3RhdHVzU2VydmVyL21vZGVsL3F1ZXVlc3RhdHVzLnB5CisrKyBiL1dlYktpdFRv b2xzL1F1ZXVlU3RhdHVzU2VydmVyL21vZGVsL3F1ZXVlc3RhdHVzLnB5CkBAIC0zOSwzICszOSw2 IEBAIGNsYXNzIFF1ZXVlU3RhdHVzKGRiLk1vZGVsLCBRdWV1ZVByb3BlcnR5TWl4aW4pOgogICAg IG1lc3NhZ2UgPSBkYi5TdHJpbmdQcm9wZXJ0eShtdWx0aWxpbmU9VHJ1ZSkKICAgICBkYXRlID0g ZGIuRGF0ZVRpbWVQcm9wZXJ0eShhdXRvX25vd19hZGQ9VHJ1ZSkKICAgICByZXN1bHRzX2ZpbGUg PSBkYi5CbG9iUHJvcGVydHkoKQorCisgICAgZGVmIGlzX3JldHJ5X3JlcXVlc3Qoc2VsZik6Cisg ICAgICAgIHJldHVybiBzZWxmLm1lc3NhZ2UgPT0gIlJldHJ5IiAgIyBGcm9tIEFic3RyYWN0UXVl dWUuX3JldHJ5X3N0YXR1cwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvUXVldWVTdGF0dXNTZXJ2 ZXIvbW9kZWwvd29ya2l0ZW1zLnB5IGIvV2ViS2l0VG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvbW9k ZWwvd29ya2l0ZW1zLnB5CmluZGV4IDQ1MTI1Yzk0MWI1ODY3Mzg1N2Y0ZmM3NDRiODcyNzhlMWI2 YWE2OTUuLmMzOWY3OTA0NjkzMzkyNTNjZWE2NjZlZTQzYmNiYzUyNTVjNzJhMjQgMTAwNjQ0Ci0t LSBhL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL21vZGVsL3dvcmtpdGVtcy5weQorKysg Yi9XZWJLaXRUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9tb2RlbC93b3JraXRlbXMucHkKQEAgLTQz LDMgKzQzLDI0IEBAIGNsYXNzIFdvcmtJdGVtcyhkYi5Nb2RlbCwgUXVldWVQcm9wZXJ0eU1peGlu KToKICAgICAgICAgaWYgYXR0YWNobWVudF9pZCBpbiBhdHRhY2htZW50X2lkOgogICAgICAgICAg ICAgcmV0dXJuIHNlbGYuaXRlbV9pZHMuaW5kZXgoYXR0YWNobWVudF9pZCkgKyAxCiAgICAgICAg IHJldHVybiBOb25lCisKKyAgICBAc3RhdGljbWV0aG9kCisgICAgZGVmIF91bmd1YXJkZWRfYWRk KGtleSwgYXR0YWNobWVudF9pZCk6CisgICAgICAgIHdvcmtfaXRlbXMgPSBkYi5nZXQoa2V5KQor ICAgICAgICBpZiBhdHRhY2htZW50X2lkIGluIHdvcmtfaXRlbXMuaXRlbV9pZHM6CisgICAgICAg ICAgICByZXR1cm4KKyAgICAgICAgd29ya19pdGVtcy5pdGVtX2lkcy5hcHBlbmQoYXR0YWNobWVu dF9pZCkKKyAgICAgICAgd29ya19pdGVtcy5wdXQoKQorCisgICAgZGVmIGFkZF93b3JrX2l0ZW0o c2VsZiwgYXR0YWNobWVudF9pZCk6CisgICAgICAgIGRiLnJ1bl9pbl90cmFuc2FjdGlvbihzZWxm Ll91bmd1YXJkZWRfYWRkLCBzZWxmLmtleSgpLCBhdHRhY2htZW50X2lkKQorCisgICAgQHN0YXRp Y21ldGhvZAorICAgIGRlZiBfdW5ndWFyZGVkX3JlbW92ZShrZXksIGF0dGFjaG1lbnRfaWQpOgor ICAgICAgICB3b3JrX2l0ZW1zID0gZGIuZ2V0KGtleSkKKyAgICAgICAgIyBXZSBzaG91bGQgbmV2 ZXIgaGF2ZSBtb3JlIHRoYW4gb25lIGVudHJ5IGZvciBhIHdvcmsgaXRlbSwgc28gd2Ugb25seSBu ZWVkIHJlbW92ZSB0aGUgZmlyc3QuCisgICAgICAgIHdvcmtfaXRlbXMuaXRlbV9pZHMucmVtb3Zl KGF0dGFjaG1lbnRfaWQpCisgICAgICAgIHdvcmtfaXRlbXMucHV0KCkKKworICAgIGRlZiByZW1v dmVfd29ya19pdGVtKHNlbGYsIGF0dGFjaG1lbnRfaWQpOgorICAgICAgICBkYi5ydW5faW5fdHJh bnNhY3Rpb24oc2VsZi5fdW5ndWFyZGVkX3JlbW92ZSwgc2VsZi5rZXkoKSwgYXR0YWNobWVudF9p ZCkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL3RlbXBsYXRlcy9z dWJtaXR0b2V3cy5odG1sIGIvV2ViS2l0VG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvdGVtcGxhdGVz L3N1Ym1pdHRvZXdzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZmI5ZDhhYTViZWE4NjJiZWQzZjhkOWJiOTlm ZjY5ZDMwZjY1OWIwMgotLS0gL2Rldi9udWxsCisrKyBiL1dlYktpdFRvb2xzL1F1ZXVlU3RhdHVz U2VydmVyL3RlbXBsYXRlcy9zdWJtaXR0b2V3cy5odG1sCkBAIC0wLDAgKzEsMyBAQAorPGZvcm0g bmFtZT0ic3VibWl0X3RvX2V3cyIgZW5jdHlwZT0ibXVsdGlwYXJ0L2Zvcm0tZGF0YSIgbWV0aG9k PSJwb3N0Ij4KK1BhdGNoIHRvIHN1Ym1pdDogPGlucHV0IG5hbWU9ImF0dGFjaG1lbnRfaWQiPjxp bnB1dCB0eXBlPSJzdWJtaXQiIHZhbHVlPSJTdWJtaXQgZm9yIEVXUyBQcm9jZXNzaW5nIj48L2Rp dj4KKzwvZm9ybT4K