Update to 0.84, this closes PR pkg/30130.

Changes:

-) libclamav:
    + JPEG exploit detector now also checks embedded Photoshop thumbnail images
    + archive meta-data scanner (improves malware detection within encrypted
      archives)
    + support for TNEF (winmail.dat) decoding
    + support for all tar archive formats
    + MD5 implementation replaced with a slightly faster one
    + improved database reloading with reference counter
    + database updateable false positive eliminator
    + speed improvements
    + various bugfixes

-) clamd:
    + VirusEvent now sets CLAM_VIRUSEVENT_FILENAME and CLAM_VIRUSEVENT_VIRUSNAME
      environment variables

-) clamav-milter:
    + improved database update detection when not --external

-) clamscan:
    + new options --include-dir and exclude-dir
    + new option --max-dir-recursion

-) freshclam:
    + new directive LocalIPAddress

3 files changed, 15 insertions, 15 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index 2fc1ffdd940..f0eb1ff3b06 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/04/11 21:46:17 tv Exp $
+# $NetBSD: Makefile,v 1.37 2005/05/05 00:42:56 xtraeme Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
@@ -11,7 +11,7 @@ COMMENT=	Anti-virus toolkit
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-CLAMAV_VERSION=		0.83
+CLAMAV_VERSION=		0.84
 
 USE_LIBTOOL=		yes
 
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index d4a394a7b13..aaeb08273ee 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.23 2005/02/24 09:59:20 agc Exp $
+$NetBSD: distinfo,v 1.24 2005/05/05 00:42:56 xtraeme Exp $
 
-SHA1 (clamav-0.83.tar.gz) = a8264834ee494b44d99db5b3a9e16599cb4e9026
-RMD160 (clamav-0.83.tar.gz) = 8fcecf6a94e9d873e797c350b50d3a7080696ff5
-Size (clamav-0.83.tar.gz) = 3653658 bytes
+SHA1 (clamav-0.84.tar.gz) = 85afd0bfa682bfe4da53456d18e1281ccd65cb8d
+RMD160 (clamav-0.84.tar.gz) = 922ea61400a2fdb93adbe35bb353e57756a43b2b
+Size (clamav-0.84.tar.gz) = 4006624 bytes
 SHA1 (patch-aa) = 17c713c3b5833f895b7caa470ae31f3d45d60643
 SHA1 (patch-ad) = 3723ad7212f15ba4e2690127515bfb1f37b97f71
 SHA1 (patch-af) = 605728b133ddb95827285d06bfeec9400222f874
-SHA1 (patch-ah) = 7c87b3d497c446bf227128e5e149094e1edccd1f
+SHA1 (patch-ah) = ab0bb5ccef06ad4fc37cc0210f939c00a9a2e052
diff --git a/mail/clamav/patches/patch-ah b/mail/clamav/patches/patch-ah
index 7aaf7882414..fff83d46375 100644
--- a/mail/clamav/patches/patch-ah
+++ b/mail/clamav/patches/patch-ah
@@ -1,26 +1,26 @@
-$NetBSD: patch-ah,v 1.3 2005/02/14 11:20:13 grant Exp $
+$NetBSD: patch-ah,v 1.4 2005/05/05 00:42:56 xtraeme Exp $
 
---- clamav-milter/clamav-milter.c.orig	2005-02-14 08:44:28.000000000 +1100
-+++ clamav-milter/clamav-milter.c
-@@ -3328,7 +3328,7 @@ clamfi_eom(SMFICTX *ctx)
+--- clamav-milter/clamav-milter.c.orig	2005-05-05 02:31:54.000000000 +0200
++++ clamav-milter/clamav-milter.c	2005-05-05 02:33:45.000000000 +0200
+@@ -2892,7 +2892,7 @@
  						 * the postmaster, so include
  						 * some useful information
  						 */
 -						fprintf(sendmail, _("The message %1$s sent from %2$s to\n"),
 +						fprintf(sendmail, _("The message %s sent from %s to\n"),
- 							sendmailId, sender);
+ 							sendmailId, privdata->from);
  					else
  						fprintf(sendmail, _("A message sent from %s to\n"),
-@@ -3342,7 +3342,7 @@ clamfi_eom(SMFICTX *ctx)
+@@ -2906,7 +2906,7 @@
  						fprintf(sendmail, _("\nThe message in question has been quarantined as %s\n"), privdata->filename);
  
  					if(hflag) {
 -						fprintf(sendmail, _("\nThe message was received by %1$s from %2$s via %3$s\n\n"),
 +						fprintf(sendmail, _("\nThe message was received by %s from %s via %s\n\n"),
- 							smfi_getsymval(ctx, "j"), sender,
+ 							smfi_getsymval(ctx, "j"), privdata->from,
  							smfi_getsymval(ctx, "_"));
  						fputs(_("For your information, the original message headers were:\n\n"), sendmail);
-@@ -4455,7 +4455,7 @@ qfile(struct privdata *privdata, const c
+@@ -4047,7 +4047,7 @@
  
  	if(move(privdata->filename, newname) < 0) {
  		if(use_syslog)