chat/prosody: Update to 0.11.4

Update prepared in wip by Tiago Seco.

Changes in 0.11.4
=================

Fixes and improvements

    core.rostermanager: Improve performance by caching rosters of offline #1233
    mod_pep: Handling subscriptions more efficiently #1372

Minor changes

    util.interpolation: Support unescaped variables with more modifiers #1452
    MUC: Mark source of historic messages correctly #1416
    mod_auth_internal_hashed: Pass on errors #1477
    mod_mam, mod_muc_mam: Improve logging of failures #1478, #1480, #1481
    mod_muc, mod_muc_mam: Reschedule message expiry in case of failure
    mod_mam: Add flag to session when it performs a MAM query
    prosodyctl check: Warn about conflict between mod_pep and mod_pep_simple
    prosodyctl check: Warn about conflict between mod_vcard and mod_vcard_legacy #1469
    core.modulemanager: Disable mod_vcard if mod_vcard_legacy is enabled to prevent conflict #1469
    MUC: Strip tags with MUC-related namespaces from private messages #1427
    MUC: Don't advertise registration feature on host #1451
    mod_vcard_legacy: Fix handling of empty photo elements #1432
    mod_vcard_legacy: Advertise lack of avatar correctly #1431
    prosodyctl: Handle if the setting proxy65_address has the wrong type
    prosodyctl: Print a blank line to improve spacing and readability
    MUC: Fix role loss in Nickname change #1466
    util.pposix: Fix reporting of memory usage in 2-4GB range #1445
    util.startup: Fix a regression concerning directory paths #1430
    mod_websocket: Don't mask WebSocket pong answers #1484
    net.resolvers: Apply IDNA conversion to ascii for DNS lookups (affects only HTTP queries) #1426
    net.resolvers.basic: Fix resolution of IPv6 literals (in brackets) #1459

9 files changed, 111 insertions, 55 deletions

diff --git a/chat/prosody/DESCR b/chat/prosody/DESCR
index 66ae434a177..3d2e77ed6bf 100644
--- a/chat/prosody/DESCR
+++ b/chat/prosody/DESCR
@@ -2,3 +2,5 @@ Prosody is a flexible communications server for Jabber/XMPP written in Lua.
 It aims to be easy to use, and light on resources. For developers it aims
 to be easy to extend and give a flexible system on which to rapidly develop
 added functionality, or prototype new protocols.
+
+List of supported XEPs: https://prosody.im/doc/xeplist
diff --git a/chat/prosody/Makefile b/chat/prosody/Makefile
index 6b8467b4b4a..44238c6a58d 100644
--- a/chat/prosody/Makefile
+++ b/chat/prosody/Makefile
@@ -1,23 +1,22 @@
-# $NetBSD: Makefile,v 1.30 2020/01/18 21:48:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.31 2020/01/23 18:26:15 gdt Exp $
 #
 
-DISTNAME=		prosody-0.10.0
-PKGREVISION=		1
+DISTNAME=		prosody-0.11.4
 CATEGORIES=		chat
-MASTER_SITES=		http://prosody.im/downloads/source/
+MASTER_SITES=		https://prosody.im/downloads/source/
 
 MAINTAINER=		fhajny@NetBSD.org
-HOMEPAGE=		http://prosody.im/
+HOMEPAGE=		https://prosody.im/
 COMMENT=		Flexible communications server for Jabber/XMPP written in Lua
 LICENSE=		mit
 
 DEPENDS+=		${LUA_PKGPREFIX}-expat>=1.2:../../textproc/lua-expat
-DEPENDS+=		${LUA_PKGPREFIX}-filesystem>=1.0:../../devel/lua-filesystem
+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
 
 HAS_CONFIGURE=		yes
-USE_LANGUAGES+=		c c99
+USE_LANGUAGES=		c99
 USE_TOOLS+=		gmake
 BUILD_DEFS+=		VARBASE
 
@@ -54,7 +53,7 @@ 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_FILES.path=	GNUmakefile man/prosodyctl.man prosody.cfg.lua.dist
 SUBST_SED.path=		-e 's,/etc/prosody,${PKG_SYSCONFDIR},g'
 SUBST_VARS.path=	EGDIR PROSODY_DATA PROSODY_LOG PROSODY_RUN
 
@@ -68,6 +67,7 @@ CONFIGURE_ARGS+=	--with-lua-include=${PREFIX}/${LUA_INCDIR}
 
 CFLAGS+=		-fPIC -Wall -DLUA_COMPAT_MODULE
 MAKE_ENV.SunOS+=	SOCKET_LIB=-lsocket
+MAKE_FILE=		GNUmakefile
 
 RCD_SCRIPTS=		prosody
 
diff --git a/chat/prosody/PLIST b/chat/prosody/PLIST
index f6ac17763b1..4680bbe1058 100644
--- a/chat/prosody/PLIST
+++ b/chat/prosody/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2017/11/23 22:06:15 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.10 2020/01/23 18:26:15 gdt Exp $
 bin/prosody
 bin/prosodyctl
 lib/prosody/core/certmanager.lua
@@ -22,6 +22,7 @@ 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_blocklist.lua
@@ -29,7 +30,8 @@ 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_compression.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
@@ -43,56 +45,92 @@ lib/prosody/modules/mod_legacyauth.lua
 lib/prosody/modules/mod_limits.lua
 lib/prosody/modules/mod_message.lua
 lib/prosody/modules/mod_motd.lua
+lib/prosody/modules/mod_muc_mam.lua
+lib/prosody/modules/mod_muc_unique.lua
 lib/prosody/modules/mod_net_multiplex.lua
 lib/prosody/modules/mod_offline.lua
 lib/prosody/modules/mod_pep.lua
+lib/prosody/modules/mod_pep_plus.lua
+lib/prosody/modules/mod_pep_simple.lua
 lib/prosody/modules/mod_ping.lua
 lib/prosody/modules/mod_posix.lua
 lib/prosody/modules/mod_presence.lua
-lib/prosody/modules/mod_privacy.lua
 lib/prosody/modules/mod_private.lua
 lib/prosody/modules/mod_proxy65.lua
 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_auth_certs.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_stanza_debug.lua
 lib/prosody/modules/mod_storage_internal.lua
+lib/prosody/modules/mod_storage_memory.lua
 lib/prosody/modules/mod_storage_none.lua
 lib/prosody/modules/mod_storage_sql.lua
-lib/prosody/modules/mod_storage_sql1.lua
 lib/prosody/modules/mod_storage_xep0227.lua
 lib/prosody/modules/mod_time.lua
 lib/prosody/modules/mod_tls.lua
 lib/prosody/modules/mod_unknown.lua
 lib/prosody/modules/mod_uptime.lua
+lib/prosody/modules/mod_user_account_management.lua
 lib/prosody/modules/mod_vcard.lua
+lib/prosody/modules/mod_vcard4.lua
+lib/prosody/modules/mod_vcard_legacy.lua
 lib/prosody/modules/mod_version.lua
 lib/prosody/modules/mod_watchregistrations.lua
 lib/prosody/modules/mod_websocket.lua
 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/hidden.lib.lua
+lib/prosody/modules/muc/history.lib.lua
+lib/prosody/modules/muc/language.lib.lua
+lib/prosody/modules/muc/lock.lib.lua
+lib/prosody/modules/muc/members_only.lib.lua
 lib/prosody/modules/muc/mod_muc.lua
+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/password.lib.lua
+lib/prosody/modules/muc/persistent.lib.lua
+lib/prosody/modules/muc/register.lib.lua
+lib/prosody/modules/muc/request.lib.lua
+lib/prosody/modules/muc/subject.lib.lua
+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/parser.lua
 lib/prosody/net/http/server.lua
 lib/prosody/net/httpserver.lua
+lib/prosody/net/resolvers/basic.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/websocket.lua
+lib/prosody/net/websocket/frames.lua
 lib/prosody/prosody.version
 lib/prosody/util/adhoc.lua
 lib/prosody/util/array.lua
+lib/prosody/util/async.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/datetime.lua
@@ -110,6 +148,7 @@ lib/prosody/util/hmac.lua
 lib/prosody/util/http.lua
 lib/prosody/util/id.lua
 lib/prosody/util/import.lua
+lib/prosody/util/indexedbheap.lua
 lib/prosody/util/interpolation.lua
 lib/prosody/util/ip.lua
 lib/prosody/util/iterators.lua
@@ -122,8 +161,10 @@ lib/prosody/util/net.so
 lib/prosody/util/openssl.lua
 lib/prosody/util/paths.lua
 lib/prosody/util/pluginloader.lua
+lib/prosody/util/poll.so
 lib/prosody/util/pposix.so
 lib/prosody/util/presence.lua
+lib/prosody/util/promise.lua
 lib/prosody/util/prosodyctl.lua
 lib/prosody/util/pubsub.lua
 lib/prosody/util/queue.lua
@@ -145,22 +186,26 @@ lib/prosody/util/signal.so
 lib/prosody/util/sql.lua
 lib/prosody/util/sslconfig.lua
 lib/prosody/util/stanza.lua
+lib/prosody/util/startup.lua
 lib/prosody/util/statistics.lua
 lib/prosody/util/statsd.lua
 lib/prosody/util/table.so
 lib/prosody/util/template.lua
 lib/prosody/util/termcolours.lua
 lib/prosody/util/throttle.lua
-lib/prosody/util/time.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
 lib/prosody/util/xmppstream.lua
+lib/prosody/util/xpcall.lua
 man/man1/prosodyctl.1
-share/examples/prosody/certs/Makefile
+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 lib/prosody/modules/storage
diff --git a/chat/prosody/distinfo b/chat/prosody/distinfo
index f2715b30aca..7a59c342018 100644
--- a/chat/prosody/distinfo
+++ b/chat/prosody/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.15 2017/11/23 22:06:15 fhajny Exp $
+$NetBSD: distinfo,v 1.16 2020/01/23 18:26:15 gdt Exp $
 
-SHA1 (prosody-0.10.0.tar.gz) = 57c1c5a665e6453bdde06727ef398cd69accd9d7
-RMD160 (prosody-0.10.0.tar.gz) = dad7a9329fb94bffbaf3177a86aa2740360f74c8
-SHA512 (prosody-0.10.0.tar.gz) = ee66e240afba6a8cb286623da48d9b535798153fb65e32070cec93aafe360e91f7087eeb49dec0f7d145e24f04339ed0878e50835b52f682130b204e22990ce9
-Size (prosody-0.10.0.tar.gz) = 330461 bytes
-SHA1 (patch-aa) = 5725cddbb77358d3bf75c55f122fe91051efbae3
-SHA1 (patch-ab) = 15acaf1320eec02c6d4a0b005350dc49dbd20af5
-SHA1 (patch-ad) = 3683833ef1c45e521542f04df4e6df698e727671
-SHA1 (patch-util-src_Makefile) = 0405f68a3b4c7f4f7a98d67230470a2a11078869
-SHA1 (patch-util-src_hashes.c) = 9c5b02f3ad652a9cb12ee4cbf4a6b7d235668932
+SHA1 (prosody-0.11.4.tar.gz) = 59e9e684230c26daf53526e18b0e6e2efb0d63c5
+RMD160 (prosody-0.11.4.tar.gz) = c177c6f58054bd595e11b9d83b2889c8d67ba611
+SHA512 (prosody-0.11.4.tar.gz) = 0c3aa3373c53f803b88a87dad4ca18b215de7a485d29b0bc4b186d97f7c48262840199a74f62aba6b7b4f1766fdfb37327ed4ff24e877c3a6dfca58764a035c3
+Size (prosody-0.11.4.tar.gz) = 423518 bytes
+SHA1 (patch-GNUmakefile) = e0fce25e95a4e765eba588e903de59526433ae54
+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
diff --git a/chat/prosody/patches/patch-aa b/chat/prosody/patches/patch-GNUmakefile
index 3818b057618..24a99785324 100644
--- a/chat/prosody/patches/patch-aa
+++ b/chat/prosody/patches/patch-GNUmakefile
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.7 2017/11/23 22:06:15 fhajny Exp $
+$NetBSD: patch-GNUmakefile,v 1.1 2020/01/23 18:26:15 gdt Exp $
 
 Fix installation directories and scripts
 
---- Makefile.orig	2017-11-17 20:57:32.803849000 +0000
-+++ Makefile
+--- GNUmakefile.orig	2019-08-31 14:08:45.000000000 +0000
++++ GNUmakefile
 @@ -3,10 +3,11 @@ include config.unix
  
  BIN = $(DESTDIR)$(PREFIX)/bin
  CONFIG = $(DESTDIR)$(SYSCONFDIR)
-+EGDIR = $(DESTDIR)@EGDIR@
++EGDIR = $(DESTDIR)/usr/pkg/share/examples/prosody
  MODULES = $(DESTDIR)$(LIBDIR)/prosody/modules
  SOURCE = $(DESTDIR)$(LIBDIR)/prosody
  DATA = $(DESTDIR)$(DATADIR)
@@ -17,7 +17,7 @@ Fix installation directories and scripts
  
  INSTALLEDSOURCE = $(LIBDIR)/prosody
  INSTALLEDCONFIG = $(SYSCONFDIR)
-@@ -28,35 +29,39 @@ ifeq ($(EXCERTS),yes)
+@@ -31,34 +32,42 @@ ifeq ($(EXCERTS),yes)
  endif
  
  install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodings.so util/encodings.so util/pposix.so util/signal.so
@@ -30,8 +30,9 @@ Fix installation directories and scripts
 -	$(INSTALL_EXEC) ./prosodyctl.install $(BIN)/prosodyctl
 -	$(INSTALL_DATA) core/*.lua $(SOURCE)/core
 -	$(INSTALL_DATA) net/*.lua $(SOURCE)/net
--	$(MKDIR) $(SOURCE)/net/http $(SOURCE)/net/websocket
+-	$(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
@@ -63,6 +64,10 @@ Fix installation directories and scripts
 +	$(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_DATA) util/*.lua $(SOURCE)/util
 +	$(BSD_INSTALL_LIB) util/*.so $(SOURCE)/util
 +	$(BSD_INSTALL_LIB_DIR) $(SOURCE)/util/sasl
@@ -81,7 +86,5 @@ Fix installation directories and scripts
 +	$(BSD_INSTALL_DATA) prosody.cfg.lua.install $(EGDIR)/prosody.cfg.lua
 +	$(BSD_INSTALL_DATA) prosody.version $(SOURCE)/prosody.version
  	$(MAKE) install -C util-src
--
+ 
  clean:
- 	rm -f prosody.install
- 	rm -f prosodyctl.install
diff --git a/chat/prosody/patches/patch-ab b/chat/prosody/patches/patch-prosody.cfg.lua.dist
index 07d3672996b..c63084cc19c 100644
--- a/chat/prosody/patches/patch-ab
+++ b/chat/prosody/patches/patch-prosody.cfg.lua.dist
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.6 2017/11/23 22:06:15 fhajny Exp $
+$NetBSD: patch-prosody.cfg.lua.dist,v 1.1 2020/01/23 18:26:15 gdt Exp $
 
 set the logging paths
 set up the pid files
 
---- prosody.cfg.lua.dist.orig	2017-11-17 20:50:11.470659000 +0000
+--- prosody.cfg.lua.dist.orig	2019-08-31 14:08:45.000000000 +0000
 +++ prosody.cfg.lua.dist
-@@ -161,12 +161,13 @@ archive_expires_after = "1w" -- Remove a
+@@ -153,12 +153,13 @@ archive_expires_after = "1w" -- Remove a
  -- Logging configuration
  -- For advanced logging see https://prosody.im/doc/logging
  log = {
@@ -21,9 +21,9 @@ set up the pid files
  -- Uncomment to enable statistics
  -- For more info see https://prosody.im/doc/statistics
  -- statistics = "internal"
-@@ -181,6 +182,9 @@ log = {
- -- Location of directory to find certificates in (relative to main config file):
- certificates = "certs"
+@@ -176,6 +177,9 @@ certificates = "certs"
+ -- HTTPS currently only supports a single certificate, specify it here:
+ --https_certificate = "certs/localhost.crt"
  
 +-- 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
new file mode 100644
index 00000000000..9b6524dece0
--- /dev/null
+++ b/chat/prosody/patches/patch-util-src_GNUmakefile
@@ -0,0 +1,15 @@
+$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
index 105727b6fbb..ad0baa8c0c7 100644
--- a/chat/prosody/patches/patch-util-src_hashes.c
+++ b/chat/prosody/patches/patch-util-src_hashes.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-util-src_hashes.c,v 1.2 2017/11/23 22:06:15 fhajny Exp $
+$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	2017-09-28 13:07:47.000000000 +0000
+--- util-src/hashes.c.orig	2019-08-31 14:08:45.000000000 +0000
 +++ util-src/hashes.c
-@@ -74,7 +74,7 @@ struct hash_desc {
+@@ -75,7 +75,7 @@ struct hash_desc {
  	void *ctx, *ctxo;
  };
  
@@ -13,16 +13,7 @@ Avoid conflict with NetBSD's hmac.
                   const char *msg, size_t msg_len, unsigned char *result) {
  	union xory {
  		unsigned char bytes[64];
-@@ -127,7 +127,7 @@ static int myFunc(lua_State *L) { \
- 	desc.digestLength = size; \
- 	desc.ctx = &ctx; \
- 	desc.ctxo = &ctxo; \
--	hmac(&desc, key, key_len, msg, msg_len, hash); \
-+	myhmac(&desc, key, key_len, msg, msg_len, hash); \
- 	if (hex_out) { \
- 		toHex(hash, size, result); \
- 		lua_pushlstring(L, (char*)result, size*2); \
-@@ -174,14 +174,14 @@ static int LscramHi(lua_State *L) {
+@@ -168,14 +168,14 @@ static int LscramHi(lua_State *L) {
  
  	memcpy(salt2, salt, salt_len);
  	memcpy(salt2 + salt_len, "\0\0\0\1", 4);
diff --git a/chat/prosody/patches/patch-ad b/chat/prosody/patches/patch-util-src_signal.c
index 8ebf4da5716..911a84b7542 100644
--- a/chat/prosody/patches/patch-ad
+++ b/chat/prosody/patches/patch-util-src_signal.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.4 2017/11/23 22:06:15 fhajny Exp $
+$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	2017-11-17 20:50:20.874396000 +0000
+--- util-src/signal.c.orig	2019-08-31 14:08:45.000000000 +0000
 +++ util-src/signal.c
-@@ -31,6 +31,10 @@
+@@ -33,6 +33,10 @@
  #include <signal.h>
  #include <stdlib.h>