diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2004-11-17 06:33:57 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2004-11-17 06:33:57 +0000 |
| commit | b5392dfa2ba5ec548ba60b60530eff3ab21f0e8d (patch) | |
| tree | 717fcf4fffb669da5a7d215f7f968013fcb9e04b /mail/antivirus-milter | |
| parent | - add date of BSD License (diff) | |
- ignore error state from clamdscan.
Notes
Notes:
svn path=/head/; revision=121796
Diffstat (limited to 'mail/antivirus-milter')
| -rw-r--r-- | mail/antivirus-milter/Makefile | 2 | ||||
| -rw-r--r-- | mail/antivirus-milter/files/patch-antivirus.c | 28 |
2 files changed, 22 insertions, 8 deletions
diff --git a/mail/antivirus-milter/Makefile b/mail/antivirus-milter/Makefile index fdb6b6b0a0da..9e24050ac85a 100644 --- a/mail/antivirus-milter/Makefile +++ b/mail/antivirus-milter/Makefile @@ -7,7 +7,7 @@ PORTNAME= antivirus PORTVERSION= 3.30 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://www.nmt.edu/~wcolburn/antivirus/ diff --git a/mail/antivirus-milter/files/patch-antivirus.c b/mail/antivirus-milter/files/patch-antivirus.c index da13da22fa36..73d3cbb52498 100644 --- a/mail/antivirus-milter/files/patch-antivirus.c +++ b/mail/antivirus-milter/files/patch-antivirus.c @@ -1,14 +1,15 @@ --- antivirus.c.orig Tue Jul 15 21:27:14 2003 -+++ antivirus.c Fri Mar 5 07:56:07 2004 -@@ -85,6 +85,7 @@ ++++ antivirus.c Wed Nov 17 07:19:12 2004 +@@ -85,6 +85,8 @@ static char *FORMAT=NULL; static sfsistat avfailcode=0; static int purgevirus=0; +static int skipwords=0; ++static int ignorerror2=0; static char *avargs[]={NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}; /* -@@ -128,6 +129,12 @@ +@@ -128,6 +130,12 @@ #define FORMAT_SOPHOS ">>> Virus '%[^']s' found in file %*s" /* @@ -21,7 +22,7 @@ ** this can be given on the command line */ static char *configfile=NULL; -@@ -502,6 +509,7 @@ +@@ -502,6 +510,7 @@ int retval; int fd; int i; @@ -29,7 +30,19 @@ char *p=NULL; char *av[]={NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}; -@@ -558,7 +566,14 @@ +@@ -552,13 +561,26 @@ + (int)ctx, retval,priv->workdir); + } + ++ if (ignorerror2 > 0 ) ++ { ++ if ( retval == 2 ) ++ retval = 0; ++ } ++ + if (retval>0) + { + fseek(priv->childfp,0,SEEK_SET); memset(viruses,0,sizeof(buf)); while (fgets(buf,sizeof(buf),priv->childfp)!=NULL) { @@ -45,7 +58,7 @@ { if (viruses[0]) strncat(viruses," ",sizeof(viruses)); -@@ -1211,6 +1226,7 @@ +@@ -1211,6 +1233,7 @@ if (AVFAILACTION==NULL) AVFAILACTION=CONF_AVFAILACTION; if (VIRUSACTION==NULL) VIRUSACTION=CONF_VIRUSACTION; @@ -53,7 +66,7 @@ if (strcasecmp(AVPRODUCT,"mcafee")==0) { FORMAT=FORMAT_MCAFEE; -@@ -1225,10 +1241,16 @@ +@@ -1225,10 +1248,17 @@ { FORMAT=FORMAT_FSAV; } @@ -62,6 +75,7 @@ + FORMAT=FORMAT_CLAMAV; + AVSCANARGS=SCANARGS_CLAMAV; + skipwords = 1; ++ ignorerror2 = 1; + } else { |