[pkgsrc/trunk]: pkgsrc Update mail/clamav to 0.74.

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a5852aeaaf22
branches:  trunk
changeset: 478289:a5852aeaaf22
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Wed Jul 21 02:48:58 2004 +0000

description:
Update mail/clamav to 0.74.

Bugfixes in this version include crashes with multipart/mixed messages
and corrupted OLE2 and Zip files. Improvements include various optimisations
of mail scanning and clamav-milter and clamdscan behaviour.

diffstat:

 doc/CHANGES                  |   3 ++-
 doc/TODO                     |   3 +--
 mail/clamav/Makefile         |   4 ++--
 mail/clamav/distinfo         |  10 +++++-----
 mail/clamav/patches/patch-ab |  21 +++++++++++----------
 mail/clamav/patches/patch-ad |  25 +++++++++++++------------
 6 files changed, 34 insertions(+), 32 deletions(-)

diffs (137 lines):

diff -r 278c896160c6 -r a5852aeaaf22 doc/CHANGES
--- a/doc/CHANGES       Wed Jul 21 01:54:45 2004 +0000
+++ b/doc/CHANGES       Wed Jul 21 02:48:58 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6624 2004/07/21 01:54:45 minskim Exp $
+$NetBSD: CHANGES,v 1.6625 2004/07/21 02:48:58 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -3481,3 +3481,4 @@
        Updated mkvtoolnix to 0.9.3 [salo 2004-07-21]
        Updated mmg to 0.9.3 [salo 2004-07-21]
        Updated xchm to 0.9.3 [minskim 2004-07-21]
+       Updated clamav to 0.74 [xtraeme 2004-07-21]
diff -r 278c896160c6 -r a5852aeaaf22 doc/TODO
--- a/doc/TODO  Wed Jul 21 01:54:45 2004 +0000
+++ b/doc/TODO  Wed Jul 21 02:48:58 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.1960 2004/07/21 01:54:45 minskim Exp $
+$NetBSD: TODO,v 1.1961 2004/07/21 02:48:58 xtraeme Exp $
 
 Suggested new packages
 ======================
@@ -183,7 +183,6 @@
        o centericq-4.10.0
        o cervisia-2.1.2
        o checkbot-1.75 [pkg/26371]
-       o clamav-0.74
        o clanlib-0.7.8
        o classpath-0.10
        o clisp-2.33.2
diff -r 278c896160c6 -r a5852aeaaf22 mail/clamav/Makefile
--- a/mail/clamav/Makefile      Wed Jul 21 01:54:45 2004 +0000
+++ b/mail/clamav/Makefile      Wed Jul 21 02:48:58 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/06/21 16:16:24 martti Exp $
+# $NetBSD: Makefile,v 1.19 2004/07/21 02:48:58 xtraeme Exp $
 
 DISTNAME=      clamav-${CLAMAV_VERSION}
 PKGNAME=       clamav-${CLAMAV_VERSION:S/-/./}
@@ -11,7 +11,7 @@
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
-CLAMAV_VERSION=        0.73
+CLAMAV_VERSION=        0.74
 
 USE_BUILDLINK3=                yes
 GNU_CONFIGURE=         yes
diff -r 278c896160c6 -r a5852aeaaf22 mail/clamav/distinfo
--- a/mail/clamav/distinfo      Wed Jul 21 01:54:45 2004 +0000
+++ b/mail/clamav/distinfo      Wed Jul 21 02:48:58 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2004/06/21 16:16:24 martti Exp $
+$NetBSD: distinfo,v 1.14 2004/07/21 02:48:58 xtraeme Exp $
 
-SHA1 (clamav-0.73.tar.gz) = a7ef52d726f241e9db96beff97c934c78a23af22
-Size (clamav-0.73.tar.gz) = 2646169 bytes
+SHA1 (clamav-0.74.tar.gz) = 910658b8f0cf88c730bd1a621282de2ee97f3c84
+Size (clamav-0.74.tar.gz) = 2660935 bytes
 SHA1 (patch-aa) = f82827375cca03499889b92563ccc338a4fa66fc
-SHA1 (patch-ab) = 898206d4d39a65a8ba353d7707d1d873b4e173e2
-SHA1 (patch-ad) = 252733f9391935489daa46f7d2b2c55c6c1896ea
+SHA1 (patch-ab) = f2a2a03f2be04a56b43e6ddd56e9ef7d231f8955
+SHA1 (patch-ad) = 6699745bb75230de378c54bc82862dfe53732e9d
diff -r 278c896160c6 -r a5852aeaaf22 mail/clamav/patches/patch-ab
--- a/mail/clamav/patches/patch-ab      Wed Jul 21 01:54:45 2004 +0000
+++ b/mail/clamav/patches/patch-ab      Wed Jul 21 02:48:58 2004 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.5 2004/06/04 15:43:25 xtraeme Exp $
+$NetBSD: patch-ab,v 1.6 2004/07/21 02:48:58 xtraeme Exp $
 
---- etc/Makefile.in.orig       2004-06-04 15:34:54.000000000 +0000
-+++ etc/Makefile.in    2004-06-04 15:35:42.000000000 +0000
-@@ -120,7 +120,7 @@
- install_sh = @install_sh@
- 
+--- etc/Makefile.in.orig       2004-07-21 04:38:49.000000000 +0200
++++ etc/Makefile.in    2004-07-21 04:39:56.000000000 +0200
+@@ -176,7 +176,7 @@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
  EXTRA_DIST = clamav.conf freshclam.conf
 -CFGINST = @CFGDIR@
 +CFGINST = $(datadir)/examples/clamav
- subdir = etc
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/clamav-config.h
-@@ -250,8 +250,8 @@
+ all: all-am
+ 
+ .SUFFIXES:
+@@ -339,8 +339,9 @@
  
  install:
        $(mkinstalldirs) $(DESTDIR)$(CFGINST)
@@ -19,6 +19,7 @@
 -@INSTALL_FRESHCLAM_CONF_TRUE@ @$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)
 +      @$(INSTALL_DATA) clamav.conf $(DESTDIR)$(CFGINST)
 +      @$(INSTALL_DATA) freshclam.conf $(DESTDIR)$(CFGINST)
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
diff -r 278c896160c6 -r a5852aeaaf22 mail/clamav/patches/patch-ad
--- a/mail/clamav/patches/patch-ad      Wed Jul 21 01:54:45 2004 +0000
+++ b/mail/clamav/patches/patch-ad      Wed Jul 21 02:48:58 2004 +0000
@@ -1,16 +1,17 @@
-$NetBSD: patch-ad,v 1.4 2004/06/04 15:43:25 xtraeme Exp $
+$NetBSD: patch-ad,v 1.5 2004/07/21 02:48:58 xtraeme Exp $
 
---- docs/Makefile.in.orig      2004-06-04 15:33:21.000000000 +0000
-+++ docs/Makefile.in   2004-06-04 15:33:54.000000000 +0000
-@@ -117,8 +117,10 @@
- am__quote = @am__quote@
- install_sh = @install_sh@
+--- docs/Makefile.in.orig      2004-07-21 04:42:08.000000000 +0200
++++ docs/Makefile.in   2004-07-21 04:43:58.000000000 +0200
+@@ -180,9 +180,11 @@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ EXTRA_DIST = clamdoc.pdf DMS German Spanish Japanese html man FreeBSD-HowTo Portugese Turkish clamd_supervised clamav-mirror-howto.pdf signatures.pdf French Polish
+-man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamav.conf.5 man/clamdscan.1 man/clamav-milter.8 man/freshclam.conf.5
++man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamav.conf.5 man/clamdscan.1 man/freshclam.conf.5
+ all: all-am
  
 +@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@MILTER_MANS = man/clamav-milter.8
 +
- EXTRA_DIST = clamdoc.pdf DMS German Spanish Japanese html man FreeBSD-HowTo Portugese Turkish clamd_supervised clamav-mirror-howto.pdf signatures.pdf French Polish
--man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamav.conf.5 man/clamdscan.1 man/clamav-milter.8 man/freshclam.conf.5
-+man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamav.conf.5 man/clamdscan.1 man/freshclam.conf.5
- subdir = docs
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/clamav-config.h
+ .SUFFIXES:
+ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+       @for dep in $?; do \