Hi ports,

Find an update for prosody 0.11.10. Release notes:

## Security

  * MUC: Fix logic for access to affiliation lists CVE-2021-37601 
<https://prosody.im/security/advisory_20210722/>

## Minor changes

  * prosodyctl: Add 'limits' to known globals to warn about misplacing it
  * util.ip: Fix netmask for link-local address range
  * mod_pep: Remove obsolete node restoration code
  * util.pubsub: Fix traceback if node data not initialized

I also modified the tarball's makefile in order to stop prosody
reporting that its version is "unknown". I'll try to get the same change
upstreamed.

My -stable server is happy with it.

-Lucas

diff refs/heads/master refs/heads/prosody-0.11.10
blob - f344ba28b68144986c7394bd325f6afe496a8500
blob + ad1c9573fbcfc0b1752d477ed29da94fe88767bd
--- net/prosody/Makefile
+++ net/prosody/Makefile
@@ -1,10 +1,9 @@
 # $OpenBSD: Makefile,v 1.62 2021/06/25 04:30:22 rsadowski Exp $
 
 COMMENT =      communications server for Jabber/XMPP written in Lua
-DISTNAME =     prosody-0.11.9
+DISTNAME =     prosody-0.11.10
 CATEGORIES =   net
 HOMEPAGE =     https://prosody.im/
-REVISION =     0
 
 MAINTAINER =   Lucas <lu...@sexy.is>
 
blob - 0ef99dbcb0e988d9204e530e9ca005d931fe0f3f
blob + d78f08aadcaecc337ec0cd87c4e6a0ae05df957a
--- net/prosody/distinfo
+++ net/prosody/distinfo
@@ -1,2 +1,2 @@
-SHA256 (prosody-0.11.9.tar.gz) = zMAyrqSdhYY1+5NkTbJ23mgSvoMHOo2A6bRQgJXe/wk=
-SIZE (prosody-0.11.9.tar.gz) = 431647
+SHA256 (prosody-0.11.10.tar.gz) = xtcU5tSm3dHbEmayBdnYo+2RgY9CdVySaP+xg1nSBOE=
+SIZE (prosody-0.11.10.tar.gz) = 438888
blob - caa942b8f659a4fcea39244728ff517f20abd51b
blob + c74f2eb6303de8bb7398da089fe1538f87da5576
--- net/prosody/patches/patch-makefile
+++ net/prosody/patches/patch-makefile
@@ -1,5 +1,9 @@
 $OpenBSD: patch-makefile,v 1.1 2019/02/07 19:23:39 danj Exp $
 
+- First hunk: fix directories
+- Second hunk: fix `prosody.version` target to stop reporting prosody
+  version as `unknown`
+
 Index: makefile
 --- makefile.orig
 +++ makefile
@@ -18,3 +22,25 @@ Index: makefile
  
  INSTALLEDSOURCE = $(LIBDIR)/prosody
  INSTALLEDCONFIG = $(SYSCONFDIR)
+@@ -90,12 +90,12 @@ prosody.cfg.lua.install: prosody.cfg.lua.dist
+       sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > $@
+ 
+ prosody.version:
+-      test -f prosody.release && \
+-              cp prosody.release $@ || \
+-              test -f .hg_archival.txt && \
+-              sed -n 's/^node: \(............\).*/\1/p' .hg_archival.txt > $@ 
|| \
+-              test -f .hg/dirstate && \
+-              hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@ || \
+-              echo unknown > $@
+-
+-
++      if [ -f prosody.release ]; then \
++              cp prosody.release $@; \
++      elif [ -f .hg_archival.txt ]; then \
++              sed -n 's/^node: \(............\).*/\1/p' .hg_archival.txt > 
$@; \
++      elif [ -f .hg/dirstate ]; then \
++              hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@; \
++      else \
++              echo unknown > $@; \
++      fi

Reply via email to