>Number:         28820
>Category:       pkg
>Synopsis:       Update chat/jabberd2 to 2.0s6
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Dec 31 03:06:00 +0000 2004
>Originator:     Eric Schnoebelen
>Release:        NetBSD 2.0G
>Organization:
Central Iowa (Model) Railroad
>Environment:
System: NetBSD thezew.cirr.com 2.0G NetBSD 2.0G (GENERIC) #9: Fri Aug 27 15:51:57 CDT 2004 eric@egsner.cirr.com:/work/eric/NetBSD-current/obj/alpha/sys/arch/alpha/compile/GENERIC alpha
Architecture: alpha
Machine: alpha
>Description:
	jabberd2 is currently at version 2.0s4, and 2.0s6 is available.
>Fix:
cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/jabberd2/Makefile,v
retrieving revision 1.16
diff -b -u -w -r1.16 Makefile
--- Makefile	29 Nov 2004 17:59:11 -0000	1.16
+++ Makefile	31 Dec 2004 03:03:57 -0000
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.16 2004/11/29 17:59:11 xtraeme Exp $
 #
 
-DISTNAME=		jabberd-2.0s4
-PKGREVISION=		1
+DISTNAME=		jabberd-2.0s6
 CATEGORIES=		chat
 MASTER_SITES=		http://www.jabberstudio.org/files/jabberd2/
 
@@ -11,10 +10,7 @@
 COMMENT=		Instant messaging server (version 2)
 
 PATCH_SITES=	http://www.marquard.net/jabber/patches/
-PATCHFILES=	patch-jedi8-sm-object_c patch-jedi-mysql-storage patch-base64 \
-		patch-sm-storage_db patch-nad-escape patch-jedi-pgsql-storage \
-		patch-memleaks patch-ns-fix patch-sm-nad-triplet \
-		patch-mod_disco_publish patch-sm-filter patch-c2s-buffers
+
 DIST_SUBDIR=    	${PKGNAME_NOREV}
 

Index: patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/chat/jabberd2/patches/patch-ag,v
retrieving revision 1.2
diff -b -u -w -r1.2 patch-ag
--- patches/patch-ag	14 Jul 2004 00:25:11 -0000	1.2
+++ patches/patch-ag	31 Dec 2004 03:03:57 -0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.2 2004/07/14 00:25:11 xtraeme Exp $
+$NetBSD$
 
---- etc/c2s.xml.in.orig	2004-07-13 18:56:31.000000000 +0200
-+++ etc/c2s.xml.in	2004-07-13 18:58:39.000000000 +0200
+--- etc/c2s.xml.in.orig	2004-11-25 12:17:11.000000000 -0600
++++ etc/c2s.xml.in
 @@ -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
@@ -37,8 +37,8 @@
 +    <pemfile>@SSLCERTS@/server.pem</pemfile>
      -->
  
-     <!-- Require STARTTLS. If this is enabled, clients must do STARTTLS
-@@ -289,7 +289,7 @@
+     <!-- File containing an optional SSL certificate chain file for client
+@@ -295,7 +295,7 @@
      <!-- Berkeley DB module configuration -->
      <db>
        <!-- Directory to store database files under -->
@@ -47,7 +47,7 @@
        
        <!-- Synchronize the database to disk after each write. If you
             disable this, database accesses may be faster, but data may
-@@ -342,7 +342,7 @@
+@@ -348,7 +348,7 @@
      <!-- Pipe module configuration -->
      <pipe>
        <!-- Program to execute -->
cvs diff: cannot find patches/patch-ah