Changes 0.95:

* Google Safe Browsing support.
* New clamav-milter.
* Clamd extensions.
* Improved API.
* ClamdTOP.
* Memory Pool Allocator.
* Unified Option Parser.

10 files changed, 75 insertions, 62 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index 6e7daabbd7e..e2bad81fe58 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2008/11/27 06:07:49 martti Exp $
+# $NetBSD: Makefile,v 1.90 2009/03/25 09:21:19 adam Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
-#PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clamav/}
 
@@ -13,7 +12,7 @@ COMMENT=	Anti-virus toolkit
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-CLAMAV_VERSION=		0.94.2
+CLAMAV_VERSION=		0.95
 
 USE_LIBTOOL=		yes
 
@@ -21,10 +20,11 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-clamav
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-dbdir=${CLAMAV_DBDIR}
-CONFIGURE_ARGS+=	--with-uid=${CLAMAV_USER}
+CONFIGURE_ARGS+=	--with-user=${CLAMAV_USER}
 CONFIGURE_ARGS+=	--with-group=${CLAMAV_GROUP}
-CONFIGURE_ARGS+=	--with-tcpwrappers
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
+CONFIGURE_ARGS+=	--with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
+CONFIGURE_ARGS+=	--with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -68,9 +68,10 @@ INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} CFGINST=${EGDIR} DBINST=${EGDIR}
 CONFIGURE_ARGS+=	--disable-zlib-vcheck
 
 .include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
+.include "../../devel/ncurses/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 d68019264ff..7f36e1893f9 100644
--- a/mail/clamav/PLIST
+++ b/mail/clamav/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.20 2008/04/12 22:43:03 jlam Exp $
+@comment $NetBSD: PLIST,v 1.21 2009/03/25 09:21:20 adam Exp $
 bin/clamav-config
 bin/clamconf
 bin/clamdscan
+bin/clamdtop
 bin/clamscan
 bin/freshclam
 bin/sigtool
@@ -12,6 +13,7 @@ lib/libclamunrar_iface.la
 lib/pkgconfig/libclamav.pc
 man/man1/clamconf.1
 man/man1/clamdscan.1
+man/man1/clamdtop.1
 man/man1/clamscan.1
 man/man1/freshclam.1
 man/man1/sigtool.1
diff --git a/mail/clamav/buildlink3.mk b/mail/clamav/buildlink3.mk
index 8045a3889d9..bff633106c5 100644
--- a/mail/clamav/buildlink3.mk
+++ b/mail/clamav/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:24:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2009/03/25 09:21:20 adam Exp $
 
 BUILDLINK_TREE+=	clamav
 
@@ -9,9 +9,9 @@ BUILDLINK_API_DEPENDS.clamav+=	clamav>=0.94.2
 BUILDLINK_PKGSRCDIR.clamav?=	../../mail/clamav
 
 .include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
-.include "../../security/tcp_wrappers/buildlink3.mk"
 .endif # CLAMAV_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-clamav
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index 0269e1781b5..3c6aea07995 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.56 2008/11/27 06:07:49 martti Exp $
+$NetBSD: distinfo,v 1.57 2009/03/25 09:21:20 adam Exp $
 
-SHA1 (clamav-0.94.2.tar.gz) = 82373d25db8b836fd88b2414df43bb0c7192cced
-RMD160 (clamav-0.94.2.tar.gz) = ae75e5f546f96b7fd0f76dcf9f4977ec95ba4dba
-Size (clamav-0.94.2.tar.gz) = 22107637 bytes
-SHA1 (patch-ad) = 019b5c83b4b5ccf9f91a79af458ea27e599d5ec9
-SHA1 (patch-af) = 06b7a1fbcc7a086afe955f4f775d9b40742b7286
-SHA1 (patch-ah) = e160264f7125974a1afe3678fc081b4d21fab0ee
+SHA1 (clamav-0.95.tar.gz) = 8550b79dc6a6e9a0782ee5bd029bbd107f9e085a
+RMD160 (clamav-0.95.tar.gz) = bd2431d12f3bb740a2cf535da4be512aa9ba2c14
+Size (clamav-0.95.tar.gz) = 24104169 bytes
+SHA1 (patch-aa) = 6b17ddb27affcd7d710adc919ee230ed19bd930c
+SHA1 (patch-ab) = b5233d23b5c1317cf8109d433ac1926361b7cdf7
+SHA1 (patch-ac) = e48939f2d2734d399dfaefb3ce031bbdb87fadf2
+SHA1 (patch-ad) = 1419f5b92b5e80bbc3b8a60678c0ee9829b5c557
+SHA1 (patch-af) = 6daee923421366d092c9592e8c29e55dbfaa1494
diff --git a/mail/clamav/patches/patch-aa b/mail/clamav/patches/patch-aa
new file mode 100644
index 00000000000..3e271e8389b
--- /dev/null
+++ b/mail/clamav/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.18 2009/03/25 09:21:20 adam Exp $
+
+--- clamdtop/clamdtop.c.orig	2009-03-25 10:02:38.000000000 +0100
++++ clamdtop/clamdtop.c
+@@ -29,6 +29,7 @@
+ #endif
+ 
+ #include <unistd.h>
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/mail/clamav/patches/patch-ab b/mail/clamav/patches/patch-ab
new file mode 100644
index 00000000000..37ea2b81463
--- /dev/null
+++ b/mail/clamav/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.11 2009/03/25 09:21:20 adam Exp $
+
+--- libclamunrar_iface/unrar_iface.h.orig	2009-03-20 22:16:29.000000000 +0100
++++ libclamunrar_iface/unrar_iface.h
+@@ -24,10 +24,6 @@
+ #include "clamav-config.h"
+ #endif
+ 
+-#define unrar_open libclamunrar_iface_LTX_unrar_open
+-#define unrar_extract_next_prepare libclamunrar_iface_LTX_unrar_extract_next_prepare
+-#define unrar_extract_next libclamunrar_iface_LTX_unrar_extract_next
+-#define unrar_close libclamunrar_iface_LTX_unrar_close
+ 
+ #ifndef HAVE_ATTRIB_PACKED
+ #define __attribute__(x)
diff --git a/mail/clamav/patches/patch-ac b/mail/clamav/patches/patch-ac
new file mode 100644
index 00000000000..2be7bd0ebf1
--- /dev/null
+++ b/mail/clamav/patches/patch-ac
@@ -0,0 +1,18 @@
+$NetBSD: patch-ac,v 1.5 2009/03/25 09:21:20 adam Exp $
+
+--- libclamunrar_iface/libclamunrar_iface.map.orig	2009-03-25 10:09:59.000000000 +0100
++++ libclamunrar_iface/libclamunrar_iface.map
+@@ -1,9 +1,9 @@
+ CLAMAV_PRIVATE {
+ 	global:
+-		libclamunrar_iface_LTX_unrar_open;
+-		libclamunrar_iface_LTX_unrar_extract_next;
+-		libclamunrar_iface_LTX_unrar_extract_next_prepare;
+-		libclamunrar_iface_LTX_unrar_close;
++		unrar_open;
++		unrar_extract_next;
++		unrar_extract_next_prepare;
++		unrar_close;
+ 	local:
+ 		*;
+ };
diff --git a/mail/clamav/patches/patch-ad b/mail/clamav/patches/patch-ad
index 8908634f930..eabe9ea3242 100644
--- a/mail/clamav/patches/patch-ad
+++ b/mail/clamav/patches/patch-ad
@@ -1,11 +1,9 @@
-$NetBSD: patch-ad,v 1.16 2008/11/04 07:16:18 martti Exp $
+$NetBSD: patch-ad,v 1.17 2009/03/25 09:21:20 adam Exp $
 
-Optionally build clamav-milter.8
-
---- docs/Makefile.in.orig	2008-10-30 18:13:31.000000000 +0200
-+++ docs/Makefile.in	2008-11-04 08:19:02.000000000 +0200
-@@ -221,6 +221,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
+--- docs/Makefile.in.orig	2009-03-23 18:09:28.000000000 +0100
++++ docs/Makefile.in
+@@ -235,6 +235,8 @@ EXTRA_DIST = html $(top_srcdir)/docs/man
+ 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
  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 4c4fb0d29aa..e3b69e4543d 100644
--- a/mail/clamav/patches/patch-af
+++ b/mail/clamav/patches/patch-af
@@ -1,10 +1,8 @@
-$NetBSD: patch-af,v 1.7 2008/11/04 07:16:18 martti Exp $
+$NetBSD: patch-af,v 1.8 2009/03/25 09:21:20 adam Exp $
 
-Installation fixes.
-
---- database/Makefile.in.orig	2008-10-30 18:13:31.000000000 +0200
-+++ database/Makefile.in	2008-11-04 08:19:27.000000000 +0200
-@@ -386,17 +386,6 @@
+--- database/Makefile.in.orig	2009-03-23 18:09:28.000000000 +0100
++++ database/Makefile.in
+@@ -400,17 +400,6 @@ install-data-local:
  	$(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-ah b/mail/clamav/patches/patch-ah
deleted file mode 100644
index 394b9ca251c..00000000000
--- a/mail/clamav/patches/patch-ah
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ah,v 1.17 2008/11/04 07:16:18 martti Exp $
-
-Build fixes.
-
---- clamav-milter/clamav-milter.c.orig	2008-10-16 11:29:55.000000000 +0300
-+++ clamav-milter/clamav-milter.c	2008-11-04 08:19:49.000000000 +0200
-@@ -3944,7 +3944,7 @@
- 						 * the postmaster, so include
- 						 * some useful information
- 						 */
--						fprintf(sendmail, _("The message %1$s sent from %2$s to\n"),
-+						fprintf(sendmail, _("The message %s sent from %s to\n"),
- 							sendmailId, privdata->from);
- 					else
- 						fprintf(sendmail, _("A message sent from %s to\n"),
-@@ -3958,7 +3958,7 @@
- 						fprintf(sendmail, _("\nThe message in question has been quarantined as %s\n"), privdata->filename);
- 
- 					if(hflag) {
--						fprintf(sendmail, _("\nThe message was received by %1$s from %2$s via %3$s\n\n"),
-+						fprintf(sendmail, _("\nThe message was received by %s from %s via %s\n\n"),
- 							smfi_getsymval(ctx, "j"), privdata->from,
- 							smfi_getsymval(ctx, "_"));
- 						fputs(_("For your information, the original message headers were:\n\n"), sendmail);
-@@ -5147,7 +5147,7 @@
- 	cli_dbgmsg("qfile move '%s' to '%s'\n", privdata->filename, newname);
- 
- 	if(move(privdata->filename, newname) < 0) {
--		logg(_("^Can't rename %1$s to %2$s\n"),
-+		logg(_("^Can't rename %s to %s\n"),
- 			privdata->filename, newname);
- 		free(newname);
- 		return -1;