Sat Sep 19 13:41:42 2020 UTC ()
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.


(taca)
diff -r1.71 -r1.72 pkgsrc/security/clamav/Makefile
diff -r1.17 -r1.18 pkgsrc/security/clamav/Makefile.common
diff -r1.10 -r1.11 pkgsrc/security/clamav/buildlink3.mk
diff -r1.34 -r1.35 pkgsrc/security/clamav/distinfo
diff -r1.6 -r1.7 pkgsrc/security/clamav/patches/patch-Makefile.in
diff -r1.1.1.1 -r1.2 pkgsrc/security/clamav/patches/patch-aa
diff -r1.7 -r0 pkgsrc/security/clamav/patches/patch-configure
diff -r1.1 -r1.2 pkgsrc/security/clamav/patches/patch-etc_clamav-milter.conf.sample
diff -r1.1 -r1.2 pkgsrc/security/clamav/patches/patch-etc_freshclam.conf.sample
diff -r1.2 -r1.3 pkgsrc/security/clamav/patches/patch-etc_clamd.conf.sample
diff -r1.2 -r1.3 pkgsrc/security/clamav/patches/patch-libclamav_fmap.c

cvs diff -r1.71 -r1.72 pkgsrc/security/clamav/Makefile (expand / switch to unified diff)

--- pkgsrc/security/clamav/Makefile 2020/09/17 16:16:38 1.71
+++ pkgsrc/security/clamav/Makefile 2020/09/19 13:41:42 1.72
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.71 2020/09/17 16:16:38 jperkin Exp $ 1# $NetBSD: Makefile,v 1.72 2020/09/19 13:41:42 taca Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4PKGREVISION= 1 
5 4
6COMMENT= Anti-virus toolkit 5COMMENT= Anti-virus toolkit
7 6
8USE_LANGUAGES= c c++ 7USE_LANGUAGES= c c++
9USE_LIBTOOL= yes 8USE_LIBTOOL= yes
10USE_TOOLS+= gsed 9USE_TOOLS+= gsed
11GNU_CONFIGURE= yes 10GNU_CONFIGURE= yes
12SET_LIBDIR= yes 11SET_LIBDIR= yes
13FAKE_NCURSES= yes 12FAKE_NCURSES= yes
14CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 13CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
15CONFIGURE_ARGS+= --with-dbdir=${CLAMAV_DBDIR} 14CONFIGURE_ARGS+= --with-dbdir=${CLAMAV_DBDIR}
16CONFIGURE_ARGS+= --with-group=${CLAMAV_GROUP} 15CONFIGURE_ARGS+= --with-group=${CLAMAV_GROUP}
17CONFIGURE_ARGS+= --with-user=${CLAMAV_USER} 16CONFIGURE_ARGS+= --with-user=${CLAMAV_USER}

cvs diff -r1.17 -r1.18 pkgsrc/security/clamav/Makefile.common (expand / switch to unified diff)

--- pkgsrc/security/clamav/Makefile.common 2020/07/17 04:48:32 1.17
+++ pkgsrc/security/clamav/Makefile.common 2020/09/19 13:41:42 1.18
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: Makefile.common,v 1.17 2020/07/17 04:48:32 taca Exp $ 1# $NetBSD: Makefile.common,v 1.18 2020/09/19 13:41:42 taca Exp $
2# 2#
3# used by security/clamav/Makefile 3# used by security/clamav/Makefile
4# used by security/clamav-doc/Makefile 4# used by security/clamav-doc/Makefile
5 5
6DISTNAME= clamav-0.102.4 6DISTNAME= clamav-0.103.0
7CATEGORIES= security 7CATEGORIES= security
8MASTER_SITES= http://www.clamav.net/downloads/production/ 8MASTER_SITES= http://www.clamav.net/downloads/production/
9 9
10MAINTAINER?= pkgsrc-users@NetBSD.org 10MAINTAINER?= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.clamav.net/ 11HOMEPAGE= https://www.clamav.net/
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DISTINFO_FILE= ${.CURDIR}/../../security/clamav/distinfo 14DISTINFO_FILE= ${.CURDIR}/../../security/clamav/distinfo
15PATCHDIR= ${.CURDIR}/../../security/clamav/patches 15PATCHDIR= ${.CURDIR}/../../security/clamav/patches

cvs diff -r1.10 -r1.11 pkgsrc/security/clamav/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/security/clamav/buildlink3.mk 2020/06/02 08:22:54 1.10
+++ pkgsrc/security/clamav/buildlink3.mk 2020/09/19 13:41:42 1.11
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: buildlink3.mk,v 1.10 2020/06/02 08:22:54 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.11 2020/09/19 13:41:42 taca Exp $
2 2
3BUILDLINK_TREE+= clamav 3BUILDLINK_TREE+= clamav
4 4
5.if !defined(CLAMAV_BUILDLINK3_MK) 5.if !defined(CLAMAV_BUILDLINK3_MK)
6CLAMAV_BUILDLINK3_MK:= 6CLAMAV_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.clamav+= clamav>=0.95.3nb1 8BUILDLINK_API_DEPENDS.clamav+= clamav>=0.95.3nb1
9BUILDLINK_ABI_DEPENDS.clamav+= clamav>=0.102.3nb3 9BUILDLINK_ABI_DEPENDS.clamav+= clamav>=0.103.0
10BUILDLINK_PKGSRCDIR.clamav?= ../../security/clamav 10BUILDLINK_PKGSRCDIR.clamav?= ../../security/clamav
11 11
12.include "../../archivers/bzip2/buildlink3.mk" 12.include "../../archivers/bzip2/buildlink3.mk"
13.include "../../devel/pcre2/buildlink3.mk" 13.include "../../devel/pcre2/buildlink3.mk"
14.include "../../textproc/json-c/buildlink3.mk" 14.include "../../textproc/json-c/buildlink3.mk"
15.include "../../textproc/libxml2/buildlink3.mk" 15.include "../../textproc/libxml2/buildlink3.mk"
16.endif # CLAMAV_BUILDLINK3_MK 16.endif # CLAMAV_BUILDLINK3_MK
17 17
18BUILDLINK_TREE+= -clamav 18BUILDLINK_TREE+= -clamav

cvs diff -r1.34 -r1.35 pkgsrc/security/clamav/distinfo (expand / switch to unified diff)

--- pkgsrc/security/clamav/distinfo 2020/07/17 04:48:32 1.34
+++ pkgsrc/security/clamav/distinfo 2020/09/19 13:41:42 1.35
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1$NetBSD: distinfo,v 1.34 2020/07/17 04:48:32 taca Exp $ 1$NetBSD: distinfo,v 1.35 2020/09/19 13:41:42 taca Exp $
2 2
3SHA1 (clamav-0.102.4.tar.gz) = ea0f6faeedb0248c684cceb87f7ff3a8bd4b610d 3SHA1 (clamav-0.103.0.tar.gz) = 259a726e7aaeebeed138578192a80e06f949638c
4RMD160 (clamav-0.102.4.tar.gz) = 1339babd0bbad4b00dab9e05cf94e27080417c63 4RMD160 (clamav-0.103.0.tar.gz) = c44cf27d6974af14103328d81ba562c513d764b7
5SHA512 (clamav-0.102.4.tar.gz) = 29893deb8d2d913dff72331875d3dc3a10356bfb254ddfe1c1933b3ea4f8b76c96a1b840f95e72be36cbc0e00b9ec35e395225ef264761f53e709bb1026a4f09 5SHA512 (clamav-0.103.0.tar.gz) = e0712ed3c068dc8dab1d31b7cbc19cd69c62875fdcf314abb28e6f42660daf162a3aae69e0a008919e7b809675b68d35f79d3cb98379442bcbc6f5c8ee4313bf
6Size (clamav-0.102.4.tar.gz) = 13234444 bytes 6Size (clamav-0.103.0.tar.gz) = 13357078 bytes
7SHA1 (patch-Makefile.in) = a11766ea353d81fb281a07c8120e8a1f5c8dc60f 7SHA1 (patch-Makefile.in) = 51e0f42323f07b7ae0cb35a640469dce4e1a2041
8SHA1 (patch-aa) = 8539a90ac5591c86f7e9f6b8c073f36523f221a5 8SHA1 (patch-aa) = c07a7b6e883f384ce278964645f0658c0d986ab5
9SHA1 (patch-ab) = 78793f0267ce8c820b51937186dc17dabb4a1ccf 9SHA1 (patch-ab) = 78793f0267ce8c820b51937186dc17dabb4a1ccf
10SHA1 (patch-af) = d217633ed33c72b6d01a9aeef03f0f5dd33b4336 10SHA1 (patch-af) = d217633ed33c72b6d01a9aeef03f0f5dd33b4336
11SHA1 (patch-configure) = fe4b44fe1720f8e0ee31fec794776ca132e347af 11SHA1 (patch-etc_clamav-milter.conf.sample) = fa65d9b25cb51c62365b1d5a8b6dafe89d505057
12SHA1 (patch-etc_clamav-milter.conf.sample) = 0cbf22bf380213c9e9f2b9baf15d7eba745afd46 12SHA1 (patch-etc_clamd.conf.sample) = e2c60b81675e73600409f76457fbc7cd8ec51a8f
13SHA1 (patch-etc_clamd.conf.sample) = 74c995c7df2d5b083bb4465d2ab4cb0cab8670b6 13SHA1 (patch-etc_freshclam.conf.sample) = 804df5480560acb915f9fcb5f2097673c657ae34
14SHA1 (patch-etc_freshclam.conf.sample) = 520ffbca5421ef2dc270e3c5a13cfb36a469e676 14SHA1 (patch-libclamav_fmap.c) = cae93dc627bb8048867054126e4c96688ac9c2f0
15SHA1 (patch-libclamav_fmap.c) = 9b37b4edf19b36557b8ea3666ff21854582ab2e1 
16SHA1 (patch-libclamav_fmap.h) = b9d19b872bc7946da4a321d3d84b7e916f84d31c 15SHA1 (patch-libclamav_fmap.h) = b9d19b872bc7946da4a321d3d84b7e916f84d31c

cvs diff -r1.6 -r1.7 pkgsrc/security/clamav/patches/patch-Makefile.in (expand / switch to unified diff)

--- pkgsrc/security/clamav/patches/patch-Makefile.in 2019/10/10 15:41:30 1.6
+++ pkgsrc/security/clamav/patches/patch-Makefile.in 2020/09/19 13:41:42 1.7
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-Makefile.in,v 1.6 2019/10/10 15:41:30 prlw1 Exp $ 1$NetBSD: patch-Makefile.in,v 1.7 2020/09/19 13:41:42 taca Exp $
2 2
3Install etc files manually. 3Install etc files manually.
4 4
5--- Makefile.in.orig 2019-10-01 17:24:08.000000000 +0000 5--- Makefile.in.orig 2020-09-13 00:27:50.000000000 +0000
6+++ Makefile.in 6+++ Makefile.in
7@@ -300,7 +300,7 @@ ETAGS = etags 7@@ -299,7 +299,7 @@ ETAGS = etags
8 CTAGS = ctags 8 CTAGS = ctags
9 CSCOPE = cscope 9 CSCOPE = cscope
10 DIST_SUBDIRS = libltdl libclamav libfreshclam clamscan clamd clamdscan \ 10 DIST_SUBDIRS = libltdl libclamav shared libfreshclam clamscan clamd \
11- freshclam sigtool clamconf database docs etc clamav-milter \ 11- clamdscan freshclam sigtool clamconf database docs etc \
12+ freshclam sigtool clamconf database docs clamav-milter \ 12+ clamdscan freshclam sigtool clamconf database docs \
13 test clamdtop clambc unit_tests clamonacc clamsubmit fuzz 13 clamav-milter test clamdtop clambc unit_tests clamonacc \
 14 clamsubmit fuzz
14 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/clamav-config.h.in \ 15 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/clamav-config.h.in \
15 $(srcdir)/clamav-config.in $(srcdir)/clamav-types.h.in \ 

cvs diff -r1.1.1.1 -r1.2 pkgsrc/security/clamav/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/security/clamav/patches/patch-aa 2010/12/24 07:11:05 1.1.1.1
+++ pkgsrc/security/clamav/patches/patch-aa 2020/09/19 13:41:42 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.1.1.1 2010/12/24 07:11:05 kefren Exp $ 1$NetBSD: patch-aa,v 1.2 2020/09/19 13:41:42 taca Exp $
2 2
3Fix compilation error DragonFly. 3Fix compilation error DragonFly.
4 4
5--- clamdtop/clamdtop.c.orig 2009-06-01 19:20:12.000000000 +0300 5--- clamdtop/clamdtop.c.orig 2020-09-13 00:27:09.000000000 +0000
6+++ clamdtop/clamdtop.c 2009-06-11 07:31:58.000000000 +0300 6+++ clamdtop/clamdtop.c
7@@ -33,6 +33,7 @@ 7@@ -36,6 +36,7 @@
8 #endif 8 #ifdef HAVE_UNISTD_H
9  
10 #include <unistd.h> 9 #include <unistd.h>
 10 #endif
11+#include <stdarg.h> 11+#include <stdarg.h>
12 #include <stdio.h> 12 #include <stdio.h>
13 #include <stdlib.h> 13 #include <stdlib.h>
14 #include <string.h> 14 #include <string.h>

File Deleted: pkgsrc/security/clamav/patches/patch-configure

cvs diff -r1.1 -r1.2 pkgsrc/security/clamav/patches/patch-etc_clamav-milter.conf.sample (expand / switch to unified diff)

--- pkgsrc/security/clamav/patches/patch-etc_clamav-milter.conf.sample 2016/06/12 16:06:01 1.1
+++ pkgsrc/security/clamav/patches/patch-etc_clamav-milter.conf.sample 2020/09/19 13:41:42 1.2
@@ -1,15 +1,24 @@ @@ -1,15 +1,24 @@
1$NetBSD: patch-etc_clamav-milter.conf.sample,v 1.1 2016/06/12 16:06:01 taca Exp $ 1$NetBSD: patch-etc_clamav-milter.conf.sample,v 1.2 2020/09/19 13:41:42 taca Exp $
2 2
3Make this useable out of the box. 3Make this useable out of the box.
4 4
5--- etc/clamav-milter.conf.sample.orig 2016-04-22 15:02:19.000000000 +0000 5--- etc/clamav-milter.conf.sample.orig 2020-09-13 00:27:09.000000000 +0000
6+++ etc/clamav-milter.conf.sample 6+++ etc/clamav-milter.conf.sample
 7@@ -3,7 +3,7 @@
 8 ##
 9
 10 # Comment or remove the line below.
 11-Example
 12+# Example
 13
 14
 15 ##
7@@ -64,7 +64,7 @@ Example 16@@ -64,7 +64,7 @@ Example
8 # daemon (main thread). 17 # also owned by root to keep other users from tampering with it.
9 # 18 #
10 # Default: disabled 19 # Default: disabled
11-#PidFile /var/run/clamav-milter.pid 20-#PidFile /var/run/clamav-milter.pid
12+PidFile @CLAMAV_DBDIR@/clamd.pid 21+PidFile @CLAMAV_DBDIR@/clamd.pid
13  22
14 # Optional path to the global temporary directory. 23 # Optional path to the global temporary directory.
15 # Default: system specific (usually /tmp or /var/tmp). 24 # Default: system specific (usually /tmp or /var/tmp).

cvs diff -r1.1 -r1.2 pkgsrc/security/clamav/patches/patch-etc_freshclam.conf.sample (expand / switch to unified diff)

--- pkgsrc/security/clamav/patches/patch-etc_freshclam.conf.sample 2014/03/11 14:34:40 1.1
+++ pkgsrc/security/clamav/patches/patch-etc_freshclam.conf.sample 2020/09/19 13:41:42 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-etc_freshclam.conf.sample,v 1.1 2014/03/11 14:34:40 jperkin Exp $ 1$NetBSD: patch-etc_freshclam.conf.sample,v 1.2 2020/09/19 13:41:42 taca Exp $
2 2
3Make this useable out of the box. 3Make this useable out of the box.
4 4
5--- etc/freshclam.conf.sample.orig 2013-04-17 15:25:09.000000000 +0000 5--- etc/freshclam.conf.sample.orig 2020-09-13 00:27:09.000000000 +0000
6+++ etc/freshclam.conf.sample 6+++ etc/freshclam.conf.sample
7@@ -5,7 +5,7 @@ 7@@ -5,7 +5,7 @@
8  8
9  9
10 # Comment or remove the line below. 10 # Comment or remove the line below.
11-Example 11-Example
12+#Example 12+# Example
13  13
14 # Path to the database directory. 14 # Path to the database directory.
15 # WARNING: It must match clamd.conf's directive! 15 # WARNING: It must match clamd.conf's directive!

cvs diff -r1.2 -r1.3 pkgsrc/security/clamav/patches/patch-etc_clamd.conf.sample (expand / switch to unified diff)

--- pkgsrc/security/clamav/patches/patch-etc_clamd.conf.sample 2016/06/12 16:06:01 1.2
+++ pkgsrc/security/clamav/patches/patch-etc_clamd.conf.sample 2020/09/19 13:41:42 1.3
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1$NetBSD: patch-etc_clamd.conf.sample,v 1.2 2016/06/12 16:06:01 taca Exp $ 1$NetBSD: patch-etc_clamd.conf.sample,v 1.3 2020/09/19 13:41:42 taca Exp $
2 2
3Make this useable out of the box. 3Make this useable out of the box.
4 4
5--- etc/clamd.conf.sample.orig 2016-04-22 15:02:19.000000000 +0000 5--- etc/clamd.conf.sample.orig 2020-09-13 00:27:09.000000000 +0000
6+++ etc/clamd.conf.sample 6+++ etc/clamd.conf.sample
7@@ -5,7 +5,7 @@ 7@@ -5,7 +5,7 @@
8  8
9  9
10 # Comment or remove the line below. 10 # Comment or remove the line below.
11-Example 11-Example
12+# Example 12+# Example
13  13
14 # Uncomment this option to enable logging. 14 # Uncomment this option to enable logging.
15 # LogFile must be writable for the user running daemon. 15 # LogFile must be writable for the user running daemon.
16@@ -63,7 +63,7 @@ Example 16@@ -74,7 +74,7 @@ Example
17 # This option allows you to save a process identifier of the listening 17 # It is recommended that the directory where this file is stored is
18 # daemon (main thread). 18 # also owned by root to keep other users from tampering with it.
19 # Default: disabled 19 # Default: disabled
20-#PidFile /var/run/clamd.pid 20-#PidFile /var/run/clamd.pid
21+PidFile @CLAMAV_DBDIR@/clamd.pid 21+PidFile @CLAMAV_DBDIR@/clamd.pid
22  22
23 # Optional path to the global temporary directory. 23 # Optional path to the global temporary directory.
24 # Default: system specific (usually /tmp or /var/tmp). 24 # Default: system specific (usually /tmp or /var/tmp).
25@@ -82,7 +82,7 @@ Example 25@@ -93,7 +93,7 @@ Example
26  26
27 # Path to a local socket file the daemon will listen on. 27 # Path to a local socket file the daemon will listen on.
28 # Default: disabled (must be specified by a user) 28 # Default: disabled (must be specified by a user)
29-#LocalSocket /tmp/clamd.socket 29-#LocalSocket /tmp/clamd.socket
30+LocalSocket @CLAMAV_DBDIR@/clamd.sock 30+LocalSocket @CLAMAV_DBDIR@/clamd.sock
31  31
32 # Sets the group ownership on the unix socket. 32 # Sets the group ownership on the unix socket.
33 # Default: disabled (the primary group of the user running clamd) 33 # Default: disabled (the primary group of the user running clamd)

cvs diff -r1.2 -r1.3 pkgsrc/security/clamav/patches/patch-libclamav_fmap.c (expand / switch to unified diff)

--- pkgsrc/security/clamav/patches/patch-libclamav_fmap.c 2019/10/10 15:41:30 1.2
+++ pkgsrc/security/clamav/patches/patch-libclamav_fmap.c 2020/09/19 13:41:42 1.3
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: patch-libclamav_fmap.c,v 1.2 2019/10/10 15:41:30 prlw1 Exp $ 1$NetBSD: patch-libclamav_fmap.c,v 1.3 2020/09/19 13:41:42 taca Exp $
2 2
3rename gets to my_gets to avoid conflict with fortify/ssp - they use 3rename gets to my_gets to avoid conflict with fortify/ssp - they use
4macros to override libc functions 4macros to override libc functions
5 5
6--- libclamav/fmap.c.orig 2019-10-01 17:24:09.000000000 +0000 6--- libclamav/fmap.c.orig 2020-09-13 00:27:10.000000000 +0000
7+++ libclamav/fmap.c 7+++ libclamav/fmap.c
8@@ -278,7 +278,7 @@ extern cl_fmap_t *cl_fmap_open_handle(vo 8@@ -427,7 +427,7 @@ extern cl_fmap_t *cl_fmap_open_handle(vo
9 m->unmap = use_aging ? unmap_mmap : unmap_malloc; 9 m->unmap = unmap_handle;
10 m->need = handle_need; 10 m->need = handle_need;
11 m->need_offstr = handle_need_offstr; 11 m->need_offstr = handle_need_offstr;
12- m->gets = handle_gets; 12- m->gets = handle_gets;
13+ m->my_gets = handle_gets; 13+ m->my_gets = handle_gets;
14 m->unneed_off = handle_unneed_off; 14 m->unneed_off = handle_unneed_off;
15 return m; 15
16 } 16 status = CL_SUCCESS;
17@@ -674,7 +674,7 @@ extern cl_fmap_t *cl_fmap_open_memory(co 17@@ -842,7 +842,7 @@ fmap_t *fmap_open_memory(const void *sta
18 m->unmap = unmap_malloc; 18 m->unmap = unmap_malloc;
19 m->need = mem_need; 19 m->need = mem_need;
20 m->need_offstr = mem_need_offstr; 20 m->need_offstr = mem_need_offstr;
21- m->gets = mem_gets; 21- m->gets = mem_gets;
22+ m->my_gets = mem_gets; 22+ m->my_gets = mem_gets;
23 m->unneed_off = mem_unneed_off; 23 m->unneed_off = mem_unneed_off;
24 return m; 24
25 } 25 if (NULL != name) {