--- prosody-0.6.1.orig/debian/changelog +++ prosody-0.6.1/debian/changelog @@ -0,0 +1,36 @@ +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.6.1.orig/debian/ejabberd2prosody.man.txt +++ prosody-0.6.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.6.1.orig/debian/rules +++ prosody-0.6.1/debian/rules @@ -0,0 +1,24 @@ +#!/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_install: + make install DESTDIR=debian/tmp + cp tools/ejabberd2prosody.lua debian/tmp/usr/bin/ejabberd2prosody + mkdir -p debian/tmp/usr/lib/prosody/util + 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 "prosodyctl 8" -r "Prosody IM" -v "" debian/ejabberd2prosody.man.txt | sed 1d > ejabberd2prosody.8 + dh_installman + +override_dh_install: + dh_install + # configuration + chmod a-x debian/prosody/usr/share/lua/5.1/prosody/prosody.version --- prosody-0.6.1.orig/debian/prosody.postinst +++ prosody-0.6.1/debian/prosody.postinst @@ -0,0 +1,84 @@ +#!/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 + mkdir "/var/log/prosody"; + fi + chown prosody:adm "/var/log/prosody" + chmod 750 "/var/log/prosody" + + # Create data directory + if [ ! -d "/var/lib/prosody" ]; then + mkdir "/var/lib/prosody"; + fi + chown prosody:prosody "/var/lib/prosody" + chmod 750 "/var/lib/prosody" + + # Fix config directory permissions + chown prosody:prosody "/etc/prosody" + chmod 750 "/etc/prosody" + + # Create subdirs for conf files + mkdir -p "/etc/prosody/conf.d" + mkdir -p "/etc/prosody/conf.avail" + chown prosody:prosody "/etc/prosody/conf.d" + chown prosody:prosody "/etc/prosody/conf.avail" + chmod 750 "/etc/prosody/conf.d" + chmod 750 "/etc/prosody/conf.avail" + + # Making SSL certificate and key if they do not exist + mkdir -p "/etc/prosody/certs" + 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 + + # Make SSL certificates readable only by the server + chown root:prosody /etc/prosody/certs/* + chmod 640 /etc/prosody/certs/* + + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# --- prosody-0.6.1.orig/debian/prosody.install +++ prosody-0.6.1/debian/prosody.install @@ -0,0 +1,11 @@ +usr/lib/prosody/prosody.version usr/share/lua/5.1/prosody/ +usr/lib/prosody/util/*.so usr/lib/prosody/ +usr/lib/prosody/util/*.lua usr/share/lua/5.1/prosody/util/ +usr/lib/prosody/net/* usr/share/lua/5.1/prosody/net/ +usr/lib/prosody/modules/* usr/share/lua/5.1/prosody/modules/ +usr/lib/prosody/core/* usr/share/lua/5.1/prosody/core/ +usr/bin/* +etc/prosody/prosody* +localhost.cfg.lua etc/prosody/conf.avail/ +example.com.cfg.lua etc/prosody/conf.avail/ +debian/README etc/prosody/ --- prosody-0.6.1.orig/debian/prosodyctl.man.txt +++ prosody-0.6.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.6.1.orig/debian/prosody.manpages +++ prosody-0.6.1/debian/prosody.manpages @@ -0,0 +1,3 @@ +prosody.8 +prosodyctl.8 +ejabberd2prosody.8 --- prosody-0.6.1.orig/debian/prosody.logrotate +++ prosody-0.6.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.6.1.orig/debian/copyright +++ prosody-0.6.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.6.1.orig/debian/compat +++ prosody-0.6.1/debian/compat @@ -0,0 +1 @@ +7 --- prosody-0.6.1.orig/debian/prosody.links +++ prosody-0.6.1/debian/prosody.links @@ -0,0 +1,5 @@ +etc/prosody/conf.avail/localhost.cfg.lua etc/prosody/conf.d/localhost.cfg.lua +usr/lib/prosody/encodings.so usr/lib/lua/5.1/util/encodings.so +usr/lib/prosody/hashes.so usr/lib/lua/5.1/util/hashes.so +usr/lib/prosody/pposix.so usr/lib/lua/5.1/util/pposix.so +usr/lib/prosody/signal.so usr/lib/lua/5.1/util/signal.so --- prosody-0.6.1.orig/debian/prosody.docs +++ prosody-0.6.1/debian/prosody.docs @@ -0,0 +1 @@ +doc/ --- prosody-0.6.1.orig/debian/prosody.postrm +++ prosody-0.6.1/debian/prosody.postrm @@ -0,0 +1,33 @@ +#!/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 + +fi --- prosody-0.6.1.orig/debian/prosody.init +++ prosody-0.6.1/debian/prosody.init @@ -0,0 +1,99 @@ +#! /bin/sh + +### BEGIN INIT INFO +# Provides: prosody +# Required-Start: $network $local_fs $remote_fs +# Required-Stop: +# 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"; + then + return 0 + else + return 1 + fi +} + +signal_prosody () { + if start-stop-daemon --stop --quiet --pidfile "$PIDFILE" \ + --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.6.1.orig/debian/control +++ prosody-0.6.1/debian/control @@ -0,0 +1,17 @@ +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.8.3 +Homepage: http://www.prosody.im/ + +Package: prosody +Architecture: any +Depends: adduser, openssl, lua5.1, liblua5.1-0, liblua5.1-expat0, liblua5.1-socket2, ${shlibs:Depends}, ${misc:Depends}, liblua5.1-filesystem0 +Recommends: liblua5.1-sec1 +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.6.1.orig/debian/README.source +++ prosody-0.6.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.6.1.orig/debian/prosody.man.txt +++ prosody-0.6.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.6.1.orig/debian/prosody.lintian-overrides +++ prosody-0.6.1/debian/prosody.lintian-overrides @@ -0,0 +1 @@ +prosody binary: possible-gpl-code-linked-with-openssl --- prosody-0.6.1.orig/debian/README +++ prosody-0.6.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.6.1.orig/debian/prosody.dirs +++ prosody-0.6.1/debian/prosody.dirs @@ -0,0 +1 @@ +usr/lib/lua/5.1/util/ --- prosody-0.6.1.orig/debian/patches/ejabberd2prosody.patch +++ prosody-0.6.1/debian/patches/ejabberd2prosody.patch @@ -0,0 +1,18 @@ +--- prosody-0.5.2.orig/tools/ejabberd2prosody.lua ++++ prosody-0.5.2/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"; + + local serialize = require "util.serialization".serialize; + local st = require "util.stanza"; --- prosody-0.6.1.orig/debian/patches/conf.patch +++ prosody-0.6.1/debian/patches/conf.patch @@ -0,0 +1,103 @@ +Author: Enrico Tassi +Description: No description. +--- prosody-0.5.2.orig/prosody.cfg.lua.dist ++++ prosody-0.5.2/prosody.cfg.lua.dist +@@ -62,10 +62,12 @@ + "register"; -- Allow users to register on this server using a client and change passwords + + -- Other specific functionality +- --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc. + --"console"; -- telnet to port 5582 (needs console_enabled = true) + --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP" + --"httpserver"; -- Serve static files from a directory over HTTP ++ -- Debian: do not remove this module, or you loose syslog ++ -- support ++ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. + }; + + -- These modules are auto-loaded, should you +@@ -80,6 +82,17 @@ + -- Disable account creation by default, for security + -- 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 disrectories 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 +@@ -87,24 +100,17 @@ + key = "certs/localhost.key"; + certificate = "certs/localhost.cert"; + } +- +--- This allows clients to connect to localhost. No harm in it. +-Host "localhost" +- +--- Section for example.com +--- (replace example.com with your domain name) +-Host "example.com" +- +- enabled = false -- This will disable the host, preserving the config, but denying connections +- +- -- 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 = "certs/example.com.key"; +- certificate = "certs/example.com.crt"; +- } +- +--- Set up a MUC (multi-user chat) room server on conference.example.com: +-Component "conference.example.com" "muc" ++ -- Debian: ++ -- all to var/log ++ -- errors to syslog also ++ log = { ++ { levels = { "error" }; to = "syslog"; }; ++ { levels = { "error" }; to = "file"; filename = "/var/log/prosody/prosody.err"; }; ++ { levels = { "info"; "warn"; }; to = "file"; filename = "/var/log/prosody/prosody.log"; }; ++ -- { levels = { "debug"; }; to = "file"; filename = "/var/log/prosody/prosody.log"; }; ++ } ++ ++-- Load all configuration files in /etc/prosody/conf.d/ ++local ztact = require "util.ztact" ++local cfgdir = "/etc/prosody/conf.d/" ++for f in ztact.dir(cfgdir) do Include(cfgdir..f); end +--- /dev/null ++++ prosody-0.5.2/example.com.cfg.lua +@@ -0,0 +1,18 @@ ++-- Section for example.com ++-- (replace example.com with your domain name) ++Host "example.com" ++ ++ enabled = false -- This will disable the host, preserving the config, but denying connections ++ ++ -- 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"; ++ } ++ ++-- Set up a MUC (multi-user chat) room server on conference.example.com: ++Component "conference.example.com" "muc" ++ +--- /dev/null ++++ prosody-0.5.2/localhost.cfg.lua +@@ -0,0 +1,4 @@ ++-- Section for localhost ++-- This allows clients to connect to localhost. No harm in it. ++Host "localhost" ++ --- prosody-0.6.1.orig/debian/patches/paths.patch +++ prosody-0.6.1/debian/patches/paths.patch @@ -0,0 +1,61 @@ +Author: Enrico Tassi +Description: No description. +--- prosody-0.5.2.orig/Makefile ++++ prosody-0.5.2/Makefile +@@ -8,9 +8,10 @@ + DATA = $(DESTDIR)$(DATADIR) + MAN = $(DESTDIR)$(PREFIX)/share/man + +-INSTALLEDSOURCE = $(PREFIX)/lib/prosody ++INSTALLEDSOURCE = $(PREFIX)/share/lua/5.1/prosody ++INSTALLEDCSOURCE = $(PREFIX)/lib/lua/5.1/prosody + INSTALLEDCONFIG = $(SYSCONFDIR) +-INSTALLEDMODULES = $(PREFIX)/lib/prosody/modules ++INSTALLEDMODULES = $(PREFIX)/share/lua/5.1/prosody/modules/ + INSTALLEDDATA = $(DATADIR) + + all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version +@@ -57,12 +58,14 @@ + + prosody.install: prosody + sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \ ++ s|^CFG_CSOURCEDIR=.*;$$|CFG_CSOURCEDIR='$(INSTALLEDCSOURCE)';|;\ + s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|; \ + s|^CFG_DATADIR=.*;$$|CFG_DATADIR='$(INSTALLEDDATA)';|; \ + s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" < prosody > prosody.install + + prosodyctl.install: prosodyctl + sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \ ++ s|^CFG_CSOURCEDIR=.*;$$|CFG_CSOURCEDIR='$(INSTALLEDCSOURCE)';|;\ + s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|; \ + s|^CFG_DATADIR=.*;$$|CFG_DATADIR='$(INSTALLEDDATA)';|; \ + s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" < prosodyctl > prosodyctl.install +--- prosody-0.5.2.orig/prosody ++++ prosody-0.5.2/prosody +@@ -10,6 +10,7 @@ + -- Will be modified by configure script if run -- + + CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR"); ++CFG_CSOURCEDIR=nil; + CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR"); + CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR"); + CFG_DATADIR=os.getenv("PROSODY_DATADIR"); +--- prosody-0.5.2.orig/prosodyctl ++++ prosody-0.5.2/prosodyctl +@@ -12,6 +12,7 @@ + -- Will be modified by configure script if run -- + + CFG_SOURCEDIR=nil; ++CFG_CSOURCEDIR=nil; + CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR"); + CFG_PLUGINDIR=nil; + CFG_DATADIR=os.getenv("PROSODY_DATADIR"); +@@ -20,7 +21,7 @@ + + if CFG_SOURCEDIR then + package.path = CFG_SOURCEDIR.."/?.lua;"..package.path +- package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath ++ package.cpath = CFG_CSOURCEDIR.."/?.so;"..package.cpath + end + + if CFG_DATADIR then --- prosody-0.6.1.orig/debian/patches/series +++ prosody-0.6.1/debian/patches/series @@ -0,0 +1,3 @@ +ejabberd2prosody.patch +conf.patch +paths.patch