Pullup ticket 2147 - requested by martti

latest update for clamav

- pkgsrc/mail/clamav/Makefile				1.77-1.79
- pkgsrc/mail/clamav/buildlink3.mk			1.14
- pkgsrc/mail/clamav/distinfo				1.45-1.47
- pkgsrc/mail/clamav/options.mk				1.3
- pkgsrc/mail/clamav/patches/patch-aa			1.16
- pkgsrc/mail/clamav/patches/patch-ah			1.10

   Module Name:	pkgsrc
   Committed By:	xtraeme
   Date:		Wed Jul 11 17:44:22 UTC 2007

   Modified Files:
	   pkgsrc/mail/clamav: Makefile distinfo options.mk

   Log Message:
   Update to 0.91:

   ClamAV 0.91 is the first release to enable the anti-phishing technology
   in default builds. This technology combines heuristics with special
   signatures and provides effective protection against phishing threats.
   Other important changes and add-ons in this version include:

   - unpacker for NSIS (Nullsoft Scriptable Install System) self-extracting
      archives
   - unpacker for ASPack 2.12
   - new implementation of the Aho-Corasick pattern matcher providing
      better detection for wildcard enabled signatures
   - support for nibble matching and floating offsets
   - improved handling of .mdb files (fixes long startup times)
   - extraction of PE files embedded into other executables
   - better handling of PE & UPX
   - removed dependency on libcurl (improves stability)
   - libclamav.dll available under Windows
   - IPv6 support in clamav-milter
   - many other improvements and bugfixes
---
   Module Name:	pkgsrc
   Committed By:	martti
   Date:		Tue Jul 17 06:54:31 UTC 2007

   Modified Files:
	   pkgsrc/mail/clamav: Makefile buildlink3.mk distinfo
	   pkgsrc/mail/clamav/patches: patch-ah

   Log Message:
   Updated mail/clamav to 0.91.1

        - libclamav/others.c: bump f-level
        - libclamav/unrar/unrarvm.c: fix another occurrence of bb#555, thanks to
          Ludwig Nussel <ludwig.nussel*suse.de>
        - sigtool/sigtool.c: increase MAX_DEL_LOOKAHEAD, requested by Sven
        - libclamav/scanner.c: don't search for embedded PEs in zip files larger
          than 1 MB (bb#573)
        - clamav-milter: Fix memory leak when load balancing
        - clamav-milter: Chroot handling no longer marked as experimental
        - libclamav/nsis: fix macro collision on AIX - bb#570
        - libclamav/phishcheck.c: fix (null) FOUND
        - libclamav: rename x86 macroes due to collisions on HPUX
        - libclamav: Fix warnings on HP-UX
---
   Module Name:	pkgsrc
   Committed By:	martti
   Date:		Wed Jul 18 06:57:59 UTC 2007

   Modified Files:
	   pkgsrc/mail/clamav: Makefile distinfo
   Added Files:
	   pkgsrc/mail/clamav/patches: patch-aa

   Log Message:
   Updated mail/clamav to 0.91.1nb1

   Fix for https://wwws.clamav.net/bugzilla/show_bug.cgi?id=580

6 files changed, 34 insertions, 27 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index 3c4547025fb..79951a65ea3 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.75 2007/06/17 22:06:33 wiz Exp $
+# $NetBSD: Makefile,v 1.75.2.1 2007/07/27 23:06:54 ghen Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
-PKGREVISION=	2
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clamav/}
 
@@ -12,7 +12,7 @@ COMMENT=	Anti-virus toolkit
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-CLAMAV_VERSION=		0.90.3
+CLAMAV_VERSION=		0.91.1
 
 USE_LIBTOOL=		yes
 
diff --git a/mail/clamav/buildlink3.mk b/mail/clamav/buildlink3.mk
index beb7446751b..8f7dd132dea 100644
--- a/mail/clamav/buildlink3.mk
+++ b/mail/clamav/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2007/05/31 05:28:09 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13.2.1 2007/07/27 23:06:54 ghen Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CLAMAV_BUILDLINK3_MK:=	${CLAMAV_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	clamav
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}clamav
 
 .if ${CLAMAV_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.clamav+=	clamav>=0.90.3
+BUILDLINK_API_DEPENDS.clamav+=	clamav>=0.91.1
 BUILDLINK_PKGSRCDIR.clamav?=	../../mail/clamav
 .endif	# CLAMAV_BUILDLINK3_MK
 
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index f5ec6f5c8e5..42c34de9cfb 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.44 2007/05/31 05:26:46 martti Exp $
+$NetBSD: distinfo,v 1.44.2.1 2007/07/27 23:06:54 ghen Exp $
 
-SHA1 (clamav-0.90.3.tar.gz) = ec322b5ada9cf5b6faebd2d800985545ee2d28fa
-RMD160 (clamav-0.90.3.tar.gz) = 7dda3541afee8403c7fb98aa827f14b5a7a1d6ce
-Size (clamav-0.90.3.tar.gz) = 12496857 bytes
+SHA1 (clamav-0.91.1.tar.gz) = 51ff98325b5ffd49dfc0f0cbf92134c0d872cd21
+RMD160 (clamav-0.91.1.tar.gz) = a9b1526d11264d55e3ac38b7c16d27db43bf8a4e
+Size (clamav-0.91.1.tar.gz) = 13099119 bytes
+SHA1 (patch-aa) = bd290d0ba57f499eb04ab00fa6d87de3957673a1
 SHA1 (patch-ad) = 554c183224c04357609111c90d0145c08e13c1d0
 SHA1 (patch-af) = fe93995448f968c479ff91d52c1fa2a1e67ef137
-SHA1 (patch-ah) = 0b0865cca6bb8534740b510b7052dbe3390b996c
+SHA1 (patch-ah) = 7de0e2d743d452afb6d253aa4f3bce3ac28605d0
diff --git a/mail/clamav/options.mk b/mail/clamav/options.mk
index 0cfd97a1862..673ae1968d2 100644
--- a/mail/clamav/options.mk
+++ b/mail/clamav/options.mk
@@ -1,8 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2007/05/31 05:26:46 martti Exp $
+# $NetBSD: options.mk,v 1.2.2.1 2007/07/27 23:06:55 ghen Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.clamav
-PKG_SUPPORTED_OPTIONS=	curl milter clamav-experimental
-PKG_SUGGESTED_OPTIONS=	curl
+PKG_SUPPORTED_OPTIONS=	milter clamav-experimental
 
 .include "../../mk/bsd.options.mk"
 
@@ -21,14 +20,6 @@ CONFIGURE_ENV+=		ac_cv_header_libmilter_mfapi_h=no
 PLIST_SUBST+=		MILTER="@comment "
 .endif
 
-.if !empty(PKG_OPTIONS:Mcurl)
-.  include "../../www/curl/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-libcurl
-BUILDLINK_API_DEPENDS.curl+=curl>=7.10.0
-.else
-CONFIGURE_ARGS+=	--without-libcurl
-.endif
-
 .if !empty(PKG_OPTIONS:Mclamav-experimental)
 CONFIGURE_ARGS+=	--enable-experimental
 .endif
diff --git a/mail/clamav/patches/patch-aa b/mail/clamav/patches/patch-aa
new file mode 100644
index 00000000000..2fb8cc77d12
--- /dev/null
+++ b/mail/clamav/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.15.4.1 2007/07/27 23:06:55 ghen Exp $
+
+Fix for https://wwws.clamav.net/bugzilla/show_bug.cgi?id=580
+
+--- libclamav/htmlnorm.c.orig	2007-07-18 05:42:18.000000000 +0300
++++ libclamav/htmlnorm.c	2007-07-18 05:42:39.000000000 +0300
+@@ -1190,7 +1190,7 @@
+ 							html_output_str(file_buff_o2, buff, strlen(buff));
+ 						}
+ 					} else
+-							html_output_c(file_buff_o1, file_buff_o2, tolower(value));
++							html_output_c(file_buff_o1, file_buff_o2, tolower(value&0xff));
+ 					state = next_state;
+ 					next_state = HTML_BAD_STATE;
+ 					ptr++;
diff --git a/mail/clamav/patches/patch-ah b/mail/clamav/patches/patch-ah
index 7e807f9d55b..1e9387c30c8 100644
--- a/mail/clamav/patches/patch-ah
+++ b/mail/clamav/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.9 2007/03/06 10:32:34 martti Exp $
+$NetBSD: patch-ah,v 1.9.4.1 2007/07/27 23:06:55 ghen Exp $
 
---- clamav-milter/clamav-milter.c.orig	2007-03-02 01:27:19.000000000 +0200
-+++ clamav-milter/clamav-milter.c	2007-03-06 12:24:12.000000000 +0200
-@@ -3455,7 +3455,7 @@
+--- clamav-milter/clamav-milter.c.orig	2007-07-16 20:11:19.000000000 +0000
++++ clamav-milter/clamav-milter.c	2007-07-17 09:58:23.000000000 +0000
+@@ -3626,7 +3626,7 @@
  						 * the postmaster, so include
  						 * some useful information
  						 */
@@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.9 2007/03/06 10:32:34 martti Exp $
  							sendmailId, privdata->from);
  					else
  						fprintf(sendmail, _("A message sent from %s to\n"),
-@@ -3469,7 +3469,7 @@
+@@ -3640,7 +3640,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.9 2007/03/06 10:32:34 martti Exp $
  							smfi_getsymval(ctx, "j"), privdata->from,
  							smfi_getsymval(ctx, "_"));
  						fputs(_("For your information, the original message headers were:\n\n"), sendmail);
-@@ -4612,7 +4612,7 @@
+@@ -4821,7 +4821,7 @@
  	cli_dbgmsg("qfile move '%s' to '%s'\n", privdata->filename, newname);
  
  	if(move(privdata->filename, newname) < 0) {