Date: Sun, 3 May 2015 07:33:41 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385235 - in head/mail/sympa: . files Message-ID: <201505030733.t437Xfqg007142@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun May 3 07:33:40 2015 New Revision: 385235 URL: https://svnweb.freebsd.org/changeset/ports/385235 Log: mail/sympa: fix bugs in rc.d script * Current sympa.rc not show the correct status, always active. grep with pid string also process. * The output of ps depends on the windows size. Sometime truncated /usr/local/libexec/sympa/task_manager.pl -w for avoid it. * Change ps options to BSD-sytle. PR: 199145 Submitted by: Igor Zabelin <igorz@yandex.ru> Approved by: geoffroy desvernay <dgeo@centrale-marseille.fr> (maintainer) Modified: head/mail/sympa/Makefile (contents, props changed) head/mail/sympa/files/sympa.in (contents, props changed) Modified: head/mail/sympa/Makefile ============================================================================== --- head/mail/sympa/Makefile Sun May 3 07:30:32 2015 (r385234) +++ head/mail/sympa/Makefile Sun May 3 07:33:40 2015 (r385235) @@ -3,6 +3,7 @@ PORTNAME= sympa PORTVERSION= 6.1.24 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.sympa.org/distribution/ \ http://www.sympa.org/distribution/old/ Modified: head/mail/sympa/files/sympa.in ============================================================================== --- head/mail/sympa/files/sympa.in Sun May 3 07:30:32 2015 (r385234) +++ head/mail/sympa/files/sympa.in Sun May 3 07:33:40 2015 (r385235) @@ -51,7 +51,7 @@ sub_status() if [ -f /var/run/sympa/$1.pid ] ; then pid=`head -1 /var/run/sympa/$1.pid | tr -s ' ' '|'` if [ "$pid" != "" ] ; then - running=`ps -A | egrep "$pid"` + running=`ps -axw | grep "^[[:space:]]*$pid[[:space:]]"` if [ "$running" != "" ]; then echo "$1 (pid(s) $pid) is active..." return 0 @@ -115,7 +115,7 @@ sub_stop() if [ "$pids" != "" ]; then for pid in $pids; do killcount=0 - running=`ps -A | grep "^[[:space:]]*$pid[[:space:]].*$1\\.pl"` + running=`ps -axw | grep "^[[:space:]]*$pid[[:space:]].*$1\\.pl"` while [ "$running" != "" ]; do if [ $killcount -gt 10 ]; then echo 'failure' @@ -123,13 +123,13 @@ sub_stop() fi kill -TERM $pid >/dev/null 2>&1 - running=`ps -A | grep "^[[:space:]]*$pid[[:space:]].*$1\\.pl"` + running=`ps -axw | grep "^[[:space:]]*$pid[[:space:]].*$1\\.pl"` if [ "$running" = "" ]; then runcount=`expr $runcount + 1` break fi sleep 2 - running=`ps -A | grep "^[[:space:]]*$pid[[:space:]].*$1\\.pl"` + running=`ps -axw | grep "^[[:space:]]*$pid[[:space:]].*$1\\.pl"` if [ "$running" = "" ]; then runcount=`expr $runcount + 1` break
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505030733.t437Xfqg007142>