Updated mail/clamav to 0.96

This release of ClamAV introduces new malware detection mechanisms and other
significant improvements to the scan engine. The key features include:

    - The Bytecode Interpreter: the interpreter built into LibClamAV allows
      the signature writers to create and distribute very complex detection
      routines and remotely enhance the scanner's functionality

    - Heuristic improvements: improve the PE heuristics detection engine by
      adding support of bogus icons and fake PE header information. In a
      nutshell, ClamAV can now detect malware that tries to disguise itself
      as a harmless application by using the most common Windows program icons.

    - Signature Improvements: logical signature improvements to allow more
      detailed matching and referencing groups of signatures. Additionally,
      improvements to wildcard matching on word boundaries and newlines.

    - Support for new archives: 7zip, InstallShield and CPIO. LibClamAV
      can now transparently unpack and inspect their contents.

    - Support for new executable file formats: 64-bit ELF files and OS X
      Universal Binaries with Mach-O files. Additionally, the PE module
      can now decompress and inspect executables packed with UPX 3.0.

    - Support for DazukoFS in clamd

    - Performance improvements: overall performance improvements and memory
      optimizations for a better overall resource utilization experience.

    - Native Windows Support: ClamAV will now build natively under Visual
      Studio. This will allow 3rd Party application developers on Windows
      to easily integrate LibClamAV into their applications.

The complete list of changes is available in the ChangeLog file. For upgrade
notes and tips please see: https://wiki.clamav.net/Main/UpgradeNotes096

9 files changed, 67 insertions, 24 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index 910eb8005bd..a789e8634ba 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.100 2010/03/24 19:43:26 asau Exp $
+# $NetBSD: Makefile,v 1.101 2010/04/01 12:02:22 martti Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
-PKGREVISION=	2
+#PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clamav/}
 
@@ -15,7 +15,7 @@ LICENSE=	gnu-gpl-v2
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-CLAMAV_VERSION=		0.95.3
+CLAMAV_VERSION=		0.96
 
 USE_LIBTOOL=		yes
 
diff --git a/mail/clamav/PLIST b/mail/clamav/PLIST
index 86c907d6ce4..98e4b80e9c3 100644
--- a/mail/clamav/PLIST
+++ b/mail/clamav/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.22 2009/06/14 18:04:27 joerg Exp $
+@comment $NetBSD: PLIST,v 1.23 2010/04/01 12:02:22 martti Exp $
 bin/clamav-config
+bin/clambc
 bin/clamconf
 bin/clamdscan
 bin/clamdtop
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index ab6de181ea5..08afa91711a 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.62 2010/01/07 15:00:35 joerg Exp $
+$NetBSD: distinfo,v 1.63 2010/04/01 12:02:22 martti Exp $
 
-SHA1 (clamav-0.95.3.tar.gz) = ab4b1f49d0f24154767d303d6a27b74acf6f4b59
-RMD160 (clamav-0.95.3.tar.gz) = c68a2948aa9ab7a3b5f8e9744322d3606ae6df71
-Size (clamav-0.95.3.tar.gz) = 26919541 bytes
-SHA1 (patch-aa) = 26115741ed1a73a26252b596ab0a92dc8cd70fda
-SHA1 (patch-ad) = 70706e96ddaaa9cb4756c91474f95705edeed199
-SHA1 (patch-af) = 3c5b8cdab88d2d990ff989c43541f360c2d4e4c5
-SHA1 (patch-ag) = e9c2f308b9418631ac5c428126336937c4e30401
+SHA1 (clamav-0.96.tar.gz) = be7cb37f2a6121cacc3cd3969eee212b96ef6b57
+RMD160 (clamav-0.96.tar.gz) = d9147d1da4fc7fa3e8d42b25c58a93f6bbaa588b
+Size (clamav-0.96.tar.gz) = 39792593 bytes
+SHA1 (patch-aa) = cf09def5ff3de0a551bb5cf8ec232cf7f7e0b54e
+SHA1 (patch-ab) = a4d097b785f870cd6213811f504a553e6b87e229
+SHA1 (patch-ac) = d14cd2c0646c4d390f10b6b642e95b2638fa194b
+SHA1 (patch-ad) = a6ea0f1e439feef3b6b9148dcea37c9b58b9d773
+SHA1 (patch-af) = ebd5b67c07fe58df8b303a34d1e64a772f6983d6
+SHA1 (patch-ag) = 64585150298220cff2257fd8b98a34f6c277d33d
diff --git a/mail/clamav/patches/patch-aa b/mail/clamav/patches/patch-aa
index 5ad104dbefe..9ba542ba5db 100644
--- a/mail/clamav/patches/patch-aa
+++ b/mail/clamav/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.19 2009/06/11 04:38:18 martti Exp $
+$NetBSD: patch-aa,v 1.20 2010/04/01 12:02:22 martti Exp $
+
+Fix compileation error DragonFly.
 
 --- clamdtop/clamdtop.c.orig	2009-06-01 19:20:12.000000000 +0300
 +++ clamdtop/clamdtop.c	2009-06-11 07:31:58.000000000 +0300
diff --git a/mail/clamav/patches/patch-ab b/mail/clamav/patches/patch-ab
new file mode 100644
index 00000000000..e250e513c12
--- /dev/null
+++ b/mail/clamav/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.13 2010/04/01 12:02:22 martti Exp $
+
+Make this pkgsrc friedly.
+
+--- libclamav/c++/llvm/utils/buildit/build_llvm.orig	2010-04-01 12:29:52.000000000 +0300
++++ libclamav/c++/llvm/utils/buildit/build_llvm	2010-04-01 12:30:04.000000000 +0300
+@@ -232,7 +232,7 @@
+     LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \
+     OPTIMIZE_OPTION='-O3' VERBOSE=1 install
+ 
+-if ! test $? == 0 ; then
++if ! test $? = 0 ; then
+     echo "error: LLVM 'make install' failed!"
+     exit 1
+ fi 
diff --git a/mail/clamav/patches/patch-ac b/mail/clamav/patches/patch-ac
new file mode 100644
index 00000000000..a613e709f7b
--- /dev/null
+++ b/mail/clamav/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.7 2010/04/01 12:02:22 martti Exp $
+
+Make this pkgsrc friedly.
+
+--- libclamav/c++/configure.orig	2010-04-01 12:30:33.000000000 +0300
++++ libclamav/c++/configure	2010-04-01 12:31:05.000000000 +0300
+@@ -14460,7 +14460,7 @@
+   enable_optimized=default
+ fi
+ 
+- if test "x$enable_optimized" == "xno"; then
++ if test "x$enable_optimized" = "xno"; then
+   DEBUG_BUILD_TRUE=
+   DEBUG_BUILD_FALSE='#'
+ else
diff --git a/mail/clamav/patches/patch-ad b/mail/clamav/patches/patch-ad
index d4ecba16ec8..245a4c8c90c 100644
--- a/mail/clamav/patches/patch-ad
+++ b/mail/clamav/patches/patch-ad
@@ -1,8 +1,10 @@
-$NetBSD: patch-ad,v 1.19 2009/10/29 07:06:09 martti Exp $
+$NetBSD: patch-ad,v 1.20 2010/04/01 12:02:22 martti Exp $
 
---- docs/Makefile.in.orig	2009-10-28 17:54:51.000000000 +0200
-+++ docs/Makefile.in	2009-10-29 08:42:26.000000000 +0200
-@@ -261,6 +261,8 @@
+Fix compileation error DragonFly.
+
+--- docs/Makefile.in.orig	2010-03-24 19:01:19.000000000 +0200
++++ docs/Makefile.in	2010-04-01 12:23:43.000000000 +0300
+@@ -270,6 +270,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 90662dbfb90..c9c792a77a2 100644
--- a/mail/clamav/patches/patch-af
+++ b/mail/clamav/patches/patch-af
@@ -1,8 +1,10 @@
-$NetBSD: patch-af,v 1.10 2009/10/29 07:06:09 martti Exp $
+$NetBSD: patch-af,v 1.11 2010/04/01 12:02:23 martti Exp $
 
---- database/Makefile.in.orig	2009-10-28 17:54:51.000000000 +0200
-+++ database/Makefile.in	2009-10-29 08:47:19.000000000 +0200
-@@ -423,17 +423,6 @@
+Fix compileation error DragonFly.
+
+--- database/Makefile.in.orig	2010-03-24 19:01:19.000000000 +0200
++++ database/Makefile.in	2010-04-01 12:24:10.000000000 +0300
+@@ -432,17 +432,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-ag b/mail/clamav/patches/patch-ag
index 2fd84618747..8b19cf92462 100644
--- a/mail/clamav/patches/patch-ag
+++ b/mail/clamav/patches/patch-ag
@@ -1,6 +1,10 @@
---- libclamav/others.h.orig	2010-01-06 19:05:29 -1000
-+++ libclamav/others.h	2010-01-06 19:05:39 -1000
-@@ -29,6 +29,7 @@
+$NetBSD: patch-ag,v 1.4 2010/04/01 12:02:23 martti Exp $
+
+Fix compileation error DragonFly.
+
+--- libclamav/others.h.orig	2010-03-31 19:39:38.000000000 +0300
++++ libclamav/others.h	2010-04-01 12:24:33.000000000 +0300
+@@ -33,6 +33,7 @@
  
  #include <stdio.h>
  #include <stdlib.h>