Updated mail/clamav to 0.91.2

  * Bugfixes and changes since 0.91.1:
    - libclamav/rtf.c: fix possible NULL dereference (bb#611)
    - libclamav/ole2_extract.c: properly initialise hdr.max_block_no (bb#603)
    - libclamav/htmlnorm.c: fix possible NULL dereference (bb#582),
      thanks to Stefanos Stamatis
    - libclamav/htmlnorm.c: fix call to tolower() (bb#580)
    - libclamav/filetypes.c: some embedded PEs were not being detected
    - clamav-milter: Fix compilation error on NetBSD2.0
    - clamav-milter: Black-hole-mode no longer needs to be run as root
    - libclamav/pdf.c: Bug 618, --block-max not always honoured
    - libclamav/phishcheck.c, regex_list.c, phish_whitelist.c: make debug
      output look better (patch from Sven)
    - libclamav/phishcheck.c: Don't report phishing on broken urls containing
      '>' in the hostname. (bb #619)
    - libclamav, sigtool: add support for PUA databases (.hdu, .mdu, .ndu),
      requested by Christoph
    - clamscan: add --detect-pua
    - clamd, clamd.conf: add DetectPUA
    - freshclam/mirman.c: properly handle mirror access times (bb#606, only
      outdated installations - three versions behind the latest one were
      affected by this problem),
      Reported by David F. Skoll <dfs*roaringpenguin.com>
    - clamav-milter:      Bug 614
    - libclamav/pdf.c:    Bug 608
    - clamav-milter:      SPF checking no longer experimental
    - libclamav/phishcheck.c: workaround Solaris problem with regexec() [bb #598
]
    - libclamav/matcher-ac.c: fix matching of patterns with prefixes and some
      other issues spotted by Glen <daineng*gmail.com>
    - clamav-milter/clamav-milter.c: Better use of res_init()
    - clamav-milter/clamav-milter.c: HP-UX doesn't have EX_CONFIG, reported
      by clam * ministry.se

6 files changed, 25 insertions, 41 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index f27f952d38b..7bcf06ab357 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.79 2007/07/18 06:57:59 martti Exp $
+# $NetBSD: Makefile,v 1.80 2007/08/22 08:02:57 martti Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
-PKGREVISION=	1
+#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.91.1
+CLAMAV_VERSION=		0.91.2
 
 USE_LIBTOOL=		yes
 
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+=	--disable-readdir-r
 CONFIGURE_ARGS+=	--enable-readdir_r
 .endif
 
-BUILD_DEFS+=	CLAMAV_DBDIR
+BUILD_DEFS+=	CLAMAV_USER CLAMAV_GROUP CLAMAV_DBDIR
 FILES_SUBST+=	CLAMAV_USER=${CLAMAV_USER:Q}
 MESSAGE_SUBST+=	CLAMAV_USER=${CLAMAV_USER}
 
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index 8b8f5357060..8f2b860bc19 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.47 2007/07/18 06:57:59 martti Exp $
+$NetBSD: distinfo,v 1.48 2007/08/22 08:02:57 martti Exp $
 
-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) = 7de0e2d743d452afb6d253aa4f3bce3ac28605d0
+SHA1 (clamav-0.91.2.tar.gz) = f18007c3045a1d78967adad805c6934d46ca6419
+RMD160 (clamav-0.91.2.tar.gz) = 9e181a7a4fd08377ff47663aed27f8cc97249a21
+Size (clamav-0.91.2.tar.gz) = 13394538 bytes
+SHA1 (patch-ad) = a2be74368afe30bb473ba02d967380f8cad02256
+SHA1 (patch-af) = 32922fa6a9f908c8fcd80452b505f39b29125b32
+SHA1 (patch-ah) = f142a2f052d5ebed148917d391c0648b4a7ef8dd
diff --git a/mail/clamav/patches/patch-aa b/mail/clamav/patches/patch-aa
deleted file mode 100644
index 2c2f773a1f1..00000000000
--- a/mail/clamav/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.16 2007/07/18 06:57:59 martti 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-ad b/mail/clamav/patches/patch-ad
index 5fb5220bcc7..66a1bc64cc1 100644
--- a/mail/clamav/patches/patch-ad
+++ b/mail/clamav/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.11 2007/02/16 14:40:41 xtraeme Exp $
+$NetBSD: patch-ad,v 1.12 2007/08/22 08:02:58 martti Exp $
 
---- docs/Makefile.in.orig	2007-02-16 15:25:08.000000000 +0100
-+++ docs/Makefile.in	2007-02-16 15:25:38.000000000 +0100
-@@ -203,6 +203,8 @@
+--- 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 @@
  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-af b/mail/clamav/patches/patch-af
index bf65efcdd68..0fbc6c5c25f 100644
--- a/mail/clamav/patches/patch-af
+++ b/mail/clamav/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 2007/02/16 14:40:41 xtraeme Exp $
+$NetBSD: patch-af,v 1.4 2007/08/22 08:02:58 martti Exp $
 
---- database/Makefile.in.orig	2007-02-16 15:27:18.000000000 +0100
-+++ database/Makefile.in	2007-02-16 15:28:06.000000000 +0100
-@@ -359,17 +359,6 @@
+--- database/Makefile.in.orig	2007-08-20 22:48:18.000000000 +0000
++++ database/Makefile.in	2007-08-22 10:57:32.000000000 +0000
+@@ -360,17 +360,6 @@
  	$(mkinstalldirs) $(DESTDIR)$(DBINST)
  	@test -f $(DESTDIR)$(DBINST)/main.cvd || test -d $(DESTDIR)$(DBINST)/main.inc || $(INSTALL_DATA) $(srcdir)/main.cvd $(DESTDIR)$(DBINST)
  	@test -f $(DESTDIR)$(DBINST)/daily.cvd || test -d $(DESTDIR)$(DBINST)/daily.inc || $(INSTALL_DATA) $(srcdir)/daily.cvd $(DESTDIR)$(DBINST)
diff --git a/mail/clamav/patches/patch-ah b/mail/clamav/patches/patch-ah
index 49dde949b60..15651c51144 100644
--- a/mail/clamav/patches/patch-ah
+++ b/mail/clamav/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.10 2007/07/17 06:54:31 martti Exp $
+$NetBSD: patch-ah,v 1.11 2007/08/22 08:02:58 martti Exp $
 
---- 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 @@
+--- 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 @@
  						 * the postmaster, so include
  						 * some useful information
  						 */
@@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.10 2007/07/17 06:54:31 martti Exp $
  							sendmailId, privdata->from);
  					else
  						fprintf(sendmail, _("A message sent from %s to\n"),
-@@ -3640,7 +3640,7 @@
+@@ -3740,7 +3740,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.10 2007/07/17 06:54:31 martti Exp $
  							smfi_getsymval(ctx, "j"), privdata->from,
  							smfi_getsymval(ctx, "_"));
  						fputs(_("For your information, the original message headers were:\n\n"), sendmail);
-@@ -4821,7 +4821,7 @@
+@@ -4924,7 +4924,7 @@
  	cli_dbgmsg("qfile move '%s' to '%s'\n", privdata->filename, newname);
  
  	if(move(privdata->filename, newname) < 0) {