Update to 2.1.6 (last stable version).

A lot of changes were made since previous update, like SASL support,
SQLite support, etc. Please see the following URL for a full list
of changes:

http://jabberd2.xiaoka.com/wiki/Releases

7 files changed, 133 insertions, 67 deletions

diff --git a/chat/jabberd2/patches/patch-aa b/chat/jabberd2/patches/patch-aa
index 2da44e996eb..8505a97f445 100644
--- a/chat/jabberd2/patches/patch-aa
+++ b/chat/jabberd2/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2005/05/24 21:02:53 xtraeme Exp $
+$NetBSD: patch-aa,v 1.4 2007/05/26 11:50:12 xtraeme Exp $
 
---- Makefile.in.orig	2005-05-24 22:43:59.000000000 +0200
-+++ Makefile.in	2005-05-24 22:44:20.000000000 +0200
-@@ -170,7 +170,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- EXTRA_DIST = PROTOCOL Doxyfile.in README.win32 contrib
--SUBDIRS = etc tools man expat mio scod subst sx util c2s resolver router s2s sm
-+SUBDIRS = tools man expat mio scod subst sx util c2s resolver router s2s sm
+--- Makefile.in.orig	2007-05-26 12:01:18.000000000 +0200
++++ Makefile.in	2007-05-26 12:01:22.000000000 +0200
+@@ -191,7 +191,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = PROTOCOL Doxyfile.in README.win32 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
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
diff --git a/chat/jabberd2/patches/patch-ac b/chat/jabberd2/patches/patch-ac
index 50ba0c2aa72..d913f57014e 100644
--- a/chat/jabberd2/patches/patch-ac
+++ b/chat/jabberd2/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/03/28 19:44:09 xtraeme Exp $
+$NetBSD: patch-ac,v 1.2 2007/05/26 11:50:13 xtraeme Exp $
 
---- etc/sm.xml.in.orig	2003-10-08 02:32:20.000000000 +0200
-+++ etc/sm.xml.in	2003-10-08 02:33:37.000000000 +0200
+--- etc/sm.xml.in.orig	2007-05-26 12:01:56.000000000 +0200
++++ etc/sm.xml.in	2007-05-26 12:03:46.000000000 +0200
 @@ -9,7 +9,7 @@
    <!-- The process ID file. comment this out if you don't need to know
         to know the process ID from outside the process (eg for control
@@ -11,16 +11,16 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/03/28 19:44:09 xtraeme Exp $
  
    <!-- Router connection configuration -->
    <router>
-@@ -26,7 +26,7 @@
-          commented out, or the file can't be read, no attempt will be
-          made to establish an encrypted channel with the router. -->
+@@ -31,7 +31,7 @@
+          If this is commented out, or the file can't be read, no attempt
+          will be made to establish an encrypted channel with the router. -->
      <!--
 -    <pemfile>@sysconfdir@/server.pem</pemfile>
 +    <pemfile>@SSLCERTS@/server.pem</pemfile>
      -->
  
      <!-- Router connection retry -->
-@@ -55,7 +55,7 @@
+@@ -64,7 +64,7 @@
  
      <!-- If logging to file, this is the filename of the logfile -->
      <!--
@@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/03/28 19:44:09 xtraeme Exp $
      -->
    </log>
  
-@@ -116,7 +116,7 @@
+@@ -128,7 +128,7 @@
      <!-- Berkeley DB driver configuration -->
      <db>
        <!-- Directory to store database files under -->
@@ -38,12 +38,12 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/03/28 19:44:09 xtraeme Exp $
  
        <!-- Synchronize the database to disk after each write. If you
             disable this, database accesses may be faster, but data may
-@@ -371,7 +371,7 @@
-          stored in the users data store when they are created. -->
-     <template>
-       <!--
--      <roster>@sysconfdir@/templates/roster.xml</roster>
-+      <roster>@PKG_SYSCONFDIR@/roster.xml</roster>
-       -->
-     </template>
-   </user>
+@@ -153,7 +153,7 @@
+     <!-- SQLite driver configuration -->
+     <sqlite>
+       <!-- Database name -->
+-      <dbname>@localstatedir@/jabberd/db/sqlite.db</dbname>
++      <dbname>@DBDIR@/sqlite.db</dbname>
+ 
+       <!-- Transacation support. If this is commented out, transactions
+            will be disabled. This might make database accesses faster,
diff --git a/chat/jabberd2/patches/patch-ad b/chat/jabberd2/patches/patch-ad
index 319ed91ce72..81aaa737dde 100644
--- a/chat/jabberd2/patches/patch-ad
+++ b/chat/jabberd2/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/03/28 19:44:09 xtraeme Exp $
+$NetBSD: patch-ad,v 1.2 2007/05/26 11:50:13 xtraeme Exp $
 
---- etc/s2s.xml.in.orig	2003-10-08 02:31:16.000000000 +0200
-+++ etc/s2s.xml.in	2003-10-08 02:31:56.000000000 +0200
+--- etc/s2s.xml.in.orig	2007-05-26 12:04:13.000000000 +0200
++++ etc/s2s.xml.in	2007-05-26 12:05:01.000000000 +0200
 @@ -6,7 +6,7 @@
    <!-- The process ID file. comment this out if you don't need to know
         to know the process ID from outside the process (eg for control
@@ -11,16 +11,16 @@ $NetBSD: patch-ad,v 1.1.1.1 2004/03/28 19:44:09 xtraeme Exp $
  
    <!-- Router connection configuration -->
    <router>
-@@ -33,7 +33,7 @@
-          commented out, or the file can't be read, no attempt will be
-          made to establish an encrypted channel with the router. -->
+@@ -38,7 +38,7 @@
+          If this is commented out, or the file can't be read, no attempt
+          will be made to establish an encrypted channel with the router. -->
      <!--
 -    <pemfile>@sysconfdir@/server.pem</pemfile>
 +    <pemfile>@SSLCERTS@/server.pem</pemfile>
      -->
  
      <!-- Router connection retry -->
-@@ -62,7 +62,7 @@
+@@ -71,7 +71,7 @@
  
      <!-- if logging to file, this is the filename of the logfile -->
      <!--
@@ -29,3 +29,21 @@ $NetBSD: patch-ad,v 1.1.1.1 2004/03/28 19:44:09 xtraeme Exp $
      -->
    </log>
  
+@@ -105,7 +105,7 @@
+          If this is commented out, or the file can't be read, no attempt will be
+          made to establish encrypted connections with other servers. -->
+     <!--
+-    <pemfile>@sysconfdir@/server.pem</pemfile>
++    <pemfile>@SSLCERTS@/server.pem</pemfile>
+     -->
+ 
+     <!-- SSL verify mode - see SSL_CTX_set_verify(3), mode parameter -->
+@@ -116,7 +116,7 @@
+     <!-- File containing an optional SSL certificate chain file for SSL 
+          connections. -->
+     <!--
+-    <cachain>@sysconfdir@/cachain.pem</cachain>
++    <cachain>@SSLCERTS@/cachain.pem</cachain>
+     -->
+ 
+   </local>
diff --git a/chat/jabberd2/patches/patch-ae b/chat/jabberd2/patches/patch-ae
index cbfa8923e68..d9d11f88eb2 100644
--- a/chat/jabberd2/patches/patch-ae
+++ b/chat/jabberd2/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.2 2006/04/21 09:18:37 rillig Exp $
+$NetBSD: patch-ae,v 1.3 2007/05/26 11:50:13 xtraeme Exp $
 
---- etc/router.xml.in.orig	2003-11-05 01:19:46.000000000 +0100
-+++ etc/router.xml.in	2003-11-05 01:20:44.000000000 +0100
+--- etc/router.xml.in.orig	2007-05-26 12:05:26.000000000 +0200
++++ etc/router.xml.in	2007-05-26 12:06:18.000000000 +0200
 @@ -6,7 +6,7 @@
    <!-- The process ID file. comment this out if you don't need to know
         to know the process ID from outside the process (eg for control
@@ -29,12 +29,20 @@ $NetBSD: patch-ae,v 1.2 2006/04/21 09:18:37 rillig Exp $
  
      <!-- Shared secret used to identify legacy components (that is,
           "jabber:component:accept" components that authenticate using
-@@ -46,7 +46,7 @@
-          connections. If this is commented out, connecting components
-          will not be able to request a SSL-encrypted channel. -->
+@@ -52,7 +52,7 @@
+          If this is commented out, connecting components will not be able
+          to request an SSL-encrypted channel. -->
      <!--
 -    <pemfile>@sysconfdir@/server.pem</pemfile>
 +    <pemfile>@SSLCERTS@/server.pem</pemfile>
      -->
    </local>
  
+@@ -185,6 +185,6 @@
+ 
+   <!-- File containing packet filter rules.
+        May be used for fine grained packet routing control. -->
+-  <filter>@sysconfdir@/router-filter.xml</filter>
++  <filter>@PKG_SYSCONFDIR@/router-filter.xml</filter>
+ 
+ </router>
diff --git a/chat/jabberd2/patches/patch-af b/chat/jabberd2/patches/patch-af
index 5fb10d670cb..96b67cedc0d 100644
--- a/chat/jabberd2/patches/patch-af
+++ b/chat/jabberd2/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/03/28 19:44:10 xtraeme Exp $
+$NetBSD: patch-af,v 1.2 2007/05/26 11:50:13 xtraeme Exp $
 
---- etc/resolver.xml.in.orig	2003-10-08 02:27:59.000000000 +0200
-+++ etc/resolver.xml.in	2003-10-08 02:28:49.000000000 +0200
+--- etc/resolver.xml.in.orig	2007-05-26 12:06:43.000000000 +0200
++++ etc/resolver.xml.in	2007-05-26 12:07:09.000000000 +0200
 @@ -6,7 +6,7 @@
    <!-- The process ID file. comment this out if you don't need to know
         to know the process ID from outside the process (eg for control
@@ -11,16 +11,16 @@ $NetBSD: patch-af,v 1.1.1.1 2004/03/28 19:44:10 xtraeme Exp $
  
    <!-- Router connection configuration -->
    <router>
-@@ -23,7 +23,7 @@
-          commented out, or the file can't be read, no attempt will be
-          made to establish an encrypted channel with the router. -->
+@@ -28,7 +28,7 @@
+          If this is commented out, or the file can't be read, no attempt
+          will be made to establish an encrypted channel with the router. -->
      <!--
 -    <pemfile>@sysconfdir@/server.pem</pemfile>
 +    <pemfile>@SSLCERTS@/server.pem</pemfile>
      -->
  
      <!-- Router connection retry -->
-@@ -52,7 +52,7 @@
+@@ -61,7 +61,7 @@
  
      <!-- If logging to file, this is the filename of the logfile -->
      <!--
diff --git a/chat/jabberd2/patches/patch-ag b/chat/jabberd2/patches/patch-ag
index 9ded7708323..2bd8673028a 100644
--- a/chat/jabberd2/patches/patch-ag
+++ b/chat/jabberd2/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.3 2005/01/20 15:08:54 xtraeme Exp $
+$NetBSD: patch-ag,v 1.4 2007/05/26 11:50:13 xtraeme Exp $
 
---- etc/c2s.xml.in.orig	2005-01-20 15:39:58.000000000 +0100
-+++ etc/c2s.xml.in	2005-01-20 15:41:39.000000000 +0100
+--- etc/c2s.xml.in.orig	2007-05-26 12:07:39.000000000 +0200
++++ etc/c2s.xml.in	2007-05-26 12:09:13.000000000 +0200
 @@ -6,7 +6,7 @@
    <!-- The process ID file. comment this out if you don't need to know
         to know the process ID from outside the process (eg for control
@@ -11,16 +11,16 @@ $NetBSD: patch-ag,v 1.3 2005/01/20 15:08:54 xtraeme Exp $
  
    <!-- Router connection configuration -->
    <router>
-@@ -23,7 +23,7 @@
-          commented out, or the file can't be read, no attempt will be
-          made to establish an encrypted channel with the router. -->
+@@ -28,7 +28,7 @@
+          If this is commented out, or the file can't be read, no attempt
+          will be made to establish an encrypted channel with the router. -->
      <!--
 -    <pemfile>@sysconfdir@/server.pem</pemfile>
 +    <pemfile>@SSLCERTS@/server.pem</pemfile>
      -->
  
      <!-- Router connection retry -->
-@@ -56,7 +56,7 @@
+@@ -61,7 +61,7 @@
      
      <!-- If logging to file, this is the filename of the logfile -->
      <!--
@@ -29,23 +29,25 @@ $NetBSD: patch-ag,v 1.3 2005/01/20 15:08:54 xtraeme Exp $
      -->
    </log>
  
-@@ -88,13 +88,13 @@
-          connections. If this is commented out, clients will not be
-          offered the STARTTLS stream extension -->
+@@ -109,7 +109,7 @@
+     <id register-enable='true'>localhost</id>
+     <!-- or
+     <id realm='company'
+-        pemfile='/usr/local/etc/jabberd/server.pem'
++	pemfile='@SSLCERTS@/server.pem'
+         verify-mode='7'
+         require-starttls='true'
+         register-enable='true'
+@@ -142,7 +142,7 @@
+          If this is commented out, clients will not be offered
+          the STARTTLS stream extension -->
      <!--
 -    <pemfile>@sysconfdir@/server.pem</pemfile>
 +    <pemfile>@SSLCERTS@/server.pem</pemfile>
      -->
  
-     <!-- File containing an optional SSL certificate chain file for client
-          SSL connections. -->
-     <!--
--    <cachain>@sysconfdir@/cachain.pem</cachain>
-+    <cachain>@SSLCERTS@/cachain.pem</cachain>
-     -->
- 
-     <!-- Require STARTTLS. If this is enabled, clients must do STARTTLS
-@@ -295,7 +295,7 @@
+     <!-- SSL verify mode - see SSL_CTX_set_verify(3), mode parameter -->
+@@ -339,7 +339,7 @@
      <!-- Berkeley DB module configuration -->
      <db>
        <!-- Directory to store database files under -->
@@ -54,7 +56,7 @@ $NetBSD: patch-ag,v 1.3 2005/01/20 15:08:54 xtraeme Exp $
        
        <!-- Synchronize the database to disk after each write. If you
             disable this, database accesses may be faster, but data may
-@@ -348,7 +348,7 @@
+@@ -403,13 +403,13 @@
      <!-- Pipe module configuration -->
      <pipe>
        <!-- Program to execute -->
@@ -62,4 +64,11 @@ $NetBSD: patch-ag,v 1.3 2005/01/20 15:08:54 xtraeme Exp $
 +      <exec>@BINDIR@/pipe-auth.pl</exec>
      </pipe>
  
-   </authreg>
+     <!-- SQLite driver configuration -->
+     <sqlite>
+       <!-- Database name -->
+-      <dbname>@localstatedir@/jabberd/db/sqlite.db</dbname>
++      <dbname>@DBDIR@/sqlite.db</dbname>
+ 
+       <!-- Transacation support. If this is commented out, transactions
+            will be disabled. This might make database accesses faster,
diff --git a/chat/jabberd2/patches/patch-ah b/chat/jabberd2/patches/patch-ah
new file mode 100644
index 00000000000..df7be7f008f
--- /dev/null
+++ b/chat/jabberd2/patches/patch-ah
@@ -0,0 +1,31 @@
+$NetBSD: patch-ah,v 1.3 2007/05/26 11:50:13 xtraeme Exp $
+
+--- etc/storage.xml.in.orig	2007-05-26 12:40:47.000000000 +0200
++++ etc/storage.xml.in	2007-05-26 12:41:15.000000000 +0200
+@@ -6,7 +6,7 @@
+   <!-- The process ID file. comment this out if you don't need to know
+        to know the process ID from outside the process (eg for control
+        scripts) -->
+-  <pidfile>@localstatedir@/jabberd/pid/storage.pid</pidfile>
++  <pidfile>@PIDDIR@/storage.pid</pidfile>
+ 
+   <!-- Router connection configuration -->
+   <router>
+@@ -28,7 +28,7 @@
+          If this is commented out, or the file can't be read, no attempt
+          will be made to establish an encrypted channel with the router. -->
+     <!--
+-    <pemfile>@sysconfdir@/server.pem</pemfile>
++    <pemfile>@SSLCERTS@/server.pem</pemfile>
+     -->
+ 
+     <!-- Router connection retry -->
+@@ -61,7 +61,7 @@
+ 
+     <!-- If logging to file, this is the filename of the logfile -->
+     <!--
+-    <file>@localstatedir@/jabberd/log/storage.log</file>
++    <file>@LOGDIR@/storage.log</file>
+     -->
+   </log>
+