prosody: update to 0.11.4

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: prosody: update to 0.11.4
From: Tiago Seco <tiago%seco.ws@localhost>
Date: Sun, 12 Jan 2020 23:05:33 +0000
Module Name:	pkgsrc-wip
Committed By:	Tiago Seco <tiago%seco.ws@localhost>
Pushed By:	tse
Date:		Sun Jan 12 23:05:33 2020 +0000
Changeset:	6bdf35a5e29517a05da5d71c2f72738e9f39bb1e

Modified Files:
	prosody/DESCR
	prosody/Makefile
	prosody/distinfo
	prosody/patches/patch-GNUmakefile
	prosody/patches/patch-prosody.cfg.lua.dist
	prosody/patches/patch-util-src_GNUmakefile
	prosody/patches/patch-util-src_hashes.c
	prosody/patches/patch-util-src_signal.c
Added Files:
	prosody/COMMIT_MSG

Log Message:
prosody: update to 0.11.4

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6bdf35a5e29517a05da5d71c2f72738e9f39bb1e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 prosody/COMMIT_MSG                         | 33 ++++++++++++++++++++++++++++++
 prosody/DESCR                              |  2 ++
 prosody/Makefile                           |  6 +++---
 prosody/distinfo                           | 18 ++++++++--------
 prosody/patches/patch-GNUmakefile          |  2 ++
 prosody/patches/patch-prosody.cfg.lua.dist |  9 +++++---
 prosody/patches/patch-util-src_GNUmakefile |  2 ++
 prosody/patches/patch-util-src_hashes.c    |  2 ++
 prosody/patches/patch-util-src_signal.c    |  2 ++
 9 files changed, 61 insertions(+), 15 deletions(-)

diffs:
diff --git a/prosody/COMMIT_MSG b/prosody/COMMIT_MSG
new file mode 100644
index 0000000000..9f964a7ef1
--- /dev/null
+++ b/prosody/COMMIT_MSG
@@ -0,0 +1,33 @@
+chat/prosody: Update to 0.11.4
+
+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
diff --git a/prosody/DESCR b/prosody/DESCR
index 66ae434a17..3d2e77ed6b 100644
--- a/prosody/DESCR
+++ b/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/prosody/Makefile b/prosody/Makefile
index 9ffee951f0..c2aaa4e881 100644
--- a/prosody/Makefile
+++ b/prosody/Makefile
@@ -1,12 +1,12 @@
 # $NetBSD$
 #
 
-DISTNAME=		prosody-0.11.3
+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@localhost
-HOMEPAGE=		http://prosody.im/
+HOMEPAGE=		https://prosody.im/
 COMMENT=		Flexible communications server for Jabber/XMPP written in Lua
 LICENSE=		mit
 
diff --git a/prosody/distinfo b/prosody/distinfo
index 0c0bd1ed34..3f484dfabf 100644
--- a/prosody/distinfo
+++ b/prosody/distinfo
@@ -1,11 +1,11 @@
 $NetBSD$
 
-SHA1 (prosody-0.11.3.tar.gz) = 87ec8039bf297ba9bc4da44b2ba42f4b035e73ca
-RMD160 (prosody-0.11.3.tar.gz) = bdfc9e054b68699722d8745e100f17a8a7e12240
-SHA512 (prosody-0.11.3.tar.gz) = 07239433c7c65184ca24d665c92b787ff9e4a5ee190ab90dede802ffd2cbd97855356d818858871e62284e9923f485b3468ab1baed5d3fb13aac0551a38967eb
-Size (prosody-0.11.3.tar.gz) = 424098 bytes
-SHA1 (patch-GNUmakefile) = 0e84f03f2f93180f2f74b316820d42f8ca354d51
-SHA1 (patch-prosody.cfg.lua.dist) = 50ea01f7b9c16e5571df84aa41916fe7a32a041c
-SHA1 (patch-util-src_GNUmakefile) = 217e7556e5bf2dc5e851bb0d5fd6be5fbc8cd37e
-SHA1 (patch-util-src_hashes.c) = 9f0ecb528046d71a242ccae66473a3226a007fde
-SHA1 (patch-util-src_signal.c) = bccc5066a28e9dd3402a9505f3acb6dddcf69ef3
+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/prosody/patches/patch-GNUmakefile b/prosody/patches/patch-GNUmakefile
index 5e4d6ff72e..5b01e271f8 100644
--- a/prosody/patches/patch-GNUmakefile
+++ b/prosody/patches/patch-GNUmakefile
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Fix installation directories and scripts
+
 --- GNUmakefile.orig	2019-08-31 14:08:45.000000000 +0000
 +++ GNUmakefile
 @@ -3,10 +3,11 @@ include config.unix
diff --git a/prosody/patches/patch-prosody.cfg.lua.dist b/prosody/patches/patch-prosody.cfg.lua.dist
index e68cda4604..af2cec6484 100644
--- a/prosody/patches/patch-prosody.cfg.lua.dist
+++ b/prosody/patches/patch-prosody.cfg.lua.dist
@@ -1,5 +1,8 @@
 $NetBSD$
 
+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
 @@ -153,12 +153,13 @@ archive_expires_after = "1w" -- Remove a
@@ -8,8 +11,8 @@ $NetBSD$
  log = {
 -	info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
 -	error = "prosody.err";
-+	info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
-+	error = "/var/log/prosody/prosody.err";
++	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
  }
@@ -23,7 +26,7 @@ $NetBSD$
  --https_certificate = "certs/localhost.crt"
  
 +-- Enable PID file by default
-+pidfile = "/var/run/prosody/prosody.pid";
++pidfile = "@PROSODY_RUN@/prosody.pid";
 +
  ----------- Virtual hosts -----------
  -- You need to add a VirtualHost entry for each domain you wish Prosody to serve.
diff --git a/prosody/patches/patch-util-src_GNUmakefile b/prosody/patches/patch-util-src_GNUmakefile
index 4829ed4f94..51a9aee822 100644
--- a/prosody/patches/patch-util-src_GNUmakefile
+++ b/prosody/patches/patch-util-src_GNUmakefile
@@ -1,5 +1,7 @@
 $NetBSD$
 
+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)
diff --git a/prosody/patches/patch-util-src_hashes.c b/prosody/patches/patch-util-src_hashes.c
index 51a0db3222..75a759e322 100644
--- a/prosody/patches/patch-util-src_hashes.c
+++ b/prosody/patches/patch-util-src_hashes.c
@@ -1,5 +1,7 @@
 $NetBSD$
 
+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 {
diff --git a/prosody/patches/patch-util-src_signal.c b/prosody/patches/patch-util-src_signal.c
index 24681df6d7..3d24b21006 100644
--- a/prosody/patches/patch-util-src_signal.c
+++ b/prosody/patches/patch-util-src_signal.c
@@ -1,5 +1,7 @@
 $NetBSD$
 
+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 @@
Prev by Date: slurm-wlm: Upgrade to 19.05.5 (CVE resolution)
Next by Date: luakit: support luajit
Previous by Thread: slurm-wlm: Upgrade to 19.05.5 (CVE resolution)
Next by Thread: luakit: support luajit
Indexes:
Home | Main Index | Thread Index | Old Index