- Fix spamd socket option parsing.
PR: ports/78102 Submitted by: Will Saxon <wills@housing.ufl.edu> Approved by: maintainer timeout (2 months)
This commit is contained in:
parent
39f72a119f
commit
eea57626a4
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=136633
4 changed files with 4 additions and 2 deletions
|
@ -7,6 +7,7 @@
|
|||
|
||||
PORTNAME= qmail-scanner
|
||||
PORTVERSION= 1.25
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= mail security
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= ${PORTNAME}
|
||||
|
|
|
@ -83,7 +83,7 @@
|
|||
SPAMD_SOCKET=`ps -ef 2>/dev/null|egrep 'spamd.*socket'|grep -v grep|sed -e 's/^.*socketpath=//'|awk '{print $1}'`
|
||||
if [ "$SPAMD_SOCKET" = "" ]; then
|
||||
- SPAMD_SOCKET=`ps aux 2>/dev/null|egrep 'spamd.*socket'|grep -v grep|sed -e 's/^.*socketpath=//'|awk '{print $1}'`
|
||||
+ SPAMD_SOCKET=`ps auxwww 2>/dev/null|egrep 'spamd.*socket'|grep -v grep|sed -e 's/^.*socketpath=//'|awk '{print $1}'`
|
||||
+ SPAMD_SOCKET=`ps auxwww 2>/dev/null|egrep 'spamd.*socket'|grep -v grep|sed -e 's/^.*socketpath[\ |=]//'|awk '{print $1}'`
|
||||
fi
|
||||
if [ "$SPAMD_SOCKET" != "" -a -S "$SPAMD_SOCKET" ]; then
|
||||
SPAMC_BINARY="$SPAMC_BINARY -U $SPAMD_SOCKET"
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
PORTNAME= qmail-scanner
|
||||
PORTVERSION= 1.25
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= mail security
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= ${PORTNAME}
|
||||
|
|
|
@ -83,7 +83,7 @@
|
|||
SPAMD_SOCKET=`ps -ef 2>/dev/null|egrep 'spamd.*socket'|grep -v grep|sed -e 's/^.*socketpath=//'|awk '{print $1}'`
|
||||
if [ "$SPAMD_SOCKET" = "" ]; then
|
||||
- SPAMD_SOCKET=`ps aux 2>/dev/null|egrep 'spamd.*socket'|grep -v grep|sed -e 's/^.*socketpath=//'|awk '{print $1}'`
|
||||
+ SPAMD_SOCKET=`ps auxwww 2>/dev/null|egrep 'spamd.*socket'|grep -v grep|sed -e 's/^.*socketpath=//'|awk '{print $1}'`
|
||||
+ SPAMD_SOCKET=`ps auxwww 2>/dev/null|egrep 'spamd.*socket'|grep -v grep|sed -e 's/^.*socketpath[\ |=]//'|awk '{print $1}'`
|
||||
fi
|
||||
if [ "$SPAMD_SOCKET" != "" -a -S "$SPAMD_SOCKET" ]; then
|
||||
SPAMC_BINARY="$SPAMC_BINARY -U $SPAMD_SOCKET"
|
||||
|
|
Loading…
Reference in a new issue