svn commit: r1233974 - in /spamassassin/trunk: lib/Mail/SpamAssassin/Plugin/Bayes.pm rules/20_mailspike.cf rulesrc/10_force_active.cf rulesrc/sandbox/wtogami/20_mailspike.cf

[km...@apache.org]

Author: kmcgrail
Date: Fri Jan 20 15:57:10 2012
New Revision: 1233974

URL: http://svn.apache.org/viewvc?rev=1233974&view=rev
Log:
Remove mailspike from sandbox and moved to rules.  remove mspike rules from force active.  Trying to fix the duplicate scores in 72_scores.cf and 50_scores.cf.

Added:
    spamassassin/trunk/rules/20_mailspike.cf
      - copied unchanged from r1233129, spamassassin/trunk/rulesrc/sandbox/wtogami/20_mailspike.cf
Removed:
    spamassassin/trunk/rulesrc/sandbox/wtogami/20_mailspike.cf
Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Bayes.pm
    spamassassin/trunk/rulesrc/10_force_active.cf

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Bayes.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Bayes.pm?rev=1233974&r1=1233973&r2=1233974&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Bayes.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Bayes.pm Fri Jan 20 15:57:10 2012
@@ -946,15 +946,18 @@ sub get_msgid {
     push(@msgid, $msgid);
   }
 
-  # Use sha1_hex(Date:, last received: and top N bytes of body)
+  # Modified 2012-01-17  per bug 5185 to remove last received from msg_id calculation
+
+  # Use sha1_hex(Date: and top N bytes of body)
   # where N is MIN(1024 bytes, 1/2 of body length)
   #
   my $date = $msg->get_header("Date");
   $date = "None" if (!defined $date || $date eq ''); # No Date?
 
-  my @rcvd = $msg->get_header("Received");
-  my $rcvd = $rcvd[$#rcvd];
-  $rcvd = "None" if (!defined $rcvd || $rcvd eq ''); # No Received?
+  #Removed per bug 5185
+  #my @rcvd = $msg->get_header("Received");
+  #my $rcvd = $rcvd[$#rcvd];
+  #$rcvd = "None" if (!defined $rcvd || $rcvd eq ''); # No Received?
 
   # Make a copy since pristine_body is a reference ...
   my $body = join('', $msg->get_pristine_body());
@@ -963,7 +966,7 @@ sub get_msgid {
     substr($body, $keep) = '';
   }
 
-  unshift(@msgid, sha1_hex($date."\000".$rcvd."\000".$body).'@sa_generated');
+  unshift(@msgid, sha1_hex($date."\000".$body).'@sa_generated');
 
   return wantarray ? @msgid : $msgid[0];
 }

Modified: spamassassin/trunk/rulesrc/10_force_active.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/10_force_active.cf?rev=1233974&r1=1233973&r2=1233974&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/10_force_active.cf (original)
+++ spamassassin/trunk/rulesrc/10_force_active.cf Fri Jan 20 15:57:10 2012
@@ -926,14 +926,3 @@ publish X_MESSAGE_INFO
 publish X_PRIORITY_CC
 publish YAHOO_DRS_REDIR
 publish YAHOO_RD_REDIR
-publish RCVD_IN_MSPIKE_ZBI
-publish RCVD_IN_MSPIKE_L5
-publish RCVD_IN_MSPIKE_L4
-publish RCVD_IN_MSPIKE_L3
-publish RCVD_IN_MSPIKE_L2
-publish RCVD_IN_MSPIKE_H2
-publish RCVD_IN_MSPIKE_H3
-publish RCVD_IN_MSPIKE_H4
-publish RCVD_IN_MSPIKE_H5
-publish RCVD_IN_MSPIKE_BL
-publish RCVD_IN_MSPIKE_WL