update clamav to 0.80.

many changes since 0.75.1, most notably, the latest virus databases
need at least 0.80.

see the ChangeLog for full details.

6 files changed, 24 insertions, 44 deletions

diff --git a/mail/clamav/MESSAGE b/mail/clamav/MESSAGE
index 5b77dde6887..90c114d19f3 100644
--- a/mail/clamav/MESSAGE
+++ b/mail/clamav/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2004/08/01 04:35:33 jlam Exp $
+$NetBSD: MESSAGE,v 1.2 2004/10/19 00:02:44 grant Exp $
 
 You should update the virus databases to the latest ones available
 before using ClamAV.  This can be done by running the following command
@@ -10,4 +10,7 @@ as `${ROOT_USER}' or `${CLAMAV_USER}':
 It is recommended that the virus database be updated hourly by adding the
 appropriate cron job.
 
+Note that as of version 0.80, clamav.conf has been replaced by
+clamd.conf. Be sure to update your configuration to reflect this.
+
 ===========================================================================
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index c74a886f236..2f256792a19 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2004/10/03 00:12:52 tv Exp $
+# $NetBSD: Makefile,v 1.26 2004/10/19 00:02:44 grant Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
-PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clamav/}
 
@@ -12,7 +11,7 @@ COMMENT=	Anti-virus toolkit
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-CLAMAV_VERSION=		0.75.1
+CLAMAV_VERSION=		0.80
 
 USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
@@ -45,7 +44,7 @@ FILES_SUBST+=	VIRUSDBDIR=${VIRUSDBDIR}
 OWN_DIRS_PERMS=		${VIRUSDBDIR} ${CLAMAV_USER} ${CLAMAV_GROUP} 0775
 CONF_FILES=		# empty
 CONF_FILES_PERMS=	# empty
-.for _file_ in clamav.conf freshclam.conf
+.for _file_ in clamd.conf freshclam.conf
 CONF_FILES+=		${EGDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_}
 .endfor
 .for _file_ in daily.cvd main.cvd
diff --git a/mail/clamav/PLIST b/mail/clamav/PLIST
index fb703b554af..8a9cffbd54d 100644
--- a/mail/clamav/PLIST
+++ b/mail/clamav/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2004/09/22 08:09:41 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2004/10/19 00:02:44 grant Exp $
 bin/clamav-config
 bin/clamdscan
 bin/clamscan
@@ -11,13 +11,13 @@ man/man1/clamdscan.1
 man/man1/clamscan.1
 man/man1/freshclam.1
 man/man1/sigtool.1
-man/man5/clamav.conf.5
+man/man5/clamd.conf.5
 man/man5/freshclam.conf.5
 ${MILTER}man/man8/clamav-milter.8
 man/man8/clamd.8
 ${MILTER}sbin/clamav-milter
 sbin/clamd
-share/examples/clamav/clamav.conf
+share/examples/clamav/clamd.conf
 share/examples/clamav/daily.cvd
 share/examples/clamav/freshclam.conf
 share/examples/clamav/main.cvd
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index 97423d2a809..d0f8d6c8ca0 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2004/08/01 04:35:33 jlam Exp $
+$NetBSD: distinfo,v 1.17 2004/10/19 00:02:44 grant Exp $
 
-SHA1 (clamav-0.75.1.tar.gz) = 7b9fa5fd6b8322e49c8e863c80ae0abf9e85cd3a
-Size (clamav-0.75.1.tar.gz) = 2777319 bytes
-SHA1 (patch-aa) = 803e0497c8cda448434b11673a195bbaee7e0285
-SHA1 (patch-ad) = 6699745bb75230de378c54bc82862dfe53732e9d
+SHA1 (clamav-0.80.tar.gz) = 0f050a19c514d2bab6063c983f155fb891c7155f
+Size (clamav-0.80.tar.gz) = 2679434 bytes
+SHA1 (patch-aa) = 98bd094cabc821481e04f0b9bf16ac83a35bda16
+SHA1 (patch-ad) = 9bc276f034a38fd48e3064bd4f59d36bad3a10c6
 SHA1 (patch-af) = 605728b133ddb95827285d06bfeec9400222f874
diff --git a/mail/clamav/patches/patch-aa b/mail/clamav/patches/patch-aa
index 382ac0aa85d..8a15639542b 100644
--- a/mail/clamav/patches/patch-aa
+++ b/mail/clamav/patches/patch-aa
@@ -1,26 +1,6 @@
-$NetBSD: patch-aa,v 1.11 2004/08/01 04:35:33 jlam Exp $
-
---- configure.orig	Thu Jul 29 17:50:13 2004
-+++ configure
-@@ -10811,7 +10811,7 @@ _ACEOF
- 
- 
- 
--if test ! -r "$cfg_dir/clamav.conf"; then
-+if true; then
-   INSTALL_CLAMAV_CONF_TRUE=
-   INSTALL_CLAMAV_CONF_FALSE='#'
- else
-@@ -10821,7 +10821,7 @@ fi
- 
- 
- 
--if test ! -r "$cfg_dir/freshclam.conf"; then
-+if true; then
-   INSTALL_FRESHCLAM_CONF_TRUE=
-   INSTALL_FRESHCLAM_CONF_FALSE='#'
- else
-@@ -11047,6 +11047,7 @@ netbsd*)
+--- configure.orig	2004-10-18 02:37:47.000000000 +1000
++++ configure	2004-10-19 09:28:50.000000000 +1000
+@@ -11558,6 +11558,7 @@
   	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
   	CLAMD_LIBS="-lpthread"
   	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
diff --git a/mail/clamav/patches/patch-ad b/mail/clamav/patches/patch-ad
index 4e0578c4fdc..fb6fb4414c5 100644
--- a/mail/clamav/patches/patch-ad
+++ b/mail/clamav/patches/patch-ad
@@ -1,13 +1,11 @@
-$NetBSD: patch-ad,v 1.5 2004/07/21 02:48:58 xtraeme Exp $
-
---- docs/Makefile.in.orig	2004-07-21 04:42:08.000000000 +0200
-+++ docs/Makefile.in	2004-07-21 04:43:58.000000000 +0200
-@@ -180,9 +180,11 @@
+--- docs/Makefile.in.orig	2004-10-18 02:37:41.000000000 +1000
++++ docs/Makefile.in	2004-10-19 09:34:06.000000000 +1000
+@@ -176,9 +176,11 @@
  target_os = @target_os@
  target_vendor = @target_vendor@
- EXTRA_DIST = clamdoc.pdf DMS German Spanish Japanese html man FreeBSD-HowTo Portugese Turkish clamd_supervised clamav-mirror-howto.pdf signatures.pdf French Polish
--man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamav.conf.5 man/clamdscan.1 man/clamav-milter.8 man/freshclam.conf.5
-+man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamav.conf.5 man/clamdscan.1 man/freshclam.conf.5
+ EXTRA_DIST = clamdoc.pdf html man clamav-mirror-howto.pdf signatures.pdf MacOSX
+-man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamd.conf.5 man/clamdscan.1 man/clamav-milter.8 man/freshclam.conf.5
++man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamd.conf.5 man/clamdscan.1 man/freshclam.conf.5
  all: all-am
  
 +@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@MILTER_MANS = man/clamav-milter.8