From 88bcd1ec167acedb86117b6f0ebeb6a543742590 Mon Sep 17 00:00:00 2001
From: tm <tm@pkgsrc.org>
Date: Sun, 4 Feb 2024 13:49:12 +0000
Subject: [PATCH] prosody: update to 0.12.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary
=======

We’re relieved to announce this overdue maintenance release containing a number of bug fixes and also some improvements from the last few months.

Especially the prosodyctl check tool which gained some new diagnostic checks as well as handling of configuration option types the same way Prosody itself does.

Minor changes
-------------

- core.certmanager: Update Mozilla TLS config to version 5.7
- util.error: Fix error on conversion of invalid error stanza #1805
- util.array: Fix new() library function
- util.array: Expose new() on module table
- prosodyctl: Fix output of error messages containing ‘%’
- util.prosodyctl.check: Correct suggested replacement for ‘disallow_s2s’
- util.prosodyctl.check: Allow same config syntax variants as in Prosody for some options #896
- util.prosodyctl.check: Fix error where hostname can’t be turned into A label
- util.prosodyctl.check: Hint about the ‘external_addresses’ config option
- util.prosodyctl.check: Suggest ‘http_cors_override’ instead of older CORS settings
- util.prosodyctl.check: Validate format of module list options
- mod_websocket: Add a ‘pre-session-close’ event #1800
- mod_smacks: Fix stray watchdog closing sessions
- mod_csi_simple: Disable revert-to-inactive timer when going to active mode
- mod_csi_simple: Clear delayed active mode timer on disable
- mod_admin_shell: Fix display of remote cert status when expired etc
- mod_smacks: Replace existing watchdog when starting hibernation
- mod_http: Fix error if ‘access_control_allow_origins’ is set
- mod_pubsub: Send correct ‘jid’ attribute in disco#items
- mod_http: Unhook CORS handlers only if active to fix an error #1801
- mod_s2s: Add event where resolver for s2sout can be tweaked
---
 chat/prosody/Makefile | 10 +++++-----
 chat/prosody/distinfo |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/chat/prosody/Makefile b/chat/prosody/Makefile
index 5f9cc7504ec4..aa24246ca1d0 100644
--- a/chat/prosody/Makefile
+++ b/chat/prosody/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2023/11/08 13:18:17 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2024/02/04 13:49:12 tm Exp $
 
-DISTNAME=		prosody-0.12.2
-PKGREVISION=		3
+DISTNAME=		prosody-0.12.4
 CATEGORIES=		chat
 MASTER_SITES=		https://prosody.im/downloads/source/
 
@@ -58,14 +57,15 @@ SUBST_VARS.path=	EGDIR PROSODY_DATA PROSODY_LOG PROSODY_RUN
 
 CONFIGURE_ARGS+=	--cflags=${CFLAGS:Q}
 CONFIGURE_ARGS+=	--datadir=${PROSODY_DATA}
-CONFIGURE_ARGS+=	--ldflags="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -shared"
+CONFIGURE_ARGS+=	--ldflags=${LDFLAGS:Q}
 CONFIGURE_ARGS+=	--no-example-certs
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-lua-include=${PREFIX}/${LUA_INCDIR}
 
 CFLAGS+=		-fPIC -Wall -DLUA_COMPAT_MODULE
-MAKE_ENV.SunOS+=	SOCKET_LIB=-lsocket
+LDFLAGS+=		-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -shared
+LDFLAGS.SunOS+=		-lsocket -lnsl
 MAKE_FILE=		makefile
 
 RCD_SCRIPTS=		prosody
diff --git a/chat/prosody/distinfo b/chat/prosody/distinfo
index 026e05fac477..90dab36f1ede 100644
--- a/chat/prosody/distinfo
+++ b/chat/prosody/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.25 2022/12/29 04:16:18 khorben Exp $
+$NetBSD: distinfo,v 1.26 2024/02/04 13:49:12 tm Exp $
 
-BLAKE2s (prosody-0.12.2.tar.gz) = 4c9f545adec09672a8d7c62c960236390b9d5f6747b2975e61e3202a1f64717c
-SHA512 (prosody-0.12.2.tar.gz) = dd14d2740b67127e7edcf79db7d1fd81b4566d4a285430edb9dd7263ad109fdd6e581a1d93fcbf971f73fa5ba051ae7935a121d31e3e7448cacfcd8ecbd802bb
-Size (prosody-0.12.2.tar.gz) = 614303 bytes
+BLAKE2s (prosody-0.12.4.tar.gz) = 84721f5de9ff02efe611d37c20ec98222730fd0e81fe32792962cc072a9686ac
+SHA512 (prosody-0.12.4.tar.gz) = e035ec9af3831c596ababbc0320f352b7253d3ee968c9937998ffc255839173c9278912a0897fa9f0a0665bc43603f8570b5e15dfd1cba4571599e86a98d8cf4
+Size (prosody-0.12.4.tar.gz) = 616043 bytes
 SHA1 (patch-makefile) = 8971d0a898ca7bf38f0d79322e2d0c381334c37c
 SHA1 (patch-prosody.cfg.lua.dist) = a1e4636abe4f2caa82d13ed8564b5b785dc8595a
 SHA1 (patch-util-src_pposix.c) = 519fd2da1931c1b35a0b028ea9303b3c0f5b6a6a