Update anomy-sanitizer to 1.68

    Added system_io_file variable to allow plugging in of custom
    replacements for the IO::File module, to facilitate internal FRISK
    development.

    Fixed a problem with the mime-type auto-detection code which would
    corrupt certain messages when feat_log_after was enabled.  This
    probably also have caused problems in other cases, but so far none have
    been reported.

    Include the TNEF hooks in Sanitizer in default distribution and made
    inclusion of Anomy::TNEFStream "lazy" to save cycles in one-shot modes.
    Note that the Anomy::TNEFStream modules still isn't distributed by
    default.

    Tuned the MIME parser to catch more of the exploits illustrated on
    http://testvirus.org/.  Also fixed a bug in the position counting.  These
    two changes combined effect almost all of the test cases (lines containing
    pos= and MIME info almost all change).

    Added the following options to configure the HTML cleaner (all are off
    by default):

       feat_html_noexe     Disallow links to executables
       feat_html_unknown   Allow unknown HTML tags
       feat_html_paranoid  Paranoid HTML Cleaner mode, bans all src= links
                           and enables feat_html_noexe paranoia as well.

    Added code to decrease the odds that attachments with content-IDs
    ending in ".com" get mistakenly treated as executables.

    Tweaked MIME parsing to catch a few more odd virus-generated messages.

4 files changed, 8 insertions, 22 deletions

diff --git a/mail/anomy-sanitizer/Makefile b/mail/anomy-sanitizer/Makefile
index 1f0be225a57..b36a41c3477 100644
--- a/mail/anomy-sanitizer/Makefile
+++ b/mail/anomy-sanitizer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2004/04/29 23:04:34 kim Exp $
+# $NetBSD: Makefile,v 1.13 2004/06/06 14:58:29 mjl Exp $
 #
 
-DISTNAME=	anomy-sanitizer-1.66
+DISTNAME=	anomy-sanitizer-1.68
 CATEGORIES=	mail
 MASTER_SITES=	http://mailtools.anomy.net/dist/
 
@@ -49,6 +49,7 @@ do-install:
 	    CHANGELOG.sanitizer \
 	    CREDITS \
 	    README.sanitizer \
+	    UNICODE.TXT \
 	    contrib \
 	    sanitizer.html \
 	    ${ANOMYDOC}
diff --git a/mail/anomy-sanitizer/PLIST b/mail/anomy-sanitizer/PLIST
index 938db635f4c..fb3646725e7 100644
--- a/mail/anomy-sanitizer/PLIST
+++ b/mail/anomy-sanitizer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/09/21 14:17:26 taca Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/06/06 14:58:29 mjl Exp $
 lib/anomy-sanitizer/bin/Anomy/HTMLCleaner.pm
 lib/anomy-sanitizer/bin/Anomy/Log.pm
 lib/anomy-sanitizer/bin/Anomy/MIMEStream.pm
@@ -17,6 +17,7 @@ sbin/simplify
 share/doc/anomy-sanitizer/CHANGELOG.sanitizer
 share/doc/anomy-sanitizer/CREDITS
 share/doc/anomy-sanitizer/README.sanitizer
+share/doc/anomy-sanitizer/UNICODE.TXT
 share/doc/anomy-sanitizer/contrib/anomy.m4
 share/doc/anomy-sanitizer/contrib/check_for_virus
 share/doc/anomy-sanitizer/contrib/postfix.txt
diff --git a/mail/anomy-sanitizer/distinfo b/mail/anomy-sanitizer/distinfo
index cf8088d5114..28622e6a3a4 100644
--- a/mail/anomy-sanitizer/distinfo
+++ b/mail/anomy-sanitizer/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.6 2004/01/18 23:40:12 kim Exp $
+$NetBSD: distinfo,v 1.7 2004/06/06 14:58:29 mjl Exp $
 
-SHA1 (anomy-sanitizer-1.66.tar.gz) = 6cfc86ebd3a8da9961a7eea2ce8b0a0d7e703ec4
-Size (anomy-sanitizer-1.66.tar.gz) = 142149 bytes
-SHA1 (patch-aa) = c765c8aa8a22bf173cb0a34f8868617e9ef66572
+SHA1 (anomy-sanitizer-1.68.tar.gz) = 0ceba1e0155f873f9b947d664c951b98abe74f12
+Size (anomy-sanitizer-1.68.tar.gz) = 149703 bytes
diff --git a/mail/anomy-sanitizer/patches/patch-aa b/mail/anomy-sanitizer/patches/patch-aa
deleted file mode 100644
index f06e47ab7c4..00000000000
--- a/mail/anomy-sanitizer/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/01/18 23:40:12 kim Exp $
-
---- bin/Anomy/MIMEStream.pm.orig	2003-12-08 19:57:49.000000000 -0500
-+++ bin/Anomy/MIMEStream.pm	2004-01-18 18:26:17.000000000 -0500
-@@ -418,7 +418,9 @@
- 	$reader->ParseContentHeader("; _encoding=", "content-transfer-encoding", $header_log);
- 	$reader->ParseContentHeader("; _disposition=", "content-disposition", $header_log);
- 	$reader->ParseContentHeader("; _description=", "content-description", $header_log);
--	$reader->ParseContentHeader("; _id=", "content-id", $header_log);
-+	# commented out next, because it causes mail from ".com" domains
-+	# to be considered ".com" attachments -- kim at tac.nyc.ny.us
-+	#$reader->ParseContentHeader("; _id=", "content-id", $header_log);
- 
- 	# Set content decoder and encoder
- 	my $enc = lc($reader->{"mime"}->{"_encoding"} || "8bit");