Packaging changes:

    move requirement for cppunit to debug option
    add db-update.pgsql, README.md

Updated to version 2.3.5

This file contains news, important changes
and upgrade instructions between different versions of jabberd2.

* 2.3.4 to 2.3.5 upgrade:

What changed:
- Module to verify users using e-mail
- Reordered MIO backends priority
- Skip non-existing blowfish i386 assembler code
- Use CSPRNG for dialback keys
- Allow presence probing own connections
- Use OpenSSL functions for base64 en/decoding when available
- Option to dump packet-filter matched packets to file

mod_verify requires CREATE TABLE "verify" in DB. Make sure you
created it before enabling the module in sm.xml.

MIO backends are prioritized from best to worst now, so if you
do not enforce a backend with ./configure it may change
in new build.

jabberd2 is now leaning strongly against OpenSSL. It is still
possible to use without, but not advisable.

5 files changed, 17 insertions, 41 deletions

diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index 1cc1bfd18ee..161376cb7e8 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.101 2015/12/13 23:46:11 schnoebe Exp $
+# $NetBSD: Makefile,v 1.102 2016/02/09 00:21:59 schnoebe Exp $
 
-DISTNAME=	jabberd-2.3.4
+DISTNAME=	jabberd-2.3.5
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jabberd2/jabberd2/releases/download/${DISTNAME}/}
 EXTRACT_SUFX=	.tar.xz
@@ -64,8 +64,9 @@ DOCDIR=			${PREFIX}/share/doc/jabberd
 FILES=			jabberd.cfg c2s.xml router.xml router-users.xml \
 			router-filter.xml s2s.xml sm.xml
 DBFILES=		db-jd14-2-jd2.sql db-setup.mysql db-setup.pgsql \
-			db-update.mysql	db-setup.sqlite db-update.sqlite
-DOCFILES=		README.protocol README README.config NEWS
+			db-setup.sqlite db-update.mysql	db-update.pgsql \
+			db-update.sqlite
+DOCFILES=		README README.config README.md README.protocol NEWS
 
 INSTALLATION_DIRS=	bin ${EGDIR} ${DOCDIR}
 
@@ -124,7 +125,6 @@ post-install:
 .endfor
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/cppunit/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../net/udns/buildlink3.mk"
 .include "../../security/gsasl/buildlink3.mk"
diff --git a/chat/jabberd2/PLIST b/chat/jabberd2/PLIST
index d44fe349e45..7a2511af06a 100644
--- a/chat/jabberd2/PLIST
+++ b/chat/jabberd2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2014/03/11 14:04:59 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.19 2016/02/09 00:21:59 schnoebe Exp $
 bin/bdbdump.pl
 bin/c2s
 bin/jabberd
@@ -40,6 +40,7 @@ lib/jabberd/mod_status.la
 lib/jabberd/mod_template-roster.la
 lib/jabberd/mod_vacation.la
 lib/jabberd/mod_validate.la
+lib/jabberd/mod_verify.la
 lib/jabberd/storage_fs.la
 ${PLIST.db}lib/jabberd/storage_db.la
 ${PLIST.ldap}lib/jabberd/storage_ldapvcard.la
@@ -53,14 +54,16 @@ man/man8/s2s.8
 man/man8/sm.8
 share/doc/jabberd/NEWS
 share/doc/jabberd/README
-share/doc/jabberd/README.protocol
 share/doc/jabberd/README.config
+share/doc/jabberd/README.md
+share/doc/jabberd/README.protocol
 share/examples/jabberd/c2s.xml
 share/examples/jabberd/db-jd14-2-jd2.sql
 share/examples/jabberd/db-setup.mysql
 share/examples/jabberd/db-setup.pgsql
 share/examples/jabberd/db-setup.sqlite
 share/examples/jabberd/db-update.mysql
+share/examples/jabberd/db-update.pgsql
 share/examples/jabberd/db-update.sqlite
 share/examples/jabberd/jabberd.cfg
 share/examples/jabberd/roster.xml
diff --git a/chat/jabberd2/distinfo b/chat/jabberd2/distinfo
index c1b930a3224..941267c27e7 100644
--- a/chat/jabberd2/distinfo
+++ b/chat/jabberd2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.36 2015/12/13 23:46:11 schnoebe Exp $
+$NetBSD: distinfo,v 1.37 2016/02/09 00:21:59 schnoebe Exp $
 
-SHA1 (jabberd-2.3.4.tar.xz) = dcee0ac3a3d1a686fdf341f3681cb2e3d6cd4031
-RMD160 (jabberd-2.3.4.tar.xz) = 210d2b28b635797831a271a3dd5deddd9042cd4c
-SHA512 (jabberd-2.3.4.tar.xz) = 593c1a80de52447fa18e448627bdbf85605e8a406129808cd2081576c26d65df3315c5fc91b37d5e832e1a89b4083d873b2db1e65d6ad76fa5b9b4f125786b7f
-Size (jabberd-2.3.4.tar.xz) = 1482736 bytes
+SHA1 (jabberd-2.3.5.tar.xz) = 9d586290837a3cc1b185ade9e90cc44f70fa4ce2
+RMD160 (jabberd-2.3.5.tar.xz) = 349d26938451346c4ad46c878a75a00884ad75a3
+SHA512 (jabberd-2.3.5.tar.xz) = bcbc793874d2100fefaf02bbb8eefe3019314ce6d132a891093125fe6357358903279383f68f0542a29079aba06dc13802bbe7fee5ee494c2a0d752a82187350
+Size (jabberd-2.3.5.tar.xz) = 1568976 bytes
 SHA1 (patch-Makefile.in) = 31d8dc4a5446e96079e1016afb45dc7a602b98c9
 SHA1 (patch-configure) = 1a58cc7b015a73009d8140402dfb739fc48e7fa0
 SHA1 (patch-sx_plugins.h) = 7042e3c56f16d719dc867bd30a1dbf9195133b61
diff --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk
index e7da030780b..0458925b7e7 100644
--- a/chat/jabberd2/options.mk
+++ b/chat/jabberd2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.27 2015/12/13 23:46:11 schnoebe Exp $
+# $NetBSD: options.mk,v 1.28 2016/02/09 00:21:59 schnoebe Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.jabberd2
 PKG_OPTIONS_REQUIRED_GROUPS=	auth storage mio
@@ -79,6 +79,7 @@ CONFIGURE_ARGS+=	--enable-developer
 # CONFIGURE_ARGS+=	--enable-nad-debug
 # CONFIGURE_ARGS+=	--enable-pool-debug
 # CONFIGURE_ARGS+=	--enable-mio-debug
+.   include "../../devel/cppunit/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mmio-kqueue)
diff --git a/chat/jabberd2/patches/patch-sx_plugins.h b/chat/jabberd2/patches/patch-sx_plugins.h
deleted file mode 100644
index 060a02a6cc3..00000000000
--- a/chat/jabberd2/patches/patch-sx_plugins.h
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-sx_plugins.h,v 1.1 2015/12/13 23:46:11 schnoebe Exp $
-
-Don't unconditionally include http_parser and friends, only
-include when USE_WEBSOCKET is defined.
-
-From
-https://github.com/jabberd2/jabberd2/commit/b861b9c72adc732cbdfbac4eb8a4205126227f6b
-
---- sx/plugins.h.orig	2015-09-01 09:55:43.000000000 +0000
-+++ sx/plugins.h
-@@ -159,7 +159,7 @@ typedef struct _sx_compress_conn_st {
- JABBERD2_API int sx_ack_init(sx_env_t env, sx_plugin_t p, va_list args);
- 
- /* websocket wrapper plugin */
--//#ifdef USE_WEBSOCKET
-+#ifdef USE_WEBSOCKET
- #include <http_parser.h>
- #include <util/util.h>
- 
-@@ -183,7 +183,7 @@ typedef struct _sx_websocket_conn_st {
-     xht                     headers;
-     void                    *frame;
- } *_sx_websocket_conn_t;
--//#endif
-+#endif
- 
- #ifdef __cplusplus
- }