ClamAV 0.99 contains major new features and changes. YARA rules,

Perl Compatible Regular Expressions, revamped on-access scanning
for Linux, and other new features join the many great features of ClamAV:

    - Processing of YARA rules(some limitations- see signatures.pdf).
    - Support in ClamAV logical signatures for many of the features
      added for YARA, such as Perl Compatible Regular Expressions,
      alternate strings, and YARA string attributes. See signatures.pdf
      for full details.
    - New and improved on-access scanning for Linux. See the recent blog
      post and clamdoc.pdf for details on the new on-access capabilities.
    - A new ClamAV API callback function that is invoked when a virus
      is found. This is intended primarily for applications running in
      all-match mode. Any applications using all-match mode must use
      the new callback function to record and report detected viruses.
    - Configurable default password list to attempt zip file decryption.
    - TIFF file support.
    - Upgrade Windows pthread library to 2.9.1.
    - A new signature target type for designating signatures to run
      against files with unknown file types.
    - Improved fidelity of the "data loss prevention" heuristic
      algorithm. Code supplied by Bill Parker.
    - Support for LZMA decompression within Adobe Flash files.
    - Support for MSO attachments within Microsoft Office 2003 XML files.
    - A new sigtool option(--ascii-normalize) allowing signature authors
      to more easily generate normalized versions of ascii files.
    - Windows installation directories changed from \Program Files\Sourcefire\
      ClamAV to \Program Files\ClamAV or \Program Files\ClamAV-x64.

8 files changed, 57 insertions, 36 deletions

diff --git a/security/clamav-doc/Makefile b/security/clamav-doc/Makefile
index a0a2a080aca..2cb10ddeefd 100644
--- a/security/clamav-doc/Makefile
+++ b/security/clamav-doc/Makefile
@@ -1,14 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/03/15 00:55:06 taca Exp $
+# $NetBSD: Makefile,v 1.2 2015/12/11 16:31:06 adam Exp $
 
-DISTNAME=	clamav-${CLAMAV_VERSION}
-PKGNAME=	clamav-doc-${CLAMAV_VERSION}
-CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clamav/}
+.include "../../security/clamav/Makefile.common"
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.clamav.net/
+PKGNAME=	${DISTNAME:S/clamav/clamav-doc/}
 COMMENT=	Anti-virus toolkit documents
-LICENSE=	gnu-gpl-v2
 
 NO_BUILD=	yes
 NO_CONFIGURE=	yes
@@ -27,5 +22,4 @@ do-install:
 	cd ${WRKSRC}/docs && ${FIND} html -type f -print | \
 		pax -rw ${DESTDIR}${DOCDIR}
 
-.include "../../security/clamav/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/clamav-doc/PLIST b/security/clamav-doc/PLIST
index 87f85c10122..1c918d6d4cf 100644
--- a/security/clamav-doc/PLIST
+++ b/security/clamav-doc/PLIST
@@ -1,17 +1,18 @@
-@comment $NetBSD: PLIST,v 1.2 2015/03/21 21:51:20 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/12/11 16:31:06 adam Exp $
 share/doc/clamav/clamdoc.pdf
 share/doc/clamav/html/WARNINGS
 share/doc/clamav/html/clam.png
 share/doc/clamav/html/clamdoc.css
 share/doc/clamav/html/clamdoc.html
 share/doc/clamav/html/contents.png
+share/doc/clamav/html/crossref.png
+share/doc/clamav/html/demon.png
 share/doc/clamav/html/footnode.html
 share/doc/clamav/html/img1.png
 share/doc/clamav/html/img2.png
 share/doc/clamav/html/img3.png
 share/doc/clamav/html/img4.png
 share/doc/clamav/html/img5.png
-share/doc/clamav/html/img6.png
 share/doc/clamav/html/index.html
 share/doc/clamav/html/next.png
 share/doc/clamav/html/next_g.png
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 1ba09931bee..53fa0cb0f6c 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -1,15 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2015/08/18 07:31:01 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2015/12/11 16:31:06 adam Exp $
 
-DISTNAME=	clamav-${CLAMAV_VERSION}
-#PKGREVISION=	2
-PKGREVISION=	2
-CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clamav/}
+.include "Makefile.common"
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.clamav.net/
 COMMENT=	Anti-virus toolkit
-LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
@@ -24,6 +17,7 @@ CONFIGURE_ARGS+=	--with-libcurl=${BUILDLINK_PREFIX.curl}
 CONFIGURE_ARGS+=	--with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
 CONFIGURE_ARGS+=	--with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ARGS+=	--with-pcre=${BUILDLINK_PREFIX.pcre}
 CONFIGURE_ARGS+=	--with-xml=${BUILDLINK_PREFIX.libxml2}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 # pkgsrc enforces a "secure" version of zlib, so don't let this check
@@ -81,10 +75,10 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/${i}.sample ${DESTDIR}${EGDIR}/${i}
 .endfor
 
-.include "Makefile.common"
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/security/clamav/Makefile.common b/security/clamav/Makefile.common
index 3d92ca05a6a..1f7d4612cd9 100644
--- a/security/clamav/Makefile.common
+++ b/security/clamav/Makefile.common
@@ -1,7 +1,14 @@
-# $NetBSD: Makefile.common,v 1.2 2015/05/20 21:15:26 bouyer Exp $
+# $NetBSD: Makefile.common,v 1.3 2015/12/11 16:31:06 adam Exp $
 #
 # used by clamav/Makefile
 # used by clamav-doc/Makefile
 
-CLAMAV_VERSION=	0.98.7
+DISTNAME=	clamav-0.99
+CATEGORIES=	security
+MASTER_SITES=	http://www.clamav.net/downloads/production/
+
+MAINTAINER?=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.clamav.net/
+LICENSE=	gnu-gpl-v2
+
 DISTINFO_FILE=	${.CURDIR}/../../security/clamav/distinfo
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index 3967d899aab..966855c2ce9 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.20 2015/11/04 01:17:42 agc Exp $
+$NetBSD: distinfo,v 1.21 2015/12/11 16:31:06 adam Exp $
 
-SHA1 (clamav-0.98.7.tar.gz) = c9793d67c041e2b944116d912f8681c8bd6e4432
-RMD160 (clamav-0.98.7.tar.gz) = 140561a2d1a0c013cb679f6af0ae48cc4cb92484
-SHA512 (clamav-0.98.7.tar.gz) = acf01961472c13ccb219420cc3fa3c3e6f8a733edef371dbc04ce5867900aa1535e956ec8ad50d31c8f872a0a1d79fcccac944cd86e29ecdfa4af18f7fd5afb9
-Size (clamav-0.98.7.tar.gz) = 15118851 bytes
-SHA1 (patch-Makefile.in) = 070fe734113de9fc6ce5f02de088b10281913b00
+SHA1 (clamav-0.99.tar.gz) = 7834baf3ce4898dd856e652c9d0301a8e14b4615
+RMD160 (clamav-0.99.tar.gz) = c1b8bca37e9707a743ea942e490549c2a462bcbc
+SHA512 (clamav-0.99.tar.gz) = 328e66fa412ba61f5e44c839b254c7a84d2ce7821fda6cf29e4ee9532c06e45bdec62f202ca561223e984fff170bfd8280e5cc8e306c09a3017b17e7db3bbf56
+Size (clamav-0.99.tar.gz) = 15968038 bytes
+SHA1 (patch-Makefile.in) = 757c930e9f72442943305cf889b24845b1608411
 SHA1 (patch-aa) = 8539a90ac5591c86f7e9f6b8c073f36523f221a5
 SHA1 (patch-ab) = fea995ea944c2ae0f51a41e1a1076badf65c6c8b
 SHA1 (patch-af) = d217633ed33c72b6d01a9aeef03f0f5dd33b4336
 SHA1 (patch-ag) = cf4a0040a53c81402e8d15478407bc854af6fb30
+SHA1 (patch-configure) = db46ba378803ddabac0cc9736ebadc33bbed4f46
 SHA1 (patch-etc_clamd.conf.sample) = 69bed1c88cf60f699e64fd361091621728b9f9d1
 SHA1 (patch-etc_freshclam.conf.sample) = 520ffbca5421ef2dc270e3c5a13cfb36a469e676
diff --git a/security/clamav/options.mk b/security/clamav/options.mk
index b75283e4c95..077d74eb100 100644
--- a/security/clamav/options.mk
+++ b/security/clamav/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2015/03/15 00:52:53 taca Exp $
+# $NetBSD: options.mk,v 1.4 2015/12/11 16:31:06 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.clamav
 PKG_SUPPORTED_OPTIONS=	milter clamav-experimental unit-test
@@ -25,12 +25,12 @@ CONFIGURE_ENV+=		ac_cv_header_libmilter_mfapi_h=no
 CONFIGURE_ARGS+=	--enable-experimental
 .endif
 
-# Enable unit test. 
+# Enable unit test
 .if !empty(PKG_OPTIONS:Munit-test)
 CONFIGURE_ARGS+=		--enable-check
 TEST_TARGET=			check
 # unit test's Makefile depends on gmake.
-USE_TOOLS=			gmake
+USE_TOOLS+=			gmake
 BUILDLINK_DEPMETHOD.check=	build
 .  include "../../devel/check/buildlink3.mk"
 .endif
diff --git a/security/clamav/patches/patch-Makefile.in b/security/clamav/patches/patch-Makefile.in
index 7be219f6ee2..24e0c1dfad7 100644
--- a/security/clamav/patches/patch-Makefile.in
+++ b/security/clamav/patches/patch-Makefile.in
@@ -1,15 +1,15 @@
-$NetBSD: patch-Makefile.in,v 1.2 2014/05/08 16:01:10 jperkin Exp $
+$NetBSD: patch-Makefile.in,v 1.3 2015/12/11 16:31:06 adam Exp $
 
 Install etc files manually.
 
---- Makefile.in.orig	2014-05-06 18:59:45.000000000 +0000
+--- Makefile.in.orig	2015-11-24 21:43:20.000000000 +0000
 +++ Makefile.in
-@@ -462,7 +462,7 @@ top_builddir = @top_builddir@
+@@ -459,7 +459,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  ACLOCAL_AMFLAGS = -I m4
  SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool \
 -	clamconf database docs etc clamav-milter test clamdtop clambc \
 +	clamconf database docs clamav-milter test clamdtop clambc \
  	unit_tests $(am__append_1)
- EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 platform.h.in clamdscan/clamdscan.map win32
+ EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.YARA COPYING.pcre platform.h.in clamdscan/clamdscan.map win32
  bin_SCRIPTS = clamav-config
diff --git a/security/clamav/patches/patch-configure b/security/clamav/patches/patch-configure
new file mode 100644
index 00000000000..a706d7cb340
--- /dev/null
+++ b/security/clamav/patches/patch-configure
@@ -0,0 +1,24 @@
+$NetBSD: patch-configure,v 1.3 2015/12/11 16:31:06 adam Exp $
+
+Portability fixes.
+
+--- configure.orig	2015-11-24 21:51:30.000000000 +0000
++++ configure
+@@ -16045,7 +16045,7 @@ $as_echo "yes" >&6; }
+ 	HAVE_LIBCHECK=yes
+ fi
+ 
+-if test "X$HAVE_LIBCHECK" == "Xyes"; then
++if test "X$HAVE_LIBCHECK" = "Xyes"; then
+     CHECK_CPPFLAGS=$CHECK_CFLAGS
+ else
+ 
+@@ -17559,7 +17559,7 @@ if test "x$PCRE_HOME" != "x"; then
+ $as_echo_n "checking pcre-config version... " >&6; }
+   PCRECONF_VERSION="`$PCRE_HOME/bin/pcre-config --version`"
+ 
+-  if test "x$PCRECONF_VERSION" == "x"; then
++  if test "x$PCRECONF_VERSION" = "x"; then
+     as_fn_error $? "pcre-config failed" "$LINENO" 5
+   fi
+