From 91583c9584610e9fcf31c56e779ca49db3863d78 Mon Sep 17 00:00:00 2001 From: tron Date: Thu, 20 May 2010 21:58:58 +0000 Subject: Pullup ticket #3126 - requested by martti mail/clamav: bug fix update Revisions pulled up: - mail/clamav/Makefile 1.103 - mail/clamav/PLIST 1.25 - mail/clamav/distinfo 1.64 - mail/clamav/patches/patch-aa 1.21 - mail/clamav/patches/patch-ac 1.8 - mail/clamav/patches/patch-ad 1.21 - mail/clamav/patches/patch-af 1.12 - mail/clamav/patches/patch-ag 1.5 --- Module Name: pkgsrc Committed By: martti Date: Thu May 20 07:47:45 UTC 2010 Modified Files: pkgsrc/mail/clamav: Makefile PLIST distinfo pkgsrc/mail/clamav/patches: patch-aa patch-ac patch-ad patch-af patch-ag Log Message: Updated mail/clamav to 0.96.1 * Lots of bug fixes --- mail/clamav/Makefile | 4 ++-- mail/clamav/PLIST | 3 ++- mail/clamav/distinfo | 18 +++++++++--------- mail/clamav/patches/patch-aa | 4 ++-- mail/clamav/patches/patch-ac | 8 ++++---- mail/clamav/patches/patch-ad | 12 ++++++------ mail/clamav/patches/patch-af | 10 +++++----- mail/clamav/patches/patch-ag | 4 ++-- 8 files changed, 32 insertions(+), 31 deletions(-) diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile index 86d23f1a0b3..f31c98af43c 100644 --- a/mail/clamav/Makefile +++ b/mail/clamav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.102 2010/04/02 19:45:23 martti Exp $ +# $NetBSD: Makefile,v 1.102.2.1 2010/05/20 21:58:58 tron Exp $ DISTNAME= clamav-${CLAMAV_VERSION} PKGNAME= clamav-${CLAMAV_VERSION:S/-/./} @@ -15,7 +15,7 @@ LICENSE= gnu-gpl-v2 PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir -CLAMAV_VERSION= 0.96 +CLAMAV_VERSION= 0.96.1 USE_LIBTOOL= yes diff --git a/mail/clamav/PLIST b/mail/clamav/PLIST index 5d463d6f443..2372697adef 100644 --- a/mail/clamav/PLIST +++ b/mail/clamav/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.24 2010/04/02 19:45:24 martti Exp $ +@comment $NetBSD: PLIST,v 1.24.2.1 2010/05/20 21:58:59 tron Exp $ bin/clamav-config bin/clambc bin/clamconf @@ -18,6 +18,7 @@ man/man1/clamdtop.1 man/man1/clamscan.1 man/man1/freshclam.1 man/man1/sigtool.1 +man/man5/clamav-milter.conf.5 man/man5/clamd.conf.5 man/man5/freshclam.conf.5 man/man8/clamav-milter.8 diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo index 08afa91711a..51be6e1be7c 100644 --- a/mail/clamav/distinfo +++ b/mail/clamav/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.63 2010/04/01 12:02:22 martti Exp $ +$NetBSD: distinfo,v 1.63.2.1 2010/05/20 21:58:59 tron Exp $ -SHA1 (clamav-0.96.tar.gz) = be7cb37f2a6121cacc3cd3969eee212b96ef6b57 -RMD160 (clamav-0.96.tar.gz) = d9147d1da4fc7fa3e8d42b25c58a93f6bbaa588b -Size (clamav-0.96.tar.gz) = 39792593 bytes -SHA1 (patch-aa) = cf09def5ff3de0a551bb5cf8ec232cf7f7e0b54e +SHA1 (clamav-0.96.1.tar.gz) = cdb24490f402748cbfb57cc87592fe77b470e0a5 +RMD160 (clamav-0.96.1.tar.gz) = f0708b921c8b01a4309fe741ec141ab8cbdf2351 +Size (clamav-0.96.1.tar.gz) = 40568982 bytes +SHA1 (patch-aa) = 8539a90ac5591c86f7e9f6b8c073f36523f221a5 SHA1 (patch-ab) = a4d097b785f870cd6213811f504a553e6b87e229 -SHA1 (patch-ac) = d14cd2c0646c4d390f10b6b642e95b2638fa194b -SHA1 (patch-ad) = a6ea0f1e439feef3b6b9148dcea37c9b58b9d773 -SHA1 (patch-af) = ebd5b67c07fe58df8b303a34d1e64a772f6983d6 -SHA1 (patch-ag) = 64585150298220cff2257fd8b98a34f6c277d33d +SHA1 (patch-ac) = e28096ec1bb70d36877e3813cda228b0ede4d552 +SHA1 (patch-ad) = 7d7ea5f8cda22dca1a399ee1219f1f072d8a3eed +SHA1 (patch-af) = a58e2c484b34bbfccb62d6fdf35b552a15dc9bd3 +SHA1 (patch-ag) = cf4a0040a53c81402e8d15478407bc854af6fb30 diff --git a/mail/clamav/patches/patch-aa b/mail/clamav/patches/patch-aa index 9ba542ba5db..07d5dbc5173 100644 --- a/mail/clamav/patches/patch-aa +++ b/mail/clamav/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.20 2010/04/01 12:02:22 martti Exp $ +$NetBSD: patch-aa,v 1.20.2.1 2010/05/20 21:58:59 tron Exp $ -Fix compileation error DragonFly. +Fix compilation error DragonFly. --- clamdtop/clamdtop.c.orig 2009-06-01 19:20:12.000000000 +0300 +++ clamdtop/clamdtop.c 2009-06-11 07:31:58.000000000 +0300 diff --git a/mail/clamav/patches/patch-ac b/mail/clamav/patches/patch-ac index a613e709f7b..2b724564b97 100644 --- a/mail/clamav/patches/patch-ac +++ b/mail/clamav/patches/patch-ac @@ -1,10 +1,10 @@ -$NetBSD: patch-ac,v 1.7 2010/04/01 12:02:22 martti Exp $ +$NetBSD: patch-ac,v 1.7.2.1 2010/05/20 21:58:59 tron Exp $ Make this pkgsrc friedly. ---- libclamav/c++/configure.orig 2010-04-01 12:30:33.000000000 +0300 -+++ libclamav/c++/configure 2010-04-01 12:31:05.000000000 +0300 -@@ -14460,7 +14460,7 @@ +--- libclamav/c++/configure.orig 2010-05-07 21:08:04.000000000 +0300 ++++ libclamav/c++/configure 2010-05-20 10:06:33.000000000 +0300 +@@ -14504,7 +14504,7 @@ enable_optimized=default fi diff --git a/mail/clamav/patches/patch-ad b/mail/clamav/patches/patch-ad index 245a4c8c90c..4479e9d1a65 100644 --- a/mail/clamav/patches/patch-ad +++ b/mail/clamav/patches/patch-ad @@ -1,11 +1,11 @@ -$NetBSD: patch-ad,v 1.20 2010/04/01 12:02:22 martti Exp $ +$NetBSD: patch-ad,v 1.20.2.1 2010/05/20 21:58:59 tron Exp $ -Fix compileation error DragonFly. +Fix compilation error DragonFly. ---- docs/Makefile.in.orig 2010-03-24 19:01:19.000000000 +0200 -+++ docs/Makefile.in 2010-04-01 12:23:43.000000000 +0300 -@@ -270,6 +270,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 +--- docs/Makefile.in.orig 2010-05-14 14:16:49.000000000 +0300 ++++ docs/Makefile.in 2010-05-20 10:07:03.000000000 +0300 +@@ -273,6 +273,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 all: all-am +@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@MILTER_MANS = man/clamav-milter.8 diff --git a/mail/clamav/patches/patch-af b/mail/clamav/patches/patch-af index c9c792a77a2..01bd108e30d 100644 --- a/mail/clamav/patches/patch-af +++ b/mail/clamav/patches/patch-af @@ -1,10 +1,10 @@ -$NetBSD: patch-af,v 1.11 2010/04/01 12:02:23 martti Exp $ +$NetBSD: patch-af,v 1.11.2.1 2010/05/20 21:58:59 tron Exp $ -Fix compileation error DragonFly. +Fix compilation error DragonFly. ---- database/Makefile.in.orig 2010-03-24 19:01:19.000000000 +0200 -+++ database/Makefile.in 2010-04-01 12:24:10.000000000 +0300 -@@ -432,17 +432,6 @@ +--- database/Makefile.in.orig 2010-05-07 22:02:57.000000000 +0300 ++++ database/Makefile.in 2010-05-20 10:07:22.000000000 +0300 +@@ -435,17 +435,6 @@ $(mkinstalldirs) $(DESTDIR)$(DBINST);\ test -f $(DESTDIR)$(DBINST)/main.cvd || test -f $(DESTDIR)$(DBINST)/main.cld || $(INSTALL_DATA) $(srcdir)/main.cvd $(DESTDIR)$(DBINST);\ test -f $(DESTDIR)$(DBINST)/daily.cvd || test -f $(DESTDIR)$(DBINST)/daily.cld || $(INSTALL_DATA) $(srcdir)/daily.cvd $(DESTDIR)$(DBINST);\ diff --git a/mail/clamav/patches/patch-ag b/mail/clamav/patches/patch-ag index 8b19cf92462..7571f40a8d5 100644 --- a/mail/clamav/patches/patch-ag +++ b/mail/clamav/patches/patch-ag @@ -1,6 +1,6 @@ -$NetBSD: patch-ag,v 1.4 2010/04/01 12:02:23 martti Exp $ +$NetBSD: patch-ag,v 1.4.2.1 2010/05/20 21:58:59 tron Exp $ -Fix compileation error DragonFly. +Fix compilation error DragonFly. --- libclamav/others.h.orig 2010-03-31 19:39:38.000000000 +0300 +++ libclamav/others.h 2010-04-01 12:24:33.000000000 +0300 -- cgit v1.2.3