cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to MailScanner 4.72.5-1.

Browse Source 
Feedback from sthen@ including adding a conflict marker as a
kludge to ensure that if a user wants to use AV support that
the correct version is installed (0.94 or newer) since it is
an optional dependency. Great job by the Clam crew for making
this such a mess. The current version of MailScanner is broken
if using 0.94 since the commandline opts were changed.

ok todd@ sthen@
This commit is contained in:
brad 2008-11-07 02:33:58 +00:00
parent 8981cec600
commit 0936ece73f
8 changed files with 67 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mail/mailscanner/Makefile
View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.9 2008/11/06 15:53:46 sthen Exp $
# $OpenBSD: Makefile,v 1.10 2008/11/07 02:33:58 brad Exp $
COMMENT= virus/spam scanning framework
V= 4.70
Vs= 6
V= 4.72
Vs= 5
Vss= ${Vs}-1
CATEGORIES= mail
MASTER_SITES= http://mailscanner.info/files/4/tar/
DISTNAME= mailscanner-${V}.${Vss}
PKGNAME= mailscanner-${V}.${Vss:S/-/./}p0
DISTNAME= mailscanner-${V}.${Vss}
PKGNAME= mailscanner-${V}.${Vss:S/-/./}
DISTFILES= MailScanner-install-${V}.${Vss}${EXTRACT_SUFX}
WRKDIST= ${WRKDIR}/MailScanner-${V}.${Vss}
@ -30,7 +30,8 @@ RUN_DEPENDS+= ::databases/p5-DBI \
::archivers/lha \
::archivers/zoo \
::net/wget \
::devel/p5-OLE-Storage_Lite
::devel/p5-OLE-Storage_Lite \
::textproc/antiword
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes

10
mail/mailscanner/distinfo
View File

@ -1,5 +1,5 @@
MD5 (MailScanner-install-4.70.6-1.tar.gz) = n5P+n4eaicQ2rl6SnMhNHA==
RMD160 (MailScanner-install-4.70.6-1.tar.gz) = AlHzzAlVuzoTsdwFGEi/4clCiAw=
SHA1 (MailScanner-install-4.70.6-1.tar.gz) = iHRKipry78iZB7X/tzOqLquVai4=
SHA256 (MailScanner-install-4.70.6-1.tar.gz) = gh+0C+Wa1GSPHYdVePruztmbkFrz3hdvSHo8Pk76Nmo=
SIZE (MailScanner-install-4.70.6-1.tar.gz) = 8325143
MD5 (MailScanner-install-4.72.5-1.tar.gz) = FgD/QZLwNMTEcqx1Jd3ThA==
RMD160 (MailScanner-install-4.72.5-1.tar.gz) = cwif57P2ISLxSi76FiIz5Vje6lM=
SHA1 (MailScanner-install-4.72.5-1.tar.gz) = SK3PWxVujdhry+7rruMPEROtWNM=
SHA256 (MailScanner-install-4.72.5-1.tar.gz) = KeVzZvH+Obq2J0/Etg6sRktzFnZytenMkwsZGsw2ekc=
SIZE (MailScanner-install-4.72.5-1.tar.gz) = 8387324

14
mail/mailscanner/patches/patch-bin_MailScanner
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-bin_MailScanner,v 1.5 2008/11/07 02:33:58 brad Exp $
--- bin/MailScanner.orig Sat Nov 1 15:03:52 2008
+++ bin/MailScanner Thu Nov 6 20:24:55 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.4 2008/05/16 16:38:36 sthen Exp $
unshift @INC, $path;
}
@@ -177,8 +177,6 @@ if ($Versions) {
@@ -179,8 +179,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.4 2008/05/16 16:38:36 sthen Exp $
printf("This is Perl version %f (%vd)\n", $], $^V);
print "\nThis is MailScanner version " . $MailScanner::Config::MailScannerVersion . "\n";
print "Module versions are:\n";
@@ -205,9 +203,10 @@ $Debug = 1 if $DebugSpamAssassin;
@@ -207,9 +205,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.4 2008/05/16 16:38:36 sthen 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;
}
@@ -248,7 +247,7 @@ if ($WantLintOnly || $WantLintLiteOnly) {
@@ -250,7 +249,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.4 2008/05/16 16:38:36 sthen Exp $
!(-f $ConfFile);
# Check the MailScanner version number against what is in MailScanner.conf
@@ -293,7 +292,7 @@ if (MailScanner::Config::QuickPeek($ConfFile, 'virussc
@@ -295,7 +294,7 @@ if (MailScanner::Config::QuickPeek($ConfFile, 'virussc
Currently you are using no virus scanners.
This is probably not what you want.

55
mail/mailscanner/patches/patch-etc_MailScanner_conf
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-etc_MailScanner_conf,v 1.4 2008/07/24 03:25:03 brad Exp $
--- etc/MailScanner.conf.orig Tue Jun 17 15:51:17 2008
+++ etc/MailScanner.conf Sat Jun 21 20:44:52 2008
$OpenBSD: patch-etc_MailScanner_conf,v 1.5 2008/11/07 02:33:58 brad Exp $
--- etc/MailScanner.conf.orig Sat Nov 1 15:03:52 2008
+++ etc/MailScanner.conf Thu Nov 6 20:24:55 2008
@@ -72,17 +72,17 @@
%web-site% = www.your-organisation.com
@ -91,7 +91,16 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.4 2008/07/24 03:25:03 brad Exp $
# The maximum length of time the "unrar" command is allowed to run for 1
# RAR archive (in seconds)
@@ -569,7 +571,7 @@ Virus Scanning = yes
@@ -503,7 +505,7 @@ Add Text Of Doc = no
# Using a ruleset here, you could have different output styles for
# different people.
# This can also be the filename of a ruleset.
-Antiword = /usr/bin/antiword -f
+Antiword = %PREFIX%/bin/antiword -f
# The maximum length of time the "antiword" command is allowed to run for 1
# Word document (in seconds)
@@ -588,7 +590,7 @@ Virus Scanning = yes
# want none, then specify "none".
#
# This *cannot* be the filename of a ruleset.
@ -100,7 +109,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.4 2008/07/24 03:25:03 brad Exp $
# The maximum length of time the commercial virus scanner is allowed to run
# for 1 batch of messages (in seconds).
@@ -697,19 +699,19 @@ Allowed Sophos Error Messages =
@@ -716,19 +718,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,7 +132,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.4 2008/07/24 03:25:03 brad Exp $
#
# Options specific to ClamAV Anti-Virus
@@ -720,7 +722,7 @@ Monitors For Sophos Updates = /opt/sophos-av/lib/sav/*
@@ -739,7 +741,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.
@ -132,7 +141,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.4 2008/07/24 03:25:03 brad Exp $
# ClamAVModule only: set limits when scanning for viruses.
#
@@ -1344,7 +1346,7 @@ Sign Messages Already Processed = no
@@ -1363,7 +1365,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 +150,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.4 2008/07/24 03:25:03 brad 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
@@ -1440,7 +1442,7 @@ Deliver Cleaned Messages = yes
@@ -1483,7 +1485,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 +159,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.4 2008/07/24 03:25:03 brad Exp $
# *If* "Notify Senders" is set to yes, do you want to notify people
# who sent you messages containing viruses?
@@ -1502,7 +1504,7 @@ Scanned Subject Text = {Scanned}
@@ -1545,7 +1547,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 +168,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.4 2008/07/24 03:25:03 brad Exp $
# This is the text to add to the start of the subject if the
# "Virus Modify Subject" option is set.
@@ -1518,7 +1520,7 @@ Virus Subject Text = {Virus?}
@@ -1561,7 +1563,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 +177,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.4 2008/07/24 03:25:03 brad Exp $
# This is the text to add to the start of the subject if the
# "Filename Modify Subject" option is set.
@@ -1536,7 +1538,7 @@ Filename Subject Text = {Filename?}
@@ -1579,7 +1581,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 +186,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.4 2008/07/24 03:25:03 brad Exp $
# This is the text to add to the start of the subject if the
# "Content Modify Subject" option is set.
@@ -1555,7 +1557,7 @@ Content Subject Text = {Dangerous Content?}
@@ -1598,7 +1600,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 +195,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.4 2008/07/24 03:25:03 brad Exp $
# This is the text to add to the start of the subject if the
# "Size Modify Subject" option is set.
@@ -1574,7 +1576,7 @@ Size Subject Text = {Size}
@@ -1617,7 +1619,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 +204,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.4 2008/07/24 03:25:03 brad Exp $
# This is the text to add to the start of the subject if the
# "Disarmed Modify Subject" option is set.
@@ -1604,7 +1606,7 @@ Phishing Subject Text = {Fraud?}
@@ -1647,7 +1649,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 +213,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.4 2008/07/24 03:25:03 brad Exp $
# This is the text to add to the start of the subject if the
# "Spam Modify Subject" option is set.
@@ -1624,7 +1626,7 @@ Spam Subject Text = {Spam?}
@@ -1667,7 +1669,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 +222,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.4 2008/07/24 03:25:03 brad Exp $
# This is just like the "Spam Subject Text" option above, except that
# it applies when the score from SpamAssassin is higher than the
@@ -1714,7 +1716,7 @@ Missing Mail Archive Is = directory
@@ -1757,7 +1759,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 +231,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.4 2008/07/24 03:25:03 brad Exp $
# Include the full headers of each message in the notices sent to the local
# system administrators?
@@ -1769,7 +1771,7 @@ Virus Scanner Definitions = %etc-dir%/virus.scanners.c
@@ -1812,7 +1814,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 +240,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.4 2008/07/24 03:25:03 brad Exp $
# This is the list of spam blacklists (RBLs) which you are using.
# See the "Spam List Definitions" file for more information about what
@@ -1948,7 +1950,7 @@ Watermark Header = X-%org-name%-MailScanner-Watermark:
@@ -1991,7 +1993,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 +249,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.4 2008/07/24 03:25:03 brad Exp $
# SpamAssassin is not very fast when scanning huge messages, so messages
# bigger than this value will be truncated to this length for SpamAssassin
@@ -2045,7 +2047,7 @@ Include Binary Attachments In SpamAssassin = no
@@ -2088,7 +2090,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 +258,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.4 2008/07/24 03:25:03 brad 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.
@@ -2469,14 +2471,14 @@ SpamAssassin Install Prefix =
@@ -2512,14 +2514,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 +275,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.4 2008/07/24 03:25:03 brad Exp $
SpamAssassin Local Rules Dir =
# The rules created by the "sa-update" tool are searched for here.
@@ -2490,10 +2492,10 @@ SpamAssassin Local Rules Dir =
@@ -2533,10 +2535,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 +288,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.4 2008/07/24 03:25:03 brad Exp $
SpamAssassin Default Rules Dir =
#
@@ -2526,9 +2528,9 @@ MCP Actions = deliver
@@ -2569,9 +2571,9 @@ MCP Actions = deliver
High Scoring MCP Actions = deliver
Bounce MCP As Attachment = no
@ -291,7 +300,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.4 2008/07/24 03:25:03 brad Exp $
High Scoring MCP Subject Text = {MCP?}
Is Definitely MCP = no
@@ -2674,7 +2676,7 @@ Lockfile Dir = /tmp
@@ -2734,7 +2736,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.

10
mail/mailscanner/patches/patch-lib_MailScanner_ConfigDefs_pl
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_MailScanner_ConfigDefs_pl,v 1.4 2008/07/24 03:25:03 brad Exp $
--- lib/MailScanner/ConfigDefs.pl.orig Tue Jun 17 15:47:39 2008
+++ lib/MailScanner/ConfigDefs.pl Sat Jun 21 20:44:52 2008
@@ -337,8 +337,8 @@ qmailintdhashnumber 1
$OpenBSD: patch-lib_MailScanner_ConfigDefs_pl,v 1.5 2008/11/07 02:33:58 brad Exp $
--- lib/MailScanner/ConfigDefs.pl.orig Wed Aug 20 11:22:39 2008
+++ lib/MailScanner/ConfigDefs.pl Thu Sep 4 00:53:09 2008
@@ -340,8 +340,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.4 2008/07/24 03:25:03 brad Exp
FileCommand /usr/bin/file
FirstCheck mcp
GunzipCommand /bin/gunzip
@@ -360,7 +360,7 @@ QuarantinePerms 0600
@@ -363,7 +363,7 @@ QuarantinePerms 0600
RunAsUser 0
RunAsGroup 0
SACache /var/spool/MailScanner/incoming/SpamAssassin.cache.db

8
mail/mailscanner/patches/patch-lib_MailScanner_Message_pm
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_MailScanner_Message_pm,v 1.4 2008/07/24 03:25:03 brad Exp $
--- lib/MailScanner/Message.pm.orig Tue Jun 17 15:47:39 2008
+++ lib/MailScanner/Message.pm Sat Jun 21 20:44:53 2008
@@ -671,12 +671,19 @@ sub IsSpam {
$OpenBSD: patch-lib_MailScanner_Message_pm,v 1.5 2008/11/07 02:33:58 brad Exp $
--- lib/MailScanner/Message.pm.orig Mon Oct 27 07:31:59 2008
+++ lib/MailScanner/Message.pm Thu Nov 6 20:24:55 2008
@@ -680,12 +680,19 @@ sub IsSpam {
# rblspamheader is useful start to spamreport if RBLsaysspam.
# Do the Custom Spam Checker

8
mail/mailscanner/patches/patch-lib_clamav-wrapper
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-lib_clamav-wrapper,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
--- lib/clamav-wrapper.orig Tue Jun 6 12:03:41 2006
+++ lib/clamav-wrapper Mon Feb 18 01:38:02 2008
$OpenBSD: patch-lib_clamav-wrapper,v 1.2 2008/11/07 02:33:58 brad Exp $
--- lib/clamav-wrapper.orig Fri Sep 5 04:55:29 2008
+++ lib/clamav-wrapper Thu Nov 6 20:24:55 2008
@@ -51,7 +51,7 @@
# You may want to check this script for bash-isms
@ -10,7 +10,7 @@ $OpenBSD: patch-lib_clamav-wrapper,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
ClamUser="clamav"
ClamGroup="clamav"
@@ -98,23 +98,23 @@ ExtraScanOptions="$ExtraScanOptions --deb"
@@ -98,23 +98,23 @@ ExtraScanOptions=""
# LESS COMMON unpackers, which probably aren't installed by default
# (hence disabled)
# Uncomment ONE of the following lines if you have unrar installed

4
mail/mailscanner/pkg/PLIST
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2008/05/16 16:38:36 sthen Exp $
@comment $OpenBSD: PLIST,v 1.4 2008/11/07 02:33:58 brad Exp $
@conflict clamav-<0.94
bin/MailScanner
bin/analyse_SpamAssassin_cache
bin/check_mailscanner
@ -15,6 +16,7 @@ lib/MailScanner/
@sample /var/spool/MailScanner/outgoing/
lib/MailScanner/MailScanner/
lib/MailScanner/MailScanner.pm
lib/MailScanner/MailScanner/Antiword.pm
lib/MailScanner/MailScanner/BinHex.pm
lib/MailScanner/MailScanner/Config.pm
lib/MailScanner/MailScanner/ConfigDefs.pl