ports/72996: [MAINTAINER] mail/MailScanner: problem with clamav-module 0.12 solved

[Jan-Peter Koopmann]

>Number:         72996
>Category:       ports
>Synopsis:       [MAINTAINER] mail/MailScanner: problem with clamav-module 0.12 solved
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 22 08:30:30 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Jan-Peter Koopmann
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD services.intern.seceidos.de 4.9-STABLE FreeBSD 4.9-STABLE #0: Mon Jan  5 10:56:46 CET
>Description:
With clamav-0.80 a new clamav-perl-module (port p5-Mail-ClamAV) must be used (version 0.12). But 0.12 did not work correctly
with MailScanner 4.34 up until this fix. Since both clamav 0.80 and p5-Mail-ClamAV 0.12 have been committed, this fix is crucial
for everyone using clamavmodule with MailScanner.


Added file(s):
- files/patch-lib:MailScanner:SweepViruses.pm

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

--- MailScanner-4.34.8_2.patch begins here ---
diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/Makefile /server-root/ports/mail/mailscanner/Makefile
--- /server-root/ports/mail/mailscanner.orig/Makefile	Wed Oct 20 16:40:22 2004
+++ /server-root/ports/mail/mailscanner/Makefile	Fri Oct 22 10:24:20 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=	MailScanner
 PORTVERSION=	4.34.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/files/patch-lib:MailScanner:SweepViruses.pm /server-root/ports/mail/mailscanner/files/patch-lib:MailScanner:SweepViruses.pm
--- /server-root/ports/mail/mailscanner.orig/files/patch-lib:MailScanner:SweepViruses.pm	Thu Jan  1 01:00:00 1970
+++ /server-root/ports/mail/mailscanner/files/patch-lib:MailScanner:SweepViruses.pm	Fri Oct 22 10:23:58 2004
@@ -0,0 +1,54 @@
+--- ../MailScanner-install-4.34.8.orig/lib/MailScanner/SweepViruses.pm	Fri Oct 22 10:23:15 2004
++++ lib/MailScanner/SweepViruses.pm	Fri Oct 22 10:23:34 2004
+@@ -2,7 +2,7 @@
+ #   MailScanner - SMTP E-Mail Virus Scanner
+ #   Copyright (C) 2002  Julian Field
+ #
+-#   $Id: SweepViruses.pm,v 1.49.2.85 2004/09/28 20:18:51 jkf Exp $
++#   $Id: SweepViruses.pm,v 1.49.2.87 2004/10/21 19:40:25 jkf Exp $
+ #
+ #   This program is free software; you can redistribute it and/or modify
+ #   it under the terms of the GNU General Public License as published by
+@@ -41,7 +41,7 @@
+ use vars qw($VERSION $ScannerPID);
+ 
+ ### The package version, both in 1.23 style *and* usable by MakeMaker:
+-$VERSION = substr q$Revision: 1.49.2.85 $, 10;
++$VERSION = substr q$Revision: 1.49.2.87 $, 10;
+ 
+ # Locking definitions for flock() which is used to lock the Lock file
+ my($LOCK_SH) = 1;
+@@ -426,6 +426,12 @@
+   MailScanner::Log::DieLog("ClamAV Perl module not found, did you install it?")
+     unless eval 'require Mail::ClamAV';
+ 
++  my $ver = $Mail::ClamAV::VERSION + 0.0;
++  MailScanner::Log::DieLog("ClamAV Perl module must be at least version 0.12" .
++                           " and you only have version %.2f, and ClamAV must" .
++                           " be at least version 0.80", $ver)
++    unless $ver >= 0.12;
++
+   $Clam = new Mail::ClamAV(Mail::ClamAV::retdbdir())
+     or MailScanner::Log::DieLog("ClamAV Module ERROR:: Could not load " .
+        "databases from %s", Mail::ClamAV::retdbdir());
+@@ -984,11 +990,17 @@
+     while($filename = $child->read()) {
+       next unless -f "$dirname/$childname/$filename"; # Only check files
+       # JKF Patch suggested by Rick Cooper to support unrar and OLE2 files
+-      #$results = $Clam->scan("$dirname/$childname/$filename", Mail::ClamAV::CL_ARCHIVE());
++      #$results = $Clam->scan("$dirname/$childname/$filename",
++      #                       Mail::ClamAV::CL_SCAN_ARCHIVE());
+       if (MailScanner::Config::Value('allowpasszips')) { # || $haverar) {
+-        $results = $Clam->scan("$dirname/$childname/$filename", Mail::ClamAV::CL_ARCHIVE() | Mail::ClamAV::CL_OLE2());
++        $results = $Clam->scan("$dirname/$childname/$filename",
++                               Mail::ClamAV::CL_SCAN_ARCHIVE() |
++                               Mail::ClamAV::CL_SCAN_OLE2());
+       } else {
+-        $results = $Clam->scan("$dirname/$childname/$filename", Mail::ClamAV::CL_ARCHIVE() | Mail::ClamAV::CL_ENCRYPTED() | Mail::ClamAV::CL_OLE2());
++        $results = $Clam->scan("$dirname/$childname/$filename",
++                               Mail::ClamAV::CL_SCAN_ARCHIVE() |
++                               Mail::ClamAV::CL_SCAN_BLOCKENCRYPTED() |
++                               Mail::ClamAV::CL_SCAN_OLE2());
+       }
+ 
+       unless ($results) {
--- MailScanner-4.34.8_2.patch ends here ---

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