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

update to 4.68.8, from brad@

Browse Source 
tested by todd@ and brad@
This commit is contained in:
todd 2008-04-24 21:31:00 +00:00
parent 3e7e75141b
commit 9d8a017ae0
12 changed files with 137 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mail/mailscanner/Makefile
View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.4 2008/04/17 07:30:27 jasper Exp $
# $OpenBSD: Makefile,v 1.5 2008/04/24 21:31:00 todd Exp $
COMMENT= virus/spam scanning framework
V= 4.66
Vs= 5
Vss= ${Vs}-3
V= 4.68
Vs= 8
Vss= ${Vs}-1
CATEGORIES= mail
MASTER_SITES= http://mailscanner.info/files/4/tar/
DISTNAME= mailscanner-${V}.${Vss}
PKGNAME= mailscanner-${V}.${Vss:S/-/./}p1
PKGNAME= mailscanner-${V}.${Vss:S/-/./}
DISTFILES= MailScanner-install-${V}.${Vss}${EXTRACT_SUFX}
WRKDIST= ${WRKDIR}/MailScanner-${V}.${Vss}
@ -18,7 +18,6 @@ MAINTAINER= Todd T. Fries <todd@openbsd.org>
RUN_DEPENDS+= ::databases/p5-DBI \
::archivers/p5-Archive-Zip \
::archivers/p5-Compress-Zlib \
::mail/p5-MIME-tools \
::net/p5-Net-CIDR \
::net/p5-Sys-Hostname-Long \
@ -32,7 +31,7 @@ RUN_DEPENDS+= ::databases/p5-DBI \
::archivers/zoo \
::net/wget
# GPL
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -46,8 +45,8 @@ post-extract:
do-install: install_libexec install_etc install_share install_lib install_bin
BINS= MailScanner df2mbox d2mbox update_phishing_sites check_mailscanner
BINS+= clean.quarantine clean.SA.cache analyse_SpamAssassin_cache
BINS= MailScanner df2mbox d2mbox update_bad_phishing_sites update_phishing_sites
BINS+= check_mailscanner clean.quarantine clean.SA.cache analyse_SpamAssassin_cache
_MS_sed_frag= _subst() { sed 's,%PREFIX%,${LOCALBASE},g;s,%SYSCONFDIR%,${SYSCONFDIR},g' \
"$$2" > ${WRKDIST}/file; \

10
mail/mailscanner/distinfo
View File

@ -1,5 +1,5 @@
MD5 (MailScanner-install-4.66.5-3.tar.gz) = xhIqVWKKQi0X+46fsSvcTA==
RMD160 (MailScanner-install-4.66.5-3.tar.gz) = z3BUx495BY+Q34DPyzwMIqlz/5I=
SHA1 (MailScanner-install-4.66.5-3.tar.gz) = 331Mrc698AkQh/r3SnCHRjdnsJ0=
SHA256 (MailScanner-install-4.66.5-3.tar.gz) = wbYrKRwLlehfLZDPfRANCD7gatRZk9Ssv0FczAjTsJk=
SIZE (MailScanner-install-4.66.5-3.tar.gz) = 8129467
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

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

@ -1,6 +1,6 @@
$OpenBSD: patch-bin_MailScanner,v 1.2 2008/04/17 07:30:27 jasper Exp $
--- bin/MailScanner.orig Fri Jan 4 20:06:47 2008
+++ bin/MailScanner Thu Apr 17 09:24:09 2008
$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
@@ -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.2 2008/04/17 07:30:27 jasper Exp $
unshift @INC, $path;
}
@@ -169,8 +169,6 @@ if ($Versions) {
@@ -171,8 +171,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.2 2008/04/17 07:30:27 jasper Exp $
printf("This is Perl version %f (%vd)\n", $], $^V);
print "\nThis is MailScanner version " . $MailScanner::Config::MailScannerVersion . "\n";
print "Module versions are:\n";
@@ -193,9 +191,10 @@ if ($Versions) {
@@ -195,9 +193,10 @@ if ($Versions) {
# Check version of MIME-tools against its requirements
my $error = 0;
@ -37,7 +37,7 @@ $OpenBSD: patch-bin_MailScanner,v 1.2 2008/04/17 07:30:27 jasper 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;
}
@@ -235,7 +234,7 @@ if ($WantLintOnly) {
@@ -238,7 +237,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.2 2008/04/17 07:30:27 jasper Exp $
!(-f $ConfFile);
# Check the MailScanner version number against what is in MailScanner.conf
@@ -280,7 +279,7 @@ if (MailScanner::Config::QuickPeek($ConfFile, 'virussc
@@ -283,7 +282,7 @@ if (MailScanner::Config::QuickPeek($ConfFile, 'virussc
Currently you are using no virus scanners.
This is probably not what you want.

18
mail/mailscanner/patches/patch-bin_cron_update_bad_phishing_sites_cron Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-bin_cron_update_bad_phishing_sites_cron,v 1.1 2008/04/24 21:31:00 todd Exp $
--- bin/cron/update_bad_phishing_sites.cron.orig Fri Apr 4 01:47:05 2008
+++ bin/cron/update_bad_phishing_sites.cron Fri Apr 4 01:47:58 2008
@@ -9,12 +9,12 @@ if [ -f /etc/sysconfig/MailScanner ] ; then
fi
export UPDATEMAXDELAY
-[ -x /opt/MailScanner/bin/update_bad_phishing_sites ] || exit 0
+[ -x %PREFIX%/bin/update_bad_phishing_sites ] || exit 0
if [ "x$UPDATEMAXDELAY" = "x0" ]; then
:
else
logger -p mail.info -t update.bad.phishing.sites Delaying cron job up to $UPDATEMAXDELAY seconds
perl -e "sleep int(rand($UPDATEMAXDELAY));"
fi
-exec /opt/MailScanner/bin/update_bad_phishing_sites > /dev/null 2>&1
+exec %PREFIX%/bin/update_bad_phishing_sites > /dev/null 2>&1
exit 0

21
mail/mailscanner/patches/patch-bin_update_bad_phishing_sites Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-bin_update_bad_phishing_sites,v 1.1 2008/04/24 21:31:00 todd Exp $
--- bin/update_bad_phishing_sites.orig Fri Apr 4 01:36:56 2008
+++ bin/update_bad_phishing_sites Fri Apr 4 01:42:50 2008
@@ -39,7 +39,7 @@ use DirHandle;
# Work out Quarantine Directory from MailScanner.conf
my $base = '/var/spool/MailScanner/quarantine'; # Default value
-my $msconf = new FileHandle("< /opt/MailScanner/etc/MailScanner.conf") or warn "Cannot open main configuration file /opt/MailScanner/etc/MailScanner.conf";
+my $msconf = new FileHandle("< %SYSCONFDIR%/MailScanner/MailScanner.conf") or warn "Cannot open main configuration file %SYSCONFDIR%/MailScanner/MailScanner.conf";
while(<$msconf>) {
$base = $1 if /^\s*Quarantine\s*Dir\s*=\s*(\S+)/;
}
@@ -49,7 +49,7 @@ my $current = $base . '/phishingupdate/';
my $cache = $current . 'cache/';
my $status = $current . 'status';
my $urlbase = "http://www.mailscanner.tv/";
-my $target= "/opt/MailScanner/etc/phishing.bad.sites.conf";
+my $target= "%SYSCONFDIR%/MailScanner/phishing.bad.sites.conf";
my $query="msupdate.greylist.bastionmail.com";
my $baseupdated = 0;

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

@ -1,6 +1,6 @@
$OpenBSD: patch-etc_MailScanner_conf,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
--- etc/MailScanner.conf.orig Fri Jan 4 13:06:47 2008
+++ etc/MailScanner.conf Mon Feb 18 01:20:02 2008
$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
@@ -72,17 +72,17 @@
%web-site% = www.your-organisation.com
@ -91,7 +91,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
# The maximum length of time the "unrar" command is allowed to run for 1
# RAR archive (in seconds)
@@ -565,7 +567,7 @@ Virus Scanning = yes
@@ -567,7 +569,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.1.1.1 2008/02/20 03:47:18 todd Exp $
# The maximum length of time the commercial virus scanner is allowed to run
# for 1 batch of messages (in seconds).
@@ -693,19 +695,19 @@ Allowed Sophos Error Messages =
@@ -695,19 +697,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 +123,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
#
# Options specific to ClamAV Anti-Virus
@@ -716,7 +718,7 @@ Monitors For Sophos Updates = /opt/sophos-av/lib/sav/*
@@ -718,7 +720,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 +132,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
# ClamAVModule only: set limits when scanning for viruses.
#
@@ -1306,7 +1308,7 @@ Sign Messages Already Processed = no
@@ -1330,7 +1332,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.1.1.1 2008/02/20 03:47:18 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
@@ -1371,7 +1373,7 @@ Deliver Cleaned Messages = yes
@@ -1395,7 +1397,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.1.1.1 2008/02/20 03:47:18 todd Exp $
# *If* "Notify Senders" is set to yes, do you want to notify people
# who sent you messages containing viruses?
@@ -1433,7 +1435,7 @@ Scanned Subject Text = {Scanned}
@@ -1457,7 +1459,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.1.1.1 2008/02/20 03:47:18 todd Exp $
# This is the text to add to the start of the subject if the
# "Virus Modify Subject" option is set.
@@ -1449,7 +1451,7 @@ Virus Subject Text = {Virus?}
@@ -1473,7 +1475,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.1.1.1 2008/02/20 03:47:18 todd Exp $
# This is the text to add to the start of the subject if the
# "Filename Modify Subject" option is set.
@@ -1467,7 +1469,7 @@ Filename Subject Text = {Filename?}
@@ -1491,7 +1493,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.1.1.1 2008/02/20 03:47:18 todd Exp $
# This is the text to add to the start of the subject if the
# "Content Modify Subject" option is set.
@@ -1486,7 +1488,7 @@ Content Subject Text = {Dangerous Content?}
@@ -1510,7 +1512,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.1.1.1 2008/02/20 03:47:18 todd Exp $
# This is the text to add to the start of the subject if the
# "Size Modify Subject" option is set.
@@ -1505,7 +1507,7 @@ Size Subject Text = {Size}
@@ -1529,7 +1531,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.1.1.1 2008/02/20 03:47:18 todd Exp $
# This is the text to add to the start of the subject if the
# "Disarmed Modify Subject" option is set.
@@ -1535,7 +1537,7 @@ Phishing Subject Text = {Fraud?}
@@ -1559,7 +1561,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.1.1.1 2008/02/20 03:47:18 todd Exp $
# This is the text to add to the start of the subject if the
# "Spam Modify Subject" option is set.
@@ -1555,7 +1557,7 @@ Spam Subject Text = {Spam?}
@@ -1579,7 +1581,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.1.1.1 2008/02/20 03:47:18 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
@@ -1624,7 +1626,7 @@ Archive Mail =
@@ -1648,7 +1650,7 @@ Archive Mail =
# 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.1.1.1 2008/02/20 03:47:18 todd Exp $
# Include the full headers of each message in the notices sent to the local
# system administrators?
@@ -1679,7 +1681,7 @@ Virus Scanner Definitions = %etc-dir%/virus.scanners.c
@@ -1703,7 +1705,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.1.1.1 2008/02/20 03:47:18 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
@@ -1858,7 +1860,7 @@ Watermark Header = X-%org-name%-MailScanner-Watermark:
@@ -1882,7 +1884,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.1.1.1 2008/02/20 03:47:18 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
@@ -1955,7 +1957,7 @@ Include Binary Attachments In SpamAssassin = no
@@ -1979,7 +1981,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.1.1.1 2008/02/20 03:47:18 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.
@@ -2319,14 +2321,14 @@ SpamAssassin Install Prefix =
@@ -2352,14 +2354,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.1.1.1 2008/02/20 03:47:18 todd Exp $
SpamAssassin Local Rules Dir =
# The rules created by the "sa-update" tool are searched for here.
@@ -2340,10 +2342,10 @@ SpamAssassin Local Rules Dir =
@@ -2373,10 +2375,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.1.1.1 2008/02/20 03:47:18 todd Exp $
SpamAssassin Default Rules Dir =
#
@@ -2376,9 +2378,9 @@ MCP Actions = deliver
@@ -2409,9 +2411,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.1.1.1 2008/02/20 03:47:18 todd Exp $
High Scoring MCP Subject Text = {MCP?}
Is Definitely MCP = no
@@ -2524,7 +2526,7 @@ Lockfile Dir = /tmp
@@ -2557,7 +2559,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.

62
mail/mailscanner/patches/patch-etc_virus_scanners_conf
View File

@ -1,13 +1,7 @@
$OpenBSD: patch-etc_virus_scanners_conf,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
--- etc/virus.scanners.conf.orig Wed Oct 31 07:58:56 2007
+++ etc/virus.scanners.conf Sat Dec 15 21:39:48 2007
@@ -6,45 +6,45 @@
# 3. Installation directory of virus scanner. This does not usually include
# any "bin" directory in the path to the scanner program itself.
# You can test a -wrapper script with a command like this:
-# /opt/MailScanner/lib/f-secure-wrapper /opt/f-secure/fsav /tmp
+# %PREFIX%/libexec/MailScanner/f-secure-wrapper /opt/f-secure/fsav /tmp
# That command will attempt to scan /tmp using F-Secure. If it works you
$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 @@
# should see some sensible output. If it fails, you will probably just see
# an error message such as "Command not found" or similar.
#
@ -17,30 +11,36 @@ $OpenBSD: patch-etc_virus_scanners_conf,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
-avg /opt/MailScanner/lib/avg-wrapper /usr/local
-bitdefender /opt/MailScanner/lib/bitdefender-wrapper /opt/bdc
-clamav /opt/MailScanner/lib/clamav-wrapper /usr/local
-clamd /bin/false /usr/local
-clamavmodule /bin/false /tmp
-command /opt/MailScanner/lib/command-wrapper /usr
-css /opt/MailScanner/lib/css-wrapper /opt/SYMCScan
-drweb /opt/MailScanner/lib/drweb-wrapper /opt/drweb
-esets /opt/MailScanner/lib/esets-wrapper /usr/sbin
-etrust /opt/MailScanner/lib/etrust-wrapper /opt/eTrustAntivirus
-f-prot /opt/MailScanner/lib/f-prot-wrapper /usr/local/f-prot
-f-prot-6 /opt/MailScanner/lib/f-prot-6-wrapper /opt/f-prot
-f-protd-6 /bin/false /opt/f-prot
-f-secure /opt/MailScanner/lib/f-secure-wrapper /opt/f-secure/fsav
-generic /opt/MailScanner/lib/generic-wrapper /
-inoculan /opt/MailScanner/lib/inoculan-wrapper /usr/local/inoculan
-inoculate /opt/MailScanner/lib/inoculate-wrapper /usr/local/av
+antivir %PREFIX%/libexec/MailScanner/antivir-wrapper /usr/lib/AntiVir
+avast %PREFIX%/libexec/MailScanner/avast-wrapper /usr
+avastd %PREFIX%/libexec/MailScanner/avastd-wrapper /usr
+avg %PREFIX%/libexec/MailScanner/avg-wrapper /usr/local
+bitdefender %PREFIX%/libexec/MailScanner/bitdefender-wrapper /opt/bdc
+clamav %PREFIX%/libexec/MailScanner/clamav-wrapper /usr/local
clamd /bin/false /usr/local
clamavmodule /bin/false /tmp
-command /opt/MailScanner/lib/command-wrapper /usr
-css /opt/MailScanner/lib/css-wrapper /opt/SYMCScan
-drweb /opt/MailScanner/lib/drweb-wrapper /opt/drweb
-etrust /opt/MailScanner/lib/etrust-wrapper /opt/eTrustAntivirus
-f-prot /opt/MailScanner/lib/f-prot-wrapper /usr/local/f-prot
-f-prot-6 /opt/MailScanner/lib/f-prot-6-wrapper /opt/f-prot
-f-secure /opt/MailScanner/lib/f-secure-wrapper /opt/f-secure/fsav
-generic /opt/MailScanner/lib/generic-wrapper /
-inoculan /opt/MailScanner/lib/inoculan-wrapper /usr/local/inoculan
-inoculate /opt/MailScanner/lib/inoculate-wrapper /usr/local/av
+clamd /bin/false /usr/local
+clamavmodule /bin/false /tmp
+command %PREFIX%/libexec/MailScanner/command-wrapper /usr
+css %PREFIX%/libexec/MailScanner/css-wrapper /opt/SYMCScan
+drweb %PREFIX%/libexec/MailScanner/drweb-wrapper /opt/drweb
+esets %PREFIX%/libexec/MailScanner/esets-wrapper /usr/sbin
+etrust %PREFIX%/libexec/MailScanner/etrust-wrapper /opt/eTrustAntivirus
+f-prot %PREFIX%/libexec/MailScanner/f-prot-wrapper /usr/local/f-prot
+f-prot-6 %PREFIX%/libexec/MailScanner/f-prot-6-wrapper /opt/f-prot
+f-protd-6 /bin/false /opt/f-prot
+f-secure %PREFIX%/libexec/MailScanner/f-secure-wrapper /opt/f-secure/fsav
+generic %PREFIX%/libexec/MailScanner/generic-wrapper /
+inoculan %PREFIX%/libexec/MailScanner/inoculan-wrapper /usr/local/inoculan
@ -59,22 +59,24 @@ $OpenBSD: patch-etc_virus_scanners_conf,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
-#nod32-1.99 /opt/MailScanner/lib/nod32-wrapper /usr/local/nod32
-nod32-1.99 /opt/MailScanner/lib/nod32-wrapper /usr/sbin
-nod32 /opt/MailScanner/lib/nod32-wrapper /usr/local/nod32
+#nod32-1.99 %PREFIX%/libexec/MailScanner/nod32-wrapper /usr/local/nod32
+nod32-1.99 %PREFIX%/libexec/MailScanner/nod32-wrapper /usr/sbin
+nod32 %PREFIX%/libexec/MailScanner/nod32-wrapper /usr/local/nod32
none /bin/false /tmp
-none /bin/false /tmp
-norman /opt/MailScanner/lib/norman-wrapper /usr/bin
-panda /opt/MailScanner/lib/panda-wrapper /usr
-rav /opt/MailScanner/lib/rav-wrapper /usr/local/rav8
-sophos /opt/MailScanner/lib/sophos-wrapper /opt/sophos-av
-sophossavi /bin/false /tmp
-symscanengine /opt/MailScanner/lib/symscanengine-wrapper /opt/SYMCScan
-trend /opt/MailScanner/lib/trend-wrapper /pack/trend
-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
+nod32 %PREFIX%/libexec/MailScanner/nod32-wrapper /usr/local/nod32
+none /bin/false /tmp
+norman %PREFIX%/libexec/MailScanner/norman-wrapper /usr/bin
+panda %PREFIX%/libexec/MailScanner/panda-wrapper /usr
+rav %PREFIX%/libexec/MailScanner/rav-wrapper /usr/local/rav8
+sophos %PREFIX%/libexec/MailScanner/sophos-wrapper /opt/sophos-av
sophossavi /bin/false /tmp
-symscanengine /opt/MailScanner/lib/symscanengine-wrapper /opt/SYMCScan
-trend /opt/MailScanner/lib/trend-wrapper /pack/trend
-vexira /opt/MailScanner/lib/vexira-wrapper /usr/local/vexira
+sophossavi /bin/false /tmp
+symscanengine %PREFIX%/libexec/MailScanner/symscanengine-wrapper /opt/SYMCScan
+trend %PREFIX%/libexec/MailScanner/trend-wrapper /pack/trend
+vexira %PREFIX%/libexec/MailScanner/vexira-wrapper /usr/local/vexira

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

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_MailScanner_ConfigDefs_pl,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
--- lib/MailScanner/ConfigDefs.pl.orig Sat Dec 29 16:28:47 2007
+++ lib/MailScanner/ConfigDefs.pl Sun Feb 17 20:42:07 2008
@@ -327,8 +327,8 @@ qmailintdhashnumber 1
$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
# 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.1.1.1 2008/02/20 03:47:18 todd
FileCommand /usr/bin/file
FirstCheck mcp
GunzipCommand /bin/gunzip
@@ -350,7 +350,7 @@ QuarantinePerms 0600
@@ -356,7 +356,7 @@ QuarantinePerms 0600
RunAsUser 0
RunAsGroup 0
SACache /var/spool/MailScanner/incoming/SpamAssassin.cache.db

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

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_MailScanner_CustomConfig_pm,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
--- lib/MailScanner/CustomConfig.pm.orig Mon Mar 20 17:48:20 2006
+++ lib/MailScanner/CustomConfig.pm Mon Mar 20 17:48:20 2006
@@ -1675,7 +1675,7 @@ __DATA__
$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__
# SO17 1BJ
# United Kingdom
#

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

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_MailScanner_Message_pm,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
--- lib/MailScanner/Message.pm.orig Sat Dec 29 16:28:46 2007
+++ lib/MailScanner/Message.pm Sun Feb 17 20:42:07 2008
@@ -645,12 +645,19 @@ sub IsSpam {
$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 {
# rblspamheader is useful start to spamreport if RBLsaysspam.
# Do the Custom Spam Checker

8
mail/mailscanner/patches/patch-lib_symscanengine-autoupdate
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-lib_symscanengine-autoupdate,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
--- lib/symscanengine-autoupdate.orig Wed May 30 12:30:32 2007
+++ lib/symscanengine-autoupdate Sun Aug 5 04:03:26 2007
$OpenBSD: patch-lib_symscanengine-autoupdate,v 1.2 2008/04/24 21:31:00 todd Exp $
--- lib/symscanengine-autoupdate.orig Sat Mar 1 20:36:16 2008
+++ lib/symscanengine-autoupdate Tue Mar 18 14:16:39 2008
@@ -2,7 +2,7 @@
use Sys::Syslog;
@ -10,7 +10,7 @@ $OpenBSD: patch-lib_symscanengine-autoupdate,v 1.1.1.1 2008/02/20 03:47:18 todd
$LockFile = "/tmp/SymScanEngineBusy.lock";
@@ -20,7 +20,7 @@ BailOut("Installation dir \"$PackageDir\" does not exi
@@ -30,7 +30,7 @@ BailOut("Installation dir \"$PackageDir\" does not exi
# Need to add code to dymanically locate the java binary
# SuSE has some info in /etc/java, is this a standard location for info?

8
mail/mailscanner/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
@comment $OpenBSD: PLIST,v 1.2 2008/04/24 21:31:00 todd Exp $
bin/MailScanner
bin/analyse_SpamAssassin_cache
bin/check_mailscanner
@ -6,6 +6,7 @@ bin/clean.SA.cache
bin/clean.quarantine
bin/d2mbox
bin/df2mbox
bin/update_bad_phishing_sites
bin/update_phishing_sites
lib/MailScanner/
@sample /var/spool/MailScanner/
@ -55,7 +56,6 @@ lib/MailScanner/MailScanner/TNEF.pm
lib/MailScanner/MailScanner/WorkArea.pm
lib/MailScanner/MailScanner/ZMDiskStore.pm
lib/MailScanner/MailScanner/ZMailer.pm
lib/MailScanner/MailScanner/notes.txt
libexec/MailScanner/
libexec/MailScanner/MailScanner
share/MailScanner/
@ -101,6 +101,10 @@ share/examples/MailScanner/libexec/css-wrapper.sample
@sample libexec/MailScanner/css-wrapper
share/examples/MailScanner/libexec/drweb-wrapper.sample
@sample libexec/MailScanner/drweb-wrapper
share/examples/MailScanner/libexec/esets-autoupdate.sample
@sample libexec/MailScanner/esets-autoupdate
share/examples/MailScanner/libexec/esets-wrapper.sample
@sample libexec/MailScanner/esets-wrapper
share/examples/MailScanner/libexec/etrust-autoupdate.sample
@sample libexec/MailScanner/etrust-autoupdate
share/examples/MailScanner/libexec/etrust-wrapper.sample