Tue Nov 4 07:16:18 2008 UTC ()
Updated mail/clamav to 0.94.1

* Bug fixes


(martti)
diff -r1.87 -r1.88 pkgsrc/mail/clamav/Makefile
diff -r1.16 -r1.17 pkgsrc/mail/clamav/buildlink3.mk
diff -r1.54 -r1.55 pkgsrc/mail/clamav/distinfo
diff -r1.15 -r1.16 pkgsrc/mail/clamav/patches/patch-ad
diff -r1.6 -r1.7 pkgsrc/mail/clamav/patches/patch-af
diff -r1.16 -r1.17 pkgsrc/mail/clamav/patches/patch-ah
cvs diff -r1.87 -r1.88 pkgsrc/mail/clamav/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/clamav/Attic/Makefile 2008/09/04 06:44:06 1.87
+++ pkgsrc/mail/clamav/Attic/Makefile 2008/11/04 07:16:17 1.88
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: Makefile,v 1.87 2008/09/04 06:44:06 martti Exp $ 1# $NetBSD: Makefile,v 1.88 2008/11/04 07:16:17 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= grant@NetBSD.org 9MAINTAINER= grant@NetBSD.org
10HOMEPAGE= http://www.clamav.net/ 10HOMEPAGE= http://www.clamav.net/
11COMMENT= Anti-virus toolkit 11COMMENT= Anti-virus toolkit
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16CLAMAV_VERSION= 0.94 16CLAMAV_VERSION= 0.94.1
17 17
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19 19
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
21CONFIGURE_ARGS+= --disable-clamav 21CONFIGURE_ARGS+= --disable-clamav
22CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 22CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
23CONFIGURE_ARGS+= --with-dbdir=${CLAMAV_DBDIR} 23CONFIGURE_ARGS+= --with-dbdir=${CLAMAV_DBDIR}
24CONFIGURE_ARGS+= --with-uid=${CLAMAV_USER} 24CONFIGURE_ARGS+= --with-uid=${CLAMAV_USER}
25CONFIGURE_ARGS+= --with-group=${CLAMAV_GROUP} 25CONFIGURE_ARGS+= --with-group=${CLAMAV_GROUP}
26CONFIGURE_ARGS+= --with-tcpwrappers 26CONFIGURE_ARGS+= --with-tcpwrappers
27CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} 27CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
28 28
29.include "../../mk/bsd.prefs.mk" 29.include "../../mk/bsd.prefs.mk"
cvs diff -r1.16 -r1.17 pkgsrc/mail/clamav/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mail/clamav/Attic/buildlink3.mk 2008/09/04 06:44:07 1.16
+++ pkgsrc/mail/clamav/Attic/buildlink3.mk 2008/11/04 07:16:17 1.17
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: buildlink3.mk,v 1.16 2008/09/04 06:44:07 martti Exp $ 1# $NetBSD: buildlink3.mk,v 1.17 2008/11/04 07:16:17 martti Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4CLAMAV_BUILDLINK3_MK:= ${CLAMAV_BUILDLINK3_MK}+ 4CLAMAV_BUILDLINK3_MK:= ${CLAMAV_BUILDLINK3_MK}+
5 5
6.if ${BUILDLINK_DEPTH} == "+" 6.if ${BUILDLINK_DEPTH} == "+"
7BUILDLINK_DEPENDS+= clamav 7BUILDLINK_DEPENDS+= clamav
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nclamav} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nclamav}
11BUILDLINK_PACKAGES+= clamav 11BUILDLINK_PACKAGES+= clamav
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}clamav 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}clamav
13 13
14.if ${CLAMAV_BUILDLINK3_MK} == "+" 14.if ${CLAMAV_BUILDLINK3_MK} == "+"
15BUILDLINK_API_DEPENDS.clamav+= clamav>=0.94 15BUILDLINK_API_DEPENDS.clamav+= clamav>=0.94.1
16BUILDLINK_PKGSRCDIR.clamav?= ../../mail/clamav 16BUILDLINK_PKGSRCDIR.clamav?= ../../mail/clamav
17.endif # CLAMAV_BUILDLINK3_MK 17.endif # CLAMAV_BUILDLINK3_MK
18 18
19.include "../../archivers/bzip2/buildlink3.mk" 19.include "../../archivers/bzip2/buildlink3.mk"
20.include "../../devel/zlib/buildlink3.mk" 20.include "../../devel/zlib/buildlink3.mk"
21.include "../../devel/gmp/buildlink3.mk" 21.include "../../devel/gmp/buildlink3.mk"
22.include "../../security/tcp_wrappers/buildlink3.mk" 22.include "../../security/tcp_wrappers/buildlink3.mk"
23 23
24BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 24BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
cvs diff -r1.54 -r1.55 pkgsrc/mail/clamav/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/clamav/Attic/distinfo 2008/09/04 06:44:07 1.54
+++ pkgsrc/mail/clamav/Attic/distinfo 2008/11/04 07:16:17 1.55
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.54 2008/09/04 06:44:07 martti Exp $ 1$NetBSD: distinfo,v 1.55 2008/11/04 07:16:17 martti Exp $
2 2
3SHA1 (clamav-0.94.tar.gz) = d69a0c462ac3ef55329384f8e136d9b7bc1b8ec5 3SHA1 (clamav-0.94.1.tar.gz) = 8eed11eb68dc6cb15d4bb12de034a4252dc09373
4RMD160 (clamav-0.94.tar.gz) = 598561b76b1e4ee14120388ba1bbdcac5ac7bfe5 4RMD160 (clamav-0.94.1.tar.gz) = 268d3b4b00c208f8a9aa3bfaa430eb8d22a4bf33
5Size (clamav-0.94.tar.gz) = 20509228 bytes 5Size (clamav-0.94.1.tar.gz) = 21817818 bytes
6SHA1 (patch-ad) = f13bc822a3f405861fb1c2a219d238efcaddf64a 6SHA1 (patch-ad) = 019b5c83b4b5ccf9f91a79af458ea27e599d5ec9
7SHA1 (patch-af) = 87ae131299a99df40252590f4400234e3de7c2b3 7SHA1 (patch-af) = 06b7a1fbcc7a086afe955f4f775d9b40742b7286
8SHA1 (patch-ah) = 5c5d06d305c9bdeb6c794ccbb0be33f0088026d8 8SHA1 (patch-ah) = e160264f7125974a1afe3678fc081b4d21fab0ee
cvs diff -r1.15 -r1.16 pkgsrc/mail/clamav/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/mail/clamav/patches/Attic/patch-ad 2008/09/04 06:44:07 1.15
+++ pkgsrc/mail/clamav/patches/Attic/patch-ad 2008/11/04 07:16:18 1.16
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ad,v 1.15 2008/09/04 06:44:07 martti Exp $ 1$NetBSD: patch-ad,v 1.16 2008/11/04 07:16:18 martti Exp $
2 2
3Optionally build clamav-milter.8 3Optionally build clamav-milter.8
4 4
5--- docs/Makefile.in.orig 2008-09-01 21:49:47.000000000 +0300 5--- docs/Makefile.in.orig 2008-10-30 18:13:31.000000000 +0200
6+++ docs/Makefile.in 2008-09-04 08:26:43.000000000 +0300 6+++ docs/Makefile.in 2008-11-04 08:19:02.000000000 +0200
7@@ -210,6 +210,8 @@ 7@@ -221,6 +221,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 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
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.6 -r1.7 pkgsrc/mail/clamav/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/mail/clamav/patches/Attic/patch-af 2008/09/04 06:44:07 1.6
+++ pkgsrc/mail/clamav/patches/Attic/patch-af 2008/11/04 07:16:18 1.7
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-af,v 1.6 2008/09/04 06:44:07 martti Exp $ 1$NetBSD: patch-af,v 1.7 2008/11/04 07:16:18 martti Exp $
2 2
3Installation fixes. 3Installation fixes.
4 4
5--- database/Makefile.in.orig 2008-09-01 21:49:47.000000000 +0300 5--- database/Makefile.in.orig 2008-10-30 18:13:31.000000000 +0200
6+++ database/Makefile.in 2008-09-04 08:28:24.000000000 +0300 6+++ database/Makefile.in 2008-11-04 08:19:27.000000000 +0200
7@@ -375,17 +375,6 @@ 7@@ -386,17 +386,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.16 -r1.17 pkgsrc/mail/clamav/patches/Attic/patch-ah (expand / switch to unified diff)

--- pkgsrc/mail/clamav/patches/Attic/patch-ah 2008/09/04 06:44:07 1.16
+++ pkgsrc/mail/clamav/patches/Attic/patch-ah 2008/11/04 07:16:18 1.17
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1$NetBSD: patch-ah,v 1.16 2008/09/04 06:44:07 martti Exp $ 1$NetBSD: patch-ah,v 1.17 2008/11/04 07:16:18 martti Exp $
2 2
3Build fixes. 3Build fixes.
4 4
5--- clamav-milter/clamav-milter.c.orig 2008-09-01 20:19:44.000000000 +0300 5--- clamav-milter/clamav-milter.c.orig 2008-10-16 11:29:55.000000000 +0300
6+++ clamav-milter/clamav-milter.c 2008-09-04 08:28:44.000000000 +0300 6+++ clamav-milter/clamav-milter.c 2008-11-04 08:19:49.000000000 +0200
7@@ -3926,7 +3926,7 @@ 7@@ -3944,7 +3944,7 @@
8 * the postmaster, so include 8 * the postmaster, so include
9 * some useful information 9 * some useful information
10 */ 10 */
11- fprintf(sendmail, _("The message %1$s sent from %2$s to\n"), 11- fprintf(sendmail, _("The message %1$s sent from %2$s to\n"),
12+ fprintf(sendmail, _("The message %s sent from %s to\n"), 12+ fprintf(sendmail, _("The message %s sent from %s to\n"),
13 sendmailId, privdata->from); 13 sendmailId, privdata->from);
14 else 14 else
15 fprintf(sendmail, _("A message sent from %s to\n"), 15 fprintf(sendmail, _("A message sent from %s to\n"),
16@@ -3940,7 +3940,7 @@ 16@@ -3958,7 +3958,7 @@
17 fprintf(sendmail, _("\nThe message in question has been quarantined as %s\n"), privdata->filename); 17 fprintf(sendmail, _("\nThe message in question has been quarantined as %s\n"), privdata->filename);
18  18
19 if(hflag) { 19 if(hflag) {
20- fprintf(sendmail, _("\nThe message was received by %1$s from %2$s via %3$s\n\n"), 20- fprintf(sendmail, _("\nThe message was received by %1$s from %2$s via %3$s\n\n"),
21+ fprintf(sendmail, _("\nThe message was received by %s from %s via %s\n\n"), 21+ fprintf(sendmail, _("\nThe message was received by %s from %s via %s\n\n"),
22 smfi_getsymval(ctx, "j"), privdata->from, 22 smfi_getsymval(ctx, "j"), privdata->from,
23 smfi_getsymval(ctx, "_")); 23 smfi_getsymval(ctx, "_"));
24 fputs(_("For your information, the original message headers were:\n\n"), sendmail); 24 fputs(_("For your information, the original message headers were:\n\n"), sendmail);
25@@ -5129,7 +5129,7 @@ 25@@ -5147,7 +5147,7 @@
26 cli_dbgmsg("qfile move '%s' to '%s'\n", privdata->filename, newname); 26 cli_dbgmsg("qfile move '%s' to '%s'\n", privdata->filename, newname);
27  27
28 if(move(privdata->filename, newname) < 0) { 28 if(move(privdata->filename, newname) < 0) {
29- logg(_("^Can't rename %1$s to %2$s\n"), 29- logg(_("^Can't rename %1$s to %2$s\n"),
30+ logg(_("^Can't rename %s to %s\n"), 30+ logg(_("^Can't rename %s to %s\n"),
31 privdata->filename, newname); 31 privdata->filename, newname);
32 free(newname); 32 free(newname);
33 return -1; 33 return -1;