Update to jabberd 2.3.1

* 2.3.0 to 2.3.1 upgrade:

What changed:
- Marked "TLS-Everywhere" as EXPERIMENTAL feature
- default EXPERIMENTAL to 'no'
- default SUPERSEDED to 'no'
- moved STANZA-ACK and MY-IP-ADDRESS XEPs and IQ-PRIVATE push
  out of experimental status


* 2.2.17 to 2.3.0 upgrade:

What changed:
- Renamed non-standard UPGRADE file overwriting outdated NEWS file
- Semantic Versioning: http://semver.org/
- TLS Everywhere: https://github.com/stpeter/manifesto
- Required GSASL >=1.1
- jabberd should compile without warnings
- out-of-source builds should work
- pgsql: authreg password_type support
- pgsql: schema support
- ldapvcard: groupattr works even if no groupattr_regex defined
- ldapfull: checks for ldap group membership on login
- vCard: Assume tel phone is voice phone
- MySQL: default password hashing algorithm changed to SHA512
- out-conn-reuse s2s.xml option naming unified
- XML parse error will log buffer details
- CRAM-MD5 auth support
- router private key cachain and password support
- hashed passwords support in SQLite3 storage

7 files changed, 18 insertions, 50 deletions

diff --git a/chat/jabberd2/MESSAGE b/chat/jabberd2/MESSAGE
index ac41ee176b4..b0eee9fb637 100644
--- a/chat/jabberd2/MESSAGE
+++ b/chat/jabberd2/MESSAGE
@@ -1,6 +1,6 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2009/08/21 02:28:12 schnoebe Exp $
+$NetBSD: MESSAGE,v 1.2 2013/12/12 23:01:02 schnoebe Exp $
 
-	Review ${PREFIX}/share/doc/jabberd/UPGRADE if you're upgrading
+	Review ${PREFIX}/share/doc/jabberd/NEWS if you're upgrading
 	from an earlier release of Jabberd 2.x.
 ===========================================================================
diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index 7dfe6d3e155..b57d4bf51d8 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.86 2013/11/01 21:34:15 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2013/12/12 23:01:02 schnoebe Exp $
 
-DISTNAME=	jabberd-2.2.17
-PKGREVISION=	11
+DISTNAME=	jabberd-2.3.1
 CATEGORIES=	chat
-MASTER_SITES=	http://cloud.github.com/downloads/jabberd2/jabberd2/
+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/
@@ -64,7 +64,7 @@ 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 UPGRADE ChangeLog
+DOCFILES=		README.protocol README README.config NEWS
 
 INSTALLATION_DIRS=	bin ${EGDIR} ${DOCDIR}
 
diff --git a/chat/jabberd2/PLIST b/chat/jabberd2/PLIST
index 0ed8823e1ef..8249cacb42a 100644
--- a/chat/jabberd2/PLIST
+++ b/chat/jabberd2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2012/08/26 18:25:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2013/12/12 23:01:02 schnoebe Exp $
 bin/bdbdump.pl
 bin/c2s
 bin/jabberd
@@ -54,7 +54,7 @@ man/man8/sm.8
 share/doc/jabberd/ChangeLog
 share/doc/jabberd/README
 share/doc/jabberd/README.protocol
-share/doc/jabberd/UPGRADE
+share/doc/jabberd/README.config
 share/examples/jabberd/c2s.xml
 share/examples/jabberd/db-jd14-2-jd2.sql
 share/examples/jabberd/db-setup.mysql
diff --git a/chat/jabberd2/distinfo b/chat/jabberd2/distinfo
index 3a0bcfc2859..ee15fa56a97 100644
--- a/chat/jabberd2/distinfo
+++ b/chat/jabberd2/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.31 2012/08/27 05:14:55 dholland Exp $
+$NetBSD: distinfo,v 1.32 2013/12/12 23:01:02 schnoebe Exp $
 
-SHA1 (jabberd-2.2.17.tar.xz) = 2b94707e0a06d07ba0329760d308460edf0f1cd8
-RMD160 (jabberd-2.2.17.tar.xz) = 4e0d30fdd24ce707ce3c5e3654f51c01de7ee0a2
-Size (jabberd-2.2.17.tar.xz) = 1382124 bytes
-SHA1 (patch-Makefile.in) = 9cdc341d764b28d331b51fb5a559afbc0b3e952b
+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 (patch-Makefile.in) = 8be9b6820e46c0e62808c8eecee6c7bd72e94ee2
 SHA1 (patch-configure) = 1a58cc7b015a73009d8140402dfb739fc48e7fa0
-SHA1 (patch-s2s_out.c) = c72be21c425b56345eb8a79284b4e4aaf18c0d65
-SHA1 (patch-sm_mod_roster.c) = f43d80c2abfd31d99016b4738a717d3c6db183ce
diff --git a/chat/jabberd2/patches/patch-Makefile.in b/chat/jabberd2/patches/patch-Makefile.in
index aae1817242c..e0c18b99979 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.3 2012/08/26 18:25:47 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.4 2013/12/12 23:01:02 schnoebe Exp $
 
 Skip etc.
 
---- Makefile.in.orig	2012-05-12 05:19:32.000000000 +0000
+--- Makefile.in.orig	2013-11-28 11:16:25.000000000 +0000
 +++ Makefile.in
-@@ -245,7 +245,7 @@ top_build_prefix = @top_build_prefix@
+@@ -333,7 +333,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 UPGRADE docs win32
+ EXTRA_DIST = Doxyfile.in 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-s2s_out.c b/chat/jabberd2/patches/patch-s2s_out.c
deleted file mode 100644
index d70af772110..00000000000
--- a/chat/jabberd2/patches/patch-s2s_out.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-s2s_out.c,v 1.4 2012/08/26 18:25:47 adam Exp $
-
-Non-void function must return a value.
-
---- s2s/out.c.orig	2012-05-12 05:21:36.000000000 +0000
-+++ s2s/out.c
-@@ -627,7 +627,7 @@ int out_packet(s2s_t s2s, pkt_t pkt) {
-             nad_free(pkt->nad);
-         free(pkt);
- 
--        return;
-+        return -1;
-     }
- 
-     /* new route key */
diff --git a/chat/jabberd2/patches/patch-sm_mod_roster.c b/chat/jabberd2/patches/patch-sm_mod_roster.c
deleted file mode 100644
index dc52def9b57..00000000000
--- a/chat/jabberd2/patches/patch-sm_mod_roster.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-sm_mod_roster.c,v 1.1 2012/05/12 05:44:46 adam Exp $
-
-Void function must not return any values.
-
---- sm/mod_roster.c.orig	2012-05-12 05:25:14.000000000 +0000
-+++ sm/mod_roster.c
-@@ -460,7 +460,7 @@ static void _roster_set_item(pkt_t pkt, 
-     log_debug(ZONE, "added %s to roster (to %d from %d ask %d name %s ngroups %d)", jid_full(item->jid), item->to, item->from, item->ask, item->name, item->ngroups);
- 
-     if (sm_storage_rate_limit(sess->user->sm, jid_user(sess->user->jid)))
--        return -stanza_err_RESOURCE_CONSTRAINT;
-+        return;
- 
-     /* save changes */
-     _roster_save_item(sess->user, item);