Update F-PROT Antivirus packages to 6.2.3.

F-PROT Antivirus for Unix, version 6.2.3

* Fixed a problem with multiple connections in fpscand.
* Startup scripts have been tuned and improved.
* fpscand now overrides the loglevel when run in foreground mode, forces
  it to 7 (DEBUG).
* scan-mail.pl had trouble with multiple instances and temporary file cleanup,
  this had been fixed.
* The installer now has the wrapper script option for fpscan as default.

8 files changed, 34 insertions, 62 deletions

diff --git a/security/f-prot-antivirus6-fs-bin/distinfo b/security/f-prot-antivirus6-fs-bin/distinfo
index 29529c5b42a..66bd983220f 100644
--- a/security/f-prot-antivirus6-fs-bin/distinfo
+++ b/security/f-prot-antivirus6-fs-bin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/09/14 15:50:27 taca Exp $
+$NetBSD: distinfo,v 1.4 2013/03/14 16:35:32 taca Exp $
 
-SHA1 (fp-NetBSD.x86.32-fs-6.2.2.tar.gz) = ccb52a10f043c22c9a46d39ed9dac95c7f96a8d7
-RMD160 (fp-NetBSD.x86.32-fs-6.2.2.tar.gz) = b2e3c1bf2a352cd2069c7f00063a13ec5f5e724d
-Size (fp-NetBSD.x86.32-fs-6.2.2.tar.gz) = 31390417 bytes
+SHA1 (fp-NetBSD.x86.32-fs-6.2.3.tar.gz) = 16264c8e8d0988d44e8870f1a412364e940d6019
+RMD160 (fp-NetBSD.x86.32-fs-6.2.3.tar.gz) = 4251980189d820bb302258794fa58ea485e15c95
+Size (fp-NetBSD.x86.32-fs-6.2.3.tar.gz) = 31466902 bytes
diff --git a/security/f-prot-antivirus6-ms-bin/Makefile b/security/f-prot-antivirus6-ms-bin/Makefile
index bb1dad56c09..b2a95d77952 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.6 2012/10/23 18:16:27 asau Exp $
+# $NetBSD: Makefile,v 1.7 2013/03/14 16:35:32 taca Exp $
 #
 DISTNAME=		${FP_DISTNAME}
-PKGREVISION=		1
 CATEGORIES=		security
 
 MAINTAINER=		taca@NetBSD.org
diff --git a/security/f-prot-antivirus6-ms-bin/distinfo b/security/f-prot-antivirus6-ms-bin/distinfo
index e830d6eee23..eac0b768e85 100644
--- a/security/f-prot-antivirus6-ms-bin/distinfo
+++ b/security/f-prot-antivirus6-ms-bin/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2012/09/14 15:50:27 taca Exp $
+$NetBSD: distinfo,v 1.6 2013/03/14 16:35:32 taca Exp $
 
-SHA1 (fp-NetBSD.x86.32-ms-6.2.2.tar.gz) = e93b7fe311d194a38d6d1a7c18cf952e7d1ba759
-RMD160 (fp-NetBSD.x86.32-ms-6.2.2.tar.gz) = 071176ad7c2b048202fb675c873250ed6058b35b
-Size (fp-NetBSD.x86.32-ms-6.2.2.tar.gz) = 31806632 bytes
-SHA1 (patch-aa) = 5a4abf9cc615dfa28b899744712e2119f52e18ce
-SHA1 (patch-ab) = cc92bda1262e0d043ba39fefded3a08731ab7d77
-SHA1 (patch-ac) = 1c5aeb2677c6015328a6e58e660405cf6fdc2350
+SHA1 (fp-NetBSD.x86.32-ms-6.2.3.tar.gz) = e703c332f1961109151e60762446684077812955
+RMD160 (fp-NetBSD.x86.32-ms-6.2.3.tar.gz) = ebfa5c41a5bccff889aad788b3d2ec6a663552e0
+Size (fp-NetBSD.x86.32-ms-6.2.3.tar.gz) = 31872002 bytes
+SHA1 (patch-aa) = 3a66281eb9e1a053572cc8926184ecd2ff114bd7
+SHA1 (patch-ab) = d13debeb745de1f081309fd8154d2b0b09231c10
+SHA1 (patch-ac) = 5b0db7bd037e8411992ed39e7bae23fbe5998be0
diff --git a/security/f-prot-antivirus6-ms-bin/patches/patch-aa b/security/f-prot-antivirus6-ms-bin/patches/patch-aa
index 5c831b506e9..66b233899a1 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.2 2010/06/16 22:27:04 taca Exp $
+$NetBSD: patch-aa,v 1.3 2013/03/14 16:35:32 taca Exp $
 
---- mailtools/scan-mail.pl.orig	2010-04-12 14:18:39.000000000 +0000
+--- mailtools/scan-mail.pl.orig	2012-12-12 08:12:57.000000000 +0000
 +++ mailtools/scan-mail.pl
 @@ -81,11 +81,6 @@
  
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.2 2010/06/16 22:27:04 taca Exp $
  	SCANMAIL_BANLIST  => ['file_list_2 =','file_list_2_policy=drop', 'file_list_2_scanner=0'],
  	SCANMAIL_STOPLIST => ['file_list_3 =','file_list_3_policy=save', 'file_list_3_scanner=0']
  );
-@@ -201,6 +196,7 @@ if (my $val = $conf->{SCANMAIL_LOGLEVEL}
+@@ -217,6 +212,7 @@ if (my $val = $conf->{SCANMAIL_LOGLEVEL}
  # script, this is fugly
  #
  
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.2 2010/06/16 22:27:04 taca Exp $
  my $debug           = 0;
  my $verbose         = 0;
  my $quarantine      = 0;
-@@ -210,7 +206,7 @@ my $milter_cf       = '/etc/mail/sendmai
+@@ -226,7 +222,7 @@ my $milter_cf       = '/etc/mail/sendmai
  my $milter_conn     = undef;
  my $milter_name     = 'fp-milter';
  my $milter_pid      = undef;
@@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.2 2010/06/16 22:27:04 taca Exp $
  my $postfix         = 0;
  my $postfix_ret     = undef;
  my $server          = 0;
-@@ -219,7 +215,8 @@ my $proxy           = 0;
+@@ -235,7 +231,8 @@ my $proxy           = 0;
  my $proxy_addr      = '0.0.0.0:25';
  my $smtp_addr       = '127.0.0.1:26';
  my $backup          = 0;
@@ -50,20 +50,20 @@ $NetBSD: patch-aa,v 1.2 2010/06/16 22:27:04 taca Exp $
  
  # use this for really complex configuration of
  # scan-mail. /etc/f-prot.conf should take care of the simple things
-@@ -441,9 +438,11 @@ if ($daemon)
+@@ -467,9 +464,10 @@ 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 +601,12 @@ else
+@@ -628,6 +626,12 @@ else
  
  ##[ Subroutines ]##############################################################
  
@@ -76,39 +76,12 @@ $NetBSD: patch-aa,v 1.2 2010/06/16 22:27:04 taca Exp $
  # proxy address, smtp address
  sub run_smtp_proxy
  {
-@@ -1020,7 +1025,7 @@ sub do_scan
-         my $subdir = "/".$m.$d."/";
-         unless (-d $backup_location)
-         {
--            unless (mkdir($backup_location,1777))
-+            unless (mkdir($backup_location,1777) or $!{'EEXIST'})
-             {
-                 my $err = "Unable to create backup basedir $backup_location: $!";
-                 syslog err => $err;
-@@ -1032,7 +1037,7 @@ sub do_scan
+@@ -1058,7 +1062,7 @@ sub do_scan
  
          unless(-d $pathto)
          {
--              unless (mkdir($pathto,1777))
+-              unless (mkdir($pathto,1777) or $!{'EEXIST'})
 +	    unless (mkdir($pathto,1777) or $!{'EEXIST'})
              {
                  my $err = "Unable to create backup subdir $pathto: $!";
                  syslog err => $err;
-@@ -1080,7 +1085,16 @@ sub do_scan
- 	}
- 
-         # Try to delete the directory. Will fail unless it's empty.
--        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
-+	# in this script.
-+	#
-+	# #!/bin/sh
-+	# cd $backup_location
-+	# find . -type d -name '[0-1]*' -mtime +7 rmdir {} \; >/dev/null 2>&1
-+	#
-     }
-     else
-     {
diff --git a/security/f-prot-antivirus6-ms-bin/patches/patch-ab b/security/f-prot-antivirus6-ms-bin/patches/patch-ab
index b698a92cf3e..4b2fb6e3a02 100644
--- a/security/f-prot-antivirus6-ms-bin/patches/patch-ab
+++ b/security/f-prot-antivirus6-ms-bin/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.2 2010/06/16 22:27:04 taca Exp $
+$NetBSD: patch-ab,v 1.3 2013/03/14 16:35:32 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.orig	2012-12-12 08:12:57.000000000 +0000
 +++ perl/lib/Anomy/Sanitizer.pm
-@@ -189,7 +189,7 @@ my $default_config = 
+@@ -190,7 +190,7 @@ my $default_config = 
      # So if you are using random directory hashing make sure to create 
      # all the directories ahead of time!
      #
diff --git a/security/f-prot-antivirus6-ms-bin/patches/patch-ac b/security/f-prot-antivirus6-ms-bin/patches/patch-ac
index e93dd445e33..8a12046f541 100644
--- a/security/f-prot-antivirus6-ms-bin/patches/patch-ac
+++ b/security/f-prot-antivirus6-ms-bin/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.1 2010/06/16 22:27:04 taca Exp $
+$NetBSD: patch-ac,v 1.2 2013/03/14 16:35:32 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.orig	2012-12-12 08:12:57.000000000 +0000
 +++ perl/lib/Anomy/MIMEStream.pm
-@@ -1388,6 +1388,12 @@ sub Encode7bit
+@@ -1387,6 +1387,12 @@ sub Encode7bit
  	my $writer = shift;
  	my $line = shift;
  
diff --git a/security/f-prot-antivirus6-ws-bin/distinfo b/security/f-prot-antivirus6-ws-bin/distinfo
index 1b0a30fa009..4f1b5a5d058 100644
--- a/security/f-prot-antivirus6-ws-bin/distinfo
+++ b/security/f-prot-antivirus6-ws-bin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/09/14 15:50:27 taca Exp $
+$NetBSD: distinfo,v 1.4 2013/03/14 16:35:32 taca Exp $
 
-SHA1 (fp-NetBSD.x86.32-ws-6.2.2.tar.gz) = 7dae920aaf9dbb3c604cb73821dafa979ee3671e
-RMD160 (fp-NetBSD.x86.32-ws-6.2.2.tar.gz) = 78c80e67002e050b72a97be708b9e5c42c509d05
-Size (fp-NetBSD.x86.32-ws-6.2.2.tar.gz) = 30700749 bytes
+SHA1 (fp-NetBSD.x86.32-ws-6.2.3.tar.gz) = 40b1746452674377f4e9d860b585b493e5d5f8f7
+RMD160 (fp-NetBSD.x86.32-ws-6.2.3.tar.gz) = d60d74821da3fca7ed06120fb6bc8caa1739ff10
+Size (fp-NetBSD.x86.32-ws-6.2.3.tar.gz) = 30773476 bytes
diff --git a/security/f-prot-antivirus6/Makefile.common b/security/f-prot-antivirus6/Makefile.common
index 4ba8701de99..88875329ab1 100644
--- a/security/f-prot-antivirus6/Makefile.common
+++ b/security/f-prot-antivirus6/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2012/09/14 15:50:26 taca Exp $
+# $NetBSD: Makefile.common,v 1.6 2013/03/14 16:35:32 taca Exp $
 #
 # used by security/f-prot-antivirus6-ms-bin/Makefile
 # used by security/f-prot-antivirus6-fs-bin/Makefile
@@ -7,7 +7,7 @@
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-x86_64
 CONFLICTS+=		f-prot-antivirus6-{fs,ms,ws} fprot-workstation-bin-*
 
-VERSION=		6.2.2
+VERSION=		6.2.3
 
 # ws, ms, fs
 FP_TYPE?=	ms