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

1 files changed, 9 insertions, 5 deletions

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"}]}.