add blars rules, and match vista ultimate too

[spamassassin_config.git] / common / pron_spam

diff --git a/common/pron_spam b/common/pron_spam
index 68f8b7875f1e4411640990fb27fa01dd0aaa6127..2823c00e714cc37437fd451bebbfecf13feeaa09 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
 
@@ -219,15 +219,16 @@ body HAVESEX              /\bhave\s+sex\b/i
 describe HAVESEX       have sex
 score HAVESEX          3
 
+# don -- disabled for false positives
 # zobel 2007-10-14
-body XXXBODY           /xxx/i
-describe XXXBODY       Body containing xxx
-score XXXBODY          4
+# body XXXBODY         /xxx/i
+# describe XXXBODY     Body containing xxx
+# score XXXBODY                4
 
 #zobel
 body __CNSITES1                /\bdot\s+cn\b/i
 body __CNSITES2                /\b\s+cn\b/i
-body CNSITESPRON       __CNSITES1 || __CNSITES2
+meta CNSITESPRON       __CNSITES1 || __CNSITES2
 describe CNSITESPRON   dot cn pron
-body CNSITESPRON       4
+score CNSITESPRON      4