* Add bts patches from blars

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

diff --git a/bugs/user_prefs b/bugs/user_prefs
index 337d262c8b59a1ea4e46465a1ee14328ed0fe9c3..1a68fecd323ae330ec9016fba0c9043cef2378d4 100644 (file)
--- a/bugs/user_prefs
+++ b/bugs/user_prefs
@@ -48,11 +48,11 @@ bayes_ignore_header X-Spam-Status
 # a bit cautious (cf. #188703)
 # blarson -- ajust again, now that it's trained 2004-05-13
 # blarson 2004-10-22
-# blarson 2006-10-29 2006-11-17
-score BAYES_00 -3
+# blarson 2006-10-29 2006-11-17 2007-11-06
+score BAYES_00 -4
 score BAYES_20 -1
 score BAYES_40 -0.2
-score BAYES_50 0.5
+score BAYES_50 1
 score BAYES_60 2
 score BAYES_80 3
 score BAYES_95 4

diff --git a/common/misc_spam b/common/misc_spam
index 4ca4af566c6b810fe08eabf8d50a825653209f80..f8a465a5fe2fa37891a2078cdbfb2d9099cbe36a 100644 (file)
--- a/common/misc_spam
+++ b/common/misc_spam
@@ -276,3 +276,7 @@ body ICQ            /^icq\:/i
 describe ICQ           icq:
 score ICQ              2
 
+# blarson 2007-11-02
+header XJ2ID           X-J2Id =~ /\d+/
+describe XJ2ID         fax bounce
+score XJ2ID            4

diff --git a/common/money_spam b/common/money_spam
index 2f08e10ce2611900826383a4957b5ebc9104c8e6..34f52164200de8ebd96fb891ad8981fd0df30a00 100644 (file)
--- a/common/money_spam
+++ b/common/money_spam
@@ -222,8 +222,8 @@ body ANALLE         /\bAN ALLE FINANZINVESTOREN\b/
 describe ANALLE                stock spam in german
 score ANALLE           3
 
-# blarson 2007-06-17 2007-09-21 2007-10-20
-body REPWATCH2         /\breplic+a\s*(?:watch|timepiece)/i
+# blarson 2007-06-17 2007-09-21 2007-10-20 2007-11-06
+body REPWATCH2         /\brepl[i1]c+a\s*(?:w[a4]tch|timepiece)/i
 describe REPWATCH2     still pushing fake watches
 score REPWATCH2                3.5
 

diff --git a/common/phrase_spam b/common/phrase_spam
index c10f00d7e0fa7f444b665f69370a6ea6bad50bdb..813698ddc0fe991039ed591bb75bb8b141204953 100644 (file)
--- a/common/phrase_spam
+++ b/common/phrase_spam
@@ -79,13 +79,8 @@ body AFFILIATEID        /affiliate.?id/i
 describe AFFILIATEID    affiliate id
 score AFFILIATEID       3
 
-# joy, 2003-08-30, 2003-09-21
-header FW               Subject =~ /^Fw: /
-describe FW             Sounds like a Fw: spam
-score FW                3
-
 # blarson 2007-07-13
-header REFWD           subject =~ /\b(?:RE|FWD)\:\s*$/i
+header REFWD           subject =~ /\b(?:RE|FWD?)\:\s*$/i
 describe REFWD         re or fwd nothing
 score REFWD            3.5
 
@@ -617,3 +612,23 @@ score LEGBUD2              4
 body SMOKING           /\b(?:beat|stop|quit|without)\s+(?:nicotine|smoking|cigarettes)\b/i
 describe SMOKING       stop smoking
 score SMOKING          3
+
+# blarson 2007-11-04
+header WORKHOME                subject =~ /\bwork\b.*\bhome\b/i
+describe WORKHOME      work from home
+score WORKHOME         2
+
+# blarson 2007-11-04
+header HOMEWORK                subject =~ /\bhome\b.*\b(?:work|business|job|based)\b/i
+describe HOMEWORK      home business
+score HOMEWORK         3
+
+# blarson 2007-11-04
+header REPRESENT       subject =~ /\bRepresent(?:ative)?\b.*\b(?:Country|needed)\b/i
+describe REPRESENT     represent your country
+score REPRESENT                2
+
+# blarson 2007-11-06
+header NOFEE           subject =~ /\bNo\s+fee\b/i
+describe NOFEE         No fee
+score NOFEE            2

diff --git a/common/pron_spam b/common/pron_spam
index 7d1572800273a6b5725398679b76254e2f93365e..6a446985622ad306ac8103733173d9642255712d 100644 (file)
--- a/common/pron_spam
+++ b/common/pron_spam
@@ -205,7 +205,7 @@ describe JACKRABBIT2        vibrator spam
 score JACKRABBIT2      3
 
 # blarson 2007-05-09
-body NUDEPIC           /\b(nude|naked|undressed)\s+(pictures?|video|snapshot|pic)\b/i
+body NUDEPIC           /\b(nude|naked|undressed)\s+(pictures?|video|snapshot|pic|photos?)\b/i
 describe NUDEPIC       nude pictures
 score NUDEPIC          2
 

diff --git a/common/url_spam b/common/url_spam
index 5267bae3549dcb5b47f4eb0b2d0aeb29deb07e33..627273344b828f3f453ea7677e6664b4633173d2 100644 (file)
--- a/common/url_spam
+++ b/common/url_spam
@@ -116,7 +116,7 @@ describe BESTLOANS  Best loans url
 score BESTLOANS                2
 
 # blarson 2007-07-22 2007-09-12
-body PENPRO            /\@(?:penmailpro|OnsetIng|openprotection|NearOut|SuperOnset|medicalgloveonline|YourOnset|GreatGloveCell|thegloveworks)\.info\b/i
+body PENPRO            /\@(?:penmailpro|OnsetIng|openprotection|NearOut|SuperOnset|medicalgloveonline|YourOnset|GreatGloveCell|thegloveworks|asiafriendworld)\.info\b/i
 describe PENPRO                penmailpro spam
 score PENPRO           3.5
 
@@ -266,3 +266,23 @@ score GMAIL                1
 body MAILRU            /\@mail\.ru\b/i
 describe MAILRU                @mail.ru
 score MAILRU           3
+
+# blarson 2007-10-31
+body ADOBE4LESS                /\b(?:adobe4less|realnewsoft|newmicrosoftdeals|kvaka-soft)\s*[.,]\s*com\b/i
+describe ADOBE4LESS    adobe4less . com
+score ADOBE4LESS       4
+
+# blarson 2007-11-01
+body RMAPPLY           /http\:\/\/rmapply\.com\b/i
+describe RMAPPLY       http://rmapply.com
+score RMAPPLY          4
+
+# blarson 2007-11-04
+header HANOIFASH       subject =~ /WWW\.HANOI-FASHION\.COM/i
+describe HANOIFASH     WWW.HANOI-FASHION.COM
+score HANOIFASH                4
+
+# blarson 2007-11-06
+body ONLINEMED         /\b(?:onlinemedicalkey|pharm\w*)\.com\b/i
+describe ONLINEMED     onlinemedicalkey.com
+score ONLINEMED                4