ports/76888: [PATCH] mail/qmail-scanner: update to 1.25, fix spamc test with sockets

[Renato Botelho]

>Number:         76888
>Category:       ports
>Synopsis:       [PATCH] mail/qmail-scanner: update to 1.25, fix spamc test with sockets
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 31 12:00:39 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Renato Botelho
>Release:        FreeBSD 5.3-RELEASE-p5 i386
>Organization:
Galle Folheados
>Environment:
System: FreeBSD srv1.galle.com.br 5.3-RELEASE-p5 FreeBSD 5.3-RELEASE-p5 #6: Mon Jan 17 09:05:47 BRDT 2005
>Description:
- Update to 1.25
- Fix a bug when you run spamd/spamc using sockets and `ps -aux` can´t find socket path

Port maintainer (freebsd at simplerezo.com) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- qmail-scanner-1.25.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/qmail-scanner.orig/Makefile /usr/ports/mail/qmail-scanner/Makefile
--- /usr/ports/mail/qmail-scanner.orig/Makefile	Fri Oct 22 09:42:44 2004
+++ /usr/ports/mail/qmail-scanner/Makefile	Mon Jan 31 09:14:41 2005
@@ -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 -ruN --exclude=CVS /usr/ports/mail/qmail-scanner.orig/distinfo /usr/ports/mail/qmail-scanner/distinfo
--- /usr/ports/mail/qmail-scanner.orig/distinfo	Fri Oct 22 09:23:59 2004
+++ /usr/ports/mail/qmail-scanner/distinfo	Mon Jan 31 08:55:15 2005
@@ -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 -ruN --exclude=CVS /usr/ports/mail/qmail-scanner.orig/files/patch-configure /usr/ports/mail/qmail-scanner/files/patch-configure
--- /usr/ports/mail/qmail-scanner.orig/files/patch-configure	Fri Oct 22 08:45:25 2004
+++ /usr/ports/mail/qmail-scanner/files/patch-configure	Mon Jan 31 09:07:54 2005
@@ -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}
--- qmail-scanner-1.25.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: