Thu May 20 07:47:45 2010 UTC ()
Updated mail/clamav to 0.96.1

* Lots of bug fixes


(martti)
diff -r1.102 -r1.103 pkgsrc/mail/clamav/Makefile
diff -r1.24 -r1.25 pkgsrc/mail/clamav/PLIST
diff -r1.63 -r1.64 pkgsrc/mail/clamav/distinfo
diff -r1.20 -r1.21 pkgsrc/mail/clamav/patches/patch-aa
diff -r1.20 -r1.21 pkgsrc/mail/clamav/patches/patch-ad
diff -r1.7 -r1.8 pkgsrc/mail/clamav/patches/patch-ac
diff -r1.11 -r1.12 pkgsrc/mail/clamav/patches/patch-af
diff -r1.4 -r1.5 pkgsrc/mail/clamav/patches/patch-ag
cvs diff -r1.102 -r1.103 pkgsrc/mail/clamav/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/clamav/Attic/Makefile 2010/04/02 19:45:23 1.102
+++ pkgsrc/mail/clamav/Attic/Makefile 2010/05/20 07:47:45 1.103
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: Makefile,v 1.102 2010/04/02 19:45:23 martti Exp $ 1# $NetBSD: Makefile,v 1.103 2010/05/20 07:47:45 martti Exp $
2 2
3DISTNAME= clamav-${CLAMAV_VERSION} 3DISTNAME= clamav-${CLAMAV_VERSION}
4PKGNAME= clamav-${CLAMAV_VERSION:S/-/./} 4PKGNAME= clamav-${CLAMAV_VERSION:S/-/./}
5#PKGREVISION= 1 5#PKGREVISION= 1
6CATEGORIES= mail 6CATEGORIES= mail
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clamav/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clamav/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.clamav.net/ 10HOMEPAGE= http://www.clamav.net/
11COMMENT= Anti-virus toolkit 11COMMENT= Anti-virus toolkit
12 12
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
16PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
17 17
18CLAMAV_VERSION= 0.96 18CLAMAV_VERSION= 0.96.1
19 19
20USE_LIBTOOL= yes 20USE_LIBTOOL= yes
21 21
22GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
23CONFIGURE_ARGS+= --disable-clamav 23CONFIGURE_ARGS+= --disable-clamav
24CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 24CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
25CONFIGURE_ARGS+= --with-dbdir=${CLAMAV_DBDIR} 25CONFIGURE_ARGS+= --with-dbdir=${CLAMAV_DBDIR}
26CONFIGURE_ARGS+= --with-user=${CLAMAV_USER} 26CONFIGURE_ARGS+= --with-user=${CLAMAV_USER}
27CONFIGURE_ARGS+= --with-group=${CLAMAV_GROUP} 27CONFIGURE_ARGS+= --with-group=${CLAMAV_GROUP}
28CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} 28CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
29CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include 29CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
30CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib 30CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
31 31
cvs diff -r1.24 -r1.25 pkgsrc/mail/clamav/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/clamav/Attic/PLIST 2010/04/02 19:45:24 1.24
+++ pkgsrc/mail/clamav/Attic/PLIST 2010/05/20 07:47:45 1.25
@@ -1,31 +1,32 @@ @@ -1,31 +1,32 @@
1@comment $NetBSD: PLIST,v 1.24 2010/04/02 19:45:24 martti Exp $ 1@comment $NetBSD: PLIST,v 1.25 2010/05/20 07:47:45 martti 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/clamconf.1 15man/man1/clamconf.1
16man/man1/clamdscan.1 16man/man1/clamdscan.1
17man/man1/clamdtop.1 17man/man1/clamdtop.1
18man/man1/clamscan.1 18man/man1/clamscan.1
19man/man1/freshclam.1 19man/man1/freshclam.1
20man/man1/sigtool.1 20man/man1/sigtool.1
 21man/man5/clamav-milter.conf.5
21man/man5/clamd.conf.5 22man/man5/clamd.conf.5
22man/man5/freshclam.conf.5 23man/man5/freshclam.conf.5
23man/man8/clamav-milter.8 24man/man8/clamav-milter.8
24man/man8/clamd.8 25man/man8/clamd.8
25sbin/clamd 26sbin/clamd
26share/examples/clamav/clamd.conf 27share/examples/clamav/clamd.conf
27share/examples/clamav/daily.cvd 28share/examples/clamav/daily.cvd
28share/examples/clamav/freshclam.conf 29share/examples/clamav/freshclam.conf
29share/examples/clamav/main.cvd 30share/examples/clamav/main.cvd
30share/examples/rc.d/clamd 31share/examples/rc.d/clamd
31share/examples/rc.d/freshclamd 32share/examples/rc.d/freshclamd
cvs diff -r1.63 -r1.64 pkgsrc/mail/clamav/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/clamav/Attic/distinfo 2010/04/01 12:02:22 1.63
+++ pkgsrc/mail/clamav/Attic/distinfo 2010/05/20 07:47:45 1.64
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.63 2010/04/01 12:02:22 martti Exp $ 1$NetBSD: distinfo,v 1.64 2010/05/20 07:47:45 martti Exp $
2 2
3SHA1 (clamav-0.96.tar.gz) = be7cb37f2a6121cacc3cd3969eee212b96ef6b57 3SHA1 (clamav-0.96.1.tar.gz) = cdb24490f402748cbfb57cc87592fe77b470e0a5
4RMD160 (clamav-0.96.tar.gz) = d9147d1da4fc7fa3e8d42b25c58a93f6bbaa588b 4RMD160 (clamav-0.96.1.tar.gz) = f0708b921c8b01a4309fe741ec141ab8cbdf2351
5Size (clamav-0.96.tar.gz) = 39792593 bytes 5Size (clamav-0.96.1.tar.gz) = 40568982 bytes
6SHA1 (patch-aa) = cf09def5ff3de0a551bb5cf8ec232cf7f7e0b54e 6SHA1 (patch-aa) = 8539a90ac5591c86f7e9f6b8c073f36523f221a5
7SHA1 (patch-ab) = a4d097b785f870cd6213811f504a553e6b87e229 7SHA1 (patch-ab) = a4d097b785f870cd6213811f504a553e6b87e229
8SHA1 (patch-ac) = d14cd2c0646c4d390f10b6b642e95b2638fa194b 8SHA1 (patch-ac) = e28096ec1bb70d36877e3813cda228b0ede4d552
9SHA1 (patch-ad) = a6ea0f1e439feef3b6b9148dcea37c9b58b9d773 9SHA1 (patch-ad) = 7d7ea5f8cda22dca1a399ee1219f1f072d8a3eed
10SHA1 (patch-af) = ebd5b67c07fe58df8b303a34d1e64a772f6983d6 10SHA1 (patch-af) = a58e2c484b34bbfccb62d6fdf35b552a15dc9bd3
11SHA1 (patch-ag) = 64585150298220cff2257fd8b98a34f6c277d33d 11SHA1 (patch-ag) = cf4a0040a53c81402e8d15478407bc854af6fb30
cvs diff -r1.20 -r1.21 pkgsrc/mail/clamav/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/mail/clamav/patches/Attic/patch-aa 2010/04/01 12:02:22 1.20
+++ pkgsrc/mail/clamav/patches/Attic/patch-aa 2010/05/20 07:47:45 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.20 2010/04/01 12:02:22 martti Exp $ 1$NetBSD: patch-aa,v 1.21 2010/05/20 07:47:45 martti Exp $
2 2
3Fix compileation 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 2009-06-01 19:20:12.000000000 +0300
6+++ clamdtop/clamdtop.c 2009-06-11 07:31:58.000000000 +0300 6+++ clamdtop/clamdtop.c 2009-06-11 07:31:58.000000000 +0300
7@@ -33,6 +33,7 @@ 7@@ -33,6 +33,7 @@
8 #endif 8 #endif
9  9
10 #include <unistd.h> 10 #include <unistd.h>
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>
cvs diff -r1.20 -r1.21 pkgsrc/mail/clamav/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/mail/clamav/patches/Attic/patch-ad 2010/04/01 12:02:22 1.20
+++ pkgsrc/mail/clamav/patches/Attic/patch-ad 2010/05/20 07:47:45 1.21
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ad,v 1.20 2010/04/01 12:02:22 martti Exp $ 1$NetBSD: patch-ad,v 1.21 2010/05/20 07:47:45 martti Exp $
2 2
3Fix compileation error DragonFly. 3Fix compilation error DragonFly.
4 4
5--- docs/Makefile.in.orig 2010-03-24 19:01:19.000000000 +0200 5--- docs/Makefile.in.orig 2010-05-14 14:16:49.000000000 +0300
6+++ docs/Makefile.in 2010-04-01 12:23:43.000000000 +0300 6+++ docs/Makefile.in 2010-05-20 10:07:03.000000000 +0300
7@@ -270,6 +270,8 @@ 7@@ -273,6 +273,8 @@
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/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
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.7 -r1.8 pkgsrc/mail/clamav/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/mail/clamav/patches/Attic/patch-ac 2010/04/01 12:02:22 1.7
+++ pkgsrc/mail/clamav/patches/Attic/patch-ac 2010/05/20 07:47:45 1.8
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ac,v 1.7 2010/04/01 12:02:22 martti Exp $ 1$NetBSD: patch-ac,v 1.8 2010/05/20 07:47:45 martti Exp $
2 2
3Make this pkgsrc friedly. 3Make this pkgsrc friedly.
4 4
5--- libclamav/c++/configure.orig 2010-04-01 12:30:33.000000000 +0300 5--- libclamav/c++/configure.orig 2010-05-07 21:08:04.000000000 +0300
6+++ libclamav/c++/configure 2010-04-01 12:31:05.000000000 +0300 6+++ libclamav/c++/configure 2010-05-20 10:06:33.000000000 +0300
7@@ -14460,7 +14460,7 @@ 7@@ -14504,7 +14504,7 @@
8 enable_optimized=default 8 enable_optimized=default
9 fi 9 fi
10  10
11- if test "x$enable_optimized" == "xno"; then 11- if test "x$enable_optimized" == "xno"; then
12+ if test "x$enable_optimized" = "xno"; then 12+ if test "x$enable_optimized" = "xno"; then
13 DEBUG_BUILD_TRUE= 13 DEBUG_BUILD_TRUE=
14 DEBUG_BUILD_FALSE='#' 14 DEBUG_BUILD_FALSE='#'
15 else 15 else
cvs diff -r1.11 -r1.12 pkgsrc/mail/clamav/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/mail/clamav/patches/Attic/patch-af 2010/04/01 12:02:23 1.11
+++ pkgsrc/mail/clamav/patches/Attic/patch-af 2010/05/20 07:47:45 1.12
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-af,v 1.11 2010/04/01 12:02:23 martti Exp $ 1$NetBSD: patch-af,v 1.12 2010/05/20 07:47:45 martti Exp $
2 2
3Fix compileation error DragonFly. 3Fix compilation error DragonFly.
4 4
5--- database/Makefile.in.orig 2010-03-24 19:01:19.000000000 +0200 5--- database/Makefile.in.orig 2010-05-07 22:02:57.000000000 +0300
6+++ database/Makefile.in 2010-04-01 12:24:10.000000000 +0300 6+++ database/Makefile.in 2010-05-20 10:07:22.000000000 +0300
7@@ -432,17 +432,6 @@ 7@@ -435,17 +435,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;\
cvs diff -r1.4 -r1.5 pkgsrc/mail/clamav/patches/Attic/patch-ag (expand / switch to unified diff)

--- pkgsrc/mail/clamav/patches/Attic/patch-ag 2010/04/01 12:02:23 1.4
+++ pkgsrc/mail/clamav/patches/Attic/patch-ag 2010/05/20 07:47:45 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ag,v 1.4 2010/04/01 12:02:23 martti Exp $ 1$NetBSD: patch-ag,v 1.5 2010/05/20 07:47:45 martti Exp $
2 2
3Fix compileation error DragonFly. 3Fix compilation error DragonFly.
4 4
5--- libclamav/others.h.orig 2010-03-31 19:39:38.000000000 +0300 5--- libclamav/others.h.orig 2010-03-31 19:39:38.000000000 +0300
6+++ libclamav/others.h 2010-04-01 12:24:33.000000000 +0300 6+++ libclamav/others.h 2010-04-01 12:24:33.000000000 +0300
7@@ -33,6 +33,7 @@ 7@@ -33,6 +33,7 @@
8  8
9 #include <stdio.h> 9 #include <stdio.h>
10 #include <stdlib.h> 10 #include <stdlib.h>
11+#include <unistd.h> 11+#include <unistd.h>
12 #include "cltypes.h" 12 #include "cltypes.h"
13  13
14 #include "clamav.h" 14 #include "clamav.h"