CVS commit: pkgsrc/chat/ejabberd

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/chat/ejabberd
From: "Greg Troxel" <gdt%netbsd.org@localhost>
Date: Thu, 24 Apr 2025 13:35:29 +0000

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Apr 24 13:35:29 UTC 2025

Modified Files:
        pkgsrc/chat/ejabberd: Makefile PLIST distinfo
        pkgsrc/chat/ejabberd/patches: patch-aa patch-ae
Removed Files:
        pkgsrc/chat/ejabberd/patches: patch-m4_erlang-extra.m4
            patch-tools_ejabberdctl.bc

Log Message:
chat/ejabberd: Update to 23.05

Tested on NetBSD 9 amd64.

packaging changes:
  - change upstream download to github
  - drop a patch cherrypicked from upstream
  - gc patch contents overtaken by upstream changes
  - gc patch comments for which I can't find a matching hunk

Upstream NEWS:

23.05

  New MQTT bridge

  This new module allows to synchronize topic changes between local
  and remote servers. It can be configured to replicate local changes
  to remote server, or can subscribe to topics on remote server and
  update local copies when they change.

  Changes in option outgoing_s2s_families

  The outgoing_s2s_families top-level option specifies which address
  families to try, in what order.

  The default value has now been changed to try IPv6 first, as servers
  are within datacenters where IPv6 is more commonly enabled (contrary
  to clients). And if it's not present, then it'll just fall back to
  IPv4.

  By the way, this option is obsolete and irrelevant when using
  ejabberd 23.01 and Erlang/OTP 2n2, or newer versions of them.

22.10

  Upstream distfile has been withdrawn and thus no NEWS is just
  missing NEWS.


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 pkgsrc/chat/ejabberd/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/chat/ejabberd/PLIST
cvs rdiff -u -r1.70 -r1.71 pkgsrc/chat/ejabberd/distinfo
cvs rdiff -u -r1.19 -r1.20 pkgsrc/chat/ejabberd/patches/patch-aa
cvs rdiff -u -r1.23 -r1.24 pkgsrc/chat/ejabberd/patches/patch-ae
cvs rdiff -u -r1.2 -r0 pkgsrc/chat/ejabberd/patches/patch-m4_erlang-extra.m4
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/chat/ejabberd/patches/patch-tools_ejabberdctl.bc

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.102 pkgsrc/chat/ejabberd/Makefile:1.103
--- pkgsrc/chat/ejabberd/Makefile:1.102 Sat Sep 21 17:55:47 2024
+++ pkgsrc/chat/ejabberd/Makefile       Thu Apr 24 13:35:29 2025
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.102 2024/09/21 17:55:47 gdt Exp $
+# $NetBSD: Makefile,v 1.103 2025/04/24 13:35:29 gdt Exp $
 
-DISTNAME=      ejabberd-22.05
-PKGREVISION=   3
+DISTNAME=      ejabberd-23.01
+# later releases:
+# 23.04 23.10 24.02 24.06 24.07 24.10 24.12 25.03 25.04
 CATEGORIES=    chat
-MASTER_SITES=  https://www.process-one.net/downloads/downloads-action.php?file=/${PKGVERSION_NOREV}/
-# later releases include
-# 22.10 23.01 23.04 23.10 24.02 24.06 24.07
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=processone/}
 
 MAINTAINER=    gdt%NetBSD.org@localhost
 HOMEPAGE=      https://www.ejabberd.im/

Index: pkgsrc/chat/ejabberd/PLIST
diff -u pkgsrc/chat/ejabberd/PLIST:1.59 pkgsrc/chat/ejabberd/PLIST:1.60
--- pkgsrc/chat/ejabberd/PLIST:1.59     Sat Oct 15 18:20:40 2022
+++ pkgsrc/chat/ejabberd/PLIST  Thu Apr 24 13:35:29 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.59 2022/10/15 18:20:40 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.60 2025/04/24 13:35:29 gdt Exp $
 lib/${PKGNAME}/COPYING
 lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/${PKGNAME}/ebin/acl.beam
@@ -80,6 +80,7 @@ lib/${PKGNAME}/ebin/ejabberd_update.beam
 lib/${PKGNAME}/ebin/ejabberd_web.beam
 lib/${PKGNAME}/ebin/ejabberd_web_admin.beam
 lib/${PKGNAME}/ebin/ejabberd_websocket.beam
+lib/${PKGNAME}/ebin/ejabberd_websocket_codec.beam
 lib/${PKGNAME}/ebin/ejabberd_xmlrpc.beam
 lib/${PKGNAME}/ebin/ejd2sql.beam
 lib/${PKGNAME}/ebin/eldap.beam
@@ -163,6 +164,9 @@ lib/${PKGNAME}/ebin/mod_mix_pam_opt.beam
 lib/${PKGNAME}/ebin/mod_mix_pam_sql.beam
 lib/${PKGNAME}/ebin/mod_mix_sql.beam
 lib/${PKGNAME}/ebin/mod_mqtt.beam
+lib/${PKGNAME}/ebin/mod_mqtt_bridge.beam
+lib/${PKGNAME}/ebin/mod_mqtt_bridge_opt.beam
+lib/${PKGNAME}/ebin/mod_mqtt_bridge_session.beam
 lib/${PKGNAME}/ebin/mod_mqtt_mnesia.beam
 lib/${PKGNAME}/ebin/mod_mqtt_opt.beam
 lib/${PKGNAME}/ebin/mod_mqtt_session.beam
@@ -276,11 +280,9 @@ lib/${PKGNAME}/ebin/translate.beam
 lib/${PKGNAME}/ebin/win32_dns.beam
 lib/${PKGNAME}/ebin/xml_compress.beam
 lib/${PKGNAME}/include/ELDAPv3.hrl
-lib/${PKGNAME}/include/adhoc.hrl
 lib/${PKGNAME}/include/bosh.hrl
 lib/${PKGNAME}/include/ejabberd_auth.hrl
 lib/${PKGNAME}/include/ejabberd_commands.hrl
-lib/${PKGNAME}/include/ejabberd_config.hrl
 lib/${PKGNAME}/include/ejabberd_ctl.hrl
 lib/${PKGNAME}/include/ejabberd_http.hrl
 lib/${PKGNAME}/include/ejabberd_oauth.hrl
@@ -307,7 +309,6 @@ lib/${PKGNAME}/include/mod_push.hrl
 lib/${PKGNAME}/include/mod_roster.hrl
 lib/${PKGNAME}/include/mod_shared_roster.hrl
 lib/${PKGNAME}/include/mod_vcard.hrl
-lib/${PKGNAME}/include/mod_vcard_xupdate.hrl
 lib/${PKGNAME}/include/mqtt.hrl
 lib/${PKGNAME}/include/pubsub.hrl
 lib/${PKGNAME}/include/translate.hrl
@@ -373,6 +374,4 @@ share/doc/ejabberd/COPYING
 share/examples/ejabberd/ejabberd.yml
 share/examples/ejabberd/ejabberdctl.cfg
 share/examples/ejabberd/inetrc
-@pkgdir var/spool/ejabberd
-@pkgdir var/log/ejabberd
 @pkgdir bin

Index: pkgsrc/chat/ejabberd/distinfo
diff -u pkgsrc/chat/ejabberd/distinfo:1.70 pkgsrc/chat/ejabberd/distinfo:1.71
--- pkgsrc/chat/ejabberd/distinfo:1.70  Fri Aug 23 12:59:05 2024
+++ pkgsrc/chat/ejabberd/distinfo       Thu Apr 24 13:35:29 2025
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.70 2024/08/23 12:59:05 gdt Exp $
+$NetBSD: distinfo,v 1.71 2025/04/24 13:35:29 gdt Exp $
 
-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) = 1e8947a3a3ce36c91df67137edf115d8f80c8a9a
-SHA1 (patch-ae) = 9e72782b7b46437edac02b341e726b28a3524c6d
-SHA1 (patch-m4_erlang-extra.m4) = 3b89c1a8212e8a45ae319b30606a41429762e2fe
+BLAKE2s (ejabberd-23.01.tar.gz) = 02743cc19b3c0898b09e3fc53fa7d418ee82b3d6e0bc78f50fe420bcd5a1bbb0
+SHA512 (ejabberd-23.01.tar.gz) = 3fe11123d24e430fa10d18aabb9cc9613bc25ee48d6c64a642ae1d0d458f220df638b94cde444241399e0d0777a4f64995ad7e37f963f1ee92bbb114ed431c4b
+Size (ejabberd-23.01.tar.gz) = 2569272 bytes
+SHA1 (patch-aa) = 751d547296ddc6bb648480118ba0af33bb21e5b7
+SHA1 (patch-ae) = a0e323793200019d47ddbe06b0a41c07d3199f3f
 SHA1 (patch-src_ejabberd__auth.erl) = f54216e2cf41c800b6c7657b9d99bb8338b84077
 SHA1 (patch-src_ejabberd__auth__anonymous.erl) = a0781130fb63c45aa911b0ff64156f3724505bb9
-SHA1 (patch-tools_ejabberdctl.bc) = 6e4f5d8411212d94dffe59192b9dca8aafba8b3f

Index: pkgsrc/chat/ejabberd/patches/patch-aa
diff -u pkgsrc/chat/ejabberd/patches/patch-aa:1.19 pkgsrc/chat/ejabberd/patches/patch-aa:1.20
--- pkgsrc/chat/ejabberd/patches/patch-aa:1.19  Fri Aug 23 12:59:05 2024
+++ pkgsrc/chat/ejabberd/patches/patch-aa       Thu Apr 24 13:35:29 2025
@@ -1,47 +1,38 @@
-$NetBSD: patch-aa,v 1.19 2024/08/23 12:59:05 gdt Exp $
+$NetBSD: patch-aa,v 1.20 2025/04/24 13:35:29 gdt Exp $
 
-Fix locations; don't mess with ownership.
+  - Split etcdir into where the config is installed and where it is
+    used from, to align with pkgsrc CONF_FILES.
+    \todo Consider patching installation instead of here, or at least
+    leaving ETCDIR correct.
 
-\todo File parts of this upstream.  At least including DESTDIR in
-EJABBERDDIR seem like a bug, and in general DESTDIR is tangled more
-than it should be.
+  - Point SPOOL and LOG at pkgsrc-chosen locations.
 
---- Makefile.in.orig   2022-05-06 15:12:22.000000000 +0200
-+++ Makefile.in        2023-08-11 09:08:52.337637204 +0200
-@@ -9,9 +9,10 @@
- 
+  - Don't set user/group on installed files; just because we are
+    running the daemon as ejabberd doesn't mean that the files in
+    e.g. /usr/pkg/bin should be installed as ejabberd.
+
+--- Makefile.in.orig   2023-01-17 10:35:52.000000000 +0000
++++ Makefile.in
+@@ -10,7 +10,8 @@ exec_prefix = @exec_prefix@
  DESTDIR =
  
  # /etc/ejabberd/
--ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
-+ETCDIR = $(DESTDIR)@prefix@/share/examples/ejabberd
+-ETCDIR = @sysconfdir@/ejabberd
++ETCDIR = @prefix@/share/examples/ejabberd
 +SYSCONFDIR_ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
  
  # /bin/
- BINDIR = $(DESTDIR)@bindir@
- 
-@@ -21,9 +22,9 @@
- # /lib/
- LIBDIR =  $(DESTDIR)@libdir@
- 
- # /lib/ejabberd/
--EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
-+EJABBERDDIR = $(LIBDIR)/ejabberd
- 
- # /share/doc/ejabberd
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
- datarootdir = @datarootdir@
-@@ -65,33 +66,20 @@
- # /usr/lib/ejabberd/priv/lua
+ BINDIR = @bindir@
+@@ -66,31 +67,18 @@ SQLDIR = $(PRIVDIR)/sql
  LUADIR = $(PRIVDIR)/lua
  
  # /var/lib/ejabberd/
--SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
-+SPOOLDIR = $(DESTDIR)@EJABBERD_DB@
+-SPOOLDIR = @localstatedir@/lib/ejabberd
++SPOOLDIR = @EJABBERD_DB@
  
  # /var/log/ejabberd/
--LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
-+LOGDIR = $(DESTDIR)@EJABBERD_LOGDIR@
+-LOGDIR = @localstatedir@/log/ejabberd
++LOGDIR = @EJABBERD_LOGDIR@
  
  INSTALLUSER=@INSTALLUSER@
 -# if no user was enabled, don't set privileges or ownership
@@ -66,16 +57,7 @@ than it should be.
  
  ifeq "$(MIX)" "mix"
  REBAR_VER:=6
- REBAR_VER_318:=0
-@@ -293,21 +281,21 @@
-               -e "s*{{bindir}}/iex*$(iexpath)*g" \
-               -e "s*{{bindir}}*@bindir@*g" \
-               -e "s*{{libdir}}*${relivelibdir}*g" \
-               -e "s*{{erl}}*@ERL@*g" \
--              -e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \
--              > ejabberdctl.relive
-+              -e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template | \
-+      $(SED)  -e "s*\${DESTDIR}**g" > ejabberdctl.relive
+@@ -318,7 +306,7 @@ ejabberd.service:
  
  ejabberdctl.example: vars.config
        $(SED)  -e "s*{{installuser}}*@INSTALLUSER@*g" \
@@ -84,13 +66,3 @@ than it should be.
                -e "s*{{logs_dir}}*${LOGDIR}*g" \
                -e "s*{{spool_dir}}*${SPOOLDIR}*g" \
                -e "s*{{bindir}}*@bindir@*g" \
-               -e "s*{{libdir}}*@libdir@*g" \
-               -e "s*{{erl}}*@ERL@*g" \
--              -e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \
--              > ejabberdctl.example
-+              -e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template | \
-+      $(SED)  -e "s*\${DESTDIR}**g" > ejabberdctl.example
- 
- install: copy-files ejabberdctl.example
-       #
-       # Configuration files

Index: pkgsrc/chat/ejabberd/patches/patch-ae
diff -u pkgsrc/chat/ejabberd/patches/patch-ae:1.23 pkgsrc/chat/ejabberd/patches/patch-ae:1.24
--- pkgsrc/chat/ejabberd/patches/patch-ae:1.23  Fri Aug 23 12:59:05 2024
+++ pkgsrc/chat/ejabberd/patches/patch-ae       Thu Apr 24 13:35:29 2025
@@ -1,19 +1,14 @@
-$NetBSD: patch-ae,v 1.23 2024/08/23 12:59:05 gdt Exp $
+$NetBSD: patch-ae,v 1.24 2025/04/24 13:35:29 gdt Exp $
 
-- Default locations.
 - Use 'su -' instead of just 'su'. Fixes priv delegation on SunOS
   and AIX where Erlang relies on $HOME set correctly. Use a portable
   su arg order while at it.
-- At least SunOS has not wheel group.
-  + \todo wheel is not patched out - explain/fix
-- Portable grep calls.
-- Fix spool directory.
 
 \todo File upstream.
 
---- ejabberdctl.template.orig  2022-05-06 13:12:22.000000000 +0000
+--- ejabberdctl.template.orig  2023-01-17 10:35:52.000000000 +0000
 +++ ejabberdctl.template
-@@ -112,7 +112,7 @@ export SCRIPT_DIR
+@@ -121,7 +121,7 @@ set_dist_client()
  exec_cmd()
  {
      case $EXEC_CMD in
@@ -22,20 +17,3 @@ $NetBSD: patch-ae,v 1.23 2024/08/23 12:5
          as_current_user) "$@" ;;
      esac
  }
-@@ -218,14 +218,14 @@ uid()
- # stop epmd if there is no other running node
- stop_epmd()
- {
--    "$EPMD" -names 2>/dev/null | grep -q name || "$EPMD" -kill >/dev/null
-+    "$EPMD" -names 2>/dev/null | grep name >/dev/null || "$EPMD" -kill >/dev/null
- }
- 
- # make sure node not already running and node name unregistered
- # if all ok, ensure runtime directory exists and make it current directory
- check_start()
- {
--    "$EPMD" -names 2>/dev/null | grep -q " ${ERLANG_NODE%@*} " && {
-+    "$EPMD" -names 2>/dev/null | grep " ${ERLANG_NODE%@*} " >/dev/null && {
-         pgrep -f "$ERLANG_NODE" >/dev/null && {
-             echo "ERROR: The ejabberd node '$ERLANG_NODE' is already running."
-             exit 4

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index