4 files changed, 29 insertions, 19 deletions
diff --git a/network/jabberd2/README b/network/jabberd2/README
index 20318f1015..ef03a9bb05 100644
--- a/network/jabberd2/README
+++ b/network/jabberd2/README
@@ -1,6 +1,7 @@
 jabberd 2.x project is the next generation of the jabberd project. It
 has been rewritten from the ground up to be scalable, architecturally
-sound and to support the latest protocol extensions coming out of the XSF.
+sound and to support the latest protocol extensions coming out of
+the XSF.
 
 Please note: jabberd 2.x is not a newer version of jabberd 1.x but a
 completely different project.
diff --git a/network/jabberd2/jabberd2.SlackBuild b/network/jabberd2/jabberd2.SlackBuild
index 642107b5e7..524025d773 100644
--- a/network/jabberd2/jabberd2.SlackBuild
+++ b/network/jabberd2/jabberd2.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for jabberd2
 
@@ -22,20 +22,30 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=jabberd2
-VERSION=${VERSION:-2.2.17}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.7.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -45,8 +55,8 @@ JABBERGRP=${JABBERGRP:-jabber}
 JABBERUID=${JABBERUID:-275}
 JABBERGID=${JABBERGID:-275}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -117,7 +127,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/tools
 cp -a \
   AUTHORS COPYING ChangeLog INSTALL NEWS README README.config README.protocol \
-  README.win32 TODO UPGRADE \
+  README.win32 TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   tools/bdb2mysql.rb tools/bdbdump.pl tools/db-jd14-2-jd2.sql \
@@ -131,11 +141,8 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/etc/rc.d \
          $PKG/var/lib/jabberd2/{db,fs,stats} \
-         $PKG/var/log/jabberd2 \
-         $PKG/var/run/jabberd2
-chown -R $JABBERUSR.$JABBERGRP $PKG/var/lib/jabberd2 \
-                               $PKG/var/log/jabberd2 \
-                               $PKG/var/run/jabberd2
+         $PKG/var/log/jabberd2
+chown -R $JABBERUSR:$JABBERGRP $PKG/var/lib/jabberd2 $PKG/var/log/jabberd2 
 install -o root -g root -m 644 $CWD/rc.jabberd2 $PKG/etc/rc.d/rc.jabberd2.new
 sed -i -e "s/%JABBERUSR%/$JABBERUSR/g" $PKG/etc/rc.d/rc.jabberd2.new
 
@@ -144,7 +151,7 @@ rm -r $PKG/usr/etc \
       $PKG/etc/jabberd2/templates/*.dist
 
 find $PKG/etc/jabberd2 -type f -exec mv {} {}.new \;
-find $PKG/etc/jabberd2 -type f -exec chown root.$JABBERGRP {} \; -exec chmod 640 {} \;
+find $PKG/etc/jabberd2 -type f -exec chown root:$JABBERGRP {} \; -exec chmod 640 {} \;
 sed -i -e "s#var/jabberd/pid#var/run/jabberd2#g" $PKG/etc/jabberd2/c2s.xml.new
 sed -i -e "s#var/jabberd/log#var/log/jabberd2#g" $PKG/etc/jabberd2/c2s.xml.new
 sed -i -e "s#var/jabberd/stats#var/lib/jabberd2/stats#g" $PKG/etc/jabberd2/c2s.xml.new
@@ -163,4 +170,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/jabberd2/jabberd2.info b/network/jabberd2/jabberd2.info
index 8958329f97..61e70d9fe0 100644
--- a/network/jabberd2/jabberd2.info
+++ b/network/jabberd2/jabberd2.info
@@ -1,8 +1,8 @@
 PRGNAM="jabberd2"
-VERSION="2.2.17"
+VERSION="2.7.0"
 HOMEPAGE="http://www.jabberd2.org"
-DOWNLOAD="https://github.com/downloads/jabberd2/jabberd2/jabberd-2.2.17.tar.xz"
-MD5SUM="8b7d654deaa6566e58ab6630112f9b10"
+DOWNLOAD="https://github.com/jabberd2/jabberd2/releases/download/jabberd-2.7.0/jabberd-2.7.0.tar.xz"
+MD5SUM="39b4b5286a1ad91ff84c3588fa26efa8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="udns libgsasl"
diff --git a/network/jabberd2/rc.jabberd2 b/network/jabberd2/rc.jabberd2
index ca328a6df3..c5e8a70f54 100644
--- a/network/jabberd2/rc.jabberd2
+++ b/network/jabberd2/rc.jabberd2
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 jabberd2_start() {
+  mkdir -p /var/run/jabberd2
+  chown %JABBERUSR% /var/run/jabberd2
   su - %JABBERUSR% -c '/usr/bin/jabberd &'
 }