From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Aug 28 13:50:03 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BFFB51065675 for ; Thu, 28 Aug 2008 13:50:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id B2D328FC16 for ; Thu, 28 Aug 2008 13:50:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m7SDo3kf093827 for ; Thu, 28 Aug 2008 13:50:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m7SDo3dS093826; Thu, 28 Aug 2008 13:50:03 GMT (envelope-from gnats) Date: Thu, 28 Aug 2008 13:50:03 GMT Message-Id: <200808281350.m7SDo3dS093826@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Renato Botelho Cc: Subject: Re: ports/126178: mail/simscan patch to work with clamav 0.93 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Renato Botelho List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Aug 2008 13:50:03 -0000 The following reply was made to PR ports/126178; it has been noted by GNATS. From: Renato Botelho To: bug-followup@freebsd.org, rainer@ultra-secure.de Cc: toxa@toxahost.ru Subject: Re: ports/126178: mail/simscan patch to work with clamav 0.93 Date: Thu, 28 Aug 2008 10:50:29 -0300 Here is a patch to fix the port based on a patch found here: http://qmail.jms1.net/simscan/simscan-1.4.0-clamav.3.patch Thanks Index: Makefile =================================================================== RCS file: /home/pcvs/ports/mail/simscan/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- Makefile 16 Apr 2008 16:10:19 -0000 1.11 +++ Makefile 28 Aug 2008 13:45:30 -0000 @@ -7,7 +7,7 @@ PORTNAME= simscan PORTVERSION= 1.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail security MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} Index: files/patch-fix_clamav_0.93 =================================================================== RCS file: files/patch-fix_clamav_0.93 diff -N files/patch-fix_clamav_0.93 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-fix_clamav_0.93 28 Aug 2008 13:45:30 -0000 @@ -0,0 +1,86 @@ +--- configure 2007-10-29 10:14:25.000000000 -0400 ++++ configure 2008-05-02 15:31:51.000000000 -0400 +@@ -4686,6 +4686,14 @@ + then + clamavdb=$f + break ++ elif test -f "$f/daily.cld" ++ then ++ clamavdb=$f ++ break ++ elif test -f "$f/daily.inc/daily.info" ++ then ++ clamavdb=$f ++ break + fi + done + +--- configure.in 2007-10-29 10:13:40.000000000 -0400 ++++ configure.in 2008-05-02 15:31:32.000000000 -0400 +@@ -622,6 +622,14 @@ + then + clamavdb=$f + break ++ elif test -f "$f/daily.cld" ++ then ++ clamavdb=$f ++ break ++ elif test -f "$f/daily.inc/daily.info" ++ then ++ clamavdb=$f ++ break + fi + done + +--- simscanmk.c 2006-10-10 19:15:17.000000000 -0400 ++++ simscanmk.c 2008-07-07 14:21:46.000000000 -0400 +@@ -123,6 +123,7 @@ + char input[MAX_LINE]; + char dbpath[MAX_LINE]; + char *pos; ++ int rv; + #if ENABLE_SPAM==1 || ENABLE_TROPHIE==1 + int fnd_vsvers; + #endif +@@ -276,8 +277,18 @@ + waitpid(pid,&rmstat,0); + close(pin[0]); close(pin[1]); + } +- strncpy(dbpath,CLAMAVDBPATH,MAX_DATA); +- strcat(dbpath,"/main.cvd"); ++ strncpy(dbpath,CLAMAVDBPATH,MAX_LINE); ++ strncat(dbpath,"/main.inc/main.info",(MAX_LINE-sizeof(CLAMAVDBPATH)-1)); ++ rv=access(dbpath,F_OK); ++ if(rv) { ++ strncpy(dbpath,CLAMAVDBPATH,MAX_LINE); ++ strncat(dbpath,"/main.cld",(MAX_LINE-sizeof(CLAMAVDBPATH)-1)); ++ } ++ rv=access(dbpath,F_OK); ++ if(rv) { ++ strncpy(dbpath,CLAMAVDBPATH,MAX_LINE); ++ strncat(dbpath,"/main.cvd",(MAX_LINE-sizeof(CLAMAVDBPATH)-1)); ++ } + strcat(data,"m:"); + if (pipe(pin)){ + printf("error opening pipe for sigtool\n"); +@@ -306,8 +317,18 @@ + } + waitpid(pid,&rmstat,0); + close(pin[0]); close(pin[1]); +- strncpy(dbpath,CLAMAVDBPATH,MAX_DATA); +- strcat(dbpath,"/daily.cvd"); ++ strncpy(dbpath,CLAMAVDBPATH,MAX_LINE); ++ strncat(dbpath,"/daily.inc/daily.info",(MAX_LINE-sizeof(CLAMAVDBPATH)-1)); ++ rv=access(dbpath,F_OK); ++ if(rv) { ++ strncpy(dbpath,CLAMAVDBPATH,MAX_LINE); ++ strncat(dbpath,"/daily.cld",(MAX_LINE-sizeof(CLAMAVDBPATH)-1)); ++ } ++ rv=access(dbpath,F_OK); ++ if(rv) { ++ strncpy(dbpath,CLAMAVDBPATH,MAX_LINE); ++ strncat(dbpath,"/daily.cvd",(MAX_LINE-sizeof(CLAMAVDBPATH)-1)); ++ } + if (pipe(pin)){ + printf("error opening pipe for sigtool\n"); + } -- Renato Botelho GnuPG Key: http://www.FreeBSD.org/~garga/pubkey.asc Govern a great nation as you would cook a small fish. Don't overdo it. -- Lao Tsu