Attachment #163836 for bug #205010

View | Details | Raw Unified | Return to bug 205010
Collapse All | Expand All

Lines 2-16 Link Here

(-)mailscanner/Makefile (-5 / +7 lines)
2	# $FreeBSD: head/mail/mailscanner/Makefile 361961 2014-07-15 16:14:15Z adamw $	2	# $FreeBSD: head/mail/mailscanner/Makefile 361961 2014-07-15 16:14:15Z adamw $
3		3
4	PORTNAME= MailScanner	4	PORTNAME= MailScanner
5	PORTVERSION= 4.84.6	5	PORTVERSION= 4.85.2
6	#PORTREVISION= 0	6	#PORTREVISION= 0
7	CATEGORIES= mail	7	CATEGORIES= mail
8	MASTER_SITES= http://www.mailscanner.info/files/4/tar/	8	MASTER_SITES= https://s3.amazonaws.com/mailscanner/release/v4/tar/
9	DISTNAME= ${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}	9	DISTNAME= ${PORTNAME}-${PORTVERSION}-${PATCHLEVEL}
10		10
11	MAINTAINER= kkobb@skylinecorp.com	11	MAINTAINER= kkobb@skylinecorp.com
12	COMMENT= Powerful virus/spam scanning framework for mail gateways	12	COMMENT= Powerful virus/spam scanning framework for mail gateways
13		13
		14	LICENSE= GPLv2
		15
14	BUILD_DEPENDS= \	16	BUILD_DEPENDS= \
15	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \	17	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
16	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \	18	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
Lines 38-44 Link Here
38		40
39	CONFLICTS= MailScanner-devel-[0-9]*	41	CONFLICTS= MailScanner-devel-[0-9]*
40		42
41	PATCHLEVEL= 1	43	PATCHLEVEL= 3
42		44
43	USES= perl5 shebangfix	45	USES= perl5 shebangfix
44	SHEBANG_FILES= bin/[^c]* bin/clean* \	46	SHEBANG_FILES= bin/[^c]* bin/clean* \
Lines 105-111 Link Here
105	SUB_LIST+= WITHOUT_SPAMASSASSIN_SYMLINK=no	107	SUB_LIST+= WITHOUT_SPAMASSASSIN_SYMLINK=no
106	.endif	108	.endif
107		109
108	DOC_FILES= INSTALL.FreeBSD README	110	DOC_FILES= README
109	ETC_FILES= MailScanner.conf filename.rules.conf \	111	ETC_FILES= MailScanner.conf filename.rules.conf \
110	archives.filename.rules.conf archives.filetype.rules.conf \	112	archives.filename.rules.conf archives.filetype.rules.conf \
111	filetype.rules.conf spam.assassin.prefs.conf \	113	filetype.rules.conf spam.assassin.prefs.conf \

Lines 1-2 Link Here

(-)mailscanner/distinfo (-2 / +2 lines)
1	SHA256 (MailScanner-install-4.84.6-1.tar.gz) = 566b6e2abf86de1acdff4f7fc5e6112aebab986954532a25f69b9f576ec70077	1	SHA256 (MailScanner-4.85.2-3.tar.gz) = 8e2ca7be98199b226942a31dd48d4f516c9d86c1d402c5ade2858cbe104d2057
2	SIZE (MailScanner-install-4.84.6-1.tar.gz) = 9524836	2	SIZE (MailScanner-4.85.2-3.tar.gz) = 924177

Lines 1-3 Link Here

(-)mailscanner/files/CHANGES.port (+4 lines)
		1	Version 4.85.2_3
		2	==============
		3	- Upgrade to 4.85.2-3
		4
1	Version 4.84.6	5	Version 4.84.6
2	==============	6	==============
3	- Upgrade to 4.84.6	7	- Upgrade to 4.84.6




--- ../MailScanner-install-4.50.15.orig/bin/cron/update_phishing_sites.cron	Wed Feb 15 20:02:33 2006
+++ bin/cron/update_phishing_sites.cron	Wed Feb 15 20:14:45 2006
@@ -1,20 +1,24 @@
 #!/bin/bash
 
-# Insert a random delay up to this value, to spread virus updates round
-# the clock. 1800 seconds = 30 minutes.
-# Set this to 0 to disable it.
-UPDATEMAXDELAY=3600
-if [ -f /etc/sysconfig/MailScanner ] ; then
-        . /etc/sysconfig/MailScanner
-fi
-export UPDATEMAXDELAY
+# Add the following line to /etc/rc.conf to configure a maximum delay in
+# order to spread virus updates round the clock. 1800 seconds = 30 minutes.
+# Set this to 0 to disable it
+
+. /etc/rc.subr
+
+name="mailscanner"
+rcvar=mailscanner_enable
+
+load_rc_config $name
+
+: ${mailscanner_updatemaxdelay="600"}
 
 [ -x /opt/MailScanner/bin/update_phishing_sites ] || exit 0
-if [ "x$UPDATEMAXDELAY" = "x0" ]; then
+if [ "x${mailscanner_updatemaxdelay}" = "x0" ]; then
   :
 else
-  logger -p mail.info -t update.phishing.sites Delaying cron job up to $UPDATEMAXDELAY seconds
-  perl -e "sleep int(rand($UPDATEMAXDELAY));"
+  logger -p mail.info -t update.phishing.sites Delaying cron job up to ${mailscanner_updatemaxdelay} seconds
+  perl -e "sleep int(rand(${mailscanner_updatemaxdelay}));"
 fi
 exec /opt/MailScanner/bin/update_phishing_sites > /dev/null 2>&1
 exit 0




--- ../MailScanner-install-4.50.15.orig/bin/cron/update_virus_scanners.cron	Wed Feb 15 20:02:33 2006
+++ bin/cron/update_virus_scanners.cron	Wed Feb 15 20:11:17 2006
@@ -1,20 +1,24 @@
 #!/bin/bash
 
-# Insert a random delay up to this value, to spread virus updates round
-# the clock. 1800 seconds = 30 minutes.
-# Set this to 0 to disable it.
-UPDATEMAXDELAY=600
-if [ -f /etc/sysconfig/MailScanner ] ; then
-        . /etc/sysconfig/MailScanner
-fi
-export UPDATEMAXDELAY
+# Add the following line to /etc/rc.conf to configure a maximum delay in
+# order to spread virus updates round the clock. 1800 seconds = 30 minutes.
+# Set this to 0 to disable it
+
+. /etc/rc.subr
+
+name="mailscanner"
+rcvar=mailscanner_enable
+
+load_rc_config $name
+
+: ${mailscanner_updatemaxdelay="600"}
 
 [ -x /opt/MailScanner/bin/update_virus_scanners ] || exit 0
-if [ "x$UPDATEMAXDELAY" = "x0" ]; then
+if [ "x${mailscanner_updatemaxdelay}" = "x0" ]; then
   :
 else
-  logger -p mail.info -t update.virus.scanners Delaying cron job up to $UPDATEMAXDELAY seconds
-  perl -e "sleep int(rand($UPDATEMAXDELAY));"
+  logger -p mail.info -t update.virus.scanners Delaying cron job up to ${mailscanner_updatemaxdelay} seconds
+  perl -e "sleep int(rand(${mailscanner_updatemaxdelay}));"
 fi
 exec /opt/MailScanner/bin/update_virus_scanners
 exit 0




--- ./lib/clamav-wrapper.orig	2011-08-20 08:32:02.000000000 -0400
+++ ./lib/clamav-wrapper	2012-03-09 08:41:47.000000000 -0500
@@ -51,6 +51,9 @@
 
 # You may want to check this script for bash-isms
 
+PATH=$PATH:/usr/local/bin
+export PATH
+
 #TempDir="/tmp/clamav.$$"
 TempDir=$(mktemp) || { echo "$0: Cannot make name for temporary dir" >&2; exit 1; }
 ClamUser="clamav"




--- ./lib/MailScanner/CustomFunctions/LastSpam.pm.orig	2011-08-20 08:24:49.000000000 -0400
+++ ./lib/MailScanner/CustomFunctions/LastSpam.pm	2014-02-21 04:11:09.000000000 -0500
@@ -32,7 +32,6 @@
 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 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";




--- ./lib/MailScanner/CustomFunctions/Ruleset-from-Function.pm.orig	2011-08-20 08:25:42.000000000 -0400
+++ ./lib/MailScanner/CustomFunctions/Ruleset-from-Function.pm	2014-02-21 04:16:55.000000000 -0500
@@ -31,7 +31,6 @@
 
 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 @@
   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;
 




--- ./lib/MailScanner/TNEF.pm.orig	2013-06-17 09:29:16.000000000 -0400
+++ ./lib/MailScanner/TNEF.pm	2014-02-21 04:03:15.000000000 -0500
@@ -229,18 +229,25 @@
 
   # 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 @@
 
     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 @@
         $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 @@
       } 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 @@
     $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",




--- lib/clamav-wrapper.orig	2015-12-04 06:27:18 UTC
+++ lib/clamav-wrapper
@@ -51,6 +51,9 @@
 
 # You may want to check this script for bash-isms
 
++PATH=$PATH:/usr/local/bin
++export PATH
+
 #TempDir="/tmp/clamav.$$"
 TempDir=$(mktemp -t tmp) || { echo "$0: Cannot make name for temporary dir" >&2; exit 1; }
 ClamUser="clamav"

Lines 20-23 Link Here

(-)mailscanner/pkg-descr (-1 / +1 lines)
20	quality open source software, leading to a system that can be trusted for	20	quality open source software, leading to a system that can be trusted for
21	performance and reliability.	21	performance and reliability.
22		22
23	WWW: http://www.mailscanner.info	23	WWW: http://www.mailscanner.info




%%ETCDIR%%/MailScanner.conf.sample
%%ETCDIR%%/archives.filename.rules.conf.sample
%%ETCDIR%%/archives.filetype.rules.conf.sample
%%ETCDIR%%/conf.d/README
%%ETCDIR%%/country.domains.conf.sample
%%ETCDIR%%/MailScanner.conf.sample
%%ETCDIR%%/filename.rules.conf.sample
%%ETCDIR%%/filetype.rules.conf.sample
%%ETCDIR%%/conf.d/README
%%ETCDIR%%/mcp/10_example.cf.sample
%%ETCDIR%%/mcp/mcp.spam.assassin.prefs.conf.sample
%%ETCDIR%%/mcp/v320.pre.sample
%%ETCDIR%%/phishing.bad.sites.conf.sample
%%ETCDIR%%/phishing.safe.sites.conf.sample
%%ETCDIR%%/rules/EXAMPLES
%%ETCDIR%%/rules/README
%%ETCDIR%%/rules/bounce.rules.sample
%%ETCDIR%%/rules/max.message.size.rules.sample
%%ETCDIR%%/rules/spam.whitelist.rules.sample
%%ETCDIR%%/phishing.bad.sites.conf.sample
%%ETCDIR%%/phishing.safe.sites.conf.sample
%%ETCDIR%%/spam.assassin.prefs.conf.sample
%%ETCDIR%%/spam.lists.conf.sample
%%ETCDIR%%/virus.scanners.conf.sample

lib/MailScanner/MailScanner/ConfigSQL.pm
lib/MailScanner/MailScanner/CustomConfig.pm
lib/MailScanner/MailScanner/CustomFunctions/CustomAction.pm
lib/MailScanner/MailScanner/CustomFunctions/GenericSpamScanner.pm
lib/MailScanner/MailScanner/CustomFunctions/MyExample.pm
lib/MailScanner/MailScanner/CustomFunctions/DavidHooton.pm
lib/MailScanner/MailScanner/CustomFunctions/GenericSpamScanner.pm
lib/MailScanner/MailScanner/CustomFunctions/SpamWhitelist.pm
lib/MailScanner/MailScanner/CustomFunctions/LastSpam.pm
lib/MailScanner/MailScanner/CustomFunctions/MyExample.pm
lib/MailScanner/MailScanner/CustomFunctions/Ruleset-from-Function.pm
lib/MailScanner/MailScanner/CustomFunctions/SpamWhitelist.pm
lib/MailScanner/MailScanner/CustomFunctions/ZMRouterDirHash.pm
lib/MailScanner/MailScanner/Exim.pm
lib/MailScanner/MailScanner/EximDiskStore.pm
lib/MailScanner/MailScanner/FileInto.pm

lib/MailScanner/MailScanner/WorkArea.pm
lib/MailScanner/MailScanner/ZMDiskStore.pm
lib/MailScanner/MailScanner/ZMailer.pm
libexec/MailScanner/analyse_SpamAssassin_cache
libexec/MailScanner/clean.SA.cache
libexec/MailScanner/clean.quarantine
libexec/MailScanner/mailscanner_create_locks
libexec/MailScanner/processing_messages_alert
libexec/MailScanner/Quick.Peek
libexec/MailScanner/analyse_SpamAssassin_cache
libexec/MailScanner/update_phishing_sites
libexec/MailScanner/update_bad_phishing_sites
libexec/MailScanner/update_bad_phishing_sites.cron
libexec/MailScanner/update_phishing_sites.cron
libexec/MailScanner/update_virus_scanners
libexec/MailScanner/update_virus_scanners.cron
libexec/MailScanner/update_spamassassin
libexec/MailScanner/update_spamassassin.cron
libexec/MailScanner/antivir-autoupdate.sample
libexec/MailScanner/antivir-wrapper.sample
libexec/MailScanner/avast-autoupdate.sample
libexec/MailScanner/avast-wrapper.sample
libexec/MailScanner/avastd-wrapper.sample
libexec/MailScanner/avast-autoupdate.sample
libexec/MailScanner/avg-autoupdate.sample
libexec/MailScanner/avg-wrapper.sample
libexec/MailScanner/bitdefender-autoupdate.sample
libexec/MailScanner/bitdefender-wrapper.sample
libexec/MailScanner/clamav-autoupdate.sample
libexec/MailScanner/clamav-wrapper.sample
libexec/MailScanner/clean.SA.cache
libexec/MailScanner/clean.quarantine
libexec/MailScanner/command-wrapper.sample
libexec/MailScanner/css-autoupdate.sample
libexec/MailScanner/css-wrapper.sample
libexec/MailScanner/drweb-wrapper.sample
libexec/MailScanner/esets-wrapper.sample
libexec/MailScanner/esets-autoupdate.sample
libexec/MailScanner/esets-wrapper.sample
libexec/MailScanner/etrust-autoupdate.sample
libexec/MailScanner/etrust-wrapper.sample
libexec/MailScanner/f-prot-6-autoupdate.sample
libexec/MailScanner/f-prot-6-wrapper.sample
libexec/MailScanner/f-prot-autoupdate.sample
libexec/MailScanner/f-prot-wrapper.sample
libexec/MailScanner/f-prot-6-wrapper.sample
libexec/MailScanner/f-prot-6-autoupdate.sample
libexec/MailScanner/f-secure-autoupdate.sample
libexec/MailScanner/f-secure-wrapper.sample
libexec/MailScanner/generic-autoupdate.sample

libexec/MailScanner/kaspersky-autoupdate.sample
libexec/MailScanner/kaspersky-wrapper.sample
libexec/MailScanner/kavdaemonclient-wrapper.sample
libexec/MailScanner/mailscanner_create_locks
libexec/MailScanner/mcafee-autoupdate.sample
libexec/MailScanner/mcafee-wrapper.sample
libexec/MailScanner/mcafee6-autoupdate.sample

libexec/MailScanner/nod32-wrapper.sample
libexec/MailScanner/norman-autoupdate.sample
libexec/MailScanner/norman-wrapper.sample
libexec/MailScanner/panda-wrapper.sample
libexec/MailScanner/panda-autoupdate.sample
libexec/MailScanner/panda-wrapper.sample
libexec/MailScanner/processing_messages_alert
libexec/MailScanner/rav-autoupdate.sample
libexec/MailScanner/rav-wrapper.sample
libexec/MailScanner/sophos-autoupdate.sample

libexec/MailScanner/symscanengine-wrapper.sample
libexec/MailScanner/trend-autoupdate.sample
libexec/MailScanner/trend-wrapper.sample
libexec/MailScanner/update_bad_phishing_emails
libexec/MailScanner/update_bad_phishing_sites
libexec/MailScanner/update_bad_phishing_sites.cron
libexec/MailScanner/update_phishing_sites
libexec/MailScanner/update_phishing_sites.cron
libexec/MailScanner/update_spamassassin
libexec/MailScanner/update_spamassassin.cron
libexec/MailScanner/update_virus_scanners
libexec/MailScanner/update_virus_scanners.cron
libexec/MailScanner/vba32-autoupdate.sample
libexec/MailScanner/vba32-wrapper.sample
libexec/MailScanner/vexira-autoupdate.sample
libexec/MailScanner/vexira-wrapper.sample
man/man8/MailScanner.8.gz
man/man8/mailscanner.8.gz
sbin/mailscanner
sbin/MailScanner
sbin/mailscanner
%%DATADIR%%/reports/ca/deleted.content.message.txt.sample
%%DATADIR%%/reports/ca/deleted.filename.message.txt.sample
%%DATADIR%%/reports/ca/deleted.size.message.txt.sample
%%DATADIR%%/reports/ca/deleted.virus.message.txt.sample
%%DATADIR%%/reports/ca/disinfected.report.txt.sample
%%DATADIR%%/reports/ca/inline.sig.html.sample

%%DATADIR%%/reports/ca/inline.warning.html.sample
%%DATADIR%%/reports/ca/inline.warning.txt.sample
%%DATADIR%%/reports/ca/languages.conf.sample
%%DATADIR%%/reports/ca/languages.conf.strings.sample
%%DATADIR%%/reports/ca/recipient.mcp.report.txt.sample
%%DATADIR%%/reports/ca/recipient.spam.report.txt.sample
%%DATADIR%%/reports/ca/rejection.report.txt.sample
%%DATADIR%%/reports/ca/sender.content.report.txt.sample
%%DATADIR%%/reports/ca/sender.error.report.txt.sample
%%DATADIR%%/reports/ca/sender.filename.report.txt.sample
%%DATADIR%%/reports/ca/sender.mcp.report.txt.sample
%%DATADIR%%/reports/ca/sender.size.report.txt.sample
%%DATADIR%%/reports/ca/sender.spam.rbl.report.txt.sample
%%DATADIR%%/reports/ca/sender.spam.report.txt.sample
%%DATADIR%%/reports/ca/sender.spam.sa.report.txt.sample
%%DATADIR%%/reports/ca/sender.virus.report.txt.sample
%%DATADIR%%/reports/ca/stored.content.message.txt.sample
%%DATADIR%%/reports/ca/stored.filename.message.txt.sample
%%DATADIR%%/reports/ca/stored.virus.message.txt.sample
%%DATADIR%%/reports/ca/deleted.size.message.txt.sample
%%DATADIR%%/reports/ca/sender.size.report.txt.sample
%%DATADIR%%/reports/ca/stored.size.message.txt.sample
%%DATADIR%%/reports/ca/stored.virus.message.txt.sample
%%DATADIR%%/reports/cy+en/deleted.content.message.txt.sample
%%DATADIR%%/reports/cy+en/deleted.filename.message.txt.sample
%%DATADIR%%/reports/cy+en/deleted.size.message.txt.sample
%%DATADIR%%/reports/cy+en/deleted.virus.message.txt.sample
%%DATADIR%%/reports/cy+en/disinfected.report.txt.sample
%%DATADIR%%/reports/cy+en/inline.sig.html.sample

%%DATADIR%%/reports/cy+en/inline.warning.html.sample
%%DATADIR%%/reports/cy+en/inline.warning.txt.sample
%%DATADIR%%/reports/cy+en/languages.conf.sample
%%DATADIR%%/reports/cy+en/languages.conf.strings.sample
%%DATADIR%%/reports/cy+en/recipient.mcp.report.txt.sample
%%DATADIR%%/reports/cy+en/recipient.spam.report.txt.sample
%%DATADIR%%/reports/cy+en/sender.content.report.txt.sample
%%DATADIR%%/reports/cy+en/rejection.report.txt.sample
%%DATADIR%%/reports/cy+en/sender.content.report.txt.sample
%%DATADIR%%/reports/cy+en/sender.error.report.txt.sample
%%DATADIR%%/reports/cy+en/sender.filename.report.txt.sample
%%DATADIR%%/reports/cy+en/sender.mcp.report.txt.sample
%%DATADIR%%/reports/cy+en/sender.size.report.txt.sample
%%DATADIR%%/reports/cy+en/sender.spam.rbl.report.txt.sample
%%DATADIR%%/reports/cy+en/sender.spam.report.txt.sample
%%DATADIR%%/reports/cy+en/sender.spam.sa.report.txt.sample
%%DATADIR%%/reports/cy+en/sender.virus.report.txt.sample
%%DATADIR%%/reports/cy+en/stored.content.message.txt.sample
%%DATADIR%%/reports/cy+en/stored.filename.message.txt.sample
%%DATADIR%%/reports/cy+en/stored.virus.message.txt.sample
%%DATADIR%%/reports/cy+en/deleted.size.message.txt.sample
%%DATADIR%%/reports/cy+en/sender.size.report.txt.sample
%%DATADIR%%/reports/cy+en/stored.size.message.txt.sample
%%DATADIR%%/reports/cy+en/stored.virus.message.txt.sample
%%DATADIR%%/reports/cz/deleted.content.message.txt.sample
%%DATADIR%%/reports/cz/deleted.filename.message.txt.sample
%%DATADIR%%/reports/cz/deleted.size.message.txt.sample
%%DATADIR%%/reports/cz/deleted.virus.message.txt.sample
%%DATADIR%%/reports/cz/disinfected.report.txt.sample
%%DATADIR%%/reports/cz/inline.sig.html.sample

%%DATADIR%%/reports/cz/inline.warning.html.sample
%%DATADIR%%/reports/cz/inline.warning.txt.sample
%%DATADIR%%/reports/cz/languages.conf.sample
%%DATADIR%%/reports/cz/languages.conf.strings.sample
%%DATADIR%%/reports/cz/recipient.mcp.report.txt.sample
%%DATADIR%%/reports/cz/recipient.spam.report.txt.sample
%%DATADIR%%/reports/cz/sender.content.report.txt.sample
%%DATADIR%%/reports/cz/rejection.report.txt.sample
%%DATADIR%%/reports/cz/sender.content.report.txt.sample
%%DATADIR%%/reports/cz/sender.error.report.txt.sample
%%DATADIR%%/reports/cz/sender.filename.report.txt.sample
%%DATADIR%%/reports/cz/sender.mcp.report.txt.sample
%%DATADIR%%/reports/cz/sender.size.report.txt.sample
%%DATADIR%%/reports/cz/sender.spam.rbl.report.txt.sample
%%DATADIR%%/reports/cz/sender.spam.report.txt.sample
%%DATADIR%%/reports/cz/sender.spam.sa.report.txt.sample
%%DATADIR%%/reports/cz/sender.virus.report.txt.sample
%%DATADIR%%/reports/cz/stored.content.message.txt.sample
%%DATADIR%%/reports/cz/stored.filename.message.txt.sample
%%DATADIR%%/reports/cz/stored.virus.message.txt.sample
%%DATADIR%%/reports/cz/deleted.size.message.txt.sample
%%DATADIR%%/reports/cz/sender.size.report.txt.sample
%%DATADIR%%/reports/cz/stored.size.message.txt.sample
%%DATADIR%%/reports/cz/stored.virus.message.txt.sample
%%DATADIR%%/reports/de/deleted.content.message.txt.sample
%%DATADIR%%/reports/de/deleted.filename.message.txt.sample
%%DATADIR%%/reports/de/deleted.size.message.txt.sample
%%DATADIR%%/reports/de/deleted.virus.message.txt.sample
%%DATADIR%%/reports/de/disinfected.report.txt.sample
%%DATADIR%%/reports/de/inline.sig.html.sample

%%DATADIR%%/reports/de/inline.warning.html.sample
%%DATADIR%%/reports/de/inline.warning.txt.sample
%%DATADIR%%/reports/de/languages.conf.sample
%%DATADIR%%/reports/de/languages.conf.strings.sample
%%DATADIR%%/reports/de/recipient.mcp.report.txt.sample
%%DATADIR%%/reports/de/recipient.spam.report.txt.sample
%%DATADIR%%/reports/de/sender.content.report.txt.sample
%%DATADIR%%/reports/de/rejection.report.txt.sample
%%DATADIR%%/reports/de/sender.content.report.txt.sample
%%DATADIR%%/reports/de/sender.error.report.txt.sample
%%DATADIR%%/reports/de/sender.filename.report.txt.sample
%%DATADIR%%/reports/de/sender.mcp.report.txt.sample
%%DATADIR%%/reports/de/sender.size.report.txt.sample
%%DATADIR%%/reports/de/sender.spam.rbl.report.txt.sample
%%DATADIR%%/reports/de/sender.spam.report.txt.sample
%%DATADIR%%/reports/de/sender.spam.sa.report.txt.sample
%%DATADIR%%/reports/de/sender.virus.report.txt.sample
%%DATADIR%%/reports/de/stored.content.message.txt.sample
%%DATADIR%%/reports/de/stored.filename.message.txt.sample
%%DATADIR%%/reports/de/stored.virus.message.txt.sample
%%DATADIR%%/reports/de/deleted.size.message.txt.sample
%%DATADIR%%/reports/de/sender.size.report.txt.sample
%%DATADIR%%/reports/de/stored.size.message.txt.sample
%%DATADIR%%/reports/de/stored.virus.message.txt.sample
%%DATADIR%%/reports/dk/deleted.content.message.txt.sample
%%DATADIR%%/reports/dk/deleted.filename.message.txt.sample
%%DATADIR%%/reports/dk/deleted.size.message.txt.sample
%%DATADIR%%/reports/dk/deleted.virus.message.txt.sample
%%DATADIR%%/reports/dk/disinfected.report.txt.sample
%%DATADIR%%/reports/dk/inline.sig.html.sample

%%DATADIR%%/reports/dk/inline.warning.html.sample
%%DATADIR%%/reports/dk/inline.warning.txt.sample
%%DATADIR%%/reports/dk/languages.conf.sample
%%DATADIR%%/reports/dk/languages.conf.strings.sample
%%DATADIR%%/reports/dk/recipient.mcp.report.txt.sample
%%DATADIR%%/reports/dk/recipient.spam.report.txt.sample
%%DATADIR%%/reports/dk/sender.content.report.txt.sample
%%DATADIR%%/reports/dk/rejection.report.txt.sample
%%DATADIR%%/reports/dk/sender.content.report.txt.sample
%%DATADIR%%/reports/dk/sender.error.report.txt.sample
%%DATADIR%%/reports/dk/sender.filename.report.txt.sample
%%DATADIR%%/reports/dk/sender.mcp.report.txt.sample
%%DATADIR%%/reports/dk/sender.size.report.txt.sample
%%DATADIR%%/reports/dk/sender.spam.rbl.report.txt.sample
%%DATADIR%%/reports/dk/sender.spam.report.txt.sample
%%DATADIR%%/reports/dk/sender.spam.sa.report.txt.sample
%%DATADIR%%/reports/dk/sender.virus.report.txt.sample
%%DATADIR%%/reports/dk/stored.content.message.txt.sample
%%DATADIR%%/reports/dk/stored.filename.message.txt.sample
%%DATADIR%%/reports/dk/stored.virus.message.txt.sample
%%DATADIR%%/reports/dk/deleted.size.message.txt.sample
%%DATADIR%%/reports/dk/sender.size.report.txt.sample
%%DATADIR%%/reports/dk/stored.size.message.txt.sample
%%DATADIR%%/reports/dk/stored.virus.message.txt.sample
%%DATADIR%%/reports/en/deleted.content.message.txt.sample
%%DATADIR%%/reports/en/deleted.filename.message.txt.sample
%%DATADIR%%/reports/en/deleted.size.message.txt.sample
%%DATADIR%%/reports/en/deleted.virus.message.txt.sample
%%DATADIR%%/reports/en/disinfected.report.txt.sample
%%DATADIR%%/reports/en/inline.sig.html.sample

%%DATADIR%%/reports/en/inline.warning.html.sample
%%DATADIR%%/reports/en/inline.warning.txt.sample
%%DATADIR%%/reports/en/languages.conf.sample
%%DATADIR%%/reports/en/languages.conf.strings.sample
%%DATADIR%%/reports/en/recipient.mcp.report.txt.sample
%%DATADIR%%/reports/en/recipient.spam.report.txt.sample
%%DATADIR%%/reports/en/sender.content.report.txt.sample
%%DATADIR%%/reports/en/rejection.report.txt.sample
%%DATADIR%%/reports/en/sender.content.report.txt.sample
%%DATADIR%%/reports/en/sender.error.report.txt.sample
%%DATADIR%%/reports/en/sender.filename.report.txt.sample
%%DATADIR%%/reports/en/sender.mcp.report.txt.sample
%%DATADIR%%/reports/en/sender.size.report.txt.sample
%%DATADIR%%/reports/en/sender.spam.rbl.report.txt.sample
%%DATADIR%%/reports/en/sender.spam.report.txt.sample
%%DATADIR%%/reports/en/sender.spam.sa.report.txt.sample
%%DATADIR%%/reports/en/sender.virus.report.txt.sample
%%DATADIR%%/reports/en/stored.content.message.txt.sample
%%DATADIR%%/reports/en/stored.filename.message.txt.sample
%%DATADIR%%/reports/en/stored.virus.message.txt.sample
%%DATADIR%%/reports/en/deleted.size.message.txt.sample
%%DATADIR%%/reports/en/sender.size.report.txt.sample
%%DATADIR%%/reports/en/stored.size.message.txt.sample
%%DATADIR%%/reports/en/stored.virus.message.txt.sample
%%DATADIR%%/reports/es/deleted.content.message.txt.sample
%%DATADIR%%/reports/es/deleted.filename.message.txt.sample
%%DATADIR%%/reports/es/deleted.size.message.txt.sample
%%DATADIR%%/reports/es/deleted.virus.message.txt.sample
%%DATADIR%%/reports/es/disinfected.report.txt.sample
%%DATADIR%%/reports/es/inline.sig.html.sample

%%DATADIR%%/reports/es/inline.warning.html.sample
%%DATADIR%%/reports/es/inline.warning.txt.sample
%%DATADIR%%/reports/es/languages.conf.sample
%%DATADIR%%/reports/es/languages.conf.strings.sample
%%DATADIR%%/reports/es/recipient.mcp.report.txt.sample
%%DATADIR%%/reports/es/recipient.spam.report.txt.sample
%%DATADIR%%/reports/es/rejection.report.txt.sample

%%DATADIR%%/reports/es/sender.error.report.txt.sample
%%DATADIR%%/reports/es/sender.filename.report.txt.sample
%%DATADIR%%/reports/es/sender.mcp.report.txt.sample
%%DATADIR%%/reports/es/sender.size.report.txt.sample
%%DATADIR%%/reports/es/sender.spam.rbl.report.txt.sample
%%DATADIR%%/reports/es/sender.spam.report.txt.sample
%%DATADIR%%/reports/es/sender.spam.sa.report.txt.sample
%%DATADIR%%/reports/es/sender.virus.report.txt.sample
%%DATADIR%%/reports/es/stored.content.message.txt.sample
%%DATADIR%%/reports/es/stored.filename.message.txt.sample
%%DATADIR%%/reports/es/stored.virus.message.txt.sample
%%DATADIR%%/reports/es/deleted.size.message.txt.sample
%%DATADIR%%/reports/es/sender.size.report.txt.sample
%%DATADIR%%/reports/es/stored.size.message.txt.sample
%%DATADIR%%/reports/es/stored.virus.message.txt.sample
%%DATADIR%%/reports/fr/deleted.content.message.txt.sample
%%DATADIR%%/reports/fr/deleted.filename.message.txt.sample
%%DATADIR%%/reports/fr/deleted.size.message.txt.sample
%%DATADIR%%/reports/fr/deleted.virus.message.txt.sample
%%DATADIR%%/reports/fr/disinfected.report.txt.sample
%%DATADIR%%/reports/fr/inline.sig.html.sample

%%DATADIR%%/reports/fr/inline.warning.html.sample
%%DATADIR%%/reports/fr/inline.warning.txt.sample
%%DATADIR%%/reports/fr/languages.conf.sample
%%DATADIR%%/reports/fr/languages.conf.strings.sample
%%DATADIR%%/reports/fr/recipient.mcp.report.txt.sample
%%DATADIR%%/reports/fr/recipient.spam.report.txt.sample
%%DATADIR%%/reports/fr/rejection.report.txt.sample

%%DATADIR%%/reports/fr/sender.error.report.txt.sample
%%DATADIR%%/reports/fr/sender.filename.report.txt.sample
%%DATADIR%%/reports/fr/sender.mcp.report.txt.sample
%%DATADIR%%/reports/fr/sender.size.report.txt.sample
%%DATADIR%%/reports/fr/sender.spam.rbl.report.txt.sample
%%DATADIR%%/reports/fr/sender.spam.report.txt.sample
%%DATADIR%%/reports/fr/sender.spam.sa.report.txt.sample
%%DATADIR%%/reports/fr/sender.virus.report.txt.sample
%%DATADIR%%/reports/fr/stored.content.message.txt.sample
%%DATADIR%%/reports/fr/stored.filename.message.txt.sample
%%DATADIR%%/reports/fr/stored.virus.message.txt.sample
%%DATADIR%%/reports/fr/deleted.size.message.txt.sample
%%DATADIR%%/reports/fr/sender.size.report.txt.sample
%%DATADIR%%/reports/fr/stored.size.message.txt.sample
%%DATADIR%%/reports/fr/stored.virus.message.txt.sample
%%DATADIR%%/reports/hu/deleted.content.message.txt.sample
%%DATADIR%%/reports/hu/deleted.filename.message.txt.sample
%%DATADIR%%/reports/hu/deleted.size.message.txt.sample
%%DATADIR%%/reports/hu/deleted.virus.message.txt.sample
%%DATADIR%%/reports/hu/disinfected.report.txt.sample
%%DATADIR%%/reports/hu/inline.sig.html.sample

%%DATADIR%%/reports/hu/inline.warning.html.sample
%%DATADIR%%/reports/hu/inline.warning.txt.sample
%%DATADIR%%/reports/hu/languages.conf.sample
%%DATADIR%%/reports/hu/languages.conf.strings.sample
%%DATADIR%%/reports/hu/recipient.mcp.report.txt.sample
%%DATADIR%%/reports/hu/recipient.spam.report.txt.sample
%%DATADIR%%/reports/hu/rejection.report.txt.sample

%%DATADIR%%/reports/hu/sender.error.report.txt.sample
%%DATADIR%%/reports/hu/sender.filename.report.txt.sample
%%DATADIR%%/reports/hu/sender.mcp.report.txt.sample
%%DATADIR%%/reports/hu/sender.size.report.txt.sample
%%DATADIR%%/reports/hu/sender.spam.rbl.report.txt.sample
%%DATADIR%%/reports/hu/sender.spam.report.txt.sample
%%DATADIR%%/reports/hu/sender.spam.sa.report.txt.sample
%%DATADIR%%/reports/hu/sender.virus.report.txt.sample
%%DATADIR%%/reports/hu/stored.content.message.txt.sample
%%DATADIR%%/reports/hu/stored.filename.message.txt.sample
%%DATADIR%%/reports/hu/stored.virus.message.txt.sample
%%DATADIR%%/reports/hu/deleted.size.message.txt.sample
%%DATADIR%%/reports/hu/sender.size.report.txt.sample
%%DATADIR%%/reports/hu/stored.size.message.txt.sample
%%DATADIR%%/reports/hu/stored.virus.message.txt.sample
%%DATADIR%%/reports/it/deleted.content.message.txt.sample
%%DATADIR%%/reports/it/deleted.filename.message.txt.sample
%%DATADIR%%/reports/it/deleted.size.message.txt.sample
%%DATADIR%%/reports/it/deleted.virus.message.txt.sample
%%DATADIR%%/reports/it/disinfected.report.txt.sample
%%DATADIR%%/reports/it/inline.sig.html.sample

%%DATADIR%%/reports/it/inline.warning.html.sample
%%DATADIR%%/reports/it/inline.warning.txt.sample
%%DATADIR%%/reports/it/languages.conf.sample
%%DATADIR%%/reports/it/languages.conf.strings.sample
%%DATADIR%%/reports/it/recipient.mcp.report.txt.sample
%%DATADIR%%/reports/it/recipient.spam.report.txt.sample
%%DATADIR%%/reports/it/rejection.report.txt.sample

%%DATADIR%%/reports/it/sender.error.report.txt.sample
%%DATADIR%%/reports/it/sender.filename.report.txt.sample
%%DATADIR%%/reports/it/sender.mcp.report.txt.sample
%%DATADIR%%/reports/it/sender.size.report.txt.sample
%%DATADIR%%/reports/it/sender.spam.rbl.report.txt.sample
%%DATADIR%%/reports/it/sender.spam.report.txt.sample
%%DATADIR%%/reports/it/sender.spam.sa.report.txt.sample
%%DATADIR%%/reports/it/sender.virus.report.txt.sample
%%DATADIR%%/reports/it/stored.content.message.txt.sample
%%DATADIR%%/reports/it/stored.filename.message.txt.sample
%%DATADIR%%/reports/it/stored.virus.message.txt.sample
%%DATADIR%%/reports/it/deleted.size.message.txt.sample
%%DATADIR%%/reports/it/sender.size.report.txt.sample
%%DATADIR%%/reports/it/stored.size.message.txt.sample
%%DATADIR%%/reports/it/stored.virus.message.txt.sample
%%DATADIR%%/reports/nl/deleted.content.message.txt.sample
%%DATADIR%%/reports/nl/deleted.filename.message.txt.sample
%%DATADIR%%/reports/nl/deleted.size.message.txt.sample
%%DATADIR%%/reports/nl/deleted.virus.message.txt.sample
%%DATADIR%%/reports/nl/disinfected.report.txt.sample
%%DATADIR%%/reports/nl/inline.sig.html.sample

%%DATADIR%%/reports/nl/inline.warning.html.sample
%%DATADIR%%/reports/nl/inline.warning.txt.sample
%%DATADIR%%/reports/nl/languages.conf.sample
%%DATADIR%%/reports/nl/languages.conf.strings.sample
%%DATADIR%%/reports/nl/recipient.mcp.report.txt.sample
%%DATADIR%%/reports/nl/recipient.spam.report.txt.sample
%%DATADIR%%/reports/nl/rejection.report.txt.sample

%%DATADIR%%/reports/nl/sender.error.report.txt.sample
%%DATADIR%%/reports/nl/sender.filename.report.txt.sample
%%DATADIR%%/reports/nl/sender.mcp.report.txt.sample
%%DATADIR%%/reports/nl/sender.size.report.txt.sample
%%DATADIR%%/reports/nl/sender.spam.rbl.report.txt.sample
%%DATADIR%%/reports/nl/sender.spam.report.txt.sample
%%DATADIR%%/reports/nl/sender.spam.sa.report.txt.sample
%%DATADIR%%/reports/nl/sender.virus.report.txt.sample
%%DATADIR%%/reports/nl/stored.content.message.txt.sample
%%DATADIR%%/reports/nl/stored.filename.message.txt.sample
%%DATADIR%%/reports/nl/stored.virus.message.txt.sample
%%DATADIR%%/reports/nl/deleted.size.message.txt.sample
%%DATADIR%%/reports/nl/sender.size.report.txt.sample
%%DATADIR%%/reports/nl/stored.size.message.txt.sample
%%DATADIR%%/reports/nl/stored.virus.message.txt.sample
%%DATADIR%%/reports/pt_br/deleted.content.message.txt.sample
%%DATADIR%%/reports/pt_br/deleted.filename.message.txt.sample
%%DATADIR%%/reports/pt_br/deleted.size.message.txt.sample
%%DATADIR%%/reports/pt_br/deleted.virus.message.txt.sample
%%DATADIR%%/reports/pt_br/disinfected.report.txt.sample
%%DATADIR%%/reports/pt_br/inline.sig.html.sample

%%DATADIR%%/reports/pt_br/inline.warning.html.sample
%%DATADIR%%/reports/pt_br/inline.warning.txt.sample
%%DATADIR%%/reports/pt_br/languages.conf.sample
%%DATADIR%%/reports/pt_br/languages.conf.strings.sample
%%DATADIR%%/reports/pt_br/recipient.mcp.report.txt.sample
%%DATADIR%%/reports/pt_br/recipient.spam.report.txt.sample
%%DATADIR%%/reports/pt_br/rejection.report.txt.sample

%%DATADIR%%/reports/pt_br/sender.error.report.txt.sample
%%DATADIR%%/reports/pt_br/sender.filename.report.txt.sample
%%DATADIR%%/reports/pt_br/sender.mcp.report.txt.sample
%%DATADIR%%/reports/pt_br/sender.size.report.txt.sample
%%DATADIR%%/reports/pt_br/sender.spam.rbl.report.txt.sample
%%DATADIR%%/reports/pt_br/sender.spam.report.txt.sample
%%DATADIR%%/reports/pt_br/sender.spam.sa.report.txt.sample
%%DATADIR%%/reports/pt_br/sender.virus.report.txt.sample
%%DATADIR%%/reports/pt_br/stored.content.message.txt.sample
%%DATADIR%%/reports/pt_br/stored.filename.message.txt.sample
%%DATADIR%%/reports/pt_br/stored.virus.message.txt.sample
%%DATADIR%%/reports/pt_br/deleted.size.message.txt.sample
%%DATADIR%%/reports/pt_br/sender.size.report.txt.sample
%%DATADIR%%/reports/pt_br/stored.size.message.txt.sample
%%DATADIR%%/reports/pt_br/stored.virus.message.txt.sample
%%DATADIR%%/reports/ro/deleted.content.message.txt.sample
%%DATADIR%%/reports/ro/deleted.filename.message.txt.sample
%%DATADIR%%/reports/ro/deleted.size.message.txt.sample
%%DATADIR%%/reports/ro/deleted.virus.message.txt.sample
%%DATADIR%%/reports/ro/disinfected.report.txt.sample
%%DATADIR%%/reports/ro/inline.sig.html.sample

%%DATADIR%%/reports/ro/inline.warning.html.sample
%%DATADIR%%/reports/ro/inline.warning.txt.sample
%%DATADIR%%/reports/ro/languages.conf.sample
%%DATADIR%%/reports/ro/languages.conf.strings.sample
%%DATADIR%%/reports/ro/recipient.mcp.report.txt.sample
%%DATADIR%%/reports/ro/recipient.spam.report.txt.sample
%%DATADIR%%/reports/ro/rejection.report.txt.sample

%%DATADIR%%/reports/ro/sender.error.report.txt.sample
%%DATADIR%%/reports/ro/sender.filename.report.txt.sample
%%DATADIR%%/reports/ro/sender.mcp.report.txt.sample
%%DATADIR%%/reports/ro/sender.size.report.txt.sample
%%DATADIR%%/reports/ro/sender.spam.rbl.report.txt.sample
%%DATADIR%%/reports/ro/sender.spam.report.txt.sample
%%DATADIR%%/reports/ro/sender.spam.sa.report.txt.sample
%%DATADIR%%/reports/ro/sender.virus.report.txt.sample
%%DATADIR%%/reports/ro/stored.content.message.txt.sample
%%DATADIR%%/reports/ro/stored.filename.message.txt.sample
%%DATADIR%%/reports/ro/stored.virus.message.txt.sample
%%DATADIR%%/reports/ro/deleted.size.message.txt.sample
%%DATADIR%%/reports/ro/sender.size.report.txt.sample
%%DATADIR%%/reports/ro/stored.size.message.txt.sample
%%DATADIR%%/reports/ro/stored.virus.message.txt.sample
%%DATADIR%%/reports/se/deleted.content.message.txt.sample
%%DATADIR%%/reports/se/deleted.filename.message.txt.sample
%%DATADIR%%/reports/se/deleted.size.message.txt.sample
%%DATADIR%%/reports/se/deleted.virus.message.txt.sample
%%DATADIR%%/reports/se/disinfected.report.txt.sample
%%DATADIR%%/reports/se/inline.sig.html.sample

%%DATADIR%%/reports/se/inline.warning.html.sample
%%DATADIR%%/reports/se/inline.warning.txt.sample
%%DATADIR%%/reports/se/languages.conf.sample
%%DATADIR%%/reports/se/languages.conf.strings.sample
%%DATADIR%%/reports/se/recipient.mcp.report.txt.sample
%%DATADIR%%/reports/se/recipient.spam.report.txt.sample
%%DATADIR%%/reports/se/rejection.report.txt.sample

%%DATADIR%%/reports/se/sender.error.report.txt.sample
%%DATADIR%%/reports/se/sender.filename.report.txt.sample
%%DATADIR%%/reports/se/sender.mcp.report.txt.sample
%%DATADIR%%/reports/se/sender.size.report.txt.sample
%%DATADIR%%/reports/se/sender.spam.rbl.report.txt.sample
%%DATADIR%%/reports/se/sender.spam.report.txt.sample
%%DATADIR%%/reports/se/sender.spam.sa.report.txt.sample
%%DATADIR%%/reports/se/sender.virus.report.txt.sample
%%DATADIR%%/reports/se/stored.content.message.txt.sample
%%DATADIR%%/reports/se/stored.filename.message.txt.sample
%%DATADIR%%/reports/se/stored.virus.message.txt.sample
%%DATADIR%%/reports/se/deleted.size.message.txt.sample
%%DATADIR%%/reports/se/sender.size.report.txt.sample
%%DATADIR%%/reports/se/stored.size.message.txt.sample
%%DATADIR%%/reports/se/stored.virus.message.txt.sample
%%DATADIR%%/reports/sk/deleted.content.message.txt.sample
%%DATADIR%%/reports/sk/deleted.filename.message.txt.sample
%%DATADIR%%/reports/sk/deleted.size.message.txt.sample
%%DATADIR%%/reports/sk/deleted.virus.message.txt.sample
%%DATADIR%%/reports/sk/disinfected.report.txt.sample
%%DATADIR%%/reports/sk/inline.sig.html.sample

%%DATADIR%%/reports/sk/inline.warning.html.sample
%%DATADIR%%/reports/sk/inline.warning.txt.sample
%%DATADIR%%/reports/sk/languages.conf.sample
%%DATADIR%%/reports/sk/languages.conf.strings.sample
%%DATADIR%%/reports/sk/recipient.mcp.report.txt.sample
%%DATADIR%%/reports/sk/recipient.spam.report.txt.sample
%%DATADIR%%/reports/sk/rejection.report.txt.sample

%%DATADIR%%/reports/sk/sender.error.report.txt.sample
%%DATADIR%%/reports/sk/sender.filename.report.txt.sample
%%DATADIR%%/reports/sk/sender.mcp.report.txt.sample
%%DATADIR%%/reports/sk/sender.size.report.txt.sample
%%DATADIR%%/reports/sk/sender.spam.rbl.report.txt.sample
%%DATADIR%%/reports/sk/sender.spam.report.txt.sample
%%DATADIR%%/reports/sk/sender.spam.sa.report.txt.sample
%%DATADIR%%/reports/sk/sender.virus.report.txt.sample
%%DATADIR%%/reports/sk/stored.content.message.txt.sample
%%DATADIR%%/reports/sk/stored.filename.message.txt.sample
%%DATADIR%%/reports/sk/stored.virus.message.txt.sample
%%DATADIR%%/reports/sk/deleted.size.message.txt.sample
%%DATADIR%%/reports/sk/sender.size.report.txt.sample
%%DATADIR%%/reports/sk/stored.size.message.txt.sample
%%DATADIR%%/reports/sk/stored.virus.message.txt.sample
%%DATADIR%%/upgrade_MailScanner_conf
%%DATADIR%%/upgrade_languages_conf
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD.port
%%PORTDOCS%%%%DOCSDIR%%/Sophos.install.freebsd
%%PORTDOCS%%%%DOCSDIR%%/INSTALL.FreeBSD
%%PORTDOCS%%%%DOCSDIR%%/README

Return to bug 205010

Lines 1-38 Link Here

(-)mailscanner/files/patch-bin-cron-update_phishing_sites.cron (-38 lines)
1	--- ../MailScanner-install-4.50.15.orig/bin/cron/update_phishing_sites.cron Wed Feb 15 20:02:33 2006
2	+++ bin/cron/update_phishing_sites.cron Wed Feb 15 20:14:45 2006
3	@@ -1,20 +1,24 @@
4	#!/bin/bash
5
6	-# Insert a random delay up to this value, to spread virus updates round
7	-# the clock. 1800 seconds = 30 minutes.
8	-# Set this to 0 to disable it.
9	-UPDATEMAXDELAY=3600
10	-if [ -f /etc/sysconfig/MailScanner ] ; then
11	- . /etc/sysconfig/MailScanner
12	-fi
13	-export UPDATEMAXDELAY
14	+# Add the following line to /etc/rc.conf to configure a maximum delay in
15	+# order to spread virus updates round the clock. 1800 seconds = 30 minutes.
16	+# Set this to 0 to disable it
17	+
18	+. /etc/rc.subr
19	+
20	+name="mailscanner"
21	+rcvar=mailscanner_enable
22	+
23	+load_rc_config $name
24	+
25	+: ${mailscanner_updatemaxdelay="600"}
26
27	[ -x /opt/MailScanner/bin/update_phishing_sites ] \|\| exit 0
28	-if [ "x$UPDATEMAXDELAY" = "x0" ]; then
29	+if [ "x${mailscanner_updatemaxdelay}" = "x0" ]; then
30	:
31	else
32	- logger -p mail.info -t update.phishing.sites Delaying cron job up to $UPDATEMAXDELAY seconds
33	- perl -e "sleep int(rand($UPDATEMAXDELAY));"
34	+ logger -p mail.info -t update.phishing.sites Delaying cron job up to ${mailscanner_updatemaxdelay} seconds
35	+ perl -e "sleep int(rand(${mailscanner_updatemaxdelay}));"
36	fi
37	exec /opt/MailScanner/bin/update_phishing_sites > /dev/null 2>&1
38	exit 0

Lines 1-38 Link Here

(-)mailscanner/files/patch-bin-cron-update_virus_scanners.cron (-38 lines)
1	--- ../MailScanner-install-4.50.15.orig/bin/cron/update_virus_scanners.cron Wed Feb 15 20:02:33 2006
2	+++ bin/cron/update_virus_scanners.cron Wed Feb 15 20:11:17 2006
3	@@ -1,20 +1,24 @@
4	#!/bin/bash
5
6	-# Insert a random delay up to this value, to spread virus updates round
7	-# the clock. 1800 seconds = 30 minutes.
8	-# Set this to 0 to disable it.
9	-UPDATEMAXDELAY=600
10	-if [ -f /etc/sysconfig/MailScanner ] ; then
11	- . /etc/sysconfig/MailScanner
12	-fi
13	-export UPDATEMAXDELAY
14	+# Add the following line to /etc/rc.conf to configure a maximum delay in
15	+# order to spread virus updates round the clock. 1800 seconds = 30 minutes.
16	+# Set this to 0 to disable it
17	+
18	+. /etc/rc.subr
19	+
20	+name="mailscanner"
21	+rcvar=mailscanner_enable
22	+
23	+load_rc_config $name
24	+
25	+: ${mailscanner_updatemaxdelay="600"}
26
27	[ -x /opt/MailScanner/bin/update_virus_scanners ] \|\| exit 0
28	-if [ "x$UPDATEMAXDELAY" = "x0" ]; then
29	+if [ "x${mailscanner_updatemaxdelay}" = "x0" ]; then
30	:
31	else
32	- logger -p mail.info -t update.virus.scanners Delaying cron job up to $UPDATEMAXDELAY seconds
33	- perl -e "sleep int(rand($UPDATEMAXDELAY));"
34	+ logger -p mail.info -t update.virus.scanners Delaying cron job up to ${mailscanner_updatemaxdelay} seconds
35	+ perl -e "sleep int(rand(${mailscanner_updatemaxdelay}));"
36	fi
37	exec /opt/MailScanner/bin/update_virus_scanners
38	exit 0

Lines 1-12 Link Here

(-)mailscanner/files/patch-lib-clamav-wrapper (-12 lines)
1	--- ./lib/clamav-wrapper.orig 2011-08-20 08:32:02.000000000 -0400
2	+++ ./lib/clamav-wrapper 2012-03-09 08:41:47.000000000 -0500
3	@@ -51,6 +51,9 @@
4
5	# You may want to check this script for bash-isms
6
7	+PATH=$PATH:/usr/local/bin
8	+export PATH
9	+
10	#TempDir="/tmp/clamav.$$"
11	TempDir=$(mktemp) \|\| { echo "$0: Cannot make name for temporary dir" >&2; exit 1; }
12	ClamUser="clamav"

Lines 1-20 Link Here

(-)mailscanner/files/patch-lib__MailScanner__CustomFunctions__LastSpam.pm (-20 lines)
1	--- ./lib/MailScanner/CustomFunctions/LastSpam.pm.orig 2011-08-20 08:24:49.000000000 -0400
2	+++ ./lib/MailScanner/CustomFunctions/LastSpam.pm 2014-02-21 04:11:09.000000000 -0500
3	@@ -32,7 +32,6 @@
4	my $Debug = 0; # Set to 1 to enable debug output to STDERR
5	#my $tmpfilename = "/tmp/MailScanner.LastSpam.$$.conf"; # Temp MS.conf file
6	# Temp MS.conf file
7	-my($tmpfh, $tmpfilename) = tempfile("MailScanner.LastSpam.XXXXXX", TMPDIR => 1, UNLINK => 0);
8	my %modtime = (); # Time domain list magic word file was last changed
9	my %filename = (); # Map Config option to magic word file
10	my %magicwords = {}; # Map Config option --> domains --> magic words
11	@@ -550,8 +549,7 @@
12	sub SetupRuleset {
13	my($opkeyword) = @_;
14
15	- my $fh = new FileHandle;
16	- $fh->open("> $tmpfilename") or die "$!";
17	+ my($fh, $tmpfilename) = tempfile("MailScanner.LastSpam.XXXXXX", TMPDIR => 1, UNLINK => 0);
18	my $rf = $rulesetfilename{$opkeyword};
19	#print STDERR "RF = $rf\n";
20	#print STDERR $opkeyword . " = $rf\n";

Lines 1-20 Link Here

(-)mailscanner/files/patch-lib__MailScanner__CustomFunctions__Ruleset-from-Function.pm (-20 lines)
1	--- ./lib/MailScanner/CustomFunctions/Ruleset-from-Function.pm.orig 2011-08-20 08:25:42.000000000 -0400
2	+++ ./lib/MailScanner/CustomFunctions/Ruleset-from-Function.pm 2014-02-21 04:16:55.000000000 -0500
3	@@ -31,7 +31,6 @@
4
5	my $Debug = 0; # Set to 1 to enable debug output to STDERR
6	#my $tmpfilename = "/tmp/MailScanner.$$.conf"; # Temp MS.conf file
7	-my($tmpfh, $tmpfilename) = tempfile("MailScanner.XXXXXX", TMPDIR => 1, UNLINK => 0);
8
9
10
11	@@ -60,8 +59,7 @@
12	my $option = 'virusscanning'; # External (MailScanner.conf-version)
13
14	# Make the temporary 1-line MailScanner.conf file, use it and delete it
15	- my $fh = new FileHandle;
16	- $fh->open("> $tmpfilename") or die "$!";
17	+ my($fh, $tmpfilename) = tempfile("MailScanner.XXXXXX", TMPDIR => 1, UNLINK => 0);
18	print $fh $option . " = $ruleset\n";
19	$fh->close;
20

Lines 1-110 Link Here

(-)mailscanner/files/patch-lib__MailScanner__TNEF.pm (-110 lines)
1	--- ./lib/MailScanner/TNEF.pm.orig 2013-06-17 09:29:16.000000000 -0400
2	+++ ./lib/MailScanner/TNEF.pm 2014-02-21 04:03:15.000000000 -0500
3	@@ -229,18 +229,25 @@
4
5	# Create the subdir to unpack it into
6	#my $unpackdir = "tnef.$$";
7	- my ($tmpfh, $unpackdir) = tempfile("tnefXXXXXX", TMPDIR => $dir, UNLINK => 0);
8	- # This line shouldn't be here any more! $dir =~ s,^.*/,,;
9	- $unpackdir = $message->MakeNameSafe($unpackdir, $dir);
10	- unless (mkdir "$dir/$unpackdir", 0777) {
11	+ my $unpackdir = tempdir("tnefXXXXXX", DIR => $dir);
12	+ unless (-d $unpackdir) {
13	MailScanner::Log::WarnLog("Trying to unpack %s in message %s, could not create subdirectory %s, failed to unpack TNEF message", $tnefname, $message->{id},
14	- "$dir/$unpackdir");
15	+ "$unpackdir");
16	return 0;
17	}
18	- chmod 0700, "$dir/$unpackdir";
19	+ # Convert Incoming Work Permissions to an octal value and add search.
20	+ my $perms = oct(sprintf("%s", MailScanner::Config::Value('workperms')))
21	+ \| 0111;
22	+ chmod $perms, $unpackdir;
23	+ # Try to set Incoming Work User and Group.
24	+ my $uname = MailScanner::Config::Value('workuser');
25	+ my $gname = MailScanner::Config::Value('workgroup');
26	+ my $uid = $uname?getpwnam($uname):-1;
27	+ my $gid = $gname?getgrnam($gname):-1;
28	+ chown $uid, $gid, $unpackdir;
29
30	my $cmd = MailScanner::Config::Value('tnefexpander') .
31	- " -f $dir/$tnefname -C $dir/$unpackdir --overwrite";
32	+ " -f $dir/$tnefname -C $unpackdir --overwrite";
33
34	my($kid);
35	my($TimedOut, $PipeReturn, $pid);
36	@@ -311,15 +318,15 @@
37
38	unless (MailScanner::Config::Value('replacetnef',$message) =~ /[12]/) {
39	# Just need to move all the unpacked files into the main attachments dir
40	- my $dirh = new DirHandle "$dir/$unpackdir";
41	+ my $dirh = new DirHandle "$$unpackdir";
42	return 0 unless defined $dirh;
43	while (defined(my $unpacked = $dirh->read)) {
44	- next unless -f "$dir/$unpackdir/$unpacked";
45	+ next unless -f "$$unpackdir/$unpacked";
46	# Add a 't' to the safename to mark it as a tnef member.
47	my $safe = $message->MakeNameSafe('t'.$unpacked, $dir);
48	# This will cause big problems as $safe has a type, and shouldn't!
49	$message->{file2parent}{$safe} = $tnefname;
50	- my $name1 = "$dir/$unpackdir/$unpacked";
51	+ my $name1 = "$unpackdir/$unpacked";
52	$name1 =~ /(.*)/;
53	$name1 = $1;
54	my $name2 = "$dir/$safe";
55	@@ -333,19 +340,21 @@
56	$safe =~ s#^(.*/)([^/])([^/]+)$#$1$3#; # I assert $2 will equal 't'.
57	$message->{file2parent}{$safe} = $tnefname;
58	}
59	- rmdir "$dir/$unpackdir"; # Directory should be empty now
60	+ # The following may result in a warning from a virus scanner that
61	+ # tries to lstat the directory, but it was empty so it can be ignored.
62	+ rmdir "$$unpackdir"; # Directory should be empty now
63	return 1;
64	}
65	#print STDERR "In TNEF External Decoder\n";
66
67	- my $dirh = new DirHandle "$dir/$unpackdir";
68	+ my $dirh = new DirHandle "$unpackdir";
69	return 0 unless defined $dirh;
70	my($type, $encoding);
71	$message->{entity}->make_multipart;
72	my($safename, @replacements, $unpacked);
73	while (defined($unpacked = $dirh->read)) {
74	- #print STDERR "Directory entry is \"$unpacked\" in \"$dir/$unpackdir\"\n";
75	- next unless -f "$dir/$unpackdir/$unpacked";
76	+ #print STDERR "Directory entry is \"$unpacked\" in \"$unpackdir\"\n";
77	+ next unless -f "$unpackdir/$unpacked";
78	# Add a 't' to the safename to mark it as a tnef member.
79	$safename = $message->MakeNameSafe('t'.$unpacked, $dir);
80	if (/^msg[\d-]+\.txt$/) {
81	@@ -353,15 +362,15 @@
82	} else {
83	($type, $encoding) = ("application/octet-stream", "base64");
84	}
85	- #print STDERR "Renaming '$dir/$unpackdir/$unpacked' to '$dir/$safename'\n";
86	- my $oldname = "$dir/$unpackdir/$unpacked";
87	+ #print STDERR "Renaming '$unpackdir/$unpacked' to '$dir/$safename'\n";
88	+ my $oldname = "$unpackdir/$unpacked";
89	my $newname = "$dir/$safename";
90	$oldname =~ /^(.*)$/;
91	$oldname = $1;
92	$newname =~ /^(.*)$/;
93	$newname = $1;
94	rename $oldname, $newname;
95	- #rename "$dir/$unpackdir/$unpacked", "$dir/$safename";
96	+ #rename "$unpackdir/$unpacked", "$dir/$safename";
97	# JKF 20090421 CHMOD, then CHOWN and CHGRP it if necessary.
98	chmod $perms, $newname;
99	#chmod $perms, "$dir/$safename";
100	@@ -381,7 +390,9 @@
101	$message->{bodymodified} = 1;
102	$message->{foundtnefattachments} = 1;
103	undef $dirh;
104	- rmdir "$dir/$unpackdir"; # Directory should be empty now
105	+ # The following may result in a warning from a virus scanner that
106	+ # tries to lstat the directory, but it was empty so it can be ignored.
107	+ rmdir "$unpackdir"; # Directory should be empty now
108	#$message->{entity}->dump_skeleton();
109
110	MailScanner::Log::InfoLog("Message %s added TNEF contents %s",

Line 0 Link Here

(-)mailscanner/files/patch-lib_clamav-wrapper (+12 lines)
	1	--- lib/clamav-wrapper.orig 2015-12-04 06:27:18 UTC
	2	+++ lib/clamav-wrapper
	3	@@ -51,6 +51,9 @@
	4
	5	# You may want to check this script for bash-isms
	6
	7	++PATH=$PATH:/usr/local/bin
	8	++export PATH
	9	+
	10	#TempDir="/tmp/clamav.$$"
	11	TempDir=$(mktemp -t tmp) \|\| { echo "$0: Cannot make name for temporary dir" >&2; exit 1; }
	12	ClamUser="clamav"