Updated mail/clamav to 0.95.1

Lots of bug fixes, see http://svn.clamav.net/svn/clamav-devel/trunk/ChangeLog
for details.

4 files changed, 18 insertions, 16 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index e2bad81fe58..04ccf416e46 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2009/03/25 09:21:19 adam Exp $
+# $NetBSD: Makefile,v 1.91 2009/04/09 08:00:10 martti Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
@@ -9,10 +9,12 @@ MAINTAINER=	grant@NetBSD.org
 HOMEPAGE=	http://www.clamav.net/
 COMMENT=	Anti-virus toolkit
 
+#LICENSE=	gnu-gpl-v2
+
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-CLAMAV_VERSION=		0.95
+CLAMAV_VERSION=		0.95.1
 
 USE_LIBTOOL=		yes
 
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index 3c6aea07995..bf9db7db9d4 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.57 2009/03/25 09:21:20 adam Exp $
+$NetBSD: distinfo,v 1.58 2009/04/09 08:00:10 martti Exp $
 
-SHA1 (clamav-0.95.tar.gz) = 8550b79dc6a6e9a0782ee5bd029bbd107f9e085a
-RMD160 (clamav-0.95.tar.gz) = bd2431d12f3bb740a2cf535da4be512aa9ba2c14
-Size (clamav-0.95.tar.gz) = 24104169 bytes
+SHA1 (clamav-0.95.1.tar.gz) = a469b0128cf5e9d18392a0385417fc5e4575bfc7
+RMD160 (clamav-0.95.1.tar.gz) = 80769c09ca15c864a578206feabe9cc4a3d985b4
+Size (clamav-0.95.1.tar.gz) = 24260964 bytes
 SHA1 (patch-aa) = 6b17ddb27affcd7d710adc919ee230ed19bd930c
 SHA1 (patch-ab) = b5233d23b5c1317cf8109d433ac1926361b7cdf7
 SHA1 (patch-ac) = e48939f2d2734d399dfaefb3ce031bbdb87fadf2
-SHA1 (patch-ad) = 1419f5b92b5e80bbc3b8a60678c0ee9829b5c557
-SHA1 (patch-af) = 6daee923421366d092c9592e8c29e55dbfaa1494
+SHA1 (patch-ad) = 9e120e5dda99055356e8820d5e5cc89b156dd867
+SHA1 (patch-af) = 2965773b94753ae36fe958dd7d06697685ffb821
diff --git a/mail/clamav/patches/patch-ad b/mail/clamav/patches/patch-ad
index eabe9ea3242..4a1f0cf7df6 100644
--- a/mail/clamav/patches/patch-ad
+++ b/mail/clamav/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.17 2009/03/25 09:21:20 adam Exp $
+$NetBSD: patch-ad,v 1.18 2009/04/09 08:00:10 martti Exp $
 
---- docs/Makefile.in.orig	2009-03-23 18:09:28.000000000 +0100
-+++ docs/Makefile.in
-@@ -235,6 +235,8 @@ EXTRA_DIST = html $(top_srcdir)/docs/man
+--- docs/Makefile.in.orig	2009-04-07 20:56:26.000000000 +0300
++++ docs/Makefile.in	2009-04-09 09:06:09.000000000 +0300
+@@ -236,6 +236,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 man/clamdtop.1
  all: all-am
  
diff --git a/mail/clamav/patches/patch-af b/mail/clamav/patches/patch-af
index e3b69e4543d..8440f05647d 100644
--- a/mail/clamav/patches/patch-af
+++ b/mail/clamav/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.8 2009/03/25 09:21:20 adam Exp $
+$NetBSD: patch-af,v 1.9 2009/04/09 08:00:10 martti Exp $
 
---- database/Makefile.in.orig	2009-03-23 18:09:28.000000000 +0100
-+++ database/Makefile.in
-@@ -400,17 +400,6 @@ install-data-local:
+--- database/Makefile.in.orig	2009-04-07 20:56:26.000000000 +0300
++++ database/Makefile.in	2009-04-09 09:06:36.000000000 +0300
+@@ -401,17 +401,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);\