You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2022/04/20 06:01:14 UTC

svn commit: r1900061 [1/2] - in /spamassassin/branches/trunk-welcomelist: ./ build/mkupdates/ lib/Mail/ lib/Mail/SpamAssassin/ lib/Mail/SpamAssassin/Plugin/ rulesrc/scores/

Author: hege
Date: Wed Apr 20 06:01:14 2022
New Revision: 1900061

URL: http://svn.apache.org/viewvc?rev=1900061&view=rev
Log:
Merge from trunk r1900060 to trunk-welcomelist

Modified:
    spamassassin/branches/trunk-welcomelist/   (props changed)
    spamassassin/branches/trunk-welcomelist/build/mkupdates/mkupdate-with-scores
    spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin.pm
    spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/PerMsgStatus.pm
    spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/Plugin/Check.pm
    spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/Util.pm
    spamassassin/branches/trunk-welcomelist/rulesrc/scores/72_scores.cf
    spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set0
    spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set1
    spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set2
    spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set3
    spamassassin/branches/trunk-welcomelist/rulesrc/scores/stats-set0
    spamassassin/branches/trunk-welcomelist/rulesrc/scores/stats-set1
    spamassassin/branches/trunk-welcomelist/spamassassin.raw

Propchange: spamassassin/branches/trunk-welcomelist/
------------------------------------------------------------------------------
  Merged /spamassassin/trunk:r1900022-1900060

Modified: spamassassin/branches/trunk-welcomelist/build/mkupdates/mkupdate-with-scores
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/build/mkupdates/mkupdate-with-scores?rev=1900061&r1=1900060&r2=1900061&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/build/mkupdates/mkupdate-with-scores (original)
+++ spamassassin/branches/trunk-welcomelist/build/mkupdates/mkupdate-with-scores Wed Apr 20 06:01:14 2022
@@ -100,7 +100,6 @@ test_version() {
   # need rules directory or build won't work
   if [ ! -e rules ]; then cp -a ../trunk/rules .; fi
 
-  rm -rf $TMPDIR/release_$SA_VERSION
   perl Makefile.PL PREFIX=$TMPDIR/release_$SA_VERSION < /dev/null
   make
   make install
@@ -135,7 +134,6 @@ make_rule_update_from_trunk() {
     svn up build
   fi
 
-  rm -rf $TMPDIR/trunk
   perl Makefile.PL PREFIX=$TMPDIR/trunk < /dev/null
   make
   make test TEST_FILES="t/basic_lint.t t/basic_lint_without_sandbox.t t/basic_meta.t"
@@ -268,39 +266,35 @@ fi
 # test to make sure it works with sa-update --install
 TESTED_VERSIONS=""
 
-# Iterate through all 3.4 versions (3.4.1 - 3.4.x, and the 3.4 HEAD)
+# Iterate through all found 3.4 versions (3.4.1 - 3.4.x)
 MAJOR_VERS=3
-for (( MINOR_VERS=4; 1; MINOR_VERS++ )); do
-  for (( UPDATE_VERS=1; 1; UPDATE_VERS++ )); do
-    REL=${MAJOR_VERS}_${MINOR_VERS}_${UPDATE_VERS}
-    if svn_path_exists $SVN_BASEURL/tags/spamassassin_release_${REL}; then
-      test_version ${REL} tags/spamassassin_release_${REL} &&
-        TESTED_VERSIONS="$TESTED_VERSIONS ${REL}"
-    fi
-  done
-  # we just assume that the next stable version is the branch's current version (HEAD)
-  if svn_path_exists $SVN_BASEURL/branches/${MAJOR_VERS}.${MINOR_VERS}; then
-    test_version ${MAJOR_VERS}_${MINOR_VERS}_HEAD branches/${MAJOR_VERS}.${MINOR_VERS} &&
-      TESTED_VERSIONS="$TESTED_VERSIONS ${MAJOR_VERS}_${MINOR_VERS}_HEAD"
-  fi
+MINOR_VERS=4
+for (( UPDATE_VERS=1; 1; UPDATE_VERS++ )); do
+  REL=${MAJOR_VERS}_${MINOR_VERS}_${UPDATE_VERS}
+  if ! svn_path_exists $SVN_BASEURL/tags/spamassassin_release_${REL}; then break; fi
+  test_version ${REL} tags/spamassassin_release_${REL} &&
+    TESTED_VERSIONS="$TESTED_VERSIONS ${REL}"
 done
+# And lastly the HEAD
+if svn_path_exists $SVN_BASEURL/branches/${MAJOR_VERS}.${MINOR_VERS}; then
+  test_version ${MAJOR_VERS}_${MINOR_VERS}_HEAD branches/${MAJOR_VERS}.${MINOR_VERS} &&
+    TESTED_VERSIONS="$TESTED_VERSIONS ${MAJOR_VERS}_${MINOR_VERS}_HEAD"
+fi
 
-# Iterate through all 4.0 versions (4.0.0 - 4.0.x, and the 4.0 HEAD)
+# Iterate through all found 4.0 versions (4.0.0 - 4.0.x)
 MAJOR_VERS=4
+MINOR_VERS=0
 for (( MINOR_VERS=0; 1; MINOR_VERS++ )); do
-  for (( UPDATE_VERS=0; 1; UPDATE_VERS++ )); do
-    REL=${MAJOR_VERS}_${MINOR_VERS}_${UPDATE_VERS}
-    if svn_path_exists $SVN_BASEURL/tags/spamassassin_release_${REL}; then
-      test_version ${REL} tags/spamassassin_release_${REL} &&
-        TESTED_VERSIONS="$TESTED_VERSIONS ${REL}"
-    fi
-  done
-  # we just assume that the next stable version is the branch's current version (HEAD)
-  if svn_path_exists $SVN_BASEURL/branches/${MAJOR_VERS}.${MINOR_VERS}; then
-    test_version ${MAJOR_VERS}_${MINOR_VERS}_HEAD branches/${MAJOR_VERS}.${MINOR_VERS} &&
-      TESTED_VERSIONS="$TESTED_VERSIONS ${MAJOR_VERS}_${MINOR_VERS}_HEAD"
-  fi
+  REL=${MAJOR_VERS}_${MINOR_VERS}_${UPDATE_VERS}
+  if ! svn_path_exists $SVN_BASEURL/tags/spamassassin_release_${REL}; then break; fi
+  test_version ${REL} tags/spamassassin_release_${REL} &&
+    TESTED_VERSIONS="$TESTED_VERSIONS ${REL}"
 done
+# And lastly the HEAD
+if svn_path_exists $SVN_BASEURL/branches/${MAJOR_VERS}.${MINOR_VERS}; then
+  test_version ${MAJOR_VERS}_${MINOR_VERS}_HEAD branches/${MAJOR_VERS}.${MINOR_VERS} &&
+    TESTED_VERSIONS="$TESTED_VERSIONS ${MAJOR_VERS}_${MINOR_VERS}_HEAD"
+fi
 
 echo "VERSIONS UPDATE PASSED ON: $TESTED_VERSIONS"
 

Modified: spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin.pm?rev=1900061&r1=1900060&r2=1900061&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin.pm Wed Apr 20 06:01:14 2022
@@ -1551,7 +1551,6 @@ sub finish {
   $self->call_plugins("finish_tests", { conf => $self->{conf},
                                         main => $self });
 
-  $self->{conf}->finish(); delete $self->{conf};
   $self->{plugins}->finish(); delete $self->{plugins};
 
   if ($self->{bayes_scanner}) {
@@ -1561,6 +1560,8 @@ sub finish {
 
   $self->{resolver}->finish()  if $self->{resolver};
 
+  $self->{conf}->finish(); delete $self->{conf};
+
   $self->timer_end("finish");
   %{$self} = ();
 }

Modified: spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=1900061&r1=1900060&r2=1900061&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/PerMsgStatus.pm Wed Apr 20 06:01:14 2022
@@ -68,10 +68,10 @@ use Mail::SpamAssassin::Logger;
 
 our @ISA = qw();
 
-# methods defined by the compiled ruleset; deleted in finish_tests()
+# methods defined by the compiled ruleset; deleted in finish()
 our @TEMPORARY_METHODS;
 
-# methods defined by register_plugin_eval_glue(); deleted in finish_tests()
+# methods defined by register_plugin_eval_glue(); deleted in finish()
 our %TEMPORARY_EVAL_GLUE_METHODS;
 
 ###########################################################################
@@ -1947,16 +1947,9 @@ sub finish {
 	  permsgstatus => $self
 	});
 
-  $self->report_unsatisfied_actions;
+  $self->report_unsatisfied_actions();
 
-  # Delete out all of the members of $self.  This will remove any direct
-  # circular references and let the memory get reclaimed while also being more
-  # efficient than a foreach() loop over the keys.
-  %{$self} = ();
-}
-
-sub finish_tests {
-  my ($conf) = @_;
+  # Clean up temporary methods
   foreach my $method (@TEMPORARY_METHODS) {
     if (defined &{$method}) {
       undef &{$method};
@@ -1964,8 +1957,17 @@ sub finish_tests {
   }
   @TEMPORARY_METHODS = ();      # clear for next time
   %TEMPORARY_EVAL_GLUE_METHODS = ();
+
+  # Delete out all of the members of $self.  This will remove any direct
+  # circular references and let the memory get reclaimed while also being more
+  # efficient than a foreach() loop over the keys.
+  %{$self} = ();
 }
 
+# Deprecated for clarity, only Plugins have this function
+sub finish_tests {}
+
+###########################################################################
 
 =item $name = $status->get_current_eval_rule_name()
 
@@ -2963,11 +2965,11 @@ ENDOFEVAL
   eval $evalstr . '; 1'   ## no critic
   or do {
     my $eval_stat = $@ ne '' ? $@ : "errno=$!";  chomp $eval_stat;
-    warn "rules: failed to run header tests, skipping some: $eval_stat\n";
+    warn "rules: failed to compile method '$function': $eval_stat\n";
     $self->{rule_errors}++;
   };
 
-  # ensure this method is deleted if finish_tests() is called
+  # ensure this method is deleted if finish() is called
   push (@TEMPORARY_METHODS, $function);
 }
 

Modified: spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/Plugin/Check.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/Plugin/Check.pm?rev=1900061&r1=1900060&r2=1900061&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/Plugin/Check.pm (original)
+++ spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/Plugin/Check.pm Wed Apr 20 06:01:14 2022
@@ -219,10 +219,10 @@ sub check_main {
       foreach my $domain (keys %{$pms->{conf}->{dns_block_rule}{$rule}}) {
         my $blockfile = $self->{main}->sed_path("__global_state_dir__/dnsblock_$domain");
         next if -f $blockfile; # no need to warn and create again..
-        warn("check: dns_block_rule $rule hit, creating $blockfile ".
-             "(This means dnsbl blocked you due to too many queries. ".
+        warn "check: dns_block_rule $rule hit, creating $blockfile ".
+             "(This means DNSBL blocked you due to too many queries. ".
              "Set all affected rules score to 0, or use ".
-             "\"dns_query_restriction deny $domain\" to disable queries)\n");
+             "\"dns_query_restriction deny $domain\" to disable queries)\n";
         Mail::SpamAssassin::Util::touch_file($blockfile, { create_exclusive => 1 });
       }
     }
@@ -384,8 +384,9 @@ sub run_rbl_eval_tests {
 
     my $function = $test->[0];
     if (!exists $pms->{conf}->{eval_plugins}->{$function}) {
-      warn("rules: unknown eval '$function' for $rulename, ignoring RBL eval\n");
-      return 0;
+      warn "rules: unknown eval '$function' for $rulename, ignoring RBL eval\n";
+      $pms->{rule_errors}++;
+      next;
     }
 
     my $result;
@@ -1137,12 +1138,14 @@ sub run_eval_tests {
 
     my $function = untaint_var($test->[0]); # was validated with \w+
     if (!$function) {
-      warn "rules: error: no eval function defined for $rulename";
+      warn "rules: no eval function defined for $rulename\n";
+      $pms->{rule_errors}++;
       next;
     }
  
     if (!exists $conf->{eval_plugins}->{$function}) {
-      warn("rules: error: unknown eval '$function' for $rulename\n");
+      warn "rules: unknown eval '$function' for $rulename\n";
+      $pms->{rule_errors}++;
       next;
     }
 
@@ -1233,7 +1236,7 @@ EOT
   if (!$eval_result) {
     my $eval_stat = $@ ne '' ? $@ : "errno=$!";  chomp $eval_stat;
     warn "rules: failed to compile eval tests, skipping some: $eval_stat\n";
-    $self->{rule_errors}++;
+    $pms->{rule_errors}++;
   }
   else {
     my $method = "${package_name}::${methodname}";

Modified: spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/Util.pm?rev=1900061&r1=1900060&r2=1900061&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/Util.pm Wed Apr 20 06:01:14 2022
@@ -2317,21 +2317,26 @@ sub fisher_yates_shuffle {
 #
 sub domain_to_search_list {
   my ($domain) = @_;
+
   $domain =~ s/^\.+//; $domain =~ s/\.+\z//;  # strip leading and trailing dots
-  my @search_keys;
-  if (index($domain, '[') == 0) {  # don't split address literals
-    @search_keys = ( $domain );  # presumably an address literal
-  } elsif ($domain ne '') {
-    $domain = lc $domain;
-    push @search_keys, $domain;
-    my $pos = 0;
-    while (($pos = index($domain, '.', $pos+1)) != -1) {
-      push @search_keys, substr($domain, $pos+1);
-    }
-    if (@search_keys > 20) {  # enforce some sanity limit
-      @search_keys = @search_keys[$#search_keys-19 .. $#search_keys];
-    }
+  return [] unless $domain;                   # no domain left
+  return [$domain] if index($domain, '[') == 0; # don't split address literals
+
+  # initialize
+  $domain = lc $domain;
+  my @search_keys = ($domain);
+  my $pos = 0;
+
+  # split domain into search keys
+  while (($pos = index($domain, '.', $pos+1)) != -1) {
+    push @search_keys, substr($domain, $pos+1);
   }
+
+  # enforce some sanity limit
+  if (@search_keys > 20) {
+    @search_keys = @search_keys[$#search_keys-19 .. $#search_keys];
+  }
+
   return \@search_keys;
 }
 

Modified: spamassassin/branches/trunk-welcomelist/rulesrc/scores/72_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rulesrc/scores/72_scores.cf?rev=1900061&r1=1900060&r2=1900061&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rulesrc/scores/72_scores.cf (original)
+++ spamassassin/branches/trunk-welcomelist/rulesrc/scores/72_scores.cf Wed Apr 20 06:01:14 2022
@@ -1,6 +1,6 @@
 score AC_BR_BONANZA                         0.001 0.001 0.001 0.001
 score AC_DIV_BONANZA                        0.001 0.001 0.001 0.001
-score AC_FROM_MANY_DOTS                     3.000 2.997 3.000 2.997
+score AC_FROM_MANY_DOTS                     2.999 2.996 2.999 2.996
 score AC_HTML_NONSENSE_TAGS                 1.999 1.997 1.999 1.997
 score AC_POST_EXTRAS                        1.000 1.000 1.000 1.000
 score AC_SPAMMY_URI_PATTERNS1               1.000 1.000 1.000 1.000
@@ -13,45 +13,45 @@ score AC_SPAMMY_URI_PATTERNS4
 score AC_SPAMMY_URI_PATTERNS8               1.000 1.000 1.000 1.000
 score AC_SPAMMY_URI_PATTERNS9               1.000 1.000 1.000 1.000
 score ADMITS_SPAM                           3.799 3.595 3.799 3.595
-score ADULT_DATING_COMPANY                  10.001 10.001 10.001 10.001
+score ADULT_DATING_COMPANY                  10.000 10.000 10.000 10.000
 score ADVANCE_FEE_2_NEW_FORM                1.000 1.000 1.000 1.000
-score ADVANCE_FEE_2_NEW_FRM_MNY             1.073 2.430 1.073 2.430
+score ADVANCE_FEE_2_NEW_FRM_MNY             1.745 2.497 1.745 2.497
 score ADVANCE_FEE_2_NEW_MONEY               1.999 1.997 1.999 1.997
-score ADVANCE_FEE_3_NEW                     3.499 2.752 3.499 2.752
-score ADVANCE_FEE_3_NEW_FRM_MNY             1.568 1.710 1.568 1.710
-score ADVANCE_FEE_3_NEW_MONEY               2.999 2.896 2.999 2.896
-score ADVANCE_FEE_4_NEW                     2.499 2.397 2.499 2.397
+score ADVANCE_FEE_3_NEW                     3.301 2.863 3.301 2.863
+score ADVANCE_FEE_3_NEW_FRM_MNY             1.090 0.087 1.090 0.087
+score ADVANCE_FEE_3_NEW_MONEY               2.899 2.896 2.899 2.896
+score ADVANCE_FEE_4_NEW                     2.399 2.397 2.399 2.397
 score ADVANCE_FEE_4_NEW_FRM_MNY             0.001 0.001 0.001 0.001
-score ADVANCE_FEE_4_NEW_MONEY               1.610 0.055 1.610 0.055
-score ADVANCE_FEE_5_NEW                     2.399 2.283 2.399 2.283
+score ADVANCE_FEE_4_NEW_MONEY               0.688 0.792 0.688 0.792
+score ADVANCE_FEE_5_NEW                     2.399 2.275 2.399 2.275
 score ADVANCE_FEE_5_NEW_FRM_MNY             0.001 0.001 0.001 0.001
-score ADVANCE_FEE_5_NEW_MONEY               0.001 2.539 0.001 2.539
-score AD_PREFS                              0.118 0.435 0.118 0.435
+score ADVANCE_FEE_5_NEW_MONEY               0.001 2.981 0.001 2.981
+score AD_PREFS                              0.001 0.437 0.001 0.437
 score ALIBABA_IMG_NOT_RCVD_ALI              1.000 1.000 1.000 1.000
 score AMAZON_IMG_NOT_RCVD_AMZN              2.499 2.497 2.499 2.497
 score APP_DEVELOPMENT_FREEM                 1.000 1.000 1.000 1.000
-score APP_DEVELOPMENT_NORDNS                1.999 1.168 1.999 1.168
+score APP_DEVELOPMENT_NORDNS                1.999 1.372 1.999 1.372
 score AXB_XMAILER_MIMEOLE_OL_024C2          0.001 0.001 0.001 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5          0.972 0.143 0.972 0.143
+score AXB_XMAILER_MIMEOLE_OL_1ECD5          0.297 1.423 0.297 1.423
 score BEBEE_IMG_NOT_RCVD_BB                 1.000 1.000 1.000 1.000
-score BIGNUM_EMAILS_FREEM                   2.214 2.557 2.214 2.557
+score BIGNUM_EMAILS_FREEM                   1.292 2.996 1.292 2.996
 score BIGNUM_EMAILS_MANY                    2.999 2.996 2.999 2.996
-score BILLION_OVERLAP                       -0.689 -0.421 -0.689 -0.421
+score BILLION_OVERLAP                       -0.285 -0.983 -0.285 -0.983
 score BITCOIN_BOMB                          1.000 1.000 1.000 1.000
-score BITCOIN_DEADLINE                      2.053 1.270 2.053 1.270
-score BITCOIN_EXTORT_01                     4.999 4.801 4.999 4.801
+score BITCOIN_DEADLINE                      2.734 0.911 2.734 0.911
+score BITCOIN_EXTORT_01                     4.499 4.506 4.499 4.506
 score BITCOIN_EXTORT_02                     1.000 1.000 1.000 1.000
-score BITCOIN_IMGUR                         1.000 1.000 1.000 1.000
-score BITCOIN_MALF_HTML                     3.499 2.858 3.499 2.858
-score BITCOIN_MALWARE                       1.000 1.271 1.000 1.271
-score BITCOIN_OBFU_SUBJ                     3.030 1.485 3.030 1.485
+score BITCOIN_IMGUR                         2.894 1.000 2.894 1.000
+score BITCOIN_MALF_HTML                     3.499 2.558 3.499 2.558
+score BITCOIN_MALWARE                       1.000 2.317 1.000 2.317
+score BITCOIN_OBFU_SUBJ                     1.000 0.864 1.000 0.864
 score BITCOIN_ONAN                          1.000 1.000 1.000 1.000
 score BITCOIN_PAY_ME                        1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_01                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_02                       2.499 2.497 2.499 2.497
-score BITCOIN_SPAM_03                       1.000 1.000 1.000 1.000
+score BITCOIN_SPAM_03                       2.499 1.000 2.499 1.000
 score BITCOIN_SPAM_04                       1.499 1.499 1.499 1.499
-score BITCOIN_SPAM_05                       0.001 0.445 0.001 0.445
+score BITCOIN_SPAM_05                       0.001 0.104 0.001 0.104
 score BITCOIN_SPAM_06                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_07                       1.000 1.000 1.000 1.000
 score BITCOIN_SPAM_08                       1.000 1.000 1.000 1.000
@@ -61,102 +61,99 @@ score BITCOIN_SPAM_11
 score BITCOIN_SPAM_12                       1.000 1.000 1.000 1.000
 score BITCOIN_SPF_ONLYALL                   0.001 1.000 0.001 1.000
 score BITCOIN_XPRIO                         2.499 2.497 2.499 2.497
-score BITCOIN_YOUR_INFO                     2.999 2.762 2.999 2.762
-score BODY_EMPTY                            1.152 0.244 1.152 0.244
-score BODY_SINGLE_URI                       2.202 0.527 2.202 0.527
+score BITCOIN_YOUR_INFO                     3.000 2.756 3.000 2.756
+score BODY_EMPTY                            1.555 0.393 1.555 0.393
+score BODY_SINGLE_URI                       1.355 0.675 1.355 0.675
 score BODY_URI_ONLY                         1.000 2.996 1.000 2.996
-score BOGUS_MIME_VERSION                    3.499 3.266 3.499 3.266
-score BOGUS_MSM_HDRS                        1.889 0.832 1.889 0.832
+score BOGUS_MIME_VERSION                    3.499 3.264 3.499 3.264
+score BOGUS_MSM_HDRS                        0.578 1.659 0.578 1.659
 score BOMB_FREEM                            1.000 1.000 1.000 1.000
 score BOMB_MONEY                            1.000 1.000 1.000 1.000
 score BTC_ORG                               1.000 1.000 1.000 1.000
 score BULK_RE_SUSP_NTLD                     1.000 1.000 1.000 1.000
-score CANT_SEE_AD                           1.000 1.165 1.000 1.165
-score CK_HELO_GENERIC                       0.249 0.001 0.249 0.001
+score CANT_SEE_AD                           1.000 1.102 1.000 1.102
+score CK_HELO_GENERIC                       0.250 0.001 0.250 0.001
 score COMMENT_GIBBERISH                     1.000 1.000 1.000 1.000
-score CONTENT_AFTER_HTML                    2.500 2.497 2.500 2.497
-score CONTENT_AFTER_HTML_WEAK               1.499 1.498 1.499 1.498
-score CTE_8BIT_MISMATCH                     0.999 0.001 0.999 0.001
+score CONTENT_AFTER_HTML                    2.137 2.497 2.137 2.497
+score CONTENT_AFTER_HTML_WEAK               1.500 1.498 1.500 1.498
+score CTE_8BIT_MISMATCH                     1.000 0.001 1.000 0.001
 score DAY_I_EARNED                          1.000 1.000 1.000 1.000
 score DEAR_BENEFICIARY                      0.001 0.001 0.001 0.001
 score DKIMWL_BL                             0.001 2.996 0.001 2.996
 score DKIMWL_BLOCKED                        0.001 0.001 0.001 0.001
-score DKIMWL_WL_HIGH                        0.001 -0.571 0.001 -0.571
+score DKIMWL_WL_HIGH                        0.001 -0.575 0.001 -0.575
 score DKIMWL_WL_MED                         0.001 -0.001 0.001 -0.001
-score DKIMWL_WL_MEDHI                       0.001 -0.872 0.001 -0.872
-score DOS_RCVD_IP_TWICE_B                   2.000 1.997 2.000 1.997
+score DKIMWL_WL_MEDHI                       0.001 -0.866 0.001 -0.866
+score DOS_RCVD_IP_TWICE_B                   1.999 1.997 1.999 1.997
 score DOTGOV_IMAGE                          1.000 1.000 1.000 1.000
 score DYNAMIC_IMGUR                         1.000 1.000 1.000 1.000
 score EBAY_IMG_NOT_RCVD_EBAY                1.000 1.000 1.000 1.000
 score ENCRYPTED_MESSAGE                     -1.000 -1.000 -1.000 -1.000
-score END_FUTURE_EMAILS                     1.000 2.191 1.000 2.191
+score END_FUTURE_EMAILS                     1.000 2.188 1.000 2.188
 score ENVFROM_GOOG_TRIX                     1.000 1.000 1.000 1.000
 score FACEBOOK_IMG_NOT_RCVD_FB              1.000 1.000 1.000 1.000
-score FAKE_REPLY_A1                         0.001 0.399 0.001 0.399
-score FAKE_REPLY_B                          2.699 1.887 2.699 1.887
+score FAKE_REPLY_A1                         0.929 2.140 0.929 2.140
+score FAKE_REPLY_B                          2.499 2.470 2.499 2.470
 score FBI_MONEY                             1.000 1.000 1.000 1.000
 score FBI_SPOOF                             1.000 1.000 1.000 1.000
-score FILL_THIS_FORM                        1.799 0.073 1.799 0.073
+score FILL_THIS_FORM                        1.799 0.072 1.799 0.072
 score FONT_INVIS_DIRECT                     0.001 0.001 0.001 0.001
 score FONT_INVIS_DOTGOV                     1.000 1.000 1.000 1.000
-score FONT_INVIS_HTML_NOHTML                3.000 2.996 3.000 2.996
-score FONT_INVIS_LONG_LINE                  1.545 1.182 1.545 1.182
-score FONT_INVIS_MSGID                      0.001 1.206 0.001 1.206
-score FONT_INVIS_NORDNS                     0.612 0.805 0.612 0.805
-score FONT_INVIS_POSTEXTRAS                 2.896 1.000 2.896 1.000
-score FORGED_RELAY_MUA_TO_MX                2.034 0.001 2.034 0.001
-score FORM_FRAUD                            1.000 0.907 1.000 0.907
+score FONT_INVIS_HTML_NOHTML                2.999 2.996 2.999 2.996
+score FONT_INVIS_LONG_LINE                  1.677 1.095 1.677 1.095
+score FONT_INVIS_MSGID                      0.890 1.275 0.890 1.275
+score FONT_INVIS_NORDNS                     0.936 1.700 0.936 1.700
+score FONT_INVIS_POSTEXTRAS                 0.782 1.000 0.782 1.000
+score FORM_FRAUD                            1.000 0.999 1.000 0.999
 score FORM_FRAUD_5                          0.001 0.001 0.001 0.001
 score FOUND_YOU                             3.249 3.246 3.249 3.246
-score FREEMAIL_FORGED_FROMDOMAIN            0.250 0.248 0.250 0.248
+score FREEMAIL_FORGED_FROMDOMAIN            0.249 0.248 0.249 0.248
 score FREEM_FRNUM_UNICD_EMPTY               1.000 1.000 1.000 1.000
 score FRNAME_IN_MSG_XPRIO_NO_SUB            1.000 1.000 1.000 1.000
-score FROMSPACE                             3.499 3.396 3.499 3.396
-score FROM_2_EMAILS_SHORT                   1.495 1.182 1.495 1.182
+score FROMSPACE                             3.499 3.397 3.499 3.397
+score FROM_2_EMAILS_SHORT                   1.397 1.574 1.397 1.574
 score FROM_ADDR_WS                          2.999 2.996 2.999 2.996
 score FROM_BANK_NOAUTH                      0.001 1.000 0.001 1.000
 score FROM_FMBLA_NDBLOCKED                  0.001 0.001 0.001 0.001
 score FROM_FMBLA_NEWDOM                     0.001 1.498 0.001 1.498
-score FROM_FMBLA_NEWDOM14                   0.001 0.998 0.001 0.998
+score FROM_FMBLA_NEWDOM14                   0.001 0.999 0.001 0.999
 score FROM_FMBLA_NEWDOM28                   0.001 0.798 0.001 0.798
-score FROM_GOV_DKIM_AU                      0.001 -0.058 0.001 -0.058
+score FROM_GOV_DKIM_AU                      0.001 -0.648 0.001 -0.648
 score FROM_GOV_REPLYTO_FREEMAIL             0.001 1.000 0.001 1.000
 score FROM_GOV_SPOOF                        0.001 1.000 0.001 1.000
-score FROM_MISSPACED                        1.999 1.168 1.999 1.168
-score FROM_MISSP_DYNIP                      1.411 1.502 1.411 1.502
+score FROM_MISSPACED                        1.999 1.163 1.999 1.163
+score FROM_MISSP_DYNIP                      1.243 1.854 1.243 1.854
 score FROM_MISSP_EH_MATCH                   1.999 0.001 1.999 0.001
-score FROM_MISSP_FREEMAIL                   3.199 0.001 3.199 0.001
+score FROM_MISSP_FREEMAIL                   3.099 0.001 3.099 0.001
 score FROM_MISSP_MSFT                       0.001 0.001 0.001 0.001
-score FROM_MISSP_PHISH                      2.837 2.417 2.837 2.417
-score FROM_MISSP_REPLYTO                    1.000 2.497 1.000 2.497
+score FROM_MISSP_PHISH                      2.813 2.348 2.813 2.348
 score FROM_MISSP_SPF_FAIL                   0.001 1.997 0.001 1.997
-score FROM_MISSP_TO_UNDISC                  0.631 1.527 0.631 1.527
+score FROM_MISSP_TO_UNDISC                  1.535 0.526 1.535 0.526
 score FROM_MISSP_USER                       0.001 0.001 0.001 0.001
-score FROM_MISSP_XPRIO                      0.001 0.001 0.001 0.001
-score FROM_MULTI_NORDNS                     1.396 1.010 1.396 1.010
+score FROM_MULTI_NORDNS                     2.500 1.009 2.500 1.009
 score FROM_NEWDOM_BTC                       0.001 1.000 0.001 1.000
 score FROM_NTLD_LINKBAIT                    1.000 1.000 1.000 1.000
-score FROM_NTLD_REPLY_FREEMAIL              1.930 1.000 1.930 1.000
+score FROM_NTLD_REPLY_FREEMAIL              1.841 1.000 1.841 1.000
 score FROM_NUMBERO_NEWDOMAIN                0.001 1.000 0.001 1.000
 score FROM_NUMERIC_TLD                      1.000 1.000 1.000 1.000
 score FROM_PAYPAL_SPOOF                     0.001 1.597 0.001 1.597
-score FROM_SUSPICIOUS_NTLD                  0.499 0.498 0.499 0.498
+score FROM_SUSPICIOUS_NTLD                  0.500 0.498 0.500 0.498
 score FROM_SUSPICIOUS_NTLD_FP               1.999 0.001 1.999 0.001
-score FROM_UNBAL1                           2.075 2.297 2.075 2.297
-score FROM_UNBAL2                           2.199 2.198 2.199 2.198
-score FROM_WSP_TRAIL                        2.299 1.339 2.299 1.339
-score FSL_BULK_SIG                          0.001 1.435 0.001 1.435
+score FROM_UNBAL1                           2.199 2.297 2.199 2.297
+score FROM_UNBAL2                           2.199 2.199 2.199 2.199
+score FROM_WSP_TRAIL                        2.200 1.334 2.200 1.334
+score FSL_BULK_SIG                          0.001 1.429 0.001 1.429
 score FSL_CTYPE_WIN1251                     0.001 0.001 0.001 0.001
 score FSL_NEW_HELO_USER                     0.001 0.001 0.001 0.001
-score FUZZY_AMAZON                          2.199 1.964 2.199 1.964
-score FUZZY_CLICK_HERE                      2.299 2.297 2.299 2.297
-score FUZZY_WALLET                          3.199 1.238 3.199 1.238
-score GAPPY_GENITALIA                       2.240 1.088 2.240 1.088
+score FUZZY_AMAZON                          2.299 2.161 2.299 2.161
+score FUZZY_CLICK_HERE                      2.400 2.297 2.400 2.297
+score FUZZY_WALLET                          3.199 1.239 3.199 1.239
+score GAPPY_GENITALIA                       1.820 0.643 1.820 0.643
 score GAPPY_SALES_LEADS_FREEM               1.000 1.000 1.000 1.000
-score GB_BITCOIN_CP                         1.000 2.149 1.000 2.149
+score GB_BITCOIN_CP                         1.000 1.659 1.000 1.659
 score GB_FAKE_RF_SHORT                      1.999 1.997 1.999 1.997
 score GB_FORGED_MUA_POSTFIX                 1.000 1.000 1.000 1.000
-score GB_FREEMAIL_DISPTO                    0.499 0.498 0.499 0.498
+score GB_FREEMAIL_DISPTO                    0.500 0.498 0.500 0.498
 score GB_FREEMAIL_DISPTO_NOTFREEM           0.499 0.498 0.499 0.498
 score GB_GOOGLE_OBFUR                       0.750 0.750 0.750 0.750
 score GOOGLE_DOCS_PHISH                     1.000 1.000 1.000 1.000
@@ -165,114 +162,114 @@ score GOOGLE_DOC_SUSP
 score GOOGLE_DRIVE_REPLY_BAD_NTLD           1.000 1.000 1.000 1.000
 score GOOG_MALWARE_DNLD                     1.000 1.000 1.000 1.000
 score GOOG_REDIR_HTML_ONLY                  1.999 1.997 1.999 1.997
-score GOOG_REDIR_NORDNS                     2.603 3.125 2.603 3.125
-score GOOG_STO_EMAIL_PHISH                  2.598 2.544 2.598 2.544
-score GOOG_STO_HTML_PHISH                   2.553 1.467 2.553 1.467
+score GOOG_REDIR_NORDNS                     3.390 3.118 3.390 3.118
+score GOOG_STO_EMAIL_PHISH                  2.373 2.262 2.373 2.262
+score GOOG_STO_HTML_PHISH                   1.818 1.893 1.818 1.893
 score GOOG_STO_HTML_PHISH_MANY              1.000 1.000 1.000 1.000
 score GOOG_STO_IMG_HTML                     1.000 1.000 1.000 1.000
-score GOOG_STO_IMG_NOHTML                   2.422 0.980 2.422 0.980
+score GOOG_STO_IMG_NOHTML                   1.774 0.312 1.774 0.312
 score GOOG_STO_NOIMG_HTML                   2.999 2.996 2.999 2.996
-score HAS_X_NO_RELAY                        2.499 2.172 2.499 2.172
-score HAS_X_OUTGOING_SPAM_STAT              1.999 0.414 1.999 0.414
-score HDRS_LCASE                            0.100 0.100 0.100 0.100
-score HDRS_LCASE_IMGONLY                    0.099 0.098 0.099 0.098
-score HDRS_MISSP                            2.500 2.146 2.500 2.146
-score HDR_ORDER_FTSDMCXX_DIRECT             2.000 0.372 2.000 0.372
-score HDR_ORDER_FTSDMCXX_NORDNS             3.013 2.983 3.013 2.983
-score HEADER_FROM_DIFFERENT_DOMAINS         0.249 0.248 0.249 0.248
+score HAS_X_NO_RELAY                        1.000 2.326 1.000 2.326
+score HAS_X_OUTGOING_SPAM_STAT              1.999 0.415 1.999 0.415
+score HDRS_LCASE_IMGONLY                    0.099 0.099 0.099 0.099
+score HDRS_MISSP                            2.499 2.314 2.499 2.314
+score HDR_ORDER_FTSDMCXX_DIRECT             1.999 1.438 1.999 1.438
+score HDR_ORDER_FTSDMCXX_NORDNS             3.020 3.095 3.020 3.095
+score HEADER_FROM_DIFFERENT_DOMAINS         0.249 0.249 0.249 0.249
 score HELO_NO_DOMAIN                        0.001 0.001 0.001 0.001
 score HEXHASH_WORD                          1.000 1.000 1.000 1.000
 score HK_CTE_RAW                            1.000 1.000 1.000 1.000
-score HK_LOTTO                              0.935 0.806 0.935 0.806
-score HK_NAME_FM_MR_MRS                     0.050 1.498 0.050 1.498
-score HK_NAME_FROM                          1.000 0.998 1.000 0.998
+score HK_LOTTO                              0.999 0.402 0.999 0.402
+score HK_NAME_FROM                          0.999 0.998 0.999 0.998
 score HK_NAME_MR_MRS                        1.000 0.998 1.000 0.998
 score HK_RANDOM_ENVFROM                     1.000 0.998 1.000 0.998
-score HK_RANDOM_FROM                        0.999 0.998 0.999 0.998
-score HK_RANDOM_REPLYTO                     0.999 0.999 0.999 0.999
+score HK_RANDOM_FROM                        1.000 0.998 1.000 0.998
+score HK_RANDOM_REPLYTO                     0.999 0.998 0.999 0.998
 score HK_RCVD_IP_MULTICAST                  1.000 1.000 1.000 1.000
-score HK_SCAM                               1.056 1.906 1.056 1.906
-score HK_WIN                                0.459 0.999 0.459 0.999
-score HOSTED_IMG_DIRECT_MX                  3.499 2.977 3.499 2.977
+score HK_SCAM                               0.258 1.642 0.258 1.642
+score HK_WIN                                0.001 0.951 0.001 0.951
+score HOSTED_IMG_DIRECT_MX                  2.602 0.808 2.602 0.808
 score HOSTED_IMG_DQ_UNSUB                   1.000 1.000 1.000 1.000
-score HOSTED_IMG_FREEM                      3.499 2.425 3.499 2.425
+score HOSTED_IMG_FREEM                      3.499 2.423 3.499 2.423
 score HOSTED_IMG_MULTI                      1.000 1.000 1.000 1.000
-score HOSTED_IMG_MULTI_PUB_01               2.999 2.996 2.999 2.996
-score HTML_ENTITY_ASCII                     0.908 0.001 0.908 0.001
+score HOSTED_IMG_MULTI_PUB_01               2.999 2.997 2.999 2.997
+score HTML_ENTITY_ASCII                     0.745 2.044 0.745 2.044
 score HTML_ENTITY_ASCII_TINY                1.000 1.000 1.000 1.000
-score HTML_FONT_TINY_NORDNS                 1.999 1.643 1.999 1.643
-score HTML_OFF_PAGE                         2.999 1.914 2.999 1.914
+score HTML_FONT_TINY_NORDNS                 1.999 1.601 1.999 1.601
+score HTML_OFF_PAGE                         2.999 2.172 2.999 2.172
 score HTML_SHRT_CMNT_OBFU_MANY              1.000 1.000 1.000 1.000
 score HTML_SINGLET_MANY                     1.000 1.604 1.000 1.604
-score HTML_TAG_BALANCE_CENTER               2.149 2.395 2.149 2.395
-score HTML_TEXT_INVISIBLE_FONT              1.000 0.794 1.000 0.794
-score HTML_TEXT_INVISIBLE_STYLE             1.786 2.279 1.786 2.279
-score IMG_ONLY_FM_DOM_INFO                  1.631 0.078 1.631 0.078
-score JH_SPAMMY_HEADERS                     3.500 3.496 3.500 3.496
+score HTML_TAG_BALANCE_CENTER               3.899 2.395 3.899 2.395
+score HTML_TEXT_INVISIBLE_FONT              1.000 1.080 1.000 1.080
+score HTML_TEXT_INVISIBLE_STYLE             1.095 2.325 1.095 2.325
+score IMG_ONLY_FM_DOM_INFO                  1.000 0.312 1.000 0.312
+score JH_SPAMMY_HEADERS                     3.499 3.496 3.499 3.496
 score JH_SPAMMY_PATTERN01                   1.000 1.000 1.000 1.000
 score JH_SPAMMY_PATTERN02                   1.000 1.000 1.000 1.000
-score KHOP_HELO_FCRDNS                      0.400 0.001 0.400 0.001
+score KHOP_HELO_FCRDNS                      0.400 0.009 0.400 0.009
 score LINKEDIN_IMG_NOT_RCVD_LNKN            1.000 1.000 1.000 1.000
 score LIST_PRTL_PUMPDUMP                    1.000 1.000 1.000 1.000
 score LIST_PRTL_SAME_USER                   1.000 1.000 1.000 1.000
-score LONGLN_LOW_CONTRAST                   2.499 2.404 2.499 2.404
+score LONGLN_LOW_CONTRAST                   2.499 2.497 2.499 2.497
 score LONG_HEX_URI                          2.999 0.001 2.999 0.001
-score LONG_IMG_URI                          1.691 0.932 1.691 0.932
-score LONG_INVISIBLE_TEXT                   1.687 1.944 1.687 1.944
+score LONG_IMG_URI                          1.691 0.930 1.691 0.930
+score LONG_INVISIBLE_TEXT                   1.786 1.849 1.786 1.849
 score LOTS_OF_MONEY                         0.010 0.010 0.010 0.010
-score LOTTO_AGENT                           0.639 1.155 0.639 1.155
-score LOTTO_DEPT                            0.001 1.388 0.001 1.388
+score LOTTO_AGENT                           1.139 0.001 1.139 0.001
+score LOTTO_DEPT                            0.001 0.312 0.001 0.312
 score LUCRATIVE                             1.000 1.000 1.000 1.000
 score MALF_HTML_B64                         1.000 1.000 1.000 1.000
 score MALWARE_NORDNS                        0.001 0.001 0.001 0.001
 score MALWARE_PASSWORD                      1.000 1.000 1.000 1.000
-score MALW_ATTACH                           2.499 2.397 2.499 2.397
-score MANY_SPAN_IN_TEXT                     2.499 1.212 2.499 1.212
-score MILLION_HUNDRED                       0.001 1.289 0.001 1.289
+score MALW_ATTACH                           2.399 2.397 2.399 2.397
+score MANY_SPAN_IN_TEXT                     2.499 1.126 2.499 1.126
+score MILLION_HUNDRED                       0.001 1.107 0.001 1.107
 score MILLION_USD                           0.001 0.001 0.001 0.001
 score MIMEOLE_DIRECT_TO_MX                  1.999 1.997 1.999 1.997
-score MIME_NO_TEXT                          1.000 1.000 1.000 1.000
-score MIXED_AREA_CASE                       0.001 0.764 0.001 0.764
-score MIXED_CENTER_CASE                     2.499 1.735 2.499 1.735
-score MIXED_ES                              2.699 1.098 2.699 1.098
-score MIXED_FONT_CASE                       0.690 2.081 0.690 2.081
-score MIXED_HREF_CASE                       1.999 0.001 1.999 0.001
-score MIXED_IMG_CASE                        1.646 2.067 1.646 2.067
+score MIME_NO_TEXT                          1.999 1.000 1.999 1.000
+score MIXED_AREA_CASE                       0.966 0.259 0.966 0.259
+score MIXED_CENTER_CASE                     2.499 2.499 2.499 2.499
+score MIXED_ES                              2.599 1.101 2.599 1.101
+score MIXED_FONT_CASE                       2.194 2.431 2.194 2.431
+score MIXED_HREF_CASE                       0.165 0.365 0.165 0.365
+score MIXED_IMG_CASE                        2.115 0.259 2.115 0.259
 score MONERO_DEADLINE                       1.000 1.000 1.000 1.000
 score MONERO_EXTORT_01                      1.000 1.000 1.000 1.000
 score MONERO_MALWARE                        1.000 1.000 1.000 1.000
 score MONERO_PAY_ME                         1.000 1.000 1.000 1.000
-score MONEY_ATM_CARD                        0.001 0.001 0.001 0.001
+score MONEY_12LTRDOM                        0.099 0.001 0.099 0.001
+score MONEY_ATM_CARD                        1.796 0.001 1.796 0.001
+score MONEY_BARRISTER                       0.001 0.001 0.001 0.001
 score MONEY_FORM                            0.001 0.001 0.001 0.001
-score MONEY_FORM_SHORT                      0.934 0.001 0.934 0.001
-score MONEY_FRAUD_3                         0.107 2.044 0.107 2.044
-score MONEY_FRAUD_5                         0.001 0.001 0.001 0.001
-score MONEY_FRAUD_8                         1.038 0.001 1.038 0.001
-score MONEY_FREEMAIL_REPTO                  2.948 0.001 2.948 0.001
-score MONEY_FROM_41                         1.999 1.948 1.999 1.948
+score MONEY_FORM_SHORT                      2.159 0.001 2.159 0.001
+score MONEY_FRAUD_3                         0.391 1.813 0.391 1.813
+score MONEY_FRAUD_5                         0.382 0.006 0.382 0.006
+score MONEY_FRAUD_8                         3.299 0.001 3.299 0.001
+score MONEY_FREEMAIL_REPTO                  2.447 0.001 2.447 0.001
+score MONEY_FROM_41                         1.999 0.951 1.999 0.951
 score MONEY_FROM_MISSP                      0.001 0.001 0.001 0.001
 score MSGID_DOLLARS_URI_IMG                 1.000 1.000 1.000 1.000
 score MSGID_HDR_MALF                        1.000 1.000 1.000 1.000
+score MSMAIL_PRI_ABNORMAL                   0.398 0.001 0.398 0.001
 score MSM_PRIO_REPTO                        1.000 1.000 1.000 1.000
-score NAME_EMAIL_DIFF                       3.499 3.396 3.499 3.396
-score NA_DOLLARS                            0.292 1.499 0.292 1.499
+score NAME_EMAIL_DIFF                       3.599 3.393 3.599 3.393
+score NA_DOLLARS                            0.795 1.498 0.795 1.498
 score NEWEGG_IMG_NOT_RCVD_NEGG              1.000 1.000 1.000 1.000
 score NEW_PRODUCTS                          1.000 1.000 1.000 1.000
-score NICE_REPLY_A                          -2.421 -3.610 -2.421 -3.610
-score NICE_REPLY_B                          -0.237 -0.001 -0.237 -0.001
-score NORDNS_LOW_CONTRAST                   1.887 0.724 1.887 0.724
+score NICE_REPLY_A                          -4.200 -4.099 -4.200 -4.099
+score NORDNS_LOW_CONTRAST                   1.887 0.771 1.887 0.771
 score NO_FM_NAME_IP_HOSTN                   0.001 0.001 0.001 0.001
 score NSL_RCVD_FROM_USER                    0.001 0.001 0.001 0.001
-score NSL_RCVD_HELO_USER                    1.418 1.875 1.418 1.875
+score NSL_RCVD_HELO_USER                    2.200 1.221 2.200 1.221
 score OBFU_BITCOIN                          1.000 1.000 1.000 1.000
-score OBFU_TEXT_ATTACH                      1.326 1.697 1.326 1.697
-score ODD_FREEM_REPTO                       2.999 2.735 2.999 2.735
+score OBFU_TEXT_ATTACH                      1.499 1.697 1.499 1.697
+score ODD_FREEM_REPTO                       2.999 2.762 2.999 2.762
 score PDS_BTC_ID                            0.499 0.498 0.499 0.498
-score PDS_BTC_MSGID                         0.999 0.121 0.999 0.121
-score PDS_BTC_NTLD                          0.001 1.341 0.001 1.341
-score PDS_DBL_URL_TNB_RUNON                 1.999 1.998 1.999 1.998
+score PDS_BTC_MSGID                         0.999 0.999 0.999 0.999
+score PDS_BTC_NTLD                          1.999 0.527 1.999 0.527
+score PDS_DBL_URL_TNB_RUNON                 2.000 1.997 2.000 1.997
 score PDS_HELO_SPF_FAIL                     0.001 1.000 0.001 1.000
-score PDS_HP_HELO_NORDNS                    1.000 0.998 1.000 0.998
+score PDS_HP_HELO_NORDNS                    0.999 0.998 0.999 0.998
 score PDS_OTHER_BAD_TLD                     1.999 1.997 1.999 1.997
 score PDS_PHPEXP_BOT                        1.499 1.498 1.499 1.498
 score PDS_PHP_EVAL                          1.499 1.498 1.499 1.498
@@ -280,25 +277,25 @@ score PDS_PHP_RUNTIME_FUNC
 score PDS_PRO_TLD                           0.999 0.998 0.999 0.998
 score PDS_RDNS_DYNAMIC_FP                   0.001 0.001 0.001 0.001
 score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE     1.999 1.997 1.999 1.997
-score PHISH_ATTACH                          2.300 2.297 2.300 2.297
+score PHISH_ATTACH                          2.299 2.297 2.299 2.297
 score PHISH_AZURE_CLOUDAPP                  3.500 3.500 3.500 3.500
 score PHISH_FBASEAPP                        1.000 1.000 1.000 1.000
 score PHOTO_EDITING_DIRECT                  1.000 1.000 1.000 1.000
 score PHOTO_EDITING_FREEM                   1.000 1.000 1.000 1.000
 score PHP_NOVER_MUA                         1.000 1.000 1.000 1.000
-score PHP_ORIG_SCRIPT                       2.500 2.047 2.500 2.047
-score PHP_ORIG_SCRIPT_EVAL                  2.999 2.996 2.999 2.996
-score PHP_SCRIPT                            2.499 2.497 2.499 2.497
+score PHP_ORIG_SCRIPT                       2.499 2.037 2.499 2.037
+score PHP_ORIG_SCRIPT_EVAL                  3.000 2.996 3.000 2.996
+score PHP_SCRIPT                            2.499 2.498 2.499 2.498
 score PHP_SCRIPT_MUA                        1.000 1.000 1.000 1.000
 score PP_MIME_FAKE_ASCII_TEXT               0.999 0.001 0.999 0.001
 score PP_TOO_MUCH_UNICODE02                 0.500 0.500 0.500 0.500
 score PP_TOO_MUCH_UNICODE05                 1.000 1.000 1.000 1.000
 score PUMPDUMP                              1.000 1.000 1.000 1.000
 score PUMPDUMP_MULTI                        1.000 1.000 1.000 1.000
-score RAND_HEADER_LIST_SPOOF                3.000 2.812 3.000 2.812
-score RAND_HEADER_MANY                      2.999 1.000 2.999 1.000
-score RAND_MKTG_HEADER                      1.999 1.494 1.999 1.494
-score RATWARE_NO_RDNS                       2.735 2.996 2.735 2.996
+score RAND_HEADER_LIST_SPOOF                2.999 2.819 2.999 2.819
+score RAND_HEADER_MANY                      1.000 1.000 1.000 1.000
+score RAND_MKTG_HEADER                      1.999 1.496 1.999 1.496
+score RATWARE_NO_RDNS                       1.534 2.996 1.534 2.996
 score RCVD_DOTEDU_SHORT                     1.000 1.000 1.000 1.000
 score RCVD_DOTEDU_SUSP_URI                  1.000 1.000 1.000 1.000
 score RCVD_IN_MSPIKE_BL                     0.001 0.001 0.001 0.001
@@ -313,13 +310,13 @@ score RCVD_IN_MSPIKE_L5
 score RCVD_IN_MSPIKE_WL                     0.001 0.001 0.001 0.001
 score RCVD_IN_MSPIKE_ZBI                    0.001 0.001 0.001 0.001
 score RDNS_NUM_TLD_ATCHNX                   1.000 1.000 1.000 1.000
-score RDNS_NUM_TLD_XM                       2.868 1.586 2.868 1.586
+score RDNS_NUM_TLD_XM                       2.722 1.168 2.722 1.168
 score REPLYTO_EMPTY                         2.152 2.696 2.152 2.696
 score REPTO_419_FRAUD                       1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_AOL                   1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_AOL_LOOSE             1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_CNS                   1.000 1.000 1.000 1.000
-score REPTO_419_FRAUD_GM                    2.999 2.996 2.999 2.996
+score REPTO_419_FRAUD_GM                    2.999 2.997 2.999 2.997
 score REPTO_419_FRAUD_GM_LOOSE              1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_HM                    1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_OL                    1.000 1.000 1.000 1.000
@@ -329,17 +326,16 @@ score REPTO_419_FRAUD_YH
 score REPTO_419_FRAUD_YH_LOOSE              1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_YJ                    1.000 1.000 1.000 1.000
 score REPTO_419_FRAUD_YN                    1.000 1.000 1.000 1.000
-score SCC_BODY_URI_ONLY                     2.799 0.148 2.799 0.148
-score SCC_CANSPAM_2                         2.899 2.057 2.899 2.057
-score SCC_ISEMM_LID_1                       3.499 1.905 3.499 1.905
-score SCC_SPAMMER_ADDR_2                    2.084 0.804 2.084 0.804
+score SCC_CANSPAM_2                         2.999 1.790 2.999 1.790
+score SCC_ISEMM_LID_1                       1.879 2.144 1.879 2.144
+score SCC_SPAMMER_ADDR_2                    2.399 1.269 2.399 1.269
 score SCRIPT_GIBBERISH                      2.699 2.696 2.699 2.696
-score SENDGRID_REDIR                        1.488 0.001 1.488 0.001
+score SENDGRID_REDIR                        1.499 0.001 1.499 0.001
 score SENDGRID_REDIR_PHISH                  1.000 1.000 1.000 1.000
 score SEO_SUSP_NTLD                         1.000 1.000 1.000 1.000
-score SERGIO_SUBJECT_VIAGRA01               4.099 1.469 4.099 1.469
-score SHOPIFY_IMG_NOT_RCVD_SFY              1.548 2.497 1.548 2.497
-score SHORTENER_SHORT_IMG                   0.001 1.281 0.001 1.281
+score SERGIO_SUBJECT_VIAGRA01               2.312 1.408 2.312 1.408
+score SHOPIFY_IMG_NOT_RCVD_SFY              2.033 2.497 2.033 2.497
+score SHORTENER_SHORT_IMG                   0.001 1.438 0.001 1.438
 score SHORT_IMG_SUSP_NTLD                   1.000 1.000 1.000 1.000
 score SHORT_SHORTNER                        1.999 1.997 1.999 1.997
 score SPOOFED_FREEMAIL                      0.001 1.997 0.001 1.997
@@ -347,42 +343,41 @@ score SPOOFED_FREEMAIL_NO_RDNS
 score SPOOFED_FREEM_REPTO                   0.001 2.497 0.001 2.497
 score SPOOFED_FREEM_REPTO_CHN               0.001 1.000 0.001 1.000
 score SPOOFED_FREEM_REPTO_RUS               0.001 1.000 0.001 1.000
-score SPOOF_GMAIL_MID                       1.000 0.723 1.000 0.723
-score STATIC_XPRIO_OLE                      0.001 0.001 0.001 0.001
+score SPOOF_GMAIL_MID                       1.000 0.664 1.000 0.664
+score STATIC_XPRIO_OLE                      0.148 0.001 0.148 0.001
 score STOCK_TIP                             1.000 1.000 1.000 1.000
-score STOX_BOUND_090909_B                   0.769 1.420 0.769 1.420
+score STOX_BOUND_090909_B                   0.465 1.041 0.465 1.041
 score STY_INVIS_DIRECT                      2.499 2.497 2.499 2.497
-score SUBJ_ATTENTION                        0.499 0.499 0.499 0.499
+score SUBJ_ATTENTION                        0.500 0.498 0.500 0.498
 score SUBJ_BRKN_WORDNUMS                    1.000 1.000 1.000 1.000
 score SURBL_BLOCKED                         0.001 0.001 0.001 0.001
 score SUSPNTLD_EXPIRATION_EXTORT            1.000 1.000 1.000 1.000
-score SUSP_UTF8_WORD_FROM                   1.999 1.999 1.999 1.999
+score SUSP_UTF8_WORD_FROM                   1.999 0.843 1.999 0.843
 score SUSP_UTF8_WORD_SUBJ                   1.999 1.997 1.999 1.997
 score SYSADMIN                              1.000 1.000 1.000 1.000
 score TAGSTAT_IMG_NOT_RCVD_TGST             1.000 1.000 1.000 1.000
 score TARINGANET_IMG_NOT_RCVD_TN            1.000 1.000 1.000 1.000
-score THIS_AD                               1.599 1.266 1.599 1.266
-score THIS_IS_ADV_SUSP_NTLD                 1.141 1.000 1.141 1.000
+score THIS_AD                               1.599 1.263 1.599 1.263
+score THIS_IS_ADV_SUSP_NTLD                 0.897 1.000 0.897 1.000
 score TONLINE_FAKE_DKIM                     1.000 1.000 1.000 1.000
 score TO_EQ_FM_DIRECT_MX                    1.000 1.000 1.000 1.000
 score TO_EQ_FM_DOM_SPF_FAIL                 0.001 0.001 0.001 0.001
 score TO_EQ_FM_SPF_FAIL                     0.001 0.001 0.001 0.001
 score TO_IN_SUBJ                            0.100 0.100 0.100 0.100
-score TO_NAME_SUBJ_NO_RDNS                  2.537 1.786 2.537 1.786
+score TO_NAME_SUBJ_NO_RDNS                  2.953 1.926 2.953 1.926
 score TO_NO_BRKTS_FROM_MSSP                 2.499 2.497 2.499 2.497
-score TO_NO_BRKTS_HTML_IMG                  1.999 0.774 1.999 0.774
-score TO_NO_BRKTS_HTML_ONLY                 2.000 1.997 2.000 1.997
-score TO_NO_BRKTS_NORDNS_HTML               1.999 1.203 1.999 1.203
+score TO_NO_BRKTS_HTML_IMG                  2.000 0.791 2.000 0.791
+score TO_NO_BRKTS_HTML_ONLY                 1.999 1.997 1.999 1.997
+score TO_NO_BRKTS_NORDNS_HTML               1.999 1.201 1.999 1.201
 score TO_NO_BRKTS_PCNT                      2.499 2.497 2.499 2.497
 score TRANSFORM_LIFE                        2.499 2.497 2.499 2.497
 score TUMBLR_IMG_NOT_RCVD_TUMB              1.000 1.000 1.000 1.000
-score TVD_PH_BODY_META                      2.999 0.591 2.999 0.591
-score TVD_SPACE_ENCODED                     1.000 0.001 1.000 0.001
+score TVD_PH_BODY_META                      2.999 2.351 2.999 2.351
 score TW_GIBBERISH_MANY                     1.000 1.000 1.000 1.000
 score UC_GIBBERISH_OBFU                     1.000 1.000 1.000 1.000
-score UNDISC_FREEM                          3.699 3.595 3.699 3.595
-score UNDISC_MONEY                          3.699 2.197 3.699 2.197
-score UNICODE_OBFU_ASC                      2.499 2.498 2.499 2.498
+score UNDISC_FREEM                          3.699 3.596 3.699 3.596
+score UNDISC_MONEY                          3.435 2.241 3.435 2.241
+score UNICODE_OBFU_ASC                      2.500 2.497 2.500 2.497
 score UNICODE_OBFU_ZW                       1.000 1.000 1.000 1.000
 score UNSUB_GOOG_FORM                       2.499 2.497 2.499 2.497
 score URI_ADOBESPARK                        1.000 1.000 1.000 1.000
@@ -392,36 +387,36 @@ score URI_DATA
 score URI_DOTEDU                            1.000 1.000 1.000 1.000
 score URI_DOTEDU_ENTITY                     1.000 1.000 1.000 1.000
 score URI_FIREBASEAPP                       2.999 2.996 2.999 2.996
-score URI_GOOGLE_PROXY                      2.899 2.796 2.899 2.796
-score URI_GOOG_STO_SPAMMY                   2.893 1.083 2.893 1.083
+score URI_GOOGLE_PROXY                      2.799 2.796 2.799 2.796
+score URI_GOOG_STO_SPAMMY                   2.999 1.887 2.999 1.887
 score URI_HEX_IP                            1.000 1.000 1.000 1.000
 score URI_IMG_WP_REDIR                      1.000 1.000 1.000 1.000
-score URI_IN_URI_10                         3.699 2.877 3.699 2.877
+score URI_IN_URI_10                         3.600 2.877 3.600 2.877
 score URI_LONG_REPEAT                       1.000 1.000 1.000 1.000
-score URI_OBFU_DOM                          2.199 2.297 2.199 2.297
-score URI_ONLY_MSGID_MALF                   1.000 1.134 1.000 1.134
+score URI_OBFU_DOM                          2.299 2.297 2.299 2.297
+score URI_ONLY_MSGID_MALF                   1.000 0.655 1.000 0.655
 score URI_OPTOUT_3LD                        1.000 1.000 1.000 1.000
-score URI_PHISH                             3.999 3.790 3.999 3.790
-score URI_PHP_REDIR                         3.499 3.169 3.499 3.169
-score URI_TRY_3LD                           1.581 1.997 1.581 1.997
+score URI_PHISH                             3.999 3.788 3.999 3.788
+score URI_PHP_REDIR                         3.499 3.160 3.499 3.160
+score URI_TRY_3LD                           1.948 1.997 1.948 1.997
 score URI_TRY_USME                          1.000 1.000 1.000 1.000
 score URI_WPADMIN                           2.699 2.696 2.699 2.696
 score URI_WP_DIRINDEX                       1.000 1.000 1.000 1.000
 score URI_WP_HACKED                         1.000 3.496 1.000 3.496
-score URI_WP_HACKED_2                       2.499 0.872 2.499 0.872
+score URI_WP_HACKED_2                       2.499 0.931 2.499 0.931
 score USB_DRIVES                            1.000 1.000 1.000 1.000
 score USER_IN_DKIM_WELCOMELIST              0.001 0.001 0.001 0.001
-score VFY_ACCT_NORDNS                       2.932 2.781 2.932 2.781
+score US_DOLLARS_3                          1.036 0.001 1.036 0.001
+score VFY_ACCT_NORDNS                       2.992 2.848 2.992 2.848
 score VPS_NO_NTLD                           1.000 1.000 1.000 1.000
 score WALMART_IMG_NOT_RCVD_WAL              1.000 1.000 1.000 1.000
-score WANT_TO_ORDER                         1.000 1.000 1.000 1.000
-score WORD_INVIS                            1.989 0.584 1.989 0.584
-score WORD_INVIS_MANY                       3.000 2.815 3.000 2.815
-score XFER_LOTSA_MONEY                      0.781 0.157 0.781 0.157
+score WORD_INVIS                            1.845 0.665 1.845 0.665
+score WORD_INVIS_MANY                       2.999 1.883 2.999 1.883
+score XFER_LOTSA_MONEY                      0.499 0.001 0.499 0.001
 score XM_DIGITS_ONLY                        1.000 1.000 1.000 1.000
-score XM_LIGHT_HEAVY                        2.500 2.497 2.500 2.497
-score XM_RANDOM                             2.499 2.497 2.499 2.497
+score XM_LIGHT_HEAVY                        2.499 2.497 2.499 2.497
+score XM_RANDOM                             2.499 2.498 2.499 2.498
 score XM_RECPTID                            2.999 2.996 2.999 2.996
-score XPRIO                                 1.000 1.311 1.000 1.311
+score XPRIO                                 1.000 1.806 1.000 1.806
 score XPRIO_SHORT_SUBJ                      1.000 1.000 1.000 1.000
-score YOU_INHERIT                           2.599 2.391 2.599 2.391
+score YOU_INHERIT                           2.599 2.159 2.599 2.159

Modified: spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set0
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set0?rev=1900061&r1=1900060&r2=1900061&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set0 (original)
+++ spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set0 Wed Apr 20 06:01:14 2022
@@ -1,229 +1,227 @@
-# Using score set 0 logs for revision 1899935 from:
-# ham-darxus.r1899935.log ham-ena-week0.r1899935.log ham-ena-week1.r1899935.log ham-ena-week2.r1899935.log ham-ena-week3.r1899935.log ham-ena-week4.r1899935.log ham-giovanni-ham.r1899935.log ham-giovanni-spammy.r1899935.log ham-giovanni-spam.r1899935.log ham-hege.r1899935.log ham-llanga.r1899935.log ham-mmiroslaw-mails-ham.r1899935.log ham-mmiroslaw-mails-spam.r1899935.log ham-pds.r1899935.log ham-spamsponge.r1899935.log ham-thendrikx.r1899935.log spam-darxus.r1899935.log spam-ena-week0.r1899935.log spam-ena-week1.r1899935.log spam-ena-week2.r1899935.log spam-ena-week3.r1899935.log spam-ena-week4.r1899935.log spam-giovanni-ham.r1899935.log spam-giovanni-spammy.r1899935.log spam-giovanni-spam.r1899935.log spam-hege.r1899935.log spam-llanga.r1899935.log spam-mmiroslaw-mails-ham.r1899935.log spam-mmiroslaw-mails-spam.r1899935.log spam-pds.r1899935.log spam-spamsponge.r1899935.log spam-thendrikx.r1899935.log
+# Using score set 0 logs for revision 1900020 from:
+# ham-darxus.r1900020.log ham-ena-week0.r1900020.log ham-ena-week1.r1900020.log ham-ena-week2.r1900020.log ham-ena-week3.r1900020.log ham-ena-week4.r1900020.log ham-giovanni-ham.r1900020.log ham-giovanni-spammy.r1900020.log ham-giovanni-spam.r1900020.log ham-hege.r1900020.log ham-llanga.r1900020.log ham-mmiroslaw-mails-ham.r1900020.log ham-mmiroslaw-mails-spam.r1900020.log ham-pds.r1900020.log ham-spamsponge.r1900020.log ham-thendrikx.r1900020.log spam-darxus.r1900020.log spam-ena-week0.r1900020.log spam-ena-week1.r1900020.log spam-ena-week2.r1900020.log spam-ena-week3.r1900020.log spam-ena-week4.r1900020.log spam-giovanni-ham.r1900020.log spam-giovanni-spammy.r1900020.log spam-giovanni-spam.r1900020.log spam-hege.r1900020.log spam-llanga.r1900020.log spam-mmiroslaw-mails-ham.r1900020.log spam-mmiroslaw-mails-spam.r1900020.log spam-pds.r1900020.log spam-spamsponge.r1900020.log spam-thendrikx.r1900020.log
 
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001
-score AC_FROM_MANY_DOTS              3.000
+score AC_FROM_MANY_DOTS              2.999
 score AC_HTML_NONSENSE_TAGS          1.999
 score ADMITS_SPAM                    3.799
-score ADVANCE_FEE_2_NEW_FRM_MNY      1.073
+score ADVANCE_FEE_2_NEW_FRM_MNY      1.745
 score ADVANCE_FEE_2_NEW_MONEY        1.999
-score ADVANCE_FEE_3_NEW              3.499
-score ADVANCE_FEE_3_NEW_FRM_MNY      1.568
-score ADVANCE_FEE_3_NEW_MONEY        2.999
-score ADVANCE_FEE_4_NEW              2.499
+score ADVANCE_FEE_3_NEW              3.301
+score ADVANCE_FEE_3_NEW_FRM_MNY      1.090
+score ADVANCE_FEE_3_NEW_MONEY        2.899
+score ADVANCE_FEE_4_NEW              2.399
 score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_4_NEW_MONEY        1.610
+score ADVANCE_FEE_4_NEW_MONEY        0.688
 score ADVANCE_FEE_5_NEW              2.399
 score ADVANCE_FEE_5_NEW_FRM_MNY      0.001
 score ADVANCE_FEE_5_NEW_MONEY        0.001
-score AD_PREFS                       0.118
+score AD_PREFS                       0.001
 score AMAZON_IMG_NOT_RCVD_AMZN       2.499
 score APP_DEVELOPMENT_NORDNS         1.999
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.972
-score BIGNUM_EMAILS_FREEM            2.214
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.297
+score BIGNUM_EMAILS_FREEM            1.292
 score BIGNUM_EMAILS_MANY             2.999
-score BILLION_OVERLAP                -0.689
-score BITCOIN_DEADLINE               2.053
-score BITCOIN_EXTORT_01              4.999
+score BILLION_OVERLAP                -0.285
+score BITCOIN_DEADLINE               2.734
+score BITCOIN_EXTORT_01              4.499
+score BITCOIN_IMGUR                  2.894
 score BITCOIN_MALF_HTML              3.499
-score BITCOIN_OBFU_SUBJ              3.030
 score BITCOIN_SPAM_02                2.499
+score BITCOIN_SPAM_03                2.499
 score BITCOIN_SPAM_04                1.499
 score BITCOIN_SPAM_09                1.499
 score BITCOIN_XPRIO                  2.499
-score BITCOIN_YOUR_INFO              2.999
-score BODY_EMPTY                     1.152
-score BODY_SINGLE_URI                2.202
+score BITCOIN_YOUR_INFO              3.000
+score BODY_EMPTY                     1.555
+score BODY_SINGLE_URI                1.355
 score BOGUS_MIME_VERSION             3.499
-score BOGUS_MSM_HDRS                 1.889
-score CK_HELO_GENERIC                0.249
-score CONTENT_AFTER_HTML             2.500
-score CONTENT_AFTER_HTML_WEAK        1.499
-score CTE_8BIT_MISMATCH              0.999
+score BOGUS_MSM_HDRS                 0.578
+score CK_HELO_GENERIC                0.250
+score CONTENT_AFTER_HTML             2.137
+score CONTENT_AFTER_HTML_WEAK        1.500
+score CTE_8BIT_MISMATCH              1.000
 score DEAR_BENEFICIARY               0.001
-score DOS_RCVD_IP_TWICE_B            2.000
-score FAKE_REPLY_A1                  0.001
-score FAKE_REPLY_B                   2.699
+score DOS_RCVD_IP_TWICE_B            1.999
+score FAKE_REPLY_A1                  0.929
+score FAKE_REPLY_B                   2.499
 score FILL_THIS_FORM                 1.799
 score FONT_INVIS_DIRECT              0.001
-score FONT_INVIS_HTML_NOHTML         3.000
-score FONT_INVIS_LONG_LINE           1.545
-score FONT_INVIS_MSGID               0.001 # force non-zero
-score FONT_INVIS_NORDNS              0.612
-score FONT_INVIS_POSTEXTRAS          2.896
-score FORGED_RELAY_MUA_TO_MX         2.034
+score FONT_INVIS_HTML_NOHTML         2.999
+score FONT_INVIS_LONG_LINE           1.677
+score FONT_INVIS_MSGID               0.890
+score FONT_INVIS_NORDNS              0.936
+score FONT_INVIS_POSTEXTRAS          0.782
 score FORM_FRAUD_5                   0.001
 score FOUND_YOU                      3.249
-score FREEMAIL_FORGED_FROMDOMAIN     0.250
+score FREEMAIL_FORGED_FROMDOMAIN     0.249
 score FROMSPACE                      3.499
-score FROM_2_EMAILS_SHORT            1.495
+score FROM_2_EMAILS_SHORT            1.397
 score FROM_ADDR_WS                   2.999
 score FROM_MISSPACED                 1.999
-score FROM_MISSP_DYNIP               1.411
+score FROM_MISSP_DYNIP               1.243
 score FROM_MISSP_EH_MATCH            1.999
-score FROM_MISSP_FREEMAIL            3.199
+score FROM_MISSP_FREEMAIL            3.099
 score FROM_MISSP_MSFT                0.001
-score FROM_MISSP_PHISH               2.837
-score FROM_MISSP_TO_UNDISC           0.631
+score FROM_MISSP_PHISH               2.813
+score FROM_MISSP_TO_UNDISC           1.535
 score FROM_MISSP_USER                0.001
-score FROM_MISSP_XPRIO               0.001
-score FROM_MULTI_NORDNS              1.396
-score FROM_NTLD_REPLY_FREEMAIL       1.930
-score FROM_SUSPICIOUS_NTLD           0.499
+score FROM_MULTI_NORDNS              2.500
+score FROM_NTLD_REPLY_FREEMAIL       1.841
+score FROM_SUSPICIOUS_NTLD           0.500
 score FROM_SUSPICIOUS_NTLD_FP        1.999
-score FROM_UNBAL1                    2.075
+score FROM_UNBAL1                    2.199
 score FROM_UNBAL2                    2.199
-score FROM_WSP_TRAIL                 2.299
+score FROM_WSP_TRAIL                 2.200
 score FSL_CTYPE_WIN1251              0.001
-score FSL_NEW_HELO_USER              0.001
-score FUZZY_AMAZON                   2.199
-score FUZZY_CLICK_HERE               2.299
+score FSL_NEW_HELO_USER              0.001 # force non-zero
+score FUZZY_AMAZON                   2.299
+score FUZZY_CLICK_HERE               2.400
 score FUZZY_WALLET                   3.199
-score GAPPY_GENITALIA                2.240
+score GAPPY_GENITALIA                1.820
 score GB_FAKE_RF_SHORT               1.999
-score GB_FREEMAIL_DISPTO             0.499
+score GB_FREEMAIL_DISPTO             0.500
 score GB_FREEMAIL_DISPTO_NOTFREEM    0.499
 score GOOG_REDIR_HTML_ONLY           1.999
-score GOOG_REDIR_NORDNS              2.603
-score GOOG_STO_EMAIL_PHISH           2.598
-score GOOG_STO_HTML_PHISH            2.553
-score GOOG_STO_IMG_NOHTML            2.422
+score GOOG_REDIR_NORDNS              3.390
+score GOOG_STO_EMAIL_PHISH           2.373
+score GOOG_STO_HTML_PHISH            1.818
+score GOOG_STO_IMG_NOHTML            1.774
 score GOOG_STO_NOIMG_HTML            2.999
-score HAS_X_NO_RELAY                 2.499
 score HAS_X_OUTGOING_SPAM_STAT       1.999
 score HDRS_LCASE_IMGONLY             0.099
-score HDRS_MISSP                     2.500
-score HDR_ORDER_FTSDMCXX_DIRECT      2.000
-score HDR_ORDER_FTSDMCXX_NORDNS      3.013
+score HDRS_MISSP                     2.499
+score HDR_ORDER_FTSDMCXX_DIRECT      1.999
+score HDR_ORDER_FTSDMCXX_NORDNS      3.020
 score HEADER_FROM_DIFFERENT_DOMAINS  0.249
 score HELO_NO_DOMAIN                 0.001
-score HK_LOTTO                       0.935
-score HK_NAME_FM_MR_MRS              0.050
-score HK_NAME_FROM                   1.000
+score HK_LOTTO                       0.999
+score HK_NAME_FROM                   0.999
 score HK_NAME_MR_MRS                 1.000
 score HK_RANDOM_ENVFROM              1.000
-score HK_RANDOM_FROM                 0.999
+score HK_RANDOM_FROM                 1.000
 score HK_RANDOM_REPLYTO              0.999
-score HK_SCAM                        1.056
-score HK_WIN                         0.459
-score HOSTED_IMG_DIRECT_MX           3.499
+score HK_SCAM                        0.258
+score HK_WIN                         0.001
+score HOSTED_IMG_DIRECT_MX           2.602
 score HOSTED_IMG_FREEM               3.499
 score HOSTED_IMG_MULTI_PUB_01        2.999
-score HTML_ENTITY_ASCII              0.908
+score HTML_ENTITY_ASCII              0.745
 score HTML_FONT_TINY_NORDNS          1.999
 score HTML_OFF_PAGE                  2.999
-score HTML_TAG_BALANCE_CENTER        2.149
-score HTML_TEXT_INVISIBLE_STYLE      1.786
-score IMG_ONLY_FM_DOM_INFO           1.631
-score JH_SPAMMY_HEADERS              3.500
+score HTML_TAG_BALANCE_CENTER        3.899
+score HTML_TEXT_INVISIBLE_STYLE      1.095
+score JH_SPAMMY_HEADERS              3.499
 score LONGLN_LOW_CONTRAST            2.499
 score LONG_HEX_URI                   2.999
 score LONG_IMG_URI                   1.691
-score LONG_INVISIBLE_TEXT            1.687
+score LONG_INVISIBLE_TEXT            1.786
 score LOTS_OF_MONEY                  0.010
-score LOTTO_AGENT                    0.639
-score LOTTO_DEPT                     0.001 # force non-zero
+score LOTTO_AGENT                    1.139
+score LOTTO_DEPT                     0.001
 score MALWARE_NORDNS                 0.001
-score MALW_ATTACH                    2.499
+score MALW_ATTACH                    2.399
 score MANY_SPAN_IN_TEXT              2.499
 score MILLION_HUNDRED                0.001
 score MILLION_USD                    0.001
 score MIMEOLE_DIRECT_TO_MX           1.999
-score MIXED_AREA_CASE                0.001
+score MIME_NO_TEXT                   1.999
+score MIXED_AREA_CASE                0.966
 score MIXED_CENTER_CASE              2.499
-score MIXED_ES                       2.699
-score MIXED_FONT_CASE                0.690
-score MIXED_HREF_CASE                1.999
-score MIXED_IMG_CASE                 1.646
-score MONEY_ATM_CARD                 0.001
-score MONEY_FORM                     0.001 # force non-zero
-score MONEY_FORM_SHORT               0.934
-score MONEY_FRAUD_3                  0.107
-score MONEY_FRAUD_5                  0.001 # force non-zero
-score MONEY_FRAUD_8                  1.038
-score MONEY_FREEMAIL_REPTO           2.948
+score MIXED_ES                       2.599
+score MIXED_FONT_CASE                2.194
+score MIXED_HREF_CASE                0.165
+score MIXED_IMG_CASE                 2.115
+score MONEY_12LTRDOM                 0.099
+score MONEY_ATM_CARD                 1.796
+score MONEY_BARRISTER                0.001
+score MONEY_FORM                     0.001
+score MONEY_FORM_SHORT               2.159
+score MONEY_FRAUD_3                  0.391
+score MONEY_FRAUD_5                  0.382
+score MONEY_FRAUD_8                  3.299
+score MONEY_FREEMAIL_REPTO           2.447
 score MONEY_FROM_41                  1.999
 score MONEY_FROM_MISSP               0.001
-score NAME_EMAIL_DIFF                3.499
-score NA_DOLLARS                     0.292
-score NICE_REPLY_A                   -2.421
-score NICE_REPLY_B                   -0.237
+score MSMAIL_PRI_ABNORMAL            0.398
+score NAME_EMAIL_DIFF                3.599
+score NA_DOLLARS                     0.795
+score NICE_REPLY_A                   -4.200
 score NORDNS_LOW_CONTRAST            1.887
 score NO_FM_NAME_IP_HOSTN            0.001
 score NSL_RCVD_FROM_USER             0.001
-score NSL_RCVD_HELO_USER             1.418
-score OBFU_TEXT_ATTACH               1.326
+score NSL_RCVD_HELO_USER             2.200
+score OBFU_TEXT_ATTACH               1.499
 score ODD_FREEM_REPTO                2.999
 score PDS_BTC_ID                     0.499
 score PDS_BTC_MSGID                  0.999
-score PDS_BTC_NTLD                   0.001
-score PDS_DBL_URL_TNB_RUNON          1.999
-score PDS_HP_HELO_NORDNS             1.000
+score PDS_BTC_NTLD                   1.999
+score PDS_DBL_URL_TNB_RUNON          2.000
+score PDS_HP_HELO_NORDNS             0.999
 score PDS_OTHER_BAD_TLD              1.999
 score PDS_PHPEXP_BOT                 1.499
 score PDS_PHP_EVAL                   1.499
 score PDS_PRO_TLD                    0.999
 score PDS_RDNS_DYNAMIC_FP            0.001 # force non-zero
 score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
-score PHISH_ATTACH                   2.300
-score PHP_ORIG_SCRIPT                2.500
-score PHP_ORIG_SCRIPT_EVAL           2.999
+score PHISH_ATTACH                   2.299
+score PHP_ORIG_SCRIPT                2.499
+score PHP_ORIG_SCRIPT_EVAL           3.000
 score PHP_SCRIPT                     2.499
 score PP_MIME_FAKE_ASCII_TEXT        0.999
-score RAND_HEADER_LIST_SPOOF         3.000
-score RAND_HEADER_MANY               2.999
+score RAND_HEADER_LIST_SPOOF         2.999
 score RAND_MKTG_HEADER               1.999
-score RATWARE_NO_RDNS                2.735
-score RDNS_NUM_TLD_XM                2.868
+score RATWARE_NO_RDNS                1.534
+score RDNS_NUM_TLD_XM                2.722
 score REPLYTO_EMPTY                  2.152
 score REPTO_419_FRAUD_GM             2.999
-score SCC_BODY_URI_ONLY              2.799
-score SCC_CANSPAM_2                  2.899
-score SCC_ISEMM_LID_1                3.499
-score SCC_SPAMMER_ADDR_2             2.084
+score SCC_CANSPAM_2                  2.999
+score SCC_ISEMM_LID_1                1.879
+score SCC_SPAMMER_ADDR_2             2.399
 score SCRIPT_GIBBERISH               2.699
-score SENDGRID_REDIR                 1.488
-score SERGIO_SUBJECT_VIAGRA01        4.099
-score SHOPIFY_IMG_NOT_RCVD_SFY       1.548
+score SENDGRID_REDIR                 1.499
+score SERGIO_SUBJECT_VIAGRA01        2.312
+score SHOPIFY_IMG_NOT_RCVD_SFY       2.033
 score SHORTENER_SHORT_IMG            0.001
 score SHORT_SHORTNER                 1.999
-score STATIC_XPRIO_OLE               0.001
-score STOX_BOUND_090909_B            0.769
+score STATIC_XPRIO_OLE               0.148
+score STOX_BOUND_090909_B            0.465
 score STY_INVIS_DIRECT               2.499
-score SUBJ_ATTENTION                 0.499
+score SUBJ_ATTENTION                 0.500
 score SUSP_UTF8_WORD_FROM            1.999
 score SUSP_UTF8_WORD_SUBJ            1.999
 score THIS_AD                        1.599
-score THIS_IS_ADV_SUSP_NTLD          1.141
-score TO_NAME_SUBJ_NO_RDNS           2.537
+score THIS_IS_ADV_SUSP_NTLD          0.897
+score TO_NAME_SUBJ_NO_RDNS           2.953
 score TO_NO_BRKTS_FROM_MSSP          2.499
-score TO_NO_BRKTS_HTML_IMG           1.999
-score TO_NO_BRKTS_HTML_ONLY          2.000
+score TO_NO_BRKTS_HTML_IMG           2.000
+score TO_NO_BRKTS_HTML_ONLY          1.999
 score TO_NO_BRKTS_NORDNS_HTML        1.999
 score TO_NO_BRKTS_PCNT               2.499
 score TRANSFORM_LIFE                 2.499
 score TVD_PH_BODY_META               2.999
 score UNDISC_FREEM                   3.699
-score UNDISC_MONEY                   3.699
-score UNICODE_OBFU_ASC               2.499
+score UNDISC_MONEY                   3.435
+score UNICODE_OBFU_ASC               2.500
 score UNSUB_GOOG_FORM                2.499
 score URI_FIREBASEAPP                2.999
-score URI_GOOGLE_PROXY               2.899
-score URI_GOOG_STO_SPAMMY            2.893
-score URI_IN_URI_10                  3.699
-score URI_OBFU_DOM                   2.199
+score URI_GOOGLE_PROXY               2.799
+score URI_GOOG_STO_SPAMMY            2.999
+score URI_IN_URI_10                  3.600
+score URI_OBFU_DOM                   2.299
 score URI_PHISH                      3.999
 score URI_PHP_REDIR                  3.499
-score URI_TRY_3LD                    1.581
+score URI_TRY_3LD                    1.948
 score URI_WPADMIN                    2.699
 score URI_WP_HACKED_2                2.499
-score VFY_ACCT_NORDNS                2.932
-score WORD_INVIS                     1.989
-score WORD_INVIS_MANY                3.000
-score XFER_LOTSA_MONEY               0.781
-score XM_LIGHT_HEAVY                 2.500
+score US_DOLLARS_3                   1.036
+score VFY_ACCT_NORDNS                2.992
+score WORD_INVIS                     1.845
+score WORD_INVIS_MANY                2.999
+score XFER_LOTSA_MONEY               0.499
+score XM_LIGHT_HEAVY                 2.499
 score XM_RANDOM                      2.499
 score XM_RECPTID                     2.999
 score YOU_INHERIT                    2.599
@@ -237,19 +235,18 @@ score AC_SPAMMY_URI_PATTERNS3        1.0
 score AC_SPAMMY_URI_PATTERNS4        1.000
 score AC_SPAMMY_URI_PATTERNS8        1.000
 score AC_SPAMMY_URI_PATTERNS9        1.000
-score ADULT_DATING_COMPANY           10.001 # force non-zero
+score ADULT_DATING_COMPANY           10.000
 score ADVANCE_FEE_2_NEW_FORM         1.000
 score ALIBABA_IMG_NOT_RCVD_ALI       1.000
 score APP_DEVELOPMENT_FREEM          1.000
 score BEBEE_IMG_NOT_RCVD_BB          1.000
 score BITCOIN_BOMB                   1.000
 score BITCOIN_EXTORT_02              1.000
-score BITCOIN_IMGUR                  1.000
 score BITCOIN_MALWARE                1.000
+score BITCOIN_OBFU_SUBJ              1.000
 score BITCOIN_ONAN                   1.000
 score BITCOIN_PAY_ME                 1.000
 score BITCOIN_SPAM_01                1.000
-score BITCOIN_SPAM_03                1.000
 score BITCOIN_SPAM_06                1.000
 score BITCOIN_SPAM_07                1.000
 score BITCOIN_SPAM_08                1.000
@@ -277,7 +274,6 @@ score FONT_INVIS_DOTGOV              1.0
 score FORM_FRAUD                     1.000
 score FREEM_FRNUM_UNICD_EMPTY        1.000
 score FRNAME_IN_MSG_XPRIO_NO_SUB     1.000
-score FROM_MISSP_REPLYTO             1.000
 score FROM_NTLD_LINKBAIT             1.000
 score FROM_NUMERIC_TLD               1.000
 score GAPPY_SALES_LEADS_FREEM        1.000
@@ -291,7 +287,7 @@ score GOOGLE_DRIVE_REPLY_BAD_NTLD    1.0
 score GOOG_MALWARE_DNLD              1.000
 score GOOG_STO_HTML_PHISH_MANY       1.000
 score GOOG_STO_IMG_HTML              1.000
-score HDRS_LCASE                     0.100
+score HAS_X_NO_RELAY                 1.000
 score HEXHASH_WORD                   1.000
 score HK_CTE_RAW                     1.000
 score HK_RCVD_IP_MULTICAST           1.000
@@ -301,6 +297,7 @@ score HTML_ENTITY_ASCII_TINY         1.0
 score HTML_SHRT_CMNT_OBFU_MANY       1.000
 score HTML_SINGLET_MANY              1.000
 score HTML_TEXT_INVISIBLE_FONT       1.000
+score IMG_ONLY_FM_DOM_INFO           1.000
 score JH_SPAMMY_PATTERN01            1.000
 score JH_SPAMMY_PATTERN02            1.000
 score KHOP_HELO_FCRDNS               0.400
@@ -310,7 +307,6 @@ score LIST_PRTL_SAME_USER            1.0
 score LUCRATIVE                      1.000
 score MALF_HTML_B64                  1.000
 score MALWARE_PASSWORD               1.000
-score MIME_NO_TEXT                   1.000
 score MONERO_DEADLINE                1.000
 score MONERO_EXTORT_01               1.000
 score MONERO_MALWARE                 1.000
@@ -332,6 +328,7 @@ score PP_TOO_MUCH_UNICODE02          0.5
 score PP_TOO_MUCH_UNICODE05          1.000
 score PUMPDUMP                       1.000
 score PUMPDUMP_MULTI                 1.000
+score RAND_HEADER_MANY               1.000
 score RCVD_DOTEDU_SHORT              1.000
 score RCVD_DOTEDU_SUSP_URI           1.000
 score RDNS_NUM_TLD_ATCHNX            1.000
@@ -363,7 +360,6 @@ score TONLINE_FAKE_DKIM              1.0
 score TO_EQ_FM_DIRECT_MX             1.000
 score TO_IN_SUBJ                     0.100
 score TUMBLR_IMG_NOT_RCVD_TUMB       1.000
-score TVD_SPACE_ENCODED              1.000
 score TW_GIBBERISH_MANY              1.000
 score UC_GIBBERISH_OBFU              1.000
 score UNICODE_OBFU_ZW                1.000
@@ -384,7 +380,6 @@ score URI_WP_HACKED                  1.0
 score USB_DRIVES                     1.000
 score VPS_NO_NTLD                    1.000
 score WALMART_IMG_NOT_RCVD_WAL       1.000
-score WANT_TO_ORDER                  1.000
 score XM_DIGITS_ONLY                 1.000
 score XPRIO                          1.000
 score XPRIO_SHORT_SUBJ               1.000