X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fdependencies.lua;h=cb0226448268c01f5f5e6ecb630ce08f27b79d20;hb=04a2051ee150255ca12514016c0b451851c5c1ca;hp=6decfba5c92e616fd187a24397aa0a8bc3952fd3;hpb=7bafec033f0e18e242122470ff618814c2761982;p=prosody.git diff --git a/util/dependencies.lua b/util/dependencies.lua index 6decfba5..cb022644 100644 --- a/util/dependencies.lua +++ b/util/dependencies.lua @@ -17,8 +17,12 @@ local function missingdep(name, sources, msg) print("Prosody was unable to find "..tostring(name)); print("This package can be obtained in the following ways:"); print(""); - for k,v in pairs(sources) do - print("", k, v); + local longest_platform = 0; + for platform in pairs(sources) do + longest_platform = math.max(longest_platform, #platform); + end + for platform, source in pairs(sources) do + print("", platform..":"..(" "):rep(4+longest_platform-#platform)..source); end print(""); print(msg or (name.." is required for Prosody to run, so we will now exit.")); @@ -53,7 +57,7 @@ local lfs, err = softreq "lfs" if not lfs then missingdep("luafilesystem", { ["luarocks"] = "luarocks install luafilesystem"; - ["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-luafilesystem0"; + ["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-filesystem0"; ["Source"] = "http://www.keplerproject.org/luafilesystem/"; }); fatal = true; @@ -71,6 +75,11 @@ if not ssl then ["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/"; }, "SSL/TLS support will not be available"); end +else + local major, minor, veryminor, patched = ssl._VERSION:match("(%d+)%.(%d+)%.?(%d*)(M?)"); + if not major or ((tonumber(major) == 0 and (tonumber(minor) or 0) <= 3 and (tonumber(veryminor) or 0) <= 2) and patched ~= "M") then + log("error", "This version of LuaSec contains a known bug that causes disconnects, see http://prosody.im/doc/depends"); + end end local encodings, err = softreq "util.encodings"