diff options
| author | Chris Rees <crees@FreeBSD.org> | 2012-07-11 06:29:44 +0000 |
|---|---|---|
| committer | Chris Rees <crees@FreeBSD.org> | 2012-07-11 06:29:44 +0000 |
| commit | 2ea7ff1249f669eefb2b95a756967f1aa11478d2 (patch) | |
| tree | 70ea868553aa21deac903e6e856a6c54d101099c /mail/sympa | |
| parent | 45cd9bcc48f70c169890c251b8d5dbe8564c861a (diff) | |
Fix rc script regex; should check for $pid followed by space or tab,
rather than space. Also anchor.
Submitted by: ivoras
Notes
Notes:
svn path=/head/; revision=300754
Diffstat (limited to 'mail/sympa')
| -rw-r--r-- | mail/sympa/Makefile | 1 | ||||
| -rw-r--r-- | mail/sympa/files/patch-src__etc__script__sympa.in | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile index a93709f3b82e..5e174be28a90 100644 --- a/mail/sympa/Makefile +++ b/mail/sympa/Makefile @@ -7,6 +7,7 @@ PORTNAME= sympa PORTVERSION= 6.1.11 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.sympa.org/distribution/ \ http://www.sympa.org/distribution/old/ diff --git a/mail/sympa/files/patch-src__etc__script__sympa.in b/mail/sympa/files/patch-src__etc__script__sympa.in index 31abae057836..ebeba9ccc050 100644 --- a/mail/sympa/files/patch-src__etc__script__sympa.in +++ b/mail/sympa/files/patch-src__etc__script__sympa.in @@ -16,7 +16,7 @@ for pid in $pids; do killcount=0 - running=`ps -A | grep "$pid ..* $1\\.pl"` -+ running=`ps -A | grep "$pid .* $1\\.pl"` ++ running=`ps -A | grep "^[[:space:]]*$pid[[:space:]].*$1\\.pl"` while [ "$running" != "" ]; do if [ $killcount -gt 10 ]; then if [ ${use_functions} ]; then @@ -25,14 +25,14 @@ kill -TERM $pid >/dev/null 2>&1 - running=`ps -A | grep "$pid ..* $1\\.pl"` -+ running=`ps -A | grep "$pid .* $1\\.pl"` ++ running=`ps -A | grep "^[[:space:]]*$pid[[:space:]].*$1\\.pl"` if [ "$running" = "" ]; then runcount=`expr $runcount + 1` break fi sleep 2 - running=`ps -A | grep "$pid ..* $1\\.pl"` -+ running=`ps -A | grep "$pid .* $1\\.pl"` ++ running=`ps -A | grep "^[[:space:]]*$pid[[:space:]].*$1\\.pl"` if [ "$running" = "" ]; then runcount=`expr $runcount + 1` - break
\ No newline at end of file + break |