# HG changeset patch # User Matthew Wild # Date 1228316998 0 # Node ID 3f9f67f1a106267fbeb4a26e2dda81c16f2adeaf # Parent c0f15538f358e86036591bfb352396c576ae720d# Parent 436e4617c85833303d780a65c8bdced53b7729b3 Merge from waqas diff -r c0f15538f358 -r 3f9f67f1a106 AUTHORS --- a/AUTHORS Wed Dec 03 19:57:08 2008 +0500 +++ b/AUTHORS Wed Dec 03 15:09:58 2008 +0000 @@ -2,5 +2,3 @@ Matthew Wild (matthew AT heavy-horse.co.uk) Waqas Hussain (waqas20 AT gmail.com) -Tobias Markmann (tm AT ayena.de) -Paul-Sebastian Manole (brokenthorn AT gmail.com) diff -r c0f15538f358 -r 3f9f67f1a106 COPYING --- a/COPYING Wed Dec 03 19:57:08 2008 +0500 +++ b/COPYING Wed Dec 03 15:09:58 2008 +0000 @@ -281,63 +281,3 @@ POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff -r c0f15538f358 -r 3f9f67f1a106 Makefile --- a/Makefile Wed Dec 03 19:57:08 2008 +0500 +++ b/Makefile Wed Dec 03 15:09:58 2008 +0000 @@ -12,8 +12,7 @@ INSTALLEDMODULES = $(PREFIX)/lib/prosody/modules INSTALLEDDATA = $(DATADIR) -all: prosody.install prosody.cfg.lua.install - $(MAKE) all -C util-src +all: prosody.install prosody.cfg.lua.install util/encodings.so util/hashes.so install: prosody.install prosody.cfg.lua.install util/encodings.so util/encodings.so install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE) $(DATA) @@ -41,12 +40,10 @@ $(MAKE) install -C util-src prosody.install: prosody - cp prosody prosody.install - sed -i "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|;" prosody.install - sed -i "s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|;" prosody.install - sed -i "s|^CFG_DATADIR=.*;$$|CFG_DATADIR='$(INSTALLEDDATA)';|;" prosody.install - # The trailing slash is intentional in this one - sed -i "s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" prosody.install + sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \ + s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|; \ + s|^CFG_DATADIR=.*;$$|CFG_DATADIR='$(INSTALLEDDATA)';|; \ + s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" < prosody > prosody.install prosody.cfg.lua.install: sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > prosody.cfg.lua.install diff -r c0f15538f358 -r 3f9f67f1a106 configure --- a/configure Wed Dec 03 19:57:08 2008 +0500 +++ b/configure Wed Dec 03 15:09:58 2008 +0000 @@ -116,11 +116,15 @@ then if [ "$OSTYPE" = "debian" ] then LUA_SUFFIX="5.1"; + LUA_SUFFIX_SET=yes LUA_INCDIR=/usr/include/lua5.1; + LUA_INCDIR_SET=yes fi if [ "$OSTYPE" = "macosx" ] then LUA_INCDIR=/usr/local/include; + LUA_INCDIR_SET=yes LUA_LIBDIR=/usr/local/lib + LUA_LIBDIR_SET=yes CFLAGS="-bundle -Wl,-undefined,dynamic_lookup" fi fi diff -r c0f15538f358 -r 3f9f67f1a106 core/componentmanager.lua --- a/core/componentmanager.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/core/componentmanager.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local log = require "util.logger".init("componentmanager") diff -r c0f15538f358 -r 3f9f67f1a106 core/configmanager.lua --- a/core/configmanager.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/core/configmanager.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local _G = _G; local setmetatable, loadfile, pcall, rawget, rawset, io = diff -r c0f15538f358 -r 3f9f67f1a106 core/discomanager.lua --- a/core/discomanager.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/core/discomanager.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local helper = require "util.discohelper".new(); local hosts = hosts; @@ -10,7 +30,7 @@ do helper:addDiscoInfoHandler("*host", function(reply, to, from, node) if hosts[to] then - reply:tag("identity", {category="server", type="im", name="lxmppd"}):up(); + reply:tag("identity", {category="server", type="im", name="Prosody"}):up(); return true; end end); diff -r c0f15538f358 -r 3f9f67f1a106 core/modulemanager.lua --- a/core/modulemanager.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/core/modulemanager.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local plugin_dir = CFG_PLUGINDIR or "./plugins/"; diff -r c0f15538f358 -r 3f9f67f1a106 core/offlinemanager.lua --- a/core/offlinemanager.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/core/offlinemanager.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local datamanager = require "util.datamanager"; local st = require "util.stanza"; diff -r c0f15538f358 -r 3f9f67f1a106 core/offlinemessage.lua --- a/core/offlinemessage.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/core/offlinemessage.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + require "util.datamanager" diff -r c0f15538f358 -r 3f9f67f1a106 core/presencemanager.lua --- a/core/presencemanager.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/core/presencemanager.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local log = require "util.logger".init("presencemanager") diff -r c0f15538f358 -r 3f9f67f1a106 core/rostermanager.lua --- a/core/rostermanager.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/core/rostermanager.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local log = require "util.logger".init("rostermanager"); diff -r c0f15538f358 -r 3f9f67f1a106 core/s2smanager.lua --- a/core/s2smanager.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/core/s2smanager.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local hosts = hosts; local sessions = sessions; diff -r c0f15538f358 -r 3f9f67f1a106 core/sessionmanager.lua --- a/core/sessionmanager.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/core/sessionmanager.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local tonumber, tostring = tonumber, tostring; local ipairs, pairs, print, next= ipairs, pairs, print, next; diff -r c0f15538f358 -r 3f9f67f1a106 core/stanza_router.lua --- a/core/stanza_router.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/core/stanza_router.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local log = require "util.logger".init("stanzarouter") diff -r c0f15538f358 -r 3f9f67f1a106 core/usermanager.lua --- a/core/usermanager.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/core/usermanager.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + require "util.datamanager" local datamanager = datamanager; diff -r c0f15538f358 -r 3f9f67f1a106 core/xmlhandlers.lua --- a/core/xmlhandlers.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/core/xmlhandlers.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + require "util.stanza" diff -r c0f15538f358 -r 3f9f67f1a106 net/connlisteners.lua --- a/net/connlisteners.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/net/connlisteners.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local listeners_dir = (CFG_SOURCEDIR or ".").."/net/"; local server_add = require "net.server".add; diff -r c0f15538f358 -r 3f9f67f1a106 net/dns.lua --- a/net/dns.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/net/dns.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + -- public domain 20080404 lua@ztact.com diff -r c0f15538f358 -r 3f9f67f1a106 net/server.lua --- a/net/server.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/net/server.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + --[[ server.lua by blastbeat of the luadch project diff -r c0f15538f358 -r 3f9f67f1a106 net/xmppclient_listener.lua --- a/net/xmppclient_listener.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/net/xmppclient_listener.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local logger = require "logger"; local lxp = require "lxp" diff -r c0f15538f358 -r 3f9f67f1a106 net/xmppserver_listener.lua --- a/net/xmppserver_listener.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/net/xmppserver_listener.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local logger = require "logger"; local lxp = require "lxp" diff -r c0f15538f358 -r 3f9f67f1a106 plugins/mod_console.lua --- a/plugins/mod_console.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/plugins/mod_console.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local connlisteners_register = require "net.connlisteners".register; diff -r c0f15538f358 -r 3f9f67f1a106 plugins/mod_dialback.lua --- a/plugins/mod_dialback.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/plugins/mod_dialback.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local format = string.format; local send_s2s = require "core.s2smanager".send_to_host; diff -r c0f15538f358 -r 3f9f67f1a106 plugins/mod_disco.lua --- a/plugins/mod_disco.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/plugins/mod_disco.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local discomanager_handle = require "core.discomanager".handle; diff -r c0f15538f358 -r 3f9f67f1a106 plugins/mod_legacyauth.lua --- a/plugins/mod_legacyauth.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/plugins/mod_legacyauth.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local st = require "util.stanza"; local t_concat = table.concat; diff -r c0f15538f358 -r 3f9f67f1a106 plugins/mod_ping.lua --- a/plugins/mod_ping.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/plugins/mod_ping.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local st = require "util.stanza"; diff -r c0f15538f358 -r 3f9f67f1a106 plugins/mod_private.lua --- a/plugins/mod_private.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/plugins/mod_private.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local st = require "util.stanza" diff -r c0f15538f358 -r 3f9f67f1a106 plugins/mod_register.lua --- a/plugins/mod_register.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/plugins/mod_register.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local st = require "util.stanza"; local usermanager_user_exists = require "core.usermanager".user_exists; diff -r c0f15538f358 -r 3f9f67f1a106 plugins/mod_roster.lua --- a/plugins/mod_roster.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/plugins/mod_roster.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local st = require "util.stanza" diff -r c0f15538f358 -r 3f9f67f1a106 plugins/mod_saslauth.lua --- a/plugins/mod_saslauth.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/plugins/mod_saslauth.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local st = require "util.stanza"; local sm_bind_resource = require "core.sessionmanager".bind_resource; diff -r c0f15538f358 -r 3f9f67f1a106 plugins/mod_selftests.lua --- a/plugins/mod_selftests.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/plugins/mod_selftests.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local st = require "util.stanza"; local register_component = require "core.componentmanager".register_component; diff -r c0f15538f358 -r 3f9f67f1a106 plugins/mod_time.lua --- a/plugins/mod_time.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/plugins/mod_time.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local st = require "util.stanza"; local datetime = require "util.datetime".datetime; diff -r c0f15538f358 -r 3f9f67f1a106 plugins/mod_tls.lua --- a/plugins/mod_tls.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/plugins/mod_tls.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local st = require "util.stanza"; diff -r c0f15538f358 -r 3f9f67f1a106 plugins/mod_uptime.lua --- a/plugins/mod_uptime.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/plugins/mod_uptime.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local st = require "util.stanza" diff -r c0f15538f358 -r 3f9f67f1a106 plugins/mod_vcard.lua --- a/plugins/mod_vcard.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/plugins/mod_vcard.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + require "util.datamanager" local datamanager = datamanager; diff -r c0f15538f358 -r 3f9f67f1a106 plugins/mod_version.lua --- a/plugins/mod_version.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/plugins/mod_version.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local st = require "util.stanza"; @@ -10,8 +30,8 @@ local function handle_version_request(session, stanza) if stanza.attr.type == "get" then session.send(st.reply(stanza):query(xmlns_version) - :tag("name"):text("lxmppd"):up() - :tag("version"):text("pre-alpha"):up() + :tag("name"):text("Prosody"):up() + :tag("version"):text("0.1"):up() :tag("os"):text("the best operating system ever!")); end end diff -r c0f15538f358 -r 3f9f67f1a106 prosody --- a/prosody Wed Dec 03 19:57:08 2008 +0500 +++ b/prosody Wed Dec 03 15:09:58 2008 +0000 @@ -1,4 +1,24 @@ #!/usr/bin/env lua +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + -- Config here -- diff -r c0f15538f358 -r 3f9f67f1a106 prosody.cfg.lua.dist --- a/prosody.cfg.lua.dist Wed Dec 03 19:57:08 2008 +0500 +++ b/prosody.cfg.lua.dist Wed Dec 03 15:09:58 2008 +0000 @@ -49,7 +49,7 @@ "ping"; -- XMPP Ping "time"; -- Let others know the time here "uptime"; -- Uptime reporting - "console"; -- telnet to port 5528 (needs console_enabled = true) + "console"; -- telnet to port 5582 (needs console_enabled = true) }; -- These are the SSL/TLS-related settings. If you don't want @@ -75,4 +75,4 @@ } enabled = false -- This will disable the host, preserving the config, but denying connections - +>>>>>>> other diff -r c0f15538f358 -r 3f9f67f1a106 tests/test.lua --- a/tests/test.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/tests/test.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + function run_all_tests() dotest "util.jid" diff -r c0f15538f358 -r 3f9f67f1a106 tests/test_core_configmanager.lua --- a/tests/test_core_configmanager.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/tests/test_core_configmanager.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + function get(get, config) config.set("example.com", "test", "testkey", 123); diff -r c0f15538f358 -r 3f9f67f1a106 tests/test_core_s2smanager.lua --- a/tests/test_core_s2smanager.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/tests/test_core_s2smanager.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + function compare_srv_priorities(csp) local r1 = { priority = 10, weight = 0 } local r2 = { priority = 100, weight = 0 } diff -r c0f15538f358 -r 3f9f67f1a106 tests/test_core_stanza_router.lua --- a/tests/test_core_stanza_router.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/tests/test_core_stanza_router.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + function core_process_stanza(core_process_stanza) local s2sout_session = { to_host = "remotehost", from_host = "localhost", type = "s2sout" } diff -r c0f15538f358 -r 3f9f67f1a106 tests/test_sasl.lua --- a/tests/test_sasl.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/tests/test_sasl.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + --- WARNING! --- -- This file contains a mix of encodings below. -- Many editors will unquestioningly convert these for you. diff -r c0f15538f358 -r 3f9f67f1a106 tests/test_util_jid.lua --- a/tests/test_util_jid.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/tests/test_util_jid.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + function split(split) function test(input_jid, expected_node, expected_server, expected_resource) diff -r c0f15538f358 -r 3f9f67f1a106 tools/ejabberd2prosody.lua --- a/tools/ejabberd2prosody.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/tools/ejabberd2prosody.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,4 +1,24 @@ #!/usr/bin/env lua +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + require "erlparse"; require "serialize"; diff -r c0f15538f358 -r 3f9f67f1a106 tools/erlparse.lua --- a/tools/erlparse.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/tools/erlparse.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local file = nil; local last = nil; diff -r c0f15538f358 -r 3f9f67f1a106 tools/serialize.lua --- a/tools/serialize.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/tools/serialize.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local indent = function(i) return string.rep("\t", i); diff -r c0f15538f358 -r 3f9f67f1a106 util-src/Makefile --- a/util-src/Makefile Wed Dec 03 19:57:08 2008 +0500 +++ b/util-src/Makefile Wed Dec 03 15:09:58 2008 +0000 @@ -12,8 +12,7 @@ all: encodings.so hashes.so install: encodings.so hashes.so - strip *.so - cp *.so ../util/ + install -s *.so ../util/ clean: diff -r c0f15538f358 -r 3f9f67f1a106 util-src/encodings.c --- a/util-src/encodings.c Wed Dec 03 19:57:08 2008 +0500 +++ b/util-src/encodings.c Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +/* Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + + /* * encodings.c * Lua library for base64, stringprep and idna encodings diff -r c0f15538f358 -r 3f9f67f1a106 util-src/hashes.c --- a/util-src/hashes.c Wed Dec 03 19:57:08 2008 +0500 +++ b/util-src/hashes.c Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +/* Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + + /* * hashes.c * Lua library for sha1, sha256 and md5 hashes diff -r c0f15538f358 -r 3f9f67f1a106 util/datamanager.lua --- a/util/datamanager.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/util/datamanager.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local format = string.format; local setmetatable, type = setmetatable, type; local pairs, ipairs = pairs, ipairs; diff -r c0f15538f358 -r 3f9f67f1a106 util/datetime.lua --- a/util/datetime.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/util/datetime.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + -- XEP-0082: XMPP Date and Time Profiles local os_date = os.date; diff -r c0f15538f358 -r 3f9f67f1a106 util/dependencies.lua --- a/util/dependencies.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/util/dependencies.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local fatal; local function softreq(...) local ok, lib = pcall(require, ...); if ok then return lib; else return nil; end end diff -r c0f15538f358 -r 3f9f67f1a106 util/discohelper.lua --- a/util/discohelper.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/util/discohelper.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local t_insert = table.insert; local jid_split = require "util.jid".split; diff -r c0f15538f358 -r 3f9f67f1a106 util/import.lua --- a/util/import.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/util/import.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local t_insert = table.insert; function import(module, ...) diff -r c0f15538f358 -r 3f9f67f1a106 util/jid.lua --- a/util/jid.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/util/jid.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local match = string.match; diff -r c0f15538f358 -r 3f9f67f1a106 util/logger.lua --- a/util/logger.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/util/logger.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local format, rep = string.format, string.rep; local io_write = io.write; diff -r c0f15538f358 -r 3f9f67f1a106 util/sasl.lua --- a/util/sasl.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/util/sasl.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,16 @@ +-- sasl.lua v0.1 +-- Copyright (C) 2008 Tobias Markmann +-- +-- All rights reserved. +-- +-- Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +-- +-- * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +-- * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +-- * Neither the name of Tobias Markmann nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. +-- +-- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + local md5 = require "util.hashes".md5; local log = require "util.logger".init("sasl"); @@ -196,4 +209,4 @@ return object end -return _M; \ No newline at end of file +return _M; diff -r c0f15538f358 -r 3f9f67f1a106 util/stanza.lua --- a/util/stanza.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/util/stanza.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local t_insert = table.insert; local t_remove = table.remove; local s_format = string.format; diff -r c0f15538f358 -r 3f9f67f1a106 util/termcolours.lua --- a/util/termcolours.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/util/termcolours.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local t_concat, t_insert = table.concat, table.insert; local char, format = string.char, string.format; local ipairs = ipairs; diff -r c0f15538f358 -r 3f9f67f1a106 util/uuid.lua --- a/util/uuid.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/util/uuid.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + local m_random = math.random; module "uuid" diff -r c0f15538f358 -r 3f9f67f1a106 util/ztact.lua --- a/util/ztact.lua Wed Dec 03 19:57:08 2008 +0500 +++ b/util/ztact.lua Wed Dec 03 15:09:58 2008 +0000 @@ -1,3 +1,23 @@ +-- Prosody IM v0.1 +-- Copyright (C) 2008 Matthew Wild +-- Copyright (C) 2008 Waqas Hussain +-- +-- This program is free software; you can redistribute it and/or +-- modify it under the terms of the GNU General Public License +-- as published by the Free Software Foundation; either version 2 +-- of the License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- + + -- public domain 20080410 lua@ztact.com