Update chat/ejabberd to 17.01

Most relevant changes:

Admin
- Add example api_permissions: definition to config template
- Allow old-stype mod_vcard_ldap in the config
- Fix migration of old pubsub database (migrating from 2.1.x)
- Get nodes from ejabberd_cluster instead of mnesia
- mod_configure: Fix configuration commands

Core
- Fix case clauses when using compression
- Set from/to in every routed packet
- Correctly process errors from new cyrsasl API
- Improve return values in cyrsasl API

Modules
- mod_http_bind: remove and migration code to mod_bosh
- mod_muc: Allow a subscriber to create room, then set
  allow_subscription=true
- mod_muc: Support legacy muc#roomconfig values
- mod_offline: Decode message before checking for expiration

Mnesia
- Let ejabberd_mnesia handles copy_type
- Fix index processing
- Speedup table setup, no i/o if EJABBERD_SCHEMA_PATH not set

SQL
- Add SSL support for SQL connections with PostgreSQL 1.1.2+
- Cope with malformed values in 'rosterusers' SQL table
- Improve tag insertion, avoid duplication

4 files changed, 29 insertions, 31 deletions

diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index 025b439db05..ae72113ba8e 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2017/01/03 18:52:33 fhajny Exp $
+# $NetBSD: Makefile,v 1.70 2017/01/21 20:20:33 fhajny Exp $
 
-DISTNAME=	ejabberd-16.12
+DISTNAME=	ejabberd-17.01
 CATEGORIES=	chat
 MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
@@ -10,12 +10,12 @@ HOMEPAGE=	http://www.ejabberd.im/
 COMMENT=	Free and Open Source distributed fault-tolerant Jabber server
 LICENSE=	gnu-gpl-v2
 
-DEPENDS+=	erlang-cache_tab>=1.0.5:../../devel/erlang-cache_tab
+DEPENDS+=	erlang-cache_tab>=1.0.6:../../devel/erlang-cache_tab
 DEPENDS+=	erlang-esip>=1.0.10:../../net/erlang-esip
-DEPENDS+=	erlang-ezlib>=1.0.1:../../devel/erlang-ezlib
-DEPENDS+=	erlang-fast_tls>=1.0.9:../../security/erlang-fast_tls
-DEPENDS+=	erlang-fast_xml>=1.1.18:../../textproc/erlang-fast_xml
-DEPENDS+=	erlang-fast_yaml>=1.0.7:../../textproc/erlang-fast_yaml
+DEPENDS+=	erlang-ezlib>=1.0.2:../../devel/erlang-ezlib
+DEPENDS+=	erlang-fast_tls>=1.0.10:../../security/erlang-fast_tls
+DEPENDS+=	erlang-fast_xml>=1.1.19:../../textproc/erlang-fast_xml
+DEPENDS+=	erlang-fast_yaml>=1.0.8:../../textproc/erlang-fast_yaml
 DEPENDS+=	erlang-iconv>=1.0.3:../../converters/erlang-iconv
 DEPENDS+=	erlang-jiffy>=0.14.8:../../textproc/erlang-jiffy
 DEPENDS+=	erlang-lager>=3.2.1:../../sysutils/erlang-lager
@@ -23,11 +23,11 @@ DEPENDS+=	erlang-luerl>=0.2:../../lang/erlang-luerl
 DEPENDS+=	erlang-p1_mysql>=1.0.2:../../databases/erlang-p1_mysql
 DEPENDS+=	erlang-p1_oauth2>=0.6.1:../../security/erlang-p1_oauth2
 DEPENDS+=	erlang-p1_pam>=1.0.0:../../security/erlang-p1_pam
-DEPENDS+=	erlang-p1_pgsql>=1.1.1:../../databases/erlang-p1_pgsql
+DEPENDS+=	erlang-p1_pgsql>=1.1.2:../../databases/erlang-p1_pgsql
 DEPENDS+=	erlang-p1_utils>=1.0.6:../../misc/erlang-p1_utils
 DEPENDS+=	erlang-stringprep>=1.0.7:../../textproc/erlang-stringprep
 DEPENDS+=	erlang-stun>=1.0.9:../../net/erlang-stun
-DEPENDS+=	erlang-xmpp>=1.1.4:../../net/erlang-xmpp
+DEPENDS+=	erlang-xmpp>=1.1.5:../../net/erlang-xmpp
 CONFLICTS+=	jabberd-[0-9]*
 
 GNU_CONFIGURE=		yes
diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST
index 3ad69fb395d..4ceed9e5e94 100644
--- a/chat/ejabberd/PLIST
+++ b/chat/ejabberd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.43 2017/01/03 18:52:33 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.44 2017/01/21 20:20:33 fhajny Exp $
 lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
 lib/erlang/lib/${PKGNAME}/ebin/acl.beam
@@ -33,7 +33,6 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_ctl.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_frontend_socket.beam
 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
@@ -114,7 +113,6 @@ 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_http_upload.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_http_upload_quota.beam
diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo
index 1bbb064a383..7e0650d0ae1 100644
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.46 2017/01/03 18:52:33 fhajny Exp $
+$NetBSD: distinfo,v 1.47 2017/01/21 20:20:33 fhajny Exp $
 
-SHA1 (ejabberd-16.12.tgz) = f2b407fa86d41ee7a4cfe2886529c77e413088e7
-RMD160 (ejabberd-16.12.tgz) = 74bb9f86d60336d26c1605ab376eb2030988b559
-SHA512 (ejabberd-16.12.tgz) = 1b08301497655479bb1cf442b0da889058c82af5c9fc074d8249cc5e9e4f74c68093d7e36491b4f9db9ff940721ad9f82faa3bf466b119f933197eb97edaf5a7
-Size (ejabberd-16.12.tgz) = 1646370 bytes
+SHA1 (ejabberd-17.01.tgz) = dab6666079dae76d6ccbeb81d76d728bc3a5f210
+RMD160 (ejabberd-17.01.tgz) = 79758741046409cb6eb3219abc10cc3055dc27e7
+SHA512 (ejabberd-17.01.tgz) = d64125f81efbf841eded140d877c950439c11e65377e167994d25f85fa66437aad771d94548d063900bd3c472922e6bfa8f8bbe65413f18e7b641f0ed32db566
+Size (ejabberd-17.01.tgz) = 1638418 bytes
 SHA1 (patch-aa) = a9197c75afa9ea4a2fbad70aec894f1b28c7bc88
 SHA1 (patch-ad) = 6a7cfbabb22cf362cf21791656be454f10ac5de8
 SHA1 (patch-ae) = c61e6662420745ff029418c26ac6211e04f27d49
 SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
-SHA1 (patch-rebar.config) = 15170e7e5de66cc88d0e3975dc5fc5d9c8bae55d
+SHA1 (patch-rebar.config) = b76de303d6c901305c4bdd5003f779f268a3d8d6
 SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569
diff --git a/chat/ejabberd/patches/patch-rebar.config b/chat/ejabberd/patches/patch-rebar.config
index 70c44e10507..c4464b1ae1a 100644
--- a/chat/ejabberd/patches/patch-rebar.config
+++ b/chat/ejabberd/patches/patch-rebar.config
@@ -1,36 +1,36 @@
-$NetBSD: patch-rebar.config,v 1.6 2017/01/03 18:52:33 fhajny Exp $
+$NetBSD: patch-rebar.config,v 1.7 2017/01/21 20:20:33 fhajny Exp $
 
 Deps are handled by pkgsrc.
 
---- rebar.config.orig	2016-12-22 19:41:01.000000000 +0000
+--- rebar.config.orig	2017-01-20 11:19:55.000000000 +0000
 +++ rebar.config
-@@ -7,46 +7,6 @@
- %%% Created :  1 May 2013 by Evgeniy Khramtsov <ekhramtsov@process-one.net>
- %%%-------------------------------------------------------------------
+@@ -18,46 +18,6 @@
+ %%%
+ %%%----------------------------------------------------------------------
  
 -{deps, [{lager, ".*", {git, "https://github.com/basho/lager", {tag, "3.2.1"}}},
 -        {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.6"}}},
--        {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.5"}}},
--        {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.9"}}},
+-        {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.6"}}},
+-        {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.10"}}},
 -        {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.7"}}},
--        {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.18"}}},
--        {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.1.4"}}},
+-        {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.19"}}},
+-        {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.1.6"}}},
 -        {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.9"}}},
 -        {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.10"}}},
--        {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.7"}}},
+-        {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.8"}}},
 -        {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}},
 -        {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.1"}}},
 -        {luerl, ".*", {git, "https://github.com/rvirding/luerl", {tag, "v0.2"}}},
 -        {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql",
 -                                               {tag, "1.0.2"}}}},
 -        {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql",
--                                               {tag, "1.1.1"}}}},
+-                                               {tag, "1.1.2"}}}},
 -        {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/processone/erlang-sqlite3",
 -                                               {tag, "1.1.5"}}}},
 -        {if_var_true, pam, {p1_pam, ".*", {git, "https://github.com/processone/epam",
 -                                           {tag, "1.0.0"}}}},
 -        {if_var_true, zlib, {ezlib, ".*", {git, "https://github.com/processone/ezlib",
--                                           {tag, "1.0.1"}}}},
+-                                           {tag, "1.0.2"}}}},
 -        {if_var_true, riak, {riakc, ".*", {git, "https://github.com/basho/riak-erlang-client",
 -                                           {tag, "2.4.1"}}}},
 -        %% Elixir support, needed to run tests
@@ -51,7 +51,7 @@ Deps are handled by pkgsrc.
  {if_var_true, latest_deps,
   {floating_deps, [cache_tab,
                    fast_tls,
-@@ -68,8 +28,8 @@
+@@ -79,8 +39,8 @@
  
  {erl_opts, [nowarn_deprecated_function,
              {i, "include"},