pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/39212: Update chat/jabberd2 to 2.2.1



>Number:         39212
>Category:       pkg
>Synopsis:       Update chat/jabberd2 to revision 2.2.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Jul 27 01:35:00 +0000 2008
>Originator:     Eric Schnoebelen
>Release:        NetBSD 4.99.55/NetBSD 4_STABLE
>Organization:
Central Iowa (Model) Railroad, Plano, TX, US
>Environment:
System: NetBSD tinker 4.99.55 NetBSD 4.99.55 (GENERIC) #5: Fri Mar 14 17:11:30 
CDT 2008 
eric%egsner.cirr.com@localhost:/work/eric/NetBSD-current/obj/amd64/sys/arch/amd64/compile/GENERIC
 amd64
Architecture: x86_64
Machine: amd64

Also built/tested (in production) on NetBSD/alpha 4_STABLE
>Description:
        jabberd2 has had at least 2 releases since the chat/jabberd2 has
        been updated.
>How-To-Repeat:
        Check the version in pkgsrc vs the web site.
        
>Fix:
        I've done the development as wip/jabberd2.

        Attached is the diff between chat/jabberd2 and wip/jabberd2

diff -buwr chat/jabberd2/DESCR wip/jabberd2/DESCR
--- chat/jabberd2/DESCR 2004-03-28 13:44:05.000000000 -0600
+++ wip/jabberd2/DESCR  2008-01-17 11:01:56.000000000 -0600
@@ -4,4 +4,4 @@
 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.
Only in wip/jabberd2: MESSAGE
diff -buwr chat/jabberd2/Makefile wip/jabberd2/Makefile
--- chat/jabberd2/Makefile      2008-06-21 05:28:56.000000000 -0500
+++ wip/jabberd2/Makefile       2008-07-19 07:27:36.000000000 -0500
@@ -1,17 +1,13 @@
-# $NetBSD: Makefile,v 1.48 2008/06/16 13:29:25 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.42 2007/11/15 12:57:21 sborrill Exp $
 
-DISTNAME=              jabberd-2.1.23
-PKGREVISION=           1
+DISTNAME=              jabberd-2.2.1
 CATEGORIES=            chat
 MASTER_SITES=          http://ftp.xiaoka.com/jabberd2/releases/
 EXTRACT_SUFX=          .tar.bz2
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=            eric%cirr.com@localhost
 HOMEPAGE=              http://jabberd2.xiaoka.com/
-COMMENT=               Instant messaging server (version 2)
-
-PKG_DESTDIR_SUPPORT=   user-destdir
+COMMENT=               XMPP (Jabber) instant messaging server
 
 CONFLICTS=             jabberd-[0-9]*
 
@@ -19,6 +15,8 @@
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
 
+BUILDLINK_FNAME_TRANSFORM.db4+=        -e "s,/db4/,/,g"
+
 SUBST_CLASSES+=                path
 SUBST_STAGE.path=      post-patch
 SUBST_FILES.path=      configure
@@ -32,7 +30,15 @@
 CONFIGURE_ARGS+=       --enable-anon
 CONFIGURE_ARGS+=       --enable-ssl
 CONFIGURE_ARGS+=       --enable-fs
-CONFIGURE_ARGS+=       --with-sasl=gsasl
+
+.if (${MACHINE_ARCH} == alpha)
+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
@@ -45,7 +51,7 @@
 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}
@@ -61,11 +67,11 @@
 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
@@ -100,23 +106,24 @@
 .endfor
 
 post-install:
+       ${INSTALL_DATA_DIR} ${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/etc/templates/roster.xml.dist.in      \
-           ${DESTDIR}${EGDIR}/roster.xml
-       ${INSTALL_SCRIPT} ${WRKSRC}/tools/pipe-auth.pl ${DESTDIR}${BINDIR}
-       ${INSTALL_SCRIPT} ${WRKSRC}/tools/migrate.pl ${DESTDIR}${BINDIR}
+           ${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} ${DESTDIR}${EGDIR}
+       ${INSTALL_DATA} ${WRKSRC}/tools/${f} ${EGDIR}
 .endfor
 .for f in ${FILES}
-       ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${DESTDIR}${EGDIR}
+       ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${EGDIR}
 .endfor
 .for f in ${DOCFILES}
-       ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}
 .endfor
 
+.include "../../wip/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 -buwr chat/jabberd2/PLIST wip/jabberd2/PLIST
--- chat/jabberd2/PLIST 2008-07-19 05:05:36.000000000 -0500
+++ wip/jabberd2/PLIST  2008-06-28 13:37:35.000000000 -0500
@@ -1,21 +1,15 @@
-@comment $NetBSD: PLIST,v 1.9 2008/07/16 15:26:27 manu Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/05/26 11:50:12 xtraeme 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_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.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/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 -buwr chat/jabberd2/distinfo wip/jabberd2/distinfo
--- chat/jabberd2/distinfo      2008-02-23 04:57:07.000000000 -0600
+++ wip/jabberd2/distinfo       2008-07-19 07:27:36.000000000 -0500
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.15 2008/02/20 14:33:04 xtraeme Exp $
+$NetBSD: distinfo,v 1.14 2007/08/27 08:41:06 xtraeme Exp $
 
-SHA1 (jabberd-2.1.23.tar.bz2) = eb05cc918f035316d47a4b4faae40f3ca976e0d6
-RMD160 (jabberd-2.1.23.tar.bz2) = 224a0cfd405d30e66a8259b579e94a556ef568b2
-Size (jabberd-2.1.23.tar.bz2) = 645473 bytes
-SHA1 (patch-aa) = fd63fa375ba477e988e057ab7dd65ab75b573f94
-SHA1 (patch-ab) = de1c8ec12b55117223bcca2071499c42ab145a34
-SHA1 (patch-ac) = e6e006bf73c345bb3bf873e389885c7f64bad11c
+SHA1 (jabberd-2.2.1.tar.bz2) = 4316662fb321690584ead8b0a5fbde8c6e177895
+RMD160 (jabberd-2.2.1.tar.bz2) = 572cd477797e6a75a7e2c6e43e66f280c8fe98d4
+Size (jabberd-2.2.1.tar.bz2) = 645496 bytes
+SHA1 (patch-aa) = 111a3ec7dfc9b54a6dca0401692615b5e12bf0f1
+SHA1 (patch-ab) = c33cefcb0ddbcec732e475eaf5b931cdc8dd6cc7
+SHA1 (patch-ac) = 748ee239da083915b839e6f89c83112295b7215c
 SHA1 (patch-ad) = db126c24dcf85c0c3c790b5b8723c6ae4da59453
-SHA1 (patch-ae) = 8cab0e740a173b76d44eea03e4b5084967b3168a
-SHA1 (patch-af) = 0a606630727c1895fdf39d7ebdd2355540cd49d0
+SHA1 (patch-ae) = 0c57279c309ef4f6a226d65a491fd040e03ae4f0
 SHA1 (patch-ag) = 28806cee8ac25a435ebf37de5744c2e893e8968b
diff -buwr chat/jabberd2/files/jabberd.sh wip/jabberd2/files/jabberd.sh
--- chat/jabberd2/files/jabberd.sh      2007-11-15 06:57:22.000000000 -0600
+++ wip/jabberd2/files/jabberd.sh       2008-06-28 13:37:35.000000000 -0500
@@ -36,7 +36,7 @@
        done
 }
 
-COMMAND_LIST="resolver router c2s s2s sm"
+COMMAND_LIST="router c2s s2s sm"
 
 name="jabberd"
 start_cmd="forward_commands"
Only in chat/jabberd2/files: resolver.sh
diff -buwr chat/jabberd2/files/sm.sh wip/jabberd2/files/sm.sh
--- chat/jabberd2/files/sm.sh   2008-03-15 19:29:24.000000000 -0500
+++ wip/jabberd2/files/sm.sh    2007-12-09 01:25:35.000000000 -0600
@@ -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.2 2004/06/26 11:21:46 abs Exp $
 #
 # PROVIDE: sm
 # REQUIRE: DAEMON c2s
@@ -35,8 +35,6 @@
 
 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 -buwr chat/jabberd2/options.mk wip/jabberd2/options.mk
--- chat/jabberd2/options.mk    2008-05-31 05:10:49.000000000 -0500
+++ wip/jabberd2/options.mk     2008-06-28 13:37:35.000000000 -0500
@@ -1,30 +1,43 @@
-# $NetBSD: options.mk,v 1.21 2008/05/27 13:23:43 obache Exp $
-#
+# $NetBSD: options.mk,v 1.18 2007/08/26 09:10:54 xtraeme 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 sasl-scod
+# 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
 
+.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:Msasl-scod)
+CONFIGURE_ARGS+=       --with-sasl=scod
+.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 "../../mk/bdb.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-db
 .endif
@@ -72,4 +85,5 @@
 
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=       --enable-debug
+CONFIGURE_ARGS+=       --enable-developer
 .endif
diff -buwr chat/jabberd2/patches/patch-aa wip/jabberd2/patches/patch-aa
--- chat/jabberd2/patches/patch-aa      2008-02-23 04:57:07.000000000 -0600
+++ wip/jabberd2/patches/patch-aa       2008-07-19 07:27:36.000000000 -0500
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2008/02/20 14:33:04 xtraeme Exp $
+$NetBSD$
 
---- Makefile.in.orig   2008-02-03 08:23:47.000000000 -0600
+--- Makefile.in.orig   2008-07-16 04:37:20.000000000 -0500
 +++ Makefile.in
-@@ -223,7 +223,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+@@ -197,7 +197,7 @@ target_alias = @target_alias@
+ 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 -buwr chat/jabberd2/patches/patch-ab wip/jabberd2/patches/patch-ab
--- chat/jabberd2/patches/patch-ab      2004-03-28 13:44:07.000000000 -0600
+++ wip/jabberd2/patches/patch-ab       2008-06-07 10:42:57.000000000 -0500
@@ -1,18 +1,16 @@
 $NetBSD: patch-ab,v 1.1.1.1 2004/03/28 19:44:07 xtraeme 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 -buwr chat/jabberd2/patches/patch-ac wip/jabberd2/patches/patch-ac
--- chat/jabberd2/patches/patch-ac      2008-02-23 04:57:07.000000000 -0600
+++ wip/jabberd2/patches/patch-ac       2008-07-19 07:27:36.000000000 -0500
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2008/02/20 14:33:04 xtraeme Exp $
+$NetBSD$
 
---- etc/sm.xml.in.orig 2008-01-08 04:23:48.000000000 -0600
+--- etc/sm.xml.in.orig 2008-07-16 04:36:58.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 @@
  
    <!-- 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 @@
      -->
  
      <!-- 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 @@
      -->
    </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 @@
  
        <!-- 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,7 @@
  
        <!-- Transacation support. If this is commented out, transactions
             will be disabled. This might make database accesses faster,
-@@ -625,7 +625,7 @@
+@@ -642,7 +642,7 @@
  
        <!-- If you defined publish, you should comment <roster> -->
        <!--
diff -buwr chat/jabberd2/patches/patch-ad wip/jabberd2/patches/patch-ad
--- chat/jabberd2/patches/patch-ad      2008-02-23 04:57:07.000000000 -0600
+++ wip/jabberd2/patches/patch-ad       2008-01-17 10:41:12.000000000 -0600
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2008/02/20 14:33:04 xtraeme Exp $
+$NetBSD$
 
 --- etc/s2s.xml.in.orig        2008-01-08 04:23:48.000000000 -0600
 +++ etc/s2s.xml.in
diff -buwr chat/jabberd2/patches/patch-ae wip/jabberd2/patches/patch-ae
--- chat/jabberd2/patches/patch-ae      2008-02-23 04:57:07.000000000 -0600
+++ wip/jabberd2/patches/patch-ae       2008-07-19 07:27:36.000000000 -0500
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.4 2008/02/20 14:33:04 xtraeme Exp $
+$NetBSD$
 
---- 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 @@
      -->
    </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>
  
- </router>
+   </aci>
+ 
Only in chat/jabberd2/patches: patch-af
diff -buwr chat/jabberd2/patches/patch-ag wip/jabberd2/patches/patch-ag
--- chat/jabberd2/patches/patch-ag      2008-02-23 04:57:07.000000000 -0600
+++ wip/jabberd2/patches/patch-ag       2008-02-06 23:50:27.000000000 -0600
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.7 2008/02/20 14:33:04 xtraeme Exp $
+$NetBSD$
 
 --- etc/c2s.xml.in.orig        2008-02-03 08:23:09.000000000 -0600
 +++ etc/c2s.xml.in



Home | Main Index | Thread Index | Old Index