summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
Diffstat (limited to 'chat')
-rw-r--r--chat/jabberd2/DESCR2
-rw-r--r--chat/jabberd2/MESSAGE6
-rw-r--r--chat/jabberd2/Makefile32
-rw-r--r--chat/jabberd2/PLIST13
-rwxr-xr-xchat/jabberd2/files/jabberd.sh4
-rwxr-xr-xchat/jabberd2/files/resolver.sh42
-rwxr-xr-xchat/jabberd2/files/sm.sh4
-rw-r--r--chat/jabberd2/options.mk34
-rw-r--r--chat/jabberd2/patches/patch-aa12
-rw-r--r--chat/jabberd2/patches/patch-ab10
-rw-r--r--chat/jabberd2/patches/patch-ac27
-rw-r--r--chat/jabberd2/patches/patch-ad10
-rw-r--r--chat/jabberd2/patches/patch-ae17
-rw-r--r--chat/jabberd2/patches/patch-af31
-rw-r--r--chat/jabberd2/patches/patch-ag16
15 files changed, 105 insertions, 155 deletions
diff --git a/chat/jabberd2/DESCR b/chat/jabberd2/DESCR
index 67bf5fee303..42f0bc78f2c 100644
--- a/chat/jabberd2/DESCR
+++ b/chat/jabberd2/DESCR
@@ -4,4 +4,4 @@ application of Jabber technology is an asynchronous, extensible instant
messaging platform, and an IM network that offers functionality similar
to legacy IM systems such as AIM, ICQ, MSN, and Yahoo.
-This is a complete rewrite of the original jabberd.
+This is a complete redesign/reimplementation of the original jabberd.
diff --git a/chat/jabberd2/MESSAGE b/chat/jabberd2/MESSAGE
new file mode 100644
index 00000000000..ac41ee176b4
--- /dev/null
+++ b/chat/jabberd2/MESSAGE
@@ -0,0 +1,6 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2009/08/21 02:28:12 schnoebe Exp $
+
+ Review ${PREFIX}/share/doc/jabberd/UPGRADE if you're upgrading
+ from an earlier release of Jabberd 2.x.
+===========================================================================
diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index e73ebceb5dc..a32f559c4fe 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.51 2009/08/18 23:50:53 gdt Exp $
-#
+# $NetBSD: Makefile,v 1.52 2009/08/21 02:28:12 schnoebe Exp $
-DISTNAME= jabberd-2.1.24.1
+DISTNAME= jabberd-2.2.8
CATEGORIES= chat
-MASTER_SITES= http://codex.xiaoka.com/pub/jabberd2/releases/
+MASTER_SITES= http://ftp.xiaoka.com/jabberd2/releases/
EXTRACT_SUFX= .tar.bz2
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= eric@cirr.com
HOMEPAGE= http://jabberd2.xiaoka.com/
-COMMENT= Instant messaging server (version 2)
+COMMENT= XMPP (Jabber) instant messaging server
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
@@ -31,7 +31,15 @@ CONFIGURE_ARGS+= --enable-pipe
CONFIGURE_ARGS+= --enable-anon
CONFIGURE_ARGS+= --enable-ssl
CONFIGURE_ARGS+= --enable-fs
-CONFIGURE_ARGS+= --with-sasl=gsasl
+
+.if (${MACHINE_ARCH} == alpha) || (${MACHINE_ARCH} == x86_64)
+CONFIGURE_ARGS+= CXXFLAGS=${CXXFLAGS:M*:C/-O./-O1/:Q}
+CONFIGURE_ENV+= CXXFLAGS=${CXXFLAGS:M*:C/-O./-O1/:Q}
+MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:C/-O./-O1/:Q}
+CONFIGURE_ARGS+= CFLAGS=${CFLAGS:M*:C/-O./-O1/:Q}
+CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:C/-O./-O1/:Q}
+MAKE_ENV+= CFLAGS=${CFLAGS:M*:C/-O./-O1/:Q}
+.endif
USE_TOOLS+= perl:run
REPLACE_PERL+= tools/*.pl
@@ -44,7 +52,7 @@ BUILD_DEFS+= VARBASE JABBERD_USER JABBERD_GROUP
BUILD_DEFS+= JABBERD_LOGDIR JABBERD_PIDDIR JABBERD_DBDIR
PKG_SYSCONFSUBDIR= jabberd
-RCD_SCRIPTS= jabberd c2s sm resolver router s2s
+RCD_SCRIPTS= jabberd c2s sm router s2s
JABBERD_USER?= jabberd
JABBERD_GROUP?= jabberd
FILES_SUBST+= JABBERD_USER=${JABBERD_USER:Q}
@@ -60,14 +68,14 @@ BINDIR= ${PREFIX}/bin
EGDIR= ${PREFIX}/share/examples/jabberd
DOCDIR= ${PREFIX}/share/doc/jabberd
-FILES= jabberd.cfg c2s.xml resolver.xml router.xml \
+FILES= jabberd.cfg c2s.xml router.xml \
router-users.xml router-filter.xml s2s.xml \
sm.xml
DBFILES= db-jd14-2-jd2.sql db-setup.mysql db-setup.pgsql \
- db-update.mysql db-setup.sqlite
+ db-update.mysql db-setup.sqlite db-update.sqlite
DOCFILES= README.protocol README UPGRADE ChangeLog
-INSTALLATION_DIRS= bin share/examples/jabberd share/doc/jabberd
+INSTALLATION_DIRS= bin ${EGDIR} ${DOCDIR}
.for f in ${FILES}
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
@@ -113,9 +121,9 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}
.endfor
+.include "../../net/udns/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/libidn/buildlink3.mk"
-.include "../../security/gsasl/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/jabberd2/PLIST b/chat/jabberd2/PLIST
index 50b906c1453..99ab35d2ffb 100644
--- a/chat/jabberd2/PLIST
+++ b/chat/jabberd2/PLIST
@@ -1,21 +1,15 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 17:37:46 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/08/21 02:28:12 schnoebe Exp $
bin/c2s
bin/jabberd
bin/migrate.pl
bin/pipe-auth.pl
-bin/resolver
bin/router
bin/s2s
bin/sm
lib/jabberd/authreg_anon.la
${PLIST.db}lib/jabberd/authreg_db.la
${PLIST.ldap}lib/jabberd/authreg_ldap.la
-${PLIST.ldap}lib/jabberd/authreg_ldapfull.a
${PLIST.ldap}lib/jabberd/authreg_ldapfull.la
-${PLIST.ldap}lib/jabberd/authreg_ldapfull.so
-${PLIST.ldap}lib/jabberd/storage_ldapvcard.a
-${PLIST.ldap}lib/jabberd/storage_ldapvcard.la
-${PLIST.ldap}lib/jabberd/storage_ldapvcard.so
${PLIST.mysql}lib/jabberd/authreg_mysql.la
${PLIST.pam}lib/jabberd/authreg_pam.la
${PLIST.pgsql}lib/jabberd/authreg_pgsql.la
@@ -47,12 +41,12 @@ lib/jabberd/mod_vacation.la
lib/jabberd/mod_validate.la
lib/jabberd/storage_fs.la
${PLIST.db}lib/jabberd/storage_db.la
+${PLIST.ldap}lib/jabberd/storage_ldapvcard.la
${PLIST.mysql}lib/jabberd/storage_mysql.la
${PLIST.pgsql}lib/jabberd/storage_pgsql.la
${PLIST.sqlite}lib/jabberd/storage_sqlite.la
man/man8/c2s.8
man/man8/jabberd.8
-man/man8/resolver.8
man/man8/router.8
man/man8/s2s.8
man/man8/sm.8
@@ -66,8 +60,8 @@ share/examples/jabberd/db-setup.mysql
share/examples/jabberd/db-setup.pgsql
share/examples/jabberd/db-setup.sqlite
share/examples/jabberd/db-update.mysql
+share/examples/jabberd/db-update.sqlite
share/examples/jabberd/jabberd.cfg
-share/examples/jabberd/resolver.xml
share/examples/jabberd/roster.xml
share/examples/jabberd/router-filter.xml
share/examples/jabberd/router-users.xml
@@ -76,7 +70,6 @@ share/examples/jabberd/s2s.xml
share/examples/jabberd/sm.xml
share/examples/rc.d/c2s
share/examples/rc.d/jabberd
-share/examples/rc.d/resolver
share/examples/rc.d/router
share/examples/rc.d/s2s
share/examples/rc.d/sm
diff --git a/chat/jabberd2/files/jabberd.sh b/chat/jabberd2/files/jabberd.sh
index 89d78a75f40..52989d6225a 100755
--- a/chat/jabberd2/files/jabberd.sh
+++ b/chat/jabberd2/files/jabberd.sh
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: jabberd.sh,v 1.2 2007/11/15 12:57:22 sborrill Exp $
+# $NetBSD: jabberd.sh,v 1.3 2009/08/21 02:28:12 schnoebe Exp $
#
# KEYWORD: nostart
@@ -36,7 +36,7 @@ reverse_commands()
done
}
-COMMAND_LIST="resolver router c2s s2s sm"
+COMMAND_LIST="router c2s s2s sm"
name="jabberd"
start_cmd="forward_commands"
diff --git a/chat/jabberd2/files/resolver.sh b/chat/jabberd2/files/resolver.sh
deleted file mode 100755
index b1162b2ffa7..00000000000
--- a/chat/jabberd2/files/resolver.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: resolver.sh,v 1.2 2004/06/26 11:21:46 abs Exp $
-#
-# PROVIDE: resolver
-# REQUIRE: DAEMON c2s
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-name="resolver"
-rcvar=$name
-command="@PREFIX@/bin/${name}"
-required_files="@PKG_SYSCONFDIR@/${name}.xml"
-extra_commands="reload"
-command_args="2>&1 > /dev/null &"
-resolver_user="@JABBERD_USER@"
-pidfile="@JABBERD_PIDDIR@/${name}.pid"
-stop_postcmd="remove_pidfile"
-start_precmd="ensure_piddir"
-
-ensure_piddir()
-{
- mkdir -p @JABBERD_PIDDIR@
- chown @JABBERD_USER@ @JABBERD_PIDDIR@
-}
-
-remove_pidfile()
-{
- if [ -f @JABBERD_PIDDIR@/${name}.pid ]; then
- rm -f @JABBERD_PIDDIR@/${name}.pid
- fi
-}
-
-if [ -f /etc/rc.subr ]; then
- load_rc_config $name
- run_rc_command "$1"
-else
- @ECHO@ -n " ${name}"
- ${command} ${resolver_flags} ${command_args}
-fi
diff --git a/chat/jabberd2/files/sm.sh b/chat/jabberd2/files/sm.sh
index ff00f569f98..fcee8f0f0bf 100755
--- a/chat/jabberd2/files/sm.sh
+++ b/chat/jabberd2/files/sm.sh
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: sm.sh,v 1.3 2008/03/08 22:20:02 gdt Exp $
+# $NetBSD: sm.sh,v 1.4 2009/08/21 02:28:12 schnoebe Exp $
#
# PROVIDE: sm
# REQUIRE: DAEMON c2s
@@ -35,8 +35,6 @@ remove_pidfile()
if [ -f /etc/rc.subr ]; then
load_rc_config $name
- # XXX Previous commands seem to complete but not be ready.
- sleep 5
run_rc_command "$1"
else
@ECHO@ -n " ${name}"
diff --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk
index 4c3f41d37e7..6c479eb33cc 100644
--- a/chat/jabberd2/options.mk
+++ b/chat/jabberd2/options.mk
@@ -1,30 +1,39 @@
-# $NetBSD: options.mk,v 1.21 2008/05/27 13:23:43 obache Exp $
-#
+# $NetBSD: options.mk,v 1.22 2009/08/21 02:28:12 schnoebe Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.jabberd2
-PKG_OPTIONS_REQUIRED_GROUPS= auth storage
+PKG_OPTIONS_REQUIRED_GROUPS= auth storage sasl
# Authentication backend
PKG_OPTIONS_GROUP.auth= auth-mysql auth-pgsql auth-sqlite
PKG_OPTIONS_GROUP.auth+= auth-db auth-ldap auth-pam
# Storage backend
PKG_OPTIONS_GROUP.storage= storage-mysql storage-pgsql
PKG_OPTIONS_GROUP.storage+= storage-sqlite storage-db
+# SASL implementation
+PKG_OPTIONS_GROUP.sasl= sasl-cyrus sasl-gnu
+# debugging
PKG_SUPPORTED_OPTIONS+= debug
-PKG_SUGGESTED_OPTIONS= auth-sqlite storage-sqlite
+PKG_SUGGESTED_OPTIONS= auth-sqlite storage-sqlite sasl-gnu
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= db ldap mysql pam pgsql sqlite
+PLIST_VARS+= db ldap mysql pam pgsql sqlite
+
+.if !empty(PKG_OPTIONS:Msasl-cyrus)
+CONFIGURE_ARGS+= --with-sasl=cyrus
+. include "../../security/cyrus-sasl/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Msasl-gnu)
+CONFIGURE_ARGS+= --with-sasl=gsasl
+. include "../../security/gsasl/buildlink3.mk"
+.endif
.if !empty(PKG_OPTIONS:Mauth-db) || !empty(PKG_OPTIONS:Mstorage-db)
-. include "../../databases/db4/buildlink3.mk"
-# XXX: configure script is broken, always using -ldb even if detect db4.
-SUBST_CLASSES+= fixdb
-SUBST_STAGE.fixdb= pre-configure
-SUBST_FILES.fixdb= storage/Makefile.in
-SUBST_SED.fixdb= -e "s|@DB_LIBS@|${BUILDLINK_LDADD.db4}|g"
-PLIST.db= yes
CONFIGURE_ARGS+= --enable-db
+PLIST.db= yes
+BDB_ACCEPTED= db4
+BUILDLINK_TRANSFORM+= l:db:db4
+. include "../../databases/db4/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-db
.endif
@@ -72,4 +81,5 @@ CONFIGURE_ARGS+= --disable-pam
.if !empty(PKG_OPTIONS:Mdebug)
CONFIGURE_ARGS+= --enable-debug
+CONFIGURE_ARGS+= --enable-developer
.endif
diff --git a/chat/jabberd2/patches/patch-aa b/chat/jabberd2/patches/patch-aa
index 6308ac4c4dd..f7acda5ab71 100644
--- a/chat/jabberd2/patches/patch-aa
+++ b/chat/jabberd2/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.6 2009/07/24 19:05:53 gdt Exp $
+$NetBSD: patch-aa,v 1.7 2009/08/21 02:28:12 schnoebe Exp $
---- Makefile.in.orig 2008-04-24 17:26:15.000000000 -0400
+--- Makefile.in.orig 2009-04-27 04:05:40.000000000 -0500
+++ Makefile.in
-@@ -194,7 +194,7 @@ target_alias = @target_alias@
+@@ -200,7 +200,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
--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
+-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
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
diff --git a/chat/jabberd2/patches/patch-ab b/chat/jabberd2/patches/patch-ab
index ddf8c4e0152..ae0a023c0b7 100644
--- a/chat/jabberd2/patches/patch-ab
+++ b/chat/jabberd2/patches/patch-ab
@@ -1,18 +1,16 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/03/28 19:44:07 xtraeme Exp $
+$NetBSD: patch-ab,v 1.2 2009/08/21 02:28:12 schnoebe Exp $
---- etc/jabberd.cfg.in.orig 2003-09-27 11:12:14.000000000 +0200
-+++ etc/jabberd.cfg.in 2003-09-27 11:15:29.000000000 +0200
-@@ -12,8 +12,8 @@
+--- etc/jabberd.cfg.in.orig
++++ etc/jabberd.cfg.in
+@@ -12,7 +12,7 @@
# program [ path to config file ]
#
-@jabberd_router_bin@ @sysconfdir@/router.xml
--@jabberd_resolver_bin@ @sysconfdir@/resolver.xml
-@jabberd_sm_bin@ @sysconfdir@/sm.xml
-@jabberd_s2s_bin@ @sysconfdir@/s2s.xml
-@jabberd_c2s_bin@ @sysconfdir@/c2s.xml
+router @PKG_SYSCONFDIR@/router.xml
-+resolver @PKG_SYSCONFDIR@/resolver.xml
+sm @PKG_SYSCONFDIR@/sm.xml
+s2s @PKG_SYSCONFDIR@/s2s.xml
+c2s @PKG_SYSCONFDIR@/c2s.xml
diff --git a/chat/jabberd2/patches/patch-ac b/chat/jabberd2/patches/patch-ac
index e9846641a87..0a2ce2168ad 100644
--- a/chat/jabberd2/patches/patch-ac
+++ b/chat/jabberd2/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2008/02/20 14:33:04 xtraeme Exp $
+$NetBSD: patch-ac,v 1.5 2009/08/21 02:28:13 schnoebe Exp $
---- etc/sm.xml.in.orig 2008-01-08 04:23:48.000000000 -0600
+--- etc/sm.xml.in.orig 2009-04-27 04:05:14.000000000 -0500
+++ etc/sm.xml.in
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
<!-- The process ID file. Comment this out if you don't need to know
the process ID from outside the process (eg for control scripts) -->
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.4 2008/02/20 14:33:04 xtraeme Exp $
<!-- Router connection configuration -->
<router>
-@@ -30,7 +30,7 @@
+@@ -29,7 +29,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. -->
<!--
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.4 2008/02/20 14:33:04 xtraeme Exp $
-->
<!-- Router connection retry -->
-@@ -63,7 +63,7 @@
+@@ -62,7 +62,7 @@
<!-- If logging to file, this is the filename of the logfile -->
<!--
@@ -29,8 +29,8 @@ $NetBSD: patch-ac,v 1.4 2008/02/20 14:33:04 xtraeme Exp $
-->
</log>
-@@ -152,7 +152,7 @@
- <!-- Berkeley DB driver configuration -->
+@@ -153,7 +153,7 @@
+ implementation does not implement the 'count' callback). -->
<db>
<!-- Directory to store database files under -->
- <path>@localstatedir@/jabberd/db</path>
@@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.4 2008/02/20 14:33:04 xtraeme Exp $
<!-- Synchronize the database to disk after each write. If you
disable this, database accesses may be faster, but data may
-@@ -177,7 +177,7 @@
+@@ -178,7 +178,7 @@
<!-- SQLite driver configuration -->
<sqlite>
<!-- Database name -->
@@ -47,7 +47,16 @@ $NetBSD: patch-ac,v 1.4 2008/02/20 14:33:04 xtraeme Exp $
<!-- Transacation support. If this is commented out, transactions
will be disabled. This might make database accesses faster,
-@@ -625,7 +625,7 @@
+@@ -192,7 +192,7 @@
+ <!-- Filesystem driver configuration -->
+ <fs>
+ <!-- Directory to store database files under. -->
+- <path>@localstatedir@/lib/jabberd2/fs</path>
++ <path>@DBDIR@/fs</path>
+ </fs>
+
+ <!-- LDAPVCARD driver configuration -->
+@@ -654,7 +654,7 @@
<!-- If you defined publish, you should comment <roster> -->
<!--
diff --git a/chat/jabberd2/patches/patch-ad b/chat/jabberd2/patches/patch-ad
index d485b917206..dd8090fca4e 100644
--- a/chat/jabberd2/patches/patch-ad
+++ b/chat/jabberd2/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.3 2008/02/20 14:33:04 xtraeme Exp $
+$NetBSD: patch-ad,v 1.4 2009/08/21 02:28:13 schnoebe Exp $
---- etc/s2s.xml.in.orig 2008-01-08 04:23:48.000000000 -0600
+--- etc/s2s.xml.in.orig 2009-07-05 16:54:18.000000000 -0500
+++ etc/s2s.xml.in
@@ -5,7 +5,7 @@
@@ -29,7 +29,7 @@ $NetBSD: patch-ad,v 1.3 2008/02/20 14:33:04 xtraeme Exp $
-->
</log>
-@@ -104,7 +104,7 @@
+@@ -106,7 +106,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. -->
<!--
@@ -38,7 +38,7 @@ $NetBSD: patch-ad,v 1.3 2008/02/20 14:33:04 xtraeme Exp $
-->
<!-- SSL verify mode - see SSL_CTX_set_verify(3), mode parameter -->
-@@ -115,7 +115,7 @@
+@@ -117,7 +117,7 @@
<!-- File containing an optional SSL certificate chain file for SSL
connections. -->
<!--
@@ -47,7 +47,7 @@ $NetBSD: patch-ad,v 1.3 2008/02/20 14:33:04 xtraeme Exp $
-->
</local>
-@@ -190,7 +190,7 @@
+@@ -227,7 +227,7 @@
<stats>
<!-- file containing count of packets that went through -->
<!--
diff --git a/chat/jabberd2/patches/patch-ae b/chat/jabberd2/patches/patch-ae
index d2e9fd34011..25ef6fdf3e2 100644
--- a/chat/jabberd2/patches/patch-ae
+++ b/chat/jabberd2/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.4 2008/02/20 14:33:04 xtraeme Exp $
+$NetBSD: patch-ae,v 1.5 2009/08/21 02:28:13 schnoebe Exp $
---- etc/router.xml.in.orig 2008-01-08 04:23:48.000000000 -0600
+--- etc/router.xml.in.orig 2008-07-16 04:36:58.000000000 -0500
+++ etc/router.xml.in
@@ -5,7 +5,7 @@
@@ -38,11 +38,12 @@ $NetBSD: patch-ae,v 1.4 2008/02/20 14:33:04 xtraeme Exp $
-->
</local>
-@@ -185,6 +185,6 @@
+@@ -191,7 +191,7 @@
- <!-- 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>
+ <!-- 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>
+
+ </aci>
- </router>
diff --git a/chat/jabberd2/patches/patch-af b/chat/jabberd2/patches/patch-af
deleted file mode 100644
index 52beed97474..00000000000
--- a/chat/jabberd2/patches/patch-af
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-af,v 1.3 2008/02/20 14:33:04 xtraeme Exp $
-
---- etc/resolver.xml.in.orig 2008-01-08 04:23:48.000000000 -0600
-+++ etc/resolver.xml.in
-@@ -5,7 +5,7 @@
-
- <!-- The process ID file. Comment this out if you don't need to know
- the process ID from outside the process (eg for control scripts) -->
-- <pidfile>@localstatedir@/jabberd/pid/resolver.pid</pidfile>
-+ <pidfile>@PIDDIR@/resolver.pid</pidfile>
-
- <!-- Router connection configuration -->
- <router>
-@@ -27,7 +27,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 -->
-@@ -60,7 +60,7 @@
-
- <!-- If logging to file, this is the filename of the logfile -->
- <!--
-- <file>@localstatedir@/jabberd/log/resolver.log</file>
-+ <file>@LOGDIR@/resolver.log</file>
- -->
- </log>
-
diff --git a/chat/jabberd2/patches/patch-ag b/chat/jabberd2/patches/patch-ag
index 46740ddf16c..a559286f3d8 100644
--- a/chat/jabberd2/patches/patch-ag
+++ b/chat/jabberd2/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.7 2008/02/20 14:33:04 xtraeme Exp $
+$NetBSD: patch-ag,v 1.8 2009/08/21 02:28:13 schnoebe Exp $
---- etc/c2s.xml.in.orig 2008-02-03 08:23:09.000000000 -0600
+--- etc/c2s.xml.in.orig 2009-07-05 16:54:18.000000000 -0500
+++ etc/c2s.xml.in
@@ -5,7 +5,7 @@
@@ -29,7 +29,7 @@ $NetBSD: patch-ag,v 1.7 2008/02/20 14:33:04 xtraeme Exp $
-->
</log>
-@@ -118,7 +118,7 @@
+@@ -125,7 +125,7 @@
<id register-enable='true'>localhost.localdomain</id>
<!-- or
<id realm='company.int'
@@ -38,7 +38,7 @@ $NetBSD: patch-ag,v 1.7 2008/02/20 14:33:04 xtraeme Exp $
verify-mode='7'
require-starttls='true'
register-enable='true'
-@@ -157,7 +157,7 @@
+@@ -164,7 +164,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.7 2008/02/20 14:33:04 xtraeme Exp $
-->
<!-- SSL verify mode - see SSL_CTX_set_verify(3), mode parameter -->
-@@ -284,7 +284,7 @@
+@@ -312,7 +312,7 @@
<stats>
<!-- file containing count of packets that went through -->
<!--
@@ -56,7 +56,7 @@ $NetBSD: patch-ag,v 1.7 2008/02/20 14:33:04 xtraeme Exp $
-->
</stats>
-@@ -393,7 +393,7 @@
+@@ -382,7 +382,7 @@
<!-- SQLite driver configuration -->
<sqlite>
<!-- Database name -->
@@ -65,7 +65,7 @@ $NetBSD: patch-ag,v 1.7 2008/02/20 14:33:04 xtraeme Exp $
<!-- Transacation support. If this is commented out, transactions
will be disabled. This might make database accesses faster,
-@@ -407,7 +407,7 @@
+@@ -459,7 +459,7 @@
<!-- Berkeley DB module configuration -->
<db>
<!-- Directory to store database files under -->
@@ -74,7 +74,7 @@ $NetBSD: patch-ag,v 1.7 2008/02/20 14:33:04 xtraeme Exp $
<!-- Synchronize the database to disk after each write. If you
disable this, database accesses may be faster, but data may
-@@ -535,7 +535,7 @@
+@@ -587,7 +587,7 @@
<!-- Pipe module configuration -->
<pipe>
<!-- Program to execute -->
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 01:55:31 +0000