CVS commit: pkgsrc/chat/prosody

["Stephen Borrill" <sborrill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sborrill
Date:           Wed Oct 15 10:34:42 UTC 2025

Modified Files:
        pkgsrc/chat/prosody: Makefile PLIST distinfo
        pkgsrc/chat/prosody/files: prosody.sh
        pkgsrc/chat/prosody/patches: patch-prosody.cfg.lua.dist
Added Files:
        pkgsrc/chat/prosody/patches: patch-util-src_makefile

Log Message:
prosody: fix rc.d and add crypto

prosodyctl should not be used to manage the service, so adjust rc.d script
to run prosody -D.
Set permissions on desired directories.
Clean up socket to stop prosodyctl shell breaking at a restart.
Set path to socket in configuration file.
Build crypto.so (missing from makefile, but not GNUmakefile)
Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/chat/prosody/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/chat/prosody/PLIST
cvs rdiff -u -r1.29 -r1.30 pkgsrc/chat/prosody/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/chat/prosody/files/prosody.sh
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/chat/prosody/patches/patch-prosody.cfg.lua.dist
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/prosody/patches/patch-util-src_makefile

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

Modified files:

Index: pkgsrc/chat/prosody/Makefile
diff -u pkgsrc/chat/prosody/Makefile:1.55 pkgsrc/chat/prosody/Makefile:1.56
--- pkgsrc/chat/prosody/Makefile:1.55   Wed Jul  2 08:36:31 2025
+++ pkgsrc/chat/prosody/Makefile        Wed Oct 15 10:34:42 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2025/07/02 08:36:31 sborrill Exp $
+# $NetBSD: Makefile,v 1.56 2025/10/15 10:34:42 sborrill Exp $
 
 DISTNAME=      prosody-13.0.2
+PKGREVISION=   1
 CATEGORIES=    chat
 MASTER_SITES=  https://prosody.im/downloads/source/
 
@@ -70,6 +71,7 @@ LDFLAGS.SunOS+=               -lsocket -lnsl
 MAKE_FILE=             makefile
 
 RCD_SCRIPTS=           prosody
+FILES_SUBST+=          LUA_DOT_VERSION=${_LUA_DOT_VERSION}
 FILES_SUBST+=          PROSODY_RUN=${PROSODY_RUN}
 FILES_SUBST+=          PROSODY_USER=${PROSODY_USER}
 FILES_SUBST+=          PROSODY_GROUP=${PROSODY_GROUP}

Index: pkgsrc/chat/prosody/PLIST
diff -u pkgsrc/chat/prosody/PLIST:1.14 pkgsrc/chat/prosody/PLIST:1.15
--- pkgsrc/chat/prosody/PLIST:1.14      Wed Jul  2 08:36:31 2025
+++ pkgsrc/chat/prosody/PLIST   Wed Oct 15 10:34:42 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2025/07/02 08:36:31 sborrill Exp $
+@comment $NetBSD: PLIST,v 1.15 2025/10/15 10:34:42 sborrill Exp $
 bin/prosody
 bin/prosodyctl
 lib/prosody/core/certmanager.lua
@@ -176,6 +176,7 @@ lib/prosody/util/bitcompat.lua
 lib/prosody/util/cache.lua
 lib/prosody/util/caps.lua
 lib/prosody/util/compat.so
+lib/prosody/util/crypto.so
 lib/prosody/util/dataforms.lua
 lib/prosody/util/datamanager.lua
 lib/prosody/util/datamapper.lua

Index: pkgsrc/chat/prosody/distinfo
diff -u pkgsrc/chat/prosody/distinfo:1.29 pkgsrc/chat/prosody/distinfo:1.30
--- pkgsrc/chat/prosody/distinfo:1.29   Wed Jul  2 08:36:31 2025
+++ pkgsrc/chat/prosody/distinfo        Wed Oct 15 10:34:42 2025
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.29 2025/07/02 08:36:31 sborrill Exp $
+$NetBSD: distinfo,v 1.30 2025/10/15 10:34:42 sborrill Exp $
 
 BLAKE2s (prosody-13.0.2.tar.gz) = 6bdbbbdddb8914d753de3624706b884a2568293000c5db14ebe6a9dd9598b270
 SHA512 (prosody-13.0.2.tar.gz) = 649f1f2d4798ca5d4fd224fd3c3784f2154366c5026f4207e88de61d98aaf906dc7378e575216cb8cb740ece98efa56df45be3e8a1d8e561954ca9fba4e0e59a
 Size (prosody-13.0.2.tar.gz) = 736799 bytes
 SHA1 (patch-makefile) = 846c12b98ba275f2d091f8d6aaa1c18617a9fd20
-SHA1 (patch-prosody.cfg.lua.dist) = a1e4636abe4f2caa82d13ed8564b5b785dc8595a
+SHA1 (patch-prosody.cfg.lua.dist) = d656a4896d95bc79304924760df46edf8157caa2
+SHA1 (patch-util-src_makefile) = b656902271845237eda3862b7795ccde621e694d
 SHA1 (patch-util-src_pposix.c) = 7e54654382ae4b3ae3acb2a5f9c0a2c64cc27c62

Index: pkgsrc/chat/prosody/files/prosody.sh
diff -u pkgsrc/chat/prosody/files/prosody.sh:1.6 pkgsrc/chat/prosody/files/prosody.sh:1.7
--- pkgsrc/chat/prosody/files/prosody.sh:1.6    Wed Jul 27 01:53:40 2022
+++ pkgsrc/chat/prosody/files/prosody.sh        Wed Oct 15 10:34:42 2025
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: prosody.sh,v 1.6 2022/07/27 01:53:40 khorben Exp $
+# $NetBSD: prosody.sh,v 1.7 2025/10/15 10:34:42 sborrill Exp $
 #
 # PROVIDE: prosody
 # REQUIRE: DAEMON
@@ -11,25 +11,34 @@ fi
 
 name="prosody"
 rcvar=${name}
-ctl_command="@PREFIX@/bin/${name}ctl"
+command="@PREFIX@/bin/${name}"
+command_args="-D"
+command_interpreter="@PREFIX@/bin/lua@LUA_DOT_VERSION@"
 required_files="@PKG_SYSCONFDIR@/${name}.cfg.lua"
 pidfile="@PROSODY_RUN@/${name}.pid"
 start_precmd="prosody_precmd"
-extra_commands="reload status"
+stop_postcmd="prosody_postcmd"
+extra_commands="reload"
+prosody_user="@PROSODY_USER@"
+prosody_group="@PROSODY_GROUP@"
 
 prosody_precmd()
 {
     if ! @TEST@ -d @PROSODY_RUN@; then
-        @MKDIR@ -m 0755 @PROSODY_RUN@
+        @MKDIR@ -m 0750 @PROSODY_RUN@
     fi
     @CHOWN@ @PROSODY_USER@:@PROSODY_GROUP@ @PROSODY_RUN@
     #ulimit -n 2048
 }
 
-start_cmd="${ctl_command} start"
-stop_cmd="${ctl_command} stop"
-reload_cmd="${ctl_command} reload"
-status_cmd="${ctl_command} status"
+prosody_postcmd()
+{
+    # Fix for failed socket clean-up which stops
+    # prosodyctl working after a restart
+    if test -S "@PROSODY_RUN@/${name}.soc"; then
+        rm -f "@PROSODY_RUN@/${name}.soc"
+    fi
+}
 
 load_rc_config $name
 run_rc_command "$1"

Index: pkgsrc/chat/prosody/patches/patch-prosody.cfg.lua.dist
diff -u pkgsrc/chat/prosody/patches/patch-prosody.cfg.lua.dist:1.2 pkgsrc/chat/prosody/patches/patch-prosody.cfg.lua.dist:1.3
--- pkgsrc/chat/prosody/patches/patch-prosody.cfg.lua.dist:1.2  Sun May  8 21:24:12 2022
+++ pkgsrc/chat/prosody/patches/patch-prosody.cfg.lua.dist      Wed Oct 15 10:34:42 2025
@@ -1,7 +1,8 @@
-$NetBSD: patch-prosody.cfg.lua.dist,v 1.2 2022/05/08 21:24:12 khorben Exp $
+$NetBSD: patch-prosody.cfg.lua.dist,v 1.3 2025/10/15 10:34:42 sborrill Exp $
 
-set the logging paths
-set up the pid files
+Set the logging paths
+Set up the pid files
+Set the location of the socket for prosodyctl
 
 --- prosody.cfg.lua.dist.orig  2022-03-08 12:34:39.594708341 +0000
 +++ prosody.cfg.lua.dist
@@ -16,13 +17,16 @@ set up the pid files
        -- "*syslog"; -- Uncomment this for logging to syslog
        -- "*console"; -- Log to the console, useful for debugging when running in the foreground
  }
-@@ -205,6 +205,9 @@ log = {
+@@ -205,6 +205,12 @@ log = {
  -- Location of directory to find certificates in (relative to main config file):
  certificates = "certs"
  
 +-- Enable PID file by default
 +pidfile = "@PROSODY_RUN@/prosody.pid";
 +
++-- Configure location of admin socket
++admin_socket = "@PROSODY_RUN@/prosody.sock";
++
  ----------- Virtual hosts -----------
  -- You need to add a VirtualHost entry for each domain you wish Prosody to serve.
  -- Settings under each VirtualHost entry apply *only* to that host.

Added files:

Index: pkgsrc/chat/prosody/patches/patch-util-src_makefile
diff -u /dev/null pkgsrc/chat/prosody/patches/patch-util-src_makefile:1.1
--- /dev/null   Wed Oct 15 10:34:42 2025
+++ pkgsrc/chat/prosody/patches/patch-util-src_makefile Wed Oct 15 10:34:42 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-util-src_makefile,v 1.1 2025/10/15 10:34:42 sborrill Exp $
+
+Build crypto.so (copied from GNUmakefile)
+
+--- util-src/makefile.orig     2025-05-29 16:42:58.000000000 +0100
++++ util-src/makefile  2025-10-15 09:42:39.050542869 +0100
+@@ -7,7 +7,7 @@
+ 
+ ALL=encodings.so hashes.so net.so pposix.so signal.so table.so \
+     ringbuffer.so time.so poll.so compat.so strbitop.so \
+-    struct.so
++    struct.so crypto.so
+ 
+ .ifdef $(RANDOM)
+ ALL+=crand.so
+@@ -32,6 +32,9 @@
+ hashes.so: hashes.o
+       $(LD) $(LDFLAGS) -o $@ $< $(LDLIBS) $(OPENSSL_LIBS)
+ 
++crypto.so: crypto.o
++      $(LD) $(LDFLAGS) -o $@ $< $(LDLIBS) $(OPENSSL_LIBS)
++
+ crand.o: crand.c
+       $(CC) $(CFLAGS) -DWITH_$(RANDOM) -c -o $@ $<
+