Hi,
This diff updates MailScanner to it's latest version.
See the announce here:
http://lists.mailscanner.info/pipermail/mailscanner/2009-October/093371.html
This version allows the include directive. I changed the default directory
to /etc/MailScanner/conf.d/
While here I added the upgrade_MailScanner_conf to the "BINS" list (with some
tweaks to the usage message).
Tested on @amd64 with spamassassin and clamd.
Comments ?
--
Pierre-Emmanuel André <pea at raveland.org>
GPG key: 0x7AE329DC
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/mailscanner/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile 11 Jun 2009 23:33:26 -0000 1.15
+++ Makefile 7 Oct 2009 18:51:37 -0000
@@ -2,8 +2,8 @@
COMMENT= virus/spam scanning framework
-V= 4.77
-Vs= 10
+V= 4.78
+Vs= 17
Vss= ${Vs}-1
CATEGORIES= mail
MASTER_SITES= http://mailscanner.info/files/4/tar/
@@ -50,7 +50,7 @@ do-install: install_libexec install_etc
BINS= MailScanner df2mbox d2mbox update_bad_phishing_sites
update_phishing_sites
BINS+= check_mailscanner clean.quarantine clean.SA.cache
analyse_SpamAssassin_cache
-BINS+= mailscanner_create_locks processing_messages_alert
+BINS+= mailscanner_create_locks processing_messages_alert
upgrade_MailScanner_conf
_MS_sed_frag= _subst() { sed
's,%PREFIX%,${LOCALBASE},g;s,%SYSCONFDIR%,${SYSCONFDIR},g' \
"$$2" > ${WRKDIST}/file; \
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/mailscanner/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo 11 Jun 2009 23:33:26 -0000 1.10
+++ distinfo 7 Oct 2009 18:51:37 -0000
@@ -1,5 +1,5 @@
-MD5 (MailScanner-install-4.77.10-1.tar.gz) = vw5cLhfcwqiY7QieOnfOqQ==
-RMD160 (MailScanner-install-4.77.10-1.tar.gz) = eEPv0zkBEiGyore5bry4LXQoq98=
-SHA1 (MailScanner-install-4.77.10-1.tar.gz) = Yauwi1FlOSCSKoVwBoJ2ZfETS/Y=
-SHA256 (MailScanner-install-4.77.10-1.tar.gz) =
9+PjouisWthJ8iU2HPwG+p1V+poSC9EKAUpEVGyW+ZI=
-SIZE (MailScanner-install-4.77.10-1.tar.gz) = 9147552
+MD5 (MailScanner-install-4.78.17-1.tar.gz) = bDby70pCSv69gmYvPXvlJw==
+RMD160 (MailScanner-install-4.78.17-1.tar.gz) = RwaoHlD6WIAEF14MvwcNdAM7edA=
+SHA1 (MailScanner-install-4.78.17-1.tar.gz) = UO66/0RxTrQDOpQ7pibjcY/ZiVc=
+SHA256 (MailScanner-install-4.78.17-1.tar.gz) =
MxAIvLW6G3QsKDrpiiLl//jkbpKixrQ1yMCYtMOfGzM=
+SIZE (MailScanner-install-4.78.17-1.tar.gz) = 9209407
Index: patches/patch-bin_MailScanner
===================================================================
RCS file: /cvs/ports/mail/mailscanner/patches/patch-bin_MailScanner,v
retrieving revision 1.8
diff -u -p -r1.8 patch-bin_MailScanner
--- patches/patch-bin_MailScanner 23 May 2009 21:30:05 -0000 1.8
+++ patches/patch-bin_MailScanner 7 Oct 2009 18:51:37 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-bin_MailScanner,v 1.8 2009/05/23 21:30:05 sthen Exp $
---- bin/MailScanner.orig Tue May 12 06:23:39 2009
-+++ bin/MailScanner Sun May 17 06:52:31 2009
+--- bin/MailScanner.orig Thu Oct 1 20:18:31 2009
++++ bin/MailScanner Wed Oct 7 15:10:16 2009
@@ -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.8 20
unshift @INC, $path;
}
-@@ -208,8 +208,6 @@ if ($Versions) {
+@@ -209,8 +209,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.8 20
printf("This is Perl version %f (%vd)\n", $], $^V);
print "\nThis is MailScanner version " .
$MailScanner::Config::MailScannerVersion . "\n";
print "Module versions are:\n";
-@@ -279,7 +277,7 @@ if ($WantLintOnly || $WantLintLiteOnly) {
+@@ -280,7 +278,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.8 20
!(-f $ConfFile);
# Do they just want a dump of the processing-database table?
-@@ -334,7 +332,7 @@ if (MailScanner::Config::QuickPeek($ConfFile, 'virussc
+@@ -335,7 +333,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.8 20
Virus Scanners = clamav
Then download
http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/install-Clam-SA.tar.gz
-@@ -421,7 +419,7 @@ if ($WantLintOnly || $WantLintLiteOnly) {
+@@ -422,7 +420,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.8 20
print STDERR "Error: Attempt to create locks in $lockdir failed!\n"
if ($clr>>8) != 0;
-@@ -716,7 +714,7 @@ if ($locksdir eq "" || $locksdir =~ /tmp$/i) {
+@@ -719,7 +717,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";
}
Index: patches/patch-bin_processing_messages_alert
===================================================================
RCS file:
/cvs/ports/mail/mailscanner/patches/patch-bin_processing_messages_alert,v
retrieving revision 1.2
diff -u -p -r1.2 patch-bin_processing_messages_alert
--- patches/patch-bin_processing_messages_alert 23 May 2009 21:30:05 -0000
1.2
+++ patches/patch-bin_processing_messages_alert 7 Oct 2009 18:51:37 -0000
@@ -1,25 +1,34 @@
$OpenBSD: patch-bin_processing_messages_alert,v 1.2 2009/05/23 21:30:05 sthen
Exp $
---- bin/processing_messages_alert.orig Wed May 6 15:39:02 2009
-+++ bin/processing_messages_alert Wed May 13 19:32:41 2009
-@@ -1,16 +1,16 @@
+--- bin/processing_messages_alert.orig Tue Sep 8 16:21:09 2009
++++ bin/processing_messages_alert Wed Oct 7 15:13:35 2009
+@@ -1,13 +1,13 @@
#!/bin/sh
--noticesfrom=`perl -n -e 'print "$_" if chomp &&
s/^\s*Notices\s*From\s*=\s*([^\s#]+).*$/$1/'
/opt/MailScanner/etc/MailScanner.conf`
--localpostmaster=`perl -n -e 'print "$_" if chomp &&
s/^\s*Local\s*Postmaster\s*=\s*([^\s#]+).*$/$1/'
/opt/MailScanner/etc/MailScanner.conf`
--noticesto=`perl -n -e 'print "$_" if chomp &&
s/^\s*Notices\s*To\s*=\s*([^\s#]+).*$/$1/'
/opt/MailScanner/etc/MailScanner.conf`
--sendnotices=`perl -n -e 'print "$_" if chomp &&
s/^\s*Send\s*Notices\s*=\s*([^\s#]+).*$/$1/'
/opt/MailScanner/etc/MailScanner.conf`
+-#noticesfrom=`perl -n -e 'print "$_" if chomp &&
s/^\s*Notices\s*From\s*=\s*([^\s#]+).*$/$1/'
/opt/MailScanner/etc/MailScanner.conf`
+-#localpostmaster=`perl -n -e 'print "$_" if chomp &&
s/^\s*Local\s*Postmaster\s*=\s*([^\s#]+).*$/$1/'
/opt/MailScanner/etc/MailScanner.conf`
+-#noticesto=`perl -n -e 'print "$_" if chomp &&
s/^\s*Notices\s*To\s*=\s*([^\s#]+).*$/$1/'
/opt/MailScanner/etc/MailScanner.conf`
+-#sendnotices=`perl -n -e 'print "$_" if chomp &&
s/^\s*Send\s*Notices\s*=\s*([^\s#]+).*$/$1/'
/opt/MailScanner/etc/MailScanner.conf`
+-noticesfrom=`/opt/MailScanner/bin/Quick.Peek noticesfrom
/opt/MailScanner/etc/MailScanner.conf`
+-localpostmaster=`/opt/MailScanner/bin/Quick.Peek localpostmaster
/opt/MailScanner/etc/MailScanner.conf`
+-noticesto=`/opt/MailScanner/bin/Quick.Peek noticesto
/opt/MailScanner/etc/MailScanner.conf`
+-sendnotices=`/opt/MailScanner/bin/Quick.Peek sendnotices
/opt/MailScanner/etc/MailScanner.conf`
+noticesfrom=`perl -n -e 'print "$_" if chomp &&
s/^\s*Notices\s*From\s*=\s*([^\s#]+).*$/$1/'
%SYSCONFDIR%/MailScanner/MailScanner.conf`
+localpostmaster=`perl -n -e 'print "$_" if chomp &&
s/^\s*Local\s*Postmaster\s*=\s*([^\s#]+).*$/$1/'
%SYSCONFDIR%/MailScanner/MailScanner.conf`
+noticesto=`perl -n -e 'print "$_" if chomp &&
s/^\s*Notices\s*To\s*=\s*([^\s#]+).*$/$1/'
%SYSCONFDIR%/MailScanner/MailScanner.conf`
+sendnotices=`perl -n -e 'print "$_" if chomp &&
s/^\s*Send\s*Notices\s*=\s*([^\s#]+).*$/$1/'
%SYSCONFDIR%/MailScanner/MailScanner.conf`
++#noticesfrom=`/opt/MailScanner/bin/Quick.Peek noticesfrom
/opt/MailScanner/etc/MailScanner.conf`
++#localpostmaster=`/opt/MailScanner/bin/Quick.Peek localpostmaster
/opt/MailScanner/etc/MailScanner.conf`
++#noticesto=`/opt/MailScanner/bin/Quick.Peek noticesto
/opt/MailScanner/etc/MailScanner.conf`
++#sendnotices=`/opt/MailScanner/bin/Quick.Peek sendnotices
/opt/MailScanner/etc/MailScanner.conf`
# Only do this if they want to send notices to postmaster at all
if [ "x$sendnotices" = "xno" ]; then
- exit 0
+@@ -21,7 +21,7 @@ if ( echo $noticesto | grep -q '^/' ); then
+ noticesto=$localpostmaster
fi
-alert=`/opt/MailScanner/bin/MailScanner --processing`
-+alert=`%PREFIX%/bin/MailScanner --processing`
++alert=`%PREFIX%/MailScanner/bin/MailScanner --processing`
if [ \! "x$alert" = "x" ]; then
#cat <<EOM
Index: patches/patch-bin_update_virus_scanners
===================================================================
RCS file: /cvs/ports/mail/mailscanner/patches/patch-bin_update_virus_scanners,v
retrieving revision 1.2
diff -u -p -r1.2 patch-bin_update_virus_scanners
--- patches/patch-bin_update_virus_scanners 28 Jan 2009 15:16:17 -0000
1.2
+++ patches/patch-bin_update_virus_scanners 7 Oct 2009 18:51:37 -0000
@@ -1,17 +1,23 @@
$OpenBSD: patch-bin_update_virus_scanners,v 1.2 2009/01/28 15:16:17 sthen Exp $
---- bin/update_virus_scanners.orig Mon Jan 12 16:32:30 2009
-+++ bin/update_virus_scanners Sat Jan 17 09:27:40 2009
-@@ -1,9 +1,9 @@
+--- bin/update_virus_scanners.orig Thu Aug 27 06:23:09 2009
++++ bin/update_virus_scanners Wed Oct 7 15:15:05 2009
+@@ -1,12 +1,12 @@
#!/bin/sh
-SCANNERSCONF=/opt/MailScanner/etc/virus.scanners.conf
--LOCKDIR=`perl -n -e 'print "$_" if chomp &&
s/^\s*Lock\s*file\s*Dir\s*=\s*([^\s#]+).*$/$1/i'
/opt/MailScanner/etc/MailScanner.conf`
--RUNASU=`perl -n -e 'print "$_" if chomp &&
s/^\s*Run\s*As\s*User\s*=\s*([^\s#]+).*$/$1/i'
/opt/MailScanner/etc/MailScanner.conf`
--RUNASG=`perl -n -e 'print "$_" if chomp &&
s/^\s*Run\s*As\s*Group\s*=\s*([^\s#]+).*$/$1/i'
/opt/MailScanner/etc/MailScanner.conf`
-+SCANNERSCONF=%SYSCONFDIR%/MailScanner/virus.scanners.conf
+-#LOCKDIR=`perl -n -e 'print "$_" if chomp &&
s/^\s*Lock\s*file\s*Dir\s*=\s*([^\s#]+).*$/$1/i'
/opt/MailScanner/etc/MailScanner.conf`
+-#RUNASU=`perl -n -e 'print "$_" if chomp &&
s/^\s*Run\s*As\s*User\s*=\s*([^\s#]+).*$/$1/i'
/opt/MailScanner/etc/MailScanner.conf`
+-#RUNASG=`perl -n -e 'print "$_" if chomp &&
s/^\s*Run\s*As\s*Group\s*=\s*([^\s#]+).*$/$1/i'
/opt/MailScanner/etc/MailScanner.conf`
+-LOCKDIR=`/opt/MailScanner/bin/Quick.Peek lockfiledir
/opt/MailScanner/etc/MailScanner.conf`
+-RUNASU=`/opt/MailScanner/bin/Quick.Peek runasuser
/opt/MailScanner/etc/MailScanner.conf`
+-RUNASG=`/opt/MailScanner/bin/Quick.Peek runasgroup
/opt/MailScanner/etc/MailScanner.conf`
++SCANNERSCONF=%SYSCONFIDR%/MailScanner/virus.scanners.conf
+LOCKDIR=`perl -n -e 'print "$_" if chomp &&
s/^\s*Lock\s*file\s*Dir\s*=\s*([^\s#]+).*$/$1/i'
%SYSCONFDIR%/MailScanner/MailScanner.conf`
+RUNASU=`perl -n -e 'print "$_" if chomp &&
s/^\s*Run\s*As\s*User\s*=\s*([^\s#]+).*$/$1/i'
%SYSCONFDIR%/MailScanner/MailScanner.conf`
+RUNASG=`perl -n -e 'print "$_" if chomp &&
s/^\s*Run\s*As\s*Group\s*=\s*([^\s#]+).*$/$1/i'
%SYSCONFDIR%/MailScanner/MailScanner.conf`
++#LOCKDIR=`/opt/MailScanner/bin/Quick.Peek lockfiledir
/opt/MailScanner/etc/MailScanner.conf`
++#RUNASU=`/opt/MailScanner/bin/Quick.Peek runasuser
/opt/MailScanner/etc/MailScanner.conf`
++#RUNASG=`/opt/MailScanner/bin/Quick.Peek runasgroup
/opt/MailScanner/etc/MailScanner.conf`
Disabled=no
if [ "x$Disabled" = "xyes" ]; then
Index: patches/patch-bin_upgrade_MailScanner_conf
===================================================================
RCS file:
/cvs/ports/mail/mailscanner/patches/patch-bin_upgrade_MailScanner_conf,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-bin_upgrade_MailScanner_conf
--- patches/patch-bin_upgrade_MailScanner_conf 20 Feb 2008 03:47:18 -0000
1.1.1.1
+++ patches/patch-bin_upgrade_MailScanner_conf 7 Oct 2009 18:51:37 -0000
@@ -1,12 +1,73 @@
$OpenBSD: patch-bin_upgrade_MailScanner_conf,v 1.1.1.1 2008/02/20 03:47:18
todd Exp $
---- bin/upgrade_MailScanner_conf.orig Fri Jul 27 10:52:56 2007
-+++ bin/upgrade_MailScanner_conf Sun Aug 5 04:03:25 2007
-@@ -106,7 +106,7 @@ If you are using the tar distribution so that the old
- /opt/MailScanner and the new one is in /opt/MailScanner.new then:
+--- bin/upgrade_MailScanner_conf.orig Tue Aug 11 11:26:07 2009
++++ bin/upgrade_MailScanner_conf Wed Oct 7 20:38:54 2009
+@@ -60,25 +60,11 @@ sub Usage {
+ print STDERR <<EOU;
+ Usage:
- cd /opt/MailScanner.new/etc/reports/en
+-RPM
+-===
+-If you are using the RPM distributions then try this:
+-
+-cd /etc/MailScanner
+-upgrade_MailScanner_conf MailScanner.conf MailScanner.conf.rpmnew >
MailScanner.new
++cd %SYSCONFDIR%/MailScanner
++%PREFIX%/bin/upgrade_MailScanner_conf
%SYSCONFDIR%/MailScanner/MailScanner.conf
%PREFIX%/share/examples/MailScanner/MailScanner.conf > MailScanner.new
+ mv -f MailScanner.conf MailScanner.old
+ mv -f MailScanner.new MailScanner.conf
+
+-TAR
+-===
+-If you are using the tar distribution so that the old version is in
+-/opt/MailScanner and the new one is in /opt/MailScanner.new then:
+-
+-cd /opt/MailScanner.new/etc
+-../bin/upgrade_MailScanner_conf /opt/MailScanner/etc/MailScanner.conf
/opt/MailScanner.new/etc/MailScanner.conf > MailScanner.new
+-mv -f MailScanner.conf MailScanner.old
+-mv -f MailScanner.new MailScanner.conf
+-
+ NOTE
+ ====
+ To keep your old comments in your original file, add "--keep-comments"
+@@ -91,25 +77,11 @@ EOU
+ print STDERR <<EOLANG;
+ Usage:
+
+-RPM
+-===
+-If you are using the RPM distributions then try this:
++cd %SYSCONFDIR%/MailScanner
++%PREFIX%/bin/upgrade_MailScanner_conf
%SYSCONFDIR%/MailScanner/MailScanner.conf
%PREFIX%/share/examples/MailScanner/MailScanner.conf > MailScanner.new
++mv -f MailScanner.conf MailScanner.old
++mv -f MailScanner.new MailScanner.conf
+
+-cd /etc/MailScanner/reports/en
+-upgrade_languages_conf languages.conf languages.conf.rpmnew > languages.new
+-mv -f languages.conf languages.old
+-mv -f languages.new languages.conf
+-
+-TAR
+-===
+-If you are using the tar distribution so that the old version is in
+-/opt/MailScanner and the new one is in /opt/MailScanner.new then:
+-
+-cd /opt/MailScanner.new/etc/reports/en
-../../../bin/upgrade_languages_conf
/opt/MailScanner/etc/reports/en/languages.conf
/opt/MailScanner.new/etc/reports/en/languages.conf > languages.new
-+../../../bin/upgrade_languages_conf
%SYSCONFDIR%/MailScanner/reports/en/languages.conf
/opt/MailScanner.new/etc/reports/en/languages.conf > languages.new
- mv -f languages.conf languages.old
- mv -f languages.new languages.conf
+-mv -f languages.conf languages.old
+-mv -f languages.new languages.conf
+-
+ NOTE
+ ====
+ To keep your old comments in your original file, add "--keep-comments"
+@@ -364,9 +336,9 @@ I would advise you to check on any parameters which ar
+ the default new conf file and the conf file you just created, so that you
+ find any parameters whose default values have changed.
+ If you ran this with a command like this
+- upgrade_$filescore $filedot $filedot.rpmnew > $filenew
++ %PREFIX%/bin/upgrade_MailScanner_conf
%SYSCONFDIR%/MailScanner/MailScanner.conf
%PREFIX%/share/examples/MailScanner/MailScanner.conf > MailScanner.new
+ then you should do
+- diff -w $filedot.rpmnew $filenew
++ diff -w $filedot $filenew
+ and check for any differences in values you have not changed yourself.
+ EOL
Index: patches/patch-etc_MailScanner_conf
===================================================================
RCS file: /cvs/ports/mail/mailscanner/patches/patch-etc_MailScanner_conf,v
retrieving revision 1.9
diff -u -p -r1.9 patch-etc_MailScanner_conf
--- patches/patch-etc_MailScanner_conf 11 Jun 2009 23:33:26 -0000 1.9
+++ patches/patch-etc_MailScanner_conf 7 Oct 2009 18:51:37 -0000
@@ -1,7 +1,16 @@
$OpenBSD: patch-etc_MailScanner_conf,v 1.9 2009/06/11 23:33:26 sthen Exp $
---- etc/MailScanner.conf.orig Mon Jun 1 11:14:02 2009
-+++ etc/MailScanner.conf Wed Jun 3 21:44:46 2009
-@@ -77,17 +77,17 @@
+--- etc/MailScanner.conf.orig Thu Oct 1 20:18:31 2009
++++ etc/MailScanner.conf Wed Oct 7 20:50:54 2009
+@@ -43,7 +43,7 @@
+ # normal shell wildcard characters such as "*".
+ # For each setting, the last value read will be used by MailScanner.
+ # At the end of this file, there is an "include" that will pull in
+-# all the files in /opt/MailScanner/etc/conf.d so you can just add
++# all the files in %SYSCONFDIR%/MailScanner/conf.d so you can just add
+ # your own local changes in there, and not need to modify this file.
+ #
+
+@@ -88,17 +88,17 @@
%web-site% = www.your-organisation.com
# Configuration directory containing this file
@@ -23,7 +32,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# One other that is set automatically for you is %version% which is,
# unsurprisingly, the string of the MailScanner version. It does not
-@@ -140,7 +140,7 @@ Queue Scan Interval = 6
+@@ -151,7 +151,7 @@ Queue Scan Interval = 6
# Example: /var/spool/mqueue.in/*
# 3. The name of a file containing a list of directory names,
# which can in turn contain wildcards.
@@ -32,7 +41,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
#
# If you are using sendmail and have your queues split into qf, df, xf
# directories, then just specify the main directory, do not give me the
-@@ -172,7 +172,7 @@ Incoming Work Dir = /var/spool/MailScanner/incoming
+@@ -183,7 +183,7 @@ Incoming Work Dir = /var/spool/MailScanner/incoming
Quarantine Dir = /var/spool/MailScanner/quarantine
# Set where to store the process id number so you can stop MailScanner
@@ -41,7 +50,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# To avoid resource leaks, re-start periodically. Forces a re-read of all
# the configuration files too, so new updates to the bad phishing sites list
-@@ -187,7 +187,7 @@ MTA = sendmail
+@@ -198,7 +198,7 @@ MTA = sendmail
# Set how to invoke MTA when sending messages MailScanner has created
# (e.g. to sender/recipient saying "found a virus in your message")
# This can also be the filename of a ruleset.
@@ -50,7 +59,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# Sendmail2 is provided for Exim users.
# It is the command used to attempt delivery of outgoing cleaned/disinfected
-@@ -195,9 +195,11 @@ Sendmail = /usr/lib/sendmail
+@@ -206,9 +206,11 @@ Sendmail = /usr/lib/sendmail
# This is not usually required for sendmail.
# This can also be the filename of a ruleset.
#For Exim users: Sendmail2 = /usr/sbin/exim -C /etc/exim/exim_send.conf
@@ -64,7 +73,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
#
# Incoming Work Dir Settings
-@@ -396,7 +398,7 @@ Deliver Unparsable TNEF = no
+@@ -407,7 +409,7 @@ Deliver Unparsable TNEF = no
# 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
@@ -73,7 +82,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# The maximum length of time the TNEF Expander is allowed to run for 1
message.
# (in seconds)
-@@ -416,7 +418,7 @@ File Timeout = 20
+@@ -427,7 +429,7 @@ File Timeout = 20
# This is used for expanding .gz files.
# To disable gzipped file checking, set this value to blank
# and the timeout to 0.
@@ -82,7 +91,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# The maximum length of time the "gunzip" command is allowed to run to expand
# 1 attachment file (in seconds).
-@@ -432,7 +434,7 @@ Gunzip Timeout = 50
+@@ -443,7 +445,7 @@ Gunzip Timeout = 50
# scanner, with one exception:
# If using the clavavmodule virus scanner, this adds external RAR checking
# to that scanner which is needed for archives which are RAR version 3.
@@ -91,7 +100,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# The maximum length of time the "unrar" command is allowed to run for 1
# RAR archive (in seconds)
-@@ -536,7 +538,7 @@ Add Text Of Doc = no
+@@ -547,7 +549,7 @@ Add Text Of Doc = no
# Using a ruleset here, you could have different output styles for
# different people.
# This can also be the filename of a ruleset.
@@ -100,7 +109,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# The maximum length of time the "antiword" command is allowed to run for 1
# Word document (in seconds)
-@@ -649,7 +651,7 @@ Virus Scanning = yes
+@@ -660,7 +662,7 @@ Virus Scanning = yes
# want none, then specify "none".
#
# This *cannot* be the filename of a ruleset.
@@ -109,7 +118,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# The maximum length of time the commercial virus scanner is allowed to run
# for 1 batch of messages (in seconds).
-@@ -777,19 +779,19 @@ Allowed Sophos Error Messages =
+@@ -807,19 +809,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.
@@ -132,7 +141,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
#
# Options specific to ClamAV Anti-Virus
-@@ -800,7 +802,7 @@ Monitors For Sophos Updates = /opt/sophos-av/lib/sav/*
+@@ -830,7 +832,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.
@@ -141,7 +150,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# ClamAVModule only: set limits when scanning for viruses.
#
-@@ -1478,7 +1480,7 @@ Sign Messages Already Processed = no
+@@ -1508,7 +1510,7 @@ Sign Messages Already Processed = no
# magic token "_SIGNATURE_" in your email message, the signature will be
# inserted just there, rather than at the end of the message.
# This can also be the filename of a ruleset.
@@ -150,7 +159,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# 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
-@@ -1606,7 +1608,7 @@ Deliver Cleaned Messages = yes
+@@ -1636,7 +1638,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.
@@ -159,7 +168,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# *If* "Notify Senders" is set to yes, do you want to notify people
# who sent you messages containing viruses?
-@@ -1668,7 +1670,7 @@ Scanned Subject Text = {Scanned}
+@@ -1698,7 +1700,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.
@@ -168,7 +177,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# This is the text to add to the start of the subject if the
# "Virus Modify Subject" option is set.
-@@ -1684,7 +1686,7 @@ Virus Subject Text = {Virus?}
+@@ -1714,7 +1716,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.
@@ -177,7 +186,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# This is the text to add to the start of the subject if the
# "Filename Modify Subject" option is set.
-@@ -1702,7 +1704,7 @@ Filename Subject Text = {Filename?}
+@@ -1732,7 +1734,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.
@@ -186,7 +195,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# This is the text to add to the start of the subject if the
# "Content Modify Subject" option is set.
-@@ -1721,7 +1723,7 @@ Content Subject Text = {Dangerous Content?}
+@@ -1751,7 +1753,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.
@@ -195,7 +204,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# This is the text to add to the start of the subject if the
# "Size Modify Subject" option is set.
-@@ -1740,7 +1742,7 @@ Size Subject Text = {Size}
+@@ -1770,7 +1772,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.
@@ -204,7 +213,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# This is the text to add to the start of the subject if the
# "Disarmed Modify Subject" option is set.
-@@ -1770,7 +1772,7 @@ Phishing Subject Text = {Fraud?}
+@@ -1800,7 +1802,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.
@@ -213,7 +222,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# This is the text to add to the start of the subject if the
# "Spam Modify Subject" option is set.
-@@ -1790,7 +1792,7 @@ Spam Subject Text = {Spam?}
+@@ -1820,7 +1822,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.
@@ -222,7 +231,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# This is just like the "Spam Subject Text" option above, except that
# it applies when the score from SpamAssassin is higher than the
-@@ -1880,7 +1882,7 @@ Missing Mail Archive Is = directory
+@@ -1910,7 +1912,7 @@ Missing Mail Archive Is = directory
# Notify the local system administrators ("Notices To") when any infections
# are found?
# This can also be the filename of a ruleset.
@@ -231,7 +240,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# Include the full headers of each message in the notices sent to the local
# system administrators?
-@@ -1935,7 +1937,7 @@ Virus Scanner Definitions = %etc-dir%/virus.scanners.c
+@@ -1965,7 +1967,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.
@@ -240,7 +249,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# This is the list of spam blacklists (RBLs) which you are using.
# See the "Spam List Definitions" file for more information about what
-@@ -2117,7 +2119,7 @@ Watermark Header = X-%org-name%-MailScanner-Watermark:
+@@ -2147,7 +2149,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.
@@ -249,7 +258,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# SpamAssassin is not very fast when scanning huge messages, so messages
# bigger than this value will be truncated to this length for SpamAssassin
-@@ -2214,7 +2216,7 @@ Include Binary Attachments In SpamAssassin = no
+@@ -2244,7 +2246,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.
@@ -258,7 +267,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# Many naive spammers send out the same message to lots of people.
# These messages are very likely to have roughly the same SpamAssassin score.
-@@ -2668,14 +2670,14 @@ SpamAssassin Install Prefix =
+@@ -2698,14 +2700,14 @@ SpamAssassin Install Prefix =
SpamAssassin Site Rules Dir = /etc/mail/spamassassin
# The site-local rules are searched for here, and in prefix/etc/spamassassin,
@@ -275,7 +284,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
SpamAssassin Local Rules Dir =
# The rules created by the "sa-update" tool are searched for here.
-@@ -2689,10 +2691,10 @@ SpamAssassin Local Rules Dir =
+@@ -2719,10 +2721,10 @@ SpamAssassin Local Rules Dir =
SpamAssassin Local State Dir = # /var/lib/spamassassin
# The default rules are searched for here, and in prefix/share/spamassassin,
@@ -288,7 +297,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
SpamAssassin Default Rules Dir =
#
-@@ -2725,9 +2727,9 @@ MCP Actions = deliver
+@@ -2755,9 +2757,9 @@ MCP Actions = deliver
High Scoring MCP Actions = deliver
Bounce MCP As Attachment = no
@@ -300,7 +309,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
High Scoring MCP Subject Text = {MCP?}
Is Definitely MCP = no
-@@ -2896,7 +2898,7 @@ Lockfile Dir = /var/spool/MailScanner/incoming/Locks
+@@ -2926,7 +2928,7 @@ Lockfile Dir = /var/spool/MailScanner/incoming/Locks
# 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.
@@ -309,3 +318,10 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1
# How to lock spool files.
# Don't set this unless you *know* you need to.
+@@ -2985,5 +2987,5 @@ Minimum Code Status = supported
+ # They will be read and processed in alphabetical order.
+ #
+ #
+-include /opt/MailScanner/etc/conf.d/*
++include %SYSCONFDIR%/MailScanner/conf.d/*
+
Index: patches/patch-lib_MailScanner_ConfigDefs_pl
===================================================================
RCS file:
/cvs/ports/mail/mailscanner/patches/patch-lib_MailScanner_ConfigDefs_pl,v
retrieving revision 1.7
diff -u -p -r1.7 patch-lib_MailScanner_ConfigDefs_pl
--- patches/patch-lib_MailScanner_ConfigDefs_pl 23 May 2009 21:30:05 -0000
1.7
+++ patches/patch-lib_MailScanner_ConfigDefs_pl 7 Oct 2009 18:51:37 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-lib_MailScanner_ConfigDefs_pl,v 1.7 2009/05/23 21:30:05 sthen
Exp $
---- lib/MailScanner/ConfigDefs.pl.orig Tue May 12 06:23:36 2009
-+++ lib/MailScanner/ConfigDefs.pl Wed May 13 19:22:44 2009
-@@ -357,8 +357,8 @@ qmailintdhashnumber 1
+--- lib/MailScanner/ConfigDefs.pl.orig Thu Jul 30 21:16:52 2009
++++ lib/MailScanner/ConfigDefs.pl Wed Oct 7 15:10:16 2009
+@@ -358,8 +358,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_ConfigDe
FileCommand /usr/bin/file
FirstCheck mcp
getipfromheader 0
-@@ -382,7 +382,7 @@ QuarantinePerms 0600
+@@ -383,7 +383,7 @@ QuarantinePerms 0600
RunAsUser 0
RunAsGroup 0
SACache
/var/spool/MailScanner/incoming/SpamAssassin.cache.db
Index: patches/patch-lib_MailScanner_Message_pm
===================================================================
RCS file: /cvs/ports/mail/mailscanner/patches/patch-lib_MailScanner_Message_pm,v
retrieving revision 1.7
diff -u -p -r1.7 patch-lib_MailScanner_Message_pm
--- patches/patch-lib_MailScanner_Message_pm 23 May 2009 21:30:05 -0000
1.7
+++ patches/patch-lib_MailScanner_Message_pm 7 Oct 2009 18:51:37 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-lib_MailScanner_Message_pm,v 1.7 2009/05/23 21:30:05 sthen Exp
$
---- lib/MailScanner/Message.pm.orig Fri May 8 05:20:04 2009
-+++ lib/MailScanner/Message.pm Wed May 13 19:22:44 2009
-@@ -719,12 +719,19 @@ sub IsSpam {
+--- lib/MailScanner/Message.pm.orig Thu Sep 24 17:49:57 2009
++++ lib/MailScanner/Message.pm Wed Oct 7 15:10:16 2009
+@@ -721,12 +721,19 @@ sub IsSpam {
# rblspamheader is useful start to spamreport if RBLsaysspam.
# Do the Custom Spam Checker
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/mailscanner/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 23 May 2009 21:30:05 -0000 1.7
+++ pkg/PLIST 7 Oct 2009 18:51:37 -0000
@@ -11,6 +11,7 @@ bin/mailscanner_create_locks
bin/processing_messages_alert
bin/update_bad_phishing_sites
bin/update_phishing_sites
+bin/upgrade_MailScanner_conf
lib/MailScanner/
@sample /var/spool/MailScanner/
@sample /var/spool/MailScanner/quarantine/
@@ -37,6 +38,7 @@ lib/MailScanner/MailScanner/Exim.pm
lib/MailScanner/MailScanner/EximDiskStore.pm
lib/MailScanner/MailScanner/FileInto.pm
lib/MailScanner/MailScanner/GenericSpam.pm
+lib/MailScanner/MailScanner/LinksDump.pm
lib/MailScanner/MailScanner/Lock.pm
lib/MailScanner/MailScanner/Log.pm
lib/MailScanner/MailScanner/MCP.pm
@@ -1064,3 +1066,4 @@ share/examples/MailScanner/spam.lists.co
@sample ${SYSCONFDIR}/MailScanner/spam.lists.conf
share/examples/MailScanner/virus.scanners.conf
@sample ${SYSCONFDIR}/MailScanner/virus.scanners.conf
+...@sample ${SYSCONFDIR}/MailScanner/conf.d/
