sync up blars changes

[spamassassin_config.git] / common / misc_spam

diff --git a/common/misc_spam b/common/misc_spam
index 93f0ce349c37c1b8b0428ceb8e4f53817408bf37..d4d8e354f1b6ead31cbc2ce139d8bfd23271cd27 100644 (file)
--- a/common/misc_spam
+++ b/common/misc_spam
@@ -22,7 +22,7 @@ describe GUEBDE www.geub.de
 score GUEBDE    5
 
 # Don 2008-06-27
-rawbody         PGPSIGNATURE   /-----BEGIN PGP SIGNATURE-----/
+full    PGPSIGNATURE   /-----BEGIN PGP SIGNATURE-----/
 describe PGPSIGNATURE  Has a pgp signature (may not be valid, but who cares?)
 score   PGPSIGNATURE   -5
 
@@ -415,7 +415,7 @@ describe INFOCOUK   to info@co.uk
 score INFOCOUK         3
 
 # blarson 2009-05-27
-body EXITAT            /\bexit\@(?:datalistsource|listsourcesworld)\.com\b/
+body EXITAT            /\bexit\@(?:datalistsource|listsourcesworld|BestAccurateReliable)\.com\b/i
 describe EXITAT                exit@datalistsource.com
 score EXITAT           3
 
@@ -428,3 +428,13 @@ score TOINFO               1
 header CONSTCONTACT    X-Mailer =~ /Constant Contact/i
 describe CONSTCONTACT  Mail comming from constant contact, which doesn't require double opt-in
 score CONSTCONTACT     5
+
+# blarson 2009-08-16
+meta CTBDN             (CT_IMAGE && MIXEDBDN)
+describe CTBDN         CT_IMAGE && MIXEDBDN
+score CTBDN            0.5
+
+# don 2009-09-22
+body NUMEMAIL          /\d{3,}\s+emails?/i
+describe NUMEMAIL      Mail which mentions some number of e-mail addresses
+score NUMEMAIL         2