mod_storage_sql2: Fix SQL syntax

[prosody.git] / util / dependencies.lua

diff --git a/util/dependencies.lua b/util/dependencies.lua
index 9371521caeca1817320af115c5d2160639b05ec2..109a3332e9180c50dcc0915cd4d3af0d53340584 100644 (file)
--- a/util/dependencies.lua
+++ b/util/dependencies.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- 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.
 --
@@ -35,11 +35,24 @@ 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;
-       
+
        local lxp = softreq "lxp"
-       
+
        if not lxp then
                missingdep("luaexpat", {
                                ["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-expat0";
@@ -48,9 +61,9 @@ function check_dependencies()
                        });
                fatal = true;
        end
-       
+
        local socket = softreq "socket"
-       
+
        if not socket then
                missingdep("luasocket", {
                                ["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-socket2";
@@ -59,7 +72,7 @@ function check_dependencies()
                        });
                fatal = true;
        end
-       
+
        local lfs, err = softreq "lfs"
        if not lfs then
                missingdep("luafilesystem", {
@@ -69,9 +82,9 @@ function check_dependencies()
                        });
                fatal = true;
        end
-       
+
        local ssl = softreq "ssl"
-       
+
        if not ssl then
                missingdep("LuaSec", {
                                ["Debian/Ubuntu"] = "http://prosody.im/download/start#debian_and_ubuntu";
@@ -79,7 +92,7 @@ function check_dependencies()
                                ["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/";
                        }, "SSL/TLS support will not be available");
        end
-       
+
        local encodings, err = softreq "util.encodings"
        if not encodings then
                if err:match("not found") then
@@ -123,6 +136,14 @@ function log_warnings()
                        log("error", "This version of LuaSec contains a known bug that causes disconnects, see http://prosody.im/doc/depends");
                end
        end
+       if lxp then
+               if not pcall(lxp.new, { StartDoctypeDecl = false }) then
+                       log("error", "The version of LuaExpat on your system leaves Prosody "
+                               .."vulnerable to denial-of-service attacks. You should upgrade to "
+                               .."LuaExpat 1.1.1 or higher as soon as possible. See "
+                               .."http://prosody.im/doc/depends#luaexpat for more information.");
+               end
+       end
 end
 
 return _M;