ports/66046: [MAINTAINER] mail/MailScanner: [SUMMARIZE CHANGES]

[Jan-Peter Koopmann]

>Number:         66046
>Category:       ports
>Synopsis:       [MAINTAINER] mail/MailScanner: [SUMMARIZE CHANGES]
>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:   Wed Apr 28 04:50:22 PDT 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:

Two bugs are fixed:
1. In certain conditions the update_virus_scanners script cannot kill the lock-file. Therefore all future updates of virus signatures fail.

2. If a mail contained too many attachment, it was blocked but the report was empty, confusing the sender.

Please add these files to CVS:
- files/patch-bin:update_virus_scanners
- file files/patch-lib:MailScanner:MessageBatch.pm


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

--- MailScanner-4.29.7_1.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	Fri Apr  2 08:01:03 2004
+++ /server-root/ports/mail/mailscanner/Makefile	Wed Apr 28 13:38:09 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	MailScanner
 PORTVERSION=	4.29.7
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${PATCHLEVEL}
diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/files/patch-bin:update_virus_scanners /server-root/ports/mail/mailscanner/files/patch-bin:update_virus_scanners
--- /server-root/ports/mail/mailscanner.orig/files/patch-bin:update_virus_scanners	Thu Jan  1 01:00:00 1970
+++ /server-root/ports/mail/mailscanner/files/patch-bin:update_virus_scanners	Wed Apr 28 13:39:50 2004
@@ -0,0 +1,12 @@
+--- ../MailScanner-4.29.7.orig/bin/update_virus_scanners	Wed Apr 28 13:38:29 2004
++++ bin/update_virus_scanners	Wed Apr 28 13:39:10 2004
+@@ -8,7 +8,8 @@
+ # the lockfile is not meant to be perfect, it's just in case the
+ # two cron scripts get run close to each other to keep them from
+ # stepping on each other's toes.
+-[ -f $LOCKFILE ] && exit 0
++
++[ -f $LOCKFILE ] && [ "`find $LOCKFILE -type f -mmin +60 -print`" = "" ] && exit 0
+ trap "rm -f $LOCKFILE" EXIT
+ touch $LOCKFILE
+ 
diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/files/patch-lib:MailScanner:MessageBatch.pm /server-root/ports/mail/mailscanner/files/patch-lib:MailScanner:MessageBatch.pm
--- /server-root/ports/mail/mailscanner.orig/files/patch-lib:MailScanner:MessageBatch.pm	Thu Jan  1 01:00:00 1970
+++ /server-root/ports/mail/mailscanner/files/patch-lib:MailScanner:MessageBatch.pm	Wed Apr 28 13:39:50 2004
@@ -0,0 +1,14 @@
+--- ../MailScanner-4.29.7.orig/lib/MailScanner/MessageBatch.pm	Wed Apr 28 13:38:25 2004
++++ lib/MailScanner/MessageBatch.pm	Wed Apr 28 13:39:29 2004
+@@ -472,6 +472,11 @@
+         MailScanner::Config::LanguageValue($message, 'cantanalyze') . "\n";
+       $message->{othertypes}{""}   .= 'e';
+     }
++	 if ($message->{toomanyattach}) {
++      $message->{otherreports}{""} .=
++        MailScanner::Config::LanguageValue($message, 'toomanyattachments') . "\n";
++      $message->{othertypes}{""}   .= 'e';
++    }
+     if ($message->{badtnef}) {
+       $message->{entityreports}{$this->{tnefentity}} .=
+         MailScanner::Config::LanguageValue($message, 'badtnef') . "\n";
--- MailScanner-4.29.7_1.patch ends here ---

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