Update chat/jabberd2 to 2.0s3.

Changes:

2004-06-25  jabberd 2.0s3

    * Fixed several memory leaks and overruns <karsten.petersen@hrz.tu-chemnitz.de>
    * Fixed XMPP session replacement [rob]
    * Added support for Win32 platforms <peter@cerebus.co.za> [rob]
    * Added support for requiring SSL/TLS before auth <deryni@eden.rutgers.edu>
    * Added support for LDAPv3 (including channel encryption) [rob]
    * Added workaround to make large presence broadcasts more efficient [rob]
    * Generate random dialback key if none provided [rob]
    * Rewrote configure script (+ many code tweaks to support this) [rob]
    * Remove build requirement for Libidn and OpenSSL [rob]
    * Removed bundled Libidn due to licensing issues [rob]
    * Bugfixes: 3059, 3174, 3343, 3368, 3480, 3481, 3594

6 files changed, 67 insertions, 99 deletions

diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index dfc4a809d72..a3ac668b7c7 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2004/07/06 00:10:57 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/07/14 00:25:11 xtraeme Exp $
 #
 
-DISTNAME=		jabberd-2.0s2
-PKGREVISION=		1
+DISTNAME=		jabberd-2.0s3
 CATEGORIES=		chat
 MASTER_SITES=		http://www.jabberstudio.org/files/jabberd2/
 
@@ -28,79 +27,16 @@ SUBST_SED.path=		-e "s,/usr/local,${PREFIX},g"			\
 			-e "s,\$sysconfdir/jabberd,\$sysconfdir,g"
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--disable-mysql
+CONFIGURE_ARGS+=	--enable-pipe
+CONFIGURE_ARGS+=	--enable-anon
 
-REPLACE_PERL=		tools/pipe-auth.pl
+REPLACE_PERL=		tools/*.pl
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DEFS+=	JABBERD_USER JABBERD_STATIC				\
-		JABBERD_AUTH_METHOD JABBERD_STORAGE_METHOD		\
-		JABBERD_LOGDIR JABBERD_DBDIR JABBERD_PIDDIR
-
-# This specify the actual method which will be used for authenticate
-# the users/accounts.
-#
-# JABBERD_AUTH_METHOD has 5 available options:
-#
-# db (by default)
-# mysql (MySQL)
-# openldap (OpenLDAP)
-# pam (Pluggable Authentication Module)
-# pgsql (PostgreSQL)
-
-JABBERD_AUTH_METHOD?=		db
-AUTHREG_MODS="anon pipe ${JABBERD_AUTH_METHOD}"
-
-.if !empty(JABBERD_AUTH_METHOD:Mdb)
-CONFIGURE_ARGS+=	--enable-authreg=${AUTHREG_MODS}
-CONFIGURE_ARGS+=	--with-berkeley-db=${BUILDLINK_DIR}/include
-.    include "../../databases/db4/buildlink3.mk"
-.  elif !empty(JABBERD_AUTH_METHOD:Mopenldap)
-CONFIGURE_ARGS+=	--enable-authreg=${AUTHREG_MODS}
-CONFIGURE_ARGS+=	--with-openldap=${BUILDLINK_PREFIX.openldap}
-.    include "../../databases/openldap/buildlink3.mk"
-.  elif !empty(JABBERD_AUTH_METHOD:Mpgsql)
-CONFIGURE_ARGS+=	--enable-authreg=${AUTHREG_MODS}
-CONFIGURE_ARGS+=	--with-pgsql=${BUILDLINK_PREFIX.postgresql-lib}
-.    include "../../databases/postgresql-lib/buildlink3.mk"
-.  elif !empty(JABBERD_AUTH_METHOD:Mmysql)
-CONFIGURE_ARGS+=	--enable-authreg=${AUTHREG_MODS}
-CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-server}
-.    include "../../databases/mysql-client/buildlink3.mk"
-.  elif !empty(JABBERD_AUTH_METHOD:Mpam)
-CONFIGURE_ARGS+=	--enable-authreg=${AUTHREG_MODS}
-CONFIGURE_ARGS+=	--with-pam=${BUILDLINK_PREFIX.PAM}
-.    include "../../security/PAM/buildlink3.mk"
-.endif
-
-# This specify the actual method which will be used to store the accounts
-# and related information.
-#
-# JABBERD_STORAGE_METHOD has 3 available options:
-#
-# db (by default)
-# mysql (MySQL)
-# pgsql (PostgreSQL)
-
-JABBERD_STORAGE_METHOD?=	db
-
-.if !empty(JABBERD_STORAGE_METHOD:Mdb)
-CONFIGURE_ARGS+=	--enable-storage=db
-CONFIGURE_ARGS+=	--with-berkeley-db=${BUILDLINK_DIR}/include
-.    include "../../databases/db4/buildlink3.mk"
-.  elif !empty(JABBERD_STORAGE_METHOD:Mmysql)
-CONFIGURE_ARGS+=	--enable-storage=mysql
-CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-server}
-.    include "../../databases/mysql-client/buildlink3.mk"
-.  elif !empty(JABBERD_STORAGE_METHOD:Mpgsql)
-CONFIGURE_ARGS+=	--enable-storage=pgsql
-CONFIGURE_ARGS+=	--with-pgsql=${BUILDLINK_PREFIX.postgresql-lib}
-.    include "../../databases/postgresql-lib/buildlink3.mk"
-.endif
-
-.if defined(JABBERD_STATIC) && !empty(JABBERD_STATIC:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--enable-all-static
-.endif
+BUILD_DEFS+=	JABBERD_USER JABBERD_GROUP JABBERD_METHOD  \
+		JABBERD_LOGDIR JABBERD_PIDDIR
 
 PKG_SYSCONFSUBDIR=	jabberd
 RCD_SCRIPTS=		jabberd c2s sm resolver router s2s
@@ -127,12 +63,27 @@ CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 CONF_FILES+=		${EGDIR}/roster.xml ${PKG_SYSCONFDIR}/roster.xml
 .undef f
 
-# Directory to store the log files
-JABBERD_LOGDIR?=	/var/log/jabberd
-# Directory to store the database files
-JABBERD_DBDIR?=		/var/db/jabberd
-# Directory to store the pid files
-JABBERD_PIDDIR?=	/var/run/jabberd
+JABBERD_METHOD?=	mysql
+
+.if !empty(JABBERD_METHOD:Mdb)
+# # Directory to store the database files
+JABBERD_DBDIR?=         ${VARBASE}/db/jabberd
+BUILD_DEFS+=		JABBERD_DBDIR
+CONFIGURE_ARGS+=	--enable-db
+.  include "../../databases/db4/buildlink3.mk"
+.elif !empty(JABBERD_METHOD:Mmysql)
+CONFIGURE_ARGS+=	--enable-mysql
+.  include "../../databases/mysql4-client/buildlink3.mk"
+.elif !empty(JABBERD_METHOD:Mpgsql)
+CONFIGURE_ARGS+=	--enable-pgsql
+.  include "../../databases/postgresql74-lib/buildlink3.mk"
+.elif !empty(JABBERD_METHOD:Mldap)
+CONFIGURE_ARGS+=	--enable-ldap
+.  include "../../databases/openldap/buildlink3.mk"
+.elif !empty(JABBERD_METHOD:Mpam)
+CONFIGURE_ARGS+=	--enable-pam
+.  include "../../security/PAM/buildlink3.mk"
+.endif
 
 .for f in ${JABBERD_LOGDIR} ${JABBERD_DBDIR} ${JABBERD_PIDDIR}
 OWN_DIRS_PERMS+=	${f} ${JABBERD_USER} ${JABBERD_GROUP} 770
@@ -163,6 +114,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/templates/roster.xml.dist.in	\
 	    ${EGDIR}/roster.xml
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/pipe-auth.pl ${BINDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/migrate.pl ${BINDIR}
 .for f in ${DBFILES}
 	${INSTALL_DATA} ${WRKSRC}/tools/${f} ${EGDIR}
 .endfor
@@ -173,5 +125,6 @@ post-install:
 .undef f
 
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/jabberd2/PLIST b/chat/jabberd2/PLIST
index fdede445728..b3bdb8f798e 100644
--- a/chat/jabberd2/PLIST
+++ b/chat/jabberd2/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2004/04/23 22:07:52 reed Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/07/14 00:25:11 xtraeme Exp $
 bin/c2s
 bin/jabberd
+bin/migrate.pl
 bin/pipe-auth.pl
 bin/resolver
 bin/router
diff --git a/chat/jabberd2/distinfo b/chat/jabberd2/distinfo
index 481817f127c..5df66f2f9ec 100644
--- a/chat/jabberd2/distinfo
+++ b/chat/jabberd2/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/03/28 19:44:07 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/07/14 00:25:11 xtraeme Exp $
 
-SHA1 (jabberd-2.0s2.tar.gz) = bec5f3ab50e383d4d3282fe472e27b049b41badd
-Size (jabberd-2.0s2.tar.gz) = 780944 bytes
-SHA1 (patch-aa) = 210389798690b21879282bba64f2e35d47814193
+SHA1 (jabberd-2.0s3.tar.gz) = 9a592f71e45445db7aca20b8fd87b97ae9690c22
+Size (jabberd-2.0s3.tar.gz) = 705819 bytes
+SHA1 (patch-aa) = ff9a1aa6c39b7e96870d4f884de09be8307ac169
 SHA1 (patch-ab) = de1c8ec12b55117223bcca2071499c42ab145a34
 SHA1 (patch-ac) = 312a07fa6772956297789e15025e0ca0fad9ebb7
 SHA1 (patch-ad) = b7776cbd6553f3b3b2f9b20250b1368f196cb85d
 SHA1 (patch-ae) = a5edb31af022b682c96ceacee615999f6439662e
 SHA1 (patch-af) = aad84cbfba7c0519e32df1ed6f31fa8383d73393
-SHA1 (patch-ag) = 385b520d815368516ceef2383f53ba19ed65961e
+SHA1 (patch-ag) = 2b60461b16a419c69855478f282fa123c00fd54c
+SHA1 (patch-ah) = 332711288dc07c952726357d6d1d804216e5eb56
diff --git a/chat/jabberd2/patches/patch-aa b/chat/jabberd2/patches/patch-aa
index da981749439..4d92dde6a1d 100644
--- a/chat/jabberd2/patches/patch-aa
+++ b/chat/jabberd2/patches/patch-aa
@@ -1,15 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/03/28 19:44:07 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2004/07/14 00:25:11 xtraeme Exp $
 
---- Makefile.in.orig	2003-11-05 01:18:17.000000000 +0100
-+++ Makefile.in	2003-11-05 01:18:49.000000000 +0100
-@@ -103,8 +103,8 @@
+--- Makefile.in.orig	2004-07-14 01:57:51.000000000 +0200
++++ Makefile.in	2004-07-14 01:58:02.000000000 +0200
+@@ -93,7 +93,7 @@
  install_sh = @install_sh@
- EXTRA_DIST = PROTOCOL Doxyfile.in
+ EXTRA_DIST = PROTOCOL Doxyfile.in README.win32
  
--SUBDIRS = ac-helpers etc tools man mio sx util expat idn scod $(JABBERD_SUBDIRS)
--DIST_SUBDIRS = ac-helpers etc tools man mio sx util expat idn scod c2s resolver router s2s sm
-+SUBDIRS = ac-helpers tools man mio sx util expat idn scod $(JABBERD_SUBDIRS)
-+DIST_SUBDIRS = ac-helpers tools man mio sx util expat idn scod c2s resolver router s2s sm
+-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
  subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/chat/jabberd2/patches/patch-ag b/chat/jabberd2/patches/patch-ag
index 43894975d64..9adff9f7202 100644
--- a/chat/jabberd2/patches/patch-ag
+++ b/chat/jabberd2/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/03/28 19:44:12 xtraeme Exp $
+$NetBSD: patch-ag,v 1.2 2004/07/14 00:25:11 xtraeme Exp $
 
---- etc/c2s.xml.in.orig	2003-11-05 01:21:31.000000000 +0100
-+++ etc/c2s.xml.in	2003-11-05 01:23:03.000000000 +0100
+--- 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
 @@ -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 @@ $NetBSD: patch-ag,v 1.1.1.1 2004/03/28 19:44:12 xtraeme Exp $
 +    <pemfile>@SSLCERTS@/server.pem</pemfile>
      -->
  
-     <!-- Older versions of jabberd support encrypted client connections
-@@ -282,7 +282,7 @@
+     <!-- Require STARTTLS. If this is enabled, clients must do STARTTLS
+@@ -289,7 +289,7 @@
      <!-- Berkeley DB module configuration -->
      <db>
        <!-- Directory to store database files under -->
@@ -47,7 +47,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2004/03/28 19:44:12 xtraeme Exp $
        
        <!-- Synchronize the database to disk after each write. If you
             disable this, database accesses may be faster, but data may
-@@ -316,7 +316,7 @@
+@@ -342,7 +342,7 @@
      <!-- Pipe module configuration -->
      <pipe>
        <!-- Program to execute -->
diff --git a/chat/jabberd2/patches/patch-ah b/chat/jabberd2/patches/patch-ah
new file mode 100644
index 00000000000..e5cc6285b96
--- /dev/null
+++ b/chat/jabberd2/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1 2004/07/14 00:25:11 xtraeme Exp $
+
+--- util/util.h.orig	2004-07-14 01:59:37.000000000 +0200
++++ util/util.h	2004-07-14 02:00:14.000000000 +0200
+@@ -31,6 +31,10 @@
+ #include <errno.h>
+ #include <assert.h>
+ 
++#ifdef HAVE_SYS_SOCKET_H
++# include <sys/socket.h>
++#endif
++
+ #ifdef HAVE_NETINET_IN_H
+ # include <netinet/in.h>
+ #endif