pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security Update F-PROT Antivirus to 6.0.3.1.
details: https://anonhg.NetBSD.org/pkgsrc/rev/72f24e37e853
branches: trunk
changeset: 576743:72f24e37e853
user: taca <taca%pkgsrc.org@localhost>
date: Wed Jun 16 22:27:03 2010 +0000
description:
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
diffstat:
security/f-prot-antivirus6-ms-bin/Makefile | 10 +-
security/f-prot-antivirus6-ms-bin/distinfo | 7 +-
security/f-prot-antivirus6-ms-bin/files/scanmail.sh | 4 +-
security/f-prot-antivirus6-ms-bin/patches/patch-aa | 29 ++----
security/f-prot-antivirus6-ms-bin/patches/patch-ab | 4 +-
security/f-prot-antivirus6-ms-bin/patches/patch-ac | 19 ++++
security/f-prot-antivirus6/Makefile.common | 5 +-
security/f-prot-antivirus6/PLIST | 87 ++++++++++----------
8 files changed, 90 insertions(+), 75 deletions(-)
diffs (truncated from 301 to 300 lines):
diff -r 7b5f42c7232a -r 72f24e37e853 security/f-prot-antivirus6-ms-bin/Makefile
--- a/security/f-prot-antivirus6-ms-bin/Makefile Wed Jun 16 22:16:31 2010 +0000
+++ b/security/f-prot-antivirus6-ms-bin/Makefile Wed Jun 16 22:27:03 2010 +0000
@@ -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@localhost
@@ -19,9 +18,10 @@
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 -r 7b5f42c7232a -r 72f24e37e853 security/f-prot-antivirus6-ms-bin/distinfo
--- a/security/f-prot-antivirus6-ms-bin/distinfo Wed Jun 16 22:16:31 2010 +0000
+++ b/security/f-prot-antivirus6-ms-bin/distinfo Wed Jun 16 22:27:03 2010 +0000
@@ -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 -r 7b5f42c7232a -r 72f24e37e853 security/f-prot-antivirus6-ms-bin/files/scanmail.sh
--- a/security/f-prot-antivirus6-ms-bin/files/scanmail.sh Wed Jun 16 22:16:31 2010 +0000
+++ b/security/f-prot-antivirus6-ms-bin/files/scanmail.sh Wed Jun 16 22:27:03 2010 +0000
@@ -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 @@
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 -r 7b5f42c7232a -r 72f24e37e853 security/f-prot-antivirus6-ms-bin/patches/patch-aa
--- a/security/f-prot-antivirus6-ms-bin/patches/patch-aa Wed Jun 16 22:16:31 2010 +0000
+++ b/security/f-prot-antivirus6-ms-bin/patches/patch-aa Wed Jun 16 22:27:03 2010 +0000
@@ -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 @@
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 @@
# 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 @@
{
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 @@
{
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 -r 7b5f42c7232a -r 72f24e37e853 security/f-prot-antivirus6-ms-bin/patches/patch-ab
--- a/security/f-prot-antivirus6-ms-bin/patches/patch-ab Wed Jun 16 22:16:31 2010 +0000
+++ b/security/f-prot-antivirus6-ms-bin/patches/patch-ab Wed Jun 16 22:27:03 2010 +0000
@@ -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 -r 7b5f42c7232a -r 72f24e37e853 security/f-prot-antivirus6-ms-bin/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/f-prot-antivirus6-ms-bin/patches/patch-ac Wed Jun 16 22:27:03 2010 +0000
@@ -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
diff -r 7b5f42c7232a -r 72f24e37e853 security/f-prot-antivirus6/Makefile.common
--- a/security/f-prot-antivirus6/Makefile.common Wed Jun 16 22:16:31 2010 +0000
+++ b/security/f-prot-antivirus6/Makefile.common Wed Jun 16 22:27:03 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2009/09/22 17:38:33 taca Exp $
+# $NetBSD: Makefile.common,v 1.2 2010/06/16 22:27:03 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
CONFLICTS+= f-prot-antivirus6-{fs,ms,ws} fprot-workstation-bin-*
-VERSION= 6.0.1
+VERSION= 6.0.3.1
# ws, ms, fs
FP_TYPE?= ws
@@ -15,6 +15,7 @@
FP_OPSYS?= ${OPSYS}
FP_DISTNAME= fp-${FP_OPSYS}-${FP_ARCH}-${FP_TYPE}-${VERSION}
+PKGNAME= f-prot-antivirus6-${FP_TYPE}-bin-${VERSION}
RESTRICTED= "Commercial product"
NO_SRC_ON_CDROM= ${RESTRICTED}
diff -r 7b5f42c7232a -r 72f24e37e853 security/f-prot-antivirus6/PLIST
--- a/security/f-prot-antivirus6/PLIST Wed Jun 16 22:16:31 2010 +0000
+++ b/security/f-prot-antivirus6/PLIST Wed Jun 16 22:27:03 2010 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/09/22 17:38:33 taca Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/06/16 22:27:03 taca Exp $
bin/fpscan
${PLIST.scanmail}${PERL5_SUB_INSTALLVENDORLIB}/Anomy/HTMLCleaner.pm
${PLIST.scanmail}${PERL5_SUB_INSTALLVENDORLIB}/Anomy/Log.pm
@@ -30,48 +30,49 @@
share/doc/f-prot/LICENSE-FPAV
share/doc/f-prot/LICENSES-others
share/doc/f-prot/README
-share/doc/f-prot/html/add_info.html
-share/doc/f-prot/html/appendix_a.html
-share/doc/f-prot/html/appendix_b.html
-share/doc/f-prot/html/appendix_c.html
-share/doc/f-prot/html/auto_updt.html
-share/doc/f-prot/html/chmstyle.css
-share/doc/f-prot/html/conf_scanmail_bootup.html
-share/doc/f-prot/html/fpmon.html
-share/doc/f-prot/html/fpmon_conf.html
-share/doc/f-prot/html/fpmon_options.html
-share/doc/f-prot/html/fprots.html
-share/doc/f-prot/html/fpscan.html
-share/doc/f-prot/html/fpscan_options.html
-share/doc/f-prot/html/fpscand.html
-share/doc/f-prot/html/fpscand_conf.html
-share/doc/f-prot/html/fpscand_options.html
-share/doc/f-prot/html/fpupdate_options.html
-share/doc/f-prot/html/images/arrow_left.gif
-share/doc/f-prot/html/images/arrow_right.gif
-share/doc/f-prot/html/images/banner.gif
-share/doc/f-prot/html/images/dazuko.gif
-share/doc/f-prot/html/images/fpupdate.gif
-share/doc/f-prot/html/images/notusing_fprot_so_v6.gif
-share/doc/f-prot/html/images/test_eicar.gif
-share/doc/f-prot/html/images/using_fprot_so_v6.gif
-share/doc/f-prot/html/index.html
-share/doc/f-prot/html/inst_pro.html
-share/doc/f-prot/html/loc_files.html
-share/doc/f-prot/html/loglevel.html
-share/doc/f-prot/html/mailscanner.html
-share/doc/f-prot/html/main_feat.html
-share/doc/f-prot/html/man_updt.html
-share/doc/f-prot/html/milter_scan.html
-share/doc/f-prot/html/per_scan.html
-share/doc/f-prot/html/postfix_scan.html
-share/doc/f-prot/html/prot_samba.html
-share/doc/f-prot/html/qmail_scan.html
-share/doc/f-prot/html/scan_with_mailscanner.html
-share/doc/f-prot/html/sys_req.html
-share/doc/f-prot/html/test_eicar.html
-share/doc/f-prot/html/test_inst.html
-share/doc/f-prot/html/updater.html
+share/doc/f-prot/html/Helpfiles_v6/add_info.html
+share/doc/f-prot/html/Helpfiles_v6/appendix_a.html
+share/doc/f-prot/html/Helpfiles_v6/appendix_b.html
+share/doc/f-prot/html/Helpfiles_v6/appendix_c.html
+share/doc/f-prot/html/Helpfiles_v6/auto_updt.html
+share/doc/f-prot/html/Helpfiles_v6/chmstyle.css
+share/doc/f-prot/html/Helpfiles_v6/conf_scanmail_bootup.html
+share/doc/f-prot/html/Helpfiles_v6/fpmon.html
+share/doc/f-prot/html/Helpfiles_v6/fpmon_conf.html
+share/doc/f-prot/html/Helpfiles_v6/fpmon_options.html
+share/doc/f-prot/html/Helpfiles_v6/fprots.html
+share/doc/f-prot/html/Helpfiles_v6/fpscan.html
+share/doc/f-prot/html/Helpfiles_v6/fpscan_options.html
+share/doc/f-prot/html/Helpfiles_v6/fpscand.html
+share/doc/f-prot/html/Helpfiles_v6/fpscand_conf.html
+share/doc/f-prot/html/Helpfiles_v6/fpscand_options.html
+share/doc/f-prot/html/Helpfiles_v6/fpupdate_options.html
+share/doc/f-prot/html/Helpfiles_v6/images/arrow_left.gif
+share/doc/f-prot/html/Helpfiles_v6/images/arrow_right.gif
+share/doc/f-prot/html/Helpfiles_v6/images/banner.gif
+share/doc/f-prot/html/Helpfiles_v6/images/dazuko.gif
+share/doc/f-prot/html/Helpfiles_v6/images/fpupdate.gif
+share/doc/f-prot/html/Helpfiles_v6/images/notusing_fprot_so_v6.gif
+share/doc/f-prot/html/Helpfiles_v6/images/test_eicar.gif
+share/doc/f-prot/html/Helpfiles_v6/images/using_fprot_so_v6.gif
+share/doc/f-prot/html/Helpfiles_v6/index.html
+share/doc/f-prot/html/Helpfiles_v6/inst_pro.html
+share/doc/f-prot/html/Helpfiles_v6/loc_files.html
+share/doc/f-prot/html/Helpfiles_v6/loglevel.html
+share/doc/f-prot/html/Helpfiles_v6/mailscanner.html
+share/doc/f-prot/html/Helpfiles_v6/main_feat.html
+share/doc/f-prot/html/Helpfiles_v6/man_updt.html
+share/doc/f-prot/html/Helpfiles_v6/milter_scan.html
+share/doc/f-prot/html/Helpfiles_v6/per_scan.html
+share/doc/f-prot/html/Helpfiles_v6/postfix_scan.html
+share/doc/f-prot/html/Helpfiles_v6/prot_samba.html
+share/doc/f-prot/html/Helpfiles_v6/qmail_scan.html
+share/doc/f-prot/html/Helpfiles_v6/scan_with_mailscanner.html
+share/doc/f-prot/html/Helpfiles_v6/sys_req.html
+share/doc/f-prot/html/Helpfiles_v6/test_eicar.html
+share/doc/f-prot/html/Helpfiles_v6/test_inst.html
+share/doc/f-prot/html/Helpfiles_v6/todo.txt
+share/doc/f-prot/html/Helpfiles_v6/updater.html
${EGDIR}/f-prot.conf
${PLIST.fpscand}share/examples/rc.d/fpscand
Home |
Main Index |
Thread Index |
Old Index