Update chat/ejabberd to 17.09.

Admin
- Harden ejabberdctl
- Fix ejabberdctl quoting when using iex
- Call earlier deps configure scripts during compilation
- Fix iexdebug and iexlive commands
- Quote $PEER in ping command to avoid hostnames containing "-" being
  interpreted as arithmetic
- Docker: Sync containers from rroemhild and add instructions in
  README
- Use eimp instead of ImageMagick calls for thumbnails creation
- Add forgotten caching options to the validator
- Fix 'make install' to work with new output from rebar list-deps
- Rewrite muc_register_nick and muc_unregister_nick to be DB
  independent
- WebAdmin: Fix deletion of multiple offline messages

Encryption
- Add support for XEP-0368 in outgoing s2s: SRV records for XMPP over
  TLS
- Deprecate s2s_use_starttls: required_trusted
- Don't attempt to access(2) a certificate file
- Let 'domain_certfile' take higher precedence instead of s2s_certfile
  or c2s_certfile

Databases
- mysql.sql: Use multi-column index on username/ID
- Use forked repo of Riak Erlang client to support OTP20

Modules
- mod_avatar: New module with support for legacy and modern clients
- mod_block_strangers: Introduce option 'allow_transports'
- mod_block_strangers: Block messages from strangers before
  mod_mam/mod_offline processing
- mod_http_upload: Don't ignore 'custom_headers'
- mod_muc: Improve presence-error and unavailable of multi-session
  occupants
- mod_multicast: Fix start and reading of configured limits
- mod_mam: Simplify check for anon MUC JID filtering
- mod_mam: Refuse filtering anon MUC queries by JID
- mod_privacy: Explicitly match against
- mod_register: Introduce 'redirect_url' option
- mod_stream_mgmt: Delete 'c2s_init' hook
- mod_vcard_xupdate: Also replace vcard-x-update in direct presences

PubSub
- Fix get_items/get_item calls
- Add correct order when requesting all items
- Implement '6.5.7 Requesting the Most Recent Items'
- Fix RSM support on SQL
- Add RSM support on mnesia
- Fix node_options: default options only apply on first plugin
- Broadcast updated node configuration
- Enforce controls on publish and delete items

Miscelanea
- Preserve correct order of deserialized XML elements
- Suppress push notifications for online clients
- Extract strings and prepare translation files works again

5 files changed, 43 insertions, 46 deletions

diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index 35cf9dfd9b2..6ca18f08244 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.76 2017/09/06 12:26:32 fhajny Exp $
+# $NetBSD: Makefile,v 1.77 2017/10/17 14:55:36 fhajny Exp $
 
-DISTNAME=	ejabberd-17.08
+DISTNAME=	ejabberd-17.09
 CATEGORIES=	chat
 MASTER_SITES=	https://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
@@ -10,25 +10,26 @@ HOMEPAGE=	https://www.ejabberd.im/
 COMMENT=	Free and Open Source distributed fault-tolerant Jabber server
 LICENSE=	gnu-gpl-v2
 
-DEPENDS+=	erlang-cache_tab>=1.0.10:../../devel/erlang-cache_tab
+DEPENDS+=	erlang-cache_tab>=1.0.11:../../devel/erlang-cache_tab
 DEPENDS+=	erlang-epam>=1.0.3:../../security/erlang-epam
 DEPENDS+=	erlang-eredis>=1.0.8.20150910:../../databases/erlang-eredis
-DEPENDS+=	erlang-esip>=1.0.15:../../net/erlang-esip
+DEPENDS+=	erlang-eimp>=1.0.1:../../graphics/erlang-eimp
+DEPENDS+=	erlang-esip>=1.0.16:../../net/erlang-esip
 DEPENDS+=	erlang-ezlib>=1.0.2:../../devel/erlang-ezlib
-DEPENDS+=	erlang-fast_tls>=1.0.15:../../security/erlang-fast_tls
-DEPENDS+=	erlang-fast_xml>=1.1.23:../../textproc/erlang-fast_xml
-DEPENDS+=	erlang-fast_yaml>=1.0.10:../../textproc/erlang-fast_yaml
-DEPENDS+=	erlang-iconv>=1.0.5:../../converters/erlang-iconv
+DEPENDS+=	erlang-fast_tls>=1.0.16:../../security/erlang-fast_tls
+DEPENDS+=	erlang-fast_xml>=1.1.24:../../textproc/erlang-fast_xml
+DEPENDS+=	erlang-fast_yaml>=1.0.11:../../textproc/erlang-fast_yaml
+DEPENDS+=	erlang-iconv>=1.0.6:../../converters/erlang-iconv
 DEPENDS+=	erlang-jiffy>=0.14.8:../../textproc/erlang-jiffy
 DEPENDS+=	erlang-lager>=3.4.2.:../../sysutils/erlang-lager
 DEPENDS+=	erlang-luerl>=0.2:../../lang/erlang-luerl
-DEPENDS+=	erlang-p1_mysql>=1.0.3:../../databases/erlang-p1_mysql
+DEPENDS+=	erlang-p1_mysql>=1.0.4:../../databases/erlang-p1_mysql
 DEPENDS+=	erlang-p1_oauth2>=0.6.2:../../security/erlang-p1_oauth2
-DEPENDS+=	erlang-p1_pgsql>=1.1.3:../../databases/erlang-p1_pgsql
-DEPENDS+=	erlang-p1_utils>=1.0.9:../../misc/erlang-p1_utils
-DEPENDS+=	erlang-stringprep>=1.0.9:../../textproc/erlang-stringprep
-DEPENDS+=	erlang-stun>=1.0.14:../../net/erlang-stun
-DEPENDS+=	erlang-xmpp>=1.1.14:../../net/erlang-xmpp
+DEPENDS+=	erlang-p1_pgsql>=1.1.4:../../databases/erlang-p1_pgsql
+DEPENDS+=	erlang-p1_utils>=1.0.10:../../misc/erlang-p1_utils
+DEPENDS+=	erlang-stringprep>=1.0.10:../../textproc/erlang-stringprep
+DEPENDS+=	erlang-stun>=1.0.15:../../net/erlang-stun
+DEPENDS+=	erlang-xmpp>=1.1.15:../../net/erlang-xmpp
 
 GNU_CONFIGURE=		yes
 USE_GCC_RUNTIME=	yes
@@ -36,6 +37,7 @@ USE_TOOLS+=		bash:run gmake patch
 
 CONFIGURE_ARGS+=	--disable-debug
 CONFIGURE_ARGS+=	--enable-system-deps
+CONFIGURE_ARGS+=	--enable-graphics
 CONFIGURE_ARGS+=	--enable-iconv
 CONFIGURE_ARGS+=	--enable-mysql
 CONFIGURE_ARGS+=	--enable-odbc
diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST
index 7e49b1445d6..fa91e77c4de 100644
--- a/chat/ejabberd/PLIST
+++ b/chat/ejabberd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.48 2017/08/20 12:58:04 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.49 2017/10/17 14:55:36 fhajny Exp $
 lib/erlang/lib/${PKGNAME}/COPYING
 lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
@@ -107,6 +107,7 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_announce.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_announce_mnesia.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_announce_riak.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_announce_sql.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_avatar.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_block_strangers.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_blocking.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_bosh.beam
@@ -282,6 +283,7 @@ lib/erlang/lib/${PKGNAME}/include/mod_shared_roster.hrl
 lib/erlang/lib/${PKGNAME}/include/mod_vcard.hrl
 lib/erlang/lib/${PKGNAME}/include/mod_vcard_xupdate.hrl
 lib/erlang/lib/${PKGNAME}/include/pubsub.hrl
+lib/erlang/lib/${PKGNAME}/include/translate.hrl
 lib/erlang/lib/${PKGNAME}/priv/bin/captcha.sh
 lib/erlang/lib/${PKGNAME}/priv/msgs/ca.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/cs.msg
diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo
index 2ccb8eb722e..c3b82c8bbb4 100644
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.51 2017/08/20 12:58:04 fhajny Exp $
+$NetBSD: distinfo,v 1.52 2017/10/17 14:55:36 fhajny Exp $
 
-SHA1 (ejabberd-17.08.tgz) = b9f05fbd9890d71bcbf91fee4fb5c0a1a8fc322c
-RMD160 (ejabberd-17.08.tgz) = bb695e29c7c2d9b4726dfde06fe4e0b7588723a8
-SHA512 (ejabberd-17.08.tgz) = 037902e557fcc09616f6c120c543be9f4aedd4eac9a6a9618209f0ebc66a24d3857870569c31478cc37652d243e1b7a02151f7c2b15ef2ddfefee8a04a8dd328
-Size (ejabberd-17.08.tgz) = 1716503 bytes
+SHA1 (ejabberd-17.09.tgz) = 7b7fd4f21f18df7751915a4af1a53b832d952cfd
+RMD160 (ejabberd-17.09.tgz) = ff4f0906999f44f607a7d0fafa6c4d8226586391
+SHA512 (ejabberd-17.09.tgz) = ee2c907ed1dc524fd4c7e52b3f0214b53b1cd58392974d8671d69f7ac43051b45a602d16e70dea02ab1cd99c9c8e9ca22753796ba0f759e77615be0ca54bc909
+Size (ejabberd-17.09.tgz) = 1759331 bytes
 SHA1 (patch-aa) = a9197c75afa9ea4a2fbad70aec894f1b28c7bc88
 SHA1 (patch-ad) = 6a7cfbabb22cf362cf21791656be454f10ac5de8
-SHA1 (patch-ae) = 41a3ce9c4fcbd3125240167e2fb3d202cbfccf05
+SHA1 (patch-ae) = b9ad2b9e615b6662e117d3aa0309b85e37a09207
 SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
 SHA1 (patch-rebar.config) = 1c9aad883e7e47908ad92580cca5ba35c0c3034a
-SHA1 (patch-rebar.config.script) = a9dd2828a7de79cc93b6313580d83d82f6a7a684
+SHA1 (patch-rebar.config.script) = 01fc3fb04990bec95f70cfb8a2208c989687951c
 SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569
diff --git a/chat/ejabberd/patches/patch-ae b/chat/ejabberd/patches/patch-ae
index 120b1ac36f3..0d178946dba 100644
--- a/chat/ejabberd/patches/patch-ae
+++ b/chat/ejabberd/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.17 2017/08/20 12:58:04 fhajny Exp $
+$NetBSD: patch-ae,v 1.18 2017/10/17 14:55:36 fhajny Exp $
 
 - Default locations.
 - Use 'su -' instead of just 'su'. Fixes priv delegation on SunOS
@@ -7,20 +7,20 @@ $NetBSD: patch-ae,v 1.17 2017/08/20 12:58:04 fhajny Exp $
 - At least SunOS has not wheel group.
 - Portable grep calls.
 
---- ejabberdctl.template.orig	2017-08-14 07:43:02.000000000 +0000
+--- ejabberdctl.template.orig	2017-09-28 13:21:11.000000000 +0000
 +++ ejabberdctl.template
-@@ -56,8 +56,8 @@ done
+@@ -57,8 +57,8 @@ done
  
  # 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:=@EJABBERD_LOGDIR@}
-+: ${SPOOL_DIR:=@EJABBERD_DB@}
- : ${EJABBERD_CONFIG_PATH:="$ETC_DIR"/ejabberd.yml}
- : ${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR"/ejabberdctl.cfg}
+ : "${ETC_DIR:="{{sysconfdir}}/ejabberd"}"
+-: "${LOGS_DIR:="{{localstatedir}}/log/ejabberd"}"
+-: "${SPOOL_DIR:="{{localstatedir}}/lib/ejabberd"}"
++: "${LOGS_DIR:=@EJABBERD_LOGDIR@}"
++: "${SPOOL_DIR:=@EJABBERD_DB@}"
+ : "${EJABBERD_CONFIG_PATH:="$ETC_DIR/ejabberd.yml"}"
+ : "${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR/ejabberdctl.cfg"}"
  [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
-@@ -108,7 +108,7 @@ export ERL_LIBS
+@@ -109,7 +109,7 @@ export ERL_LIBS
  exec_cmd()
  {
      case $EXEC_CMD in
@@ -29,7 +29,7 @@ $NetBSD: patch-ae,v 1.17 2017/08/20 12:58:04 fhajny Exp $
          as_current_user) "$@" ;;
      esac
  }
-@@ -207,19 +207,19 @@ uid()
+@@ -208,14 +208,14 @@ uid()
  # stop epmd if there is no other running node
  stop_epmd()
  {
@@ -42,14 +42,7 @@ $NetBSD: patch-ae,v 1.17 2017/08/20 12:58:04 fhajny Exp $
  check_start()
  {
 -    "$EPMD" -names 2>/dev/null | grep -q " ${ERLANG_NODE%@*} " && {
--        ps ux | grep -v grep | grep -q " $ERLANG_NODE " && {
 +    "$EPMD" -names 2>/dev/null | grep " ${ERLANG_NODE%@*} " >/dev/null && {
-+        ps ux | grep -v grep | grep " $ERLANG_NODE " >/dev/null && {
+         pgrep -f "$ERLANG_NODE" >/dev/null && {
              echo "ERROR: The ejabberd node '$ERLANG_NODE' is already running."
              exit 4
-         } || {
--            ps ux | grep -v grep | grep -q beam && {
-+            ps ux | grep -v grep | grep beam >/dev/null && {
-                 echo "ERROR: The ejabberd node '$ERLANG_NODE' is registered,"
-                 echo "       but no related beam process has been found."
-                 echo "Shutdown all other erlang nodes, and call 'epmd -kill'."
diff --git a/chat/ejabberd/patches/patch-rebar.config.script b/chat/ejabberd/patches/patch-rebar.config.script
index 1e3bf101244..b0abd17b411 100644
--- a/chat/ejabberd/patches/patch-rebar.config.script
+++ b/chat/ejabberd/patches/patch-rebar.config.script
@@ -1,14 +1,14 @@
-$NetBSD: patch-rebar.config.script,v 1.3 2017/03/30 14:50:05 fhajny Exp $
+$NetBSD: patch-rebar.config.script,v 1.4 2017/10/17 14:55:36 fhajny Exp $
 
 Deps are handled by pkgsrc.
 
---- rebar.config.script.orig	2017-02-24 04:57:57.000000000 +0000
+--- rebar.config.script.orig	2017-09-28 13:21:11.000000000 +0000
 +++ rebar.config.script
-@@ -315,8 +315,6 @@ Rules = [
+@@ -326,8 +326,6 @@ Rules = [
  	  AppendList([{coveralls, ".*", {git, "https://github.com/markusn/coveralls-erl.git", "master"}}]), []},
  	 {[post_hooks], [cover_enabled], os:getenv("TRAVIS") == "true",
  	  AppendList2(TravisPostHooks), [], false},
--	 {[pre_hooks], [post_hook_configure], true,
+-	 {[overrides], [post_hook_configure], true,
 -	  AppendList2(GenDepsConfigure), [], []},
  	 {[ct_extra_params], [eunit_compile_opts], true,
  	  AppendStr2(CtParams), "", []},