Changes 2.2.17:

* Fixed possibility of Unsolicited Dialback Attacks
* Use XML_SetHashSalt with expat 2.1.x only
* Fix s2s crash with witelist enabled

7 files changed, 22 insertions, 22 deletions

diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index ccde15efbbd..2ac96751d40 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.71 2012/05/12 05:44:45 adam Exp $
+# $NetBSD: Makefile,v 1.72 2012/08/26 18:25:47 adam Exp $
 
-DISTNAME=	jabberd-2.2.16
+DISTNAME=	jabberd-2.2.17
 CATEGORIES=	chat
 MASTER_SITES=	https://github.com/downloads/Jabberd2/jabberd2/
+EXTRACT_SUFX=	.tar.xz
 FETCH_USING=	curl
 
 MAINTAINER=	adam@NetBSD.org
diff --git a/chat/jabberd2/PLIST b/chat/jabberd2/PLIST
index 50c882b8f4f..0ed8823e1ef 100644
--- a/chat/jabberd2/PLIST
+++ b/chat/jabberd2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2012/05/12 05:44:45 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2012/08/26 18:25:47 adam Exp $
 bin/bdbdump.pl
 bin/c2s
 bin/jabberd
@@ -6,7 +6,6 @@ bin/pipe-auth.pl
 bin/router
 bin/s2s
 bin/sm
-bin/tests
 lib/jabberd/authreg_anon.la
 ${PLIST.db}lib/jabberd/authreg_db.la
 ${PLIST.ldap}lib/jabberd/authreg_ldap.la
diff --git a/chat/jabberd2/distinfo b/chat/jabberd2/distinfo
index 88b0046c09f..04860177740 100644
--- a/chat/jabberd2/distinfo
+++ b/chat/jabberd2/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.29 2012/06/16 05:34:31 dholland Exp $
+$NetBSD: distinfo,v 1.30 2012/08/26 18:25:47 adam Exp $
 
-SHA1 (jabberd-2.2.16.tar.gz) = d39f7475ec676a127e948f2c5f73d7605ec5a7f9
-RMD160 (jabberd-2.2.16.tar.gz) = c778babd0a883506f874dff56f879f800533e73c
-Size (jabberd-2.2.16.tar.gz) = 2818476 bytes
-SHA1 (patch-Makefile.in) = 10d7ad04ee5c0844e948f0302420a77a89c05b08
-SHA1 (patch-configure) = cf61b12c93c94e167c710a776128b73bb91ce0c3
-SHA1 (patch-s2s_out.c) = 89580485bc82ce57e22c382eb464b60c3820f346
+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 (patch-configure) = 1a58cc7b015a73009d8140402dfb739fc48e7fa0
+SHA1 (patch-s2s_out.c) = c72be21c425b56345eb8a79284b4e4aaf18c0d65
 SHA1 (patch-sm_mod_roster.c) = f43d80c2abfd31d99016b4738a717d3c6db183ce
-SHA1 (patch-util_log_c) = acc4f8747976ac189ccd95b9a3b5809887da4a32
+SHA1 (patch-util_log_c) = d7a5c6f8b0fe04be2ef53ed941100ca9dc53e9be
diff --git a/chat/jabberd2/patches/patch-Makefile.in b/chat/jabberd2/patches/patch-Makefile.in
index 20c49a38a57..aae1817242c 100644
--- a/chat/jabberd2/patches/patch-Makefile.in
+++ b/chat/jabberd2/patches/patch-Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile.in,v 1.2 2012/05/12 05:44:46 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.3 2012/08/26 18:25:47 adam Exp $
 
 Skip etc.
 
 --- Makefile.in.orig	2012-05-12 05:19:32.000000000 +0000
 +++ Makefile.in
-@@ -247,7 +247,7 @@ top_build_prefix = @top_build_prefix@
+@@ -245,7 +245,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
diff --git a/chat/jabberd2/patches/patch-configure b/chat/jabberd2/patches/patch-configure
index 651fb51ebda..14c940fde0a 100644
--- a/chat/jabberd2/patches/patch-configure
+++ b/chat/jabberd2/patches/patch-configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.4 2012/05/12 05:44:46 adam Exp $
+$NetBSD: patch-configure,v 1.5 2012/08/26 18:25:47 adam Exp $
 
 Allow -Os in CFLAGS.
 
 --- configure.orig	2011-05-31 22:11:47.000000000 +0000
 +++ configure
-@@ -15431,7 +15431,7 @@ fi
+@@ -11762,7 +11762,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-s2s_out.c b/chat/jabberd2/patches/patch-s2s_out.c
index 05a19c2bb16..d70af772110 100644
--- a/chat/jabberd2/patches/patch-s2s_out.c
+++ b/chat/jabberd2/patches/patch-s2s_out.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-s2s_out.c,v 1.3 2012/05/12 05:44:46 adam Exp $
+$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
-@@ -632,7 +632,7 @@ int out_packet(s2s_t s2s, pkt_t pkt) {
+@@ -627,7 +627,7 @@ int out_packet(s2s_t s2s, pkt_t pkt) {
              nad_free(pkt->nad);
          free(pkt);
  
diff --git a/chat/jabberd2/patches/patch-util_log_c b/chat/jabberd2/patches/patch-util_log_c
index f6f587bbda9..ec55194c1e2 100644
--- a/chat/jabberd2/patches/patch-util_log_c
+++ b/chat/jabberd2/patches/patch-util_log_c
@@ -1,13 +1,13 @@
-$NetBSD: patch-util_log_c,v 1.1 2012/06/16 05:34:31 dholland Exp $
+$NetBSD: patch-util_log_c,v 1.2 2012/08/26 18:25:47 adam Exp $
 
 Provide set_debug_log_from_config() when DEBUG is turned off; avoids
 link failure.
 
---- util/log.c~	2012-05-04 14:51:08.000000000 +0000
+--- util/log.c.orig	2012-05-05 13:54:17.000000000 +0000
 +++ util/log.c
-@@ -263,4 +263,7 @@ void debug_log(const char *file, int lin
+@@ -266,4 +266,7 @@ void set_debug_flag(int v)
  
- void set_debug_flag(int v)
+ void set_debug_log_from_config(config_t c)
  { }
 +
 +int set_debug_log_from_config(config_t c)