X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fpron_spam;h=00f0877039a68040199d0b593115730cfc2e3079;hp=68f8b7875f1e4411640990fb27fa01dd0aaa6127;hb=0cbe55381c60538746775d273cd2be3b0218152d;hpb=a5ca236f28d1b8ea92ce4b0ab52df1705741f549

diff --git a/common/pron_spam b/common/pron_spam
index 68f8b78..00f0877 100644
--- a/common/pron_spam
+++ b/common/pron_spam
@@ -1,3 +1,4 @@
+# -*- mode: spamassassin -*-
 # spam messages dealing with pr0n, dating, sex, etc. match these rules
 
 # sexually-explicit stuff on a bunch of lists --pasc 04/05/11, --pasc 04/05/14
@@ -205,29 +206,40 @@ 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+(picture|video|snapshot|pic|photo)s?\b/i
 describe NUDEPIC	nude pictures
-score NUDEPIC		2
+score NUDEPIC		3
 
 # blarson 2007-06-17
 body PRETTYGIRL		/\bpretty girl/i
 describe PRETTYGIRL	pretty girls trying to seduce bugs
-score PRETTYGIRL	2
+score PRETTYGIRL	3
 
 # blarson 2007-10-16
-body HAVESEX		/\bhave\s+sex\b/i
-describe HAVESEX	have sex
+body HAVESEX		/\b(have|hot)\s+(sex|hookups)\b/i
+describe HAVESEX	have hot sex hookups
 score HAVESEX		3
 
+# don 2011-11-30
+body ADULTFRIEND	/adult\s+friendfinder/i
+describe ADULTFRIEND	Adult friend finder
+score ADULTFRIEND 	4
+
+header FUCKSUBJ		Subject =~ /\bfuck\b/i
+describe FUCKSUBJ	Fuck in the subject
+score FUCKSUBJ		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
 
+# don -- disabled for false positives 2010-10-09
 #zobel
-body __CNSITES1		/\bdot\s+cn\b/i
-body __CNSITES2		/\b\s+cn\b/i
-body CNSITESPRON	__CNSITES1 || __CNSITES2
-describe CNSITESPRON	dot cn pron
-body CNSITESPRON	4
+# 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