Changes 2.2.10:

* Special case to ignore the X509_V_ERR_UNABLE_TO_GET_CRL error
  when CRL is not present in chain. Merged patch by Michal Witkowski.
* storage_ldapvcard rebind like auth_ldap for successful connection
  to MS Active Directory as LDAP storage. Merged patch by x0r.
* Merged SASL External login for clients patch by Michal Witkowski.
* Merged router-filter redirect option by Ugnich Anton.
* Dropped support for PEP
* Fix for crash on empty pkt->to

8 files changed, 50 insertions, 60 deletions

diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index 199da9cc7c6..ce4fdfd770f 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2010/06/02 13:14:47 adam Exp $
+# $NetBSD: Makefile,v 1.58 2010/06/16 07:56:29 adam Exp $
 
-DISTNAME=	jabberd-2.2.9
-PKGREVISION=	3
+DISTNAME=	jabberd-2.2.10
 CATEGORIES=	chat
 MASTER_SITES=	http://codex.xiaoka.com/pub/jabberd2/releases/
 EXTRACT_SUFX=	.tar.bz2
@@ -26,15 +25,6 @@ CONFIGURE_ARGS+=	--enable-ssl
 CONFIGURE_ARGS+=	--enable-fs
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
-.if (${MACHINE_ARCH} == alpha) || (${MACHINE_ARCH} == x86_64)
-CONFIGURE_ARGS+=	CXXFLAGS=${CXXFLAGS:M*:C/-O./-Os/:M*:Q}
-CONFIGURE_ENV+=		CXXFLAGS=${CXXFLAGS:M*:C/-O./-Os/:M*:Q}
-MAKE_ENV+=		CXXFLAGS=${CXXFLAGS:M*:C/-O./-Os/:M*:Q}
-CONFIGURE_ARGS+=	CFLAGS=${CFLAGS:M*:C/-O./-Os/:M*:Q}
-CONFIGURE_ENV+=		CFLAGS=${CFLAGS:M*:C/-O./-Os/:M*:Q}
-MAKE_ENV+=		CFLAGS=${CFLAGS:M*:C/-O./-Os/:M*:Q}
-.endif
-
 SUBST_CLASSES+=		path
 SUBST_STAGE.path=	post-patch
 SUBST_FILES.path=	configure
@@ -108,8 +98,8 @@ pre-configure:
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/templates/roster.xml.dist.in	\
 	    ${DESTDIR}${EGDIR}/roster.xml
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/bdbdump.pl ${DESTDIR}${BINDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/pipe-auth.pl ${DESTDIR}${BINDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/migrate.pl ${DESTDIR}${BINDIR}
 .for f in ${DBFILES}
 	${INSTALL_DATA} ${WRKSRC}/tools/${f} ${DESTDIR}${EGDIR}
 .endfor
diff --git a/chat/jabberd2/PLIST b/chat/jabberd2/PLIST
index 807eee65246..2e9a08739be 100644
--- a/chat/jabberd2/PLIST
+++ b/chat/jabberd2/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.12 2010/06/02 13:14:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2010/06/16 07:56:29 adam Exp $
+bin/bdbdump.pl
 bin/c2s
 bin/jabberd
-bin/migrate.pl
 bin/pipe-auth.pl
 bin/router
 bin/s2s
@@ -19,7 +19,6 @@ lib/jabberd/mod_active.la
 lib/jabberd/mod_amp.la
 lib/jabberd/mod_announce.la
 lib/jabberd/mod_deliver.la
-lib/jabberd/mod_disco-publish.la
 lib/jabberd/mod_disco.la
 lib/jabberd/mod_echo.la
 lib/jabberd/mod_help.la
@@ -30,6 +29,7 @@ lib/jabberd/mod_iq-time.la
 lib/jabberd/mod_iq-vcard.la
 lib/jabberd/mod_iq-version.la
 lib/jabberd/mod_offline.la
+lib/jabberd/mod_pep.la
 lib/jabberd/mod_presence.la
 lib/jabberd/mod_privacy.la
 lib/jabberd/mod_roster-publish.la
diff --git a/chat/jabberd2/distinfo b/chat/jabberd2/distinfo
index 6f280bb4e19..50b7302731f 100644
--- a/chat/jabberd2/distinfo
+++ b/chat/jabberd2/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.20 2010/04/15 07:01:23 adam Exp $
+$NetBSD: distinfo,v 1.21 2010/06/16 07:56:29 adam Exp $
 
-SHA1 (jabberd-2.2.9.tar.bz2) = 1da9da3305e6fd402336ffba402b80dc767afa27
-RMD160 (jabberd-2.2.9.tar.bz2) = 7b8075653d14dbdf491d96b28894d5450a374a91
-Size (jabberd-2.2.9.tar.bz2) = 653992 bytes
-SHA1 (patch-aa) = e069e26e9c88a48baee9b9eb8ebbc9a403e91f9f
+SHA1 (jabberd-2.2.10.tar.bz2) = 911995b8363e3db83672f493a78fd550d612b63e
+RMD160 (jabberd-2.2.10.tar.bz2) = c900baa1ae629aa5847e4e2c0bc7cdb119ffa5ea
+Size (jabberd-2.2.10.tar.bz2) = 649638 bytes
+SHA1 (patch-aa) = 38366e20229effc28dc2f1314d8095d6d7c34077
 SHA1 (patch-ab) = c33cefcb0ddbcec732e475eaf5b931cdc8dd6cc7
-SHA1 (patch-ac) = 7fce39dc745cf1e9cd793150840eac1543f3b597
+SHA1 (patch-ac) = 9bb5547c01fa3cc0f4df2133007a843aaed66bef
 SHA1 (patch-ad) = 2930f23bc8616ba2a5783cc8bb2a42c5d1c5eff7
 SHA1 (patch-ae) = 0c57279c309ef4f6a226d65a491fd040e03ae4f0
-SHA1 (patch-af) = 8ff4e1779e1f925b7dee28e24d4d90fe50ef88a7
-SHA1 (patch-ag) = 64c5338daa59a5eb1eed70608ac766df36dc2f83
-SHA1 (patch-ah) = 358fa54c7e57396f30f763c794000a1b12250778
+SHA1 (patch-af) = efb289b0e1859bf8c7d5d6eb7b67d2b95f64c653
+SHA1 (patch-ag) = 2423bc1f7aced7d0010b51949fb2f9b5ddb44cc0
+SHA1 (patch-ah) = e22e6df0ce59922fba2751dd557b2353b2065fbe
diff --git a/chat/jabberd2/patches/patch-aa b/chat/jabberd2/patches/patch-aa
index 7cd8b0dae91..fc40418e82e 100644
--- a/chat/jabberd2/patches/patch-aa
+++ b/chat/jabberd2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2009/09/06 04:18:11 schnoebe Exp $
+$NetBSD: patch-aa,v 1.9 2010/06/16 07:56:30 adam Exp $
 
---- Makefile.in.orig	2009-07-05 16:54:47.000000000 -0500
+--- Makefile.in.orig	2010-06-11 11:45:18.000000000 +0000
 +++ Makefile.in
-@@ -201,7 +201,7 @@ top_build_prefix = @top_build_prefix@
+@@ -232,7 +232,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
diff --git a/chat/jabberd2/patches/patch-ac b/chat/jabberd2/patches/patch-ac
index 4805d79c759..5b811fcc386 100644
--- a/chat/jabberd2/patches/patch-ac
+++ b/chat/jabberd2/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.6 2009/09/06 04:18:11 schnoebe Exp $
+$NetBSD: patch-ac,v 1.7 2010/06/16 07:56:30 adam Exp $
 
---- etc/sm.xml.in.orig	2009-07-05 16:54:18.000000000 -0500
+--- etc/sm.xml.in.orig	2010-06-11 11:44:58.000000000 +0000
 +++ etc/sm.xml.in
 @@ -5,7 +5,7 @@
  
@@ -56,9 +56,9 @@ $NetBSD: patch-ac,v 1.6 2009/09/06 04:18:11 schnoebe Exp $
      </fs>
  
      <!-- LDAPVCARD driver configuration -->
-@@ -667,7 +667,7 @@
- 
-       <!-- If you defined publish, you should comment <roster> -->
+@@ -679,7 +679,7 @@
+            stored in the users data store when they are created. -->
+       <!-- If you defined publish, you should comment-out <roster> -->
        <!--
 -      <roster>@sysconfdir@/templates/roster.xml</roster>
 +      <roster>@PKG_SYSCONFDIR@/roster.xml</roster>
diff --git a/chat/jabberd2/patches/patch-af b/chat/jabberd2/patches/patch-af
index 98bf7da1c66..d92a8df3566 100644
--- a/chat/jabberd2/patches/patch-af
+++ b/chat/jabberd2/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.5 2010/04/15 07:02:51 adam Exp $
+$NetBSD: patch-af,v 1.6 2010/06/16 07:56:30 adam Exp $
 
---- configure.orig	2010-02-22 07:15:14.000000000 +0000
+--- configure.orig	2010-06-11 11:45:15.000000000 +0000
 +++ configure
-@@ -11394,7 +11394,7 @@ fi
+@@ -11008,7 +11008,7 @@ fi
  # check for optimisation level
- { $as_echo "$as_me:$LINENO: checking CFLAGS optimization level" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS optimization level" >&5
  $as_echo_n "checking CFLAGS optimization level... " >&6; }
 -if echo $CFLAGS | grep '.*-O[3s].*' >/dev/null 2>&1; then
 +if echo $CFLAGS | grep '.*-O[3].*' >/dev/null 2>&1; then
-     { { $as_echo "$as_me:$LINENO: error: maximum allowed optimization level is -O2" >&5
- $as_echo "$as_me: error: maximum allowed optimization level is -O2" >&2;}
-    { (exit 1); exit 1; }; }
+     as_fn_error "maximum allowed optimization level is -O2" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: fine" >&5
diff --git a/chat/jabberd2/patches/patch-ag b/chat/jabberd2/patches/patch-ag
index a559286f3d8..923c3c9aaba 100644
--- a/chat/jabberd2/patches/patch-ag
+++ b/chat/jabberd2/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.8 2009/08/21 02:28:13 schnoebe Exp $
+$NetBSD: patch-ag,v 1.9 2010/06/16 07:56:30 adam Exp $
 
---- etc/c2s.xml.in.orig	2009-07-05 16:54:18.000000000 -0500
+--- etc/c2s.xml.in.orig	2010-06-11 11:44:58.000000000 +0000
 +++ etc/c2s.xml.in
 @@ -5,7 +5,7 @@
  
@@ -29,16 +29,16 @@ $NetBSD: patch-ag,v 1.8 2009/08/21 02:28:13 schnoebe Exp $
      -->
    </log>
  
-@@ -125,7 +125,7 @@
+@@ -136,7 +136,7 @@
      <id register-enable='true'>localhost.localdomain</id>
      <!-- or
      <id realm='company.int'
 -        pemfile='@sysconfdir@/server.pem'
 +        pemfile='@SSLCERTS@/server.pem'
          verify-mode='7'
+         cachain='@sysconfdir@/client_ca_certs.pem'
          require-starttls='true'
-         register-enable='true'
-@@ -164,7 +164,7 @@
+@@ -176,7 +176,7 @@
           use STARTTLS over the standard XMPP port 5222 then you
           MUST specify the pemfile in the 'id' tag above. -->
      <!--
@@ -47,7 +47,7 @@ $NetBSD: patch-ag,v 1.8 2009/08/21 02:28:13 schnoebe Exp $
      -->
  
      <!-- SSL verify mode - see SSL_CTX_set_verify(3), mode parameter -->
-@@ -312,7 +312,7 @@
+@@ -329,7 +329,7 @@
    <stats>
      <!-- file containing count of packets that went through -->
      <!--
@@ -56,7 +56,7 @@ $NetBSD: patch-ag,v 1.8 2009/08/21 02:28:13 schnoebe Exp $
      -->
    </stats>
  
-@@ -382,7 +382,7 @@
+@@ -399,7 +399,7 @@
      <!-- SQLite driver configuration -->
      <sqlite>
        <!-- Database name -->
@@ -65,7 +65,7 @@ $NetBSD: patch-ag,v 1.8 2009/08/21 02:28:13 schnoebe Exp $
  
        <!-- Transacation support. If this is commented out, transactions
             will be disabled. This might make database accesses faster,
-@@ -459,7 +459,7 @@
+@@ -476,7 +476,7 @@
      <!-- Berkeley DB module configuration -->
      <db>
        <!-- Directory to store database files under -->
@@ -74,7 +74,7 @@ $NetBSD: patch-ag,v 1.8 2009/08/21 02:28:13 schnoebe Exp $
  
        <!-- Synchronize the database to disk after each write. If you
             disable this, database accesses may be faster, but data may
-@@ -587,7 +587,7 @@
+@@ -604,7 +604,7 @@
      <!-- Pipe module configuration -->
      <pipe>
        <!-- Program to execute -->
diff --git a/chat/jabberd2/patches/patch-ah b/chat/jabberd2/patches/patch-ah
index 3280210977a..518d6a6bd30 100644
--- a/chat/jabberd2/patches/patch-ah
+++ b/chat/jabberd2/patches/patch-ah
@@ -1,12 +1,12 @@
-$NetBSD: patch-ah,v 1.5 2010/04/15 07:02:51 adam Exp $
+$NetBSD: patch-ah,v 1.6 2010/06/16 07:56:30 adam Exp $
 
---- router/main.c.orig	2010-02-24 08:41:41.000000000 +0000
-+++ router/main.c
-@@ -479,6 +479,7 @@ JABBER_MAIN("jabberd2router", "Jabber 2 
-         do {
-             xhash_iter_get(r->components, NULL, xhv.val);
-             sx_close(comp->s);
-+            mio_run(r->mio, 5);
-         } while(xhash_count(r->components) > 0);
- 
-     xhash_free(r->components);
+--- storage/storage_ldapvcard.c.orig	2010-06-13 06:44:33.000000000 +0000
++++ storage/storage_ldapvcard.c
+@@ -143,7 +143,6 @@ static int rebindProc(LDAP *ld, LDAP_CON
+     drvdata_t data = mdata;
+     data->ld = ld;
+     if(ldap_simple_bind_s(data->ld, data->binddn, data->bindpw)) {
+-        log_write(drv->st->sm->log, LOG_ERR, "ldap: bind failed (to %s): %s", url, ldap_err2string(_ldap_get_lderrno(data->ld)));
+         ldap_unbind_s(data->ld);
+         data->ld = NULL;
+         return NULL;