ejabberd: Update to 22.05

upstream changes:
-----------------
Version 22.05
  o https://github.com/processone/ejabberd/blob/432e972/CHANGELOG.md
Version 21.12
  o https://github.com/processone/ejabberd/blob/21.12/CHANGELOG.md
Version 21.07
  o https://github.com/processone/ejabberd/blob/21.07/CHANGELOG.md

8 files changed, 80 insertions, 98 deletions

diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index 0c971faa601..d16769c5026 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,52 +1,50 @@
-# $NetBSD: Makefile,v 1.96 2021/04/15 08:28:11 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2022/10/15 18:20:40 triaxx Exp $
 
-DISTNAME=	ejabberd-21.04
-PKGREVISION=	1
+DISTNAME=	ejabberd-22.05
 CATEGORIES=	chat
 MASTER_SITES=	https://www.process-one.net/downloads/downloads-action.php?file=/${PKGVERSION_NOREV}/
-EXTRACT_SUFX=	.tgz
-# remove on next update
-# https://github.com/processone/ejabberd/issues/3570
-DIST_SUBDIR=	${DISTNAME}-20210414
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.ejabberd.im/
 COMMENT=	Free and Open Source distributed fault-tolerant Jabber server
 LICENSE=	gnu-gpl-v2
 
+DEPENDS+=	elixir>=1.4.4:../../lang/elixir
 DEPENDS+=	erlang-base64url>=1.0.1:../../devel/erlang-base64url
-DEPENDS+=	erlang-cache_tab>=1.0.26:../../devel/erlang-cache_tab
-DEPENDS+=	erlang-epam>=1.0.10:../../security/erlang-epam
-DEPENDS+=	erlang-eredis>=1.0.8.20150910:../../databases/erlang-eredis
-DEPENDS+=	erlang-eimp>=1.0.18:../../graphics/erlang-eimp
-DEPENDS+=	erlang-esip>=1.0.39:../../net/erlang-esip
-DEPENDS+=	erlang-ezlib>=1.0.9:../../devel/erlang-ezlib
-DEPENDS+=	erlang-fast_tls>=1.1.10:../../security/erlang-fast_tls
-DEPENDS+=	erlang-fast_xml>=1.1.45:../../textproc/erlang-fast_xml
-DEPENDS+=	erlang-fast_yaml>=1.0.29:../../textproc/erlang-fast_yaml
-DEPENDS+=	erlang-jiffy>=1.0.5:../../textproc/erlang-jiffy
-DEPENDS+=	erlang-jose>=1.9.0:../../security/erlang-jose
-DEPENDS+=	erlang-lager>=3.6.10.:../../sysutils/erlang-lager
-DEPENDS+=	erlang-luerl>=0.3:../../lang/erlang-luerl
-DEPENDS+=	erlang-mqtree>=1.0.11:../../devel/erlang-mqtree
-DEPENDS+=	erlang-p1_acme>=1.0.10:../../security/erlang-p1_acme
-DEPENDS+=	erlang-p1_mysql>=1.0.6:../../databases/erlang-p1_mysql
-DEPENDS+=	erlang-p1_oauth2>=0.6.8:../../security/erlang-p1_oauth2
-DEPENDS+=	erlang-p1_pgsql>=1.1.6:../../databases/erlang-p1_pgsql
-DEPENDS+=	erlang-p1_utils>=1.0.21:../../misc/erlang-p1_utils
-DEPENDS+=	erlang-pkix>=1.0.7:../../security/erlang-pkix
-DEPENDS+=	erlang-stringprep>=1.0.24:../../textproc/erlang-stringprep
-DEPENDS+=	erlang-stun>=1.0.40:../../net/erlang-stun
-DEPENDS+=	erlang-xmpp>=1.5.1:../../net/erlang-xmpp
-DEPENDS+=	erlang-yconf>=1.0.9:../../textproc/erlang-yconf
+DEPENDS+=	erlang-cache_tab>=1.0.30:../../devel/erlang-cache_tab
+DEPENDS+=	erlang-epam>=1.0.12:../../security/erlang-epam
+DEPENDS+=	erlang-eredis>=1.2.0:../../databases/erlang-eredis
+DEPENDS+=	erlang-eimp>=1.0.22:../../graphics/erlang-eimp
+DEPENDS+=	erlang-esip>=1.0.47:../../net/erlang-esip
+DEPENDS+=	erlang-ezlib>=1.0.12:../../devel/erlang-ezlib
+DEPENDS+=	erlang-fast_tls>=1.1.15:../../security/erlang-fast_tls
+DEPENDS+=	erlang-fast_xml>=1.1.49:../../textproc/erlang-fast_xml
+DEPENDS+=	erlang-fast_yaml>=1.0.33:../../textproc/erlang-fast_yaml
+DEPENDS+=	erlang-idna>=6.0.0:../../net/erlang-idna
+DEPENDS+=	erlang-jiffy>=1.1.1:../../textproc/erlang-jiffy
+DEPENDS+=	erlang-jose>=1.11.1:../../security/erlang-jose
+DEPENDS+=	erlang-lager>=3.9.1.:../../sysutils/erlang-lager
+DEPENDS+=	erlang-luerl>=1.0:../../lang/erlang-luerl
+DEPENDS+=	erlang-mqtree>=1.0.15:../../devel/erlang-mqtree
+DEPENDS+=	erlang-p1_acme>=1.0.19:../../security/erlang-p1_acme
+DEPENDS+=	erlang-p1_mysql>=1.0.19:../../databases/erlang-p1_mysql
+DEPENDS+=	erlang-p1_oauth2>=0.6.11:../../security/erlang-p1_oauth2
+DEPENDS+=	erlang-p1_pgsql>=1.1.18:../../databases/erlang-p1_pgsql
+DEPENDS+=	erlang-p1_utils>=1.0.25:../../misc/erlang-p1_utils
+DEPENDS+=	erlang-pkix>=1.0.9:../../security/erlang-pkix
+DEPENDS+=	erlang-sqlite3>=1.1.13:../../databases/erlang-sqlite3
+DEPENDS+=	erlang-stringprep>=1.0.28:../../textproc/erlang-stringprep
+DEPENDS+=	erlang-stun>=1.2.2:../../net/erlang-stun
+DEPENDS+=	erlang-xmpp>=1.5.8:../../net/erlang-xmpp
+DEPENDS+=	erlang-yconf>=1.0.13:../../textproc/erlang-yconf
 
 GNU_CONFIGURE=		yes
 USE_GCC_RUNTIME=	yes
-USE_TOOLS+=		bash:run gmake patch
+USE_TOOLS+=		aclocal autoconf automake bash:run gmake patch perl
 
 CONFIGURE_ARGS+=	--disable-debug
 CONFIGURE_ARGS+=	--enable-system-deps
-CONFIGURE_ARGS+=	--enable-iconv
+CONFIGURE_ARGS+=	--enable-erlang-version-check=no
 CONFIGURE_ARGS+=	--enable-mysql
 CONFIGURE_ARGS+=	--enable-odbc
 CONFIGURE_ARGS+=	--enable-pam
@@ -118,6 +116,9 @@ SUBST_VARS.paths+=	PKG_SYSCONFDIR PREFIX LOCALBASE
 post-extract:
 	cd ${WRKSRC} && ${MKDIR} deps && ${TOUCH} deps/.got deps/.built
 
+pre-configure:
+	cd ${WRKSRC} && ${SH} autogen.sh
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/tools/ejabberdctl.bc			\
 		${DESTDIR}${PREFIX}/share/bash-completion/completions/ejabberd
diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST
index 35804c20c98..83c904a69eb 100644
--- a/chat/ejabberd/PLIST
+++ b/chat/ejabberd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.58 2021/04/13 08:02:24 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.59 2022/10/15 18:20:40 triaxx Exp $
 lib/${PKGNAME}/COPYING
 lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/${PKGNAME}/ebin/acl.beam
@@ -18,6 +18,7 @@ lib/${PKGNAME}/ebin/ejabberd_auth_mnesia.beam
 lib/${PKGNAME}/ebin/ejabberd_auth_pam.beam
 lib/${PKGNAME}/ebin/ejabberd_auth_sql.beam
 lib/${PKGNAME}/ebin/ejabberd_backend_sup.beam
+lib/${PKGNAME}/ebin/ejabberd_batch.beam
 lib/${PKGNAME}/ebin/ejabberd_bosh.beam
 lib/${PKGNAME}/ebin/ejabberd_c2s.beam
 lib/${PKGNAME}/ebin/ejabberd_c2s_config.beam
@@ -122,12 +123,16 @@ lib/${PKGNAME}/ebin/mod_carboncopy.beam
 lib/${PKGNAME}/ebin/mod_client_state.beam
 lib/${PKGNAME}/ebin/mod_client_state_opt.beam
 lib/${PKGNAME}/ebin/mod_configure.beam
+lib/${PKGNAME}/ebin/mod_conversejs.beam
+lib/${PKGNAME}/ebin/mod_conversejs_opt.beam
 lib/${PKGNAME}/ebin/mod_delegation.beam
 lib/${PKGNAME}/ebin/mod_delegation_opt.beam
 lib/${PKGNAME}/ebin/mod_disco.beam
 lib/${PKGNAME}/ebin/mod_disco_opt.beam
 lib/${PKGNAME}/ebin/mod_fail2ban.beam
 lib/${PKGNAME}/ebin/mod_fail2ban_opt.beam
+lib/${PKGNAME}/ebin/mod_host_meta.beam
+lib/${PKGNAME}/ebin/mod_host_meta_opt.beam
 lib/${PKGNAME}/ebin/mod_http_api.beam
 lib/${PKGNAME}/ebin/mod_http_api_opt.beam
 lib/${PKGNAME}/ebin/mod_http_fileserver.beam
@@ -165,6 +170,7 @@ lib/${PKGNAME}/ebin/mod_mqtt_sql.beam
 lib/${PKGNAME}/ebin/mod_mqtt_ws.beam
 lib/${PKGNAME}/ebin/mod_muc.beam
 lib/${PKGNAME}/ebin/mod_muc_admin.beam
+lib/${PKGNAME}/ebin/mod_muc_admin_opt.beam
 lib/${PKGNAME}/ebin/mod_muc_log.beam
 lib/${PKGNAME}/ebin/mod_muc_log_opt.beam
 lib/${PKGNAME}/ebin/mod_muc_mnesia.beam
@@ -323,6 +329,7 @@ lib/${PKGNAME}/priv/img/vcss.png
 lib/${PKGNAME}/priv/js/admin.js
 lib/${PKGNAME}/priv/js/muc.js
 lib/${PKGNAME}/priv/lua/redis_sm.lua
+lib/${PKGNAME}/priv/msgs/ar.msg
 lib/${PKGNAME}/priv/msgs/ca.msg
 lib/${PKGNAME}/priv/msgs/cs.msg
 lib/${PKGNAME}/priv/msgs/de.msg
@@ -367,6 +374,5 @@ share/examples/ejabberd/ejabberd.yml
 share/examples/ejabberd/ejabberdctl.cfg
 share/examples/ejabberd/inetrc
 @pkgdir var/spool/ejabberd
-@pkgdir var/run/ejabberd
 @pkgdir var/log/ejabberd
 @pkgdir bin
diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo
index 65165ec0f0e..4e4e9c95208 100644
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.66 2021/10/26 10:05:13 nia Exp $
+$NetBSD: distinfo,v 1.67 2022/10/15 18:20:40 triaxx Exp $
 
-BLAKE2s (ejabberd-21.04-20210414/ejabberd-21.04.tgz) = d0aec17b9dcb3994ab510fb29b435d5b07ce2873a70ee4c9d672b4006edd2edb
-SHA512 (ejabberd-21.04-20210414/ejabberd-21.04.tgz) = 4f7f645dbca35187c412e75fe90bcb96b87fc71beb073e0b913155e78832499f57218b1c42e0adf139a24cf1e235b4d1d123214a472aabf093a65f5d136b9579
-Size (ejabberd-21.04-20210414/ejabberd-21.04.tgz) = 1560934 bytes
-SHA1 (patch-aa) = 8a1aac6e3ee13bc5251d4994fc8d1927b876e372
-SHA1 (patch-ae) = 5e1424f57dfe0d3d7adc4fa4811e9a1322a01f22
-SHA1 (patch-configure) = 2c92f408fa49ae9595173613157d55a585ec1cb3
-SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569
+BLAKE2s (ejabberd-22.05.tar.gz) = 657dcfe4ee9f78fbba344588c255c8d3be8ee155e55c702b125fd0626673b908
+SHA512 (ejabberd-22.05.tar.gz) = 33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865
+Size (ejabberd-22.05.tar.gz) = 2527957 bytes
+SHA1 (patch-aa) = c48f1b242777a4610cdbecb32791ce614e0ef80d
+SHA1 (patch-ae) = de7536dbafab8d14430faa5fcbd767c238a151e5
+SHA1 (patch-m4_erlang-extra.m4) = efa18366b54a9269bec79a44dda175792d8e2f00
+SHA1 (patch-tools_ejabberdctl.bc) = 167f542c95f8e25ba601076ad717a85bfd456dc7
diff --git a/chat/ejabberd/patches/patch-aa b/chat/ejabberd/patches/patch-aa
index e16c21a5a5f..8f9058bda8d 100644
--- a/chat/ejabberd/patches/patch-aa
+++ b/chat/ejabberd/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.16 2021/01/16 20:24:33 triaxx Exp $
+$NetBSD: patch-aa,v 1.17 2022/10/15 18:20:40 triaxx Exp $
 
 Fix locations; don't mess with ownership.
 
---- Makefile.in.orig	2020-12-15 14:40:16.000000000 +0000
+--- Makefile.in.orig	2022-05-06 13:12:22.000000000 +0000
 +++ Makefile.in
-@@ -9,7 +9,7 @@ exec_prefix = @exec_prefix@
+@@ -10,7 +10,7 @@ exec_prefix = @exec_prefix@
  DESTDIR =
  
  # /etc/ejabberd/
@@ -13,7 +13,7 @@ Fix locations; don't mess with ownership.
  
  # /bin/
  BINDIR = $(DESTDIR)@bindir@
-@@ -21,7 +21,7 @@ SBINDIR = $(DESTDIR)@sbindir@
+@@ -22,7 +22,7 @@ SBINDIR = $(DESTDIR)@sbindir@
  LIBDIR =  $(DESTDIR)@libdir@
  
  # /lib/ejabberd/
@@ -22,20 +22,13 @@ Fix locations; don't mess with ownership.
  
  # /share/doc/ejabberd
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
-@@ -65,37 +65,24 @@ SQLDIR = $(PRIVDIR)/sql
+@@ -66,31 +66,18 @@ SQLDIR = $(PRIVDIR)/sql
  LUADIR = $(PRIVDIR)/lua
  
  # /var/lib/ejabberd/
 -SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
 +SPOOLDIR = $(DESTDIR)@EJABBERD_DB@
  
- # /var/lock/ejabberdctl
--CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl
-+CTLLOCKDIR = $(DESTDIR)@EJABBERD_PIDDIR@
- 
- # /var/lib/ejabberd/.erlang.cookie
- COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
- 
  # /var/log/ejabberd/
 -LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
 +LOGDIR = $(DESTDIR)@EJABBERD_LOGDIR@
@@ -61,5 +54,5 @@ Fix locations; don't mess with ownership.
 -  G_USER=-g $(INSTALLGROUP)
 -endif
  
- IS_REBAR3:=$(shell expr `$(REBAR) --version | awk -F '[ .]' '/rebar / {print $$2}'` '>=' 3)
- 
+ ifeq "$(MIX)" "mix"
+ REBAR_VER:=6
diff --git a/chat/ejabberd/patches/patch-ae b/chat/ejabberd/patches/patch-ae
index dd087cef543..50cd5e939de 100644
--- a/chat/ejabberd/patches/patch-ae
+++ b/chat/ejabberd/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.21 2021/01/16 21:19:33 triaxx Exp $
+$NetBSD: patch-ae,v 1.22 2022/10/15 18:20:40 triaxx Exp $
 
 - Default locations.
 - Use 'su -' instead of just 'su'. Fixes priv delegation on SunOS
@@ -8,18 +8,9 @@ $NetBSD: patch-ae,v 1.21 2021/01/16 21:19:33 triaxx Exp $
 - Portable grep calls.
 - Fix spool directory.
 
---- ejabberdctl.template.orig	2020-12-15 14:40:16.000000000 +0000
+--- ejabberdctl.template.orig	2022-05-06 13:12:22.000000000 +0000
 +++ ejabberdctl.template
-@@ -57,7 +57,7 @@ done
- # define ejabberd variables if not already defined from the command line
- : "${ETC_DIR:="{{sysconfdir}}/ejabberd"}"
- : "${LOGS_DIR:="{{localstatedir}}/log/ejabberd"}"
--: "${SPOOL_DIR:="{{localstatedir}}/lib/ejabberd"}"
-+: "${SPOOL_DIR:="{{localstatedir}}/spool/ejabberd"}"
- : "${EJABBERD_CONFIG_PATH:="$ETC_DIR/ejabberd.yml"}"
- : "${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR/ejabberdctl.cfg"}"
- # Allows passing extra Erlang command-line arguments in vm.args file
-@@ -110,7 +110,7 @@ export ERL_LIBS
+@@ -112,7 +112,7 @@ export SCRIPT_DIR
  exec_cmd()
  {
      case $EXEC_CMD in
@@ -28,7 +19,7 @@ $NetBSD: patch-ae,v 1.21 2021/01/16 21:19:33 triaxx Exp $
          as_current_user) "$@" ;;
      esac
  }
-@@ -217,14 +217,14 @@ uid()
+@@ -218,14 +218,14 @@ uid()
  # stop epmd if there is no other running node
  stop_epmd()
  {
diff --git a/chat/ejabberd/patches/patch-configure b/chat/ejabberd/patches/patch-configure
deleted file mode 100644
index 58d9f6d7497..00000000000
--- a/chat/ejabberd/patches/patch-configure
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-configure,v 1.2 2021/01/16 20:24:33 triaxx Exp $
-
-Portability.
-
---- configure.orig	2013-10-10 10:59:33.747311941 +0000
-+++ configure
-@@ -2548,7 +2548,7 @@ EOF
- 	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
- $as_echo "failed" >&6; }
- 	   X="`cat conftest.out`"
--	   if test "" == "warn"; then
-+	   if test "" = "warn"; then
- 	      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $X" >&5
- $as_echo "$as_me: WARNING: $X" >&2;}
- 	   else
-@@ -2630,7 +2630,7 @@ EOF
- 	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
- $as_echo "failed" >&6; }
- 	   X="`cat conftest.out`"
--	   if test "warn" == "warn"; then
-+	   if test "warn" = "warn"; then
- 	      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $X" >&5
- $as_echo "$as_me: WARNING: $X" >&2;}
- 	   else
diff --git a/chat/ejabberd/patches/patch-m4_erlang-extra.m4 b/chat/ejabberd/patches/patch-m4_erlang-extra.m4
new file mode 100644
index 00000000000..347725b5840
--- /dev/null
+++ b/chat/ejabberd/patches/patch-m4_erlang-extra.m4
@@ -0,0 +1,15 @@
+$NetBSD: patch-m4_erlang-extra.m4,v 1.1 2022/10/15 18:20:40 triaxx Exp $
+
+Fix portability of configure script.
+
+--- m4/erlang-extra.m4.orig	2022-05-06 13:12:22.000000000 +0000
++++ m4/erlang-extra.m4
+@@ -75,7 +75,7 @@ EOF
+ 	if test "x`cat conftest.out`" != "xok"; then
+ 	   AC_MSG_RESULT([failed])
+ 	   X="`cat conftest.out`"
+-	   if test "[$3]" == "warn"; then
++	   if test "[$3]" = "warn"; then
+ 	      AC_MSG_WARN([$X])
+ 	   else
+ 	      AC_MSG_FAILURE([$X])
diff --git a/chat/ejabberd/patches/patch-tools_ejabberdctl.bc b/chat/ejabberd/patches/patch-tools_ejabberdctl.bc
index 2b7a82b2cc8..245ecc4f0a0 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.2 2015/11/05 12:23:50 fhajny Exp $
+$NetBSD: patch-tools_ejabberdctl.bc,v 1.3 2022/10/15 18:20:40 triaxx Exp $
 
 Proper log file location.
 
---- tools/ejabberdctl.bc.orig	2015-10-28 14:53:12.000000000 +0000
+--- tools/ejabberdctl.bc.orig	2022-05-06 13:12:22.000000000 +0000
 +++ tools/ejabberdctl.bc
 @@ -3,7 +3,7 @@
  #
@@ -10,6 +10,6 @@ Proper log file location.
  {
 -    local COMMANDCACHE=/var/log/ejabberd/bash_completion_$RANDOM
 +    local COMMANDCACHE=@EJABBERD_LOGDIR@/bash_completion_$RANDOM
-     ejabberdctl $CTLARGS help >$COMMANDCACHE
+     ejabberdctl $CTLARGS help tags >$COMMANDCACHE.tags
+     ejabberdctl $CTLARGS >$COMMANDCACHE
      if [[ $? == 2 ]] ; then
-         ISRUNNING=1