diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2018-10-10 02:40:39 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2018-10-10 02:40:39 +0000 |
| commit | 5c3c3141ae833e05ed02cc61c67737bc7e1dd145 (patch) | |
| tree | 348549f701744717dd07178651d3245e136bb5a1 /user/prosody/prosodyctl.patch | |
| parent | cd08a629daf51010fd863fd81add887377cd6b20 (diff) | |
| parent | cef60d848566b56692a9604df7c4e53c8b5605c6 (diff) | |
| download | packages-5c3c3141ae833e05ed02cc61c67737bc7e1dd145.tar.gz packages-5c3c3141ae833e05ed02cc61c67737bc7e1dd145.tar.bz2 packages-5c3c3141ae833e05ed02cc61c67737bc7e1dd145.tar.xz packages-5c3c3141ae833e05ed02cc61c67737bc7e1dd145.zip | |
Merge branch 'prosody' into 'master'
Import prosody from Alpine, with cleanups.
See merge request !84
Diffstat (limited to 'user/prosody/prosodyctl.patch')
| -rw-r--r-- | user/prosody/prosodyctl.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/user/prosody/prosodyctl.patch b/user/prosody/prosodyctl.patch new file mode 100644 index 000000000..18333dd52 --- /dev/null +++ b/user/prosody/prosodyctl.patch @@ -0,0 +1,11 @@ +--- prosody-0.9.10.q/prosodyctl ++++ prosody-0.9.10/prosodyctl +@@ -244,7 +244,7 @@ + local modulemanager = require "core.modulemanager" + + local prosodyctl = require "util.prosodyctl" +-require "socket" ++local socket = require "socket" + ----------------------- + + -- FIXME: Duplicate code waiting for util.startup |