Update chat/ejabberd to 17.11.

New features
- ACME Support
- Introduce 'certfiles' global option
- Use new API for IQ routing

Admin
- Omit "ProtectSystem" option from systemd unit
- Log warnings for c2s/s2s certfile option
- Log a message when a user gets registered
- ejabberdctl: Fix 'read' syntax for non-bash shells
- Fix renew_certificates ejabberdctl command
- Unregister commands when stopping node only if it's last one
- Halt ejabberd if the top supervisor fails to start

Build
- Avoid badarg error when running get-deps before ./configure has
  created src/ejabberd.app
- Fix sed invocation that was incompatible with FreeBSD's sed
- Makefile.in: Fix "make clean && make"
- Improve --enable-system-deps
- Install binaries with 755 permissions
- Install eimp binary with +x attribute
- Remove find-outdated-deps script, we have better replacement for it

Databases
- Allow export command regardless of the configured db_type
- Add SQL_INSERT macro and update SQL queries to use server_host field
- Update SQL archive index to match mysql.sql
- mod_muc: Use correct table field name in sql query

MAM
- Always strip stanza IDs
- Announce support for stanza IDs
- Don't store from 'sm_receive_packet' hook
- Fix mod_mam reloading
- Ignore non-message stanzas earlier
- Improve handling of forked messages
- Make sure a stanza ID is always added
- Make sure archived message isn't bounced
- Prepare version 0.6.1 of XEP-0313 (MAM) support

MUC
- Properly store subject element
- Resend presences and history if presence possesses x MUC element
- Send presence-unavailable when expulsing a participant
- Add mucsub event for subscribers list changes
- Optimize muc subscriptions handling
- Show real jid in mucsub subscription change events

PubSub
- Add basic PubSub meta-data support
- Rewrite pubsub export to sql
- Cleanup tree requests, rename pubsub_node.type to pubsub_node.plugin
- Fix select_type race on plugin_init
- Implement parentnodes seek for hometree
- Delete cached item on node removal
- Fix delete item from unregistered user
- Cleanup pubsub subscriptions quering, fix pep case
- PEP services must send notifications to the account owner

Push
- Avoid notification duplicates
- Add support for SQL storage
- Add export from Mnesia database to SQL file
- Don't store xdata() in Mnesia table
- Simplify backend interface

4 files changed, 45 insertions, 33 deletions

diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index 6ca18f08244..086fa69a02d 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.77 2017/10/17 14:55:36 fhajny Exp $
+# $NetBSD: Makefile,v 1.78 2017/12/14 21:12:21 fhajny Exp $
 
-DISTNAME=	ejabberd-17.09
+DISTNAME=	ejabberd-17.11
 CATEGORIES=	chat
 MASTER_SITES=	https://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
@@ -10,17 +10,19 @@ 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.11:../../devel/erlang-cache_tab
+DEPENDS+=	erlang-cache_tab>=1.0.12:../../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-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.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-eimp>=1.0.2:../../graphics/erlang-eimp
+DEPENDS+=	erlang-esip>=1.0.17:../../net/erlang-esip
+DEPENDS+=	erlang-ezlib>=1.0.3:../../devel/erlang-ezlib
+DEPENDS+=	erlang-fast_tls>=1.0.17:../../security/erlang-fast_tls
+DEPENDS+=	erlang-fast_xml>=1.1.25:../../textproc/erlang-fast_xml
+DEPENDS+=	erlang-fast_yaml>=1.0.12:../../textproc/erlang-fast_yaml
+DEPENDS+=	erlang-fs>=2.12.0:../../devel/erlang-fs
 DEPENDS+=	erlang-iconv>=1.0.6:../../converters/erlang-iconv
 DEPENDS+=	erlang-jiffy>=0.14.8:../../textproc/erlang-jiffy
+DEPENDS+=	erlang-jose>=1.8.4:../../security/erlang-jose
 DEPENDS+=	erlang-lager>=3.4.2.:../../sysutils/erlang-lager
 DEPENDS+=	erlang-luerl>=0.2:../../lang/erlang-luerl
 DEPENDS+=	erlang-p1_mysql>=1.0.4:../../databases/erlang-p1_mysql
@@ -28,8 +30,8 @@ DEPENDS+=	erlang-p1_oauth2>=0.6.2:../../security/erlang-p1_oauth2
 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
+DEPENDS+=	erlang-stun>=1.0.16:../../net/erlang-stun
+DEPENDS+=	erlang-xmpp>=1.1.16:../../net/erlang-xmpp
 
 GNU_CONFIGURE=		yes
 USE_GCC_RUNTIME=	yes
diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST
index fa91e77c4de..54ffb99ab13 100644
--- a/chat/ejabberd/PLIST
+++ b/chat/ejabberd/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.49 2017/10/17 14:55:36 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.50 2017/12/14 21:12:21 fhajny Exp $
 lib/erlang/lib/${PKGNAME}/COPYING
 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/acme_challenge.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_digest.beam
@@ -12,6 +13,8 @@ lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_scram.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd.app
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_access_permissions.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_acme.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_acme_comm.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_admin.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_app.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth.beam
@@ -38,6 +41,7 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_hooks.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http_ws.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_idna.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_iq.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
@@ -103,6 +107,7 @@ lib/erlang/lib/${PKGNAME}/ebin/jlib.beam
 lib/erlang/lib/${PKGNAME}/ebin/misc.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_adhoc.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_admin_extra.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_admin_update_sql.beam
 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
@@ -184,6 +189,7 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_pubsub.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_push.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_push_keepalive.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_push_mnesia.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_push_sql.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_register.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_register_web.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_roster.beam
@@ -253,6 +259,8 @@ lib/erlang/lib/${PKGNAME}/include/XmppAddr.hrl
 lib/erlang/lib/${PKGNAME}/include/adhoc.hrl
 lib/erlang/lib/${PKGNAME}/include/bosh.hrl
 lib/erlang/lib/${PKGNAME}/include/ejabberd.hrl
+lib/erlang/lib/${PKGNAME}/include/ejabberd_acme.hrl
+lib/erlang/lib/${PKGNAME}/include/ejabberd_auth.hrl
 lib/erlang/lib/${PKGNAME}/include/ejabberd_commands.hrl
 lib/erlang/lib/${PKGNAME}/include/ejabberd_config.hrl
 lib/erlang/lib/${PKGNAME}/include/ejabberd_ctl.hrl
@@ -278,6 +286,7 @@ lib/erlang/lib/${PKGNAME}/include/mod_offline.hrl
 lib/erlang/lib/${PKGNAME}/include/mod_privacy.hrl
 lib/erlang/lib/${PKGNAME}/include/mod_private.hrl
 lib/erlang/lib/${PKGNAME}/include/mod_proxy65.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_push.hrl
 lib/erlang/lib/${PKGNAME}/include/mod_roster.hrl
 lib/erlang/lib/${PKGNAME}/include/mod_shared_roster.hrl
 lib/erlang/lib/${PKGNAME}/include/mod_vcard.hrl
@@ -285,6 +294,22 @@ 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/css/admin.css
+lib/erlang/lib/${PKGNAME}/priv/css/bosh.css
+lib/erlang/lib/${PKGNAME}/priv/css/muc.css
+lib/erlang/lib/${PKGNAME}/priv/css/oauth.css
+lib/erlang/lib/${PKGNAME}/priv/css/register.css
+lib/erlang/lib/${PKGNAME}/priv/img/admin-logo-fill.png
+lib/erlang/lib/${PKGNAME}/priv/img/admin-logo.png
+lib/erlang/lib/${PKGNAME}/priv/img/bosh-logo.png
+lib/erlang/lib/${PKGNAME}/priv/img/favicon.png
+lib/erlang/lib/${PKGNAME}/priv/img/oauth-logo.png
+lib/erlang/lib/${PKGNAME}/priv/img/powered-by-ejabberd.png
+lib/erlang/lib/${PKGNAME}/priv/img/powered-by-erlang.png
+lib/erlang/lib/${PKGNAME}/priv/img/valid-xhtml10.png
+lib/erlang/lib/${PKGNAME}/priv/img/vcss.png
+lib/erlang/lib/${PKGNAME}/priv/js/admin.js
+lib/erlang/lib/${PKGNAME}/priv/js/muc.js
 lib/erlang/lib/${PKGNAME}/priv/msgs/ca.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/cs.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/de.msg
@@ -314,6 +339,7 @@ lib/erlang/lib/${PKGNAME}/priv/msgs/zh.msg
 lib/erlang/lib/${PKGNAME}/priv/sql/lite.sql
 lib/erlang/lib/${PKGNAME}/priv/sql/mssql.sql
 lib/erlang/lib/${PKGNAME}/priv/sql/mysql.sql
+lib/erlang/lib/${PKGNAME}/priv/sql/pg.new.sql
 lib/erlang/lib/${PKGNAME}/priv/sql/pg.sql
 sbin/ejabberdctl
 share/bash-completion.d/ejabberd
diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo
index c3b82c8bbb4..64ea0b16cae 100644
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.52 2017/10/17 14:55:36 fhajny Exp $
+$NetBSD: distinfo,v 1.53 2017/12/14 21:12:21 fhajny Exp $
 
-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 (ejabberd-17.11.tgz) = 7800a13a764534d893450c290a0c5d1ccce55bd6
+RMD160 (ejabberd-17.11.tgz) = 47d2ca9eb1970d9b787b015f9d75157a07a309d0
+SHA512 (ejabberd-17.11.tgz) = 67c31f59eb7a41b365c043f084a9f306f8467139b894ede04ed841c0352e7a6f7368e4a6ce17893b5b6ce34d217c99ac907e35eefe6bdd652a1596408ef8595a
+Size (ejabberd-17.11.tgz) = 1878639 bytes
 SHA1 (patch-aa) = a9197c75afa9ea4a2fbad70aec894f1b28c7bc88
 SHA1 (patch-ad) = 6a7cfbabb22cf362cf21791656be454f10ac5de8
 SHA1 (patch-ae) = b9ad2b9e615b6662e117d3aa0309b85e37a09207
 SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
 SHA1 (patch-rebar.config) = 1c9aad883e7e47908ad92580cca5ba35c0c3034a
-SHA1 (patch-rebar.config.script) = 01fc3fb04990bec95f70cfb8a2208c989687951c
 SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569
diff --git a/chat/ejabberd/patches/patch-rebar.config.script b/chat/ejabberd/patches/patch-rebar.config.script
deleted file mode 100644
index b0abd17b411..00000000000
--- a/chat/ejabberd/patches/patch-rebar.config.script
+++ /dev/null
@@ -1,15 +0,0 @@
-$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-09-28 13:21:11.000000000 +0000
-+++ rebar.config.script
-@@ -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},
--	 {[overrides], [post_hook_configure], true,
--	  AppendList2(GenDepsConfigure), [], []},
- 	 {[ct_extra_params], [eunit_compile_opts], true,
- 	  AppendStr2(CtParams), "", []},
- 	 {[erl_opts], true,