- Update to 2.1.15

- Remove patch-sasl patch (already in source)
- Better describe items in OPTIONS
- Fix USE_BDB (4.1.25 is minimal supported version)
- Enable MySQL backend as default
- Disable fs backend (suitable for testing only)

4 files changed, 28 insertions, 99 deletions

diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index dd4a308d649d..44ac4fc33b93 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	jabberd
-PORTVERSION=	2.1.14
-PORTREVISION=	1
+PORTVERSION=	2.1.15
 CATEGORIES=	net-im
 MASTER_SITES=	http://ftp.xiaoka.com/jabberd2/releases/
 DIST_SUBDIR=	jabber
@@ -19,15 +18,16 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
 		gsasl.10:${PORTSDIR}/security/gsasl \
 		idn.16:${PORTSDIR}/dns/libidn
 
-OPTIONS=	POSTGRESQL "Use PostgreSQL for storage and authentication" off \
-		MYSQL "Use MySQL for storage and authentication" off \
-		LDAP "Use LDAP for authentication" off \
-		BDB "Use BDB for storage and authentication" off \
-		SQLITE "Use SQLITE3 for storage" off \
-		PAM "Use PAM for authentication" off \
-		PIPE "Enable pipe auth/reg support" off \
-		ANON "Enable anonymous auth/reg support" off \
-		DEBUG "Compile with debug information" on
+OPTIONS=	MYSQL "Support MySQL (storage/auth/reg)" on \
+		POSTGRESQL "Support PostgreSQL (storage/auth/reg)" off \
+		LDAP "Support OpenLDAP (storage/auth/reg)" off \
+		BDB "Support BerkeleyDB (storage/auth/reg)" off \
+		SQLITE "Support SQLite3 (storage/auth/reg)" off \
+		PAM "Enable PAM (auth/reg)" off \
+		PIPE "Enable pipe (auth/reg)" off \
+		ANON "Enable anonymous (auth/reg)" off \
+		FS "Filesystem storage (only for testing)" off \
+		DEBUG "Compile with debug messages" on
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
@@ -38,8 +38,7 @@ CONFIGURE_ARGS+=	--localstatedir=/var \
 		--sysconfdir=${PREFIX}/etc/jabberd \
 		--enable-ssl --enable-mio=poll \
 		--with-extra-include-path="${LOCALBASE}/include ${EIP}" \
-		--with-extra-library-path="${LOCALBASE}/lib ${ELP}" \
-		--enable-fs
+		--with-extra-library-path="${LOCALBASE}/lib ${ELP}"
 
 JABBER_USER=	jabber
 JABBER_UID=	93
@@ -65,7 +64,7 @@ DOCFILES=	AUTHORS BUGS COPYING ChangeLog INSTALL NEWS PROTOCOL README \
 ELP+=	${OPENSSLLIB}
 EIP+=	${OPENSSLINC}
 
-.if defined(WITH_DEBUG)
+.if !defined(WITHOUT_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 .endif
 
@@ -88,7 +87,7 @@ CONFIGURE_ARGS+=--disable-sqlite
 PLIST_SUB+=	SUB_SQLITE="@comment "
 .endif
 
-.if defined(WITH_MYSQL)
+.if !defined(WITHOUT_MYSQL)
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=--enable-mysql
 EIP+=:${LOCALBASE}/include/mysql
@@ -100,7 +99,7 @@ PLIST_SUB+=	SUB_MYSQL="@comment "
 .endif
 
 .if defined(WITH_BDB)
-USE_BDB=	yes
+USE_BDB=	41+
 CONFIGURE_ARGS+=--enable-db
 CONFIGURE_ARGS+=--oldincludedir=/nonexistant
 EIP+=:${BDB_INCLUDE_DIR}
@@ -120,6 +119,14 @@ CONFIGURE_ARGS+=--disable-ldap
 PLIST_SUB+=	SUB_LDAP="@comment "
 .endif
 
+.if defined(WITH_FS)
+CONFIGURE_ARGS+=--enable-fs
+PLIST_SUB+=	SUB_FS=""
+.else
+CONFIGURE_ARGS+=--disable-fs
+PLIST_SUB+=	SUB_FS="@comment "
+.endif
+
 .if defined(WITH_PAM)
 CONFIGURE_ARGS+=--enable-pam
 PLIST_SUB+=	SUB_PAM=""
diff --git a/net-im/jabberd/distinfo b/net-im/jabberd/distinfo
index abe246e6c27b..019cfda7227e 100644
--- a/net-im/jabberd/distinfo
+++ b/net-im/jabberd/distinfo
@@ -1,3 +1,3 @@
-MD5 (jabber/jabberd-2.1.14.tar.gz) = 17c8bc08f77391d36b13d42940793cff
-SHA256 (jabber/jabberd-2.1.14.tar.gz) = 0fd0b06e171b8e810b73e0abceaec3bc298e04654b4f7da26128e4a5968ca8c0
-SIZE (jabber/jabberd-2.1.14.tar.gz) = 1408492
+MD5 (jabber/jabberd-2.1.15.tar.gz) = bf3e6596045e3f5018e75d5613c1f864
+SHA256 (jabber/jabberd-2.1.15.tar.gz) = e9c3e03ae407913ddb0ceec827af71f9722da9e03ff6f6f979188c4f6ba6f4c9
+SIZE (jabber/jabberd-2.1.15.tar.gz) = 1408858
diff --git a/net-im/jabberd/files/patch-sasl b/net-im/jabberd/files/patch-sasl
deleted file mode 100644
index f89776fccc0b..000000000000
--- a/net-im/jabberd/files/patch-sasl
+++ /dev/null
@@ -1,78 +0,0 @@
-Index: sx/sasl_cyrus.c
-===================================================================
---- sx/sasl_cyrus.c	(revision 349)
-+++ sx/sasl_cyrus.c	(working copy)
-@@ -745,7 +745,7 @@
- /** process handshake packets from the client */
- static void _sx_sasl_client_process(sx_t s, sx_plugin_t p, char *mech, char *in, int inlen) {
-     _sx_sasl_data_t sd = (_sx_sasl_data_t) s->plugin_data[p->index];
--    char *buf, *out;
-+    char *buf = NULL, *out = NULL;
-     int buflen, outlen, ret;
- 
-     /* decode the response */
-@@ -760,8 +760,15 @@
-     /* process the data */
-     if(mech != NULL)
-         ret = sasl_server_start(sd->sasl, mech, buf, buflen, (const char **) &out, &outlen);
--    else
-+    else {
-+        if(!sd->sasl) {
-+            _sx_debug(ZONE, "response send before auth request enabling mechanism (decoded: %.*s)", buflen, buf);
-+            _sx_nad_write(s, _sx_sasl_failure(s, _sasl_err_MECH_TOO_WEAK), 0);
-+            if(buf != NULL) free(buf);
-+            return;
-+        }
-         ret = sasl_server_step(sd->sasl, buf, buflen, (const char **) &out, &outlen);
-+    }
- 
-     if(buf != NULL) free(buf);
- 
-Index: sx/sasl_gsasl.c
-===================================================================
---- sx/sasl_gsasl.c	(revision 351)
-+++ sx/sasl_gsasl.c	(working copy)
-@@ -349,16 +349,14 @@
-     else {
-         /* decode and process */
-         _sx_sasl_decode(in, inlen, &buf, &buflen);
--        _sx_debug(ZONE, "response from client (decoded: %.*s)", buflen, buf);
--        ret = gsasl_step(sd, buf, buflen, &out, (size_t *) &outlen);
--        if(ret != GSASL_OK && ret != GSASL_NEEDS_MORE) {
--            _sx_debug(ZONE, "gsasl_step failed, no sasl for this conn; (%d): %s", ret, gsasl_strerror(ret));
--            _sx_nad_write(s, _sx_sasl_failure(s, _sasl_err_MALFORMED_REQUEST), 0);
--            if(out != NULL) free(out);
-+        if(!sd) {
-+            _sx_debug(ZONE, "response send before auth request enabling mechanism (decoded: %.*s)", buflen, buf);
-+            _sx_nad_write(s, _sx_sasl_failure(s, _sasl_err_MECH_TOO_WEAK), 0);
-             if(buf != NULL) free(buf);
-             return;
-         }
--
-+        _sx_debug(ZONE, "response from client (decoded: %.*s)", buflen, buf);
-+        ret = gsasl_step(sd, buf, buflen, &out, (size_t *) &outlen);
-     }
- 
-     if(buf != NULL) free(buf);
-Index: sx/sasl_scod.c
-===================================================================
---- sx/sasl_scod.c	(revision 349)
-+++ sx/sasl_scod.c	(working copy)
-@@ -258,10 +258,15 @@
-     }
- 
-     else {
--        _sx_debug(ZONE, "response from client");
--
-         /* decode and process */
-         _sx_sasl_decode(in, inlen, &buf, &buflen);
-+        if(!sd) {
-+            _sx_debug(ZONE, "response send before auth request enabling mechanism (decoded: %.*s)", buflen, buf);
-+            _sx_nad_write(s, _sx_sasl_failure(s, _sasl_err_MECH_TOO_WEAK), 0);
-+            if(buf != NULL) free(buf);
-+            return;
-+        }
-+        _sx_debug(ZONE, "response from client (decoded: %.*s)", buflen, buf);
-         ret = scod_server_step(sd, buf, buflen, &out, &outlen);
-     }
- 
diff --git a/net-im/jabberd/pkg-plist b/net-im/jabberd/pkg-plist
index dd981e31e260..05f3a2c0374a 100644
--- a/net-im/jabberd/pkg-plist
+++ b/net-im/jabberd/pkg-plist
@@ -108,8 +108,8 @@ lib/jabberd/mod_vacation.so.0
 lib/jabberd/mod_validate.la
 lib/jabberd/mod_validate.so
 lib/jabberd/mod_validate.so.0
-lib/jabberd/storage_fs.la
-lib/jabberd/storage_fs.so
+%%SUB_FS%%lib/jabberd/storage_fs.la
+%%SUB_FS%%lib/jabberd/storage_fs.so
 %%SUB_BDB%%lib/jabberd/storage_db.la
 %%SUB_BDB%%lib/jabberd/storage_db.so
 %%SUB_MYSQL%%lib/jabberd/storage_mysql.la