CVS commit: pkgsrc/chat/ejabberd

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Feb  6 17:02:07 UTC 2026

Modified Files:
        pkgsrc/chat/ejabberd: Makefile PLIST distinfo
Added Files:
        pkgsrc/chat/ejabberd/patches: patch-src_mod__muc__room.erl

Log Message:
chat/ejabberd: Update to 25.10

Upstream NEWS:

* 25.10

Release Highlights:

    Added more Ad-Hoc Commands from XEP-0133
    Updated support for XEP-0317 Hats

If you are upgrading from a previous version, there are no mandatory changes in SQL schemas, configuration, API commands or hooks.

Other contents:

    New option archive_muc_as_mucsub in mod_mam
    Removed support for Erlang/OTP older than 25.0
    Support for the new Erlang maybe expression
    Rename New SQL schema to Multihost, and Default to Singlehost


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 pkgsrc/chat/ejabberd/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/chat/ejabberd/PLIST
cvs rdiff -u -r1.74 -r1.75 pkgsrc/chat/ejabberd/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/chat/ejabberd/patches/patch-src_mod__muc__room.erl

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

Modified files:

Index: pkgsrc/chat/ejabberd/Makefile
diff -u pkgsrc/chat/ejabberd/Makefile:1.110 pkgsrc/chat/ejabberd/Makefile:1.111
--- pkgsrc/chat/ejabberd/Makefile:1.110 Fri Feb  6 15:59:16 2026
+++ pkgsrc/chat/ejabberd/Makefile       Fri Feb  6 17:02:06 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.110 2026/02/06 15:59:16 gdt Exp $
+# $NetBSD: Makefile,v 1.111 2026/02/06 17:02:06 gdt Exp $
 
-DISTNAME=      ejabberd-25.08
+DISTNAME=      ejabberd-25.10
 CATEGORIES=    chat
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=processone/}
 

Index: pkgsrc/chat/ejabberd/PLIST
diff -u pkgsrc/chat/ejabberd/PLIST:1.63 pkgsrc/chat/ejabberd/PLIST:1.64
--- pkgsrc/chat/ejabberd/PLIST:1.63     Fri Feb  6 15:59:16 2026
+++ pkgsrc/chat/ejabberd/PLIST  Fri Feb  6 17:02:06 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.63 2026/02/06 15:59:16 gdt Exp $
+@comment $NetBSD: PLIST,v 1.64 2026/02/06 17:02:06 gdt Exp $
 lib/${PKGNAME}/COPYING
 lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/${PKGNAME}/ebin/acl.beam
@@ -318,7 +318,6 @@ lib/${PKGNAME}/include/ejabberd_router.h
 lib/${PKGNAME}/include/ejabberd_sm.hrl
 lib/${PKGNAME}/include/ejabberd_sql.hrl
 lib/${PKGNAME}/include/ejabberd_sql_pt.hrl
-lib/${PKGNAME}/include/ejabberd_stacktrace.hrl
 lib/${PKGNAME}/include/ejabberd_web_admin.hrl
 lib/${PKGNAME}/include/eldap.hrl
 lib/${PKGNAME}/include/http_bind.hrl

Index: pkgsrc/chat/ejabberd/distinfo
diff -u pkgsrc/chat/ejabberd/distinfo:1.74 pkgsrc/chat/ejabberd/distinfo:1.75
--- pkgsrc/chat/ejabberd/distinfo:1.74  Fri Feb  6 15:59:16 2026
+++ pkgsrc/chat/ejabberd/distinfo       Fri Feb  6 17:02:06 2026
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.74 2026/02/06 15:59:16 gdt Exp $
+$NetBSD: distinfo,v 1.75 2026/02/06 17:02:06 gdt Exp $
 
-BLAKE2s (ejabberd-25.08.tar.gz) = c020cc19fc5d0f52e2926fdff13f3af0ce08c53b6103064387766b4c654f325d
-SHA512 (ejabberd-25.08.tar.gz) = e89a745a1ce454c3d9b10548ce990535bc27febe90c2c28785d9e4d7c0b29685d6df28ec33672b821246af86e3a437d02766444b37d24ecc4e309925abb1e2e1
-Size (ejabberd-25.08.tar.gz) = 2683642 bytes
+BLAKE2s (ejabberd-25.10.tar.gz) = bd4dfdc79222eda081d9c6a9a622b795e75820abdee448b85b5ef7be2abc62ea
+SHA512 (ejabberd-25.10.tar.gz) = 8020c8a5d55bf6b897eeca4aab1bab615ff1b3fca40ee8bd2e5bda0ff10cd0ec09ddd612b65af70639a531c4d77cc4609cf3678697eb47e2cc7e384458a379e5
+Size (ejabberd-25.10.tar.gz) = 2701783 bytes
 SHA1 (patch-aa) = a0a21134adae1f2bbad58a001fb527ea18b70c99
 SHA1 (patch-ae) = b9d3e6183753830bbd9cbfea1d329f81c251f534
+SHA1 (patch-src_mod__muc__room.erl) = 02ad6446b4371e3db93cc5e2cd468aff0a9ef89e

Added files:

Index: pkgsrc/chat/ejabberd/patches/patch-src_mod__muc__room.erl
diff -u /dev/null pkgsrc/chat/ejabberd/patches/patch-src_mod__muc__room.erl:1.1
--- /dev/null   Fri Feb  6 17:02:07 2026
+++ pkgsrc/chat/ejabberd/patches/patch-src_mod__muc__room.erl   Fri Feb  6 17:02:06 2026
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_mod__muc__room.erl,v 1.1 2026/02/06 17:02:06 gdt Exp $
+
+Sync one function with git master, pulling up what I think is several
+bugfixes.
+
+--- src/mod_muc_room.erl.orig  2025-10-28 12:56:01.000000000 +0000
++++ src/mod_muc_room.erl
+@@ -5370,13 +5370,17 @@ add_presence_hats(JID, Pres, StateData) 
+                     Pres;
+                 _ ->
+                     Items =
+-                        lists:map(fun(URI) ->
+-                                     {URI, Title, Hue} = get_hat_details(URI, StateData),
+-                                     #muc_hat{uri = URI,
+-                                              title = Title,
+-                                              hue = Hue}
+-                                  end,
+-                                  UserHats),
++                        lists:filtermap(fun(URI) ->
++                                           case get_hat_details(URI, StateData) of
++                                               false ->
++                                                   false;
++                                               {URI, Title, Hue} ->
++                                                   {true,
++                                                    #muc_hat{uri = URI,
++                                                             title = Title}}
++                                           end
++                                        end,
++                                        UserHats),
+                     xmpp:set_subtag(Pres, #muc_hats{hats = Items})
+             end;
+         false ->