- Update to 17.07

- Add STUN, and SIP options for STUN/TURN, and SIP support
- Remove dependency on shells/bash
- Fix pkg-install script for PAM option, missed in previous
  updates
- Add a note to UPDATING about a known issue

3 files changed, 21 insertions, 40 deletions

diff --git a/net-im/ejabberd/files/patch-Makefile.in b/net-im/ejabberd/files/patch-Makefile.in
index 8d35309e895a..af3fa522ebe0 100644
--- a/net-im/ejabberd/files/patch-Makefile.in
+++ b/net-im/ejabberd/files/patch-Makefile.in
@@ -1,4 +1,4 @@
---- Makefile.in.orig	2017-01-20 11:19:55 UTC
+--- Makefile.in.orig	2017-07-06 11:49:21 UTC
 +++ Makefile.in
 @@ -21,7 +21,7 @@ SBINDIR = $(DESTDIR)@sbindir@
  LIBDIR =  $(DESTDIR)@libdir@
diff --git a/net-im/ejabberd/files/patch-ejabberdctl.template b/net-im/ejabberd/files/patch-ejabberdctl.template
index c122e28008af..a467eb736281 100644
--- a/net-im/ejabberd/files/patch-ejabberdctl.template
+++ b/net-im/ejabberd/files/patch-ejabberdctl.template
@@ -1,42 +1,23 @@
---- ejabberdctl.template.orig	2016-06-11 03:11:27 UTC
+--- ejabberdctl.template.orig	2017-07-10 09:25:01 UTC
 +++ ejabberdctl.template
-@@ -15,7 +15,8 @@ ERL={{erl}}
- IEX={{bindir}}/iex
- EPMD={{epmd}}
- INSTALLUSER={{installuser}}
--ERL_LIBS={{libdir}}
-+ERL_LIBS={{libdir}}/ejabberd
-+ERL_LIBS=$ERL_LIBS:{{libdir}}/ejabberd/lib
+@@ -49,8 +49,8 @@ done
  
- # check the proper system user is used if defined
- if [ "$INSTALLUSER" != "" ] ; then
-@@ -31,14 +32,14 @@ if [ "$INSTALLUSER" != "" ] ; then
-         fi
-     done
-     if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
--        EXEC_CMD="bash -c"
-+        EXEC_CMD="%%LOCALBASE%%/bin/bash -c"
+ # define ejabberd variables if not already defined from the command line
+ : ${ETC_DIR:={{sysconfdir}}/ejabberd}
+-: ${LOGS_DIR:={{localstatedir}}/log/ejabberd}
+-: ${SPOOL_DIR:={{localstatedir}}/lib/ejabberd}
++: ${LOGS_DIR:=/var/log/ejabberd}
++: ${SPOOL_DIR:=/var/spool/ejabberd}
+ : ${EJABBERD_CONFIG_PATH:="$ETC_DIR"/ejabberd.yml}
+ : ${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR"/ejabberdctl.cfg}
+ [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
+@@ -72,7 +72,8 @@ if [ "$INET_DIST_INTERFACE" != "" ] ; th
+         ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_use_interface \"$INET_DIST_INTERFACE2\""
      fi
-     if [ "$EXEC_CMD" = "false" ] ; then
-         echo "This command can only be run by root or the user $INSTALLUSER" >&2
-         exit 4
-     fi
- else
--    EXEC_CMD="bash -c"
-+    EXEC_CMD="%%LOCALBASE%%/bin/bash -c"
  fi
+-ERL_LIBS={{libdir}}
++ERL_LIBS={{libdir}}/ejabberd
++ERL_LIBS=$ERL_LIBS:{{libdir}}/ejabberd/lib
+ ERL_CRASH_DUMP="$LOGS_DIR"/erl_crash_$(date "+%Y%m%d-%H%M%S").dump
+ ERL_INETRC="$ETC_DIR"/inetrc
  
- # parse command line parameters
-@@ -73,10 +74,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th
-     EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml
- fi
- if [ "$LOGS_DIR" = "" ] ; then
--    LOGS_DIR={{localstatedir}}/log/ejabberd
-+    LOGS_DIR=/var/log/ejabberd
- fi
- if [ "$SPOOL_DIR" = "" ] ; then
--    SPOOL_DIR={{localstatedir}}/lib/ejabberd
-+    SPOOL_DIR=/var/spool/ejabberd
- fi
- if [ "$EJABBERD_DOC_PATH" = "" ] ; then
-     EJABBERD_DOC_PATH={{docdir}}
diff --git a/net-im/ejabberd/files/pkg-install.in b/net-im/ejabberd/files/pkg-install.in
index 59cc2a570f1a..e380cc0207a9 100644
--- a/net-im/ejabberd/files/pkg-install.in
+++ b/net-im/ejabberd/files/pkg-install.in
@@ -14,9 +14,9 @@ chown -R %%USERS%%:%%GROUPS%%  %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%POR
 find %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%% -type f -print0 | xargs -0 chmod %%SHAREMODE%%
 find %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%% -type f -print0 | xargs -0 chown %%SHAREOWN%%:%%SHAREGRP%%
 
-%%PAM%%chmod 4750 %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_pam-1.0.0/priv/bin/epam \
+%%PAM%%chmod 4750 %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/epam-1.0.3/priv/bin/epam \
 %%PAM%%	     %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/epam
-%%PAM%%chown root:%%GROUPS%% %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_pam-1.0.0/priv/bin/epam \
+%%PAM%%chown root:%%GROUPS%% %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/epam-1.0.3/priv/bin/epam \
 %%PAM%%	     %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/epam
 
 exit 0