CVS commit: pkgsrc/chat/prosody

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

Module Name:    pkgsrc
Committed By:   sborrill
Date:           Wed Jul  2 08:36:31 UTC 2025

Modified Files:
        pkgsrc/chat/prosody: Makefile PLIST distinfo
        pkgsrc/chat/prosody/patches: patch-util-src_pposix.c

Log Message:
prosody: update to 13.0.2

Changes since 0.12.5:

13.0.2:

Fixes and improvements

    mod_storage_internal: Fix queries with only start returning extra items
    mod_invites_register: Stricter validation of registration events

Minor changes

    MUC: Ensure allow MUC PM setting has valid value (fixes #1933: PM does not work on new MUCs)
    mod_storage_sql: Delay showing SQL library error until attempted load
    mod_storage_sql: Handle failure to deploy new UNIQUE index
    mod_storage_sql: Add shell command to create tables and indices (again)
    mod_s2s: Fix log to use formatting instead of concatenation (fixes #1461: Logging issues uncovered by mod_log_json)
    modulemanager, util.pluginloader: Improve error message when load fails but some candidates were filtered
    prosodyctl check config: add recommendation to switch from admin_telnet to shell
    mod_storage_sql: Retrieve all indices to see if the new one exists
    prosodyctl check config: List modules which Prosody cannot successfully load
    net.http.files: Fix issue with caching
    util.jsonschema: Fix handling of false as schema
    mod_invites: Consider password reset a distinct type wrt invite page
    configmanager: Emit config warning when referencing non-existent value
    mod_admin_shell: Add role:list() and role:show() commands
    MUC: Fix nickname registration form error handling (#1930)
    MUC: Fix Error when join stanza sent without resource (#1934)
    MUC: Factor out identification of join stanza
    mod_invites_register: Don't restrict username for roster invites (thanks lissine)
    mod_admin_shell: Fix matching logic in s2s:close (Thanks Menel)
    mod_authz_internal: Improve error message when invalid role specified
    mod_http_file_share: Add media-src 'self' to Content-Security-Policy header
    mod_admin_shell: Visual tweaks to the output of debug:cert_index()
    mod_http: Log problems parsing IP addresses in X-Forwarded-For (Thanks Boris)
    mod_http: Fix IP address normalization (Thanks Boris)
    util.prosodyctl.check: Improve reporting of DNS lookup problems

13.0.1:

Fixes and improvements

    mod_admin_shell: Add debug:cert_index() command to aid debugging of automatic certificate selection
    mod_tls: Enable Prosody's certificate checking for incoming s2s connections (fixes #1916: Impossible to override certificate verification policy in 13.0)
    portmanager: Multiple fixes to use correct certificates for direct TLS ports (fixes #1915)
    net.server_epoll: Use correct connection timeout when initiating Direct TLS
    mod_roster: Fix shell commands when a component is involved (fixes #1908: error in prosodyctl shell roster attempting to subscribe a component)
    mod_http_file_share: Explicitly reject all unsupported ranges
    mod_http_file_share: Fix off by one in Range response
    mod_admin_shell, prosodyctl shell: Report command failure when no password entered (fixes #1907: prosodyctl adduser: unexpected account creation on password mismatch)

Minor changes

    mod_storage_sql: Drop legacy index without confirmation to ease upgrades
    util.adminstream: Fix traceback on double-close (fixes #1913: Prosody fails to completely stop while shell watch:log is active)
    certmanager: Improve logging for all cases where certs are skipped
    mod_tls: Collect full certificate chain validation information
    mod_s2s: Fix error detection with newer versions of OpenSSL
    portmanager: Add debug log message to state which certificate we end up using
    prosodyctl check certs: Use correct hostname in warning message about HTTPS
    prosodyctl check: Be more robust against invalid disco_items, and show warning
    spec/tls: Add TLS/certificate integration tests
    mod_http_file_share: Improve error reporting by using util.error more
    core.storagemanager: Fix tests by removing an assert that upset luarocks
    core.usermanager: Fix COMPAT layer for legacy is_admin() function
    certmanager: Remove obsolete and verbose index log (replaced by shell command)
    doap: Add XEP-0333, XEP-0334, XEP-0156 and mod_http_altconnect

13.0.0:

New in this release
Modules

A number of popular modules have transitioned from community modules into Prosody with this release:

    mod_cloud_notify
    mod_http_altconnect

And the following modules are completely new:

    mod_account_activity
    mod_flags
    mod_s2s_auth_dane_in
    mod_server_info

Administration

    New 'prosodyctl check features' recommends configuration improvements
    mod_announce: Add shell commands to send messages to all users, online users, or limited by roles
    New mod_account_activity plugin records last login/logout time of a user account
    New 'watch log' command to follow live debug logs at runtime
    Similarly, 'watch stanzas' can be used to capture XML logs in real-time

Networking

    Honour 'weight' parameter during SRV record selection
    Support for RFC 8305 "Happy Eyeballs" to improve IPv4/IPv6 connectivity
    Support for TCP Fast Open in server_epoll (pending LuaSocket support)
    Support for deferred accept in server_epoll (pending LuaSocket support)

MUC

    Component admins are no longer room owners by default. This can be reverted to the old behaviour with component_admins_as_room_owners = true, but this has known incompatibilities with some 
clients. Instead, use the shell or ad-hoc commands to gain ownership of rooms when necessary.
    Permissions updates:
        Room creation restricted to local users (of the parent host) by default
            restrict_room_creation = true restricts to admins, false disables all restrictions
        Persistent rooms can only be created by local users (parent host) by default
            muc_room_allow_persistent = false restricts to admins
        Public rooms can only be created by local users (parent host) by default
            muc_room_allow_public = false restricts to admins
    Commands to show occupants and affiliations in the Shell
    Save 'reason' text supplied with affiliation change
    Owners can set MUC avatars (functionality previously in community module mod_vcard_muc)

Security and authentication

    New role and permissions framework and API
    Ability to disable and enable user accounts
    A "grace period" is now supported for deletion requests via in-band registration
    Advertise supported SASL Channel-Binding types (XEP-0440)
    Implement RFC 9266 'tls-exporter' channel binding with TLS 1.3
    Implement 'tls-server-end-point' channel binding
    Full DANE support for s2s
    No longer check certificate Common Names per RFC 9525

Storage

    Performance improvements in internal archive stores
    Ability to use SQLite3 storage with LuaSQLite3 instead of LuaDBI
    SQLCipher support

Module API for developers

    New 'keyval+' combined keyval/map store type
    Config interface API can require that string values be picked from a provided set
    Acceptable interval can be specified for number options
    Method for parsing time periods / intervals from config
    Method for retrieving integer settings from config
    It is now easy for modules to expose a Prosody shell command, by adding a shell-command item
    Modules can now implement a module.ready method which will be called after server initialization
    module:depends() now accepts a second parameter 'soft' to enable soft dependencies

Configuration file

    The configuration file now supports referring and appending to options previously set
    Direct usage of the Lua API in the config file is deprecated, but can now be accessed via Lua.* instead
    Convenience functions for reading values from files, with variant meant for credentials or secrets (e.g. from systemd-creds)

Changed in this release

    Support sub-second precision timestamps
    mod_blocklist: New option 'migrate_legacy_blocking' to disable migration from mod_privacy
    Moved all modules into the Lua namespace prosody.
    Forwarded header from RFC 7239 supported, disabled by default
    mod_http_file_share now uses roles framework, affecting access from e.g. components
    Intervals of mod_cron managed periodic jobs made configurable
    When mod_smacks is enabled, s2s connections not responding to ack requests are closed.
    Arguments to prosodyctl shell that start with ':' are now turned into method calls
    Support for Type=notify and notify-reload systemd service type added
    Support for the roster group access_model in mod_pep
    Support for systemd socket activation in server_epoll
    mod_invites_adhoc gained a command for creating password resets
    [mod_cloud_notify] imported from community modules for push notification support
    [mod_http_altconnect] imported from community modules, simplifying web clients

Removed in this release

    Lua 5.1 support
    XEP-0090 support removed from mod_time
    util.rfc6724


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/chat/prosody/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/chat/prosody/PLIST
cvs rdiff -u -r1.28 -r1.29 pkgsrc/chat/prosody/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/chat/prosody/patches/patch-util-src_pposix.c

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.54 pkgsrc/chat/prosody/Makefile:1.55
--- pkgsrc/chat/prosody/Makefile:1.54   Thu Apr 17 21:49:55 2025
+++ pkgsrc/chat/prosody/Makefile        Wed Jul  2 08:36:31 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2025/04/17 21:49:55 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2025/07/02 08:36:31 sborrill Exp $
 
-DISTNAME=      prosody-0.12.5
-PKGREVISION=   1
+DISTNAME=      prosody-13.0.2
 CATEGORIES=    chat
 MASTER_SITES=  https://prosody.im/downloads/source/
 
@@ -21,7 +20,7 @@ HAS_CONFIGURE=                yes
 TEST_TARGET=           test
 BUILD_DEFS+=           VARBASE
 
-LUA_VERSIONS_ACCEPTED= 54 52 51
+LUA_VERSIONS_ACCEPTED= 54 52
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/chat/prosody/PLIST
diff -u pkgsrc/chat/prosody/PLIST:1.13 pkgsrc/chat/prosody/PLIST:1.14
--- pkgsrc/chat/prosody/PLIST:1.13      Sun May  8 21:24:12 2022
+++ pkgsrc/chat/prosody/PLIST   Wed Jul  2 08:36:31 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2022/05/08 21:24:12 khorben Exp $
+@comment $NetBSD: PLIST,v 1.14 2025/07/02 08:36:31 sborrill Exp $
 bin/prosody
 bin/prosodyctl
 lib/prosody/core/certmanager.lua
@@ -16,8 +16,10 @@ lib/prosody/core/stanza_router.lua
 lib/prosody/core/statsmanager.lua
 lib/prosody/core/storagemanager.lua
 lib/prosody/core/usermanager.lua
+lib/prosody/loader.lua
 lib/prosody/modules/adhoc/adhoc.lib.lua
 lib/prosody/modules/adhoc/mod_adhoc.lua
+lib/prosody/modules/mod_account_activity.lua
 lib/prosody/modules/mod_admin_adhoc.lua
 lib/prosody/modules/mod_admin_shell.lua
 lib/prosody/modules/mod_admin_socket.lua
@@ -34,16 +36,21 @@ lib/prosody/modules/mod_bookmarks.lua
 lib/prosody/modules/mod_bosh.lua
 lib/prosody/modules/mod_c2s.lua
 lib/prosody/modules/mod_carbons.lua
+lib/prosody/modules/mod_cloud_notify.lua
 lib/prosody/modules/mod_component.lua
 lib/prosody/modules/mod_cron.lua
 lib/prosody/modules/mod_csi.lua
 lib/prosody/modules/mod_csi_simple.lua
+lib/prosody/modules/mod_debug_reset.lua
 lib/prosody/modules/mod_debug_sql.lua
+lib/prosody/modules/mod_debug_stanzas/watcher.lib.lua
 lib/prosody/modules/mod_dialback.lua
 lib/prosody/modules/mod_disco.lua
 lib/prosody/modules/mod_external_services.lua
+lib/prosody/modules/mod_flags.lua
 lib/prosody/modules/mod_groups.lua
 lib/prosody/modules/mod_http.lua
+lib/prosody/modules/mod_http_altconnect.lua
 lib/prosody/modules/mod_http_errors.lua
 lib/prosody/modules/mod_http_file_share.lua
 lib/prosody/modules/mod_http_files.lua
@@ -73,6 +80,7 @@ lib/prosody/modules/mod_posix.lua
 lib/prosody/modules/mod_presence.lua
 lib/prosody/modules/mod_private.lua
 lib/prosody/modules/mod_proxy65.lua
+lib/prosody/modules/mod_pubsub/commands.lib.lua
 lib/prosody/modules/mod_pubsub/mod_pubsub.lua
 lib/prosody/modules/mod_pubsub/pubsub.lib.lua
 lib/prosody/modules/mod_register.lua
@@ -81,10 +89,12 @@ lib/prosody/modules/mod_register_limits.
 lib/prosody/modules/mod_roster.lua
 lib/prosody/modules/mod_s2s.lua
 lib/prosody/modules/mod_s2s_auth_certs.lua
+lib/prosody/modules/mod_s2s_auth_dane_in.lua
 lib/prosody/modules/mod_s2s_bidi.lua
 lib/prosody/modules/mod_saslauth.lua
 lib/prosody/modules/mod_scansion_record.lua
 lib/prosody/modules/mod_server_contact_info.lua
+lib/prosody/modules/mod_server_info.lua
 lib/prosody/modules/mod_smacks.lua
 lib/prosody/modules/mod_stanza_debug.lua
 lib/prosody/modules/mod_storage_internal.lua
@@ -127,8 +137,10 @@ lib/prosody/modules/muc/persistent.lib.l
 lib/prosody/modules/muc/presence_broadcast.lib.lua
 lib/prosody/modules/muc/register.lib.lua
 lib/prosody/modules/muc/request.lib.lua
+lib/prosody/modules/muc/restrict_pm.lib.lua
 lib/prosody/modules/muc/subject.lib.lua
 lib/prosody/modules/muc/util.lib.lua
+lib/prosody/modules/muc/vcard.lib.lua
 lib/prosody/modules/muc/whois.lib.lua
 lib/prosody/net/adns.lua
 lib/prosody/net/connect.lua
@@ -140,7 +152,6 @@ lib/prosody/net/http/errors.lua
 lib/prosody/net/http/files.lua
 lib/prosody/net/http/parser.lua
 lib/prosody/net/http/server.lua
-lib/prosody/net/httpserver.lua
 lib/prosody/net/resolvers/basic.lua
 lib/prosody/net/resolvers/chain.lua
 lib/prosody/net/resolvers/manual.lua
@@ -150,6 +161,7 @@ lib/prosody/net/server_epoll.lua
 lib/prosody/net/server_event.lua
 lib/prosody/net/server_select.lua
 lib/prosody/net/stun.lua
+lib/prosody/net/tls_luasec.lua
 lib/prosody/net/unbound.lua
 lib/prosody/net/websocket.lua
 lib/prosody/net/websocket/frames.lua
@@ -179,6 +191,7 @@ lib/prosody/util/error.lua
 lib/prosody/util/events.lua
 lib/prosody/util/filters.lua
 lib/prosody/util/format.lua
+lib/prosody/util/fsm.lua
 lib/prosody/util/gc.lua
 lib/prosody/util/hashes.so
 lib/prosody/util/hashring.lua
@@ -200,11 +213,13 @@ lib/prosody/util/jsonpointer.lua
 lib/prosody/util/jsonschema.lua
 lib/prosody/util/jwt.lua
 lib/prosody/util/logger.lua
+lib/prosody/util/mathcompat.lua
 lib/prosody/util/mercurial.lua
 lib/prosody/util/multitable.lua
 lib/prosody/util/net.so
 lib/prosody/util/openmetrics.lua
 lib/prosody/util/openssl.lua
+lib/prosody/util/paseto.lua
 lib/prosody/util/paths.lua
 lib/prosody/util/pluginloader.lua
 lib/prosody/util/poll.so
@@ -218,12 +233,13 @@ lib/prosody/util/prosodyctl/shell.lua
 lib/prosody/util/pubsub.lua
 lib/prosody/util/queue.lua
 lib/prosody/util/random.lua
-lib/prosody/util/rfc6724.lua
 lib/prosody/util/ringbuffer.so
+lib/prosody/util/roles.lua
 lib/prosody/util/rsm.lua
 lib/prosody/util/sasl.lua
 lib/prosody/util/sasl/anonymous.lua
 lib/prosody/util/sasl/external.lua
+lib/prosody/util/sasl/oauthbearer.lua
 lib/prosody/util/sasl/plain.lua
 lib/prosody/util/sasl/scram.lua
 lib/prosody/util/serialization.lua
@@ -232,6 +248,7 @@ lib/prosody/util/set.lua
 lib/prosody/util/signal.so
 lib/prosody/util/smqueue.lua
 lib/prosody/util/sql.lua
+lib/prosody/util/sqlite3.lua
 lib/prosody/util/sslconfig.lua
 lib/prosody/util/stanza.lua
 lib/prosody/util/startup.lua
@@ -246,7 +263,6 @@ lib/prosody/util/throttle.lua
 lib/prosody/util/time.so
 lib/prosody/util/timer.lua
 lib/prosody/util/uuid.lua
-lib/prosody/util/vcard.lua
 lib/prosody/util/watchdog.lua
 lib/prosody/util/x509.lua
 lib/prosody/util/xml.lua
@@ -259,4 +275,3 @@ share/examples/prosody/certs/localhost.c
 share/examples/prosody/certs/makefile
 share/examples/prosody/certs/openssl.cnf
 share/examples/prosody/prosody.cfg.lua
-@pkgdir var/db/prosody

Index: pkgsrc/chat/prosody/distinfo
diff -u pkgsrc/chat/prosody/distinfo:1.28 pkgsrc/chat/prosody/distinfo:1.29
--- pkgsrc/chat/prosody/distinfo:1.28   Mon Jan 27 13:57:51 2025
+++ pkgsrc/chat/prosody/distinfo        Wed Jul  2 08:36:31 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.28 2025/01/27 13:57:51 adam Exp $
+$NetBSD: distinfo,v 1.29 2025/07/02 08:36:31 sborrill Exp $
 
-BLAKE2s (prosody-0.12.5.tar.gz) = 7df5108347d5b225bf2960d98141a125bc9c75252a832373a76550d7bf6f4b1d
-SHA512 (prosody-0.12.5.tar.gz) = 05b15204849ec285c465784ae43e3b748c4a3cda434b53f700121b518af59e14faea22af4b6bbc0d45f3633ddcaf762f00072fd713744a60d2e9ea8b3b10a7ed
-Size (prosody-0.12.5.tar.gz) = 617833 bytes
+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-util-src_pposix.c) = 519fd2da1931c1b35a0b028ea9303b3c0f5b6a6a
+SHA1 (patch-util-src_pposix.c) = 7e54654382ae4b3ae3acb2a5f9c0a2c64cc27c62

Index: pkgsrc/chat/prosody/patches/patch-util-src_pposix.c
diff -u pkgsrc/chat/prosody/patches/patch-util-src_pposix.c:1.1 pkgsrc/chat/prosody/patches/patch-util-src_pposix.c:1.2
--- pkgsrc/chat/prosody/patches/patch-util-src_pposix.c:1.1     Sun May  8 21:24:12 2022
+++ pkgsrc/chat/prosody/patches/patch-util-src_pposix.c Wed Jul  2 08:36:31 2025
@@ -1,12 +1,19 @@
-$NetBSD: patch-util-src_pposix.c,v 1.1 2022/05/08 21:24:12 khorben Exp $
+$NetBSD: patch-util-src_pposix.c,v 1.2 2025/07/02 08:36:31 sborrill Exp $
 
---- util-src/pposix.c.orig     2022-03-08 12:34:39.594708341 +0000
-+++ util-src/pposix.c
-@@ -38,6 +38,7 @@
+Define _NETBSD_SOURCE for initgroups(), etc.
+
+--- util-src/pposix.c.orig     2025-05-29 16:42:58.718566327 +0100
++++ util-src/pposix.c  2025-07-02 08:57:07.265785615 +0100
+@@ -38,6 +38,12 @@
  #endif
  #endif
  
-+#include <unistd.h>
++#if defined(__NetBSD__)
++#ifndef _NETBSD_SOURCE
++#define _NETBSD_SOURCE
++#endif
++#endif
++
  #include <stdlib.h>
  #include <math.h>
  #include <unistd.h>