Update chat/ejabberd to 15.09.

### Major changes
- Added OAuth delegation framework
- Preliminary OAuth and HTTP based ejabberd API
- X-AUTH2 authentication mechanism,
- MAM now can store MUC room
- MSSQL: improved schema, simplified config, and fixed support

*Note: ejabberd now requires erlang 17.1 or higher*

### Core improvements
- New `set_loglevel` admin command to ease changing loglevel.
- Configuration: allow to override main config file options with data
  from included files
- Improve S2S certificate checks
- Log TLS errors as debug messages only
- XEP-0198: new option "max_resume_timeout"
- XEP-0198: Improve handling of non-message stanzas
- ext_mod: Check external modules configuration on load
- ext_mod: Don't override custom configuration on module upgrade
- Several Elixir fixes
- Updated most translation languages

### Modules improvements
- Carbon Copy: Don't copy messages of type "normal" without body
- HTTP-Bind: More eye-candy mod_http_bind help page
- HTTP-Bind: Nameprep host name passed to http-bind before using in
- HTTP-Bind: Set disable caching headers in http-bind responses
- HTTP: pass stream management options defined in http listener to
  http-bind and websocket
- MAM: Add XEP-0359 to archived messages
- MAM: Add XEP-0313 v0.4 support
- MUC commands: Changed argument names in two commands
- MUC commands: Fix and document create_rooms_file and destroy_rooms_file
- MUC hooks: added muc_filter_presence
- MUC hooks: renamed muc_filter_packet to muc_filter_message
- MUC logging: check for hint
- Multicast: many improvements in the source code
- SIP: Do not crash SIP authentication on SCRAMed passwords

### Packaging
- Remove bashisms in join_cluster leave_cluster and postinstall scripts
- Allow root to run join_cluster and leave_cluster
- Allow building an ejabberd release with mix and elixir release manager
- Allow installing as root
- Fix Debian/Ubuntu package
- Rename idna to ejabberd_idna
- Improve 'make install' to remove useless failure cases

5 files changed, 67 insertions, 37 deletions

diff --git a/chat/ejabberd/MESSAGE b/chat/ejabberd/MESSAGE
deleted file mode 100644
index ca8133fe801..00000000000
--- a/chat/ejabberd/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.4 2014/03/10 11:33:59 fhajny Exp $
-
-You will need to customize the following files to configure ejabberd for
-local use:
-
-    ${PKG_SYSCONFDIR}/ejabberd.yml
-
-===========================================================================
diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index e042806c495..5b57c1a7b83 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2015/09/01 11:36:59 fhajny Exp $
+# $NetBSD: Makefile,v 1.58 2015/10/01 14:48:14 fhajny Exp $
 
-DISTNAME=	ejabberd-15.07
+DISTNAME=	ejabberd-15.09
 CATEGORIES=	chat
 MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
@@ -23,17 +23,22 @@ USE_TOOLS+=		bash:run gmake patch
 
 CONFIGURE_ARGS+=	--disable-debug
 CONFIGURE_ARGS+=	--enable-iconv
-CONFIGURE_ARGS+=	--enable-json
 CONFIGURE_ARGS+=	--enable-lager
 CONFIGURE_ARGS+=	--enable-mysql
 CONFIGURE_ARGS+=	--enable-nif
 CONFIGURE_ARGS+=	--enable-odbc
 CONFIGURE_ARGS+=	--enable-pgsql
 CONFIGURE_ARGS+=	--enable-zlib
+CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat}
 
 CONFIGURE_ARGS+=	--enable-user=${EJABBERD_USER}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 
+# Configure normally happens as part of getting the deps, which we avoid
+# by using a separate deps distfile.
+CONFIGURE_DIRS=		. deps/esip deps/p1_stringprep deps/p1_tls deps/p1_xml deps/p1_yaml
+BUILD_DIRS=		.
+
 RCD_SCRIPTS=		ejabberd
 
 BUILD_DEFS+=		EJABBERD_USER EJABBERD_GROUP EJABBERD_LOGDIR
@@ -66,8 +71,7 @@ PKG_SHELL.${EJABBERD_USER}=	${SH}
 
 EGDIR=			share/examples/ejabberd
 
-INSTALLATION_DIRS+=	share/doc/${PKGBASE}
-INSTALLATION_DIRS+=	${EGDIR}
+INSTALLATION_DIRS+=	share/doc/${PKGBASE} ${EGDIR} share/bash-completion.d
 
 CONF_FILES_PERMS=	${EGDIR}/ejabberd.yml ${PKG_SYSCONFDIR}/ejabberd.yml \
 			${ROOT_USER} ${EJABBERD_GROUP} 0640
@@ -77,21 +81,15 @@ CONF_FILES_PERMS+=	${EGDIR}/inetrc ${PKG_SYSCONFDIR}/inetrc \
 			${ROOT_USER} ${EJABBERD_GROUP} 0640
 SPECIAL_PERMS+=		sbin/ejabberdctl ${ROOT_USER} ${EJABBERD_GROUP} 0750
 
-REPLACE_BASH=		ejabberdctl.template tools/captcha.sh \
-			tools/joincluster tools/leavecluster
+REPLACE_BASH=		tools/captcha.sh
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Localizing paths
 SUBST_STAGE.paths=	pre-configure
-SUBST_FILES.paths=	Makefile.in
-SUBST_FILES.paths+=	ejabberd.yml.example
-SUBST_FILES.paths+=	ejabberdctl.template
-SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=	-e 's,@EJABBERD_DB@,${EJABBERD_DB},g'
-SUBST_SED.paths+=	-e 's,@EJABBERD_LOGDIR@,${EJABBERD_LOGDIR},g'
-SUBST_SED.paths+=	-e 's,@EJABBERD_PIDDIR@,${EJABBERD_PIDDIR},g'
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=	-e 's,@DISTNAME@,${DISTNAME},g'
+SUBST_FILES.paths=	Makefile.in ejabberd.yml.example ejabberdctl.template
+SUBST_FILES.paths+=	tools/ejabberdctl.bc
+SUBST_VARS.paths=	DISTNAME EJABBERD_DB EJABBERD_LOGDIR EJABBERD_PIDDIR
+SUBST_VARS.paths+=	PKG_SYSCONFDIR PREFIX
 
 # Helper target to refresh remote deps for tarring up
 fetch-deps:
@@ -100,6 +98,10 @@ fetch-deps:
 post-extract:
 	${LN} -s ${WRKDIR}/deps ${WRKSRC}/
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/tools/ejabberdctl.bc				\
+		${DESTDIR}${PREFIX}/share/bash-completion.d/ejabberd
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/erlang/buildlink3.mk"
diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST
index c4320ccea3e..b811eba2c5e 100644
--- a/chat/ejabberd/PLIST
+++ b/chat/ejabberd/PLIST
@@ -1,14 +1,16 @@
-@comment $NetBSD: PLIST,v 1.34 2015/09/01 11:36:59 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.35 2015/10/01 14:48:14 fhajny Exp $
 lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
 lib/erlang/lib/${PKGNAME}/ebin/acl.beam
 lib/erlang/lib/${PKGNAME}/ebin/adhoc.beam
+lib/erlang/lib/${PKGNAME}/ebin/beam_util.beam
 lib/erlang/lib/${PKGNAME}/ebin/cache_tab.beam
 lib/erlang/lib/${PKGNAME}/ebin/cache_tab_app.beam
 lib/erlang/lib/${PKGNAME}/ebin/cache_tab_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_digest.beam
+lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_oauth.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_plain.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_scram.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd.app
@@ -34,10 +36,12 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_hooks.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http_bind.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http_ws.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_idna.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_listener.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_local.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_logger.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_node_groups.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_odbc.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_odbc_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_piefxis.beam
@@ -114,7 +118,6 @@ lib/erlang/lib/${PKGNAME}/ebin/gre.beam
 lib/erlang/lib/${PKGNAME}/ebin/iconv.beam
 lib/erlang/lib/${PKGNAME}/ebin/iconv_app.beam
 lib/erlang/lib/${PKGNAME}/ebin/iconv_sup.beam
-lib/erlang/lib/${PKGNAME}/ebin/idna.beam
 lib/erlang/lib/${PKGNAME}/ebin/jd2ejd.beam
 lib/erlang/lib/${PKGNAME}/ebin/jiffy.app
 lib/erlang/lib/${PKGNAME}/ebin/jiffy.beam
@@ -151,6 +154,7 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_configure2.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_disco.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_echo.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_fail2ban.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_http_api.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_http_bind.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_http_fileserver.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_ip_blacklist.beam
@@ -207,6 +211,14 @@ lib/erlang/lib/${PKGNAME}/ebin/nodetree_dag.beam
 lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree.beam
 lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree_odbc.beam
 lib/erlang/lib/${PKGNAME}/ebin/nodetree_virtual.beam
+lib/erlang/lib/${PKGNAME}/ebin/oauth2.app
+lib/erlang/lib/${PKGNAME}/ebin/oauth2.beam
+lib/erlang/lib/${PKGNAME}/ebin/oauth2_backend.beam
+lib/erlang/lib/${PKGNAME}/ebin/oauth2_config.beam
+lib/erlang/lib/${PKGNAME}/ebin/oauth2_priv_set.beam
+lib/erlang/lib/${PKGNAME}/ebin/oauth2_response.beam
+lib/erlang/lib/${PKGNAME}/ebin/oauth2_token.beam
+lib/erlang/lib/${PKGNAME}/ebin/oauth2_token_generation.beam
 lib/erlang/lib/${PKGNAME}/ebin/odbc_queries.beam
 lib/erlang/lib/${PKGNAME}/ebin/p1_cache_tab.app
 lib/erlang/lib/${PKGNAME}/ebin/p1_fsm.beam
@@ -261,19 +273,27 @@ lib/erlang/lib/${PKGNAME}/ebin/stun_shaper.beam
 lib/erlang/lib/${PKGNAME}/ebin/stun_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/stun_test.beam
 lib/erlang/lib/${PKGNAME}/ebin/stun_tmp_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/tcp_serv.beam
 lib/erlang/lib/${PKGNAME}/ebin/translate.beam
 lib/erlang/lib/${PKGNAME}/ebin/treap.beam
 lib/erlang/lib/${PKGNAME}/ebin/turn.beam
 lib/erlang/lib/${PKGNAME}/ebin/turn_sm.beam
 lib/erlang/lib/${PKGNAME}/ebin/turn_tmp_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/url_util.beam
 lib/erlang/lib/${PKGNAME}/ebin/win32_dns.beam
 lib/erlang/lib/${PKGNAME}/ebin/xml.beam
 lib/erlang/lib/${PKGNAME}/ebin/xml_app.beam
 lib/erlang/lib/${PKGNAME}/ebin/xml_gen.beam
 lib/erlang/lib/${PKGNAME}/ebin/xml_stream.beam
 lib/erlang/lib/${PKGNAME}/ebin/xml_sup.beam
-lib/erlang/lib/${PKGNAME}/ebin/xml_util.beam
+lib/erlang/lib/${PKGNAME}/ebin/xmlrpc.app
+lib/erlang/lib/${PKGNAME}/ebin/xmlrpc.beam
 lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_codec.beam
+lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_decode.beam
+lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_encode.beam
+lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_http.beam
+lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_tests.beam
+lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_util.beam
 lib/erlang/lib/${PKGNAME}/include/ELDAPv3.hrl
 lib/erlang/lib/${PKGNAME}/include/XmppAddr.hrl
 lib/erlang/lib/${PKGNAME}/include/adhoc.hrl
@@ -302,12 +322,12 @@ lib/erlang/lib/${PKGNAME}/include/sqlite3.hrl
 lib/erlang/lib/${PKGNAME}/include/stun.hrl
 lib/erlang/lib/${PKGNAME}/include/xml.hrl
 lib/erlang/lib/${PKGNAME}/include/xml_gen.hrl
+lib/erlang/lib/${PKGNAME}/include/xmlrpc.hrl
 lib/erlang/lib/${PKGNAME}/priv/bin/captcha.sh
 lib/erlang/lib/${PKGNAME}/priv/bin/joincluster
 lib/erlang/lib/${PKGNAME}/priv/bin/leavecluster
 lib/erlang/lib/${PKGNAME}/priv/jiffy.so
 lib/erlang/lib/${PKGNAME}/priv/lib/esip_drv.so
-lib/erlang/lib/${PKGNAME}/priv/lib/expat_erl.so
 lib/erlang/lib/${PKGNAME}/priv/lib/ezlib_drv.so
 lib/erlang/lib/${PKGNAME}/priv/lib/iconv.so
 lib/erlang/lib/${PKGNAME}/priv/lib/jiffy.so
@@ -316,6 +336,7 @@ lib/erlang/lib/${PKGNAME}/priv/lib/p1_tls_drv.so
 lib/erlang/lib/${PKGNAME}/priv/lib/p1_yaml.so
 lib/erlang/lib/${PKGNAME}/priv/lib/stringprep.so
 lib/erlang/lib/${PKGNAME}/priv/lib/xml.so
+lib/erlang/lib/${PKGNAME}/priv/lib/xml_stream.so
 lib/erlang/lib/${PKGNAME}/priv/msgs/ca.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/cs.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/de.msg
@@ -344,8 +365,8 @@ lib/erlang/lib/${PKGNAME}/priv/msgs/wa.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/zh.msg
 lib/erlang/lib/${PKGNAME}/priv/sql/lite.sql
 sbin/ejabberdctl
+share/bash-completion.d/ejabberd
 share/doc/ejabberd/COPYING
-share/doc/ejabberd/guide.html
 share/examples/ejabberd/ejabberd.yml
 share/examples/ejabberd/ejabberdctl.cfg
 share/examples/ejabberd/inetrc
diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo
index 975f5d16ced..c48d513694e 100644
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.36 2015/09/01 11:36:59 fhajny Exp $
+$NetBSD: distinfo,v 1.37 2015/10/01 14:48:14 fhajny Exp $
 
-SHA1 (ejabberd-15.07-deps.tar.gz) = 19019c87abf4187dc823a409078d791a580377c3
-RMD160 (ejabberd-15.07-deps.tar.gz) = 63171aa661ca0afb43a6887ffd7b644c5aa9c418
-Size (ejabberd-15.07-deps.tar.gz) = 15110194 bytes
-SHA1 (ejabberd-15.07.tgz) = 7b80ac2f0f269673c2742079fb8cb08cfcbca70b
-RMD160 (ejabberd-15.07.tgz) = b51d63c5ff6685148d5fc48860a91b8edce92b98
-Size (ejabberd-15.07.tgz) = 1640947 bytes
+SHA1 (ejabberd-15.09-deps.tar.gz) = 84635a6e5fdb221fb0464ea49afee1e61e86f44c
+RMD160 (ejabberd-15.09-deps.tar.gz) = 1bdd900e3e064c4cd0b0f6b9c53cb73ccfc7b992
+Size (ejabberd-15.09-deps.tar.gz) = 16715917 bytes
+SHA1 (ejabberd-15.09.tgz) = 6df162377c5955e14d39e36be23e121e07d49b97
+RMD160 (ejabberd-15.09.tgz) = 126641534848e0fe16815dfa298a08a4fb25dc04
+Size (ejabberd-15.09.tgz) = 1590675 bytes
 SHA1 (patch-aa) = 5025927e6be5792fa8e59541938950d901b91ee5
 SHA1 (patch-ad) = cdd7a61333f3206ac3ae9168b1878a059da25988
 SHA1 (patch-ae) = a9340add286fe4b70ce0ac6b75a2f9162b8c4e7d
 SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
+SHA1 (patch-tools_ejabberdctl.bc) = 678d9a0be30bc4b1612c97a62def652ea6ca3e8a
diff --git a/chat/ejabberd/patches/patch-tools_ejabberdctl.bc b/chat/ejabberd/patches/patch-tools_ejabberdctl.bc
new file mode 100644
index 00000000000..6777364da65
--- /dev/null
+++ b/chat/ejabberd/patches/patch-tools_ejabberdctl.bc
@@ -0,0 +1,15 @@
+$NetBSD: patch-tools_ejabberdctl.bc,v 1.1 2015/10/01 14:48:14 fhajny Exp $
+
+Subst real log dir.
+
+--- tools/ejabberdctl.bc.orig	2015-09-29 20:37:15.000000000 +0000
++++ tools/ejabberdctl.bc
+@@ -3,7 +3,7 @@
+ #
+ get_help()
+ {
+-    local COMMANDCACHE=/var/log/ejabberd/bash_completion_$RANDOM
++    local COMMANDCACHE=@EJABBERD_LOGDIR@/bash_completion_$RANDOM
+     ejabberdctl $CTLARGS help >$COMMANDCACHE
+     if [[ $? == 2 ]] ; then
+         ISRUNNING=1