Attached patch updates net/prosody to 0.9.12. Some patches in the ports tree were merged upstream so can be removed.
The update includes bug fixes. OK?
Index: Makefile =================================================================== RCS file: /cvs/ports/net/prosody/Makefile,v retrieving revision 1.43 diff -u -p -r1.43 Makefile --- Makefile 16 May 2016 12:11:48 -0000 1.43 +++ Makefile 27 Mar 2017 17:20:53 -0000 @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.43 2016/05/16 12:11:48 jca Exp $ COMMENT= communications server for Jabber/XMPP written in Lua -DISTNAME= prosody-0.9.10 -REVISION= 2 +DISTNAME= prosody-0.9.12 CATEGORIES= net MASTER_SITES= http://prosody.im/downloads/source/ @@ -29,7 +28,7 @@ SUBST_VARS+= FLAVOR MAKE_PROGRAM CONFIGURE_STYLE=simple CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --sysconfdir="${SYSCONFDIR}/prosody" \ - --datadir="/var/prosody" \ + --datadir="${VARBASE}/prosody" \ --with-lua="${LOCALBASE}" \ --with-lua-include="${MODLUA_INCL_DIR}" \ --c-compiler="${CC}" \ Index: distinfo =================================================================== RCS file: /cvs/ports/net/prosody/distinfo,v retrieving revision 1.12 diff -u -p -r1.12 distinfo --- distinfo 29 Jan 2016 12:13:55 -0000 1.12 +++ distinfo 27 Mar 2017 17:20:53 -0000 @@ -1,2 +1,2 @@ -SHA256 (prosody-0.9.10.tar.gz) = SDbu/tTZu7Yyy6JKxb2Om8fAKaedBghLAP/HCFjRZi8= -SIZE (prosody-0.9.10.tar.gz) = 267380 +SHA256 (prosody-0.9.12.tar.gz) = GlmjIrcZKKIZhVIqoA0OqzVSII17+eyzGFQqGy/uPo0= +SIZE (prosody-0.9.12.tar.gz) = 267869 Index: patches/patch-certs_Makefile =================================================================== RCS file: /cvs/ports/net/prosody/patches/patch-certs_Makefile,v retrieving revision 1.5 diff -u -p -r1.5 patch-certs_Makefile --- patches/patch-certs_Makefile 11 Jan 2016 12:11:36 -0000 1.5 +++ patches/patch-certs_Makefile 27 Mar 2017 17:20:53 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-certs_Makefile,v 1.5 2016/01/11 12:11:36 sthen Exp $ ---- certs/Makefile.orig Fri Jan 8 13:07:07 2016 -+++ certs/Makefile Mon Jan 11 12:01:57 2016 +--- certs/Makefile.orig Mon Dec 5 13:54:23 2016 ++++ certs/Makefile Mon Mar 27 19:18:16 2017 @@ -2,13 +2,13 @@ keysize=2048 @@ -19,11 +19,9 @@ $OpenBSD: patch-certs_Makefile,v 1.5 201 # to generate a self signed certificate. .PRECIOUS: %.cnf %.key -@@ -27,4 +27,6 @@ keysize=2048 - +@@ -28,3 +28,5 @@ keysize=2048 %.key: umask 0077 && openssl genrsa -out $@ $(keysize) -- @chmod 400 $@ -c -+ @chmod 400 $@ + @chmod 400 $@ + @chown _prosody $@ || \ + echo "***WARNING***: You will need to 'chown _prosody $@'" Index: patches/patch-prosody =================================================================== RCS file: patches/patch-prosody diff -N patches/patch-prosody --- patches/patch-prosody 24 Mar 2016 12:28:42 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-prosody,v 1.6 2016/03/24 12:28:42 jca Exp $ ---- prosody.orig Wed Jan 27 14:06:11 2016 -+++ prosody Wed Mar 23 09:11:59 2016 -@@ -43,6 +43,11 @@ if CFG_DATADIR then - end - end - -+-- luasec 0.6 fix -+_G.ssl = require("ssl"); -+_G.ssl.context = require("ssl.context"); -+_G.ssl.x509 = require("ssl.x509"); -+ - -- Global 'prosody' object - local prosody = { events = require "util.events".new(); }; - _G.prosody = prosody;
