Update to 0.68-1, and reenable the milter (OK'd by recht). Changes:

0.68-1
------
Fixed RAR support.

0.68
----
This version fixes a crash with some RAR archives generated by the Bagle worm,
also a few important fixes have been backported from CVS.

We strongly encourage users to install the 0.70-rc version (released today).

0.67
----
This release fixes a memory management problem (platform dependent; can lead
to a DoS attack) with messages that only have attachments (reported by Oliver
Brandmueller). It also contains patches for a few problems found in 0.66 and
has better Cygwin support.

3 files changed, 14 insertions, 49 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index 3c2d151ac1f..91eebeead63 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.14 2004/03/30 00:29:59 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2004/04/14 16:30:42 tv Exp $
 
-DISTNAME=	clamav-0.66
-PKGREVISION=	1
+DISTNAME=	clamav-${CLAMAV_VERSION}
+PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clamav/} \
-		http://clamav.catt.com/stable/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clamav/}
 
 MAINTAINER=	david@netbsd-fr.org
 HOMEPAGE=	http://www.clamav.net/
 COMMENT=	Anti-virus toolkit
 
+CLAMAV_VERSION=	0.68-1
+
 USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 USE_PKGINSTALL=		yes
@@ -33,9 +34,9 @@ PLIST_SRC=	${PKGDIR}/PLIST
 
 .include "../../mk/bsd.prefs.mk"
 .if defined(USE_MILTER) && ${USE_MILTER} == "YES"
-#.include "../../mail/libmilter/buildlink3.mk"
-#CONFIGURE_ARGS+=	--enable-milter
-#PLIST_SRC+=		${PKGDIR}/PLIST.milter
+.include "../../mail/libmilter/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-milter
+PLIST_SRC+=		${PKGDIR}/PLIST.milter
 .else
 CONFIGURE_ARGS+=	--disable-milter
 .endif
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index 76b259ab664..eedadacd6e3 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2004/02/29 03:46:22 toshii Exp $
+$NetBSD: distinfo,v 1.9 2004/04/14 16:30:42 tv Exp $
 
-SHA1 (clamav-0.66.tar.gz) = 1a008d33f8e2caf54708b952747e5a5266610cfc
-Size (clamav-0.66.tar.gz) = 2275692 bytes
-SHA1 (patch-aa) = 779aef1a73f78749e1e6b9ed5e5fd6eb0d537a41
+SHA1 (clamav-0.68-1.tar.gz) = d99dc0f88ad31df77441e5e4cfa1d6c66ac8f756
+Size (clamav-0.68-1.tar.gz) = 2170863 bytes
+SHA1 (patch-aa) = 6bd43ca5ed8e160ea5b1e69497c8cf71f4774bde
 SHA1 (patch-ab) = 49f80b512704fec57c6b920d2625c083c756f957
 SHA1 (patch-ac) = cab02632217fe4d75c0b48d0fd962d7822c3617d
 SHA1 (patch-ad) = 6f2bfa05bb3421280272719c03260784a7826e91
diff --git a/mail/clamav/patches/patch-aa b/mail/clamav/patches/patch-aa
index 50d1e7019b7..9c584fd82a5 100644
--- a/mail/clamav/patches/patch-aa
+++ b/mail/clamav/patches/patch-aa
@@ -1,43 +1,7 @@
-$NetBSD: patch-aa,v 1.7 2004/02/11 10:55:49 recht Exp $
+$NetBSD: patch-aa,v 1.8 2004/04/14 16:30:43 tv Exp $
 
 --- configure.orig	2004-02-11 00:16:08.000000000 +0100
 +++ configure	2004-02-11 11:34:05.000000000 +0100
-@@ -8773,7 +8773,17 @@
- fi
- 
- 
--have_milter="no"
-+# Check whether --enable-milter or --disable-milter was given.
-+if test "${enable_milter+set}" = set; then
-+  enableval="$enable_milter"
-+
-+else
-+  have_milter="no"
-+  want_milter="no"
-+fi;
-+
-+if test "$want_milter" = "yes"
-+then
- if test "${ac_cv_header_libmilter_mfapi_h+set}" = set; then
-   echo "$as_me:$LINENO: checking for libmilter/mfapi.h" >&5
- echo $ECHO_N "checking for libmilter/mfapi.h... $ECHO_C" >&6
-@@ -8879,15 +8889,7 @@
-   have_milter="yes"
- fi
- 
--
--
--# Check whether --enable-milter or --disable-milter was given.
--if test "${enable_milter+set}" = set; then
--  enableval="$enable_milter"
--
--else
--  have_milter="no"
--fi;
-+fi
- 
- want_dsig="yes"
- # Check whether --enable-dsig or --disable-dsig was given.
 @@ -9502,11 +9504,17 @@
  
      ;;