From a1cca576be8eeb34d63963f14785445d99bc355f Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 23 Nov 2009 02:58:42 +0000 Subject: util.dependencies: Make the commands line up properly in the "missing dependency" output. Yes, this was the commit you didn't know you were waiting for! --- util/dependencies.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'util/dependencies.lua') diff --git a/util/dependencies.lua b/util/dependencies.lua index 5b07072f..cbdecc10 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.")); -- cgit v1.2.3 From b3b272859867ff184d622969f903ffcc60e7b906 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 23 Nov 2009 17:31:49 +0000 Subject: util.dependencies: Add LuaFileSystem as a hard dependency --- util/dependencies.lua | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'util/dependencies.lua') diff --git a/util/dependencies.lua b/util/dependencies.lua index 5b07072f..a0f4e453 100644 --- a/util/dependencies.lua +++ b/util/dependencies.lua @@ -41,6 +41,15 @@ if not socket then fatal = true; end +local lfs, err = softreq "lfs" +if not lfs then + missingdep("luafilesystem", { ["luarocks"] = "luarocks install luafilesystem"; + ["Ubuntu 8.04 (Hardy)"] = "sudo apt-get install liblua5.1-luafilesystem0"; + ["Source"] = "http://www.keplerproject.org/luafilesystem/"; + }); + fatal = true; +end + local ssl = softreq "ssl" if not ssl then -- cgit v1.2.3 From 86de4680024ddfcaaaf38dee06a177efb5f3d352 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 23 Nov 2009 18:51:54 +0000 Subject: util.dependencies: Clearer message, add homepages, etc. --- util/dependencies.lua | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'util/dependencies.lua') diff --git a/util/dependencies.lua b/util/dependencies.lua index a0f4e453..6e0cfe14 100644 --- a/util/dependencies.lua +++ b/util/dependencies.lua @@ -30,23 +30,32 @@ end local lxp = softreq "lxp" if not lxp then - missingdep("luaexpat", { ["Ubuntu 8.04 (Hardy)"] = "sudo apt-get install liblua5.1-expat0"; ["luarocks"] = "luarocks install luaexpat"; }); + missingdep("luaexpat", { + ["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-expat0"; + ["luarocks"] = "luarocks install luaexpat"; + ["Source"] = "http://www.keplerproject.org/luaexpat/"; + }); fatal = true; end local socket = softreq "socket" if not socket then - missingdep("luasocket", { ["Ubuntu 8.04 (Hardy)"] = "sudo apt-get install liblua5.1-socket2"; ["luarocks"] = "luarocks install luasocket"; }); + missingdep("luasocket", { + ["Ubuntu"] = "sudo apt-get install liblua5.1-socket2"; + ["luarocks"] = "luarocks install luasocket"; + ["Source"] = "http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/"; + }); fatal = true; end local lfs, err = softreq "lfs" if not lfs then - missingdep("luafilesystem", { ["luarocks"] = "luarocks install luafilesystem"; - ["Ubuntu 8.04 (Hardy)"] = "sudo apt-get install liblua5.1-luafilesystem0"; - ["Source"] = "http://www.keplerproject.org/luafilesystem/"; - }); + missingdep("luafilesystem", { + ["luarocks"] = "luarocks install luafilesystem"; + ["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-luafilesystem0"; + ["Source"] = "http://www.keplerproject.org/luafilesystem/"; + }); fatal = true; end @@ -56,7 +65,11 @@ if not ssl then if config.get("*", "core", "run_without_ssl") then log("warn", "Running without SSL support because run_without_ssl is defined in the config"); else - missingdep("LuaSec", { ["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/" }, "SSL/TLS support will not be available"); + missingdep("LuaSec", { + ["Debian/Ubuntu"] = "http://prosody.im/download/start#debian_and_ubuntu"; + ["luarocks"] = "luarocks install luasec"; + ["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/"; + }, "SSL/TLS support will not be available"); end end -- cgit v1.2.3 From a918d40c046d0cc4576ece7799e3b8ffc69e31d4 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 23 Nov 2009 19:59:32 +0000 Subject: util.dependencies: Missed a Debian/ --- util/dependencies.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/dependencies.lua') diff --git a/util/dependencies.lua b/util/dependencies.lua index 6e0cfe14..6decfba5 100644 --- a/util/dependencies.lua +++ b/util/dependencies.lua @@ -42,7 +42,7 @@ local socket = softreq "socket" if not socket then missingdep("luasocket", { - ["Ubuntu"] = "sudo apt-get install liblua5.1-socket2"; + ["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-socket2"; ["luarocks"] = "luarocks install luasocket"; ["Source"] = "http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/"; }); -- cgit v1.2.3 From 38e55888e5c0a041f876281cfeb6230be406c7c3 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Wed, 25 Nov 2009 15:40:33 +0000 Subject: util.dependencies: Log an error if the current version of LuaSec installed contains The Bug (thanks Remko) --- util/dependencies.lua | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'util/dependencies.lua') diff --git a/util/dependencies.lua b/util/dependencies.lua index 6decfba5..790045eb 100644 --- a/util/dependencies.lua +++ b/util/dependencies.lua @@ -71,6 +71,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" -- cgit v1.2.3