3 files changed, 43 insertions, 32 deletions
diff --git a/network/ejabberd/ejabberd.SlackBuild b/network/ejabberd/ejabberd.SlackBuild
index 1e3262a987..08efa75ad2 100644
--- a/network/ejabberd/ejabberd.SlackBuild
+++ b/network/ejabberd/ejabberd.SlackBuild
@@ -25,8 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ejabberd
-VERSION=${VERSION:-22.05_git75a771b}
-COMMIT=75a771bfec3626145d404349fdaec4f0eef83bbc
+VERSION=${VERSION:-22.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -81,11 +80,11 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$COMMIT
-tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz
-cd $PRGNAM-$COMMIT
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 
-find -L $CWD -type f -name "*.tar.gz" ! -name "$PRGNAM-$COMMIT.tar.gz" \
+find -L $CWD -type f -name "*.tar.gz" ! -name "$PRGNAM-$VERSION.tar.gz" \
   | while read f
 do
   fn=$(basename $f | sed -e 's/ejabberd-po.*/ejabberd_po/' \
diff --git a/network/ejabberd/ejabberd.info b/network/ejabberd/ejabberd.info
index ede054729e..5f04184d65 100644
--- a/network/ejabberd/ejabberd.info
+++ b/network/ejabberd/ejabberd.info
@@ -1,67 +1,67 @@
 PRGNAM="ejabberd"
-VERSION="22.05_git75a771b"
+VERSION="22.10"
 HOMEPAGE="https://www.ejabberd.im"
-DOWNLOAD="https://github.com/processone/ejabberd/archive/75a771b/ejabberd-75a771bfec3626145d404349fdaec4f0eef83bbc.tar.gz \
+DOWNLOAD="https://github.com/processone/ejabberd/archive/22.10/ejabberd-22.10.tar.gz \
           https://github.com/dvv/base64url/archive/1.0.1/base64url-1.0.1.tar.gz \
           https://github.com/processone/cache_tab/archive/1.0.30/cache_tab-1.0.30.tar.gz \
           https://github.com/processone/eimp/archive/1.0.22/eimp-1.0.22.tar.gz \
-          https://github.com/processone/ejabberd-po/archive/9849703/ejabberd-po-9849703.tar.gz \
+          https://github.com/processone/ejabberd-po/archive/7a977ef/ejabberd-po-7a977ef321ad305f848920d42a257140c86f3537.tar.gz \
           https://github.com/elixir-lang/elixir/archive/v1.4.4/elixir-1.4.4.tar.gz \
           https://github.com/processone/epam/archive/1.0.12/epam-1.0.12.tar.gz \
           https://github.com/wooga/eredis/archive/v1.2.0/eredis-1.2.0.tar.gz \
-          https://github.com/processone/esip/archive/1.0.47/esip-1.0.47.tar.gz \
+          https://github.com/processone/esip/archive/1.0.48/esip-1.0.48.tar.gz \
           https://github.com/processone/ezlib/archive/1.0.12/ezlib-1.0.12.tar.gz \
-          https://github.com/processone/fast_tls/archive/1.1.15/fast_tls-1.1.15.tar.gz \
+          https://github.com/processone/fast_tls/archive/1.1.16/fast_tls-1.1.16.tar.gz \
           https://github.com/processone/fast_xml/archive/1.1.49/fast_xml-1.1.49.tar.gz \
-          https://github.com/processone/fast_yaml/archive/1.0.33/fast_yaml-1.0.33.tar.gz \
+          https://github.com/processone/fast_yaml/archive/1.0.34/fast_yaml-1.0.34.tar.gz \
           https://github.com/benoitc/erlang-idna/archive/6.0.0/erlang-idna-6.0.0.tar.gz \
           https://github.com/davisp/jiffy/archive/1.1.1/jiffy-1.1.1.tar.gz \
           https://github.com/potatosalad/erlang-jose/archive/1.11.1/erlang-jose-1.11.1.tar.gz \
           https://github.com/rvirding/luerl/archive/1.0/luerl-1.0.tar.gz \
           https://github.com/processone/mqtree/archive/1.0.15/mqtree-1.0.15.tar.gz \
-          https://github.com/processone/p1_acme/archive/1.0.19/p1_acme-1.0.19.tar.gz \
-          https://github.com/processone/p1_mysql/archive/1.0.19/p1_mysql-1.0.19.tar.gz \
+          https://github.com/processone/p1_acme/archive/1.0.20/p1_acme-1.0.20.tar.gz \
+          https://github.com/processone/p1_mysql/archive/1.0.20/p1_mysql-1.0.20.tar.gz \
           https://github.com/processone/p1_oauth2/archive/0.6.11/p1_oauth2-0.6.11.tar.gz \
-          https://github.com/processone/p1_pgsql/archive/1.1.18/p1_pgsql-1.1.18.tar.gz \
+          https://github.com/processone/p1_pgsql/archive/1.1.19/p1_pgsql-1.1.19.tar.gz \
           https://github.com/processone/p1_utils/archive/1.0.25/p1_utils-1.0.25.tar.gz \
           https://github.com/processone/pkix/archive/1.0.9/pkix-1.0.9.tar.gz \
           https://github.com/processone/rebar_elixir_plugin/archive/0.1.0/rebar_elixir_plugin-0.1.0.tar.gz \
           https://github.com/processone/erlang-sqlite3/archive/1.1.13/erlang-sqlite3-1.1.13.tar.gz \
-          https://github.com/processone/stringprep/archive/1.0.28/stringprep-1.0.28.tar.gz \
-          https://github.com/processone/stun/archive/1.2.2/stun-1.2.2.tar.gz \
-          https://github.com/processone/xmpp/archive/1.5.8/xmpp-1.5.8.tar.gz \
-          https://github.com/processone/yconf/archive/1.0.13/yconf-1.0.13.tar.gz \
+          https://github.com/processone/stringprep/archive/1.0.29/stringprep-1.0.29.tar.gz \
+          https://github.com/processone/stun/archive/1.2.6/stun-1.2.6.tar.gz \
+          https://github.com/processone/xmpp/archive/1.6.0/xmpp-1.6.0.tar.gz \
+          https://github.com/processone/yconf/archive/1.0.14/yconf-1.0.14.tar.gz \
           https://github.com/benoitc/unicode_util_compat/archive/0.4.1/unicode_util_compat-0.4.1.tar.gz"
-MD5SUM="d07080e2dbd540a649ae555fcb97fe05 \
+MD5SUM="97a11f8b265a7512a3e7ff2304f3b9b3 \
         4d515ed34e4e8966bb7400ce51de83b2 \
         b8fd0788b9108c1dcea49fb3ba86eb77 \
         505deb9dfe6324a6bc8e130908df105d \
-        a6c357cd991609b73132883f88fac04a \
+        ab32f2e00feb8134c5bddbe45a67c490 \
         55923c6db17e5e799b600ba581865e7f \
         48028404dabbfc2ea26cedc2484386a8 \
         239232590c82b1b7d78247079a1f17aa \
-        838e19b90c8ba181f90da9b27f127d1a \
+        d295e0909a6920ad5d2465c7a76e816d \
         5fd5273a71ad80b3397212dc4a9dccd3 \
-        4f01ae8211c09e3cad6b2ec8b798aa6f \
+        7b3798a054aba431512413c1a0a67e0d \
         605997a85ff66db85b5657e67714db3c \
-        4ef37539360cee3b88cd25d3674fdaa7 \
+        2ee0b86ba5b7fd9fe252b401a7af4279 \
         1975930f1ab7d90ca14f914a8f7dacd6 \
         5ab471571ac2b39c02a90350cecb04e3 \
         169a0d3375cd58de88bf6577ef7448de \
         05b29840a87cc8a68e1332305c68702f \
         e8a02c04daf5099df97f9ba92dea5188 \
-        bd54109e32cb37cf22634aecdc732446 \
-        a74b5ee76d8bdffae71a986d40763f98 \
+        4b6aad2679b57822235c9a04990d527d \
+        62c0339f6dee6326c115ab9be849ad1c \
         b6f0cdb01185ad4bcfbdd0effff0e3cf \
-        f183c52c0d52f4f42cb6891ff3381189 \
+        96c5582a97910a231dae1a7b2e927b6e \
         90f134a42486419966e4d64d8bdaa105 \
         db9a2e5cb2db46f0ed48b06efbcfa4c5 \
         74cefd398679915411076df92449b47e \
         006f99732c11fdeb92ae90058e34dbb5 \
-        69634d72941132138e5e8827fdc85038 \
-        4509516809c5ba667d839e0700f349f1 \
-        6d65de07440a8d8fa23f2f985b5c8636 \
-        adc7221fdd1ebe4c01f7e7cf9a9fce05 \
+        4d5dff0200768e298b166667272f5f92 \
+        5bec75192231c57460a7e2cfc6f7eca6 \
+        49e940b4dc9b02d797f892c8824a23ce \
+        6dc2b2df8568b3ec0967b4d934e3bafd \
         1742d5522f1329229beb3e033a96898d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/ejabberd/rc.ejabberd b/network/ejabberd/rc.ejabberd
index 9ff1a8a331..dfd7a35043 100644
--- a/network/ejabberd/rc.ejabberd
+++ b/network/ejabberd/rc.ejabberd
@@ -24,6 +24,16 @@ status_ejabberd() {
   $bin status
 }
 
+force-stop_ejabberd() {
+  echo "Killing ejabberd... "
+  port=$(/usr/bin/epmd -names | awk -v name=ejabberd '$2==name {print $5}')
+  if [ -z "$port" ]; then
+    echo "ejabberd not found"
+  else
+    kill $(lsof -i TCP:$port -s TCP:LISTEN | tail -n +2 | awk '{print $2}')
+  fi
+}
+
 case "$1" in
 start)
   start_ejabberd ;;
@@ -33,6 +43,8 @@ restart|reload)
   restart_ejabberd ;;
 status)
   status_ejabberd ;;
+force-stop)
+  force-stop_ejabberd ;;
 *)
-  echo "usage $0 start|stop|restart|status"
+  echo "usage $0 start|stop|restart|status|force-stop"
 esac