Changes 2.2.16:

* Implemented --enable-tests configure option
* Fixed 'make dist' packaging
* Fixed domain name in punycode resolution
* Expand @package@ in etc/*.xml.dist.in
* storage_ldapvcard compilation fixes
* Implement debug logging into file
* Fix invalid default router.xml (Unterminated XML comment tag)
* Fixed libstorage_la_SOURCES
* Implemented support for fake (PBX) sessions in SM
* PBX integration priority setting support
* Fix a crash that occurs when c2s connecting clients passed the defined
  connection limit
* Log S2S retry timeout to main log
* Do not log messages when not enabled or empty logfile configured

7 files changed, 60 insertions, 22 deletions

diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index 702c05e3eb7..ccde15efbbd 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.70 2012/04/27 12:31:35 obache Exp $
+# $NetBSD: Makefile,v 1.71 2012/05/12 05:44:45 adam Exp $
 
-DISTNAME=	jabberd-2.2.14
-PKGREVISION=	2
+DISTNAME=	jabberd-2.2.16
 CATEGORIES=	chat
-MASTER_SITES=	http://codex.xiaoka.com/pub/jabberd2/releases/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	https://github.com/downloads/Jabberd2/jabberd2/
+FETCH_USING=	curl
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://jabberd2.xiaoka.com/
@@ -17,7 +16,7 @@ CONFLICTS=		jabberd-[0-9]*
 
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
-USE_TOOLS+=		perl:run
+USE_TOOLS+=		perl:run pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-anon
 CONFIGURE_ARGS+=	--enable-pipe
@@ -125,6 +124,7 @@ post-install:
 .endfor
 
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/cppunit/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../net/udns/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/chat/jabberd2/PLIST b/chat/jabberd2/PLIST
index 2e9a08739be..50c882b8f4f 100644
--- a/chat/jabberd2/PLIST
+++ b/chat/jabberd2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2010/06/16 07:56:29 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2012/05/12 05:44:45 adam Exp $
 bin/bdbdump.pl
 bin/c2s
 bin/jabberd
@@ -6,6 +6,7 @@ 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
@@ -15,6 +16,7 @@ ${PLIST.pam}lib/jabberd/authreg_pam.la
 ${PLIST.pgsql}lib/jabberd/authreg_pgsql.la
 ${PLIST.sqlite}lib/jabberd/authreg_sqlite.la
 lib/jabberd/authreg_pipe.la
+lib/jabberd/libstorage.la
 lib/jabberd/mod_active.la
 lib/jabberd/mod_amp.la
 lib/jabberd/mod_announce.la
diff --git a/chat/jabberd2/distinfo b/chat/jabberd2/distinfo
index 9b191b9a1cb..5d0e7eb9780 100644
--- a/chat/jabberd2/distinfo
+++ b/chat/jabberd2/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.27 2011/06/01 11:16:09 adam Exp $
+$NetBSD: distinfo,v 1.28 2012/05/12 05:44:46 adam Exp $
 
-SHA1 (jabberd-2.2.14.tar.bz2) = 419319cf8a9ec188b50c349033567977a97d0d72
-RMD160 (jabberd-2.2.14.tar.bz2) = 29e2eaeac85dcbd8872478e64b1420c1288b8548
-Size (jabberd-2.2.14.tar.bz2) = 615984 bytes
-SHA1 (patch-Makefile.in) = 0db128003f37425a1b7b315f526828f2e328ddb4
-SHA1 (patch-configure) = 3142e9bfdaa1a147d75a3ae86db3287b25129b35
+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 (patch-sm_mod_roster.c) = f43d80c2abfd31d99016b4738a717d3c6db183ce
diff --git a/chat/jabberd2/patches/patch-Makefile.in b/chat/jabberd2/patches/patch-Makefile.in
index a2b7d6177dc..20c49a38a57 100644
--- a/chat/jabberd2/patches/patch-Makefile.in
+++ b/chat/jabberd2/patches/patch-Makefile.in
@@ -1,13 +1,15 @@
-$NetBSD: patch-Makefile.in,v 1.1 2011/02/06 19:23:51 schnoebe Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2012/05/12 05:44:46 adam Exp $
 
---- Makefile.in.orig	2010-08-08 15:51:13.000000000 +0000
+Skip etc.
+
+--- Makefile.in.orig	2012-05-12 05:19:32.000000000 +0000
 +++ Makefile.in
-@@ -233,7 +233,7 @@ top_build_prefix = @top_build_prefix@
+@@ -247,7 +247,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
--SUBDIRS = etc man $(am__append_1) tools mio sx util c2s router s2s sm \
-+SUBDIRS = man $(am__append_1) tools mio sx util c2s router s2s sm \
- 	storage
+ EXTRA_DIST = Doxyfile.in README.win32 README.protocol README.config contrib UPGRADE 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)
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/chat/jabberd2/patches/patch-configure b/chat/jabberd2/patches/patch-configure
index e0888ea1e13..651fb51ebda 100644
--- a/chat/jabberd2/patches/patch-configure
+++ b/chat/jabberd2/patches/patch-configure
@@ -1,8 +1,10 @@
-$NetBSD: patch-configure,v 1.3 2011/06/01 11:16:09 adam Exp $
+$NetBSD: patch-configure,v 1.4 2012/05/12 05:44:46 adam Exp $
+
+Allow -Os in CFLAGS.
 
 --- configure.orig	2011-05-31 22:11:47.000000000 +0000
 +++ configure
-@@ -10896,7 +10896,7 @@ fi
+@@ -15431,7 +15431,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
new file mode 100644
index 00000000000..05a19c2bb16
--- /dev/null
+++ b/chat/jabberd2/patches/patch-s2s_out.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-s2s_out.c,v 1.3 2012/05/12 05:44:46 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) {
+             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
new file mode 100644
index 00000000000..dc52def9b57
--- /dev/null
+++ b/chat/jabberd2/patches/patch-sm_mod_roster.c
@@ -0,0 +1,15 @@
+$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);