spamassassin: 3.1.3 -> 3.2.4

1 files changed, 43 insertions, 6 deletions

diff --git a/spamassassin/.footprint b/spamassassin/.footprint
index 96dd20207..15345a109 100644
--- a/spamassassin/.footprint
+++ b/spamassassin/.footprint
@@ -6,8 +6,10 @@ drwxr-xr-x	root/root	etc/spamassassin/
 -rw-r--r--	root/root	etc/spamassassin/local.cf
 -rw-r--r--	root/root	etc/spamassassin/v310.pre
 -rw-r--r--	root/root	etc/spamassassin/v312.pre
+-rw-r--r--	root/root	etc/spamassassin/v320.pre
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/sa-compile
 -rwxr-xr-x	root/root	usr/bin/sa-learn
 -rwxr-xr-x	root/root	usr/bin/sa-update
 -rwxr-xr-x	root/root	usr/bin/spamassassin
@@ -23,7 +25,9 @@ drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin.pm
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/AICache.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/ArchiveIterator.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/AsyncLoop.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/AutoWhitelist.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Bayes.pm
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Bayes/
@@ -46,7 +50,6 @@ drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Conf/
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/DBBasedAddrList.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Dns.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/DnsResolver.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/EvalTests.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/HTML.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Locales.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Locker.pm
@@ -72,24 +75,43 @@ drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Message/Met
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/PersistentAddrList.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin.pm
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/ASN.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/AWL.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/AccessDB.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/AntiVirus.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/Bayes.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/BodyEval.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/Check.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/DCC.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/DKIM.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/DNSEval.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/DomainKeys.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/HTMLEval.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/HTTPSMismatch.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/Hashcash.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/HeaderEval.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/ImageInfo.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/MIMEEval.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/MIMEHeader.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/Pyzor.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/Razor2.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/RelayCountry.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/RelayEval.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/ReplaceTags.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/Rule2XSBody.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/SPF.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/Shortcircuit.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/SpamCop.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/Test.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/TextCat.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/URIDNSBL.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/URIDetail.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/URIEval.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/VBounce.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/WLBLEval.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Plugin/WhiteListSubject.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/PluginHandler.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Reporter.pm
@@ -102,9 +124,11 @@ drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Util/
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Util/DependencyInfo.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Util/Progress.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/Mail/SpamAssassin/Util/TieOneStringHash.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.8.8/spamassassin-run.pod
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
+-rw-r--r--	root/root	usr/man/man1/sa-compile.1pm.gz
 -rw-r--r--	root/root	usr/man/man1/sa-learn.1pm.gz
 -rw-r--r--	root/root	usr/man/man1/sa-update.1pm.gz
 -rw-r--r--	root/root	usr/man/man1/spamassassin-run.1pm.gz
@@ -113,7 +137,9 @@ drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/spamd.1pm.gz
 drwxr-xr-x	root/root	usr/man/man3/
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin.3pm.gz
+-rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::AICache.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::ArchiveIterator.3pm.gz
+-rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::AsyncLoop.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::AutoWhitelist.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Bayes.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::BayesStore.3pm.gz
@@ -137,24 +163,32 @@ drwxr-xr-x	root/root	usr/man/man3/
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::PerMsgStatus.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::PersistentAddrList.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin.3pm.gz
+-rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::ASN.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::AWL.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::AccessDB.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::AntiVirus.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::AutoLearnThreshold.3pm.gz
+-rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::BodyRuleBaseExtractor.3pm.gz
+-rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::Check.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::DCC.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::DKIM.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::DomainKeys.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::Hashcash.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::MIMEHeader.3pm.gz
+-rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::OneLineBodyRuleType.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::Pyzor.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::Razor2.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::RelayCountry.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::ReplaceTags.3pm.gz
+-rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::Rule2XSBody.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::SPF.3pm.gz
+-rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::Shortcircuit.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::SpamCop.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::Test.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::TextCat.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::URIDNSBL.3pm.gz
+-rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::URIDetail.3pm.gz
+-rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::VBounce.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::Plugin::WhiteListSubject.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::PluginHandler.3pm.gz
 -rw-r--r--	root/root	usr/man/man3/Mail::SpamAssassin::SQLBasedAddrList.3pm.gz
@@ -165,27 +199,28 @@ drwxr-xr-x	root/root	usr/man/man3/
 -rw-r--r--	root/root	usr/man/man3/spamassassin-run.3pm.gz
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/spamassassin/
--rw-r--r--	root/root	usr/share/spamassassin/10_misc.cf
+-rw-r--r--	root/root	usr/share/spamassassin/10_default_prefs.cf
 -rw-r--r--	root/root	usr/share/spamassassin/20_advance_fee.cf
--rw-r--r--	root/root	usr/share/spamassassin/20_anti_ratware.cf
 -rw-r--r--	root/root	usr/share/spamassassin/20_body_tests.cf
 -rw-r--r--	root/root	usr/share/spamassassin/20_compensate.cf
 -rw-r--r--	root/root	usr/share/spamassassin/20_dnsbl_tests.cf
 -rw-r--r--	root/root	usr/share/spamassassin/20_drugs.cf
+-rw-r--r--	root/root	usr/share/spamassassin/20_dynrdns.cf
 -rw-r--r--	root/root	usr/share/spamassassin/20_fake_helo_tests.cf
 -rw-r--r--	root/root	usr/share/spamassassin/20_head_tests.cf
 -rw-r--r--	root/root	usr/share/spamassassin/20_html_tests.cf
+-rw-r--r--	root/root	usr/share/spamassassin/20_imageinfo.cf
 -rw-r--r--	root/root	usr/share/spamassassin/20_meta_tests.cf
 -rw-r--r--	root/root	usr/share/spamassassin/20_net_tests.cf
 -rw-r--r--	root/root	usr/share/spamassassin/20_phrases.cf
 -rw-r--r--	root/root	usr/share/spamassassin/20_porn.cf
 -rw-r--r--	root/root	usr/share/spamassassin/20_ratware.cf
 -rw-r--r--	root/root	usr/share/spamassassin/20_uri_tests.cf
+-rw-r--r--	root/root	usr/share/spamassassin/20_vbounce.cf
 -rw-r--r--	root/root	usr/share/spamassassin/23_bayes.cf
 -rw-r--r--	root/root	usr/share/spamassassin/25_accessdb.cf
 -rw-r--r--	root/root	usr/share/spamassassin/25_antivirus.cf
--rw-r--r--	root/root	usr/share/spamassassin/25_body_tests_es.cf
--rw-r--r--	root/root	usr/share/spamassassin/25_body_tests_pl.cf
+-rw-r--r--	root/root	usr/share/spamassassin/25_asn.cf
 -rw-r--r--	root/root	usr/share/spamassassin/25_dcc.cf
 -rw-r--r--	root/root	usr/share/spamassassin/25_dkim.cf
 -rw-r--r--	root/root	usr/share/spamassassin/25_domainkeys.cf
@@ -204,11 +239,13 @@ drwxr-xr-x	root/root	usr/share/spamassassin/
 -rw-r--r--	root/root	usr/share/spamassassin/30_text_pt_br.cf
 -rw-r--r--	root/root	usr/share/spamassassin/50_scores.cf
 -rw-r--r--	root/root	usr/share/spamassassin/60_awl.cf
+-rw-r--r--	root/root	usr/share/spamassassin/60_shortcircuit.cf
 -rw-r--r--	root/root	usr/share/spamassassin/60_whitelist.cf
+-rw-r--r--	root/root	usr/share/spamassassin/60_whitelist_dk.cf
 -rw-r--r--	root/root	usr/share/spamassassin/60_whitelist_dkim.cf
 -rw-r--r--	root/root	usr/share/spamassassin/60_whitelist_spf.cf
 -rw-r--r--	root/root	usr/share/spamassassin/60_whitelist_subject.cf
+-rw-r--r--	root/root	usr/share/spamassassin/72_active.cf
 -rw-r--r--	root/root	usr/share/spamassassin/languages
 -rw-r--r--	root/root	usr/share/spamassassin/sa-update-pubkey.txt
--rw-r--r--	root/root	usr/share/spamassassin/triplets.txt
 -rw-r--r--	root/root	usr/share/spamassassin/user_prefs.template