net-im/prosody: Update to 0.12.0

PR:	262667

net-im/prosody/Makefile

@@ -1,7 +1,7 @@
 # Created by: Andrew Lewis <freeghb@gmail.com>
 
 PORTNAME=	prosody
-PORTVERSION=	0.11.13
+PORTVERSION=	0.12.0
 CATEGORIES=	net-im
 MASTER_SITES=	https://prosody.im/downloads/source/
 
@@ -11,14 +11,18 @@ COMMENT=	Simple extensible XMPP server written in Lua
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LUA_REFMODLIBDIR}/socket/core.so:net/luasocket@${LUA_FLAVOR} \
+LIB_DEPENDS=	libicudata.so:devel/icu \
-		${LUA_REFMODLIBDIR}/ssl.so:security/luasec@${LUA_FLAVOR} \
+		libicui18n.so:devel/icu \
-		${LUA_REFMODLIBDIR}/lxp.so:textproc/luaexpat@${LUA_FLAVOR} \
+		libicuuc.so:devel/icu
+RUN_DEPENDS=	${LUA_REFMODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \
 		${LUA_REFMODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR} \
-		${LUA_REFMODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR}
+		${LUA_REFMODLIBDIR}/luaevent/core.so:devel/lua-libevent@${LUA_FLAVOR} \
-LIB_DEPENDS=	libidn.so:dns/libidn
+		${LUA_REFMODLIBDIR}/lunbound.so:dns/luaunbound@${LUA_FLAVOR} \
+		${LUA_REFMODLIBDIR}/lxp.so:textproc/luaexpat@${LUA_FLAVOR} \
+		${LUA_REFMODLIBDIR}/socket/core.so:net/luasocket@${LUA_FLAVOR} \
+		${LUA_REFMODLIBDIR}/ssl.so:security/luasec@${LUA_FLAVOR}
 
-USES=		cpe gmake lua:52 shebangfix ssl
+USES=		cpe gmake lua:54 shebangfix ssl
 SHEBANG_FILES=	prosody prosodyctl tools/migration/prosody-migrator.lua
 LUA_PREMK=	yes
 HAS_CONFIGURE=	yes
@@ -47,6 +51,7 @@ SUB_LIST=	USERS=${USERS} GROUPS=${GROUPS} LUA_PREFIX=${LUA_PREFIX} LUA_CMD=${LUA
 PLIST_SUB=	PROSODY_USER=${USERS} PROSODY_GROUP=${GROUPS}
 
 post-install:
+	@${REINPLACE_CMD} -e "s|\"luarocks |\"luarocks${LUA_VER_STR} |" ${STAGEDIR}${PREFIX}/lib/prosody/util/prosodyctl.lua
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/prosody/util/*.so
 	@${MKDIR} ${STAGEDIR}/var/run/prosody
 	@${RM} ${STAGEDIR}${ETCDIR}/certs/*

net-im/prosody/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1643063257
+TIMESTAMP = 1647297087
-SHA256 (prosody-0.11.13.tar.gz) = 39c61b346a09b5125b604cb969e14206cbbcb86c81156ffc6ba2d62527cf0432
+SHA256 (prosody-0.12.0.tar.gz) = 752ff32015dac565fc3417c2196af268971c358ee066e51f5d912413580d889a
-SIZE (prosody-0.11.13.tar.gz) = 439816
+SIZE (prosody-0.12.0.tar.gz) = 610330

net-im/prosody/files/patch-GNUmakefile

@@ -1,4 +1,4 @@
---- GNUmakefile.orig	2020-01-02 09:49:37 UTC
+--- GNUmakefile.orig	2022-03-08 12:34:39 UTC
 +++ GNUmakefile
 @@ -6,7 +6,7 @@ CONFIG = $(DESTDIR)$(SYSCONFDIR)
  MODULES = $(DESTDIR)$(LIBDIR)/prosody/modules
@@ -9,15 +9,20 @@
  
  INSTALLEDSOURCE = $(LIBDIR)/prosody
  INSTALLEDCONFIG = $(SYSCONFDIR)
-@@ -57,9 +57,10 @@ install: prosody.install prosodyctl.install prosody.cf
+@@ -35,7 +35,7 @@ install-etc: prosody.cfg.lua.install
- 	$(INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam
+ 	$(MKDIR) $(CONFIG)
+ 	$(MKDIR) $(CONFIG)/certs
  	$(INSTALL_DATA) certs/* $(CONFIG)/certs
- 	$(INSTALL_DATA) man/prosodyctl.man $(MAN)/man1/prosodyctl.1
 -	test -f $(CONFIG)/prosody.cfg.lua || $(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
 +	$(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua.sample
- 	-test -f prosody.version && $(INSTALL_DATA) prosody.version $(SOURCE)/prosody.version
+ 
- 	$(MAKE) install -C util-src
+ install-bin: prosody.install prosodyctl.install
-+	$(MAKE) install -C tools/migration
+ 	$(MKDIR) $(BIN)
+@@ -89,6 +89,7 @@ install-data:
+ 	$(MKDIR_PRIVATE) $(DATA)
+ 
+ install: install-util install-net install-core install-plugins install-bin install-etc install-man install-meta install-data
++	$(MAKE) -C tools/migration install
  
  clean:
  	rm -f prosody.install

net-im/prosody/files/patch-tools_migration_Makefile

@@ -1,4 +1,4 @@
---- tools/migration/Makefile.orig	2020-01-02 09:49:37 UTC
+--- tools/migration/Makefile.orig	2022-03-08 12:34:39 UTC
 +++ tools/migration/Makefile
 @@ -5,7 +5,7 @@ BIN = $(DESTDIR)$(PREFIX)/bin
  CONFIG = $(DESTDIR)$(SYSCONFDIR)
@@ -9,10 +9,10 @@
  
  INSTALLEDSOURCE = $(LIBDIR)/prosody
  INSTALLEDCONFIG = $(SYSCONFDIR)
-@@ -22,14 +22,14 @@ install: prosody-migrator.install migrator.cfg.lua.ins
+@@ -18,14 +18,14 @@ install: prosody-migrator.install migrator.cfg.lua.ins
- 	install -d $(SOURCE)/migrator
+ 	install -d $(BIN) $(CONFIG) $(SOURCE)
+ 	install -d $(MAN)/man1
  	install -m755 ./prosody-migrator.install $(BIN)/prosody-migrator
- 	install -m644 $(SOURCE_FILES) $(SOURCE)/migrator
 -	test -e $(CONFIG)/migrator.cfg.lua || install -m644 migrator.cfg.lua.install $(CONFIG)/migrator.cfg.lua
 +	install -m644 migrator.cfg.lua.install $(CONFIG)/migrator.cfg.lua.sample
  
@@ -24,5 +24,5 @@
 -	sed "1s/\blua\b/$(RUNWITH)/; \
 +	sed "1s/ lua$$/ $(RUNWITH)/; \
  		s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \
- 		s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|;" \
+ 		s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|; \
- 			< prosody-migrator.lua > prosody-migrator.install
+ 		s|^CFG_DATADIR=.*;$$|CFG_DATADIR='$(INSTALLEDDATA)';|; \

net-im/prosody/files/patch-util-src_pposix.c

@@ -1,12 +0,0 @@
---- util-src/pposix.c.orig	2021-08-03 09:53:04 UTC
-+++ util-src/pposix.c
-@@ -30,9 +30,6 @@
- #define _DARWIN_C_SOURCE
- #endif
- #endif
--#ifndef _POSIX_C_SOURCE
--#define _POSIX_C_SOURCE 200809L
--#endif
- 
- #include <stdlib.h>
- #include <math.h>

net-im/prosody/files/patch-util-src_time.c

@@ -1,10 +0,0 @@
---- util-src/time.c.orig	2021-08-03 09:53:04 UTC
-+++ util-src/time.c
-@@ -1,7 +1,3 @@
--#ifndef _POSIX_C_SOURCE
--#define _POSIX_C_SOURCE 199309L
--#endif
--
- #include <time.h>
- #include <lua.h>
- 

net-im/prosody/pkg-plist

@@ -6,6 +6,7 @@ bin/prosody-migrator
 @sample %%ETCDIR%%/prosody.cfg.lua.sample
 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,34 +19,41 @@ lib/prosody/core/stanza_router.lua
 lib/prosody/core/statsmanager.lua
 lib/prosody/core/storagemanager.lua
 lib/prosody/core/usermanager.lua
-lib/prosody/migrator/jabberd14.lua
-lib/prosody/migrator/mtools.lua
-lib/prosody/migrator/prosody_files.lua
-lib/prosody/migrator/prosody_sql.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
@@ -54,6 +62,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
@@ -73,12 +82,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.lua
-lib/prosody/modules/mod_s2s/s2sout.lib.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
@@ -87,6 +97,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
@@ -100,6 +113,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
@@ -110,8 +124,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
@@ -119,48 +135,63 @@ 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/crand.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
@@ -169,10 +200,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
@@ -181,6 +216,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
@@ -189,15 +227,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
@@ -205,6 +242,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
@@ -218,6 +256,7 @@ 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.gz
 @dir(%%PROSODY_USER%%,%%PROSODY_GROUP%%,) /var/db/prosody
 @dir(%%PROSODY_USER%%,%%PROSODY_GROUP%%,) /var/run/prosody