From nobody@FreeBSD.org  Fri Aug  1 20:32:35 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 70FE71065677
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  1 Aug 2008 20:32:35 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 44CFE8FC19
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  1 Aug 2008 20:32:35 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m71KWYDD019715
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 1 Aug 2008 20:32:34 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id m71KWYsc019714;
	Fri, 1 Aug 2008 20:32:34 GMT
	(envelope-from nobody)
Message-Id: <200808012032.m71KWYsc019714@www.freebsd.org>
Date: Fri, 1 Aug 2008 20:32:34 GMT
From: Rainer Duffner <rainer@ultra-secure.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: simscan patch to work with clamav 0.93
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: toxa@toxahost.ru

>Number:         126178
>Category:       ports
>Synopsis:       mail/simscan patch to work with clamav 0.93
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    garga
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 01 20:40:06 UTC 2008
>Closed-Date:    Fri Aug 29 16:54:15 UTC 2008
>Last-Modified:  Fri Aug 29 16:54:15 UTC 2008
>Originator:     Rainer Duffner
>Release:        7.0
>Organization:
>Environment:
7.0-RELEASE-p2 i386 GENERIC
>Description:
Hi,

there's a patch at 
http://qmail.jms1.net/simscan/
(http://qmail.jms1.net/simscan/simscan-1.4.0-combined.3.patch)

That adds support for clamav's daily.cld files and also adds some more
debugging possibilities.
>How-To-Repeat:

>Fix:


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sat Aug 2 06:22:37 UTC 2008 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=126178 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: toxa@toxahost.ru
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/126178: mail/simscan patch to work with clamav 0.93
Date: Sat, 2 Aug 2008 06:22:35 UT

 Maintainer of mail/simscan,
 
 Please note that PR ports/126178 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/126178
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Renato Botelho <garga@FreeBSD.org>
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 <garga @ FreeBSD.org>
                <garga @ freebsdbrasil.com.br>
 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
Responsible-Changed-From-To: freebsd-ports-bugs->garga 
Responsible-Changed-By: garga 
Responsible-Changed-When: Thu Aug 28 13:50:23 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=126178 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/126178: commit references a PR
Date: Fri, 29 Aug 2008 16:48:30 +0000 (UTC)

 garga       2008-08-29 16:48:17 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/simscan         Makefile 
   Added files:
     mail/simscan/files   patch-fix_clamav_0.93 
   Log:
   - Fix build with recent clamav, based on the following patch:
   
           http://qmail.jms1.net/simscan/simscan-1.4.0-clamav.3.patch
   
   - Bump PORTREVISION
   
   PR:             ports/126178
   Submitted by:   Rainer Duffner <rainer@ultra-secure.de>
   Reworked by:    garga
   Approved by:    maintainer via ICQ
   
   Revision  Changes    Path
   1.12      +1 -1      ports/mail/simscan/Makefile
   1.1       +86 -0     ports/mail/simscan/files/patch-fix_clamav_0.93 (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: garga 
State-Changed-When: Fri Aug 29 16:54:13 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=126178 
>Unformatted:
