X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fmisc_spam;h=296e83cace09cc9cacc5cfbbad83250a208671e6;hp=351d1295807a00bde74579596156f5811e77ae71;hb=ae2a57678dd807ad566cddd3cb16d2c3c76071c7;hpb=48b65374bdcd999d6964b708c64a3a0aa238112a

diff --git a/common/misc_spam b/common/misc_spam
index 351d129..296e83c 100644
--- a/common/misc_spam
+++ b/common/misc_spam
@@ -171,7 +171,7 @@ describe FAILNOTE	bounced spam
 score FAILNOTE		2
 
 # blarson 2007-06-28
-rawbody CTINLINE	/^Content\-Disposition\: inline\;\b/
+full CTINLINE	/^Content\-Disposition\: inline\;\b/
 describe CTINLINE	Inline attachment
 score CTINLINE		1
 
@@ -228,9 +228,9 @@ body OUTOFOFFICE	/out of the office/i
 describe OUTOFOFFICE	Out of the office
 score OUTOFOFFICE	3
 
-body OUTOFOFFICE_BACK /will be back/i
-body OUTOFOFFICE_BACK Out of the office
-score OUTOFOFFICE_BACK 3
+body OUTOFOFFICE_BACK   /will be back/i
+describe OUTOFOFFICE_BACK   Out of the office
+score OUTOFOFFICE_BACK   3
 
 # blarson 2007-08-01 \w was too broad 2007-08-12 add dash, at least 3 digits
 header SUBENDNUM	subject =~ /[a-zA-Z!]-?\d{3,}$/
@@ -313,7 +313,7 @@ describe TINYFONT	tiny font specified
 score TINYFONT		3
 
 # blarson 2008-04-03
-rawbody ZIPFILE		/\bfilename\=.*\.zip\b/i
+full ZIPFILE		/\bfilename\=.*\.zip\b/i
 describe ZIPFILE	zipfile attachment
 score ZIPFILE		0.5
 
@@ -493,10 +493,26 @@ header CTOCTET_STREAM	Content-Type =~ /octet-stream/i
 describe CTOCTET_STREAM	Content type is octet-stream
 score CTOCTET_STREAM	0.5
 
-header RTF_ATTACH	Content-Type =~ /name=.+\.rtf/i
-describe RTF_ATTACH	Contains an RTF Attachment
-score RTF_ATTACH	0.5
+full RTF_ATTACH		/^Content-Disposition:.+name=.+\.(rtf|doc)/i
+describe RTF_ATTACH	Contains an RTF or DOC Attachment
+score RTF_ATTACH	2
 
 meta RTF_SPAM		CTOCTET_STREAM && RTF_ATTACH
 describe RTF_SPAM	Content type is octet-stream and has an RTF Attachment
 score RTF_SPAM		3
+
+# blarson 2010-10-11
+header WORDDIGDIG      subject =~ /^\w{3,}\s+\d\s\d\s*$/
+describe WORDDIGDIG    Word digit digit subject
+score WORDDIGDIG       3
+
+# don 2011-06-06
+header BRACE_SUBJECT	Subject =~ /^\[\ [a-z0-9]{16}]\ /
+describe BRACE_SUBJECT	16 length word in braces in the subject
+score BRACE_SUBJECT	4
+
+# formorer 2011-08-12
+header COMPTESFR    subject =~ /concernant Compte SFR/i
+describe COMPTESFR  concernant Compte SFR
+score COMPTESFR     3
+