Fri Jul 8 09:28:06 2011 UTC ()
Changes 0.97.1:
This is a bugfix release recommended for all users. Please refer to the
ChangeLog file for details.


(adam)
diff -r1.2 -r1.3 pkgsrc/security/clamav/Makefile
diff -r1.2 -r1.3 pkgsrc/security/clamav/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/security/clamav/PLIST
diff -r1.1.1.1 -r1.2 pkgsrc/security/clamav/patches/patch-ad
diff -r1.1.1.1 -r1.2 pkgsrc/security/clamav/patches/patch-af
cvs diff -r1.2 -r1.3 pkgsrc/security/clamav/Makefile (switch to unified diff)

--- pkgsrc/security/clamav/Makefile 2011/02/08 07:56:09 1.2
+++ pkgsrc/security/clamav/Makefile 2011/07/08 09:28:06 1.3
@@ -1,79 +1,78 @@ @@ -1,79 +1,78 @@
1# $NetBSD: Makefile,v 1.2 2011/02/08 07:56:09 adam Exp $ 1# $NetBSD: Makefile,v 1.3 2011/07/08 09:28:06 adam Exp $
2 2
3DISTNAME= clamav-0.97 3DISTNAME= clamav-0.97.1
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
17CONFIGURE_ARGS+= --disable-clamav 17CONFIGURE_ARGS+= --disable-clamav
18CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 18CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
19CONFIGURE_ARGS+= --with-dbdir=${CLAMAV_DBDIR} 19CONFIGURE_ARGS+= --with-dbdir=${CLAMAV_DBDIR}
20CONFIGURE_ARGS+= --with-user=${CLAMAV_USER} 20CONFIGURE_ARGS+= --with-user=${CLAMAV_USER}
21CONFIGURE_ARGS+= --with-group=${CLAMAV_GROUP} 21CONFIGURE_ARGS+= --with-group=${CLAMAV_GROUP}
22CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include 22CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
23CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib 23CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
24CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} 24CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
25# pkgsrc enforces a "secure" version of zlib, so don't let this check 25# pkgsrc enforces a "secure" version of zlib, so don't let this check
26# bomb the build. 26# bomb the build.
27CONFIGURE_ARGS+= --disable-zlib-vcheck 27CONFIGURE_ARGS+= --disable-zlib-vcheck
28# avoid multiarch libdir on Darwin 28# avoid multiarch libdir on Darwin
29CONFIGURE_ARGS+= --libdir=${PREFIX}/lib 29CONFIGURE_ARGS+= --libdir=${PREFIX}/lib
30 30
31CHECK_PORTABILITY_SKIP= contrib/* unit_tests/* 31CHECK_PORTABILITY_SKIP= contrib/* unit_tests/*
32 32
33.include "../../mk/bsd.prefs.mk" 33.include "../../mk/bsd.prefs.mk"
34 34
35PLIST_SRC+= ${PKGDIR}/PLIST 35PLIST_SRC+= ${PKGDIR}/PLIST
36 36
37.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.*) 37.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.*)
38CONFIGURE_ARGS+= --disable-readdir-r 38CONFIGURE_ARGS+= --disable-readdir-r
39.else 39.else
40CONFIGURE_ARGS+= --enable-readdir_r 40CONFIGURE_ARGS+= --enable-readdir_r
41.endif 41.endif
42 42
43BUILD_DEFS+= CLAMAV_USER CLAMAV_GROUP CLAMAV_DBDIR 43BUILD_DEFS+= CLAMAV_USER CLAMAV_GROUP CLAMAV_DBDIR
44FILES_SUBST+= CLAMAV_USER=${CLAMAV_USER} 44FILES_SUBST+= CLAMAV_USER=${CLAMAV_USER}
45MESSAGE_SUBST+= CLAMAV_USER=${CLAMAV_USER} 45MESSAGE_SUBST+= CLAMAV_USER=${CLAMAV_USER}
46 46
47RCD_SCRIPTS= clamd freshclamd 47RCD_SCRIPTS= clamd freshclamd
48PKG_GROUPS+= ${CLAMAV_GROUP} 48PKG_GROUPS+= ${CLAMAV_GROUP}
49PKG_USERS+= ${CLAMAV_USER}:${CLAMAV_GROUP} 49PKG_USERS+= ${CLAMAV_USER}:${CLAMAV_GROUP}
50 50
51PKG_GROUPS_VARS+= CLAMAV_GROUP 51PKG_GROUPS_VARS+= CLAMAV_GROUP
52PKG_USERS_VARS= CLAMAV_USER 52PKG_USERS_VARS= CLAMAV_USER
53 53
54EGDIR= ${PREFIX}/share/examples/clamav 54EGDIR= ${PREFIX}/share/examples/clamav
55FILES_SUBST+= CLAMAV_DBDIR=${CLAMAV_DBDIR} 55FILES_SUBST+= CLAMAV_DBDIR=${CLAMAV_DBDIR}
56 56
57OWN_DIRS_PERMS= ${CLAMAV_DBDIR} ${CLAMAV_USER} ${CLAMAV_GROUP} 0775 57OWN_DIRS_PERMS= ${CLAMAV_DBDIR} ${CLAMAV_USER} ${CLAMAV_GROUP} 0775
58CONF_FILES= # empty 58CONF_FILES= # empty
59CONF_FILES_PERMS= # empty 59CONF_FILES_PERMS= # empty
60.for i in clamd.conf freshclam.conf 60.for i in clamd.conf freshclam.conf
61CONF_FILES+= ${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i} 61CONF_FILES+= ${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i}
62.endfor 62.endfor
63.for i in daily.cvd main.cvd 63.for i in daily.cvd main.cvd
64CONF_FILES_PERMS+= ${EGDIR}/${i} ${CLAMAV_DBDIR}/${i} \ 64CONF_FILES_PERMS+= ${EGDIR}/${i} ${CLAMAV_DBDIR}/${i} \
65 ${CLAMAV_USER} ${CLAMAV_GROUP} 0664 65 ${CLAMAV_USER} ${CLAMAV_GROUP} 0664
66.endfor 66.endfor
67 67
68INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} CFGINST=${EGDIR} DBINST=${EGDIR} 68INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} CFGINST=${EGDIR} DBINST=${EGDIR}
69 69
70.include "options.mk" 70.include "options.mk"
71 71
72.include "../../archivers/bzip2/buildlink3.mk" 72.include "../../archivers/bzip2/buildlink3.mk"
73.include "../../devel/libltdl/buildlink3.mk" 73.include "../../devel/libltdl/buildlink3.mk"
74.include "../../devel/ncurses/buildlink3.mk" 74.include "../../devel/ncurses/buildlink3.mk"
75.include "../../devel/zlib/buildlink3.mk" 75.include "../../devel/zlib/buildlink3.mk"
76.include "../../devel/gmp/buildlink3.mk" 76.include "../../devel/gmp/buildlink3.mk"
77.include "../../mk/pthread.buildlink3.mk" 77.include "../../mk/pthread.buildlink3.mk"
78 
79.include "../../mk/bsd.pkg.mk" 78.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/security/clamav/distinfo (switch to unified diff)

--- pkgsrc/security/clamav/distinfo 2011/02/08 07:56:09 1.2
+++ pkgsrc/security/clamav/distinfo 2011/07/08 09:28:06 1.3
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.2 2011/02/08 07:56:09 adam Exp $ 1$NetBSD: distinfo,v 1.3 2011/07/08 09:28:06 adam Exp $
2 2
3SHA1 (clamav-0.97.tar.gz) = 68f5a6736b3f67d608c4064ef839777877f09115 3SHA1 (clamav-0.97.1.tar.gz) = 1b3a4667dcc278bc7eab38acbc0f35269aa05387
4RMD160 (clamav-0.97.tar.gz) = bc37a2da03c1d8923da9f28a7e051f6e67db8603 4RMD160 (clamav-0.97.1.tar.gz) = e42885e8ed39938984ea38b2926a0397b21dce51
5Size (clamav-0.97.tar.gz) = 41834871 bytes 5Size (clamav-0.97.1.tar.gz) = 43913867 bytes
6SHA1 (patch-aa) = 8539a90ac5591c86f7e9f6b8c073f36523f221a5 6SHA1 (patch-aa) = 8539a90ac5591c86f7e9f6b8c073f36523f221a5
7SHA1 (patch-ab) = fea995ea944c2ae0f51a41e1a1076badf65c6c8b 7SHA1 (patch-ab) = fea995ea944c2ae0f51a41e1a1076badf65c6c8b
8SHA1 (patch-ad) = 7d7ea5f8cda22dca1a399ee1219f1f072d8a3eed 8SHA1 (patch-ad) = c862658ceba98ac415b0c193fc205c5862ac4970
9SHA1 (patch-af) = a58e2c484b34bbfccb62d6fdf35b552a15dc9bd3 9SHA1 (patch-af) = d217633ed33c72b6d01a9aeef03f0f5dd33b4336
10SHA1 (patch-ag) = cf4a0040a53c81402e8d15478407bc854af6fb30 10SHA1 (patch-ag) = cf4a0040a53c81402e8d15478407bc854af6fb30
cvs diff -r1.1.1.1 -r1.2 pkgsrc/security/clamav/PLIST (switch to unified diff)

--- pkgsrc/security/clamav/PLIST 2010/12/24 07:11:05 1.1.1.1
+++ pkgsrc/security/clamav/PLIST 2011/07/08 09:28:06 1.2
@@ -1,32 +1,33 @@ @@ -1,32 +1,33 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2010/12/24 07:11:05 kefren Exp $ 1@comment $NetBSD: PLIST,v 1.2 2011/07/08 09:28:06 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
 15man/man1/clambc.1
15man/man1/clamconf.1 16man/man1/clamconf.1
16man/man1/clamdscan.1 17man/man1/clamdscan.1
17man/man1/clamdtop.1 18man/man1/clamdtop.1
18man/man1/clamscan.1 19man/man1/clamscan.1
19man/man1/freshclam.1 20man/man1/freshclam.1
20man/man1/sigtool.1 21man/man1/sigtool.1
21man/man5/clamav-milter.conf.5 22man/man5/clamav-milter.conf.5
22man/man5/clamd.conf.5 23man/man5/clamd.conf.5
23man/man5/freshclam.conf.5 24man/man5/freshclam.conf.5
24man/man8/clamav-milter.8 25man/man8/clamav-milter.8
25man/man8/clamd.8 26man/man8/clamd.8
26sbin/clamd 27sbin/clamd
27share/examples/clamav/clamd.conf 28share/examples/clamav/clamd.conf
28share/examples/clamav/daily.cvd 29share/examples/clamav/daily.cvd
29share/examples/clamav/freshclam.conf 30share/examples/clamav/freshclam.conf
30share/examples/clamav/main.cvd 31share/examples/clamav/main.cvd
31share/examples/rc.d/clamd 32share/examples/rc.d/clamd
32share/examples/rc.d/freshclamd 33share/examples/rc.d/freshclamd
cvs diff -r1.1.1.1 -r1.2 pkgsrc/security/clamav/patches/Attic/patch-ad (switch to unified diff)

--- pkgsrc/security/clamav/patches/Attic/patch-ad 2010/12/24 07:11:05 1.1.1.1
+++ pkgsrc/security/clamav/patches/Attic/patch-ad 2011/07/08 09:28:06 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ad,v 1.1.1.1 2010/12/24 07:11:05 kefren Exp $ 1$NetBSD: patch-ad,v 1.2 2011/07/08 09:28:06 adam Exp $
2 2
3Fix compilation error DragonFly. 3Fix compilation error DragonFly.
4 4
5--- docs/Makefile.in.orig 2010-05-14 14:16:49.000000000 +0300 5--- docs/Makefile.in.orig 2011-06-09 06:51:36.000000000 +0000
6+++ docs/Makefile.in 2010-05-20 10:07:03.000000000 +0300 6+++ docs/Makefile.in
7@@ -273,6 +273,8 @@ 7@@ -274,6 +274,8 @@ EXTRA_DIST = html $(top_srcdir)/docs/man
8 man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamd.conf.5 man/clamdscan.1 man/clamav-milter.8 man/clamav-milter.conf.5 man/freshclam.conf.5 man/clamconf.1 man/clamdtop.1 8 man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamd.conf.5 man/clamdscan.1 man/clamav-milter.8 man/clamav-milter.conf.5 man/freshclam.conf.5 man/clamconf.1 man/clamdtop.1 man/clambc.1
9 all: all-am 9 all: all-am
10  10
11+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@MILTER_MANS = man/clamav-milter.8 11+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@MILTER_MANS = man/clamav-milter.8
12+ 12+
13 .SUFFIXES: 13 .SUFFIXES:
14 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) 14 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
15 @for dep in $?; do \ 15 @for dep in $?; do \
cvs diff -r1.1.1.1 -r1.2 pkgsrc/security/clamav/patches/patch-af (switch to unified diff)

--- pkgsrc/security/clamav/patches/patch-af 2010/12/24 07:11:05 1.1.1.1
+++ pkgsrc/security/clamav/patches/patch-af 2011/07/08 09:28:06 1.2
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: patch-af,v 1.1.1.1 2010/12/24 07:11:05 kefren Exp $ 1$NetBSD: patch-af,v 1.2 2011/07/08 09:28:06 adam Exp $
2 2
3Fix compilation error DragonFly. 3Fix compilation error DragonFly.
4 4
5--- database/Makefile.in.orig 2010-05-07 22:02:57.000000000 +0300 5--- database/Makefile.in.orig 2010-05-07 22:02:57.000000000 +0300
6+++ database/Makefile.in 2010-05-20 10:07:22.000000000 +0300 6+++ database/Makefile.in 2010-05-20 10:07:22.000000000 +0300
7@@ -435,17 +435,6 @@ 7@@ -436,17 +436,6 @@
8 $(mkinstalldirs) $(DESTDIR)$(DBINST);\ 8 $(mkinstalldirs) $(DESTDIR)$(DBINST);\
9 test -f $(DESTDIR)$(DBINST)/main.cvd || test -f $(DESTDIR)$(DBINST)/main.cld || $(INSTALL_DATA) $(srcdir)/main.cvd $(DESTDIR)$(DBINST);\ 9 test -f $(DESTDIR)$(DBINST)/main.cvd || test -f $(DESTDIR)$(DBINST)/main.cld || $(INSTALL_DATA) $(srcdir)/main.cvd $(DESTDIR)$(DBINST);\
10 test -f $(DESTDIR)$(DBINST)/daily.cvd || test -f $(DESTDIR)$(DBINST)/daily.cld || $(INSTALL_DATA) $(srcdir)/daily.cvd $(DESTDIR)$(DBINST);\ 10 test -f $(DESTDIR)$(DBINST)/daily.cvd || test -f $(DESTDIR)$(DBINST)/daily.cld || $(INSTALL_DATA) $(srcdir)/daily.cvd $(DESTDIR)$(DBINST);\
11- if test `id|sed -e 's/^.[^(]*(\([^)]*\)).*/\1/'` = "root" && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \ 11- if test `id|sed -e 's/^.[^(]*(\([^)]*\)).*/\1/'` = "root" && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \
12- chmod 775 $(DESTDIR)$(DBINST); \ 12- chmod 775 $(DESTDIR)$(DBINST); \
13- chown ${CLAMAVUSER} $(DESTDIR)$(DBINST); \ 13- chown ${CLAMAVUSER} $(DESTDIR)$(DBINST); \
14- chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST); \ 14- chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST); \
15- if test -f $(DESTDIR)$(DBINST)/main.cvd; then chmod 664 $(DESTDIR)$(DBINST)/main.cvd; fi;\ 15- if test -f $(DESTDIR)$(DBINST)/main.cvd; then chmod 664 $(DESTDIR)$(DBINST)/main.cvd; fi;\
16- if test -f $(DESTDIR)$(DBINST)/main.cvd; then chown ${CLAMAVUSER} $(DESTDIR)$(DBINST)/main.cvd; fi;\ 16- if test -f $(DESTDIR)$(DBINST)/main.cvd; then chown ${CLAMAVUSER} $(DESTDIR)$(DBINST)/main.cvd; fi;\
17- if test -f $(DESTDIR)$(DBINST)/main.cvd; then chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST)/main.cvd; fi;\ 17- if test -f $(DESTDIR)$(DBINST)/main.cvd; then chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST)/main.cvd; fi;\
18- if test -f $(DESTDIR)$(DBINST)/daily.cvd; then chmod 664 $(DESTDIR)$(DBINST)/daily.cvd; fi;\ 18- if test -f $(DESTDIR)$(DBINST)/daily.cvd; then chmod 664 $(DESTDIR)$(DBINST)/daily.cvd; fi;\
19- if test -f $(DESTDIR)$(DBINST)/daily.cvd; then chown ${CLAMAVUSER} $(DESTDIR)$(DBINST)/daily.cvd; fi;\ 19- if test -f $(DESTDIR)$(DBINST)/daily.cvd; then chown ${CLAMAVUSER} $(DESTDIR)$(DBINST)/daily.cvd; fi;\
20- if test -f $(DESTDIR)$(DBINST)/daily.cvd; then chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST)/daily.cvd; fi;\ 20- if test -f $(DESTDIR)$(DBINST)/daily.cvd; then chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST)/daily.cvd; fi;\
21- fi 21- fi
22  22
23 # Tell versions [3.59,3.63) of GNU make to not export all variables. 23 # Tell versions [3.59,3.63) of GNU make to not export all variables.
24 # Otherwise a system limit (for SysV at least) may be exceeded. 24 # Otherwise a system limit (for SysV at least) may be exceeded.