v341 updates, decruft

 * purge ancient rules
 * enable razor2 as it has been free for ten years now...
 * make bayes path less wonky (.spamassassin/ gunk is due to
   Mysterious Ancient Reasons(tm))
 * Ditch AWL for TxRep

diff --git a/init.pre b/init.pre
index 9584484..a330bad 100644 (file)
--- a/init.pre
+++ b/init.pre
@@ -7,12 +7,17 @@
 # in SpamAssassin 3.0.x releases.  It will not be installed if you
 # already have a file in place called "init.pre".
 #
+# There are now multiple files read to enable plugins in the 
+# /etc/mail/spamassassin directory; previously only one, "init.pre" was 
+# read.  Now both "init.pre", "v310.pre", and any other files ending in
+# ".pre" will be read.  As future releases are made, new plugins will be
+# added to new files, named according to the release they're added in.
 ###########################################################################
 
 # RelayCountry - add metadata for Bayes learning, marking the countries
 # a message was relayed through
 #
-# Note: This requires the IP::Country::Fast Perl module
+# Note: This requires the Geo::IP Perl module
 #
 # loadplugin Mail::SpamAssassin::Plugin::RelayCountry
 

diff --git a/local.cf b/local.cf
index baf1567..120ab86 100644 (file)
--- a/local.cf
+++ b/local.cf
@@ -52,19 +52,48 @@ report_safe 0
 # bayes_ignore_header X-Spam-Status
 
 # Location of bayes data
-bayes_path /var/local/lib/spamd/.spamassassin/bayes
+bayes_path /var/local/lib/spamd/bayes
 
 # Fix bayes permissions
 bayes_file_mode 0770
 
-# hcoop: auto-whitelist lock
-auto_whitelist_path /var/local/lib/spamd/.spamassassin/auto-whitelist
+# enable txrep
+use_txrep 1
+txrep_autolearn 1
 
-# Directives from old installation on fyodor
+#   Whether to decode non- UTF-8 and non-ASCII textual parts and recode
+#   them to UTF-8 before the text is given over to rules processing.
+#
+# normalize_charset 1
+
+#   Some shortcircuiting, if the plugin is enabled
+# 
+ifplugin Mail::SpamAssassin::Plugin::Shortcircuit
+#
+#   default: strongly-whitelisted mails are *really* whitelisted now, if the
+#   shortcircuiting plugin is active, causing early exit to save CPU load.
+#   Uncomment to turn this on
+#
+# shortcircuit USER_IN_WHITELIST       on
+# shortcircuit USER_IN_DEF_WHITELIST   on
+# shortcircuit USER_IN_ALL_SPAM_TO     on
+# shortcircuit SUBJECT_IN_WHITELIST    on
+
+#   the opposite; blacklisted mails can also save CPU
+#
+# shortcircuit USER_IN_BLACKLIST       on
+# shortcircuit USER_IN_BLACKLIST_TO    on
+# shortcircuit SUBJECT_IN_BLACKLIST    on
+
+#   if you have taken the time to correctly specify your "trusted_networks",
+#   this is another good way to save CPU
+#
+# shortcircuit ALL_TRUSTED             on
+
+#   and a well-trained bayes DB can save running rules, too
+#
+# shortcircuit BAYES_99                spam
+# shortcircuit BAYES_00                ham
+
+endif # Mail::SpamAssassin::Plugin::Shortcircuit
 
-# clinton: disabling these for now because they may have helped with
-# an ancient spamd, but probably won't do anything nowadays
-#score PYZOR_CHECK 0
-#score URIBL_SBL 1.096
-#score DNS_FROM_RFC_POST 0.5
-#score FORGED_HOTMAIL_RCVD 0.5

diff --git a/sa-compile.pre b/sa-compile.pre
new file mode 100644 (file)
index 0000000..e20236a
--- /dev/null
+++ b/sa-compile.pre
@@ -0,0 +1,3 @@
+# Rule2XSBody - speedup by compilation of ruleset to native code
+#
+loadplugin Mail::SpamAssassin::Plugin::Rule2XSBody

diff --git a/v310.pre b/v310.pre
index b394d24..56e5b2f 100644 (file)
--- a/v310.pre
+++ b/v310.pre
@@ -9,6 +9,11 @@
 # so you can modify it to enable some disabled-by-default plugins below,
 # if you so wish.
 #
+# There are now multiple files read to enable plugins in the
+# /etc/mail/spamassassin directory; previously only one, "init.pre" was
+# read.  Now both "init.pre", "v310.pre", and any other files ending in
+# ".pre" will be read.  As future releases are made, new plugins will be
+# added to new files, named according to the release they're added in.
 ###########################################################################
 
 # DCC - perform DCC message checks.
@@ -24,7 +29,7 @@ loadplugin Mail::SpamAssassin::Plugin::Pyzor
 
 # Razor2 - perform Razor2 message checks.
 #
-#loadplugin Mail::SpamAssassin::Plugin::Razor2
+loadplugin Mail::SpamAssassin::Plugin::Razor2
 
 # SpamCop - perform SpamCop message reporting
 #
@@ -37,7 +42,7 @@ loadplugin Mail::SpamAssassin::Plugin::SpamCop
 
 # AWL - do auto-whitelist checks
 #
-loadplugin Mail::SpamAssassin::Plugin::AWL
+#loadplugin Mail::SpamAssassin::Plugin::AWL
 
 # AutoLearnThreshold - threshold-based discriminator for Bayes auto-learning
 #
@@ -60,9 +65,8 @@ loadplugin Mail::SpamAssassin::Plugin::WhiteListSubject
 
 # DomainKeys - perform DomainKeys verification
 #
-# External modules required for use, see INSTALL for more information.
-#
-#loadplugin Mail::SpamAssassin::Plugin::DomainKeys
+# This plugin has been removed as of v3.3.0.  Use the DKIM plugin instead,
+# which supports both Domain Keys and DKIM.
 
 # MIMEHeader - apply regexp rules against MIME headers in the message
 #

diff --git a/v312.pre b/v312.pre
index 02b70bd..cba5d7d 100644 (file)
--- a/v312.pre
+++ b/v312.pre
@@ -9,7 +9,11 @@
 # so you can modify it to enable some disabled-by-default plugins below,
 # if you so wish.
 #
-###########################################################################
+# There are now multiple files read to enable plugins in the
+# /etc/mail/spamassassin directory; previously only one, "init.pre" was
+# read.  Now both "init.pre", "v310.pre", and any other files ending in
+# ".pre" will be read.  As future releases are made, new plugins will be
+# added to new files, named according to the release they're added in.
 
 ###########################################################################
 # experimental plugins
@@ -17,6 +21,9 @@
 # DKIM - perform DKIM verification
 #
 # Mail::DKIM module required for use, see INSTALL for more information.
+# 
+# Note that if C<Mail::DKIM> version 0.20 or later is installed, this
+# renders the DomainKeys plugin redundant.
 #
-#loadplugin Mail::SpamAssassin::Plugin::DKIM
+loadplugin Mail::SpamAssassin::Plugin::DKIM
 

diff --git a/v320.pre b/v320.pre
index a5c1b3e..4a6f563 100644 (file)
--- a/v320.pre
+++ b/v320.pre
@@ -50,7 +50,7 @@ loadplugin Mail::SpamAssassin::Plugin::VBounce
 
 # Rule2XSBody - speedup by compilation of ruleset to native code
 #
-loadplugin Mail::SpamAssassin::Plugin::Rule2XSBody
+#loadplugin Mail::SpamAssassin::Plugin::Rule2XSBody
 
 # ASN - Look up the Autonomous System Number of the connecting IP
 # and create a header containing ASN data for bayes tokenization.

diff --git a/v340.pre b/v340.pre
new file mode 100644 (file)
index 0000000..cf7beb1
--- /dev/null
+++ b/v340.pre
@@ -0,0 +1,21 @@
+# This is the right place to customize your installation of SpamAssassin.
+#
+# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be
+# tweaked.
+#
+# This file was installed during the installation of SpamAssassin 3.4.0,
+# and contains plugin loading commands for the new plugins added in that
+# release.  It will not be overwritten during future SpamAssassin installs,
+# so you can modify it to enable some disabled-by-default plugins below,
+# if you so wish.
+#
+# There are now multiple files read to enable plugins in the
+# /etc/mail/spamassassin directory; previously only one, "init.pre" was
+# read.  Now both "init.pre", "v310.pre", and any other files ending in
+# ".pre" will be read.  As future releases are made, new plugins will be
+# added to new files, named according to the release they're added in.
+###########################################################################
+
+# AskDNS - forms a DNS query based on 'tags' as supplied by other plugins
+#
+loadplugin Mail::SpamAssassin::Plugin::AskDNS

diff --git a/v341.pre b/v341.pre
new file mode 100644 (file)
index 0000000..37723cb
--- /dev/null
+++ b/v341.pre
@@ -0,0 +1,28 @@
+# This is the right place to customize your installation of SpamAssassin.
+#
+# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be
+# tweaked.
+#
+# This file was installed during the installation of SpamAssassin 3.4.1,
+# and contains plugin loading commands for the new plugins added in that
+# release.  It will not be overwritten during future SpamAssassin installs,
+# so you can modify it to enable some disabled-by-default plugins below,
+# if you so wish.
+#
+# There are now multiple files read to enable plugins in the
+# /etc/mail/spamassassin directory; previously only one, "init.pre" was
+# read.  Now both "init.pre", "v310.pre", and any other files ending in
+# ".pre" will be read.  As future releases are made, new plugins will be
+# added to new files, named according to the release they're added in.
+###########################################################################
+
+# TxRep - Reputation database that replaces AWL
+loadplugin Mail::SpamAssassin::Plugin::TxRep
+
+# URILocalBL - Provides ISP and Country code based filtering as well as
+# quick IP based blocks without a full RBL implementation - Bug 7060
+
+# loadplugin Mail::SpamAssassin::Plugin::URILocalBL
+
+# PDFInfo - Use several methods to detect a PDF file's ham/spam traits
+# loadplugin Mail::SpamAssassin::Plugin::PDFInfo