update to MailScanner-4.85.2-1, from Brad (maintainer)

This commit is contained in:
sthen 2015-04-09 19:55:09 +00:00
parent e8d04e5922
commit 1f9a513648
19 changed files with 130 additions and 421 deletions

View File

@ -1,17 +1,14 @@
# $OpenBSD: Makefile,v 1.55 2014/07/22 10:55:40 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.56 2015/04/09 19:55:09 sthen Exp $
COMMENT= virus/spam scanning framework
V= 4.84
Vs= 6
V= 4.85
Vs= 2
Vss= ${Vs}-1
DISTNAME= mailscanner-${V}.${Vss}
DISTNAME= MailScanner-${V}.${Vss}
PKGNAME= mailscanner-${V}.${Vss:S/-/./}
REVISION= 2
CATEGORIES= mail
MASTER_SITES= http://comstyle.com/source/
DISTFILES= MailScanner-install-${V}.${Vss}${EXTRACT_SUFX}
MASTER_SITES= https://s3.amazonaws.com/mailscanner/release/v4/tar/
HOMEPAGE= http://www.mailscanner.info/
@ -28,13 +25,16 @@ RUN_DEPENDS+= archivers/lha \
converters/p5-Convert-TNEF \
databases/p5-DBD-SQLite \
databases/p5-DBI \
devel/p5-IO-String \
devel/p5-OLE-Storage_Lite \
devel/p5-Sys-SigAction \
mail/p5-MIME-tools \
mail/tnef>=1.4.7 \
net/p5-Net-CIDR \
net/p5-Net-IP \
net/p5-Sys-Hostname-Long \
net/wget \
security/p5-Digest-SHA1 \
sysutils/p5-Filesys-Df \
textproc/antiword \
www/p5-HTML-Parser
@ -101,7 +101,7 @@ install_share:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc
${INSTALL_DATA_DIR} ${PREFIX}/share/MailScanner
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/MailScanner
@${INST_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/MailScanner/README
@${INST_DATA} ${WRKDIR}/MailScanner-install-${V}.${Vs}/README ${PREFIX}/share/doc/MailScanner/README
@cd ${WRKSRC}/etc ; find reports -type d -exec ${INSTALL_DATA_DIR} ${PREFIX}'/share/examples/MailScanner/{}' \;
@cd ${WRKSRC}/etc ; find reports -type f ! -name "*.orig" | while read f; do ${INST_DATA} $$f ${PREFIX}/share/examples/MailScanner/$$f; done
@cd ${PREFIX}/share/examples/MailScanner/reports ; find . -name "*.bak" -print0 | xargs -0 rm -f

View File

@ -1,2 +1,2 @@
SHA256 (MailScanner-install-4.84.6-1.tar.gz) = 2IAGKL8rftSAEhvAYgmHILE/NMk4x1oeNbakGP/NLAM=
SIZE (MailScanner-install-4.84.6-1.tar.gz) = 9507315
SHA256 (MailScanner-4.85.2-1.tar.gz) = Y1u4aQ7jTPfCZMP6tG7FfIcLVdGrplhE6HAEyYDYc20=
SIZE (MailScanner-4.85.2-1.tar.gz) = 923998

View File

@ -1,63 +0,0 @@
all:
build:
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
install_bin:
.for _f in ${BINS}
@${INSTALL_SCRIPT} bin/${_f} ${PREFIX}/bin
.endfor
install_libexec:
@mkdir -p ${PREFIX}/libexec/MailScanner
@-chmod -R ${BINMODE} ${PREFIX}/libexec/MailScanner 2>/dev/null
${INSTALL_SCRIPT} bin/MailScanner ${PREFIX}/libexec/MailScanner
( cd lib ; find * -name "*-wrapper" -exec ${INSTALL_SCRIPT} '{}' ${PREFIX}'/libexec/MailScanner/{}'.sample \; )
( cd lib ; find * -name "*-autoupdate" -exec ${INSTALL_SCRIPT} '{}' ${PREFIX}'/libexec/MailScanner/{}'.sample \; )
ETC= MailScanner.conf filename.rules.conf filetype.rules.conf
ETC+= phishing.safe.sites.conf
ETC+= spam.assassin.prefs.conf spam.lists.conf virus.scanners.conf
ETC+= rules/spam.whitelist.rules rules/bounce.rules
install_etc:
@${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/examples/MailScanner
@${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/examples/MailScanner/rules
.for _f in ${ETC}
@${INSTALL_DATA} etc/${_f} ${PREFIX}/share/examples/MailScanner/${_f}
.endfor
${INSTALL_DATA} etc/rules/EXAMPLES ${PREFIX}/share/examples/MailScanner/rules/EXAMPLES
${INSTALL_DATA} etc/rules/README ${PREFIX}/share/examples/MailScanner/rules/README
install_share:
@${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/doc
@${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/MailScanner
@${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/doc/MailScanner
( cd docs ; find * -type d -exec ${BSD_INSTALL_DATA_DIR} ${PREFIX}'/share/doc/MailScanner/{}' \; )
( cd docs ; find * -type f ! -name "*.orig" -exec ${INSTALL_DATA} '{}' ${PREFIX}'/share/doc/MailScanner/{}' \; )
${INSTALL_DATA} INSTALL ${PREFIX}/share/doc/MailScanner/INSTALL
${INSTALL_DATA} INSTALL.FreeBSD ${PREFIX}/share/doc/MailScanner/INSTALL.FreeBSD
${INSTALL_DATA} INSTALL.OpenBSD ${PREFIX}/share/doc/MailScanner/INSTALL.OpenBSD
${INSTALL_DATA} README ${PREFIX}/share/doc/MailScanner
${INSTALL_DATA} README.OpenBSD.port ${PREFIX}/share/doc/MailScanner
( cd etc ; find reports -type d -exec ${BSD_INSTALL_DATA_DIR} ${PREFIX}'/share/MailScanner/{}' \; ) 2>/dev/null
( cd etc ; find reports -type f ! -name "*.orig" -exec ${INSTALL_DATA} '{}' ${PREFIX}'/share/MailScanner/{}' \; )
@-chmod -R ${BINMODE} ${PREFIX}/share/MailScanner/reports
install_lib:
@${BSD_INSTALL_PROGRAM_DIR} ${PREFIX}/lib/MailScanner
@${BSD_INSTALL_PROGRAM_DIR} ${PREFIX}/lib/MailScanner/MailScanner
@${BSD_INSTALL_PROGRAM_DIR} ${PREFIX}/lib/MailScanner/MailScanner/CustomFunctions
${INSTALL_SCRIPT} lib/MailScanner.pm ${PREFIX}/lib/MailScanner/MailScanner.pm
(cd lib/MailScanner ; find * -type f ! -name "*.orig" -exec ${INSTALL_SCRIPT} '{}' ${PREFIX}'/lib/MailScanner/MailScanner/{}' \; )

View File

@ -1,13 +1,13 @@
$OpenBSD: patch-bin_MailScanner,v 1.10 2010/06/18 21:48:23 sthen Exp $
--- bin/MailScanner.orig Wed Jun 2 04:17:25 2010
+++ bin/MailScanner Tue Jun 15 18:46:32 2010
$OpenBSD: patch-bin_MailScanner,v 1.11 2015/04/09 19:55:09 sthen Exp $
--- bin/MailScanner.orig Wed Feb 25 06:38:27 2015
+++ bin/MailScanner Fri Mar 13 03:49:09 2015
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -I/opt/MailScanner/lib
+#!/usr/bin/perl -I%PREFIX%/lib/MailScanner
-#!/usr/bin/perl -U -I/opt/MailScanner/lib
+#!/usr/bin/perl -U -I%PREFIX%/lib/MailScanner
#
# MailScanner - SMTP E-Mail Virus Scanner
# Copyright (C) 2002 Julian Field
@@ -72,7 +72,7 @@ BEGIN {
@@ -73,7 +73,7 @@ BEGIN {
# of each element
foreach $path (reverse @oldinc) {
next unless $path =~ /\//;
@ -16,7 +16,7 @@ $OpenBSD: patch-bin_MailScanner,v 1.10 2010/06/18 21:48:23 sthen Exp $
unshift @INC, $path;
}
@@ -209,8 +209,6 @@ if ($Versions) {
@@ -210,8 +210,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.10 2010/06/18 21:48:23 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";
@@ -280,7 +278,7 @@ if ($WantLintOnly || $WantLintLiteOnly) {
@@ -281,7 +279,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.
@ -34,7 +34,7 @@ $OpenBSD: patch-bin_MailScanner,v 1.10 2010/06/18 21:48:23 sthen Exp $
!(-f $ConfFile);
# Tell ConfigSQL where the configuration file is.
$MailScanner::ConfigSQL::ConfFile = $ConfFile;
@@ -337,7 +335,7 @@ if (MailScanner::Config::QuickPeek($ConfFile, 'virussc
@@ -338,7 +336,7 @@ if (MailScanner::Config::QuickPeek($ConfFile, 'virussc
Currently you are using no virus scanners.
This is probably not what you want.
@ -43,7 +43,7 @@ $OpenBSD: patch-bin_MailScanner,v 1.10 2010/06/18 21:48:23 sthen Exp $
Virus Scanners = clamav
Then download
http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/install-Clam-SA.tar.gz
@@ -424,7 +422,7 @@ if ($WantLintOnly || $WantLintLiteOnly) {
@@ -425,7 +423,7 @@ if ($WantLintOnly || $WantLintLiteOnly) {
}
my $cluid = MailScanner::Config::QuickPeek($ConfFile, 'runasuser');
my $clgid = MailScanner::Config::QuickPeek($ConfFile, 'runasgroup');
@ -52,7 +52,7 @@ $OpenBSD: patch-bin_MailScanner,v 1.10 2010/06/18 21:48:23 sthen Exp $
print STDERR "Error: Attempt to create locks in $lockdir failed!\n"
if ($clr>>8) != 0;
@@ -721,7 +719,7 @@ if ($locksdir eq "" || $locksdir =~ /tmp$/i) {
@@ -722,7 +720,7 @@ if ($locksdir eq "" || $locksdir =~ /tmp$/i) {
print STDERR "Please move your \"Lockfile Dir\" setting in MailScanner.conf.\n";
print STDERR "It should point outside /tmp, preferably /var/spool/MailScanner/incoming/Locks\n";
}

View File

@ -1,8 +1,9 @@
$OpenBSD: patch-bin_cron_processing_messages_alert_cron,v 1.1 2009/10/07 20:59:29 sthen Exp $
--- bin/cron/processing_messages_alert.cron.orig Fri Aug 28 18:34:11 2009
+++ bin/cron/processing_messages_alert.cron Fri Aug 28 18:34:51 2009
$OpenBSD: patch-bin_cron_processing_messages_alert_cron,v 1.2 2015/04/09 19:55:09 sthen Exp $
--- bin/cron/processing_messages_alert.cron.orig Sun Mar 15 02:06:59 2015
+++ bin/cron/processing_messages_alert.cron Sun Mar 15 14:21:23 2015
@@ -1,5 +1,5 @@
#!/bin/bash
-#!/bin/bash
+#!/bin/sh
-[ -x /opt/MailScanner/bin/processing_messages_alert ] || exit 0
-exec /opt/MailScanner/bin/processing_messages_alert > /dev/null 2>&1

View File

@ -1,16 +1,26 @@
$OpenBSD: patch-bin_update_bad_phishing_emails,v 1.3 2012/03/06 20:09:40 pea Exp $
--- bin/update_bad_phishing_emails.orig Mon Mar 5 10:33:31 2012
+++ bin/update_bad_phishing_emails Mon Mar 5 13:05:01 2012
@@ -39,7 +39,7 @@ use DirHandle;
$OpenBSD: patch-bin_update_bad_phishing_emails,v 1.4 2015/04/09 19:55:09 sthen Exp $
--- bin/update_bad_phishing_emails.orig Wed Feb 18 06:53:04 2015
+++ bin/update_bad_phishing_emails Fri Mar 13 20:26:56 2015
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w -I/opt/MailScanner/lib
+#!/usr/bin/perl -w -I%PREFIX%/lib/MailScanner
#
# MailScanner - SMTP E-Mail Virus Scanner
@@ -39,17 +39,17 @@ use MailScanner::Config;
# 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+)/;
-if (-f '/opt/MailScanner/etc/MailScanner.conf') {
- $base = MailScanner::Config::QuickPeek('/opt/MailScanner/etc/MailScanner.conf', 'QuarantineDir');
+if (-f '%SYSCONFDIR%/MailScanner/MailScanner.conf') {
+ $base = MailScanner::Config::QuickPeek('%SYSCONFDIR%/MailScanner/MailScanner.conf', 'QuarantineDir');
}else{
- warn "Default configuration file /opt/MailScanner/etc/MailScanner.conf not found";
+ warn "Default configuration file %SYSCONFDIR%/MailScanner/MailScanner.conf not found";
}
@@ -49,7 +49,7 @@ my $current = $base . '/phishingupdate/';
my $current = $base . '/phishingupdate/';
my $cache = $current . 'emails.cache/';
my $status = $current . 'emails.status';
my $urlbase = "http://cdn.mailscanner.info/emails.";

View File

@ -1,21 +1,18 @@
$OpenBSD: patch-bin_update_bad_phishing_sites,v 1.3 2012/03/06 20:09:40 pea Exp $
--- bin/update_bad_phishing_sites.orig Mon Mar 5 10:33:35 2012
+++ bin/update_bad_phishing_sites Mon Mar 5 13:05:16 2012
@@ -39,7 +39,7 @@ use DirHandle;
$OpenBSD: patch-bin_update_bad_phishing_sites,v 1.4 2015/04/09 19:55:09 sthen Exp $
--- bin/update_bad_phishing_sites.orig Thu Mar 12 19:19:12 2015
+++ bin/update_bad_phishing_sites Sun Mar 15 14:16:04 2015
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
#
# MailScanner - SMTP E-Mail Virus Scanner
# Copyright (C) 2002 Julian Field
@@ -23,7 +23,7 @@
# set your options here
#
-CONFIGDIR='/opt/MailScanner/etc';
+CONFIGDIR='%SYSCONFDIR%/MailScanner';
THEURL='http://phishing.mailborder.com/phishing.bad.sites.conf';
# 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://cdn.mailscanner.info/";
-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;

View File

@ -1,23 +1,18 @@
$OpenBSD: patch-bin_update_phishing_sites,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
--- bin/update_phishing_sites.orig Tue Jun 26 05:06:26 2007
+++ bin/update_phishing_sites Sun Aug 5 04:03:25 2007
@@ -34,8 +34,8 @@
PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/etc:/usr/local/bin:/usr/sfw/bin
export PATH
$OpenBSD: patch-bin_update_phishing_sites,v 1.2 2015/04/09 19:55:09 sthen Exp $
--- bin/update_phishing_sites.orig Thu Mar 12 19:19:12 2015
+++ bin/update_phishing_sites Sun Mar 15 14:14:20 2015
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
#
# MailScanner - SMTP E-Mail Virus Scanner
# Copyright (C) 2002 Julian Field
@@ -23,7 +23,7 @@
-if [ -d /opt/MailScanner/etc ]; then
- cd /opt/MailScanner/etc
+if [ -d %SYSCONFDIR%/MailScanner ]; then
+ cd %SYSCONFDIR%/MailScanner
else
logger -p mail.warn -t update.phishing.sites Cannot find MailScanner configuration directory, update failed.
echo Cannot find MailScanner configuration directory.
@@ -43,7 +43,7 @@ else
exit 1
fi
# set your options here
#
-CONFIGDIR='/opt/MailScanner/etc';
+CONFIGDIR='%SYSCONFDIR%/MailScanner';
THEURL='http://phishing.mailborder.com/phishing.safe.sites.conf';
-wget http://www.mailscanner.info/phishing.safe.sites.conf.master || \
+ftp http://www.mailscanner.info/phishing.safe.sites.conf.master || \
curl -O http://www.mailscanner.info/phishing.safe.sites.conf.master || \
( logger -p mail.warn -t update.phishing.sites Cannot find wget or curl, update failed. ; echo Cannot find wget or curl to do phishing sites update. ; exit 1 )

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-etc_MailScanner_conf,v 1.14 2010/12/29 06:42:16 ajacoutot Exp $
--- etc/MailScanner.conf.orig Sat Nov 13 16:16:14 2010
+++ etc/MailScanner.conf Wed Dec 29 07:36:41 2010
$OpenBSD: patch-etc_MailScanner_conf,v 1.15 2015/04/09 19:55:09 sthen Exp $
--- etc/MailScanner.conf.orig Wed Feb 25 06:38:27 2015
+++ etc/MailScanner.conf Fri Mar 13 03:55:37 2015
@@ -43,7 +43,7 @@
# normal shell wildcard characters such as "*".
# For each setting, the last value read will be used by MailScanner.
@ -77,7 +77,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.14 2010/12/29 06:42:16 ajacoutot Exp $
# may be. It helps protect against Denial Of Service attacks in TNEF files.
# This can also be the filename of a ruleset.
#TNEF Expander = internal
-TNEF Expander = /opt/MailScanner/bin/tnef --maxsize=100000000
-TNEF Expander = /usr/bin/tnef --maxsize=100000000
+TNEF Expander = %PREFIX%/bin/tnef --maxsize=100000000
# The maximum length of time the TNEF Expander is allowed to run for 1 message.
@ -145,8 +145,8 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.14 2010/12/29 06:42:16 ajacoutot Exp $
# 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/*.cld /usr/local/share/clamav/*.cvd
+Monitors for ClamAV Updates = %PREFIX%/share/clamav/*.cld %PREFIX%/share/clamav/*.cvd
-Monitors for ClamAV Updates = /usr/local/share/clamav/*.cld /usr/local/share/clamav/*.cvd /var/lib/clamav/*.inc/* /var/lib/clamav/*.?db /var/lib/clamav/*.cvd
+Monitors for ClamAV Updates = %PREFIX%/share/clamav/*.cld %PREFIX%/share/clamav/*.cvd /var/db/clamav/*.inc/* /var/db/clamav/*.?db /var/db/clamav/*.cvd
# ClamAVModule only: set limits when scanning for viruses.
#
@ -318,10 +318,13 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.14 2010/12/29 06:42:16 ajacoutot Exp $
# How to lock spool files.
# Don't set this unless you *know* you need to.
@@ -3119,5 +3121,5 @@ Minimum Code Status = supported
@@ -3119,6 +3121,6 @@ Minimum Code Status = supported
# They will be read and processed in alphabetical order.
#
#
-include /opt/MailScanner/etc/conf.d/*
+include %SYSCONFDIR%/MailScanner/conf.d/*
-# End Of File
\ No newline at end of file
+# End Of File

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-lib_MailScanner_ConfigDefs_pl,v 1.10 2010/06/22 07:38:14 sthen Exp $
--- lib/MailScanner/ConfigDefs.pl.orig Wed Jun 9 17:21:30 2010
+++ lib/MailScanner/ConfigDefs.pl Mon Jun 21 21:49:22 2010
$OpenBSD: patch-lib_MailScanner_ConfigDefs_pl,v 1.11 2015/04/09 19:55:09 sthen Exp $
--- lib/MailScanner/ConfigDefs.pl.orig Wed Mar 4 08:09:15 2015
+++ lib/MailScanner/ConfigDefs.pl Sun Mar 15 13:51:04 2015
@@ -360,8 +360,8 @@ qmailintdhashnumber 1
# filename containing a list of directories.
[Simple,Other]
cachetiming 1800,300,10800,172800,600
-ClamWatchFiles /usr/local/share/clamav/*.cvd
-CustomFunctionsDir /usr/lib/MailScanner/MailScanner/CustomFunctions
-CustomFunctionsDir /usr/share/MailScanner/MailScanner/CustomFunctions
+ClamWatchFiles %PREFIX%/share/clamav/*.cvd
+CustomFunctionsDir %PREFIX%/lib/MailScanner/MailScanner/CustomFunctions
FileCommand /usr/bin/file

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-lib_MailScanner_CustomConfig_pm,v 1.4 2009/10/07 20:59:29 sthen Exp $
--- lib/MailScanner/CustomConfig.pm.orig Sun Apr 6 12:07:16 2008
+++ lib/MailScanner/CustomConfig.pm Fri Aug 28 18:52:24 2009
$OpenBSD: patch-lib_MailScanner_CustomConfig_pm,v 1.5 2015/04/09 19:55:09 sthen Exp $
--- lib/MailScanner/CustomConfig.pm.orig Sun Mar 1 23:13:10 2015
+++ lib/MailScanner/CustomConfig.pm Sun Mar 15 13:52:19 2015
@@ -765,7 +765,7 @@ my($hostname);
my $ConfFile = $ARGV[0];
@ -14,7 +14,7 @@ $OpenBSD: patch-lib_MailScanner_CustomConfig_pm,v 1.4 2009/10/07 20:59:29 sthen
# SO17 1BJ
# United Kingdom
#
-push @INC,"/usr/lib/MailScanner","/opt/MailScanner/lib";
-push @INC,"/usr/share/MailScanner","/opt/MailScanner/lib";
+push @INC,"%PREFIX%/lib/MailScanner";
use FileHandle;
use Fcntl qw(:DEFAULT :flock);

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-lib_MailScanner_CustomFunctions_LastSpam_pm,v 1.1 2013/12/12 21:56:19 brad Exp $
--- lib/MailScanner/CustomFunctions/LastSpam.pm.orig Thu Dec 12 16:18:13 2013
+++ lib/MailScanner/CustomFunctions/LastSpam.pm Thu Dec 12 16:21:45 2013
@@ -32,7 +32,6 @@ $VERSION = substr q$Revision: 1.1 $, 10;
my $Debug = 0; # Set to 1 to enable debug output to STDERR
#my $tmpfilename = "/tmp/MailScanner.LastSpam.$$.conf"; # Temp MS.conf file
# Temp MS.conf file
-my($tmpfh, $tmpfilename) = tempfile("MailScanner.LastSpam.XXXXXX", TMPDIR => 1, UNLINK => 0);
my %modtime = (); # Time domain list magic word file was last changed
my %filename = (); # Map Config option to magic word file
my %magicwords = {}; # Map Config option --> domains --> magic words
@@ -550,8 +549,7 @@ sub EndLastSpamSpamChecks {
sub SetupRuleset {
my($opkeyword) = @_;
- my $fh = new FileHandle;
- $fh->open("> $tmpfilename") or die "$!";
+ my($fh, $tmpfilename) = tempfile("MailScanner.LastSpam.XXXXXX", TMPDIR => 1, UNLINK => 0);
my $rf = $rulesetfilename{$opkeyword};
#print STDERR "RF = $rf\n";
#print STDERR $opkeyword . " = $rf\n";

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-lib_MailScanner_CustomFunctions_Ruleset-from-Function_pm,v 1.1 2013/12/12 21:56:19 brad Exp $
--- lib/MailScanner/CustomFunctions/Ruleset-from-Function.pm.orig Wed Dec 11 18:35:48 2013
+++ lib/MailScanner/CustomFunctions/Ruleset-from-Function.pm Wed Dec 11 18:36:34 2013
@@ -31,7 +31,6 @@ $VERSION = substr q$Revision: 1.1 $, 10;
my $Debug = 0; # Set to 1 to enable debug output to STDERR
#my $tmpfilename = "/tmp/MailScanner.$$.conf"; # Temp MS.conf file
-my($tmpfh, $tmpfilename) = tempfile("MailScanner.XXXXXX", TMPDIR => 1, UNLINK => 0);
@@ -60,8 +59,7 @@ sub InitVirusScanning {
my $option = 'virusscanning'; # External (MailScanner.conf-version)
# Make the temporary 1-line MailScanner.conf file, use it and delete it
- my $fh = new FileHandle;
- $fh->open("> $tmpfilename") or die "$!";
+ my($fh, $tmpfilename) = tempfile("MailScanner.XXXXXX", TMPDIR => 1, UNLINK => 0);
print $fh $option . " = $ruleset\n";
$fh->close;

View File

@ -1,111 +0,0 @@
$OpenBSD: patch-lib_MailScanner_TNEF_pm,v 1.4 2013/12/12 21:56:19 brad Exp $
--- lib/MailScanner/TNEF.pm.orig Wed Dec 11 18:21:01 2013
+++ lib/MailScanner/TNEF.pm Wed Dec 11 18:48:39 2013
@@ -229,18 +229,25 @@ sub ExternalDecoder {
# Create the subdir to unpack it into
#my $unpackdir = "tnef.$$";
- my ($tmpfh, $unpackdir) = tempfile("tnefXXXXXX", TMPDIR => $dir, UNLINK => 0);
- # This line shouldn't be here any more! $dir =~ s,^.*/,,;
- $unpackdir = $message->MakeNameSafe($unpackdir, $dir);
- unless (mkdir "$dir/$unpackdir", 0777) {
+ my $unpackdir = tempdir("tnefXXXXXX", DIR => $dir);
+ unless (-d $unpackdir) {
MailScanner::Log::WarnLog("Trying to unpack %s in message %s, could not create subdirectory %s, failed to unpack TNEF message", $tnefname, $message->{id},
- "$dir/$unpackdir");
+ "$unpackdir");
return 0;
}
- chmod 0700, "$dir/$unpackdir";
+ # Convert Incoming Work Permissions to an octal value and add search.
+ my $perms = oct(sprintf("%s", MailScanner::Config::Value('workperms')))
+ | 0111;
+ chmod $perms, $unpackdir;
+ # Try to set Incoming Work User and Group.
+ my $uname = MailScanner::Config::Value('workuser');
+ my $gname = MailScanner::Config::Value('workgroup');
+ my $uid = $uname?getpwnam($uname):-1;
+ my $gid = $gname?getgrnam($gname):-1;
+ chown $uid, $gid, $unpackdir;
my $cmd = MailScanner::Config::Value('tnefexpander') .
- " -f $dir/$tnefname -C $dir/$unpackdir --overwrite";
+ " -f $dir/$tnefname -C $unpackdir --overwrite";
my($kid);
my($TimedOut, $PipeReturn, $pid);
@@ -311,15 +318,15 @@ sub ExternalDecoder {
unless (MailScanner::Config::Value('replacetnef',$message) =~ /[12]/) {
# Just need to move all the unpacked files into the main attachments dir
- my $dirh = new DirHandle "$dir/$unpackdir";
+ my $dirh = new DirHandle "$$unpackdir";
return 0 unless defined $dirh;
while (defined(my $unpacked = $dirh->read)) {
- next unless -f "$dir/$unpackdir/$unpacked";
+ next unless -f "$$unpackdir/$unpacked";
# Add a 't' to the safename to mark it as a tnef member.
my $safe = $message->MakeNameSafe('t'.$unpacked, $dir);
# This will cause big problems as $safe has a type, and shouldn't!
$message->{file2parent}{$safe} = $tnefname;
- my $name1 = "$dir/$unpackdir/$unpacked";
+ my $name1 = "$unpackdir/$unpacked";
$name1 =~ /(.*)/;
$name1 = $1;
my $name2 = "$dir/$safe";
@@ -333,19 +340,21 @@ sub ExternalDecoder {
$safe =~ s#^(.*/)([^/])([^/]+)$#$1$3#; # I assert $2 will equal 't'.
$message->{file2parent}{$safe} = $tnefname;
}
- rmdir "$dir/$unpackdir"; # Directory should be empty now
+ # The following may result in a warning from a virus scanner that
+ # tries to lstat the directory, but it was empty so it can be ignored.
+ rmdir "$$unpackdir"; # Directory should be empty now
return 1;
}
#print STDERR "In TNEF External Decoder\n";
- my $dirh = new DirHandle "$dir/$unpackdir";
+ my $dirh = new DirHandle "$unpackdir";
return 0 unless defined $dirh;
my($type, $encoding);
$message->{entity}->make_multipart;
my($safename, @replacements, $unpacked);
while (defined($unpacked = $dirh->read)) {
- #print STDERR "Directory entry is \"$unpacked\" in \"$dir/$unpackdir\"\n";
- next unless -f "$dir/$unpackdir/$unpacked";
+ #print STDERR "Directory entry is \"$unpacked\" in \"$unpackdir\"\n";
+ next unless -f "$unpackdir/$unpacked";
# Add a 't' to the safename to mark it as a tnef member.
$safename = $message->MakeNameSafe('t'.$unpacked, $dir);
if (/^msg[\d-]+\.txt$/) {
@@ -353,15 +362,15 @@ sub ExternalDecoder {
} else {
($type, $encoding) = ("application/octet-stream", "base64");
}
- #print STDERR "Renaming '$dir/$unpackdir/$unpacked' to '$dir/$safename'\n";
- my $oldname = "$dir/$unpackdir/$unpacked";
+ #print STDERR "Renaming '$unpackdir/$unpacked' to '$dir/$safename'\n";
+ my $oldname = "$unpackdir/$unpacked";
my $newname = "$dir/$safename";
$oldname =~ /^(.*)$/;
$oldname = $1;
$newname =~ /^(.*)$/;
$newname = $1;
rename $oldname, $newname;
- #rename "$dir/$unpackdir/$unpacked", "$dir/$safename";
+ #rename "$unpackdir/$unpacked", "$dir/$safename";
# JKF 20090421 CHMOD, then CHOWN and CHGRP it if necessary.
chmod $perms, $newname;
#chmod $perms, "$dir/$safename";
@@ -381,7 +390,9 @@ sub ExternalDecoder {
$message->{bodymodified} = 1;
$message->{foundtnefattachments} = 1;
undef $dirh;
- rmdir "$dir/$unpackdir"; # Directory should be empty now
+ # The following may result in a warning from a virus scanner that
+ # tries to lstat the directory, but it was empty so it can be ignored.
+ rmdir "$unpackdir"; # Directory should be empty now
#$message->{entity}->dump_skeleton();
MailScanner::Log::InfoLog("Message %s added TNEF contents %s",

View File

@ -1,20 +0,0 @@
$OpenBSD: patch-lib_bitdefender-wrapper,v 1.1 2013/12/12 21:56:19 brad Exp $
--- lib/bitdefender-wrapper.orig Wed Dec 11 18:29:16 2013
+++ lib/bitdefender-wrapper Wed Dec 11 18:29:38 2013
@@ -34,7 +34,6 @@ prog=bdc
extras=''
#LogFile=/tmp/log.bdc.$$
-LogFile=$(mktemp) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
if [ -x ${PackageDir}/bdscan ]; then
# Version 7.5 is installed
@@ -60,7 +59,7 @@ if [ "x$1" = "x-IsItInstalled" ]; then
fi
umask 077
-rm -f $LogFile
+LogFile=$(mktemp) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
${PackageDir}/$prog --log=$LogFile $extras "$@" >/dev/null 2>&1
cat $LogFile
rm -f $LogFile

View File

@ -1,15 +1,7 @@
$OpenBSD: patch-lib_clamav-wrapper,v 1.4 2013/12/12 21:56:19 brad Exp $
--- lib/clamav-wrapper.orig Sat Aug 20 08:32:02 2011
+++ lib/clamav-wrapper Wed Dec 11 18:30:49 2013
@@ -52,7 +52,6 @@
# You may want to check this script for bash-isms
#TempDir="/tmp/clamav.$$"
-TempDir=$(mktemp) || { echo "$0: Cannot make name for temporary dir" >&2; exit 1; }
ClamUser="clamav"
ClamGroup="clamav"
@@ -99,23 +98,23 @@ ExtraScanOptions=""
$OpenBSD: patch-lib_clamav-wrapper,v 1.5 2015/04/09 19:55:09 sthen Exp $
--- lib/clamav-wrapper.orig Wed Feb 18 06:53:04 2015
+++ lib/clamav-wrapper Fri Mar 13 03:49:10 2015
@@ -99,23 +99,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
@ -38,19 +30,3 @@ $OpenBSD: patch-lib_clamav-wrapper,v 1.4 2013/12/12 21:56:19 brad Exp $
#ExtraScanOptions="$ExtraScanOptions --zoo=/path/to/unzoo"
# Now increase the allowed expansion size of zip files
@@ -140,14 +139,10 @@ fi
PATH=$PATH:/usr/ucb
export PATH
-# Check if the tmpdir exists, if so delete so we start with a clean slate
-if [ -x "${TempDir}" ]; then
- rm -rf ${TempDir} >/dev/null 2>&1
-fi
# Make the Temp dir
umask 0077
-mkdir "${TempDir}" >/dev/null 2>&1
+TempDir=$(mktemp -d) || { echo "$0: Cannot create temporary dir" >&2; exit 1; }
# In case we get interupted....
trap "rm -rf ${TempDir}" EXIT

View File

@ -1,51 +0,0 @@
$OpenBSD: patch-lib_kaspersky-wrapper,v 1.1 2013/12/12 21:56:19 brad Exp $
--- lib/kaspersky-wrapper.orig Wed Dec 11 18:30:59 2013
+++ lib/kaspersky-wrapper Wed Dec 11 18:32:32 2013
@@ -42,14 +42,13 @@ shift
Scanner=kav4fs/bin/kav4fs-kavscanner
if [ -x ${PackageDir}/$Scanner ]; then
#Report=/tmp/kavoutput.tmp.$$
- Report=$(mktemp) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
ScanOptions="-xp -i0" # Don't report progress, don't attempt to clean
if [ "x$1" = "x-IsItInstalled" ]; then
exit 0
fi
Args=`echo "$@" | sed -e 's/ -I/ -i/g; s/^-I/-i/g; s/-- / /g;'`
- rm -f $Report
+ Report=$(mktemp) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
# 29/09/05 JKF Removed -j3 on advice from Kaspersky users
${PackageDir}/$Scanner $ScanOptions -o$Report -q "$@"
cat $Report
@@ -61,14 +60,13 @@ fi
Scanner=kav4unix/bin/kavscanner
if [ -x ${PackageDir}/$Scanner ]; then
#Report=/tmp/kavoutput.tmp.$$
- Report=$(mktemp) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
ScanOptions="-xp -i0" # Don't report progress, don't attempt to clean
if [ "x$1" = "x-IsItInstalled" ]; then
exit 0
fi
Args=`echo "$@" | sed -e 's/ -I/ -i/g; s/^-I/-i/g; s/-- / /g;'`
- rm -f $Report
+ Report=$(mktemp) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
# 29/09/05 JKF Removed -j3 on advice from Kaspersky users
${PackageDir}/$Scanner $ScanOptions -o$Report -q "$@"
cat $Report
@@ -80,14 +78,13 @@ fi
Scanner=bin/kavscanner
if [ -x ${PackageDir}/$Scanner ]; then
#Report=/tmp/kavoutput.tmp.$$
- Report=$(mktemp) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
ScanOptions="-xp -i0" # Don't report progress, don't attempt to clean
if [ "x$1" = "x-IsItInstalled" ]; then
exit 0
fi
Args=`echo "$@" | sed -e 's/ -I/ -i/g; s/^-I/-i/g; s/-- / /g;'`
- rm -f $Report
+ Report=$(mktemp) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
# 29/09/05 JKF Removed -j3 on advice from Kaspersky users
${PackageDir}/$Scanner $ScanOptions -o$Report -q "$@"
cat $Report

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-lib_trend-autoupdate,v 1.1 2013/12/12 21:56:19 brad Exp $
--- lib/trend-autoupdate.orig Wed Dec 11 18:22:26 2013
+++ lib/trend-autoupdate Wed Dec 11 18:22:40 2013
@@ -16,7 +16,7 @@ shift
shift
#TEMPDIR=/tmp/trend-update.$$
-TEMPDIR=$(mktemp) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
+TEMPDIR=$(mktemp -d) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
# In case it's a link
rm -f $TEMPDIR >/dev/null 2>&1
# In case it's a dir

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.13 2011/07/22 19:57:20 sthen Exp $
@comment $OpenBSD: PLIST,v 1.14 2015/04/09 19:55:09 sthen Exp $
@conflict clamav-<0.94
bin/MailScanner
bin/Quick.Peek
@ -239,6 +239,8 @@ share/examples/MailScanner/reports/ca/inline.warning.txt
@sample share/MailScanner/reports/ca/inline.warning.txt
share/examples/MailScanner/reports/ca/languages.conf
@sample share/MailScanner/reports/ca/languages.conf
share/examples/MailScanner/reports/ca/languages.conf.strings
@sample share/MailScanner/reports/ca/languages.conf.strings
share/examples/MailScanner/reports/ca/recipient.mcp.report.txt
@sample share/MailScanner/reports/ca/recipient.mcp.report.txt
share/examples/MailScanner/reports/ca/recipient.spam.report.txt
@ -295,6 +297,8 @@ share/examples/MailScanner/reports/cy+en/inline.warning.txt
@sample share/MailScanner/reports/cy+en/inline.warning.txt
share/examples/MailScanner/reports/cy+en/languages.conf
@sample share/MailScanner/reports/cy+en/languages.conf
share/examples/MailScanner/reports/cy+en/languages.conf.strings
@sample share/MailScanner/reports/cy+en/languages.conf.strings
share/examples/MailScanner/reports/cy+en/recipient.mcp.report.txt
@sample share/MailScanner/reports/cy+en/recipient.mcp.report.txt
share/examples/MailScanner/reports/cy+en/recipient.spam.report.txt
@ -351,6 +355,8 @@ share/examples/MailScanner/reports/cz/inline.warning.txt
@sample share/MailScanner/reports/cz/inline.warning.txt
share/examples/MailScanner/reports/cz/languages.conf
@sample share/MailScanner/reports/cz/languages.conf
share/examples/MailScanner/reports/cz/languages.conf.strings
@sample share/MailScanner/reports/cz/languages.conf.strings
share/examples/MailScanner/reports/cz/recipient.mcp.report.txt
@sample share/MailScanner/reports/cz/recipient.mcp.report.txt
share/examples/MailScanner/reports/cz/recipient.spam.report.txt
@ -385,8 +391,6 @@ share/examples/MailScanner/reports/cz/stored.virus.message.txt
@sample share/MailScanner/reports/cz/stored.virus.message.txt
share/examples/MailScanner/reports/de/
@sample share/MailScanner/reports/de/
share/examples/MailScanner/reports/de/README.1ST
@sample share/MailScanner/reports/de/README.1ST
share/examples/MailScanner/reports/de/deleted.content.message.txt
@sample share/MailScanner/reports/de/deleted.content.message.txt
share/examples/MailScanner/reports/de/deleted.filename.message.txt
@ -409,6 +413,8 @@ share/examples/MailScanner/reports/de/inline.warning.txt
@sample share/MailScanner/reports/de/inline.warning.txt
share/examples/MailScanner/reports/de/languages.conf
@sample share/MailScanner/reports/de/languages.conf
share/examples/MailScanner/reports/de/languages.conf.strings
@sample share/MailScanner/reports/de/languages.conf.strings
share/examples/MailScanner/reports/de/recipient.mcp.report.txt
@sample share/MailScanner/reports/de/recipient.mcp.report.txt
share/examples/MailScanner/reports/de/recipient.spam.report.txt
@ -465,6 +471,8 @@ share/examples/MailScanner/reports/dk/inline.warning.txt
@sample share/MailScanner/reports/dk/inline.warning.txt
share/examples/MailScanner/reports/dk/languages.conf
@sample share/MailScanner/reports/dk/languages.conf
share/examples/MailScanner/reports/dk/languages.conf.strings
@sample share/MailScanner/reports/dk/languages.conf.strings
share/examples/MailScanner/reports/dk/recipient.mcp.report.txt
@sample share/MailScanner/reports/dk/recipient.mcp.report.txt
share/examples/MailScanner/reports/dk/recipient.spam.report.txt
@ -521,6 +529,8 @@ share/examples/MailScanner/reports/en/inline.warning.txt
@sample share/MailScanner/reports/en/inline.warning.txt
share/examples/MailScanner/reports/en/languages.conf
@sample share/MailScanner/reports/en/languages.conf
share/examples/MailScanner/reports/en/languages.conf.strings
@sample share/MailScanner/reports/en/languages.conf.strings
share/examples/MailScanner/reports/en/recipient.mcp.report.txt
@sample share/MailScanner/reports/en/recipient.mcp.report.txt
share/examples/MailScanner/reports/en/recipient.spam.report.txt
@ -577,6 +587,8 @@ share/examples/MailScanner/reports/es/inline.warning.txt
@sample share/MailScanner/reports/es/inline.warning.txt
share/examples/MailScanner/reports/es/languages.conf
@sample share/MailScanner/reports/es/languages.conf
share/examples/MailScanner/reports/es/languages.conf.strings
@sample share/MailScanner/reports/es/languages.conf.strings
share/examples/MailScanner/reports/es/recipient.mcp.report.txt
@sample share/MailScanner/reports/es/recipient.mcp.report.txt
share/examples/MailScanner/reports/es/recipient.spam.report.txt
@ -633,6 +645,8 @@ share/examples/MailScanner/reports/fr/inline.warning.txt
@sample share/MailScanner/reports/fr/inline.warning.txt
share/examples/MailScanner/reports/fr/languages.conf
@sample share/MailScanner/reports/fr/languages.conf
share/examples/MailScanner/reports/fr/languages.conf.strings
@sample share/MailScanner/reports/fr/languages.conf.strings
share/examples/MailScanner/reports/fr/recipient.mcp.report.txt
@sample share/MailScanner/reports/fr/recipient.mcp.report.txt
share/examples/MailScanner/reports/fr/recipient.spam.report.txt
@ -689,6 +703,8 @@ share/examples/MailScanner/reports/hu/inline.warning.txt
@sample share/MailScanner/reports/hu/inline.warning.txt
share/examples/MailScanner/reports/hu/languages.conf
@sample share/MailScanner/reports/hu/languages.conf
share/examples/MailScanner/reports/hu/languages.conf.strings
@sample share/MailScanner/reports/hu/languages.conf.strings
share/examples/MailScanner/reports/hu/recipient.mcp.report.txt
@sample share/MailScanner/reports/hu/recipient.mcp.report.txt
share/examples/MailScanner/reports/hu/recipient.spam.report.txt
@ -745,6 +761,8 @@ share/examples/MailScanner/reports/it/inline.warning.txt
@sample share/MailScanner/reports/it/inline.warning.txt
share/examples/MailScanner/reports/it/languages.conf
@sample share/MailScanner/reports/it/languages.conf
share/examples/MailScanner/reports/it/languages.conf.strings
@sample share/MailScanner/reports/it/languages.conf.strings
share/examples/MailScanner/reports/it/recipient.mcp.report.txt
@sample share/MailScanner/reports/it/recipient.mcp.report.txt
share/examples/MailScanner/reports/it/recipient.spam.report.txt
@ -801,6 +819,8 @@ share/examples/MailScanner/reports/nl/inline.warning.txt
@sample share/MailScanner/reports/nl/inline.warning.txt
share/examples/MailScanner/reports/nl/languages.conf
@sample share/MailScanner/reports/nl/languages.conf
share/examples/MailScanner/reports/nl/languages.conf.strings
@sample share/MailScanner/reports/nl/languages.conf.strings
share/examples/MailScanner/reports/nl/recipient.mcp.report.txt
@sample share/MailScanner/reports/nl/recipient.mcp.report.txt
share/examples/MailScanner/reports/nl/recipient.spam.report.txt
@ -857,6 +877,8 @@ share/examples/MailScanner/reports/pt_br/inline.warning.txt
@sample share/MailScanner/reports/pt_br/inline.warning.txt
share/examples/MailScanner/reports/pt_br/languages.conf
@sample share/MailScanner/reports/pt_br/languages.conf
share/examples/MailScanner/reports/pt_br/languages.conf.strings
@sample share/MailScanner/reports/pt_br/languages.conf.strings
share/examples/MailScanner/reports/pt_br/recipient.mcp.report.txt
@sample share/MailScanner/reports/pt_br/recipient.mcp.report.txt
share/examples/MailScanner/reports/pt_br/recipient.spam.report.txt
@ -913,6 +935,8 @@ share/examples/MailScanner/reports/ro/inline.warning.txt
@sample share/MailScanner/reports/ro/inline.warning.txt
share/examples/MailScanner/reports/ro/languages.conf
@sample share/MailScanner/reports/ro/languages.conf
share/examples/MailScanner/reports/ro/languages.conf.strings
@sample share/MailScanner/reports/ro/languages.conf.strings
share/examples/MailScanner/reports/ro/recipient.mcp.report.txt
@sample share/MailScanner/reports/ro/recipient.mcp.report.txt
share/examples/MailScanner/reports/ro/recipient.spam.report.txt
@ -947,8 +971,6 @@ share/examples/MailScanner/reports/ro/stored.virus.message.txt
@sample share/MailScanner/reports/ro/stored.virus.message.txt
share/examples/MailScanner/reports/se/
@sample share/MailScanner/reports/se/
share/examples/MailScanner/reports/se/README
@sample share/MailScanner/reports/se/README
share/examples/MailScanner/reports/se/deleted.content.message.txt
@sample share/MailScanner/reports/se/deleted.content.message.txt
share/examples/MailScanner/reports/se/deleted.filename.message.txt
@ -971,6 +993,8 @@ share/examples/MailScanner/reports/se/inline.warning.txt
@sample share/MailScanner/reports/se/inline.warning.txt
share/examples/MailScanner/reports/se/languages.conf
@sample share/MailScanner/reports/se/languages.conf
share/examples/MailScanner/reports/se/languages.conf.strings
@sample share/MailScanner/reports/se/languages.conf.strings
share/examples/MailScanner/reports/se/recipient.mcp.report.txt
@sample share/MailScanner/reports/se/recipient.mcp.report.txt
share/examples/MailScanner/reports/se/recipient.spam.report.txt
@ -1027,6 +1051,8 @@ share/examples/MailScanner/reports/sk/inline.warning.txt
@sample share/MailScanner/reports/sk/inline.warning.txt
share/examples/MailScanner/reports/sk/languages.conf
@sample share/MailScanner/reports/sk/languages.conf
share/examples/MailScanner/reports/sk/languages.conf.strings
@sample share/MailScanner/reports/sk/languages.conf.strings
share/examples/MailScanner/reports/sk/recipient.mcp.report.txt
@sample share/MailScanner/reports/sk/recipient.mcp.report.txt
share/examples/MailScanner/reports/sk/recipient.spam.report.txt