[pkgsrc/trunk]: pkgsrc/chat/jabberd2 Update to 2.1.23. Lots of changes and bu...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/chat/jabberd2 Update to 2.1.23. Lots of changes and bu...
From: xtraeme <xtraeme%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:49:01 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/3ee5b54d4d5b
branches:  trunk
changeset: 538898:3ee5b54d4d5b
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Wed Feb 20 14:33:04 2008 +0000

description:
Update to 2.1.23. Lots of changes and bugfixes since previous version,
see http://jabberd2.xiaoka.com/wiki/Releases for a detailed description.

diffstat:

 chat/jabberd2/Makefile         |  28 ++++++++++++++---------
 chat/jabberd2/PLIST            |  10 +++++--
 chat/jabberd2/distinfo         |  21 ++++++++---------
 chat/jabberd2/options.mk       |  18 ++------------
 chat/jabberd2/patches/patch-aa |  14 +++++-----
 chat/jabberd2/patches/patch-ac |  28 +++++++++++-----------
 chat/jabberd2/patches/patch-ad |  33 +++++++++++++++++---------
 chat/jabberd2/patches/patch-ae |  20 ++++++++--------
 chat/jabberd2/patches/patch-af |  18 +++++++-------
 chat/jabberd2/patches/patch-ag |  51 ++++++++++++++++++++++++-----------------
 chat/jabberd2/patches/patch-ah |  31 -------------------------
 11 files changed, 128 insertions(+), 144 deletions(-)

diffs (truncated from 566 to 300 lines):

diff -r 9d1bbc439d4b -r 3ee5b54d4d5b chat/jabberd2/Makefile
--- a/chat/jabberd2/Makefile    Wed Feb 20 13:53:38 2008 +0000
+++ b/chat/jabberd2/Makefile    Wed Feb 20 14:33:04 2008 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2008/01/18 05:06:24 tnn Exp $
+# $NetBSD: Makefile,v 1.44 2008/02/20 14:33:04 xtraeme Exp $
 #
 
-DISTNAME=              jabberd-2.1.14
-PKGREVISION=           3
+DISTNAME=              jabberd-2.1.23
 CATEGORIES=            chat
 MASTER_SITES=          http://ftp.xiaoka.com/jabberd2/releases/
 EXTRACT_SUFX=          .tar.bz2
@@ -32,6 +31,7 @@
 CONFIGURE_ARGS+=       --enable-anon
 CONFIGURE_ARGS+=       --enable-ssl
 CONFIGURE_ARGS+=       --enable-fs
+CONFIGURE_ARGS+=       --with-sasl=gsasl
 
 USE_TOOLS+=            perl:run
 REPLACE_PERL+=         tools/*.pl
@@ -58,13 +58,16 @@
 
 BINDIR=                        ${PREFIX}/bin
 EGDIR=                 ${PREFIX}/share/examples/jabberd
-CONF_FILES=            ${EGDIR}/jabberd.cfg ${PKG_SYSCONFDIR}/jabberd.cfg
+DOCDIR=                        ${PREFIX}/share/doc/jabberd
 
-FILES=                 c2s.xml resolver.xml router.xml                 \
+FILES=                 jabberd.cfg c2s.xml resolver.xml router.xml     \
                        router-users.xml router-filter.xml s2s.xml      \
-                       sm.xml storage.xml
-DBFILES=               db-setup.mysql db-setup.pgsql db-update.mysql   \
-                       db-setup-status.mysql db-setup.sqlite
+                       sm.xml
+DBFILES=               db-jd14-2-jd2.sql db-setup.mysql db-setup.pgsql \
+                       db-update.mysql db-setup.sqlite
+DOCFILES=              README.protocol README UPGRADE ChangeLog
+
+INSTALLATION_DIRS=      bin share/examples/jabberd share/doc/jabberd
 
 .for f in ${FILES}
 CONF_FILES+=           ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
@@ -81,10 +84,9 @@
 .for f in ${FILES}
        mv ${WRKSRC}/etc/${f}.dist.in ${WRKSRC}/etc/${f}.in
 .endfor
-       mv ${WRKSRC}/etc/jabberd.cfg.dist.in ${WRKSRC}/etc/jabberd.cfg.in
 
 pre-configure:
-.for f in ${FILES} jabberd.cfg
+.for f in ${FILES}
        sed                                                             \
                -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"             \
                -e "s|@PIDDIR@|${JABBERD_PIDDIR}|g"                     \
@@ -105,12 +107,16 @@
 .for f in ${DBFILES}
        ${INSTALL_DATA} ${WRKSRC}/tools/${f} ${EGDIR}
 .endfor
-.for f in jabberd.cfg ${FILES}
+.for f in ${FILES}
        ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${EGDIR}
 .endfor
+.for f in ${DOCFILES}
+       ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}
+.endfor
 
 .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 -r 9d1bbc439d4b -r 3ee5b54d4d5b chat/jabberd2/PLIST
--- a/chat/jabberd2/PLIST       Wed Feb 20 13:53:38 2008 +0000
+++ b/chat/jabberd2/PLIST       Wed Feb 20 14:33:04 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/05/26 11:50:12 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/02/20 14:33:04 xtraeme Exp $
 bin/c2s
 bin/jabberd
 bin/migrate.pl
@@ -33,6 +33,7 @@
 lib/jabberd/mod_presence.la
 lib/jabberd/mod_privacy.la
 lib/jabberd/mod_roster.la
+lib/jabberd/mod_roster-publish.la
 lib/jabberd/mod_session.la
 lib/jabberd/mod_status.la
 lib/jabberd/mod_template-roster.la
@@ -49,8 +50,12 @@
 man/man8/router.8
 man/man8/s2s.8
 man/man8/sm.8
+share/doc/jabberd/README
+share/doc/jabberd/README.protocol
+share/doc/jabberd/UPGRADE
+share/doc/jabberd/ChangeLog
 share/examples/jabberd/c2s.xml
-share/examples/jabberd/db-setup-status.mysql
+share/examples/jabberd/db-jd14-2-jd2.sql
 share/examples/jabberd/db-setup.mysql
 share/examples/jabberd/db-setup.pgsql
 share/examples/jabberd/db-setup.sqlite
@@ -63,7 +68,6 @@
 share/examples/jabberd/router.xml
 share/examples/jabberd/s2s.xml
 share/examples/jabberd/sm.xml
-share/examples/jabberd/storage.xml
 share/examples/rc.d/c2s
 share/examples/rc.d/jabberd
 share/examples/rc.d/resolver
diff -r 9d1bbc439d4b -r 3ee5b54d4d5b chat/jabberd2/distinfo
--- a/chat/jabberd2/distinfo    Wed Feb 20 13:53:38 2008 +0000
+++ b/chat/jabberd2/distinfo    Wed Feb 20 14:33:04 2008 +0000
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.14 2007/08/27 08:41:06 xtraeme Exp $
+$NetBSD: distinfo,v 1.15 2008/02/20 14:33:04 xtraeme Exp $
 
-SHA1 (jabberd-2.1.14.tar.bz2) = dd12ed8956ffc0118e6bfd0424d788d4bd1c128c
-RMD160 (jabberd-2.1.14.tar.bz2) = 3a6f1c2104ce0d88c4535139fd705e06da564863
-Size (jabberd-2.1.14.tar.bz2) = 1046630 bytes
-SHA1 (patch-aa) = bd62fd5956cb6722f7cb4b5bdca05ee502f43e46
+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) = 768d98497682017a2b80bad02a719f817fd0dd87
-SHA1 (patch-ad) = 3a4b9f80912c70fb1cdc7756b6d4dcc12feadb5a
-SHA1 (patch-ae) = 56cb29f139c9f6e74afd9bb0361d70fe4fad0c47
-SHA1 (patch-af) = 83b16643caae2a0c5ca396793f0a80c0bb5d83e7
-SHA1 (patch-ag) = fd65428b7253eb1137799ef40d654e14083bc8d9
-SHA1 (patch-ah) = f896a30c9ee44bb0bd19a9c848a455e94eefcdb4
+SHA1 (patch-ac) = e6e006bf73c345bb3bf873e389885c7f64bad11c
+SHA1 (patch-ad) = db126c24dcf85c0c3c790b5b8723c6ae4da59453
+SHA1 (patch-ae) = 8cab0e740a173b76d44eea03e4b5084967b3168a
+SHA1 (patch-af) = 0a606630727c1895fdf39d7ebdd2355540cd49d0
+SHA1 (patch-ag) = 28806cee8ac25a435ebf37de5744c2e893e8968b
diff -r 9d1bbc439d4b -r 3ee5b54d4d5b chat/jabberd2/options.mk
--- a/chat/jabberd2/options.mk  Wed Feb 20 13:53:38 2008 +0000
+++ b/chat/jabberd2/options.mk  Wed Feb 20 14:33:04 2008 +0000
@@ -1,18 +1,16 @@
-# $NetBSD: options.mk,v 1.18 2007/08/26 09:10:54 xtraeme Exp $
+# $NetBSD: options.mk,v 1.19 2008/02/20 14:33:04 xtraeme Exp $
 #
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.jabberd2
-PKG_OPTIONS_REQUIRED_GROUPS=   auth storage sasl
+PKG_OPTIONS_REQUIRED_GROUPS=   auth storage
 # 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=                cyrus-sasl gnusasl
 PKG_SUPPORTED_OPTIONS+=                debug
-PKG_SUGGESTED_OPTIONS=         auth-sqlite storage-sqlite gnusasl
+PKG_SUGGESTED_OPTIONS=         auth-sqlite storage-sqlite
 
 .include "../../mk/bsd.options.mk"
 
@@ -68,16 +66,6 @@
 CONFIGURE_ARGS+=       --disable-ldap
 .endif
 
-.if !empty(PKG_OPTIONS:Mcyrus-sasl)
-CONFIGURE_ARGS+=       --enable-sasl=cyrus
-.  include "../../security/cyrus-sasl/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnusasl)
-CONFIGURE_ARGS+=       --enable-sasl=gsasl
-.  include "../../security/gsasl/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mauth-pam)
 PLIST_SUBST+=          PAM_OPT=
 CONFIGURE_ARGS+=       --enable-pam
diff -r 9d1bbc439d4b -r 3ee5b54d4d5b chat/jabberd2/patches/patch-aa
--- a/chat/jabberd2/patches/patch-aa    Wed Feb 20 13:53:38 2008 +0000
+++ b/chat/jabberd2/patches/patch-aa    Wed Feb 20 14:33:04 2008 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.4 2007/05/26 11:50:12 xtraeme Exp $
+$NetBSD: patch-aa,v 1.5 2008/02/20 14:33:04 xtraeme Exp $
 
---- Makefile.in.orig   2007-05-26 12:01:18.000000000 +0200
-+++ Makefile.in        2007-05-26 12:01:22.000000000 +0200
-@@ -191,7 +191,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- EXTRA_DIST = PROTOCOL Doxyfile.in README.win32 contrib UPGRADE
+--- Makefile.in.orig   2008-02-03 08:23:47.000000000 -0600
++++ Makefile.in
+@@ -223,7 +223,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ 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
  all: config.h
diff -r 9d1bbc439d4b -r 3ee5b54d4d5b chat/jabberd2/patches/patch-ac
--- a/chat/jabberd2/patches/patch-ac    Wed Feb 20 13:53:38 2008 +0000
+++ b/chat/jabberd2/patches/patch-ac    Wed Feb 20 14:33:04 2008 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.3 2007/08/27 08:41:06 xtraeme Exp $
+$NetBSD: patch-ac,v 1.4 2008/02/20 14:33:04 xtraeme Exp $
 
---- etc/sm.xml.in.orig 2007-07-30 21:07:08.000000000 +0200
-+++ etc/sm.xml.in      2007-08-27 10:32:36.000000000 +0200
-@@ -9,7 +9,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
-        scripts) -->
+--- etc/sm.xml.in.orig 2008-01-08 04:23:48.000000000 -0600
++++ etc/sm.xml.in
+@@ -8,7 +8,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/sm.pid</pidfile>
 +  <pidfile>@PIDDIR@/sm.pid</pidfile>
  
    <!-- Router connection configuration -->
    <router>
-@@ -31,7 +31,7 @@
+@@ -30,7 +30,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 -->
-@@ -64,7 +64,7 @@
+@@ -63,7 +63,7 @@
  
      <!-- If logging to file, this is the filename of the logfile -->
      <!--
@@ -29,7 +29,7 @@
      -->
    </log>
  
-@@ -136,7 +136,7 @@
+@@ -152,7 +152,7 @@
      <!-- Berkeley DB driver configuration -->
      <db>
        <!-- Directory to store database files under -->
@@ -38,7 +38,7 @@
  
        <!-- Synchronize the database to disk after each write. If you
             disable this, database accesses may be faster, but data may
-@@ -161,7 +161,7 @@
+@@ -177,7 +177,7 @@
      <!-- SQLite driver configuration -->
      <sqlite>
        <!-- Database name -->
@@ -47,9 +47,9 @@
  
        <!-- Transacation support. If this is commented out, transactions
             will be disabled. This might make database accesses faster,
-@@ -430,7 +430,7 @@
-          stored in the users data store when they are created. -->
-     <template>
+@@ -625,7 +625,7 @@
+ 
+       <!-- If you defined publish, you should comment <roster> -->
        <!--
 -      <roster>@sysconfdir@/templates/roster.xml</roster>
 +      <roster>@PKG_SYSCONFDIR@/roster.xml</roster>
diff -r 9d1bbc439d4b -r 3ee5b54d4d5b chat/jabberd2/patches/patch-ad
--- a/chat/jabberd2/patches/patch-ad    Wed Feb 20 13:53:38 2008 +0000
+++ b/chat/jabberd2/patches/patch-ad    Wed Feb 20 14:33:04 2008 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-ad,v 1.2 2007/05/26 11:50:13 xtraeme Exp $
+$NetBSD: patch-ad,v 1.3 2008/02/20 14:33:04 xtraeme Exp $
 
---- etc/s2s.xml.in.orig        2007-05-26 12:04:13.000000000 +0200
-+++ etc/s2s.xml.in     2007-05-26 12:05:01.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
-        scripts) -->
+--- etc/s2s.xml.in.orig        2008-01-08 04:23:48.000000000 -0600
++++ etc/s2s.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/s2s.pid</pidfile>
 +  <pidfile>@PIDDIR@/s2s.pid</pidfile>
  
    <!-- Router connection configuration -->
    <router>
-@@ -38,7 +38,7 @@
+@@ -37,7 +37,7 @@
           If this is commented out, or the file can't be read, no attempt
Prev by Date: [pkgsrc/trunk]: pkgsrc/mail/mail-notification Update to 5.0.
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/ncursesw Add a ncursesw/builtin.mk file to that ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mail/mail-notification Update to 5.0.
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/ncursesw Add a ncursesw/builtin.mk file to that ...
Indexes:
Home | Main Index | Thread Index | Old Index