update clamav to 0.87.1.

changes since 0.87:

  * Bugfixes:
    - libclamav/petite.c: fix boundary checks (acab)
    - libclamav/mbox.c: scan attachments that have no filename (njh)
    - libclamav/fsg.c: fix buffer size calculation in unfsg_133
      Reported by Zero Day Initiative (ZDI-CAN-004)
    - libclamav/tnef.c: fix possible infinite loop
      Reported by iDEFENSE (IDEF1169).
    - libclamav/mspack/cabd.c: fix possible infinite loop in cabd_find
      (tk)
      Reported by iDEFENSE (IDEF1180).
    - clamd/others.c: fix compilation error on Cobalt Qube 1 (tk)
    - clamd: properly handle ReadTimeout in SESSION (tk)
      Bug reported by Kamil Kaczkowski <kamil*kamil.eisp.pl>
    - libclamav/others.c,h: Add generic bitset implementation (trog)
    - libclamav/ole2_extract.c: Make sure the property tree doesn't
      loop (trog)
      Fixes CAN-2005-3239. Installations with default settings were
      not affected by this bug.

3 files changed, 10 insertions, 21 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index e8f87d63d22..63fc7eaab9a 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/10/23 22:32:20 rillig Exp $
+# $NetBSD: Makefile,v 1.47 2005/11/04 03:47:49 grant 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.87
+CLAMAV_VERSION=		0.87.1
 
 USE_LIBTOOL=		yes
 
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index 21e63cd03a7..56b430de6bc 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.31 2005/10/13 18:09:06 rillig Exp $
+$NetBSD: distinfo,v 1.32 2005/11/04 03:47:49 grant Exp $
 
-SHA1 (clamav-0.87.tar.gz) = 783d8bbd7dd956333a5c66c09cef7b2f410e229e
-RMD160 (clamav-0.87.tar.gz) = eced1d11a2747ff2ffda6060b959afe00ba21561
-Size (clamav-0.87.tar.gz) = 4273714 bytes
+SHA1 (clamav-0.87.1.tar.gz) = 995f0d70c71455056d5c399b6704e07c42742646
+RMD160 (clamav-0.87.1.tar.gz) = cc8c4436e2da70955d067b8bbe1610a7d20c4884
+Size (clamav-0.87.1.tar.gz) = 4468992 bytes
 SHA1 (patch-aa) = 17c713c3b5833f895b7caa470ae31f3d45d60643
 SHA1 (patch-ab) = afe9915e3fbed6c8dee93101149206a9b2f5c13c
 SHA1 (patch-ad) = 3723ad7212f15ba4e2690127515bfb1f37b97f71
 SHA1 (patch-af) = 605728b133ddb95827285d06bfeec9400222f874
-SHA1 (patch-ah) = 345d884a87e8675787b91925165663cffe47b2d4
+SHA1 (patch-ah) = 26e0d7db6a6ea8f491459f65197278de4b232f89
diff --git a/mail/clamav/patches/patch-ah b/mail/clamav/patches/patch-ah
index 25aa5e7bb5c..1a1a5286302 100644
--- a/mail/clamav/patches/patch-ah
+++ b/mail/clamav/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.5 2005/10/13 18:09:06 rillig Exp $
+$NetBSD: patch-ah,v 1.6 2005/11/04 03:47:49 grant Exp $
 
---- clamav-milter/clamav-milter.c.orig	Fri Sep 16 00:24:41 2005
-+++ clamav-milter/clamav-milter.c	Thu Oct 13 20:07:24 2005
+--- clamav-milter/clamav-milter.c.orig	2005-10-26 07:40:59.000000000 +1000
++++ clamav-milter/clamav-milter.c
 @@ -2973,7 +2973,7 @@ clamfi_eom(SMFICTX *ctx)
  						 * the postmaster, so include
  						 * some useful information
@@ -20,17 +20,6 @@ $NetBSD: patch-ah,v 1.5 2005/10/13 18:09:06 rillig Exp $
  							smfi_getsymval(ctx, "j"), privdata->from,
  							smfi_getsymval(ctx, "_"));
  						fputs(_("For your information, the original message headers were:\n\n"), sendmail);
-@@ -3439,9 +3439,9 @@ clamd_recv(int sock, char *buf, size_t l
- {
- 	fd_set rfds;
- 	struct timeval tv;
-+	int ret;
- 
- 	assert(sock >= 0);
--	int ret;
- 
- 	if(readTimeout == 0) {
- 		do
 @@ -4150,7 +4150,7 @@ qfile(struct privdata *privdata, const c
  
  	if(move(privdata->filename, newname) < 0) {