X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fpron_spam;h=6a446985622ad306ac8103733173d9642255712d;hp=aa20e5141f8d271048671eaabe43f667fad52733;hb=8a22a55bc937824a7d826d15d1f284a9c7e11175;hpb=652703901508da38854d07b3b53b6d231eff175f

diff --git a/common/pron_spam b/common/pron_spam
index aa20e51..6a44698 100644
--- a/common/pron_spam
+++ b/common/pron_spam
@@ -187,10 +187,11 @@ body ADULTDVD		/adult\s+dvd/i
 describe ADULTDVD	adult dvd
 score ADULTDVD		3
 
-# blarson 2005-01-07	2005-01-30 trollwife submits bugs
-body WIFE			/(?<!troll)wi[fv]e/i
-describe WIFE		wife
-score WIFE		2
+# don 2007-10-13 false positives; commenting out for now
+# # blarson 2005-01-07	2005-01-30 trollwife submits bugs
+# body WIFE		/(?<!troll)wi[fv]e/i
+# describe WIFE		wife
+# score WIFE		2
 
 # blarson 2005-07-10
 header JACKRABBIT	subject =~ /Jack Rabbit Vibrator/i
@@ -204,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
 
@@ -212,3 +213,21 @@ score NUDEPIC		2
 body PRETTYGIRL		/\bpretty girl/i
 describe PRETTYGIRL	pretty girls trying to seduce bugs
 score PRETTYGIRL	2
+
+# blarson 2007-10-16
+body HAVESEX		/\bhave\s+sex\b/i
+describe HAVESEX	have sex
+score HAVESEX		3
+
+# zobel 2007-10-14
+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
+meta CNSITESPRON	__CNSITES1 || __CNSITES2
+describe CNSITESPRON	dot cn pron
+score CNSITESPRON	4
+