Update F-PROT Antivirus to 6.0.3.1.

pkgsrc changes:

* Fix PKGNAME to really intended to.
* Some permission problem with using scan-mail.pl


6.0.3 (Initially NetBSD only):

 - Scanning inside NSIS (Nullsoft) installer files

 - Generic IFRAME exploit detection

 - Numerous additions to the Eldorado heuristic engine, making it
   significantly more powerful than before - Scanning of 7-Zip, ACE
   and "solid RAR" archives - Improved scanning of JavaScript files

 - List of detected malware now includes Eldorado heuristic detections

 - Much faster initial loading of ANTIVIR.DEF

  - Scan engine updated

6 files changed, 43 insertions, 30 deletions

diff --git a/security/f-prot-antivirus6-ms-bin/Makefile b/security/f-prot-antivirus6-ms-bin/Makefile
index f4614a3d9f1..73f93656211 100644
--- a/security/f-prot-antivirus6-ms-bin/Makefile
+++ b/security/f-prot-antivirus6-ms-bin/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2010/02/14 10:56:32 taca Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/16 22:27:03 taca Exp $
 #
 DISTNAME=		${FP_DISTNAME}
-PKGREVISION=		1
 CATEGORIES=		security
 
 MAINTAINER=		taca@NetBSD.org
@@ -19,9 +18,10 @@ BUILD_DEFS+=		FPROT_GROUP FPROT_USER VARBASE
 
 VARDIR=			${VARBASE}/f-prot
 
-OWN_DIRS_PERMS+=	${VARDIR} ${BINOWN} ${BINGRP} 0751 \
-			${VARDIR}/backup ${BINOWN} ${BINGRP} 0700 \
-			${VARDIR}/tmp ${BINOWN} ${BINGRP} 0700 \
+OWN_DIRS_PERMS+=	${VARDIR} ${BINOWN} ${BINGRP} 0775 \
+			${VARDIR}/backup ${BINOWN} ${FPROT_GROUP} 0770 \
+			${VARDIR}/run ${BINOWN} ${FPROT_GROUP} 0770 \
+			${VARDIR}/tmp ${BINOWN} ${FPROT_GROUP} 0770 \
 
 FILES_SUBST+=		FPROT_USER=${FPROT_USER} VARDIR=${VARDIR}
 PLIST_SUBST+=		VARDIR=${VARDIR}
diff --git a/security/f-prot-antivirus6-ms-bin/distinfo b/security/f-prot-antivirus6-ms-bin/distinfo
index e2bbf5bbab7..1d3e12d45df 100644
--- a/security/f-prot-antivirus6-ms-bin/distinfo
+++ b/security/f-prot-antivirus6-ms-bin/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/09/22 17:41:07 taca Exp $
+$NetBSD: distinfo,v 1.2 2010/06/16 22:27:03 taca Exp $
 
-SHA1 (patch-aa) = bf94f9d3ce9d714cbf6386e855eb383ecc04027d
-SHA1 (patch-ab) = 60f226d61487115eba5ffb7bb3bb2d3c75fca1c9
+SHA1 (patch-aa) = 5a4abf9cc615dfa28b899744712e2119f52e18ce
+SHA1 (patch-ab) = cc92bda1262e0d043ba39fefded3a08731ab7d77
+SHA1 (patch-ac) = 1c5aeb2677c6015328a6e58e660405cf6fdc2350
diff --git a/security/f-prot-antivirus6-ms-bin/files/scanmail.sh b/security/f-prot-antivirus6-ms-bin/files/scanmail.sh
index 3792e887f35..c2cff22e821 100644
--- a/security/f-prot-antivirus6-ms-bin/files/scanmail.sh
+++ b/security/f-prot-antivirus6-ms-bin/files/scanmail.sh
@@ -1,5 +1,5 @@
 #!@RCD_SCRIPTS_SHELL@
-# $NetBSD: scanmail.sh,v 1.1.1.1 2009/09/22 17:41:07 taca Exp $
+# $NetBSD: scanmail.sh,v 1.2 2010/06/16 22:27:04 taca Exp $
 
 # PROVIDE: scanmail
 # REQUIRE: fpscand
@@ -11,7 +11,7 @@ name="scanmail"
 rcvar=$name
 command="@PREFIX@/@FPROTDIR@/scan-mail.pl"
 command_interpreter="@PREFIX@/bin/perl"
-pidfile="@VARDIR@/scan-mail.pid"
+pidfile="@VARDIR@/run/scan-mail.pid"
 datadir="@VARDIR@"
 required_files="${command}"
 command_args="--daemon"
diff --git a/security/f-prot-antivirus6-ms-bin/patches/patch-aa b/security/f-prot-antivirus6-ms-bin/patches/patch-aa
index 45ec67fcf24..5c831b506e9 100644
--- a/security/f-prot-antivirus6-ms-bin/patches/patch-aa
+++ b/security/f-prot-antivirus6-ms-bin/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/09/22 17:41:07 taca Exp $
+$NetBSD: patch-aa,v 1.2 2010/06/16 22:27:04 taca Exp $
 
---- mailtools/scan-mail.pl.orig	2008-01-19 23:53:47.000000000 +0900
+--- mailtools/scan-mail.pl.orig	2010-04-12 14:18:39.000000000 +0000
 +++ mailtools/scan-mail.pl
 @@ -81,11 +81,6 @@
  
@@ -46,33 +46,24 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/09/22 17:41:07 taca Exp $
  my $backup          = 0;
 -my $backup_location = "$Bin/../backup/";
 +my $backup_location = "$datadir/backup/";
-+my $pid_file	    = "$datadir/scan-mail.pid";
++my $pid_file	    = "$datadir/run/scan-mail.pid";
  
  # use this for really complex configuration of
  # scan-mail. /etc/f-prot.conf should take care of the simple things
-@@ -239,7 +236,7 @@ if (my $val = $conf->{SCANMAIL_DROP_MALW
- # The temporary dir to use for files that are scanned and tmp data
- # produced elsewhere (via tmpfile) in the program
- my $TMPDIR = do {
--    my $tmp = '/tmp'; # default
-+    my $tmp = '/var/tmp'; # default
- 
-     if ($ENV{TMPDIR} and $ENV{TMPDIR} ne $tmp) {
-         $tmp = $ENV{TMPDIR};
-@@ -441,9 +438,10 @@ if ($daemon)
+@@ -441,9 +438,11 @@ if ($daemon)
      defined(my $pid = fork)    or die "Can't fork: $!";
      exit if $pid;
      setsid                     or die "Can't start a new session: $!";
 -    open PID_FILE, '>/var/run/scan-mail.pid' or die "Can't open pid file: $!";
--    print PID_FILE $$;
 +    open PID_FILE, ">$pid_file" or die "Can't open pid file: $!";
 +    print PID_FILE "$$\n";
+     print PID_FILE $$;
      close PID_FILE;
 +    $SIG{'TERM'} = $SIG{'HUP'} = \&clean_up;
      open STDERR, '>&STDOUT'    or die "Can't dup stdout: $!";
  }
  
-@@ -602,6 +600,12 @@ else
+@@ -602,6 +601,12 @@ else
  
  ##[ Subroutines ]##############################################################
  
@@ -85,7 +76,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/09/22 17:41:07 taca Exp $
  # proxy address, smtp address
  sub run_smtp_proxy
  {
-@@ -1020,7 +1024,7 @@ sub do_scan
+@@ -1020,7 +1025,7 @@ sub do_scan
          my $subdir = "/".$m.$d."/";
          unless (-d $backup_location)
          {
@@ -94,7 +85,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/09/22 17:41:07 taca Exp $
              {
                  my $err = "Unable to create backup basedir $backup_location: $!";
                  syslog err => $err;
-@@ -1032,7 +1036,7 @@ sub do_scan
+@@ -1032,7 +1037,7 @@ sub do_scan
  
          unless(-d $pathto)
          {
@@ -103,12 +94,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/09/22 17:41:07 taca Exp $
              {
                  my $err = "Unable to create backup subdir $pathto: $!";
                  syslog err => $err;
-@@ -1080,7 +1084,16 @@ sub do_scan
+@@ -1080,7 +1085,16 @@ sub do_scan
  	}
  
          # Try to delete the directory. Will fail unless it's empty.
 -        rmdir($pathto);
-+        # rmdir($pathto);
++	# rmdir($pathto);
 +	#
 +	# But it cause some race, keep the directory and remove it by
 +	# another script using find command or execute same functionality
diff --git a/security/f-prot-antivirus6-ms-bin/patches/patch-ab b/security/f-prot-antivirus6-ms-bin/patches/patch-ab
index 53c3618cbe7..b698a92cf3e 100644
--- a/security/f-prot-antivirus6-ms-bin/patches/patch-ab
+++ b/security/f-prot-antivirus6-ms-bin/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/09/22 17:41:07 taca Exp $
+$NetBSD: patch-ab,v 1.2 2010/06/16 22:27:04 taca Exp $
+
+use /var/tmp instead of /tmp.
 
 --- perl/lib/Anomy/Sanitizer.pm.orig	2008-01-19 23:53:47.000000000 +0900
 +++ perl/lib/Anomy/Sanitizer.pm
diff --git a/security/f-prot-antivirus6-ms-bin/patches/patch-ac b/security/f-prot-antivirus6-ms-bin/patches/patch-ac
new file mode 100644
index 00000000000..e93dd445e33
--- /dev/null
+++ b/security/f-prot-antivirus6-ms-bin/patches/patch-ac
@@ -0,0 +1,19 @@
+$NetBSD: patch-ac,v 1.1 2010/06/16 22:27:04 taca Exp $
+
+Avoid strip 8bit character unconditionally.
+
+--- perl/lib/Anomy/MIMEStream.pm.orig	2010-04-12 14:18:39.000000000 +0000
++++ perl/lib/Anomy/MIMEStream.pm
+@@ -1388,6 +1388,12 @@ sub Encode7bit
+ 	my $writer = shift;
+ 	my $line = shift;
+ 
++	# There is a broken MUA create mutipart mail whose body is "7bit"
++	# but includes "8bit" part in it.
++	# We wish F-PROT Antivirus to check Virus scaning but don't want
++	# to fix such broken mail message.
++	return $line;
++
+ 	# This performs some "nice" iso-8859-1 -> US-ASCII munging.
+ 	# Probably not be a good idea (shouldn't this be in the "charset" mapping
+ 	# code I haven't written?) ... but hopefully it'll never even be used, so