From ef5e158bb30235a858d06d4ac477b83798315564 Mon Sep 17 00:00:00 2001 From: martti Date: Thu, 19 Oct 2006 07:30:15 +0000 Subject: Updated mail/clamav to 0.88.5 (I tried to contact the MAINTAINER but got no reply. I'm using this in our production systems so this should work just fine.) * Bugfixes: - libclamav/rebuildpe.c: fix possible heap overflow [IDEF1597] - libclamav/chmunpack.c: fix possible crash [IDEF1736] - freshclam/manager.c: "Cache-Control: no-cache" is now disabled by default. If you're behind a broken proxy you can recompile freshclam with --enable-no-cache. --- mail/clamav/Makefile | 12 ++++++------ mail/clamav/distinfo | 18 +++++++++--------- mail/clamav/patches/patch-aa | 8 ++++---- mail/clamav/patches/patch-ab | 8 ++++---- mail/clamav/patches/patch-ad | 8 ++++---- mail/clamav/patches/patch-af | 8 ++++---- mail/clamav/patches/patch-ah | 12 ++++++------ 7 files changed, 37 insertions(+), 37 deletions(-) (limited to 'mail') diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile index 9c62bd3908a..43479f041d8 100644 --- a/mail/clamav/Makefile +++ b/mail/clamav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2006/08/09 18:35:45 salo Exp $ +# $NetBSD: Makefile,v 1.62 2006/10/19 07:30:15 martti Exp $ DISTNAME= clamav-${CLAMAV_VERSION} PKGNAME= clamav-${CLAMAV_VERSION:S/-/./} @@ -11,7 +11,7 @@ COMMENT= Anti-virus toolkit PKG_INSTALLATION_TYPES= overwrite pkgviews -CLAMAV_VERSION= 0.88.4 +CLAMAV_VERSION= 0.88.5 #PKGREVISION= 1 USE_LIBTOOL= yes @@ -42,11 +42,11 @@ FILES_SUBST+= VIRUSDBDIR=${VIRUSDBDIR:Q} OWN_DIRS_PERMS= ${VIRUSDBDIR} ${CLAMAV_USER} ${CLAMAV_GROUP} 0775 CONF_FILES= # empty CONF_FILES_PERMS= # empty -.for _file_ in clamd.conf freshclam.conf -CONF_FILES+= ${EGDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_} +.for i in clamd.conf freshclam.conf +CONF_FILES+= ${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i} .endfor -.for _file_ in daily.cvd main.cvd -CONF_FILES_PERMS+= ${EGDIR}/${_file_} ${VIRUSDBDIR}/${_file_} \ +.for i in daily.cvd main.cvd +CONF_FILES_PERMS+= ${EGDIR}/${i} ${VIRUSDBDIR}/${i} \ ${CLAMAV_USER} ${CLAMAV_GROUP} 0664 .endfor diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo index 282373b9fba..f466eaf9000 100644 --- a/mail/clamav/distinfo +++ b/mail/clamav/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.37 2006/08/09 18:35:45 salo Exp $ +$NetBSD: distinfo,v 1.38 2006/10/19 07:30:15 martti Exp $ -SHA1 (clamav-0.88.4.tar.gz) = efc343e833c0bc1c77540bdb4e8dc21cedee70fa -RMD160 (clamav-0.88.4.tar.gz) = efa419598c7d6deae53bf9c0f40a4c2912433228 -Size (clamav-0.88.4.tar.gz) = 7632947 bytes -SHA1 (patch-aa) = 17c713c3b5833f895b7caa470ae31f3d45d60643 -SHA1 (patch-ab) = afe9915e3fbed6c8dee93101149206a9b2f5c13c -SHA1 (patch-ad) = 3723ad7212f15ba4e2690127515bfb1f37b97f71 -SHA1 (patch-af) = 605728b133ddb95827285d06bfeec9400222f874 -SHA1 (patch-ah) = 26e0d7db6a6ea8f491459f65197278de4b232f89 +SHA1 (clamav-0.88.5.tar.gz) = eb4c671d14d43b7079f19da9d9ef37357fa24c83 +RMD160 (clamav-0.88.5.tar.gz) = b0e24b90f2a085ded89fcd90f3434d6bc1981caf +Size (clamav-0.88.5.tar.gz) = 8663193 bytes +SHA1 (patch-aa) = b295a8fea8937faafcbae7f08ad9a5e1bae468e2 +SHA1 (patch-ab) = 05f3ff7681e5f1ba78c31dc117c31b3e23f56339 +SHA1 (patch-ad) = 9c25ad53c9a8912f34ac99f596a887f2a3618d0d +SHA1 (patch-af) = a1c2177c3d7ecbd9bc241aa2e90004fe1c6d78a2 +SHA1 (patch-ah) = 90415d363ed701e89fbe5ca58d87fe9e1ba60a29 diff --git a/mail/clamav/patches/patch-aa b/mail/clamav/patches/patch-aa index 7cd6b850deb..53cc188b1b1 100644 --- a/mail/clamav/patches/patch-aa +++ b/mail/clamav/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.13 2004/10/30 09:50:33 xtraeme Exp $ +$NetBSD: patch-aa,v 1.14 2006/10/19 07:30:15 martti Exp $ ---- configure.orig 2004-10-18 02:37:47.000000000 +1000 -+++ configure 2004-10-19 09:28:50.000000000 +1000 -@@ -11558,6 +11558,7 @@ +--- configure.orig 2006-10-15 21:56:53.000000000 +0000 ++++ configure 2006-10-19 10:16:35.000000000 +0000 +@@ -13374,6 +13374,7 @@ LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread" CLAMD_LIBS="-lpthread" CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread" diff --git a/mail/clamav/patches/patch-ab b/mail/clamav/patches/patch-ab index bc3f7accdac..ed9e97ecae4 100644 --- a/mail/clamav/patches/patch-ab +++ b/mail/clamav/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.8 2005/07/01 03:27:49 grant Exp $ +$NetBSD: patch-ab,v 1.9 2006/10/19 07:30:15 martti Exp $ ---- configure.orig 2005-07-01 13:22:45.000000000 +1000 -+++ configure -@@ -11818,6 +11818,38 @@ _ACEOF +--- configure.orig 2006-10-19 10:16:35.000000000 +0000 ++++ configure 2006-10-19 10:16:57.000000000 +0000 +@@ -13316,6 +13316,38 @@ use_gethostbyname_r="no" ;; diff --git a/mail/clamav/patches/patch-ad b/mail/clamav/patches/patch-ad index ed4d3c1bca8..f774629b67a 100644 --- a/mail/clamav/patches/patch-ad +++ b/mail/clamav/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.9 2005/02/14 11:20:13 grant Exp $ +$NetBSD: patch-ad,v 1.10 2006/10/19 07:30:15 martti Exp $ ---- docs/Makefile.in.orig 2005-02-14 09:40:05.000000000 +1100 -+++ docs/Makefile.in -@@ -182,6 +182,8 @@ EXTRA_DIST = clamdoc.pdf man clamav-mirr +--- docs/Makefile.in.orig 2006-10-15 21:46:39.000000000 +0000 ++++ docs/Makefile.in 2006-10-19 10:17:15.000000000 +0000 +@@ -191,6 +191,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 all: all-am diff --git a/mail/clamav/patches/patch-af b/mail/clamav/patches/patch-af index 4bf16e87e06..1e02c14e970 100644 --- a/mail/clamav/patches/patch-af +++ b/mail/clamav/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.1 2004/08/01 04:35:33 jlam Exp $ +$NetBSD: patch-af,v 1.2 2006/10/19 07:30:15 martti Exp $ ---- database/Makefile.in.orig Thu Jul 29 17:50:06 2004 -+++ database/Makefile.in -@@ -344,17 +344,6 @@ install: +--- database/Makefile.in.orig 2006-10-15 21:46:39.000000000 +0000 ++++ database/Makefile.in 2006-10-19 10:17:33.000000000 +0000 +@@ -351,17 +351,6 @@ @test -f $(DESTDIR)$(DBINST)/mirrors.txt && rm -f $(DESTDIR)$(DBINST)/mirrors.txt || true @test -f $(DESTDIR)$(DBINST)/viruses.db && rm -f $(DESTDIR)$(DBINST)/viruses.db || true @test -f $(DESTDIR)$(DBINST)/viruses.db2 && rm -f $(DESTDIR)$(DBINST)/viruses.db2 || true diff --git a/mail/clamav/patches/patch-ah b/mail/clamav/patches/patch-ah index 1a1a5286302..61de981376f 100644 --- a/mail/clamav/patches/patch-ah +++ b/mail/clamav/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.6 2005/11/04 03:47:49 grant Exp $ +$NetBSD: patch-ah,v 1.7 2006/10/19 07:30:15 martti Exp $ ---- clamav-milter/clamav-milter.c.orig 2005-10-26 07:40:59.000000000 +1000 -+++ clamav-milter/clamav-milter.c -@@ -2973,7 +2973,7 @@ clamfi_eom(SMFICTX *ctx) +--- clamav-milter/clamav-milter.c.orig 2006-04-29 19:14:28.000000000 +0000 ++++ clamav-milter/clamav-milter.c 2006-10-19 10:18:21.000000000 +0000 +@@ -2976,7 +2976,7 @@ clamfi_eom(SMFICTX *ctx) * the postmaster, so include * some useful information */ @@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.6 2005/11/04 03:47:49 grant Exp $ sendmailId, privdata->from); else fprintf(sendmail, _("A message sent from %s to\n"), -@@ -2987,7 +2987,7 @@ clamfi_eom(SMFICTX *ctx) +@@ -2990,7 +2990,7 @@ clamfi_eom(SMFICTX *ctx) fprintf(sendmail, _("\nThe message in question has been quarantined as %s\n"), privdata->filename); if(hflag) { @@ -20,7 +20,7 @@ $NetBSD: patch-ah,v 1.6 2005/11/04 03:47:49 grant Exp $ smfi_getsymval(ctx, "j"), privdata->from, smfi_getsymval(ctx, "_")); fputs(_("For your information, the original message headers were:\n\n"), sendmail); -@@ -4150,7 +4150,7 @@ qfile(struct privdata *privdata, const c +@@ -4151,7 +4151,7 @@ qfile(struct privdata *privdata, const c if(move(privdata->filename, newname) < 0) { if(use_syslog) -- cgit v1.2.3