Mon Jul 2 07:12:58 2012 UTC ()
Changes 0.97.5:
* libclamav: Scan output at end of truncated tar
* libclamav: Fix handling of tar file with malformed header
* libclamav: Scan chm with invalid handling
* freshclam: give custom dbs higher priority during update
* libclamav: detect read races and abort the scan with an error
* libclamav/pe.c: drop old header check


(adam)
diff -r1.7 -r1.8 pkgsrc/security/clamav/Makefile
diff -r1.2 -r1.3 pkgsrc/security/clamav/PLIST
diff -r1.5 -r1.6 pkgsrc/security/clamav/distinfo
cvs diff -r1.7 -r1.8 pkgsrc/security/clamav/Makefile (expand / switch to unified diff)

--- pkgsrc/security/clamav/Makefile 2012/01/26 06:34:19 1.7
+++ pkgsrc/security/clamav/Makefile 2012/07/02 07:12:58 1.8
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1# $NetBSD: Makefile,v 1.7 2012/01/26 06:34:19 sbd Exp $ 1# $NetBSD: Makefile,v 1.8 2012/07/02 07:12:58 adam Exp $
2 2
3DISTNAME= clamav-0.97.3 3DISTNAME= clamav-0.97.5
4CATEGORIES= security 4CATEGORIES= security
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clamav/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clamav/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.clamav.net/ 8HOMEPAGE= http://www.clamav.net/
9COMMENT= Anti-virus toolkit 9COMMENT= Anti-virus toolkit
10LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
11 11
12PKG_INSTALLATION_TYPES= overwrite pkgviews 12PKG_INSTALLATION_TYPES= overwrite pkgviews
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17SET_LIBDIR= yes 17SET_LIBDIR= yes
18CONFIGURE_ARGS+= --disable-clamav 18CONFIGURE_ARGS+= --disable-clamav
19CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 19CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
20CONFIGURE_ARGS+= --with-dbdir=${CLAMAV_DBDIR} 20CONFIGURE_ARGS+= --with-dbdir=${CLAMAV_DBDIR}
21CONFIGURE_ARGS+= --with-user=${CLAMAV_USER} 21CONFIGURE_ARGS+= --with-user=${CLAMAV_USER}
22CONFIGURE_ARGS+= --with-group=${CLAMAV_GROUP} 22CONFIGURE_ARGS+= --with-group=${CLAMAV_GROUP}
23CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include 23CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
24CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib 24CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
25CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} 25CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
26# pkgsrc enforces a "secure" version of zlib, so don't let this check 26# pkgsrc enforces a "secure" version of zlib, so don't let this check
27# bomb the build. 27# bomb the build
28CONFIGURE_ARGS+= --disable-zlib-vcheck 28CONFIGURE_ARGS+= --disable-zlib-vcheck
29 29
30CHECK_PORTABILITY_SKIP= contrib/* unit_tests/* 30CHECK_PORTABILITY_SKIP= contrib/* unit_tests/*
31 31
32.include "../../mk/bsd.prefs.mk" 32.include "../../mk/bsd.prefs.mk"
33 33
34PLIST_SRC+= ${PKGDIR}/PLIST 34PLIST_SRC+= ${PKGDIR}/PLIST
35 35
36.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.*) 36.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.*)
37CONFIGURE_ARGS+= --disable-readdir-r 37CONFIGURE_ARGS+= --disable-readdir-r
38.else 38.else
39CONFIGURE_ARGS+= --enable-readdir_r 39CONFIGURE_ARGS+= --enable-readdir_r
40.endif 40.endif
@@ -49,29 +49,25 @@ PKG_USERS+= ${CLAMAV_USER}:${CLAMAV_GROU @@ -49,29 +49,25 @@ PKG_USERS+= ${CLAMAV_USER}:${CLAMAV_GROU
49 49
50PKG_GROUPS_VARS+= CLAMAV_GROUP 50PKG_GROUPS_VARS+= CLAMAV_GROUP
51PKG_USERS_VARS= CLAMAV_USER 51PKG_USERS_VARS= CLAMAV_USER
52 52
53EGDIR= ${PREFIX}/share/examples/clamav 53EGDIR= ${PREFIX}/share/examples/clamav
54FILES_SUBST+= CLAMAV_DBDIR=${CLAMAV_DBDIR} 54FILES_SUBST+= CLAMAV_DBDIR=${CLAMAV_DBDIR}
55 55
56OWN_DIRS_PERMS= ${CLAMAV_DBDIR} ${CLAMAV_USER} ${CLAMAV_GROUP} 0775 56OWN_DIRS_PERMS= ${CLAMAV_DBDIR} ${CLAMAV_USER} ${CLAMAV_GROUP} 0775
57CONF_FILES= # empty 57CONF_FILES= # empty
58CONF_FILES_PERMS= # empty 58CONF_FILES_PERMS= # empty
59.for i in clamd.conf freshclam.conf 59.for i in clamd.conf freshclam.conf
60CONF_FILES+= ${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i} 60CONF_FILES+= ${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i}
61.endfor 61.endfor
62.for i in daily.cvd main.cvd 
63CONF_FILES_PERMS+= ${EGDIR}/${i} ${CLAMAV_DBDIR}/${i} \ 
64 ${CLAMAV_USER} ${CLAMAV_GROUP} 0664 
65.endfor 
66 62
67INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} CFGINST=${EGDIR} DBINST=${EGDIR} 63INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} CFGINST=${EGDIR} DBINST=${EGDIR}
68 64
69.include "options.mk" 65.include "options.mk"
70 66
71.include "../../archivers/bzip2/buildlink3.mk" 67.include "../../archivers/bzip2/buildlink3.mk"
72.include "../../devel/libltdl/buildlink3.mk" 68.include "../../devel/libltdl/buildlink3.mk"
73.include "../../devel/ncurses/buildlink3.mk" 69.include "../../devel/ncurses/buildlink3.mk"
74.include "../../devel/zlib/buildlink3.mk" 70.include "../../devel/zlib/buildlink3.mk"
75.include "../../devel/gmp/buildlink3.mk" 71.include "../../devel/gmp/buildlink3.mk"
76.include "../../mk/pthread.buildlink3.mk" 72.include "../../mk/pthread.buildlink3.mk"
77.include "../../mk/bsd.pkg.mk" 73.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/security/clamav/PLIST (expand / switch to unified diff)

--- pkgsrc/security/clamav/PLIST 2011/07/08 09:28:06 1.2
+++ pkgsrc/security/clamav/PLIST 2012/07/02 07:12:58 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2011/07/08 09:28:06 adam Exp $ 1@comment $NetBSD: PLIST,v 1.3 2012/07/02 07:12:58 adam 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/freshclam 8bin/freshclam
9bin/sigtool 9bin/sigtool
10include/clamav.h 10include/clamav.h
11lib/libclamav.la 11lib/libclamav.la
12lib/libclamunrar.la 12lib/libclamunrar.la
13lib/libclamunrar_iface.la 13lib/libclamunrar_iface.la
14lib/pkgconfig/libclamav.pc 14lib/pkgconfig/libclamav.pc
@@ -16,18 +16,16 @@ man/man1/clambc.1 @@ -16,18 +16,16 @@ man/man1/clambc.1
16man/man1/clamconf.1 16man/man1/clamconf.1
17man/man1/clamdscan.1 17man/man1/clamdscan.1
18man/man1/clamdtop.1 18man/man1/clamdtop.1
19man/man1/clamscan.1 19man/man1/clamscan.1
20man/man1/freshclam.1 20man/man1/freshclam.1
21man/man1/sigtool.1 21man/man1/sigtool.1
22man/man5/clamav-milter.conf.5 22man/man5/clamav-milter.conf.5
23man/man5/clamd.conf.5 23man/man5/clamd.conf.5
24man/man5/freshclam.conf.5 24man/man5/freshclam.conf.5
25man/man8/clamav-milter.8 25man/man8/clamav-milter.8
26man/man8/clamd.8 26man/man8/clamd.8
27sbin/clamd 27sbin/clamd
28share/examples/clamav/clamd.conf 28share/examples/clamav/clamd.conf
29share/examples/clamav/daily.cvd 
30share/examples/clamav/freshclam.conf 29share/examples/clamav/freshclam.conf
31share/examples/clamav/main.cvd 
32share/examples/rc.d/clamd 30share/examples/rc.d/clamd
33share/examples/rc.d/freshclamd 31share/examples/rc.d/freshclamd
cvs diff -r1.5 -r1.6 pkgsrc/security/clamav/distinfo (expand / switch to unified diff)

--- pkgsrc/security/clamav/distinfo 2011/10/26 17:55:05 1.5
+++ pkgsrc/security/clamav/distinfo 2012/07/02 07:12:58 1.6
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.5 2011/10/26 17:55:05 tez Exp $ 1$NetBSD: distinfo,v 1.6 2012/07/02 07:12:58 adam Exp $
2 2
3SHA1 (clamav-0.97.3.tar.gz) = 263c7b8b7dc1536652ab64e32263d1c60e138655 3SHA1 (clamav-0.97.5.tar.gz) = 1bb317ead4a1a677a9a11a063fc35a63f22309e9
4RMD160 (clamav-0.97.3.tar.gz) = 9fee55f0b115fafa622e1092483e380afd0dc5b9 4RMD160 (clamav-0.97.5.tar.gz) = 882294b892c7660669e9164918b1e08651b37d77
5Size (clamav-0.97.3.tar.gz) = 45793398 bytes 5Size (clamav-0.97.5.tar.gz) = 14754465 bytes
6SHA1 (patch-aa) = 8539a90ac5591c86f7e9f6b8c073f36523f221a5 6SHA1 (patch-aa) = 8539a90ac5591c86f7e9f6b8c073f36523f221a5
7SHA1 (patch-ab) = fea995ea944c2ae0f51a41e1a1076badf65c6c8b 7SHA1 (patch-ab) = fea995ea944c2ae0f51a41e1a1076badf65c6c8b
8SHA1 (patch-ad) = c862658ceba98ac415b0c193fc205c5862ac4970 8SHA1 (patch-ad) = c862658ceba98ac415b0c193fc205c5862ac4970
9SHA1 (patch-af) = d217633ed33c72b6d01a9aeef03f0f5dd33b4336 9SHA1 (patch-af) = d217633ed33c72b6d01a9aeef03f0f5dd33b4336
10SHA1 (patch-ag) = cf4a0040a53c81402e8d15478407bc854af6fb30 10SHA1 (patch-ag) = cf4a0040a53c81402e8d15478407bc854af6fb30