diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile index 3025e8aa0d5..d2d027aadc5 100644 --- a/mail/mailscanner/Makefile +++ b/mail/mailscanner/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.14 2009/05/23 21:30:05 sthen Exp $ +# $OpenBSD: Makefile,v 1.15 2009/06/11 23:33:26 sthen Exp $ COMMENT= virus/spam scanning framework -V= 4.76 -Vs= 25 +V= 4.77 +Vs= 10 Vss= ${Vs}-1 CATEGORIES= mail MASTER_SITES= http://mailscanner.info/files/4/tar/ @@ -14,7 +14,7 @@ WRKDIST= ${WRKDIR}/MailScanner-${V}.${Vss} HOMEPAGE= http://www.mailscanner.info/ -MAINTAINER= Todd T. Fries +MAINTAINER= Brad Smith RUN_DEPENDS+= ::databases/p5-DBI \ ::archivers/p5-Archive-Zip \ diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo index d9544b5d47c..951577bdde6 100644 --- a/mail/mailscanner/distinfo +++ b/mail/mailscanner/distinfo @@ -1,5 +1,5 @@ -MD5 (MailScanner-install-4.76.25-1.tar.gz) = feMWWZau6UEDKXzS5LeHrg== -RMD160 (MailScanner-install-4.76.25-1.tar.gz) = 9o40jjguN/t+p85biXTshIC1wi8= -SHA1 (MailScanner-install-4.76.25-1.tar.gz) = bw0PrZsuIM6wnMhLksjOkcmmIco= -SHA256 (MailScanner-install-4.76.25-1.tar.gz) = PZXMtkhdPHV2QeGuiH846xOcW3+jK3BHsFFkinMs5VE= -SIZE (MailScanner-install-4.76.25-1.tar.gz) = 9033249 +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 diff --git a/mail/mailscanner/patches/patch-etc_MailScanner_conf b/mail/mailscanner/patches/patch-etc_MailScanner_conf index fba04473416..3a729810466 100644 --- a/mail/mailscanner/patches/patch-etc_MailScanner_conf +++ b/mail/mailscanner/patches/patch-etc_MailScanner_conf @@ -1,7 +1,7 @@ -$OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ ---- etc/MailScanner.conf.orig Tue May 12 06:23:39 2009 -+++ etc/MailScanner.conf Wed May 13 19:22:44 2009 -@@ -72,17 +72,17 @@ +$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 @@ %web-site% = www.your-organisation.com # Configuration directory containing this file @@ -23,7 +23,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ # One other that is set automatically for you is %version% which is, # unsurprisingly, the string of the MailScanner version. It does not -@@ -135,7 +135,7 @@ Queue Scan Interval = 6 +@@ -140,7 +140,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 +32,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ # # 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 -@@ -167,7 +167,7 @@ Incoming Work Dir = /var/spool/MailScanner/incoming +@@ -172,7 +172,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 +41,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ # 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 -@@ -182,7 +182,7 @@ MTA = sendmail +@@ -187,7 +187,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 +50,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ # Sendmail2 is provided for Exim users. # It is the command used to attempt delivery of outgoing cleaned/disinfected -@@ -190,9 +190,11 @@ Sendmail = /usr/lib/sendmail +@@ -195,9 +195,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 +64,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ # # Incoming Work Dir Settings -@@ -390,7 +392,7 @@ Deliver Unparsable TNEF = no +@@ -396,7 +398,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 +73,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ # The maximum length of time the TNEF Expander is allowed to run for 1 message. # (in seconds) -@@ -410,7 +412,7 @@ File Timeout = 20 +@@ -416,7 +418,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 +82,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ # The maximum length of time the "gunzip" command is allowed to run to expand # 1 attachment file (in seconds). -@@ -426,7 +428,7 @@ Gunzip Timeout = 50 +@@ -432,7 +434,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 +91,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ # The maximum length of time the "unrar" command is allowed to run for 1 # RAR archive (in seconds) -@@ -530,7 +532,7 @@ Add Text Of Doc = no +@@ -536,7 +538,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 +100,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ # The maximum length of time the "antiword" command is allowed to run for 1 # Word document (in seconds) -@@ -643,7 +645,7 @@ Virus Scanning = yes +@@ -649,7 +651,7 @@ Virus Scanning = yes # want none, then specify "none". # # This *cannot* be the filename of a ruleset. @@ -109,7 +109,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ # The maximum length of time the commercial virus scanner is allowed to run # for 1 batch of messages (in seconds). -@@ -771,19 +773,19 @@ Allowed Sophos Error Messages = +@@ -777,19 +779,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 +132,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ # # Options specific to ClamAV Anti-Virus -@@ -794,7 +796,7 @@ Monitors For Sophos Updates = /opt/sophos-av/lib/sav/* +@@ -800,7 +802,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 +141,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ # ClamAVModule only: set limits when scanning for viruses. # -@@ -1472,7 +1474,7 @@ Sign Messages Already Processed = no +@@ -1478,7 +1480,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 +150,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 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 -@@ -1600,7 +1602,7 @@ Deliver Cleaned Messages = yes +@@ -1606,7 +1608,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 +159,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ # *If* "Notify Senders" is set to yes, do you want to notify people # who sent you messages containing viruses? -@@ -1662,7 +1664,7 @@ Scanned Subject Text = {Scanned} +@@ -1668,7 +1670,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 +168,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ # This is the text to add to the start of the subject if the # "Virus Modify Subject" option is set. -@@ -1678,7 +1680,7 @@ Virus Subject Text = {Virus?} +@@ -1684,7 +1686,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 +177,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ # This is the text to add to the start of the subject if the # "Filename Modify Subject" option is set. -@@ -1696,7 +1698,7 @@ Filename Subject Text = {Filename?} +@@ -1702,7 +1704,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 +186,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ # This is the text to add to the start of the subject if the # "Content Modify Subject" option is set. -@@ -1715,7 +1717,7 @@ Content Subject Text = {Dangerous Content?} +@@ -1721,7 +1723,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 +195,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ # This is the text to add to the start of the subject if the # "Size Modify Subject" option is set. -@@ -1734,7 +1736,7 @@ Size Subject Text = {Size} +@@ -1740,7 +1742,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 +204,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ # This is the text to add to the start of the subject if the # "Disarmed Modify Subject" option is set. -@@ -1764,7 +1766,7 @@ Phishing Subject Text = {Fraud?} +@@ -1770,7 +1772,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 +213,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ # This is the text to add to the start of the subject if the # "Spam Modify Subject" option is set. -@@ -1784,7 +1786,7 @@ Spam Subject Text = {Spam?} +@@ -1790,7 +1792,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 +222,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 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 -@@ -1874,7 +1876,7 @@ Missing Mail Archive Is = directory +@@ -1880,7 +1882,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 +231,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ # Include the full headers of each message in the notices sent to the local # system administrators? -@@ -1929,7 +1931,7 @@ Virus Scanner Definitions = %etc-dir%/virus.scanners.c +@@ -1935,7 +1937,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 +240,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 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 -@@ -2111,7 +2113,7 @@ Watermark Header = X-%org-name%-MailScanner-Watermark: +@@ -2117,7 +2119,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 +249,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 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 -@@ -2208,7 +2210,7 @@ Include Binary Attachments In SpamAssassin = no +@@ -2214,7 +2216,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 +258,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 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. -@@ -2660,14 +2662,14 @@ SpamAssassin Install Prefix = +@@ -2668,14 +2670,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 +275,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ SpamAssassin Local Rules Dir = # The rules created by the "sa-update" tool are searched for here. -@@ -2681,10 +2683,10 @@ SpamAssassin Local Rules Dir = +@@ -2689,10 +2691,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 +288,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ SpamAssassin Default Rules Dir = # -@@ -2717,9 +2719,9 @@ MCP Actions = deliver +@@ -2725,9 +2727,9 @@ MCP Actions = deliver High Scoring MCP Actions = deliver Bounce MCP As Attachment = no @@ -300,7 +300,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.8 2009/05/23 21:30:05 sthen Exp $ High Scoring MCP Subject Text = {MCP?} Is Definitely MCP = no -@@ -2888,7 +2890,7 @@ Lockfile Dir = /var/spool/MailScanner/incoming/Locks +@@ -2896,7 +2898,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. diff --git a/mail/mailscanner/patches/patch-etc_rules_EXAMPLES b/mail/mailscanner/patches/patch-etc_rules_EXAMPLES index e6778e46720..7ef2dbf0314 100644 --- a/mail/mailscanner/patches/patch-etc_rules_EXAMPLES +++ b/mail/mailscanner/patches/patch-etc_rules_EXAMPLES @@ -1,6 +1,6 @@ -$OpenBSD: patch-etc_rules_EXAMPLES,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $ ---- etc/rules/EXAMPLES.orig Wed May 30 12:30:36 2007 -+++ etc/rules/EXAMPLES Sun Aug 5 04:03:26 2007 +$OpenBSD: patch-etc_rules_EXAMPLES,v 1.2 2009/06/11 23:33:26 sthen Exp $ +--- etc/rules/EXAMPLES.orig Mon Jun 1 11:11:58 2009 ++++ etc/rules/EXAMPLES Wed Jun 3 21:44:46 2009 @@ -5,7 +5,7 @@ Here are a few ideas of how to implement features usin 1. Spam WhiteList @@ -10,7 +10,7 @@ $OpenBSD: patch-etc_rules_EXAMPLES,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $ Set addresses to be whitelisted using rules such as From: user@good.domain.com yes From: *@friendly.domain.com yes -@@ -18,7 +18,7 @@ Here are a few ideas of how to implement features usin +@@ -22,7 +22,7 @@ Here are a few ideas of how to implement features usin 2. Spam BlackList @@ -19,7 +19,7 @@ $OpenBSD: patch-etc_rules_EXAMPLES,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $ Set addresses to be blacklisted using rules such as From: user@nasty.domain.com yes From: *@spammers.com yes -@@ -28,7 +28,7 @@ Here are a few ideas of how to implement features usin +@@ -32,7 +32,7 @@ Here are a few ideas of how to implement features usin 3. Only sign outgoing messages @@ -27,8 +27,8 @@ $OpenBSD: patch-etc_rules_EXAMPLES,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $ + Set "Sign Clean Messages = %SYSCONFDIR%/MailScanner/rules/signing.rules". If your messages come from "yourdomain.com", then try this: From: 192.168. yes - FromOrTo: default no -@@ -36,16 +36,16 @@ Here are a few ideas of how to implement features usin + From: host:yourdomain.com yes +@@ -41,16 +41,16 @@ Here are a few ideas of how to implement features usin 4. Use different signatures for different domains