Update to 0.65. clamav-milter is still disabled while the maintainer is

working on the issue.

Changes:
-) clamd:
    + fixed a race condition in database reloading code (random crashes
      under high load)
    + fixed a race condition with the improperly initialized session start time
      (thanks to Michael Dankov)
    + fixed PidFile permissions (Magnus Ekdahl, bug reported by Tomasz Papszun)
    + fixed LogFile permissions (Magnus Ekdahl)
    + new directive ScanRAR (bacause RAR support is now disabled by default)
    + new directive VirusEvent
    + new directive FixStaleSocket (Thomas Lamy and Mark Mielke)
    + new directive TCPAddr (Bernard Quatermass, fixed by Damien Curtain)
    + new directive Debug

-) clamav-milter: (Nigel Horne <njh*clamav.net>)
    + new --force-scan flag
    + new -P and -q flags by Nicholas M. Kirsch
    WARNING: clamav-milter and our mail scanner are still in high development
             and may be unstable. You should always use the CVS version.

-) libclamav:
    + support for a new database container format (CVD) - compressed and
      digitally signed
    + better protection against malformed zip archives (such as Mimail)
    + mail decoder fixes (thanks to Rene Bellora, Bernd Kuhls, Thomas Lamy,
      Tomasz Papszun) (Nigel Horne)
    + memory leak fixes (Thomas Lamy)
    + new scan option CL_DISABLERAR (disables built-in RAR unpacker)

-) freshclam:
    + fixed --on-error-execute behaviour (David Woakes)
    + new option --user (-u) USER - run as USER instead of the default user.
      Patch by Damien Curtain.
    + rewritten to use database.clamav.net and CVD

-) documentation:
    + new Spanish documentation on ClamAV and Sendmail integration by
      Erick Ivaan Lopez Carreon
    + included clamdoc.pdf Turkish translation by yavuz kaya and Ýbrahim erken
    + included clamav-mirror-howto.pdf by Luca Gibelli
    + included clamd+daemontools HOWTO by Jesse D. Guardiani
    + included signatures.pdf
    + man pages: updated
    + clamdoc.pdf: rewritten

5 files changed, 20 insertions, 20 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index dcc7fc18860..7fc8d3b7bd1 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2003/12/08 06:47:31 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/29 17:14:16 cube Exp $
 
-DISTNAME=	clamav-0.60
-PKGREVISION=	1
+DISTNAME=	clamav-0.65
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clamav/}
 
diff --git a/mail/clamav/PLIST b/mail/clamav/PLIST
index 849d3d36023..a6f436ac8d0 100644
--- a/mail/clamav/PLIST
+++ b/mail/clamav/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/09/28 23:39:24 chris Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/01/29 17:14:16 cube Exp $
 bin/clamdscan
 bin/clamscan
 bin/freshclam
@@ -16,9 +16,9 @@ man/man1/sigtool.1
 man/man5/clamav.conf.5
 man/man8/clamd.8
 sbin/clamd
+share/clamav/daily.cvd
+share/clamav/main.cvd
 share/clamav/mirrors.txt
-share/clamav/viruses.db
-share/clamav/viruses.db2
 share/examples/clamav/clamav.conf
 @dirrm share/examples/clamav
 @dirrm share/clamav
diff --git a/mail/clamav/PLIST.milter b/mail/clamav/PLIST.milter
index aa7805bffe1..c242f90e95a 100644
--- a/mail/clamav/PLIST.milter
+++ b/mail/clamav/PLIST.milter
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST.milter,v 1.1 2003/09/28 23:39:24 chris Exp $
-man/man1/clamav-milter.1
+@comment $NetBSD: PLIST.milter,v 1.2 2004/01/29 17:14:16 cube Exp $
+man/man8/clamav-milter.8
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index 431a1a71c46..3bcf2fc1fde 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.4 2003/09/28 23:39:24 chris Exp $
+$NetBSD: distinfo,v 1.5 2004/01/29 17:14:16 cube Exp $
 
-SHA1 (clamav-0.60.tar.gz) = d72547dc3027fcdd76ad9a4b6edd3aa655534e1c
-Size (clamav-0.60.tar.gz) = 1018727 bytes
-SHA1 (patch-aa) = d3694bbe8a53b47a92ca19a0f60cb479d9020980
+SHA1 (clamav-0.65.tar.gz) = 15cfd1f736d01d3039de87eaf1167b119b100bf0
+Size (clamav-0.65.tar.gz) = 1438425 bytes
+SHA1 (patch-aa) = fb71cea4fde55a39744acd57a9ddac343a436871
 SHA1 (patch-ab) = 0d1ef00c0c1c64642461e353f7e4ed7f81e3a042
+SHA1 (patch-ac) = 920297ccb7659c7e70e9ae1b657059066b962310
+SHA1 (patch-ad) = eb593a2ab4d587e62e61e88ab9a6ca64799afea6
diff --git a/mail/clamav/patches/patch-aa b/mail/clamav/patches/patch-aa
index 62f71a88d73..e13e63c2041 100644
--- a/mail/clamav/patches/patch-aa
+++ b/mail/clamav/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2003/09/28 23:39:24 chris Exp $
+$NetBSD: patch-aa,v 1.5 2004/01/29 17:14:16 cube Exp $
 
---- configure.in.orig	2003-06-21 04:05:32.000000000 +0100
-+++ configure.in	2003-09-28 23:35:17.000000000 +0100
-@@ -74,12 +74,16 @@
+--- configure.in.orig	Wed Nov 12 02:27:29 2003
++++ configure.in
+@@ -74,12 +74,15 @@ then
      AC_CHECK_LIB(bz2, bzReadOpen, AC_DEFINE(NOBZ2PREFIX),)
  fi
  
@@ -19,11 +19,10 @@ $NetBSD: patch-aa,v 1.4 2003/09/28 23:39:24 chris Exp $
 +then
 +	AC_CHECK_HEADER(libmilter/mfapi.h,[have_milter=yes],)
 +fi
-+
- 
- AC_CHECK_HEADER(syslog.h,AC_DEFINE(CLAMD_USE_SYSLOG),)
  
-@@ -255,8 +259,12 @@
+ want_dsig="yes"
+ AC_ARG_ENABLE(dsig,
+@@ -271,8 +274,12 @@ openbsd*)
      AC_DEFINE(C_BSD)
      ;;
  netbsd*)