diff options
| -rw-r--r-- | mail/qmail-scanner/Makefile | 2 | ||||
| -rw-r--r-- | mail/qmail-scanner/distinfo | 4 | ||||
| -rw-r--r-- | mail/qmail-scanner/files/patch-configure | 13 | ||||
| -rw-r--r-- | mail/qmail-scanner1/Makefile | 2 | ||||
| -rw-r--r-- | mail/qmail-scanner1/distinfo | 4 | ||||
| -rw-r--r-- | mail/qmail-scanner1/files/patch-configure | 13 |
6 files changed, 28 insertions, 10 deletions
diff --git a/mail/qmail-scanner/Makefile b/mail/qmail-scanner/Makefile index 64d142fd2dee..2dad6dc723da 100644 --- a/mail/qmail-scanner/Makefile +++ b/mail/qmail-scanner/Makefile @@ -6,7 +6,7 @@ # PORTNAME= qmail-scanner -PORTVERSION= 1.24 +PORTVERSION= 1.25 CATEGORIES= mail security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/mail/qmail-scanner/distinfo b/mail/qmail-scanner/distinfo index c1fed311eee5..72f4e0525ade 100644 --- a/mail/qmail-scanner/distinfo +++ b/mail/qmail-scanner/distinfo @@ -1,2 +1,2 @@ -MD5 (qmail-scanner-1.24.tgz) = 0281b721b059e09c8470982d26e4ccb0 -SIZE (qmail-scanner-1.24.tgz) = 197398 +MD5 (qmail-scanner-1.25.tgz) = 0117c425efb75208682fabcba4e1dd24 +SIZE (qmail-scanner-1.25.tgz) = 221156 diff --git a/mail/qmail-scanner/files/patch-configure b/mail/qmail-scanner/files/patch-configure index e368f0b5eb7c..10809f909b3b 100644 --- a/mail/qmail-scanner/files/patch-configure +++ b/mail/qmail-scanner/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 <list of installed content 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} diff --git a/mail/qmail-scanner1/Makefile b/mail/qmail-scanner1/Makefile index 64d142fd2dee..2dad6dc723da 100644 --- a/mail/qmail-scanner1/Makefile +++ b/mail/qmail-scanner1/Makefile @@ -6,7 +6,7 @@ # PORTNAME= qmail-scanner -PORTVERSION= 1.24 +PORTVERSION= 1.25 CATEGORIES= mail security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/mail/qmail-scanner1/distinfo b/mail/qmail-scanner1/distinfo index c1fed311eee5..72f4e0525ade 100644 --- a/mail/qmail-scanner1/distinfo +++ b/mail/qmail-scanner1/distinfo @@ -1,2 +1,2 @@ -MD5 (qmail-scanner-1.24.tgz) = 0281b721b059e09c8470982d26e4ccb0 -SIZE (qmail-scanner-1.24.tgz) = 197398 +MD5 (qmail-scanner-1.25.tgz) = 0117c425efb75208682fabcba4e1dd24 +SIZE (qmail-scanner-1.25.tgz) = 221156 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 <list of installed content 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} |