You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by si...@apache.org on 2007/05/03 07:45:10 UTC
svn commit: r534718 - /spamassassin/rules/trunk/sandbox/sidney/70_other.cf
Author: sidney
Date: Wed May 2 22:45:09 2007
New Revision: 534718
URL: http://svn.apache.org/viewvc?view=rev&rev=534718
Log:
metas cannot reference metas. fix that and use complete set for tests
Modified:
spamassassin/rules/trunk/sandbox/sidney/70_other.cf
Modified: spamassassin/rules/trunk/sandbox/sidney/70_other.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/sidney/70_other.cf?view=diff&rev=534718&r1=534717&r2=534718
==============================================================================
--- spamassassin/rules/trunk/sandbox/sidney/70_other.cf (original)
+++ spamassassin/rules/trunk/sandbox/sidney/70_other.cf Wed May 2 22:45:09 2007
@@ -1,25 +1,50 @@
# some tests to try to understand an FP I saw with OE and EXTRA_MPART_TYPE
-# OE with EXTRA_MPART_TYPE
-meta T_SIDNEY_OE_WITH_EXTRA_MPART_TYPE EXTRA_MPART_TYPE && __OE_MUA && !__FORGED_OE
+# OE with HTML
+meta T_SIDNEY_OE_HTML (__MIME_HTML && (__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
-# OE with HTML and EXTRA_MPART_TYPE (should be same as above)
-meta T_SIDNEY_OE_WITH_HTML_EXTRA_MPART_TYPE __MIME_HTML && EXTRA_MPART_TYPE && __OE_MUA && !__FORGED_OE
+# OE without HTML
+meta T_SIDNEY_OE_NHTML ((!__MIME_HTML) && (__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
+
+# OE with EXTRA_MPART_TYPE
+meta T_SIDNEY_OE_EMPT (EXTRA_MPART_TYPE && (__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
# OE without EXTRA_MPART_TYPE
-meta T_SIDNEY_OE_WITHOUT_EXTRA_MPART_TYPE !EXTRA_MPART_TYPE && __OE_MUA && !__FORGED_OE
+meta T_SIDNEY_OE_NEMPT ((!EXTRA_MPART_TYPE) && (__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
-# OE with HTML
-meta T_SIDNEY_OE_WITH_HTML __MIME_HTML && __OE_MUA && !__FORGED_OE
+# OE with HTML and EXTRA_MPART_TYPE (should be same as above)
+meta T_SIDNEY_OE_HTML_EMPT (__MIME_HTML && (EXTRA_MPART_TYPE && (__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID))))
-# OE without HTML
-meta T_SIDNEY_OE_WITHOUT_HTML !__MIME_HTML && __OE_MUA && !__FORGED_OE
+# OE without HTML and with EXTRA_MPART_TYPE
+meta T_SIDNEY_OE_NHTML_EMPT ((!__MIME_HTML) && (EXTRA_MPART_TYPE && (__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID))))
-# Not OE with EXTRA_MPART_YTPE
-meta T_SIDNEY_NOT_OE_WITH_EXTRA_MPART_TYPE EXTRA_MPART_TYPE && ( !__OE_MUA || __FORGED_OE )
+# OE without HTML and without EXTRA_MPART_TYPE
+meta T_SIDNEY_OE_NHTML_NMPT ((!__MIME_HTML) && (!EXTRA_MPART_TYPE) && (__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
+
+# OE with HTML and without EXTRA_MPART_TYPE
+meta T_SIDNEY_OE_HTML_NMPT (__MIME_HTML && (!EXTRA_MPART_TYPE) && (__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
# Not OE with HTML
-meta T_SIDNEY_NOT_OE_WITH_HTML __MIME_HTML && ( !__OE_MUA || __FORGED_OE )
+meta T_SIDNEY_NOE_HTML (__MIME_HTML && !(__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
+
+# Not OE without HTML
+meta T_SIDNEY_NOE_NHTML (!__MIME_HTML) && !(__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID))
+
+# Not OE with EXTRA_MPART_TYPE
+meta T_SIDNEY_NOE_EMPT (EXTRA_MPART_TYPE && !(__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
+
+# Not OE without EXTRA_MPART_TYPE
+meta T_SIDNEY_NOE_NEMPT ((!EXTRA_MPART_TYPE) && !(__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
# Not OE with HTML with EXTRA_MPART_TYPE
-meta T_SIDNEY_NOT_OE_WITH_HTML_EXTRA_MPART_TYPE EXTRA_MPART_TYPE && __MIME_HTML && ( !__OE_MUA || __FORGED_OE )
+meta T_SIDNEY_NOE_HTML_EMPT (EXTRA_MPART_TYPE && (__MIME_HTML && !(__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID))))
+
+# Not OE without HTML and with EXTRA_MPART_TYPE
+meta T_SIDNEY_NOE_NHTML_EMPT (EXTRA_MPART_TYPE && (!__MIME_HTML) && !(__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
+
+# Not OE without HTML without EXTRA_MPART_TYPE
+meta T_SIDNEY_NOE_NHTML_NEMPT ((!EXTRA_MPART_TYPE) && (!__MIME_HTML) && !(__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID)))
+
+# Not OE with HTML without EXTRA_MPART_TYPE
+meta T_SIDNEY_NOE_HTML_NEMPT ((!EXTRA_MPART_TYPE) && (__MIME_HTML && !(__OE_MUA && ( __OE_MSGID_1 || __OE_MSGID_2 || __OE_MSGID_3 || __UNUSABLE_MSGID))))
+