Update to jabberd 2.3.4:

This is a major feature release with a bit of bugfixes.

With this release jabberd2 joins HTTP realm with WebSocket client
connections handling built in C2S module! :-)


Changes:
 * Rewrite TLS ephemeral key + cipher handling
 * Recover Berkeley DB before opening it
 * bcrypt support for PostgreSQL
 * Option to set authreg module per realm
 * AuthReg ANONYMOUS does not offer password check
 * Answer to disco#info queries to user JID
 * WebSocket C2S SX plugin

Note: websockets are not available, as the required http-parser module
is not (yet) in pkgsrc.

5 files changed, 51 insertions, 14 deletions

diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index de057959f48..1cc1bfd18ee 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.100 2015/10/10 01:58:00 ryoon Exp $
+# $NetBSD: Makefile,v 1.101 2015/12/13 23:46:11 schnoebe Exp $
 
-DISTNAME=	jabberd-2.3.3
-PKGREVISION=	2
+DISTNAME=	jabberd-2.3.4
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jabberd2/jabberd2/releases/download/${DISTNAME}/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/chat/jabberd2/distinfo b/chat/jabberd2/distinfo
index 4ae3a9c398f..c1b930a3224 100644
--- a/chat/jabberd2/distinfo
+++ b/chat/jabberd2/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.35 2015/11/03 01:20:21 agc Exp $
+$NetBSD: distinfo,v 1.36 2015/12/13 23:46:11 schnoebe Exp $
 
-SHA1 (jabberd-2.3.3.tar.xz) = 4f682cb0c28cc5f048741f1257c5607c158bb4bf
-RMD160 (jabberd-2.3.3.tar.xz) = f1840a24690e264cb790aceae07a4af9905c5b5e
-SHA512 (jabberd-2.3.3.tar.xz) = c3c8d6829c3bc61555280d90edc1bef0228e4cec2684ba283373075883ef64bfa5e9118dad96d7a1193bb2afb6b2e7c78e24267e6feb6e7b191138bf8c79a7da
-Size (jabberd-2.3.3.tar.xz) = 1457340 bytes
-SHA1 (patch-Makefile.in) = 8be9b6820e46c0e62808c8eecee6c7bd72e94ee2
+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 (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 3302e396284..e7da030780b 100644
--- a/chat/jabberd2/options.mk
+++ b/chat/jabberd2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.26 2014/02/24 19:30:53 schnoebe Exp $
+# $NetBSD: options.mk,v 1.27 2015/12/13 23:46:11 schnoebe Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.jabberd2
 PKG_OPTIONS_REQUIRED_GROUPS=	auth storage mio
@@ -12,6 +12,7 @@ PKG_OPTIONS_GROUP.storage+=	storage-sqlite storage-db
 PKG_OPTIONS_GROUP.mio=		mio-kqueue mio-select mio-poll mio-epoll
 # debugging
 PKG_SUPPORTED_OPTIONS+=		debug
+# PKG_SUPPORTED_OPTIONS+=		websocket
 
 PKG_SUGGESTED_OPTIONS=		auth-sqlite storage-sqlite
 PKG_SUGGESTED_OPTIONS+=		mio-select mio-poll
@@ -19,6 +20,7 @@ PKG_SUGGESTED_OPTIONS+=		mio-select mio-poll
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=	db ldap mysql pam pgsql sqlite
+# PLIST_VARS+=	ws
 
 .if !empty(PKG_OPTIONS:Mauth-db) || !empty(PKG_OPTIONS:Mstorage-db)
 BDB_ACCEPTED=		db4 db5
@@ -94,3 +96,10 @@ CONFIGURE_ARGS+=	--enable-mio=poll
 .if !empty(PKG_OPTIONS:Mmio-select)
 CONFIGURE_ARGS+=	--enable-mio=select
 .endif
+
+# .if !empty(PKG_OPTIONS:Mwebsocket)
+# PLIST.ws=		yes
+# CONFIGURE_ARGS+=	--enable-websocket
+# .else
+# CONFIGURE_ARGS+=	--disable-websocket
+# .endif
diff --git a/chat/jabberd2/patches/patch-Makefile.in b/chat/jabberd2/patches/patch-Makefile.in
index e0c18b99979..63136bcfc59 100644
--- a/chat/jabberd2/patches/patch-Makefile.in
+++ b/chat/jabberd2/patches/patch-Makefile.in
@@ -1,13 +1,13 @@
-$NetBSD: patch-Makefile.in,v 1.4 2013/12/12 23:01:02 schnoebe Exp $
+$NetBSD: patch-Makefile.in,v 1.5 2015/12/13 23:46:11 schnoebe Exp $
 
 Skip etc.
 
---- Makefile.in.orig	2013-11-28 11:16:25.000000000 +0000
+--- Makefile.in.orig	2015-10-30 08:53:18.000000000 +0000
 +++ Makefile.in
-@@ -333,7 +333,7 @@ top_build_prefix = @top_build_prefix@
+@@ -343,7 +343,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
- EXTRA_DIST = Doxyfile.in README.win32 README.protocol README.config contrib docs win32
+ EXTRA_DIST = Doxyfile.in README.md README.win32 README.protocol README.config contrib docs win32
 -SUBDIRS = etc man $(am__append_1) tools mio sx util c2s router s2s \
 +SUBDIRS = man $(am__append_1) tools mio sx util c2s router s2s \
  	storage sm $(am__append_2)
diff --git a/chat/jabberd2/patches/patch-sx_plugins.h b/chat/jabberd2/patches/patch-sx_plugins.h
new file mode 100644
index 00000000000..060a02a6cc3
--- /dev/null
+++ b/chat/jabberd2/patches/patch-sx_plugins.h
@@ -0,0 +1,28 @@
+$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
+ }