--- prosody-0.8.1.orig/debian/ejabberd2prosody.man.txt +++ prosody-0.8.1/debian/ejabberd2prosody.man.txt @@ -0,0 +1,16 @@ +NAME + ejabberd2prosody - ejabbed db dump importer for prosody + +SYNOPSIS + ejabberd2prosody file + +DESCRIPTION + The ejabberd dump file can be generated with the following command: + + ejabberdctl dump file + +SEE ALSO + prosodyctl(8), prosody(8) + +AUTHOR + Matthew Wild --- prosody-0.8.1.orig/debian/watch +++ prosody-0.8.1/debian/watch @@ -0,0 +1,8 @@ +# test this watch file using: +# uscan --watchfile debian/watch --upstream-version 0.0.1 --package prosody +# +version=3 +opts="uversionmangle=s/rc/~rc/" \ +http://prosody.im/downloads/source/ prosody-(.*).tar.gz +opts="uversionmangle=s/rc/~rc/" \ +http://prosody.im/tmp/(\d.\d.\d.*)/ prosody-(.*).tar.gz --- prosody-0.8.1.orig/debian/prosody.docs +++ prosody-0.8.1/debian/prosody.docs @@ -0,0 +1 @@ +doc/ --- prosody-0.8.1.orig/debian/prosody.links +++ prosody-0.8.1/debian/prosody.links @@ -0,0 +1 @@ +etc/prosody/conf.avail/localhost.cfg.lua etc/prosody/conf.d/localhost.cfg.lua --- prosody-0.8.1.orig/debian/prosody.install +++ prosody-0.8.1/debian/prosody.install @@ -0,0 +1,7 @@ +usr/bin/* +usr/lib/prosody +etc/prosody/prosody* +etc/prosody/migrator.cfg.lua +localhost.cfg.lua etc/prosody/conf.avail/ +example.com.cfg.lua etc/prosody/conf.avail/ +debian/README etc/prosody/ --- prosody-0.8.1.orig/debian/copyright +++ prosody-0.8.1/debian/copyright @@ -0,0 +1,74 @@ +This package was debianized by Matthew James Wild on +Fri, 28 Nov 2008 01:07:10 +0000. + +It was downloaded from http://prosody.im/ + +Upstream Authors: + + Matthew Wild + Waqas Hussain + Tobias Markmann + +Copyright: + + Copyright (C) 2008 Matthew Wild + Copyright (C) 2008 Waqas Hussain + +License: + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + + +The file util-src/lsignal.c is + Copyright (C) 2007 Patrick J. Donnelly (batrick@unm.edu) + with the same license as above. + + +The file util/sasl.lua is 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. + + +The Debian packaging is (C) 2008, Matthew James Wild and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- prosody-0.8.1.orig/debian/prosody-migrator.man.txt +++ prosody-0.8.1/debian/prosody-migrator.man.txt @@ -0,0 +1,36 @@ +NAME + prosody-migrator - Migrate data between Prosody data stores + +SYNOPSIS + prosody-migrator [OPTIONS] [SOURCE_STORE DESTINATION_STORE] + +DESCRIPTION + prosody-migrator is used to move data (user accounts, rosters, vcards, etc.) + between different data stores. For example this allows you to migrate data from + a file-based store to an SQL database, and vice-versa. + + Note: the migrator assumes that the destination store is empty. Existing data + that conflicts with data in the source store will be overwritten! + +OPTIONS + --config=FILENAME + Specify an alternative config file to use. The default is + /etc/prosody/migrator.cfg.lua. + + SOURCE_STORE + The name of the store (defined in the config file) to migrate data from. + Defaults to 'input'. + + DESTINATION_STORE + The name of the store (also defined in the config file) to migrate data to. + Defaults to 'output'. + +FILES + /etc/prosody/migrator.cfg.lua + The migrator config file. + +SEE ALSO + prosody(8), prosodyctl(8) + +AUTHOR + Matthew Wild --- prosody-0.8.1.orig/debian/changelog +++ prosody-0.8.1/debian/changelog @@ -0,0 +1,99 @@ +prosody (0.8.1-1) unstable; urgency=high + + * New upstream release (Closes: #622638) + * Depend on lua-expat >= 1.2.0 to fix DoS attack (Closes: #629234) + + -- Enrico Tassi Sat, 04 Jun 2011 18:42:47 +0200 + +prosody (0.8.0-1) unstable; urgency=low + + [ Matthew James Wild ] + * New upstream release. (closes: #614175, #620882) + * Relocate all Prosody modules into /usr/lib/prosody. (closes: #600370) + + [ Enrico Tassi ] + * Removed prosody.dirs, usr/lib/lua/5.1/util/ not needed + * Bumped standards version to 3.9.1. no changes needed + * Added watch file + + -- Enrico Tassi Mon, 23 May 2011 10:07:42 +0200 + +prosody (0.7.0-1) unstable; urgency=low + + * New upstream release. + * Check username and process name along with pidfile before stopping + prosody daemon (closes: #580185). + * Strictened dependency on liblua5.1-filesystem0 to versions with fixed + umask bug in mkdir procedure (closes: #579087). + * Use an absolute SSL certificate and key paths in config example + /etc/prosody/conf.avail/example.com.cfg.lua (closes: #581682). + * Added $syslog dependency to the prosody init script. + * Added liblua5.1-event0 (which provides support for a large number of + network connections) to recommended dependencies. + * Bumped standards version to 3.9.0. + + -- Sergei Golovan Mon, 05 Jul 2010 20:55:28 +0400 + +prosody (0.6.2-2) unstable; urgency=low + + * Fixed changing ownership and permissions of the old prosody config + file (closes: #578837). + * Added required-stop dependency on $remote_fs for prosody init script + because it requires /usr/bin/prosody existence to run. Also, removed + unnecessary dependency on $local_fs. + * Bumped standards version to 3.8.4. + + -- Sergei Golovan Sun, 25 Apr 2010 10:37:20 +0400 + +prosody (0.6.2-1) unstable; urgency=low + + [ Enrico Tassi ] + * Fixed typo in config file. Thanks Tollef Fog Heen (Closes: #563795) + + [ Sergei Golovan ] + * New upstream release. + * Remove prosody group on package purge. + * Make /etc/prosody directory readable, so the config filename can be + completed in case user enters 'sudo vi /etc/prosody/pr'. The config + file itself is world-unreadable now. + * Don't change ownership and permissions of prosody config, log and + database directories if they are overridden by dpkg-statoverride. + + -- Sergei Golovan Sun, 18 Apr 2010 11:57:22 +0400 + +prosody (0.6.1-1) unstable; urgency=low + + * New upstream release. + * Replaced no_daemonize option by daemonize in the prosody config file. + + -- Sergei Golovan Sun, 13 Dec 2009 16:23:07 +0300 + +prosody (0.5.2-2) unstable; urgency=low + + [ Enrico Tassi ] + * recommend liblua5.1-sec1 instead of liblua5.1-sec0 + + -- Enrico Tassi Tue, 17 Nov 2009 10:11:50 +0100 + +prosody (0.5.2-1) unstable; urgency=low + + [ Sergei Golovan ] + * New upstream release. + * Change log rotating frequency to weekly, compress logs, and create log + files with adm group instead of prosody and with permissions 640. + * Added copyright note for util-src/lsignal.c file to debian/copyright + and reformatted it to fit 80 character lines. + * Added README.source which explains how to get patched source given the + pristine source and the series of patches in debian/patches. + * Bumped standards version to 3.8.3. + + [ Matthew James Wild ] + * Suppress output of reload during logrotate, avoiding emails from cron. + + -- Sergei Golovan Wed, 30 Sep 2009 20:44:14 +0400 + +prosody (0.5.1-1) unstable; urgency=low + + * Initial release (closes: #538130). + + -- Sergei Golovan Fri, 31 Jul 2009 13:43:15 +0400 --- prosody-0.8.1.orig/debian/README.source +++ prosody-0.8.1/debian/README.source @@ -0,0 +1,8 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To get detailed instructions on how to apply the series of patches +and modify them, please read /usr/share/doc/quilt/README.source + + -- Sergei Golovan Wed, 30 Sep 2009 20:43:54 +0400 --- prosody-0.8.1.orig/debian/README +++ prosody-0.8.1/debian/README @@ -0,0 +1,9 @@ +Prosody configuration directory +=============================== + +The configuration file /etc/prosody/prosody.cfg.lua should contain +only global settings. + +Per-host configuration files should be placed in /etc/prosody/conf.avail/, +and the active ones should be linked in /etc/prosody/conf.d/ + --- prosody-0.8.1.orig/debian/prosody.man.txt +++ prosody-0.8.1/debian/prosody.man.txt @@ -0,0 +1,18 @@ +NAME + prosody - Prosody XMPP Server + +SYNOPSIS + prosody + +DESCRIPTION + Prosody is an XMPP server. + It should be started using the startup script in /etc/init.d/prosody. + +SEE ALSO + prosodyctl(8) + +FILES + /etc/prosody/prosody.cfg.lua + +AUTHOR + Matthew Wild --- prosody-0.8.1.orig/debian/prosodyctl.man.txt +++ prosody-0.8.1/debian/prosodyctl.man.txt @@ -0,0 +1,28 @@ +NAME + prosodyctl - Manage Prosody XMPP Server + +SYNOPSIS + prosodyctl COMMAND [OPTIONS] + +DESCRIPTION + prosodyctl is an utility to manage a prosody server. + +OPTIONS + adduser JID Create the specified user account in Prosody + + passwd JID Set the password for the specified user account in Prosody + + deluser JID Permanently remove the specified user account from Prosody + + stop Stop a running Prosody server + + start Start Prosody + + status Reports the running status of Prosody + + +SEE ALSO + prosody(8) + +AUTHOR + Matthew Wild --- prosody-0.8.1.orig/debian/prosody.init +++ prosody-0.8.1/debian/prosody.init @@ -0,0 +1,99 @@ +#! /bin/sh + +### BEGIN INIT INFO +# Provides: prosody +# Required-Start: $network $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Prosody XMPP Server +### END INIT INFO + +set -e + +# /etc/init.d/prosody: start and stop Prosody XMPP server + +USER=prosody +DAEMON=/usr/bin/prosody +PIDFILE=/var/run/prosody/prosody.pid + +test -x "$DAEMON" || exit 0 + +. /lib/lsb/init-functions + +start_prosody () { + mkdir -p `dirname $PIDFILE` + chown prosody:adm `dirname $PIDFILE` + if start-stop-daemon --start --quiet --pidfile "$PIDFILE" \ + --chuid "$USER" --oknodo --user "$USER" --name lua \ + --startas "$DAEMON"; + then + return 0 + else + return 1 + fi +} + +stop_prosody () { + if start-stop-daemon --stop --quiet --retry 30 \ + --oknodo --pidfile "$PIDFILE" --user "$USER" --name lua; + then + return 0 + else + return 1 + fi +} + +signal_prosody () { + if start-stop-daemon --stop --quiet --pidfile "$PIDFILE" \ + --user "$USER" --name lua --oknodo --signal $1; + then + return 0 + else + return 1 + fi +} + +case "$1" in + start) + log_daemon_msg "Starting Prosody XMPP Server" "prosody" + if start_prosody; then + log_end_msg 0; + else + log_end_msg 1; + fi + ;; + stop) + log_daemon_msg "Stopping Prosody XMPP Server" "prosody" + if stop_prosody; then + log_end_msg 0; + else + log_end_msg 1; + fi + ;; + force-reload|restart) + log_daemon_msg "Restarting Prosody XMPP Server" "prosody" + + stop_prosody + + if start_prosody; then + log_end_msg 0; + else + log_end_msg 1; + fi + ;; + reload) + log_daemon_msg "Reloading Prosody XMPP Server" "prosody" + + if signal_prosody 1; then + log_end_msg 0; + else + log_end_msg 1; + fi + ;; + *) + log_action_msg "Usage: /etc/init.d/prosody {start|stop|restart|reload}" + exit 1 +esac + +exit 0 --- prosody-0.8.1.orig/debian/compat +++ prosody-0.8.1/debian/compat @@ -0,0 +1 @@ +7 --- prosody-0.8.1.orig/debian/prosody.postinst +++ prosody-0.8.1/debian/prosody.postinst @@ -0,0 +1,122 @@ +#!/bin/sh +# postinst script for prosody + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in + configure) + if ! getent passwd prosody >/dev/null; then + adduser --disabled-password --quiet --system \ + --home "/var/lib/prosody" --no-create-home \ + --gecos "Prosody XMPP Server" --group prosody + fi + + # Create directory for log files + if [ ! -d "/var/log/prosody" ]; then + install -d -o prosody -g adm -m 750 "/var/log/prosody"; + fi + if ! dpkg-statoverride --list "/var/log/prosody" >/dev/null; then + chown prosody:adm "/var/log/prosody" + chmod 750 "/var/log/prosody" + fi + + # Create data directory + if [ ! -d "/var/lib/prosody" ]; then + install -d -o prosody -g prosody -m 750 "/var/lib/prosody"; + fi + if ! dpkg-statoverride --list "/var/lib/prosody" >/dev/null; then + chown prosody:prosody "/var/lib/prosody" + chmod 750 "/var/lib/prosody" + fi + + # Fix config directory permissions + if ! dpkg-statoverride --list "/etc/prosody" >/dev/null; then + chown root:root "/etc/prosody" + chmod 755 "/etc/prosody" + fi + + # Fix config file permissions + if ! dpkg-statoverride --list "/etc/prosody/prosody.cfg.lua" >/dev/null; then + for f in "/etc/prosody/prosody.cfg.lua" \ + /etc/prosody/prosody.cfg.lua.dpkg*; do + if [ -f $f ]; then + chown root:prosody $f + chmod 640 $f + fi + done + fi + + # Create subdirs for conf files + if [ ! -d "/etc/prosody/conf.d" ]; then + install -d -o root -g prosody -m 754 "/etc/prosody/conf.d"; + fi + if ! dpkg-statoverride --list "/etc/prosody/conf.d" >/dev/null; then + chown root:prosody "/etc/prosody/conf.d" + chmod 754 "/etc/prosody/conf.d" + fi + + if [ ! -d "/etc/prosody/conf.avail" ]; then + install -d -o root -g prosody -m 754 "/etc/prosody/conf.avail"; + fi + if ! dpkg-statoverride --list "/etc/prosody/conf.avail" >/dev/null; then + chown root:prosody "/etc/prosody/conf.avail" + chmod 754 "/etc/prosody/conf.avail" + fi + + # Making SSL certificate and key if they do not exist + if [ ! -d "/etc/prosody/certs" ]; then + install -d -o root -g prosody -m 750 "/etc/prosody/certs"; + fi + if ! dpkg-statoverride --list "/etc/prosody/certs" >/dev/null; then + chown root:prosody "/etc/prosody/certs" + chmod 750 "/etc/prosody/certs" + fi + if [ ! -f "/etc/prosody/certs/localhost.cert" ] || \ + [ ! -f "/etc/prosody/certs/localhost.key" ]; then + HOST=$(hostname -s 2>/dev/null || echo localhost) + DOMAIN=$(hostname -d 2>/dev/null || echo localdomain) + openssl req -new -x509 -days 365 -nodes \ + -out "/etc/prosody/certs/localhost.cert" \ + -keyout "/etc/prosody/certs/localhost.key" >/dev/null \ + 2>&1 <<+++ +. +. +. +$DOMAIN +$HOST +localhost +root@$HOST.$DOMAIN ++++ + fi + + if grep -q 'require "util.ztact"' /etc/prosody/prosody.cfg.lua; then + # Upgrade config from pre-0.8.0 (removes util.ztact usage) + echo "Deprecated method for including conf.d/* detected in"\ + "prosody.cfg.lua. Fixing config file in-place, current version"\ + "will be saved as /etc/prosody/prosody.cfg.lua.dpkg-bak" >&2; + sed -e 's|^local ztact = require "util.ztact"$||'\ + -e 'T;: loop;N;s|^--------*$||m;t end;b loop;:end; i\' \ + -e 'Include "conf.d/*.cfg.lua"' \ + -e 'd' -i.dpkg-bak /etc/prosody/prosody.cfg.lua; + fi + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# --- prosody-0.8.1.orig/debian/prosody.logrotate +++ prosody-0.8.1/debian/prosody.logrotate @@ -0,0 +1,11 @@ +/var/log/prosody/prosody.log /var/log/prosody/prosody.err { + weekly + rotate 52 + compress + create 640 prosody adm + postrotate + /etc/init.d/prosody reload > /dev/null + endscript + sharedscripts + missingok +} --- prosody-0.8.1.orig/debian/control +++ prosody-0.8.1/debian/control @@ -0,0 +1,18 @@ +Source: prosody +Section: net +Priority: extra +Maintainer: Matthew James Wild +Uploaders: Enrico Tassi , Sergei Golovan +Build-Depends: lua5.1, liblua5.1-dev, libidn11-dev, libssl-dev, debhelper (>> 7.2.5), txt2man, quilt (>= 0.46-7) +Standards-Version: 3.9.1 +Homepage: http://www.prosody.im/ + +Package: prosody +Architecture: any +Depends: adduser, openssl, lua5.1, liblua5.1-0, liblua5.1-expat0 (>= 1.2.0), liblua5.1-socket2, + ${shlibs:Depends}, ${misc:Depends}, liblua5.1-filesystem0 (>= 1.4.2-3~) +Recommends: liblua5.1-sec1, liblua5.1-event0 +Description: Lightweight Jabber/XMPP server written in Lua + Prosody IM is a simple-to-use XMPP server. It is designed to be easy to + extend via plugins, and light on resources. + --- prosody-0.8.1.orig/debian/prosody.lintian-overrides +++ prosody-0.8.1/debian/prosody.lintian-overrides @@ -0,0 +1 @@ +prosody binary: possible-gpl-code-linked-with-openssl --- prosody-0.8.1.orig/debian/prosody.manpages +++ prosody-0.8.1/debian/prosody.manpages @@ -0,0 +1,4 @@ +prosody.8 +prosodyctl.8 +ejabberd2prosody.8 +prosody-migrator.8 --- prosody-0.8.1.orig/debian/rules +++ prosody-0.8.1/debian/rules @@ -0,0 +1,38 @@ +#!/usr/bin/make -f + +%: + dh --with quilt $@ + +override_dh_auto_configure: + ./configure --lua-suffix=5.1 --with-lua-include=/usr/include/lua5.1 --prefix=/usr --with-ssl=crypto + +override_dh_auto_build: + dh_auto_build + $(MAKE) -C tools/migration + +override_dh_auto_install: + $(MAKE) install DESTDIR=debian/tmp + $(MAKE) -C tools/migration install DESTDIR=../../debian/tmp + cp tools/ejabberd2prosody.lua debian/tmp/usr/bin/ejabberd2prosody + cp tools/erlparse.lua debian/tmp/usr/lib/prosody/util + +override_dh_installman: + txt2man -t "prosody 8" -r "Prosody IM" -v "" debian/prosody.man.txt | sed 1d > prosody.8 + txt2man -t "prosodyctl 8" -r "Prosody IM" -v "" debian/prosodyctl.man.txt | sed 1d > prosodyctl.8 + txt2man -t "ejabberd2prosody 8" -r "Prosody IM" -v "" debian/ejabberd2prosody.man.txt | sed 1d > ejabberd2prosody.8 + txt2man -t "prosody-migrator 8" -r "Prosody IM" -v "" debian/prosody-migrator.man.txt | sed 1d > prosody-migrator.8 + dh_installman + +override_dh_install: + dh_install + # configuration + chmod a-x debian/prosody/usr/lib/prosody/prosody.version + +override_dh_clean: + if [ -f config.unix ]; then \ + make -C tools/migration clean \ + make clean; \ + rm -f config.unix; \ + fi + rm -f prosody.8 prosodyctl.8 ejabberd2prosody.8 prosody-migrator.8 + dh_clean --- prosody-0.8.1.orig/debian/prosody.postrm +++ prosody-0.8.1/debian/prosody.postrm @@ -0,0 +1,34 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" = "purge" ] ; then + # Delete localhost SSL certificate + if [ -d "/etc/prosody/certs" ]; then + rm -f "/etc/prosody/certs/localhost.cert" + rm -f "/etc/prosody/certs/localhost.key" + rmdir --ignore-fail-on-non-empty "/etc/prosody/certs" + fi + + # Delete directory for .pid + if [ -d "/var/run/prosody" ]; then + rm -rf "/var/run/prosody"; + fi + + # Delete directory for users data + if [ -d "/var/lib/prosody" ]; then + rm -rf "/var/lib/prosody"; + fi + + # Delete directory for log files + if [ -d "/var/log/prosody" ]; then + rm -rf "/var/log/prosody"; + fi + + # Delete user 'prosody' + userdel prosody > /dev/null || true + groupdel prosody > /dev/null || true + +fi --- prosody-0.8.1.orig/debian/patches/conf.patch +++ prosody-0.8.1/debian/patches/conf.patch @@ -0,0 +1,124 @@ +Index: prosody-0.8.0/prosody.cfg.lua.dist +=================================================================== +--- prosody-0.8.0.orig/prosody.cfg.lua.dist 2011-04-05 14:47:06.000000000 +0100 ++++ prosody-0.8.0/prosody.cfg.lua.dist 2011-04-05 14:57:27.000000000 +0100 +@@ -59,7 +59,6 @@ + --"admin_telnet"; -- Opens telnet console interface on localhost port 5582 + + -- Other specific functionality +- --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc. + --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP" + --"httpserver"; -- Serve static files from a directory over HTTP + --"groups"; -- Shared roster support +@@ -67,6 +66,9 @@ + --"welcome"; -- Welcome users who register accounts + --"watchregistrations"; -- Alert admins of registrations + --"motd"; -- Send a message to users when they log in ++ -- Debian: do not remove this module, or you lose syslog ++ -- support ++ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. + }; + + -- These modules are auto-loaded, should you +@@ -83,6 +85,17 @@ + -- For more information see http://prosody.im/doc/creating_accounts + allow_registration = false; + ++-- Debian: ++-- send the server to background. ++-- ++daemonize = true; ++ ++-- Debian: ++-- Please, don't change this option since /var/run/prosody/ ++-- is one of the few directories Prosody is allowed to write to ++-- ++pidfile = "/var/run/prosody/prosody.pid"; ++ + -- These are the SSL/TLS-related settings. If you don't want + -- to use SSL/TLS, you may comment or remove this + ssl = { +@@ -122,19 +135,22 @@ + + -- Logging configuration + -- For advanced logging see http://prosody.im/doc/logging ++-- ++-- Debian: ++-- Logs info and higher to /var/log ++-- Logs errors to syslog also + log = { +- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging +- error = "prosody.err"; +- -- "*syslog"; -- Uncomment this for logging to syslog +- -- "*console"; -- Log to the console, useful for debugging with daemonize=false ++ -- Log files (change 'info' to 'debug' for debug logs): ++ info = "/var/log/prosody/prosody.log"; ++ error = "/var/log/prosody/prosody.err"; ++ -- Syslog: ++ { levels = { "error" }; to = "syslog"; }; + } + + ----------- Virtual hosts ----------- + -- You need to add a VirtualHost entry for each domain you wish Prosody to serve. + -- Settings under each VirtualHost entry apply *only* to that host. + +-VirtualHost "localhost" +- + VirtualHost "example.com" + enabled = false -- Remove this line to enable this host + +@@ -166,3 +182,10 @@ + -- + --Component "gateway.example.com" + -- component_secret = "password" ++ ++------ Additional config files ------ ++-- For organizational purposes you may prefer to add VirtualHost and ++-- Component definitions in their own config files. This line includes ++-- all config files in /etc/prosody/conf.d/ ++ ++Include "conf.d/*.cfg.lua" +Index: prosody-0.8.0/localhost.cfg.lua +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ prosody-0.8.0/localhost.cfg.lua 2011-04-05 14:57:27.000000000 +0100 +@@ -0,0 +1,5 @@ ++-- Section for localhost ++ ++-- This allows clients to connect to localhost. No harm in it. ++VirtualHost "localhost" ++ +Index: prosody-0.8.0/example.com.cfg.lua +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ prosody-0.8.0/example.com.cfg.lua 2011-04-05 14:57:27.000000000 +0100 +@@ -0,0 +1,29 @@ ++-- Section for example.com ++ ++VirtualHost "example.com" ++ enabled = false -- Remove this line to enable this host ++ ++ -- Assign this host a certificate for TLS, otherwise it would use the one ++ -- set in the global section (if any). ++ -- Note that old-style SSL on port 5223 only supports one certificate, and will always ++ -- use the global one. ++ ssl = { ++ key = "/etc/prosody/certs/example.com.key"; ++ certificate = "/etc/prosody/certs/example.com.crt"; ++ } ++ ++------ Components ------ ++-- You can specify components to add hosts that provide special services, ++-- like multi-user conferences, and transports. ++-- For more information on components, see http://prosody.im/doc/components ++ ++-- Set up a MUC (multi-user chat) room server on conference.example.com: ++Component "conference.example.com" "muc" ++ ++-- Set up a SOCKS5 bytestream proxy for server-proxied file transfers: ++--Component "proxy.example.com" "proxy65" ++ ++---Set up an external component (default component port is 5347) ++--Component "gateway.example.com" ++-- component_secret = "password" ++ --- prosody-0.8.1.orig/debian/patches/ejabberd2prosody.patch +++ prosody-0.8.1/debian/patches/ejabberd2prosody.patch @@ -0,0 +1,18 @@ +--- prosody-0.7.0.orig/tools/ejabberd2prosody.lua ++++ prosody-0.7.0/tools/ejabberd2prosody.lua +@@ -9,13 +9,8 @@ + + + +-package.path = package.path ..";../?.lua"; +- +-if arg[0]:match("^./") then +- package.path = package.path .. ";"..arg[0]:gsub("/ejabberd2prosody.lua$", "/?.lua"); +-end +- +-require "erlparse"; ++package.path = package.path ..";/usr/share/lua/5.1/prosody/?.lua"; ++local erlparse = require "util.erlparse"; + + prosody = {}; + --- prosody-0.8.1.orig/debian/patches/prosody-migrator.patch +++ prosody-0.8.1/debian/patches/prosody-migrator.patch @@ -0,0 +1,16 @@ +Index: prosody-0.8.0rc2/tools/migration/Makefile +=================================================================== +--- prosody-0.8.0rc2.orig/tools/migration/Makefile 2011-03-03 18:16:23.000000000 +0000 ++++ prosody-0.8.0rc2/tools/migration/Makefile 2011-03-03 18:16:32.000000000 +0000 +@@ -12,9 +12,9 @@ + INSTALLEDMODULES = $(PREFIX)/lib/prosody/modules + INSTALLEDDATA = $(DATADIR) + +-SOURCE_FILES = main.lua migrator/*.lua ++SOURCE_FILES = migrator/*.lua + +-all: prosody-migrator.install migrator.cfg.lua.install $(SOURCE_FILES) ++all: prosody-migrator.install migrator.cfg.lua.install main.lua $(SOURCE_FILES) + + install: prosody-migrator.install migrator.cfg.lua.install + install -d $(BIN) $(CONFIG) $(SOURCE) $(SOURCE)/migrator --- prosody-0.8.1.orig/debian/patches/series +++ prosody-0.8.1/debian/patches/series @@ -0,0 +1,2 @@ +ejabberd2prosody.patch +conf.patch