ports/114932: [UPDATE] net-im/jabberd from 2.0.11 to 2.1.10

Martin Matuska mm at FreeBSD.org
Thu Jul 26 12:10:09 UTC 2007 

>Number:         114932
>Category:       ports
>Synopsis:       [UPDATE] net-im/jabberd from 2.0.11 to 2.1.10
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 26 12:10:08 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska
>Release:        FreeBSD 6.2-STABLE
>Organization:
>Environment:
FreeBSD 6.2-STABLE i386/amd64
>Description:
Update of net-im/jabberd from 2.0.11 to 2.1.10, added features:

* Added JABBER_* variables (USER, GROUP, UID, GID, RUNDIR, ..)
* Updated pkg-install and pkg-deinstall to use JABBER_* vars
* Renamed jabberd.sh.in to jabberd.in and uses JABBER_* vars
* Updated startup file (correct variables, pidfile location)
* Added port documentation, moved SQL files do DOCSDIR
* Removed avatar patch (already in source)
* Added support for anon auth (WITH_ANON)
* Updated pkg-descr (project has moved)
* Other small changes and fixes

I would like to ask the maintainer to pass maintainership for this
port to me (mm at FreeBSD.org). If not interested, just approve the patch,
please.

Thank you very much!

>How-To-Repeat:
>Fix:
Index: ports/net-im/jabberd/Makefile
===================================================================
RCS file: /home/pcvs/ports/net-im/jabberd/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- ports/net-im/jabberd/Makefile	7 Oct 2006 14:35:12 -0000	1.39
+++ ports/net-im/jabberd/Makefile	26 Jul 2007 11:44:35 -0000
@@ -6,18 +6,16 @@
 #
 
 PORTNAME=	jabberd
-PORTVERSION=	2.0.11
-PORTREVISION=	2
+PORTVERSION=	2.1.10
 CATEGORIES=	net-im
-MASTER_SITES=	http://jabberstudio.rediris.es/jabberd2/ \
-		http://jabberstudio.2nw.net/jabberd2/
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}s${PORTVERSION:E}
+MASTER_SITES=	http://ftp.xiaoka.com/jabberd2/releases/
 DIST_SUBDIR=	jabber
 
-MAINTAINER=	kirk at strauser.com
+MAINTAINER=	mm at FreeBSD.org
 COMMENT=	Online presence and instant messaging server
 
-LIB_DEPENDS=	idn.16:${PORTSDIR}/dns/libidn
+LIB_DEPENDS=	idn.16:${PORTSDIR}/dns/libidn \
+		gsasl.10:${PORTSDIR}/security/gsasl
 
 OPTIONS=	POSTGRESQL "Use PostgreSQL for storage and authentication" off \
 		MYSQL "Use MySQL for storage and authentication" off \
@@ -26,19 +24,40 @@
 		SQLITE "Use SQLITE3 for storage" off \
 		PAM "Use PAM for authentication" off \
 		PIPE "Enable pipe auth/reg support" off \
-		AVATAR "Enable avatar support in vCard" off \
+		ANON "Enable anonymous auth/reg support" off \
 		DEBUG "Compile with debug information" on
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 USE_ICONV=	yes
-USE_RC_SUBR=	jabberd.sh
+USE_RC_SUBR=	jabberd
+USE_LDCONFIG=	${TARGETDIR}/lib/jabberd
 CONFIGURE_ARGS=	--localstatedir=/var \
+		--sysconfdir=${PREFIX}/etc/jabberd \
 		--enable-ssl \
-		--with-extra-include-path=${LOCALBASE}/include${EIP} \
-		--with-extra-library-path=${LOCALBASE}/lib${ELP} \
+		--with-extra-include-path="${LOCALBASE}/include ${EIP}" \
+		--with-extra-library-path="${LOCALBASE}/lib ${ELP}" \
 		--enable-fs
 
+JABBER_USER=	jabber
+JABBER_UID=	93
+JABBER_GROUP=	${JABBER_USER}
+JABBER_GID=	${JABBER_UID}
+JABBER_ETCDIR=	"${TARGETDIR}/etc/jabberd"
+JABBER_RUNDIR=	"/var/jabberd"
+
+SUB_LIST+=	JABBER_USER=${JABBER_USER} JABBER_UID=${JABBER_UID} \
+		JABBER_GROUP=${JABBER_GROUP} JABBER_GID=${JABBER_GID} \
+		JABBER_ETCDIR="${JABBER_ETCDIR}" \
+		JABBER_RUNDIR="${JABBER_RUNDIR}"
+
+SUB_FILES+=	pkg-install pkg-deinstall
+
+PORTDOCS=	*
+
+DOCFILES=	AUTHORS BUGS COPYING ChangeLog INSTALL NEWS PROTOCOL README \
+		TODO UPGRADE
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_DEBUG)
@@ -48,15 +67,19 @@
 .if defined(WITH_POSTGRESQL)
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=--enable-pgsql
+PLIST_SUB+=	SUB_PGSQL=""
 .else
 CONFIGURE_ARGS+=--disable-pgsql
+PLIST_SUB+=	SUB_PGSQL="@comment "
 .endif
 
 .if defined(WITH_SQLITE)
 CONFIGURE_ARGS+=--enable-sqlite
 LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3
+PLIST_SUB+=	SUB_SQLITE=""
 .else
 CONFIGURE_ARGS+=--disable-sqlite
+PLIST_SUB+=	SUB_SQLITE="@comment "
 .endif
 
 .if defined(WITH_MYSQL)
@@ -64,54 +87,70 @@
 CONFIGURE_ARGS+=--enable-mysql
 EIP+=:${LOCALBASE}/include/mysql
 ELP+=:${LOCALBASE}/lib/mysql
+PLIST_SUB+=	SUB_MYSQL=""
 .else
 CONFIGURE_ARGS+=--disable-mysql
+PLIST_SUB+=	SUB_MYSQL="@comment "
 .endif
 
 .if defined(WITH_BDB)
 USE_BDB=	yes
-WANT_BDB_VER=	43
 CONFIGURE_ARGS+=--enable-db
 CONFIGURE_ARGS+=--oldincludedir=/nonexistant
 EIP+=:${BDB_INCLUDE_DIR}
 ELP+=:${BDB_LIB_DIR}
+PLIST_SUB+=	SUB_BDB=""
 .else
 CONFIGURE_ARGS+=--disable-db
+PLIST_SUB+=	SUB_BDB="@comment "
 .endif
 
 .if defined(WITH_LDAP)
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--enable-ldap
+PLIST_SUB+=	SUB_LDAP=""
 .else
 CONFIGURE_ARGS+=--disable-ldap
+PLIST_SUB+=	SUB_LDAP="@comment "
 .endif
 
 .if defined(WITH_PAM)
 CONFIGURE_ARGS+=--enable-pam
+PLIST_SUB+=	SUB_PAM=""
 .else
 CONFIGURE_ARGS+=--disable-pam
+PLIST_SUB+=	SUB_PAM="@comment "
 .endif
 
 .if defined(WITH_PIPE)
 CONFIGURE_ARGS+=--enable-pipe
+PLIST_SUB+=	SUB_PIPE=""
+.else
+PLIST_SUB+=	SUB_PIPE="@comment "
 .endif
 
-.if defined(WITH_AVATAR)
-PATCH_SITES+=	http://www.deepdarc.com/
-PATCHFILES+=	vcard-avatar.diff
+.if defined(WITH_ANON)
+CONFIGURE_ARGS+=--enable-anon
+PLIST_SUB+=	SUB_ANON=""
+.else
+PLIST_SUB+=	SUB_ANON="@comment "
 .endif
 
 MAN8=		c2s.8 jabberd.8 resolver.8 router.8 s2s.8 sm.8
 
-pre-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
 post-install:
-	@${CHOWN} -R jabber:jabber ${PREFIX}/etc/jabberd
+	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${CHOWN} -R ${JABBER_USER}:${JABBER_GROUP} ${PREFIX}/etc/jabberd
 	@${FIND} ${PREFIX}/etc/jabberd -type d | ${XARGS} ${CHMOD} 750
 	@${FIND} ${PREFIX}/etc/jabberd -type f | ${XARGS} ${CHMOD} 660
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/tools/db-setup.mysql ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/tools/db-setup.pgsql ${DATADIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for FILE in ${DOCFILES}
+	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
+.endfor
+.for FILE in db-setup.mysql db-setup.pgsql db-setup.sqlite
+	@${INSTALL_DATA} ${WRKSRC}/tools/${FILE} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.post.mk>
Index: ports/net-im/jabberd/distinfo
===================================================================
RCS file: /home/pcvs/ports/net-im/jabberd/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- ports/net-im/jabberd/distinfo	20 Mar 2006 12:24:18 -0000	1.13
+++ ports/net-im/jabberd/distinfo	26 Jul 2007 11:44:35 -0000
@@ -1,6 +1,3 @@
-MD5 (jabber/jabberd-2.0s11.tar.gz) = 67d1663ed97a5ba707d5d145b1d19c55
-SHA256 (jabber/jabberd-2.0s11.tar.gz) = 0ef0f668f5d86b8c22ce0ae2366bff0be9d4c961d6f48b7b849ebe749bdb213a
-SIZE (jabber/jabberd-2.0s11.tar.gz) = 777466
-MD5 (jabber/vcard-avatar.diff) = adf9078a9c68c40a8fbe37cf282d37a4
-SHA256 (jabber/vcard-avatar.diff) = 5e42dc7e31e6c222c3cabc3e8916c8989b37723c800e9afc69e28d2731d4ca9b
-SIZE (jabber/vcard-avatar.diff) = 5463
+MD5 (jabber/jabberd-2.1.10.tar.gz) = d0d938395c1eda5d37b2af4f99477ccd
+SHA256 (jabber/jabberd-2.1.10.tar.gz) = 9acc8bdfc0f24bd40c6b95ca84f4213d5e17fb4020f969adfa5798b8b7790c58
+SIZE (jabber/jabberd-2.1.10.tar.gz) = 1397275
Index: ports/net-im/jabberd/pkg-deinstall
===================================================================
RCS file: ports/net-im/jabberd/pkg-deinstall
diff -N ports/net-im/jabberd/pkg-deinstall
--- ports/net-im/jabberd/pkg-deinstall	1 Jan 2004 13:21:15 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-#!/bin/sh
-# $FreeBSD: ports/net-im/jabberd/pkg-deinstall,v 1.3 2004/01/01 13:21:15 demon Exp $
-#
-
-if [ "$2" != "POST-DEINSTALL" ]; then
-    exit 0
-fi
-
-USER=jabber
-
-if pw usershow "${USER}" 2>/dev/null 1>&2; then
-	echo "To delete Jabber user permanently, use 'pw userdel ${USER}'"
-fi
-
-if pw groupshow "${USER}" 2>/dev/null 1>&2; then
-	echo "To delete Jabber group permanently, use 'pw groupdel ${USER}'"
-fi
-
-echo "If you wish to delete jabber data files, remove '/var/jabberd' directory."
-
-exit 0
Index: ports/net-im/jabberd/pkg-descr
===================================================================
RCS file: /home/pcvs/ports/net-im/jabberd/pkg-descr,v
retrieving revision 1.1
diff -u -r1.1 pkg-descr
--- ports/net-im/jabberd/pkg-descr	29 Dec 2003 13:27:06 -0000	1.1
+++ ports/net-im/jabberd/pkg-descr	26 Jul 2007 11:44:35 -0000
@@ -1,4 +1,5 @@
-The Jabber server (jabberd) is a daemon for Jabber clients to connect
-and communicate with.
+jabberd 2.x series is the next generation of the Jabber/XMPP server.
+It has been rewritten from the ground up to be scalable, architecturally 
+sound and to support the latest protocol extensions coming out of the XSF. 
 
-WWW: http://jabberd.jabberstudio.org/
+WWW: http://jabberd2.xiaoka.com/
Index: ports/net-im/jabberd/pkg-install
===================================================================
RCS file: ports/net-im/jabberd/pkg-install
diff -N ports/net-im/jabberd/pkg-install
--- ports/net-im/jabberd/pkg-install	9 Jan 2004 11:30:09 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-#!/bin/sh
-# $FreeBSD: ports/net-im/jabberd/pkg-install,v 1.3 2004/01/09 11:30:09 demon Exp $
-#
-
-if [ "$2" != "PRE-INSTALL" ]; then
-    exit 0
-fi
-
-USER=jabber
-GROUP=${USER}
-UID=93
-GID=${UID}
-
-if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
-	if pw groupadd ${GROUP} -g ${GID}; then
-		echo "Added group \"${GROUP}\"."
-	else
-		echo "Adding group \"${GROUP}\" failed..."
-		exit 1
-	fi
-fi
-
-if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
-	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-		-s "/sbin/nologin" -d "/nonexistent" \
-		-c "Jabber Daemon"; \
-	then
-		echo "Added user \"${USER}\"."
-	else
-		echo "Adding user \"${USER}\" failed..."
-		exit 1
-	fi
-fi
-
-mkdir -m 750 /var/jabberd /var/jabberd/db /var/jabberd/pid /var/jabberd/log
-chown jabber:jabber /var/jabberd /var/jabberd/db /var/jabberd/pid /var/jabberd/log
-
-exit 0
Index: ports/net-im/jabberd/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/net-im/jabberd/pkg-plist,v
retrieving revision 1.9
diff -u -r1.9 pkg-plist
--- ports/net-im/jabberd/pkg-plist	22 Jan 2006 02:46:36 -0000	1.9
+++ ports/net-im/jabberd/pkg-plist	26 Jul 2007 11:44:35 -0000
@@ -1,4 +1,4 @@
- at unexec [ ! -f /var/jabberd/pid/router.pid ] || %D/etc/rc.d/jabberd.sh stop || true
+ at unexec [ ! -f /var/jabberd/pid/router.pid ] || %D/etc/rc.d/jabberd stop || true
 bin/c2s
 bin/jabberd
 bin/resolver
@@ -21,8 +21,101 @@
 etc/jabberd/sm.xml.dist
 @unexec if cmp -s %D/etc/jabberd/templates/roster.xml %D/etc/jabberd/templates/roster.xml.dist; then rm -f %D/etc/jabberd/templates/roster.xml; fi
 etc/jabberd/templates/roster.xml.dist
-%%DATADIR%%/db-setup.mysql
-%%DATADIR%%/db-setup.pgsql
- at dirrm %%DATADIR%%
+%%SUB_ANON%%lib/jabberd/authreg_anon.la
+%%SUB_ANON%%lib/jabberd/authreg_anon.so
+%%SUB_BDB%%lib/jabberd/authreg_db.la
+%%SUB_BDB%%lib/jabberd/authreg_db.so
+%%SUB_LDAP%%lib/jabberd/authreg_ldap.la
+%%SUB_LDAP%%lib/jabberd/authreg_ldap.so
+%%SUB_MYSQL%%lib/jabberd/authreg_mysql.la
+%%SUB_MYSQL%%lib/jabberd/authreg_mysql.so
+%%SUB_PAM%%lib/jabberd/authreg_pam.la
+%%SUB_PAM%%lib/jabberd/authreg_pam.so
+%%SUB_PIPE%%lib/jabberd/authreg_pipe.la
+%%SUB_PIPE%%lib/jabberd/authreg_pipe.so
+%%SUB_PGSQL%%lib/jabberd/authreg_pgsql.la
+%%SUB_PGSQL%%lib/jabberd/authreg_pgsql.so
+%%SUB_SQLITE%%lib/jabberd/authreg_sqlite.la
+%%SUB_SQLITE%%lib/jabberd/authreg_sqlite.so
+lib/jabberd/mod_active.la
+lib/jabberd/mod_active.so
+lib/jabberd/mod_active.so.0
+lib/jabberd/mod_amp.la
+lib/jabberd/mod_amp.so
+lib/jabberd/mod_amp.so.0
+lib/jabberd/mod_announce.la
+lib/jabberd/mod_announce.so
+lib/jabberd/mod_announce.so.0
+lib/jabberd/mod_deliver.la
+lib/jabberd/mod_deliver.so
+lib/jabberd/mod_deliver.so.0
+lib/jabberd/mod_disco-publish.la
+lib/jabberd/mod_disco-publish.so
+lib/jabberd/mod_disco-publish.so.0
+lib/jabberd/mod_disco.la
+lib/jabberd/mod_disco.so
+lib/jabberd/mod_disco.so.0
+lib/jabberd/mod_echo.la
+lib/jabberd/mod_echo.so
+lib/jabberd/mod_echo.so.0
+lib/jabberd/mod_help.la
+lib/jabberd/mod_help.so
+lib/jabberd/mod_help.so.0
+lib/jabberd/mod_iq-last.la
+lib/jabberd/mod_iq-last.so
+lib/jabberd/mod_iq-last.so.0
+lib/jabberd/mod_iq-ping.la
+lib/jabberd/mod_iq-ping.so
+lib/jabberd/mod_iq-ping.so.0
+lib/jabberd/mod_iq-private.la
+lib/jabberd/mod_iq-private.so
+lib/jabberd/mod_iq-private.so.0
+lib/jabberd/mod_iq-time.la
+lib/jabberd/mod_iq-time.so
+lib/jabberd/mod_iq-time.so.0
+lib/jabberd/mod_iq-vcard.la
+lib/jabberd/mod_iq-vcard.so
+lib/jabberd/mod_iq-vcard.so.0
+lib/jabberd/mod_iq-version.la
+lib/jabberd/mod_iq-version.so
+lib/jabberd/mod_iq-version.so.0
+lib/jabberd/mod_offline.la
+lib/jabberd/mod_offline.so
+lib/jabberd/mod_offline.so.0
+lib/jabberd/mod_presence.la
+lib/jabberd/mod_presence.so
+lib/jabberd/mod_presence.so.0
+lib/jabberd/mod_privacy.la
+lib/jabberd/mod_privacy.so
+lib/jabberd/mod_privacy.so.0
+lib/jabberd/mod_roster.la
+lib/jabberd/mod_roster.so
+lib/jabberd/mod_roster.so.0
+lib/jabberd/mod_session.la
+lib/jabberd/mod_session.so
+lib/jabberd/mod_session.so.0
+lib/jabberd/mod_status.la
+lib/jabberd/mod_status.so
+lib/jabberd/mod_status.so.0
+lib/jabberd/mod_template-roster.la
+lib/jabberd/mod_template-roster.so
+lib/jabberd/mod_template-roster.so.0
+lib/jabberd/mod_vacation.la
+lib/jabberd/mod_vacation.so
+lib/jabberd/mod_vacation.so.0
+lib/jabberd/mod_validate.la
+lib/jabberd/mod_validate.so
+lib/jabberd/mod_validate.so.0
+lib/jabberd/storage_fs.la
+lib/jabberd/storage_fs.so
+%%SUB_BDB%%lib/jabberd/storage_db.la
+%%SUB_BDB%%lib/jabberd/storage_db.so
+%%SUB_MYSQL%%lib/jabberd/storage_mysql.la
+%%SUB_MYSQL%%lib/jabberd/storage_mysql.so
+%%SUB_PGSQL%%lib/jabberd/storage_pgsql.la
+%%SUB_PGSQL%%lib/jabberd/storage_pgsql.so
+%%SUB_SQLITE%%lib/jabberd/storage_sqlite.la
+%%SUB_SQLITE%%lib/jabberd/storage_sqlite.so
+ at dirrm lib/jabberd
 @dirrmtry etc/jabberd/templates
 @dirrmtry etc/jabberd
Index: ports/net-im/jabberd/files/jabberd.in
===================================================================
RCS file: ports/net-im/jabberd/files/jabberd.in
diff -N ports/net-im/jabberd/files/jabberd.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ports/net-im/jabberd/files/jabberd.in	26 Jul 2007 11:44:35 -0000
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+# $FreeBSD$
+
+# PROVIDE: jabberd
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+#
+prefix=%%PREFIX%%
+
+# Define these jabberd_* variables in one of these files:
+#       /etc/rc.conf
+#       /etc/rc.conf.local
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+jabberd_chdir=${jabberd_chdir-"%%JABBER_RUNDIR%%/pid"}
+jabberd_enable=${jabberd_enable-"NO"}
+jabberd_user=${jabberd_user-"%%JABBER_USER%%"}
+
+. %%RC_SUBR%%
+
+name="jabberd"
+rcvar=`set_rcvar`
+command="${prefix}/bin/jabberd"
+command_args="&"
+procname="${prefix}/bin/router"
+
+load_rc_config $name
+
+pidfile="${jabberd_chdir}/router.pid"
+
+case "$1" in
+	stop|faststop|onestop)
+		echo "Stopping Jabber2"
+		killall -u ${jabberd_user} jabberd c2s resolver router s2s sm
+		for file in c2s resolver router s2s sm; do
+			rm -f ${jabberd_chdir}/$file.pid
+		done
+	;;
+	*)
+		run_rc_command "$1"
+	;;
+esac
Index: ports/net-im/jabberd/files/jabberd.sh.in
===================================================================
RCS file: ports/net-im/jabberd/files/jabberd.sh.in
diff -N ports/net-im/jabberd/files/jabberd.sh.in
--- ports/net-im/jabberd/files/jabberd.sh.in	20 Feb 2006 20:47:32 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# Start or stop jabberd
-# $FreeBSD: ports/net-im/jabberd/files/jabberd.sh.in,v 1.2 2006/02/20 20:47:32 dougb Exp $
-
-# PROVIDE: jabberd
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-#
-prefix=%%PREFIX%%
-
-# Define these jabberd_* variables in one of these files:
-#       /etc/rc.conf
-#       /etc/rc.conf.local
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-jabberd_chdir=${jabberd_chdir-"/var/jabberd/pid"}
-jabberd_enable=${jabberd_enable-"NO"}
-jabberd_user=${jabberd_user-"jabber"}
-
-. %%RC_SUBR%%
-
-name="jabberd"
-rcvar=`set_rcvar`
-command="${prefix}/bin/jabberd"
-command_args="&"
-procname="${prefix}/bin/router"
-
-load_rc_config $name
-
-pidfile="${jabberd_chdir}/router.pid"
-
-case "$1" in
-	stop|faststop|onestop)
-		echo "Stopping Jabber2"
-		killall -u ${jabberd_user} jabberd c2s resolver router s2s sm
-		for file in c2s resolver router s2s sm; do
-			rm -f ${jabberd_chdir}/$file.pid
-		done
-	;;
-	*)
-		run_rc_command "$1"
-	;;
-esac
Index: ports/net-im/jabberd/files/pkg-deinstall.in
===================================================================
RCS file: ports/net-im/jabberd/files/pkg-deinstall.in
diff -N ports/net-im/jabberd/files/pkg-deinstall.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ports/net-im/jabberd/files/pkg-deinstall.in	26 Jul 2007 11:44:35 -0000
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+if [ "$2" != "POST-DEINSTALL" ]; then
+    exit 0
+fi
+
+USER=%%JABBER_USER%%
+GROUP=%%JABBER_GROUP%%
+RUNDIR="%%JABBER_RUNDIR%%"
+
+if pw usershow "${USER}" 2>/dev/null 1>&2; then
+	echo "To delete Jabber user permanently, use 'pw userdel ${USER}'"
+fi
+
+if pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
+	echo "To delete Jabber group permanently, use 'pw groupdel ${USER}'"
+fi
+
+echo "You may want to delete the following directories:"
+echo "${RUNDIR}" 
+
+exit 0
Index: ports/net-im/jabberd/files/pkg-install.in
===================================================================
RCS file: ports/net-im/jabberd/files/pkg-install.in
diff -N ports/net-im/jabberd/files/pkg-install.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ports/net-im/jabberd/files/pkg-install.in	26 Jul 2007 11:44:35 -0000
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+if [ "$2" != "POST-INSTALL" ]; then
+    exit 0
+fi
+
+USER=%%JABBER_USER%%
+GROUP=%%JABBER_GROUP%%
+UID=%%JABBER_UID%%
+GID=%%JABBER_GID%%
+ETCDIR=%%JABBER_ETCDIR%%
+RUNDIR=%%JABBER_RUNDIR%%
+
+if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
+	if pw groupadd ${GROUP} -g ${GID}; then
+		echo "Added group \"${GROUP}\"."
+	else
+		echo "Adding group \"${GROUP}\" failed..."
+		exit 1
+	fi
+fi
+
+if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
+	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+		-s "/sbin/nologin" -d "/nonexistent" \
+		-c "Jabber Daemon"; \
+	then
+		echo "Added user \"${USER}\"."
+	else
+		echo "Adding user \"${USER}\" failed..."
+		exit 1
+	fi
+fi
+
+if [ ! -d ${RUNDIR} ]; then
+	echo "Creating \"${RUNDIR}\"."
+	mkdir -p ${RUNDIR}/pid ${RUNDIR}/db ${RUNDIR}/logs
+fi
+
+echo "Fixing ownerships and modes in \"${ETCDIR}\"."
+chown -R ${USER}:${GROUP} ${ETCDIR}
+chmod -R go= ${ETCDIR}
+
+echo "Fixing ownerships and modes in \"${RUNDIR}\"."
+chown -R ${USER}:${GROUP} ${RUNDIR}
+chmod -R go= ${RUNDIR}
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list