From ddc4c1b3a81894cbb5b0d4aad3d48652dcec3588 Mon Sep 17 00:00:00 2001
From: grant <grant>
Date: Mon, 14 Feb 2005 11:20:13 +0000
Subject: update to 0.83.

changes since 0.82 (summarized):

  * clamd: change default value of StreamMaxPort to 2048
  * freshclam: add support for Foreground (requested by Jeremy Kitchen
	       <kitchen*scriptkitchen.com>)
  * clamav-milter:	Added --whistlist-file and --sendmail-cf options
			When in SESSION mode, not all sessions would send END

other changes are documentation and misc. bug fixes.
---
 mail/clamav/Makefile         |  4 ++--
 mail/clamav/distinfo         | 10 +++++-----
 mail/clamav/patches/patch-ad |  8 ++++----
 mail/clamav/patches/patch-ah | 12 ++++++------
 4 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'mail')

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index 93651052728..0b592bbb8e0 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/02/13 07:24:22 grant Exp $
+# $NetBSD: Makefile,v 1.35 2005/02/14 11:20:13 grant Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
@@ -11,7 +11,7 @@ COMMENT=	Anti-virus toolkit
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-CLAMAV_VERSION=		0.82
+CLAMAV_VERSION=		0.83
 
 USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index f002c9eb416..c8aafbbe79b 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2005/02/13 07:24:22 grant Exp $
+$NetBSD: distinfo,v 1.22 2005/02/14 11:20:13 grant Exp $
 
-SHA1 (clamav-0.82.tar.gz) = 83dd3b5881efee5d682f746419e5654cfb35e0e6
-Size (clamav-0.82.tar.gz) = 3565864 bytes
+SHA1 (clamav-0.83.tar.gz) = a8264834ee494b44d99db5b3a9e16599cb4e9026
+Size (clamav-0.83.tar.gz) = 3653658 bytes
 SHA1 (patch-aa) = 17c713c3b5833f895b7caa470ae31f3d45d60643
-SHA1 (patch-ad) = 6dffd1bbccf4effd0e073d366f1da35070521bd8
+SHA1 (patch-ad) = 3723ad7212f15ba4e2690127515bfb1f37b97f71
 SHA1 (patch-af) = 605728b133ddb95827285d06bfeec9400222f874
-SHA1 (patch-ah) = 9a62a7e5ad90f05df4972dfd3a129ce8848435e6
+SHA1 (patch-ah) = 7c87b3d497c446bf227128e5e149094e1edccd1f
diff --git a/mail/clamav/patches/patch-ad b/mail/clamav/patches/patch-ad
index 8d5a06f4032..ed4d3c1bca8 100644
--- a/mail/clamav/patches/patch-ad
+++ b/mail/clamav/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.8 2005/02/13 07:24:22 grant Exp $
+$NetBSD: patch-ad,v 1.9 2005/02/14 11:20:13 grant Exp $
 
---- docs/Makefile.in.orig	2005-02-07 08:28:08.000000000 +1100
+--- docs/Makefile.in.orig	2005-02-14 09:40:05.000000000 +1100
 +++ docs/Makefile.in
-@@ -179,6 +179,8 @@ EXTRA_DIST = clamdoc.pdf man clamav-mirr
+@@ -182,6 +182,8 @@ EXTRA_DIST = clamdoc.pdf man clamav-mirr
  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
  all: all-am
  
 +@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@MILTER_MANS = man/clamav-milter.8
 +
  .SUFFIXES:
- $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  	@for dep in $?; do \
diff --git a/mail/clamav/patches/patch-ah b/mail/clamav/patches/patch-ah
index eab7d893c0f..7aaf7882414 100644
--- a/mail/clamav/patches/patch-ah
+++ b/mail/clamav/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2005/02/13 07:24:22 grant Exp $
+$NetBSD: patch-ah,v 1.3 2005/02/14 11:20:13 grant Exp $
 
---- clamav-milter/clamav-milter.c.orig	2005-02-07 07:35:29.000000000 +1100
+--- clamav-milter/clamav-milter.c.orig	2005-02-14 08:44:28.000000000 +1100
 +++ clamav-milter/clamav-milter.c
-@@ -3251,7 +3251,7 @@ clamfi_eom(SMFICTX *ctx)
+@@ -3328,7 +3328,7 @@ clamfi_eom(SMFICTX *ctx)
  						 * the postmaster, so include
  						 * some useful information
  						 */
@@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.2 2005/02/13 07:24:22 grant Exp $
  							sendmailId, sender);
  					else
  						fprintf(sendmail, _("A message sent from %s to\n"),
-@@ -3265,7 +3265,7 @@ clamfi_eom(SMFICTX *ctx)
+@@ -3342,7 +3342,7 @@ clamfi_eom(SMFICTX *ctx)
  						fprintf(sendmail, _("\nThe message in question has been quarantined as %s\n"), privdata->filename);
  
  					if(hflag) {
@@ -20,9 +20,9 @@ $NetBSD: patch-ah,v 1.2 2005/02/13 07:24:22 grant Exp $
  							smfi_getsymval(ctx, "j"), sender,
  							smfi_getsymval(ctx, "_"));
  						fputs(_("For your information, the original message headers were:\n\n"), sendmail);
-@@ -4381,7 +4381,7 @@ qfile(struct privdata *privdata, const c
+@@ -4455,7 +4455,7 @@ qfile(struct privdata *privdata, const c
+ 
  	if(move(privdata->filename, newname) < 0) {
- 		perror(newname);
  		if(use_syslog)
 -			syslog(LOG_WARNING, _("Can't rename %1$s to %2$s"),
 +			syslog(LOG_WARNING, _("Can't rename %s to %s"),
-- 
cgit v1.2.3