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

Update to mailscanner-4.82.3.1.

Browse Source 
from Brad.
This commit is contained in:
ajacoutot 2010-12-29 06:42:16 +00:00
parent c5744a55e5
commit ba1d321f62
4 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mail/mailscanner/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.35 2010/11/22 09:28:34 espie Exp $
# $OpenBSD: Makefile,v 1.36 2010/12/29 06:42:16 ajacoutot Exp $
COMMENT= virus/spam scanning framework
V= 4.81
Vs= 4
V= 4.82
Vs= 3
Vss= ${Vs}-1
REVISION= 2
CATEGORIES= mail
MASTER_SITES= http://mailscanner.info/files/4/tar/
DISTNAME= mailscanner-${V}.${Vss}

10
mail/mailscanner/distinfo
View File

@ -1,5 +1,5 @@
MD5 (MailScanner-install-4.81.4-1.tar.gz) = LVGmz4Epnhx5w5carxaU6A==
RMD160 (MailScanner-install-4.81.4-1.tar.gz) = 1hcR3Cg4o2x+E3zenKcqrWxp/Go=
SHA1 (MailScanner-install-4.81.4-1.tar.gz) = lkJM4cL/kREoG+XdXrixtYPKz1A=
SHA256 (MailScanner-install-4.81.4-1.tar.gz) = fTrlxxRIPkgMOHzy/yekHJ9NivSk4Lk7fzSYeZAQwkg=
SIZE (MailScanner-install-4.81.4-1.tar.gz) = 9500894
MD5 (MailScanner-install-4.82.3-1.tar.gz) = Erslmbhv/JgnXa2JgrQMSA==
RMD160 (MailScanner-install-4.82.3-1.tar.gz) = OMtNeHblelCUMVmqhOek5rKNBhY=
SHA1 (MailScanner-install-4.82.3-1.tar.gz) = gy0tdcDLWB8gTGZ0ajYbZrwL5vM=
SHA256 (MailScanner-install-4.82.3-1.tar.gz) = iU3ImtWdSOrY90I1I0PWYL4J0ISptsBaN2Fn9LikmKY=
SIZE (MailScanner-install-4.82.3-1.tar.gz) = 9463760

19
mail/mailscanner/patches/patch-bin_cron_clean_SA_cache_cron
View File

@ -1,14 +1,19 @@
$OpenBSD: patch-bin_cron_clean_SA_cache_cron,v 1.1 2009/10/07 20:59:29 sthen Exp $
--- bin/cron/clean.SA.cache.cron.orig Fri Aug 28 18:24:48 2009
+++ bin/cron/clean.SA.cache.cron Fri Aug 28 18:25:40 2009
@@ -7,8 +7,8 @@ unless (eval { require "DBD/SQLite.pm" }) {
$OpenBSD: patch-bin_cron_clean_SA_cache_cron,v 1.2 2010/12/29 06:42:16 ajacoutot Exp $
--- bin/cron/clean.SA.cache.cron.orig Sat Nov 13 10:16:14 2010
+++ bin/cron/clean.SA.cache.cron Sun Dec 26 14:16:01 2010
@@ -7,11 +7,11 @@ unless (eval { require "DBD/SQLite.pm" }) {
exit 0;
}
-#$cachefile = `perl -n -e 'print "$_" if chomp && s/^\s*SpamAssassin\s*Cache\s*Database\s*File\s*=\s*(\S+)/$1/i' /etc/MailScanner/MailScanner.conf`;
-$cachefile = `/opt/MailScanner/bin/Quick.Peek spamassassincachedatabasefile /etc/MailScanner/MailScanner.conf`;
-#$cachefile = `/opt/MailScanner/bin/Quick.Peek spamassassincachedatabasefile /etc/MailScanner/MailScanner.conf`;
+#$cachefile = `perl -n -e 'print "$_" if chomp && s/^\s*SpamAssassin\s*Cache\s*Database\s*File\s*=\s*(\S+)/$1/i' %SYSCONFDIR%/MailScanner/MailScanner.conf`;
+$cachefile = `%PREFIX%/bin/Quick.Peek spamassassincachedatabasefile %SYSCONFDIR%/MailScanner/MailScanner.conf`;
+#$cachefile = `%PREFIX%/bin/Quick.Peek spamassassincachedatabasefile %SYSCONFDIR%/MailScanner/MailScanner.conf`;
# Allow alternative locations for MailScanner (noel.butler@ausics.net)
-$cachefile = `/opt/MailScanner/bin/Quick.Peek spamassassincachedatabasefile /etc/MailScanner/MailScanner.conf` if (-e "/etc/MailScanner/MailScanner.conf");
-$cachefile = `/opt/MailScanner/bin/Quick.Peek spamassassincachedatabasefile /opt/MailScanner/etc/MailScanner.conf` if (-e "/opt/MailScanner/etc/MailScanner.conf");
+$cachefile = `%PREFIX%/bin/Quick.Peek spamassassincachedatabasefile %SYSCONFDIR%/MailScanner/MailScanner.conf` if (-e "%SYSCONFDIR%/MailScanner/MailScanner.conf");
+$cachefile = `%PREFIX%/bin/Quick.Peek spamassassincachedatabasefile %SYSCONFDIR%/MailScanner/MailScanner.conf` if (-e "%SYSCONFDIR%/MailScanner/MailScanner.conf");
chomp $cachefile;
$cachefile = '/var/spool/MailScanner/incoming/SpamAssassin.cache.db' unless $cachefile;

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

@ -1,6 +1,6 @@
$OpenBSD: patch-etc_MailScanner_conf,v 1.13 2010/08/19 08:34:19 sthen Exp $
--- etc/MailScanner.conf.orig Sun Aug 15 09:08:48 2010
+++ etc/MailScanner.conf Mon Aug 16 14:42:27 2010
$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
@@ -43,7 +43,7 @@
# normal shell wildcard characters such as "*".
# For each setting, the last value read will be used by MailScanner.
@ -150,7 +150,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.13 2010/08/19 08:34:19 sthen Exp $
# ClamAVModule only: set limits when scanning for viruses.
#
@@ -1515,7 +1517,7 @@ Sign Messages Already Processed = no
@@ -1551,7 +1553,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.
@ -159,7 +159,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.13 2010/08/19 08:34:19 sthen Exp $
# If you are using HTML signatures, you can embed an image in the signature.
# For the filename(s) of the image, see the settings "Signature Image
@@ -1643,7 +1645,7 @@ Deliver Cleaned Messages = yes
@@ -1679,7 +1681,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.
@ -168,7 +168,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.13 2010/08/19 08:34:19 sthen Exp $
# *If* "Notify Senders" is set to yes, do you want to notify people
# who sent you messages containing viruses?
@@ -1705,7 +1707,7 @@ Scanned Subject Text = {Scanned}
@@ -1741,7 +1743,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.
@ -177,7 +177,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.13 2010/08/19 08:34:19 sthen Exp $
# This is the text to add to the start of the subject if the
# "Virus Modify Subject" option is set.
@@ -1721,7 +1723,7 @@ Virus Subject Text = {Virus?}
@@ -1757,7 +1759,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.
@ -186,7 +186,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.13 2010/08/19 08:34:19 sthen Exp $
# This is the text to add to the start of the subject if the
# "Filename Modify Subject" option is set.
@@ -1739,7 +1741,7 @@ Filename Subject Text = {Filename?}
@@ -1775,7 +1777,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.
@ -195,7 +195,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.13 2010/08/19 08:34:19 sthen Exp $
# This is the text to add to the start of the subject if the
# "Content Modify Subject" option is set.
@@ -1758,7 +1760,7 @@ Content Subject Text = {Dangerous Content?}
@@ -1794,7 +1796,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.
@ -204,7 +204,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.13 2010/08/19 08:34:19 sthen Exp $
# This is the text to add to the start of the subject if the
# "Size Modify Subject" option is set.
@@ -1777,7 +1779,7 @@ Size Subject Text = {Size}
@@ -1813,7 +1815,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.
@ -213,7 +213,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.13 2010/08/19 08:34:19 sthen Exp $
# This is the text to add to the start of the subject if the
# "Disarmed Modify Subject" option is set.
@@ -1807,7 +1809,7 @@ Phishing Subject Text = {Fraud?}
@@ -1843,7 +1845,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.
@ -222,7 +222,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.13 2010/08/19 08:34:19 sthen Exp $
# This is the text to add to the start of the subject if the
# "Spam Modify Subject" option is set.
@@ -1827,7 +1829,7 @@ Spam Subject Text = {Spam?}
@@ -1863,7 +1865,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.
@ -231,7 +231,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.13 2010/08/19 08:34:19 sthen Exp $
# This is just like the "Spam Subject Text" option above, except that
# it applies when the score from SpamAssassin is higher than the
@@ -1920,7 +1922,7 @@ Missing Mail Archive Is = directory
@@ -1956,7 +1958,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.
@ -240,7 +240,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.13 2010/08/19 08:34:19 sthen Exp $
# Include the full headers of each message in the notices sent to the local
# system administrators?
@@ -1975,7 +1977,7 @@ Virus Scanner Definitions = %etc-dir%/virus.scanners.c
@@ -2011,7 +2013,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.
@ -249,7 +249,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.13 2010/08/19 08:34:19 sthen Exp $
# This is the list of spam blacklists (RBLs) which you are using.
# See the "Spam List Definitions" file for more information about what
@@ -2157,7 +2159,7 @@ Watermark Header = X-%org-name%-MailScanner-Watermark:
@@ -2193,7 +2195,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.
@ -258,7 +258,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.13 2010/08/19 08:34:19 sthen Exp $
# SpamAssassin is not very fast when scanning huge messages, so messages
# bigger than this value will be truncated to this length for SpamAssassin
@@ -2254,7 +2256,7 @@ Include Binary Attachments In SpamAssassin = no
@@ -2290,7 +2292,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.
@ -267,7 +267,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.13 2010/08/19 08:34:19 sthen Exp $
# Many naive spammers send out the same message to lots of people.
# These messages are very likely to have roughly the same SpamAssassin score.
@@ -2711,14 +2713,14 @@ SpamAssassin Install Prefix =
@@ -2747,14 +2749,14 @@ SpamAssassin Install Prefix =
SpamAssassin Site Rules Dir = /etc/mail/spamassassin
# The site-local rules are searched for here, and in prefix/etc/spamassassin,
@ -284,7 +284,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.13 2010/08/19 08:34:19 sthen Exp $
SpamAssassin Local Rules Dir =
# The rules created by the "sa-update" tool are searched for here.
@@ -2732,10 +2734,10 @@ SpamAssassin Local Rules Dir =
@@ -2768,10 +2770,10 @@ SpamAssassin Local Rules Dir =
SpamAssassin Local State Dir = # /var/lib/spamassassin
# The default rules are searched for here, and in prefix/share/spamassassin,
@ -297,7 +297,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.13 2010/08/19 08:34:19 sthen Exp $
SpamAssassin Default Rules Dir =
#
@@ -2853,9 +2855,9 @@ MCP Actions = deliver
@@ -2889,9 +2891,9 @@ MCP Actions = deliver
High Scoring MCP Actions = deliver
Bounce MCP As Attachment = no
@ -309,7 +309,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.13 2010/08/19 08:34:19 sthen Exp $
High Scoring MCP Subject Text = {MCP?}
Is Definitely MCP = no
@@ -3024,7 +3026,7 @@ Lockfile Dir = /var/spool/MailScanner/incoming/Locks
@@ -3060,7 +3062,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.
@ -318,7 +318,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.13 2010/08/19 08:34:19 sthen Exp $
# How to lock spool files.
# Don't set this unless you *know* you need to.
@@ -3083,5 +3085,5 @@ Minimum Code Status = supported
@@ -3119,5 +3121,5 @@ Minimum Code Status = supported
# They will be read and processed in alphabetical order.
#
#