Update clamav to 0.99.2, based on patch vy Matthias Ferdinand

on pkgsrc-users.


Changes from 0.99.1 to 0.99.2 are available only with ChangeLog and it
is too many to write here.  Please refer ChangeLog file.

0.99.1
------

ClamAV 0.99.1 contains a new feature for parsing Hancom Office files
including extracting and scanning embedded objects. ClamAV 0.99.1
also contains important bug fixes. Please see ChangeLog for details.

4 files changed, 27 insertions, 21 deletions

diff --git a/security/clamav/patches/patch-Makefile.in b/security/clamav/patches/patch-Makefile.in
index 24e0c1dfad7..5789e4f582c 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.3 2015/12/11 16:31:06 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.4 2016/06/12 16:06:01 taca Exp $
 
 Install etc files manually.
 
---- Makefile.in.orig	2015-11-24 21:43:20.000000000 +0000
+--- Makefile.in.orig	2016-04-22 16:19:51.000000000 +0000
 +++ Makefile.in
-@@ -459,7 +459,7 @@ top_builddir = @top_builddir@
+@@ -551,7 +551,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)
+ 	unit_tests $(am__append_1) $(am__append_2)
  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
index a706d7cb340..2ddad0716b7 100644
--- a/security/clamav/patches/patch-configure
+++ b/security/clamav/patches/patch-configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.3 2015/12/11 16:31:06 adam Exp $
+$NetBSD: patch-configure,v 1.4 2016/06/12 16:06:01 taca Exp $
 
 Portability fixes.
 
---- configure.orig	2015-11-24 21:51:30.000000000 +0000
+--- configure.orig	2016-04-22 16:19:50.000000000 +0000
 +++ configure
-@@ -16045,7 +16045,7 @@ $as_echo "yes" >&6; }
+@@ -16835,7 +16835,7 @@ $as_echo "yes" >&6; }
  	HAVE_LIBCHECK=yes
  fi
  
@@ -13,12 +13,3 @@ Portability fixes.
      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
- 
diff --git a/security/clamav/patches/patch-etc_clamav-milter.conf.sample b/security/clamav/patches/patch-etc_clamav-milter.conf.sample
new file mode 100644
index 00000000000..31759a66bde
--- /dev/null
+++ b/security/clamav/patches/patch-etc_clamav-milter.conf.sample
@@ -0,0 +1,15 @@
+$NetBSD: patch-etc_clamav-milter.conf.sample,v 1.1 2016/06/12 16:06:01 taca Exp $
+
+Make this useable out of the box.
+
+--- etc/clamav-milter.conf.sample.orig	2016-04-22 15:02:19.000000000 +0000
++++ etc/clamav-milter.conf.sample
+@@ -64,7 +64,7 @@ Example
+ # daemon (main thread).
+ #
+ # Default: disabled
+-#PidFile /var/run/clamav-milter.pid
++PidFile @CLAMAV_DBDIR@/clamd.pid
+ 
+ # Optional path to the global temporary directory.
+ # Default: system specific (usually /tmp or /var/tmp).
diff --git a/security/clamav/patches/patch-etc_clamd.conf.sample b/security/clamav/patches/patch-etc_clamd.conf.sample
index 58fce424ce3..1fbd1ccbe48 100644
--- a/security/clamav/patches/patch-etc_clamd.conf.sample
+++ b/security/clamav/patches/patch-etc_clamd.conf.sample
@@ -1,19 +1,19 @@
-$NetBSD: patch-etc_clamd.conf.sample,v 1.1 2014/03/11 14:34:40 jperkin Exp $
+$NetBSD: patch-etc_clamd.conf.sample,v 1.2 2016/06/12 16:06:01 taca Exp $
 
 Make this useable out of the box.
 
---- etc/clamd.conf.sample.orig	2013-04-17 15:25:09.000000000 +0000
+--- etc/clamd.conf.sample.orig	2016-04-22 15:02:19.000000000 +0000
 +++ etc/clamd.conf.sample
 @@ -5,7 +5,7 @@
  
  
  # Comment or remove the line below.
 -Example
-+#Example
++# Example
  
  # Uncomment this option to enable logging.
  # LogFile must be writable for the user running daemon.
-@@ -58,7 +58,7 @@ Example
+@@ -63,7 +63,7 @@ Example
  # This option allows you to save a process identifier of the listening
  # daemon (main thread).
  # Default: disabled
@@ -22,7 +22,7 @@ Make this useable out of the box.
  
  # Optional path to the global temporary directory.
  # Default: system specific (usually /tmp or /var/tmp).
-@@ -77,7 +77,7 @@ Example
+@@ -82,7 +82,7 @@ Example
  
  # Path to a local socket file the daemon will listen on.
  # Default: disabled (must be specified by a user)