diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2008-08-29 16:48:17 +0000 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2008-08-29 16:48:17 +0000 |
| commit | 51fd85cc98d871a3ca51d6c9df2876a1ace666df (patch) | |
| tree | 1b6ce6ec3b0f0e9a0bbacb8370f806c8168922a4 /mail/simscan | |
| parent | - S/X11BASE/LOCALBASE (diff) | |
- Fix build with recent clamav, based on the following patch:
http://qmail.jms1.net/simscan/simscan-1.4.0-clamav.3.patch
- Bump PORTREVISION
PR: ports/126178
Submitted by: Rainer Duffner <rainer@ultra-secure.de>
Reworked by: garga
Approved by: maintainer via ICQ
Notes
Notes:
svn path=/head/; revision=219427
Diffstat (limited to 'mail/simscan')
| -rw-r--r-- | mail/simscan/Makefile | 2 | ||||
| -rw-r--r-- | mail/simscan/files/patch-fix_clamav_0.93 | 86 |
2 files changed, 87 insertions, 1 deletions
diff --git a/mail/simscan/Makefile b/mail/simscan/Makefile index 65ac71e63a43..c7ee5706ba02 100644 --- a/mail/simscan/Makefile +++ b/mail/simscan/Makefile @@ -7,7 +7,7 @@ PORTNAME= simscan PORTVERSION= 1.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail security MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} diff --git a/mail/simscan/files/patch-fix_clamav_0.93 b/mail/simscan/files/patch-fix_clamav_0.93 new file mode 100644 index 000000000000..d3a6550b0c80 --- /dev/null +++ b/mail/simscan/files/patch-fix_clamav_0.93 @@ -0,0 +1,86 @@ +--- configure 2007-10-29 10:14:25.000000000 -0400 ++++ configure 2008-05-02 15:31:51.000000000 -0400 +@@ -4686,6 +4686,14 @@ + then + clamavdb=$f + break ++ elif test -f "$f/daily.cld" ++ then ++ clamavdb=$f ++ break ++ elif test -f "$f/daily.inc/daily.info" ++ then ++ clamavdb=$f ++ break + fi + done + +--- configure.in 2007-10-29 10:13:40.000000000 -0400 ++++ configure.in 2008-05-02 15:31:32.000000000 -0400 +@@ -622,6 +622,14 @@ + then + clamavdb=$f + break ++ elif test -f "$f/daily.cld" ++ then ++ clamavdb=$f ++ break ++ elif test -f "$f/daily.inc/daily.info" ++ then ++ clamavdb=$f ++ break + fi + done + +--- simscanmk.c 2006-10-10 19:15:17.000000000 -0400 ++++ simscanmk.c 2008-07-07 14:21:46.000000000 -0400 +@@ -123,6 +123,7 @@ + char input[MAX_LINE]; + char dbpath[MAX_LINE]; + char *pos; ++ int rv; + #if ENABLE_SPAM==1 || ENABLE_TROPHIE==1 + int fnd_vsvers; + #endif +@@ -276,8 +277,18 @@ + waitpid(pid,&rmstat,0); + close(pin[0]); close(pin[1]); + } +- strncpy(dbpath,CLAMAVDBPATH,MAX_DATA); +- strcat(dbpath,"/main.cvd"); ++ strncpy(dbpath,CLAMAVDBPATH,MAX_LINE); ++ strncat(dbpath,"/main.inc/main.info",(MAX_LINE-sizeof(CLAMAVDBPATH)-1)); ++ rv=access(dbpath,F_OK); ++ if(rv) { ++ strncpy(dbpath,CLAMAVDBPATH,MAX_LINE); ++ strncat(dbpath,"/main.cld",(MAX_LINE-sizeof(CLAMAVDBPATH)-1)); ++ } ++ rv=access(dbpath,F_OK); ++ if(rv) { ++ strncpy(dbpath,CLAMAVDBPATH,MAX_LINE); ++ strncat(dbpath,"/main.cvd",(MAX_LINE-sizeof(CLAMAVDBPATH)-1)); ++ } + strcat(data,"m:"); + if (pipe(pin)){ + printf("error opening pipe for sigtool\n"); +@@ -306,8 +317,18 @@ + } + waitpid(pid,&rmstat,0); + close(pin[0]); close(pin[1]); +- strncpy(dbpath,CLAMAVDBPATH,MAX_DATA); +- strcat(dbpath,"/daily.cvd"); ++ strncpy(dbpath,CLAMAVDBPATH,MAX_LINE); ++ strncat(dbpath,"/daily.inc/daily.info",(MAX_LINE-sizeof(CLAMAVDBPATH)-1)); ++ rv=access(dbpath,F_OK); ++ if(rv) { ++ strncpy(dbpath,CLAMAVDBPATH,MAX_LINE); ++ strncat(dbpath,"/daily.cld",(MAX_LINE-sizeof(CLAMAVDBPATH)-1)); ++ } ++ rv=access(dbpath,F_OK); ++ if(rv) { ++ strncpy(dbpath,CLAMAVDBPATH,MAX_LINE); ++ strncat(dbpath,"/daily.cvd",(MAX_LINE-sizeof(CLAMAVDBPATH)-1)); ++ } + if (pipe(pin)){ + printf("error opening pipe for sigtool\n"); + } |