update to 0.70

0.70
----

The two major changes in this version are new thread manager in clamd
and support for decoding MS Office VBA macros. Both of them have been
implemented by Trog. Besides, there are many improvements and bugfixes
(all listed in ChangeLog), a short summary:

-) clamd
    + new thread manager (with better SMP support)
    + on-access scanning now also available on FreeBSD (with Dazuko 2.0)
    + new directive ArchiveBlockEncrypted
    + new directive ReadTimeout (replaces ThreadTimeout)
    + handle SIGHUP (re-open logfile) and SIGUSR2 (reload database)
    + respect TCPAddr in stream scanner

-) clamav-milter:
    + TCPWrappers support

-) libclamav:
    + support MS Office documents (OLE2) and VBA macro decoding
    + support encrypted archive detection
    + new flags: CL_OLE2, CL_ENCRYPTED (see clamdoc.pdf, Section 6.1)
    + improve virus detection in big files
    + improve support for multipart, bounce and embedded RFC822 messages
    + improve RAR support
    + include backup snprintf implementation

-) clamscan:
    + new option: --block-encrypted

-) freshclam
    + new option: --pid, -p (write pid file if run as daemon)
    + handle SIGHUP (re-open logfile), SIGTERM (terminate with log message),
      SIGALRM and SIGUSR1 (wake up and check mirror)
    + fix bug with -u and -c handling

-) contrib
    + windows clamd client now available with source code

-) documentation:
    + new Polish documentation on ClamAV and Samba integration
    + official documentation updated

9 files changed, 35 insertions, 97 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index 91eebeead63..236e6f1bc73 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/04/14 16:30:42 tv Exp $
+# $NetBSD: Makefile,v 1.16 2004/04/25 21:37:59 recht Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
@@ -9,7 +9,7 @@ MAINTAINER=	david@netbsd-fr.org
 HOMEPAGE=	http://www.clamav.net/
 COMMENT=	Anti-virus toolkit
 
-CLAMAV_VERSION=	0.68-1
+CLAMAV_VERSION=	0.70
 
 USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
@@ -20,6 +20,7 @@ CONFIGURE_ARGS+=	--disable-clamav
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-uid=${CLAMAV_USER}
 CONFIGURE_ARGS+=	--with-group=${CLAMAV_GROUP}
+CONFIGURE_ARGS+=	--with-tcpwrappers
 
 BUILD_DEFS+=	CLAMAV_USER CLAMAV_GROUP USE_MILTER
 
@@ -33,12 +34,14 @@ CONF_FILES+=	${EGDIR}/freshclam.conf ${PKG_SYSCONFDIR}/freshclam.conf
 PLIST_SRC=	${PKGDIR}/PLIST
 
 .include "../../mk/bsd.prefs.mk"
-.if defined(USE_MILTER) && ${USE_MILTER} == "YES"
+.if defined(USE_MILTER) && !empty(USE_MILTER:M[yY][eE][sS])
 .include "../../mail/libmilter/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-milter
 PLIST_SRC+=		${PKGDIR}/PLIST.milter
 .else
 CONFIGURE_ARGS+=	--disable-milter
+# XXX --disable-milter doesn't work as expected, so we need this
+CONFIGURE_ENV+=		ac_cv_header_libmilter_mfapi_h=no
 .endif
 
 # for freshclam to work it must own the share/clamav dir
@@ -48,6 +51,7 @@ post-install:
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/clamav/PLIST b/mail/clamav/PLIST
index 8c78cf60976..8c919ede9d6 100644
--- a/mail/clamav/PLIST
+++ b/mail/clamav/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/04/23 22:07:53 reed Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/04/25 21:37:59 recht Exp $
 bin/clamdscan
 bin/clamscan
 bin/freshclam
@@ -8,7 +8,7 @@ lib/libclamav.a
 lib/libclamav.la
 lib/libclamav.so
 lib/libclamav.so.1
-lib/libclamav.so.1.3
+lib/libclamav.so.1.4
 man/man1/clamdscan.1
 man/man1/clamscan.1
 man/man1/freshclam.1
diff --git a/mail/clamav/PLIST.milter b/mail/clamav/PLIST.milter
index c242f90e95a..36c76af59a4 100644
--- a/mail/clamav/PLIST.milter
+++ b/mail/clamav/PLIST.milter
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST.milter,v 1.2 2004/01/29 17:14:16 cube Exp $
+@comment $NetBSD: PLIST.milter,v 1.3 2004/04/25 21:37:59 recht Exp $
 man/man8/clamav-milter.8
+sbin/clamav-milter
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index b4214c8cf7a..c23bbca7916 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.10 2004/04/16 11:50:41 tv Exp $
+$NetBSD: distinfo,v 1.11 2004/04/25 21:37:59 recht Exp $
 
-SHA1 (clamav-0.68-1.tar.gz) = d99dc0f88ad31df77441e5e4cfa1d6c66ac8f756
-Size (clamav-0.68-1.tar.gz) = 2170863 bytes
-SHA1 (patch-aa) = 6bd43ca5ed8e160ea5b1e69497c8cf71f4774bde
-SHA1 (patch-ab) = 49f80b512704fec57c6b920d2625c083c756f957
-SHA1 (patch-ac) = cab02632217fe4d75c0b48d0fd962d7822c3617d
-SHA1 (patch-ad) = 6f2bfa05bb3421280272719c03260784a7826e91
-SHA1 (patch-ae) = 2761d90b6551c3b5006edeead097dc5d2846a337
+SHA1 (clamav-0.70.tar.gz) = 81687ad9afd4bd4753cb390dec1d3f98b00abf6f
+Size (clamav-0.70.tar.gz) = 2347104 bytes
+SHA1 (patch-aa) = fad0dd5c5ce55b497159157401fa5da8c9025bd6
+SHA1 (patch-ab) = 88fe29d2ac3414bb44a78e3a29347aabd15350c8
+SHA1 (patch-ad) = 207480a81125d5879ea8527f1991161c32550930
diff --git a/mail/clamav/patches/patch-aa b/mail/clamav/patches/patch-aa
index 9c584fd82a5..79ad0f93951 100644
--- a/mail/clamav/patches/patch-aa
+++ b/mail/clamav/patches/patch-aa
@@ -1,25 +1,12 @@
-$NetBSD: patch-aa,v 1.8 2004/04/14 16:30:43 tv Exp $
+$NetBSD: patch-aa,v 1.9 2004/04/25 21:37:59 recht Exp $
 
---- configure.orig	2004-02-11 00:16:08.000000000 +0100
-+++ configure	2004-02-11 11:34:05.000000000 +0100
-@@ -9502,11 +9504,17 @@
- 
-     ;;
- netbsd*)
--    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"
+--- configure.orig	2004-04-17 00:48:32.000000000 +0200
++++ configure	2004-04-25 22:07:17.000000000 +0200
+@@ -9873,6 +9873,7 @@
+  	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
+  	CLAMD_LIBS="-lpthread"
+  	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
++	TH_SAFE="-thread-safe"
  
  cat >>confdefs.h <<\_ACEOF
-+#define CL_THREAD_SAFE 1
-+_ACEOF
-+
-+    fi
-+cat >>confdefs.h <<\_ACEOF
- #define C_BSD 1
- _ACEOF
- 
+ #define CL_THREAD_SAFE 1
diff --git a/mail/clamav/patches/patch-ab b/mail/clamav/patches/patch-ab
index 4bf03b033ce..a4eadced4c4 100644
--- a/mail/clamav/patches/patch-ab
+++ b/mail/clamav/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2004/02/11 10:55:49 recht Exp $
+$NetBSD: patch-ab,v 1.4 2004/04/25 21:37:59 recht Exp $
 
---- 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 @@
+--- etc/Makefile.in.orig	2004-04-17 00:50:44.000000000 +0200
++++ etc/Makefile.in	2004-04-25 21:29:51.000000000 +0200
+@@ -119,7 +119,7 @@
  install_sh = @install_sh@
  
  EXTRA_DIST = clamav.conf freshclam.conf
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.3 2004/02/11 10:55:49 recht Exp $
  subdir = etc
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = $(top_builddir)/clamav-config.h
-@@ -248,8 +248,8 @@
+@@ -249,8 +249,8 @@
  
  install:
  	$(mkinstalldirs) $(DESTDIR)$(CFGINST)
diff --git a/mail/clamav/patches/patch-ac b/mail/clamav/patches/patch-ac
deleted file mode 100644
index 810ab8a6dfb..00000000000
--- a/mail/clamav/patches/patch-ac
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2004/02/29 03:45:37 toshii Exp $
-
---- libclamav/others.c.orig	Wed Feb 11 08:03:01 2004
-+++ libclamav/others.c
-@@ -261,13 +261,13 @@
- 
- unsigned int cl_rndnum(unsigned int max)
- {
--	FILE *fd;
-+	int fd;
- 	unsigned int generated;
- 	char *byte;
- 	int size;
- 
- 
--    if((fd = fopen("/dev/urandom", "rb")) == NULL) {
-+    if((fd = open("/dev/urandom", O_RDONLY)) < 0) {
- 	cli_errmsg("!Can't open /dev/urandom.\n");
- 	return -1;
-     }
-@@ -276,12 +276,12 @@
-     size = sizeof(generated);
-     do {
- 	int bread;
--	bread = fread(byte, 1, size, fd);
-+	bread = read(fd, byte, size);
- 	size -= bread;
- 	byte += bread;
-     } while(size > 0);
- 
--    fclose(fd);
-+    close(fd);
-     return generated % max;
- }
- #endif
diff --git a/mail/clamav/patches/patch-ad b/mail/clamav/patches/patch-ad
index 2777e04843e..6ddb0c3c4d4 100644
--- a/mail/clamav/patches/patch-ad
+++ b/mail/clamav/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2004/02/11 10:55:49 recht Exp $
+$NetBSD: patch-ad,v 1.3 2004/04/25 21:37:59 recht Exp $
 
---- 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 @@
+--- docs/Makefile.in.orig	2004-04-17 00:50:41.000000000 +0200
++++ docs/Makefile.in	2004-04-25 21:30:17.000000000 +0200
+@@ -116,8 +116,10 @@
  am__quote = @am__quote@
  install_sh = @install_sh@
  
diff --git a/mail/clamav/patches/patch-ae b/mail/clamav/patches/patch-ae
deleted file mode 100644
index e0cbe6cafb1..00000000000
--- a/mail/clamav/patches/patch-ae
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/04/16 11:50:41 tv Exp $
-
---- clamav-milter/clamav-milter.c.orig	Fri Apr 16 07:48:37 2004
-+++ clamav-milter/clamav-milter.c
-@@ -1608,12 +1608,7 @@ clamfi_envfrom(SMFICTX *ctx, char **argv
- 
- 			/* 0.4 - use better error message */
- 			if(use_syslog) {
--#ifdef TARGET_OS_SOLARIS	/* no strerror_r */
- 				syslog(LOG_ERR, "Failed to connect to port %d given by clamd: %s", port, strerror(rc));
--#else
--				strerror_r(rc, buf, sizeof(buf));
--				syslog(LOG_ERR, "Failed to connect to port %d given by clamd: %s", port, buf);
--#endif
- 			}
- 
- 			return cl_error;