You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by qu...@apache.org on 2005/01/16 10:37:05 UTC
svn commit: r125350 - /spamassassin/trunk/rules/20_head_tests.cf /spamassassin/trunk/rules/70_testing.cf
Author: quinlan
Date: Sun Jan 16 01:37:04 2005
New Revision: 125350
URL: http://svn.apache.org/viewcvs?view=rev&rev=125350
Log:
promote T_X_MAILER_SPAM_2 to X_MAILER_SPAM
promote T_TOCC_NONE to TO_CC_NONE
Modified:
spamassassin/trunk/rules/20_head_tests.cf
spamassassin/trunk/rules/70_testing.cf
Modified: spamassassin/trunk/rules/20_head_tests.cf
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/20_head_tests.cf?view=diff&rev=125350&p1=spamassassin/trunk/rules/20_head_tests.cf&r1=125349&p2=spamassassin/trunk/rules/20_head_tests.cf&r2=125350
==============================================================================
--- spamassassin/trunk/rules/20_head_tests.cf (original)
+++ spamassassin/trunk/rules/20_head_tests.cf Sun Jan 16 01:37:04 2005
@@ -623,3 +623,10 @@
header FROM_LOCAL_DIGITS From =~ /\d{11}\S*\@/i
describe FROM_LOCAL_DIGITS From: localpart has long digit sequence
+
+header X_MAILER_SPAM X-Mailer !~ m{[A-Z0-9./]} [if-unset: Foo 1.0]
+describe X_MAILER_SPAM X-Mailer: header is bulk email fingerprint
+
+header __TOCC_EXISTS exists:ToCc
+meta TO_CC_NONE !__TOCC_EXISTS
+describe TO_CC_NONE No To: or Cc: header
Modified: spamassassin/trunk/rules/70_testing.cf
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/70_testing.cf?view=diff&rev=125350&p1=spamassassin/trunk/rules/70_testing.cf&r1=125349&p2=spamassassin/trunk/rules/70_testing.cf&r2=125350
==============================================================================
--- spamassassin/trunk/rules/70_testing.cf (original)
+++ spamassassin/trunk/rules/70_testing.cf Sun Jan 16 01:37:04 2005
@@ -396,33 +396,6 @@
header T_MSGID_SHORT_DO_0_7 MESSAGEID =~ /\@.{0,7}>/
header T_MSGID_SHORT_DO_0_8 MESSAGEID =~ /\@.{0,8}>/
-# no To or Cc
-header __CC_UNSET Cc =~ /^UNSET$/ [if-unset: UNSET]
-header __TO_UNSET To =~ /^UNSET$/ [if-unset: UNSET]
-header __CC_EXISTS exists:Cc
-header __TO_EXISTS exists:To
-meta T_TO_CC_UNSET __CC_UNSET && __TO_UNSET
-meta T_TO_CC_NONE !__CC_EXISTS && !__TO_EXISTS
-header T_TOCC_UNSET ToCc =~ /^UNSET$/ [if-unset: UNSET]
-header __TOCC_EXISTS exists:ToCc
-meta T_TOCC_NONE !__TOCC_EXISTS
-# consider Bcc:
-header __BCC_EXISTS exists:Bcc
-meta T_TO_CC_UNSET_NOBCC T_TO_CC_UNSET && !__BCC_EXISTS
-meta T_TO_CC_NONE_NOBCC T_TO_CC_NONE && !__BCC_EXISTS
-meta T_TOCC_UNSET_NOBCC T_TOCC_UNSET && !__BCC_EXISTS
-meta T_TOCC_NONE_NOBCC T_TOCC_NONE && !__BCC_EXISTS
-meta T_TO_CC_UNSET_XBCC T_TO_CC_UNSET + __BCC_EXISTS == 1
-meta T_TO_CC_NONE_XBCC T_TO_CC_NONE + __BCC_EXISTS == 1
-meta T_TOCC_UNSET_XBCC T_TOCC_UNSET + __BCC_EXISTS == 1
-meta T_TOCC_NONE_XBCC T_TOCC_NONE + __BCC_EXISTS == 1
-
-# X-Mailer rules
-header T_X_MAILER_SPAM_1 X-Mailer !~ m{[A-Z0-9.]} [if-unset: Foo 1.0]
-header T_X_MAILER_SPAM_2 X-Mailer !~ m{[A-Z0-9./]} [if-unset: Foo 1.0]
-header T_X_MAILER_SPAM_3 X-Mailer !~ m{[A-Z0-9.-]} [if-unset: Foo 1.0]
-header T_X_MAILER_SPAM_4 X-Mailer !~ m{[A-Z0-9./-]} [if-unset: Foo 1.0]
-
# some testing work on case-sensitive names
header T_HEADER_01 ALL =~ /\nAlternate-Recipient:/
header T_HEADER_02 ALL =~ /\nAntivirus:/
@@ -460,7 +433,6 @@
header T_HEADER_34 ALL =~ /\nX-JLH:/
header T_HEADER_35 ALL =~ /\nX-L-C:/
header T_HEADER_36 ALL =~ /\nX-LIDCode:/
-header T_HEADER_37 ALL =~ /\nX-MID:/
header T_HEADER_38 ALL =~ /\nX-Mailid:/
header T_HEADER_39 ALL =~ /\nX-MailingID:/
header T_HEADER_40 ALL =~ /\nX-Message-flag:/
@@ -474,7 +446,6 @@
header T_HEADER_48 ALL =~ /\nX-SG4:/
header T_HEADER_49 ALL =~ /\nX-SP-Track-ID:/
header T_HEADER_50 ALL =~ /\nX-Spam:/
-header T_HEADER_51 ALL =~ /\nX-T2-Posting-ID:/
header T_HEADER_52 ALL =~ /\nX-TID:/
header T_HEADER_53 ALL =~ /\nX-Text-Classification:/
header T_HEADER_54 ALL =~ /\nX-Tnz-Problem-Type:/