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

4 files changed, 43 insertions, 9 deletions

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);