update to 0.66

This version is a response to the "clamav 0.65 remote DOS exploit"
information published on popular security-related mailing lists.

Other changes include: (see the README for a full list)

-) clamd:
    + fixed database timestamp handling (and a double reload problem reported
      by Alex Pleiner and Ole Stanstrup)
    + new directive: ArchiveMaxCompressionRatio
    + new command: SESSION (starts a clamd session and allows to do multiple
      commands per TCP session)
    + new directives: TemporaryDirectory, LogClean (Andrey V. Malyshev)

-) freshclam:
    + support for freshclam.conf (that may be optionally merged with
      clamav.conf, command line options overwrite config settings)
    + work-around for potential database downgrade (subtle problem
      in r-r dns handling) - reported by Daniel Mario Vega and patched
      by Luca Gibelli

Fix build by rather patch "configure" directly instead of configure.in
(autoconf failed). Tested on NetBSD-current and Linux (some kind of Debian).

7 files changed, 83 insertions, 91 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index ce0e637a1b8..d96a9c31b4c 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2004/02/02 00:00:48 recht Exp $
+# $NetBSD: Makefile,v 1.10 2004/02/11 10:55:49 recht Exp $
 
-DISTNAME=	clamav-0.65
-PKGREVISION=	1
+DISTNAME=	clamav-0.66
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clamav/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clamav/} \
+		http://clamav.catt.com/stable/
 
 MAINTAINER=	david@netbsd-fr.org
 HOMEPAGE=	http://www.clamav.net/
 COMMENT=	Anti-virus toolkit
 
-AUTOCONF_REQD=		2.53	# clamav used 2.53
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 USE_PKGINSTALL=		yes
@@ -29,6 +28,7 @@ PKG_USERS+=     ${CLAMAV_USER}:${CLAMAV_GROUP}::Clamav\\ User
 
 EGDIR=		${PREFIX}/share/examples/clamav
 CONF_FILES=	${EGDIR}/clamav.conf ${PKG_SYSCONFDIR}/clamav.conf
+CONF_FILES+=	${EGDIR}/freshclam.conf ${PKG_SYSCONFDIR}/freshclam.conf
 PLIST_SRC=	${PKGDIR}/PLIST
 
 .include "../../mk/bsd.prefs.mk"
@@ -40,12 +40,6 @@ PLIST_SRC=	${PKGDIR}/PLIST
 CONFIGURE_ARGS+=	--disable-milter
 .endif
 
-pre-configure:
-	cd ${WRKSRC};						\
-	${ACLOCAL};						\
-	${AUTOMAKE} -a --foreign -i;				\
-	${AUTOCONF}
-
 # for freshclam to work it must own the share/clamav dir
 post-install:
 	${CHOWN} -R ${CLAMAV_USER}:${CLAMAV_GROUP} ${PREFIX}/share/clamav
@@ -54,6 +48,4 @@ post-install:
 .include "../../devel/zlib/buildlink2.mk"
 
 .include "../../mk/pthread.buildlink2.mk"
-.include "../../mk/autoconf.mk"
-.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/clamav/PLIST b/mail/clamav/PLIST
index f974ba3d9f2..e8446701566 100644
--- a/mail/clamav/PLIST
+++ b/mail/clamav/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/02/02 00:00:48 recht Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/02/11 10:55:49 recht Exp $
 bin/clamdscan
 bin/clamscan
 bin/freshclam
@@ -19,7 +19,7 @@ man/man8/clamd.8
 sbin/clamd
 share/clamav/daily.cvd
 share/clamav/main.cvd
-share/clamav/mirrors.txt
 share/examples/clamav/clamav.conf
+share/examples/clamav/freshclam.conf
 @dirrm share/examples/clamav
 @dirrm share/clamav
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index 93f0d848f88..738f34a6685 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.6 2004/02/02 00:00:48 recht Exp $
+$NetBSD: distinfo,v 1.7 2004/02/11 10:55:49 recht Exp $
 
-SHA1 (clamav-0.65.tar.gz) = 15cfd1f736d01d3039de87eaf1167b119b100bf0
-Size (clamav-0.65.tar.gz) = 1438425 bytes
-SHA1 (patch-aa) = b13503c4073df21532d9ce64924d88123b116c3f
-SHA1 (patch-ab) = 0d1ef00c0c1c64642461e353f7e4ed7f81e3a042
-SHA1 (patch-ac) = 920297ccb7659c7e70e9ae1b657059066b962310
-SHA1 (patch-ad) = eb593a2ab4d587e62e61e88ab9a6ca64799afea6
+SHA1 (clamav-0.66.tar.gz) = 1a008d33f8e2caf54708b952747e5a5266610cfc
+Size (clamav-0.66.tar.gz) = 2275692 bytes
+SHA1 (patch-aa) = 779aef1a73f78749e1e6b9ed5e5fd6eb0d537a41
+SHA1 (patch-ab) = 49f80b512704fec57c6b920d2625c083c756f957
+SHA1 (patch-ad) = 6f2bfa05bb3421280272719c03260784a7826e91
diff --git a/mail/clamav/patches/patch-aa b/mail/clamav/patches/patch-aa
index 88d3ed8aa68..50d1e7019b7 100644
--- a/mail/clamav/patches/patch-aa
+++ b/mail/clamav/patches/patch-aa
@@ -1,48 +1,61 @@
-$NetBSD: patch-aa,v 1.6 2004/02/02 00:00:48 recht Exp $
+$NetBSD: patch-aa,v 1.7 2004/02/11 10:55:49 recht Exp $
 
---- configure.in.orig	2003-11-12 02:27:29.000000000 +0100
-+++ configure.in	2004-02-02 00:03:11.000000000 +0100
-@@ -74,12 +74,15 @@
-     AC_CHECK_LIB(bz2, bzReadOpen, AC_DEFINE(NOBZ2PREFIX),)
+--- configure.orig	2004-02-11 00:16:08.000000000 +0100
++++ configure	2004-02-11 11:34:05.000000000 +0100
+@@ -8773,7 +8773,17 @@
  fi
  
+ 
 -have_milter="no"
--AC_CHECK_HEADER(libmilter/mfapi.h,have_milter="yes",)
--
- AC_ARG_ENABLE(milter,
- [  --enable-milter	  Build clamav-milter (if milter library found)],
--,have_milter="no")
-+want_milter=$enableval, want_milter=no)
++# Check whether --enable-milter or --disable-milter was given.
++if test "${enable_milter+set}" = set; then
++  enableval="$enable_milter"
++
++else
++  have_milter="no"
++  want_milter="no"
++fi;
 +
-+have_milter=no
 +if test "$want_milter" = "yes"
 +then
-+	AC_CHECK_HEADER(libmilter/mfapi.h,[have_milter=yes],)
+ if test "${ac_cv_header_libmilter_mfapi_h+set}" = set; then
+   echo "$as_me:$LINENO: checking for libmilter/mfapi.h" >&5
+ echo $ECHO_N "checking for libmilter/mfapi.h... $ECHO_C" >&6
+@@ -8879,15 +8889,7 @@
+   have_milter="yes"
+ fi
+ 
+-
+-
+-# Check whether --enable-milter or --disable-milter was given.
+-if test "${enable_milter+set}" = set; then
+-  enableval="$enable_milter"
+-
+-else
+-  have_milter="no"
+-fi;
 +fi
  
  want_dsig="yes"
- AC_ARG_ENABLE(dsig,
-@@ -193,7 +196,7 @@
- AC_DEFINE_UNQUOTED(CONFDIR,"$cfg_dir",)
- 
- dnl Do not overwrite the current config file
--AM_CONDITIONAL(INSTALL_CONF, test ! -r "$cfg_dir/clamav.conf")
-+AM_CONDITIONAL(INSTALL_CONF, test "yes" = "yes")
+ # Check whether --enable-dsig or --disable-dsig was given.
+@@ -9502,11 +9504,17 @@
  
- if test "$test_urandom" = "yes"
- then
-@@ -271,8 +274,12 @@
-     AC_DEFINE(C_BSD)
      ;;
  netbsd*)
--    AC_MSG_RESULT(NetBSD detected. Disabling thread support.)
+-    echo "$as_me:$LINENO: result: NetBSD detected. Disabling thread support." >&5
+-echo "${ECHO_T}NetBSD detected. Disabling thread support." >&6
 -    have_pthreads="no"
 +    if test "$have_pthreads" = "yes"; then
-+    	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
-+	CLAMD_LIBS="-lpthread"
-+	TH_SAFE="-thread-safe"
-+	AC_DEFINE(CL_THREAD_SAFE)
++        LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
++        CLAMD_LIBS="-lpthread"
++        TH_SAFE="-thread-safe"
+ 
+ cat >>confdefs.h <<\_ACEOF
++#define CL_THREAD_SAFE 1
++_ACEOF
++
 +    fi
-     AC_DEFINE(C_BSD)
-     ;;
- bsd*)
++cat >>confdefs.h <<\_ACEOF
+ #define C_BSD 1
+ _ACEOF
+ 
diff --git a/mail/clamav/patches/patch-ab b/mail/clamav/patches/patch-ab
index 96106938dbd..4bf03b033ce 100644
--- a/mail/clamav/patches/patch-ab
+++ b/mail/clamav/patches/patch-ab
@@ -1,19 +1,24 @@
-$NetBSD: patch-ab,v 1.2 2003/09/20 01:27:19 chris Exp $
+$NetBSD: patch-ab,v 1.3 2004/02/11 10:55:49 recht Exp $
 
---- etc/Makefile.am.orig	2000-02-16 20:21:00.000000000 +0000
-+++ etc/Makefile.am	2003-09-20 01:30:31.000000000 +0100
-@@ -18,11 +18,11 @@
- #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+--- etc/Makefile.in.orig	2004-02-11 11:41:38.000000000 +0100
++++ etc/Makefile.in	2004-02-11 11:42:22.000000000 +0100
+@@ -118,7 +118,7 @@
+ install_sh = @install_sh@
  
- EXTRA_DIST = clamav.conf
+ EXTRA_DIST = clamav.conf freshclam.conf
 -CFGINST = @CFGDIR@
 +CFGINST = $(datadir)/examples/clamav
-  
- if INSTALL_CONF
+ subdir = etc
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/clamav-config.h
+@@ -248,8 +248,8 @@
  
  install:
--	$(mkinstalldirs) $(DESTDIR)$(CFGINST)
--	@$(INSTALL_DATA) clamav.conf $(DESTDIR)$(CFGINST)
-+	$(mkinstalldirs) $(CFGINST)
-+	@$(INSTALL_DATA) clamav.conf $(CFGINST)
- endif
+ 	$(mkinstalldirs) $(DESTDIR)$(CFGINST)
+-@INSTALL_CLAMAV_CONF_TRUE@	@$(INSTALL_DATA) clamav.conf $(DESTDIR)$(CFGINST)
+-@INSTALL_FRESHCLAM_CONF_TRUE@	@$(INSTALL_DATA) 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 --git a/mail/clamav/patches/patch-ac b/mail/clamav/patches/patch-ac
deleted file mode 100644
index 965b51c9c6e..00000000000
--- a/mail/clamav/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/01/29 17:14:53 cube Exp $
-
---- docs/Makefile.am.orig	Wed Nov 12 02:08:39 2003
-+++ docs/Makefile.am
-@@ -15,5 +15,11 @@
- #  along with this program; if not, write to the Free Software
- #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
-+if BUILD_CLAMD
-+if HAVE_MILTER
-+MILTER_MANS = man/clamav-milter.8
-+endif
-+endif
-+
- EXTRA_DIST = clamdoc.pdf DMS Spanish Japanese html man FreeBSD-HowTo Portugese Turkish clamd_supervised clamav-mirror-howto.pdf signatures.pdf
--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_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamav.conf.5 man/clamdscan.1 $(MILTER_MANS)
diff --git a/mail/clamav/patches/patch-ad b/mail/clamav/patches/patch-ad
index c92b4c556b7..2777e04843e 100644
--- a/mail/clamav/patches/patch-ad
+++ b/mail/clamav/patches/patch-ad
@@ -1,16 +1,16 @@
-$NetBSD: patch-ad,v 1.1 2004/01/29 17:14:53 cube Exp $
+$NetBSD: patch-ad,v 1.2 2004/02/11 10:55:49 recht Exp $
 
---- docs/Makefile.in.orig	Wed Nov 12 02:36:50 2003
-+++ docs/Makefile.in
-@@ -114,8 +114,10 @@ am__include = @am__include@
+--- docs/Makefile.in.orig	2004-02-11 00:16:37.000000000 +0100
++++ docs/Makefile.in	2004-02-11 11:04:17.000000000 +0100
+@@ -115,8 +115,10 @@
  am__quote = @am__quote@
  install_sh = @install_sh@
  
 +@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@MILTER_MANS = man/clamav-milter.8
 +
- EXTRA_DIST = clamdoc.pdf DMS Spanish Japanese html man FreeBSD-HowTo Portugese Turkish clamd_supervised clamav-mirror-howto.pdf signatures.pdf
+ EXTRA_DIST = clamdoc.pdf DMS 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_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamav.conf.5 man/clamdscan.1 $(MILTER_MANS)
++man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamav.conf.5 man/clamdscan.1  $(MILTER_MANS)
  subdir = docs
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES =
+ CONFIG_HEADER = $(top_builddir)/clamav-config.h