pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/chat/jabberd2 Welcome to jabberd2 2.2.8.
details: https://anonhg.NetBSD.org/pkgsrc/rev/bdd0a028a599
branches: trunk
changeset: 397955:bdd0a028a599
user: schnoebe <schnoebe%pkgsrc.org@localhost>
date: Fri Aug 21 02:28:12 2009 +0000
description:
Welcome to jabberd2 2.2.8.
diffstat:
chat/jabberd2/DESCR | 2 +-
chat/jabberd2/MESSAGE | 6 +++++
chat/jabberd2/Makefile | 32 +++++++++++++++++++-----------
chat/jabberd2/PLIST | 13 ++---------
chat/jabberd2/files/jabberd.sh | 4 +-
chat/jabberd2/files/resolver.sh | 42 -----------------------------------------
chat/jabberd2/files/sm.sh | 4 +--
chat/jabberd2/options.mk | 34 +++++++++++++++++++++-----------
chat/jabberd2/patches/patch-aa | 12 +++++-----
chat/jabberd2/patches/patch-ab | 10 +++-----
chat/jabberd2/patches/patch-ac | 27 +++++++++++++++++--------
chat/jabberd2/patches/patch-ad | 10 ++++----
chat/jabberd2/patches/patch-ae | 17 ++++++++-------
chat/jabberd2/patches/patch-af | 31 ------------------------------
chat/jabberd2/patches/patch-ag | 16 +++++++-------
15 files changed, 105 insertions(+), 155 deletions(-)
diffs (truncated from 594 to 300 lines):
diff -r 228c12e26196 -r bdd0a028a599 chat/jabberd2/DESCR
--- a/chat/jabberd2/DESCR Fri Aug 21 01:57:54 2009 +0000
+++ b/chat/jabberd2/DESCR Fri Aug 21 02:28:12 2009 +0000
@@ -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.
diff -r 228c12e26196 -r bdd0a028a599 chat/jabberd2/MESSAGE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/jabberd2/MESSAGE Fri Aug 21 02:28:12 2009 +0000
@@ -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 -r 228c12e26196 -r bdd0a028a599 chat/jabberd2/Makefile
--- a/chat/jabberd2/Makefile Fri Aug 21 01:57:54 2009 +0000
+++ b/chat/jabberd2/Makefile Fri Aug 21 02:28:12 2009 +0000
@@ -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@localhost
+MAINTAINER= eric%cirr.com@localhost
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-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+= 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 @@
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 @@
${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 -r 228c12e26196 -r bdd0a028a599 chat/jabberd2/PLIST
--- a/chat/jabberd2/PLIST Fri Aug 21 01:57:54 2009 +0000
+++ b/chat/jabberd2/PLIST Fri Aug 21 02:28:12 2009 +0000
@@ -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_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 -r 228c12e26196 -r bdd0a028a599 chat/jabberd2/files/jabberd.sh
--- a/chat/jabberd2/files/jabberd.sh Fri Aug 21 01:57:54 2009 +0000
+++ b/chat/jabberd2/files/jabberd.sh Fri Aug 21 02:28:12 2009 +0000
@@ -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 @@
done
}
-COMMAND_LIST="resolver router c2s s2s sm"
+COMMAND_LIST="router c2s s2s sm"
name="jabberd"
start_cmd="forward_commands"
diff -r 228c12e26196 -r bdd0a028a599 chat/jabberd2/files/resolver.sh
--- a/chat/jabberd2/files/resolver.sh Fri Aug 21 01:57:54 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 228c12e26196 -r bdd0a028a599 chat/jabberd2/files/sm.sh
--- a/chat/jabberd2/files/sm.sh Fri Aug 21 01:57:54 2009 +0000
+++ b/chat/jabberd2/files/sm.sh Fri Aug 21 02:28:12 2009 +0000
@@ -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 @@
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 -r 228c12e26196 -r bdd0a028a599 chat/jabberd2/options.mk
--- a/chat/jabberd2/options.mk Fri Aug 21 01:57:54 2009 +0000
+++ b/chat/jabberd2/options.mk Fri Aug 21 02:28:12 2009 +0000
@@ -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)
+CONFIGURE_ARGS+= --enable-db
+PLIST.db= yes
+BDB_ACCEPTED= db4
+BUILDLINK_TRANSFORM+= l:db:db4
. 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
.else
CONFIGURE_ARGS+= --disable-db
.endif
@@ -72,4 +81,5 @@
.if !empty(PKG_OPTIONS:Mdebug)
Home |
Main Index |
Thread Index |
Old Index