From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Oct 22 12:50:28 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1F71016A4CE for ; Fri, 22 Oct 2004 12:50:28 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 031E643D41 for ; Fri, 22 Oct 2004 12:50:28 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i9MCoRfi034505 for ; Fri, 22 Oct 2004 12:50:27 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i9MCoRxL034504; Fri, 22 Oct 2004 12:50:27 GMT (envelope-from gnats) Resent-Date: Fri, 22 Oct 2004 12:50:27 GMT Resent-Message-Id: <200410221250.i9MCoRxL034504@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Renato Botelho Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E52D016A4CE for ; Fri, 22 Oct 2004 12:46:36 +0000 (GMT) Received: from srv1.galle.com.br (srv1.galle.com.br [200.246.25.2]) by mx1.FreeBSD.org (Postfix) with SMTP id CACF443D5A for ; Fri, 22 Oct 2004 12:46:35 +0000 (GMT) (envelope-from root@srv1.galle.com.br) Received: (qmail 59110 invoked by uid 0); 22 Oct 2004 09:46:33 -0300 Message-Id: <20041022124633.59109.qmail@srv1.galle.com.br> Date: 22 Oct 2004 09:46:33 -0300 From: Renato Botelho To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: freebsd@simplerezo.com Subject: ports/73001: [PATCH] mail/qmail-scanner: Fix spamd/spamc unix sockets detection X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Oct 2004 12:50:28 -0000 >Number: 73001 >Category: ports >Synopsis: [PATCH] mail/qmail-scanner: Fix spamd/spamc unix sockets detection >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Oct 22 12:50:27 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Renato Botelho >Release: FreeBSD 5.2.1-RELEASE-p8 i386 >Organization: Galle Folheados >Environment: System: FreeBSD srv1.galle.com.br 5.2.1-RELEASE-p8 FreeBSD 5.2.1-RELEASE-p8 #27: Wed May 26 10:21:14 BRT 2004 >Description: When you are running spamd/spamc with unix sockets, Q-S configure script donīt detect the socket right. Port maintainer (freebsd@simplerezo.com) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- qmail-scanner-1.24.patch begins here --- diff -ruN --exclude=CVS /var/jail/data/usr/ports/mail/qmail-scanner.orig/files/patch-configure /var/jail/data/usr/ports/mail/qmail-scanner/files/patch-configure --- /var/jail/data/usr/ports/mail/qmail-scanner.orig/files/patch-configure Fri Oct 22 08:45:25 2004 +++ /var/jail/data/usr/ports/mail/qmail-scanner/files/patch-configure Fri Oct 22 09:38:58 2004 @@ -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 Fri Oct 22 09:36:22 2004 @@ -1,13 +1,6 @@ #!/bin/sh # @@ -78,7 +78,20 @@ --scanners Defaults to "auto" - will use whatever scanners are found on system. -@@ -1005,9 +1017,14 @@ +@@ -910,10 +922,11 @@ + #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 auxww 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" ++ SA_HN=" -U $SPAMD_SOCKET" + fi + DD="`$SPAMC_BINARY < ./contrib/spamc-nice.eml`" + if [ "`echo $DD|grep '^From '`" != "" ]; then +@@ -1005,9 +1018,14 @@ MAILDOMAIN=${MAILDOMAIN:-$FQDN} LOCAL_DOMAINS_ARRAY=${LOCAL_DOMAINS_ARRAY:-$MAILDOMAIN} @@ -95,7 +108,7 @@ if [ "$MANUAL_INSTALL" = "1" ]; then CMDLINE="$CMDLINE --no-QQ-check $MANUAL_INSTALL" fi -@@ -1381,7 +1398,7 @@ +@@ -1381,7 +1399,7 @@ fi fi @@ -104,7 +117,7 @@ SCANNER_ARRAY=`echo $SCANNER_ARRAY|sed 's/^,//g'` -@@ -1461,7 +1478,13 @@ +@@ -1461,7 +1479,13 @@ fi echo "archiving $ASTRING into $AS_QQ/$ARCHIVEDIR/" fi @@ -119,7 +132,7 @@ echo "local-domains=$LOCAL_DOMAINS_ARRAY" echo "silent-viruses=$FIND_SILENT_VIRUSES_ARRAY" echo "scanners=$SCANNER_ARRAY" -@@ -1623,10 +1646,12 @@ +@@ -1623,10 +1647,12 @@ s?SPAMC_BINARY?$SPAMC_BINARY?g; s?SPAMC_OPTIONS?$SPAMC_OPTIONS?g; s?SPAMC_SUBJECT?$SPAMC_SUBJECT?g; --- qmail-scanner-1.24.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: