Update ejabberd to 15.10.

Switch dependencies to use standalone packages for Erlang modules.

Core
- c2s: Let stop/1 close XEP-0198 sessions
- c2s: Close socket when waiting for resume
- s2s: Don't crash on certificates without extensions
- xml: Optimizations in memory allocator
- OAuth: Fix cyrsasl_oauth:mech_new call

Modules
- mod_http_upload: New HTTP File Upload module (XEP-0363)
- mod_http_upload_quota: New module to support user quotas
- mod_metrics: New simple metrics module for use with grapherl
- mod_mam: Advertise XEP-0313 v0.4 support in room disco
- mod_mam: Avoid MAM dups when routing to multiple resources

Compilation
- Make: Pass {C,CPP,LD}FLAGS used in main ./configure to deps
- Use OTP directory structure for `make install`
- mix.lock should be commited to ensure consistent builds
- Code cosmetic cleanup

Commands
- Let modules_update_specs report failures
- Fix problem with -auth
- Fix unauthenticated calls to commands with policy=user
- Improve access_commands option backward compatibility

Configuration
- ejabberdctl.cfg: New CONTRIB_MODULES_CONF_DIR
- Be able to merge old style configs with {listen,...}
- Fix support for macros
- mod_ping: New option ping_ack_timeout

5 files changed, 92 insertions, 20 deletions

diff --git a/chat/ejabberd/patches/patch-aa b/chat/ejabberd/patches/patch-aa
index 8db0812a304..d537adff84d 100644
--- a/chat/ejabberd/patches/patch-aa
+++ b/chat/ejabberd/patches/patch-aa
@@ -1,7 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2015/04/29 10:03:58 fhajny Exp $
+$NetBSD: patch-aa,v 1.13 2015/11/05 12:23:50 fhajny Exp $
 
 Fix locations; don't mess with ownership.
---- Makefile.in.orig	2015-04-23 08:14:08.000000000 +0000
+
+--- Makefile.in.orig	2015-10-28 14:53:12.000000000 +0000
 +++ Makefile.in
 @@ -9,7 +9,7 @@ exec_prefix = @exec_prefix@
  DESTDIR =
@@ -12,16 +13,20 @@ Fix locations; don't mess with ownership.
  
  # /bin/
  BINDIR = $(DESTDIR)@bindir@
-@@ -18,7 +18,7 @@ BINDIR = $(DESTDIR)@bindir@
+@@ -18,10 +18,10 @@ BINDIR = $(DESTDIR)@bindir@
  SBINDIR = $(DESTDIR)@sbindir@
  
+ # /lib/
+-LIBDIR =  $(DESTDIR)@libdir@
++LIBDIR =  $(DESTDIR)@prefix@/lib/erlang/lib
+ 
  # /lib/ejabberd/
 -EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
-+EJABBERDDIR = $(DESTDIR)@prefix@/lib/erlang/lib/@DISTNAME@
++EJABBERDDIR = $(LIBDIR)/ejabberd
  
  # /share/doc/ejabberd
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
-@@ -47,16 +47,16 @@ MSGSDIR = $(PRIVDIR)/msgs
+@@ -50,16 +50,16 @@ MSGSDIR = $(PRIVDIR)/msgs
  SQLDIR = $(PRIVDIR)/sql
  
  # /var/lib/ejabberd/
@@ -41,7 +46,7 @@ Fix locations; don't mess with ownership.
  
  INSTALLUSER=@INSTALLUSER@
  # if no user was enabled, don't set privileges or ownership
-@@ -67,10 +67,10 @@ ifeq ($(INSTALLUSER),)
+@@ -70,10 +70,10 @@ ifeq ($(INSTALLUSER),)
    CHOWN_OUTPUT=/dev/null
    INIT_USER=root
  else
diff --git a/chat/ejabberd/patches/patch-ad b/chat/ejabberd/patches/patch-ad
index b593796536a..e4713208c1b 100644
--- a/chat/ejabberd/patches/patch-ad
+++ b/chat/ejabberd/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.7 2013/10/11 13:32:25 fhajny Exp $
+$NetBSD: patch-ad,v 1.8 2015/11/05 12:23:50 fhajny Exp $
 
 Proper path to captcha script.
 --- ejabberd.yml.example.orig	2013-09-27 09:19:22.000000000 +0000
@@ -8,7 +8,7 @@ Proper path to captcha script.
  ## Full path to a script that generates the image.
  ##
 -## captcha_cmd: "/lib/ejabberd/priv/bin/captcha.sh"
-+## captcha_cmd: "@PREFIX@/lib/erlang/lib/@DISTNAME@/priv/bin/captcha.sh"
++## captcha_cmd: "@PREFIX@/lib/erlang/lib/ejabberd/priv/bin/captcha.sh"
  
  ##
  ## Host for the URL and port where ejabberd listens for CAPTCHA requests.
diff --git a/chat/ejabberd/patches/patch-ae b/chat/ejabberd/patches/patch-ae
index b388b1b2d4d..9eea8eaca58 100644
--- a/chat/ejabberd/patches/patch-ae
+++ b/chat/ejabberd/patches/patch-ae
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.11 2015/06/29 21:44:10 fhajny Exp $
+$NetBSD: patch-ae,v 1.12 2015/11/05 12:23:50 fhajny Exp $
 
 - Default locations.
 - Make it work with NetBSD's flock(1).
 
---- ejabberdctl.template.orig	2015-06-24 09:58:37.000000000 +0000
+--- ejabberdctl.template.orig	2015-10-28 14:53:12.000000000 +0000
 +++ ejabberdctl.template
-@@ -71,10 +71,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th
+@@ -72,10 +72,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th
      EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml
  fi
  if [ "$LOGS_DIR" = "" ] ; then
@@ -18,16 +18,16 @@ $NetBSD: patch-ae,v 1.11 2015/06/29 21:44:10 fhajny Exp $
  fi
  if [ "$EJABBERD_DOC_PATH" = "" ] ; then
      EJABBERD_DOC_PATH={{docdir}}
-@@ -85,7 +85,7 @@ if [ "$ERLANG_NODE_ARG" != "" ] ; then
+@@ -86,7 +86,7 @@ if [ "$ERLANG_NODE_ARG" != "" ] ; then
  fi
  if [ "{{release}}" != "true" ] ; then
      if [ "$EJABBERDDIR" = "" ] ; then
 -        EJABBERDDIR={{libdir}}/ejabberd
-+        EJABBERDDIR={{libdir}}/erlang/lib/@DISTNAME@
++        EJABBERDDIR={{libdir}}/erlang/lib/ejabberd
      fi
-     if [ "$EJABBERD_EBIN_PATH" = "" ] ; then
-         EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin
-@@ -335,7 +335,7 @@ ctl()
+     if [ "$EJABBERD_PRIV_PATH" = "" ] ; then
+         EJABBERD_PRIV_PATH=$EJABBERDDIR/priv
+@@ -325,7 +325,7 @@ ctl()
      # using flock if available. Expects a linux-style
      # flock that can lock a file descriptor.
      MAXCONNID=100
@@ -36,7 +36,7 @@ $NetBSD: patch-ae,v 1.11 2015/06/29 21:44:10 fhajny Exp $
      FLOCK=/usr/bin/flock
      if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then
          JOT=/usr/bin/jot
-@@ -362,7 +362,7 @@ ctl()
+@@ -352,7 +352,7 @@ ctl()
              CTL_LOCKFILE="$CONNLOCKDIR/$CTL_CONN"
              (
                  exec 8>"$CTL_LOCKFILE"
diff --git a/chat/ejabberd/patches/patch-rebar.config.script b/chat/ejabberd/patches/patch-rebar.config.script
new file mode 100644
index 00000000000..b4479c2c503
--- /dev/null
+++ b/chat/ejabberd/patches/patch-rebar.config.script
@@ -0,0 +1,67 @@
+$NetBSD: patch-rebar.config.script,v 1.1 2015/11/05 12:23:50 fhajny Exp $
+
+Skip dependencies, handled by pkgsrc now.
+
+--- rebar.config.script.orig	2015-10-28 14:53:12.000000000 +0000
++++ rebar.config.script
+@@ -54,17 +54,7 @@ SrcDirs = lists:foldl(
+                     Acc
+             end, [], Cfg),
+ 
+-Deps = [{p1_cache_tab, ".*", {git, "https://github.com/processone/cache_tab", "f7ea12b0ba962a3d2f9a406d2954cf7de4e27230"}},
+-        {p1_tls, ".*", {git, "https://github.com/processone/tls", "e56321afd974e9da33da913cd31beebc8e73e75f"}},
+-        {p1_stringprep, ".*", {git, "https://github.com/processone/stringprep", "3c640237a3a7831dc39de6a6d329d3a9af25c579"}},
+-        {p1_xml, ".*", {git, "https://github.com/processone/xml", "1c8b016b0ac7986efb823baf1682a43565449e65"}},
+-        {esip, ".*", {git, "https://github.com/processone/p1_sip", "d662d3fe7f6288b444ea321d854de0bd6d40e022"}},
+-        {p1_stun, ".*", {git, "https://github.com/processone/stun", "061bdae484268cbf0457ad4797e74b8516df3ad1"}},
+-        {p1_yaml, ".*", {git, "https://github.com/processone/p1_yaml", "79f756ba73a235c4d3836ec07b5f7f2b55f49638"}},
+-        {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", "d7800881e6702723ce58b7646b60c9e4cd25d563"}},
+-        {jiffy, ".*", {git, "https://github.com/davisp/jiffy", "cfc61a2e952dc3182e0f9b1473467563699992e2"}},
+-        {oauth2, ".*", {git, "https://github.com/prefiks/oauth2.git", "e6da9912e5d8f658e7e868f41a102d085bdbef59"}},
+-        {xmlrpc, ".*", {git, "https://github.com/rds13/xmlrpc.git", "42e6e96a0fe7106830274feed915125feb1056f3"}}],
++Deps = [],
+ 
+ CFLags = proplists:get_value(cflags, Cfg, ""),
+ CPPFLags = proplists:get_value(cppflags, Cfg, ""),
+@@ -93,32 +83,7 @@ PostHooks = [ConfigureCmd("p1_tls", ""),
+              ConfigureCmd("p1_xml", XMLFlags)],
+ 
+ CfgDeps = lists:flatmap(
+-            fun({mysql, true}) ->
+-                    [{p1_mysql, ".*", {git, "https://github.com/processone/mysql", "dfa87da95f8fdb92e270741c2a53f796b682f918"}}];
+-               ({pgsql, true}) ->
+-                    [{p1_pgsql, ".*", {git, "https://github.com/processone/pgsql", "e72c03c60bfcb56bbb5d259342021d9cb3581dac"}}];
+-               ({sqlite, true}) ->
+-                    [{sqlite3, ".*", {git, "https://github.com/alexeyr/erlang-sqlite3", "8350dc603804c503f99c92bfd2eab1dd6885758e"}}];
+-               ({pam, true}) ->
+-                    [{p1_pam, ".*", {git, "https://github.com/processone/epam", "d3ce290b7da75d780a03e86e7a8198a80e9826a6"}}];
+-               ({zlib, true}) ->
+-                    [{p1_zlib, ".*", {git, "https://github.com/processone/zlib", "e3d4222b7aae616d7ef2e7e2fa0bbf451516c602"}}];
+-               ({riak, true}) ->
+-                    [{riakc, ".*", {git, "https://github.com/basho/riak-erlang-client", {tag, "1.4.2"}}}];
+-               ({elixir, true}) ->
+-                    [{rebar_elixir_plugin, ".*", {git, "https://github.com/yrashk/rebar_elixir_plugin", "7058379b7c7e017555647f6b9cecfd87cd50f884"}},
+-                     {elixir, ".*", {git, "https://github.com/elixir-lang/elixir", "1d9548fd285d243721b7eba71912bde2ffd1f6c3"}}];
+-               ({iconv, true}) ->
+-                    [{p1_iconv, ".*", {git, "https://github.com/processone/eiconv", "8b7542b1aaf0a851f335e464956956985af6d9a2"}}];
+-               ({lager, true}) ->
+-                    [{lager, ".*", {git, "https://github.com/basho/lager", "4d2ec8c701e1fa2d386f92f2b83b23faf8608ac3"}}];
+-               ({lager, false}) ->
+-                    [{p1_logger, ".*", {git, "https://github.com/processone/p1_logger", "3e19507fd5606a73694917158767ecb3f5704e3f"}}];
+-               ({tools, true}) ->
+-                    [{meck, "0.*", {git, "https://github.com/eproxus/meck", "0845277398b8326f9dddddd9fc3cf73467ba6877"}}];
+-               ({redis, true}) ->
+-                    [{eredis, ".*", {git, "https://github.com/wooga/eredis", "bf12ecb30253c84a2331f4f0d93fd68856fcb9f4"}}];
+-               (_) ->
++            fun(_) ->
+                     []
+             end, Cfg),
+ 
+@@ -193,7 +158,6 @@ Config = [{erl_opts, Macros ++ HiPE ++ D
+ 	  {xref_queries,
+ 	   [{"(XC - UC) || (XU - X - B - "
+ 	     ++ string:join(CfgXrefs, " - ") ++ ")", []}]},
+-          {post_hooks, PostHooks ++ CfgPostHooks},
+           {deps, AllDeps}] ++ ElixirConfig,
+ %%io:format("ejabberd configuration:~n  ~p~n", [Config]),
+ Config.
diff --git a/chat/ejabberd/patches/patch-tools_ejabberdctl.bc b/chat/ejabberd/patches/patch-tools_ejabberdctl.bc
index 6777364da65..2b7a82b2cc8 100644
--- a/chat/ejabberd/patches/patch-tools_ejabberdctl.bc
+++ b/chat/ejabberd/patches/patch-tools_ejabberdctl.bc
@@ -1,8 +1,8 @@
-$NetBSD: patch-tools_ejabberdctl.bc,v 1.1 2015/10/01 14:48:14 fhajny Exp $
+$NetBSD: patch-tools_ejabberdctl.bc,v 1.2 2015/11/05 12:23:50 fhajny Exp $
 
-Subst real log dir.
+Proper log file location.
 
---- tools/ejabberdctl.bc.orig	2015-09-29 20:37:15.000000000 +0000
+--- tools/ejabberdctl.bc.orig	2015-10-28 14:53:12.000000000 +0000
 +++ tools/ejabberdctl.bc
 @@ -3,7 +3,7 @@
  #