update to 4.69.9-1 and fix typo in @sample line

(spam.assasin.prefs.conf -> spam.assassin.prefs.conf)

from brad, ok todd (maintainer)
This commit is contained in:
sthen 2008-05-16 16:38:36 +00:00
parent 4282052de3
commit 7eb95b50f0
9 changed files with 68 additions and 61 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.5 2008/04/24 21:31:00 todd Exp $
# $OpenBSD: Makefile,v 1.6 2008/05/16 16:38:36 sthen Exp $
COMMENT= virus/spam scanning framework
V= 4.68
Vs= 8
V= 4.69
Vs= 9
Vss= ${Vs}-1
CATEGORIES= mail
MASTER_SITES= http://mailscanner.info/files/4/tar/
@ -29,9 +29,10 @@ RUN_DEPENDS+= ::databases/p5-DBI \
::archivers/unzip \
::archivers/lha \
::archivers/zoo \
::net/wget
::net/wget \
::devel/p5-OLE-Storage_Lite
# GPLv2
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes

View File

@ -1,5 +1,5 @@
MD5 (MailScanner-install-4.68.8-1.tar.gz) = hVQsnlzuk4EcaCGfuD8FJw==
RMD160 (MailScanner-install-4.68.8-1.tar.gz) = XiD6OQJhyyTlkDl6iHgd1htR/no=
SHA1 (MailScanner-install-4.68.8-1.tar.gz) = fVsAmbvu/CYbWnsHGp4g+D4aEFg=
SHA256 (MailScanner-install-4.68.8-1.tar.gz) = K38Zv1d4tKz5nrCgAJiRUBUqg1kioLf6KMA7Z6p9Mc4=
SIZE (MailScanner-install-4.68.8-1.tar.gz) = 8316730
MD5 (MailScanner-install-4.69.9-1.tar.gz) = ZsuJdqACM4p+2kTH941yGA==
RMD160 (MailScanner-install-4.69.9-1.tar.gz) = pMLnKcXxU5VdqfpavwmrpOBrhOU=
SHA1 (MailScanner-install-4.69.9-1.tar.gz) = WrY5VsSJQIg5J6Pwxy+0YYCsW0Y=
SHA256 (MailScanner-install-4.69.9-1.tar.gz) = 40Iat/v6Necru0n7lVgBV8USHjkYBseEFoGjiwVRpog=
SIZE (MailScanner-install-4.69.9-1.tar.gz) = 8327507

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-bin_MailScanner,v 1.3 2008/04/24 21:31:00 todd Exp $
--- bin/MailScanner.orig Tue Apr 1 11:28:10 2008
+++ bin/MailScanner Fri Apr 18 21:28:17 2008
$OpenBSD: patch-bin_MailScanner,v 1.4 2008/05/16 16:38:36 sthen Exp $
--- bin/MailScanner.orig Thu May 1 04:33:27 2008
+++ bin/MailScanner Fri May 2 18:36:15 2008
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -I/opt/MailScanner/lib
+#!/usr/bin/perl -I%PREFIX%/lib/MailScanner
@ -16,7 +16,7 @@ $OpenBSD: patch-bin_MailScanner,v 1.3 2008/04/24 21:31:00 todd Exp $
unshift @INC, $path;
}
@@ -171,8 +171,6 @@ if ($Versions) {
@@ -177,8 +177,6 @@ if ($Versions) {
my($module, $s, $v, $m);
printf("Running on\n%s", `uname -a`);
@ -25,7 +25,7 @@ $OpenBSD: patch-bin_MailScanner,v 1.3 2008/04/24 21:31:00 todd Exp $
printf("This is Perl version %f (%vd)\n", $], $^V);
print "\nThis is MailScanner version " . $MailScanner::Config::MailScannerVersion . "\n";
print "Module versions are:\n";
@@ -195,9 +193,10 @@ if ($Versions) {
@@ -205,9 +203,10 @@ $Debug = 1 if $DebugSpamAssassin;
# Check version of MIME-tools against its requirements
my $error = 0;
@ -37,7 +37,7 @@ $OpenBSD: patch-bin_MailScanner,v 1.3 2008/04/24 21:31:00 todd Exp $
print STDERR "\n\n**** ERROR: You must upgrade your perl IO module to at least\n**** ERROR: version 1.2301 or MailScanner will not work!\n\n";
$error = 1;
}
@@ -238,7 +237,7 @@ if ($WantLintOnly || $WantLintLiteOnly) {
@@ -248,7 +247,7 @@ if ($WantLintOnly || $WantLintLiteOnly) {
# Find the mailscanner.conf file, with a default just in case.
my $ConfFile = $ARGV[0];
# Use the default if we couldn't find theirs. Will save a lot of grief.
@ -46,7 +46,7 @@ $OpenBSD: patch-bin_MailScanner,v 1.3 2008/04/24 21:31:00 todd Exp $
!(-f $ConfFile);
# Check the MailScanner version number against what is in MailScanner.conf
@@ -283,7 +282,7 @@ if (MailScanner::Config::QuickPeek($ConfFile, 'virussc
@@ -293,7 +292,7 @@ if (MailScanner::Config::QuickPeek($ConfFile, 'virussc
Currently you are using no virus scanners.
This is probably not what you want.

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-etc_MailScanner_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
--- etc/MailScanner.conf.orig Tue Apr 1 11:28:10 2008
+++ etc/MailScanner.conf Fri Apr 4 01:05:04 2008
$OpenBSD: patch-etc_MailScanner_conf,v 1.3 2008/05/16 16:38:36 sthen Exp $
--- etc/MailScanner.conf.orig Sun May 4 10:32:13 2008
+++ etc/MailScanner.conf Mon May 5 00:51:10 2008
@@ -72,17 +72,17 @@
%web-site% = www.your-organisation.com
@ -91,7 +91,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
# The maximum length of time the "unrar" command is allowed to run for 1
# RAR archive (in seconds)
@@ -567,7 +569,7 @@ Virus Scanning = yes
@@ -569,7 +571,7 @@ Virus Scanning = yes
# want none, then specify "none".
#
# This *cannot* be the filename of a ruleset.
@ -100,7 +100,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
# The maximum length of time the commercial virus scanner is allowed to run
# for 1 batch of messages (in seconds).
@@ -695,19 +697,19 @@ Allowed Sophos Error Messages =
@@ -697,19 +699,19 @@ Allowed Sophos Error Messages =
# The directory (or a link to it) containing all the Sophos *.ide files.
# This is only used by the "sophossavi" virus scanner, and is irrelevant
# for all other scanners.
@ -123,16 +123,16 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
#
# Options specific to ClamAV Anti-Virus
@@ -718,7 +720,7 @@ Monitors For Sophos Updates = /opt/sophos-av/lib/sav/*
@@ -720,7 +722,7 @@ Monitors For Sophos Updates = /opt/sophos-av/lib/sav/*
# detect when a ClamAV update has happened.
# This is only used by the "clamavmodule" virus scanner, not the "clamav"
# scanner setting.
-Monitors for ClamAV Updates = /usr/local/share/clamav/*.inc/* /usr/local/share/clamav/*.cvd
+Monitors for ClamAV Updates = %PREFIX%/share/clamav/*.inc/* %PREFIX%/share/clamav/*.cvd
-Monitors for ClamAV Updates = /usr/local/share/clamav/*.cld /usr/local/share/clamav/*.cvd
+Monitors for ClamAV Updates = %PREFIX%/share/clamav/*.cld %PREFIX%/share/clamav/*.cvd
# ClamAVModule only: set limits when scanning for viruses.
#
@@ -1330,7 +1332,7 @@ Sign Messages Already Processed = no
@@ -1338,7 +1340,7 @@ Sign Messages Already Processed = no
# Add the "Inline HTML Signature" or "Inline Text Signature" to the end
# of uninfected messages?
# This can also be the filename of a ruleset.
@ -141,7 +141,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
# If you are using HTML signatures, you can embed an image in the signature.
# For the filename(s) of the image, see the settings "Signature Image
@@ -1395,7 +1397,7 @@ Deliver Cleaned Messages = yes
@@ -1425,7 +1427,7 @@ Deliver Cleaned Messages = yes
# Do you want to notify the people who sent you messages containing
# viruses or badly-named filenames?
# This can also be the filename of a ruleset.
@ -150,7 +150,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
# *If* "Notify Senders" is set to yes, do you want to notify people
# who sent you messages containing viruses?
@@ -1457,7 +1459,7 @@ Scanned Subject Text = {Scanned}
@@ -1487,7 +1489,7 @@ Scanned Subject Text = {Scanned}
# end = Add text to the end of the subject line.
# This makes filtering in Outlook very easy.
# This can also be the filename of a ruleset.
@ -159,7 +159,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
# This is the text to add to the start of the subject if the
# "Virus Modify Subject" option is set.
@@ -1473,7 +1475,7 @@ Virus Subject Text = {Virus?}
@@ -1503,7 +1505,7 @@ Virus Subject Text = {Virus?}
# end = Add text to the end of the subject line.
# This makes filtering in Outlook very easy.
# This can also be the filename of a ruleset.
@ -168,7 +168,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
# This is the text to add to the start of the subject if the
# "Filename Modify Subject" option is set.
@@ -1491,7 +1493,7 @@ Filename Subject Text = {Filename?}
@@ -1521,7 +1523,7 @@ Filename Subject Text = {Filename?}
# end = Add text to the end of the subject line.
# This makes filtering in Outlook very easy.
# This can also be the filename of a ruleset.
@ -177,7 +177,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
# This is the text to add to the start of the subject if the
# "Content Modify Subject" option is set.
@@ -1510,7 +1512,7 @@ Content Subject Text = {Dangerous Content?}
@@ -1540,7 +1542,7 @@ Content Subject Text = {Dangerous Content?}
# end = Add text to the end of the subject line.
# This makes filtering in Outlook very easy.
# This can also be the filename of a ruleset.
@ -186,7 +186,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
# This is the text to add to the start of the subject if the
# "Size Modify Subject" option is set.
@@ -1529,7 +1531,7 @@ Size Subject Text = {Size}
@@ -1559,7 +1561,7 @@ Size Subject Text = {Size}
# yes = Add text to the start of the subject line, or
# end = Add text to the end of the subject line.
# This can also be the filename of a ruleset.
@ -195,7 +195,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
# This is the text to add to the start of the subject if the
# "Disarmed Modify Subject" option is set.
@@ -1559,7 +1561,7 @@ Phishing Subject Text = {Fraud?}
@@ -1589,7 +1591,7 @@ Phishing Subject Text = {Fraud?}
# end = Add text to the end of the subject line.
# This makes filtering in Outlook very easy.
# This can also be the filename of a ruleset.
@ -204,7 +204,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
# This is the text to add to the start of the subject if the
# "Spam Modify Subject" option is set.
@@ -1579,7 +1581,7 @@ Spam Subject Text = {Spam?}
@@ -1609,7 +1611,7 @@ Spam Subject Text = {Spam?}
# yes = Add text to the start of the subject line, or
# end = Add text to the end of the subject line.
# This can also be the filename of a ruleset.
@ -213,7 +213,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
# This is just like the "Spam Subject Text" option above, except that
# it applies when the score from SpamAssassin is higher than the
@@ -1648,7 +1650,7 @@ Archive Mail =
@@ -1699,7 +1701,7 @@ Missing Mail Archive Is = directory
# Notify the local system administrators ("Notices To") when any infections
# are found?
# This can also be the filename of a ruleset.
@ -222,7 +222,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
# Include the full headers of each message in the notices sent to the local
# system administrators?
@@ -1703,7 +1705,7 @@ Virus Scanner Definitions = %etc-dir%/virus.scanners.c
@@ -1754,7 +1756,7 @@ Virus Scanner Definitions = %etc-dir%/virus.scanners.c
# If you want to just disable the "Spam List" feature then set
# "Spam List =" (i.e. an empty list) in the setting below.
# This can also be the filename of a ruleset.
@ -231,7 +231,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
# This is the list of spam blacklists (RBLs) which you are using.
# See the "Spam List Definitions" file for more information about what
@@ -1882,7 +1884,7 @@ Watermark Header = X-%org-name%-MailScanner-Watermark:
@@ -1933,7 +1935,7 @@ Watermark Header = X-%org-name%-MailScanner-Watermark:
# Do you want to find spam using the "SpamAssassin" package?
# This can also be the filename of a ruleset.
@ -240,7 +240,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
# SpamAssassin is not very fast when scanning huge messages, so messages
# bigger than this value will be truncated to this length for SpamAssassin
@@ -1979,7 +1981,7 @@ Include Binary Attachments In SpamAssassin = no
@@ -2030,7 +2032,7 @@ Include Binary Attachments In SpamAssassin = no
# whatever SpamAssassin threshold they want. For example, they just look
# for "sssss" for every message whose score is > 5, for example.
# This can also be the filename of a ruleset.
@ -249,7 +249,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
# Many naive spammers send out the same message to lots of people.
# These messages are very likely to have roughly the same SpamAssassin score.
@@ -2352,14 +2354,14 @@ SpamAssassin Install Prefix =
@@ -2454,14 +2456,14 @@ SpamAssassin Install Prefix =
SpamAssassin Site Rules Dir = /etc/mail/spamassassin
# The site-local rules are searched for here, and in prefix/etc/spamassassin,
@ -266,7 +266,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
SpamAssassin Local Rules Dir =
# The rules created by the "sa-update" tool are searched for here.
@@ -2373,10 +2375,10 @@ SpamAssassin Local Rules Dir =
@@ -2475,10 +2477,10 @@ SpamAssassin Local Rules Dir =
SpamAssassin Local State Dir = # /var/lib/spamassassin
# The default rules are searched for here, and in prefix/share/spamassassin,
@ -279,7 +279,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
SpamAssassin Default Rules Dir =
#
@@ -2409,9 +2411,9 @@ MCP Actions = deliver
@@ -2511,9 +2513,9 @@ MCP Actions = deliver
High Scoring MCP Actions = deliver
Bounce MCP As Attachment = no
@ -291,7 +291,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
High Scoring MCP Subject Text = {MCP?}
Is Definitely MCP = no
@@ -2557,7 +2559,7 @@ Lockfile Dir = /tmp
@@ -2659,7 +2661,7 @@ Lockfile Dir = /tmp
# directory should be over-written by the installation or upgrade process.
# All files starting with "." or ending with ".rpmnew" will be ignored,
# all other files will be compiled and may be used with Custom Functions.

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-etc_virus_scanners_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
--- etc/virus.scanners.conf.orig Wed Mar 12 18:56:22 2008
+++ etc/virus.scanners.conf Fri Apr 4 01:24:36 2008
@@ -11,42 +11,42 @@
$OpenBSD: patch-etc_virus_scanners_conf,v 1.3 2008/05/16 16:38:36 sthen Exp $
--- etc/virus.scanners.conf.orig Sun May 4 10:29:47 2008
+++ etc/virus.scanners.conf Mon May 5 00:56:14 2008
@@ -11,43 +11,43 @@
# should see some sensible output. If it fails, you will probably just see
# an error message such as "Command not found" or similar.
#
@ -67,6 +67,7 @@ $OpenBSD: patch-etc_virus_scanners_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
-sophossavi /bin/false /tmp
-symscanengine /opt/MailScanner/lib/symscanengine-wrapper /opt/SYMCScan
-trend /opt/MailScanner/lib/trend-wrapper /pack/trend
-vba32 /opt/MailScanner/lib/vba32-wrapper /opt/vba/vbacl
-vexira /opt/MailScanner/lib/vexira-wrapper /usr/local/vexira
+#nod32-1.99 %PREFIX%/libexec/MailScanner/nod32-wrapper /usr/local/nod32
+nod32-1.99 %PREFIX%/libexec/MailScanner/nod32-wrapper /usr/sbin
@ -79,4 +80,5 @@ $OpenBSD: patch-etc_virus_scanners_conf,v 1.2 2008/04/24 21:31:00 todd Exp $
+sophossavi /bin/false /tmp
+symscanengine %PREFIX%/libexec/MailScanner/symscanengine-wrapper /opt/SYMCScan
+trend %PREFIX%/libexec/MailScanner/trend-wrapper /pack/trend
+vba32 %PREFIX%/libexec/MailScanner/vba32-wrapper /opt/vba/vbacl
+vexira %PREFIX%/libexec/MailScanner/vexira-wrapper /usr/local/vexira

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_MailScanner_ConfigDefs_pl,v 1.2 2008/04/24 21:31:00 todd Exp $
--- lib/MailScanner/ConfigDefs.pl.orig Sun Mar 16 19:40:39 2008
+++ lib/MailScanner/ConfigDefs.pl Fri Apr 4 01:05:04 2008
@@ -333,8 +333,8 @@ qmailintdhashnumber 1
$OpenBSD: patch-lib_MailScanner_ConfigDefs_pl,v 1.3 2008/05/16 16:38:36 sthen Exp $
--- lib/MailScanner/ConfigDefs.pl.orig Tue Apr 22 05:10:16 2008
+++ lib/MailScanner/ConfigDefs.pl Fri May 2 18:36:15 2008
@@ -336,8 +336,8 @@ qmailintdhashnumber 1
# filename containing a list of directories.
[Simple,Other]
cachetiming 1800,300,10800,172800,600
@ -12,7 +12,7 @@ $OpenBSD: patch-lib_MailScanner_ConfigDefs_pl,v 1.2 2008/04/24 21:31:00 todd Exp
FileCommand /usr/bin/file
FirstCheck mcp
GunzipCommand /bin/gunzip
@@ -356,7 +356,7 @@ QuarantinePerms 0600
@@ -359,7 +359,7 @@ QuarantinePerms 0600
RunAsUser 0
RunAsGroup 0
SACache /var/spool/MailScanner/incoming/SpamAssassin.cache.db

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_MailScanner_CustomConfig_pm,v 1.2 2008/04/24 21:31:00 todd Exp $
--- lib/MailScanner/CustomConfig.pm.orig Mon Mar 24 09:07:46 2008
+++ lib/MailScanner/CustomConfig.pm Fri Apr 4 01:05:04 2008
@@ -1674,7 +1674,7 @@ __DATA__
$OpenBSD: patch-lib_MailScanner_CustomConfig_pm,v 1.3 2008/05/16 16:38:36 sthen Exp $
--- lib/MailScanner/CustomConfig.pm.orig Sun Apr 6 12:44:33 2008
+++ lib/MailScanner/CustomConfig.pm Fri May 2 18:36:15 2008
@@ -1675,7 +1675,7 @@ __DATA__
# SO17 1BJ
# United Kingdom
#

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_MailScanner_Message_pm,v 1.2 2008/04/24 21:31:00 todd Exp $
--- lib/MailScanner/Message.pm.orig Sat Mar 1 19:31:02 2008
+++ lib/MailScanner/Message.pm Tue Mar 18 14:16:39 2008
@@ -650,12 +650,19 @@ sub IsSpam {
$OpenBSD: patch-lib_MailScanner_Message_pm,v 1.3 2008/05/16 16:38:36 sthen Exp $
--- lib/MailScanner/Message.pm.orig Tue Apr 22 05:10:16 2008
+++ lib/MailScanner/Message.pm Fri May 2 18:36:15 2008
@@ -653,12 +653,19 @@ sub IsSpam {
# rblspamheader is useful start to spamreport if RBLsaysspam.
# Do the Custom Spam Checker

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2008/04/24 21:31:00 todd Exp $
@comment $OpenBSD: PLIST,v 1.3 2008/05/16 16:38:36 sthen Exp $
bin/MailScanner
bin/analyse_SpamAssassin_cache
bin/check_mailscanner
@ -168,6 +168,10 @@ share/examples/MailScanner/libexec/trend-autoupdate.sample
@sample libexec/MailScanner/trend-autoupdate
share/examples/MailScanner/libexec/trend-wrapper.sample
@sample libexec/MailScanner/trend-wrapper
share/examples/MailScanner/libexec/vba32-autoupdate.sample
@sample libexec/MailScanner/vba32-autoupdate
share/examples/MailScanner/libexec/vba32-wrapper.sample
@sample libexec/MailScanner/vba32-wrapper
share/examples/MailScanner/libexec/vexira-autoupdate.sample
@sample libexec/MailScanner/vexira-autoupdate
share/examples/MailScanner/libexec/vexira-wrapper.sample
@ -1044,7 +1048,7 @@ share/examples/MailScanner/rules/max.message.size.rules
share/examples/MailScanner/rules/spam.whitelist.rules
@sample ${SYSCONFDIR}/MailScanner/rules/spam.whitelist.rules
share/examples/MailScanner/spam.assassin.prefs.conf
@sample ${SYSCONFDIR}/MailScanner/spam.assasin.prefs.conf
@sample ${SYSCONFDIR}/MailScanner/spam.assassin.prefs.conf
share/examples/MailScanner/spam.lists.conf
@sample ${SYSCONFDIR}/MailScanner/spam.lists.conf
share/examples/MailScanner/virus.scanners.conf