pullup ticket #2573 - requested by martti

clamav: update package for bug fixes

revisions pulled up:
pkgsrc/mail/clamav/Makefile		1.88
pkgsrc/mail/clamav/buildlink3.mk	1.17
pkgsrc/mail/clamav/distinfo		1.55
pkgsrc/mail/clamav/patches/patch-ad	1.16
pkgsrc/mail/clamav/patches/patch-af	1.7
pkgsrc/mail/clamav/patches/patch-ah	1.17

   Module Name:    pkgsrc
   Committed By:   martti
   Date:           Tue Nov  4 07:16:18 UTC 2008

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

   Log Message:
   Updated mail/clamav to 0.94.1

   * Bug fixes

6 files changed, 25 insertions, 25 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index 658c564b813..83ff0a12a55 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2008/09/04 06:44:06 martti Exp $
+# $NetBSD: Makefile,v 1.87.4.1 2008/11/04 12:06:15 rtr Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
@@ -13,7 +13,7 @@ COMMENT=	Anti-virus toolkit
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-CLAMAV_VERSION=		0.94
+CLAMAV_VERSION=		0.94.1
 
 USE_LIBTOOL=		yes
 
diff --git a/mail/clamav/buildlink3.mk b/mail/clamav/buildlink3.mk
index 15b87822706..eaf7483336d 100644
--- a/mail/clamav/buildlink3.mk
+++ b/mail/clamav/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2008/09/04 06:44:07 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.16.4.1 2008/11/04 12:06:15 rtr Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CLAMAV_BUILDLINK3_MK:=	${CLAMAV_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	clamav
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}clamav
 
 .if ${CLAMAV_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.clamav+=	clamav>=0.94
+BUILDLINK_API_DEPENDS.clamav+=	clamav>=0.94.1
 BUILDLINK_PKGSRCDIR.clamav?=	../../mail/clamav
 .endif	# CLAMAV_BUILDLINK3_MK
 
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index 75cb6c90879..03f0f7d83f5 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.54 2008/09/04 06:44:07 martti Exp $
+$NetBSD: distinfo,v 1.54.4.1 2008/11/04 12:06:15 rtr Exp $
 
-SHA1 (clamav-0.94.tar.gz) = d69a0c462ac3ef55329384f8e136d9b7bc1b8ec5
-RMD160 (clamav-0.94.tar.gz) = 598561b76b1e4ee14120388ba1bbdcac5ac7bfe5
-Size (clamav-0.94.tar.gz) = 20509228 bytes
-SHA1 (patch-ad) = f13bc822a3f405861fb1c2a219d238efcaddf64a
-SHA1 (patch-af) = 87ae131299a99df40252590f4400234e3de7c2b3
-SHA1 (patch-ah) = 5c5d06d305c9bdeb6c794ccbb0be33f0088026d8
+SHA1 (clamav-0.94.1.tar.gz) = 8eed11eb68dc6cb15d4bb12de034a4252dc09373
+RMD160 (clamav-0.94.1.tar.gz) = 268d3b4b00c208f8a9aa3bfaa430eb8d22a4bf33
+Size (clamav-0.94.1.tar.gz) = 21817818 bytes
+SHA1 (patch-ad) = 019b5c83b4b5ccf9f91a79af458ea27e599d5ec9
+SHA1 (patch-af) = 06b7a1fbcc7a086afe955f4f775d9b40742b7286
+SHA1 (patch-ah) = e160264f7125974a1afe3678fc081b4d21fab0ee
diff --git a/mail/clamav/patches/patch-ad b/mail/clamav/patches/patch-ad
index adffa9d3e4c..1d21c69ea47 100644
--- a/mail/clamav/patches/patch-ad
+++ b/mail/clamav/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.15 2008/09/04 06:44:07 martti Exp $
+$NetBSD: patch-ad,v 1.15.4.1 2008/11/04 12:06:15 rtr Exp $
 
 Optionally build clamav-milter.8
 
---- docs/Makefile.in.orig	2008-09-01 21:49:47.000000000 +0300
-+++ docs/Makefile.in	2008-09-04 08:26:43.000000000 +0300
-@@ -210,6 +210,8 @@
+--- docs/Makefile.in.orig	2008-10-30 18:13:31.000000000 +0200
++++ docs/Makefile.in	2008-11-04 08:19:02.000000000 +0200
+@@ -221,6 +221,8 @@
  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/clamconf.1
  all: all-am
  
diff --git a/mail/clamav/patches/patch-af b/mail/clamav/patches/patch-af
index 1b69890860a..b525bcccaab 100644
--- a/mail/clamav/patches/patch-af
+++ b/mail/clamav/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.6 2008/09/04 06:44:07 martti Exp $
+$NetBSD: patch-af,v 1.6.4.1 2008/11/04 12:06:16 rtr Exp $
 
 Installation fixes.
 
---- database/Makefile.in.orig	2008-09-01 21:49:47.000000000 +0300
-+++ database/Makefile.in	2008-09-04 08:28:24.000000000 +0300
-@@ -375,17 +375,6 @@
+--- database/Makefile.in.orig	2008-10-30 18:13:31.000000000 +0200
++++ database/Makefile.in	2008-11-04 08:19:27.000000000 +0200
+@@ -386,17 +386,6 @@
  	$(mkinstalldirs) $(DESTDIR)$(DBINST);\
  	test -f $(DESTDIR)$(DBINST)/main.cvd || test -f $(DESTDIR)$(DBINST)/main.cld || $(INSTALL_DATA) $(srcdir)/main.cvd $(DESTDIR)$(DBINST);\
  	test -f $(DESTDIR)$(DBINST)/daily.cvd || test -f $(DESTDIR)$(DBINST)/daily.cld || $(INSTALL_DATA) $(srcdir)/daily.cvd $(DESTDIR)$(DBINST);\
diff --git a/mail/clamav/patches/patch-ah b/mail/clamav/patches/patch-ah
index 597c9c5bcd7..bb2dee7aae4 100644
--- a/mail/clamav/patches/patch-ah
+++ b/mail/clamav/patches/patch-ah
@@ -1,10 +1,10 @@
-$NetBSD: patch-ah,v 1.16 2008/09/04 06:44:07 martti Exp $
+$NetBSD: patch-ah,v 1.16.4.1 2008/11/04 12:06:16 rtr Exp $
 
 Build fixes.
 
---- clamav-milter/clamav-milter.c.orig	2008-09-01 20:19:44.000000000 +0300
-+++ clamav-milter/clamav-milter.c	2008-09-04 08:28:44.000000000 +0300
-@@ -3926,7 +3926,7 @@
+--- clamav-milter/clamav-milter.c.orig	2008-10-16 11:29:55.000000000 +0300
++++ clamav-milter/clamav-milter.c	2008-11-04 08:19:49.000000000 +0200
+@@ -3944,7 +3944,7 @@
  						 * the postmaster, so include
  						 * some useful information
  						 */
@@ -13,7 +13,7 @@ Build fixes.
  							sendmailId, privdata->from);
  					else
  						fprintf(sendmail, _("A message sent from %s to\n"),
-@@ -3940,7 +3940,7 @@
+@@ -3958,7 +3958,7 @@
  						fprintf(sendmail, _("\nThe message in question has been quarantined as %s\n"), privdata->filename);
  
  					if(hflag) {
@@ -22,7 +22,7 @@ Build fixes.
  							smfi_getsymval(ctx, "j"), privdata->from,
  							smfi_getsymval(ctx, "_"));
  						fputs(_("For your information, the original message headers were:\n\n"), sendmail);
-@@ -5129,7 +5129,7 @@
+@@ -5147,7 +5147,7 @@
  	cli_dbgmsg("qfile move '%s' to '%s'\n", privdata->filename, newname);
  
  	if(move(privdata->filename, newname) < 0) {