mod_adhoc: Add support for commands only executable by global administrators

[prosody.git] / util / dependencies.lua

diff --git a/util/dependencies.lua b/util/dependencies.lua
index 13f88f794104f73e039b3559c80f1fbfc58943cd..5baea942af4b52781332af029b0c30e47841219d 100644 (file)
--- a/util/dependencies.lua
+++ b/util/dependencies.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -10,6 +10,11 @@ module("dependencies", package.seeall)
 
 function softreq(...) local ok, lib =  pcall(require, ...); if ok then return lib; else return nil, lib; end end
 
+-- Required to be able to find packages installed with luarocks
+if not softreq "luarocks.loader" then -- LuaRocks 2.x
+       softreq "luarocks.require"; -- LuaRocks <1.x
+end
+
 function missingdep(name, sources, msg)
        print("");
        print("**************************");
@@ -30,6 +35,19 @@ function missingdep(name, sources, msg)
        print("");
 end
 
+-- COMPAT w/pre-0.8 Debian: The Debian config file used to use 
+-- util.ztact, which has been removed from Prosody in 0.8. This
+-- is to log an error for people who still use it, so they can
+-- update their configs.
+package.preload["util.ztact"] = function ()
+       if not package.loaded["core.loggingmanager"] then
+               error("util.ztact has been removed from Prosody and you need to fix your config "
+                   .."file. More information can be found at http://prosody.im/doc/packagers#ztact", 0);
+       else
+               error("module 'util.ztact' has been deprecated in Prosody 0.8.");
+       end
+end;
+
 function check_dependencies()
        local fatal;
        
@@ -68,20 +86,11 @@ function check_dependencies()
        local ssl = softreq "ssl"
        
        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", {
-                                       ["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
-       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
+               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
        
        local encodings, err = softreq "util.encodings"
@@ -120,5 +129,13 @@ function check_dependencies()
        return not fatal;
 end
 
+function log_warnings()
+       if ssl then
+               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
+end
 
 return _M;