Changes 2.2.12:

Many stability fixes, memory leak fixes, and connection handling fixes.

6 files changed, 10 insertions, 100 deletions

diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index da1b6e75f24..d3a7acfc49f 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.63 2011/02/06 19:23:51 schnoebe Exp $
+# $NetBSD: Makefile,v 1.64 2011/02/12 18:50:13 adam Exp $
 
-DISTNAME=	jabberd-2.2.11
-PKGREVISION=	1
+DISTNAME=	jabberd-2.2.12
 CATEGORIES=	chat
 MASTER_SITES=	http://codex.xiaoka.com/pub/jabberd2/releases/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	schnoebe@netbsd.org
+MAINTAINER=	schnoebe@NetBSD.org
 HOMEPAGE=	http://jabberd2.xiaoka.com/
 COMMENT=	XMPP (Jabber) instant messaging server
 LICENSE=	gnu-gpl-v2
diff --git a/chat/jabberd2/distinfo b/chat/jabberd2/distinfo
index ea39dd13d11..12980f704a1 100644
--- a/chat/jabberd2/distinfo
+++ b/chat/jabberd2/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.24 2011/02/06 19:23:51 schnoebe Exp $
+$NetBSD: distinfo,v 1.25 2011/02/12 18:50:13 adam Exp $
 
-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 (jabberd-2.2.12.tar.bz2) = 36d55aa3e8d5c67b32e448158ce8794aafc39fe7
+RMD160 (jabberd-2.2.12.tar.bz2) = e45f205b524431d195a4e35466082c8557cc557b
+Size (jabberd-2.2.12.tar.bz2) = 625610 bytes
 SHA1 (patch-Makefile.in) = 0db128003f37425a1b7b315f526828f2e328ddb4
-SHA1 (patch-configure) = 0a30ddc50345278eb8a20825f87754c914720b05
-SHA1 (patch-router_router.c) = 04edab379f11ab42a9cbff7ab4466594273f5a1c
-SHA1 (patch-s2s_out.c) = 64454597acae90bc3926b4a28eba5a177e9f8413
-SHA1 (patch-sm_sm.c) = 9386f560d609316c209e56624e8b5e71ba43e7df
+SHA1 (patch-configure) = 63c4c916552779cb8d620efbaa1ccb6b9b7c08e2
diff --git a/chat/jabberd2/patches/patch-configure b/chat/jabberd2/patches/patch-configure
index 148221f36d4..b947aa58a5f 100644
--- a/chat/jabberd2/patches/patch-configure
+++ b/chat/jabberd2/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.1 2011/02/06 19:23:51 schnoebe Exp $
+$NetBSD: patch-configure,v 1.2 2011/02/12 18:50:14 adam Exp $
 
 --- configure.orig	2010-08-08 15:51:09.000000000 +0000
 +++ configure
-@@ -10878,7 +10878,7 @@ fi
+@@ -10875,7 +10875,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-router_router.c b/chat/jabberd2/patches/patch-router_router.c
deleted file mode 100644
index a988d1561f1..00000000000
--- a/chat/jabberd2/patches/patch-router_router.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-router_router.c,v 1.1 2011/02/06 19:23:51 schnoebe Exp $
-
-# correct a segfault in the router
-# fixed upstream as r920 (will be in 2.2.12)
-
---- router/router.c.orig	2010-08-08 15:50:56.000000000 +0000
-+++ router/router.c
-@@ -886,7 +886,7 @@ static int _router_sx_callback(sx_t s, s
-             }
- 
-             /* top element must be router scoped */
--            if(NAD_NURI_L(nad, NAD_ENS(nad, 0)) != strlen(uri_COMPONENT) || strncmp(uri_COMPONENT, NAD_NURI(nad, NAD_ENS(nad, 0)), strlen(uri_COMPONENT)) != 0) {
-+            if(NAD_ENS(nad, 0) < 0 || NAD_NURI_L(nad, NAD_ENS(nad, 0)) != strlen(uri_COMPONENT) || strncmp(uri_COMPONENT, NAD_NURI(nad, NAD_ENS(nad, 0)), strlen(uri_COMPONENT)) != 0) {
-                 log_debug(ZONE, "invalid packet namespace, dropping");
-                 nad_free(nad);
-                 return 0;
diff --git a/chat/jabberd2/patches/patch-s2s_out.c b/chat/jabberd2/patches/patch-s2s_out.c
deleted file mode 100644
index 303a25bd6f5..00000000000
--- a/chat/jabberd2/patches/patch-s2s_out.c
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-s2s_out.c,v 1.1 2011/02/06 19:23:51 schnoebe Exp $
-
-# Resolver doesn't return IPv4 Address if resolve_aaaa (IPv6) is enabled
-# fixed upstream as part of r915 (will be available in 2.2.12)
-
---- s2s/out.c	(revision 914)
-+++ s2s/out.c	(revision 915)
-@@ -1071,10 +1071,8 @@
- 
-         /* resolve hostname */
-         free(query->cur_host);
--        query->cur_host = strndup(ipport, ipport_len);
--        tmp = malloc(sizeof(char) * port_len + 1);
--        strncpy(tmp, c, port_len);
--        tmp[port_len] = '\0';
-+        query->cur_host = strndup(ipport, ip_len);
-+        tmp = strndup(c, port_len);
-         query->cur_port = atoi(tmp);
-         free(tmp);
-         query->cur_prio = res->prio;
-@@ -1082,29 +1080,23 @@
-         query->cur_expiry = res->expiry;
-         log_debug(ZONE, "dns ttl for %s@%p limited to %d", query->name, query, query->cur_expiry);
- 
--        tmp = malloc(sizeof(char) * ip_len + 1);
--        strncpy(tmp, ipport, ip_len);
--        tmp[ip_len] = '\0';
--
-         if (query->s2s->resolve_aaaa) {
--            log_debug(ZONE, "dns request for %s@%p: AAAA %s", query->name, query, tmp);
-+            log_debug(ZONE, "dns request for %s@%p: AAAA %s", query->name, query, query->cur_host);
- 
--            query->query = dns_submit_a6(NULL, tmp, DNS_NOSRCH, _dns_result_aaaa, query);
-+            query->query = dns_submit_a6(NULL, query->cur_host, DNS_NOSRCH, _dns_result_aaaa, query);
- 
-             /* if submit failed, call ourselves with a NULL result */
-             if (query->query == NULL)
-                 _dns_result_aaaa(ctx, NULL, query);
-         } else {
--            log_debug(ZONE, "dns request for %s@%p: A %s", query->name, query, tmp);
-+            log_debug(ZONE, "dns request for %s@%p: A %s", query->name, query, query->cur_host);
- 
--            query->query = dns_submit_a4(NULL, tmp, DNS_NOSRCH, _dns_result_a, query);
-+            query->query = dns_submit_a4(NULL, query->cur_host, DNS_NOSRCH, _dns_result_a, query);
- 
-             /* if submit failed, call ourselves with a NULL result */
-             if (query->query == NULL)
-                 _dns_result_a(ctx, NULL, query);
-         }
--        
--        free(tmp);
- 
-     /* finished */
-     } else {
diff --git a/chat/jabberd2/patches/patch-sm_sm.c b/chat/jabberd2/patches/patch-sm_sm.c
deleted file mode 100644
index cb5a15520ef..00000000000
--- a/chat/jabberd2/patches/patch-sm_sm.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-sm_sm.c,v 1.1 2011/02/06 19:23:51 schnoebe Exp $
-
-# fix segfault when debugging is turned on/up.  
-# fixed up stream as part of r910 (will be released with 2.2.12)
-
---- sm/sm.c.orig	2010-08-08 15:50:55.000000000 +0000
-+++ sm/sm.c
-@@ -138,7 +138,7 @@ int sm_sx_callback(sx_t s, sx_event_t e,
-                 elem = nad_append_elem(nad, ns, "bind", 0);
-                 nad_set_attr(nad, elem, -1, "name", domain, len);
-                 nad_append_attr(nad, -1, "multi", "to");
--                log_debug(ZONE, "requesting domain bind for '%.*s'", domain, len);
-+                log_debug(ZONE, "requesting domain bind for '%.*s'", len, domain);
-                 sx_nad_write(sm->router, nad);
-             
-             } while(xhash_iter_next(sm->hosts));