Update to mimedefang-2.78.
This commit is contained in:
parent
df7ba0b290
commit
285f82ed94
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.40 2015/03/28 06:34:51 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.41 2015/06/24 07:23:04 ajacoutot Exp $
|
||||
|
||||
COMMENT= mailfilter to identify and mark spam
|
||||
|
||||
DISTNAME= mimedefang-2.76
|
||||
DISTNAME= mimedefang-2.78
|
||||
CATEGORIES= mail
|
||||
|
||||
HOMEPAGE= http://www.mimedefang.org/
|
||||
@ -13,15 +13,19 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
|
||||
# GPLv2
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
WANTLIB= c m perl pthread util milter
|
||||
WANTLIB += c m milter perl pthread util
|
||||
|
||||
BUILD_DEPENDS= ${RUN_DEPENDS}
|
||||
RUN_DEPENDS= archivers/p5-Archive-Zip \
|
||||
RUN_DEPENDS= devel/p5-IO-stringy \
|
||||
mail/p5-Mail-Tools \
|
||||
mail/p5-MIME-tools \
|
||||
security/p5-Digest-SHA1 \
|
||||
www/p5-HTML-Parser \
|
||||
sysutils/p5-Unix-Syslog
|
||||
|
||||
# useful optional dependencies
|
||||
RUN_DEPENDS += archivers/p5-Archive-Zip
|
||||
RUN_DEPENDS += www/p5-HTML-Parser
|
||||
|
||||
LIB_DEPENDS= mail/sendmail,-libmilter
|
||||
|
||||
CONFIGURE_STYLE=gnu
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (mimedefang-2.76.tar.gz) = cNnJTKKmK87FP6eiTJfgYgSOJBFK7DzHe8Zfv0DYv1E=
|
||||
SIZE (mimedefang-2.76.tar.gz) = 364503
|
||||
SHA256 (mimedefang-2.78.tar.gz) = jDYwY/ppN4Jvhkfkf8Pl75mcy5ARDgy2S+/dRc2oNyw=
|
||||
SIZE (mimedefang-2.78.tar.gz) = 364501
|
||||
|
@ -1,33 +0,0 @@
|
||||
$OpenBSD: patch-mimedefang_pl_in,v 1.5 2015/03/28 06:34:52 ajacoutot Exp $
|
||||
|
||||
Fix Avira/Antivir.
|
||||
|
||||
--- mimedefang.pl.in.orig Tue Mar 24 21:31:42 2015
|
||||
+++ mimedefang.pl.in Sat Mar 28 07:21:34 2015
|
||||
@@ -3512,7 +3512,7 @@ sub entity_contains_virus_hbedv {
|
||||
|
||||
# Run antivir
|
||||
my($code, $category, $action) =
|
||||
- run_virus_scanner($Features{'Virus:HBEDV'} . " --allfiles -z -rs $path 2>&1", "!Virus!|>>>|VIRUS:|ALERT:");
|
||||
+ run_virus_scanner($Features{'Virus:HBEDV'} . " --alert-action=none --scan-mode=all --scan-in-archive=yes --scan-in-mbox=yes --batch -s $path 2>&1", "!Virus!|>>>|VIRUS:|ALERT:");
|
||||
if ($action ne 'proceed') {
|
||||
return (wantarray ? ($code, $category, $action) : $code);
|
||||
}
|
||||
@@ -3537,7 +3537,7 @@ sub message_contains_virus_hbedv {
|
||||
|
||||
# Run antivir
|
||||
my($code, $category, $action) =
|
||||
- run_virus_scanner($Features{'Virus:HBEDV'} . " --allfiles -z -rs ./Work 2>&1", "!Virus!|>>>|VIRUS:|ALERT:");
|
||||
+ run_virus_scanner($Features{'Virus:HBEDV'} . " --alert-action=none --scan-mode=all --scan-in-archive=yes --scan-in-mbox=yes --batch -s ./Work 2>&1", "!Virus!|>>>|VIRUS:|ALERT:");
|
||||
return (wantarray ? interpret_hbedv_code($code) : $code);
|
||||
}
|
||||
|
||||
@@ -3551,7 +3551,7 @@ sub interpret_hbedv_code {
|
||||
|
||||
# Virus or virus in memory
|
||||
if ($code == 1 || $code == 2 || $code == 3) {
|
||||
- $VirusName = $1 if ($CurrentVirusScannerMessage =~ m/ALERT: \[(\S+)/ or
|
||||
+ $VirusName = $1 if ($CurrentVirusScannerMessage =~ m/ALERT: (\S+)/ or
|
||||
$CurrentVirusScannerMessage =~ /!Virus! \S+ (\S+)/ or
|
||||
$CurrentVirusScannerMessage =~ m/VIRUS: file contains code of the virus '(\S+)'/);
|
||||
$VirusName = "unknown-HBEDV-virus" if $VirusName eq "";
|
Loading…
Reference in New Issue
Block a user