CVS commit: pkgsrc/security/clamav

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Jun 12 16:06:01 UTC 2016

Modified Files:
        pkgsrc/security/clamav: Makefile Makefile.common distinfo
        pkgsrc/security/clamav/patches: patch-Makefile.in patch-configure
            patch-etc_clamd.conf.sample
Added Files:
        pkgsrc/security/clamav/patches: patch-etc_clamav-milter.conf.sample

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/security/clamav/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/clamav/Makefile.common
cvs rdiff -u -r1.21 -r1.22 pkgsrc/security/clamav/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/clamav/patches/patch-Makefile.in \
    pkgsrc/security/clamav/patches/patch-configure
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/clamav/patches/patch-etc_clamav-milter.conf.sample
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/security/clamav/patches/patch-etc_clamd.conf.sample

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/clamav/Makefile
diff -u pkgsrc/security/clamav/Makefile:1.30 pkgsrc/security/clamav/Makefile:1.31
--- pkgsrc/security/clamav/Makefile:1.30        Mon Jun  6 22:49:36 2016
+++ pkgsrc/security/clamav/Makefile     Sun Jun 12 16:06:01 2016
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.30 2016/06/06 22:49:36 pgoyette Exp $
+# $NetBSD: Makefile,v 1.31 2016/06/12 16:06:01 taca Exp $
 
-PKGREVISION= 3
 .include "Makefile.common"
 
 COMMENT=       Anti-virus toolkit
@@ -48,7 +47,7 @@ MESSAGE_SUBST+=       CLAMAV_USER=${CLAMAV_USE
 
 SUBST_CLASSES+=                vars
 SUBST_STAGE.vars=      pre-configure
-SUBST_FILES.vars=      etc/clamd.conf.sample
+SUBST_FILES.vars=      etc/clamav-milter.conf.sample etc/clamd.conf.sample
 SUBST_VARS.vars=       CLAMAV_DBDIR
 
 RCD_SCRIPTS=   clamd freshclamd

Index: pkgsrc/security/clamav/Makefile.common
diff -u pkgsrc/security/clamav/Makefile.common:1.3 pkgsrc/security/clamav/Makefile.common:1.4
--- pkgsrc/security/clamav/Makefile.common:1.3  Fri Dec 11 16:31:06 2015
+++ pkgsrc/security/clamav/Makefile.common      Sun Jun 12 16:06:01 2016
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.3 2015/12/11 16:31:06 adam Exp $
+# $NetBSD: Makefile.common,v 1.4 2016/06/12 16:06:01 taca Exp $
 #
 # used by clamav/Makefile
 # used by clamav-doc/Makefile
 
-DISTNAME=      clamav-0.99
+DISTNAME=      clamav-0.99.2
 CATEGORIES=    security
 MASTER_SITES=  http://www.clamav.net/downloads/production/
 

Index: pkgsrc/security/clamav/distinfo
diff -u pkgsrc/security/clamav/distinfo:1.21 pkgsrc/security/clamav/distinfo:1.22
--- pkgsrc/security/clamav/distinfo:1.21        Fri Dec 11 16:31:06 2015
+++ pkgsrc/security/clamav/distinfo     Sun Jun 12 16:06:01 2016
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.21 2015/12/11 16:31:06 adam Exp $
+$NetBSD: distinfo,v 1.22 2016/06/12 16:06:01 taca Exp $
 
-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 (clamav-0.99.2.tar.gz) = c1a47411834d8527f7b40727aebee63f01d488af
+RMD160 (clamav-0.99.2.tar.gz) = 4ddb7c4ff32b1233a5210da54f162a154043c48e
+SHA512 (clamav-0.99.2.tar.gz) = 7744ba8a344b163cf98e9737cddfd25d2120b34ee9c4518380e028c9ec3cd50127b198b0dfa9fde30f5ce9aab0c0e6384712fbc11287e77d16ce052fd7b6ac44
+Size (clamav-0.99.2.tar.gz) = 16067497 bytes
+SHA1 (patch-Makefile.in) = c7f106f812952ef22f32aaa0354a15d501460c01
 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-configure) = d3a0a77c522b8abb4a5144e29aacc8b110f31c5a
+SHA1 (patch-etc_clamav-milter.conf.sample) = 0cbf22bf380213c9e9f2b9baf15d7eba745afd46
+SHA1 (patch-etc_clamd.conf.sample) = 74c995c7df2d5b083bb4465d2ab4cb0cab8670b6
 SHA1 (patch-etc_freshclam.conf.sample) = 520ffbca5421ef2dc270e3c5a13cfb36a469e676

Index: pkgsrc/security/clamav/patches/patch-Makefile.in
diff -u pkgsrc/security/clamav/patches/patch-Makefile.in:1.3 pkgsrc/security/clamav/patches/patch-Makefile.in:1.4
--- pkgsrc/security/clamav/patches/patch-Makefile.in:1.3        Fri Dec 11 16:31:06 2015
+++ pkgsrc/security/clamav/patches/patch-Makefile.in    Sun Jun 12 16:06:01 2016
@@ -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
Index: pkgsrc/security/clamav/patches/patch-configure
diff -u pkgsrc/security/clamav/patches/patch-configure:1.3 pkgsrc/security/clamav/patches/patch-configure:1.4
--- pkgsrc/security/clamav/patches/patch-configure:1.3  Fri Dec 11 16:31:06 2015
+++ pkgsrc/security/clamav/patches/patch-configure      Sun Jun 12 16:06:01 2016
@@ -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
- 

Index: pkgsrc/security/clamav/patches/patch-etc_clamd.conf.sample
diff -u pkgsrc/security/clamav/patches/patch-etc_clamd.conf.sample:1.1 pkgsrc/security/clamav/patches/patch-etc_clamd.conf.sample:1.2
--- pkgsrc/security/clamav/patches/patch-etc_clamd.conf.sample:1.1      Tue Mar 11 14:34:40 2014
+++ pkgsrc/security/clamav/patches/patch-etc_clamd.conf.sample  Sun Jun 12 16:06:01 2016
@@ -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)

Added files:

Index: pkgsrc/security/clamav/patches/patch-etc_clamav-milter.conf.sample
diff -u /dev/null pkgsrc/security/clamav/patches/patch-etc_clamav-milter.conf.sample:1.1
--- /dev/null   Sun Jun 12 16:06:01 2016
+++ pkgsrc/security/clamav/patches/patch-etc_clamav-milter.conf.sample  Sun Jun 12 16:06:01 2016
@@ -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).