Mailing List Archive

Author: jm
Date: Thu Jan 11 05:50:42 2007
New Revision: 495220

URL: http://svn.apache.org/viewvc?view=rev&rev=495220
Log:
bug 5278: remove 6-month limit imposed via the __UNUSABLE_MSGID rule on FORGED_MUA_* rules which use Message-ID header

Modified:
spamassassin/rules/trunk/sandbox/jm/20_basic.cf
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm

Modified: spamassassin/rules/trunk/sandbox/jm/20_basic.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/jm/20_basic.cf?view=diff&rev=495220&r1=495219&r2=495220
==============================================================================
--- spamassassin/rules/trunk/sandbox/jm/20_basic.cf (original)
+++ spamassassin/rules/trunk/sandbox/jm/20_basic.cf Thu Jan 11 05:50:42 2007
@@ -214,24 +214,5 @@
header HELO_ADMIN X-Spam-Relays-Untrusted =~ /^[^\]]+ helo=admin\S* /i


-# __UNUSABLE_MSGID without message-id expiration (bug 5278)
-header __UNUSABLE_MSGID5278 eval:check_messageid_not_usable2()
-
-meta FORGED_MUA_EUDORA5278 (__EUDORA_MUA && !__EUDORA_MSGID && !__UNUSABLE_MSGID5278 && !__HAS_X_LOOP && !__HAS_X_MAILING_LIST)
-
-meta FORGED_MUA_OIMO5278 (__OIMO_MUA && !__OIMO_MSGID && !__OE_MSGID_2 && !__UNUSABLE_MSGID5278)
-
-meta __FORGED_OUTLOOK_DOLLARS5278 (__OUTLOOK_DOLLARS_MUA && !__OE_MSGID_2 && !__OUTLOOK_DOLLARS_OTHER && !__IMS_MSGID && !__UNUSABLE_MSGID5278)
-
-meta __FORGED_OE5278 (__OE_MUA && !__OE_MSGID_1 && !__OE_MSGID_2 && !__OE_MSGID_3 && !__UNUSABLE_MSGID5278)
-
-meta FORGED_MUA_OUTLOOK5278 (__FORGED_OE5278 || __FORGED_OUTLOOK_DOLLARS5278)
-
-meta FORGED_MUA_IMS5278 (__IMS_MUA && !__IMS_MSGID && !__UNUSABLE_MSGID5278)
-
-meta TVD_FW_GRAPHIC_ID3_2_5278 __TVD_OUTLOOK_IMG && !__UNUSABLE_MSGID5278 && ! (__OE_MSGID_2 || __IMS_MSGID )
-
-meta TVD_FW_GRAPHIC_ID3_5278 __TVD_OUTLOOK_IMG && __TVD_INT_CID && !__UNUSABLE_MSGID5278 && ! (__OE_MSGID_2 || __IMS_MSGID )
-
header RCVD_FROM_EXTRA_SPACE Received =~ /^from [a-zA-Z]/


Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm?view=diff&rev=495220&r1=495219&r2=495220
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm Thu Jan 11 05:50:42 2007
@@ -62,7 +62,6 @@
$self->register_eval_rule("check_for_to_in_subject");
$self->register_eval_rule("check_outlook_message_id");
$self->register_eval_rule("check_messageid_not_usable");
- $self->register_eval_rule("check_messageid_not_usable2");
$self->register_eval_rule("check_header_count_range");
$self->register_eval_rule("check_unresolved_template");
$self->register_eval_rule("check_ratware_name_id");
@@ -1028,30 +1027,6 @@
}

sub check_messageid_not_usable {
- my ($self, $pms) = @_;
- local ($_);
-
- # Lyris eats message-ids. also some ezmlm, I think :(
- $_ = $pms->get("List-Unsubscribe");
- return 1 if (/<mailto:(?:leave-\S+|\S+-unsubscribe)\@\S+>$/);
-
- # ezmlm again
- if($self->gated_through_received_hdr_remover($pms)) { return 1; }
-
- # Allen notes this as 'Wacky sendmail version?'
- $_ = $pms->get("Received");
- return 1 if /\/CWT\/DCE\)/;
-
- # Apr 2 2003 jm: iPlanet rewrites lots of stuff, including Message-IDs
- return 1 if /iPlanet Messaging Server/;
-
- # too old; older versions of clients used different formats
- return 1 if ($self->received_within_months($pms, '6','undef'));
-
- return 0;
-}
-
-sub check_messageid_not_usable2 {
my ($self, $pms) = @_;
local ($_);