You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by sp...@apache.org on 2014/06/23 04:34:00 UTC

svn commit: r1604684 - in /spamassassin/trunk/rulesrc/scores: 72_scores.cf scores-set0 scores-set1 scores-set2 scores-set3 stats-set0 stats-set1

Author: spamassassin_role
Date: Mon Jun 23 02:33:59 2014
New Revision: 1604684

URL: http://svn.apache.org/r1604684
Log:
updated scores for revision 1604549 active rules added since last mass-check

Modified:
    spamassassin/trunk/rulesrc/scores/72_scores.cf
    spamassassin/trunk/rulesrc/scores/scores-set0
    spamassassin/trunk/rulesrc/scores/scores-set1
    spamassassin/trunk/rulesrc/scores/scores-set2
    spamassassin/trunk/rulesrc/scores/scores-set3
    spamassassin/trunk/rulesrc/scores/stats-set0
    spamassassin/trunk/rulesrc/scores/stats-set1

Modified: spamassassin/trunk/rulesrc/scores/72_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/scores/72_scores.cf?rev=1604684&r1=1604683&r2=1604684&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/scores/72_scores.cf (original)
+++ spamassassin/trunk/rulesrc/scores/72_scores.cf Mon Jun 23 02:33:59 2014
@@ -2,106 +2,105 @@ score AC_BR_BONANZA                     
 score AC_DIV_BONANZA                        0.001 0.001 0.001 0.001
 score AC_HTML_NONSENSE_TAGS                 1.000 1.000 1.000 1.000
 score AC_SPAMMY_URI_PATTERNS1               1.000 1.000 1.000 1.000
-score AC_SPAMMY_URI_PATTERNS10              1.000 1.000 1.000 1.000
+score AC_SPAMMY_URI_PATTERNS10              3.999 1.000 3.999 1.000
 score AC_SPAMMY_URI_PATTERNS11              1.000 1.000 1.000 1.000
 score AC_SPAMMY_URI_PATTERNS12              1.000 1.000 1.000 1.000
 score AC_SPAMMY_URI_PATTERNS2               1.000 1.000 1.000 1.000
 score AC_SPAMMY_URI_PATTERNS3               1.000 1.000 1.000 1.000
-score AC_SPAMMY_URI_PATTERNS4               3.429 0.318 3.429 0.318
+score AC_SPAMMY_URI_PATTERNS4               3.783 3.168 3.783 3.168
 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 ADVANCE_FEE_2_NEW_FORM                1.000 1.000 1.000 1.000
-score ADVANCE_FEE_2_NEW_FRM_MNY             2.499 1.505 2.499 1.505
-score ADVANCE_FEE_2_NEW_MONEY               2.000 1.999 2.000 1.999
-score ADVANCE_FEE_3_NEW                     2.748 3.499 2.748 3.499
-score ADVANCE_FEE_3_NEW_FORM                0.649 1.079 0.649 1.079
-score ADVANCE_FEE_3_NEW_FRM_MNY             0.539 2.583 0.539 2.583
-score ADVANCE_FEE_3_NEW_MONEY               3.816 3.417 3.816 3.417
+score ADVANCE_FEE_2_NEW_FRM_MNY             2.500 1.207 2.500 1.207
+score ADVANCE_FEE_2_NEW_MONEY               1.999 1.999 1.999 1.999
+score ADVANCE_FEE_3_NEW                     2.600 3.499 2.600 3.499
+score ADVANCE_FEE_3_NEW_FORM                0.302 1.571 0.302 1.571
+score ADVANCE_FEE_3_NEW_FRM_MNY             3.038 1.131 3.038 1.131
+score ADVANCE_FEE_3_NEW_MONEY               0.842 3.117 0.842 3.117
 score ADVANCE_FEE_4_NEW                     0.001 0.001 0.001 0.001
 score ADVANCE_FEE_4_NEW_FORM                0.001 0.001 0.001 0.001
-score ADVANCE_FEE_4_NEW_FRM_MNY             1.176 3.191 1.176 3.191
-score ADVANCE_FEE_4_NEW_MONEY               0.168 0.244 0.168 0.244
+score ADVANCE_FEE_4_NEW_FRM_MNY             1.458 0.012 1.458 0.012
+score ADVANCE_FEE_4_NEW_MONEY               0.011 0.001 0.011 0.001
 score ADVANCE_FEE_5_NEW                     0.001 0.001 0.001 0.001
 score ADVANCE_FEE_5_NEW_FORM                0.001 0.001 0.001 0.001
-score ADVANCE_FEE_5_NEW_FRM_MNY             2.546 2.426 2.546 2.426
-score ADVANCE_FEE_5_NEW_MONEY               2.931 0.207 2.931 0.207
+score ADVANCE_FEE_5_NEW_FRM_MNY             0.829 1.799 0.829 1.799
+score ADVANCE_FEE_5_NEW_MONEY               1.314 0.997 1.314 0.997
 score AXB_BULKWARE_API                      2.599 2.599 2.599 2.599
-score AXB_NOQUIEROMAS                       2.500 2.599 2.500 2.599
-score AXB_XMAILER_MIMEOLE_OL_024C2          3.634 0.233 3.634 0.233
-score AXB_XMAILER_MIMEOLE_OL_1ECD5          0.144 2.326 0.144 2.326
-score AXB_XM_FORGED_OL2600                  1.591 2.499 1.591 2.499
-score AXB_X_AOL_SEZ_S                       2.601 2.799 2.601 2.799
+score AXB_NOQUIEROMAS                       1.999 2.499 1.999 2.499
+score AXB_XMAILER_MIMEOLE_OL_024C2          0.001 0.002 0.001 0.002
+score AXB_XMAILER_MIMEOLE_OL_1ECD5          0.998 0.171 0.998 0.171
+score AXB_XM_FORGED_OL2600                  0.956 2.499 0.956 2.499
+score AXB_X_AOL_SEZ_S                       2.600 2.799 2.600 2.799
 score BILLION_OVERLAP                       0.001 0.001 0.001 0.001
-score BODY_EMPTY                            0.001 0.652 0.001 0.652
+score BODY_EMPTY                            0.001 0.674 0.001 0.674
 score BODY_SINGLE_URI                       0.001 0.001 0.001 0.001
-score CANT_SEE_AD                           2.999 2.999 2.999 2.999
+score CANT_SEE_AD                           2.999 1.000 2.999 1.000
 score CK_HELO_DYNAMIC_SPLIT_IP              1.499 1.499 1.499 1.499
-score CK_HELO_GENERIC                       0.250 0.250 0.250 0.250
-score CN_B2B_SPAMMER                        2.699 2.500 2.699 2.500
+score CK_HELO_GENERIC                       0.249 0.250 0.249 0.250
+score CN_B2B_SPAMMER                        2.499 2.499 2.499 2.499
 score COMPENSATION                          1.499 1.000 1.499 1.000
-score DATE_IN_FUTURE_Q_PLUS                 2.155 2.399 2.155 2.399
-score DEAR_BENEFICIARY                      3.399 2.888 3.399 2.888
-score DOS_FAKE_SQUIRREL                     1.699 1.224 1.699 1.224
+score DEAR_BENEFICIARY                      3.151 2.488 3.151 2.488
+score DOS_FAKE_SQUIRREL                     1.700 1.699 1.700 1.699
 score DSN_NO_MIMEVERSION                    1.999 1.999 1.999 1.999
-score DX_TEXT_01                            2.499 2.436 2.499 2.436
-score DX_TEXT_02                            2.499 2.499 2.499 2.499
+score DX_TEXT_01                            2.499 2.434 2.499 2.434
+score DX_TEXT_02                            0.001 2.399 0.001 2.399
 score EMAIL_URI_PHISH                       3.999 3.999 3.999 3.999
-score FBI_MONEY                             1.134 1.000 1.134 1.000
-score FBI_SPOOF                             0.001 1.000 0.001 1.000
-score FILL_THIS_FORM                        0.021 0.001 0.021 0.001
-score FORGED_RELAY_MUA_TO_MX                2.500 0.001 2.500 0.001
-score FORM_FRAUD_3                          3.699 3.599 3.699 3.599
+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                        0.001 0.001 0.001 0.001
+score FORGED_RELAY_MUA_TO_MX                2.600 0.001 2.600 0.001
+score FORM_FRAUD_3                          3.599 3.599 3.599 3.599
 score FORM_FRAUD_5                          0.001 0.001 0.001 0.001
 score FORM_LOW_CONTRAST                     1.000 1.000 1.000 1.000
 score FOUND_YOU                             1.000 1.000 1.000 1.000
 score FREEMAIL_FORGED_FROMDOMAIN            0.001 0.001 0.001 0.001
-score FROM_12LTRDOM                         0.100 0.100 0.100 0.100
+score FROM_12LTRDOM                         0.100 0.099 0.100 0.099
 score FROM_MISSPACED                        0.001 0.001 0.001 0.001
 score FROM_MISSP_EH_MATCH                   1.999 1.999 1.999 1.999
-score FROM_MISSP_FREEMAIL                   2.856 0.001 2.856 0.001
-score FROM_MISSP_MSFT                       2.202 0.001 2.202 0.001
-score FROM_MISSP_REPLYTO                    3.299 0.001 3.299 0.001
+score FROM_MISSP_FREEMAIL                   0.001 0.001 0.001 0.001
+score FROM_MISSP_MSFT                       0.001 0.001 0.001 0.001
+score FROM_MISSP_REPLYTO                    0.001 0.001 0.001 0.001
 score FROM_MISSP_SPF_FAIL                   0.001 1.000 0.001 1.000
-score FROM_MISSP_TO_UNDISC                  2.379 0.001 2.379 0.001
-score FROM_MISSP_USER                       0.984 0.001 0.984 0.001
-score FSL_CTYPE_WIN1251                     0.780 0.001 0.780 0.001
-score FSL_HELO_FAKE                         2.100 2.199 2.100 2.199
-score FSL_HELO_FIREWALL                     0.001 2.699 0.001 2.699
-score FSL_NEW_HELO_USER                     1.831 1.098 1.831 1.098
+score FROM_MISSP_TO_UNDISC                  0.001 0.001 0.001 0.001
+score FROM_MISSP_USER                       0.001 0.001 0.001 0.001
+score FSL_CTYPE_WIN1251                     0.001 0.001 0.001 0.001
+score FSL_HELO_FAKE                         2.199 2.100 2.199 2.100
+score FSL_HELO_FIREWALL                     2.799 2.699 2.799 2.699
+score FSL_NEW_HELO_USER                     1.999 1.095 1.999 1.095
 score GOOGLE_DOCS_PHISH                     1.000 1.000 1.000 1.000
 score GOOGLE_DOCS_PHISH_MANY                1.000 1.000 1.000 1.000
 score HEADER_FROM_DIFFERENT_DOMAINS         0.001 0.001 0.001 0.001
-score HEXHASH_WORD                          2.088 2.100 2.088 2.100
-score HK_LOTTO                              0.408 1.000 0.408 1.000
-score HK_LOTTO_NAME                         0.195 1.000 0.195 1.000
-score HK_NAME_MR_MRS                        0.999 0.622 0.999 0.622
-score HK_RANDOM_FROM                        0.999 0.999 0.999 0.999
-score HK_SCAM_N1                            0.001 1.907 0.001 1.907
-score HK_SCAM_N2                            1.132 3.099 1.132 3.099
-score HK_SCAM_N3                            2.245 2.268 2.245 2.268
-score HK_SCAM_N8                            2.276 1.341 2.276 1.341
-score HTML_OFF_PAGE                         1.999 1.999 1.999 1.999
-score IMG_DIRECT_TO_MX                      0.001 0.019 0.001 0.019
-score KHOP_DYNAMIC                          1.999 0.213 1.999 0.213
+score HEXHASH_WORD                          2.081 2.100 2.081 2.100
+score HK_LOTTO                              0.203 0.999 0.203 0.999
+score HK_LOTTO_NAME                         0.401 0.999 0.401 0.999
+score HK_NAME_MR_MRS                        1.000 0.623 1.000 0.623
+score HK_RANDOM_FROM                        1.000 0.999 1.000 0.999
+score HK_SCAM_N1                            0.001 1.909 0.001 1.909
+score HK_SCAM_N2                            2.084 3.099 2.084 3.099
+score HK_SCAM_N3                            2.555 0.999 2.555 0.999
+score HK_SCAM_N8                            2.005 2.188 2.005 2.188
+score HTML_OFF_PAGE                         2.000 1.999 2.000 1.999
+score IMG_DIRECT_TO_MX                      0.001 0.001 0.001 0.001
+score KHOP_DYNAMIC                          1.999 0.220 1.999 0.220
 score LONG_HEX_URI                          2.999 2.999 2.999 2.999
-score LONG_IMG_URI                          3.899 3.799 3.899 3.799
+score LONG_IMG_URI                          3.799 3.799 3.799 3.799
 score LOTS_OF_MONEY                         0.001 0.010 0.001 0.010
 score LOTTO_AGENT                           2.499 2.499 2.499 2.499
 score LOTTO_DEPT                            0.001 0.001 0.001 0.001
-score MAILER_EQ_ORG                         2.599 2.500 2.599 2.500
-score MALFORMED_FREEMAIL                    1.390 1.469 1.390 1.469
-score MANY_SPAN_IN_TEXT                     2.086 0.001 2.086 0.001
-score MONEY_ATM_CARD                        1.622 2.637 1.622 2.637
-score MONEY_FORM                            0.688 1.550 0.688 1.550
-score MONEY_FORM_SHORT                      3.284 3.199 3.284 3.199
-score MONEY_FRAUD_3                         3.488 2.732 3.488 2.732
-score MONEY_FRAUD_5                         2.924 1.041 2.924 1.041
+score MAILER_EQ_ORG                         2.499 2.499 2.499 2.499
+score MALFORMED_FREEMAIL                    0.460 1.485 0.460 1.485
+score MANY_SPAN_IN_TEXT                     1.685 0.001 1.685 0.001
+score MONEY_ATM_CARD                        1.948 2.039 1.948 2.039
+score MONEY_FORM                            0.910 1.551 0.910 1.551
+score MONEY_FORM_SHORT                      2.800 3.199 2.800 3.199
+score MONEY_FRAUD_3                         4.000 1.947 4.000 1.947
+score MONEY_FRAUD_5                         1.683 1.387 1.683 1.387
 score MONEY_FROM_41                         1.999 1.999 1.999 1.999
-score MONEY_FROM_MISSP                      0.001 0.100 0.001 0.100
-score NSL_RCVD_FROM_USER                    3.212 0.001 3.212 0.001
-score NSL_RCVD_HELO_USER                    0.770 2.627 0.770 2.627
-score OBFU_TEXT_ATTACH                      2.201 1.877 2.201 1.877
-score PUMPDUMP                              2.999 2.826 2.999 2.826
+score MONEY_FROM_MISSP                      0.001 1.066 0.001 1.066
+score NSL_RCVD_FROM_USER                    0.001 0.237 0.001 0.237
+score NSL_RCVD_HELO_USER                    3.445 2.632 3.445 2.632
+score OBFU_TEXT_ATTACH                      2.198 1.887 2.198 1.887
+score PUMPDUMP                              2.999 2.951 2.999 2.951
 score PUMPDUMP_MULTI                        1.000 1.000 1.000 1.000
 score RCVD_IN_MSPIKE_BL                     0.001 0.010 0.001 0.010
 score RCVD_IN_MSPIKE_H2                     0.001 -0.001 0.001 -0.001
@@ -109,23 +108,22 @@ score RCVD_IN_MSPIKE_H3                 
 score RCVD_IN_MSPIKE_H4                     0.001 -0.010 0.001 -0.010
 score RCVD_IN_MSPIKE_H5                     0.001 -1.000 0.001 -1.000
 score RCVD_IN_MSPIKE_L2                     0.001 0.001 0.001 0.001
-score RCVD_IN_MSPIKE_L3                     0.001 2.289 0.001 2.289
-score RCVD_IN_MSPIKE_L4                     0.001 2.409 0.001 2.409
+score RCVD_IN_MSPIKE_L3                     0.001 2.269 0.001 2.269
+score RCVD_IN_MSPIKE_L4                     0.001 2.367 0.001 2.367
 score RCVD_IN_MSPIKE_L5                     0.001 3.099 0.001 3.099
 score RCVD_IN_MSPIKE_WL                     0.001 -0.010 0.001 -0.010
 score RCVD_IN_MSPIKE_ZBI                    0.001 0.001 0.001 0.001
-score RISK_FREE                             2.799 2.699 2.799 2.699
-score TAB_IN_FROM                           0.001 0.500 0.001 0.500
+score RISK_FREE                             2.699 1.878 2.699 1.878
+score TAB_IN_FROM                           0.500 0.500 0.500 0.500
 score TO_EQ_FM_DOM_SPF_FAIL                 0.001 0.001 0.001 0.001
-score TO_EQ_FM_HTML_ONLY                    2.399 0.001 2.399 0.001
 score TO_EQ_FM_SPF_FAIL                     0.001 0.001 0.001 0.001
-score TO_NO_BRKTS_DYNIP                     2.360 1.079 2.360 1.079
-score TO_NO_BRKTS_FROM_MSSP                 0.001 0.591 0.001 0.591
-score TO_NO_BRKTS_MSFT                      3.499 3.500 3.499 3.500
-score TO_NO_BRKTS_PCNT                      0.600 1.992 0.600 1.992
-score TVD_FROM_1                            1.000 0.999 1.000 0.999
+score TO_NO_BRKTS_DYNIP                     2.360 1.080 2.360 1.080
+score TO_NO_BRKTS_FROM_MSSP                 0.001 0.181 0.001 0.181
+score TO_NO_BRKTS_MSFT                      3.500 3.499 3.500 3.499
+score TO_NO_BRKTS_PCNT                      0.599 1.993 0.599 1.993
+score TVD_FROM_1                            0.999 1.000 0.999 1.000
 score TVD_SPACE_RATIO_MINFP                 1.000 1.000 1.000 1.000
 score UC_GIBBERISH_OBFU                     1.000 1.000 1.000 1.000
 score UNSUBSCRIBE_ES                        1.000 1.000 1.000 1.000
-score XM_PHPMAILER_FORGED                   2.399 2.499 2.399 2.499
-score YOU_INHERIT                           2.499 2.499 2.499 2.499
+score XM_PHPMAILER_FORGED                   2.499 2.399 2.499 2.399
+score YOU_INHERIT                           2.500 2.499 2.500 2.499

Modified: spamassassin/trunk/rulesrc/scores/scores-set0
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/scores/scores-set0?rev=1604684&r1=1604683&r2=1604684&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/scores/scores-set0 (original)
+++ spamassassin/trunk/rulesrc/scores/scores-set0 Mon Jun 23 02:33:59 2014
@@ -1,106 +1,101 @@
-# Using score set 0 logs for revision 1604106 from:
-# ham-axb-coi-bulk.log ham-axb-generic.log ham-axb-ham-misc.log ham-bb-guenther_fraud.log ham-bb-jhardin_fraud.log ham-bb-jhardin.log ham-bb-jm.log ham-bb-kmcgrail.log ham-bb-zmi.log ham-bernie-fsf.log ham-bernie-it_batt.log ham-bpoliakoff.log ham-darxus.log ham-dwarren.log ham-jarif.log ham-kpg-core.log ham-zmi.log spam-axb-coi-bulk.log spam-axb-generic.log spam-axb-ham-misc.log spam-bb-guenther_fraud.log spam-bb-jhardin_fraud.log spam-bb-jhardin.log spam-bb-jm.log spam-bb-kmcgrail.log spam-bb-zmi.log spam-bernie-fsf.log spam-bernie-it_batt.log spam-bpoliakoff.log spam-darxus.log spam-dwarren.log spam-jarif.log spam-kpg-core.log spam-zmi.log
+# Using score set 0 logs for revision 1604549 from:
+# ham-axb-coi-bulk.log ham-axb-generic.log ham-axb-ham-misc.log ham-bb-guenther_fraud.log ham-bb-jhardin_fraud.log ham-bb-jhardin.log ham-bb-jm.log ham-bb-kmcgrail.log ham-bb-zmi.log ham-bernie-fsf.log ham-bernie-it_batt.log ham-bpoliakoff.log ham-darxus.log ham-dwarren.log ham-jarif.log ham-kpg-core.log ham-mas-cps.log ham-mas-mas.log ham-zmi.log spam-axb-coi-bulk.log spam-axb-generic.log spam-axb-ham-misc.log spam-bb-guenther_fraud.log spam-bb-jhardin_fraud.log spam-bb-jhardin.log spam-bb-jm.log spam-bb-kmcgrail.log spam-bb-zmi.log spam-bernie-fsf.log spam-bernie-it_batt.log spam-bpoliakoff.log spam-darxus.log spam-dwarren.log spam-jarif.log spam-kpg-core.log spam-mas-cps.log spam-mas-mas.log spam-zmi.log
 
 score AC_DIV_BONANZA                 0.001 # force non-zero
-score AC_SPAMMY_URI_PATTERNS4        3.429
-score ADVANCE_FEE_2_NEW_FRM_MNY      2.499
-score ADVANCE_FEE_2_NEW_MONEY        2.000
-score ADVANCE_FEE_3_NEW              2.748
-score ADVANCE_FEE_3_NEW_FORM         0.649
-score ADVANCE_FEE_3_NEW_FRM_MNY      0.539
-score ADVANCE_FEE_3_NEW_MONEY        3.816
+score AC_SPAMMY_URI_PATTERNS10       3.999
+score AC_SPAMMY_URI_PATTERNS4        3.783
+score ADVANCE_FEE_2_NEW_FRM_MNY      2.500
+score ADVANCE_FEE_2_NEW_MONEY        1.999
+score ADVANCE_FEE_3_NEW              2.600
+score ADVANCE_FEE_3_NEW_FORM         0.302
+score ADVANCE_FEE_3_NEW_FRM_MNY      3.038
+score ADVANCE_FEE_3_NEW_MONEY        0.842
 score ADVANCE_FEE_4_NEW              0.001
 score ADVANCE_FEE_4_NEW_FORM         0.001
-score ADVANCE_FEE_4_NEW_FRM_MNY      1.176
-score ADVANCE_FEE_4_NEW_MONEY        0.168
+score ADVANCE_FEE_4_NEW_FRM_MNY      1.458
+score ADVANCE_FEE_4_NEW_MONEY        0.011
 score ADVANCE_FEE_5_NEW              0.001
 score ADVANCE_FEE_5_NEW_FORM         0.001
-score ADVANCE_FEE_5_NEW_FRM_MNY      2.546
-score ADVANCE_FEE_5_NEW_MONEY        2.931
+score ADVANCE_FEE_5_NEW_FRM_MNY      0.829
+score ADVANCE_FEE_5_NEW_MONEY        1.314
 score AXB_BULKWARE_API               2.599
-score AXB_NOQUIEROMAS                2.500
-score AXB_XMAILER_MIMEOLE_OL_024C2   3.634
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.144
-score AXB_XM_FORGED_OL2600           1.591
-score AXB_X_AOL_SEZ_S                2.601
-score BODY_EMPTY                     0.001
+score AXB_NOQUIEROMAS                1.999
+score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.998
+score AXB_XM_FORGED_OL2600           0.956
+score AXB_X_AOL_SEZ_S                2.600
+score BODY_EMPTY                     0.001 # force non-zero
 score BODY_SINGLE_URI                0.001
 score CANT_SEE_AD                    2.999
 score CK_HELO_DYNAMIC_SPLIT_IP       1.499
-score CK_HELO_GENERIC                0.250
-score CN_B2B_SPAMMER                 2.699
+score CK_HELO_GENERIC                0.249
+score CN_B2B_SPAMMER                 2.499
 score COMPENSATION                   1.499
-score DATE_IN_FUTURE_Q_PLUS          2.155
-score DEAR_BENEFICIARY               3.399
-score DOS_FAKE_SQUIRREL              1.699
+score DEAR_BENEFICIARY               3.151
+score DOS_FAKE_SQUIRREL              1.700
 score DSN_NO_MIMEVERSION             1.999
 score DX_TEXT_01                     2.499
-score DX_TEXT_02                     2.499
 score EMAIL_URI_PHISH                3.999
-score FBI_MONEY                      1.134
-score FBI_SPOOF                      0.001
-score FILL_THIS_FORM                 0.021
-score FORGED_RELAY_MUA_TO_MX         2.500
-score FORM_FRAUD_3                   3.699
+score FILL_THIS_FORM                 0.001
+score FORGED_RELAY_MUA_TO_MX         2.600
+score FORM_FRAUD_3                   3.599
 score FORM_FRAUD_5                   0.001
-score FREEMAIL_FORGED_FROMDOMAIN     0.001
+score FREEMAIL_FORGED_FROMDOMAIN     0.001 # force non-zero
 score FROM_12LTRDOM                  0.100
 score FROM_MISSPACED                 0.001
 score FROM_MISSP_EH_MATCH            1.999
-score FROM_MISSP_FREEMAIL            2.856
-score FROM_MISSP_MSFT                2.202
-score FROM_MISSP_REPLYTO             3.299
-score FROM_MISSP_TO_UNDISC           2.379
-score FROM_MISSP_USER                0.984
-score FSL_CTYPE_WIN1251              0.780
-score FSL_HELO_FAKE                  2.100
-score FSL_NEW_HELO_USER              1.831
+score FROM_MISSP_FREEMAIL            0.001
+score FROM_MISSP_MSFT                0.001
+score FROM_MISSP_REPLYTO             0.001
+score FROM_MISSP_TO_UNDISC           0.001
+score FROM_MISSP_USER                0.001 # force non-zero
+score FSL_CTYPE_WIN1251              0.001
+score FSL_HELO_FAKE                  2.199
+score FSL_HELO_FIREWALL              2.799
+score FSL_NEW_HELO_USER              1.999
 score HEADER_FROM_DIFFERENT_DOMAINS  0.001 # force non-zero
-score HEXHASH_WORD                   2.088
-score HK_LOTTO                       0.408
-score HK_LOTTO_NAME                  0.195
-score HK_NAME_MR_MRS                 0.999
-score HK_RANDOM_FROM                 0.999
+score HEXHASH_WORD                   2.081
+score HK_LOTTO                       0.203
+score HK_LOTTO_NAME                  0.401
+score HK_NAME_MR_MRS                 1.000
+score HK_RANDOM_FROM                 1.000
 score HK_SCAM_N1                     0.001
-score HK_SCAM_N2                     1.132
-score HK_SCAM_N3                     2.245
-score HK_SCAM_N8                     2.276
-score HTML_OFF_PAGE                  1.999
+score HK_SCAM_N2                     2.084
+score HK_SCAM_N3                     2.555
+score HK_SCAM_N8                     2.005
+score HTML_OFF_PAGE                  2.000
 score IMG_DIRECT_TO_MX               0.001
 score KHOP_DYNAMIC                   1.999
 score LONG_HEX_URI                   2.999
-score LONG_IMG_URI                   3.899
+score LONG_IMG_URI                   3.799
 score LOTS_OF_MONEY                  0.001 # force non-zero
 score LOTTO_AGENT                    2.499
 score LOTTO_DEPT                     0.001
-score MAILER_EQ_ORG                  2.599
-score MALFORMED_FREEMAIL             1.390
-score MANY_SPAN_IN_TEXT              2.086
-score MONEY_ATM_CARD                 1.622
-score MONEY_FORM                     0.688
-score MONEY_FORM_SHORT               3.284
-score MONEY_FRAUD_3                  3.488
-score MONEY_FRAUD_5                  2.924
+score MAILER_EQ_ORG                  2.499
+score MALFORMED_FREEMAIL             0.460
+score MANY_SPAN_IN_TEXT              1.685
+score MONEY_ATM_CARD                 1.948
+score MONEY_FORM                     0.910
+score MONEY_FORM_SHORT               2.800
+score MONEY_FRAUD_3                  4.000
+score MONEY_FRAUD_5                  1.683
 score MONEY_FROM_41                  1.999
 score MONEY_FROM_MISSP               0.001
-score NSL_RCVD_FROM_USER             3.212
-score NSL_RCVD_HELO_USER             0.770
-score OBFU_TEXT_ATTACH               2.201
+score NSL_RCVD_FROM_USER             0.001
+score NSL_RCVD_HELO_USER             3.445
+score OBFU_TEXT_ATTACH               2.198
 score PUMPDUMP                       2.999
-score RISK_FREE                      2.799
-score TAB_IN_FROM                    0.001 # force non-zero
-score TO_EQ_FM_HTML_ONLY             2.399
+score RISK_FREE                      2.699
 score TO_NO_BRKTS_DYNIP              2.360
 score TO_NO_BRKTS_FROM_MSSP          0.001
-score TO_NO_BRKTS_MSFT               3.499
-score TO_NO_BRKTS_PCNT               0.600
-score TVD_FROM_1                     1.000
-score XM_PHPMAILER_FORGED            2.399
-score YOU_INHERIT                    2.499
+score TO_NO_BRKTS_MSFT               3.500
+score TO_NO_BRKTS_PCNT               0.599
+score TVD_FROM_1                     0.999
+score XM_PHPMAILER_FORGED            2.499
+score YOU_INHERIT                    2.500
 score AC_BR_BONANZA                  0.001
 score AC_HTML_NONSENSE_TAGS          1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
-score AC_SPAMMY_URI_PATTERNS10       1.000
 score AC_SPAMMY_URI_PATTERNS11       1.000
 score AC_SPAMMY_URI_PATTERNS12       1.000
 score AC_SPAMMY_URI_PATTERNS2        1.000
@@ -109,11 +104,14 @@ score AC_SPAMMY_URI_PATTERNS8        1.0
 score AC_SPAMMY_URI_PATTERNS9        1.000
 score ADVANCE_FEE_2_NEW_FORM         1.000
 score BILLION_OVERLAP                0.001 # force non-zero
+score FBI_MONEY                      1.000
+score FBI_SPOOF                      1.000
 score FORM_LOW_CONTRAST              1.000
 score FOUND_YOU                      1.000
 score GOOGLE_DOCS_PHISH              1.000
 score GOOGLE_DOCS_PHISH_MANY         1.000
 score PUMPDUMP_MULTI                 1.000
+score TAB_IN_FROM                    0.500
 score TVD_SPACE_RATIO_MINFP          1.000
 score UC_GIBBERISH_OBFU              1.000
 score UNSUBSCRIBE_ES                 1.000

Modified: spamassassin/trunk/rulesrc/scores/scores-set1
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/scores/scores-set1?rev=1604684&r1=1604683&r2=1604684&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/scores/scores-set1 (original)
+++ spamassassin/trunk/rulesrc/scores/scores-set1 Mon Jun 23 02:33:59 2014
@@ -2,101 +2,99 @@
 # ham-net-axb-coi-bulk.log ham-net-axb-generic.log ham-net-axb-ham-misc.log ham-net-bb-guenther_fraud.log ham-net-bb-jhardin_fraud.log ham-net-bb-jhardin.log ham-net-bb-jm.log ham-net-bb-kmcgrail.log ham-net-bb-zmi.log ham-net-bernie-fsf.log ham-net-bernie-it_batt.log ham-net-bpoliakoff.log ham-net-darxus.log ham-net-dwarren.log ham-net-jarif.log ham-net-kpg-core.log ham-net-zmi.log spam-net-axb-coi-bulk.log spam-net-axb-generic.log spam-net-axb-ham-misc.log spam-net-bb-guenther_fraud.log spam-net-bb-jhardin_fraud.log spam-net-bb-jhardin.log spam-net-bb-jm.log spam-net-bb-kmcgrail.log spam-net-bb-zmi.log spam-net-bernie-fsf.log spam-net-bernie-it_batt.log spam-net-bpoliakoff.log spam-net-darxus.log spam-net-dwarren.log spam-net-jarif.log spam-net-kpg-core.log spam-net-zmi.log
 
 score AC_DIV_BONANZA                 0.001 # force non-zero
-score AC_SPAMMY_URI_PATTERNS4        0.318
-score ADVANCE_FEE_2_NEW_FRM_MNY      1.505
+score AC_SPAMMY_URI_PATTERNS4        3.168
+score ADVANCE_FEE_2_NEW_FRM_MNY      1.207
 score ADVANCE_FEE_2_NEW_MONEY        1.999
 score ADVANCE_FEE_3_NEW              3.499
-score ADVANCE_FEE_3_NEW_FORM         1.079
-score ADVANCE_FEE_3_NEW_FRM_MNY      2.583
-score ADVANCE_FEE_3_NEW_MONEY        3.417
-score ADVANCE_FEE_4_NEW              0.001
-score ADVANCE_FEE_4_NEW_FORM         0.001 # force non-zero
-score ADVANCE_FEE_4_NEW_FRM_MNY      3.191
-score ADVANCE_FEE_4_NEW_MONEY        0.244
+score ADVANCE_FEE_3_NEW_FORM         1.571
+score ADVANCE_FEE_3_NEW_FRM_MNY      1.131
+score ADVANCE_FEE_3_NEW_MONEY        3.117
+score ADVANCE_FEE_4_NEW              0.001 # force non-zero
+score ADVANCE_FEE_4_NEW_FORM         0.001
+score ADVANCE_FEE_4_NEW_FRM_MNY      0.012
+score ADVANCE_FEE_4_NEW_MONEY        0.001
 score ADVANCE_FEE_5_NEW              0.001
 score ADVANCE_FEE_5_NEW_FORM         0.001
-score ADVANCE_FEE_5_NEW_FRM_MNY      2.426
-score ADVANCE_FEE_5_NEW_MONEY        0.207
+score ADVANCE_FEE_5_NEW_FRM_MNY      1.799
+score ADVANCE_FEE_5_NEW_MONEY        0.997
 score AXB_BULKWARE_API               2.599
-score AXB_NOQUIEROMAS                2.599
-score AXB_XMAILER_MIMEOLE_OL_024C2   0.233
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   2.326
+score AXB_NOQUIEROMAS                2.499
+score AXB_XMAILER_MIMEOLE_OL_024C2   0.002
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.171
 score AXB_XM_FORGED_OL2600           2.499
 score AXB_X_AOL_SEZ_S                2.799
-score BODY_EMPTY                     0.652
+score BODY_EMPTY                     0.674
 score BODY_SINGLE_URI                0.001
-score CANT_SEE_AD                    2.999
 score CK_HELO_DYNAMIC_SPLIT_IP       1.499
 score CK_HELO_GENERIC                0.250
-score CN_B2B_SPAMMER                 2.500
-score DATE_IN_FUTURE_Q_PLUS          2.399
-score DEAR_BENEFICIARY               2.888
-score DOS_FAKE_SQUIRREL              1.224
+score CN_B2B_SPAMMER                 2.499
+score DEAR_BENEFICIARY               2.488
+score DOS_FAKE_SQUIRREL              1.699
 score DSN_NO_MIMEVERSION             1.999
-score DX_TEXT_01                     2.436
-score DX_TEXT_02                     2.499
+score DX_TEXT_01                     2.434
+score DX_TEXT_02                     2.399
 score EMAIL_URI_PHISH                3.999
 score FILL_THIS_FORM                 0.001
 score FORGED_RELAY_MUA_TO_MX         0.001
 score FORM_FRAUD_3                   3.599
-score FORM_FRAUD_5                   0.001 # force non-zero
-score FREEMAIL_FORGED_FROMDOMAIN     0.001 # force non-zero
-score FROM_12LTRDOM                  0.100
-score FROM_MISSPACED                 0.001 # force non-zero
+score FORM_FRAUD_5                   0.001
+score FREEMAIL_FORGED_FROMDOMAIN     0.001
+score FROM_12LTRDOM                  0.099
+score FROM_MISSPACED                 0.001
 score FROM_MISSP_EH_MATCH            1.999
 score FROM_MISSP_FREEMAIL            0.001
-score FROM_MISSP_MSFT                0.001 # force non-zero
+score FROM_MISSP_MSFT                0.001
 score FROM_MISSP_REPLYTO             0.001
-score FROM_MISSP_TO_UNDISC           0.001 # force non-zero
+score FROM_MISSP_TO_UNDISC           0.001
 score FROM_MISSP_USER                0.001
-score FSL_CTYPE_WIN1251              0.001 # force non-zero
-score FSL_HELO_FAKE                  2.199
+score FSL_CTYPE_WIN1251              0.001
+score FSL_HELO_FAKE                  2.100
 score FSL_HELO_FIREWALL              2.699
-score FSL_NEW_HELO_USER              1.098
-score HEADER_FROM_DIFFERENT_DOMAINS  0.001 # force non-zero
+score FSL_NEW_HELO_USER              1.095
+score HEADER_FROM_DIFFERENT_DOMAINS  0.001
 score HEXHASH_WORD                   2.100
-score HK_LOTTO                       1.000
-score HK_LOTTO_NAME                  1.000
-score HK_NAME_MR_MRS                 0.622
+score HK_LOTTO                       0.999
+score HK_LOTTO_NAME                  0.999
+score HK_NAME_MR_MRS                 0.623
 score HK_RANDOM_FROM                 0.999
-score HK_SCAM_N1                     1.907
+score HK_SCAM_N1                     1.909
 score HK_SCAM_N2                     3.099
-score HK_SCAM_N3                     2.268
-score HK_SCAM_N8                     1.341
+score HK_SCAM_N3                     0.999
+score HK_SCAM_N8                     2.188
 score HTML_OFF_PAGE                  1.999
-score IMG_DIRECT_TO_MX               0.019
-score KHOP_DYNAMIC                   0.213
+score IMG_DIRECT_TO_MX               0.001
+score KHOP_DYNAMIC                   0.220
 score LONG_HEX_URI                   2.999
 score LONG_IMG_URI                   3.799
 score LOTS_OF_MONEY                  0.010
 score LOTTO_AGENT                    2.499
 score LOTTO_DEPT                     0.001
-score MAILER_EQ_ORG                  2.500
-score MALFORMED_FREEMAIL             1.469
-score MANY_SPAN_IN_TEXT              0.001 # force non-zero
-score MONEY_ATM_CARD                 2.637
-score MONEY_FORM                     1.550
+score MAILER_EQ_ORG                  2.499
+score MALFORMED_FREEMAIL             1.485
+score MANY_SPAN_IN_TEXT              0.001
+score MONEY_ATM_CARD                 2.039
+score MONEY_FORM                     1.551
 score MONEY_FORM_SHORT               3.199
-score MONEY_FRAUD_3                  2.732
-score MONEY_FRAUD_5                  1.041
+score MONEY_FRAUD_3                  1.947
+score MONEY_FRAUD_5                  1.387
 score MONEY_FROM_41                  1.999
-score MONEY_FROM_MISSP               0.100
-score NSL_RCVD_FROM_USER             0.001 # force non-zero
-score NSL_RCVD_HELO_USER             2.627
-score OBFU_TEXT_ATTACH               1.877
-score PUMPDUMP                       2.826
+score MONEY_FROM_MISSP               1.066
+score NSL_RCVD_FROM_USER             0.237
+score NSL_RCVD_HELO_USER             2.632
+score OBFU_TEXT_ATTACH               1.887
+score PUMPDUMP                       2.951
 score RCVD_IN_MSPIKE_H2              -0.001
-score RCVD_IN_MSPIKE_L3              2.289
-score RCVD_IN_MSPIKE_L4              2.409
+score RCVD_IN_MSPIKE_L3              2.269
+score RCVD_IN_MSPIKE_L4              2.367
 score RCVD_IN_MSPIKE_L5              3.099
 score RCVD_IN_MSPIKE_ZBI             0.001
-score RISK_FREE                      2.699
-score TO_NO_BRKTS_DYNIP              1.079
-score TO_NO_BRKTS_FROM_MSSP          0.591
-score TO_NO_BRKTS_MSFT               3.500
-score TO_NO_BRKTS_PCNT               1.992
-score TVD_FROM_1                     0.999
-score XM_PHPMAILER_FORGED            2.499
+score RISK_FREE                      1.878
+score TO_NO_BRKTS_DYNIP              1.080
+score TO_NO_BRKTS_FROM_MSSP          0.181
+score TO_NO_BRKTS_MSFT               3.499
+score TO_NO_BRKTS_PCNT               1.993
+score TVD_FROM_1                     1.000
+score XM_PHPMAILER_FORGED            2.399
 score YOU_INHERIT                    2.499
 score AC_BR_BONANZA                  0.001
 score AC_HTML_NONSENSE_TAGS          1.000
@@ -110,6 +108,7 @@ score AC_SPAMMY_URI_PATTERNS8        1.0
 score AC_SPAMMY_URI_PATTERNS9        1.000
 score ADVANCE_FEE_2_NEW_FORM         1.000
 score BILLION_OVERLAP                0.001 # force non-zero
+score CANT_SEE_AD                    1.000
 score COMPENSATION                   1.000
 score FBI_MONEY                      1.000
 score FBI_SPOOF                      1.000

Modified: spamassassin/trunk/rulesrc/scores/scores-set2
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/scores/scores-set2?rev=1604684&r1=1604683&r2=1604684&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/scores/scores-set2 (original)
+++ spamassassin/trunk/rulesrc/scores/scores-set2 Mon Jun 23 02:33:59 2014
@@ -1,106 +1,101 @@
-# Using score set 0 logs for revision 1604106 from:
-# ham-axb-coi-bulk.log ham-axb-generic.log ham-axb-ham-misc.log ham-bb-guenther_fraud.log ham-bb-jhardin_fraud.log ham-bb-jhardin.log ham-bb-jm.log ham-bb-kmcgrail.log ham-bb-zmi.log ham-bernie-fsf.log ham-bernie-it_batt.log ham-bpoliakoff.log ham-darxus.log ham-dwarren.log ham-jarif.log ham-kpg-core.log ham-zmi.log spam-axb-coi-bulk.log spam-axb-generic.log spam-axb-ham-misc.log spam-bb-guenther_fraud.log spam-bb-jhardin_fraud.log spam-bb-jhardin.log spam-bb-jm.log spam-bb-kmcgrail.log spam-bb-zmi.log spam-bernie-fsf.log spam-bernie-it_batt.log spam-bpoliakoff.log spam-darxus.log spam-dwarren.log spam-jarif.log spam-kpg-core.log spam-zmi.log
+# Using score set 0 logs for revision 1604549 from:
+# ham-axb-coi-bulk.log ham-axb-generic.log ham-axb-ham-misc.log ham-bb-guenther_fraud.log ham-bb-jhardin_fraud.log ham-bb-jhardin.log ham-bb-jm.log ham-bb-kmcgrail.log ham-bb-zmi.log ham-bernie-fsf.log ham-bernie-it_batt.log ham-bpoliakoff.log ham-darxus.log ham-dwarren.log ham-jarif.log ham-kpg-core.log ham-mas-cps.log ham-mas-mas.log ham-zmi.log spam-axb-coi-bulk.log spam-axb-generic.log spam-axb-ham-misc.log spam-bb-guenther_fraud.log spam-bb-jhardin_fraud.log spam-bb-jhardin.log spam-bb-jm.log spam-bb-kmcgrail.log spam-bb-zmi.log spam-bernie-fsf.log spam-bernie-it_batt.log spam-bpoliakoff.log spam-darxus.log spam-dwarren.log spam-jarif.log spam-kpg-core.log spam-mas-cps.log spam-mas-mas.log spam-zmi.log
 
 score AC_DIV_BONANZA                 0.001 # force non-zero
-score AC_SPAMMY_URI_PATTERNS4        3.429
-score ADVANCE_FEE_2_NEW_FRM_MNY      2.499
-score ADVANCE_FEE_2_NEW_MONEY        2.000
-score ADVANCE_FEE_3_NEW              2.748
-score ADVANCE_FEE_3_NEW_FORM         0.649
-score ADVANCE_FEE_3_NEW_FRM_MNY      0.539
-score ADVANCE_FEE_3_NEW_MONEY        3.816
+score AC_SPAMMY_URI_PATTERNS10       3.999
+score AC_SPAMMY_URI_PATTERNS4        3.783
+score ADVANCE_FEE_2_NEW_FRM_MNY      2.500
+score ADVANCE_FEE_2_NEW_MONEY        1.999
+score ADVANCE_FEE_3_NEW              2.600
+score ADVANCE_FEE_3_NEW_FORM         0.302
+score ADVANCE_FEE_3_NEW_FRM_MNY      3.038
+score ADVANCE_FEE_3_NEW_MONEY        0.842
 score ADVANCE_FEE_4_NEW              0.001
 score ADVANCE_FEE_4_NEW_FORM         0.001
-score ADVANCE_FEE_4_NEW_FRM_MNY      1.176
-score ADVANCE_FEE_4_NEW_MONEY        0.168
+score ADVANCE_FEE_4_NEW_FRM_MNY      1.458
+score ADVANCE_FEE_4_NEW_MONEY        0.011
 score ADVANCE_FEE_5_NEW              0.001
 score ADVANCE_FEE_5_NEW_FORM         0.001
-score ADVANCE_FEE_5_NEW_FRM_MNY      2.546
-score ADVANCE_FEE_5_NEW_MONEY        2.931
+score ADVANCE_FEE_5_NEW_FRM_MNY      0.829
+score ADVANCE_FEE_5_NEW_MONEY        1.314
 score AXB_BULKWARE_API               2.599
-score AXB_NOQUIEROMAS                2.500
-score AXB_XMAILER_MIMEOLE_OL_024C2   3.634
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.144
-score AXB_XM_FORGED_OL2600           1.591
-score AXB_X_AOL_SEZ_S                2.601
-score BODY_EMPTY                     0.001
+score AXB_NOQUIEROMAS                1.999
+score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.998
+score AXB_XM_FORGED_OL2600           0.956
+score AXB_X_AOL_SEZ_S                2.600
+score BODY_EMPTY                     0.001 # force non-zero
 score BODY_SINGLE_URI                0.001
 score CANT_SEE_AD                    2.999
 score CK_HELO_DYNAMIC_SPLIT_IP       1.499
-score CK_HELO_GENERIC                0.250
-score CN_B2B_SPAMMER                 2.699
+score CK_HELO_GENERIC                0.249
+score CN_B2B_SPAMMER                 2.499
 score COMPENSATION                   1.499
-score DATE_IN_FUTURE_Q_PLUS          2.155
-score DEAR_BENEFICIARY               3.399
-score DOS_FAKE_SQUIRREL              1.699
+score DEAR_BENEFICIARY               3.151
+score DOS_FAKE_SQUIRREL              1.700
 score DSN_NO_MIMEVERSION             1.999
 score DX_TEXT_01                     2.499
-score DX_TEXT_02                     2.499
 score EMAIL_URI_PHISH                3.999
-score FBI_MONEY                      1.134
-score FBI_SPOOF                      0.001
-score FILL_THIS_FORM                 0.021
-score FORGED_RELAY_MUA_TO_MX         2.500
-score FORM_FRAUD_3                   3.699
+score FILL_THIS_FORM                 0.001
+score FORGED_RELAY_MUA_TO_MX         2.600
+score FORM_FRAUD_3                   3.599
 score FORM_FRAUD_5                   0.001
-score FREEMAIL_FORGED_FROMDOMAIN     0.001
+score FREEMAIL_FORGED_FROMDOMAIN     0.001 # force non-zero
 score FROM_12LTRDOM                  0.100
 score FROM_MISSPACED                 0.001
 score FROM_MISSP_EH_MATCH            1.999
-score FROM_MISSP_FREEMAIL            2.856
-score FROM_MISSP_MSFT                2.202
-score FROM_MISSP_REPLYTO             3.299
-score FROM_MISSP_TO_UNDISC           2.379
-score FROM_MISSP_USER                0.984
-score FSL_CTYPE_WIN1251              0.780
-score FSL_HELO_FAKE                  2.100
-score FSL_NEW_HELO_USER              1.831
+score FROM_MISSP_FREEMAIL            0.001
+score FROM_MISSP_MSFT                0.001
+score FROM_MISSP_REPLYTO             0.001
+score FROM_MISSP_TO_UNDISC           0.001
+score FROM_MISSP_USER                0.001 # force non-zero
+score FSL_CTYPE_WIN1251              0.001
+score FSL_HELO_FAKE                  2.199
+score FSL_HELO_FIREWALL              2.799
+score FSL_NEW_HELO_USER              1.999
 score HEADER_FROM_DIFFERENT_DOMAINS  0.001 # force non-zero
-score HEXHASH_WORD                   2.088
-score HK_LOTTO                       0.408
-score HK_LOTTO_NAME                  0.195
-score HK_NAME_MR_MRS                 0.999
-score HK_RANDOM_FROM                 0.999
+score HEXHASH_WORD                   2.081
+score HK_LOTTO                       0.203
+score HK_LOTTO_NAME                  0.401
+score HK_NAME_MR_MRS                 1.000
+score HK_RANDOM_FROM                 1.000
 score HK_SCAM_N1                     0.001
-score HK_SCAM_N2                     1.132
-score HK_SCAM_N3                     2.245
-score HK_SCAM_N8                     2.276
-score HTML_OFF_PAGE                  1.999
+score HK_SCAM_N2                     2.084
+score HK_SCAM_N3                     2.555
+score HK_SCAM_N8                     2.005
+score HTML_OFF_PAGE                  2.000
 score IMG_DIRECT_TO_MX               0.001
 score KHOP_DYNAMIC                   1.999
 score LONG_HEX_URI                   2.999
-score LONG_IMG_URI                   3.899
+score LONG_IMG_URI                   3.799
 score LOTS_OF_MONEY                  0.001 # force non-zero
 score LOTTO_AGENT                    2.499
 score LOTTO_DEPT                     0.001
-score MAILER_EQ_ORG                  2.599
-score MALFORMED_FREEMAIL             1.390
-score MANY_SPAN_IN_TEXT              2.086
-score MONEY_ATM_CARD                 1.622
-score MONEY_FORM                     0.688
-score MONEY_FORM_SHORT               3.284
-score MONEY_FRAUD_3                  3.488
-score MONEY_FRAUD_5                  2.924
+score MAILER_EQ_ORG                  2.499
+score MALFORMED_FREEMAIL             0.460
+score MANY_SPAN_IN_TEXT              1.685
+score MONEY_ATM_CARD                 1.948
+score MONEY_FORM                     0.910
+score MONEY_FORM_SHORT               2.800
+score MONEY_FRAUD_3                  4.000
+score MONEY_FRAUD_5                  1.683
 score MONEY_FROM_41                  1.999
 score MONEY_FROM_MISSP               0.001
-score NSL_RCVD_FROM_USER             3.212
-score NSL_RCVD_HELO_USER             0.770
-score OBFU_TEXT_ATTACH               2.201
+score NSL_RCVD_FROM_USER             0.001
+score NSL_RCVD_HELO_USER             3.445
+score OBFU_TEXT_ATTACH               2.198
 score PUMPDUMP                       2.999
-score RISK_FREE                      2.799
-score TAB_IN_FROM                    0.001 # force non-zero
-score TO_EQ_FM_HTML_ONLY             2.399
+score RISK_FREE                      2.699
 score TO_NO_BRKTS_DYNIP              2.360
 score TO_NO_BRKTS_FROM_MSSP          0.001
-score TO_NO_BRKTS_MSFT               3.499
-score TO_NO_BRKTS_PCNT               0.600
-score TVD_FROM_1                     1.000
-score XM_PHPMAILER_FORGED            2.399
-score YOU_INHERIT                    2.499
+score TO_NO_BRKTS_MSFT               3.500
+score TO_NO_BRKTS_PCNT               0.599
+score TVD_FROM_1                     0.999
+score XM_PHPMAILER_FORGED            2.499
+score YOU_INHERIT                    2.500
 score AC_BR_BONANZA                  0.001
 score AC_HTML_NONSENSE_TAGS          1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
-score AC_SPAMMY_URI_PATTERNS10       1.000
 score AC_SPAMMY_URI_PATTERNS11       1.000
 score AC_SPAMMY_URI_PATTERNS12       1.000
 score AC_SPAMMY_URI_PATTERNS2        1.000
@@ -109,11 +104,14 @@ score AC_SPAMMY_URI_PATTERNS8        1.0
 score AC_SPAMMY_URI_PATTERNS9        1.000
 score ADVANCE_FEE_2_NEW_FORM         1.000
 score BILLION_OVERLAP                0.001 # force non-zero
+score FBI_MONEY                      1.000
+score FBI_SPOOF                      1.000
 score FORM_LOW_CONTRAST              1.000
 score FOUND_YOU                      1.000
 score GOOGLE_DOCS_PHISH              1.000
 score GOOGLE_DOCS_PHISH_MANY         1.000
 score PUMPDUMP_MULTI                 1.000
+score TAB_IN_FROM                    0.500
 score TVD_SPACE_RATIO_MINFP          1.000
 score UC_GIBBERISH_OBFU              1.000
 score UNSUBSCRIBE_ES                 1.000

Modified: spamassassin/trunk/rulesrc/scores/scores-set3
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/scores/scores-set3?rev=1604684&r1=1604683&r2=1604684&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/scores/scores-set3 (original)
+++ spamassassin/trunk/rulesrc/scores/scores-set3 Mon Jun 23 02:33:59 2014
@@ -2,101 +2,99 @@
 # ham-net-axb-coi-bulk.log ham-net-axb-generic.log ham-net-axb-ham-misc.log ham-net-bb-guenther_fraud.log ham-net-bb-jhardin_fraud.log ham-net-bb-jhardin.log ham-net-bb-jm.log ham-net-bb-kmcgrail.log ham-net-bb-zmi.log ham-net-bernie-fsf.log ham-net-bernie-it_batt.log ham-net-bpoliakoff.log ham-net-darxus.log ham-net-dwarren.log ham-net-jarif.log ham-net-kpg-core.log ham-net-zmi.log spam-net-axb-coi-bulk.log spam-net-axb-generic.log spam-net-axb-ham-misc.log spam-net-bb-guenther_fraud.log spam-net-bb-jhardin_fraud.log spam-net-bb-jhardin.log spam-net-bb-jm.log spam-net-bb-kmcgrail.log spam-net-bb-zmi.log spam-net-bernie-fsf.log spam-net-bernie-it_batt.log spam-net-bpoliakoff.log spam-net-darxus.log spam-net-dwarren.log spam-net-jarif.log spam-net-kpg-core.log spam-net-zmi.log
 
 score AC_DIV_BONANZA                 0.001 # force non-zero
-score AC_SPAMMY_URI_PATTERNS4        0.318
-score ADVANCE_FEE_2_NEW_FRM_MNY      1.505
+score AC_SPAMMY_URI_PATTERNS4        3.168
+score ADVANCE_FEE_2_NEW_FRM_MNY      1.207
 score ADVANCE_FEE_2_NEW_MONEY        1.999
 score ADVANCE_FEE_3_NEW              3.499
-score ADVANCE_FEE_3_NEW_FORM         1.079
-score ADVANCE_FEE_3_NEW_FRM_MNY      2.583
-score ADVANCE_FEE_3_NEW_MONEY        3.417
-score ADVANCE_FEE_4_NEW              0.001
-score ADVANCE_FEE_4_NEW_FORM         0.001 # force non-zero
-score ADVANCE_FEE_4_NEW_FRM_MNY      3.191
-score ADVANCE_FEE_4_NEW_MONEY        0.244
+score ADVANCE_FEE_3_NEW_FORM         1.571
+score ADVANCE_FEE_3_NEW_FRM_MNY      1.131
+score ADVANCE_FEE_3_NEW_MONEY        3.117
+score ADVANCE_FEE_4_NEW              0.001 # force non-zero
+score ADVANCE_FEE_4_NEW_FORM         0.001
+score ADVANCE_FEE_4_NEW_FRM_MNY      0.012
+score ADVANCE_FEE_4_NEW_MONEY        0.001
 score ADVANCE_FEE_5_NEW              0.001
 score ADVANCE_FEE_5_NEW_FORM         0.001
-score ADVANCE_FEE_5_NEW_FRM_MNY      2.426
-score ADVANCE_FEE_5_NEW_MONEY        0.207
+score ADVANCE_FEE_5_NEW_FRM_MNY      1.799
+score ADVANCE_FEE_5_NEW_MONEY        0.997
 score AXB_BULKWARE_API               2.599
-score AXB_NOQUIEROMAS                2.599
-score AXB_XMAILER_MIMEOLE_OL_024C2   0.233
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   2.326
+score AXB_NOQUIEROMAS                2.499
+score AXB_XMAILER_MIMEOLE_OL_024C2   0.002
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.171
 score AXB_XM_FORGED_OL2600           2.499
 score AXB_X_AOL_SEZ_S                2.799
-score BODY_EMPTY                     0.652
+score BODY_EMPTY                     0.674
 score BODY_SINGLE_URI                0.001
-score CANT_SEE_AD                    2.999
 score CK_HELO_DYNAMIC_SPLIT_IP       1.499
 score CK_HELO_GENERIC                0.250
-score CN_B2B_SPAMMER                 2.500
-score DATE_IN_FUTURE_Q_PLUS          2.399
-score DEAR_BENEFICIARY               2.888
-score DOS_FAKE_SQUIRREL              1.224
+score CN_B2B_SPAMMER                 2.499
+score DEAR_BENEFICIARY               2.488
+score DOS_FAKE_SQUIRREL              1.699
 score DSN_NO_MIMEVERSION             1.999
-score DX_TEXT_01                     2.436
-score DX_TEXT_02                     2.499
+score DX_TEXT_01                     2.434
+score DX_TEXT_02                     2.399
 score EMAIL_URI_PHISH                3.999
 score FILL_THIS_FORM                 0.001
 score FORGED_RELAY_MUA_TO_MX         0.001
 score FORM_FRAUD_3                   3.599
-score FORM_FRAUD_5                   0.001 # force non-zero
-score FREEMAIL_FORGED_FROMDOMAIN     0.001 # force non-zero
-score FROM_12LTRDOM                  0.100
-score FROM_MISSPACED                 0.001 # force non-zero
+score FORM_FRAUD_5                   0.001
+score FREEMAIL_FORGED_FROMDOMAIN     0.001
+score FROM_12LTRDOM                  0.099
+score FROM_MISSPACED                 0.001
 score FROM_MISSP_EH_MATCH            1.999
 score FROM_MISSP_FREEMAIL            0.001
-score FROM_MISSP_MSFT                0.001 # force non-zero
+score FROM_MISSP_MSFT                0.001
 score FROM_MISSP_REPLYTO             0.001
-score FROM_MISSP_TO_UNDISC           0.001 # force non-zero
+score FROM_MISSP_TO_UNDISC           0.001
 score FROM_MISSP_USER                0.001
-score FSL_CTYPE_WIN1251              0.001 # force non-zero
-score FSL_HELO_FAKE                  2.199
+score FSL_CTYPE_WIN1251              0.001
+score FSL_HELO_FAKE                  2.100
 score FSL_HELO_FIREWALL              2.699
-score FSL_NEW_HELO_USER              1.098
-score HEADER_FROM_DIFFERENT_DOMAINS  0.001 # force non-zero
+score FSL_NEW_HELO_USER              1.095
+score HEADER_FROM_DIFFERENT_DOMAINS  0.001
 score HEXHASH_WORD                   2.100
-score HK_LOTTO                       1.000
-score HK_LOTTO_NAME                  1.000
-score HK_NAME_MR_MRS                 0.622
+score HK_LOTTO                       0.999
+score HK_LOTTO_NAME                  0.999
+score HK_NAME_MR_MRS                 0.623
 score HK_RANDOM_FROM                 0.999
-score HK_SCAM_N1                     1.907
+score HK_SCAM_N1                     1.909
 score HK_SCAM_N2                     3.099
-score HK_SCAM_N3                     2.268
-score HK_SCAM_N8                     1.341
+score HK_SCAM_N3                     0.999
+score HK_SCAM_N8                     2.188
 score HTML_OFF_PAGE                  1.999
-score IMG_DIRECT_TO_MX               0.019
-score KHOP_DYNAMIC                   0.213
+score IMG_DIRECT_TO_MX               0.001
+score KHOP_DYNAMIC                   0.220
 score LONG_HEX_URI                   2.999
 score LONG_IMG_URI                   3.799
 score LOTS_OF_MONEY                  0.010
 score LOTTO_AGENT                    2.499
 score LOTTO_DEPT                     0.001
-score MAILER_EQ_ORG                  2.500
-score MALFORMED_FREEMAIL             1.469
-score MANY_SPAN_IN_TEXT              0.001 # force non-zero
-score MONEY_ATM_CARD                 2.637
-score MONEY_FORM                     1.550
+score MAILER_EQ_ORG                  2.499
+score MALFORMED_FREEMAIL             1.485
+score MANY_SPAN_IN_TEXT              0.001
+score MONEY_ATM_CARD                 2.039
+score MONEY_FORM                     1.551
 score MONEY_FORM_SHORT               3.199
-score MONEY_FRAUD_3                  2.732
-score MONEY_FRAUD_5                  1.041
+score MONEY_FRAUD_3                  1.947
+score MONEY_FRAUD_5                  1.387
 score MONEY_FROM_41                  1.999
-score MONEY_FROM_MISSP               0.100
-score NSL_RCVD_FROM_USER             0.001 # force non-zero
-score NSL_RCVD_HELO_USER             2.627
-score OBFU_TEXT_ATTACH               1.877
-score PUMPDUMP                       2.826
+score MONEY_FROM_MISSP               1.066
+score NSL_RCVD_FROM_USER             0.237
+score NSL_RCVD_HELO_USER             2.632
+score OBFU_TEXT_ATTACH               1.887
+score PUMPDUMP                       2.951
 score RCVD_IN_MSPIKE_H2              -0.001
-score RCVD_IN_MSPIKE_L3              2.289
-score RCVD_IN_MSPIKE_L4              2.409
+score RCVD_IN_MSPIKE_L3              2.269
+score RCVD_IN_MSPIKE_L4              2.367
 score RCVD_IN_MSPIKE_L5              3.099
 score RCVD_IN_MSPIKE_ZBI             0.001
-score RISK_FREE                      2.699
-score TO_NO_BRKTS_DYNIP              1.079
-score TO_NO_BRKTS_FROM_MSSP          0.591
-score TO_NO_BRKTS_MSFT               3.500
-score TO_NO_BRKTS_PCNT               1.992
-score TVD_FROM_1                     0.999
-score XM_PHPMAILER_FORGED            2.499
+score RISK_FREE                      1.878
+score TO_NO_BRKTS_DYNIP              1.080
+score TO_NO_BRKTS_FROM_MSSP          0.181
+score TO_NO_BRKTS_MSFT               3.499
+score TO_NO_BRKTS_PCNT               1.993
+score TVD_FROM_1                     1.000
+score XM_PHPMAILER_FORGED            2.399
 score YOU_INHERIT                    2.499
 score AC_BR_BONANZA                  0.001
 score AC_HTML_NONSENSE_TAGS          1.000
@@ -110,6 +108,7 @@ score AC_SPAMMY_URI_PATTERNS8        1.0
 score AC_SPAMMY_URI_PATTERNS9        1.000
 score ADVANCE_FEE_2_NEW_FORM         1.000
 score BILLION_OVERLAP                0.001 # force non-zero
+score CANT_SEE_AD                    1.000
 score COMPENSATION                   1.000
 score FBI_MONEY                      1.000
 score FBI_SPOOF                      1.000

Modified: spamassassin/trunk/rulesrc/scores/stats-set0
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/scores/stats-set0?rev=1604684&r1=1604683&r2=1604684&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/scores/stats-set0 (original)
+++ spamassassin/trunk/rulesrc/scores/stats-set0 Mon Jun 23 02:33:59 2014
@@ -1,40 +1,40 @@
 ##### WITH NEW RULES AND SCORES #####
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 140076  41.081%  (97.433% of non-spam corpus)
-# Correctly spam:     147966  43.395%  (75.030% of spam corpus)
-# False positives:      3691  1.082%  (2.567% of nonspam, 155279 weighted)
-# False negatives:     49244  14.442%  (24.970% of spam, 149201 weighted)
-# Average score for spam:  7.0    nonspam: 1.1
-# Average for false-pos:   6.1  false-neg: 3.0
-# TOTAL:              340977  100.00%
+# Correctly non-spam: 158042  36.976%  (97.711% of non-spam corpus)
+# Correctly spam:     105917  24.781%  (39.868% of spam corpus)
+# False positives:      3702  0.866%  (2.289% of nonspam, 187434 weighted)
+# False negatives:    159753  37.377%  (60.132% of spam, 547345 weighted)
+# Average score for spam:  5.2    nonspam: 1.0
+# Average for false-pos:   6.2  false-neg: 3.4
+# TOTAL:              427414  100.00%
 
 Reading scores from "tmprules"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  17585  97.52%
-# Correctly spam:      18590  75.41%
-# False positives:       447  2.48%
-# False negatives:      6061  24.59%
-# TCR(l=50): 0.867657  SpamRecall: 75.413%  SpamPrec: 97.652%
+# Correctly non-spam:  19911  97.64%
+# Correctly spam:      13094  39.40%
+# False positives:       482  2.36%
+# False negatives:     20140  60.60%
+# TCR(l=50): 0.751221  SpamRecall: 39.399%  SpamPrec: 96.450%
 
 ##### WITHOUT NEW RULES AND SCORES #####
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 140373  97.64%
-# Correctly spam:     142108  72.06%
-# False positives:      3394  2.36%
-# False negatives:     55102  27.94%
-# TCR(l=50): 0.877261  SpamRecall: 72.059%  SpamPrec: 97.667%
+# Correctly non-spam: 158262  97.85%
+# Correctly spam:      89283  33.61%
+# False positives:      3482  2.15%
+# False negatives:    176387  66.39%
+# TCR(l=50): 0.758002  SpamRecall: 33.607%  SpamPrec: 96.246%
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  17636  97.80%
-# Correctly spam:      17912  72.66%
-# False positives:       396  2.20%
-# False negatives:      6739  27.34%
-# TCR(l=50): 0.928859  SpamRecall: 72.662%  SpamPrec: 97.837%
+# Correctly non-spam:  19962  97.89%
+# Correctly spam:      11072  33.32%
+# False positives:       431  2.11%
+# False negatives:     22162  66.68%
+# TCR(l=50): 0.760295  SpamRecall: 33.315%  SpamPrec: 96.253%

Modified: spamassassin/trunk/rulesrc/scores/stats-set1
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/scores/stats-set1?rev=1604684&r1=1604683&r2=1604684&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/scores/stats-set1 (original)
+++ spamassassin/trunk/rulesrc/scores/stats-set1 Mon Jun 23 02:33:59 2014
@@ -1,40 +1,40 @@
 ##### WITH NEW RULES AND SCORES #####
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 143240  37.000%  (99.587% of non-spam corpus)
-# Correctly spam:     136416  35.237%  (56.068% of spam corpus)
-# False positives:       594  0.153%  (0.413% of nonspam,  67691 weighted)
-# False negatives:    106890  27.610%  (43.932% of spam, 274581 weighted)
+# Correctly non-spam: 143018  36.962%  (99.523% of non-spam corpus)
+# Correctly spam:     136373  35.244%  (56.067% of spam corpus)
+# False positives:       686  0.177%  (0.477% of nonspam,  75511 weighted)
+# False negatives:    106860  27.617%  (43.933% of spam, 274470 weighted)
 # Average score for spam:  7.1    nonspam: -0.4
-# Average for false-pos:   6.7  false-neg: 2.6
-# TOTAL:              387140  100.00%
+# Average for false-pos:   6.5  false-neg: 2.6
+# TOTAL:              386937  100.00%
 
 Reading scores from "tmprules"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  17959  99.53%
-# Correctly spam:      17155  56.37%
-# False positives:        85  0.47%
-# False negatives:     13280  43.63%
-# TCR(l=50): 1.736167  SpamRecall: 56.366%  SpamPrec: 99.507%
+# Correctly non-spam:  17945  99.57%
+# Correctly spam:      17139  56.33%
+# False positives:        78  0.43%
+# False negatives:     13285  43.67%
+# TCR(l=50): 1.770381  SpamRecall: 56.334%  SpamPrec: 99.547%
 
 ##### WITHOUT NEW RULES AND SCORES #####
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 143528  99.79%
-# Correctly spam:     121878  50.09%
-# False positives:       306  0.21%
-# False negatives:    121428  49.91%
-# TCR(l=50): 1.779489  SpamRecall: 50.092%  SpamPrec: 99.750%
+# Correctly non-spam: 143385  99.78%
+# Correctly spam:     121778  50.07%
+# False positives:       319  0.22%
+# False negatives:    121455  49.93%
+# TCR(l=50): 1.770190  SpamRecall: 50.066%  SpamPrec: 99.739%
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  17999  99.75%
-# Correctly spam:      15373  50.51%
-# False positives:        45  0.25%
-# False negatives:     15062  49.49%
-# TCR(l=50): 1.758029  SpamRecall: 50.511%  SpamPrec: 99.708%
+# Correctly non-spam:  17992  99.83%
+# Correctly spam:      15359  50.48%
+# False positives:        31  0.17%
+# False negatives:     15065  49.52%
+# TCR(l=50): 1.831116  SpamRecall: 50.483%  SpamPrec: 99.799%