Thu Sep 5 09:26:25 2019 UTC ()
Pullup ticket #6036 - requested by taca
security/clamav: security fix

Revisions pulled up:
- security/clamav/Makefile                                      1.51
- security/clamav/Makefile.common                               1.11
- security/clamav/PLIST                                         1.7
- security/clamav/buildlink3.mk                                 1.8
- security/clamav/distinfo                                      1.28
- security/clamav/options.mk                                    1.6
- security/clamav/patches/patch-Makefile.in                     1.5
- security/clamav/patches/patch-ab                              1.2

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Sat Jul 20 22:46:59 UTC 2019

   Modified Files:

   	pkgsrc/security/clamav: Makefile

   Log Message:
   *: recursive bump for nettle 3.5.1

---
   Module Name:	pkgsrc
   Committed By:	prlw1
   Date:		Mon Aug  5 14:44:20 UTC 2019

   Modified Files:
   	pkgsrc/security/clamav: Makefile Makefile.common PLIST buildlink3.mk
   	    distinfo options.mk
   	pkgsrc/security/clamav/patches: patch-Makefile.in patch-ab

   Log Message:
   Update clamav to 0.101.2

   Remove rar support to workaround PR pkg/54420

     This release includes 3 extra security related bug fixes that do not
      apply to prior versions. In addition, it includes a number of minor bug
      fixes and improvements.
        * Fixes for the following vulnerabilities affecting 0.101.1 and
          prior:
             + CVE-2019-1787: An out-of-bounds heap read condition may occur
               when scanning PDF documents. The defect is a failure to
               correctly keep track of the number of bytes remaining in a
               buffer when indexing file data.
             + CVE-2019-1789: An out-of-bounds heap read condition may occur
               when scanning PE files (i.e. Windows EXE and DLL files) that
               have been packed using Aspack as a result of inadequate
               bound-checking.
             + CVE-2019-1788: An out-of-bounds heap write condition may occur
               when scanning OLE2 files such as Microsoft Office 97-2003
               documents. The invalid write happens when an invalid pointer
               is mistakenly used to initialize a 32bit integer to zero. This
               is likely to crash the application.
        * Fixes for the following ClamAV vulnerabilities:
             + CVE-2018-15378: Vulnerability in ClamAV's MEW unpacking
               feature that could allow an unauthenticated, remote attacker
               to cause a denial of service (DoS) condition on an affected
               device. Reported by Secunia Research at Flexera.
             + Fix for a 2-byte buffer over-read bug in ClamAV's PDF parsing
               code. Reported by Alex Gaynor.
        * Fixes for the following vulnerabilities in bundled third-party
          libraries:
             + CVE-2018-14680: An issue was discovered in mspack/chmd.c in
               libmspack before 0.7alpha. It does not reject blank CHM
               filenames.
             + CVE-2018-14681: An issue was discovered in kwajd_read_headers
               in mspack/kwajd.c in libmspack before 0.7alpha. Bad KWAJ file
               header extensions could cause a one or two byte overwrite.
             + CVE-2018-14682: An issue was discovered in mspack/chmd.c in
               libmspack before 0.7alpha. There is an off-by-one error in the
               TOLOWER() macro for CHM decompression.
             + Additionally, 0.100.2 reverted 0.100.1's patch for
               CVE-2018-14679, and applied libmspack's version of the fix in
               its place.
        * Fixes for the following CVE's:
             + CVE-2017-16932: Vulnerability in libxml2 dependency (affects
               ClamAV on Windows only).
             + CVE-2018-0360: HWP integer overflow, infinite loop
               vulnerability. Reported by Secunia Research at Flexera.
             + CVE-2018-0361: ClamAV PDF object length check, unreasonably
               long time to parse relatively small file. Reported by aCaB.

   For the full release notes, see:
   https://github.com/Cisco-Talos/clamav-devel/blob/clamav-0.101.2/NEWS.md


(bsiegert)
diff -r1.48 -r1.48.2.1 pkgsrc/security/clamav/Makefile
diff -r1.10 -r1.10.12.1 pkgsrc/security/clamav/Makefile.common
diff -r1.6 -r1.6.44.1 pkgsrc/security/clamav/PLIST
diff -r1.7 -r1.7.18.1 pkgsrc/security/clamav/buildlink3.mk
diff -r1.27 -r1.27.2.1 pkgsrc/security/clamav/distinfo
diff -r1.5 -r1.5.30.1 pkgsrc/security/clamav/options.mk
diff -r1.4 -r1.4.28.1 pkgsrc/security/clamav/patches/patch-Makefile.in
diff -r1.1.1.1 -r1.1.1.1.72.1 pkgsrc/security/clamav/patches/patch-ab
cvs diff -r1.48 -r1.48.2.1 pkgsrc/security/clamav/Makefile (expand / switch to unified diff)

--- pkgsrc/security/clamav/Makefile 2019/05/04 16:12:00 1.48
+++ pkgsrc/security/clamav/Makefile 2019/09/05 09:26:25 1.48.2.1
@@ -1,92 +1,93 @@ @@ -1,92 +1,93 @@
1# $NetBSD: Makefile,v 1.48 2019/05/04 16:12:00 rillig Exp $ 1# $NetBSD: Makefile,v 1.48.2.1 2019/09/05 09:26:25 bsiegert Exp $
2 2
3PKGREVISION= 3 
4.include "Makefile.common" 3.include "Makefile.common"
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}
18CONFIGURE_ARGS+= --with-libcurl=${BUILDLINK_PREFIX.curl} 17CONFIGURE_ARGS+= --with-libcurl=${BUILDLINK_PREFIX.curl}
 18CONFIGURE_ARGS+= --with-libjson=${BUILDLINK_PREFIX.json-c}
19CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include 19CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
20CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib 20CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
21CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 21CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
22CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre2} 22CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre2}
 23CONFIGURE_ARGS+= --with-system-libmspack=${BUILDLINK_PREFIX.libmspack}
23CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2} 24CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2}
24CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} 25CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
25CONFIGURE_ARGS+= --enable-readdir_r 26CONFIGURE_ARGS+= --enable-readdir_r
26# pkgsrc enforces a "secure" version of zlib, so don't let this check 27# pkgsrc enforces a "secure" version of zlib, so don't let this check
27# bomb the build 28# bomb the build
28CONFIGURE_ARGS+= --disable-zlib-vcheck 29CONFIGURE_ARGS+= --disable-zlib-vcheck
 30# Work around build failure PR pkg/54420
 31CONFIGURE_ARGS+= --disable-unrar
29 32
30CHECK_PORTABILITY_SKIP= contrib/* unit_tests/* win32/* 33CHECK_PORTABILITY_SKIP= contrib/* unit_tests/* win32/*
31 34
32.include "../../mk/compiler.mk" 35.include "../../mk/compiler.mk"
33 36
34NOT_PAX_MPROTECT_SAFE+= sbin/clamd 37NOT_PAX_MPROTECT_SAFE+= sbin/clamd
35NOT_PAX_MPROTECT_SAFE+= bin/clamscan 38NOT_PAX_MPROTECT_SAFE+= bin/clamscan
36NOT_PAX_MPROTECT_SAFE+= bin/freshclam 39NOT_PAX_MPROTECT_SAFE+= bin/freshclam
37 40
38CFLAGS.SunOS+= -D__EXTENSIONS__ 41CFLAGS.SunOS+= -D__EXTENSIONS__
39.if !empty(PKGSRC_COMPILER:Mclang) || !empty(CC_VERSION:Mgcc-[6-9]*) 42.if !empty(PKGSRC_COMPILER:Mclang) || !empty(CC_VERSION:Mgcc-[6-9]*)
40CFLAGS.SunOS+= -D_XOPEN_SOURCE=600 43CFLAGS.SunOS+= -D_XOPEN_SOURCE=600
41.endif 44.endif
42 45
43BUILD_DEFS+= CLAMAV_USER CLAMAV_GROUP CLAMAV_DBDIR 46BUILD_DEFS+= CLAMAV_USER CLAMAV_GROUP CLAMAV_DBDIR
44FILES_SUBST+= CLAMAV_USER=${CLAMAV_USER} 47FILES_SUBST+= CLAMAV_USER=${CLAMAV_USER}
45FILES_SUBST+= CLAMAV_GROUP=${CLAMAV_GROUP} 48FILES_SUBST+= CLAMAV_GROUP=${CLAMAV_GROUP}
46FILES_SUBST+= CLAMAV_DBDIR=${CLAMAV_DBDIR} 49FILES_SUBST+= CLAMAV_DBDIR=${CLAMAV_DBDIR}
47MESSAGE_SUBST+= CLAMAV_USER=${CLAMAV_USER} 50MESSAGE_SUBST+= CLAMAV_USER=${CLAMAV_USER}
48 51
49SUBST_CLASSES+= vars 
50SUBST_STAGE.vars= pre-configure 
51SUBST_FILES.vars= etc/clamav-milter.conf.sample etc/clamd.conf.sample 
52SUBST_VARS.vars= CLAMAV_DBDIR 
53 
54RCD_SCRIPTS= clamd freshclamd 52RCD_SCRIPTS= clamd freshclamd
55SMF_METHODS= ${RCD_SCRIPTS} 53SMF_METHODS= ${RCD_SCRIPTS}
56SMF_INSTANCES= ${SMF_METHODS} 54SMF_INSTANCES= ${SMF_METHODS}
57 55
58PKG_GROUPS+= ${CLAMAV_GROUP} 56PKG_GROUPS+= ${CLAMAV_GROUP}
59PKG_USERS+= ${CLAMAV_USER}:${CLAMAV_GROUP} 57PKG_USERS+= ${CLAMAV_USER}:${CLAMAV_GROUP}
60 58
61PKG_GROUPS_VARS+= CLAMAV_GROUP 59PKG_GROUPS_VARS+= CLAMAV_GROUP
62PKG_USERS_VARS= CLAMAV_USER 60PKG_USERS_VARS= CLAMAV_USER
63 61
64EGDIR= ${PREFIX}/share/examples/clamav 62EGDIR= ${PREFIX}/share/examples/clamav
65 63
 64CONF_SAMPLES= clamd.conf freshclam.conf
66OWN_DIRS_PERMS= ${CLAMAV_DBDIR} ${CLAMAV_USER} ${CLAMAV_GROUP} 0775 65OWN_DIRS_PERMS= ${CLAMAV_DBDIR} ${CLAMAV_USER} ${CLAMAV_GROUP} 0775
67CONF_FILES= # empty 66CONF_FILES= # empty
68CONF_FILES_PERMS= # empty 67CONF_FILES_PERMS= # empty
69.for i in clamav-milter.conf clamd.conf freshclam.conf 68.for i in ${CONF_SAMPLES}
70CONF_FILES+= ${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i} 69CONF_FILES+= ${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i}
71.endfor 70.endfor
72 71
73INSTALLATION_DIRS+= ${EGDIR} 72INSTALLATION_DIRS+= ${EGDIR}
74 73
75.include "options.mk" 74.include "options.mk"
76 75
77post-install: 76post-install:
78.for i in clamav-milter.conf clamd.conf freshclam.conf 77.for i in ${CONF_SAMPLES}
79 ${INSTALL_DATA} ${WRKSRC}/etc/${i}.sample ${DESTDIR}${EGDIR}/${i} 78 ${MV} ${DESTDIR}${PREFIX}/etc/${i}.sample ${DESTDIR}${EGDIR}/${i}
80.endfor 79.endfor
81 80
82.include "../../archivers/bzip2/buildlink3.mk" 81.include "../../archivers/bzip2/buildlink3.mk"
 82.include "../../archivers/libmspack/buildlink3.mk"
83.include "../../devel/libltdl/buildlink3.mk" 83.include "../../devel/libltdl/buildlink3.mk"
84.include "../../devel/pcre2/buildlink3.mk" 84.include "../../devel/pcre2/buildlink3.mk"
85.include "../../devel/zlib/buildlink3.mk" 85.include "../../devel/zlib/buildlink3.mk"
86.include "../../devel/gmp/buildlink3.mk" 86.include "../../devel/gmp/buildlink3.mk"
87.include "../../security/openssl/buildlink3.mk" 87.include "../../security/openssl/buildlink3.mk"
 88.include "../../textproc/json-c/buildlink3.mk"
88.include "../../textproc/libxml2/buildlink3.mk" 89.include "../../textproc/libxml2/buildlink3.mk"
89.include "../../www/curl/buildlink3.mk" 90.include "../../www/curl/buildlink3.mk"
90.include "../../mk/curses.buildlink3.mk" 91.include "../../mk/curses.buildlink3.mk"
91.include "../../mk/pthread.buildlink3.mk" 92.include "../../mk/pthread.buildlink3.mk"
92.include "../../mk/bsd.pkg.mk" 93.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.10.12.1 pkgsrc/security/clamav/Makefile.common (expand / switch to unified diff)

--- pkgsrc/security/clamav/Makefile.common 2018/03/21 06:55:57 1.10
+++ pkgsrc/security/clamav/Makefile.common 2019/09/05 09:26:25 1.10.12.1
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: Makefile.common,v 1.10 2018/03/21 06:55:57 prlw1 Exp $ 1# $NetBSD: Makefile.common,v 1.10.12.1 2019/09/05 09:26:25 bsiegert 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.99.4 6DISTNAME= clamav-0.101.2
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= http://www.clamav.net/ 11HOMEPAGE= http://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.6 -r1.6.44.1 pkgsrc/security/clamav/PLIST (expand / switch to unified diff)

--- pkgsrc/security/clamav/PLIST 2014/05/08 16:01:09 1.6
+++ pkgsrc/security/clamav/PLIST 2019/09/05 09:26:25 1.6.44.1
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1@comment $NetBSD: PLIST,v 1.6 2014/05/08 16:01:09 jperkin Exp $ 1@comment $NetBSD: PLIST,v 1.6.44.1 2019/09/05 09:26:25 bsiegert Exp $
2bin/clamav-config 2bin/clamav-config
3bin/clambc 3bin/clambc
4bin/clamconf 4bin/clamconf
5bin/clamdscan 5bin/clamdscan
6bin/clamdtop 6bin/clamdtop
7bin/clamscan 7bin/clamscan
8bin/clamsubmit 8bin/clamsubmit
9bin/freshclam 9bin/freshclam
10bin/sigtool 10bin/sigtool
 11include/clamav-types.h
11include/clamav.h 12include/clamav.h
12lib/libclamav.la 13lib/libclamav.la
13lib/libclamunrar.la 14lib/libclammspack.la
14lib/libclamunrar_iface.la 
15lib/pkgconfig/libclamav.pc 15lib/pkgconfig/libclamav.pc
16man/man1/clambc.1 16man/man1/clambc.1
17man/man1/clamconf.1 17man/man1/clamconf.1
18man/man1/clamdscan.1 18man/man1/clamdscan.1
19man/man1/clamdtop.1 19man/man1/clamdtop.1
20man/man1/clamscan.1 20man/man1/clamscan.1
21man/man1/clamsubmit.1 21man/man1/clamsubmit.1
22man/man1/freshclam.1 22man/man1/freshclam.1
23man/man1/sigtool.1 23man/man1/sigtool.1
24man/man5/clamav-milter.conf.5 24man/man5/clamav-milter.conf.5
25man/man5/clamd.conf.5 25man/man5/clamd.conf.5
26man/man5/freshclam.conf.5 26man/man5/freshclam.conf.5
27man/man8/clamav-milter.8 27man/man8/clamav-milter.8
28man/man8/clamd.8 28man/man8/clamd.8
29${PLIST.milter}sbin/clamav-milter 29${PLIST.milter}sbin/clamav-milter
30sbin/clamd 30sbin/clamd
31share/examples/clamav/clamav-milter.conf 31${PLIST.milter}share/examples/clamav/clamav-milter.conf
32share/examples/clamav/clamd.conf 32share/examples/clamav/clamd.conf
33share/examples/clamav/freshclam.conf 33share/examples/clamav/freshclam.conf
cvs diff -r1.7 -r1.7.18.1 pkgsrc/security/clamav/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/security/clamav/buildlink3.mk 2017/09/25 22:27:43 1.7
+++ pkgsrc/security/clamav/buildlink3.mk 2019/09/05 09:26:25 1.7.18.1
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: buildlink3.mk,v 1.7 2017/09/25 22:27:43 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.7.18.1 2019/09/05 09:26:25 bsiegert 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.98.7nb2 9BUILDLINK_ABI_DEPENDS.clamav+= clamav>=0.98.7nb2
10BUILDLINK_PKGSRCDIR.clamav?= ../../security/clamav 10BUILDLINK_PKGSRCDIR.clamav?= ../../security/clamav
11.endif # CLAMAV_BUILDLINK3_MK 
12 11
13.include "../../archivers/bzip2/buildlink3.mk" 12.include "../../archivers/bzip2/buildlink3.mk"
14.include "../../devel/pcre2/buildlink3.mk" 13.include "../../devel/pcre2/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 17
17BUILDLINK_TREE+= -clamav 18BUILDLINK_TREE+= -clamav
cvs diff -r1.27 -r1.27.2.1 pkgsrc/security/clamav/distinfo (expand / switch to unified diff)

--- pkgsrc/security/clamav/distinfo 2019/04/13 08:48:22 1.27
+++ pkgsrc/security/clamav/distinfo 2019/09/05 09:26:25 1.27.2.1
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo,v 1.27 2019/04/13 08:48:22 szptvlfn Exp $ 1$NetBSD: distinfo,v 1.27.2.1 2019/09/05 09:26:25 bsiegert Exp $
2 2
3SHA1 (clamav-0.99.4.tar.gz) = 31f91cb63329385325821a03db46e7001dc40fa2 3SHA1 (clamav-0.101.2.tar.gz) = 6545fc72fbc4e3e8b7e845e08edd0a36142d033e
4RMD160 (clamav-0.99.4.tar.gz) = 5925f4727c98d328f7f12267bb1af11fc368f9d8 4RMD160 (clamav-0.101.2.tar.gz) = 53fddb9858c49c8b11654b204cf2e5938e193a7c
5SHA512 (clamav-0.99.4.tar.gz) = 778d5ef510d8d4bdfac5dc33d92469ed4283c414b3d42da6e1a0b13ed70e37755d5c837622dc336bc728ba1f8bf5485fc8a8d3a67a90e9aaa9e4dc71ece0691d 5SHA512 (clamav-0.101.2.tar.gz) = f9ea4589a8081acf7b6d454d1a068da05ae6574a9070a08f9438935795cb6dc084ffb9222b11fb1623f31962f859e6536a2f5bd1de29ef6b9b314efa5edc8c7e
6Size (clamav-0.99.4.tar.gz) = 16083015 bytes 6Size (clamav-0.101.2.tar.gz) = 21722932 bytes
7SHA1 (patch-Makefile.in) = c7f106f812952ef22f32aaa0354a15d501460c01 7SHA1 (patch-Makefile.in) = c3bdefe7f7d0fee58ce3a1f16c00b3739ab8586a
8SHA1 (patch-aa) = 8539a90ac5591c86f7e9f6b8c073f36523f221a5 8SHA1 (patch-aa) = 8539a90ac5591c86f7e9f6b8c073f36523f221a5
9SHA1 (patch-ab) = fea995ea944c2ae0f51a41e1a1076badf65c6c8b 9SHA1 (patch-ab) = 78793f0267ce8c820b51937186dc17dabb4a1ccf
10SHA1 (patch-af) = d217633ed33c72b6d01a9aeef03f0f5dd33b4336 10SHA1 (patch-af) = d217633ed33c72b6d01a9aeef03f0f5dd33b4336
11SHA1 (patch-configure) = d3a0a77c522b8abb4a5144e29aacc8b110f31c5a 11SHA1 (patch-configure) = d3a0a77c522b8abb4a5144e29aacc8b110f31c5a
12SHA1 (patch-etc_clamav-milter.conf.sample) = 0cbf22bf380213c9e9f2b9baf15d7eba745afd46 12SHA1 (patch-etc_clamav-milter.conf.sample) = 0cbf22bf380213c9e9f2b9baf15d7eba745afd46
13SHA1 (patch-etc_clamd.conf.sample) = 74c995c7df2d5b083bb4465d2ab4cb0cab8670b6 13SHA1 (patch-etc_clamd.conf.sample) = 74c995c7df2d5b083bb4465d2ab4cb0cab8670b6
14SHA1 (patch-etc_freshclam.conf.sample) = 520ffbca5421ef2dc270e3c5a13cfb36a469e676 14SHA1 (patch-etc_freshclam.conf.sample) = 520ffbca5421ef2dc270e3c5a13cfb36a469e676
15SHA1 (patch-libclamav_fmap.c) = a4c08f96e3d3aae57533e8e8294358fcb26a6db4 15SHA1 (patch-libclamav_fmap.c) = a4c08f96e3d3aae57533e8e8294358fcb26a6db4
16SHA1 (patch-libclamav_fmap.h) = c486e4fd957f2cc9811c5a0422db69c85f0f9e0f 16SHA1 (patch-libclamav_fmap.h) = c486e4fd957f2cc9811c5a0422db69c85f0f9e0f
cvs diff -r1.5 -r1.5.30.1 pkgsrc/security/clamav/options.mk (expand / switch to unified diff)

--- pkgsrc/security/clamav/options.mk 2016/02/01 12:45:38 1.5
+++ pkgsrc/security/clamav/options.mk 2019/09/05 09:26:25 1.5.30.1
@@ -1,30 +1,31 @@ @@ -1,30 +1,31 @@
1# $NetBSD: options.mk,v 1.5 2016/02/01 12:45:38 jperkin Exp $ 1# $NetBSD: options.mk,v 1.5.30.1 2019/09/05 09:26:25 bsiegert Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.clamav 3PKG_OPTIONS_VAR= PKG_OPTIONS.clamav
4PKG_SUPPORTED_OPTIONS= milter clamav-experimental unit-test 4PKG_SUPPORTED_OPTIONS= milter clamav-experimental unit-test
5 5
6.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
7 7
8PLIST_VARS+= milter 8PLIST_VARS+= milter
9 9
10.if !empty(PKG_OPTIONS:Mmilter) 10.if !empty(PKG_OPTIONS:Mmilter)
11# force use of pkgsrc version of libmilter -- clamav uses the sendmail binary 11# force use of pkgsrc version of libmilter -- clamav uses the sendmail binary
12# to check API compatibility(!), so it must build with as new a version of 12# to check API compatibility(!), so it must build with as new a version of
13# libmilter as pkgsrc is capable of providing 13# libmilter as pkgsrc is capable of providing
14USE_BUILTIN.libmilter= no 14USE_BUILTIN.libmilter= no
15. include "../../mail/libmilter/buildlink3.mk" 15. include "../../mail/libmilter/buildlink3.mk"
16CONFIGURE_ARGS+= --enable-milter 16CONFIGURE_ARGS+= --enable-milter
17PLIST.milter= yes 17PLIST.milter= yes
 18CONF_SAMPLES+= clamav-milter.conf
18SMF_INSTANCES+= clamav-milter 19SMF_INSTANCES+= clamav-milter
19.else 20.else
20CONFIGURE_ARGS+= --disable-milter 21CONFIGURE_ARGS+= --disable-milter
21# XXX --disable-milter doesn't work as expected, so we need this 22# XXX --disable-milter doesn't work as expected, so we need this
22CONFIGURE_ENV+= ac_cv_header_libmilter_mfapi_h=no 23CONFIGURE_ENV+= ac_cv_header_libmilter_mfapi_h=no
23.endif 24.endif
24 25
25.if !empty(PKG_OPTIONS:Mclamav-experimental) 26.if !empty(PKG_OPTIONS:Mclamav-experimental)
26CONFIGURE_ARGS+= --enable-experimental 27CONFIGURE_ARGS+= --enable-experimental
27.endif 28.endif
28 29
29# Enable unit test 30# Enable unit test
30.if !empty(PKG_OPTIONS:Munit-test) 31.if !empty(PKG_OPTIONS:Munit-test)
cvs diff -r1.4 -r1.4.28.1 pkgsrc/security/clamav/patches/patch-Makefile.in (expand / switch to unified diff)

--- pkgsrc/security/clamav/patches/patch-Makefile.in 2016/06/12 16:06:01 1.4
+++ pkgsrc/security/clamav/patches/patch-Makefile.in 2019/09/05 09:26:25 1.4.28.1
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-Makefile.in,v 1.4 2016/06/12 16:06:01 taca Exp $ 1$NetBSD: patch-Makefile.in,v 1.4.28.1 2019/09/05 09:26:25 bsiegert Exp $
2 2
3Install etc files manually. 3Install etc files manually.
4 4
5--- Makefile.in.orig 2016-04-22 16:19:51.000000000 +0000 5--- Makefile.in.orig 2018-09-19 19:29:07.000000000 +0000
6+++ Makefile.in 6+++ Makefile.in
7@@ -551,7 +551,7 @@ top_builddir = @top_builddir@ 7@@ -303,7 +303,7 @@ ETAGS = etags
8 top_srcdir = @top_srcdir@ 8 CTAGS = ctags
9 ACLOCAL_AMFLAGS = -I m4 9 CSCOPE = cscope
10 SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool \ 10 DIST_SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam \
11- clamconf database docs etc clamav-milter test clamdtop clambc \ 11- sigtool clamconf database docs etc clamav-milter test clamdtop \
12+ clamconf database docs clamav-milter test clamdtop clambc \ 12+ sigtool clamconf database docs clamav-milter test clamdtop \
13 unit_tests $(am__append_1) $(am__append_2) 13 clambc unit_tests clamsubmit libfreshclam fuzz
14 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 14 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
15 bin_SCRIPTS = clamav-config 15 distdir = $(PACKAGE)-$(VERSION)
cvs diff -r1.1.1.1 -r1.1.1.1.72.1 pkgsrc/security/clamav/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/security/clamav/patches/patch-ab 2010/12/24 07:11:05 1.1.1.1
+++ pkgsrc/security/clamav/patches/patch-ab 2019/09/05 09:26:25 1.1.1.1.72.1
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ab,v 1.1.1.1 2010/12/24 07:11:05 kefren Exp $ 1$NetBSD: patch-ab,v 1.1.1.1.72.1 2019/09/05 09:26:25 bsiegert Exp $
2 2
3Make this pkgsrc friedly. 3Make this pkgsrc friendly.
4 4
5--- libclamav/c++/llvm/utils/buildit/build_llvm.orig 2010-11-10 16:57:04.000000000 +0000 5--- libclamav/c++/llvm/utils/buildit/build_llvm.orig 2010-11-10 16:57:04.000000000 +0000
6+++ libclamav/c++/llvm/utils/buildit/build_llvm 6+++ libclamav/c++/llvm/utils/buildit/build_llvm
7@@ -224,7 +224,7 @@ make $LOCAL_MAKEFLAGS $OPTIMIZE_OPTS UNI 7@@ -224,7 +224,7 @@ make $LOCAL_MAKEFLAGS $OPTIMIZE_OPTS UNI
8 LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \ 8 LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \
9 OPTIMIZE_OPTION='-O3' VERBOSE=1 install 9 OPTIMIZE_OPTION='-O3' VERBOSE=1 install
10  10
11-if ! test $? == 0 ; then 11-if ! test $? == 0 ; then
12+if ! test $? = 0 ; then 12+if ! test $? = 0 ; then
13 echo "error: LLVM 'make install' failed!" 13 echo "error: LLVM 'make install' failed!"
14 exit 1 14 exit 1
15 fi  15 fi
16@@ -332,7 +332,7 @@ if [ "$INSTALL_LIBLTO" = "yes" ]; then 16@@ -332,7 +332,7 @@ if [ "$INSTALL_LIBLTO" = "yes" ]; then