Changes 2.2.11:

* Use length with route keys
* closefd during main loop
* ported router connection closing improvement from cwave
* fix potential segfault in a call to xhash_putx()
* enforce iq type
* Fixed packet jabber:server -> jabber:client namespace mangling
* Fixed attribute namespace handling in NAD parser
* Fixed missing reference in log_error

5 files changed, 14 insertions, 28 deletions

diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index bf2c6a98029..7836152c925 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2010/09/16 08:04:14 adam Exp $
+# $NetBSD: Makefile,v 1.61 2010/11/09 07:33:10 adam Exp $
 
-DISTNAME=	jabberd-2.2.10
-PKGREVISION=	1
+DISTNAME=	jabberd-2.2.11
 CATEGORIES=	chat
 MASTER_SITES=	http://codex.xiaoka.com/pub/jabberd2/releases/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/chat/jabberd2/distinfo b/chat/jabberd2/distinfo
index 50b7302731f..a3bbbb6efc2 100644
--- a/chat/jabberd2/distinfo
+++ b/chat/jabberd2/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.21 2010/06/16 07:56:29 adam Exp $
+$NetBSD: distinfo,v 1.22 2010/11/09 07:33:11 adam Exp $
 
-SHA1 (jabberd-2.2.10.tar.bz2) = 911995b8363e3db83672f493a78fd550d612b63e
-RMD160 (jabberd-2.2.10.tar.bz2) = c900baa1ae629aa5847e4e2c0bc7cdb119ffa5ea
-Size (jabberd-2.2.10.tar.bz2) = 649638 bytes
-SHA1 (patch-aa) = 38366e20229effc28dc2f1314d8095d6d7c34077
+SHA1 (jabberd-2.2.11.tar.bz2) = 32956231dd5ab5a242545907341fab9bc6007d22
+RMD160 (jabberd-2.2.11.tar.bz2) = d4bac0f0cbf41788e5504ca1796f910b27c813d1
+Size (jabberd-2.2.11.tar.bz2) = 659500 bytes
+SHA1 (patch-aa) = 0db128003f37425a1b7b315f526828f2e328ddb4
 SHA1 (patch-ab) = c33cefcb0ddbcec732e475eaf5b931cdc8dd6cc7
 SHA1 (patch-ac) = 9bb5547c01fa3cc0f4df2133007a843aaed66bef
 SHA1 (patch-ad) = 2930f23bc8616ba2a5783cc8bb2a42c5d1c5eff7
 SHA1 (patch-ae) = 0c57279c309ef4f6a226d65a491fd040e03ae4f0
-SHA1 (patch-af) = efb289b0e1859bf8c7d5d6eb7b67d2b95f64c653
+SHA1 (patch-af) = 0a30ddc50345278eb8a20825f87754c914720b05
 SHA1 (patch-ag) = 2423bc1f7aced7d0010b51949fb2f9b5ddb44cc0
-SHA1 (patch-ah) = e22e6df0ce59922fba2751dd557b2353b2065fbe
diff --git a/chat/jabberd2/patches/patch-aa b/chat/jabberd2/patches/patch-aa
index fc40418e82e..6db3445777e 100644
--- a/chat/jabberd2/patches/patch-aa
+++ b/chat/jabberd2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2010/06/16 07:56:30 adam Exp $
+$NetBSD: patch-aa,v 1.10 2010/11/09 07:33:11 adam Exp $
 
---- Makefile.in.orig	2010-06-11 11:45:18.000000000 +0000
+--- Makefile.in.orig	2010-08-08 15:51:13.000000000 +0000
 +++ Makefile.in
-@@ -232,7 +232,7 @@ top_build_prefix = @top_build_prefix@
+@@ -233,7 +233,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  EXTRA_DIST = Doxyfile.in README.win32 README.protocol contrib UPGRADE tests/Makefile.in
diff --git a/chat/jabberd2/patches/patch-af b/chat/jabberd2/patches/patch-af
index d92a8df3566..ff828ba3bbb 100644
--- a/chat/jabberd2/patches/patch-af
+++ b/chat/jabberd2/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.6 2010/06/16 07:56:30 adam Exp $
+$NetBSD: patch-af,v 1.7 2010/11/09 07:33:11 adam Exp $
 
---- configure.orig	2010-06-11 11:45:15.000000000 +0000
+--- configure.orig	2010-08-08 15:51:09.000000000 +0000
 +++ configure
-@@ -11008,7 +11008,7 @@ fi
+@@ -10878,7 +10878,7 @@ fi
  # check for optimisation level
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS optimization level" >&5
  $as_echo_n "checking CFLAGS optimization level... " >&6; }
diff --git a/chat/jabberd2/patches/patch-ah b/chat/jabberd2/patches/patch-ah
deleted file mode 100644
index 518d6a6bd30..00000000000
--- a/chat/jabberd2/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.6 2010/06/16 07:56:30 adam Exp $
-
---- storage/storage_ldapvcard.c.orig	2010-06-13 06:44:33.000000000 +0000
-+++ storage/storage_ldapvcard.c
-@@ -143,7 +143,6 @@ static int rebindProc(LDAP *ld, LDAP_CON
-     drvdata_t data = mdata;
-     data->ld = ld;
-     if(ldap_simple_bind_s(data->ld, data->binddn, data->bindpw)) {
--        log_write(drv->st->sm->log, LOG_ERR, "ldap: bind failed (to %s): %s", url, ldap_err2string(_ldap_get_lderrno(data->ld)));
-         ldap_unbind_s(data->ld);
-         data->ld = NULL;
-         return NULL;