Update chat/ejabberd to 17.04.

Make the Redis support unconditional (no extra dependencies).

Changes in 17.04:

Admin
- Add more examples on config template
- Generate ejabberd lib dir when not available in code server
- Set default prefix to /usr/local
- Start supervisors after ext_mod
- Don't log warning on successful ping reply
- New muc_register_nick command

Core
- Deprecate jlib.erl in favor of misc.erl
- Add support for file-based queues
- ejabberd_sm: Fix routing of headline and groupchat messages
- Fix c2s connection close on demand
- Improve overloaded S2S queue processing

Databases
- Improve Redis related code
- Add Redis pool support
- Improve logging of Redis errors
- Add Redis and SQL as mod_proxy65 RAM backends
- Add Redis and SQL as mod_carboncopy RAM backends
- Add Redis and SQL as mod_bosh RAM backends
- Add Redis and SQL as router RAM backends
- Add SQL as mod_muc RAM backend
- Remove obsolete Pubsub mnesia migration calls

Miscellany
- ejabberd_http: Expand @VERSION@ in custom headers
- ejabberd_http: Add "custom_headers" option
- mod_client_state: Queue stanzas of each full JID
- mod_http_upload: Don't add "Server" header line
- Pubsub: Refactor pubsub's get_last_items
- Pubsub: Fix PEP issues

5 files changed, 35 insertions, 27 deletions

diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index 33c3f65a9f0..b444e78f11e 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.71 2017/03/30 14:50:05 fhajny Exp $
+# $NetBSD: Makefile,v 1.72 2017/04/13 19:04:53 fhajny Exp $
 
-DISTNAME=	ejabberd-17.03
+DISTNAME=	ejabberd-17.04
 CATEGORIES=	chat
 MASTER_SITES=	https://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
@@ -11,21 +11,22 @@ COMMENT=	Free and Open Source distributed fault-tolerant Jabber server
 LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	erlang-cache_tab>=1.0.7:../../devel/erlang-cache_tab
-DEPENDS+=	erlang-epam>=1.0.0:../../security/erlang-epam
+DEPENDS+=	erlang-epam>=1.0.2:../../security/erlang-epam
+DEPENDS+=	erlang-eredis>=1.0.8.20150910:../../databases/erlang-eredis
 DEPENDS+=	erlang-esip>=1.0.11:../../net/erlang-esip
 DEPENDS+=	erlang-ezlib>=1.0.2:../../devel/erlang-ezlib
 DEPENDS+=	erlang-fast_tls>=1.0.11:../../security/erlang-fast_tls
 DEPENDS+=	erlang-fast_xml>=1.1.21:../../textproc/erlang-fast_xml
 DEPENDS+=	erlang-fast_yaml>=1.0.9:../../textproc/erlang-fast_yaml
-DEPENDS+=	erlang-iconv>=1.0.3:../../converters/erlang-iconv
+DEPENDS+=	erlang-iconv>=1.0.4:../../converters/erlang-iconv
 DEPENDS+=	erlang-jiffy>=0.14.8:../../textproc/erlang-jiffy
 DEPENDS+=	erlang-lager>=3.2.1:../../sysutils/erlang-lager
 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_pgsql>=1.1.2:../../databases/erlang-p1_pgsql
-DEPENDS+=	erlang-p1_utils>=1.0.7:../../misc/erlang-p1_utils
-DEPENDS+=	erlang-stringprep>=1.0.7:../../textproc/erlang-stringprep
+DEPENDS+=	erlang-p1_utils>=1.0.8:../../misc/erlang-p1_utils
+DEPENDS+=	erlang-stringprep>=1.0.8:../../textproc/erlang-stringprep
 DEPENDS+=	erlang-stun>=1.0.10:../../net/erlang-stun
 DEPENDS+=	erlang-xmpp>=1.1.9:../../net/erlang-xmpp
 CONFLICTS+=	jabberd-[0-9]*
diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST
index 660b9093b40..bb3f4fe8e0f 100644
--- a/chat/ejabberd/PLIST
+++ b/chat/ejabberd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.45 2017/03/30 14:50:05 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.46 2017/04/13 19:04:53 fhajny Exp $
 lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
 lib/erlang/lib/${PKGNAME}/ebin/acl.beam
@@ -47,12 +47,15 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_piefxis.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_rdbms.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_receiver.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_redis.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_redis_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_regexp.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_riak.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_riak_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router_mnesia.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router_multicast.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router_redis.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router_sql.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s_in.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s_out.beam
@@ -89,6 +92,7 @@ lib/erlang/lib/${PKGNAME}/ebin/gen_pubsub_node.beam
 lib/erlang/lib/${PKGNAME}/ebin/gen_pubsub_nodetree.beam
 lib/erlang/lib/${PKGNAME}/ebin/jd2ejd.beam
 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_announce.beam
@@ -102,12 +106,16 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_blocking_riak.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_blocking_sql.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_bosh.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_bosh_mnesia.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_bosh_redis.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_bosh_sql.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_caps.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_caps_mnesia.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_caps_riak.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_caps_sql.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy_mnesia.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy_redis.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy_sql.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_client_state.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_configure.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_delegation.beam
@@ -159,7 +167,9 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_privilege.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_lib.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_mnesia.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_redis.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_service.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_sql.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_stream.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_pubsub.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_register.beam
diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo
index 49ee5cebcd1..31ba8d85a77 100644
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.48 2017/03/30 14:50:05 fhajny Exp $
+$NetBSD: distinfo,v 1.49 2017/04/13 19:04:53 fhajny Exp $
 
-SHA1 (ejabberd-17.03.tgz) = 0d84b1f99d1619428207ce5380ec8844a021f4ae
-RMD160 (ejabberd-17.03.tgz) = 72d57e7a26058496836255f0114e29ad929cc11d
-SHA512 (ejabberd-17.03.tgz) = d155102a40d810fb26786c5c38c540e931b45236751d4bc217a2b254cd87dfa44d970b4ffc3112b23ca403b3a62f56e442fa9c8aff7e349ba6ced46441c695d4
-Size (ejabberd-17.03.tgz) = 1680682 bytes
+SHA1 (ejabberd-17.04.tgz) = cd098135ae2cdf75267cba0c99759578e21b7274
+RMD160 (ejabberd-17.04.tgz) = 301914a72893035eea6719ef09ae99b87981a804
+SHA512 (ejabberd-17.04.tgz) = 03467434dba92bd1ff2f70d78aa8fcf86fc73cb52aaaa73e4947229e1d14225e7b0d0133c3da7c8efe4c9db13aab932f40f757be46b120d0f280f96d62c203d7
+Size (ejabberd-17.04.tgz) = 1690441 bytes
 SHA1 (patch-aa) = a9197c75afa9ea4a2fbad70aec894f1b28c7bc88
 SHA1 (patch-ad) = 6a7cfbabb22cf362cf21791656be454f10ac5de8
 SHA1 (patch-ae) = c61e6662420745ff029418c26ac6211e04f27d49
 SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
-SHA1 (patch-rebar.config) = 011b0dc0d511613e4056362b04fa230823316ad1
+SHA1 (patch-rebar.config) = f091a8915f262663d52d853ba9e4008044837521
 SHA1 (patch-rebar.config.script) = a9dd2828a7de79cc93b6313580d83d82f6a7a684
 SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569
diff --git a/chat/ejabberd/options.mk b/chat/ejabberd/options.mk
index cac7aef0037..bffe03d0784 100644
--- a/chat/ejabberd/options.mk
+++ b/chat/ejabberd/options.mk
@@ -1,19 +1,12 @@
-# $NetBSD: options.mk,v 1.4 2016/04/25 20:24:14 fhajny Exp $
+# $NetBSD: options.mk,v 1.5 2017/04/13 19:04:53 fhajny Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ejabberd
-PKG_SUPPORTED_OPTIONS=	redis sqlite
+PKG_SUPPORTED_OPTIONS=	sqlite
 PKG_SUGGESTED_OPTIONS=	#
 
 .include "../../mk/bsd.options.mk"
 
 #
-# Add Redis support
-#
-.if !empty(PKG_OPTIONS:Mredis)
-DEPENDS+=		erlang-eredis>=1.0.8.20150910:../../databases/erlang-eredis
-.endif
-
-#
 # Add SQLite 3 support
 #
 .if !empty(PKG_OPTIONS:Msqlite)
diff --git a/chat/ejabberd/patches/patch-rebar.config b/chat/ejabberd/patches/patch-rebar.config
index fc65ba52609..7f5fe7bda17 100644
--- a/chat/ejabberd/patches/patch-rebar.config
+++ b/chat/ejabberd/patches/patch-rebar.config
@@ -1,21 +1,23 @@
-$NetBSD: patch-rebar.config,v 1.8 2017/03/30 14:50:05 fhajny Exp $
+$NetBSD: patch-rebar.config,v 1.9 2017/04/13 19:04:53 fhajny Exp $
 
 Deps are handled by pkgsrc.
 
---- rebar.config.orig	2017-03-24 08:03:23.000000000 +0000
+--- rebar.config.orig	2017-04-11 10:13:58.000000000 +0000
 +++ rebar.config
-@@ -79,8 +79,8 @@
+@@ -79,9 +79,9 @@
  
  {erl_opts, [nowarn_deprecated_function,
              {i, "include"},
 -	    {i, "deps/fast_xml/include"},
 -	    {i, "deps/xmpp/include"},
+-	    {i, "deps/p1_utils/include"},
 +	    {i, "@LOCALBASE@/lib/erlang/lib/fast_xml/include"},
 +	    {i, "@LOCALBASE@/lib/erlang/lib/xmpp/include"},
++	    {i, "@LOCALBASE@/lib/erlang/lib/p1_utils/include"},
              {if_var_false, debug, no_debug_info},
              {if_var_true, debug, debug_info},
              {if_var_true, roster_gateway_workaround, {d, 'ROSTER_GATWAY_WORKAROUND'}},
-@@ -104,7 +104,7 @@
+@@ -105,7 +105,7 @@
  			  ]}}.
  
  {if_var_true, elixir,
@@ -24,12 +26,14 @@ Deps are handled by pkgsrc.
  {if_var_true, elixir,
                {src_dirs, ["include"]}}.
  
-@@ -134,8 +134,8 @@
+@@ -135,9 +135,9 @@
  
  {eunit_compile_opts, [{i, "tools"},
  		      {i, "include"},
+-		      {i, "deps/p1_utils/include"},
 -		      {i, "deps/fast_xml/include"},
 -		      {i, "deps/xmpp/include"}]}.
++		      {i, "@LOCALBASE@/lib/erlang/lib/p1_utils/include"},
 +		      {i, "@LOCALBASE@/lib/erlang/lib/fast_xml/include"},
 +		      {i, "@LOCALBASE@/lib/erlang/lib/xmpp/include"}]}.