[pkgsrc/trunk]: pkgsrc/security/clamav security/clamav: update to 0.103.0

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d83bb053247a
branches:  trunk
changeset: 439393:d83bb053247a
user:      taca <taca%pkgsrc.org@localhost>
date:      Sat Sep 19 13:41:42 2020 +0000

description:
security/clamav: update to 0.103.0

Update clamav package to 0.103.0.


Quote from release announce:

ClamAV 0.103.0 highlights

With your feedback on the previous candidates, we've fixed these additional
issues:

* The freshclam PID file was not readable by other users in previous release
  candidates but is now readable by all.
* An issue with how freshclam was linked with the autotools build system
  caused SysLog settings to be ignored.
* The real-path checks introduced to clamscan and clamdscan in 0.102.4 broke
  scanning of some files with Unicode filenames and files on network shares
  for Windows users.

Thanks to the users for your help in fixing these bugs.

Major changes

* clamd can now reload the signature database without blocking
  scanning. This multi-threaded database reload improvement was made
  possible thanks to a community effort.

* Non-blocking database reloads are now the default behavior. Some systems
  that are more constrained on RAM may need to disable non-blocking reloads,
  as it will temporarily consume double the amount of memory. We added a new
  clamd config option ConcurrentDatabaseReload, which may be set to no.

Special thanks to those who made this feature a reality:

* Alberto Wu
* Alexander Sulfrian
* Arjen de Korte
* David Heidelberg
* Ged Haywood
* Julius Plenz
* Michael Orlitzky

Notable changes

* The DLP module has been enhanced with additional credit card ranges and a
  new engine option that allows ClamAV to alert only on credit cards (and
  not, for instance, gift cards) when scanning with the DLP module. John
  Schember developed this feature, with input from Alexander Sulfrian.
* We added support for Adobe Reader X PDF encryption and overhauled the
  PNG-scanning tool to detect PNG-specific exploits. We also made a major
  change to GIF parsing that now makes it more tolerant of problematic files
  and adds the ability to scan overlays, all thanks to work and patches
  submitted by Aldo Mazzeo.
* clamdtop.exe is now available for Windows users. The functionality is
  somewhat limited when compared to clamdtop on Linux. PDCurses is required
  to build clamdtop.exe for ClamAV on Windows.
* The phishing detection module will now print "Suspicious link found!"
  along with the "Real URL" and "Display URL" each time ClamAV detects
  phishing. In a future version, we would like to print out alert-related
  metadata like this at the end of a scan, but for now, this detail will
  help users understand why a given file is being flagged as phishing.
* Added new *experimental* CMake build tooling. CMake is not yet recommended
  for production builds. Our team would appreciate any assistance improving
  the CMake build tooling so we can one day deprecate autotools and remove
  the Visual Studio solutions.

        - Please see the new CMake installation instructions found in
          INSTALL.cmake.md for detailed instructions on how to build ClamAV
          with CMake.

* Added --ping and --wait options to the clamdscan and clamonacc client
  applications.

* The --ping (-p) command will attempt to ping clamd up to a specified
   maximum number of attempts at an optional interval. If the interval isn't
   specified, a default one-second interval is used. It will exit with
   status code `0` when it receives a PONG from clamd or status code `21` if
   the timeout expires before it receives a response.

diffstat:

 security/clamav/Makefile                                    |   3 +-
 security/clamav/Makefile.common                             |   4 +-
 security/clamav/buildlink3.mk                               |   4 +-
 security/clamav/distinfo                                    |  23 ++--
 security/clamav/patches/patch-Makefile.in                   |  16 +-
 security/clamav/patches/patch-aa                            |  12 +-
 security/clamav/patches/patch-configure                     |  57 -------------
 security/clamav/patches/patch-etc_clamav-milter.conf.sample |  15 ++-
 security/clamav/patches/patch-etc_clamd.conf.sample         |  12 +-
 security/clamav/patches/patch-etc_freshclam.conf.sample     |   6 +-
 security/clamav/patches/patch-libclamav_fmap.c              |  18 ++--
 11 files changed, 60 insertions(+), 110 deletions(-)

diffs (truncated from 309 to 300 lines):

diff -r 77afe5e1824c -r d83bb053247a security/clamav/Makefile
--- a/security/clamav/Makefile  Sat Sep 19 13:35:42 2020 +0000
+++ b/security/clamav/Makefile  Sat Sep 19 13:41:42 2020 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.71 2020/09/17 16:16:38 jperkin Exp $
+# $NetBSD: Makefile,v 1.72 2020/09/19 13:41:42 taca Exp $
 
 .include "Makefile.common"
-PKGREVISION= 1
 
 COMMENT=       Anti-virus toolkit
 
diff -r 77afe5e1824c -r d83bb053247a security/clamav/Makefile.common
--- a/security/clamav/Makefile.common   Sat Sep 19 13:35:42 2020 +0000
+++ b/security/clamav/Makefile.common   Sat Sep 19 13:41:42 2020 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.17 2020/07/17 04:48:32 taca Exp $
+# $NetBSD: Makefile.common,v 1.18 2020/09/19 13:41:42 taca Exp $
 #
 # used by security/clamav/Makefile
 # used by security/clamav-doc/Makefile
 
-DISTNAME=      clamav-0.102.4
+DISTNAME=      clamav-0.103.0
 CATEGORIES=    security
 MASTER_SITES=  http://www.clamav.net/downloads/production/
 
diff -r 77afe5e1824c -r d83bb053247a security/clamav/buildlink3.mk
--- a/security/clamav/buildlink3.mk     Sat Sep 19 13:35:42 2020 +0000
+++ b/security/clamav/buildlink3.mk     Sat Sep 19 13:41:42 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2020/06/02 08:22:54 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2020/09/19 13:41:42 taca Exp $
 
 BUILDLINK_TREE+=       clamav
 
@@ -6,7 +6,7 @@
 CLAMAV_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.clamav+= clamav>=0.95.3nb1
-BUILDLINK_ABI_DEPENDS.clamav+= clamav>=0.102.3nb3
+BUILDLINK_ABI_DEPENDS.clamav+= clamav>=0.103.0
 BUILDLINK_PKGSRCDIR.clamav?=   ../../security/clamav
 
 .include "../../archivers/bzip2/buildlink3.mk"
diff -r 77afe5e1824c -r d83bb053247a security/clamav/distinfo
--- a/security/clamav/distinfo  Sat Sep 19 13:35:42 2020 +0000
+++ b/security/clamav/distinfo  Sat Sep 19 13:41:42 2020 +0000
@@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.34 2020/07/17 04:48:32 taca Exp $
+$NetBSD: distinfo,v 1.35 2020/09/19 13:41:42 taca Exp $
 
-SHA1 (clamav-0.102.4.tar.gz) = ea0f6faeedb0248c684cceb87f7ff3a8bd4b610d
-RMD160 (clamav-0.102.4.tar.gz) = 1339babd0bbad4b00dab9e05cf94e27080417c63
-SHA512 (clamav-0.102.4.tar.gz) = 29893deb8d2d913dff72331875d3dc3a10356bfb254ddfe1c1933b3ea4f8b76c96a1b840f95e72be36cbc0e00b9ec35e395225ef264761f53e709bb1026a4f09
-Size (clamav-0.102.4.tar.gz) = 13234444 bytes
-SHA1 (patch-Makefile.in) = a11766ea353d81fb281a07c8120e8a1f5c8dc60f
-SHA1 (patch-aa) = 8539a90ac5591c86f7e9f6b8c073f36523f221a5
+SHA1 (clamav-0.103.0.tar.gz) = 259a726e7aaeebeed138578192a80e06f949638c
+RMD160 (clamav-0.103.0.tar.gz) = c44cf27d6974af14103328d81ba562c513d764b7
+SHA512 (clamav-0.103.0.tar.gz) = e0712ed3c068dc8dab1d31b7cbc19cd69c62875fdcf314abb28e6f42660daf162a3aae69e0a008919e7b809675b68d35f79d3cb98379442bcbc6f5c8ee4313bf
+Size (clamav-0.103.0.tar.gz) = 13357078 bytes
+SHA1 (patch-Makefile.in) = 51e0f42323f07b7ae0cb35a640469dce4e1a2041
+SHA1 (patch-aa) = c07a7b6e883f384ce278964645f0658c0d986ab5
 SHA1 (patch-ab) = 78793f0267ce8c820b51937186dc17dabb4a1ccf
 SHA1 (patch-af) = d217633ed33c72b6d01a9aeef03f0f5dd33b4336
-SHA1 (patch-configure) = fe4b44fe1720f8e0ee31fec794776ca132e347af
-SHA1 (patch-etc_clamav-milter.conf.sample) = 0cbf22bf380213c9e9f2b9baf15d7eba745afd46
-SHA1 (patch-etc_clamd.conf.sample) = 74c995c7df2d5b083bb4465d2ab4cb0cab8670b6
-SHA1 (patch-etc_freshclam.conf.sample) = 520ffbca5421ef2dc270e3c5a13cfb36a469e676
-SHA1 (patch-libclamav_fmap.c) = 9b37b4edf19b36557b8ea3666ff21854582ab2e1
+SHA1 (patch-etc_clamav-milter.conf.sample) = fa65d9b25cb51c62365b1d5a8b6dafe89d505057
+SHA1 (patch-etc_clamd.conf.sample) = e2c60b81675e73600409f76457fbc7cd8ec51a8f
+SHA1 (patch-etc_freshclam.conf.sample) = 804df5480560acb915f9fcb5f2097673c657ae34
+SHA1 (patch-libclamav_fmap.c) = cae93dc627bb8048867054126e4c96688ac9c2f0
 SHA1 (patch-libclamav_fmap.h) = b9d19b872bc7946da4a321d3d84b7e916f84d31c
diff -r 77afe5e1824c -r d83bb053247a security/clamav/patches/patch-Makefile.in
--- a/security/clamav/patches/patch-Makefile.in Sat Sep 19 13:35:42 2020 +0000
+++ b/security/clamav/patches/patch-Makefile.in Sat Sep 19 13:41:42 2020 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-Makefile.in,v 1.6 2019/10/10 15:41:30 prlw1 Exp $
+$NetBSD: patch-Makefile.in,v 1.7 2020/09/19 13:41:42 taca Exp $
 
 Install etc files manually.
 
---- Makefile.in.orig   2019-10-01 17:24:08.000000000 +0000
+--- Makefile.in.orig   2020-09-13 00:27:50.000000000 +0000
 +++ Makefile.in
-@@ -300,7 +300,7 @@ ETAGS = etags
+@@ -299,7 +299,7 @@ ETAGS = etags
  CTAGS = ctags
  CSCOPE = cscope
- DIST_SUBDIRS = libltdl libclamav libfreshclam clamscan clamd clamdscan \
--      freshclam sigtool clamconf database docs etc clamav-milter \
-+      freshclam sigtool clamconf database docs clamav-milter \
-       test clamdtop clambc unit_tests clamonacc clamsubmit fuzz
+ DIST_SUBDIRS = libltdl libclamav shared libfreshclam clamscan clamd \
+-      clamdscan freshclam sigtool clamconf database docs etc \
++      clamdscan freshclam sigtool clamconf database docs \
+       clamav-milter test clamdtop clambc unit_tests clamonacc \
+       clamsubmit fuzz
  am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/clamav-config.h.in \
-       $(srcdir)/clamav-config.in $(srcdir)/clamav-types.h.in \
diff -r 77afe5e1824c -r d83bb053247a security/clamav/patches/patch-aa
--- a/security/clamav/patches/patch-aa  Sat Sep 19 13:35:42 2020 +0000
+++ b/security/clamav/patches/patch-aa  Sat Sep 19 13:41:42 2020 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/12/24 07:11:05 kefren Exp $
+$NetBSD: patch-aa,v 1.2 2020/09/19 13:41:42 taca Exp $
 
 Fix compilation 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
-@@ -33,6 +33,7 @@
+--- clamdtop/clamdtop.c.orig   2020-09-13 00:27:09.000000000 +0000
++++ clamdtop/clamdtop.c
+@@ -36,6 +36,7 @@
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
  #endif
- 
- #include <unistd.h>
 +#include <stdarg.h>
  #include <stdio.h>
  #include <stdlib.h>
diff -r 77afe5e1824c -r d83bb053247a security/clamav/patches/patch-configure
--- a/security/clamav/patches/patch-configure   Sat Sep 19 13:35:42 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-$NetBSD: patch-configure,v 1.7 2019/12/03 12:55:16 taca Exp $
-
-Portability fixes.
-
---- configure.orig     2019-11-20 04:42:24.000000000 +0000
-+++ configure
-@@ -18272,7 +18272,7 @@ else
- fi
- 
- 
-- if test x$enable_libclamav_only == xyes; then
-+ if test x$enable_libclamav_only = xyes; then
-   BUILD_LIBCLAMAV_ONLY_TRUE=
-   BUILD_LIBCLAMAV_ONLY_FALSE='#'
- else
-@@ -18281,8 +18281,8 @@ else
- fi
- 
- 
--if test "$enable_libclamav_only" == "yes"; then
--         if test x$enable_libclamav_only == xno; then
-+if test "$enable_libclamav_only" = "yes"; then
-+         if test x$enable_libclamav_only = xno; then
-   BUILD_CLAMONACC_TRUE=
-   BUILD_CLAMONACC_FALSE='#'
- else
-@@ -21227,7 +21227,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
- 
-@@ -29918,10 +29918,10 @@ fi
- 
-                       ;;
-               *)
--                      if test "$enable_clamonacc" == "yes"; then
-+                      if test "$enable_clamonacc" = "yes"; then
-                               as_fn_error $? "Clamonacc was explicitly requested, but the platform ($host_os) you are trying to build on is not currently supported for this tool." "$LINENO" 5
-                       fi
--                       if test x$enable_clamonacc == xno; then
-+                       if test x$enable_clamonacc = xno; then
-   BUILD_CLAMONACC_TRUE=
-   BUILD_CLAMONACC_FALSE='#'
- else
-@@ -29932,7 +29932,7 @@ fi
-                         ;;
-       esac
- else
--       if test x$enable_clamonacc == xyes; then
-+       if test x$enable_clamonacc = xyes; then
-   BUILD_CLAMONACC_TRUE=
-   BUILD_CLAMONACC_FALSE='#'
- else
diff -r 77afe5e1824c -r d83bb053247a security/clamav/patches/patch-etc_clamav-milter.conf.sample
--- a/security/clamav/patches/patch-etc_clamav-milter.conf.sample       Sat Sep 19 13:35:42 2020 +0000
+++ b/security/clamav/patches/patch-etc_clamav-milter.conf.sample       Sat Sep 19 13:41:42 2020 +0000
@@ -1,11 +1,20 @@
-$NetBSD: patch-etc_clamav-milter.conf.sample,v 1.1 2016/06/12 16:06:01 taca Exp $
+$NetBSD: patch-etc_clamav-milter.conf.sample,v 1.2 2020/09/19 13:41:42 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.orig 2020-09-13 00:27:09.000000000 +0000
 +++ etc/clamav-milter.conf.sample
+@@ -3,7 +3,7 @@
+ ##
+ 
+ # Comment or remove the line below.
+-Example
++# Example
+ 
+ 
+ ##
 @@ -64,7 +64,7 @@ Example
- # daemon (main thread).
+ # also owned by root to keep other users from tampering with it.
  #
  # Default: disabled
 -#PidFile /var/run/clamav-milter.pid
diff -r 77afe5e1824c -r d83bb053247a security/clamav/patches/patch-etc_clamd.conf.sample
--- a/security/clamav/patches/patch-etc_clamd.conf.sample       Sat Sep 19 13:35:42 2020 +0000
+++ b/security/clamav/patches/patch-etc_clamd.conf.sample       Sat Sep 19 13:41:42 2020 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-etc_clamd.conf.sample,v 1.2 2016/06/12 16:06:01 taca Exp $
+$NetBSD: patch-etc_clamd.conf.sample,v 1.3 2020/09/19 13:41:42 taca Exp $
 
 Make this useable out of the box.
 
---- etc/clamd.conf.sample.orig 2016-04-22 15:02:19.000000000 +0000
+--- etc/clamd.conf.sample.orig 2020-09-13 00:27:09.000000000 +0000
 +++ etc/clamd.conf.sample
 @@ -5,7 +5,7 @@
  
@@ -13,16 +13,16 @@
  
  # Uncomment this option to enable logging.
  # LogFile must be writable for the user running daemon.
-@@ -63,7 +63,7 @@ Example
- # This option allows you to save a process identifier of the listening
- # daemon (main thread).
+@@ -74,7 +74,7 @@ Example
+ # It is recommended that the directory where this file is stored is
+ # also owned by root to keep other users from tampering with it.
  # Default: disabled
 -#PidFile /var/run/clamd.pid
 +PidFile @CLAMAV_DBDIR@/clamd.pid
  
  # Optional path to the global temporary directory.
  # Default: system specific (usually /tmp or /var/tmp).
-@@ -82,7 +82,7 @@ Example
+@@ -93,7 +93,7 @@ Example
  
  # Path to a local socket file the daemon will listen on.
  # Default: disabled (must be specified by a user)
diff -r 77afe5e1824c -r d83bb053247a security/clamav/patches/patch-etc_freshclam.conf.sample
--- a/security/clamav/patches/patch-etc_freshclam.conf.sample   Sat Sep 19 13:35:42 2020 +0000
+++ b/security/clamav/patches/patch-etc_freshclam.conf.sample   Sat Sep 19 13:41:42 2020 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-etc_freshclam.conf.sample,v 1.1 2014/03/11 14:34:40 jperkin Exp $
+$NetBSD: patch-etc_freshclam.conf.sample,v 1.2 2020/09/19 13:41:42 taca Exp $
 
 Make this useable out of the box.
 
---- etc/freshclam.conf.sample.orig     2013-04-17 15:25:09.000000000 +0000
+--- etc/freshclam.conf.sample.orig     2020-09-13 00:27:09.000000000 +0000
 +++ etc/freshclam.conf.sample
 @@ -5,7 +5,7 @@
  
  
  # Comment or remove the line below.
 -Example
-+#Example
++# Example
  
  # Path to the database directory.
  # WARNING: It must match clamd.conf's directive!
diff -r 77afe5e1824c -r d83bb053247a security/clamav/patches/patch-libclamav_fmap.c
--- a/security/clamav/patches/patch-libclamav_fmap.c    Sat Sep 19 13:35:42 2020 +0000
+++ b/security/clamav/patches/patch-libclamav_fmap.c    Sat Sep 19 13:41:42 2020 +0000
@@ -1,25 +1,25 @@
-$NetBSD: patch-libclamav_fmap.c,v 1.2 2019/10/10 15:41:30 prlw1 Exp $
+$NetBSD: patch-libclamav_fmap.c,v 1.3 2020/09/19 13:41:42 taca Exp $
 
 rename gets to my_gets to avoid conflict with fortify/ssp - they use
 macros to override libc functions
 
---- libclamav/fmap.c.orig      2019-10-01 17:24:09.000000000 +0000
+--- libclamav/fmap.c.orig      2020-09-13 00:27:10.000000000 +0000
 +++ libclamav/fmap.c
-@@ -278,7 +278,7 @@ extern cl_fmap_t *cl_fmap_open_handle(vo
-     m->unmap           = use_aging ? unmap_mmap : unmap_malloc;
+@@ -427,7 +427,7 @@ extern cl_fmap_t *cl_fmap_open_handle(vo
+     m->unmap           = unmap_handle;
      m->need            = handle_need;
      m->need_offstr     = handle_need_offstr;
 -    m->gets            = handle_gets;
 +    m->my_gets         = handle_gets;
      m->unneed_off      = handle_unneed_off;
-     return m;
- }
-@@ -674,7 +674,7 @@ extern cl_fmap_t *cl_fmap_open_memory(co
+ 
+     status = CL_SUCCESS;
+@@ -842,7 +842,7 @@ fmap_t *fmap_open_memory(const void *sta
      m->unmap       = unmap_malloc;