diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/Makefile /server-root/ports/mail/mailscanner/Makefile --- /server-root/ports/mail/mailscanner.orig/Makefile Sat Aug 21 12:15:49 2004 +++ /server-root/ports/mail/mailscanner/Makefile Tue Aug 31 15:28:47 2004 @@ -6,8 +6,7 @@ # PORTNAME= MailScanner -PORTVERSION= 4.32.5 -PORTREVISION= 1 +PORTVERSION= 4.33.3 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/distinfo /server-root/ports/mail/mailscanner/distinfo --- /server-root/ports/mail/mailscanner.orig/distinfo Sun Aug 8 19:16:18 2004 +++ /server-root/ports/mail/mailscanner/distinfo Tue Aug 31 15:28:57 2004 @@ -1,2 +1,2 @@ -MD5 (MailScanner-install-4.32.5-1.tar.gz) = 4cb194671412ca2eb79cc9e18cd21733 -SIZE (MailScanner-install-4.32.5-1.tar.gz) = 5330121 +MD5 (MailScanner-install-4.33.3-1.tar.gz) = a1b1a5e297c849f430c91b12ced59f7a +SIZE (MailScanner-install-4.33.3-1.tar.gz) = 5339017 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 Sat Aug 21 12:15:49 2004 +++ /server-root/ports/mail/mailscanner/files/patch-lib:MailScanner:SweepViruses.pm Thu Jan 1 01:00:00 1970 @@ -1,44 +0,0 @@ ---- ../MailScanner-install-4.32.5.orig/lib/MailScanner/SweepViruses.pm Mon Aug 16 18:57:47 2004 -+++ lib/MailScanner/SweepViruses.pm Mon Aug 16 18:58:17 2004 -@@ -2195,7 +2195,7 @@ - MailScanner::Log::InfoLog("ProcessClamAVOutput: %s", $1); - return 0; - } -- return 0 if /^ /; # " inflating", " deflating.." from --unzip -+ return 0 if /^ |^Extracting|module failure$/; # " inflating", " deflating.." from --unzip - if ($clamav_archive && /^$clamav_archive:/) - { - $clamav_archive = ""; -@@ -2206,6 +2206,22 @@ - - MailScanner::Log::InfoLog("%s", $line); - -+ #(Real infected archive: /var/spool/MailScanner/incoming/19746/./i75EFmSZ014248/eicar.rar) -+ if (/^\(Real infected archive: (.*)\)$/) -+ { -+ my ($file, $ReportStart); -+ $file = $1; -+ $file =~ s/^(.\/)?$BaseDir\/?//; -+ $file =~ s/^\.\///; -+ my ($id,$part) = split /\//, $file, 2; -+ -+ $ReportStart = $part; -+ $ReportStart = $Name . ': ' . $ReportStart if $Name; -+ $infections->{"$id"}{"$part"} .= "$ReportStart contains a virus\n"; -+ $types->{"$id"}{"$part"} .= "v"; -+ return 1; -+ } -+ - if (/^(\(raw\) )?(.*?): (.*) FOUND$/) - { - my ($file, $subfile, $virus, $report, $ReportStart); -@@ -2457,6 +2473,9 @@ - # Sample output: - #./1B978O-0000g2-Iq/eicar.com Virus identified EICAR_Test (+2) - #./1B978O-0000g2-Iq/eicar.zip:\eicar.com Virus identified EICAR_Test (+2) -+ -+ # Remove all the duff carriage-returns from the line -+ $line =~ s/[\r\n]//g; - - #print STDERR "Line: $line\n"; - return 0 unless $line =~ /Virus identified (.+)$/; diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/pkg-plist /server-root/ports/mail/mailscanner/pkg-plist --- /server-root/ports/mail/mailscanner.orig/pkg-plist Fri Jun 4 02:08:06 2004 +++ /server-root/ports/mail/mailscanner/pkg-plist Tue Aug 31 15:31:53 2004 @@ -80,6 +80,8 @@ libexec/MailScanner/rav-wrapper.sample libexec/MailScanner/sophos-autoupdate.sample libexec/MailScanner/sophos-wrapper.sample +libexec/MailScanner/symscanengine-wrapper.sample +libexec/MailScanner/symscanengine-autoupdate.sample libexec/MailScanner/trend-autoupdate.sample libexec/MailScanner/trend-wrapper.sample libexec/MailScanner/vexira-wrapper.sample