summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/prosody/doinst.sh13
-rw-r--r--network/prosody/prosody.SlackBuild8
-rw-r--r--network/prosody/prosody.info10
-rw-r--r--network/prosody/rc.prosody62
4 files changed, 87 insertions, 6 deletions
diff --git a/network/prosody/doinst.sh b/network/prosody/doinst.sh
index 330cafc8a7..58d9be9f5b 100644
--- a/network/prosody/doinst.sh
+++ b/network/prosody/doinst.sh
@@ -8,6 +8,17 @@ 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
@@ -18,3 +29,5 @@ config etc/prosody/certs/Makefile.new
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
diff --git a/network/prosody/prosody.SlackBuild b/network/prosody/prosody.SlackBuild
index fad92e6637..6cfc70ff34 100644
--- a/network/prosody/prosody.SlackBuild
+++ b/network/prosody/prosody.SlackBuild
@@ -21,9 +21,11 @@
# 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.
+#
+# Maintained by Gerardo Zamudio <gerardo.zamudio@linux.com>
PRGNAM=prosody
-VERSION=${VERSION:-0.9.4}
+VERSION=${VERSION:-0.9.8}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -112,6 +114,10 @@ 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 24bc3fd0da..34b241fe37 100644
--- a/network/prosody/prosody.info
+++ b/network/prosody/prosody.info
@@ -1,10 +1,10 @@
PRGNAM="prosody"
-VERSION="0.9.4"
+VERSION="0.9.8"
HOMEPAGE="http://prosody.im/"
-DOWNLOAD="https://prosody.im/downloads/source/prosody-0.9.4.tar.gz"
-MD5SUM="94f9a613c834c276352ac5b142fb72e0"
+DOWNLOAD="https://prosody.im/downloads/source/prosody-0.9.8.tar.gz"
+MD5SUM="5144cd832a1860443e21e336dc560ee7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="lua luasocket luaexpat lua-filesystem"
-MAINTAINER="Andrew Tkalia"
-EMAIL="anddt@yandex.ru"
+MAINTAINER="Gerardo Zamudio"
+EMAIL="gerardo.zamudio@linux.com"
diff --git a/network/prosody/rc.prosody b/network/prosody/rc.prosody
new file mode 100644
index 0000000000..f713110ed5
--- /dev/null
+++ b/network/prosody/rc.prosody
@@ -0,0 +1,62 @@
+#!/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