CVS commit: pkgsrc/chat/ejabberd

"Greg Troxel" <[email protected]> Wed, 5 Aug 2026 18:19:22 +0000

Newsgroups	gmane.os.netbsd.devel.pkgsrc.cvs
Message-ID	<[email protected]>

Module Name:	pkgsrc
Committed By:	gdt
Date:		Wed Aug  5 18:19:22 UTC 2026

Modified Files:
	pkgsrc/chat/ejabberd: Makefile PLIST distinfo

Log Message:
chat/ejabberd: Update to 26.02

## Version 26.02

- Removes `mod_muc_occupantid` modules, and integrates its functionality directly into `mod_muc` ([#4521](https://github.com/processone/ejabberd/issues/4521))


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 pkgsrc/chat/ejabberd/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/chat/ejabberd/PLIST
cvs rdiff -u -r1.76 -r1.77 pkgsrc/chat/ejabberd/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

(unnamed) (text/x-diff, 5.7 KB)

Modified files:

Index: pkgsrc/chat/ejabberd/Makefile
diff -u pkgsrc/chat/ejabberd/Makefile:1.114 pkgsrc/chat/ejabberd/Makefile:1.115
--- pkgsrc/chat/ejabberd/Makefile:1.114	Sun Feb 15 18:22:30 2026
+++ pkgsrc/chat/ejabberd/Makefile	Wed Aug  5 18:19:22 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.114 2026/02/15 18:22:30 gdt Exp $
+# $NetBSD: Makefile,v 1.115 2026/08/05 18:19:22 gdt Exp $
 
-DISTNAME=	ejabberd-26.01
-PKGREVISION=	1
+DISTNAME=	ejabberd-26.02
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_GITHUB:=processone/}
 
@@ -41,6 +40,19 @@ CONFIGURE_ARGS+=	--with-rebar=rebar
 # rebar3_hexpm.
 #ALLOW_NETWORK_ACCESS=	yes
 
+# This script uses sha256sum which is a linuxism; patch it to use a g
+# prefix to align with our TOOLS requirements of coreutils.  Not yet
+# addressed upstream.
+TOOL_DEPENDS+=		coreutils-*:../../sysutils/coreutils
+SUBST_CLASSES+=		invites
+SUBST_MESSAGE.invites=	Fixing Linuxism of sha256sum
+SUBST_STAGE.invites=	pre-configure
+SUBST_FILES.invites=	tools/dl_invites_page_deps.sh
+SUBST_SED.invites=	-e 's/sha256sum/g&/'
+# Leave network usage at build time unremediated, on the theory that
+# updating for security fixes is more important than ick reduction.
+ALLOW_NETWORK_ACCESS=	yes
+
 # We intend to use the erlang packages DEPENDed on below, rather than
 # having ejabberd's build system download and build them.  The
 # configure option seems to work for rebar(2), but not for mix or
@@ -136,7 +148,7 @@ CONF_FILES_PERMS+=	${EGDIR}/inetrc ${PKG
 			${REAL_ROOT_USER} ${EJABBERD_GROUP} 0640
 SPECIAL_PERMS+=		sbin/ejabberdctl ${REAL_ROOT_USER} ${EJABBERD_GROUP} 0750
 
-REPLACE_BASH=		ejabberdctl.template tools/captcha.sh
+REPLACE_BASH=		ejabberdctl.template tools/captcha.sh tools/dl_invites_page_deps.sh
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Localizing paths

Index: pkgsrc/chat/ejabberd/PLIST
diff -u pkgsrc/chat/ejabberd/PLIST:1.65 pkgsrc/chat/ejabberd/PLIST:1.66
--- pkgsrc/chat/ejabberd/PLIST:1.65	Sat Feb  7 01:58:53 2026
+++ pkgsrc/chat/ejabberd/PLIST	Wed Aug  5 18:19:22 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.65 2026/02/07 01:58:53 gdt Exp $
+@comment $NetBSD: PLIST,v 1.66 2026/08/05 18:19:22 gdt Exp $
 lib/${PKGNAME}/COPYING
 lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/${PKGNAME}/ebin/acl.beam
@@ -203,7 +203,6 @@ lib/${PKGNAME}/ebin/mod_muc_admin_opt.be
 lib/${PKGNAME}/ebin/mod_muc_log.beam
 lib/${PKGNAME}/ebin/mod_muc_log_opt.beam
 lib/${PKGNAME}/ebin/mod_muc_mnesia.beam
-lib/${PKGNAME}/ebin/mod_muc_occupantid.beam
 lib/${PKGNAME}/ebin/mod_muc_opt.beam
 lib/${PKGNAME}/ebin/mod_muc_room.beam
 lib/${PKGNAME}/ebin/mod_muc_rtbl.beam
@@ -368,6 +367,41 @@ lib/${PKGNAME}/priv/img/vcss.png
 lib/${PKGNAME}/priv/js/admin.js
 lib/${PKGNAME}/priv/js/muc.js
 lib/${PKGNAME}/priv/js/sortable.min.js
+lib/${PKGNAME}/priv/mod_invites/HOWTO.md
+lib/${PKGNAME}/priv/mod_invites/apps.html
+lib/${PKGNAME}/priv/mod_invites/apps.json
+lib/${PKGNAME}/priv/mod_invites/base.html
+lib/${PKGNAME}/priv/mod_invites/base_min.html
+lib/${PKGNAME}/priv/mod_invites/client.html
+lib/${PKGNAME}/priv/mod_invites/copyright
+lib/${PKGNAME}/priv/mod_invites/invite.html
+lib/${PKGNAME}/priv/mod_invites/invite_invalid.html
+lib/${PKGNAME}/priv/mod_invites/register.html
+lib/${PKGNAME}/priv/mod_invites/register_error.html
+lib/${PKGNAME}/priv/mod_invites/register_success.html
+lib/${PKGNAME}/priv/mod_invites/roster.html
+lib/${PKGNAME}/priv/mod_invites/static/bootstrap/css/bootstrap.min.css
+lib/${PKGNAME}/priv/mod_invites/static/bootstrap/js/bootstrap.min.js
+lib/${PKGNAME}/priv/mod_invites/static/favicon.png
+lib/${PKGNAME}/priv/mod_invites/static/illus-empty.svg
+lib/${PKGNAME}/priv/mod_invites/static/invite.css
+lib/${PKGNAME}/priv/mod_invites/static/invite.js
+lib/${PKGNAME}/priv/mod_invites/static/logos/apple_as.svg
+lib/${PKGNAME}/priv/mod_invites/static/logos/beagle-im.svg
+lib/${PKGNAME}/priv/mod_invites/static/logos/conversations.svg
+lib/${PKGNAME}/priv/mod_invites/static/logos/converse-js.svg
+lib/${PKGNAME}/priv/mod_invites/static/logos/dino.svg
+lib/${PKGNAME}/priv/mod_invites/static/logos/fdroid.png
+lib/${PKGNAME}/priv/mod_invites/static/logos/gajim.svg
+lib/${PKGNAME}/priv/mod_invites/static/logos/generic.svg
+lib/${PKGNAME}/priv/mod_invites/static/logos/google_ps.png
+lib/${PKGNAME}/priv/mod_invites/static/logos/monal-tmp.svg
+lib/${PKGNAME}/priv/mod_invites/static/logos/monal.png
+lib/${PKGNAME}/priv/mod_invites/static/logos/renga.svg
+lib/${PKGNAME}/priv/mod_invites/static/logos/siskin-im.svg
+lib/${PKGNAME}/priv/mod_invites/static/logos/yaxim.svg
+lib/${PKGNAME}/priv/mod_invites/static/platform.min.js
+lib/${PKGNAME}/priv/mod_invites/static/qrcode.min.js
 lib/${PKGNAME}/priv/msgs/ar.msg
 lib/${PKGNAME}/priv/msgs/bg.msg
 lib/${PKGNAME}/priv/msgs/ca.msg

Index: pkgsrc/chat/ejabberd/distinfo
diff -u pkgsrc/chat/ejabberd/distinfo:1.76 pkgsrc/chat/ejabberd/distinfo:1.77
--- pkgsrc/chat/ejabberd/distinfo:1.76	Sat Feb  7 01:58:53 2026
+++ pkgsrc/chat/ejabberd/distinfo	Wed Aug  5 18:19:22 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.76 2026/02/07 01:58:53 gdt Exp $
+$NetBSD: distinfo,v 1.77 2026/08/05 18:19:22 gdt Exp $
 
-BLAKE2s (ejabberd-26.01.tar.gz) = 57c3960519106d2b1d46cc988f69967b52513b70fe021fd6e813d017cbe9bb4c
-SHA512 (ejabberd-26.01.tar.gz) = 97ef4210fb6376f3ae2dc8c4a7d42274e04536f1d24191b68bf4e43434f9e5fac4ffb1fd5334000388bc3ecc076604a5f5e0c35158adba5e4198b785d48d5f29
-Size (ejabberd-26.01.tar.gz) = 2908713 bytes
+BLAKE2s (ejabberd-26.02.tar.gz) = 0dd9d4f11150a30a9b8a6010731f5af9fa9e9a5532591e54a6090167fcb7301c
+SHA512 (ejabberd-26.02.tar.gz) = 0057f73ce996173365e73ca3779027ff656f0c678ee632b50815703c5593a9c94818fa3eb635e73739f42af9e4beb955dcbbd9bf76451b768f345156e9cdbc9f
+Size (ejabberd-26.02.tar.gz) = 2918404 bytes
 SHA1 (patch-aa) = a0a21134adae1f2bbad58a001fb527ea18b70c99