Sat Oct 15 18:20:41 2022 UTC ()
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


(triaxx)
diff -r1.96 -r1.97 pkgsrc/chat/ejabberd/Makefile
diff -r1.58 -r1.59 pkgsrc/chat/ejabberd/PLIST
diff -r1.66 -r1.67 pkgsrc/chat/ejabberd/distinfo
diff -r1.16 -r1.17 pkgsrc/chat/ejabberd/patches/patch-aa
diff -r1.21 -r1.22 pkgsrc/chat/ejabberd/patches/patch-ae
diff -r1.2 -r0 pkgsrc/chat/ejabberd/patches/patch-configure
diff -r0 -r1.1 pkgsrc/chat/ejabberd/patches/patch-m4_erlang-extra.m4
diff -r1.2 -r1.3 pkgsrc/chat/ejabberd/patches/patch-tools_ejabberdctl.bc
cvs diff -r1.96 -r1.97 pkgsrc/chat/ejabberd/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/Makefile 2021/04/15 08:28:11 1.96
+++ pkgsrc/chat/ejabberd/Makefile 2022/10/15 18:20:40 1.97
@@ -1,62 +1,60 @@ @@ -1,62 +1,60 @@
1# $NetBSD: Makefile,v 1.96 2021/04/15 08:28:11 wiz Exp $ 1# $NetBSD: Makefile,v 1.97 2022/10/15 18:20:40 triaxx Exp $
2 2
3DISTNAME= ejabberd-21.04 3DISTNAME= ejabberd-22.05
4PKGREVISION= 1 
5CATEGORIES= chat 4CATEGORIES= chat
6MASTER_SITES= https://www.process-one.net/downloads/downloads-action.php?file=/${PKGVERSION_NOREV}/ 5MASTER_SITES= https://www.process-one.net/downloads/downloads-action.php?file=/${PKGVERSION_NOREV}/
7EXTRACT_SUFX= .tgz 
8# remove on next update 
9# https://github.com/processone/ejabberd/issues/3570 
10DIST_SUBDIR= ${DISTNAME}-20210414 
11 6
12MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= https://www.ejabberd.im/ 8HOMEPAGE= https://www.ejabberd.im/
14COMMENT= Free and Open Source distributed fault-tolerant Jabber server 9COMMENT= Free and Open Source distributed fault-tolerant Jabber server
15LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
16 11
 12DEPENDS+= elixir>=1.4.4:../../lang/elixir
17DEPENDS+= erlang-base64url>=1.0.1:../../devel/erlang-base64url 13DEPENDS+= erlang-base64url>=1.0.1:../../devel/erlang-base64url
18DEPENDS+= erlang-cache_tab>=1.0.26:../../devel/erlang-cache_tab 14DEPENDS+= erlang-cache_tab>=1.0.30:../../devel/erlang-cache_tab
19DEPENDS+= erlang-epam>=1.0.10:../../security/erlang-epam 15DEPENDS+= erlang-epam>=1.0.12:../../security/erlang-epam
20DEPENDS+= erlang-eredis>=1.0.8.20150910:../../databases/erlang-eredis 16DEPENDS+= erlang-eredis>=1.2.0:../../databases/erlang-eredis
21DEPENDS+= erlang-eimp>=1.0.18:../../graphics/erlang-eimp 17DEPENDS+= erlang-eimp>=1.0.22:../../graphics/erlang-eimp
22DEPENDS+= erlang-esip>=1.0.39:../../net/erlang-esip 18DEPENDS+= erlang-esip>=1.0.47:../../net/erlang-esip
23DEPENDS+= erlang-ezlib>=1.0.9:../../devel/erlang-ezlib 19DEPENDS+= erlang-ezlib>=1.0.12:../../devel/erlang-ezlib
24DEPENDS+= erlang-fast_tls>=1.1.10:../../security/erlang-fast_tls 20DEPENDS+= erlang-fast_tls>=1.1.15:../../security/erlang-fast_tls
25DEPENDS+= erlang-fast_xml>=1.1.45:../../textproc/erlang-fast_xml 21DEPENDS+= erlang-fast_xml>=1.1.49:../../textproc/erlang-fast_xml
26DEPENDS+= erlang-fast_yaml>=1.0.29:../../textproc/erlang-fast_yaml 22DEPENDS+= erlang-fast_yaml>=1.0.33:../../textproc/erlang-fast_yaml
27DEPENDS+= erlang-jiffy>=1.0.5:../../textproc/erlang-jiffy 23DEPENDS+= erlang-idna>=6.0.0:../../net/erlang-idna
28DEPENDS+= erlang-jose>=1.9.0:../../security/erlang-jose 24DEPENDS+= erlang-jiffy>=1.1.1:../../textproc/erlang-jiffy
29DEPENDS+= erlang-lager>=3.6.10.:../../sysutils/erlang-lager 25DEPENDS+= erlang-jose>=1.11.1:../../security/erlang-jose
30DEPENDS+= erlang-luerl>=0.3:../../lang/erlang-luerl 26DEPENDS+= erlang-lager>=3.9.1.:../../sysutils/erlang-lager
31DEPENDS+= erlang-mqtree>=1.0.11:../../devel/erlang-mqtree 27DEPENDS+= erlang-luerl>=1.0:../../lang/erlang-luerl
32DEPENDS+= erlang-p1_acme>=1.0.10:../../security/erlang-p1_acme 28DEPENDS+= erlang-mqtree>=1.0.15:../../devel/erlang-mqtree
33DEPENDS+= erlang-p1_mysql>=1.0.6:../../databases/erlang-p1_mysql 29DEPENDS+= erlang-p1_acme>=1.0.19:../../security/erlang-p1_acme
34DEPENDS+= erlang-p1_oauth2>=0.6.8:../../security/erlang-p1_oauth2 30DEPENDS+= erlang-p1_mysql>=1.0.19:../../databases/erlang-p1_mysql
35DEPENDS+= erlang-p1_pgsql>=1.1.6:../../databases/erlang-p1_pgsql 31DEPENDS+= erlang-p1_oauth2>=0.6.11:../../security/erlang-p1_oauth2
36DEPENDS+= erlang-p1_utils>=1.0.21:../../misc/erlang-p1_utils 32DEPENDS+= erlang-p1_pgsql>=1.1.18:../../databases/erlang-p1_pgsql
37DEPENDS+= erlang-pkix>=1.0.7:../../security/erlang-pkix 33DEPENDS+= erlang-p1_utils>=1.0.25:../../misc/erlang-p1_utils
38DEPENDS+= erlang-stringprep>=1.0.24:../../textproc/erlang-stringprep 34DEPENDS+= erlang-pkix>=1.0.9:../../security/erlang-pkix
39DEPENDS+= erlang-stun>=1.0.40:../../net/erlang-stun 35DEPENDS+= erlang-sqlite3>=1.1.13:../../databases/erlang-sqlite3
40DEPENDS+= erlang-xmpp>=1.5.1:../../net/erlang-xmpp 36DEPENDS+= erlang-stringprep>=1.0.28:../../textproc/erlang-stringprep
41DEPENDS+= erlang-yconf>=1.0.9:../../textproc/erlang-yconf 37DEPENDS+= erlang-stun>=1.2.2:../../net/erlang-stun
 38DEPENDS+= erlang-xmpp>=1.5.8:../../net/erlang-xmpp
 39DEPENDS+= erlang-yconf>=1.0.13:../../textproc/erlang-yconf
42 40
43GNU_CONFIGURE= yes 41GNU_CONFIGURE= yes
44USE_GCC_RUNTIME= yes 42USE_GCC_RUNTIME= yes
45USE_TOOLS+= bash:run gmake patch 43USE_TOOLS+= aclocal autoconf automake bash:run gmake patch perl
46 44
47CONFIGURE_ARGS+= --disable-debug 45CONFIGURE_ARGS+= --disable-debug
48CONFIGURE_ARGS+= --enable-system-deps 46CONFIGURE_ARGS+= --enable-system-deps
49CONFIGURE_ARGS+= --enable-iconv 47CONFIGURE_ARGS+= --enable-erlang-version-check=no
50CONFIGURE_ARGS+= --enable-mysql 48CONFIGURE_ARGS+= --enable-mysql
51CONFIGURE_ARGS+= --enable-odbc 49CONFIGURE_ARGS+= --enable-odbc
52CONFIGURE_ARGS+= --enable-pam 50CONFIGURE_ARGS+= --enable-pam
53CONFIGURE_ARGS+= --enable-pgsql 51CONFIGURE_ARGS+= --enable-pgsql
54CONFIGURE_ARGS+= --enable-redis 52CONFIGURE_ARGS+= --enable-redis
55CONFIGURE_ARGS+= --enable-sip 53CONFIGURE_ARGS+= --enable-sip
56CONFIGURE_ARGS+= --enable-stun 54CONFIGURE_ARGS+= --enable-stun
57CONFIGURE_ARGS+= --enable-zlib 55CONFIGURE_ARGS+= --enable-zlib
58CONFIGURE_ARGS+= --enable-user=${EJABBERD_USER} 56CONFIGURE_ARGS+= --enable-user=${EJABBERD_USER}
59CONFIGURE_ARGS+= --enable-group=${EJABBERD_GROUP} 57CONFIGURE_ARGS+= --enable-group=${EJABBERD_GROUP}
60CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 58CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
61CONFIGURE_ARGS+= --localstatedir=${VARBASE} 59CONFIGURE_ARGS+= --localstatedir=${VARBASE}
62 60
@@ -108,21 +106,24 @@ SPECIAL_PERMS+= sbin/ejabberdctl ${REAL @@ -108,21 +106,24 @@ SPECIAL_PERMS+= sbin/ejabberdctl ${REAL
108 106
109REPLACE_BASH= ejabberdctl.template tools/captcha.sh 107REPLACE_BASH= ejabberdctl.template tools/captcha.sh
110 108
111SUBST_CLASSES+= paths 109SUBST_CLASSES+= paths
112SUBST_MESSAGE.paths= Localizing paths 110SUBST_MESSAGE.paths= Localizing paths
113SUBST_STAGE.paths= pre-configure 111SUBST_STAGE.paths= pre-configure
114SUBST_FILES.paths= Makefile.in 112SUBST_FILES.paths= Makefile.in
115SUBST_VARS.paths= DISTNAME EJABBERD_DB EJABBERD_LOGDIR EJABBERD_PIDDIR 113SUBST_VARS.paths= DISTNAME EJABBERD_DB EJABBERD_LOGDIR EJABBERD_PIDDIR
116SUBST_VARS.paths+= PKG_SYSCONFDIR PREFIX LOCALBASE 114SUBST_VARS.paths+= PKG_SYSCONFDIR PREFIX LOCALBASE
117 115
118post-extract: 116post-extract:
119 cd ${WRKSRC} && ${MKDIR} deps && ${TOUCH} deps/.got deps/.built 117 cd ${WRKSRC} && ${MKDIR} deps && ${TOUCH} deps/.got deps/.built
120 118
 119pre-configure:
 120 cd ${WRKSRC} && ${SH} autogen.sh
 121
121post-install: 122post-install:
122 ${INSTALL_DATA} ${WRKSRC}/tools/ejabberdctl.bc \ 123 ${INSTALL_DATA} ${WRKSRC}/tools/ejabberdctl.bc \
123 ${DESTDIR}${PREFIX}/share/bash-completion/completions/ejabberd 124 ${DESTDIR}${PREFIX}/share/bash-completion/completions/ejabberd
124 cd ${WRKSRC}/sql && ${INSTALL_DATA} *.sql \ 125 cd ${WRKSRC}/sql && ${INSTALL_DATA} *.sql \
125 ${DESTDIR}${PREFIX}/lib/${PKGNAME_NOREV}/priv/sql 126 ${DESTDIR}${PREFIX}/lib/${PKGNAME_NOREV}/priv/sql
126 127
127.include "../../lang/erlang/buildlink3.mk" 128.include "../../lang/erlang/buildlink3.mk"
128.include "../../mk/bsd.pkg.mk" 129.include "../../mk/bsd.pkg.mk"
cvs diff -r1.58 -r1.59 pkgsrc/chat/ejabberd/PLIST (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/PLIST 2021/04/13 08:02:24 1.58
+++ pkgsrc/chat/ejabberd/PLIST 2022/10/15 18:20:40 1.59
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1@comment $NetBSD: PLIST,v 1.58 2021/04/13 08:02:24 triaxx Exp $ 1@comment $NetBSD: PLIST,v 1.59 2022/10/15 18:20:40 triaxx Exp $
2lib/${PKGNAME}/COPYING 2lib/${PKGNAME}/COPYING
3lib/${PKGNAME}/ebin/ELDAPv3.beam 3lib/${PKGNAME}/ebin/ELDAPv3.beam
4lib/${PKGNAME}/ebin/acl.beam 4lib/${PKGNAME}/ebin/acl.beam
5lib/${PKGNAME}/ebin/econf.beam 5lib/${PKGNAME}/ebin/econf.beam
6lib/${PKGNAME}/ebin/ejabberd.app 6lib/${PKGNAME}/ebin/ejabberd.app
7lib/${PKGNAME}/ebin/ejabberd.beam 7lib/${PKGNAME}/ebin/ejabberd.beam
8lib/${PKGNAME}/ebin/ejabberd_access_permissions.beam 8lib/${PKGNAME}/ebin/ejabberd_access_permissions.beam
9lib/${PKGNAME}/ebin/ejabberd_acme.beam 9lib/${PKGNAME}/ebin/ejabberd_acme.beam
10lib/${PKGNAME}/ebin/ejabberd_admin.beam 10lib/${PKGNAME}/ebin/ejabberd_admin.beam
11lib/${PKGNAME}/ebin/ejabberd_app.beam 11lib/${PKGNAME}/ebin/ejabberd_app.beam
12lib/${PKGNAME}/ebin/ejabberd_auth.beam 12lib/${PKGNAME}/ebin/ejabberd_auth.beam
13lib/${PKGNAME}/ebin/ejabberd_auth_anonymous.beam 13lib/${PKGNAME}/ebin/ejabberd_auth_anonymous.beam
14lib/${PKGNAME}/ebin/ejabberd_auth_external.beam 14lib/${PKGNAME}/ebin/ejabberd_auth_external.beam
15lib/${PKGNAME}/ebin/ejabberd_auth_jwt.beam 15lib/${PKGNAME}/ebin/ejabberd_auth_jwt.beam
16lib/${PKGNAME}/ebin/ejabberd_auth_ldap.beam 16lib/${PKGNAME}/ebin/ejabberd_auth_ldap.beam
17lib/${PKGNAME}/ebin/ejabberd_auth_mnesia.beam 17lib/${PKGNAME}/ebin/ejabberd_auth_mnesia.beam
18lib/${PKGNAME}/ebin/ejabberd_auth_pam.beam 18lib/${PKGNAME}/ebin/ejabberd_auth_pam.beam
19lib/${PKGNAME}/ebin/ejabberd_auth_sql.beam 19lib/${PKGNAME}/ebin/ejabberd_auth_sql.beam
20lib/${PKGNAME}/ebin/ejabberd_backend_sup.beam 20lib/${PKGNAME}/ebin/ejabberd_backend_sup.beam
 21lib/${PKGNAME}/ebin/ejabberd_batch.beam
21lib/${PKGNAME}/ebin/ejabberd_bosh.beam 22lib/${PKGNAME}/ebin/ejabberd_bosh.beam
22lib/${PKGNAME}/ebin/ejabberd_c2s.beam 23lib/${PKGNAME}/ebin/ejabberd_c2s.beam
23lib/${PKGNAME}/ebin/ejabberd_c2s_config.beam 24lib/${PKGNAME}/ebin/ejabberd_c2s_config.beam
24lib/${PKGNAME}/ebin/ejabberd_captcha.beam 25lib/${PKGNAME}/ebin/ejabberd_captcha.beam
25lib/${PKGNAME}/ebin/ejabberd_cluster.beam 26lib/${PKGNAME}/ebin/ejabberd_cluster.beam
26lib/${PKGNAME}/ebin/ejabberd_cluster_mnesia.beam 27lib/${PKGNAME}/ebin/ejabberd_cluster_mnesia.beam
27lib/${PKGNAME}/ebin/ejabberd_commands.beam 28lib/${PKGNAME}/ebin/ejabberd_commands.beam
28lib/${PKGNAME}/ebin/ejabberd_commands_doc.beam 29lib/${PKGNAME}/ebin/ejabberd_commands_doc.beam
29lib/${PKGNAME}/ebin/ejabberd_config.beam 30lib/${PKGNAME}/ebin/ejabberd_config.beam
30lib/${PKGNAME}/ebin/ejabberd_config_transformer.beam 31lib/${PKGNAME}/ebin/ejabberd_config_transformer.beam
31lib/${PKGNAME}/ebin/ejabberd_ctl.beam 32lib/${PKGNAME}/ebin/ejabberd_ctl.beam
32lib/${PKGNAME}/ebin/ejabberd_db_sup.beam 33lib/${PKGNAME}/ebin/ejabberd_db_sup.beam
33lib/${PKGNAME}/ebin/ejabberd_doc.beam 34lib/${PKGNAME}/ebin/ejabberd_doc.beam
@@ -112,32 +113,36 @@ lib/${PKGNAME}/ebin/mod_blocking.beam @@ -112,32 +113,36 @@ lib/${PKGNAME}/ebin/mod_blocking.beam
112lib/${PKGNAME}/ebin/mod_bosh.beam 113lib/${PKGNAME}/ebin/mod_bosh.beam
113lib/${PKGNAME}/ebin/mod_bosh_mnesia.beam 114lib/${PKGNAME}/ebin/mod_bosh_mnesia.beam
114lib/${PKGNAME}/ebin/mod_bosh_opt.beam 115lib/${PKGNAME}/ebin/mod_bosh_opt.beam
115lib/${PKGNAME}/ebin/mod_bosh_redis.beam 116lib/${PKGNAME}/ebin/mod_bosh_redis.beam
116lib/${PKGNAME}/ebin/mod_bosh_sql.beam 117lib/${PKGNAME}/ebin/mod_bosh_sql.beam
117lib/${PKGNAME}/ebin/mod_caps.beam 118lib/${PKGNAME}/ebin/mod_caps.beam
118lib/${PKGNAME}/ebin/mod_caps_mnesia.beam 119lib/${PKGNAME}/ebin/mod_caps_mnesia.beam
119lib/${PKGNAME}/ebin/mod_caps_opt.beam 120lib/${PKGNAME}/ebin/mod_caps_opt.beam
120lib/${PKGNAME}/ebin/mod_caps_sql.beam 121lib/${PKGNAME}/ebin/mod_caps_sql.beam
121lib/${PKGNAME}/ebin/mod_carboncopy.beam 122lib/${PKGNAME}/ebin/mod_carboncopy.beam
122lib/${PKGNAME}/ebin/mod_client_state.beam 123lib/${PKGNAME}/ebin/mod_client_state.beam
123lib/${PKGNAME}/ebin/mod_client_state_opt.beam 124lib/${PKGNAME}/ebin/mod_client_state_opt.beam
124lib/${PKGNAME}/ebin/mod_configure.beam 125lib/${PKGNAME}/ebin/mod_configure.beam
 126lib/${PKGNAME}/ebin/mod_conversejs.beam
 127lib/${PKGNAME}/ebin/mod_conversejs_opt.beam
125lib/${PKGNAME}/ebin/mod_delegation.beam 128lib/${PKGNAME}/ebin/mod_delegation.beam
126lib/${PKGNAME}/ebin/mod_delegation_opt.beam 129lib/${PKGNAME}/ebin/mod_delegation_opt.beam
127lib/${PKGNAME}/ebin/mod_disco.beam 130lib/${PKGNAME}/ebin/mod_disco.beam
128lib/${PKGNAME}/ebin/mod_disco_opt.beam 131lib/${PKGNAME}/ebin/mod_disco_opt.beam
129lib/${PKGNAME}/ebin/mod_fail2ban.beam 132lib/${PKGNAME}/ebin/mod_fail2ban.beam
130lib/${PKGNAME}/ebin/mod_fail2ban_opt.beam 133lib/${PKGNAME}/ebin/mod_fail2ban_opt.beam
 134lib/${PKGNAME}/ebin/mod_host_meta.beam
 135lib/${PKGNAME}/ebin/mod_host_meta_opt.beam
131lib/${PKGNAME}/ebin/mod_http_api.beam 136lib/${PKGNAME}/ebin/mod_http_api.beam
132lib/${PKGNAME}/ebin/mod_http_api_opt.beam 137lib/${PKGNAME}/ebin/mod_http_api_opt.beam
133lib/${PKGNAME}/ebin/mod_http_fileserver.beam 138lib/${PKGNAME}/ebin/mod_http_fileserver.beam
134lib/${PKGNAME}/ebin/mod_http_fileserver_opt.beam 139lib/${PKGNAME}/ebin/mod_http_fileserver_opt.beam
135lib/${PKGNAME}/ebin/mod_http_upload.beam 140lib/${PKGNAME}/ebin/mod_http_upload.beam
136lib/${PKGNAME}/ebin/mod_http_upload_opt.beam 141lib/${PKGNAME}/ebin/mod_http_upload_opt.beam
137lib/${PKGNAME}/ebin/mod_http_upload_quota.beam 142lib/${PKGNAME}/ebin/mod_http_upload_quota.beam
138lib/${PKGNAME}/ebin/mod_http_upload_quota_opt.beam 143lib/${PKGNAME}/ebin/mod_http_upload_quota_opt.beam
139lib/${PKGNAME}/ebin/mod_jidprep.beam 144lib/${PKGNAME}/ebin/mod_jidprep.beam
140lib/${PKGNAME}/ebin/mod_jidprep_opt.beam 145lib/${PKGNAME}/ebin/mod_jidprep_opt.beam
141lib/${PKGNAME}/ebin/mod_last.beam 146lib/${PKGNAME}/ebin/mod_last.beam
142lib/${PKGNAME}/ebin/mod_last_mnesia.beam 147lib/${PKGNAME}/ebin/mod_last_mnesia.beam
143lib/${PKGNAME}/ebin/mod_last_opt.beam 148lib/${PKGNAME}/ebin/mod_last_opt.beam
@@ -155,26 +160,27 @@ lib/${PKGNAME}/ebin/mod_mix_opt.beam @@ -155,26 +160,27 @@ lib/${PKGNAME}/ebin/mod_mix_opt.beam
155lib/${PKGNAME}/ebin/mod_mix_pam.beam 160lib/${PKGNAME}/ebin/mod_mix_pam.beam
156lib/${PKGNAME}/ebin/mod_mix_pam_mnesia.beam 161lib/${PKGNAME}/ebin/mod_mix_pam_mnesia.beam
157lib/${PKGNAME}/ebin/mod_mix_pam_opt.beam 162lib/${PKGNAME}/ebin/mod_mix_pam_opt.beam
158lib/${PKGNAME}/ebin/mod_mix_pam_sql.beam 163lib/${PKGNAME}/ebin/mod_mix_pam_sql.beam
159lib/${PKGNAME}/ebin/mod_mix_sql.beam 164lib/${PKGNAME}/ebin/mod_mix_sql.beam
160lib/${PKGNAME}/ebin/mod_mqtt.beam 165lib/${PKGNAME}/ebin/mod_mqtt.beam
161lib/${PKGNAME}/ebin/mod_mqtt_mnesia.beam 166lib/${PKGNAME}/ebin/mod_mqtt_mnesia.beam
162lib/${PKGNAME}/ebin/mod_mqtt_opt.beam 167lib/${PKGNAME}/ebin/mod_mqtt_opt.beam
163lib/${PKGNAME}/ebin/mod_mqtt_session.beam 168lib/${PKGNAME}/ebin/mod_mqtt_session.beam
164lib/${PKGNAME}/ebin/mod_mqtt_sql.beam 169lib/${PKGNAME}/ebin/mod_mqtt_sql.beam
165lib/${PKGNAME}/ebin/mod_mqtt_ws.beam 170lib/${PKGNAME}/ebin/mod_mqtt_ws.beam
166lib/${PKGNAME}/ebin/mod_muc.beam 171lib/${PKGNAME}/ebin/mod_muc.beam
167lib/${PKGNAME}/ebin/mod_muc_admin.beam 172lib/${PKGNAME}/ebin/mod_muc_admin.beam
 173lib/${PKGNAME}/ebin/mod_muc_admin_opt.beam
168lib/${PKGNAME}/ebin/mod_muc_log.beam 174lib/${PKGNAME}/ebin/mod_muc_log.beam
169lib/${PKGNAME}/ebin/mod_muc_log_opt.beam 175lib/${PKGNAME}/ebin/mod_muc_log_opt.beam
170lib/${PKGNAME}/ebin/mod_muc_mnesia.beam 176lib/${PKGNAME}/ebin/mod_muc_mnesia.beam
171lib/${PKGNAME}/ebin/mod_muc_opt.beam 177lib/${PKGNAME}/ebin/mod_muc_opt.beam
172lib/${PKGNAME}/ebin/mod_muc_room.beam 178lib/${PKGNAME}/ebin/mod_muc_room.beam
173lib/${PKGNAME}/ebin/mod_muc_sql.beam 179lib/${PKGNAME}/ebin/mod_muc_sql.beam
174lib/${PKGNAME}/ebin/mod_muc_sup.beam 180lib/${PKGNAME}/ebin/mod_muc_sup.beam
175lib/${PKGNAME}/ebin/mod_multicast.beam 181lib/${PKGNAME}/ebin/mod_multicast.beam
176lib/${PKGNAME}/ebin/mod_multicast_opt.beam 182lib/${PKGNAME}/ebin/mod_multicast_opt.beam
177lib/${PKGNAME}/ebin/mod_offline.beam 183lib/${PKGNAME}/ebin/mod_offline.beam
178lib/${PKGNAME}/ebin/mod_offline_mnesia.beam 184lib/${PKGNAME}/ebin/mod_offline_mnesia.beam
179lib/${PKGNAME}/ebin/mod_offline_opt.beam 185lib/${PKGNAME}/ebin/mod_offline_opt.beam
180lib/${PKGNAME}/ebin/mod_offline_sql.beam 186lib/${PKGNAME}/ebin/mod_offline_sql.beam
@@ -313,26 +319,27 @@ lib/${PKGNAME}/priv/css/oauth.css @@ -313,26 +319,27 @@ lib/${PKGNAME}/priv/css/oauth.css
313lib/${PKGNAME}/priv/css/register.css 319lib/${PKGNAME}/priv/css/register.css
314lib/${PKGNAME}/priv/img/admin-logo-fill.png 320lib/${PKGNAME}/priv/img/admin-logo-fill.png
315lib/${PKGNAME}/priv/img/admin-logo.png 321lib/${PKGNAME}/priv/img/admin-logo.png
316lib/${PKGNAME}/priv/img/bosh-logo.png 322lib/${PKGNAME}/priv/img/bosh-logo.png
317lib/${PKGNAME}/priv/img/favicon.png 323lib/${PKGNAME}/priv/img/favicon.png
318lib/${PKGNAME}/priv/img/oauth-logo.png 324lib/${PKGNAME}/priv/img/oauth-logo.png
319lib/${PKGNAME}/priv/img/powered-by-ejabberd.png 325lib/${PKGNAME}/priv/img/powered-by-ejabberd.png
320lib/${PKGNAME}/priv/img/powered-by-erlang.png 326lib/${PKGNAME}/priv/img/powered-by-erlang.png
321lib/${PKGNAME}/priv/img/valid-xhtml10.png 327lib/${PKGNAME}/priv/img/valid-xhtml10.png
322lib/${PKGNAME}/priv/img/vcss.png 328lib/${PKGNAME}/priv/img/vcss.png
323lib/${PKGNAME}/priv/js/admin.js 329lib/${PKGNAME}/priv/js/admin.js
324lib/${PKGNAME}/priv/js/muc.js 330lib/${PKGNAME}/priv/js/muc.js
325lib/${PKGNAME}/priv/lua/redis_sm.lua 331lib/${PKGNAME}/priv/lua/redis_sm.lua
 332lib/${PKGNAME}/priv/msgs/ar.msg
326lib/${PKGNAME}/priv/msgs/ca.msg 333lib/${PKGNAME}/priv/msgs/ca.msg
327lib/${PKGNAME}/priv/msgs/cs.msg 334lib/${PKGNAME}/priv/msgs/cs.msg
328lib/${PKGNAME}/priv/msgs/de.msg 335lib/${PKGNAME}/priv/msgs/de.msg
329lib/${PKGNAME}/priv/msgs/el.msg 336lib/${PKGNAME}/priv/msgs/el.msg
330lib/${PKGNAME}/priv/msgs/eo.msg 337lib/${PKGNAME}/priv/msgs/eo.msg
331lib/${PKGNAME}/priv/msgs/es.msg 338lib/${PKGNAME}/priv/msgs/es.msg
332lib/${PKGNAME}/priv/msgs/fr.msg 339lib/${PKGNAME}/priv/msgs/fr.msg
333lib/${PKGNAME}/priv/msgs/gl.msg 340lib/${PKGNAME}/priv/msgs/gl.msg
334lib/${PKGNAME}/priv/msgs/he.msg 341lib/${PKGNAME}/priv/msgs/he.msg
335lib/${PKGNAME}/priv/msgs/hu.msg 342lib/${PKGNAME}/priv/msgs/hu.msg
336lib/${PKGNAME}/priv/msgs/id.msg 343lib/${PKGNAME}/priv/msgs/id.msg
337lib/${PKGNAME}/priv/msgs/it.msg 344lib/${PKGNAME}/priv/msgs/it.msg
338lib/${PKGNAME}/priv/msgs/ja.msg 345lib/${PKGNAME}/priv/msgs/ja.msg
@@ -357,16 +364,15 @@ lib/${PKGNAME}/priv/sql/mssql.sql @@ -357,16 +364,15 @@ lib/${PKGNAME}/priv/sql/mssql.sql
357lib/${PKGNAME}/priv/sql/mysql.new.sql 364lib/${PKGNAME}/priv/sql/mysql.new.sql
358lib/${PKGNAME}/priv/sql/mysql.old-to-new.sql 365lib/${PKGNAME}/priv/sql/mysql.old-to-new.sql
359lib/${PKGNAME}/priv/sql/mysql.sql 366lib/${PKGNAME}/priv/sql/mysql.sql
360lib/${PKGNAME}/priv/sql/pg.new.sql 367lib/${PKGNAME}/priv/sql/pg.new.sql
361lib/${PKGNAME}/priv/sql/pg.sql 368lib/${PKGNAME}/priv/sql/pg.sql
362man/man5/ejabberd.yml.5 369man/man5/ejabberd.yml.5
363sbin/ejabberdctl 370sbin/ejabberdctl
364share/bash-completion/completions/ejabberd 371share/bash-completion/completions/ejabberd
365share/doc/ejabberd/COPYING 372share/doc/ejabberd/COPYING
366share/examples/ejabberd/ejabberd.yml 373share/examples/ejabberd/ejabberd.yml
367share/examples/ejabberd/ejabberdctl.cfg 374share/examples/ejabberd/ejabberdctl.cfg
368share/examples/ejabberd/inetrc 375share/examples/ejabberd/inetrc
369@pkgdir var/spool/ejabberd 376@pkgdir var/spool/ejabberd
370@pkgdir var/run/ejabberd 
371@pkgdir var/log/ejabberd 377@pkgdir var/log/ejabberd
372@pkgdir bin 378@pkgdir bin
cvs diff -r1.66 -r1.67 pkgsrc/chat/ejabberd/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/distinfo 2021/10/26 10:05:13 1.66
+++ pkgsrc/chat/ejabberd/distinfo 2022/10/15 18:20:40 1.67
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.66 2021/10/26 10:05:13 nia Exp $ 1$NetBSD: distinfo,v 1.67 2022/10/15 18:20:40 triaxx Exp $
2 2
3BLAKE2s (ejabberd-21.04-20210414/ejabberd-21.04.tgz) = d0aec17b9dcb3994ab510fb29b435d5b07ce2873a70ee4c9d672b4006edd2edb 3BLAKE2s (ejabberd-22.05.tar.gz) = 657dcfe4ee9f78fbba344588c255c8d3be8ee155e55c702b125fd0626673b908
4SHA512 (ejabberd-21.04-20210414/ejabberd-21.04.tgz) = 4f7f645dbca35187c412e75fe90bcb96b87fc71beb073e0b913155e78832499f57218b1c42e0adf139a24cf1e235b4d1d123214a472aabf093a65f5d136b9579 4SHA512 (ejabberd-22.05.tar.gz) = 33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865
5Size (ejabberd-21.04-20210414/ejabberd-21.04.tgz) = 1560934 bytes 5Size (ejabberd-22.05.tar.gz) = 2527957 bytes
6SHA1 (patch-aa) = 8a1aac6e3ee13bc5251d4994fc8d1927b876e372 6SHA1 (patch-aa) = c48f1b242777a4610cdbecb32791ce614e0ef80d
7SHA1 (patch-ae) = 5e1424f57dfe0d3d7adc4fa4811e9a1322a01f22 7SHA1 (patch-ae) = de7536dbafab8d14430faa5fcbd767c238a151e5
8SHA1 (patch-configure) = 2c92f408fa49ae9595173613157d55a585ec1cb3 8SHA1 (patch-m4_erlang-extra.m4) = efa18366b54a9269bec79a44dda175792d8e2f00
9SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569 9SHA1 (patch-tools_ejabberdctl.bc) = 167f542c95f8e25ba601076ad717a85bfd456dc7
cvs diff -r1.16 -r1.17 pkgsrc/chat/ejabberd/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/patches/patch-aa 2021/01/16 20:24:33 1.16
+++ pkgsrc/chat/ejabberd/patches/patch-aa 2022/10/15 18:20:40 1.17
@@ -1,65 +1,58 @@ @@ -1,65 +1,58 @@
1$NetBSD: patch-aa,v 1.16 2021/01/16 20:24:33 triaxx Exp $ 1$NetBSD: patch-aa,v 1.17 2022/10/15 18:20:40 triaxx Exp $
2 2
3Fix locations; don't mess with ownership. 3Fix locations; don't mess with ownership.
4 4
5--- Makefile.in.orig 2020-12-15 14:40:16.000000000 +0000 5--- Makefile.in.orig 2022-05-06 13:12:22.000000000 +0000
6+++ Makefile.in 6+++ Makefile.in
7@@ -9,7 +9,7 @@ exec_prefix = @exec_prefix@ 7@@ -10,7 +10,7 @@ exec_prefix = @exec_prefix@
8 DESTDIR = 8 DESTDIR =
9  9
10 # /etc/ejabberd/ 10 # /etc/ejabberd/
11-ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd 11-ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
12+ETCDIR = $(DESTDIR)@prefix@/share/examples/ejabberd 12+ETCDIR = $(DESTDIR)@prefix@/share/examples/ejabberd
13  13
14 # /bin/ 14 # /bin/
15 BINDIR = $(DESTDIR)@bindir@ 15 BINDIR = $(DESTDIR)@bindir@
16@@ -21,7 +21,7 @@ SBINDIR = $(DESTDIR)@sbindir@ 16@@ -22,7 +22,7 @@ SBINDIR = $(DESTDIR)@sbindir@
17 LIBDIR = $(DESTDIR)@libdir@ 17 LIBDIR = $(DESTDIR)@libdir@
18  18
19 # /lib/ejabberd/ 19 # /lib/ejabberd/
20-EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd 20-EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
21+EJABBERDDIR = $(LIBDIR)/ejabberd 21+EJABBERDDIR = $(LIBDIR)/ejabberd
22  22
23 # /share/doc/ejabberd 23 # /share/doc/ejabberd
24 PACKAGE_TARNAME = @PACKAGE_TARNAME@ 24 PACKAGE_TARNAME = @PACKAGE_TARNAME@
25@@ -65,37 +65,24 @@ SQLDIR = $(PRIVDIR)/sql 25@@ -66,31 +66,18 @@ SQLDIR = $(PRIVDIR)/sql
26 LUADIR = $(PRIVDIR)/lua 26 LUADIR = $(PRIVDIR)/lua
27  27
28 # /var/lib/ejabberd/ 28 # /var/lib/ejabberd/
29-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd 29-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
30+SPOOLDIR = $(DESTDIR)@EJABBERD_DB@ 30+SPOOLDIR = $(DESTDIR)@EJABBERD_DB@
31  31
32 # /var/lock/ejabberdctl 
33-CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl 
34+CTLLOCKDIR = $(DESTDIR)@EJABBERD_PIDDIR@ 
35  
36 # /var/lib/ejabberd/.erlang.cookie 
37 COOKIEFILE = $(SPOOLDIR)/.erlang.cookie 
38  
39 # /var/log/ejabberd/ 32 # /var/log/ejabberd/
40-LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd 33-LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
41+LOGDIR = $(DESTDIR)@EJABBERD_LOGDIR@ 34+LOGDIR = $(DESTDIR)@EJABBERD_LOGDIR@
42  35
43 INSTALLUSER=@INSTALLUSER@ 36 INSTALLUSER=@INSTALLUSER@
44-# if no user was enabled, don't set privileges or ownership 37-# if no user was enabled, don't set privileges or ownership
45-ifeq ($(INSTALLUSER),) 38-ifeq ($(INSTALLUSER),)
46 O_USER= 39 O_USER=
47 G_USER= 40 G_USER=
48 CHOWN_COMMAND=echo 41 CHOWN_COMMAND=echo
49 CHOWN_OUTPUT=/dev/null 42 CHOWN_OUTPUT=/dev/null
50 INIT_USER=root 43 INIT_USER=root
51-else 44-else
52- O_USER=-o $(INSTALLUSER) 45- O_USER=-o $(INSTALLUSER)
53- G_USER=-g $(INSTALLUSER) 46- G_USER=-g $(INSTALLUSER)
54- CHOWN_COMMAND=chown 47- CHOWN_COMMAND=chown
55- CHOWN_OUTPUT=&1 48- CHOWN_OUTPUT=&1
56- INIT_USER=$(INSTALLUSER) 49- INIT_USER=$(INSTALLUSER)
57-endif 50-endif
58-# if no group was enabled, don't set privileges or ownership 51-# if no group was enabled, don't set privileges or ownership
59 INSTALLGROUP=@INSTALLGROUP@ 52 INSTALLGROUP=@INSTALLGROUP@
60-ifneq ($(INSTALLGROUP),) 53-ifneq ($(INSTALLGROUP),)
61- G_USER=-g $(INSTALLGROUP) 54- G_USER=-g $(INSTALLGROUP)
62-endif 55-endif
63  56
64 IS_REBAR3:=$(shell expr `$(REBAR) --version | awk -F '[ .]' '/rebar / {print $$2}'` '>=' 3) 57 ifeq "$(MIX)" "mix"
65  58 REBAR_VER:=6
cvs diff -r1.21 -r1.22 pkgsrc/chat/ejabberd/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/patches/patch-ae 2021/01/16 21:19:33 1.21
+++ pkgsrc/chat/ejabberd/patches/patch-ae 2022/10/15 18:20:40 1.22
@@ -1,44 +1,35 @@ @@ -1,44 +1,35 @@
1$NetBSD: patch-ae,v 1.21 2021/01/16 21:19:33 triaxx Exp $ 1$NetBSD: patch-ae,v 1.22 2022/10/15 18:20:40 triaxx Exp $
2 2
3- Default locations. 3- Default locations.
4- Use 'su -' instead of just 'su'. Fixes priv delegation on SunOS 4- Use 'su -' instead of just 'su'. Fixes priv delegation on SunOS
5 and AIX where Erlang relies on $HOME set correctly. Use a portable 5 and AIX where Erlang relies on $HOME set correctly. Use a portable
6 su arg order while at it. 6 su arg order while at it.
7- At least SunOS has not wheel group. 7- At least SunOS has not wheel group.
8- Portable grep calls. 8- Portable grep calls.
9- Fix spool directory. 9- Fix spool directory.
10 10
11--- ejabberdctl.template.orig 2020-12-15 14:40:16.000000000 +0000 11--- ejabberdctl.template.orig 2022-05-06 13:12:22.000000000 +0000
12+++ ejabberdctl.template 12+++ ejabberdctl.template
13@@ -57,7 +57,7 @@ done 13@@ -112,7 +112,7 @@ export SCRIPT_DIR
14 # define ejabberd variables if not already defined from the command line 
15 : "${ETC_DIR:="{{sysconfdir}}/ejabberd"}" 
16 : "${LOGS_DIR:="{{localstatedir}}/log/ejabberd"}" 
17-: "${SPOOL_DIR:="{{localstatedir}}/lib/ejabberd"}" 
18+: "${SPOOL_DIR:="{{localstatedir}}/spool/ejabberd"}" 
19 : "${EJABBERD_CONFIG_PATH:="$ETC_DIR/ejabberd.yml"}" 
20 : "${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR/ejabberdctl.cfg"}" 
21 # Allows passing extra Erlang command-line arguments in vm.args file 
22@@ -110,7 +110,7 @@ export ERL_LIBS 
23 exec_cmd() 14 exec_cmd()
24 { 15 {
25 case $EXEC_CMD in 16 case $EXEC_CMD in
26- as_install_user) su -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;; 17- as_install_user) su -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;;
27+ as_install_user) su - "$INSTALLUSER" -c '"$@"' -- "$@" ;; 18+ as_install_user) su - "$INSTALLUSER" -c '"$@"' -- "$@" ;;
28 as_current_user) "$@" ;; 19 as_current_user) "$@" ;;
29 esac 20 esac
30 } 21 }
31@@ -217,14 +217,14 @@ uid() 22@@ -218,14 +218,14 @@ uid()
32 # stop epmd if there is no other running node 23 # stop epmd if there is no other running node
33 stop_epmd() 24 stop_epmd()
34 { 25 {
35- "$EPMD" -names 2>/dev/null | grep -q name || "$EPMD" -kill >/dev/null 26- "$EPMD" -names 2>/dev/null | grep -q name || "$EPMD" -kill >/dev/null
36+ "$EPMD" -names 2>/dev/null | grep name >/dev/null || "$EPMD" -kill >/dev/null 27+ "$EPMD" -names 2>/dev/null | grep name >/dev/null || "$EPMD" -kill >/dev/null
37 } 28 }
38  29
39 # make sure node not already running and node name unregistered 30 # make sure node not already running and node name unregistered
40 # if all ok, ensure runtime directory exists and make it current directory 31 # if all ok, ensure runtime directory exists and make it current directory
41 check_start() 32 check_start()
42 { 33 {
43- "$EPMD" -names 2>/dev/null | grep -q " ${ERLANG_NODE%@*} " && { 34- "$EPMD" -names 2>/dev/null | grep -q " ${ERLANG_NODE%@*} " && {
44+ "$EPMD" -names 2>/dev/null | grep " ${ERLANG_NODE%@*} " >/dev/null && { 35+ "$EPMD" -names 2>/dev/null | grep " ${ERLANG_NODE%@*} " >/dev/null && {
File Deleted: pkgsrc/chat/ejabberd/patches/Attic/patch-configure
File Added: pkgsrc/chat/ejabberd/patches/patch-m4_erlang-extra.m4
$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])
cvs diff -r1.2 -r1.3 pkgsrc/chat/ejabberd/patches/patch-tools_ejabberdctl.bc (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/patches/patch-tools_ejabberdctl.bc 2015/11/05 12:23:50 1.2
+++ pkgsrc/chat/ejabberd/patches/patch-tools_ejabberdctl.bc 2022/10/15 18:20:40 1.3
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-tools_ejabberdctl.bc,v 1.2 2015/11/05 12:23:50 fhajny Exp $ 1$NetBSD: patch-tools_ejabberdctl.bc,v 1.3 2022/10/15 18:20:40 triaxx Exp $
2 2
3Proper log file location. 3Proper log file location.
4 4
5--- tools/ejabberdctl.bc.orig 2015-10-28 14:53:12.000000000 +0000 5--- tools/ejabberdctl.bc.orig 2022-05-06 13:12:22.000000000 +0000
6+++ tools/ejabberdctl.bc 6+++ tools/ejabberdctl.bc
7@@ -3,7 +3,7 @@ 7@@ -3,7 +3,7 @@
8 # 8 #
9 get_help() 9 get_help()
10 { 10 {
11- local COMMANDCACHE=/var/log/ejabberd/bash_completion_$RANDOM 11- local COMMANDCACHE=/var/log/ejabberd/bash_completion_$RANDOM
12+ local COMMANDCACHE=@EJABBERD_LOGDIR@/bash_completion_$RANDOM 12+ local COMMANDCACHE=@EJABBERD_LOGDIR@/bash_completion_$RANDOM
13 ejabberdctl $CTLARGS help >$COMMANDCACHE 13 ejabberdctl $CTLARGS help tags >$COMMANDCACHE.tags
 14 ejabberdctl $CTLARGS >$COMMANDCACHE
14 if [[ $? == 2 ]] ; then 15 if [[ $? == 2 ]] ; then
15 ISRUNNING=1