From f76ae8ef7e469ac854de7ac7a5261054e5f322a0 Mon Sep 17 00:00:00 2001
From: ghen <ghen@pkgsrc.org>
Date: Tue, 18 Dec 2007 09:34:17 +0000
Subject: Pullup ticket 2251 - requested by martti latest update for clamav

- pkgsrc/mail/clamav/Makefile				1.81
- pkgsrc/mail/clamav/PLIST				1.19
- pkgsrc/mail/clamav/distinfo				1.49
- pkgsrc/mail/clamav/patches/patch-ad			1.13
- pkgsrc/mail/clamav/patches/patch-ah			1.12

   Module Name:	pkgsrc
   Committed By:	martti
   Date:		Tue Dec 18 08:16:11 UTC 2007

   Modified Files:
	   pkgsrc/mail/clamav: Makefile PLIST distinfo
	   pkgsrc/mail/clamav/patches: patch-ad patch-ah

   Log Message:
   Updated mail/clamav to 0.92

   This release provides various bugfixes, optimisations and improvements
   to the scanning engine. The new features include support for ARJ and
   SFX-ARJ archives, AutoIt, basic SPF parser in clamav-milter (to reduce
   phishing false-positives), faster scanning and others (see ChangeLog).
   To get a consistent behaviour of the anti-phishing module on all platforms,
   libclamav now includes the regex library from OpenBSD.
---
 mail/clamav/patches/patch-ad |  8 ++++----
 mail/clamav/patches/patch-ah | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'mail/clamav/patches')

diff --git a/mail/clamav/patches/patch-ad b/mail/clamav/patches/patch-ad
index 66a1bc64cc1..e8ed806463b 100644
--- a/mail/clamav/patches/patch-ad
+++ b/mail/clamav/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.12 2007/08/22 08:02:58 martti Exp $
+$NetBSD: patch-ad,v 1.12.2.1 2007/12/18 09:34:18 ghen Exp $
 
---- docs/Makefile.in.orig	2007-08-20 22:48:18.000000000 +0000
-+++ docs/Makefile.in	2007-08-22 10:56:42.000000000 +0000
-@@ -204,6 +204,8 @@
+--- docs/Makefile.in.orig	2007-12-13 01:06:48.000000000 +0200
++++ docs/Makefile.in	2007-12-18 09:33:55.000000000 +0200
+@@ -198,6 +198,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
  all: all-am
  
diff --git a/mail/clamav/patches/patch-ah b/mail/clamav/patches/patch-ah
index 15651c51144..04bd3ae0d2d 100644
--- a/mail/clamav/patches/patch-ah
+++ b/mail/clamav/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.11 2007/08/22 08:02:58 martti Exp $
+$NetBSD: patch-ah,v 1.11.2.1 2007/12/18 09:34:18 ghen Exp $
 
---- clamav-milter/clamav-milter.c.orig	2007-08-20 21:01:19.000000000 +0000
-+++ clamav-milter/clamav-milter.c	2007-08-22 10:57:57.000000000 +0000
-@@ -3726,7 +3726,7 @@
+--- clamav-milter/clamav-milter.c.orig	2007-12-13 00:41:25.000000000 +0200
++++ clamav-milter/clamav-milter.c	2007-12-18 09:34:20.000000000 +0200
+@@ -3803,7 +3803,7 @@
  						 * the postmaster, so include
  						 * some useful information
  						 */
@@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.11 2007/08/22 08:02:58 martti Exp $
  							sendmailId, privdata->from);
  					else
  						fprintf(sendmail, _("A message sent from %s to\n"),
-@@ -3740,7 +3740,7 @@
+@@ -3817,7 +3817,7 @@
  						fprintf(sendmail, _("\nThe message in question has been quarantined as %s\n"), privdata->filename);
  
  					if(hflag) {
@@ -20,7 +20,7 @@ $NetBSD: patch-ah,v 1.11 2007/08/22 08:02:58 martti Exp $
  							smfi_getsymval(ctx, "j"), privdata->from,
  							smfi_getsymval(ctx, "_"));
  						fputs(_("For your information, the original message headers were:\n\n"), sendmail);
-@@ -4924,7 +4924,7 @@
+@@ -5000,7 +5000,7 @@
  	cli_dbgmsg("qfile move '%s' to '%s'\n", privdata->filename, newname);
  
  	if(move(privdata->filename, newname) < 0) {
-- 
cgit v1.2.3