* 2.3.1 to 2.3.2 upgrade:

What changed:
- Removed unmaintained CyrusSASL backend
- Option to add realm to username in ldapvcard module
- systemd unit files

3 files changed, 12 insertions, 22 deletions

diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index 6de97de38d3..fc9af7a1c09 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.90 2014/02/12 23:17:36 tron Exp $
+# $NetBSD: Makefile,v 1.91 2014/02/24 19:30:53 schnoebe Exp $
 
-DISTNAME=	jabberd-2.3.1
-PKGREVISION=	2
+DISTNAME=	jabberd-2.3.2
 CATEGORIES=	chat
 MASTER_SITES=	https://github.com/jabberd2/jabberd2/releases/download/${DISTNAME}/
 EXTRACT_SUFX=	.tar.xz
 
+FETCH_USING=	curl
+
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://jabberd2.org/
 COMMENT=	XMPP (Jabber) instant messaging server
@@ -126,6 +127,7 @@ post-install:
 .include "../../devel/cppunit/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../net/udns/buildlink3.mk"
+.include "../../security/gsasl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
diff --git a/chat/jabberd2/distinfo b/chat/jabberd2/distinfo
index ee15fa56a97..b192570a894 100644
--- a/chat/jabberd2/distinfo
+++ b/chat/jabberd2/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.32 2013/12/12 23:01:02 schnoebe Exp $
+$NetBSD: distinfo,v 1.33 2014/02/24 19:30:53 schnoebe Exp $
 
-SHA1 (jabberd-2.3.1.tar.xz) = 94e27233b6cb43da35e7d18a3aec8b7d02f50ee4
-RMD160 (jabberd-2.3.1.tar.xz) = 79d94573cbda969219d2cb5f33738282acd4b81f
-Size (jabberd-2.3.1.tar.xz) = 1460088 bytes
+SHA1 (jabberd-2.3.2.tar.xz) = c2f5a79b2c8fb1c0f16dd015490e3a453fac3332
+RMD160 (jabberd-2.3.2.tar.xz) = 6b97de4d4e2ff782fed060a01b57ba322c77fe70
+Size (jabberd-2.3.2.tar.xz) = 1473436 bytes
 SHA1 (patch-Makefile.in) = 8be9b6820e46c0e62808c8eecee6c7bd72e94ee2
 SHA1 (patch-configure) = 1a58cc7b015a73009d8140402dfb739fc48e7fa0
diff --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk
index edb08f8d198..3302e396284 100644
--- a/chat/jabberd2/options.mk
+++ b/chat/jabberd2/options.mk
@@ -1,37 +1,25 @@
-# $NetBSD: options.mk,v 1.25 2010/07/06 00:01:35 schnoebe Exp $
+# $NetBSD: options.mk,v 1.26 2014/02/24 19:30:53 schnoebe Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.jabberd2
-PKG_OPTIONS_REQUIRED_GROUPS=	auth storage sasl mio
+PKG_OPTIONS_REQUIRED_GROUPS=	auth storage mio
 # Authentication backend
 PKG_OPTIONS_GROUP.auth=		auth-mysql auth-pgsql auth-sqlite
 PKG_OPTIONS_GROUP.auth+=	auth-db auth-ldap auth-pam
 # Storage backend
 PKG_OPTIONS_GROUP.storage=	storage-mysql storage-pgsql
 PKG_OPTIONS_GROUP.storage+=	storage-sqlite storage-db
-# SASL implementation
-PKG_OPTIONS_GROUP.sasl=		sasl-cyrus sasl-gnu
 # mio implementations
 PKG_OPTIONS_GROUP.mio=		mio-kqueue mio-select mio-poll mio-epoll
 # debugging
 PKG_SUPPORTED_OPTIONS+=		debug
 
-PKG_SUGGESTED_OPTIONS=		auth-sqlite storage-sqlite sasl-gnu
+PKG_SUGGESTED_OPTIONS=		auth-sqlite storage-sqlite
 PKG_SUGGESTED_OPTIONS+=		mio-select mio-poll
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=	db ldap mysql pam pgsql sqlite
 
-.if !empty(PKG_OPTIONS:Msasl-cyrus)
-CONFIGURE_ARGS+=	--with-sasl=cyrus
-.  include "../../security/cyrus-sasl/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Msasl-gnu)
-CONFIGURE_ARGS+=	--with-sasl=gsasl
-.  include "../../security/gsasl/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mauth-db) || !empty(PKG_OPTIONS:Mstorage-db)
 BDB_ACCEPTED=		db4 db5
 CONFIGURE_ARGS+=	--enable-db