From 23ffd90ad13cf60b7b6f8b2fa7b959d73d5e9ce1 Mon Sep 17 00:00:00 2001 From: Sergei Kolobov Date: Thu, 17 Feb 2005 11:28:00 +0000 Subject: =?UTF-8?q?-=20Update=20to=201.25=20-=20Fix=20a=20bug=20when=20you?= =?UTF-8?q?=20run=20spamd/spamc=20using=20sockets=20and=20=20=20`ps=20-aux?= =?UTF-8?q?`=20can=C2=B4t=20find=20socket=20path?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR: ports/76888 Submitted by: Renato Botelho Approved by: maintainer --- mail/qmail-scanner1/files/patch-configure | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'mail/qmail-scanner1/files/patch-configure') diff --git a/mail/qmail-scanner1/files/patch-configure b/mail/qmail-scanner1/files/patch-configure index e368f0b5eb7c..10809f909b3b 100644 --- a/mail/qmail-scanner1/files/patch-configure +++ b/mail/qmail-scanner1/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig Tue Oct 19 02:26:55 2004 -+++ configure Fri Oct 22 01:36:34 2004 +--- ./configure.orig Mon Oct 18 21:26:55 2004 ++++ ./configure Mon Jan 31 09:07:22 2005 @@ -1,13 +1,6 @@ #!/bin/sh # @@ -78,6 +78,15 @@ --scanners Defaults to "auto" - will use whatever scanners are found on system. +@@ -910,7 +922,7 @@ + #Test to see if spamc is calling Unix sockets instead of TCP + 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}'` + fi + if [ "$SPAMD_SOCKET" != "" -a -S "$SPAMD_SOCKET" ]; then + SPAMC_BINARY="$SPAMC_BINARY -U $SPAMD_SOCKET" @@ -1005,9 +1017,14 @@ MAILDOMAIN=${MAILDOMAIN:-$FQDN} -- cgit v1.2.3