diff options
-rw-r--r-- | network/prosody/README | 6 | ||||
-rw-r--r-- | network/prosody/doinst.sh | 17 | ||||
-rw-r--r-- | network/prosody/prosody.SlackBuild | 6 | ||||
-rw-r--r-- | network/prosody/prosody.info | 6 | ||||
-rw-r--r-- | network/prosody/rc.prosody | 62 |
5 files changed, 13 insertions, 84 deletions
diff --git a/network/prosody/README b/network/prosody/README index c426c565c1..a288d0a37a 100644 --- a/network/prosody/README +++ b/network/prosody/README @@ -1,13 +1,15 @@ Prosody is a server for Jabber/XMPP written in Lua. It aims to be -easy to use and light on resources. For developers, it aims to give a -flexible system on which to rapidly develop added functionality or +easy to use and light on resources. For developers, it aims to give a +flexible system on which to rapidly develop added functionality or rapidly prototype new protocols. Before you can run prosody you'll need to look in README.SBo. You need a "prosody" user and group prior to building prosody. Something like this will suffice for most systems: + groupadd -g 274 prosody useradd -u 274 -g 274 -s /sbin/nologin -d /var/lib/prosody prosody + Feel free to use a different uid and gid if desired, but 274 is recommended to avoid conflicts with other stuff from SlackBuilds.org. diff --git a/network/prosody/doinst.sh b/network/prosody/doinst.sh index 58d9be9f5b..93d6f240b8 100644 --- a/network/prosody/doinst.sh +++ b/network/prosody/doinst.sh @@ -8,17 +8,6 @@ config() { fi } -preserve_perms() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - if [ -e $OLD ]; then - cp -a $OLD ${NEW}.incoming - cat $NEW > ${NEW}.incoming - mv ${NEW}.incoming $NEW - fi - config $NEW -} - config etc/prosody/prosody.cfg.lua.new config etc/prosody/migrator.cfg.lua.new config etc/prosody/certs/openssl.cnf.new @@ -30,4 +19,8 @@ config etc/prosody/certs/localhost.cnf.new config etc/prosody/certs/example.com.cnf.new config etc/prosody/certs/localhost.crt.new -preserve_perms etc/rc.d/rc.prosody.new +if ! [ -L etc/rc.d/rc.prosody ] ; +then + rm -f etc/rc.d/rc.prosody + ln -s /usr/bin/prosodyctl etc/rc.d/rc.prosody +fi diff --git a/network/prosody/prosody.SlackBuild b/network/prosody/prosody.SlackBuild index 92fe55a233..3797e0a06f 100644 --- a/network/prosody/prosody.SlackBuild +++ b/network/prosody/prosody.SlackBuild @@ -25,7 +25,7 @@ # Maintained by Gerardo Zamudio <gerardo.zamudio@linux.com> PRGNAM=prosody -VERSION=${VERSION:-0.9.11} +VERSION=${VERSION:-0.9.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -111,10 +111,6 @@ cd tools/migration MAN="${PKG}/usr/man" cd - -# Install rc.prosody -mkdir -p $PKG/etc/rc.d -install -m 0644 $CWD/rc.prosody $PKG/etc/rc.d/rc.prosody.new - find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/network/prosody/prosody.info b/network/prosody/prosody.info index 940ac22b9d..bfaca3f18b 100644 --- a/network/prosody/prosody.info +++ b/network/prosody/prosody.info @@ -1,8 +1,8 @@ PRGNAM="prosody" -VERSION="0.9.11" +VERSION="0.9.12" HOMEPAGE="http://prosody.im/" -DOWNLOAD="https://prosody.im/downloads/source/prosody-0.9.11.tar.gz" -MD5SUM="02d48f056ade5269bb5e3aff40b619c5" +DOWNLOAD="https://prosody.im/downloads/source/prosody-0.9.12.tar.gz" +MD5SUM="d743adea6cfbaacc3a24cc0c3928bb1b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="luasec luasocket luaexpat lua-filesystem" diff --git a/network/prosody/rc.prosody b/network/prosody/rc.prosody deleted file mode 100644 index f713110ed5..0000000000 --- a/network/prosody/rc.prosody +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash -# -# Copyright 2015, Niki Kovacs <info@microlinux.fr> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - -prosody_start() - { - lua /usr/bin/prosodyctl start - } - -prosody_stop() - { - lua /usr/bin/prosodyctl stop - } - -prosody_restart() - { - prosody_stop - prosody_start - } - -prosody_reload() - { - lua /usr/bin/prosodyctl reload - } - -prosody_status() - { - lua /usr/bin/prosodyctl status - } - -case $1 in - 'start') - prosody_start ;; - 'stop') - prosody_stop ;; - 'restart') - prosody_restart ;; - 'reload') - prosody_reload ;; - 'status') - prosody_status ;; - *) - echo "usage $0 start|stop|restart|reload|status" -esac |