Pullup ticket 283 - requested by Grant Beattie

clamav update

Revisions pulled up:
- pkgsrc/mail/clamav/Makefile         1.32-1.34
- pkgsrc/mail/clamav/buildlink3.mk    1.4
- pkgsrc/mail/clamav/distinfo         1.21
- pkgsrc/mail/clamav/patches/patch-ad 1.8
- pkgsrc/mail/clamav/patches/patch-ag removed
- pkgsrc/mail/clamav/patches/patch-ah 1.2

   Module Name:	pkgsrc
   Committed By:	grant
   Date:		Sun Feb 13 07:24:22 UTC 2005

   Modified Files:
   	pkgsrc/mail/clamav: Makefile buildlink3.mk distinfo
   	pkgsrc/mail/clamav/patches: patch-ad patch-ah

   Log Message:
   update clamav to 0.82. closes PR pkg/29139, PR pkg/29319.

   [ skipped ridiculously long list of changes ]
---
   Module Name:	pkgsrc
   Committed By:	grant
   Date:		Sun Feb 13 13:08:50 UTC 2005

   Removed Files:
   	pkgsrc/mail/clamav/patches: patch-ag

   Log Message:
   remove unused patch.

6 files changed, 25 insertions, 40 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index 9450707a22b..f7c133c31bc 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2004/10/30 12:09:12 recht Exp $
+# $NetBSD: Makefile,v 1.31.2.1 2005/02/13 15:34:23 salo Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
-PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clamav/}
 
@@ -12,7 +11,7 @@ COMMENT=	Anti-virus toolkit
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-CLAMAV_VERSION=		0.80
+CLAMAV_VERSION=		0.82
 
 USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
@@ -85,6 +84,10 @@ BUILDLINK_DEPENDS.curl+=curl>=7.10.0
 CONFIGURE_ARGS+=	--without-libcurl
 .endif
 
+# pkgsrc enforces a "secure" version of zlib, so don't let this check
+# bomb the build.
+CONFIGURE_ARGS+=	--disable-zlib-vcheck
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
diff --git a/mail/clamav/buildlink3.mk b/mail/clamav/buildlink3.mk
index 2a792081161..f39a82e88f7 100644
--- a/mail/clamav/buildlink3.mk
+++ b/mail/clamav/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/20 06:30:24 grant Exp $
+# $NetBSD: buildlink3.mk,v 1.3.2.1 2005/02/13 15:34:23 salo Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CLAMAV_BUILDLINK3_MK:=	${CLAMAV_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	clamav
 
 .if !empty(CLAMAV_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.clamav+=	clamav>=0.60nb1
-BUILDLINK_RECOMMENDED.clamav+=	clamav>=0.80
+BUILDLINK_RECOMMENDED.clamav+=	clamav>=0.82
 BUILDLINK_PKGSRCDIR.clamav?=	../../mail/clamav
 .endif	# CLAMAV_BUILDLINK3_MK
 
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index 41aa2c430d9..ed98d255aa5 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.20 2004/10/30 12:34:51 grant Exp $
+$NetBSD: distinfo,v 1.20.2.1 2005/02/13 15:34:23 salo Exp $
 
-SHA1 (clamav-0.80.tar.gz) = 0f050a19c514d2bab6063c983f155fb891c7155f
-Size (clamav-0.80.tar.gz) = 2679434 bytes
+SHA1 (clamav-0.82.tar.gz) = 83dd3b5881efee5d682f746419e5654cfb35e0e6
+Size (clamav-0.82.tar.gz) = 3565864 bytes
 SHA1 (patch-aa) = 17c713c3b5833f895b7caa470ae31f3d45d60643
-SHA1 (patch-ad) = 39ce91421e9baf128817830b34e196a5275e208e
+SHA1 (patch-ad) = 6dffd1bbccf4effd0e073d366f1da35070521bd8
 SHA1 (patch-af) = 605728b133ddb95827285d06bfeec9400222f874
-SHA1 (patch-ag) = 3f3154077961527ad6afa9574091fb743f2c50ab
-SHA1 (patch-ah) = f033a0fc7ce1a81fc7983954397e942724f174cc
+SHA1 (patch-ah) = 9a62a7e5ad90f05df4972dfd3a129ce8848435e6
diff --git a/mail/clamav/patches/patch-ad b/mail/clamav/patches/patch-ad
index 42b7afd4e50..efadec47290 100644
--- a/mail/clamav/patches/patch-ad
+++ b/mail/clamav/patches/patch-ad
@@ -1,13 +1,9 @@
-$NetBSD: patch-ad,v 1.7 2004/10/30 09:50:33 xtraeme Exp $
+$NetBSD: patch-ad,v 1.7.2.1 2005/02/13 15:34:23 salo Exp $
 
---- 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 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
+--- docs/Makefile.in.orig	2005-02-07 08:28:08.000000000 +1100
++++ docs/Makefile.in
+@@ -179,6 +179,8 @@ EXTRA_DIST = clamdoc.pdf man clamav-mirr
+ 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
  all: all-am
  
 +@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@MILTER_MANS = man/clamav-milter.8
diff --git a/mail/clamav/patches/patch-ag b/mail/clamav/patches/patch-ag
deleted file mode 100644
index d7ef15d09f0..00000000000
--- a/mail/clamav/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/10/19 00:37:41 grant Exp $
-
---- libclamav/clamav.h.orig	2004-09-20 04:51:54.000000000 +1000
-+++ libclamav/clamav.h
-@@ -85,7 +85,7 @@ extern "C"
- #define CL_MAIL		CL_SCAN_MAIL
- #define CL_DISABLERAR	CL_SCAN_DISABLERAR
- #define CL_OLE2		CL_SCAN_OLE2
--#define CL_ENCRYPTED    CL_SCAN_ENCRYPTED
-+#define CL_ENCRYPTED    CL_SCAN_BLOCKENCRYPTED
- 
- 
- struct cli_bm_patt {
diff --git a/mail/clamav/patches/patch-ah b/mail/clamav/patches/patch-ah
index 0ed9e7670fc..50ce226b6a9 100644
--- a/mail/clamav/patches/patch-ah
+++ b/mail/clamav/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2004/10/30 12:34:51 grant Exp $
+$NetBSD: patch-ah,v 1.1.4.1 2005/02/13 15:34:23 salo Exp $
 
---- clamav-milter/clamav-milter.c.orig	2004-10-11 10:59:12.000000000 +1000
+--- clamav-milter/clamav-milter.c.orig	2005-02-07 07:35:29.000000000 +1100
 +++ clamav-milter/clamav-milter.c
-@@ -2691,7 +2691,7 @@ clamfi_eom(SMFICTX *ctx)
+@@ -3251,7 +3251,7 @@ clamfi_eom(SMFICTX *ctx)
  						 * the postmaster, so include
  						 * some useful information
  						 */
@@ -11,8 +11,8 @@ $NetBSD: patch-ah,v 1.1 2004/10/30 12:34:51 grant Exp $
  							sendmailId, sender);
  					else
  						fprintf(sendmail, _("A message sent from %s to\n"),
-@@ -2706,7 +2706,7 @@ clamfi_eom(SMFICTX *ctx)
- 							fprintf(sendmail, _("\nThe message in question has been quarantined as %s\n"), privdata->filename);
+@@ -3265,7 +3265,7 @@ clamfi_eom(SMFICTX *ctx)
+ 						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"),
@@ -20,8 +20,8 @@ $NetBSD: patch-ah,v 1.1 2004/10/30 12:34:51 grant Exp $
  							smfi_getsymval(ctx, "j"), sender,
  							smfi_getsymval(ctx, "_"));
  						fputs(_("For your information, the original message headers were:\n\n"), sendmail);
-@@ -3697,7 +3697,7 @@ qfile(struct privdata *privdata, const c
- 	if(link(privdata->filename, newname) < 0) {
+@@ -4381,7 +4381,7 @@ qfile(struct privdata *privdata, const c
+ 	if(move(privdata->filename, newname) < 0) {
  		perror(newname);
  		if(use_syslog)
 -			syslog(LOG_WARNING, _("Can't rename %1$s to %2$s"),