Update chat/ejabberd to 16.12.

API / integration
- New API permissions framework

Commands
- Add configurable weight for ejabberd commands
- add_rosteritem: Support several groups separated by ;
- create_rooms_file: Fix reading room jids from file
- delete_old_messages: Fix command for SQL backends
- send_message: Don't duplicate the message
- Remove obsolete remove_node command (use leave_cluster)
- Fix reload_config
- Cleanup mod_admin_extra, add few functions
- Expose unregister API command

Core XMPP
- New BOSH module
- Use fxml_gen XML generator
- Use our new stand-alone XMPP library instead of jlib.erl
- Don't let MAM messages go into offline storage
- Add xdata generator for XMPP data form
- Get rid of excessive (io)list_to_binary/1 calls

HTTP
- Add authentication support to mod_http_fileserver
- ejabberd_http: Handle missing POST data gracefully
- Use inets instead of lhttpc in http_p1
- Add http_p1.erl, rest.erl, and oauth2 ReST backend for OAuth2 tokens

MUC
- Create room on configuration request as per XEP-0045, 10.1.3
- Ensure that presence_broadcast room option is stored
- Fix conference disco#items when running multiple virtual hosts
- Fix Result Set Management (RSM) for conference disco#items
- Introduce muc_invite hook
- Make the constant MAX_ROOMS_DISCOITEMS configurable
- mod_carboncopy: Don't copy MUC private messages

MUC/Sub
- Store the flag "Allow Subscription" room option in database
- When getting list of subscribed rooms, also check temporary ones
- Add password support in muc_subscribe
- When unsubscribes, check if room should get closed

Pubsub
- Enforce pubsub node removal
- Relational databases support
- Append ; to privacy_list_data exporting lines
- Improve relational database import

Build
- Make build system compatible with rebar3
- Produce ejabberd.service and fix for systemd usage
- Cleanup ext_mod and fix compilation path
- Fix compilation of external module with new xmpp lib

1 files changed, 28 insertions, 21 deletions

diff --git a/chat/ejabberd/patches/patch-rebar.config b/chat/ejabberd/patches/patch-rebar.config
index 0a01724d900..70c44e10507 100644
--- a/chat/ejabberd/patches/patch-rebar.config
+++ b/chat/ejabberd/patches/patch-rebar.config
@@ -1,29 +1,30 @@
-$NetBSD: patch-rebar.config,v 1.5 2016/10/02 12:17:40 fhajny Exp $
+$NetBSD: patch-rebar.config,v 1.6 2017/01/03 18:52:33 fhajny Exp $
 
 Deps are handled by pkgsrc.
 
---- rebar.config.orig	2016-09-13 12:31:39.000000000 +0000
+--- rebar.config.orig	2016-12-22 19:41:01.000000000 +0000
 +++ rebar.config
-@@ -7,50 +7,6 @@
+@@ -7,46 +7,6 @@
  %%% Created :  1 May 2013 by Evgeniy Khramtsov <ekhramtsov@process-one.net>
  %%%-------------------------------------------------------------------
  
 -{deps, [{lager, ".*", {git, "https://github.com/basho/lager", {tag, "3.2.1"}}},
--        {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.5"}}},
--        {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.4"}}},
--        {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.7"}}},
--        {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.6"}}},
--        {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.15"}}},
--        {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.7"}}},
--        {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.8"}}},
--        {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.6"}}},
--        {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.7"}}},
+-        {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"}}},
+-        {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"}}},
+-        {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"}}},
+-        {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.1"}}}},
+-                                               {tag, "1.0.2"}}}},
 -        {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql",
--                                               {tag, "1.1.0"}}}},
+-                                               {tag, "1.1.1"}}}},
 -        {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",
@@ -31,12 +32,7 @@ Deps are handled by pkgsrc.
 -        {if_var_true, zlib, {ezlib, ".*", {git, "https://github.com/processone/ezlib",
 -                                           {tag, "1.0.1"}}}},
 -        {if_var_true, riak, {riakc, ".*", {git, "https://github.com/basho/riak-erlang-client",
--                                           "527722d12d0433b837cdb92a60900c2cb5df8942"}}},
--        %% Forces correct dependency for riakc and allow using newer meck version)
--        {if_var_true, riak, {hamcrest, ".*", {git, "https://github.com/hyperthunk/hamcrest-erlang",
--                                              "13f9bfb9b27d216e8e033b0e0a9a29097ed923dd"}}},  % for riak_pb-2.1.0.7
--        {if_var_true, riak, {protobuffs, ".*", {git, "https://github.com/basho/erlang_protobuffs",
--                                                "6e7fc924506e2dc166a6170e580ce1d95ebbd5bd"}}},  % for riak_pb-2.1.0.7 with correct meck dependency
+-                                           {tag, "2.4.1"}}}},
 -        %% Elixir support, needed to run tests
 -        {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir",
 -                                              {tag, {if_version_above, "17", "v1.2.6", "v1.1.1"}}}}},
@@ -44,7 +40,7 @@ Deps are handled by pkgsrc.
 -        {if_var_true, elixir, {rebar_elixir_plugin, ".*",
 -                               {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}},
 -        {if_var_true, iconv, {iconv, ".*", {git, "https://github.com/processone/iconv",
--                                            {tag, "1.0.2"}}}},
+-                                            {tag, "1.0.3"}}}},
 -        {if_var_true, tools, {meck, "0.8.*", {git, "https://github.com/eproxus/meck",
 -                                              {tag, "0.8.4"}}}},
 -        {if_var_true, tools, {moka, ".*", {git, "https://github.com/processone/moka.git",
@@ -55,3 +51,14 @@ Deps are handled by pkgsrc.
  {if_var_true, latest_deps,
   {floating_deps, [cache_tab,
                    fast_tls,
+@@ -68,8 +28,8 @@
+ 
+ {erl_opts, [nowarn_deprecated_function,
+             {i, "include"},
+-	    {i, "deps/fast_xml/include"},
+-	    {i, "deps/xmpp/include"},
++	    {i, "@LOCALBASE@/lib/erlang/lib/fast_xml/include"},
++	    {i, "@LOCALBASE@/lib/erlang/lib/xmpp/include"},
+             {if_var_false, debug, no_debug_info},
+             {if_var_true, debug, debug_info},
+             {if_var_true, roster_gateway_workaround, {d, 'ROSTER_GATWAY_WORKAROUND'}},