176393 2017-09-05 12:32:57 -0700 Log stack-trace for run-webkit-tests when interrupted 2019-04-08 18:32:24 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=178402 InRadar P2 Normal --- 178587 178402 1 jbedard jbedard aakash_jain buildbot commit-queue darin ews-watchlist glenn lforschler webkit-bug-importer oldest_to_newest 1345570 0 jbedard 2017-09-05 12:32:57 -0700 We have a number of circumstances where run-webkit-tests gets stuck. Debugging these issues is difficult since these issues can often only be reproduced on specific configurations and even then, are frequently flakey. If run-webkit-tests printed a stack-trace when interrupted, these issues would be much easier to debug. 1345571 1 webkit-bug-importer 2017-09-05 12:33:27 -0700 <rdar://problem/34262310> 1345572 2 319924 jbedard 2017-09-05 12:36:49 -0700 Created attachment 319924 Patch 1345790 3 319924 darin 2017-09-05 20:55:14 -0700 Comment on attachment 319924 Patch This is great for someone who is working on run-webkit-tests, or who is annoyed that it is stuck, but makes things worse if you are not working on run-webkit-test and are not annoyed, but just want to cancel it so you can correct a mistake or type another command. I don’t think this should be turned on for everybody. I find these tools that dump stack traces whenever you interrupt them super-frustrating when just trying to use the tools to do my work. 1345793 4 319924 darin 2017-09-05 20:56:03 -0700 Comment on attachment 319924 Patch Maybe have it just dump the stack trace into a file? 1345937 5 320024 jbedard 2017-09-06 08:52:39 -0700 Created attachment 320024 Patch 1355233 6 320024 commit-queue 2017-10-02 07:59:32 -0700 Comment on attachment 320024 Patch Clearing flags on attachment: 320024 Committed r222709: <http://trac.webkit.org/changeset/222709> 1355234 7 commit-queue 2017-10-02 07:59:33 -0700 All reviewed patches have been landed. Closing bug. 1362707 8 commit-queue 2017-10-20 09:06:58 -0700 Re-opened since this is blocked by bug 178587 1373108 9 327187 jbedard 2017-11-17 09:48:23 -0800 Created attachment 327187 Patch 1373110 10 jbedard 2017-11-17 09:51:32 -0800 Updating the patch so that when multiple processes print stack traces, they don't all go to the same file. 1525430 11 jbedard 2019-04-08 15:43:42 -0700 I think we should revive this change, it was just quite valuable in root-causing <https://bugs.webkit.org/show_bug.cgi?id=196694>. 1525431 12 327187 lforschler 2019-04-08 15:44:42 -0700 Comment on attachment 327187 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=327187&action=review the two functions appear to be nearly identical to each other. is there any way to simplify the do reduce code duplication? > Tools/Scripts/webkitpy/common/interupt_debugging.py:28 > + nit: please alphabetize > Tools/Scripts/webkitpy/common/interupt_debugging.py:63 > +def log_stack_trace_on_cntrl_c(output_file=None): I usually see control abbreviated as CTRL > Tools/Scripts/webkitpy/common/interupt_debugging.py:74 > + file.write('cntrl C received\n') CTRL+C received 1525453 13 366996 jbedard 2019-04-08 16:30:04 -0700 Created attachment 366996 Patch 1525462 14 366996 lforschler 2019-04-08 16:46:02 -0700 Comment on attachment 366996 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=366996&action=review lgtm. > Tools/Scripts/webkitpy/common/interupt_debugging.py:28 > + nit: alphabetize 1525466 15 366999 jbedard 2019-04-08 16:56:17 -0700 Created attachment 366999 Patch 1525467 16 367000 jbedard 2019-04-08 17:00:26 -0700 Created attachment 367000 Patch 1525471 17 ews-watchlist 2019-04-08 17:03:17 -0700 Attachment 367000 did not pass style-queue: ERROR: Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:39: No name 'interrupt_debugging' in module 'webkitpy.common' [pylint/E0611] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1525477 18 367003 jbedard 2019-04-08 17:11:42 -0700 Created attachment 367003 Patch 1525507 19 367003 commit-queue 2019-04-08 18:32:22 -0700 Comment on attachment 367003 Patch Clearing flags on attachment: 367003 Committed r244064: <https://trac.webkit.org/changeset/244064> 1525508 20 commit-queue 2019-04-08 18:32:24 -0700 All reviewed patches have been landed. Closing bug. 319924 2017-09-05 12:36:49 -0700 2017-09-06 08:52:37 -0700 Patch bug-176393-20170905123648.patch text/plain 4988 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyMTYyOCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDE3LTA5LTA1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBQcmludCBzdGFjay10cmFjZSBmb3IgcnVuLXdlYmtpdC10ZXN0cyB3aGVu IGludGVycnVwdGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNzYzOTMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM0MjYyMzEwPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gcnVuLXdlYmtpdC10 ZXN0cyBpcyBzdHVjaywgaXQgaXMgZGlmZmljdWx0IHRvIGltbWVkaWF0ZWx5IHRlbGwKKyAgICAg ICAgd2h5LiBQcmludGluZyBhIHN0YWNrLXRyYWNlIHdoZW4gcnVuLXdlYmtpdC10ZXN0cyBpcyB0 ZXJtaW5hdGVkCisgICAgICAgIG9yIHN0b3BwZWQgd2l0aCBDTlRSTC1DIHdpbGwgbWFrZSBzdWNo IGlzc3VlcyBlYXNpZXIgdG8gZGVidWcuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9pbnRlcnVwdF9kZWJ1Z2dpbmcucHk6IEFkZGVkLgorICAgICAgICAocHJpbnRfc3RhY2tf dHJhY2UpOiBHaXZlbiBhIFB5dGhvbiBmcmFtZSBvYmplY3QsIHByaW50IGEgc3RhY2sgdHJhY2Uu CisgICAgICAgIChwcmludF9zdGFja190cmFjZV9vbl90ZXJtKTogQXR0YWNoIGEgbGlzdGVuZXIg dG8gU0lHVEVSTSBzbyB0aGF0IGEKKyAgICAgICAgc3RhY2stdHJhY2UgY2FuIGJlIHByaW50ZWQg d2hlbiBhIHByb2dyYW0gaXMgdGVybWluYXRlZC4KKyAgICAgICAgKHByaW50X3N0YWNrX3RyYWNl X29uX2NudHJsX2MpOiBBdHRhY2ggYSBsaXN0ZW5lciB0byBTSUdJTlQgc28gdGhhdCBhCisgICAg ICAgIHN0YWNrLXRyYWNlIGNhbiBiZSBwcmludGVkIHdoZW4gYSBwcm9ncmFtIGlzIENOVFJMLUNl ZC4gCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90 ZXN0cy5weToKKyAgICAgICAgKG1haW4pOiBTZXQgaGFuZGxlcnMgdG8gcHJpbnQgc3RhY2sgdHJh Y2Ugb24gaW50ZXJydXB0aW9uLgorCiAyMDE3LTA5LTA1ICBNYXR0IExld2lzICA8amxld2lzM0Bh cHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIyMTYwMy4KSW5k ZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2ludGVydXB0X2RlYnVnZ2luZy5weQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9pbnRlcnVwdF9kZWJ1 Z2dpbmcucHkJKG5vbmV4aXN0ZW50KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v aW50ZXJ1cHRfZGVidWdnaW5nLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsNjEgQEAKKyMg Q29weXJpZ2h0IChDKSAyMDE3IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMKKyMg UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv ciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucworIyBhcmUgbWV0OgorIyAxLiAgUmVkaXN0cmlidXRpb25z IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgIG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l ci4KKyMgMi4gIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0 aGUgYWJvdmUgY29weXJpZ2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisjICAgICBkb2N1bWVudGF0aW9u IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgor IworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05U UklCVVRPUlMgYGBBUyBJUycnIEFORAorIyBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJ RVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAorIyBXQVJSQU5U SUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBP U0UgQVJFCisjIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRT IENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SCisjIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJ REVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwKKyMgREFNQUdFUyAo SU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUg R09PRFMgT1IKKyMgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBC VVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIKKyMgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZ IE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwKKyMg T1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFO WSBXQVkgT1VUIE9GIFRIRSBVU0UKKyMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKworaW1wb3J0IGxpbmVjYWNoZQor aW1wb3J0IGxvZ2dpbmcKK2ltcG9ydCBzaWduYWwKKworCitfbG9nID0gbG9nZ2luZy5nZXRMb2dn ZXIoX19uYW1lX18pCisKKworZGVmIHByaW50X3N0YWNrX3RyYWNlKGZyYW1lKToKKyAgICBfbG9n LmNyaXRpY2FsKCdUcmFjZWJhY2sobW9zdCByZWNlbnQgY2FsbCBsYXN0KTonKQorCisgICAgZGVm IGZ1bmMoZnJhbWUpOgorICAgICAgICBpZiBub3QgZnJhbWU6CisgICAgICAgICAgICByZXR1cm4K KyAgICAgICAgZnVuYyhmcmFtZS5mX2JhY2spCisgICAgICAgIF9sb2cuY3JpdGljYWwoJyAgRmls ZSAie30iLCBsaW5lIHt9LCBpbiB7fScuZm9ybWF0KGZyYW1lLmZfY29kZS5jb19maWxlbmFtZSwg ZnJhbWUuZl9saW5lbm8sIGZyYW1lLmZfY29kZS5jb19uYW1lKSkKKyAgICAgICAgX2xvZy5jcml0 aWNhbCgnICAgIHt9Jy5mb3JtYXQobGluZWNhY2hlLmdldGxpbmUoZnJhbWUuZl9jb2RlLmNvX2Zp bGVuYW1lLCBmcmFtZS5mX2xpbmVubykubHN0cmlwKCkpKQorCisgICAgZnVuYyhmcmFtZSkKKwor CitkZWYgcHJpbnRfc3RhY2tfdHJhY2Vfb25fdGVybSgpOgorICAgIGRlZiBoYW5kbGVyKHNpZ251 bSwgZnJhbWUpOgorICAgICAgICBfbG9nLmNyaXRpY2FsKCcnKQorICAgICAgICBfbG9nLmNyaXRp Y2FsKCdraWxsIHJlY2VpdmVkJykKKyAgICAgICAgcHJpbnRfc3RhY2tfdHJhY2UoZnJhbWUpCisg ICAgICAgIGV4aXQoLTEpCisKKyAgICBzaWduYWwuc2lnbmFsKHNpZ25hbC5TSUdURVJNLCBoYW5k bGVyKQorCisKK2RlZiBwcmludF9zdGFja190cmFjZV9vbl9jbnRybF9jKCk6CisgICAgZGVmIGhh bmRsZXIoc2lnbnVtLCBmcmFtZSk6CisgICAgICAgIF9sb2cuY3JpdGljYWwoJycpCisgICAgICAg IF9sb2cuY3JpdGljYWwoJ2NudHJsIEMgcmVjZWl2ZWQnKQorICAgICAgICBwcmludF9zdGFja190 cmFjZShmcmFtZSkKKyAgICAgICAgcmFpc2UgS2V5Ym9hcmRJbnRlcnJ1cHQKKworICAgIHNpZ25h bC5zaWduYWwoc2lnbmFsLlNJR0lOVCwgaGFuZGxlcikKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQkocmV2 aXNpb24gMjIxNjE2KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVu X3dlYmtpdF90ZXN0cy5weQkod29ya2luZyBjb3B5KQpAQCAtMzUsNiArMzUsNyBAQCBpbXBvcnQg c3lzCiBpbXBvcnQgdHJhY2ViYWNrCiAKIGZyb20gd2Via2l0cHkuY29tbW9uLmhvc3QgaW1wb3J0 IEhvc3QKK2Zyb20gd2Via2l0cHkuY29tbW9uLmludGVydXB0X2RlYnVnZ2luZyBpbXBvcnQgcHJp bnRfc3RhY2tfdHJhY2Vfb25fY250cmxfYywgcHJpbnRfc3RhY2tfdHJhY2Vfb25fdGVybQogZnJv bSB3ZWJraXRweS5sYXlvdXRfdGVzdHMuY29udHJvbGxlcnMubWFuYWdlciBpbXBvcnQgTWFuYWdl cgogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzLnRlc3RfcnVuX3Jlc3VsdHMgaW1w b3J0IElOVEVSUlVQVEVEX0VYSVRfU1RBVFVTCiBmcm9tIHdlYmtpdHB5LnBvcnQgaW1wb3J0IGNv bmZpZ3VyYXRpb25fb3B0aW9ucywgcGxhdGZvcm1fb3B0aW9ucwpAQCAtNTIsNiArNTMsOCBAQCBF WENFUFRJT05BTF9FWElUX1NUQVRVUyA9IDI1NAogCiBkZWYgbWFpbihhcmd2LCBzdGRvdXQsIHN0 ZGVycik6CiAgICAgb3B0aW9ucywgYXJncyA9IHBhcnNlX2FyZ3MoYXJndikKKyAgICBwcmludF9z dGFja190cmFjZV9vbl9jbnRybF9jKCkKKyAgICBwcmludF9zdGFja190cmFjZV9vbl90ZXJtKCkK IAogICAgIGlmIG9wdGlvbnMucGxhdGZvcm0gYW5kICd0ZXN0JyBpbiBvcHRpb25zLnBsYXRmb3Jt OgogICAgICAgICAjIEl0J3MgYSBiaXQgbGFtZSB0byBpbXBvcnQgbW9ja3MgaW50byByZWFsIGNv ZGUsIGJ1dCB0aGlzIGFsbG93cyB0aGUgdXNlcgo= 320024 2017-09-06 08:52:39 -0700 2017-11-17 09:48:22 -0800 Patch bug-176393-20170906085238.patch text/plain 5833 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyMTY2OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI1IEBACisyMDE3LTA5LTA2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBMb2cgc3RhY2stdHJhY2UgZm9yIHJ1bi13ZWJraXQtdGVzdHMgd2hlbiBp bnRlcnJ1cHRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTc2MzkzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNDI2MjMxMD4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHJ1bi13ZWJraXQtdGVz dHMgaXMgc3R1Y2ssIGl0IGlzIGRpZmZpY3VsdCB0byBpbW1lZGlhdGVseSB0ZWxsCisgICAgICAg IHdoeS4gU2F2aW5nIGEgc3RhY2stdHJhY2Ugd2hlbiBydW4td2Via2l0LXRlc3RzIGlzIHRlcm1p bmF0ZWQKKyAgICAgICAgb3Igc3RvcHBlZCB3aXRoIENOVFJMLUMgd2lsbCBtYWtlIHN1Y2ggaXNz dWVzIGVhc2llciB0byBkZWJ1Zy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9u L2ludGVydXB0X2RlYnVnZ2luZy5weTogQWRkZWQuCisgICAgICAgIChsb2dfc3RhY2tfdHJhY2Up OiBHaXZlbiBhIFB5dGhvbiBmcmFtZSBvYmplY3QsIGxvZyBhIHN0YWNrIHRyYWNlIHRvCisgICAg ICAgIHRoZSBwcm92aWRlZCBmaWxlLgorICAgICAgICAobG9nX3N0YWNrX3RyYWNlX29uX3Rlcm0p OiBBdHRhY2ggYSBsaXN0ZW5lciB0byBTSUdURVJNIHNvIHRoYXQgYQorICAgICAgICBzdGFjay10 cmFjZSBjYW4gYmUgbG9nZ2VkIHdoZW4gYSBwcm9ncmFtIGlzIHRlcm1pbmF0ZWQuCisgICAgICAg IChsb2dfc3RhY2tfdHJhY2Vfb25fY250cmxfYyk6IEF0dGFjaCBhIGxpc3RlbmVyIHRvIFNJR0lO VCBzbyB0aGF0IGEKKyAgICAgICAgc3RhY2stdHJhY2UgY2FuIGJlIGxvZ2dlZCB3aGVuIGEgcHJv Z3JhbSBpcyBDTlRSTC1DZWQuIAorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3J1bl93ZWJraXRfdGVzdHMucHk6CisgICAgICAgIChtYWluKTogU2V0IGhhbmRsZXJzIHRv IGxvZyBzdGFjayB0cmFjZSBvbiBpbnRlcnJ1cHRpb24uCisKIDIwMTctMDktMDYgIFlvc2hpYWtp IEppdHN1a2F3YSAgPFlvc2hpYWtpLkppdHN1a2F3YUBzb255LmNvbT4KIAogICAgICAgICBbV2lu XSBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9Qcmlvcml0eVF1ZXVlLmNwcCBmYWlscyB0 byBjb21waWxlIHdpdGggTVNWQyAyMDE1CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9pbnRlcnVwdF9kZWJ1Z2dpbmcucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vaW50ZXJ1cHRfZGVidWdnaW5nLnB5CShub25leGlzdGVudCkKKysrIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2ludGVydXB0X2RlYnVnZ2luZy5weQkod29ya2lu ZyBjb3B5KQpAQCAtMCwwICsxLDc1IEBACisjIENvcHlyaWdodCAoQykgMjAxNyBBcHBsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291 cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorIyBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyMgYXJl IG1ldDoKKyMgMS4gIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0 aGUgYWJvdmUgY29weXJpZ2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisjIDIuICBSZWRpc3RyaWJ1dGlvbnMgaW4g YmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorIyAgICAgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy IGluIHRoZQorIyAgICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3Zp ZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURF RCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJyBBTkQKKyMgQU5Z IEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRF RCBUTywgVEhFIElNUExJRUQKKyMgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJ VE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRQorIyBESVNDTEFJTUVELiBJTiBOTyBF VkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUgor IyBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBP UiBDT05TRVFVRU5USUFMCisjIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRP LCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SCisjIFNFUlZJQ0VTOyBMT1NTIE9G IFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVS CisjIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09O VFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksCisjIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNF IE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisjIE9GIFRI SVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBE QU1BR0UuCisKK2ltcG9ydCBsaW5lY2FjaGUKK2ltcG9ydCBsb2dnaW5nCitpbXBvcnQgc2lnbmFs CitpbXBvcnQgc3lzCisKK19sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKKworCitk ZWYgbG9nX3N0YWNrX3RyYWNlKGZyYW1lLCBmaWxlKToKKyAgICBmaWxlLndyaXRlKCdUcmFjZWJh Y2sobW9zdCByZWNlbnQgY2FsbCBsYXN0KTpcbicpCisKKyAgICBkZWYgZnVuYyhmcmFtZSk6Cisg ICAgICAgIGlmIG5vdCBmcmFtZToKKyAgICAgICAgICAgIHJldHVybgorICAgICAgICBmdW5jKGZy YW1lLmZfYmFjaykKKyAgICAgICAgZmlsZS53cml0ZSgnICBGaWxlICJ7fSIsIGxpbmUge30sIGlu IHt9XG4nLmZvcm1hdChmcmFtZS5mX2NvZGUuY29fZmlsZW5hbWUsIGZyYW1lLmZfbGluZW5vLCBm cmFtZS5mX2NvZGUuY29fbmFtZSkpCisgICAgICAgIGZpbGUud3JpdGUoJyAgICB7fVxuJy5mb3Jt YXQobGluZWNhY2hlLmdldGxpbmUoZnJhbWUuZl9jb2RlLmNvX2ZpbGVuYW1lLCBmcmFtZS5mX2xp bmVubykubHN0cmlwKCkucnN0cmlwKCkpKQorCisgICAgZnVuYyhmcmFtZSkKKworCitkZWYgbG9n X3N0YWNrX3RyYWNlX29uX3Rlcm0ob3V0cHV0X2ZpbGU9Tm9uZSk6CisgICAgZGVmIGhhbmRsZXIo c2lnbnVtLCBmcmFtZSk6CisgICAgICAgIGZpbGUgPSBvcGVuKG91dHB1dF9maWxlLCAndycpIGlm IG91dHB1dF9maWxlIGVsc2Ugc3lzLnN0ZGVycgorICAgICAgICBpZiBub3QgZmlsZToKKyAgICAg ICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcigne30gY2Fubm90IGJlIG9wZW5lZCcuZm9ybWF0KG91 dHB1dF9maWxlKSkKKworICAgICAgICBpZiBmaWxlIGlzIHN5cy5zdGRlcnI6CisgICAgICAgICAg ICBmaWxlLndyaXRlKCdcbicpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBfbG9nLmNyaXRp Y2FsKCdTdGFjayB0cmFjZSBzYXZlZCB0byB7fScuZm9ybWF0KG91dHB1dF9maWxlKSkKKyAgICAg ICAgZmlsZS53cml0ZSgnU0lHVEVSTSBzaWduYWwgcmVjZWl2ZWQnKQorICAgICAgICBsb2dfc3Rh Y2tfdHJhY2UoZnJhbWUsIGZpbGUpCisgICAgICAgIGV4aXQoLTEpCisKKyAgICBzaWduYWwuc2ln bmFsKHNpZ25hbC5TSUdURVJNLCBoYW5kbGVyKQorCisKK2RlZiBsb2dfc3RhY2tfdHJhY2Vfb25f Y250cmxfYyhvdXRwdXRfZmlsZT1Ob25lKToKKyAgICBkZWYgaGFuZGxlcihzaWdudW0sIGZyYW1l KToKKyAgICAgICAgZmlsZSA9IG9wZW4ob3V0cHV0X2ZpbGUsICd3JykgaWYgb3V0cHV0X2ZpbGUg ZWxzZSBzeXMuc3RkZXJyCisgICAgICAgIGlmIG5vdCBmaWxlOgorICAgICAgICAgICAgcmFpc2Ug UnVudGltZUVycm9yKCd7fSBjYW5ub3QgYmUgb3BlbmVkJy5mb3JtYXQob3V0cHV0X2ZpbGUpKQor CisgICAgICAgIGlmIGZpbGUgaXMgc3lzLnN0ZGVycjoKKyAgICAgICAgICAgIGZpbGUud3JpdGUo J1xuJykKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIF9sb2cuY3JpdGljYWwoJ1N0YWNrIHRy YWNlIHNhdmVkIHRvIHt9Jy5mb3JtYXQob3V0cHV0X2ZpbGUpKQorICAgICAgICBmaWxlLndyaXRl KCdjbnRybCBDIHJlY2VpdmVkXG4nKQorICAgICAgICBsb2dfc3RhY2tfdHJhY2UoZnJhbWUsIGZp bGUpCisgICAgICAgIHJhaXNlIEtleWJvYXJkSW50ZXJydXB0CisKKyAgICBzaWduYWwuc2lnbmFs KHNpZ25hbC5TSUdJTlQsIGhhbmRsZXIpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkJKHJldmlzaW9uIDIy MTY2OSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRf dGVzdHMucHkJKHdvcmtpbmcgY29weSkKQEAgLTM1LDYgKzM1LDcgQEAgaW1wb3J0IHN5cwogaW1w b3J0IHRyYWNlYmFjawogCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5ob3N0IGltcG9ydCBIb3N0Citm cm9tIHdlYmtpdHB5LmNvbW1vbi5pbnRlcnVwdF9kZWJ1Z2dpbmcgaW1wb3J0IGxvZ19zdGFja190 cmFjZV9vbl9jbnRybF9jLCBsb2dfc3RhY2tfdHJhY2Vfb25fdGVybQogZnJvbSB3ZWJraXRweS5s YXlvdXRfdGVzdHMuY29udHJvbGxlcnMubWFuYWdlciBpbXBvcnQgTWFuYWdlcgogZnJvbSB3ZWJr aXRweS5sYXlvdXRfdGVzdHMubW9kZWxzLnRlc3RfcnVuX3Jlc3VsdHMgaW1wb3J0IElOVEVSUlVQ VEVEX0VYSVRfU1RBVFVTCiBmcm9tIHdlYmtpdHB5LnBvcnQgaW1wb3J0IGNvbmZpZ3VyYXRpb25f b3B0aW9ucywgcGxhdGZvcm1fb3B0aW9ucwpAQCAtNzMsNiArNzQsMTAgQEAgZGVmIG1haW4oYXJn diwgc3Rkb3V0LCBzdGRlcnIpOgogICAgICAgICBwcmludCA+PiBzdGRlcnIsIHN0cihlKQogICAg ICAgICByZXR1cm4gRVhDRVBUSU9OQUxfRVhJVF9TVEFUVVMKIAorICAgIHN0YWNrX3RyYWNlX3Bh dGggPSBob3N0LmZpbGVzeXN0ZW0uam9pbihwb3J0LnJlc3VsdHNfZGlyZWN0b3J5KCksICdweXRo b25fc3RhY2tfdHJhY2UudHh0JykKKyAgICBsb2dfc3RhY2tfdHJhY2Vfb25fY250cmxfYyhvdXRw dXRfZmlsZT1zdGFja190cmFjZV9wYXRoKQorICAgIGxvZ19zdGFja190cmFjZV9vbl90ZXJtKG91 dHB1dF9maWxlPXN0YWNrX3RyYWNlX3BhdGgpCisKICAgICBpZiBvcHRpb25zLnByaW50X2V4cGVj dGF0aW9uczoKICAgICAgICAgcmV0dXJuIF9wcmludF9leHBlY3RhdGlvbnMocG9ydCwgb3B0aW9u cywgYXJncywgc3RkZXJyKQogCg== 327187 2017-11-17 09:48:23 -0800 2019-04-08 16:30:03 -0700 Patch bug-176393-20171117094822.patch text/plain 6067 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyNDk2NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI1IEBACisyMDE3LTExLTE3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBMb2cgc3RhY2stdHJhY2UgZm9yIHJ1bi13ZWJraXQtdGVzdHMgd2hlbiBp bnRlcnJ1cHRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTc2MzkzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNDI2MjMxMD4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHJ1bi13ZWJraXQtdGVz dHMgaXMgc3R1Y2ssIGl0IGlzIGRpZmZpY3VsdCB0byBpbW1lZGlhdGVseSB0ZWxsCisgICAgICAg IHdoeS4gU2F2aW5nIGEgc3RhY2stdHJhY2Ugd2hlbiBydW4td2Via2l0LXRlc3RzIGlzIHRlcm1p bmF0ZWQKKyAgICAgICAgb3Igc3RvcHBlZCB3aXRoIENOVFJMLUMgd2lsbCBtYWtlIHN1Y2ggaXNz dWVzIGVhc2llciB0byBkZWJ1Zy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9u L2ludGVydXB0X2RlYnVnZ2luZy5weTogQWRkZWQuCisgICAgICAgIChsb2dfc3RhY2tfdHJhY2Up OiBHaXZlbiBhIFB5dGhvbiBmcmFtZSBvYmplY3QsIGxvZyBhIHN0YWNrIHRyYWNlIHRvCisgICAg ICAgIHRoZSBwcm92aWRlZCBmaWxlLgorICAgICAgICAobG9nX3N0YWNrX3RyYWNlX29uX3Rlcm0p OiBBdHRhY2ggYSBsaXN0ZW5lciB0byBTSUdURVJNIHNvIHRoYXQgYQorICAgICAgICBzdGFjay10 cmFjZSBjYW4gYmUgbG9nZ2VkIHdoZW4gYSBwcm9ncmFtIGlzIHRlcm1pbmF0ZWQuCisgICAgICAg IChsb2dfc3RhY2tfdHJhY2Vfb25fY250cmxfYyk6IEF0dGFjaCBhIGxpc3RlbmVyIHRvIFNJR0lO VCBzbyB0aGF0IGEKKyAgICAgICAgc3RhY2stdHJhY2UgY2FuIGJlIGxvZ2dlZCB3aGVuIGEgcHJv Z3JhbSBpcyBDTlRSTC1DZWQuIAorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3J1bl93ZWJraXRfdGVzdHMucHk6CisgICAgICAgIChtYWluKTogU2V0IGhhbmRsZXJzIHRv IGxvZyBzdGFjayB0cmFjZSBvbiBpbnRlcnJ1cHRpb24uCisKIDIwMTctMTEtMTYgIERvbiBPbG1z dGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNvbT4KIAogICAgICAgICBbV2luQ2Fpcm9dIFVwZGF0 ZSBXaW5DYWlyb1JlcXVpcmVtZW50cwpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vaW50ZXJ1cHRfZGVidWdnaW5nLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL2ludGVydXB0X2RlYnVnZ2luZy5weQkobm9uZXhpc3RlbnQpCisrKyBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9pbnRlcnVwdF9kZWJ1Z2dpbmcucHkJKHdvcmtpbmcg Y29weSkKQEAgLTAsMCArMSw3OCBAQAorIyBDb3B5cmlnaHQgKEMpIDIwMTcgQXBwbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgorIworIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBhcmUg cGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisjIGFyZSBt ZXQ6CisjIDEuICBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhl IGFib3ZlIGNvcHlyaWdodAorIyAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorIyAyLiAgUmVkaXN0cmlidXRpb25zIGluIGJp bmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgIG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBp biB0aGUKKyMgICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRl ZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisjCisjIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQg QlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycgQU5ECisjIEFOWSBF WFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQg VE8sIFRIRSBJTVBMSUVECisjIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRO RVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUKKyMgRElTQ0xBSU1FRC4gSU4gTk8gRVZF TlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IKKyMg QU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1Ig Q09OU0VRVUVOVElBTAorIyBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywg UFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUgorIyBTRVJWSUNFUzsgTE9TUyBPRiBV U0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUgor IyBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRS QUNULCBTVFJJQ1QgTElBQklMSVRZLAorIyBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBP UiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBPRiBUSElT IFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFN QUdFLgorCitpbXBvcnQgb3MKK2ltcG9ydCBsaW5lY2FjaGUKK2ltcG9ydCBsb2dnaW5nCitpbXBv cnQgc2lnbmFsCitpbXBvcnQgc3lzCisKK19sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVf XykKKworCitkZWYgbG9nX3N0YWNrX3RyYWNlKGZyYW1lLCBmaWxlKToKKyAgICBmaWxlLndyaXRl KCdUcmFjZWJhY2sobW9zdCByZWNlbnQgY2FsbCBsYXN0KTpcbicpCisKKyAgICBkZWYgZnVuYyhm cmFtZSk6CisgICAgICAgIGlmIG5vdCBmcmFtZToKKyAgICAgICAgICAgIHJldHVybgorICAgICAg ICBmdW5jKGZyYW1lLmZfYmFjaykKKyAgICAgICAgZmlsZS53cml0ZSgnICBGaWxlICJ7fSIsIGxp bmUge30sIGluIHt9XG4nLmZvcm1hdChmcmFtZS5mX2NvZGUuY29fZmlsZW5hbWUsIGZyYW1lLmZf bGluZW5vLCBmcmFtZS5mX2NvZGUuY29fbmFtZSkpCisgICAgICAgIGZpbGUud3JpdGUoJyAgICB7 fVxuJy5mb3JtYXQobGluZWNhY2hlLmdldGxpbmUoZnJhbWUuZl9jb2RlLmNvX2ZpbGVuYW1lLCBm cmFtZS5mX2xpbmVubykubHN0cmlwKCkucnN0cmlwKCkpKQorCisgICAgZnVuYyhmcmFtZSkKKwor CitkZWYgbG9nX3N0YWNrX3RyYWNlX29uX3Rlcm0ob3V0cHV0X2ZpbGU9Tm9uZSk6CisgICAgZGVm IGhhbmRsZXIoc2lnbnVtLCBmcmFtZSk6CisgICAgICAgIGZpbGVfbmFtZSA9IG9zLnBhdGguam9p bihvcy5wYXRoLmRpcm5hbWUob3V0cHV0X2ZpbGUpLCAne30te30nLmZvcm1hdChvcy5nZXRwaWQo KSwgb3MucGF0aC5iYXNlbmFtZShvdXRwdXRfZmlsZSkpKSBpZiBvdXRwdXRfZmlsZSBlbHNlIE5v bmUKKyAgICAgICAgZmlsZSA9IG9wZW4oZmlsZV9uYW1lLCAndycpIGlmIGZpbGVfbmFtZSBlbHNl IHN5cy5zdGRlcnIKKyAgICAgICAgaWYgbm90IGZpbGU6CisgICAgICAgICAgICByYWlzZSBSdW50 aW1lRXJyb3IoJ3t9IGNhbm5vdCBiZSBvcGVuZWQnLmZvcm1hdChmaWxlX25hbWUpKQorCisgICAg ICAgIGlmIGZpbGUgaXMgc3lzLnN0ZGVycjoKKyAgICAgICAgICAgIGZpbGUud3JpdGUoJ1xuJykK KyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIF9sb2cuY3JpdGljYWwoJ1N0YWNrIHRyYWNlIHNh dmVkIHRvIHt9Jy5mb3JtYXQoZmlsZV9uYW1lKSkKKyAgICAgICAgZmlsZS53cml0ZSgnU0lHVEVS TSBzaWduYWwgcmVjZWl2ZWQnKQorICAgICAgICBsb2dfc3RhY2tfdHJhY2UoZnJhbWUsIGZpbGUp CisgICAgICAgIGV4aXQoLTEpCisKKyAgICBzaWduYWwuc2lnbmFsKHNpZ25hbC5TSUdURVJNLCBo YW5kbGVyKQorCisKK2RlZiBsb2dfc3RhY2tfdHJhY2Vfb25fY250cmxfYyhvdXRwdXRfZmlsZT1O b25lKToKKyAgICBkZWYgaGFuZGxlcihzaWdudW0sIGZyYW1lKToKKyAgICAgICAgZmlsZV9uYW1l ID0gb3MucGF0aC5qb2luKG9zLnBhdGguZGlybmFtZShvdXRwdXRfZmlsZSksICd7fS17fScuZm9y bWF0KG9zLmdldHBpZCgpLCBvcy5wYXRoLmJhc2VuYW1lKG91dHB1dF9maWxlKSkpIGlmIG91dHB1 dF9maWxlIGVsc2UgTm9uZQorICAgICAgICBmaWxlID0gb3BlbihmaWxlX25hbWUsICd3JykgaWYg ZmlsZV9uYW1lIGVsc2Ugc3lzLnN0ZGVycgorICAgICAgICBpZiBub3QgZmlsZToKKyAgICAgICAg ICAgIHJhaXNlIFJ1bnRpbWVFcnJvcigne30gY2Fubm90IGJlIG9wZW5lZCcuZm9ybWF0KGZpbGVf bmFtZSkpCisKKyAgICAgICAgaWYgZmlsZSBpcyBzeXMuc3RkZXJyOgorICAgICAgICAgICAgZmls ZS53cml0ZSgnXG4nKQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgX2xvZy5jcml0aWNhbCgn U3RhY2sgdHJhY2Ugc2F2ZWQgdG8ge30nLmZvcm1hdChmaWxlX25hbWUpKQorICAgICAgICBmaWxl LndyaXRlKCdjbnRybCBDIHJlY2VpdmVkXG4nKQorICAgICAgICBsb2dfc3RhY2tfdHJhY2UoZnJh bWUsIGZpbGUpCisgICAgICAgIHJhaXNlIEtleWJvYXJkSW50ZXJydXB0CisKKyAgICBzaWduYWwu c2lnbmFsKHNpZ25hbC5TSUdJTlQsIGhhbmRsZXIpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkJKHJldmlz aW9uIDIyNDk2NykKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93 ZWJraXRfdGVzdHMucHkJKHdvcmtpbmcgY29weSkKQEAgLTM1LDYgKzM1LDcgQEAgaW1wb3J0IHN5 cwogaW1wb3J0IHRyYWNlYmFjawogCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5ob3N0IGltcG9ydCBI b3N0Citmcm9tIHdlYmtpdHB5LmNvbW1vbi5pbnRlcnVwdF9kZWJ1Z2dpbmcgaW1wb3J0IGxvZ19z dGFja190cmFjZV9vbl9jbnRybF9jLCBsb2dfc3RhY2tfdHJhY2Vfb25fdGVybQogZnJvbSB3ZWJr aXRweS5sYXlvdXRfdGVzdHMuY29udHJvbGxlcnMubWFuYWdlciBpbXBvcnQgTWFuYWdlcgogZnJv bSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzLnRlc3RfcnVuX3Jlc3VsdHMgaW1wb3J0IElO VEVSUlVQVEVEX0VYSVRfU1RBVFVTCiBmcm9tIHdlYmtpdHB5LnBvcnQgaW1wb3J0IGNvbmZpZ3Vy YXRpb25fb3B0aW9ucywgcGxhdGZvcm1fb3B0aW9ucwpAQCAtNzMsNiArNzQsMTAgQEAgZGVmIG1h aW4oYXJndiwgc3Rkb3V0LCBzdGRlcnIpOgogICAgICAgICBwcmludCA+PiBzdGRlcnIsIHN0cihl KQogICAgICAgICByZXR1cm4gRVhDRVBUSU9OQUxfRVhJVF9TVEFUVVMKIAorICAgIHN0YWNrX3Ry YWNlX3BhdGggPSBob3N0LmZpbGVzeXN0ZW0uam9pbihwb3J0LnJlc3VsdHNfZGlyZWN0b3J5KCks ICdweXRob25fc3RhY2tfdHJhY2UudHh0JykKKyAgICBsb2dfc3RhY2tfdHJhY2Vfb25fY250cmxf YyhvdXRwdXRfZmlsZT1zdGFja190cmFjZV9wYXRoKQorICAgIGxvZ19zdGFja190cmFjZV9vbl90 ZXJtKG91dHB1dF9maWxlPXN0YWNrX3RyYWNlX3BhdGgpCisKICAgICBpZiBvcHRpb25zLnByaW50 X2V4cGVjdGF0aW9uczoKICAgICAgICAgcmV0dXJuIF9wcmludF9leHBlY3RhdGlvbnMocG9ydCwg b3B0aW9ucywgYXJncywgc3RkZXJyKQogCg== 366996 2019-04-08 16:30:04 -0700 2019-04-08 16:56:16 -0700 Patch bug-176393-20190408162959.patch text/plain 6323 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NDA1NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDE5LTA0LTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBMb2cgc3RhY2stdHJhY2UgZm9yIHJ1bi13ZWJraXQtdGVzdHMgd2hlbiBp bnRlcnJ1cHRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTc2MzkzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNDI2MjMxMD4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv Y29tbW9uL2ludGVydXB0X2RlYnVnZ2luZy5weTogQWRkZWQuCisgICAgICAgIChsb2dfc3RhY2tf dHJhY2UpOiBHaXZlbiBhIFB5dGhvbiBmcmFtZSBvYmplY3QsIGxvZyBhIHN0YWNrIHRyYWNlIHRv IHRoZSBwcm92aWRlZCBmaWxlLgorICAgICAgICAoU3RhY2tUcmFjZUZpbGVDb250ZXh0KTogQ29u dGV4dCB3aGljaCBhbGxvd3Mgc3RhY2stdHJhY2VzIHRvIGJlIHByaW50ZWQgdG8gc3RkZXJyIG9y IHRvIGEgZmlsZS4gCisgICAgICAgIChsb2dfc3RhY2tfdHJhY2Vfb25fdGVybSk6IEF0dGFjaCBh IGxpc3RlbmVyIHRvIFNJR1RFUk0gc28gdGhhdCBhIHN0YWNrLXRyYWNlIGNhbiBiZSBsb2dnZWQg d2hlbiBhIHByb2dyYW0gaXMgdGVybWluYXRlZC4KKyAgICAgICAgKGxvZ19zdGFja190cmFjZV9v bl9jdHJsX2MpOiBBdHRhY2ggYSBsaXN0ZW5lciB0byBTSUdJTlQgc28gdGhhdCBhIHN0YWNrLXRy YWNlIGNhbiBiZSBsb2dnZWQgd2hlbiBhIHByb2dyYW0gaXMgQ1RSTCtDZWQuIAorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHk6CisgICAg ICAgIChtYWluKTogU2V0IGhhbmRsZXJzIHRvIGxvZyBzdGFjayB0cmFjZSBvbiBpbnRlcnJ1cHRp b24uCisKIDIwMTktMDQtMDggIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+ CiAKICAgICAgICAgW2lPU10gRG8gbm90IGFsbG93IHN0YXJ0aW5nIHNlbGVjdGlvbiBkcmFncyB3 aGVuIHNlbGVjdGlvbiB2aWV3cyBhcmUgbm90IHZpc2libGUKSW5kZXg6IFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2ludGVydXB0X2RlYnVnZ2luZy5weQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9pbnRlcnVwdF9kZWJ1Z2dpbmcucHkJKG5vbmV4aXN0 ZW50KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vaW50ZXJ1cHRfZGVidWdnaW5n LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsODUgQEAKKyMgQ29weXJpZ2h0IChDKSAyMDE5 IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMKKyMgUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlm aWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0 aW9ucworIyBhcmUgbWV0OgorIyAxLiAgUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11 c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgIG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMgMi4gIFJlZGlzdHJp YnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0 CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIgaW4gdGhlCisjICAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRl cmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorIworIyBUSElTIFNPRlRXQVJF IElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycn IEFORAorIyBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVU IE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAorIyBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJ TElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFCisjIERJU0NMQUlN RUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUyBCRSBM SUFCTEUgRk9SCisjIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBF WEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwKKyMgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9U IExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IKKyMgU0VSVklD RVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJ T04pIEhPV0VWRVIKKyMgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hF VEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwKKyMgT1IgVE9SVCAoSU5DTFVESU5H IE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBV U0UKKyMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElU WSBPRiBTVUNIIERBTUFHRS4KKworaW1wb3J0IG9zCitpbXBvcnQgbGluZWNhY2hlCitpbXBvcnQg bG9nZ2luZworaW1wb3J0IHNpZ25hbAoraW1wb3J0IHN5cworCitfbG9nID0gbG9nZ2luZy5nZXRM b2dnZXIoX19uYW1lX18pCisKKworZGVmIGxvZ19zdGFja190cmFjZShmcmFtZSwgZmlsZSk6Cisg ICAgZmlsZS53cml0ZSgnVHJhY2ViYWNrKG1vc3QgcmVjZW50IGNhbGwgbGFzdCk6XG4nKQorCisg ICAgZGVmIGZ1bmMoZnJhbWUpOgorICAgICAgICBpZiBub3QgZnJhbWU6CisgICAgICAgICAgICBy ZXR1cm4KKyAgICAgICAgZnVuYyhmcmFtZS5mX2JhY2spCisgICAgICAgIGZpbGUud3JpdGUoJyAg RmlsZSAie30iLCBsaW5lIHt9LCBpbiB7fVxuJy5mb3JtYXQoZnJhbWUuZl9jb2RlLmNvX2ZpbGVu YW1lLCBmcmFtZS5mX2xpbmVubywgZnJhbWUuZl9jb2RlLmNvX25hbWUpKQorICAgICAgICBmaWxl LndyaXRlKCcgICAge31cbicuZm9ybWF0KGxpbmVjYWNoZS5nZXRsaW5lKGZyYW1lLmZfY29kZS5j b19maWxlbmFtZSwgZnJhbWUuZl9saW5lbm8pLmxzdHJpcCgpLnJzdHJpcCgpKSkKKworICAgIGZ1 bmMoZnJhbWUpCisKKworY2xhc3MgU3RhY2tUcmFjZUZpbGVDb250ZXh0KG9iamVjdCk6CisgICAg ZGVmIF9faW5pdF9fKHNlbGYsIG91dHB1dF9maWxlPU5vbmUpOgorICAgICAgICBzZWxmLmZpbGVf bmFtZSA9IE5vbmUKKyAgICAgICAgaWYgb3V0cHV0X2ZpbGU6CisgICAgICAgICAgICBzZWxmLmZp bGVfbmFtZSA9IG9zLnBhdGguam9pbihvcy5wYXRoLmRpcm5hbWUob3V0cHV0X2ZpbGUpLCAne30t e30nLmZvcm1hdChvcy5nZXRwaWQoKSwgb3MucGF0aC5iYXNlbmFtZShvdXRwdXRfZmlsZSkpKQor ICAgICAgICBzZWxmLmZpbGUgPSBzeXMuc3RkZXJyCisKKyAgICBkZWYgX19lbnRlcl9fKHNlbGYp OgorICAgICAgICBpZiBzZWxmLmZpbGVfbmFtZToKKyAgICAgICAgICAgIHNlbGYuZmlsZSA9IG9w ZW4oc2VsZi5maWxlX25hbWUsICd3JykKKyAgICAgICAgICAgIF9sb2cuY3JpdGljYWwoJ1N0YWNr IHRyYWNlIHNhdmVkIHRvIHt9Jy5mb3JtYXQoc2VsZi5maWxlX25hbWUpKQorICAgICAgICBlbHNl OgorICAgICAgICAgICAgc2VsZi5maWxlLndyaXRlKCdcbicpCisgICAgICAgIHJldHVybiBzZWxm LmZpbGUKKworICAgIGRlZiBfX2V4aXRfXyhzZWxmLCAqYXJncyk6CisgICAgICAgIGlmIHNlbGYu ZmlsZV9uYW1lOgorICAgICAgICAgICAgc2VsZi5maWxlLmNsb3NlKCkKKyAgICAgICAgc2VsZi5m aWxlID0gc3lzLnN0ZGVycgorCisKK2RlZiBsb2dfc3RhY2tfdHJhY2Vfb25fdGVybShvdXRwdXRf ZmlsZT1Ob25lKToKKyAgICBkZWYgaGFuZGxlcihzaWdudW0sIGZyYW1lKToKKyAgICAgICAgd2l0 aCBTdGFja1RyYWNlRmlsZUNvbnRleHQob3V0cHV0X2ZpbGU9b3V0cHV0X2ZpbGUpIGFzIGZpbGU6 CisgICAgICAgICAgICBmaWxlLndyaXRlKCdTSUdURVJNIHNpZ25hbCByZWNlaXZlZCcpCisgICAg ICAgICAgICBsb2dfc3RhY2tfdHJhY2UoZnJhbWUsIGZpbGUpCisKKyAgICAgICAgZXhpdCgtMSkK KworICAgIHNpZ25hbC5zaWduYWwoc2lnbmFsLlNJR1RFUk0sIGhhbmRsZXIpCisKKworZGVmIGxv Z19zdGFja190cmFjZV9vbl9jdHJsX2Mob3V0cHV0X2ZpbGU9Tm9uZSk6CisgICAgZGVmIGhhbmRs ZXIoc2lnbnVtLCBmcmFtZSk6CisgICAgICAgIHdpdGggU3RhY2tUcmFjZUZpbGVDb250ZXh0KG91 dHB1dF9maWxlPW91dHB1dF9maWxlKSBhcyBmaWxlOgorICAgICAgICAgICAgZmlsZS53cml0ZSgn Q1RSTCtDIHJlY2VpdmVkXG4nKQorICAgICAgICAgICAgbG9nX3N0YWNrX3RyYWNlKGZyYW1lLCBm aWxlKQorCisgICAgICAgIHJhaXNlIEtleWJvYXJkSW50ZXJydXB0CisKKyAgICBzaWduYWwuc2ln bmFsKHNpZ25hbC5TSUdJTlQsIGhhbmRsZXIpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkJKHJldmlzaW9u IDI0NDA1NikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJr aXRfdGVzdHMucHkJKHdvcmtpbmcgY29weSkKQEAgLTEsNiArMSw2IEBACiAjIENvcHlyaWdodCAo QykgMjAxMCBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIyBDb3B5cmlnaHQgKEMp IDIwMTAgR2Fib3IgUmFwY3NhbnlpIChyZ2Fib3JAaW5mLnUtc3plZ2VkLmh1KSwgVW5pdmVyc2l0 eSBvZiBTemVnZWQKLSMgQ29weXJpZ2h0IChDKSAyMDExLCAyMDE2IEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDExLCAyMDE2LCAyMDE5IEFwcGxlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBz b3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwg YXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUK QEAgLTM2LDYgKzM2LDcgQEAgaW1wb3J0IHN5cwogaW1wb3J0IHRyYWNlYmFjawogCiBmcm9tIHdl YmtpdHB5LmNvbW1vbi5ob3N0IGltcG9ydCBIb3N0Citmcm9tIHdlYmtpdHB5LmNvbW1vbi5pbnRl cnVwdF9kZWJ1Z2dpbmcgaW1wb3J0IGxvZ19zdGFja190cmFjZV9vbl9jdHJsX2MsIGxvZ19zdGFj a190cmFjZV9vbl90ZXJtCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5jb250cm9sbGVycy5t YW5hZ2VyIGltcG9ydCBNYW5hZ2VyCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5tb2RlbHMu dGVzdF9ydW5fcmVzdWx0cyBpbXBvcnQgSU5URVJSVVBURURfRVhJVF9TVEFUVVMKIGZyb20gd2Vi a2l0cHkucG9ydCBpbXBvcnQgY29uZmlndXJhdGlvbl9vcHRpb25zLCBwbGF0Zm9ybV9vcHRpb25z CkBAIC03NSw2ICs3NiwxMCBAQCBkZWYgbWFpbihhcmd2LCBzdGRvdXQsIHN0ZGVycik6CiAgICAg ICAgIHByaW50KHN0cihlKSwgZmlsZT1zdGRlcnIpCiAgICAgICAgIHJldHVybiBFWENFUFRJT05B TF9FWElUX1NUQVRVUwogCisgICAgc3RhY2tfdHJhY2VfcGF0aCA9IGhvc3QuZmlsZXN5c3RlbS5q b2luKHBvcnQucmVzdWx0c19kaXJlY3RvcnkoKSwgJ3B5dGhvbl9zdGFja190cmFjZS50eHQnKQor ICAgIGxvZ19zdGFja190cmFjZV9vbl9jdHJsX2Mob3V0cHV0X2ZpbGU9c3RhY2tfdHJhY2VfcGF0 aCkKKyAgICBsb2dfc3RhY2tfdHJhY2Vfb25fdGVybShvdXRwdXRfZmlsZT1zdGFja190cmFjZV9w YXRoKQorCiAgICAgaWYgb3B0aW9ucy5wcmludF9leHBlY3RhdGlvbnM6CiAgICAgICAgIHJldHVy biBfcHJpbnRfZXhwZWN0YXRpb25zKHBvcnQsIG9wdGlvbnMsIGFyZ3MsIHN0ZGVycikKIAo= 366999 2019-04-08 16:56:17 -0700 2019-04-08 17:00:25 -0700 Patch bug-176393-20190408165612.patch text/plain 6324 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NDA1NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDE5LTA0LTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBMb2cgc3RhY2stdHJhY2UgZm9yIHJ1bi13ZWJraXQtdGVzdHMgd2hlbiBp bnRlcnJ1cHRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTc2MzkzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNDI2MjMxMD4KKworICAgICAgICBS ZXZpZXdlZCBieSBMdWNhcyBGb3JzY2hsZXIuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9pbnRlcnVwdF9kZWJ1Z2dpbmcucHk6IEFkZGVkLgorICAgICAgICAobG9nX3N0YWNr X3RyYWNlKTogR2l2ZW4gYSBQeXRob24gZnJhbWUgb2JqZWN0LCBsb2cgYSBzdGFjayB0cmFjZSB0 byB0aGUgcHJvdmlkZWQgZmlsZS4KKyAgICAgICAgKFN0YWNrVHJhY2VGaWxlQ29udGV4dCk6IENv bnRleHQgd2hpY2ggYWxsb3dzIHN0YWNrLXRyYWNlcyB0byBiZSBwcmludGVkIHRvIHN0ZGVyciBv ciB0byBhIGZpbGUuIAorICAgICAgICAobG9nX3N0YWNrX3RyYWNlX29uX3Rlcm0pOiBBdHRhY2gg YSBsaXN0ZW5lciB0byBTSUdURVJNIHNvIHRoYXQgYSBzdGFjay10cmFjZSBjYW4gYmUgbG9nZ2Vk IHdoZW4gYSBwcm9ncmFtIGlzIHRlcm1pbmF0ZWQuCisgICAgICAgIChsb2dfc3RhY2tfdHJhY2Vf b25fY3RybF9jKTogQXR0YWNoIGEgbGlzdGVuZXIgdG8gU0lHSU5UIHNvIHRoYXQgYSBzdGFjay10 cmFjZSBjYW4gYmUgbG9nZ2VkIHdoZW4gYSBwcm9ncmFtIGlzIENUUkwrQ2VkLiAKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorICAg ICAgICAobWFpbik6IFNldCBoYW5kbGVycyB0byBsb2cgc3RhY2sgdHJhY2Ugb24gaW50ZXJydXB0 aW9uLgorCiAyMDE5LTA0LTA4ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29t PgogCiAgICAgICAgIFtpT1NdIERvIG5vdCBhbGxvdyBzdGFydGluZyBzZWxlY3Rpb24gZHJhZ3Mg d2hlbiBzZWxlY3Rpb24gdmlld3MgYXJlIG5vdCB2aXNpYmxlCkluZGV4OiBUb29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9pbnRlcnVwdF9kZWJ1Z2dpbmcucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vaW50ZXJ1cHRfZGVidWdnaW5nLnB5CShub25leGlz dGVudCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2ludGVydXB0X2RlYnVnZ2lu Zy5weQkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDg1IEBACisjIENvcHlyaWdodCAoQykgMjAx OSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlzdHJpYnV0aW9uIGFu ZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorIyBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMKKyMgYXJlIG1ldDoKKyMgMS4gIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBt dXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisjIDIuICBSZWRpc3Ry aWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdo dAorIyAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyIGluIHRoZQorIyAgICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0 ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyMKKyMgVEhJUyBTT0ZUV0FS RSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMn JyBBTkQKKyMgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywgVEhFIElNUExJRUQKKyMgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFC SUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRQorIyBESVNDTEFJ TUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMgQkUg TElBQkxFIEZPUgorIyBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwg RVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMCisjIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5P VCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SCisjIFNFUlZJ Q0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBU SU9OKSBIT1dFVkVSCisjIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdI RVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksCisjIE9SIFRPUlQgKElOQ0xVRElO RyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUg VVNFCisjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJ VFkgT0YgU1VDSCBEQU1BR0UuCisKK2ltcG9ydCBsaW5lY2FjaGUKK2ltcG9ydCBsb2dnaW5nCitp bXBvcnQgb3MKK2ltcG9ydCBzaWduYWwKK2ltcG9ydCBzeXMKKworX2xvZyA9IGxvZ2dpbmcuZ2V0 TG9nZ2VyKF9fbmFtZV9fKQorCisKK2RlZiBsb2dfc3RhY2tfdHJhY2UoZnJhbWUsIGZpbGUpOgor ICAgIGZpbGUud3JpdGUoJ1RyYWNlYmFjayhtb3N0IHJlY2VudCBjYWxsIGxhc3QpOlxuJykKKwor ICAgIGRlZiBmdW5jKGZyYW1lKToKKyAgICAgICAgaWYgbm90IGZyYW1lOgorICAgICAgICAgICAg cmV0dXJuCisgICAgICAgIGZ1bmMoZnJhbWUuZl9iYWNrKQorICAgICAgICBmaWxlLndyaXRlKCcg IEZpbGUgInt9IiwgbGluZSB7fSwgaW4ge31cbicuZm9ybWF0KGZyYW1lLmZfY29kZS5jb19maWxl bmFtZSwgZnJhbWUuZl9saW5lbm8sIGZyYW1lLmZfY29kZS5jb19uYW1lKSkKKyAgICAgICAgZmls ZS53cml0ZSgnICAgIHt9XG4nLmZvcm1hdChsaW5lY2FjaGUuZ2V0bGluZShmcmFtZS5mX2NvZGUu Y29fZmlsZW5hbWUsIGZyYW1lLmZfbGluZW5vKS5sc3RyaXAoKS5yc3RyaXAoKSkpCisKKyAgICBm dW5jKGZyYW1lKQorCisKK2NsYXNzIFN0YWNrVHJhY2VGaWxlQ29udGV4dChvYmplY3QpOgorICAg IGRlZiBfX2luaXRfXyhzZWxmLCBvdXRwdXRfZmlsZT1Ob25lKToKKyAgICAgICAgc2VsZi5maWxl X25hbWUgPSBOb25lCisgICAgICAgIGlmIG91dHB1dF9maWxlOgorICAgICAgICAgICAgc2VsZi5m aWxlX25hbWUgPSBvcy5wYXRoLmpvaW4ob3MucGF0aC5kaXJuYW1lKG91dHB1dF9maWxlKSwgJ3t9 LXt9Jy5mb3JtYXQob3MuZ2V0cGlkKCksIG9zLnBhdGguYmFzZW5hbWUob3V0cHV0X2ZpbGUpKSkK KyAgICAgICAgc2VsZi5maWxlID0gc3lzLnN0ZGVycgorCisgICAgZGVmIF9fZW50ZXJfXyhzZWxm KToKKyAgICAgICAgaWYgc2VsZi5maWxlX25hbWU6CisgICAgICAgICAgICBzZWxmLmZpbGUgPSBv cGVuKHNlbGYuZmlsZV9uYW1lLCAndycpCisgICAgICAgICAgICBfbG9nLmNyaXRpY2FsKCdTdGFj ayB0cmFjZSBzYXZlZCB0byB7fScuZm9ybWF0KHNlbGYuZmlsZV9uYW1lKSkKKyAgICAgICAgZWxz ZToKKyAgICAgICAgICAgIHNlbGYuZmlsZS53cml0ZSgnXG4nKQorICAgICAgICByZXR1cm4gc2Vs Zi5maWxlCisKKyAgICBkZWYgX19leGl0X18oc2VsZiwgKmFyZ3MpOgorICAgICAgICBpZiBzZWxm LmZpbGVfbmFtZToKKyAgICAgICAgICAgIHNlbGYuZmlsZS5jbG9zZSgpCisgICAgICAgIHNlbGYu ZmlsZSA9IHN5cy5zdGRlcnIKKworCitkZWYgbG9nX3N0YWNrX3RyYWNlX29uX3Rlcm0ob3V0cHV0 X2ZpbGU9Tm9uZSk6CisgICAgZGVmIGhhbmRsZXIoc2lnbnVtLCBmcmFtZSk6CisgICAgICAgIHdp dGggU3RhY2tUcmFjZUZpbGVDb250ZXh0KG91dHB1dF9maWxlPW91dHB1dF9maWxlKSBhcyBmaWxl OgorICAgICAgICAgICAgZmlsZS53cml0ZSgnU0lHVEVSTSBzaWduYWwgcmVjZWl2ZWQnKQorICAg ICAgICAgICAgbG9nX3N0YWNrX3RyYWNlKGZyYW1lLCBmaWxlKQorCisgICAgICAgIGV4aXQoLTEp CisKKyAgICBzaWduYWwuc2lnbmFsKHNpZ25hbC5TSUdURVJNLCBoYW5kbGVyKQorCisKK2RlZiBs b2dfc3RhY2tfdHJhY2Vfb25fY3RybF9jKG91dHB1dF9maWxlPU5vbmUpOgorICAgIGRlZiBoYW5k bGVyKHNpZ251bSwgZnJhbWUpOgorICAgICAgICB3aXRoIFN0YWNrVHJhY2VGaWxlQ29udGV4dChv dXRwdXRfZmlsZT1vdXRwdXRfZmlsZSkgYXMgZmlsZToKKyAgICAgICAgICAgIGZpbGUud3JpdGUo J0NUUkwrQyByZWNlaXZlZFxuJykKKyAgICAgICAgICAgIGxvZ19zdGFja190cmFjZShmcmFtZSwg ZmlsZSkKKworICAgICAgICByYWlzZSBLZXlib2FyZEludGVycnVwdAorCisgICAgc2lnbmFsLnNp Z25hbChzaWduYWwuU0lHSU5ULCBoYW5kbGVyKQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CShyZXZpc2lv biAyNDQwNTYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Vi a2l0X3Rlc3RzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xLDYgKzEsNiBAQAogIyBDb3B5cmlnaHQg KEMpIDIwMTAgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMgQ29weXJpZ2h0IChD KSAyMDEwIEdhYm9yIFJhcGNzYW55aSAocmdhYm9yQGluZi51LXN6ZWdlZC5odSksIFVuaXZlcnNp dHkgb2YgU3plZ2VkCi0jIENvcHlyaWdodCAoQykgMjAxMSwgMjAxNiBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCisjIENvcHlyaWdodCAoQykgMjAxMSwgMjAxNiwgMjAxOSBBcHBsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4g c291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBtb2RpZmljYXRpb24s IGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJl CkBAIC0zNiw2ICszNiw3IEBAIGltcG9ydCBzeXMKIGltcG9ydCB0cmFjZWJhY2sKIAogZnJvbSB3 ZWJraXRweS5jb21tb24uaG9zdCBpbXBvcnQgSG9zdAorZnJvbSB3ZWJraXRweS5jb21tb24uaW50 ZXJ1cHRfZGVidWdnaW5nIGltcG9ydCBsb2dfc3RhY2tfdHJhY2Vfb25fY3RybF9jLCBsb2dfc3Rh Y2tfdHJhY2Vfb25fdGVybQogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMuY29udHJvbGxlcnMu bWFuYWdlciBpbXBvcnQgTWFuYWdlcgogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxz LnRlc3RfcnVuX3Jlc3VsdHMgaW1wb3J0IElOVEVSUlVQVEVEX0VYSVRfU1RBVFVTCiBmcm9tIHdl YmtpdHB5LnBvcnQgaW1wb3J0IGNvbmZpZ3VyYXRpb25fb3B0aW9ucywgcGxhdGZvcm1fb3B0aW9u cwpAQCAtNzUsNiArNzYsMTAgQEAgZGVmIG1haW4oYXJndiwgc3Rkb3V0LCBzdGRlcnIpOgogICAg ICAgICBwcmludChzdHIoZSksIGZpbGU9c3RkZXJyKQogICAgICAgICByZXR1cm4gRVhDRVBUSU9O QUxfRVhJVF9TVEFUVVMKIAorICAgIHN0YWNrX3RyYWNlX3BhdGggPSBob3N0LmZpbGVzeXN0ZW0u am9pbihwb3J0LnJlc3VsdHNfZGlyZWN0b3J5KCksICdweXRob25fc3RhY2tfdHJhY2UudHh0JykK KyAgICBsb2dfc3RhY2tfdHJhY2Vfb25fY3RybF9jKG91dHB1dF9maWxlPXN0YWNrX3RyYWNlX3Bh dGgpCisgICAgbG9nX3N0YWNrX3RyYWNlX29uX3Rlcm0ob3V0cHV0X2ZpbGU9c3RhY2tfdHJhY2Vf cGF0aCkKKwogICAgIGlmIG9wdGlvbnMucHJpbnRfZXhwZWN0YXRpb25zOgogICAgICAgICByZXR1 cm4gX3ByaW50X2V4cGVjdGF0aW9ucyhwb3J0LCBvcHRpb25zLCBhcmdzLCBzdGRlcnIpCiAK 367000 2019-04-08 17:00:26 -0700 2019-04-08 17:11:40 -0700 Patch bug-176393-20190408170021.patch text/plain 2800 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NDA1NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDE5LTA0LTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBMb2cgc3RhY2stdHJhY2UgZm9yIHJ1bi13ZWJraXQtdGVzdHMgd2hlbiBp bnRlcnJ1cHRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTc2MzkzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNDI2MjMxMD4KKworICAgICAgICBS ZXZpZXdlZCBieSBMdWNhcyBGb3JzY2hsZXIuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9pbnRlcnJ1cHRfZGVidWdnaW5nLnB5OiBBZGRlZC4KKyAgICAgICAgKGxvZ19zdGFj a190cmFjZSk6IEdpdmVuIGEgUHl0aG9uIGZyYW1lIG9iamVjdCwgbG9nIGEgc3RhY2sgdHJhY2Ug dG8gdGhlIHByb3ZpZGVkIGZpbGUuCisgICAgICAgIChTdGFja1RyYWNlRmlsZUNvbnRleHQpOiBD b250ZXh0IHdoaWNoIGFsbG93cyBzdGFjay10cmFjZXMgdG8gYmUgcHJpbnRlZCB0byBzdGRlcnIg b3IgdG8gYSBmaWxlLiAKKyAgICAgICAgKGxvZ19zdGFja190cmFjZV9vbl90ZXJtKTogQXR0YWNo IGEgbGlzdGVuZXIgdG8gU0lHVEVSTSBzbyB0aGF0IGEgc3RhY2stdHJhY2UgY2FuIGJlIGxvZ2dl ZCB3aGVuIGEgcHJvZ3JhbSBpcyB0ZXJtaW5hdGVkLgorICAgICAgICAobG9nX3N0YWNrX3RyYWNl X29uX2N0cmxfYyk6IEF0dGFjaCBhIGxpc3RlbmVyIHRvIFNJR0lOVCBzbyB0aGF0IGEgc3RhY2st dHJhY2UgY2FuIGJlIGxvZ2dlZCB3aGVuIGEgcHJvZ3JhbSBpcyBDVFJMK0NlZC4gCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weToKKyAg ICAgICAgKG1haW4pOiBTZXQgaGFuZGxlcnMgdG8gbG9nIHN0YWNrIHRyYWNlIG9uIGludGVycnVw dGlvbi4KKwogMjAxOS0wNC0wOCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNv bT4KIAogICAgICAgICBbaU9TXSBEbyBub3QgYWxsb3cgc3RhcnRpbmcgc2VsZWN0aW9uIGRyYWdz IHdoZW4gc2VsZWN0aW9uIHZpZXdzIGFyZSBub3QgdmlzaWJsZQpJbmRleDogVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5 CShyZXZpc2lvbiAyNDQwNTYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9ydW5fd2Via2l0X3Rlc3RzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xLDYgKzEsNiBAQAogIyBD b3B5cmlnaHQgKEMpIDIwMTAgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMgQ29w eXJpZ2h0IChDKSAyMDEwIEdhYm9yIFJhcGNzYW55aSAocmdhYm9yQGluZi51LXN6ZWdlZC5odSks IFVuaXZlcnNpdHkgb2YgU3plZ2VkCi0jIENvcHlyaWdodCAoQykgMjAxMSwgMjAxNiBBcHBsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjIENvcHlyaWdodCAoQykgMjAxMSwgMjAxNiwgMjAx OSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFu ZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMgYXJlCkBAIC0zNiw2ICszNiw3IEBAIGltcG9ydCBzeXMKIGltcG9ydCB0cmFjZWJhY2sK IAogZnJvbSB3ZWJraXRweS5jb21tb24uaG9zdCBpbXBvcnQgSG9zdAorZnJvbSB3ZWJraXRweS5j b21tb24uaW50ZXJydXB0X2RlYnVnZ2luZyBpbXBvcnQgbG9nX3N0YWNrX3RyYWNlX29uX2N0cmxf YywgbG9nX3N0YWNrX3RyYWNlX29uX3Rlcm0KIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLmNv bnRyb2xsZXJzLm1hbmFnZXIgaW1wb3J0IE1hbmFnZXIKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rl c3RzLm1vZGVscy50ZXN0X3J1bl9yZXN1bHRzIGltcG9ydCBJTlRFUlJVUFRFRF9FWElUX1NUQVRV UwogZnJvbSB3ZWJraXRweS5wb3J0IGltcG9ydCBjb25maWd1cmF0aW9uX29wdGlvbnMsIHBsYXRm b3JtX29wdGlvbnMKQEAgLTc1LDYgKzc2LDEwIEBAIGRlZiBtYWluKGFyZ3YsIHN0ZG91dCwgc3Rk ZXJyKToKICAgICAgICAgcHJpbnQoc3RyKGUpLCBmaWxlPXN0ZGVycikKICAgICAgICAgcmV0dXJu IEVYQ0VQVElPTkFMX0VYSVRfU1RBVFVTCiAKKyAgICBzdGFja190cmFjZV9wYXRoID0gaG9zdC5m aWxlc3lzdGVtLmpvaW4ocG9ydC5yZXN1bHRzX2RpcmVjdG9yeSgpLCAncHl0aG9uX3N0YWNrX3Ry YWNlLnR4dCcpCisgICAgbG9nX3N0YWNrX3RyYWNlX29uX2N0cmxfYyhvdXRwdXRfZmlsZT1zdGFj a190cmFjZV9wYXRoKQorICAgIGxvZ19zdGFja190cmFjZV9vbl90ZXJtKG91dHB1dF9maWxlPXN0 YWNrX3RyYWNlX3BhdGgpCisKICAgICBpZiBvcHRpb25zLnByaW50X2V4cGVjdGF0aW9uczoKICAg ICAgICAgcmV0dXJuIF9wcmludF9leHBlY3RhdGlvbnMocG9ydCwgb3B0aW9ucywgYXJncywgc3Rk ZXJyKQogCg== 367003 2019-04-08 17:11:42 -0700 2019-04-08 18:32:22 -0700 Patch bug-176393-20190408171134.patch text/plain 6329 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NDA1NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDE5LTA0LTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBMb2cgc3RhY2stdHJhY2UgZm9yIHJ1bi13ZWJraXQtdGVzdHMgd2hlbiBp bnRlcnJ1cHRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTc2MzkzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNDI2MjMxMD4KKworICAgICAgICBS ZXZpZXdlZCBieSBMdWNhcyBGb3JzY2hsZXIuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9pbnRlcnJ1cHRfZGVidWdnaW5nLnB5OiBBZGRlZC4KKyAgICAgICAgKGxvZ19zdGFj a190cmFjZSk6IEdpdmVuIGEgUHl0aG9uIGZyYW1lIG9iamVjdCwgbG9nIGEgc3RhY2sgdHJhY2Ug dG8gdGhlIHByb3ZpZGVkIGZpbGUuCisgICAgICAgIChTdGFja1RyYWNlRmlsZUNvbnRleHQpOiBD b250ZXh0IHdoaWNoIGFsbG93cyBzdGFjay10cmFjZXMgdG8gYmUgcHJpbnRlZCB0byBzdGRlcnIg b3IgdG8gYSBmaWxlLiAKKyAgICAgICAgKGxvZ19zdGFja190cmFjZV9vbl90ZXJtKTogQXR0YWNo IGEgbGlzdGVuZXIgdG8gU0lHVEVSTSBzbyB0aGF0IGEgc3RhY2stdHJhY2UgY2FuIGJlIGxvZ2dl ZCB3aGVuIGEgcHJvZ3JhbSBpcyB0ZXJtaW5hdGVkLgorICAgICAgICAobG9nX3N0YWNrX3RyYWNl X29uX2N0cmxfYyk6IEF0dGFjaCBhIGxpc3RlbmVyIHRvIFNJR0lOVCBzbyB0aGF0IGEgc3RhY2st dHJhY2UgY2FuIGJlIGxvZ2dlZCB3aGVuIGEgcHJvZ3JhbSBpcyBDVFJMK0NlZC4gCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weToKKyAg ICAgICAgKG1haW4pOiBTZXQgaGFuZGxlcnMgdG8gbG9nIHN0YWNrIHRyYWNlIG9uIGludGVycnVw dGlvbi4KKwogMjAxOS0wNC0wOCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNv bT4KIAogICAgICAgICBbaU9TXSBEbyBub3QgYWxsb3cgc3RhcnRpbmcgc2VsZWN0aW9uIGRyYWdz IHdoZW4gc2VsZWN0aW9uIHZpZXdzIGFyZSBub3QgdmlzaWJsZQpJbmRleDogVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vaW50ZXJydXB0X2RlYnVnZ2luZy5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9pbnRlcnJ1cHRfZGVidWdnaW5nLnB5CShub25l eGlzdGVudCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2ludGVycnVwdF9kZWJ1 Z2dpbmcucHkJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw4NSBAQAorIyBDb3B5cmlnaHQgKEMp IDIwMTkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIworIyBSZWRpc3RyaWJ1dGlv biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyMg bW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBj b25kaXRpb25zCisjIGFyZSBtZXQ6CisjIDEuICBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNv ZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorIyAgICAgbm90aWNlLCB0aGlzIGxp c3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorIyAyLiAgUmVk aXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5 cmlnaHQKKyMgICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xs b3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyMgICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVy IG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisjCisjIFRISVMgU09G VFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFT IElTJycgQU5ECisjIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5H LCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRSBJTVBMSUVECisjIFdBUlJBTlRJRVMgT0YgTUVSQ0hB TlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUKKyMgRElT Q0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JT IEJFIExJQUJMRSBGT1IKKyMgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJ QUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTAorIyBEQU1BR0VTIChJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUgorIyBT RVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVS UlVQVElPTikgSE9XRVZFUgorIyBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZ LCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLAorIyBPUiBUT1JUIChJTkNM VURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0Yg VEhFIFVTRQorIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJ QklMSVRZIE9GIFNVQ0ggREFNQUdFLgorCitpbXBvcnQgbGluZWNhY2hlCitpbXBvcnQgbG9nZ2lu ZworaW1wb3J0IG9zCitpbXBvcnQgc2lnbmFsCitpbXBvcnQgc3lzCisKK19sb2cgPSBsb2dnaW5n LmdldExvZ2dlcihfX25hbWVfXykKKworCitkZWYgbG9nX3N0YWNrX3RyYWNlKGZyYW1lLCBmaWxl KToKKyAgICBmaWxlLndyaXRlKCdUcmFjZWJhY2sobW9zdCByZWNlbnQgY2FsbCBsYXN0KTpcbicp CisKKyAgICBkZWYgZnVuYyhmcmFtZSk6CisgICAgICAgIGlmIG5vdCBmcmFtZToKKyAgICAgICAg ICAgIHJldHVybgorICAgICAgICBmdW5jKGZyYW1lLmZfYmFjaykKKyAgICAgICAgZmlsZS53cml0 ZSgnICBGaWxlICJ7fSIsIGxpbmUge30sIGluIHt9XG4nLmZvcm1hdChmcmFtZS5mX2NvZGUuY29f ZmlsZW5hbWUsIGZyYW1lLmZfbGluZW5vLCBmcmFtZS5mX2NvZGUuY29fbmFtZSkpCisgICAgICAg IGZpbGUud3JpdGUoJyAgICB7fVxuJy5mb3JtYXQobGluZWNhY2hlLmdldGxpbmUoZnJhbWUuZl9j b2RlLmNvX2ZpbGVuYW1lLCBmcmFtZS5mX2xpbmVubykubHN0cmlwKCkucnN0cmlwKCkpKQorCisg ICAgZnVuYyhmcmFtZSkKKworCitjbGFzcyBTdGFja1RyYWNlRmlsZUNvbnRleHQob2JqZWN0KToK KyAgICBkZWYgX19pbml0X18oc2VsZiwgb3V0cHV0X2ZpbGU9Tm9uZSk6CisgICAgICAgIHNlbGYu ZmlsZV9uYW1lID0gTm9uZQorICAgICAgICBpZiBvdXRwdXRfZmlsZToKKyAgICAgICAgICAgIHNl bGYuZmlsZV9uYW1lID0gb3MucGF0aC5qb2luKG9zLnBhdGguZGlybmFtZShvdXRwdXRfZmlsZSks ICd7fS17fScuZm9ybWF0KG9zLmdldHBpZCgpLCBvcy5wYXRoLmJhc2VuYW1lKG91dHB1dF9maWxl KSkpCisgICAgICAgIHNlbGYuZmlsZSA9IHN5cy5zdGRlcnIKKworICAgIGRlZiBfX2VudGVyX18o c2VsZik6CisgICAgICAgIGlmIHNlbGYuZmlsZV9uYW1lOgorICAgICAgICAgICAgc2VsZi5maWxl ID0gb3BlbihzZWxmLmZpbGVfbmFtZSwgJ3cnKQorICAgICAgICAgICAgX2xvZy5jcml0aWNhbCgn U3RhY2sgdHJhY2Ugc2F2ZWQgdG8ge30nLmZvcm1hdChzZWxmLmZpbGVfbmFtZSkpCisgICAgICAg IGVsc2U6CisgICAgICAgICAgICBzZWxmLmZpbGUud3JpdGUoJ1xuJykKKyAgICAgICAgcmV0dXJu IHNlbGYuZmlsZQorCisgICAgZGVmIF9fZXhpdF9fKHNlbGYsICphcmdzKToKKyAgICAgICAgaWYg c2VsZi5maWxlX25hbWU6CisgICAgICAgICAgICBzZWxmLmZpbGUuY2xvc2UoKQorICAgICAgICBz ZWxmLmZpbGUgPSBzeXMuc3RkZXJyCisKKworZGVmIGxvZ19zdGFja190cmFjZV9vbl90ZXJtKG91 dHB1dF9maWxlPU5vbmUpOgorICAgIGRlZiBoYW5kbGVyKHNpZ251bSwgZnJhbWUpOgorICAgICAg ICB3aXRoIFN0YWNrVHJhY2VGaWxlQ29udGV4dChvdXRwdXRfZmlsZT1vdXRwdXRfZmlsZSkgYXMg ZmlsZToKKyAgICAgICAgICAgIGZpbGUud3JpdGUoJ1NJR1RFUk0gc2lnbmFsIHJlY2VpdmVkJykK KyAgICAgICAgICAgIGxvZ19zdGFja190cmFjZShmcmFtZSwgZmlsZSkKKworICAgICAgICBleGl0 KC0xKQorCisgICAgc2lnbmFsLnNpZ25hbChzaWduYWwuU0lHVEVSTSwgaGFuZGxlcikKKworCitk ZWYgbG9nX3N0YWNrX3RyYWNlX29uX2N0cmxfYyhvdXRwdXRfZmlsZT1Ob25lKToKKyAgICBkZWYg aGFuZGxlcihzaWdudW0sIGZyYW1lKToKKyAgICAgICAgd2l0aCBTdGFja1RyYWNlRmlsZUNvbnRl eHQob3V0cHV0X2ZpbGU9b3V0cHV0X2ZpbGUpIGFzIGZpbGU6CisgICAgICAgICAgICBmaWxlLndy aXRlKCdDVFJMK0MgcmVjZWl2ZWRcbicpCisgICAgICAgICAgICBsb2dfc3RhY2tfdHJhY2UoZnJh bWUsIGZpbGUpCisKKyAgICAgICAgcmFpc2UgS2V5Ym9hcmRJbnRlcnJ1cHQKKworICAgIHNpZ25h bC5zaWduYWwoc2lnbmFsLlNJR0lOVCwgaGFuZGxlcikKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQkocmV2 aXNpb24gMjQ0MDU2KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVu X3dlYmtpdF90ZXN0cy5weQkod29ya2luZyBjb3B5KQpAQCAtMSw2ICsxLDYgQEAKICMgQ29weXJp Z2h0IChDKSAyMDEwIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjIENvcHlyaWdo dCAoQykgMjAxMCBHYWJvciBSYXBjc2FueWkgKHJnYWJvckBpbmYudS1zemVnZWQuaHUpLCBVbml2 ZXJzaXR5IG9mIFN6ZWdlZAotIyBDb3B5cmlnaHQgKEMpIDIwMTEsIDIwMTYgQXBwbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMTEsIDIwMTYsIDIwMTkgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0 aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25z IGFyZQpAQCAtMzYsNiArMzYsNyBAQCBpbXBvcnQgc3lzCiBpbXBvcnQgdHJhY2ViYWNrCiAKIGZy b20gd2Via2l0cHkuY29tbW9uLmhvc3QgaW1wb3J0IEhvc3QKK2Zyb20gd2Via2l0cHkuY29tbW9u LmludGVycnVwdF9kZWJ1Z2dpbmcgaW1wb3J0IGxvZ19zdGFja190cmFjZV9vbl9jdHJsX2MsIGxv Z19zdGFja190cmFjZV9vbl90ZXJtCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5jb250cm9s bGVycy5tYW5hZ2VyIGltcG9ydCBNYW5hZ2VyCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5t b2RlbHMudGVzdF9ydW5fcmVzdWx0cyBpbXBvcnQgSU5URVJSVVBURURfRVhJVF9TVEFUVVMKIGZy b20gd2Via2l0cHkucG9ydCBpbXBvcnQgY29uZmlndXJhdGlvbl9vcHRpb25zLCBwbGF0Zm9ybV9v cHRpb25zCkBAIC03NSw2ICs3NiwxMCBAQCBkZWYgbWFpbihhcmd2LCBzdGRvdXQsIHN0ZGVycik6 CiAgICAgICAgIHByaW50KHN0cihlKSwgZmlsZT1zdGRlcnIpCiAgICAgICAgIHJldHVybiBFWENF UFRJT05BTF9FWElUX1NUQVRVUwogCisgICAgc3RhY2tfdHJhY2VfcGF0aCA9IGhvc3QuZmlsZXN5 c3RlbS5qb2luKHBvcnQucmVzdWx0c19kaXJlY3RvcnkoKSwgJ3B5dGhvbl9zdGFja190cmFjZS50 eHQnKQorICAgIGxvZ19zdGFja190cmFjZV9vbl9jdHJsX2Mob3V0cHV0X2ZpbGU9c3RhY2tfdHJh Y2VfcGF0aCkKKyAgICBsb2dfc3RhY2tfdHJhY2Vfb25fdGVybShvdXRwdXRfZmlsZT1zdGFja190 cmFjZV9wYXRoKQorCiAgICAgaWYgb3B0aW9ucy5wcmludF9leHBlY3RhdGlvbnM6CiAgICAgICAg IHJldHVybiBfcHJpbnRfZXhwZWN0YXRpb25zKHBvcnQsIG9wdGlvbnMsIGFyZ3MsIHN0ZGVycikK IAo=