62027 2011-06-03 09:37:38 -0700 nrwt: handle missing httpd cleanly 2011-06-22 17:18:58 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 63130 1 dpranke kkristof abarth abecsi eric galpeter kkristof ossy tony webkit.review.bot oldest_to_newest 414955 0 dpranke 2011-06-03 09:37:38 -0700 See 61939 for the change to ORWT; NRWT needs something similar. 421070 1 97244 kkristof 2011-06-15 00:01:29 -0700 Created attachment 97244 proposed fix 421076 2 97244 ossy 2011-06-15 00:07:26 -0700 Comment on attachment 97244 proposed fix LGTM, but I'm not so familiar with NRWT. Dirk? 421517 3 97244 dpranke 2011-06-15 12:51:51 -0700 Comment on attachment 97244 proposed fix The idea is good, but this is is the wrong place to check for this ... this check would be done in a worker thread after the main test suite has already started running. There is a check_sys_deps() function on the Port object that is called prior to running the tests. It is passed a flag indicating whether we need an http server to run the tests or not. You should probably move this check to that routine instead. See Tools/Scripts/webkitpy/layout_tests/port/base.py:185. Bonus points for modifying the chromium.py implementation as well :) Also, NRWT doesn't actually support the --no-http flag yet, so we should either add that, file a bug to fix that, or not mention it in this error message. 421848 4 97420 kkristof 2011-06-16 01:28:51 -0700 Created attachment 97420 proposed fix I deleted the flag from the message, and it now test in the right place. But I didn't modify the chromium.py because I can't test it at now. 422240 5 97420 dpranke 2011-06-16 14:35:32 -0700 Comment on attachment 97420 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=97420&action=review Almost there. > Tools/Scripts/webkitpy/layout_tests/port/apache_http_server.py:210 > + if not(os.system(self._start_cmd + " -v >" + os.devnull)): Generally speaking we try to avoid calling routines in os.* directly where possible, and this will also have the side effect of printing stuff to stderr, which I try to avoid. Can you change this to: try: return self._port_obj._executive(self._start_cmd + " -v", return_error_code=True): except OSError, e: return False instead? > Tools/Scripts/webkitpy/layout_tests/port/base.py:191 > + self.check_httpd() This check only needs to be done if needs_http is true. 423615 6 97786 kkristof 2011-06-20 05:42:43 -0700 Created attachment 97786 proposed fix 423635 7 galpeter 2011-06-20 06:32:30 -0700 (In reply to comment #6) > Created an attachment (id=97786) [details] > proposed fix > Tools/Scripts/webkitpy/layout_tests/port/base.py:244 > + print cmd I don't think you wanted this 'print' in the patch :) Otherwise LGTM. 423658 8 97798 kkristof 2011-06-20 07:14:18 -0700 Created attachment 97798 proposed fix thank you for noticed that 423791 9 97798 dpranke 2011-06-20 11:27:21 -0700 Comment on attachment 97798 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=97798&action=review > Tools/Scripts/webkitpy/layout_tests/port/apache_http_server.py:211 > + You don't need this function. Use self._port_obj._path_to_apache() (see line 78 for an example). > Tools/Scripts/webkitpy/layout_tests/port/base.py:192 > + self.check_httpd() This should just return False if there's no httpd, not raise an Exception. > Tools/Scripts/webkitpy/layout_tests/port/base.py:240 > + raise Exception('No httpd found. Cannot run http tests.') This should not raise an exception. Just return the result of has_httpd(). In fact, I would probably just inline that method, which made more sense as a separate method when it was on the http_server object. > Tools/Scripts/webkitpy/layout_tests/port/http_server.py:107 > + Same comment as above. 424352 10 97952 kkristof 2011-06-21 01:58:05 -0700 Created attachment 97952 proposed fix thank you for your forbearance 424685 11 97952 dpranke 2011-06-21 12:51:13 -0700 Comment on attachment 97952 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=97952&action=review Change basically looks fine but I'm cq-'ing so you can clean up the nits. > Tools/Scripts/webkitpy/layout_tests/port/base.py:192 > + if not self.check_httpd(): Minor nit: if needs_http: return self.check_httpd() return True You don't need the print (which should be _log.error() anyway) since check_httpd() will log messages. > Tools/Scripts/webkitpy/layout_tests/port/base.py:193 > + print 'No httpd found. Cannot run http tests.' Nit. Change this to _log.error() > Tools/Scripts/webkitpy/layout_tests/port/base.py:244 > + if logging: I don't know if you were copying code from check_image_diff, but logging isn't passed in to this method, so you're testing against the imported module, which will always be true. Just remove the if. 425066 12 98128 kkristof 2011-06-22 00:27:34 -0700 Created attachment 98128 proposed fix 425068 13 98128 dpranke 2011-06-22 00:35:00 -0700 Comment on attachment 98128 proposed fix excellent. thanks for the work! 425086 14 98128 webkit.review.bot 2011-06-22 01:22:45 -0700 Comment on attachment 98128 proposed fix Clearing flags on attachment: 98128 Committed r89414: <http://trac.webkit.org/changeset/89414> 425087 15 webkit.review.bot 2011-06-22 01:22:51 -0700 All reviewed patches have been landed. Closing bug. 425148 16 ossy 2011-06-22 04:23:06 -0700 Reopen, because it was rolled out by http://trac.webkit.org/changeset/89421 http://build.webkit.org/builders/Qt%20Linux%20Release/builds/34459/steps/webkitpy-test/logs/stdio 425397 17 98203 dpranke 2011-06-22 11:16:02 -0700 Created attachment 98203 stub out check_sys_deps() on the test port. 425399 18 dpranke 2011-06-22 11:16:52 -0700 Whoops. I should've realized that we needed to run test-webkitpy and make sure nothing broke. We needed to stub out the check_sys_deps() call (which used to be a no-op) on the test port. 425413 19 98203 tony 2011-06-22 11:30:09 -0700 Comment on attachment 98203 stub out check_sys_deps() on the test port. What is the change in base.py for? 425422 20 dpranke 2011-06-22 11:38:26 -0700 (In reply to comment #19) > (From update of attachment 98203 [details]) > What is the change in base.py for? That's the actual fix ... it modifies the default check_sys_deps() code to ensure that we have an http server. This only happens on the non-chromium ports at the moment. I will add this to chromium in a separate path. We could put this change only in webkit.py, but I'm planning to merge the two classes shortly anyway, so I didn't see much point. 425430 21 98203 tony 2011-06-22 11:44:45 -0700 Comment on attachment 98203 stub out check_sys_deps() on the test port. Oh, I see, there are two fixes here: (1) handle missing httpd cleanly and (2) fixing unit tests. The ChangeLog didn't make that clear (normally the text below the bug number expands on the bug description). 425473 22 dpranke 2011-06-22 12:40:07 -0700 (In reply to comment #21) > (From update of attachment 98203 [details]) > Oh, I see, there are two fixes here: (1) handle missing httpd cleanly and (2) fixing unit tests. The ChangeLog didn't make that clear (normally the text below the bug number expands on the bug description). Sorry, I had tried to make the ChangeLog describe that, but I probably could've described the original change better. I will update the ChangeLog. 425476 23 98219 dpranke 2011-06-22 12:42:31 -0700 Created attachment 98219 update ChangeLog 425764 24 98219 webkit.review.bot 2011-06-22 17:18:52 -0700 Comment on attachment 98219 update ChangeLog Clearing flags on attachment: 98219 Committed r89502: <http://trac.webkit.org/changeset/89502> 425765 25 webkit.review.bot 2011-06-22 17:18:58 -0700 All reviewed patches have been landed. Closing bug. 97244 2011-06-15 00:01:29 -0700 2011-06-16 01:28:51 -0700 proposed fix 14.patch text/plain 1879 kkristof ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlZWRk MTIyLi5hOGIxNTRhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDYtMTQgIEtyaXN0w7NmIEtvc3p0ecOzICA8 S29zenR5by5LcmlzdG9mQHN0dWQudS1zemVnZWQuaHU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW05SV1RdIFByaW50IGVycm9yIG1lc3NhZ2Ugd2hl biB0aGVyZSBpcyBubyBodHRwZCBwcmVzZW50IG9uIHRoZSBzeXN0ZW0KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyMDI3CisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2FwYWNoZV9odHRwX3NlcnZlci5weToKKwog MjAxMS0wNi0wOSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAg ICAgIFVucmV2aWV3ZWQgcm9sbGluZyBvdXQgcjg4NDcxLCBiZWNhdXNlIGl0IGJyb2tlIHBsdWdp biB0ZXN0cyBvbiBRdC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvYXBhY2hlX2h0dHBfc2VydmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKaW5kZXggMDVhMjMzOC4u NTliOWY1NCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKQEAgLTE5Nyw2ICsxOTcsOSBA QCBjbGFzcyBMYXlvdXRUZXN0QXBhY2hlSHR0cGQoaHR0cF9zZXJ2ZXJfYmFzZS5IdHRwU2VydmVy QmFzZSk6CiAgICAgICAgICMgc2hlbGw9VHJ1ZSBpcyBhIHRyYWlsIG9mIHRlYXJzLgogICAgICAg ICAjIE5vdGU6IE5vdCB0aHJlYWQgc2FmZTogaHR0cDovL2J1Z3MucHl0aG9uLm9yZy9pc3N1ZTIz MjAKICAgICAgICAgX2xvZy5kZWJ1ZygnU3RhcnRpbmcgaHR0cCBzZXJ2ZXIsIGNtZD0iJXMiJyAl IHN0cihzZWxmLl9zdGFydF9jbWQpKQorICAgICAgICBpZiBub3Qoc2VsZi5faGFzX2h0dHBkKCkp OgorICAgICAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCdObyBodHRwZCBmb3VuZC4gQ2Fubm90IHJ1 biBodHRwIHRlc3RzLlxuUGxlYXNlIHVzZSAtLW5vLWh0dHAgaWYgeW91IGRvIG5vdCB3YW50IHRv IHJ1biBodHRwIHRlc3RzLicpCisKICAgICAgICAgc2VsZi5faHR0cGRfcHJvYyA9IHN1YnByb2Nl c3MuUG9wZW4oc2VsZi5fc3RhcnRfY21kLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBzdGRlcnI9c3VicHJvY2Vzcy5QSVBFLAogICAgICAgICAgICAgc2hlbGw9 VHJ1ZSkKQEAgLTIwNiw2ICsyMDksMTEgQEAgY2xhc3MgTGF5b3V0VGVzdEFwYWNoZUh0dHBkKGh0 dHBfc2VydmVyX2Jhc2UuSHR0cFNlcnZlckJhc2UpOgogICAgICAgICAgICAgcmV0dXJuIEZhbHNl CiAgICAgICAgIHJldHVybiBUcnVlCiAKKyAgICBkZWYgX2hhc19odHRwZChzZWxmKToKKyAgICAg ICAgaWYgbm90KG9zLnN5c3RlbShzZWxmLl9zdGFydF9jbWQgKyAiIC12ID4iICsgb3MuZGV2bnVs bCkpOgorICAgICAgICAgICAgcmV0dXJuIFRydWUKKyAgICAgICAgcmV0dXJuIEZhbHNlCisKICAg ICBkZWYgc3RhcnQoc2VsZik6CiAgICAgICAgICIiIlN0YXJ0cyB0aGUgYXBhY2hlIGh0dHAgc2Vy dmVyLiIiIgogICAgICAgICAjIFN0b3AgYW55IGN1cnJlbnRseSBydW5uaW5nIHNlcnZlcnMuCg== 97420 2011-06-16 01:28:51 -0700 2011-06-20 05:42:43 -0700 proposed fix 16.patch text/plain 3110 kkristof ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlZWRk MTIyLi5hOGIxNTRhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDYtMTQgIEtyaXN0w7NmIEtvc3p0ecOzICA8 S29zenR5by5LcmlzdG9mQHN0dWQudS1zemVnZWQuaHU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW05SV1RdIFByaW50IGVycm9yIG1lc3NhZ2Ugd2hl biB0aGVyZSBpcyBubyBodHRwZCBwcmVzZW50IG9uIHRoZSBzeXN0ZW0KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyMDI3CisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2FwYWNoZV9odHRwX3NlcnZlci5weToKKwog MjAxMS0wNi0wOSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAg ICAgIFVucmV2aWV3ZWQgcm9sbGluZyBvdXQgcjg4NDcxLCBiZWNhdXNlIGl0IGJyb2tlIHBsdWdp biB0ZXN0cyBvbiBRdC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvYXBhY2hlX2h0dHBfc2VydmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKaW5kZXggMDVhMjMzOC4u YjM5MDc0YiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKQEAgLTIwNiw2ICsyMDYsMTEg QEAgY2xhc3MgTGF5b3V0VGVzdEFwYWNoZUh0dHBkKGh0dHBfc2VydmVyX2Jhc2UuSHR0cFNlcnZl ckJhc2UpOgogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCiAgICAgICAgIHJldHVybiBUcnVlCiAK KyAgICBkZWYgX2hhc19odHRwZChzZWxmKToKKyAgICAgICAgaWYgbm90KG9zLnN5c3RlbShzZWxm Ll9zdGFydF9jbWQgKyAiIC12ID4iICsgb3MuZGV2bnVsbCkpOgorICAgICAgICAgICAgcmV0dXJu IFRydWUKKyAgICAgICAgcmV0dXJuIEZhbHNlCisKICAgICBkZWYgc3RhcnQoc2VsZik6CiAgICAg ICAgICIiIlN0YXJ0cyB0aGUgYXBhY2hlIGh0dHAgc2VydmVyLiIiIgogICAgICAgICAjIFN0b3Ag YW55IGN1cnJlbnRseSBydW5uaW5nIHNlcnZlcnMuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKaW5kZXggYmY0YmUwYy4uY2UzNGU3ZCAxMDA3 NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQpA QCAtMTg4LDYgKzE4OCw4IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAgICAgVGhpcyBzdGVw IGNhbiBiZSBza2lwcGVkIHdpdGggLS1ub2NoZWNrLXN5cy1kZXBzLgogCiAgICAgICAgIFJldHVy bnMgd2hldGhlciB0aGUgc3lzdGVtIGlzIHByb3Blcmx5IGNvbmZpZ3VyZWQuIiIiCisgICAgICAg IHNlbGYuY2hlY2tfaHR0cGQoKQorCiAgICAgICAgIHJldHVybiBUcnVlCiAKICAgICBkZWYgY2hl Y2tfaW1hZ2VfZGlmZihzZWxmLCBvdmVycmlkZV9zdGVwPU5vbmUsIGxvZ2dpbmc9VHJ1ZSk6CkBA IC0yMjcsNiArMjI5LDE0IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKIAogICAgICAgICByZXR1cm4g VHJ1ZQogCisgICAgZGVmIGNoZWNrX2h0dHBkKHNlbGYpOgorICAgICAgICBpZiBzZWxmLmdldF9v cHRpb24oJ3VzZV9hcGFjaGUnKToKKyAgICAgICAgICAgIHNlcnZlciA9IGFwYWNoZV9odHRwX3Nl cnZlci5MYXlvdXRUZXN0QXBhY2hlSHR0cGQoc2VsZiwgc2VsZi5yZXN1bHRzX2RpcmVjdG9yeSgp KQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgc2VydmVyID0gaHR0cF9zZXJ2ZXIuTGlnaHR0 cGQoc2VsZiwgc2VsZi5yZXN1bHRzX2RpcmVjdG9yeSgpKQorICAgICAgICBpZiBub3Qoc2VydmVy Ll9oYXNfaHR0cGQoKSk6CisgICAgICAgICAgICByYWlzZSBFeGNlcHRpb24oJ05vIGh0dHBkIGZv dW5kLiBDYW5ub3QgcnVuIGh0dHAgdGVzdHMuJykKKwogICAgIGRlZiBjb21wYXJlX3RleHQoc2Vs ZiwgZXhwZWN0ZWRfdGV4dCwgYWN0dWFsX3RleHQpOgogICAgICAgICAiIiJSZXR1cm4gd2hldGhl ciBvciBub3QgdGhlIHR3byBzdHJpbmdzIGFyZSAqbm90KiBlcXVhbC4gVGhpcwogICAgICAgICBy b3V0aW5lIGlzIHVzZWQgdG8gZGlmZiB0ZXh0IG91dHB1dC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvaHR0cF9zZXJ2ZXIucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2h0dHBfc2VydmVyLnB5CmluZGV4IGU1 MjVlZTAuLjU2MDVhODQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvaHR0cF9zZXJ2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9odHRwX3NlcnZlci5weQpAQCAtMTAyLDYgKzEwMiwxMSBAQCBjbGFz cyBMaWdodHRwZChodHRwX3NlcnZlcl9iYXNlLkh0dHBTZXJ2ZXJCYXNlKToKICAgICBkZWYgaXNf cnVubmluZyhzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX3Byb2Nlc3MgIT0gTm9uZQogCisg ICAgZGVmIF9oYXNfaHR0cGQoc2VsZik6CisgICAgICAgIGlmIG5vdChvcy5zeXN0ZW0oc2VsZi5f cG9ydF9vYmouX3BhdGhfdG9fbGlnaHR0cGQoKSArICIgLXYgPiIgKyBvcy5kZXZudWxsKSk6Cisg ICAgICAgICAgICByZXR1cm4gVHJ1ZQorICAgICAgICByZXR1cm4gRmFsc2UKKwogICAgIGRlZiBz dGFydChzZWxmKToKICAgICAgICAgaWYgc2VsZi5pc19ydW5uaW5nKCk6CiAgICAgICAgICAgICBy YWlzZSAnTGlnaHR0cGQgYWxyZWFkeSBydW5uaW5nJwo= 97786 2011-06-20 05:42:43 -0700 2011-06-20 07:14:18 -0700 proposed fix 20c.patch text/plain 3258 kkristof ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlZWRk MTIyLi5hOGIxNTRhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDYtMTQgIEtyaXN0w7NmIEtvc3p0ecOzICA8 S29zenR5by5LcmlzdG9mQHN0dWQudS1zemVnZWQuaHU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW05SV1RdIFByaW50IGVycm9yIG1lc3NhZ2Ugd2hl biB0aGVyZSBpcyBubyBodHRwZCBwcmVzZW50IG9uIHRoZSBzeXN0ZW0KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyMDI3CisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2FwYWNoZV9odHRwX3NlcnZlci5weToKKwog MjAxMS0wNi0wOSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAg ICAgIFVucmV2aWV3ZWQgcm9sbGluZyBvdXQgcjg4NDcxLCBiZWNhdXNlIGl0IGJyb2tlIHBsdWdp biB0ZXN0cyBvbiBRdC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvYXBhY2hlX2h0dHBfc2VydmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKaW5kZXggMDVhMjMzOC4u ZWUyMzBjMSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKQEAgLTIwNiw2ICsyMDYsOSBA QCBjbGFzcyBMYXlvdXRUZXN0QXBhY2hlSHR0cGQoaHR0cF9zZXJ2ZXJfYmFzZS5IdHRwU2VydmVy QmFzZSk6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKICAgICAgICAgcmV0dXJuIFRydWUKIAor ICAgIGRlZiBfZ2V0X2h0dHBkX3BhdGgoc2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLl9zdGFy dF9jbWQuc3BsaXQoKVswXQorCiAgICAgZGVmIHN0YXJ0KHNlbGYpOgogICAgICAgICAiIiJTdGFy dHMgdGhlIGFwYWNoZSBodHRwIHNlcnZlci4iIiIKICAgICAgICAgIyBTdG9wIGFueSBjdXJyZW50 bHkgcnVubmluZyBzZXJ2ZXJzLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9iYXNlLnB5CmluZGV4IGJmNGJlMGMuLjkwMzZiMDUgMTAwNzU1Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKQEAgLTE4OCw2ICsx ODgsOSBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgIFRoaXMgc3RlcCBjYW4gYmUgc2tp cHBlZCB3aXRoIC0tbm9jaGVjay1zeXMtZGVwcy4KIAogICAgICAgICBSZXR1cm5zIHdoZXRoZXIg dGhlIHN5c3RlbSBpcyBwcm9wZXJseSBjb25maWd1cmVkLiIiIgorICAgICAgICBpZiBuZWVkc19o dHRwOgorICAgICAgICAgICAgc2VsZi5jaGVja19odHRwZCgpCisKICAgICAgICAgcmV0dXJuIFRy dWUKIAogICAgIGRlZiBjaGVja19pbWFnZV9kaWZmKHNlbGYsIG92ZXJyaWRlX3N0ZXA9Tm9uZSwg bG9nZ2luZz1UcnVlKToKQEAgLTIyNyw2ICsyMzAsMjMgQEAgY2xhc3MgUG9ydChvYmplY3QpOgog CiAgICAgICAgIHJldHVybiBUcnVlCiAKKyAgICBkZWYgY2hlY2tfaHR0cGQoc2VsZik6CisgICAg ICAgIGlmIHNlbGYuZ2V0X29wdGlvbigndXNlX2FwYWNoZScpOgorICAgICAgICAgICAgc2VydmVy ID0gYXBhY2hlX2h0dHBfc2VydmVyLkxheW91dFRlc3RBcGFjaGVIdHRwZChzZWxmLCBzZWxmLnJl c3VsdHNfZGlyZWN0b3J5KCkpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBzZXJ2ZXIgPSBo dHRwX3NlcnZlci5MaWdodHRwZChzZWxmLCBzZWxmLnJlc3VsdHNfZGlyZWN0b3J5KCkpCisKKyAg ICAgICAgaWYgbm90IHNlbGYuaGFzX2h0dHBkKHNlcnZlcik6CisgICAgICAgICAgICByYWlzZSBF eGNlcHRpb24oJ05vIGh0dHBkIGZvdW5kLiBDYW5ub3QgcnVuIGh0dHAgdGVzdHMuJykKKworICAg IGRlZiBoYXNfaHR0cGQoc2VsZiwgc2VydmVyKToKKyAgICAgICAgY21kID0gc2VydmVyLl9nZXRf aHR0cGRfcGF0aCgpCisgICAgICAgIHByaW50IGNtZAorICAgICAgICB0cnk6CisgICAgICAgICAg ICByZXR1cm4gc2VsZi5fZXhlY3V0aXZlLnJ1bl9jb21tYW5kKFtjbWQsICItdiJdLCByZXR1cm5f ZXhpdF9jb2RlPVRydWUpID09IDAKKyAgICAgICAgZXhjZXB0IE9TRXJyb3IsIGU6CisgICAgICAg ICAgICByZXR1cm4gRmFsc2UKKwogICAgIGRlZiBjb21wYXJlX3RleHQoc2VsZiwgZXhwZWN0ZWRf dGV4dCwgYWN0dWFsX3RleHQpOgogICAgICAgICAiIiJSZXR1cm4gd2hldGhlciBvciBub3QgdGhl IHR3byBzdHJpbmdzIGFyZSAqbm90KiBlcXVhbC4gVGhpcwogICAgICAgICByb3V0aW5lIGlzIHVz ZWQgdG8gZGlmZiB0ZXh0IG91dHB1dC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvaHR0cF9zZXJ2ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2h0dHBfc2VydmVyLnB5CmluZGV4IGU1MjVlZTAuLjE4MDNi NTQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv aHR0cF9zZXJ2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9odHRwX3NlcnZlci5weQpAQCAtMTAyLDYgKzEwMiw5IEBAIGNsYXNzIExpZ2h0dHBkKGh0 dHBfc2VydmVyX2Jhc2UuSHR0cFNlcnZlckJhc2UpOgogICAgIGRlZiBpc19ydW5uaW5nKHNlbGYp OgogICAgICAgICByZXR1cm4gc2VsZi5fcHJvY2VzcyAhPSBOb25lCiAKKyAgICBkZWYgX2dldF9o dHRwZF9wYXRoKHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi5fcG9ydF9vYmouX3BhdGhfdG9f bGlnaHR0cGQoKS5zcGxpdCgpWzBdCisKICAgICBkZWYgc3RhcnQoc2VsZik6CiAgICAgICAgIGlm IHNlbGYuaXNfcnVubmluZygpOgogICAgICAgICAgICAgcmFpc2UgJ0xpZ2h0dHBkIGFscmVhZHkg cnVubmluZycK 97798 2011-06-20 07:14:18 -0700 2011-06-21 01:58:05 -0700 proposed fix 20.patch text/plain 3239 kkristof ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlZWRk MTIyLi5hOGIxNTRhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDYtMTQgIEtyaXN0w7NmIEtvc3p0ecOzICA8 S29zenR5by5LcmlzdG9mQHN0dWQudS1zemVnZWQuaHU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW05SV1RdIFByaW50IGVycm9yIG1lc3NhZ2Ugd2hl biB0aGVyZSBpcyBubyBodHRwZCBwcmVzZW50IG9uIHRoZSBzeXN0ZW0KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyMDI3CisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2FwYWNoZV9odHRwX3NlcnZlci5weToKKwog MjAxMS0wNi0wOSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAg ICAgIFVucmV2aWV3ZWQgcm9sbGluZyBvdXQgcjg4NDcxLCBiZWNhdXNlIGl0IGJyb2tlIHBsdWdp biB0ZXN0cyBvbiBRdC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvYXBhY2hlX2h0dHBfc2VydmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKaW5kZXggMDVhMjMzOC4u ZWUyMzBjMSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKQEAgLTIwNiw2ICsyMDYsOSBA QCBjbGFzcyBMYXlvdXRUZXN0QXBhY2hlSHR0cGQoaHR0cF9zZXJ2ZXJfYmFzZS5IdHRwU2VydmVy QmFzZSk6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKICAgICAgICAgcmV0dXJuIFRydWUKIAor ICAgIGRlZiBfZ2V0X2h0dHBkX3BhdGgoc2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLl9zdGFy dF9jbWQuc3BsaXQoKVswXQorCiAgICAgZGVmIHN0YXJ0KHNlbGYpOgogICAgICAgICAiIiJTdGFy dHMgdGhlIGFwYWNoZSBodHRwIHNlcnZlci4iIiIKICAgICAgICAgIyBTdG9wIGFueSBjdXJyZW50 bHkgcnVubmluZyBzZXJ2ZXJzLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9iYXNlLnB5CmluZGV4IGJmNGJlMGMuLjIzNmQxMzQgMTAwNzU1Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKQEAgLTE4OCw2ICsx ODgsOSBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgIFRoaXMgc3RlcCBjYW4gYmUgc2tp cHBlZCB3aXRoIC0tbm9jaGVjay1zeXMtZGVwcy4KIAogICAgICAgICBSZXR1cm5zIHdoZXRoZXIg dGhlIHN5c3RlbSBpcyBwcm9wZXJseSBjb25maWd1cmVkLiIiIgorICAgICAgICBpZiBuZWVkc19o dHRwOgorICAgICAgICAgICAgc2VsZi5jaGVja19odHRwZCgpCisKICAgICAgICAgcmV0dXJuIFRy dWUKIAogICAgIGRlZiBjaGVja19pbWFnZV9kaWZmKHNlbGYsIG92ZXJyaWRlX3N0ZXA9Tm9uZSwg bG9nZ2luZz1UcnVlKToKQEAgLTIyNyw2ICsyMzAsMjIgQEAgY2xhc3MgUG9ydChvYmplY3QpOgog CiAgICAgICAgIHJldHVybiBUcnVlCiAKKyAgICBkZWYgY2hlY2tfaHR0cGQoc2VsZik6CisgICAg ICAgIGlmIHNlbGYuZ2V0X29wdGlvbigndXNlX2FwYWNoZScpOgorICAgICAgICAgICAgc2VydmVy ID0gYXBhY2hlX2h0dHBfc2VydmVyLkxheW91dFRlc3RBcGFjaGVIdHRwZChzZWxmLCBzZWxmLnJl c3VsdHNfZGlyZWN0b3J5KCkpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBzZXJ2ZXIgPSBo dHRwX3NlcnZlci5MaWdodHRwZChzZWxmLCBzZWxmLnJlc3VsdHNfZGlyZWN0b3J5KCkpCisKKyAg ICAgICAgaWYgbm90IHNlbGYuaGFzX2h0dHBkKHNlcnZlcik6CisgICAgICAgICAgICByYWlzZSBF eGNlcHRpb24oJ05vIGh0dHBkIGZvdW5kLiBDYW5ub3QgcnVuIGh0dHAgdGVzdHMuJykKKworICAg IGRlZiBoYXNfaHR0cGQoc2VsZiwgc2VydmVyKToKKyAgICAgICAgY21kID0gc2VydmVyLl9nZXRf aHR0cGRfcGF0aCgpCisgICAgICAgIHRyeToKKyAgICAgICAgICAgIHJldHVybiBzZWxmLl9leGVj dXRpdmUucnVuX2NvbW1hbmQoW2NtZCwgIi12Il0sIHJldHVybl9leGl0X2NvZGU9VHJ1ZSkgPT0g MAorICAgICAgICBleGNlcHQgT1NFcnJvciwgZToKKyAgICAgICAgICAgIHJldHVybiBGYWxzZQor CiAgICAgZGVmIGNvbXBhcmVfdGV4dChzZWxmLCBleHBlY3RlZF90ZXh0LCBhY3R1YWxfdGV4dCk6 CiAgICAgICAgICIiIlJldHVybiB3aGV0aGVyIG9yIG5vdCB0aGUgdHdvIHN0cmluZ3MgYXJlICpu b3QqIGVxdWFsLiBUaGlzCiAgICAgICAgIHJvdXRpbmUgaXMgdXNlZCB0byBkaWZmIHRleHQgb3V0 cHV0LgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9odHRwX3NlcnZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvaHR0cF9zZXJ2ZXIucHkKaW5kZXggZTUyNWVlMC4uMTgwM2I1NCAxMDA3NTUKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9odHRwX3NlcnZlci5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2h0dHBfc2VydmVyLnB5 CkBAIC0xMDIsNiArMTAyLDkgQEAgY2xhc3MgTGlnaHR0cGQoaHR0cF9zZXJ2ZXJfYmFzZS5IdHRw U2VydmVyQmFzZSk6CiAgICAgZGVmIGlzX3J1bm5pbmcoc2VsZik6CiAgICAgICAgIHJldHVybiBz ZWxmLl9wcm9jZXNzICE9IE5vbmUKIAorICAgIGRlZiBfZ2V0X2h0dHBkX3BhdGgoc2VsZik6Cisg ICAgICAgIHJldHVybiBzZWxmLl9wb3J0X29iai5fcGF0aF90b19saWdodHRwZCgpLnNwbGl0KClb MF0KKwogICAgIGRlZiBzdGFydChzZWxmKToKICAgICAgICAgaWYgc2VsZi5pc19ydW5uaW5nKCk6 CiAgICAgICAgICAgICByYWlzZSAnTGlnaHR0cGQgYWxyZWFkeSBydW5uaW5nJwo= 97952 2011-06-21 01:58:05 -0700 2011-06-22 05:04:44 -0700 proposed fix 21.patch text/plain 1925 kkristof ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlZWRk MTIyLi5hOGIxNTRhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDYtMTQgIEtyaXN0w7NmIEtvc3p0ecOzICA8 S29zenR5by5LcmlzdG9mQHN0dWQudS1zemVnZWQuaHU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW05SV1RdIFByaW50IGVycm9yIG1lc3NhZ2Ugd2hl biB0aGVyZSBpcyBubyBodHRwZCBwcmVzZW50IG9uIHRoZSBzeXN0ZW0KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyMDI3CisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2FwYWNoZV9odHRwX3NlcnZlci5weToKKwog MjAxMS0wNi0wOSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAg ICAgIFVucmV2aWV3ZWQgcm9sbGluZyBvdXQgcjg4NDcxLCBiZWNhdXNlIGl0IGJyb2tlIHBsdWdp biB0ZXN0cyBvbiBRdC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvYmFzZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvYmFzZS5weQppbmRleCBiZjRiZTBjLi5lNTEzMzU2IDEwMDc1NQotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CkBAIC0xODgsNiArMTg4LDEx IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAgICAgVGhpcyBzdGVwIGNhbiBiZSBza2lwcGVk IHdpdGggLS1ub2NoZWNrLXN5cy1kZXBzLgogCiAgICAgICAgIFJldHVybnMgd2hldGhlciB0aGUg c3lzdGVtIGlzIHByb3Blcmx5IGNvbmZpZ3VyZWQuIiIiCisgICAgICAgIGlmIG5lZWRzX2h0dHA6 CisgICAgICAgICAgICBpZiBub3Qgc2VsZi5jaGVja19odHRwZCgpOgorICAgICAgICAgICAgICAg IHByaW50ICdObyBodHRwZCBmb3VuZC4gQ2Fubm90IHJ1biBodHRwIHRlc3RzLicKKyAgICAgICAg ICAgICAgICByZXR1cm4gRmFsc2UKKwogICAgICAgICByZXR1cm4gVHJ1ZQogCiAgICAgZGVmIGNo ZWNrX2ltYWdlX2RpZmYoc2VsZiwgb3ZlcnJpZGVfc3RlcD1Ob25lLCBsb2dnaW5nPVRydWUpOgpA QCAtMjI3LDYgKzIzMiwxOSBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAKICAgICAgICAgcmV0dXJu IFRydWUKIAorICAgIGRlZiBjaGVja19odHRwZChzZWxmKToKKyAgICAgICAgaWYgc2VsZi5nZXRf b3B0aW9uKCd1c2VfYXBhY2hlJyk6CisgICAgICAgICAgICBwYXRoID0gc2VsZi5fcGF0aF90b19h cGFjaGUoKQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgcGF0aCA9IHNlbGYuX3BhdGhfdG9f bGlnaHR0cGQoKQorCisgICAgICAgIHRyeToKKyAgICAgICAgICAgIHJldHVybiBzZWxmLl9leGVj dXRpdmUucnVuX2NvbW1hbmQoW3BhdGgsICItdiJdLCByZXR1cm5fZXhpdF9jb2RlPVRydWUpID09 IDAKKyAgICAgICAgZXhjZXB0IE9TRXJyb3IsIGU6CisgICAgICAgICAgICBpZiBsb2dnaW5nOgor ICAgICAgICAgICAgICAgIF9sb2cuZXJyb3IoIk5vIGh0dHBkIGZvdW5kLiBDYW5ub3QgcnVuIGh0 dHAgdGVzdHMuIikKKyAgICAgICAgICAgIHJldHVybiBGYWxzZQorCiAgICAgZGVmIGNvbXBhcmVf dGV4dChzZWxmLCBleHBlY3RlZF90ZXh0LCBhY3R1YWxfdGV4dCk6CiAgICAgICAgICIiIlJldHVy biB3aGV0aGVyIG9yIG5vdCB0aGUgdHdvIHN0cmluZ3MgYXJlICpub3QqIGVxdWFsLiBUaGlzCiAg ICAgICAgIHJvdXRpbmUgaXMgdXNlZCB0byBkaWZmIHRleHQgb3V0cHV0Lgo= 98128 2011-06-22 00:27:34 -0700 2011-06-22 11:15:57 -0700 proposed fix 22.patch text/plain 1798 kkristof ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlZWRk MTIyLi5hOGIxNTRhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDYtMTQgIEtyaXN0w7NmIEtvc3p0ecOzICA8 S29zenR5by5LcmlzdG9mQHN0dWQudS1zemVnZWQuaHU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW05SV1RdIFByaW50IGVycm9yIG1lc3NhZ2Ugd2hl biB0aGVyZSBpcyBubyBodHRwZCBwcmVzZW50IG9uIHRoZSBzeXN0ZW0KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyMDI3CisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2FwYWNoZV9odHRwX3NlcnZlci5weToKKwog MjAxMS0wNi0wOSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAg ICAgIFVucmV2aWV3ZWQgcm9sbGluZyBvdXQgcjg4NDcxLCBiZWNhdXNlIGl0IGJyb2tlIHBsdWdp biB0ZXN0cyBvbiBRdC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvYmFzZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvYmFzZS5weQppbmRleCBiZjRiZTBjLi5jZDY2ZDY0IDEwMDc1NQotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CkBAIC0xODgsNiArMTg4LDgg QEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICBUaGlzIHN0ZXAgY2FuIGJlIHNraXBwZWQg d2l0aCAtLW5vY2hlY2stc3lzLWRlcHMuCiAKICAgICAgICAgUmV0dXJucyB3aGV0aGVyIHRoZSBz eXN0ZW0gaXMgcHJvcGVybHkgY29uZmlndXJlZC4iIiIKKyAgICAgICAgaWYgbmVlZHNfaHR0cDoK KyAgICAgICAgICAgIHJldHVybiBzZWxmLmNoZWNrX2h0dHBkKCkKICAgICAgICAgcmV0dXJuIFRy dWUKIAogICAgIGRlZiBjaGVja19pbWFnZV9kaWZmKHNlbGYsIG92ZXJyaWRlX3N0ZXA9Tm9uZSwg bG9nZ2luZz1UcnVlKToKQEAgLTIyNyw2ICsyMjksMTggQEAgY2xhc3MgUG9ydChvYmplY3QpOgog CiAgICAgICAgIHJldHVybiBUcnVlCiAKKyAgICBkZWYgY2hlY2tfaHR0cGQoc2VsZik6CisgICAg ICAgIGlmIHNlbGYuZ2V0X29wdGlvbigndXNlX2FwYWNoZScpOgorICAgICAgICAgICAgcGF0aCA9 IHNlbGYuX3BhdGhfdG9fYXBhY2hlKCkKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHBhdGgg PSBzZWxmLl9wYXRoX3RvX2xpZ2h0dHBkKCkKKworICAgICAgICB0cnk6CisgICAgICAgICAgICBy ZXR1cm4gc2VsZi5fZXhlY3V0aXZlLnJ1bl9jb21tYW5kKFtwYXRoLCAiLXYiXSwgcmV0dXJuX2V4 aXRfY29kZT1UcnVlKSA9PSAwCisgICAgICAgIGV4Y2VwdCBPU0Vycm9yLCBlOgorICAgICAgICAg ICAgX2xvZy5lcnJvcigiTm8gaHR0cGQgZm91bmQuIENhbm5vdCBydW4gaHR0cCB0ZXN0cy4iKQor ICAgICAgICAgICAgcmV0dXJuIEZhbHNlCisKICAgICBkZWYgY29tcGFyZV90ZXh0KHNlbGYsIGV4 cGVjdGVkX3RleHQsIGFjdHVhbF90ZXh0KToKICAgICAgICAgIiIiUmV0dXJuIHdoZXRoZXIgb3Ig bm90IHRoZSB0d28gc3RyaW5ncyBhcmUgKm5vdCogZXF1YWwuIFRoaXMKICAgICAgICAgcm91dGlu ZSBpcyB1c2VkIHRvIGRpZmYgdGV4dCBvdXRwdXQuCg== 98203 2011-06-22 11:16:02 -0700 2011-06-22 12:42:26 -0700 stub out check_sys_deps() on the test port. bug-62027-20110622111600.patch text/plain 2599 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogODkzNzMKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkYmEyNWY0NGRlYzhhNzhiNzg0MGExYTM5M2YwOWNkN2U5 MTcxY2I1Li5iYWEyY2Y1Njk2YTkzNDFiNzA4MDJlMjBiMmRmYTczMmZiYjY2NTU3IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTEtMDYtMjIgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbnJ3dDogaGFuZGxl IG1pc3NpbmcgaHR0cGQgY2xlYW5seQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjIwMjcKKworICAgICAgICBGaXggdGhlIGNoYW5nZSBpbiByODk0MTQg dG8gc3R1YiBvdXQgdGhlCisgICAgICAgIGNoZWNrX3N5c19kZXBzKCkgaW4gdGhlIHRlc3QgcG9y dCBzbyB0aGF0IHRoZQorICAgICAgICB1bml0IHRlc3RzIHJ1biBjb3JyZWN0bHkuCisKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5OgorCiAyMDExLTA2 LTIxICBEbWl0cnkgTG9tb3YgIDxkc2xvbW92QGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgQWRhbSBSb2Jlbi4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvYmFzZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvYmFzZS5weQppbmRleCA2YzhhZTUyNTIzMzE0ZTI0NDIyNTY2MWVjZjUwNGQwODgz YWZmN2FjLi5lOTI0MmY1N2Q1YjRiZjQ4N2U0YjRmMWI5YzUxMTJiNWI0YWZlNThiIDEwMDc1NQot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CkBAIC0x ODgsNiArMTg4LDggQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICBUaGlzIHN0ZXAgY2Fu IGJlIHNraXBwZWQgd2l0aCAtLW5vY2hlY2stc3lzLWRlcHMuCiAKICAgICAgICAgUmV0dXJucyB3 aGV0aGVyIHRoZSBzeXN0ZW0gaXMgcHJvcGVybHkgY29uZmlndXJlZC4iIiIKKyAgICAgICAgaWYg bmVlZHNfaHR0cDoKKyAgICAgICAgICAgIHJldHVybiBzZWxmLmNoZWNrX2h0dHBkKCkKICAgICAg ICAgcmV0dXJuIFRydWUKIAogICAgIGRlZiBjaGVja19pbWFnZV9kaWZmKHNlbGYsIG92ZXJyaWRl X3N0ZXA9Tm9uZSwgbG9nZ2luZz1UcnVlKToKQEAgLTIyNyw2ICsyMjksMTggQEAgY2xhc3MgUG9y dChvYmplY3QpOgogCiAgICAgICAgIHJldHVybiBUcnVlCiAKKyAgICBkZWYgY2hlY2tfaHR0cGQo c2VsZik6CisgICAgICAgIGlmIHNlbGYuZ2V0X29wdGlvbigndXNlX2FwYWNoZScpOgorICAgICAg ICAgICAgcGF0aCA9IHNlbGYuX3BhdGhfdG9fYXBhY2hlKCkKKyAgICAgICAgZWxzZToKKyAgICAg ICAgICAgIHBhdGggPSBzZWxmLl9wYXRoX3RvX2xpZ2h0dHBkKCkKKworICAgICAgICB0cnk6Cisg ICAgICAgICAgICByZXR1cm4gc2VsZi5fZXhlY3V0aXZlLnJ1bl9jb21tYW5kKFtwYXRoLCAiLXYi XSwgcmV0dXJuX2V4aXRfY29kZT1UcnVlKSA9PSAwCisgICAgICAgIGV4Y2VwdCBPU0Vycm9yLCBl OgorICAgICAgICAgICAgX2xvZy5lcnJvcigiTm8gaHR0cGQgZm91bmQuIENhbm5vdCBydW4gaHR0 cCB0ZXN0cy4iKQorICAgICAgICAgICAgcmV0dXJuIEZhbHNlCisKICAgICBkZWYgY29tcGFyZV90 ZXh0KHNlbGYsIGV4cGVjdGVkX3RleHQsIGFjdHVhbF90ZXh0KToKICAgICAgICAgIiIiUmV0dXJu IHdoZXRoZXIgb3Igbm90IHRoZSB0d28gc3RyaW5ncyBhcmUgKm5vdCogZXF1YWwuIFRoaXMKICAg ICAgICAgcm91dGluZSBpcyB1c2VkIHRvIGRpZmYgdGV4dCBvdXRwdXQuCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3QucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3QucHkKaW5kZXggOWUwZmNlMzc1 MjNmODI5OTM5NjVkMjNmZTYzNjJkZGUzMWY0ODhjYS4uMTRkYmZlNzgwMjZjMzE4NGZlNjhmZmRj N2FjZDQ3MTQ3OGE3ODJkNCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC90ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvdGVzdC5weQpAQCAtMzAzLDYgKzMwMyw5IEBAIGNsYXNzIFRlc3RQb3J0KGJh c2UuUG9ydCk6CiAgICAgZGVmIGNoZWNrX2J1aWxkKHNlbGYsIG5lZWRzX2h0dHApOgogICAgICAg ICByZXR1cm4gVHJ1ZQogCisgICAgZGVmIGNoZWNrX3N5c19kZXBzKHNlbGYsIG5lZWRzX2h0dHAp OgorICAgICAgICByZXR1cm4gVHJ1ZQorCiAgICAgZGVmIGRlZmF1bHRfY29uZmlndXJhdGlvbihz ZWxmKToKICAgICAgICAgcmV0dXJuICdSZWxlYXNlJwogCg== 98219 2011-06-22 12:42:31 -0700 2011-06-22 17:18:51 -0700 update ChangeLog bug-62027-20110622124230.patch text/plain 2828 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogODk0NTMKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyMjkzYmRlZGEyZDc3MWUxMWI1MWY2NDkxNTU0ODY0MDUx MzE1NTI5Li4xMmEwZGMwMDk2NGI2MTAzZGE1OGFjMTNjMWFhYzBmOGMwMWVjYjE4IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTEtMDYtMjIgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbnJ3dDogaGFuZGxl IG1pc3NpbmcgaHR0cGQgY2xlYW5seQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjIwMjcKKworICAgICAgICBXZSBoYWQgcmV2ZXJ0ZWQgdGhlIGNoYW5n ZSBpbiByODk0MTQsIHNvIHRoaXMgYWRkcyBpdCBiYWNrIGluCisgICAgICAgIChtb2RpZnlpbmcg Y2hlY2tfc3lzX2RlcHMoKSBpbiBwb3J0L2Jhc2UucHkgdG8gY2hlY2sgZm9yIGFuCisgICAgICAg IGluc3RhbGxlZCB3ZWIgc2VydmVyKS4KKworICAgICAgICBUaGlzIGNoYW5nZSB0aGVuIGZpeGVz IHRoZSBjaGFuZ2UgaW4gcjg5NDE0IHRvIHN0dWIgb3V0IHRoZQorICAgICAgICBjaGVja19zeXNf ZGVwcygpIGluIHRoZSB0ZXN0IHBvcnQgc28gdGhhdCB0aGUgdW5pdCB0ZXN0cyBydW4gY29ycmVj dGx5LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNl LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdC5w eToKKwogMjAxMS0wNi0yMiAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAKICAgICAg ICAgQWRkIGxpbmtzIHRvIGV4aXN0aW5nIGJ1Z3MgcmVsYXRlZCB0byBmYWlsaW5nIHRlc3RzIG9u IFRlc3RGYWlsdXJlcyBwYWdlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2Jhc2UucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Jhc2UucHkKaW5kZXggNzI0NDM1NzdhZDQ4MDc0NGEwMjAxYWU4ZTAyZDc4Y2M5 MGYwMTkwZi4uZTMzZDYxZWQ4NmMwOTIyODA0YmE1ZGZiOWU1Njg3MmIyZTZmYzg1ZSAxMDA3NTUK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQpAQCAt MTg4LDYgKzE4OCw4IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAgICAgVGhpcyBzdGVwIGNh biBiZSBza2lwcGVkIHdpdGggLS1ub2NoZWNrLXN5cy1kZXBzLgogCiAgICAgICAgIFJldHVybnMg d2hldGhlciB0aGUgc3lzdGVtIGlzIHByb3Blcmx5IGNvbmZpZ3VyZWQuIiIiCisgICAgICAgIGlm IG5lZWRzX2h0dHA6CisgICAgICAgICAgICByZXR1cm4gc2VsZi5jaGVja19odHRwZCgpCiAgICAg ICAgIHJldHVybiBUcnVlCiAKICAgICBkZWYgY2hlY2tfaW1hZ2VfZGlmZihzZWxmLCBvdmVycmlk ZV9zdGVwPU5vbmUsIGxvZ2dpbmc9VHJ1ZSk6CkBAIC0yMjcsNiArMjI5LDE4IEBAIGNsYXNzIFBv cnQob2JqZWN0KToKIAogICAgICAgICByZXR1cm4gVHJ1ZQogCisgICAgZGVmIGNoZWNrX2h0dHBk KHNlbGYpOgorICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ3VzZV9hcGFjaGUnKToKKyAgICAg ICAgICAgIHBhdGggPSBzZWxmLl9wYXRoX3RvX2FwYWNoZSgpCisgICAgICAgIGVsc2U6CisgICAg ICAgICAgICBwYXRoID0gc2VsZi5fcGF0aF90b19saWdodHRwZCgpCisKKyAgICAgICAgdHJ5Ogor ICAgICAgICAgICAgcmV0dXJuIHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChbcGF0aCwgIi12 Il0sIHJldHVybl9leGl0X2NvZGU9VHJ1ZSkgPT0gMAorICAgICAgICBleGNlcHQgT1NFcnJvciwg ZToKKyAgICAgICAgICAgIF9sb2cuZXJyb3IoIk5vIGh0dHBkIGZvdW5kLiBDYW5ub3QgcnVuIGh0 dHAgdGVzdHMuIikKKyAgICAgICAgICAgIHJldHVybiBGYWxzZQorCiAgICAgZGVmIGNvbXBhcmVf dGV4dChzZWxmLCBleHBlY3RlZF90ZXh0LCBhY3R1YWxfdGV4dCk6CiAgICAgICAgICIiIlJldHVy biB3aGV0aGVyIG9yIG5vdCB0aGUgdHdvIHN0cmluZ3MgYXJlICpub3QqIGVxdWFsLiBUaGlzCiAg ICAgICAgIHJvdXRpbmUgaXMgdXNlZCB0byBkaWZmIHRleHQgb3V0cHV0LgpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5CmluZGV4IDllMGZjZTM3 NTIzZjgyOTkzOTY1ZDIzZmU2MzYyZGRlMzFmNDg4Y2EuLjE0ZGJmZTc4MDI2YzMxODRmZTY4ZmZk YzdhY2Q0NzE0NzhhNzgyZDQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvdGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L3Rlc3QucHkKQEAgLTMwMyw2ICszMDMsOSBAQCBjbGFzcyBUZXN0UG9ydChi YXNlLlBvcnQpOgogICAgIGRlZiBjaGVja19idWlsZChzZWxmLCBuZWVkc19odHRwKToKICAgICAg ICAgcmV0dXJuIFRydWUKIAorICAgIGRlZiBjaGVja19zeXNfZGVwcyhzZWxmLCBuZWVkc19odHRw KToKKyAgICAgICAgcmV0dXJuIFRydWUKKwogICAgIGRlZiBkZWZhdWx0X2NvbmZpZ3VyYXRpb24o c2VsZik6CiAgICAgICAgIHJldHVybiAnUmVsZWFzZScKIAo=