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

svn commit: r1900140 [2/2] - in /spamassassin/branches/trunk-welcomelist: ./ lib/Mail/SpamAssassin/Conf/ lib/Mail/SpamAssassin/Plugin/ rulesrc/scores/ t/

Modified: spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set1
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set1?rev=1900140&r1=1900139&r2=1900140&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set1 (original)
+++ spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set1 Fri Apr 22 06:47:23 2022
@@ -3,255 +3,252 @@
 
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001 # force non-zero
-score AC_FROM_MANY_DOTS              2.999
-score AC_HTML_NONSENSE_TAGS          1.999
-score ADMITS_SPAM                    3.600
-score ADVANCE_FEE_2_NEW_FRM_MNY      2.399
-score ADVANCE_FEE_2_NEW_MONEY        1.999
-score ADVANCE_FEE_3_NEW              3.070
-score ADVANCE_FEE_3_NEW_FRM_MNY      2.599
-score ADVANCE_FEE_3_NEW_MONEY        2.899
-score ADVANCE_FEE_4_NEW              2.399
+score AC_FROM_MANY_DOTS              2.996
+score AC_HTML_NONSENSE_TAGS          1.997
+score ADMITS_SPAM                    3.595
+score ADVANCE_FEE_2_NEW_FRM_MNY      2.423
+score ADVANCE_FEE_2_NEW_MONEY        1.997
+score ADVANCE_FEE_3_NEW              3.104
+score ADVANCE_FEE_3_NEW_FRM_MNY      0.027
+score ADVANCE_FEE_3_NEW_MONEY        2.896
+score ADVANCE_FEE_4_NEW              2.397
 score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_4_NEW_MONEY        0.610
-score ADVANCE_FEE_5_NEW              2.399
+score ADVANCE_FEE_4_NEW_MONEY        0.440
+score ADVANCE_FEE_5_NEW              2.393
 score ADVANCE_FEE_5_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_5_NEW_MONEY        2.732
-score AD_PREFS                       0.009
-score AMAZON_IMG_NOT_RCVD_AMZN       2.499
-score APP_DEVELOPMENT_NORDNS         0.028
+score ADVANCE_FEE_5_NEW_MONEY        3.020
+score AD_PREFS                       0.426
+score AMAZON_IMG_NOT_RCVD_AMZN       2.497
+score APP_DEVELOPMENT_NORDNS         1.722
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   1.490
-score BIGNUM_EMAILS_FREEM            2.999
-score BIGNUM_EMAILS_MANY             2.999
-score BILLION_OVERLAP                -0.890
-score BITCOIN_DEADLINE               2.999
-score BITCOIN_EXTORT_01              4.325
-score BITCOIN_MALF_HTML              2.801
-score BITCOIN_MALWARE                1.681
-score BITCOIN_OBFU_SUBJ              0.454
-score BITCOIN_SPAM_02                2.499
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   1.779
+score BIGNUM_EMAILS_FREEM            2.996
+score BIGNUM_EMAILS_MANY             2.996
+score BILLION_OVERLAP                -0.442
+score BITCOIN_DEADLINE               2.501
+score BITCOIN_EXTORT_01              4.788
+score BITCOIN_MALF_HTML              2.973
+score BITCOIN_MALWARE                1.195
+score BITCOIN_OBFU_SUBJ              0.639
+score BITCOIN_SPAM_02                2.497
 score BITCOIN_SPAM_04                1.499
-score BITCOIN_SPAM_05                0.893
-score BITCOIN_SPAM_09                1.499
-score BITCOIN_XPRIO                  2.499
-score BITCOIN_YOUR_INFO              2.758
-score BODY_EMPTY                     0.386
-score BODY_SINGLE_URI                0.669
-score BODY_URI_ONLY                  2.999
-score BOGUS_MIME_VERSION             3.268
-score BOGUS_MSM_HDRS                 2.058
-score CANT_SEE_AD                    1.986
+score BITCOIN_SPAM_05                1.765
+score BITCOIN_SPAM_09                1.498
+score BITCOIN_XPRIO                  2.497
+score BITCOIN_YOUR_INFO              2.747
+score BODY_EMPTY                     0.392
+score BODY_SINGLE_URI                0.667
+score BODY_URI_ONLY                  2.996
+score BOGUS_MIME_VERSION             3.270
+score BOGUS_MSM_HDRS                 1.838
+score CANT_SEE_AD                    1.192
 score CK_HELO_GENERIC                0.001
-score CONTENT_AFTER_HTML             2.499
-score CONTENT_AFTER_HTML_WEAK        1.499
-score CTE_8BIT_MISMATCH              0.001
+score CONTENT_AFTER_HTML             2.497
+score CONTENT_AFTER_HTML_WEAK        1.498
+score CTE_8BIT_MISMATCH              0.001 # force non-zero
 score DEAR_BENEFICIARY               0.001
-score DKIMWL_BL                      2.999
-score DKIMWL_WL_HIGH                 -0.577
+score DKIMWL_BL                      2.997
+score DKIMWL_WL_HIGH                 -0.572
 score DKIMWL_WL_MED                  -0.001 # force non-zero
-score DKIMWL_WL_MEDHI                -0.880
-score DOS_RCVD_IP_TWICE_B            1.999
-score END_FUTURE_EMAILS              2.193
-score FAKE_REPLY_B                   0.967
-score FILL_THIS_FORM                 0.073
+score DKIMWL_WL_MEDHI                -0.860
+score DOS_RCVD_IP_TWICE_B            1.997
+score END_FUTURE_EMAILS              2.187
+score FAKE_REPLY_B                   0.519
+score FILL_THIS_FORM                 0.070
 score FONT_INVIS_DIRECT              0.001
-score FONT_INVIS_HTML_NOHTML         2.999
-score FONT_INVIS_LONG_LINE           1.096
-score FONT_INVIS_MSGID               1.258
-score FONT_INVIS_NORDNS              2.453
-score FORGED_SPF_HELO                0.373
-score FORM_FRAUD                     0.818
-score FORM_FRAUD_3                   0.795
+score FONT_INVIS_HTML_NOHTML         2.996
+score FONT_INVIS_LONG_LINE           1.089
+score FONT_INVIS_MSGID               1.332
+score FONT_INVIS_NORDNS              0.659
+score FORGED_SPF_HELO                0.125
+score FORM_FRAUD                     0.993
+score FORM_FRAUD_3                   1.378
 score FORM_FRAUD_5                   0.001
-score FOUND_YOU                      3.249
-score FREEMAIL_FORGED_FROMDOMAIN     0.249
-score FROMSPACE                      3.399
-score FROM_2_EMAILS_SHORT            1.426
-score FROM_ADDR_WS                   2.999
-score FROM_FMBLA_NEWDOM              1.499
-score FROM_FMBLA_NEWDOM14            0.999
-score FROM_FMBLA_NEWDOM28            0.799
-score FROM_GOV_DKIM_AU               -0.625
-score FROM_MISSPACED                 1.170
-score FROM_MISSP_DYNIP               1.487
+score FOUND_YOU                      3.246
+score FREEMAIL_FORGED_FROMDOMAIN     0.248
+score FROMSPACE                      3.396
+score FROM_2_EMAILS_SHORT            0.269
+score FROM_ADDR_WS                   2.996
+score FROM_FMBLA_NEWDOM              1.498
+score FROM_FMBLA_NEWDOM14            0.998
+score FROM_FMBLA_NEWDOM28            0.798
+score FROM_GOV_DKIM_AU               -0.307
+score FROM_MISSPACED                 1.169
+score FROM_MISSP_DYNIP               1.545
 score FROM_MISSP_EH_MATCH            0.001
 score FROM_MISSP_FREEMAIL            0.001
-score FROM_MISSP_MSFT                0.001 # force non-zero
-score FROM_MISSP_PHISH               3.130
-score FROM_MISSP_REPLYTO             2.499
-score FROM_MISSP_SPF_FAIL            1.999
-score FROM_MISSP_TO_UNDISC           1.794
+score FROM_MISSP_MSFT                0.001
+score FROM_MISSP_PHISH               2.003
+score FROM_MISSP_REPLYTO             2.497
+score FROM_MISSP_SPF_FAIL            1.997
+score FROM_MISSP_TO_UNDISC           0.505
 score FROM_MISSP_USER                0.001
-score FROM_MULTI_NORDNS              1.016
-score FROM_PAYPAL_SPOOF              1.599
-score FROM_SUSPICIOUS_NTLD           0.500
-score FROM_SUSPICIOUS_NTLD_FP        0.001 # force non-zero
-score FROM_UNBAL1                    2.299
-score FROM_UNBAL2                    2.199
-score FROM_WSP_TRAIL                 1.347
-score FSL_BULK_SIG                   1.435
+score FROM_MULTI_NORDNS              1.001
+score FROM_PAYPAL_SPOOF              1.597
+score FROM_SUSPICIOUS_NTLD           0.499
+score FROM_SUSPICIOUS_NTLD_FP        0.001
+score FROM_UNBAL1                    2.297
+score FROM_WSP_TRAIL                 1.320
+score FSL_BULK_SIG                   1.412
 score FSL_CTYPE_WIN1251              0.001
 score FSL_NEW_HELO_USER              0.001
-score FUZZY_AMAZON                   2.268
-score FUZZY_CLICK_HERE               2.299
-score FUZZY_WALLET                   1.238
-score GAPPY_GENITALIA                1.013
-score GB_BITCOIN_CP                  1.562
-score GB_FAKE_RF_SHORT               1.999
-score GB_FREEMAIL_DISPTO             0.499
-score GB_FREEMAIL_DISPTO_NOTFREEM    0.500
-score GOOG_REDIR_HTML_ONLY           1.999
-score GOOG_REDIR_NORDNS              3.128
-score GOOG_STO_EMAIL_PHISH           2.022
-score GOOG_STO_HTML_PHISH            0.001
-score GOOG_STO_IMG_NOHTML            0.826
-score GOOG_STO_NOIMG_HTML            2.999
-score HAS_X_NO_RELAY                 2.099
-score HAS_X_OUTGOING_SPAM_STAT       0.416
-score HDRS_LCASE_IMGONLY             0.100
-score HDRS_MISSP                     2.078
-score HDR_ORDER_FTSDMCXX_DIRECT      1.453
-score HDR_ORDER_FTSDMCXX_NORDNS      3.496
-score HEADER_FROM_DIFFERENT_DOMAINS  0.250
+score FUZZY_AMAZON                   2.132
+score FUZZY_CLICK_HERE               2.297
+score FUZZY_WALLET                   1.227
+score GB_BITCOIN_CP                  1.046
+score GB_FAKE_RF_SHORT               1.997
+score GB_FREEMAIL_DISPTO             0.498
+score GB_FREEMAIL_DISPTO_NOTFREEM    0.498
+score GOOG_REDIR_HTML_ONLY           1.997
+score GOOG_REDIR_NORDNS              3.120
+score GOOG_STO_EMAIL_PHISH           2.335
+score GOOG_STO_HTML_PHISH            0.401
+score GOOG_STO_IMG_NOHTML            1.889
+score GOOG_STO_NOIMG_HTML            2.996
+score HAS_X_NO_RELAY                 2.324
+score HAS_X_OUTGOING_SPAM_STAT       0.409
+score HDRS_LCASE_IMGONLY             0.098
+score HDRS_MISSP                     2.325
+score HDR_ORDER_FTSDMCXX_DIRECT      0.294
+score HDR_ORDER_FTSDMCXX_NORDNS      3.434
+score HEADER_FROM_DIFFERENT_DOMAINS  0.248
 score HELO_NO_DOMAIN                 0.001
-score HK_LOTTO                       0.479
-score HK_NAME_FROM                   0.999
-score HK_NAME_MR_MRS                 0.999
-score HK_RANDOM_ENVFROM              0.999
-score HK_RANDOM_FROM                 1.000
-score HK_RANDOM_REPLYTO              0.999
-score HK_SCAM                        1.773
-score HK_WIN                         0.065
-score HOSTED_IMG_DIRECT_MX           0.732
-score HOSTED_IMG_FREEM               2.426
-score HOSTED_IMG_MULTI_PUB_01        2.999
-score HTML_ENTITY_ASCII              0.929
-score HTML_FONT_TINY_NORDNS          1.627
-score HTML_OFF_PAGE                  2.807
+score HK_LOTTO                       0.458
+score HK_NAME_FROM                   0.998
+score HK_NAME_MR_MRS                 0.998
+score HK_RANDOM_ENVFROM              0.998
+score HK_RANDOM_FROM                 0.998
+score HK_RANDOM_REPLYTO              0.998
+score HK_SCAM                        1.941
+score HK_WIN                         0.176
+score HOSTED_IMG_DIRECT_MX           1.489
+score HOSTED_IMG_FREEM               2.425
+score HOSTED_IMG_MULTI_PUB_01        2.996
+score HTML_ENTITY_ASCII              1.741
+score HTML_FONT_TINY_NORDNS          1.598
+score HTML_OFF_PAGE                  2.047
 score HTML_SINGLET_MANY              1.606
-score HTML_TAG_BALANCE_CENTER        2.396
-score HTML_TEXT_INVISIBLE_FONT       1.179
-score HTML_TEXT_INVISIBLE_STYLE      2.299
-score IMG_ONLY_FM_DOM_INFO           0.083
-score JH_SPAMMY_HEADERS              3.499
-score KHOP_HELO_FCRDNS               0.001
-score LONGLN_LOW_CONTRAST            2.500
+score HTML_TAG_BALANCE_CENTER        2.403
+score HTML_TEXT_INVISIBLE_FONT       1.000
+score HTML_TEXT_INVISIBLE_STYLE      2.415
+score IMG_ONLY_FM_DOM_INFO           0.288
+score JH_SPAMMY_HEADERS              3.496
+score KHOP_HELO_FCRDNS               0.024
+score LONGLN_LOW_CONTRAST            2.497
 score LONG_HEX_URI                   0.001
-score LONG_IMG_URI                   0.925
-score LONG_INVISIBLE_TEXT            1.850
+score LONG_IMG_URI                   0.929
+score LONG_INVISIBLE_TEXT            1.853
 score LOTS_OF_MONEY                  0.010
-score LOTTO_AGENT                    0.390
-score LOTTO_DEPT                     0.829
+score LOTTO_AGENT                    0.791
+score LOTTO_DEPT                     0.533
 score MALWARE_NORDNS                 0.001
-score MALW_ATTACH                    2.399
-score MANY_SPAN_IN_TEXT              1.109
-score MILLION_HUNDRED                1.233
+score MALW_ATTACH                    2.397
+score MANY_SPAN_IN_TEXT              1.130
+score MILLION_HUNDRED                0.768
 score MILLION_USD                    0.001
-score MIMEOLE_DIRECT_TO_MX           2.000
-score MIXED_AREA_CASE                0.396
-score MIXED_CENTER_CASE              1.614
-score MIXED_ES                       1.109
-score MIXED_FONT_CASE                1.307
-score MIXED_HREF_CASE                0.001
-score MIXED_IMG_CASE                 1.446
+score MIMEOLE_DIRECT_TO_MX           1.997
+score MIXED_AREA_CASE                1.286
+score MIXED_CENTER_CASE              1.116
+score MIXED_ES                       1.087
+score MIXED_FONT_CASE                1.655
+score MIXED_HREF_CASE                1.999
+score MIXED_IMG_CASE                 2.710
 score MONEY_ATM_CARD                 0.001
-score MONEY_FORM                     0.001 # force non-zero
+score MONEY_FORM                     0.001
 score MONEY_FORM_SHORT               0.001
-score MONEY_FRAUD_3                  1.985
-score MONEY_FRAUD_5                  0.001
+score MONEY_FRAUD_3                  2.111
+score MONEY_FRAUD_5                  0.492
 score MONEY_FRAUD_8                  0.001
-score MONEY_FREEMAIL_REPTO           0.001 # force non-zero
-score MONEY_FROM_41                  1.191
-score MONEY_FROM_MISSP               0.001 # force non-zero
-score NAME_EMAIL_DIFF                3.398
-score NA_DOLLARS                     1.499
-score NICE_REPLY_A                   -3.185
-score NORDNS_LOW_CONTRAST            0.746
+score MONEY_FREEMAIL_REPTO           0.001
+score MONEY_FROM_41                  1.327
+score MONEY_FROM_MISSP               0.001
+score NAME_EMAIL_DIFF                3.397
+score NA_DOLLARS                     1.498
+score NICE_REPLY_A                   -1.165
+score NORDNS_LOW_CONTRAST            0.767
 score NO_FM_NAME_IP_HOSTN            0.001
 score NSL_RCVD_FROM_USER             0.001
-score NSL_RCVD_HELO_USER             1.324
-score OBFU_TEXT_ATTACH               1.699
-score ODD_FREEM_REPTO                2.391
-score PDS_BTC_ID                     0.500
-score PDS_BTC_MSGID                  0.200
-score PDS_BTC_NTLD                   0.714
-score PDS_DBL_URL_TNB_RUNON          1.999
-score PDS_HP_HELO_NORDNS             0.999
-score PDS_OTHER_BAD_TLD              1.999
-score PDS_PHPEXP_BOT                 1.499
-score PDS_PHP_EVAL                   1.499
-score PDS_PRO_TLD                    0.999
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
-score PHISH_ATTACH                   2.299
-score PHP_ORIG_SCRIPT                2.042
-score PHP_ORIG_SCRIPT_EVAL           2.999
-score PHP_SCRIPT                     2.499
+score NSL_RCVD_HELO_USER             1.733
+score OBFU_TEXT_ATTACH               1.697
+score ODD_FREEM_REPTO                2.899
+score PDS_BTC_ID                     0.498
+score PDS_BTC_MSGID                  0.407
+score PDS_BTC_NTLD                   0.653
+score PDS_DBL_URL_TNB_RUNON          1.997
+score PDS_HP_HELO_NORDNS             0.998
+score PDS_OTHER_BAD_TLD              1.997
+score PDS_PHPEXP_BOT                 1.498
+score PDS_PHP_EVAL                   1.498
+score PDS_PRO_TLD                    0.998
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.997
+score PHISH_ATTACH                   2.297
+score PHP_ORIG_SCRIPT                2.038
+score PHP_ORIG_SCRIPT_EVAL           2.996
+score PHP_SCRIPT                     2.497
 score PP_MIME_FAKE_ASCII_TEXT        0.001
-score RAND_HEADER_LIST_SPOOF         2.878
-score RAND_MKTG_HEADER               1.494
-score RATWARE_NO_RDNS                2.999
+score RAND_HEADER_LIST_SPOOF         2.755
+score RAND_MKTG_HEADER               1.499
+score RATWARE_NO_RDNS                2.996
 score RCVD_IN_MSPIKE_H2              -0.001
-score RDNS_NUM_TLD_XM                1.693
-score REPLYTO_EMPTY                  2.699
-score REPTO_419_FRAUD_GM             2.999
-score SCC_CANSPAM_2                  1.854
-score SCC_ISEMM_LID_1                1.743
-score SCC_SPAMMER_ADDR_2             0.851
-score SCRIPT_GIBBERISH               2.699
+score RDNS_NUM_TLD_XM                1.500
+score REPLYTO_EMPTY                  2.696
+score REPTO_419_FRAUD_GM             2.996
+score SCC_CANSPAM_2                  1.702
+score SCC_ISEMM_LID_1                1.721
+score SCC_SPAMMER_ADDR_2             1.690
+score SCRIPT_GIBBERISH               2.696
 score SENDGRID_REDIR                 0.001
-score SERGIO_SUBJECT_VIAGRA01        3.899
-score SHOPIFY_IMG_NOT_RCVD_SFY       2.499
-score SHORTENER_SHORT_IMG            1.440
-score SHORT_SHORTNER                 1.999
-score SPOOFED_FREEMAIL               1.999
+score SERGIO_SUBJECT_VIAGRA01        2.719
+score SHOPIFY_IMG_NOT_RCVD_SFY       2.497
+score SHORTENER_SHORT_IMG            1.433
+score SHORT_SHORTNER                 1.997
+score SPOOFED_FREEMAIL               1.997
 score SPOOFED_FREEMAIL_NO_RDNS       0.001
-score SPOOFED_FREEM_REPTO            2.499
-score SPOOF_GMAIL_MID                0.722
+score SPOOFED_FREEM_REPTO            2.497
+score SPOOF_GMAIL_MID                0.565
 score STATIC_XPRIO_OLE               0.001
-score STY_INVIS_DIRECT               2.499
-score SUBJ_ATTENTION                 0.499
-score SUSP_UTF8_WORD_FROM            1.999
-score SUSP_UTF8_WORD_SUBJ            1.999
+score SUBJ_ATTENTION                 0.498
+score SUSP_UTF8_WORD_FROM            1.650
+score SUSP_UTF8_WORD_SUBJ            1.997
 score THIS_AD                        1.264
 score TO_EQ_FM_DOM_SPF_FAIL          0.001
 score TO_EQ_FM_SPF_FAIL              0.001
-score TO_NAME_SUBJ_NO_RDNS           0.222
-score TO_NO_BRKTS_FROM_MSSP          2.499
-score TO_NO_BRKTS_HTML_IMG           0.783
-score TO_NO_BRKTS_HTML_ONLY          1.999
+score TO_NAME_SUBJ_NO_RDNS           1.321
+score TO_NO_BRKTS_FROM_MSSP          2.497
+score TO_NO_BRKTS_HTML_IMG           0.777
+score TO_NO_BRKTS_HTML_ONLY          1.998
 score TO_NO_BRKTS_MSFT               0.001
-score TO_NO_BRKTS_NORDNS_HTML        1.199
-score TO_NO_BRKTS_PCNT               2.499
-score TRANSFORM_LIFE                 2.499
-score TVD_PH_BODY_META               2.225
+score TO_NO_BRKTS_NORDNS_HTML        1.198
+score TO_NO_BRKTS_PCNT               2.497
+score TRANSFORM_LIFE                 2.497
+score TVD_PH_BODY_META               2.054
 score TVD_SPACE_ENCODED              0.001
-score TVD_SPACE_RATIO_MINFP          0.283
-score UNDISC_FREEM                   3.599
+score TVD_SPACE_RATIO_MINFP          0.272
+score UNDISC_FREEM                   3.595
 score UNDISC_MONEY                   2.234
-score UNICODE_OBFU_ASC               2.499
-score UNSUB_GOOG_FORM                2.499
-score URI_FIREBASEAPP                2.999
-score URI_GOOGLE_PROXY               2.799
-score URI_GOOG_STO_SPAMMY            2.831
-score URI_IN_URI_10                  2.879
-score URI_OBFU_DOM                   2.299
-score URI_ONLY_MSGID_MALF            0.668
-score URI_PHISH                      3.791
-score URI_PHP_REDIR                  3.172
-score URI_TRY_3LD                    1.999
-score URI_WPADMIN                    2.699
-score URI_WP_HACKED                  3.499
-score URI_WP_HACKED_2                0.873
-score VFY_ACCT_NORDNS                2.999
-score WORD_INVIS                     0.684
-score WORD_INVIS_MANY                2.538
-score XFER_LOTSA_MONEY               0.001
-score XM_LIGHT_HEAVY                 2.499
-score XM_RANDOM                      2.499
-score XM_RECPTID                     2.999
-score XPRIO                          1.922
-score YOU_INHERIT                    1.836
+score UNICODE_OBFU_ASC               2.497
+score UNSUB_GOOG_FORM                2.497
+score URI_FIREBASEAPP                2.996
+score URI_GOOGLE_PROXY               2.796
+score URI_GOOG_STO_SPAMMY            2.682
+score URI_IN_URI_10                  2.874
+score URI_OBFU_DOM                   2.297
+score URI_ONLY_MSGID_MALF            1.190
+score URI_PHISH                      3.782
+score URI_PHP_REDIR                  3.144
+score URI_TRY_3LD                    1.997
+score URI_WPADMIN                    2.696
+score URI_WP_HACKED                  3.496
+score URI_WP_HACKED_2                1.032
+score VFY_ACCT_NORDNS                2.813
+score WORD_INVIS                     0.601
+score WORD_INVIS_MANY                2.123
+score XFER_LOTSA_MONEY               0.193
+score XM_LIGHT_HEAVY                 2.497
+score XM_RANDOM                      2.497
+score XM_RECPTID                     2.996
+score XPRIO                          2.113
+score YOU_INHERIT                    1.454
 score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000

Modified: spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set2
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set2?rev=1900140&r1=1900139&r2=1900140&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set2 (original)
+++ spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set2 Fri Apr 22 06:47:23 2022
@@ -1,229 +1,225 @@
-# Using score set 0 logs for revision 1900065 from:
-# ham-darxus.r1900065.log ham-ena-week0.r1900065.log ham-ena-week1.r1900065.log ham-ena-week2.r1900065.log ham-ena-week3.r1900065.log ham-ena-week4.r1900065.log ham-giovanni-ham.r1900065.log ham-giovanni-spammy.r1900065.log ham-giovanni-spam.r1900065.log ham-hege.r1900065.log ham-llanga.r1900065.log ham-mmiroslaw-mails-ham.r1900065.log ham-mmiroslaw-mails-spam.r1900065.log ham-pds.r1900065.log ham-spamsponge.r1900065.log ham-thendrikx.r1900065.log spam-darxus.r1900065.log spam-ena-week0.r1900065.log spam-ena-week1.r1900065.log spam-ena-week2.r1900065.log spam-ena-week3.r1900065.log spam-ena-week4.r1900065.log spam-giovanni-ham.r1900065.log spam-giovanni-spammy.r1900065.log spam-giovanni-spam.r1900065.log spam-hege.r1900065.log spam-llanga.r1900065.log spam-mmiroslaw-mails-ham.r1900065.log spam-mmiroslaw-mails-spam.r1900065.log spam-pds.r1900065.log spam-spamsponge.r1900065.log spam-thendrikx.r1900065.log
+# Using score set 0 logs for revision 1900099 from:
+# ham-darxus.r1900099.log ham-ena-week0.r1900099.log ham-ena-week1.r1900099.log ham-ena-week2.r1900099.log ham-ena-week3.r1900099.log ham-ena-week4.r1900099.log ham-giovanni-ham.r1900099.log ham-giovanni-spammy.r1900099.log ham-giovanni-spam.r1900099.log ham-hege.r1900099.log ham-llanga.r1900099.log ham-mmiroslaw-mails-ham.r1900099.log ham-mmiroslaw-mails-spam.r1900099.log ham-pds.r1900099.log ham-spamsponge.r1900099.log ham-thendrikx.r1900099.log spam-darxus.r1900099.log spam-ena-week0.r1900099.log spam-ena-week1.r1900099.log spam-ena-week2.r1900099.log spam-ena-week3.r1900099.log spam-ena-week4.r1900099.log spam-giovanni-ham.r1900099.log spam-giovanni-spammy.r1900099.log spam-giovanni-spam.r1900099.log spam-hege.r1900099.log spam-llanga.r1900099.log spam-mmiroslaw-mails-ham.r1900099.log spam-mmiroslaw-mails-spam.r1900099.log spam-pds.r1900099.log spam-spamsponge.r1900099.log spam-thendrikx.r1900099.log
 
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001
 score AC_FROM_MANY_DOTS              2.999
 score AC_HTML_NONSENSE_TAGS          1.999
 score ADMITS_SPAM                    3.799
-score ADVANCE_FEE_2_NEW_FRM_MNY      2.499
+score ADVANCE_FEE_2_NEW_FRM_MNY      2.074
 score ADVANCE_FEE_2_NEW_MONEY        1.999
-score ADVANCE_FEE_3_NEW              3.303
-score ADVANCE_FEE_3_NEW_FRM_MNY      1.363
+score ADVANCE_FEE_3_NEW              3.499
+score ADVANCE_FEE_3_NEW_FRM_MNY      1.480
 score ADVANCE_FEE_3_NEW_MONEY        2.899
-score ADVANCE_FEE_4_NEW              2.399
+score ADVANCE_FEE_4_NEW              1.804
 score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_4_NEW_MONEY        1.046
+score ADVANCE_FEE_4_NEW_MONEY        1.039
 score ADVANCE_FEE_5_NEW              2.399
 score ADVANCE_FEE_5_NEW_FRM_MNY      0.001 # force non-zero
-score ADVANCE_FEE_5_NEW_MONEY        0.001 # force non-zero
+score ADVANCE_FEE_5_NEW_MONEY        0.001
 score AD_PREFS                       0.001
-score AMAZON_IMG_NOT_RCVD_AMZN       2.500
+score AMAZON_IMG_NOT_RCVD_AMZN       2.499
 score APP_DEVELOPMENT_NORDNS         1.999
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   0.571
-score BIGNUM_EMAILS_FREEM            2.565
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   1.347
+score BIGNUM_EMAILS_FREEM            0.318
 score BIGNUM_EMAILS_MANY             2.999
-score BILLION_OVERLAP                -0.999
-score BITCOIN_DEADLINE               2.302
-score BITCOIN_EXTORT_01              4.501
-score BITCOIN_IMGUR                  3.500
+score BITCOIN_DEADLINE               2.176
+score BITCOIN_EXTORT_01              4.504
+score BITCOIN_IMGUR                  3.499
 score BITCOIN_MALF_HTML              3.499
 score BITCOIN_SPAM_02                2.499
 score BITCOIN_SPAM_03                2.499
 score BITCOIN_SPAM_04                1.499
-score BITCOIN_SPAM_09                1.500
+score BITCOIN_SPAM_09                1.499
 score BITCOIN_XPRIO                  2.499
 score BITCOIN_YOUR_INFO              2.999
 score BODY_EMPTY                     1.999
 score BODY_SINGLE_URI                2.499
-score BOGUS_MIME_VERSION             2.752
-score BOGUS_MSM_HDRS                 2.487
+score BOGUS_MIME_VERSION             3.499
+score BOGUS_MSM_HDRS                 1.420
 score CK_HELO_GENERIC                0.250
-score CONTENT_AFTER_HTML             1.791
+score CONTENT_AFTER_HTML             2.352
 score CONTENT_AFTER_HTML_WEAK        1.499
 score CTE_8BIT_MISMATCH              0.999
 score DEAR_BENEFICIARY               0.001
 score DOS_RCVD_IP_TWICE_B            1.999
-score FAKE_REPLY_B                   2.299
-score FILL_THIS_FORM                 1.800
+score FACEBOOK_IMG_NOT_RCVD_FB       0.308
+score FAKE_REPLY_B                   2.199
+score FILL_THIS_FORM                 1.408
 score FONT_INVIS_DIRECT              0.001
-score FONT_INVIS_HTML_NOHTML         2.999
-score FONT_INVIS_LONG_LINE           1.654
-score FONT_INVIS_MSGID               0.749
-score FONT_INVIS_NORDNS              1.226
-score FONT_INVIS_POSTEXTRAS          1.647
+score FONT_INVIS_HTML_NOHTML         3.000
+score FONT_INVIS_LONG_LINE           1.673
+score FONT_INVIS_MSGID               1.131
+score FONT_INVIS_NORDNS              0.776
+score FONT_INVIS_POSTEXTRAS          1.650
 score FORM_FRAUD_5                   0.001
 score FOUND_YOU                      3.249
-score FREEMAIL_FORGED_FROMDOMAIN     0.250
+score FREEMAIL_FORGED_FROMDOMAIN     0.249
 score FROMSPACE                      3.399
-score FROM_2_EMAILS_SHORT            1.599
-score FROM_ADDR_WS                   3.000
+score FROM_2_EMAILS_SHORT            1.593
+score FROM_ADDR_WS                   2.999
 score FROM_MISSPACED                 1.999
-score FROM_MISSP_DYNIP               2.399
+score FROM_MISSP_DYNIP               0.188
 score FROM_MISSP_EH_MATCH            1.999
-score FROM_MISSP_FREEMAIL            3.099
+score FROM_MISSP_FREEMAIL            3.199
 score FROM_MISSP_MSFT                0.001
-score FROM_MISSP_PHISH               1.959
-score FROM_MISSP_TO_UNDISC           1.612
+score FROM_MISSP_PHISH               3.499
+score FROM_MISSP_TO_UNDISC           1.243
 score FROM_MISSP_USER                0.001
-score FROM_MULTI_NORDNS              1.500
-score FROM_NTLD_REPLY_FREEMAIL       1.901
+score FROM_MULTI_NORDNS              1.229
+score FROM_NTLD_REPLY_FREEMAIL       1.999
 score FROM_SUSPICIOUS_NTLD           0.499
 score FROM_SUSPICIOUS_NTLD_FP        1.999
-score FROM_UNBAL1                    2.299
-score FROM_UNBAL2                    2.199
+score FROM_UNBAL1                    2.059
 score FROM_WSP_TRAIL                 2.199
 score FSL_CTYPE_WIN1251              0.001
 score FSL_NEW_HELO_USER              0.001
-score FUZZY_AMAZON                   2.299
-score FUZZY_CLICK_HERE               2.400
-score FUZZY_WALLET                   3.099
-score GAPPY_GENITALIA                0.790
+score FUZZY_AMAZON                   2.199
+score FUZZY_CLICK_HERE               2.499
+score FUZZY_WALLET                   3.199
 score GB_FAKE_RF_SHORT               1.999
 score GB_FREEMAIL_DISPTO             0.499
-score GB_FREEMAIL_DISPTO_NOTFREEM    0.499
+score GB_FREEMAIL_DISPTO_NOTFREEM    0.500
 score GOOG_REDIR_HTML_ONLY           1.999
-score GOOG_REDIR_NORDNS              2.603
-score GOOG_STO_EMAIL_PHISH           2.943
-score GOOG_STO_HTML_PHISH            1.568
-score GOOG_STO_IMG_NOHTML            2.462
+score GOOG_REDIR_NORDNS              2.601
+score GOOG_STO_EMAIL_PHISH           2.552
+score GOOG_STO_HTML_PHISH            1.961
+score GOOG_STO_IMG_NOHTML            2.338
 score GOOG_STO_NOIMG_HTML            2.999
-score HAS_X_OUTGOING_SPAM_STAT       2.000
+score HAS_X_NO_RELAY                 2.499
+score HAS_X_OUTGOING_SPAM_STAT       1.999
 score HDRS_LCASE_IMGONLY             0.099
 score HDRS_MISSP                     2.499
 score HDR_ORDER_FTSDMCXX_DIRECT      1.999
-score HDR_ORDER_FTSDMCXX_NORDNS      2.528
+score HDR_ORDER_FTSDMCXX_NORDNS      2.971
 score HEADER_FROM_DIFFERENT_DOMAINS  0.250
 score HELO_NO_DOMAIN                 0.001
-score HK_LOTTO                       0.893
+score HK_LOTTO                       0.596
 score HK_NAME_FROM                   0.999
 score HK_NAME_MR_MRS                 0.999
 score HK_RANDOM_ENVFROM              0.999
-score HK_RANDOM_FROM                 0.999
+score HK_RANDOM_FROM                 1.000
 score HK_RANDOM_REPLYTO              0.999
-score HK_SCAM                        0.950
-score HK_WIN                         0.365
-score HOSTED_IMG_DIRECT_MX           3.499
+score HK_SCAM                        0.622
+score HK_WIN                         0.099
+score HOSTED_IMG_DIRECT_MX           2.635
 score HOSTED_IMG_FREEM               3.499
 score HOSTED_IMG_MULTI_PUB_01        2.999
-score HTML_ENTITY_ASCII              2.943
+score HTML_ENTITY_ASCII              1.299
 score HTML_FONT_TINY_NORDNS          1.999
-score HTML_OFF_PAGE                  3.000
-score HTML_TAG_BALANCE_CENTER        2.900
-score HTML_TEXT_INVISIBLE_STYLE      0.601
-score IMG_ONLY_FM_DOM_INFO           1.616
+score HTML_OFF_PAGE                  2.999
+score HTML_TAG_BALANCE_CENTER        2.901
+score HTML_TEXT_INVISIBLE_STYLE      0.600
 score JH_SPAMMY_HEADERS              3.499
 score LONGLN_LOW_CONTRAST            2.499
 score LONG_HEX_URI                   2.999
-score LONG_IMG_URI                   1.683
+score LONG_IMG_URI                   1.690
 score LONG_INVISIBLE_TEXT            1.788
 score LOTS_OF_MONEY                  0.010
-score LOTTO_AGENT                    1.122
-score LOTTO_DEPT                     1.999
+score LOTTO_AGENT                    1.499
+score LOTTO_DEPT                     0.001
 score MALWARE_NORDNS                 0.001
-score MALW_ATTACH                    2.399
-score MANY_SPAN_IN_TEXT              2.399
-score MILLION_HUNDRED                0.083
-score MILLION_USD                    0.142
+score MALW_ATTACH                    2.400
+score MANY_SPAN_IN_TEXT              2.499
+score MILLION_HUNDRED                0.001
+score MILLION_USD                    0.001
 score MIMEOLE_DIRECT_TO_MX           1.999
 score MIME_NO_TEXT                   1.999
-score MIXED_AREA_CASE                0.892
-score MIXED_CENTER_CASE              2.499
+score MIXED_AREA_CASE                1.572
+score MIXED_CENTER_CASE              2.500
 score MIXED_ES                       2.599
-score MIXED_FONT_CASE                1.622
+score MIXED_FONT_CASE                1.069
 score MIXED_HREF_CASE                1.999
-score MIXED_IMG_CASE                 0.001
-score MONEY_12LTRDOM                 0.100
-score MONEY_ATM_CARD                 1.264
-score MONEY_BARRISTER                0.001
+score MIXED_IMG_CASE                 1.993
+score MONEY_12LTRDOM                 0.099
+score MONEY_ATM_CARD                 0.001 # force non-zero
+score MONEY_BARRISTER                0.999
 score MONEY_FORM                     0.001
-score MONEY_FORM_SHORT               1.143
-score MONEY_FRAUD_3                  2.766
-score MONEY_FRAUD_5                  0.716
-score MONEY_FRAUD_8                  3.299
-score MONEY_FREEMAIL_REPTO           2.593
+score MONEY_FORM_SHORT               1.269
+score MONEY_FRAUD_3                  0.001
+score MONEY_FRAUD_5                  0.298
+score MONEY_FRAUD_8                  0.656
+score MONEY_FREEMAIL_REPTO           2.349
 score MONEY_FROM_41                  1.999
 score MONEY_FROM_MISSP               0.001
-score MSMAIL_PRI_ABNORMAL            0.271
+score MSMAIL_PRI_ABNORMAL            0.284
 score NAME_EMAIL_DIFF                3.399
-score NA_DOLLARS                     0.001
-score NICE_REPLY_A                   -4.199
-score NORDNS_LOW_CONTRAST            1.887
-score NO_FM_NAME_IP_HOSTN            0.001 # force non-zero
+score NA_DOLLARS                     0.896
+score NICE_REPLY_A                   -4.299
+score NORDNS_LOW_CONTRAST            1.888
+score NO_FM_NAME_IP_HOSTN            0.001
 score NSL_RCVD_FROM_USER             0.001
-score NSL_RCVD_HELO_USER             0.311
-score OBFU_TEXT_ATTACH               1.345
+score NSL_RCVD_HELO_USER             0.152
+score OBFU_TEXT_ATTACH               1.400
 score ODD_FREEM_REPTO                2.999
 score PDS_BTC_ID                     0.499
 score PDS_BTC_MSGID                  0.999
-score PDS_BTC_NTLD                   1.000
 score PDS_DBL_URL_TNB_RUNON          1.999
 score PDS_HP_HELO_NORDNS             0.999
 score PDS_OTHER_BAD_TLD              1.999
 score PDS_PHPEXP_BOT                 1.499
-score PDS_PHP_EVAL                   1.500
+score PDS_PHP_EVAL                   1.499
 score PDS_PRO_TLD                    1.000
 score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
 score PHISH_ATTACH                   2.299
 score PHP_ORIG_SCRIPT                2.499
 score PHP_ORIG_SCRIPT_EVAL           2.999
 score PHP_SCRIPT                     2.499
-score PP_MIME_FAKE_ASCII_TEXT        1.000
+score PP_MIME_FAKE_ASCII_TEXT        0.999
 score RAND_HEADER_LIST_SPOOF         2.999
 score RAND_MKTG_HEADER               1.999
-score RATWARE_NO_RDNS                1.585
-score RDNS_NUM_TLD_XM                2.157
-score REPLYTO_EMPTY                  2.153
-score REPTO_419_FRAUD_GM             1.656
-score SCC_CANSPAM_2                  2.899
-score SCC_ISEMM_LID_1                1.933
-score SCC_SPAMMER_ADDR_2             1.880
-score SCRIPT_GIBBERISH               2.800
-score SENDGRID_REDIR                 1.389
-score SERGIO_SUBJECT_VIAGRA01        3.798
-score SHOPIFY_IMG_NOT_RCVD_SFY       2.036
+score RATWARE_NO_RDNS                0.845
+score RDNS_NUM_TLD_XM                1.554
+score REPLYTO_EMPTY                  2.152
+score REPTO_419_FRAUD_GM             2.999
+score SCC_CANSPAM_2                  2.999
+score SCC_ISEMM_LID_1                1.994
+score SCC_SPAMMER_ADDR_2             1.814
+score SCRIPT_GIBBERISH               2.799
+score SENDGRID_REDIR                 1.286
+score SERGIO_SUBJECT_VIAGRA01        3.897
+score SHOPIFY_IMG_NOT_RCVD_SFY       1.547
 score SHORTENER_SHORT_IMG            0.001
 score SHORT_SHORTNER                 1.999
-score STATIC_XPRIO_OLE               0.149
-score STY_INVIS_DIRECT               2.499
+score STATIC_XPRIO_OLE               0.155
 score SUBJ_ATTENTION                 0.499
 score SUSP_UTF8_WORD_FROM            2.000
 score SUSP_UTF8_WORD_SUBJ            1.999
 score THIS_AD                        1.599
-score THIS_IS_ADV_SUSP_NTLD          0.906
-score TO_NAME_SUBJ_NO_RDNS           2.596
+score THIS_IS_ADV_SUSP_NTLD          0.062
+score TO_NAME_SUBJ_NO_RDNS           2.810
 score TO_NO_BRKTS_FROM_MSSP          2.499
 score TO_NO_BRKTS_HTML_IMG           1.999
-score TO_NO_BRKTS_HTML_ONLY          1.999
+score TO_NO_BRKTS_HTML_ONLY          2.000
 score TO_NO_BRKTS_NORDNS_HTML        1.999
 score TO_NO_BRKTS_PCNT               2.499
 score TRANSFORM_LIFE                 2.499
 score TVD_PH_7                       2.699
-score TVD_PH_BODY_META               2.899
+score TVD_PH_BODY_META               2.999
+score TVD_RCVD_SPACE_BRACKET         1.568
 score UNDISC_FREEM                   3.699
-score UNDISC_MONEY                   2.992
+score UNDISC_MONEY                   3.251
 score UNICODE_OBFU_ASC               2.499
 score UNSUB_GOOG_FORM                2.499
-score URI_DOTEDU                     1.345
 score URI_FIREBASEAPP                2.999
-score URI_GOOGLE_PROXY               2.799
+score URI_GOOGLE_PROXY               2.899
 score URI_GOOG_STO_SPAMMY            2.999
-score URI_IN_URI_10                  3.599
+score URI_IN_URI_10                  3.600
 score URI_OBFU_DOM                   2.299
-score URI_PHISH                      4.000
+score URI_PHISH                      3.999
 score URI_PHP_REDIR                  3.499
-score URI_TRY_3LD                    1.952
+score URI_TRY_3LD                    1.999
 score URI_WPADMIN                    2.699
 score URI_WP_HACKED_2                2.499
-score US_DOLLARS_3                   0.041
-score VFY_ACCT_NORDNS                2.944
-score WORD_INVIS                     1.984
+score US_DOLLARS_3                   0.771
+score VFY_ACCT_NORDNS                2.673
+score WORD_INVIS                     1.606
 score WORD_INVIS_MANY                2.999
-score XFER_LOTSA_MONEY               0.999
+score XFER_LOTSA_MONEY               0.760
 score XM_LIGHT_HEAVY                 2.499
 score XM_RANDOM                      2.499
-score XM_RECPTID                     2.999
+score XM_RECPTID                     3.000
 score YOU_INHERIT                    2.599
 score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
@@ -240,6 +236,7 @@ score ADVANCE_FEE_2_NEW_FORM         1.0
 score ALIBABA_IMG_NOT_RCVD_ALI       1.000
 score APP_DEVELOPMENT_FREEM          1.000
 score BEBEE_IMG_NOT_RCVD_BB          1.000
+score BILLION_OVERLAP                0.001 # force non-zero
 score BITCOIN_BOMB                   1.000
 score BITCOIN_EXTORT_02              1.000
 score BITCOIN_MALWARE                1.000
@@ -268,7 +265,6 @@ score EBAY_IMG_NOT_RCVD_EBAY         1.0
 score ENCRYPTED_MESSAGE              -1.000
 score END_FUTURE_EMAILS              1.000
 score ENVFROM_GOOG_TRIX              1.000
-score FACEBOOK_IMG_NOT_RCVD_FB       1.000
 score FBI_MONEY                      1.000
 score FBI_SPOOF                      1.000
 score FONT_INVIS_DOTGOV              1.000
@@ -289,7 +285,6 @@ score GOOGLE_DRIVE_REPLY_BAD_NTLD    1.0
 score GOOG_MALWARE_DNLD              1.000
 score GOOG_STO_HTML_PHISH_MANY       1.000
 score GOOG_STO_IMG_HTML              1.000
-score HAS_X_NO_RELAY                 1.000
 score HDRS_LCASE                     0.100
 score HEXHASH_WORD                   1.000
 score HK_CTE_RAW                     1.000
@@ -300,6 +295,7 @@ score HTML_ENTITY_ASCII_TINY         1.0
 score HTML_SHRT_CMNT_OBFU_MANY       1.000
 score HTML_SINGLET_MANY              1.000
 score HTML_TEXT_INVISIBLE_FONT       1.000
+score IMG_ONLY_FM_DOM_INFO           1.000
 score JH_SPAMMY_PATTERN01            1.000
 score JH_SPAMMY_PATTERN02            1.000
 score KHOP_HELO_FCRDNS               0.400
@@ -320,6 +316,8 @@ score MSM_PRIO_REPTO                 1.0
 score NEWEGG_IMG_NOT_RCVD_NEGG       1.000
 score NEW_PRODUCTS                   1.000
 score OBFU_BITCOIN                   1.000
+score PDS_BTC_NTLD                   1.000
+score PDS_FROM_2_EMAILS              1.000
 score PDS_PHP_RUNTIME_FUNC           1.000
 score PHISH_AZURE_CLOUDAPP           3.500
 score PHISH_FBASEAPP                 1.000
@@ -373,6 +371,7 @@ score URI_ADOBESPARK                 1.0
 score URI_AZURE_CLOUDAPP             1.000
 score URI_DASHGOVEDU                 1.000
 score URI_DATA                       1.000
+score URI_DOTEDU                     1.000
 score URI_DOTEDU_ENTITY              1.000
 score URI_HEX_IP                     1.000
 score URI_IMG_WP_REDIR               1.000

Modified: spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set3
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set3?rev=1900140&r1=1900139&r2=1900140&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set3 (original)
+++ spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set3 Fri Apr 22 06:47:23 2022
@@ -3,255 +3,252 @@
 
 score AC_BR_BONANZA                  0.001
 score AC_DIV_BONANZA                 0.001 # force non-zero
-score AC_FROM_MANY_DOTS              2.999
-score AC_HTML_NONSENSE_TAGS          1.999
-score ADMITS_SPAM                    3.600
-score ADVANCE_FEE_2_NEW_FRM_MNY      2.399
-score ADVANCE_FEE_2_NEW_MONEY        1.999
-score ADVANCE_FEE_3_NEW              3.070
-score ADVANCE_FEE_3_NEW_FRM_MNY      2.599
-score ADVANCE_FEE_3_NEW_MONEY        2.899
-score ADVANCE_FEE_4_NEW              2.399
+score AC_FROM_MANY_DOTS              2.996
+score AC_HTML_NONSENSE_TAGS          1.997
+score ADMITS_SPAM                    3.595
+score ADVANCE_FEE_2_NEW_FRM_MNY      2.423
+score ADVANCE_FEE_2_NEW_MONEY        1.997
+score ADVANCE_FEE_3_NEW              3.104
+score ADVANCE_FEE_3_NEW_FRM_MNY      0.027
+score ADVANCE_FEE_3_NEW_MONEY        2.896
+score ADVANCE_FEE_4_NEW              2.397
 score ADVANCE_FEE_4_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_4_NEW_MONEY        0.610
-score ADVANCE_FEE_5_NEW              2.399
+score ADVANCE_FEE_4_NEW_MONEY        0.440
+score ADVANCE_FEE_5_NEW              2.393
 score ADVANCE_FEE_5_NEW_FRM_MNY      0.001
-score ADVANCE_FEE_5_NEW_MONEY        2.732
-score AD_PREFS                       0.009
-score AMAZON_IMG_NOT_RCVD_AMZN       2.499
-score APP_DEVELOPMENT_NORDNS         0.028
+score ADVANCE_FEE_5_NEW_MONEY        3.020
+score AD_PREFS                       0.426
+score AMAZON_IMG_NOT_RCVD_AMZN       2.497
+score APP_DEVELOPMENT_NORDNS         1.722
 score AXB_XMAILER_MIMEOLE_OL_024C2   0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5   1.490
-score BIGNUM_EMAILS_FREEM            2.999
-score BIGNUM_EMAILS_MANY             2.999
-score BILLION_OVERLAP                -0.890
-score BITCOIN_DEADLINE               2.999
-score BITCOIN_EXTORT_01              4.325
-score BITCOIN_MALF_HTML              2.801
-score BITCOIN_MALWARE                1.681
-score BITCOIN_OBFU_SUBJ              0.454
-score BITCOIN_SPAM_02                2.499
+score AXB_XMAILER_MIMEOLE_OL_1ECD5   1.779
+score BIGNUM_EMAILS_FREEM            2.996
+score BIGNUM_EMAILS_MANY             2.996
+score BILLION_OVERLAP                -0.442
+score BITCOIN_DEADLINE               2.501
+score BITCOIN_EXTORT_01              4.788
+score BITCOIN_MALF_HTML              2.973
+score BITCOIN_MALWARE                1.195
+score BITCOIN_OBFU_SUBJ              0.639
+score BITCOIN_SPAM_02                2.497
 score BITCOIN_SPAM_04                1.499
-score BITCOIN_SPAM_05                0.893
-score BITCOIN_SPAM_09                1.499
-score BITCOIN_XPRIO                  2.499
-score BITCOIN_YOUR_INFO              2.758
-score BODY_EMPTY                     0.386
-score BODY_SINGLE_URI                0.669
-score BODY_URI_ONLY                  2.999
-score BOGUS_MIME_VERSION             3.268
-score BOGUS_MSM_HDRS                 2.058
-score CANT_SEE_AD                    1.986
+score BITCOIN_SPAM_05                1.765
+score BITCOIN_SPAM_09                1.498
+score BITCOIN_XPRIO                  2.497
+score BITCOIN_YOUR_INFO              2.747
+score BODY_EMPTY                     0.392
+score BODY_SINGLE_URI                0.667
+score BODY_URI_ONLY                  2.996
+score BOGUS_MIME_VERSION             3.270
+score BOGUS_MSM_HDRS                 1.838
+score CANT_SEE_AD                    1.192
 score CK_HELO_GENERIC                0.001
-score CONTENT_AFTER_HTML             2.499
-score CONTENT_AFTER_HTML_WEAK        1.499
-score CTE_8BIT_MISMATCH              0.001
+score CONTENT_AFTER_HTML             2.497
+score CONTENT_AFTER_HTML_WEAK        1.498
+score CTE_8BIT_MISMATCH              0.001 # force non-zero
 score DEAR_BENEFICIARY               0.001
-score DKIMWL_BL                      2.999
-score DKIMWL_WL_HIGH                 -0.577
+score DKIMWL_BL                      2.997
+score DKIMWL_WL_HIGH                 -0.572
 score DKIMWL_WL_MED                  -0.001 # force non-zero
-score DKIMWL_WL_MEDHI                -0.880
-score DOS_RCVD_IP_TWICE_B            1.999
-score END_FUTURE_EMAILS              2.193
-score FAKE_REPLY_B                   0.967
-score FILL_THIS_FORM                 0.073
+score DKIMWL_WL_MEDHI                -0.860
+score DOS_RCVD_IP_TWICE_B            1.997
+score END_FUTURE_EMAILS              2.187
+score FAKE_REPLY_B                   0.519
+score FILL_THIS_FORM                 0.070
 score FONT_INVIS_DIRECT              0.001
-score FONT_INVIS_HTML_NOHTML         2.999
-score FONT_INVIS_LONG_LINE           1.096
-score FONT_INVIS_MSGID               1.258
-score FONT_INVIS_NORDNS              2.453
-score FORGED_SPF_HELO                0.373
-score FORM_FRAUD                     0.818
-score FORM_FRAUD_3                   0.795
+score FONT_INVIS_HTML_NOHTML         2.996
+score FONT_INVIS_LONG_LINE           1.089
+score FONT_INVIS_MSGID               1.332
+score FONT_INVIS_NORDNS              0.659
+score FORGED_SPF_HELO                0.125
+score FORM_FRAUD                     0.993
+score FORM_FRAUD_3                   1.378
 score FORM_FRAUD_5                   0.001
-score FOUND_YOU                      3.249
-score FREEMAIL_FORGED_FROMDOMAIN     0.249
-score FROMSPACE                      3.399
-score FROM_2_EMAILS_SHORT            1.426
-score FROM_ADDR_WS                   2.999
-score FROM_FMBLA_NEWDOM              1.499
-score FROM_FMBLA_NEWDOM14            0.999
-score FROM_FMBLA_NEWDOM28            0.799
-score FROM_GOV_DKIM_AU               -0.625
-score FROM_MISSPACED                 1.170
-score FROM_MISSP_DYNIP               1.487
+score FOUND_YOU                      3.246
+score FREEMAIL_FORGED_FROMDOMAIN     0.248
+score FROMSPACE                      3.396
+score FROM_2_EMAILS_SHORT            0.269
+score FROM_ADDR_WS                   2.996
+score FROM_FMBLA_NEWDOM              1.498
+score FROM_FMBLA_NEWDOM14            0.998
+score FROM_FMBLA_NEWDOM28            0.798
+score FROM_GOV_DKIM_AU               -0.307
+score FROM_MISSPACED                 1.169
+score FROM_MISSP_DYNIP               1.545
 score FROM_MISSP_EH_MATCH            0.001
 score FROM_MISSP_FREEMAIL            0.001
-score FROM_MISSP_MSFT                0.001 # force non-zero
-score FROM_MISSP_PHISH               3.130
-score FROM_MISSP_REPLYTO             2.499
-score FROM_MISSP_SPF_FAIL            1.999
-score FROM_MISSP_TO_UNDISC           1.794
+score FROM_MISSP_MSFT                0.001
+score FROM_MISSP_PHISH               2.003
+score FROM_MISSP_REPLYTO             2.497
+score FROM_MISSP_SPF_FAIL            1.997
+score FROM_MISSP_TO_UNDISC           0.505
 score FROM_MISSP_USER                0.001
-score FROM_MULTI_NORDNS              1.016
-score FROM_PAYPAL_SPOOF              1.599
-score FROM_SUSPICIOUS_NTLD           0.500
-score FROM_SUSPICIOUS_NTLD_FP        0.001 # force non-zero
-score FROM_UNBAL1                    2.299
-score FROM_UNBAL2                    2.199
-score FROM_WSP_TRAIL                 1.347
-score FSL_BULK_SIG                   1.435
+score FROM_MULTI_NORDNS              1.001
+score FROM_PAYPAL_SPOOF              1.597
+score FROM_SUSPICIOUS_NTLD           0.499
+score FROM_SUSPICIOUS_NTLD_FP        0.001
+score FROM_UNBAL1                    2.297
+score FROM_WSP_TRAIL                 1.320
+score FSL_BULK_SIG                   1.412
 score FSL_CTYPE_WIN1251              0.001
 score FSL_NEW_HELO_USER              0.001
-score FUZZY_AMAZON                   2.268
-score FUZZY_CLICK_HERE               2.299
-score FUZZY_WALLET                   1.238
-score GAPPY_GENITALIA                1.013
-score GB_BITCOIN_CP                  1.562
-score GB_FAKE_RF_SHORT               1.999
-score GB_FREEMAIL_DISPTO             0.499
-score GB_FREEMAIL_DISPTO_NOTFREEM    0.500
-score GOOG_REDIR_HTML_ONLY           1.999
-score GOOG_REDIR_NORDNS              3.128
-score GOOG_STO_EMAIL_PHISH           2.022
-score GOOG_STO_HTML_PHISH            0.001
-score GOOG_STO_IMG_NOHTML            0.826
-score GOOG_STO_NOIMG_HTML            2.999
-score HAS_X_NO_RELAY                 2.099
-score HAS_X_OUTGOING_SPAM_STAT       0.416
-score HDRS_LCASE_IMGONLY             0.100
-score HDRS_MISSP                     2.078
-score HDR_ORDER_FTSDMCXX_DIRECT      1.453
-score HDR_ORDER_FTSDMCXX_NORDNS      3.496
-score HEADER_FROM_DIFFERENT_DOMAINS  0.250
+score FUZZY_AMAZON                   2.132
+score FUZZY_CLICK_HERE               2.297
+score FUZZY_WALLET                   1.227
+score GB_BITCOIN_CP                  1.046
+score GB_FAKE_RF_SHORT               1.997
+score GB_FREEMAIL_DISPTO             0.498
+score GB_FREEMAIL_DISPTO_NOTFREEM    0.498
+score GOOG_REDIR_HTML_ONLY           1.997
+score GOOG_REDIR_NORDNS              3.120
+score GOOG_STO_EMAIL_PHISH           2.335
+score GOOG_STO_HTML_PHISH            0.401
+score GOOG_STO_IMG_NOHTML            1.889
+score GOOG_STO_NOIMG_HTML            2.996
+score HAS_X_NO_RELAY                 2.324
+score HAS_X_OUTGOING_SPAM_STAT       0.409
+score HDRS_LCASE_IMGONLY             0.098
+score HDRS_MISSP                     2.325
+score HDR_ORDER_FTSDMCXX_DIRECT      0.294
+score HDR_ORDER_FTSDMCXX_NORDNS      3.434
+score HEADER_FROM_DIFFERENT_DOMAINS  0.248
 score HELO_NO_DOMAIN                 0.001
-score HK_LOTTO                       0.479
-score HK_NAME_FROM                   0.999
-score HK_NAME_MR_MRS                 0.999
-score HK_RANDOM_ENVFROM              0.999
-score HK_RANDOM_FROM                 1.000
-score HK_RANDOM_REPLYTO              0.999
-score HK_SCAM                        1.773
-score HK_WIN                         0.065
-score HOSTED_IMG_DIRECT_MX           0.732
-score HOSTED_IMG_FREEM               2.426
-score HOSTED_IMG_MULTI_PUB_01        2.999
-score HTML_ENTITY_ASCII              0.929
-score HTML_FONT_TINY_NORDNS          1.627
-score HTML_OFF_PAGE                  2.807
+score HK_LOTTO                       0.458
+score HK_NAME_FROM                   0.998
+score HK_NAME_MR_MRS                 0.998
+score HK_RANDOM_ENVFROM              0.998
+score HK_RANDOM_FROM                 0.998
+score HK_RANDOM_REPLYTO              0.998
+score HK_SCAM                        1.941
+score HK_WIN                         0.176
+score HOSTED_IMG_DIRECT_MX           1.489
+score HOSTED_IMG_FREEM               2.425
+score HOSTED_IMG_MULTI_PUB_01        2.996
+score HTML_ENTITY_ASCII              1.741
+score HTML_FONT_TINY_NORDNS          1.598
+score HTML_OFF_PAGE                  2.047
 score HTML_SINGLET_MANY              1.606
-score HTML_TAG_BALANCE_CENTER        2.396
-score HTML_TEXT_INVISIBLE_FONT       1.179
-score HTML_TEXT_INVISIBLE_STYLE      2.299
-score IMG_ONLY_FM_DOM_INFO           0.083
-score JH_SPAMMY_HEADERS              3.499
-score KHOP_HELO_FCRDNS               0.001
-score LONGLN_LOW_CONTRAST            2.500
+score HTML_TAG_BALANCE_CENTER        2.403
+score HTML_TEXT_INVISIBLE_FONT       1.000
+score HTML_TEXT_INVISIBLE_STYLE      2.415
+score IMG_ONLY_FM_DOM_INFO           0.288
+score JH_SPAMMY_HEADERS              3.496
+score KHOP_HELO_FCRDNS               0.024
+score LONGLN_LOW_CONTRAST            2.497
 score LONG_HEX_URI                   0.001
-score LONG_IMG_URI                   0.925
-score LONG_INVISIBLE_TEXT            1.850
+score LONG_IMG_URI                   0.929
+score LONG_INVISIBLE_TEXT            1.853
 score LOTS_OF_MONEY                  0.010
-score LOTTO_AGENT                    0.390
-score LOTTO_DEPT                     0.829
+score LOTTO_AGENT                    0.791
+score LOTTO_DEPT                     0.533
 score MALWARE_NORDNS                 0.001
-score MALW_ATTACH                    2.399
-score MANY_SPAN_IN_TEXT              1.109
-score MILLION_HUNDRED                1.233
+score MALW_ATTACH                    2.397
+score MANY_SPAN_IN_TEXT              1.130
+score MILLION_HUNDRED                0.768
 score MILLION_USD                    0.001
-score MIMEOLE_DIRECT_TO_MX           2.000
-score MIXED_AREA_CASE                0.396
-score MIXED_CENTER_CASE              1.614
-score MIXED_ES                       1.109
-score MIXED_FONT_CASE                1.307
-score MIXED_HREF_CASE                0.001
-score MIXED_IMG_CASE                 1.446
+score MIMEOLE_DIRECT_TO_MX           1.997
+score MIXED_AREA_CASE                1.286
+score MIXED_CENTER_CASE              1.116
+score MIXED_ES                       1.087
+score MIXED_FONT_CASE                1.655
+score MIXED_HREF_CASE                1.999
+score MIXED_IMG_CASE                 2.710
 score MONEY_ATM_CARD                 0.001
-score MONEY_FORM                     0.001 # force non-zero
+score MONEY_FORM                     0.001
 score MONEY_FORM_SHORT               0.001
-score MONEY_FRAUD_3                  1.985
-score MONEY_FRAUD_5                  0.001
+score MONEY_FRAUD_3                  2.111
+score MONEY_FRAUD_5                  0.492
 score MONEY_FRAUD_8                  0.001
-score MONEY_FREEMAIL_REPTO           0.001 # force non-zero
-score MONEY_FROM_41                  1.191
-score MONEY_FROM_MISSP               0.001 # force non-zero
-score NAME_EMAIL_DIFF                3.398
-score NA_DOLLARS                     1.499
-score NICE_REPLY_A                   -3.185
-score NORDNS_LOW_CONTRAST            0.746
+score MONEY_FREEMAIL_REPTO           0.001
+score MONEY_FROM_41                  1.327
+score MONEY_FROM_MISSP               0.001
+score NAME_EMAIL_DIFF                3.397
+score NA_DOLLARS                     1.498
+score NICE_REPLY_A                   -1.165
+score NORDNS_LOW_CONTRAST            0.767
 score NO_FM_NAME_IP_HOSTN            0.001
 score NSL_RCVD_FROM_USER             0.001
-score NSL_RCVD_HELO_USER             1.324
-score OBFU_TEXT_ATTACH               1.699
-score ODD_FREEM_REPTO                2.391
-score PDS_BTC_ID                     0.500
-score PDS_BTC_MSGID                  0.200
-score PDS_BTC_NTLD                   0.714
-score PDS_DBL_URL_TNB_RUNON          1.999
-score PDS_HP_HELO_NORDNS             0.999
-score PDS_OTHER_BAD_TLD              1.999
-score PDS_PHPEXP_BOT                 1.499
-score PDS_PHP_EVAL                   1.499
-score PDS_PRO_TLD                    0.999
-score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
-score PHISH_ATTACH                   2.299
-score PHP_ORIG_SCRIPT                2.042
-score PHP_ORIG_SCRIPT_EVAL           2.999
-score PHP_SCRIPT                     2.499
+score NSL_RCVD_HELO_USER             1.733
+score OBFU_TEXT_ATTACH               1.697
+score ODD_FREEM_REPTO                2.899
+score PDS_BTC_ID                     0.498
+score PDS_BTC_MSGID                  0.407
+score PDS_BTC_NTLD                   0.653
+score PDS_DBL_URL_TNB_RUNON          1.997
+score PDS_HP_HELO_NORDNS             0.998
+score PDS_OTHER_BAD_TLD              1.997
+score PDS_PHPEXP_BOT                 1.498
+score PDS_PHP_EVAL                   1.498
+score PDS_PRO_TLD                    0.998
+score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.997
+score PHISH_ATTACH                   2.297
+score PHP_ORIG_SCRIPT                2.038
+score PHP_ORIG_SCRIPT_EVAL           2.996
+score PHP_SCRIPT                     2.497
 score PP_MIME_FAKE_ASCII_TEXT        0.001
-score RAND_HEADER_LIST_SPOOF         2.878
-score RAND_MKTG_HEADER               1.494
-score RATWARE_NO_RDNS                2.999
+score RAND_HEADER_LIST_SPOOF         2.755
+score RAND_MKTG_HEADER               1.499
+score RATWARE_NO_RDNS                2.996
 score RCVD_IN_MSPIKE_H2              -0.001
-score RDNS_NUM_TLD_XM                1.693
-score REPLYTO_EMPTY                  2.699
-score REPTO_419_FRAUD_GM             2.999
-score SCC_CANSPAM_2                  1.854
-score SCC_ISEMM_LID_1                1.743
-score SCC_SPAMMER_ADDR_2             0.851
-score SCRIPT_GIBBERISH               2.699
+score RDNS_NUM_TLD_XM                1.500
+score REPLYTO_EMPTY                  2.696
+score REPTO_419_FRAUD_GM             2.996
+score SCC_CANSPAM_2                  1.702
+score SCC_ISEMM_LID_1                1.721
+score SCC_SPAMMER_ADDR_2             1.690
+score SCRIPT_GIBBERISH               2.696
 score SENDGRID_REDIR                 0.001
-score SERGIO_SUBJECT_VIAGRA01        3.899
-score SHOPIFY_IMG_NOT_RCVD_SFY       2.499
-score SHORTENER_SHORT_IMG            1.440
-score SHORT_SHORTNER                 1.999
-score SPOOFED_FREEMAIL               1.999
+score SERGIO_SUBJECT_VIAGRA01        2.719
+score SHOPIFY_IMG_NOT_RCVD_SFY       2.497
+score SHORTENER_SHORT_IMG            1.433
+score SHORT_SHORTNER                 1.997
+score SPOOFED_FREEMAIL               1.997
 score SPOOFED_FREEMAIL_NO_RDNS       0.001
-score SPOOFED_FREEM_REPTO            2.499
-score SPOOF_GMAIL_MID                0.722
+score SPOOFED_FREEM_REPTO            2.497
+score SPOOF_GMAIL_MID                0.565
 score STATIC_XPRIO_OLE               0.001
-score STY_INVIS_DIRECT               2.499
-score SUBJ_ATTENTION                 0.499
-score SUSP_UTF8_WORD_FROM            1.999
-score SUSP_UTF8_WORD_SUBJ            1.999
+score SUBJ_ATTENTION                 0.498
+score SUSP_UTF8_WORD_FROM            1.650
+score SUSP_UTF8_WORD_SUBJ            1.997
 score THIS_AD                        1.264
 score TO_EQ_FM_DOM_SPF_FAIL          0.001
 score TO_EQ_FM_SPF_FAIL              0.001
-score TO_NAME_SUBJ_NO_RDNS           0.222
-score TO_NO_BRKTS_FROM_MSSP          2.499
-score TO_NO_BRKTS_HTML_IMG           0.783
-score TO_NO_BRKTS_HTML_ONLY          1.999
+score TO_NAME_SUBJ_NO_RDNS           1.321
+score TO_NO_BRKTS_FROM_MSSP          2.497
+score TO_NO_BRKTS_HTML_IMG           0.777
+score TO_NO_BRKTS_HTML_ONLY          1.998
 score TO_NO_BRKTS_MSFT               0.001
-score TO_NO_BRKTS_NORDNS_HTML        1.199
-score TO_NO_BRKTS_PCNT               2.499
-score TRANSFORM_LIFE                 2.499
-score TVD_PH_BODY_META               2.225
+score TO_NO_BRKTS_NORDNS_HTML        1.198
+score TO_NO_BRKTS_PCNT               2.497
+score TRANSFORM_LIFE                 2.497
+score TVD_PH_BODY_META               2.054
 score TVD_SPACE_ENCODED              0.001
-score TVD_SPACE_RATIO_MINFP          0.283
-score UNDISC_FREEM                   3.599
+score TVD_SPACE_RATIO_MINFP          0.272
+score UNDISC_FREEM                   3.595
 score UNDISC_MONEY                   2.234
-score UNICODE_OBFU_ASC               2.499
-score UNSUB_GOOG_FORM                2.499
-score URI_FIREBASEAPP                2.999
-score URI_GOOGLE_PROXY               2.799
-score URI_GOOG_STO_SPAMMY            2.831
-score URI_IN_URI_10                  2.879
-score URI_OBFU_DOM                   2.299
-score URI_ONLY_MSGID_MALF            0.668
-score URI_PHISH                      3.791
-score URI_PHP_REDIR                  3.172
-score URI_TRY_3LD                    1.999
-score URI_WPADMIN                    2.699
-score URI_WP_HACKED                  3.499
-score URI_WP_HACKED_2                0.873
-score VFY_ACCT_NORDNS                2.999
-score WORD_INVIS                     0.684
-score WORD_INVIS_MANY                2.538
-score XFER_LOTSA_MONEY               0.001
-score XM_LIGHT_HEAVY                 2.499
-score XM_RANDOM                      2.499
-score XM_RECPTID                     2.999
-score XPRIO                          1.922
-score YOU_INHERIT                    1.836
+score UNICODE_OBFU_ASC               2.497
+score UNSUB_GOOG_FORM                2.497
+score URI_FIREBASEAPP                2.996
+score URI_GOOGLE_PROXY               2.796
+score URI_GOOG_STO_SPAMMY            2.682
+score URI_IN_URI_10                  2.874
+score URI_OBFU_DOM                   2.297
+score URI_ONLY_MSGID_MALF            1.190
+score URI_PHISH                      3.782
+score URI_PHP_REDIR                  3.144
+score URI_TRY_3LD                    1.997
+score URI_WPADMIN                    2.696
+score URI_WP_HACKED                  3.496
+score URI_WP_HACKED_2                1.032
+score VFY_ACCT_NORDNS                2.813
+score WORD_INVIS                     0.601
+score WORD_INVIS_MANY                2.123
+score XFER_LOTSA_MONEY               0.193
+score XM_LIGHT_HEAVY                 2.497
+score XM_RANDOM                      2.497
+score XM_RECPTID                     2.996
+score XPRIO                          2.113
+score YOU_INHERIT                    1.454
 score AC_POST_EXTRAS                 1.000
 score AC_SPAMMY_URI_PATTERNS1        1.000
 score AC_SPAMMY_URI_PATTERNS10       1.000

Modified: spamassassin/branches/trunk-welcomelist/rulesrc/scores/stats-set0
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rulesrc/scores/stats-set0?rev=1900140&r1=1900139&r2=1900140&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rulesrc/scores/stats-set0 (original)
+++ spamassassin/branches/trunk-welcomelist/rulesrc/scores/stats-set0 Fri Apr 22 06:47:23 2022
@@ -1,40 +1,40 @@
 ##### WITH NEW RULES AND SCORES #####
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 176608  48.980%  (99.670% of non-spam corpus)
-# Correctly spam:     108892  30.200%  (59.381% of spam corpus)
-# False positives:       585  0.162%  (0.330% of nonspam,  18151 weighted)
-# False negatives:     74488  20.658%  (40.619% of spam, 116135 weighted)
-# Average score for spam:  8.3    nonspam: 0.3
+# Correctly non-spam: 181884  49.294%  (99.679% of non-spam corpus)
+# Correctly spam:     110539  29.958%  (59.268% of spam corpus)
+# False positives:       585  0.159%  (0.321% of nonspam,  17937 weighted)
+# False negatives:     75969  20.589%  (40.732% of spam, 118444 weighted)
+# Average score for spam:  8.4    nonspam: 0.3
 # Average for false-pos:   6.0  false-neg: 1.6
-# TOTAL:              360573  100.00%
+# TOTAL:              368977  100.00%
 
 Reading scores from "tmprules"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  22203  99.70%
-# Correctly spam:      13696  59.46%
-# False positives:        66  0.30%
-# False negatives:      9338  40.54%
-# TCR(l=50): 1.822599  SpamRecall: 59.460%  SpamPrec: 99.520%
+# Correctly non-spam:  22843  99.67%
+# Correctly spam:      13900  59.38%
+# False positives:        76  0.33%
+# False negatives:      9510  40.62%
+# TCR(l=50): 1.758828  SpamRecall: 59.376%  SpamPrec: 99.456%
 
 ##### 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: 172809  97.53%
-# Correctly spam:      84723  46.20%
-# False positives:      4384  2.47%
-# False negatives:     98657  53.80%
-# TCR(l=50): 0.576926  SpamRecall: 46.201%  SpamPrec: 95.080%
+# Correctly non-spam: 177947  97.52%
+# Correctly spam:      87092  46.70%
+# False positives:      4522  2.48%
+# False negatives:     99416  53.30%
+# TCR(l=50): 0.572961  SpamRecall: 46.696%  SpamPrec: 95.064%
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  21688  97.39%
-# Correctly spam:      10623  46.12%
-# False positives:       581  2.61%
-# False negatives:     12411  53.88%
-# TCR(l=50): 0.555558  SpamRecall: 46.119%  SpamPrec: 94.814%
+# Correctly non-spam:  22330  97.43%
+# Correctly spam:      10937  46.72%
+# False positives:       589  2.57%
+# False negatives:     12473  53.28%
+# TCR(l=50): 0.558405  SpamRecall: 46.719%  SpamPrec: 94.890%

Modified: spamassassin/branches/trunk-welcomelist/rulesrc/scores/stats-set1
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rulesrc/scores/stats-set1?rev=1900140&r1=1900139&r2=1900140&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rulesrc/scores/stats-set1 (original)
+++ spamassassin/branches/trunk-welcomelist/rulesrc/scores/stats-set1 Fri Apr 22 06:47:23 2022
@@ -1,11 +1,11 @@
 ##### WITH NEW RULES AND SCORES #####
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 162974  48.768%  (99.660% of non-spam corpus)
-# Correctly spam:     149788  44.822%  (87.774% of spam corpus)
-# False positives:       556  0.166%  (0.340% of nonspam,  35491 weighted)
-# False negatives:     20863  6.243%  (12.226% of spam,  53700 weighted)
-# Average score for spam:  13.9    nonspam: -1.0
+# Correctly non-spam: 162988  48.772%  (99.669% of non-spam corpus)
+# Correctly spam:     149681  44.790%  (87.712% of spam corpus)
+# False positives:       542  0.162%  (0.331% of nonspam,  34724 weighted)
+# False negatives:     20970  6.275%  (12.288% of spam,  54129 weighted)
+# Average score for spam:  13.7    nonspam: -0.9
 # Average for false-pos:   6.1  false-neg: 2.6
 # TOTAL:              334181  100.00%
 
@@ -13,11 +13,11 @@ Reading scores from "tmprules"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  20539  99.65%
-# Correctly spam:      18939  88.13%
-# False positives:        73  0.35%
-# False negatives:      2551  11.87%
-# TCR(l=50): 3.465570  SpamRecall: 88.129%  SpamPrec: 99.616%
+# Correctly non-spam:  20542  99.66%
+# Correctly spam:      18931  88.09%
+# False positives:        70  0.34%
+# False negatives:      2559  11.91%
+# TCR(l=50): 3.546790  SpamRecall: 88.092%  SpamPrec: 99.632%
 
 ##### WITHOUT NEW RULES AND SCORES #####
 Reading scores from "../rules-base"...

Modified: spamassassin/branches/trunk-welcomelist/sa-learn.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/sa-learn.raw?rev=1900140&r1=1900139&r2=1900140&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/sa-learn.raw (original)
+++ spamassassin/branches/trunk-welcomelist/sa-learn.raw Fri Apr 22 06:47:23 2022
@@ -173,15 +173,14 @@ if ( !defined $isspam
   && !defined $opt{'folders'} )
 {
   usage( 0,
-"Please select either --spam, --ham, --folders, --forget, --sync, --import,\n--dump, --clear, --backup or --restore"
+    "Please select either --spam, --ham, --folders, --forget, --sync, --import,\n--dump, --clear, --backup or --restore"
   );
 }
 
 # We need to make sure the journal syncs pre-forget...
 if ( defined $forget && $opt{'nosync'} ) {
   $opt{'nosync'} = 0;
-  warn
-"sa-learn warning: --forget requires read/write access to the database, and is incompatible with --no-sync\n";
+  warn "sa-learn warning: --forget requires read/write access to the database, and is incompatible with --no-sync\n";
 }
 
 if ( defined $opt{'old_format'} ) {
@@ -517,10 +516,10 @@ sub killed {
 sub target {
   my ($target) = @_;
 
-  if (!defined $isspam)
+  if (!defined $isspam && !$forget)
   {
     usage( 0,
-  "Please select either --spam or --ham before the first target"
+      "Please select either --spam or --ham or --forget before the first target"
     );
   }
   my $class = ( $isspam ? "spam" : "ham" );
@@ -626,7 +625,7 @@ Options:
 
  --ham                 Learn the following messages as ham (non-spam)
  --spam                Learn the following messages as spam
- --forget              Forget a message
+ --forget              Forget the following messages
  --use-ignores         Use bayes_ignore_from and bayes_ignore_to
  --sync                Synchronize the database and the journal if needed
  --force-expire        Force a database sync and expiry run
@@ -767,7 +766,8 @@ into the Bayes databases.
 
 =item B<--forget>
 
-Forget a given message previously learnt.
+Forget the input message(s) in the files following the option as previously
+learnt.
 
 =item B<--dbpath>
 

Modified: spamassassin/branches/trunk-welcomelist/t/bayesbdb.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/bayesbdb.t?rev=1900140&r1=1900139&r2=1900140&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/bayesbdb.t (original)
+++ spamassassin/branches/trunk-welcomelist/t/bayesbdb.t Fri Apr 22 06:47:23 2022
@@ -16,7 +16,7 @@ plan skip_all => "BerkeleyDB is unavaila
   plan skip_all => "BerkeleyDB >= 4.6 is required" unless $BerkeleyDB::db_version >= 4.6;
 }
 
-plan tests => 46;
+plan tests => 48;
 
 
 tstprefs ("
@@ -175,6 +175,10 @@ $wanted_examined = 3;
 ok(salearnrun("--ham --mbox < data/nice.mbox", \&check_examined));
 ok_all_patterns();
 
+$wanted_examined = 3;
+ok(salearnrun("--forget --mbox data/nice.mbox", \&check_examined));
+ok_all_patterns();
+
 %patterns = ( 'non-token data: bayes db version' => 'db version' );
 ok(salearnrun("--dump magic", \&patterns_run_cb));
 ok_all_patterns();

Modified: spamassassin/branches/trunk-welcomelist/t/bayesdbm.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/bayesdbm.t?rev=1900140&r1=1900139&r2=1900140&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/bayesdbm.t (original)
+++ spamassassin/branches/trunk-welcomelist/t/bayesdbm.t Fri Apr 22 06:47:23 2022
@@ -10,7 +10,7 @@ use Test::More;
 
 plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
 plan skip_all => "DB_File is unavailable" unless HAS_DB_FILE;
-plan tests => 52;
+plan tests => 54;
 
 tstprefs ("
   bayes_learn_to_journal 0
@@ -195,6 +195,10 @@ $wanted_examined = 3;
 ok(salearnrun("--ham --mbox < data/nice.mbox", \&check_examined));
 ok_all_patterns();
 
+$wanted_examined = 3;
+ok(salearnrun("--forget --mbox data/nice.mbox", \&check_examined));
+ok_all_patterns();
+
 %patterns = ( 'non-token data: bayes db version' => 'db version' );
 ok(salearnrun("--dump magic", \&patterns_run_cb));
 ok_all_patterns();

Modified: spamassassin/branches/trunk-welcomelist/t/bayessql.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/t/bayessql.t?rev=1900140&r1=1900139&r2=1900140&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/t/bayessql.t (original)
+++ spamassassin/branches/trunk-welcomelist/t/bayessql.t Fri Apr 22 06:47:23 2022
@@ -15,8 +15,8 @@ plan skip_all => "DBI is unavailable on
 plan skip_all => "Bayes SQL tests are disabled or DBD::SQLite not found" unless (SQLITE || SQL);
 
 my $tests = 0;
-$tests += 57 if (SQLITE);
-$tests += 57 if (SQL);
+$tests += 59 if (SQLITE);
+$tests += 59 if (SQL);
 plan tests => $tests;
 
 diag "Note: Failure may be due to an incorrect config.";
@@ -360,6 +360,10 @@ $wanted_examined = 3;
 ok(salearnrun("--ham --mbox < data/nice.mbox", \&check_examined));
 ok_all_patterns();
 
+$wanted_examined = 3;
+ok(salearnrun("--forget --mbox data/nice.mbox", \&check_examined));
+ok_all_patterns();
+
 %patterns = ( 'non-token data: bayes db version' => 'db version' );
 ok(salearnrun("--dump magic", \&patterns_run_cb));
 ok_all_patterns();