https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7580
Bug ID: 7580
Summary: Proposal: Clean up some 'merged duplicates' rules
Product: Spamassassin
Version: unspecified
Hardware: All
OS: All
Status: NEW
Severity: minor
Priority: P2
Component: Rules
Assignee: [email protected]
Reporter: [email protected]
Target Milestone: Undefined
Below are pairs of identical upstream rules, found as 'merged duplicates' in
the SpamAssassin Debug.
This is a minor priority update, and the intent is to clean the debug output a
little bit as well as discourage the creation/use of multiple rules that do the
same thing.
The logic of which rule gets deprecated is either:
1) Naming convention, keep the rule that has a more 'standard' naming
convention (e.g. __HAS_REPLY_TO over __REPLYTO_EXISTS).
2) Path of least resistance, deprecate the rule used in fewer meta rules.
Below are the duplicate rules, along with the corresponding meta rules which
need to be updated:
uri __HAS_ANY_URI /^\w+:\/\//
uri __DOS_HAS_ANY_URI /^\w+:\/\//
proposal: deprecate __DOS_HAS_ANY_URI, replace instances with __HAS_ANY_URI
Rule(s) to update:
meta DOS_FIX_MY_URI __MIMEOLE_1106 && __DOS_HAS_ANY_URI &&
__DOS_SINGLE_EXT_RELAY && __DOS_HI && __DOS_LINK
==========================================================================
header __ML4 exists:Mailing-List
header __DOS_HAS_MAILING_LIST exists:Mailing-List
proposal: deprecate __DOS_HAS_MAILING_LIST, replace instances with __ML4
Rule(s) to update:
meta __DOS_DIRECT_TO_MX __DOS_SINGLE_EXT_RELAY && !__DOS_HAS_LIST_ID &&
!__DOS_HAS_LIST_UNSUB && !__DOS_HAS_MAILING_LIST && !__DOS_RELAYED_EXT
==========================================================================
header __THEBAT_MUA X-Mailer =~ /^The Bat!/
header __XM_THEBAT X-Mailer =~ /^The Bat!/
proposal: deprecate __XM_THEBAT, replace instances with __THEBAT_MUA
Rule(s) to update:
meta __BOTH_INR_AND_REF (__XM_BALSA || __XM_CALYPSO || __XM_FORTE ||
__XM_MHE || __XM_SQRLMAIL || __XM_SYLPHEED || __XM_THEBAT || __XM_VM ||
__XM_XIMEVOL || __UA_KMAIL || __UA_MOZ5 || __UA_OPERA7)
==========================================================================
header __HAS_X_MAILER exists:X-Mailer
header __HAS_XMAIL exists:X-Mailer
proposal: deprecate __HAS_XMAIL, (no upstream instances of use)
==========================================================================
header __HAS_REPLY_TO exists:Reply-To
header __REPLYTO_EXISTS exists:Reply-To
proposal: deprecate __REPLYTO_EXISTS, replace instances with __HAS_REPLY_TO
Rule(s) to update:
meta LUCRATIVE __LUCRATIVE && !ALL_TRUSTED && !__ANY_TEXT_ATTACH &&
!__REPLYTO_EXISTS && !__LCL__ENV_AND_HDR_FROM_MATCH
meta REPLYTO_WITHOUT_TO_CC (__REPLYTO_EXISTS && !__TOCC_EXISTS)
meta __FBI_SPOOF (__FBI_FM_NAME || __FBI_FM_DOM ||
__FBI_BODY_SHOUT_1 || __FBI_BODY_SHOUT_2) && !__FBI_RCVD_DOM &&
__REPLYTO_EXISTS
meta __MSM_PRIO_REPTO __HAS_MSMAIL_PRI && __REPLYTO_EXISTS &&
__SUBJ_SHORT
==========================================================================
header __ML2 exists:List-Id
header __HAS_LIST_ID exists:List-Id
proposal: deprecate __HAS_LIST_ID, replace instances with __ML2
Rule(s) to update:
meta MAILING_LIST_MULTI __HAS_X_LOOP + __HAS_X_MAILING_LIST +
__HAS_X_MAILMAN_VERSION + __HAS_LIST_ID + __HAS_X_BEEN_THERE
+__DOS_HAS_LIST_UNSUB + __ML1 + __ML3 + __ML4 + __ML5 > 2
==========================================================================
header __RATWARE_0_TZ_DATE Date =~ / \+0000$/
header __JM_REACTOR_DATE Date =~ / \+0000$/
proposal: deprecate __JM_REACTOR_DATE, replace instances with
__RATWARE_0_TZ_DATE
Rule(s) to update:
meta COMMENT_GIBBERISH __COMMENT_GIBBERISH &&
!__JM_REACTOR_DATE && !__RCD_RDNS_MTA_MESSY && !__SENDER_BOT
--
You are receiving this mail because:
You are the assignee for the bug.
