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/luasec-0.6-fix.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/luasec-0.6-fix.patch')
| -rw-r--r-- | user/prosody/luasec-0.6-fix.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/user/prosody/luasec-0.6-fix.patch b/user/prosody/luasec-0.6-fix.patch new file mode 100644 index 000000000..c8e37d091 --- /dev/null +++ b/user/prosody/luasec-0.6-fix.patch @@ -0,0 +1,14 @@ +diff --git a/util/dependencies.lua b/util/dependencies.lua +index 4d50cf6..9ea211d 100644 +--- a/util/dependencies.lua ++++ b/util/dependencies.lua +@@ -99,6 +99,9 @@ function check_dependencies() + ["luarocks"] = "luarocks install luasec"; + ["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/"; + }, "SSL/TLS support will not be available"); ++ elseif not _G.ssl then ++ _G.ssl = ssl; ++ _G.ssl.context = require "ssl.context"; + end + + local encodings, err = softreq "util.encodings" |