Date: Tue, 18 Apr 2006 15:42:04 +0100 From: Shaun Amott <shaun@inerd.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/96001: [MAINTAINER] net-im/ejabberd - select new UID/GID, fix rc.d script Message-ID: <1145371324.46960@charon.picobyte.net> Resent-Message-ID: <200604181450.k3IEoBh7055676@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 96001 >Category: ports >Synopsis: [MAINTAINER] net-im/ejabberd - select new UID/GID, fix rc.d script >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Apr 18 14:50:10 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Shaun Amott >Release: FreeBSD 6.1-PRERELEASE i386 >Organization: >Environment: >Description: - Fix ejabberd's rc script This is a tweaked version of the patch in ports/94163 (which can be closed, after this is applied) I believe this also fixes the problem reported in ports/91555, but the submitter hasn't replied yet. - Pick another UID/GID as per ports/86197 This pair should be reserved in the Porter's Handbook list. I have done a fairly thorough check of the ports tree and there doesn't appear to be anything else using the new UID/GID (544/544). >How-To-Repeat: >Fix: --- ejabberd.diff begins here --- diff -urN ejabberd.orig/Makefile ejabberd/Makefile --- ejabberd.orig/Makefile Sat Apr 15 21:31:54 2006 +++ ejabberd/Makefile Tue Apr 18 15:13:55 2006 @@ -7,7 +7,7 @@ PORTNAME= ejabberd PORTVERSION= 1.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im MASTER_SITES= http://www.jabber.ru/files/ejabberd/ \ http://www.process-one.net/en/projects/ejabberd/download/${PORTVERSION}/ diff -urN ejabberd.orig/files/ejabberd.sh.in ejabberd/files/ejabberd.sh.in --- ejabberd.orig/files/ejabberd.sh.in Sat Jan 7 06:29:54 2006 +++ ejabberd/files/ejabberd.sh.in Tue Apr 18 15:12:10 2006 @@ -43,12 +43,7 @@ ejabberd_start() { echo -n "Starting $name: " - if ejabberd_status; then - echo " already running." - exit 1 - else - su $EJABBERDUSER -c "$EJABBERD -noshell -detached" - fi + su $EJABBERDUSER -c "$EJABBERD -s -noshell -detached" echo "$name." } @@ -59,8 +54,8 @@ cnt=0 while ejabberd_status; do cnt=`expr $cnt + 1` - if [ $cnt -gt 60 ]; then - echo -n " failed " + if [ $cnt -gt 6 ]; then + killall -u ejabberd -kill break fi sleep 1 diff -urN ejabberd.orig/pkg-install ejabberd/pkg-install --- ejabberd.orig/pkg-install Sun Aug 28 16:51:47 2005 +++ ejabberd/pkg-install Tue Apr 18 14:57:01 2006 @@ -6,7 +6,7 @@ USER=ejabberd GROUP=${USER} -UID=522 +UID=544 GID=${UID} USERS_HOME="/var/spool/ejabberd" --- ejabberd.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1145371324.46960>