1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-22 20:41:26 +00:00

- Update to 1.25

- Fix a bug when you run spamd/spamc using sockets and
  `ps -aux` can´t find socket path

PR:		ports/76888
Submitted by:	Renato Botelho <renato@galle.com.br>
Approved by:	maintainer
This commit is contained in:
Sergei Kolobov 2005-02-17 11:28:00 +00:00
parent b2ec0f67ea
commit 23ffd90ad1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=129085
6 changed files with 28 additions and 10 deletions

View File

@ -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}

View File

@ -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

View File

@ -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}

View File

@ -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}

View File

@ -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

View File

@ -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}