Upgrade to Mimedefang 2.62

PR:		ports/114187
Submitted by:	Robin Gruyters <r.gruyters@yirdis.nl> (partially)
This commit is contained in:
Wes Peters 2007-07-14 03:07:32 +00:00
parent 3034d94e67
commit ea6df57fe9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=195552
3 changed files with 7 additions and 52 deletions

View file

@ -6,8 +6,7 @@
# #
PORTNAME= mimedefang PORTNAME= mimedefang
PORTVERSION= 2.61 PORTVERSION= 2.62
PORTREVISION= 1
CATEGORIES= mail CATEGORIES= mail
MASTER_SITES= http://www.mimedefang.org/static/ MASTER_SITES= http://www.mimedefang.org/static/

View file

@ -1,3 +1,3 @@
MD5 (mimedefang-2.61.tar.gz) = 3da2d687a40bd8ed2ef4b1db3a5ea863 MD5 (mimedefang-2.62.tar.gz) = 2b040a77e93ab913a83aaa45a94a54a9
SHA256 (mimedefang-2.61.tar.gz) = 9a3ca09b2d8bf40401aabf03ca0cb2b78bbf0583664238e0568e67f4526c1fb3 SHA256 (mimedefang-2.62.tar.gz) = 95fcc2b43f6b6de3e0349e97ddb4994024dd52157b285c31380f1a99e2348611
SIZE (mimedefang-2.61.tar.gz) = 326722 SIZE (mimedefang-2.62.tar.gz) = 329774

View file

@ -1,6 +1,6 @@
--- mimedefang.pl.in.orig Sun Jun 12 18:36:52 2005 --- mimedefang.pl.in.orig Fri Jul 13 08:03:23 2007
+++ mimedefang.pl.in Sun Jun 12 18:37:35 2005 +++ mimedefang.pl.in Fri Jul 13 08:04:19 2007
@@ -191,7 +191,7 @@ @@ -186,7 +186,7 @@
$FprotdHost = "127.0.0.1:10200"; $FprotdHost = "127.0.0.1:10200";
$SophieSock = "@SPOOLDIR@/sophie"; $SophieSock = "@SPOOLDIR@/sophie";
@ -9,47 +9,3 @@
$TrophieSock = "@SPOOLDIR@/trophie"; $TrophieSock = "@SPOOLDIR@/trophie";
package MIME::Parser::ParanoidFiler; package MIME::Parser::ParanoidFiler;
@@ -3669,7 +3669,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);
}
@@ -3693,7 +3693,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);
}
@@ -4506,10 +4506,10 @@
md_syslog('err', "$MsgID: Clamd returned error: $err_detail");
# If it's a zip module failure, try falling back on clamscan.
# This is despicable, but it might work
- if ($err_detail =~ /zip module failure/i &&
+ if ($err_detail =~ /(?:zip module failure|Not supported data format)/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);
}
@@ -4603,10 +4603,10 @@
md_syslog('err', "$MsgID: Clamd returned error: $err_detail");
# If it's a zip module failure, try falling back on clamscan.
# This is despicable, but it might work
- if ($err_detail =~ /zip module failure/i &&
+ if ($err_detail =~ /(?:zip module failure|Not supported data format)/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);
}