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/17 01:38:12 UTC

svn commit: r125379 - /spamassassin/trunk/rules/70_testing.cf

Author: quinlan
Date: Sun Jan 16 16:38:11 2005
New Revision: 125379

URL: http://svn.apache.org/viewcvs?view=rev&rev=125379
Log:
next revision of short ID rules

Modified:
   spamassassin/trunk/rules/70_testing.cf

Modified: spamassassin/trunk/rules/70_testing.cf
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/70_testing.cf?view=diff&rev=125379&p1=spamassassin/trunk/rules/70_testing.cf&r1=125378&p2=spamassassin/trunk/rules/70_testing.cf&r2=125379
==============================================================================
--- spamassassin/trunk/rules/70_testing.cf	(original)
+++ spamassassin/trunk/rules/70_testing.cf	Sun Jan 16 16:38:11 2005
@@ -309,92 +309,27 @@
 ########################################################################
 
 # short message-ids
-# 18 long are my first FPs: <81...@pamho.net>
-# idea: work towards combined rule that looks vaguely like this:
-# header T_MSGID_SHORT	MESSAGEID =~ /<.{1,5}\@|\@.{1,6}>|^.{1,17}$/
-# missing (seems unlikely)
-header __MSGID_EXISTS_01	exists:MESSAGEID
-header __MSGID_EXISTS_02	exists:Message-ID
-meta T_MSGID_NONE_01		!__MSGID_EXISTS_01
-meta T_MSGID_NONE_02		!__MSGID_EXISTS_02
 # full id #1
-header T_MSGID_SHORT_A05	MESSAGEID =~ /^.{1,5}$/
-header T_MSGID_SHORT_A06	MESSAGEID =~ /^.{1,6}$/
-header T_MSGID_SHORT_A07	MESSAGEID =~ /^.{1,7}$/
-header T_MSGID_SHORT_A08	MESSAGEID =~ /^.{1,8}$/
-header T_MSGID_SHORT_A09	MESSAGEID =~ /^.{1,9}$/
-header T_MSGID_SHORT_A10	MESSAGEID =~ /^.{1,10}$/
-header T_MSGID_SHORT_A11	MESSAGEID =~ /^.{1,11}$/
-header T_MSGID_SHORT_A12	MESSAGEID =~ /^.{1,12}$/
-header T_MSGID_SHORT_A13	MESSAGEID =~ /^.{1,13}$/
-header T_MSGID_SHORT_A14	MESSAGEID =~ /^.{1,14}$/
 header T_MSGID_SHORT_A15	MESSAGEID =~ /^.{1,15}$/
 header T_MSGID_SHORT_A16	MESSAGEID =~ /^.{1,16}$/
-header T_MSGID_SHORT_A17	MESSAGEID =~ /^.{1,17}$/
-# full id #2
-header T_MSGID_SHORT_B05	MESSAGEID =~ /^.{0,5}$/
-header T_MSGID_SHORT_B06	MESSAGEID =~ /^.{0,6}$/
-header T_MSGID_SHORT_B07	MESSAGEID =~ /^.{0,7}$/
-header T_MSGID_SHORT_B08	MESSAGEID =~ /^.{0,8}$/
-header T_MSGID_SHORT_B09	MESSAGEID =~ /^.{0,9}$/
-header T_MSGID_SHORT_B10	MESSAGEID =~ /^.{0,10}$/
-header T_MSGID_SHORT_B11	MESSAGEID =~ /^.{0,11}$/
-header T_MSGID_SHORT_B12	MESSAGEID =~ /^.{0,12}$/
-header T_MSGID_SHORT_B13	MESSAGEID =~ /^.{0,13}$/
-header T_MSGID_SHORT_B14	MESSAGEID =~ /^.{0,14}$/
-header T_MSGID_SHORT_B15	MESSAGEID =~ /^.{0,15}$/
-header T_MSGID_SHORT_B16	MESSAGEID =~ /^.{0,16}$/
-header T_MSGID_SHORT_B17	MESSAGEID =~ /^.{0,17}$/
-# full id #3
-header T_MSGID_SHORT_C03	MESSAGEID =~ /<.{1,3}>/
-header T_MSGID_SHORT_C04	MESSAGEID =~ /<.{1,4}>/
-header T_MSGID_SHORT_C05	MESSAGEID =~ /<.{1,5}>/
-header T_MSGID_SHORT_C06	MESSAGEID =~ /<.{1,6}>/
-header T_MSGID_SHORT_C07	MESSAGEID =~ /<.{1,7}>/
-header T_MSGID_SHORT_C08	MESSAGEID =~ /<.{1,8}>/
-header T_MSGID_SHORT_C09	MESSAGEID =~ /<.{1,9}>/
-header T_MSGID_SHORT_C10	MESSAGEID =~ /<.{1,10}>/
-header T_MSGID_SHORT_C11	MESSAGEID =~ /<.{1,11}>/
-header T_MSGID_SHORT_C12	MESSAGEID =~ /<.{1,12}>/
-header T_MSGID_SHORT_C13	MESSAGEID =~ /<.{1,13}>/
-header T_MSGID_SHORT_C14	MESSAGEID =~ /<.{1,14}>/
-header T_MSGID_SHORT_C15	MESSAGEID =~ /<.{1,15}>/
-# full id #4
-header T_MSGID_SHORT_D03	MESSAGEID =~ /<.{0,3}>/
-header T_MSGID_SHORT_D04	MESSAGEID =~ /<.{0,4}>/
-header T_MSGID_SHORT_D05	MESSAGEID =~ /<.{0,5}>/
-header T_MSGID_SHORT_D06	MESSAGEID =~ /<.{0,6}>/
-header T_MSGID_SHORT_D07	MESSAGEID =~ /<.{0,7}>/
-header T_MSGID_SHORT_D08	MESSAGEID =~ /<.{0,8}>/
-header T_MSGID_SHORT_D09	MESSAGEID =~ /<.{0,9}>/
-header T_MSGID_SHORT_D10	MESSAGEID =~ /<.{0,10}>/
-header T_MSGID_SHORT_D11	MESSAGEID =~ /<.{0,11}>/
-header T_MSGID_SHORT_D12	MESSAGEID =~ /<.{0,12}>/
-header T_MSGID_SHORT_D13	MESSAGEID =~ /<.{0,13}>/
-header T_MSGID_SHORT_D14	MESSAGEID =~ /<.{0,14}>/
-header T_MSGID_SHORT_D15	MESSAGEID =~ /<.{0,15}>/
-# local part #2
-header T_MSGID_SHORT_LP_1_5	MESSAGEID =~ /<.{1,5}\@/
-header T_MSGID_SHORT_LP_1_6	MESSAGEID =~ /<.{1,6}\@/
-header T_MSGID_SHORT_LP_1_7	MESSAGEID =~ /<.{1,7}\@/
-header T_MSGID_SHORT_LP_1_8	MESSAGEID =~ /<.{1,8}\@/
 # local part #1
+header T_MSGID_SHORT_LP_0_1	MESSAGEID =~ /<.{0,1}\@/
+header T_MSGID_SHORT_LP_0_2	MESSAGEID =~ /<.{0,2}\@/
+header T_MSGID_SHORT_LP_0_3	MESSAGEID =~ /<.{0,3}\@/
+header T_MSGID_SHORT_LP_0_4	MESSAGEID =~ /<.{0,4}\@/
 header T_MSGID_SHORT_LP_0_5	MESSAGEID =~ /<.{0,5}\@/
-header T_MSGID_SHORT_LP_0_6	MESSAGEID =~ /<.{0,6}\@/
-header T_MSGID_SHORT_LP_0_7	MESSAGEID =~ /<.{0,7}\@/
-header T_MSGID_SHORT_LP_0_8	MESSAGEID =~ /<.{0,8}\@/
-# domain #1
-header T_MSGID_SHORT_DO_1_4	MESSAGEID =~ /\@.{1,4}>/
-header T_MSGID_SHORT_DO_1_5	MESSAGEID =~ /\@.{1,5}>/
-header T_MSGID_SHORT_DO_1_6	MESSAGEID =~ /\@.{1,6}>/
-header T_MSGID_SHORT_DO_1_7	MESSAGEID =~ /\@.{1,7}>/
-header T_MSGID_SHORT_DO_1_8	MESSAGEID =~ /\@.{1,8}>/
-# domain #2
-header T_MSGID_SHORT_DO_0_4	MESSAGEID =~ /\@.{0,4}>/
-header T_MSGID_SHORT_DO_0_5	MESSAGEID =~ /\@.{0,5}>/
-header T_MSGID_SHORT_DO_0_6	MESSAGEID =~ /\@.{0,6}>/
-header T_MSGID_SHORT_DO_0_7	MESSAGEID =~ /\@.{0,7}>/
-header T_MSGID_SHORT_DO_0_8	MESSAGEID =~ /\@.{0,8}>/
+# combo #1
+meta T_MSGID_SHORT_LP_0_1A	T_MSGID_SHORT_LP_0_1 && T_MSGID_SHORT_A15
+meta T_MSGID_SHORT_LP_0_2A	T_MSGID_SHORT_LP_0_2 && T_MSGID_SHORT_A15
+meta T_MSGID_SHORT_LP_0_3A	T_MSGID_SHORT_LP_0_3 && T_MSGID_SHORT_A15
+meta T_MSGID_SHORT_LP_0_4A	T_MSGID_SHORT_LP_0_4 && T_MSGID_SHORT_A15
+meta T_MSGID_SHORT_LP_0_5A	T_MSGID_SHORT_LP_0_5 && T_MSGID_SHORT_A15
+# combo #2
+meta T_MSGID_SHORT_LP_0_1B	T_MSGID_SHORT_LP_0_1 && T_MSGID_SHORT_A16
+meta T_MSGID_SHORT_LP_0_2B	T_MSGID_SHORT_LP_0_2 && T_MSGID_SHORT_A16
+meta T_MSGID_SHORT_LP_0_3B	T_MSGID_SHORT_LP_0_3 && T_MSGID_SHORT_A16
+meta T_MSGID_SHORT_LP_0_4B	T_MSGID_SHORT_LP_0_4 && T_MSGID_SHORT_A16
+meta T_MSGID_SHORT_LP_0_5B	T_MSGID_SHORT_LP_0_5 && T_MSGID_SHORT_A16
 
 # some testing work on case-sensitive names
 header T_HEADER_01	ALL =~ /\nAlternate-Recipient:/