Update to 2.1.24.

  Added missing files to distribution

  Check for non configured c2s local.id

  Added tool to migrate from jabberd14 to jabberd2 SQLite. BBN.com
  contribution.

  Fix for authreg_pipe. Fixes #204

  Updated bdb2mysql.rb to jabberd 2.1 DB schema

  Do not handle disco to nodes

  Fixed vCard get

  Fixed empty node check

  Restored reading [jabberd] group from my.cnf

  Unified way utf-8 is selected in MySQL backend

  Merged crypted passwords support for MySQL. Closes #184 and 197

  Removed debug that might cause segfault. Fixes #196.

  Do not handle vCard request destined to full JIDs. Fixes #190

  Added charset utf-8 to db-setup.mysql

  Fixes segfault that happend when there are multiple sessions and
  privacy list was changed. Fixes #188

  Really fix gsasl ANONYMOUS login

  Webstatus presence resource enabled only when service enabled

  Added server component presence resources

  Added maxstanzasize debug message

  Include “util/inaddr.h” for socklen_t ss_family etc. Refs #191

  Include <stdarg.h> if available. Refs #191

  TYPE_SOCKLEN_T check. Refs #91

  TYPE_SOCKLEN_T check. Refs #91

  Include inttypes.h instead of stdlib.h as it is more universally
  available. Refs #191

  Check for stdarg.h in configure.

  Remove AC_PROG_GCC_TRADITIONAL (obsolete).

  Remove AC_FUNC_MALLOC, AC_FUNC_REALLOC - if they find malloc(0) does
  not return a valid pointer malloc will be defined to rpl_malloc, and
  no rpl_malloc is available. See
  http://www.gnu.org/software/autoconf/manual/autoconf.html#Particular-Functions

  Seems easier to use AC_SEARCH_LIBS for inet_ntop etc.

  Move the broken __ss_family check so that it appears after the check
  for struct sockaddr_storage.

  Check for socklen_t

  Fix –enable-pgsql

  Fixed compatibility with VC++ and ANSI, variables must be declared at
  the beginning of the block.

  Check for Win32 OpenSSL and Visual C++ 2005 SP1 Redistributable
  Package (x86), and raise error if not found in the installer.

  Updated Makefile.am witn new README.protocol file

  Unified URI/URN definitions

3 files changed, 12 insertions, 13 deletions

diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index 30fb3a2d3af..2feb5de1c94 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2009/05/28 20:55:59 zafer Exp $
+# $NetBSD: Makefile,v 1.50 2009/07/24 19:05:53 gdt Exp $
 #
 
-DISTNAME=		jabberd-2.1.23
-PKGREVISION=		1
+DISTNAME=		jabberd-2.1.24
 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 eb06692ce8f..43b67da7e57 100644
--- a/chat/jabberd2/distinfo
+++ b/chat/jabberd2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2008/02/20 14:33:04 xtraeme Exp $
+$NetBSD: distinfo,v 1.16 2009/07/24 19:05:53 gdt Exp $
 
-SHA1 (jabberd-2.1.23.tar.bz2) = eb05cc918f035316d47a4b4faae40f3ca976e0d6
-RMD160 (jabberd-2.1.23.tar.bz2) = 224a0cfd405d30e66a8259b579e94a556ef568b2
-Size (jabberd-2.1.23.tar.bz2) = 645473 bytes
-SHA1 (patch-aa) = fd63fa375ba477e988e057ab7dd65ab75b573f94
+SHA1 (jabberd-2.1.24.tar.bz2) = fa93dc53d7443a96494baecabfd311769abfd6b6
+RMD160 (jabberd-2.1.24.tar.bz2) = 3608e8df96dfd14a57f066e85304e22aa4aa6d1b
+Size (jabberd-2.1.24.tar.bz2) = 649648 bytes
+SHA1 (patch-aa) = 524ac9a1c82914728aff96be527d624cb0ab648e
 SHA1 (patch-ab) = de1c8ec12b55117223bcca2071499c42ab145a34
 SHA1 (patch-ac) = e6e006bf73c345bb3bf873e389885c7f64bad11c
 SHA1 (patch-ad) = db126c24dcf85c0c3c790b5b8723c6ae4da59453
diff --git a/chat/jabberd2/patches/patch-aa b/chat/jabberd2/patches/patch-aa
index d76beb41999..6308ac4c4dd 100644
--- a/chat/jabberd2/patches/patch-aa
+++ b/chat/jabberd2/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.5 2008/02/20 14:33:04 xtraeme Exp $
+$NetBSD: patch-aa,v 1.6 2009/07/24 19:05:53 gdt Exp $
 
---- Makefile.in.orig	2008-02-03 08:23:47.000000000 -0600
+--- Makefile.in.orig	2008-04-24 17:26:15.000000000 -0400
 +++ Makefile.in
-@@ -223,7 +223,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+@@ -194,7 +194,7 @@ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
  EXTRA_DIST = Doxyfile.in README.win32 README.protocol contrib UPGRADE
 -SUBDIRS = etc tools man mio subst sx util c2s resolver router s2s sm storage
 +SUBDIRS = tools man mio subst sx util c2s resolver router s2s sm storage