>Number:         29139
>Category:       pkg
>Synopsis:       Update mail/clamav to 0.81
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Jan 27 17:53:00 +0000 2005
>Originator:     Eric Schnoebelen
>Release:        NetBSD: kernel 2.99.11, userland 2.0
>Organization:
Central Iowa (Model) Railroad
>Environment:
System: NetBSD egsner.cirr.com 2.99.11 NetBSD 2.99.11 (GENERIC.MPACPI) #3: Sat Jan 1 09:10:14 CST 2005 eric@egsner.cirr.com:/work/eric/NetBSD-current/obj/i386/sys/arch/i386/compile/GENERIC.MPACPI i386
Architecture: i386
Machine: i386
	See above
>Description:
	This  morning, libclamav started whining at me about the clamav
	engine being out of date.  In checking out the clamav web site,
	I learned that a new engine had been released.
>How-To-Repeat:
	# install mail/clamav
	/usr/pkg/etc/rc.d/clamav restart
	# note message about engine being out of date..
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/clamav/Makefile,v
retrieving revision 1.33
diff -b -u -w -r1.33 Makefile
--- Makefile	3 Jan 2005 15:59:12 -0000	1.33
+++ Makefile	27 Jan 2005 17:51:27 -0000
@@ -2,7 +2,7 @@
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
-PKGREVISION=	5
+# PKGREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clamav/}
 
@@ -12,7 +12,7 @@
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-CLAMAV_VERSION=		0.80
+CLAMAV_VERSION=		0.81
 
 USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/clamav/distinfo,v
retrieving revision 1.20
diff -b -u -w -r1.20 distinfo
--- distinfo	30 Oct 2004 12:34:51 -0000	1.20
+++ distinfo	27 Jan 2005 17:51:27 -0000
@@ -1,9 +1,8 @@
 $NetBSD: distinfo,v 1.20 2004/10/30 12:34:51 grant Exp $
 
-SHA1 (clamav-0.80.tar.gz) = 0f050a19c514d2bab6063c983f155fb891c7155f
-Size (clamav-0.80.tar.gz) = 2679434 bytes
+SHA1 (clamav-0.81.tar.gz) = 553f0b945a739590e4fdd1bf9c718fa7d376cb59
+Size (clamav-0.81.tar.gz) = 3347423 bytes
 SHA1 (patch-aa) = 17c713c3b5833f895b7caa470ae31f3d45d60643
-SHA1 (patch-ad) = 39ce91421e9baf128817830b34e196a5275e208e
+SHA1 (patch-ad) = e45864cc0b7f3533caf59d740a94e9349171deca
 SHA1 (patch-af) = 605728b133ddb95827285d06bfeec9400222f874
-SHA1 (patch-ag) = 3f3154077961527ad6afa9574091fb743f2c50ab
-SHA1 (patch-ah) = f033a0fc7ce1a81fc7983954397e942724f174cc
+SHA1 (patch-ah) = aeecf851768be2a67772ff0a2080bbb25f94f88b
Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/mail/clamav/patches/patch-ad,v
retrieving revision 1.7
diff -b -u -w -r1.7 patch-ad
--- patches/patch-ad	30 Oct 2004 09:50:33 -0000	1.7
+++ patches/patch-ad	27 Jan 2005 17:51:27 -0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-ad,v 1.7 2004/10/30 09:50:33 xtraeme Exp $
+$NetBSD$
 
---- 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 @@
+--- docs/Makefile.in.orig	2005-01-26 12:19:12.000000000 -0600
++++ docs/Makefile.in
+@@ -176,9 +176,11 @@ target_cpu = @target_cpu@
  target_os = @target_os@
  target_vendor = @target_vendor@
- EXTRA_DIST = clamdoc.pdf html man clamav-mirror-howto.pdf signatures.pdf MacOSX
+ EXTRA_DIST = clamdoc.pdf man clamav-mirror-howto.pdf signatures.pdf MacOSX clamdoc.tex clam.eps
 -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
cvs diff: cannot find patches/patch-ag
Index: patches/patch-ah
===================================================================
RCS file: /cvsroot/pkgsrc/mail/clamav/patches/patch-ah,v
retrieving revision 1.1
diff -b -u -w -r1.1 patch-ah
--- patches/patch-ah	30 Oct 2004 12:34:51 -0000	1.1
+++ patches/patch-ah	27 Jan 2005 17:51:27 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2004/10/30 12:34:51 grant Exp $
+$NetBSD$
 
---- clamav-milter/clamav-milter.c.orig	2004-10-11 10:59:12.000000000 +1000
+--- clamav-milter/clamav-milter.c.orig	2005-01-25 05:07:36.000000000 -0600
 +++ clamav-milter/clamav-milter.c
-@@ -2691,7 +2691,7 @@ clamfi_eom(SMFICTX *ctx)
+@@ -3217,7 +3217,7 @@ clamfi_eom(SMFICTX *ctx)
  						 * the postmaster, so include
  						 * some useful information
  						 */
@@ -11,7 +11,7 @@
  							sendmailId, sender);
  					else
  						fprintf(sendmail, _("A message sent from %s to\n"),
-@@ -2706,7 +2706,7 @@ clamfi_eom(SMFICTX *ctx)
+@@ -3231,7 +3231,7 @@ clamfi_eom(SMFICTX *ctx)
  							fprintf(sendmail, _("\nThe message in question has been quarantined as %s\n"), privdata->filename);
  
  					if(hflag) {
@@ -20,8 +20,8 @@
  							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) {
+@@ -4347,7 +4347,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"),