pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/chat/jabberd2 Update to 2.1.6 (last stable version).
details: https://anonhg.NetBSD.org/pkgsrc/rev/83564952811c
branches: trunk
changeset: 529163:83564952811c
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Sat May 26 11:50:12 2007 +0000
description:
Update to 2.1.6 (last stable version).
A lot of changes were made since previous update, like SASL support,
SQLite support, etc. Please see the following URL for a full list
of changes:
http://jabberd2.xiaoka.com/wiki/Releases
diffstat:
chat/jabberd2/Makefile | 27 +++++++++------
chat/jabberd2/PLIST | 44 ++++++++++++++++++++++++-
chat/jabberd2/distinfo | 21 ++++++-----
chat/jabberd2/options.mk | 73 +++++++++++++++++++++++++++++++++++------
chat/jabberd2/patches/patch-aa | 18 +++++-----
chat/jabberd2/patches/patch-ac | 34 +++++++++---------
chat/jabberd2/patches/patch-ad | 32 ++++++++++++++----
chat/jabberd2/patches/patch-ae | 20 ++++++++---
chat/jabberd2/patches/patch-af | 14 ++++----
chat/jabberd2/patches/patch-ag | 51 +++++++++++++++++------------
chat/jabberd2/patches/patch-ah | 31 +++++++++++++++++
11 files changed, 264 insertions(+), 101 deletions(-)
diffs (truncated from 636 to 300 lines):
diff -r 511ade057a92 -r 83564952811c chat/jabberd2/Makefile
--- a/chat/jabberd2/Makefile Sat May 26 11:13:32 2007 +0000
+++ b/chat/jabberd2/Makefile Sat May 26 11:50:12 2007 +0000
@@ -1,20 +1,21 @@
-# $NetBSD: Makefile,v 1.34 2007/02/22 19:26:12 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2007/05/26 11:50:12 xtraeme Exp $
#
-DISTNAME= jabberd-2.0s11
+DISTNAME= jabberd-2.1.6
CATEGORIES= chat
-MASTER_SITES= http://files.jabberstudio.org/jabberd2/
+MASTER_SITES= http://ftp.xiaoka.com/jabberd2/releases/
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= xtraeme%NetBSD.org@localhost
-HOMEPAGE= http://jabberd.jabberstudio.org/2/
+HOMEPAGE= http://jabberd2.xiaoka.com/
COMMENT= Instant messaging server (version 2)
CONFLICTS= jabberd-[0-9]*
+USE_LANGUAGES= c c++
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.6b
BUILDLINK_FNAME_TRANSFORM.db4+= -e "s,/db4/,/,g"
SUBST_CLASSES+= path
@@ -35,7 +36,8 @@
.include "../../mk/bsd.prefs.mk"
-BUILD_DEFS+= JABBERD_USER JABBERD_GROUP JABBERD_LOGDIR JABBERD_PIDDIR
+BUILD_DEFS+= JABBERD_USER JABBERD_GROUP
+BUILD_DEFS+= JABBERD_LOGDIR JABBERD_PIDDIR
PKG_SYSCONFSUBDIR= jabberd
RCD_SCRIPTS= jabberd c2s sm resolver router s2s
@@ -53,8 +55,10 @@
CONF_FILES= ${EGDIR}/jabberd.cfg ${PKG_SYSCONFDIR}/jabberd.cfg
FILES= c2s.xml resolver.xml router.xml \
- router-users.xml s2s.xml sm.xml
-DBFILES= db-setup.mysql db-setup.pgsql
+ 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
.for f in ${FILES}
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
@@ -69,13 +73,13 @@
post-extract:
.for f in ${FILES}
- @${MV} ${WRKSRC}/etc/${f}.dist.in ${WRKSRC}/etc/${f}.in
+ ${MV} ${WRKSRC}/etc/${f}.dist.in ${WRKSRC}/etc/${f}.in
.endfor
- @${MV} ${WRKSRC}/etc/jabberd.cfg.dist.in ${WRKSRC}/etc/jabberd.cfg.in
+ ${MV} ${WRKSRC}/etc/jabberd.cfg.dist.in ${WRKSRC}/etc/jabberd.cfg.in
pre-configure:
.for f in ${FILES} jabberd.cfg
- @${SED} \
+ ${SED} \
-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \
-e "s|@PIDDIR@|${JABBERD_PIDDIR}|g" \
-e "s|@LOGDIR@|${JABBERD_LOGDIR}|g" \
@@ -101,4 +105,5 @@
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/libidn/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 511ade057a92 -r 83564952811c chat/jabberd2/PLIST
--- a/chat/jabberd2/PLIST Sat May 26 11:13:32 2007 +0000
+++ b/chat/jabberd2/PLIST Sat May 26 11:50:12 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/05/03 15:33:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/05/26 11:50:12 xtraeme Exp $
bin/c2s
bin/jabberd
bin/migrate.pl
@@ -7,6 +7,42 @@
bin/router
bin/s2s
bin/sm
+lib/jabberd/authreg_anon.la
+${DB_OPT}lib/jabberd/authreg_db.la
+${LDAP_OPT}lib/jabberd/authreg_ldap.la
+${MYSQL_OPT}lib/jabberd/authreg_mysql.la
+${PAM_OPT}lib/jabberd/authreg_pam.la
+${PGSQL_OPT}lib/jabberd/authreg_pgsql.la
+${SQLITE_OPT}lib/jabberd/authreg_sqlite.la
+lib/jabberd/authreg_pipe.la
+lib/jabberd/mod_active.la
+lib/jabberd/mod_amp.la
+lib/jabberd/mod_announce.la
+lib/jabberd/mod_deliver.la
+lib/jabberd/mod_disco-publish.la
+lib/jabberd/mod_disco.la
+lib/jabberd/mod_echo.la
+lib/jabberd/mod_help.la
+lib/jabberd/mod_iq-last.la
+lib/jabberd/mod_iq-ping.la
+lib/jabberd/mod_iq-private.la
+lib/jabberd/mod_iq-time.la
+lib/jabberd/mod_iq-vcard.la
+lib/jabberd/mod_iq-version.la
+lib/jabberd/mod_offline.la
+lib/jabberd/mod_presence.la
+lib/jabberd/mod_privacy.la
+lib/jabberd/mod_roster.la
+lib/jabberd/mod_session.la
+lib/jabberd/mod_status.la
+lib/jabberd/mod_template-roster.la
+lib/jabberd/mod_vacation.la
+lib/jabberd/mod_validate.la
+lib/jabberd/storage_fs.la
+${DB_OPT}lib/jabberd/storage_db.la
+${MYSQL_OPT}lib/jabberd/storage_mysql.la
+${PGSQL_OPT}lib/jabberd/storage_pgsql.la
+${SQLITE_OPT}lib/jabberd/storage_sqlite.la
man/man8/c2s.8
man/man8/jabberd.8
man/man8/resolver.8
@@ -14,15 +50,20 @@
man/man8/s2s.8
man/man8/sm.8
share/examples/jabberd/c2s.xml
+share/examples/jabberd/db-setup-status.mysql
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/jabberd.cfg
share/examples/jabberd/resolver.xml
share/examples/jabberd/roster.xml
+share/examples/jabberd/router-filter.xml
share/examples/jabberd/router-users.xml
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
@@ -30,3 +71,4 @@
share/examples/rc.d/s2s
share/examples/rc.d/sm
@dirrm share/examples/jabberd
+@dirrm lib/jabberd
diff -r 511ade057a92 -r 83564952811c chat/jabberd2/distinfo
--- a/chat/jabberd2/distinfo Sat May 26 11:13:32 2007 +0000
+++ b/chat/jabberd2/distinfo Sat May 26 11:50:12 2007 +0000
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.10 2006/06/11 01:57:27 xtraeme Exp $
+$NetBSD: distinfo,v 1.11 2007/05/26 11:50:12 xtraeme Exp $
-SHA1 (jabberd-2.0s11.tar.gz) = c938d95fc17634b889ba9b1d7d27115593b13e3d
-RMD160 (jabberd-2.0s11.tar.gz) = 7e89790abb5ff4e84a0a38ac5afbc0c365d60b3d
-Size (jabberd-2.0s11.tar.gz) = 777466 bytes
-SHA1 (patch-aa) = 2a3f7a9e9b9ecc248b5e05b54c6c7e08e9ca0183
+SHA1 (jabberd-2.1.6.tar.bz2) = fbb846a164d9ae5e6eaf8227ac8c82257acdb1e8
+RMD160 (jabberd-2.1.6.tar.bz2) = d02b395d0e9fded2d9136cb3fbd27f907958aa84
+Size (jabberd-2.1.6.tar.bz2) = 865179 bytes
+SHA1 (patch-aa) = bd62fd5956cb6722f7cb4b5bdca05ee502f43e46
SHA1 (patch-ab) = de1c8ec12b55117223bcca2071499c42ab145a34
-SHA1 (patch-ac) = 312a07fa6772956297789e15025e0ca0fad9ebb7
-SHA1 (patch-ad) = b7776cbd6553f3b3b2f9b20250b1368f196cb85d
-SHA1 (patch-ae) = 9b03c202c5b9944906f0311fac350d563d27199b
-SHA1 (patch-af) = aad84cbfba7c0519e32df1ed6f31fa8383d73393
-SHA1 (patch-ag) = fda728bc2682c76376b68863797fcb085739a047
+SHA1 (patch-ac) = 6750c724910a7be4b19488af02d57784ff06af3d
+SHA1 (patch-ad) = 3a4b9f80912c70fb1cdc7756b6d4dcc12feadb5a
+SHA1 (patch-ae) = 56cb29f139c9f6e74afd9bb0361d70fe4fad0c47
+SHA1 (patch-af) = 83b16643caae2a0c5ca396793f0a80c0bb5d83e7
+SHA1 (patch-ag) = e4dc021acbc40dd9bc6206014fe12ee4aedefdc7
+SHA1 (patch-ah) = f896a30c9ee44bb0bd19a9c848a455e94eefcdb4
diff -r 511ade057a92 -r 83564952811c chat/jabberd2/options.mk
--- a/chat/jabberd2/options.mk Sat May 26 11:13:32 2007 +0000
+++ b/chat/jabberd2/options.mk Sat May 26 11:50:12 2007 +0000
@@ -1,38 +1,87 @@
-# $NetBSD: options.mk,v 1.12 2007/02/22 19:26:12 wiz Exp $
+# $NetBSD: options.mk,v 1.13 2007/05/26 11:50:12 xtraeme Exp $
#
-PKG_OPTIONS_VAR= PKG_OPTIONS.jabberd2
-PKG_SUPPORTED_OPTIONS= db ldap pam
-PKG_OPTIONS_OPTIONAL_GROUPS= database
-PKG_OPTIONS_GROUP.database= mysql pgsql
-PKG_SUGGESTED_OPTIONS= mysql
+PKG_OPTIONS_VAR= PKG_OPTIONS.jabberd2
+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= cyrus-sasl gnusasl
+PKG_SUGGESTED_OPTIONS= auth-sqlite storage-sqlite gnusasl
.include "../../mk/bsd.options.mk"
-.if !empty(PKG_OPTIONS:Mdb)
-BUILD_DEFS+= JABBERD_DBDIR
+.if !empty(PKG_OPTIONS:Mauth-db) || !empty(PKG_OPTIONS:Mstorage-db)
+BUILD_DEFS+= VARBASE JABBERD_DBDIR
JABBERD_DBDIR?= ${VARBASE}/db/jabberd
+PLIST_SUBST+= DB_OPT=
CONFIGURE_ARGS+= --enable-db
. include "../../databases/db4/buildlink3.mk"
+.else
+PLIST_SUBST+= DB_OPT='@comment '
+CONFIGURE_ARGS+= --disable-db
.endif
-.if !empty(PKG_OPTIONS:Mmysql)
+.if !empty(PKG_OPTIONS:Mauth-mysql) || !empty(PKG_OPTIONS:Mstorage-mysql)
+PLIST_SUBST+= MYSQL_OPT=
CONFIGURE_ARGS+= --enable-mysql
CPPFLAGS+= -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
. include "../../mk/mysql.buildlink3.mk"
+.else
+PLIST_SUBST+= MYSQL_OPT='@comment '
+CONFIGURE_ARGS+= --disable-mysql
.endif
-.if !empty(PKG_OPTIONS:Mpgsql)
+.if !empty(PKG_OPTIONS:Mauth-pgsql) || !empty(PKG_OPTIONS:Mstorage-pgsql)
+PLIST_SUBST+= PGSQL_OPT=
CONFIGURE_ARGS+= --enable-pgsql
. include "../../mk/pgsql.buildlink3.mk"
+.else
+PLIST_SUBST+= PGSQL_OPT='@comment '
+CONFIGURE_ARGS+= --disable-pgsql
+.endif
+
+.if !empty(PKG_OPTIONS:Mauth-sqlite) || !empty(PKG_OPTIONS:Mstorage-sqlite)
+PLIST_SUBST+= SQLITE_OPT=
+CONFIGURE_ARGS+= --enable-sqlite
+. include "../../databases/sqlite3/buildlink3.mk"
+.else
+PLIST_SUBST+= SQLITE_OPT='@comment '
+CONFIGURE_ARGS+= --disable-sqlite
.endif
-.if !empty(PKG_OPTIONS:Mldap)
+.if !empty(PKG_OPTIONS:Mauth-ldap)
+PLIST_SUBST+= LDAP_OPT=
CONFIGURE_ARGS+= --enable-ldap
. include "../../databases/openldap-client/buildlink3.mk"
+.else
+PLIST_SUBST+= LDAP_OPT='@comment '
+CONFIGURE_ARGS+= --disable-ldap
+.endif
+
+.if !empty(PKG_OPTIONS:Mcyrus-sasl)
+CONFIGURE_ARGS+= --enable-cyrus
+. include "../../security/cyrus-sasl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-cyrus
.endif
-.if !empty(PKG_OPTIONS:Mpam)
+.if !empty(PKG_OPTIONS:Mgnusasl)
+CONFIGURE_ARGS+= --enable-gsasl
+. include "../../security/gsasl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-gsasl
+.endif
+
+.if !empty(PKG_OPTIONS:Mauth-pam)
+PLIST_SUBST+= PAM_OPT=
CONFIGURE_ARGS+= --enable-pam
. include "../../mk/pam.buildlink3.mk"
+.else
+PLIST_SUBST+= PAM_OPT='@comment '
+CONFIGURE_ARGS+= --disable-pam
.endif
diff -r 511ade057a92 -r 83564952811c chat/jabberd2/patches/patch-aa
--- a/chat/jabberd2/patches/patch-aa Sat May 26 11:13:32 2007 +0000
+++ b/chat/jabberd2/patches/patch-aa Sat May 26 11:50:12 2007 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2005/05/24 21:02:53 xtraeme Exp $
+$NetBSD: patch-aa,v 1.4 2007/05/26 11:50:12 xtraeme Exp $
---- Makefile.in.orig 2005-05-24 22:43:59.000000000 +0200
-+++ Makefile.in 2005-05-24 22:44:20.000000000 +0200
-@@ -170,7 +170,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- EXTRA_DIST = PROTOCOL Doxyfile.in README.win32 contrib
--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
+--- Makefile.in.orig 2007-05-26 12:01:18.000000000 +0200
Home |
Main Index |
Thread Index |
Old Index