Bug#413606: mimedefang: diff for NMU version 2.57-4.1

[Stephen Gran]

Package: mimedefang
Version: 2.57-4
Severity: normal
Tags: patch

Hi,

Attached is the diff for my mimedefang 2.57-4.1 NMU.

This fixes the problem with clamscan for unstable.  I plan to upload in
the next few days if I don't hear back from you.

Thanks,
-- 
 -----------------------------------------------------------------
|   ,''`.                                            Stephen Gran |
|  : :' :                                        [EMAIL PROTECTED] |
|  `. `'                        Debian user, admin, and developer |
|    `-                                     http://www.debian.org |
 -----------------------------------------------------------------

diff -u mimedefang-2.57/mimedefang.pl.in mimedefang-2.57/mimedefang.pl.in
--- mimedefang-2.57/mimedefang.pl.in
+++ mimedefang-2.57/mimedefang.pl.in
@@ -3767,7 +3767,7 @@
 
     # Run clamscan
     my($code, $category, $action) =
-	run_virus_scanner($Features{'Virus:CLAMAV'} . " --mbox --stdout --disable-summary --infected $path 2>&1");
+	run_virus_scanner($Features{'Virus:CLAMAV'} . " --stdout --disable-summary --infected $path 2>&1");
     if ($action ne 'proceed') {
 	return (wantarray ? ($code, $category, $action) : $code);
     }
@@ -3791,7 +3791,7 @@
 
     # Run clamscan
     my($code, $category, $action) =
-	run_virus_scanner($Features{'Virus:CLAMAV'} . " -r --mbox --stdout --disable-summary --infected ./Work 2>&1");
+	run_virus_scanner($Features{'Virus:CLAMAV'} . " -r --stdout --disable-summary --infected ./Work 2>&1");
     if ($action ne 'proceed') {
 	return (wantarray ? ($code, $category, $action) : $code);
     }
@@ -4607,7 +4607,7 @@
 	    if ($err_detail =~ /zip module failure/i &&
 		$Features{'Virus:CLAMAV'}) {
 		my ($code, $category, $action) =
-		run_virus_scanner($Features{'Virus:CLAMAV'} . " -r --unzip --mbox --stdout --disable-summary --infected $CWD/Work 2>&1");
+		run_virus_scanner($Features{'Virus:CLAMAV'} . " -r --unzip --stdout --disable-summary --infected $CWD/Work 2>&1");
 		if ($action ne 'proceed') {
 			return (wantarray ? ($code, $category, $action) : $code);
 		}
@@ -4704,7 +4704,7 @@
 	    if ($err_detail =~ /zip module failure/i &&
 		$Features{'Virus:CLAMAV'}) {
 		my ($code, $category, $action) =
-		    run_virus_scanner($Features{'Virus:CLAMAV'} . " -r --unzip --mbox --stdout --disable-summary --infected $CWD/Work 2>&1");
+		    run_virus_scanner($Features{'Virus:CLAMAV'} . " -r --unzip --stdout --disable-summary --infected $CWD/Work 2>&1");
 		if ($action ne 'proceed') {
 			return (wantarray ? ($code, $category, $action) : $code);
 		}
diff -u mimedefang-2.57/debian/changelog mimedefang-2.57/debian/changelog
--- mimedefang-2.57/debian/changelog
+++ mimedefang-2.57/debian/changelog
@@ -1,3 +1,10 @@
+mimedefang (2.57-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Remove obsolete mbox switches from clamscan command line
+
+ -- Stephen Gran <[EMAIL PROTECTED]>  Tue,  6 Mar 2007 02:09:21 +0000
+
 mimedefang (2.57-4) unstable; urgency=high
 
   * add depend on adduser (closes :#408255)

signature.asc
Description: Digital signature