prosody: update to 0.12.0

New in this release:

Modules

* mod_mimicking: Prevent address spoofing
* mod_s2s_bidi: Bi-directional server-to-server connections (XEP-0288)
* mod_external_services: Generic XEP-0215 support
* mod_turn_external: Easy setup of XEP-0215 for STUN/TURN for audio/video calls
* mod_http_file_share: File sharing via HTTP (XEP-0363)
* mod_http_openmetrics: Expose metrics to Prometheus and compatible monitoring systems
* mod_smacks: Stream management and resumption (XEP-0198)
* mod_auth_ldap: LDAP authentication
* mod_cron: One module to rule all the periodic tasks
* mod_admin_shell: New home of the Console admin interface
* mod_admin_socket: Enable secure connections to the Console
* mod_tombstones: Prevent re-registration of deleted accounts
* mod_invites: Create and manage invites
* mod_invites_register: Allow registering accounts using invites
* mod_invites_adhoc: Create invites via ad-hoc command
* mod_bookmarks: Synchronise open rooms between clients

Security and authentication

* Unencrypted HTTP port (5280) restricted to loopback by default
* require_encryption options default to true if unspecified
* Authentication module defaults to internal_hashed if unspecified
* SNI support (including automatic certificate selection)
* ALPN support in mod_net_multiplex
* DANE support in low-level network layer
* Direct TLS support (c2s and s2s)
* SCRAM-SHA-256
* Direct TLS (including https) certificates are now updated on reload
* Pluggable authorization providers (mod_authz_*)
* Easy use of Mozilla TLS recommendations presets

HTTP

* CORS handling now provided by mod_http
* Built-in HTTP server now handles HEAD requests
* Uploads can be handled incrementally

API

* Module statuses (API change)
* util.error for encapsulating errors
* Promise based API for sending queries
* API for adding periodic tasks
* More APIs supporting ES6 Promises
* Async can be used during shutdown

Other

* Plugin installer
* MUC presence broadcast controls
* MUC: support for XEP-0421 occupant identifiers
* prosodyctl check connectivity via observe.jabber.network
* STUN/TURN server tests in prosodyctl check
* libunbound for DNS queries
* The POSIX poll() API used by server_epoll on *nix other than Linux

Changed in this release

* Improved rules for mobile optimizations in mod_csi_simple
* Improved rules for what messages should be archived in mod_mam
* mod_limits: Support for exempt JIDs
* mod_server_contact_info now loaded on components if enabled
* Statistics now based on OpenMetrics
* Statistics scheduling can be done by plugin
* Offline messages aren't sent to MAM clients
* Archive quotas (maximum limit on items in an archive store)
* Rewritten migrator with archive support
* Improved automatic certificate locating and selecting
* Logging to syslog no longer missing startup messages
* Graceful shutdown sequence that closes ports first and waits for connections to close

Removed in this release

* daemonize option deprecated
* SASL DIGEST-MD5 removed
* mod_auth_cyrus (older LDAP support)
* Network backend server_select deprecated (not actually removed yet)

10 files changed, 105 insertions, 204 deletions

diff --git a/chat/prosody/Makefile b/chat/prosody/Makefile
index 8727eb835c0..7ccdb43a9ae 100644
--- a/chat/prosody/Makefile
+++ b/chat/prosody/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2022/05/06 04:02:11 khorben Exp $
+# $NetBSD: Makefile,v 1.37 2022/05/08 21:24:12 khorben Exp $
 
-DISTNAME=		prosody-0.11.13
+DISTNAME=		prosody-0.12.0
 CATEGORIES=		chat
 MASTER_SITES=		https://prosody.im/downloads/source/
 
@@ -13,6 +13,7 @@ DEPENDS+=		${LUA_PKGPREFIX}-expat>=1.2:../../textproc/lua-expat
 DEPENDS+=		${LUA_PKGPREFIX}-filesystem>=1.6.2:../../devel/lua-filesystem
 DEPENDS+=		${LUA_PKGPREFIX}-sec>=0.3.3:../../security/lua-sec
 DEPENDS+=		${LUA_PKGPREFIX}-socket>=2.0:../../net/lua-socket
+DEPENDS+=		${LUA_PKGPREFIX}-unbound-[0-9]*:../../net/lua-unbound
 
 HAS_CONFIGURE=		yes
 USE_LANGUAGES=		c99
@@ -51,8 +52,8 @@ REPLACE_LUA+=		prosody prosodyctl
 SUBST_CLASSES+=		path
 SUBST_MESSAGE.path=	Fixing default paths
 SUBST_STAGE.path=	pre-configure
-SUBST_FILES.path=	makefile man/prosodyctl.man prosody.cfg.lua.dist
-SUBST_SED.path=		-e 's,/etc/prosody,${PKG_SYSCONFDIR},g'
+SUBST_FILES.path=	makefile prosody.cfg.lua.dist
+SUBST_SED.path=		-e 's,$$(CONFIG),$$(DESTDIR)$(EGDIR),g'
 SUBST_VARS.path=	EGDIR PROSODY_DATA PROSODY_LOG PROSODY_RUN
 
 CONFIGURE_ARGS+=	--cflags=${CFLAGS:Q}
@@ -76,4 +77,5 @@ TEST_TARGET=		test
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/prosody/PLIST b/chat/prosody/PLIST
index 84390067250..90c0ecd01b5 100644
--- a/chat/prosody/PLIST
+++ b/chat/prosody/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.12 2022/01/13 14:25:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2022/05/08 21:24:12 khorben Exp $
 bin/prosody
 bin/prosodyctl
 lib/prosody/core/certmanager.lua
 lib/prosody/core/configmanager.lua
+lib/prosody/core/features.lua
 lib/prosody/core/hostmanager.lua
 lib/prosody/core/loggingmanager.lua
 lib/prosody/core/moduleapi.lua
@@ -18,27 +19,38 @@ lib/prosody/core/usermanager.lua
 lib/prosody/modules/adhoc/adhoc.lib.lua
 lib/prosody/modules/adhoc/mod_adhoc.lua
 lib/prosody/modules/mod_admin_adhoc.lua
+lib/prosody/modules/mod_admin_shell.lua
+lib/prosody/modules/mod_admin_socket.lua
 lib/prosody/modules/mod_admin_telnet.lua
 lib/prosody/modules/mod_announce.lua
 lib/prosody/modules/mod_auth_anonymous.lua
-lib/prosody/modules/mod_auth_cyrus.lua
 lib/prosody/modules/mod_auth_insecure.lua
 lib/prosody/modules/mod_auth_internal_hashed.lua
 lib/prosody/modules/mod_auth_internal_plain.lua
+lib/prosody/modules/mod_auth_ldap.lua
+lib/prosody/modules/mod_authz_internal.lua
 lib/prosody/modules/mod_blocklist.lua
+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_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_sql.lua
 lib/prosody/modules/mod_dialback.lua
 lib/prosody/modules/mod_disco.lua
+lib/prosody/modules/mod_external_services.lua
 lib/prosody/modules/mod_groups.lua
 lib/prosody/modules/mod_http.lua
 lib/prosody/modules/mod_http_errors.lua
+lib/prosody/modules/mod_http_file_share.lua
 lib/prosody/modules/mod_http_files.lua
+lib/prosody/modules/mod_http_openmetrics.lua
+lib/prosody/modules/mod_invites.lua
+lib/prosody/modules/mod_invites_adhoc.lua
+lib/prosody/modules/mod_invites_register.lua
 lib/prosody/modules/mod_iq.lua
 lib/prosody/modules/mod_lastactivity.lua
 lib/prosody/modules/mod_legacyauth.lua
@@ -47,6 +59,7 @@ lib/prosody/modules/mod_mam/mamprefs.lib.lua
 lib/prosody/modules/mod_mam/mamprefsxml.lib.lua
 lib/prosody/modules/mod_mam/mod_mam.lua
 lib/prosody/modules/mod_message.lua
+lib/prosody/modules/mod_mimicking.lua
 lib/prosody/modules/mod_motd.lua
 lib/prosody/modules/mod_muc_mam.lua
 lib/prosody/modules/mod_muc_unique.lua
@@ -66,12 +79,13 @@ lib/prosody/modules/mod_register.lua
 lib/prosody/modules/mod_register_ibr.lua
 lib/prosody/modules/mod_register_limits.lua
 lib/prosody/modules/mod_roster.lua
-lib/prosody/modules/mod_s2s/mod_s2s.lua
-lib/prosody/modules/mod_s2s/s2sout.lib.lua
+lib/prosody/modules/mod_s2s.lua
 lib/prosody/modules/mod_s2s_auth_certs.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_smacks.lua
 lib/prosody/modules/mod_stanza_debug.lua
 lib/prosody/modules/mod_storage_internal.lua
 lib/prosody/modules/mod_storage_memory.lua
@@ -80,6 +94,9 @@ lib/prosody/modules/mod_storage_sql.lua
 lib/prosody/modules/mod_storage_xep0227.lua
 lib/prosody/modules/mod_time.lua
 lib/prosody/modules/mod_tls.lua
+lib/prosody/modules/mod_tokenauth.lua
+lib/prosody/modules/mod_tombstones.lua
+lib/prosody/modules/mod_turn_external.lua
 lib/prosody/modules/mod_unknown.lua
 lib/prosody/modules/mod_uptime.lua
 lib/prosody/modules/mod_user_account_management.lua
@@ -93,6 +110,7 @@ lib/prosody/modules/mod_welcome.lua
 lib/prosody/modules/mod_windows.lua
 lib/prosody/modules/muc/config_form_sections.lib.lua
 lib/prosody/modules/muc/description.lib.lua
+lib/prosody/modules/muc/hats.lib.lua
 lib/prosody/modules/muc/hidden.lib.lua
 lib/prosody/modules/muc/history.lib.lua
 lib/prosody/modules/muc/language.lib.lua
@@ -103,8 +121,10 @@ lib/prosody/modules/muc/moderated.lib.lua
 lib/prosody/modules/muc/muc.lib.lua
 lib/prosody/modules/muc/name.lib.lua
 lib/prosody/modules/muc/occupant.lib.lua
+lib/prosody/modules/muc/occupant_id.lib.lua
 lib/prosody/modules/muc/password.lib.lua
 lib/prosody/modules/muc/persistent.lib.lua
+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/subject.lib.lua
@@ -112,47 +132,62 @@ lib/prosody/modules/muc/util.lib.lua
 lib/prosody/modules/muc/whois.lib.lua
 lib/prosody/net/adns.lua
 lib/prosody/net/connect.lua
-lib/prosody/net/connlisteners.lua
 lib/prosody/net/cqueues.lua
 lib/prosody/net/dns.lua
 lib/prosody/net/http.lua
 lib/prosody/net/http/codes.lua
+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
 lib/prosody/net/resolvers/service.lua
 lib/prosody/net/server.lua
 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/unbound.lua
 lib/prosody/net/websocket.lua
 lib/prosody/net/websocket/frames.lua
 lib/prosody/prosody.version
 lib/prosody/util/adhoc.lua
+lib/prosody/util/adminstream.lua
+lib/prosody/util/argparse.lua
 lib/prosody/util/array.lua
 lib/prosody/util/async.lua
+lib/prosody/util/bit53.lua
+lib/prosody/util/bitcompat.lua
 lib/prosody/util/cache.lua
 lib/prosody/util/caps.lua
 lib/prosody/util/compat.so
 lib/prosody/util/dataforms.lua
 lib/prosody/util/datamanager.lua
+lib/prosody/util/datamapper.lua
 lib/prosody/util/datetime.lua
 lib/prosody/util/dbuffer.lua
 lib/prosody/util/debug.lua
 lib/prosody/util/dependencies.lua
+lib/prosody/util/dns.lua
+lib/prosody/util/dnsregistry.lua
 lib/prosody/util/encodings.so
 lib/prosody/util/envload.lua
+lib/prosody/util/error.lua
 lib/prosody/util/events.lua
 lib/prosody/util/filters.lua
 lib/prosody/util/format.lua
 lib/prosody/util/gc.lua
 lib/prosody/util/hashes.so
+lib/prosody/util/hashring.lua
 lib/prosody/util/helpers.lua
 lib/prosody/util/hex.lua
 lib/prosody/util/hmac.lua
 lib/prosody/util/http.lua
+lib/prosody/util/human/io.lua
+lib/prosody/util/human/units.lua
 lib/prosody/util/id.lua
 lib/prosody/util/import.lua
 lib/prosody/util/indexedbheap.lua
@@ -161,10 +196,14 @@ lib/prosody/util/ip.lua
 lib/prosody/util/iterators.lua
 lib/prosody/util/jid.lua
 lib/prosody/util/json.lua
+lib/prosody/util/jsonpointer.lua
+lib/prosody/util/jsonschema.lua
+lib/prosody/util/jwt.lua
 lib/prosody/util/logger.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/paths.lua
 lib/prosody/util/pluginloader.lua
@@ -173,6 +212,9 @@ lib/prosody/util/pposix.so
 lib/prosody/util/presence.lua
 lib/prosody/util/promise.lua
 lib/prosody/util/prosodyctl.lua
+lib/prosody/util/prosodyctl/cert.lua
+lib/prosody/util/prosodyctl/check.lua
+lib/prosody/util/prosodyctl/shell.lua
 lib/prosody/util/pubsub.lua
 lib/prosody/util/queue.lua
 lib/prosody/util/random.lua
@@ -181,15 +223,14 @@ lib/prosody/util/ringbuffer.so
 lib/prosody/util/rsm.lua
 lib/prosody/util/sasl.lua
 lib/prosody/util/sasl/anonymous.lua
-lib/prosody/util/sasl/digest-md5.lua
 lib/prosody/util/sasl/external.lua
 lib/prosody/util/sasl/plain.lua
 lib/prosody/util/sasl/scram.lua
-lib/prosody/util/sasl_cyrus.lua
 lib/prosody/util/serialization.lua
 lib/prosody/util/session.lua
 lib/prosody/util/set.lua
 lib/prosody/util/signal.so
+lib/prosody/util/smqueue.lua
 lib/prosody/util/sql.lua
 lib/prosody/util/sslconfig.lua
 lib/prosody/util/stanza.lua
@@ -197,6 +238,7 @@ lib/prosody/util/startup.lua
 lib/prosody/util/statistics.lua
 lib/prosody/util/statsd.lua
 lib/prosody/util/strbitop.so
+lib/prosody/util/struct.so
 lib/prosody/util/table.so
 lib/prosody/util/template.lua
 lib/prosody/util/termcolours.lua
@@ -210,9 +252,11 @@ lib/prosody/util/x509.lua
 lib/prosody/util/xml.lua
 lib/prosody/util/xmppstream.lua
 lib/prosody/util/xpcall.lua
+lib/prosody/util/xtemplate.lua
 man/man1/prosodyctl.1
 share/examples/prosody/certs/GNUmakefile
 share/examples/prosody/certs/localhost.cnf
 share/examples/prosody/certs/makefile
 share/examples/prosody/certs/openssl.cnf
 share/examples/prosody/prosody.cfg.lua
+@pkgdir var/db/prosody
diff --git a/chat/prosody/distinfo b/chat/prosody/distinfo
index 011b952c28c..5c07475c687 100644
--- a/chat/prosody/distinfo
+++ b/chat/prosody/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.22 2022/05/06 04:02:11 khorben Exp $
+$NetBSD: distinfo,v 1.23 2022/05/08 21:24:12 khorben Exp $
 
-BLAKE2s (prosody-0.11.13.tar.gz) = 82e287e75af462333e447010ddb5524eff4fbe760163f6a3ea371ac2389911c3
-SHA512 (prosody-0.11.13.tar.gz) = 7616785536b7b51767a26963a80c961ef2403609e1e78dda3f88cf68c00d5bb899278c70a22b006b58c36c62cbb1bbd390a9298bad5b8d6524928a1cd5457813
-Size (prosody-0.11.13.tar.gz) = 439816 bytes
-SHA1 (patch-certs_makefile) = 8a3c9640cf01d034a1e8edbfc86fb319f27c875b
-SHA1 (patch-makefile) = d7931c59b043a73d79a3acaf3bbf66c0e78beb88
-SHA1 (patch-prosody.cfg.lua.dist) = e8cc3a467b21bfe606a87beb412cebac71a627a9
-SHA1 (patch-util-src_GNUmakefile) = d64699fb842be5fb963085dcb1edff67cd130161
-SHA1 (patch-util-src_hashes.c) = e955d3ab2d170dce179bee8eed559ba57f825497
-SHA1 (patch-util-src_signal.c) = 2492ccd0a82498a50f76722e0e2036e16eead180
+BLAKE2s (prosody-0.12.0.tar.gz) = 5060b27c828174f3b9a1cca350b584a5767b93d48f8373d61cf1d63e37b7000c
+SHA512 (prosody-0.12.0.tar.gz) = b7144a413a5bc72b1e677504d5ced6583c7399c8334b39b4c9157da60f951300832b34a1d47703a0b217caa4f1d3a0f52ab59cef08b27c6b43e876e1dffca3ce
+Size (prosody-0.12.0.tar.gz) = 610330 bytes
+SHA1 (patch-makefile) = 8971d0a898ca7bf38f0d79322e2d0c381334c37c
+SHA1 (patch-prosody.cfg.lua.dist) = a1e4636abe4f2caa82d13ed8564b5b785dc8595a
+SHA1 (patch-util-src_pposix.c) = 519fd2da1931c1b35a0b028ea9303b3c0f5b6a6a
diff --git a/chat/prosody/patches/patch-certs_makefile b/chat/prosody/patches/patch-certs_makefile
deleted file mode 100644
index 60f95cfc815..00000000000
--- a/chat/prosody/patches/patch-certs_makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-certs_makefile,v 1.1 2020/03/09 19:37:20 khorben Exp $
-
-Also generate localhost.cnf
-
---- certs/makefile.orig	2020-01-02 09:49:37.000000000 +0000
-+++ certs/makefile
-@@ -12,7 +12,12 @@ keysize=2048
- # to generate a self signed certificate.
- 
- ${.TARGETS:M*.crt}: 
-+	$(MAKE) ${.TARGET:R}.cnf
- 	openssl req -new -x509 -newkey rsa:$(keysize) -nodes -keyout ${.TARGET:R}.key \
- 		-days 365 -sha256 -out $@ -utf8 -subj /CN=${.TARGET:R}
- 
-+# Generate a config from the example
-+${.TARGETS:M*.cnf}:
-+	sed 's,example\.com,$*,g' openssl.cnf > $@
-+
- .SUFFIXES: .key .crt
diff --git a/chat/prosody/patches/patch-makefile b/chat/prosody/patches/patch-makefile
index 69a79dacf3a..1ce4971485c 100644
--- a/chat/prosody/patches/patch-makefile
+++ b/chat/prosody/patches/patch-makefile
@@ -1,101 +1,35 @@
-$NetBSD: patch-makefile,v 1.1 2020/03/09 19:37:20 khorben Exp $
+$NetBSD: patch-makefile,v 1.2 2022/05/08 21:24:12 khorben Exp $
 
 Fix installation directories and scripts
 
---- makefile.orig	2020-01-02 09:49:37.000000000 +0000
+--- makefile.orig	2022-03-08 12:34:39.594708341 +0000
 +++ makefile
-@@ -3,10 +3,11 @@ include config.unix
- 
- BIN = $(DESTDIR)$(PREFIX)/bin
- CONFIG = $(DESTDIR)$(SYSCONFDIR)
-+EGDIR = $(DESTDIR)@EGDIR@
+@@ -6,7 +6,7 @@ CONFIG = $(DESTDIR)$(SYSCONFDIR)
  MODULES = $(DESTDIR)$(LIBDIR)/prosody/modules
  SOURCE = $(DESTDIR)$(LIBDIR)/prosody
  DATA = $(DESTDIR)$(DATADIR)
 -MAN = $(DESTDIR)$(PREFIX)/share/man
-+MAN = $(DESTDIR)$(PREFIX)/$(PKGMANDIR)
++MAN = $(DESTDIR)$(PREFIX)/man
  
  INSTALLEDSOURCE = $(LIBDIR)/prosody
  INSTALLEDCONFIG = $(SYSCONFDIR)
-@@ -28,37 +29,52 @@ all: prosody.install prosodyctl.install 
- .endif
- 
- install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodings.so util/encodings.so util/pposix.so util/signal.so
--	$(MKDIR) $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
--	$(MKDIR_PRIVATE) $(DATA)
--	$(MKDIR) $(MAN)/man1
--	$(MKDIR) $(CONFIG)/certs
--	$(MKDIR) $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
--	$(INSTALL_EXEC) ./prosody.install $(BIN)/prosody
--	$(INSTALL_EXEC) ./prosodyctl.install $(BIN)/prosodyctl
--	$(INSTALL_DATA) core/*.lua $(SOURCE)/core
--	$(INSTALL_DATA) net/*.lua $(SOURCE)/net
--	$(MKDIR) $(SOURCE)/net/http $(SOURCE)/net/resolvers $(SOURCE)/net/websocket
--	$(INSTALL_DATA) net/http/*.lua $(SOURCE)/net/http
--	$(INSTALL_DATA) net/resolvers/*.lua $(SOURCE)/net/resolvers
--	$(INSTALL_DATA) net/websocket/*.lua $(SOURCE)/net/websocket
--	$(INSTALL_DATA) util/*.lua $(SOURCE)/util
--	$(INSTALL_DATA) util/*.so $(SOURCE)/util
--	$(MKDIR) $(SOURCE)/util/sasl
--	$(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl
--	$(MKDIR) $(MODULES)/mod_s2s $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam
--	$(INSTALL_DATA) plugins/*.lua $(MODULES)
--	$(INSTALL_DATA) plugins/mod_s2s/*.lua $(MODULES)/mod_s2s
--	$(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub
--	$(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc
--	$(INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc
--	$(INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam
-+	$(BSD_INSTALL_SCRIPT_DIR) $(BIN)
-+	$(BSD_INSTALL_DATA_DIR) $(EGDIR)
-+	$(BSD_INSTALL_DATA_DIR) $(MODULES)
-+	$(BSD_INSTALL_DATA_DIR) $(SOURCE)
-+	$(BSD_INSTALL_DATA_DIR) -m 750 $(DATA)
-+	$(BSD_INSTALL_MAN_DIR) $(MAN)/man1
-+	$(BSD_INSTALL_SCRIPT) ./prosody.install $(BIN)/prosody
-+	$(BSD_INSTALL_SCRIPT) ./prosodyctl.install $(BIN)/prosodyctl
-+	$(BSD_INSTALL_LIB_DIR) $(SOURCE)/core
-+	$(BSD_INSTALL_DATA) core/*.lua $(SOURCE)/core
-+	$(BSD_INSTALL_LIB_DIR) $(SOURCE)/net
-+	$(BSD_INSTALL_DATA) net/*.lua $(SOURCE)/net
-+	$(BSD_INSTALL_LIB_DIR) $(SOURCE)/net/http
-+	$(BSD_INSTALL_DATA) net/http/*.lua $(SOURCE)/net/http
-+	$(BSD_INSTALL_LIB_DIR) $(SOURCE)/net/resolvers
-+	$(BSD_INSTALL_DATA) net/resolvers/*.lua $(SOURCE)/net/resolvers
-+	$(BSD_INSTALL_LIB_DIR) $(SOURCE)/net/websocket
-+	$(BSD_INSTALL_DATA) net/websocket/*.lua $(SOURCE)/net/websocket
-+	$(BSD_INSTALL_LIB_DIR) $(SOURCE)/util
-+	$(BSD_INSTALL_DATA) util/*.lua $(SOURCE)/util
-+	$(BSD_INSTALL_LIB) util/*.so $(SOURCE)/util
-+	$(BSD_INSTALL_LIB_DIR) $(SOURCE)/util/sasl
-+	$(BSD_INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl
-+	$(BSD_INSTALL_LIB_DIR) $(MODULES)
-+	$(BSD_INSTALL_DATA) plugins/*.lua $(MODULES)
-+	$(BSD_INSTALL_LIB_DIR) $(MODULES)/mod_s2s
-+	$(BSD_INSTALL_DATA) plugins/mod_s2s/*.lua $(MODULES)/mod_s2s
-+	$(BSD_INSTALL_LIB_DIR) $(MODULES)/mod_pubsub
-+	$(BSD_INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub
-+	$(BSD_INSTALL_DATA_DIR) $(EGDIR)/certs
-+	$(BSD_INSTALL_DATA) certs/*.cnf $(EGDIR)/certs
-+	$(BSD_INSTALL_DATA) certs/*makefile $(EGDIR)/certs
-+	$(BSD_INSTALL_LIB_DIR) $(MODULES)/adhoc
-+	$(BSD_INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc
-+	$(BSD_INSTALL_LIB_DIR) $(MODULES)/muc
-+	$(BSD_INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc
-+	$(BSD_INSTALL_LIB_DIR) $(MODULES)/mod_mam
-+	$(BSD_INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam
- .if $(EXCERTS) == "yes"
--	$(INSTALL_DATA) certs/localhost.crt certs/localhost.key $(CONFIG)/certs
--	$(INSTALL_DATA) certs/example.com.crt certs/example.com.key $(CONFIG)/certs
-+	$(BSD_INSTALL_DATA_DIR) $(EGDIR)/certs
-+	$(BSD_INSTALL_DATA) certs/localhost.crt certs/localhost.key $(EGDIR)/certs
-+	$(BSD_INSTALL_DATA) certs/example.com.crt certs/example.com.key $(EGDIR)/certs
- .endif
--	$(INSTALL_DATA) man/prosodyctl.man $(MAN)/man1/prosodyctl.1
+@@ -33,7 +33,9 @@ all: prosody.install prosodyctl.install 
+ install-etc: prosody.cfg.lua.install
+ 	$(MKDIR) $(CONFIG)
+ 	$(MKDIR) $(CONFIG)/certs
 -	test -f $(CONFIG)/prosody.cfg.lua || $(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
--	-test -f prosody.version && $(INSTALL_DATA) prosody.version $(SOURCE)/prosody.version
-+	$(BSD_INSTALL_MAN) man/prosodyctl.man $(MAN)/man1/prosodyctl.1
-+	test -f $(CONFIG)/prosody.cfg.lua || $(BSD_INSTALL_DATA) prosody.cfg.lua.install $(EGDIR)/prosody.cfg.lua
-+	-test -f prosody.version && $(BSD_INSTALL_DATA) prosody.version $(SOURCE)/prosody.version
++	$(INSTALL_DATA) certs/GNUmakefile certs/localhost.cnf $(CONFIG)/certs
++	$(INSTALL_DATA) certs/makefile certs/openssl.cnf $(CONFIG)/certs
++	$(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
+ .if $(EXCERTS) == "yes"
+ 	$(INSTALL_DATA) certs/localhost.crt certs/localhost.key $(CONFIG)/certs
+ 	$(INSTALL_DATA) certs/example.com.crt certs/example.com.key $(CONFIG)/certs
+@@ -63,7 +65,7 @@ install-util: util/encodings.so util/enc
+ 	$(MKDIR) $(SOURCE)/util
+ 	$(INSTALL_DATA) util/*.lua $(SOURCE)/util
  	$(MAKE) install -C util-src
- 
- clean:
+-	$(INSTALL_DATA) util/*.so $(SOURCE)/util
++	$(INSTALL_EXEC) util/*.so $(SOURCE)/util
+ 	$(MKDIR) $(SOURCE)/util/sasl
+ 	$(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl
+ 	$(MKDIR) $(SOURCE)/util/human
diff --git a/chat/prosody/patches/patch-prosody.cfg.lua.dist b/chat/prosody/patches/patch-prosody.cfg.lua.dist
index c63084cc19c..1e6b48bb505 100644
--- a/chat/prosody/patches/patch-prosody.cfg.lua.dist
+++ b/chat/prosody/patches/patch-prosody.cfg.lua.dist
@@ -1,11 +1,11 @@
-$NetBSD: patch-prosody.cfg.lua.dist,v 1.1 2020/01/23 18:26:15 gdt Exp $
+$NetBSD: patch-prosody.cfg.lua.dist,v 1.2 2022/05/08 21:24:12 khorben Exp $
 
 set the logging paths
 set up the pid files
 
---- prosody.cfg.lua.dist.orig	2019-08-31 14:08:45.000000000 +0000
+--- prosody.cfg.lua.dist.orig	2022-03-08 12:34:39.594708341 +0000
 +++ prosody.cfg.lua.dist
-@@ -153,12 +153,13 @@ archive_expires_after = "1w" -- Remove a
+@@ -183,8 +183,8 @@ archive_expires_after = "1w" -- Remove a
  -- Logging configuration
  -- For advanced logging see https://prosody.im/doc/logging
  log = {
@@ -14,16 +14,11 @@ set up the pid files
 +	info = "@PROSODY_LOG@/prosody.log"; -- Change 'info' to 'debug' for verbose logging
 +	error = "@PROSODY_LOG@/prosody.err";
  	-- "*syslog"; -- Uncomment this for logging to syslog
- 	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
+ 	-- "*console"; -- Log to the console, useful for debugging when running in the foreground
  }
- 
-+
- -- Uncomment to enable statistics
- -- For more info see https://prosody.im/doc/statistics
- -- statistics = "internal"
-@@ -176,6 +177,9 @@ certificates = "certs"
- -- HTTPS currently only supports a single certificate, specify it here:
- --https_certificate = "certs/localhost.crt"
+@@ -205,6 +205,9 @@ 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";
diff --git a/chat/prosody/patches/patch-util-src_GNUmakefile b/chat/prosody/patches/patch-util-src_GNUmakefile
deleted file mode 100644
index 9b6524dece0..00000000000
--- a/chat/prosody/patches/patch-util-src_GNUmakefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-util-src_GNUmakefile,v 1.1 2020/01/23 18:26:15 gdt Exp $
-
-We need libsocket on SunOS at least, for getifaddrs.
-
---- util-src/GNUmakefile.orig	2019-08-31 14:08:45.000000000 +0000
-+++ util-src/GNUmakefile
-@@ -28,6 +28,8 @@ encodings.so: LDLIBS+=$(IDNA_LIBS)
- 
- hashes.so: LDLIBS+=$(OPENSSL_LIBS)
- 
-+net.so: LDLIBS+=$(SOCKET_LIB)
-+
- crand.o: CFLAGS+=-DWITH_$(RANDOM)
- crand.so: LDLIBS+=$(RANDOM_LIBS)
- 
diff --git a/chat/prosody/patches/patch-util-src_hashes.c b/chat/prosody/patches/patch-util-src_hashes.c
deleted file mode 100644
index ad0baa8c0c7..00000000000
--- a/chat/prosody/patches/patch-util-src_hashes.c
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-util-src_hashes.c,v 1.3 2020/01/23 18:26:15 gdt Exp $
-
-Avoid conflict with NetBSD's hmac.
-
---- util-src/hashes.c.orig	2019-08-31 14:08:45.000000000 +0000
-+++ util-src/hashes.c
-@@ -75,7 +75,7 @@ struct hash_desc {
- 	void *ctx, *ctxo;
- };
- 
--static void hmac(struct hash_desc *desc, const char *key, size_t key_len,
-+static void myhmac(struct hash_desc *desc, const char *key, size_t key_len,
-                  const char *msg, size_t msg_len, unsigned char *result) {
- 	union xory {
- 		unsigned char bytes[64];
-@@ -168,14 +168,14 @@ static int LscramHi(lua_State *L) {
- 
- 	memcpy(salt2, salt, salt_len);
- 	memcpy(salt2 + salt_len, "\0\0\0\1", 4);
--	hmac(&desc, str, str_len, salt2, salt_len + 4, Ust);
-+	myhmac(&desc, str, str_len, salt2, salt_len + 4, Ust);
- 	free(salt2);
- 
- 	memcpy(res.bytes, Ust, sizeof(res));
- 
- 	for(i = 1; i < iter; i++) {
- 		int j;
--		hmac(&desc, str, str_len, (char *)Ust, sizeof(Ust), Und.bytes);
-+		myhmac(&desc, str, str_len, (char *)Ust, sizeof(Ust), Und.bytes);
- 
- 		for(j = 0; j < SHA_DIGEST_LENGTH / 4; j++) {
- 			res.quadbytes[j] ^= Und.quadbytes[j];
diff --git a/chat/prosody/patches/patch-util-src_pposix.c b/chat/prosody/patches/patch-util-src_pposix.c
new file mode 100644
index 00000000000..73981bc4144
--- /dev/null
+++ b/chat/prosody/patches/patch-util-src_pposix.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-util-src_pposix.c,v 1.1 2022/05/08 21:24:12 khorben Exp $
+
+--- util-src/pposix.c.orig	2022-03-08 12:34:39.594708341 +0000
++++ util-src/pposix.c
+@@ -38,6 +38,7 @@
+ #endif
+ #endif
+ 
++#include <unistd.h>
+ #include <stdlib.h>
+ #include <math.h>
+ #include <unistd.h>
diff --git a/chat/prosody/patches/patch-util-src_signal.c b/chat/prosody/patches/patch-util-src_signal.c
deleted file mode 100644
index 911a84b7542..00000000000
--- a/chat/prosody/patches/patch-util-src_signal.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-util-src_signal.c,v 1.1 2020/01/23 18:26:15 gdt Exp $
-
-Include <sys/param.h> when on UNIX
-
---- util-src/signal.c.orig	2019-08-31 14:08:45.000000000 +0000
-+++ util-src/signal.c
-@@ -33,6 +33,10 @@
- #include <signal.h>
- #include <stdlib.h>
- 
-+#ifdef __unix__
-+#include <sys/param.h>
-+#endif
-+
- #include "lua.h"
- #include "lauxlib.h"
-