diff options
author | abs <abs> | 2004-06-26 11:21:46 +0000 |
---|---|---|
committer | abs <abs> | 2004-06-26 11:21:46 +0000 |
commit | 77e1a5ae59cb124358c33b51a1ae2c37ea426d2b (patch) | |
tree | 6cec5a3d210577f5bfc657059a2b0a103fa0ed26 /chat | |
parent | 65c9a2f65e82264ab5a9641709ad50727c02c42a (diff) | |
download | pkgsrc-77e1a5ae59cb124358c33b51a1ae2c37ea426d2b.tar.gz |
Update jabberd2 to jabberd-2.0s2nb1
Since the various jabber daemons need to write their pid files as the
jabberd user, ensure a jabberd owned /var/run/jabberd is created by rc.d files
Diffstat (limited to 'chat')
-rw-r--r-- | chat/jabberd2/Makefile | 5 | ||||
-rwxr-xr-x | chat/jabberd2/files/c2s.sh | 9 | ||||
-rwxr-xr-x | chat/jabberd2/files/resolver.sh | 9 | ||||
-rwxr-xr-x | chat/jabberd2/files/router.sh | 9 | ||||
-rwxr-xr-x | chat/jabberd2/files/s2s.sh | 9 | ||||
-rwxr-xr-x | chat/jabberd2/files/sm.sh | 9 |
6 files changed, 43 insertions, 7 deletions
diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile index ff0efd3f936..37e50d5f46f 100644 --- a/chat/jabberd2/Makefile +++ b/chat/jabberd2/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2004/06/03 10:14:13 abs Exp $ +# $NetBSD: Makefile,v 1.4 2004/06/26 11:21:46 abs Exp $ # DISTNAME= jabberd-2.0s2 +PKGREVISION= 1 CATEGORIES= chat MASTER_SITES= http://www.jabberstudio.org/files/jabberd2/ @@ -132,7 +133,7 @@ JABBERD_LOGDIR?= /var/log/jabberd # Directory to store the database files JABBERD_DBDIR?= /var/db/jabberd # Directory to store the pid files -JABBERD_PIDDIR?= /var/run +JABBERD_PIDDIR?= /var/run/jabberd .for f in ${JABBERD_LOGDIR} ${JABBERD_DBDIR} ${JABBERD_PIDDIR} OWN_DIRS_PERMS+= ${f} ${JABBERD_USER} ${JABBERD_GROUP} 770 diff --git a/chat/jabberd2/files/c2s.sh b/chat/jabberd2/files/c2s.sh index a208b6e76c2..278f29a3901 100755 --- a/chat/jabberd2/files/c2s.sh +++ b/chat/jabberd2/files/c2s.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: c2s.sh,v 1.1.1.1 2004/03/28 19:44:07 xtraeme Exp $ +# $NetBSD: c2s.sh,v 1.2 2004/06/26 11:21:46 abs Exp $ # # PROVIDE: c2s # REQUIRE: DAEMON @@ -18,6 +18,13 @@ command_args="2>&1 >/dev/null &" c2s_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() { diff --git a/chat/jabberd2/files/resolver.sh b/chat/jabberd2/files/resolver.sh index acc0908d082..b1162b2ffa7 100755 --- a/chat/jabberd2/files/resolver.sh +++ b/chat/jabberd2/files/resolver.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: resolver.sh,v 1.1.1.1 2004/03/28 19:44:07 xtraeme Exp $ +# $NetBSD: resolver.sh,v 1.2 2004/06/26 11:21:46 abs Exp $ # # PROVIDE: resolver # REQUIRE: DAEMON c2s @@ -18,6 +18,13 @@ 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() { diff --git a/chat/jabberd2/files/router.sh b/chat/jabberd2/files/router.sh index 682b1c7f112..0a60641130b 100755 --- a/chat/jabberd2/files/router.sh +++ b/chat/jabberd2/files/router.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: router.sh,v 1.1.1.1 2004/03/28 19:44:07 xtraeme Exp $ +# $NetBSD: router.sh,v 1.2 2004/06/26 11:21:46 abs Exp $ # # PROVIDE: router # REQUIRE: DAEMON c2s @@ -18,6 +18,13 @@ command_args="2>&1 > /dev/null &" router_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() { diff --git a/chat/jabberd2/files/s2s.sh b/chat/jabberd2/files/s2s.sh index 2ec0a998c86..adef244928e 100755 --- a/chat/jabberd2/files/s2s.sh +++ b/chat/jabberd2/files/s2s.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: s2s.sh,v 1.1.1.1 2004/03/28 19:44:07 xtraeme Exp $ +# $NetBSD: s2s.sh,v 1.2 2004/06/26 11:21:46 abs Exp $ # # PROVIDE: s2s # REQUIRE: DAEMON c2s @@ -18,6 +18,13 @@ command_args="2>&1 > /dev/null &" s2s_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() { diff --git a/chat/jabberd2/files/sm.sh b/chat/jabberd2/files/sm.sh index af1eb42e87d..e7f7c090558 100755 --- a/chat/jabberd2/files/sm.sh +++ b/chat/jabberd2/files/sm.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: sm.sh,v 1.1.1.1 2004/03/28 19:44:07 xtraeme Exp $ +# $NetBSD: sm.sh,v 1.2 2004/06/26 11:21:46 abs Exp $ # # PROVIDE: sm # REQUIRE: DAEMON c2s @@ -18,6 +18,13 @@ command_args="2>&1 > /dev/null &" sm_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() { |