* Make the office software match wider

 * add no investment subject rule
 * add ie subject rule
 * increase the score of invalid message id
 * bts specific changes

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-listmaster/trunk/spamassassin_config@24 0b7a5b0c-1f2c-0410-bd74-c376f8064c91

diff --git a/bugs/user_prefs b/bugs/user_prefs
index 879c98520fb72229d6463f8eb4c7f4c8b859d9b8..337d262c8b59a1ea4e46465a1ee14328ed0fe9c3 100644 (file)
--- a/bugs/user_prefs
+++ b/bugs/user_prefs
@@ -58,7 +58,6 @@ score BAYES_80 3
 score BAYES_95 4
 score BAYES_99 4.5
 
-include common/bts_specific
 # blarson 2005-01-28
 clear_trusted_networks
 # the /24 around spohr, master, and gluck
@@ -75,6 +74,8 @@ rbl_timeout 15
 loadplugin Mail::SpamAssassin::Plugin::URIDNSBL
 uridnsbl_timeout       5
 
+include common/blacklists
+
 include common/common_rbl
 
 include common/common_spam

diff --git a/common/bts_scores b/common/bts_scores
index 092035283eb9229c9fcc9214fda2f894f84aac3a..a97752a23edf5b9bc5e656a10f8b16b7776729aa 100644 (file)
--- a/common/bts_scores
+++ b/common/bts_scores
@@ -125,3 +125,6 @@ score INVALID_MSGID 3
 
 # blarson 2007-09-15
 score UNPARSEABLE_RELAY 1
+
+# blarson 2007-09-24
+score INVALID_MSGID 3

diff --git a/common/drug_spam b/common/drug_spam
index 24f974115156404408812b9eda05f5091727c6a6..9cb41aaf21b1ad18b880dde02f923c4eade24268 100644 (file)
--- a/common/drug_spam
+++ b/common/drug_spam
@@ -219,9 +219,9 @@ describe PILLS              pills spam
 score PILLS            3.5
 
 # blarson 2007-09-13
-body PFIZER            /\bPfizer\b/i
+body PFIZER            /\bP\W?f\W?i\W?z\W?e\W?r\b/i
 describe PFIZER                Pfizer
-score PFIZER           2
+score PFIZER           3
 
 # blarson 2007-09-19
 body WONDERCUM         /\bwondercum\b/i

diff --git a/common/phrase_spam b/common/phrase_spam
index 05f50a0fa753528aa22689db8d6581d99e6a8f70..a8a81a91c61a73dfe5f6339c819eca1758120716 100644 (file)
--- a/common/phrase_spam
+++ b/common/phrase_spam
@@ -348,7 +348,7 @@ describe ACRO8PR0   sales spam
 score ACRO8PR0         4       
 
 # blarson 2007-09-15
-body WBRS              /\b(WBRS|FPMC|ADYN|AFML|MISJ|HXPN|WHKA|CBFE|HSBC|PCAI|MPRG|HPRS|AUNI|TGVI|MHII|TAMG|GDKI|ACEN|CDYV|G7Q\.F|mbwc|CHFR|CDPN|DSDI|UTEV|P-S-U-D|GPSI|SGXI|CAON|SREA|ERMX|VPSN|SZSN|PAYI\.OB|LTDI|C\W\W?Y\W\W?T\W\W?V|E\WX\WM\WT|CYTV|VGPM|V\s?G\s?P\s?M(\.PK)?|wwng|WWNG|F\WD\WE\WG|FDEG|UTYW|M\s*I\s*H\s*I|O\W?N\W?C\W?O|P\W?P\W?Y\W?H)\b/
+body WBRS              /\b(WBRS|FPMC|ADYN|AFML|MISJ|HXPN|WHKA|CBFE|HSBC|PCAI|MPRG|HPRS|AUNI|TGVI|MHII|TAMG|GDKI|ACEN|CDYV|G7Q\.F|mbwc|CHFR|CDPN|DSDI|UTEV|P-S-U-D|GPSI|SGXI|CAON|SREA|ERMX|VPSN|SZSN|PAYI\.OB|LTDI|C\W\W?Y\W\W?T\W\W?V|E\WX\WM\WT|CYTV|VGPM|V\s?G\s?P\s?M(\.PK)?|wwng|WWNG|F\WD\WE\WG|FDEG|UTYW|M\s*I\s*H\s*I|O\W?N\W?C\W?O|P\W?P\W?Y\W?H|S\W?R\W?E\W?A|A\W?C\W?G\W?U|S\W?C\W?Y\W?F|C\W?H\W?V\W?C)\b/
 describe WBRS          stock spam
 score WBRS             4
 
@@ -422,7 +422,7 @@ describe DELAFT             more pdf spam
 score DELAFT           3
 
 # blarson 2007-09-13
-header OFF1CE          subject =~ /\b[O0]ff[1i]ce 2[O0][O0]7\b/i
+header OFF1CE          subject =~ /\b[O0]ff[1i]ce\s*\W?2[O0][O0]7\b/i
 describe OFF1CE                off1ce spam
 score OFF1CE           4
 
@@ -470,3 +470,13 @@ score SSIST                4
 body GRADUATEUNDER     /\bgraduate in under\b/i
 describe GRADUATEUNDER graduate in under
 score GRADUATEUNDER    3
+
+# blarson 2007-09-24
+header NOINVEST                subject =~ /\b(?:no investment|high.paid)\b/i
+describe NOINVEST      no investment
+score NOINVEST         4
+
+# blarson 2007-09-25
+header INTEXP          subject =~ /\b[I|]nternet Exp[l|]orer\b/i
+describe INTEXP                |nternet Exp|orer
+score INTEXP           2

diff --git a/common/url_spam b/common/url_spam
index 6a9b8149a95fe0cc5ce12dfac35f9eabc566131a..26efc7f94e6f47ac6e9e06f108fdb1386cf36d22 100644 (file)
--- a/common/url_spam
+++ b/common/url_spam
@@ -188,3 +188,7 @@ body WWWRU          /\b(?:www\.|https?\:.*)\w+\.ru\b/i
 describe WWWRU         russian web site
 score WWWRU            2
 
+# blarson 2007-09-24
+body VIPSMS            /\bvipsms\.org\b/i
+describe VIPSMS                vipsms.org
+score VIPSMS           4