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 2017/11/26 02:46:27 UTC

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

Author: spamassassin_role
Date: Sun Nov 26 02:46:27 2017
New Revision: 1816360

URL: http://svn.apache.org/viewvc?rev=1816360&view=rev
Log:
updated scores for revision 1816268 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=1816360&r1=1816359&r2=1816360&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/scores/72_scores.cf (original)
+++ spamassassin/trunk/rulesrc/scores/72_scores.cf Sun Nov 26 02:46:27 2017
@@ -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_HTML_NONSENSE_TAGS                 1.000 1.999 1.000 1.999
+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_PATTERNS11              1.000 1.000 1.000 1.000
@@ -11,85 +11,75 @@ 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 ADVANCE_FEE_2_NEW_FORM                1.000 1.000 1.000 1.000
-score ADVANCE_FEE_2_NEW_MONEY               0.001 0.091 0.001 0.091
-score ADVANCE_FEE_3_NEW                     2.994 3.469 2.994 3.469
-score ADVANCE_FEE_3_NEW_MONEY               2.999 2.799 2.999 2.799
-score ADVANCE_FEE_4_NEW_MONEY               0.852 2.799 0.852 2.799
-score ADVANCE_FEE_5_NEW_FRM_MNY             3.005 3.099 3.005 3.099
-score ADVANCE_FEE_5_NEW_MONEY               1.833 2.328 1.833 2.328
-score APOSTROPHE_TOCC                       2.729 2.999 2.729 2.999
-score AXB_XMAILER_MIMEOLE_OL_024C2          0.398 0.001 0.398 0.001
-score AXB_X_AOL_SEZ_S                       3.399 3.299 3.399 3.299
-score BODY_SINGLE_URI                       0.598 0.001 0.598 0.001
-score BODY_SINGLE_WORD                      0.003 1.697 0.003 1.697
-score BODY_URI_ONLY                         1.000 1.000 1.000 1.000
-score BOGUS_MSM_HDRS                        1.673 0.591 1.673 0.591
+score ADVANCE_FEE_2_NEW_MONEY               0.001 1.000 0.001 1.000
+score ADVANCE_FEE_3_NEW                     2.993 3.499 2.993 3.499
+score ADVANCE_FEE_3_NEW_MONEY               2.899 2.599 2.899 2.599
+score ADVANCE_FEE_4_NEW_FRM_MNY             0.001 2.365 0.001 2.365
+score ADVANCE_FEE_5_NEW_FRM_MNY             3.199 2.056 3.199 2.056
+score ADVANCE_FEE_5_NEW_MONEY               1.834 0.001 1.834 0.001
+score ANY_PILL_PRICE                        0.001 1.784 0.001 1.784
+score AXB_XMAILER_MIMEOLE_OL_024C2          0.397 0.001 0.397 0.001
+score BODY_SINGLE_WORD                      0.602 2.500 0.602 2.500
+score BODY_URI_ONLY                         0.999 1.000 0.999 1.000
+score BOGUS_MSM_HDRS                        2.228 2.167 2.228 2.167
 score CANT_SEE_AD                           1.000 1.000 1.000 1.000
-score CK_HELO_DYNAMIC_SPLIT_IP              1.499 0.110 1.499 0.110
-score CK_HELO_GENERIC                       0.250 0.250 0.250 0.250
+score CK_HELO_DYNAMIC_SPLIT_IP              1.499 0.388 1.499 0.388
 score COMMENT_GIBBERISH                     1.000 1.000 1.000 1.000
-score COMPENSATION                          1.000 0.001 1.000 0.001
-score DEAR_BENEFICIARY                      3.199 3.099 3.199 3.099
+score DEAR_BENEFICIARY                      3.199 2.699 3.199 2.699
 score ENCRYPTED_MESSAGE                     -1.000 -1.000 -1.000 -1.000
 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.195 0.416 0.195 0.416
-score FORM_FRAUD                            0.999 0.002 0.999 0.002
-score FORM_FRAUD_3                          2.800 1.284 2.800 1.284
+score FILL_THIS_FORM                        1.275 0.414 1.275 0.414
+score FORM_FRAUD                            1.000 1.000 1.000 1.000
 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                             3.250 1.000 3.250 1.000
-score FREEMAIL_FORGED_FROMDOMAIN            0.001 0.150 0.001 0.150
-score FROM_IN_TO_AND_SUBJ                   1.300 0.001 1.300 0.001
+score FOUND_YOU                             3.249 3.249 3.249 3.249
+score FREEMAIL_FORGED_FROMDOMAIN            0.001 0.199 0.001 0.199
+score FROM_IN_TO_AND_SUBJ                   1.299 1.000 1.299 1.000
 score FROM_MISSPACED                        0.001 0.001 0.001 0.001
-score FROM_MISSP_DYNIP                      1.089 1.582 1.089 1.582
-score FROM_MISSP_EH_MATCH                   0.001 0.119 0.001 0.119
-score FROM_MISSP_FREEMAIL                   2.807 2.064 2.807 2.064
+score FROM_MISSP_EH_MATCH                   0.001 1.000 0.001 1.000
+score FROM_MISSP_FREEMAIL                   3.299 0.595 3.299 0.595
 score FROM_MISSP_MSFT                       0.001 0.001 0.001 0.001
-score FROM_MISSP_REPLYTO                    1.004 0.001 1.004 0.001
-score FROM_MISSP_SPF_FAIL                   0.001 0.001 0.001 0.001
-score FROM_MISSP_TO_UNDISC                  1.843 2.264 1.843 2.264
+score FROM_MISSP_REPLYTO                    2.083 0.001 2.083 0.001
+score FROM_MISSP_SPF_FAIL                   0.001 1.000 0.001 1.000
+score FROM_MISSP_TO_UNDISC                  1.339 2.699 1.339 2.699
 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_WORDY                            2.500 2.499 2.500 2.499
+score FROM_WORDY                            2.500 1.000 2.500 1.000
 score FROM_WORDY_SHORT                      1.000 1.000 1.000 1.000
 score FSL_CTYPE_WIN1251                     0.001 0.001 0.001 0.001
-score FSL_HELO_FAKE                         3.699 3.800 3.699 3.800
-score FSL_NEW_HELO_USER                     0.236 0.001 0.236 0.001
-score FUZZY_UNSUBSCRIBE                     0.001 2.799 0.001 2.799
-score GAPPY_GENITALIA                       2.832 0.001 2.832 0.001
+score FSL_HELO_FAKE                         3.799 3.699 3.799 3.699
+score FSL_NEW_HELO_USER                     0.181 0.001 0.181 0.001
+score FUZZY_CLICK_HERE                      0.001 2.399 0.001 2.399
 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 GOOG_MALWARE_DNLD                     1.000 1.000 1.000 1.000
-score HDRS_MISSP                            1.797 1.936 1.797 1.936
+score HDRS_MISSP                            1.798 2.000 1.798 2.000
 score HEADER_FROM_DIFFERENT_DOMAINS         0.001 0.001 0.001 0.001
-score HELO_MISC_IP                          0.249 0.249 0.249 0.249
+score HELO_MISC_IP                          0.250 0.250 0.250 0.250
 score HEXHASH_WORD                          1.000 1.000 1.000 1.000
 score HK_RANDOM_FROM                        0.999 1.000 0.999 1.000
-score HK_SCAM_N2                            1.887 0.652 1.887 0.652
+score HK_SCAM_N2                            1.888 1.333 1.888 1.333
 score HTML_OFF_PAGE                         1.000 1.000 1.000 1.000
-score IMG_DIRECT_TO_MX                      3.299 1.744 3.299 1.744
-score LIST_PARTIAL_SHORT_MSG                1.000 0.001 1.000 0.001
+score IMG_DIRECT_TO_MX                      3.299 2.999 3.299 2.999
 score LIST_PRTL_PUMPDUMP                    1.000 1.000 1.000 1.000
-score LIST_PRTL_SAME_USER                   0.001 0.241 0.001 0.241
-score LONG_HEX_URI                          0.351 2.260 0.351 2.260
-score LONG_IMG_URI                          0.547 0.100 0.547 0.100
-score LOTS_OF_MONEY                         0.001 0.010 0.001 0.010
+score LIST_PRTL_SAME_USER                   0.001 0.001 0.001 0.001
+score LONG_HEX_URI                          0.112 0.472 0.112 0.472
+score LONG_IMG_URI                          0.553 0.094 0.553 0.094
+score LOTS_OF_MONEY                         0.001 0.004 0.001 0.004
 score LUCRATIVE                             1.000 1.000 1.000 1.000
-score MILLION_USD                           1.999 1.999 1.999 1.999
-score MIMEOLE_DIRECT_TO_MX                  1.999 0.732 1.999 0.732
+score MANY_SPAN_IN_TEXT                     0.001 2.499 0.001 2.499
+score MILLION_USD                           2.000 1.999 2.000 1.999
+score MIMEOLE_DIRECT_TO_MX                  2.000 0.001 2.000 0.001
 score MIME_NO_TEXT                          1.000 1.000 1.000 1.000
-score MONEY_ATM_CARD                        3.199 3.199 3.199 3.199
-score MONEY_FORM                            2.805 0.001 2.805 0.001
-score MONEY_FORM_SHORT                      2.499 2.182 2.499 2.182
-score MONEY_FRAUD_3                         2.999 0.590 2.999 0.590
-score MONEY_FRAUD_5                         0.700 2.999 0.700 2.999
+score MONEY_BARRISTER                       0.001 1.000 0.001 1.000
+score MONEY_FORM_SHORT                      2.500 0.001 2.500 0.001
+score MONEY_FRAUD_5                         0.935 3.186 0.935 3.186
 score MONEY_FRAUD_8                         0.001 0.001 0.001 0.001
-score MONEY_FROM_41                         1.999 2.000 1.999 2.000
-score MONEY_FROM_MISSP                      1.993 0.001 1.993 0.001
+score MONEY_FROM_41                         2.000 1.000 2.000 1.000
 score MSM_PRIO_REPTO                        1.000 1.000 1.000 1.000
 score NSL_RCVD_FROM_USER                    0.001 0.001 0.001 0.001
-score NSL_RCVD_HELO_USER                    2.365 1.014 2.365 1.014
+score NSL_RCVD_HELO_USER                    2.420 2.071 2.420 2.071
 score PHP_NOVER_MUA                         1.000 1.000 1.000 1.000
 score PHP_ORIG_SCRIPT                       1.000 1.000 1.000 1.000
 score PHP_SCRIPT_MUA                        1.000 1.000 1.000 1.000
@@ -100,56 +90,50 @@ score PUMPDUMP
 score PUMPDUMP_MULTI                        1.000 1.000 1.000 1.000
 score RAND_HEADER_MANY                      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
+score RCVD_IN_MSPIKE_H2                     0.001 -0.094 0.001 -0.094
 score RCVD_IN_MSPIKE_H3                     0.001 -0.010 0.001 -0.010
 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 1.280 0.001 1.280
-score RCVD_IN_MSPIKE_L4                     0.001 2.099 0.001 2.099
+score RCVD_IN_MSPIKE_L3                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_L4                     0.001 2.819 0.001 2.819
 score RCVD_IN_MSPIKE_L5                     0.001 0.001 0.001 0.001
 score RCVD_IN_MSPIKE_WL                     0.001 -0.010 0.001 -0.010
-score RCVD_IN_MSPIKE_ZBI                    0.001 3.499 0.001 3.499
-score S25R_4                                3.099 0.001 3.099 0.001
-score SERGIO_SUBJECT_VIAGRA01               1.026 1.672 1.026 1.672
-score SHORTENED_URL_SRC                     3.800 2.809 3.800 2.809
-score SINGLETS_LOW_CONTRAST                 1.705 2.599 1.705 2.599
+score RCVD_IN_MSPIKE_ZBI                    0.001 3.299 0.001 3.299
+score S25R_4                                3.099 2.399 3.099 2.399
+score SERGIO_SUBJECT_VIAGRA01               1.021 0.675 1.021 0.675
+score SINGLETS_LOW_CONTRAST                 3.499 1.914 3.499 1.914
 score SPOOFED_FREEM_REPTO                   2.499 2.499 2.499 2.499
 score SPOOFED_FREEM_REPTO_CHN               1.000 1.000 1.000 1.000
 score SPOOFED_FREEM_REPTO_RUS               1.000 1.000 1.000 1.000
-score STATIC_XPRIO_OLE                      1.999 1.434 1.999 1.434
+score STATIC_XPRIO_OLE                      1.999 1.999 1.999 1.999
 score STOCK_LOW_CONTRAST                    1.000 1.000 1.000 1.000
 score STOCK_TIP                             1.000 1.000 1.000 1.000
-score STYLE_GIBBERISH                       2.600 3.499 2.600 3.499
-score SURBL_BLOCKED                         0.001 0.001 0.001 0.001
+score STYLE_GIBBERISH                       2.601 1.000 2.601 1.000
 score SYSADMIN                              1.000 1.000 1.000 1.000
-score THIS_AD                               0.001 0.688 0.001 0.688
-score THREAD_INDEX_HEX                      2.699 0.001 2.699 0.001
-score TO_EQ_FM_DIRECT_MX                    2.500 2.499 2.500 2.499
+score THIS_AD                               0.001 0.492 0.001 0.492
+score TO_EQ_FM_DIRECT_MX                    2.500 2.437 2.500 2.437
 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.001 0.075 0.001 0.075
-score TO_NO_BRKTS_DYNIP                     2.360 2.208 2.360 2.208
-score TO_NO_BRKTS_HTML_IMG                  0.001 1.500 0.001 1.500
-score TO_NO_BRKTS_HTML_ONLY                 0.670 1.264 0.670 1.264
-score TO_NO_BRKTS_MSFT                      2.499 2.109 2.499 2.109
-score TO_NO_BRKTS_NORDNS_HTML               0.001 0.335 0.001 0.335
-score TO_NO_BRKTS_PCNT                      1.000 2.499 1.000 2.499
-score TVD_SPACE_ENCODED                     2.499 1.975 2.499 1.975
+score TO_IN_SUBJ                            0.001 0.099 0.001 0.099
+score TO_NO_BRKTS_DYNIP                     2.362 2.268 2.362 2.268
+score TO_NO_BRKTS_FROM_MSSP                 0.001 0.001 0.001 0.001
+score TO_NO_BRKTS_HTML_IMG                  0.001 1.639 0.001 1.639
+score TO_NO_BRKTS_HTML_ONLY                 0.690 1.000 0.690 1.000
+score TO_NO_BRKTS_MSFT                      2.499 0.001 2.499 0.001
+score TO_NO_BRKTS_NORDNS_HTML               0.001 0.187 0.001 0.187
+score TO_NO_BRKTS_PCNT                      1.000 1.000 1.000 1.000
+score TVD_SPACE_ENCODED                     2.500 2.500 2.500 2.500
 score TVD_SPACE_ENC_FM_MIME                 1.999 1.999 1.999 1.999
 score TVD_SPACE_RATIO_MINFP                 2.499 2.499 2.499 2.499
 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 URI_DATA                              1.000 1.000 1.000 1.000
-score URI_ONLY_MSGID_MALF                   1.999 1.879 1.999 1.879
+score URI_ONLY_MSGID_MALF                   1.999 1.999 1.999 1.999
 score URI_OPTOUT_3LD                        1.000 1.000 1.000 1.000
-score URI_PHISH                             1.000 3.892 1.000 3.892
+score URI_PHISH                             1.000 1.000 1.000 1.000
 score URI_TRY_3LD                           0.001 0.001 0.001 0.001
-score URI_TRY_USME                          3.099 2.999 3.099 2.999
-score URI_WPADMIN                           2.699 1.500 2.699 1.500
-score URI_WP_DIRINDEX                       3.499 2.869 3.499 2.869
-score URI_WP_HACKED                         3.499 3.499 3.499 3.499
-score URI_WP_HACKED_2                       1.495 2.351 1.495 2.351
-score XPRIO                                 1.298 0.141 1.298 0.141
+score URI_WP_DIRINDEX                       3.499 3.345 3.499 3.345
+score URI_WP_HACKED                         3.499 1.000 3.499 1.000
+score URI_WP_HACKED_2                       1.494 0.822 1.494 0.822
+score XPRIO                                 1.197 0.001 1.197 0.001
 score XPRIO_SHORT_SUBJ                      1.000 1.000 1.000 1.000
-score YOU_INHERIT                           2.799 0.001 2.799 0.001

Modified: spamassassin/trunk/rulesrc/scores/scores-set0
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/scores/scores-set0?rev=1816360&r1=1816359&r2=1816360&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/scores/scores-set0 (original)
+++ spamassassin/trunk/rulesrc/scores/scores-set0 Sun Nov 26 02:46:27 2017
@@ -4,83 +4,79 @@
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001
 score ADVANCE_FEE_2_NEW_MONEY        0.001
-score ADVANCE_FEE_3_NEW              2.994
-score ADVANCE_FEE_3_NEW_MONEY        2.999
-score ADVANCE_FEE_4_NEW_MONEY        0.852
-score ADVANCE_FEE_5_NEW_FRM_MNY      3.005
-score ADVANCE_FEE_5_NEW_MONEY        1.833
-score APOSTROPHE_TOCC                2.729
-score AXB_XMAILER_MIMEOLE_OL_024C2   0.398
+score ADVANCE_FEE_3_NEW              2.993
+score ADVANCE_FEE_3_NEW_MONEY        2.899
+score ADVANCE_FEE_4_NEW_MONEY        0.616
+score ADVANCE_FEE_5_NEW_FRM_MNY      3.199
+score ADVANCE_FEE_5_NEW_MONEY        1.834
+score APOSTROPHE_TOCC                2.694
+score AXB_XMAILER_MIMEOLE_OL_024C2   0.397
 score AXB_X_AOL_SEZ_S                3.399
-score BODY_SINGLE_URI                0.598
-score BODY_SINGLE_WORD               0.003
-score BODY_URI_ONLY                  1.000
-score BOGUS_MSM_HDRS                 1.673
+score BODY_SINGLE_WORD               0.602
+score BODY_URI_ONLY                  0.999
+score BOGUS_MSM_HDRS                 2.228
 score CK_HELO_DYNAMIC_SPLIT_IP       1.499
-score CK_HELO_GENERIC                0.250
 score DEAR_BENEFICIARY               3.199
-score FILL_THIS_FORM                 0.195
-score FORM_FRAUD                     0.999
-score FORM_FRAUD_3                   2.800
+score FILL_THIS_FORM                 1.275
+score FORM_FRAUD                     1.000
+score FORM_FRAUD_3                   2.799
 score FORM_FRAUD_5                   0.001
-score FOUND_YOU                      3.250
-score FREEMAIL_FORGED_FROMDOMAIN     0.001
-score FROM_IN_TO_AND_SUBJ            1.300
+score FOUND_YOU                      3.249
+score FREEMAIL_FORGED_FROMDOMAIN     0.001 # force non-zero
+score FROM_IN_TO_AND_SUBJ            1.299
 score FROM_MISSPACED                 0.001
-score FROM_MISSP_DYNIP               1.089
+score FROM_MISSP_DYNIP               2.457
 score FROM_MISSP_EH_MATCH            0.001
-score FROM_MISSP_FREEMAIL            2.807
+score FROM_MISSP_FREEMAIL            3.299
 score FROM_MISSP_MSFT                0.001
-score FROM_MISSP_REPLYTO             1.004
-score FROM_MISSP_TO_UNDISC           1.843
+score FROM_MISSP_REPLYTO             2.083
+score FROM_MISSP_TO_UNDISC           1.339
 score FROM_MISSP_USER                0.001
 score FROM_MISSP_XPRIO               0.001
 score FROM_WORDY                     2.500
-score FSL_CTYPE_WIN1251              0.001
-score FSL_HELO_FAKE                  3.699
-score FSL_NEW_HELO_USER              0.236
+score FSL_CTYPE_WIN1251              0.001 # force non-zero
+score FSL_HELO_FAKE                  3.799
+score FSL_NEW_HELO_USER              0.181
 score FUZZY_UNSUBSCRIBE              0.001
-score GAPPY_GENITALIA                2.832
-score HDRS_MISSP                     1.797
+score GAPPY_GENITALIA                1.842
+score HDRS_MISSP                     1.798
 score HEADER_FROM_DIFFERENT_DOMAINS  0.001 # force non-zero
-score HELO_MISC_IP                   0.249
+score HELO_MISC_IP                   0.250
 score HK_RANDOM_FROM                 0.999
-score HK_SCAM_N2                     1.887
+score HK_SCAM_N2                     1.888
 score IMG_DIRECT_TO_MX               3.299
 score LIST_PRTL_SAME_USER            0.001 # force non-zero
-score LONG_HEX_URI                   0.351
-score LONG_IMG_URI                   0.547
+score LONG_HEX_URI                   0.112
+score LONG_IMG_URI                   0.553
 score LOTS_OF_MONEY                  0.001 # force non-zero
-score MILLION_USD                    1.999
-score MIMEOLE_DIRECT_TO_MX           1.999
+score MILLION_USD                    2.000
+score MIMEOLE_DIRECT_TO_MX           2.000
 score MONEY_ATM_CARD                 3.199
-score MONEY_FORM                     2.805
-score MONEY_FORM_SHORT               2.499
-score MONEY_FRAUD_3                  2.999
-score MONEY_FRAUD_5                  0.700
-score MONEY_FRAUD_8                  0.001
-score MONEY_FROM_41                  1.999
-score MONEY_FROM_MISSP               1.993
-score NSL_RCVD_FROM_USER             0.001
-score NSL_RCVD_HELO_USER             2.365
+score MONEY_FORM_SHORT               2.500
+score MONEY_FRAUD_3                  2.801
+score MONEY_FRAUD_5                  0.935
+score MONEY_FRAUD_8                  0.001 # force non-zero
+score MONEY_FROM_41                  2.000
+score NSL_RCVD_FROM_USER             0.001 # force non-zero
+score NSL_RCVD_HELO_USER             2.420
 score PP_MIME_FAKE_ASCII_TEXT        0.999
 score S25R_4                         3.099
-score SERGIO_SUBJECT_VIAGRA01        1.026
-score SHORTENED_URL_SRC              3.800
-score SINGLETS_LOW_CONTRAST          1.705
+score SERGIO_SUBJECT_VIAGRA01        1.021
+score SHORTENED_URL_SRC              3.799
+score SINGLETS_LOW_CONTRAST          3.499
 score SPOOFED_FREEM_REPTO            2.499
 score STATIC_XPRIO_OLE               1.999
-score STYLE_GIBBERISH                2.600
+score STYLE_GIBBERISH                2.601
 score THIS_AD                        0.001
-score THREAD_INDEX_HEX               2.699
+score THREAD_INDEX_HEX               2.700
 score TO_EQ_FM_DIRECT_MX             2.500
-score TO_IN_SUBJ                     0.001
-score TO_NO_BRKTS_DYNIP              2.360
+score TO_IN_SUBJ                     0.001 # force non-zero
+score TO_NO_BRKTS_DYNIP              2.362
 score TO_NO_BRKTS_HTML_IMG           0.001
-score TO_NO_BRKTS_HTML_ONLY          0.670
+score TO_NO_BRKTS_HTML_ONLY          0.690
 score TO_NO_BRKTS_MSFT               2.499
 score TO_NO_BRKTS_NORDNS_HTML        0.001
-score TVD_SPACE_ENCODED              2.499
+score TVD_SPACE_ENCODED              2.500
 score TVD_SPACE_ENC_FM_MIME          1.999
 score TVD_SPACE_RATIO_MINFP          2.499
 score URI_ONLY_MSGID_MALF            1.999
@@ -89,8 +85,8 @@ score URI_TRY_USME                   3.0
 score URI_WPADMIN                    2.699
 score URI_WP_DIRINDEX                3.499
 score URI_WP_HACKED                  3.499
-score URI_WP_HACKED_2                1.495
-score XPRIO                          1.298
+score URI_WP_HACKED_2                1.494
+score XPRIO                          1.197
 score YOU_INHERIT                    2.799
 score AC_HTML_NONSENSE_TAGS          1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
@@ -105,7 +101,6 @@ score AC_SPAMMY_URI_PATTERNS9        1.0
 score ADVANCE_FEE_2_NEW_FORM         1.000
 score CANT_SEE_AD                    1.000
 score COMMENT_GIBBERISH              1.000
-score COMPENSATION                   1.000
 score ENCRYPTED_MESSAGE              -1.000
 score FBI_MONEY                      1.000
 score FBI_SPOOF                      1.000
@@ -116,7 +111,6 @@ score GOOGLE_DOCS_PHISH_MANY         1.0
 score GOOG_MALWARE_DNLD              1.000
 score HEXHASH_WORD                   1.000
 score HTML_OFF_PAGE                  1.000
-score LIST_PARTIAL_SHORT_MSG         1.000
 score LIST_PRTL_PUMPDUMP             1.000
 score LUCRATIVE                      1.000
 score MIME_NO_TEXT                   1.000

Modified: spamassassin/trunk/rulesrc/scores/scores-set1
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/scores/scores-set1?rev=1816360&r1=1816359&r2=1816360&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/scores/scores-set1 (original)
+++ spamassassin/trunk/rulesrc/scores/scores-set1 Sun Nov 26 02:46:27 2017
@@ -1,103 +1,84 @@
-# Using score set 1 logs for revision 1815645 from:
-# ham-net-axb-coi-bulk.log ham-net-axb-generic.log ham-net-axb-ham-misc.log ham-net-axb-ninja.log ham-net-darxus.log ham-net-ena-week0.log ham-net-ena-week1.log ham-net-ena-week2.log ham-net-ena-week3.log ham-net-giovanni.log ham-net-grenier.log ham-net-jarif.log ham-net-jbrooks.log ham-net-mmiroslaw-mails-ham.log ham-net-mmiroslaw-mails-spam.log ham-net-thendrikx.log spam-net-axb-coi-bulk.log spam-net-axb-generic.log spam-net-axb-ham-misc.log spam-net-axb-ninja.log spam-net-darxus.log spam-net-ena-week0.log spam-net-ena-week1.log spam-net-ena-week2.log spam-net-ena-week3.log spam-net-giovanni.log spam-net-grenier.log spam-net-jarif.log spam-net-jbrooks.log spam-net-mmiroslaw-mails-ham.log spam-net-mmiroslaw-mails-spam.log spam-net-thendrikx.log
+# Using score set 1 logs for revision 1816268 from:
+# ham-net-axb-coi-bulk.log ham-net-axb-generic.log ham-net-axb-ham-misc.log ham-net-axb-ninja.log ham-net-darxus.log ham-net-giovanni.log ham-net-grenier.log ham-net-jarif.log ham-net-mmiroslaw-mails-ham.log ham-net-mmiroslaw-mails-spam.log ham-net-thendrikx.log spam-net-axb-coi-bulk.log spam-net-axb-generic.log spam-net-axb-ham-misc.log spam-net-axb-ninja.log spam-net-darxus.log spam-net-giovanni.log spam-net-grenier.log spam-net-jarif.log spam-net-mmiroslaw-mails-ham.log spam-net-mmiroslaw-mails-spam.log spam-net-thendrikx.log
 
-score AC_BR_BONANZA                  0.001
-score AC_DIV_BONANZA                 0.001
-score AC_HTML_NONSENSE_TAGS          1.999
-score ADVANCE_FEE_2_NEW_MONEY        0.091
-score ADVANCE_FEE_3_NEW              3.469
-score ADVANCE_FEE_3_NEW_MONEY        2.799
-score ADVANCE_FEE_4_NEW_MONEY        2.799
-score ADVANCE_FEE_5_NEW_FRM_MNY      3.099
-score ADVANCE_FEE_5_NEW_MONEY        2.328
-score APOSTROPHE_TOCC                2.999
+score AC_DIV_BONANZA                 0.001 # force non-zero
+score ADVANCE_FEE_3_NEW              3.499
+score ADVANCE_FEE_3_NEW_MONEY        2.599
+score ADVANCE_FEE_4_NEW_FRM_MNY      2.365
+score ADVANCE_FEE_5_NEW_FRM_MNY      2.056
+score ADVANCE_FEE_5_NEW_MONEY        0.001
+score ANY_PILL_PRICE                 1.784
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_X_AOL_SEZ_S                3.299
-score BODY_SINGLE_WORD               1.697
+score BODY_SINGLE_WORD               2.500
 score BODY_URI_ONLY                  1.000
-score BOGUS_MSM_HDRS                 0.591
-score CK_HELO_DYNAMIC_SPLIT_IP       0.110
-score CK_HELO_GENERIC                0.250
-score DEAR_BENEFICIARY               3.099
-score FILL_THIS_FORM                 0.416
-score FORM_FRAUD                     0.002
-score FORM_FRAUD_3                   1.284
+score BOGUS_MSM_HDRS                 2.167
+score CK_HELO_DYNAMIC_SPLIT_IP       0.388
+score DEAR_BENEFICIARY               2.699
+score FILL_THIS_FORM                 0.414
 score FORM_FRAUD_5                   0.001
-score FREEMAIL_FORGED_FROMDOMAIN     0.150
-score FROM_IN_TO_AND_SUBJ            0.001
+score FOUND_YOU                      3.249
+score FREEMAIL_FORGED_FROMDOMAIN     0.199
+score FROM_IN_TO_AND_SUBJ            1.000
 score FROM_MISSPACED                 0.001
-score FROM_MISSP_DYNIP               1.582
-score FROM_MISSP_EH_MATCH            0.119
-score FROM_MISSP_FREEMAIL            2.064
+score FROM_MISSP_FREEMAIL            0.595
 score FROM_MISSP_MSFT                0.001
 score FROM_MISSP_REPLYTO             0.001
-score FROM_MISSP_SPF_FAIL            0.001
-score FROM_MISSP_TO_UNDISC           2.264
+score FROM_MISSP_TO_UNDISC           2.699
 score FROM_MISSP_USER                0.001
 score FROM_MISSP_XPRIO               0.001
-score FROM_UNBAL1                    2.543
-score FROM_WORDY                     2.499
 score FSL_CTYPE_WIN1251              0.001
-score FSL_HELO_FAKE                  3.800
-score FSL_NEW_HELO_USER              0.001 # force non-zero
-score FUZZY_UNSUBSCRIBE              2.799
-score HDRS_MISSP                     1.936
+score FSL_HELO_FAKE                  3.699
+score FSL_NEW_HELO_USER              0.001
+score FUZZY_CLICK_HERE               2.399
+score HDRS_MISSP                     2.000
 score HEADER_FROM_DIFFERENT_DOMAINS  0.001 # force non-zero
-score HELO_MISC_IP                   0.249
+score HELO_MISC_IP                   0.250
 score HK_RANDOM_FROM                 1.000
-score HK_SCAM_N2                     0.652
-score IMG_DIRECT_TO_MX               1.744
-score LIST_PRTL_SAME_USER            0.241
-score LONG_HEX_URI                   2.260
-score LONG_IMG_URI                   0.100
-score LOTS_OF_MONEY                  0.010
+score HK_SCAM_N2                     1.333
+score IMG_DIRECT_TO_MX               2.999
+score LIST_PRTL_SAME_USER            0.001
+score LONG_HEX_URI                   0.472
+score LONG_IMG_URI                   0.094
+score LOTS_OF_MONEY                  0.004
+score MANY_SPAN_IN_TEXT              2.499
 score MILLION_USD                    1.999
-score MIMEOLE_DIRECT_TO_MX           0.732
-score MONEY_ATM_CARD                 3.199
-score MONEY_FORM_SHORT               2.182
-score MONEY_FRAUD_3                  0.590
-score MONEY_FRAUD_5                  2.999
+score MIMEOLE_DIRECT_TO_MX           0.001
+score MONEY_FORM_SHORT               0.001
+score MONEY_FRAUD_5                  3.186
 score MONEY_FRAUD_8                  0.001
-score MONEY_FROM_41                  2.000
 score NSL_RCVD_FROM_USER             0.001
-score NSL_RCVD_HELO_USER             1.014
+score NSL_RCVD_HELO_USER             2.071
 score PP_MIME_FAKE_ASCII_TEXT        0.001
-score RCVD_IN_MSPIKE_H2              -0.001
-score RCVD_IN_MSPIKE_L3              1.280
-score RCVD_IN_MSPIKE_L4              2.099
-score RCVD_IN_MSPIKE_L5              0.001
-score RCVD_IN_MSPIKE_ZBI             3.499
-score SERGIO_SUBJECT_VIAGRA01        1.672
-score SHORTENED_URL_SRC              2.809
-score SINGLETS_LOW_CONTRAST          2.599
+score RCVD_IN_MSPIKE_H2              -0.094
+score RCVD_IN_MSPIKE_L3              0.001 # force non-zero
+score RCVD_IN_MSPIKE_L4              2.819
+score RCVD_IN_MSPIKE_L5              0.001 # force non-zero
+score RCVD_IN_MSPIKE_ZBI             3.299
+score S25R_4                         2.399
+score SERGIO_SUBJECT_VIAGRA01        0.675
+score SINGLETS_LOW_CONTRAST          1.914
 score SPOOFED_FREEM_REPTO            2.499
-score STATIC_XPRIO_OLE               1.434
-score STYLE_GIBBERISH                3.499
-score THIS_AD                        0.688
-score THREAD_INDEX_HEX               0.001
-score TO_EQ_FM_DIRECT_MX             2.499
+score STATIC_XPRIO_OLE               1.999
+score THIS_AD                        0.492
+score TO_EQ_FM_DIRECT_MX             2.437
 score TO_EQ_FM_DOM_SPF_FAIL          0.001
 score TO_EQ_FM_SPF_FAIL              0.001
-score TO_IN_SUBJ                     0.075
-score TO_NO_BRKTS_DYNIP              2.208
-score TO_NO_BRKTS_HTML_IMG           1.500
-score TO_NO_BRKTS_HTML_ONLY          1.264
-score TO_NO_BRKTS_MSFT               2.109
-score TO_NO_BRKTS_NORDNS_HTML        0.335
-score TO_NO_BRKTS_PCNT               2.499
-score TVD_SPACE_ENCODED              1.975
+score TO_IN_SUBJ                     0.099
+score TO_NO_BRKTS_DYNIP              2.268
+score TO_NO_BRKTS_FROM_MSSP          0.001 # force non-zero
+score TO_NO_BRKTS_HTML_IMG           1.639
+score TO_NO_BRKTS_MSFT               0.001
+score TO_NO_BRKTS_NORDNS_HTML        0.187
+score TVD_SPACE_ENCODED              2.500
 score TVD_SPACE_ENC_FM_MIME          1.999
 score TVD_SPACE_RATIO_MINFP          2.499
-score URI_GOOGLE_PROXY               1.799
-score URI_ONLY_MSGID_MALF            1.879
-score URI_PHISH                      3.892
+score URI_ONLY_MSGID_MALF            1.999
 score URI_TRY_3LD                    0.001
-score URI_TRY_USME                   2.999
-score URI_WPADMIN                    1.500
-score URI_WP_DIRINDEX                2.869
-score URI_WP_HACKED                  3.499
-score URI_WP_HACKED_2                2.351
-score XPRIO                          0.141
+score URI_WP_DIRINDEX                3.345
+score URI_WP_HACKED_2                0.822
+score XPRIO                          0.001 # force non-zero
+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
@@ -108,13 +89,17 @@ score AC_SPAMMY_URI_PATTERNS4        1.0
 score AC_SPAMMY_URI_PATTERNS8        1.000
 score AC_SPAMMY_URI_PATTERNS9        1.000
 score ADVANCE_FEE_2_NEW_FORM         1.000
+score ADVANCE_FEE_2_NEW_MONEY        1.000
 score CANT_SEE_AD                    1.000
 score COMMENT_GIBBERISH              1.000
 score ENCRYPTED_MESSAGE              -1.000
 score FBI_MONEY                      1.000
 score FBI_SPOOF                      1.000
+score FORM_FRAUD                     1.000
 score FORM_LOW_CONTRAST              1.000
-score FOUND_YOU                      1.000
+score FROM_MISSP_EH_MATCH            1.000
+score FROM_MISSP_SPF_FAIL            1.000
+score FROM_WORDY                     1.000
 score FROM_WORDY_SHORT               1.000
 score GOOGLE_DOCS_PHISH              1.000
 score GOOGLE_DOCS_PHISH_MANY         1.000
@@ -124,6 +109,8 @@ score HTML_OFF_PAGE                  1.0
 score LIST_PRTL_PUMPDUMP             1.000
 score LUCRATIVE                      1.000
 score MIME_NO_TEXT                   1.000
+score MONEY_BARRISTER                1.000
+score MONEY_FROM_41                  1.000
 score MSM_PRIO_REPTO                 1.000
 score PHP_NOVER_MUA                  1.000
 score PHP_ORIG_SCRIPT                1.000
@@ -142,9 +129,14 @@ score SPOOFED_FREEM_REPTO_CHN        1.0
 score SPOOFED_FREEM_REPTO_RUS        1.000
 score STOCK_LOW_CONTRAST             1.000
 score STOCK_TIP                      1.000
+score STYLE_GIBBERISH                1.000
 score SYSADMIN                       1.000
+score TO_NO_BRKTS_HTML_ONLY          1.000
+score TO_NO_BRKTS_PCNT               1.000
 score TW_GIBBERISH_MANY              1.000
 score UC_GIBBERISH_OBFU              1.000
 score URI_DATA                       1.000
 score URI_OPTOUT_3LD                 1.000
+score URI_PHISH                      1.000
+score URI_WP_HACKED                  1.000
 score XPRIO_SHORT_SUBJ               1.000

Modified: spamassassin/trunk/rulesrc/scores/scores-set2
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/scores/scores-set2?rev=1816360&r1=1816359&r2=1816360&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/scores/scores-set2 (original)
+++ spamassassin/trunk/rulesrc/scores/scores-set2 Sun Nov 26 02:46:27 2017
@@ -4,83 +4,79 @@
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001
 score ADVANCE_FEE_2_NEW_MONEY        0.001
-score ADVANCE_FEE_3_NEW              2.994
-score ADVANCE_FEE_3_NEW_MONEY        2.999
-score ADVANCE_FEE_4_NEW_MONEY        0.852
-score ADVANCE_FEE_5_NEW_FRM_MNY      3.005
-score ADVANCE_FEE_5_NEW_MONEY        1.833
-score APOSTROPHE_TOCC                2.729
-score AXB_XMAILER_MIMEOLE_OL_024C2   0.398
+score ADVANCE_FEE_3_NEW              2.993
+score ADVANCE_FEE_3_NEW_MONEY        2.899
+score ADVANCE_FEE_4_NEW_MONEY        0.616
+score ADVANCE_FEE_5_NEW_FRM_MNY      3.199
+score ADVANCE_FEE_5_NEW_MONEY        1.834
+score APOSTROPHE_TOCC                2.694
+score AXB_XMAILER_MIMEOLE_OL_024C2   0.397
 score AXB_X_AOL_SEZ_S                3.399
-score BODY_SINGLE_URI                0.598
-score BODY_SINGLE_WORD               0.003
-score BODY_URI_ONLY                  1.000
-score BOGUS_MSM_HDRS                 1.673
+score BODY_SINGLE_WORD               0.602
+score BODY_URI_ONLY                  0.999
+score BOGUS_MSM_HDRS                 2.228
 score CK_HELO_DYNAMIC_SPLIT_IP       1.499
-score CK_HELO_GENERIC                0.250
 score DEAR_BENEFICIARY               3.199
-score FILL_THIS_FORM                 0.195
-score FORM_FRAUD                     0.999
-score FORM_FRAUD_3                   2.800
+score FILL_THIS_FORM                 1.275
+score FORM_FRAUD                     1.000
+score FORM_FRAUD_3                   2.799
 score FORM_FRAUD_5                   0.001
-score FOUND_YOU                      3.250
-score FREEMAIL_FORGED_FROMDOMAIN     0.001
-score FROM_IN_TO_AND_SUBJ            1.300
+score FOUND_YOU                      3.249
+score FREEMAIL_FORGED_FROMDOMAIN     0.001 # force non-zero
+score FROM_IN_TO_AND_SUBJ            1.299
 score FROM_MISSPACED                 0.001
-score FROM_MISSP_DYNIP               1.089
+score FROM_MISSP_DYNIP               2.457
 score FROM_MISSP_EH_MATCH            0.001
-score FROM_MISSP_FREEMAIL            2.807
+score FROM_MISSP_FREEMAIL            3.299
 score FROM_MISSP_MSFT                0.001
-score FROM_MISSP_REPLYTO             1.004
-score FROM_MISSP_TO_UNDISC           1.843
+score FROM_MISSP_REPLYTO             2.083
+score FROM_MISSP_TO_UNDISC           1.339
 score FROM_MISSP_USER                0.001
 score FROM_MISSP_XPRIO               0.001
 score FROM_WORDY                     2.500
-score FSL_CTYPE_WIN1251              0.001
-score FSL_HELO_FAKE                  3.699
-score FSL_NEW_HELO_USER              0.236
+score FSL_CTYPE_WIN1251              0.001 # force non-zero
+score FSL_HELO_FAKE                  3.799
+score FSL_NEW_HELO_USER              0.181
 score FUZZY_UNSUBSCRIBE              0.001
-score GAPPY_GENITALIA                2.832
-score HDRS_MISSP                     1.797
+score GAPPY_GENITALIA                1.842
+score HDRS_MISSP                     1.798
 score HEADER_FROM_DIFFERENT_DOMAINS  0.001 # force non-zero
-score HELO_MISC_IP                   0.249
+score HELO_MISC_IP                   0.250
 score HK_RANDOM_FROM                 0.999
-score HK_SCAM_N2                     1.887
+score HK_SCAM_N2                     1.888
 score IMG_DIRECT_TO_MX               3.299
 score LIST_PRTL_SAME_USER            0.001 # force non-zero
-score LONG_HEX_URI                   0.351
-score LONG_IMG_URI                   0.547
+score LONG_HEX_URI                   0.112
+score LONG_IMG_URI                   0.553
 score LOTS_OF_MONEY                  0.001 # force non-zero
-score MILLION_USD                    1.999
-score MIMEOLE_DIRECT_TO_MX           1.999
+score MILLION_USD                    2.000
+score MIMEOLE_DIRECT_TO_MX           2.000
 score MONEY_ATM_CARD                 3.199
-score MONEY_FORM                     2.805
-score MONEY_FORM_SHORT               2.499
-score MONEY_FRAUD_3                  2.999
-score MONEY_FRAUD_5                  0.700
-score MONEY_FRAUD_8                  0.001
-score MONEY_FROM_41                  1.999
-score MONEY_FROM_MISSP               1.993
-score NSL_RCVD_FROM_USER             0.001
-score NSL_RCVD_HELO_USER             2.365
+score MONEY_FORM_SHORT               2.500
+score MONEY_FRAUD_3                  2.801
+score MONEY_FRAUD_5                  0.935
+score MONEY_FRAUD_8                  0.001 # force non-zero
+score MONEY_FROM_41                  2.000
+score NSL_RCVD_FROM_USER             0.001 # force non-zero
+score NSL_RCVD_HELO_USER             2.420
 score PP_MIME_FAKE_ASCII_TEXT        0.999
 score S25R_4                         3.099
-score SERGIO_SUBJECT_VIAGRA01        1.026
-score SHORTENED_URL_SRC              3.800
-score SINGLETS_LOW_CONTRAST          1.705
+score SERGIO_SUBJECT_VIAGRA01        1.021
+score SHORTENED_URL_SRC              3.799
+score SINGLETS_LOW_CONTRAST          3.499
 score SPOOFED_FREEM_REPTO            2.499
 score STATIC_XPRIO_OLE               1.999
-score STYLE_GIBBERISH                2.600
+score STYLE_GIBBERISH                2.601
 score THIS_AD                        0.001
-score THREAD_INDEX_HEX               2.699
+score THREAD_INDEX_HEX               2.700
 score TO_EQ_FM_DIRECT_MX             2.500
-score TO_IN_SUBJ                     0.001
-score TO_NO_BRKTS_DYNIP              2.360
+score TO_IN_SUBJ                     0.001 # force non-zero
+score TO_NO_BRKTS_DYNIP              2.362
 score TO_NO_BRKTS_HTML_IMG           0.001
-score TO_NO_BRKTS_HTML_ONLY          0.670
+score TO_NO_BRKTS_HTML_ONLY          0.690
 score TO_NO_BRKTS_MSFT               2.499
 score TO_NO_BRKTS_NORDNS_HTML        0.001
-score TVD_SPACE_ENCODED              2.499
+score TVD_SPACE_ENCODED              2.500
 score TVD_SPACE_ENC_FM_MIME          1.999
 score TVD_SPACE_RATIO_MINFP          2.499
 score URI_ONLY_MSGID_MALF            1.999
@@ -89,8 +85,8 @@ score URI_TRY_USME                   3.0
 score URI_WPADMIN                    2.699
 score URI_WP_DIRINDEX                3.499
 score URI_WP_HACKED                  3.499
-score URI_WP_HACKED_2                1.495
-score XPRIO                          1.298
+score URI_WP_HACKED_2                1.494
+score XPRIO                          1.197
 score YOU_INHERIT                    2.799
 score AC_HTML_NONSENSE_TAGS          1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
@@ -105,7 +101,6 @@ score AC_SPAMMY_URI_PATTERNS9        1.0
 score ADVANCE_FEE_2_NEW_FORM         1.000
 score CANT_SEE_AD                    1.000
 score COMMENT_GIBBERISH              1.000
-score COMPENSATION                   1.000
 score ENCRYPTED_MESSAGE              -1.000
 score FBI_MONEY                      1.000
 score FBI_SPOOF                      1.000
@@ -116,7 +111,6 @@ score GOOGLE_DOCS_PHISH_MANY         1.0
 score GOOG_MALWARE_DNLD              1.000
 score HEXHASH_WORD                   1.000
 score HTML_OFF_PAGE                  1.000
-score LIST_PARTIAL_SHORT_MSG         1.000
 score LIST_PRTL_PUMPDUMP             1.000
 score LUCRATIVE                      1.000
 score MIME_NO_TEXT                   1.000

Modified: spamassassin/trunk/rulesrc/scores/scores-set3
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/scores/scores-set3?rev=1816360&r1=1816359&r2=1816360&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/scores/scores-set3 (original)
+++ spamassassin/trunk/rulesrc/scores/scores-set3 Sun Nov 26 02:46:27 2017
@@ -1,103 +1,84 @@
-# Using score set 1 logs for revision 1815645 from:
-# ham-net-axb-coi-bulk.log ham-net-axb-generic.log ham-net-axb-ham-misc.log ham-net-axb-ninja.log ham-net-darxus.log ham-net-ena-week0.log ham-net-ena-week1.log ham-net-ena-week2.log ham-net-ena-week3.log ham-net-giovanni.log ham-net-grenier.log ham-net-jarif.log ham-net-jbrooks.log ham-net-mmiroslaw-mails-ham.log ham-net-mmiroslaw-mails-spam.log ham-net-thendrikx.log spam-net-axb-coi-bulk.log spam-net-axb-generic.log spam-net-axb-ham-misc.log spam-net-axb-ninja.log spam-net-darxus.log spam-net-ena-week0.log spam-net-ena-week1.log spam-net-ena-week2.log spam-net-ena-week3.log spam-net-giovanni.log spam-net-grenier.log spam-net-jarif.log spam-net-jbrooks.log spam-net-mmiroslaw-mails-ham.log spam-net-mmiroslaw-mails-spam.log spam-net-thendrikx.log
+# Using score set 1 logs for revision 1816268 from:
+# ham-net-axb-coi-bulk.log ham-net-axb-generic.log ham-net-axb-ham-misc.log ham-net-axb-ninja.log ham-net-darxus.log ham-net-giovanni.log ham-net-grenier.log ham-net-jarif.log ham-net-mmiroslaw-mails-ham.log ham-net-mmiroslaw-mails-spam.log ham-net-thendrikx.log spam-net-axb-coi-bulk.log spam-net-axb-generic.log spam-net-axb-ham-misc.log spam-net-axb-ninja.log spam-net-darxus.log spam-net-giovanni.log spam-net-grenier.log spam-net-jarif.log spam-net-mmiroslaw-mails-ham.log spam-net-mmiroslaw-mails-spam.log spam-net-thendrikx.log
 
-score AC_BR_BONANZA                  0.001
-score AC_DIV_BONANZA                 0.001
-score AC_HTML_NONSENSE_TAGS          1.999
-score ADVANCE_FEE_2_NEW_MONEY        0.091
-score ADVANCE_FEE_3_NEW              3.469
-score ADVANCE_FEE_3_NEW_MONEY        2.799
-score ADVANCE_FEE_4_NEW_MONEY        2.799
-score ADVANCE_FEE_5_NEW_FRM_MNY      3.099
-score ADVANCE_FEE_5_NEW_MONEY        2.328
-score APOSTROPHE_TOCC                2.999
+score AC_DIV_BONANZA                 0.001 # force non-zero
+score ADVANCE_FEE_3_NEW              3.499
+score ADVANCE_FEE_3_NEW_MONEY        2.599
+score ADVANCE_FEE_4_NEW_FRM_MNY      2.365
+score ADVANCE_FEE_5_NEW_FRM_MNY      2.056
+score ADVANCE_FEE_5_NEW_MONEY        0.001
+score ANY_PILL_PRICE                 1.784
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_X_AOL_SEZ_S                3.299
-score BODY_SINGLE_WORD               1.697
+score BODY_SINGLE_WORD               2.500
 score BODY_URI_ONLY                  1.000
-score BOGUS_MSM_HDRS                 0.591
-score CK_HELO_DYNAMIC_SPLIT_IP       0.110
-score CK_HELO_GENERIC                0.250
-score DEAR_BENEFICIARY               3.099
-score FILL_THIS_FORM                 0.416
-score FORM_FRAUD                     0.002
-score FORM_FRAUD_3                   1.284
+score BOGUS_MSM_HDRS                 2.167
+score CK_HELO_DYNAMIC_SPLIT_IP       0.388
+score DEAR_BENEFICIARY               2.699
+score FILL_THIS_FORM                 0.414
 score FORM_FRAUD_5                   0.001
-score FREEMAIL_FORGED_FROMDOMAIN     0.150
-score FROM_IN_TO_AND_SUBJ            0.001
+score FOUND_YOU                      3.249
+score FREEMAIL_FORGED_FROMDOMAIN     0.199
+score FROM_IN_TO_AND_SUBJ            1.000
 score FROM_MISSPACED                 0.001
-score FROM_MISSP_DYNIP               1.582
-score FROM_MISSP_EH_MATCH            0.119
-score FROM_MISSP_FREEMAIL            2.064
+score FROM_MISSP_FREEMAIL            0.595
 score FROM_MISSP_MSFT                0.001
 score FROM_MISSP_REPLYTO             0.001
-score FROM_MISSP_SPF_FAIL            0.001
-score FROM_MISSP_TO_UNDISC           2.264
+score FROM_MISSP_TO_UNDISC           2.699
 score FROM_MISSP_USER                0.001
 score FROM_MISSP_XPRIO               0.001
-score FROM_UNBAL1                    2.543
-score FROM_WORDY                     2.499
 score FSL_CTYPE_WIN1251              0.001
-score FSL_HELO_FAKE                  3.800
-score FSL_NEW_HELO_USER              0.001 # force non-zero
-score FUZZY_UNSUBSCRIBE              2.799
-score HDRS_MISSP                     1.936
+score FSL_HELO_FAKE                  3.699
+score FSL_NEW_HELO_USER              0.001
+score FUZZY_CLICK_HERE               2.399
+score HDRS_MISSP                     2.000
 score HEADER_FROM_DIFFERENT_DOMAINS  0.001 # force non-zero
-score HELO_MISC_IP                   0.249
+score HELO_MISC_IP                   0.250
 score HK_RANDOM_FROM                 1.000
-score HK_SCAM_N2                     0.652
-score IMG_DIRECT_TO_MX               1.744
-score LIST_PRTL_SAME_USER            0.241
-score LONG_HEX_URI                   2.260
-score LONG_IMG_URI                   0.100
-score LOTS_OF_MONEY                  0.010
+score HK_SCAM_N2                     1.333
+score IMG_DIRECT_TO_MX               2.999
+score LIST_PRTL_SAME_USER            0.001
+score LONG_HEX_URI                   0.472
+score LONG_IMG_URI                   0.094
+score LOTS_OF_MONEY                  0.004
+score MANY_SPAN_IN_TEXT              2.499
 score MILLION_USD                    1.999
-score MIMEOLE_DIRECT_TO_MX           0.732
-score MONEY_ATM_CARD                 3.199
-score MONEY_FORM_SHORT               2.182
-score MONEY_FRAUD_3                  0.590
-score MONEY_FRAUD_5                  2.999
+score MIMEOLE_DIRECT_TO_MX           0.001
+score MONEY_FORM_SHORT               0.001
+score MONEY_FRAUD_5                  3.186
 score MONEY_FRAUD_8                  0.001
-score MONEY_FROM_41                  2.000
 score NSL_RCVD_FROM_USER             0.001
-score NSL_RCVD_HELO_USER             1.014
+score NSL_RCVD_HELO_USER             2.071
 score PP_MIME_FAKE_ASCII_TEXT        0.001
-score RCVD_IN_MSPIKE_H2              -0.001
-score RCVD_IN_MSPIKE_L3              1.280
-score RCVD_IN_MSPIKE_L4              2.099
-score RCVD_IN_MSPIKE_L5              0.001
-score RCVD_IN_MSPIKE_ZBI             3.499
-score SERGIO_SUBJECT_VIAGRA01        1.672
-score SHORTENED_URL_SRC              2.809
-score SINGLETS_LOW_CONTRAST          2.599
+score RCVD_IN_MSPIKE_H2              -0.094
+score RCVD_IN_MSPIKE_L3              0.001 # force non-zero
+score RCVD_IN_MSPIKE_L4              2.819
+score RCVD_IN_MSPIKE_L5              0.001 # force non-zero
+score RCVD_IN_MSPIKE_ZBI             3.299
+score S25R_4                         2.399
+score SERGIO_SUBJECT_VIAGRA01        0.675
+score SINGLETS_LOW_CONTRAST          1.914
 score SPOOFED_FREEM_REPTO            2.499
-score STATIC_XPRIO_OLE               1.434
-score STYLE_GIBBERISH                3.499
-score THIS_AD                        0.688
-score THREAD_INDEX_HEX               0.001
-score TO_EQ_FM_DIRECT_MX             2.499
+score STATIC_XPRIO_OLE               1.999
+score THIS_AD                        0.492
+score TO_EQ_FM_DIRECT_MX             2.437
 score TO_EQ_FM_DOM_SPF_FAIL          0.001
 score TO_EQ_FM_SPF_FAIL              0.001
-score TO_IN_SUBJ                     0.075
-score TO_NO_BRKTS_DYNIP              2.208
-score TO_NO_BRKTS_HTML_IMG           1.500
-score TO_NO_BRKTS_HTML_ONLY          1.264
-score TO_NO_BRKTS_MSFT               2.109
-score TO_NO_BRKTS_NORDNS_HTML        0.335
-score TO_NO_BRKTS_PCNT               2.499
-score TVD_SPACE_ENCODED              1.975
+score TO_IN_SUBJ                     0.099
+score TO_NO_BRKTS_DYNIP              2.268
+score TO_NO_BRKTS_FROM_MSSP          0.001 # force non-zero
+score TO_NO_BRKTS_HTML_IMG           1.639
+score TO_NO_BRKTS_MSFT               0.001
+score TO_NO_BRKTS_NORDNS_HTML        0.187
+score TVD_SPACE_ENCODED              2.500
 score TVD_SPACE_ENC_FM_MIME          1.999
 score TVD_SPACE_RATIO_MINFP          2.499
-score URI_GOOGLE_PROXY               1.799
-score URI_ONLY_MSGID_MALF            1.879
-score URI_PHISH                      3.892
+score URI_ONLY_MSGID_MALF            1.999
 score URI_TRY_3LD                    0.001
-score URI_TRY_USME                   2.999
-score URI_WPADMIN                    1.500
-score URI_WP_DIRINDEX                2.869
-score URI_WP_HACKED                  3.499
-score URI_WP_HACKED_2                2.351
-score XPRIO                          0.141
+score URI_WP_DIRINDEX                3.345
+score URI_WP_HACKED_2                0.822
+score XPRIO                          0.001 # force non-zero
+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
@@ -108,13 +89,17 @@ score AC_SPAMMY_URI_PATTERNS4        1.0
 score AC_SPAMMY_URI_PATTERNS8        1.000
 score AC_SPAMMY_URI_PATTERNS9        1.000
 score ADVANCE_FEE_2_NEW_FORM         1.000
+score ADVANCE_FEE_2_NEW_MONEY        1.000
 score CANT_SEE_AD                    1.000
 score COMMENT_GIBBERISH              1.000
 score ENCRYPTED_MESSAGE              -1.000
 score FBI_MONEY                      1.000
 score FBI_SPOOF                      1.000
+score FORM_FRAUD                     1.000
 score FORM_LOW_CONTRAST              1.000
-score FOUND_YOU                      1.000
+score FROM_MISSP_EH_MATCH            1.000
+score FROM_MISSP_SPF_FAIL            1.000
+score FROM_WORDY                     1.000
 score FROM_WORDY_SHORT               1.000
 score GOOGLE_DOCS_PHISH              1.000
 score GOOGLE_DOCS_PHISH_MANY         1.000
@@ -124,6 +109,8 @@ score HTML_OFF_PAGE                  1.0
 score LIST_PRTL_PUMPDUMP             1.000
 score LUCRATIVE                      1.000
 score MIME_NO_TEXT                   1.000
+score MONEY_BARRISTER                1.000
+score MONEY_FROM_41                  1.000
 score MSM_PRIO_REPTO                 1.000
 score PHP_NOVER_MUA                  1.000
 score PHP_ORIG_SCRIPT                1.000
@@ -142,9 +129,14 @@ score SPOOFED_FREEM_REPTO_CHN        1.0
 score SPOOFED_FREEM_REPTO_RUS        1.000
 score STOCK_LOW_CONTRAST             1.000
 score STOCK_TIP                      1.000
+score STYLE_GIBBERISH                1.000
 score SYSADMIN                       1.000
+score TO_NO_BRKTS_HTML_ONLY          1.000
+score TO_NO_BRKTS_PCNT               1.000
 score TW_GIBBERISH_MANY              1.000
 score UC_GIBBERISH_OBFU              1.000
 score URI_DATA                       1.000
 score URI_OPTOUT_3LD                 1.000
+score URI_PHISH                      1.000
+score URI_WP_HACKED                  1.000
 score XPRIO_SHORT_SUBJ               1.000

Modified: spamassassin/trunk/rulesrc/scores/stats-set0
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/scores/stats-set0?rev=1816360&r1=1816359&r2=1816360&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/scores/stats-set0 (original)
+++ spamassassin/trunk/rulesrc/scores/stats-set0 Sun Nov 26 02:46:27 2017
@@ -1,23 +1,23 @@
 ##### WITH NEW RULES AND SCORES #####
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 309446  26.352%  (95.781% of non-spam corpus)
-# Correctly spam:     384616  32.754%  (45.186% of spam corpus)
-# False positives:     13630  1.161%  (4.219% of nonspam, 1049004 weighted)
-# False negatives:    466575  39.733%  (54.814% of spam, 1294822 weighted)
+# Correctly non-spam: 309406  26.349%  (95.769% of non-spam corpus)
+# Correctly spam:     384918  32.780%  (45.222% of spam corpus)
+# False positives:     13670  1.164%  (4.231% of nonspam, 1051741 weighted)
+# False negatives:    466259  39.707%  (54.778% of spam, 1290631 weighted)
 # Average score for spam:  4.9    nonspam: 1.5
 # Average for false-pos:   5.8  false-neg: 2.8
-# TOTAL:              1174267  100.00%
+# TOTAL:              1174253  100.00%
 
 Reading scores from "tmprules"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
 # Correctly non-spam:  38452  95.61%
-# Correctly spam:      47946  45.17%
+# Correctly spam:      47724  44.96%
 # False positives:      1765  4.39%
-# False negatives:     58199  54.83%
-# TCR(l=50): 0.724792  SpamRecall: 45.170%  SpamPrec: 96.449%
+# False negatives:     58417  55.04%
+# TCR(l=50): 0.723687  SpamRecall: 44.963%  SpamPrec: 96.434%
 
 ##### WITHOUT NEW RULES AND SCORES #####
 Reading scores from "../rules-base"...
@@ -25,16 +25,16 @@ Reading per-message hit stat logs and sc
 
 # SUMMARY for threshold 5.0:
 # Correctly non-spam: 309331  95.75%
-# Correctly spam:     157638  18.52%
+# Correctly spam:     157513  18.51%
 # False positives:     13745  4.25%
-# False negatives:    693553  81.48%
-# TCR(l=50): 0.616446  SpamRecall: 18.520%  SpamPrec: 91.980%
+# False negatives:    693664  81.49%
+# TCR(l=50): 0.616387  SpamRecall: 18.505%  SpamPrec: 91.974%
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
 # Correctly non-spam:  38584  95.94%
-# Correctly spam:      19663  18.52%
+# Correctly spam:      19513  18.38%
 # False positives:      1633  4.06%
-# False negatives:     86482  81.48%
-# TCR(l=50): 0.631319  SpamRecall: 18.525%  SpamPrec: 92.332%
+# False negatives:     86628  81.62%
+# TCR(l=50): 0.630748  SpamRecall: 18.384%  SpamPrec: 92.277%

Modified: spamassassin/trunk/rulesrc/scores/stats-set1
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/scores/stats-set1?rev=1816360&r1=1816359&r2=1816360&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/scores/stats-set1 (original)
+++ spamassassin/trunk/rulesrc/scores/stats-set1 Sun Nov 26 02:46:27 2017
@@ -1,40 +1,40 @@
 ##### WITH NEW RULES AND SCORES #####
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 318607  35.041%  (99.583% of non-spam corpus)
-# Correctly spam:     481183  52.922%  (81.653% of spam corpus)
-# False positives:      1333  0.147%  (0.417% of nonspam, 147709 weighted)
-# False negatives:    108116  11.891%  (18.347% of spam, 341769 weighted)
-# Average score for spam:  9.3    nonspam: 0.3
-# Average for false-pos:   6.0  false-neg: 3.2
-# TOTAL:              909239  100.00%
+# Correctly non-spam: 143931  17.094%  (99.834% of non-spam corpus)
+# Correctly spam:     644111  76.497%  (92.301% of spam corpus)
+# False positives:       240  0.029%  (0.166% of nonspam,  72655 weighted)
+# False negatives:     53723  6.380%  (7.699% of spam, 174863 weighted)
+# Average score for spam:  9.6    nonspam: 0.1
+# Average for false-pos:   6.3  false-neg: 3.3
+# TOTAL:              842005  100.00%
 
 Reading scores from "tmprules"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  39700  99.61%
-# Correctly spam:      60062  81.61%
-# False positives:       155  0.39%
-# False negatives:     13530  18.39%
-# TCR(l=50): 3.458271  SpamRecall: 81.615%  SpamPrec: 99.743%
+# Correctly non-spam:  18044  99.79%
+# Correctly spam:      80281  92.21%
+# False positives:        38  0.21%
+# False negatives:      6784  7.79%
+# TCR(l=50): 10.025910  SpamRecall: 92.208%  SpamPrec: 99.953%
 
 ##### 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: 318716  99.62%
-# Correctly spam:     304101  51.60%
-# False positives:      1224  0.38%
-# False negatives:    285198  48.40%
-# TCR(l=50): 1.701219  SpamRecall: 51.604%  SpamPrec: 99.599%
+# Correctly non-spam: 143536  99.56%
+# Correctly spam:     441934  63.33%
+# False positives:       635  0.44%
+# False negatives:    255900  36.67%
+# TCR(l=50): 2.425983  SpamRecall: 63.329%  SpamPrec: 99.857%
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  39713  99.64%
-# Correctly spam:      37965  51.59%
-# False positives:       142  0.36%
-# False negatives:     35627  48.41%
-# TCR(l=50): 1.722377  SpamRecall: 51.588%  SpamPrec: 99.627%
+# Correctly non-spam:  17993  99.51%
+# Correctly spam:      55022  63.20%
+# False positives:        89  0.49%
+# False negatives:     32043  36.80%
+# TCR(l=50): 2.385800  SpamRecall: 63.196%  SpamPrec: 99.839%