You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2010/12/28 15:12:27 UTC
svn commit: r1053352 - /spamassassin/trunk/rules/50_scores.cf
Author: mmartinec
Date: Tue Dec 28 14:12:26 2010
New Revision: 1053352
URL: http://svn.apache.org/viewvc?rev=1053352&view=rev
Log:
Bug 6499 and mailing list: wrapped scores for rules DKIMDOMAIN_IN_DWL*,
ACCESSDB and SHORTCIRCUIT into a suitable ifplugin/endif to avoid
lint warnings; removed score for nonexistent rule SUBJ_RE_NUM.
Modified:
spamassassin/trunk/rules/50_scores.cf
Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=1053352&r1=1053351&r2=1053352&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Tue Dec 28 14:12:26 2010
@@ -33,7 +33,6 @@
# Start of generated scores. <gen:mutable>
-score ACCESSDB 0 # n=0 n=1 n=2
score ACT_NOW_CAPS 1.404 2.399 0.925 2.211
score ADVANCE_FEE_2 2.314 2.294 1.198 1.053
score ADVANCE_FEE_3 2.686 1.898 3.505 3.817
@@ -498,7 +497,6 @@ score SANE_7429530a7398f43f1f1b795f94207
score SANE_91eb43f705d25c804374a746d7519660 3.099 2.803 2.746 1.572
score SANE_d0d2b0f6373bf91253d66dd74c594b87 3.799 2.040 2.710 1.494
score SB_GIF_AND_NO_URIS 2.199 2.199 2.200 2.199 # n=2
-score SHORTCIRCUIT 0 # n=0 n=1 n=2
score SHORT_HELO_AND_INLINE_IMAGE 0.237 0.160 0.013 1.390 # n=2
score SHORT_TERM_PRICE 0.001 # n=0 n=1 n=2 n=3
score SPAMMY_XMAILER 2.650 0.862 1.993 2.491 # n=2
@@ -526,7 +524,6 @@ score SUBJECT_SEXUAL 0 # n=0 n=1 n=2 n=3
score SUBJ_AS_SEEN 2.711 3.099 3.099 1.461 # n=0
score SUBJ_BUY 0.594 1.498 0.001 0.639
score SUBJ_DOLLARS 0.600 0.001 0.601 1.800
-score SUBJ_RE_NUM 0 # n=0 n=1 n=2 n=3
score SUBJ_YOUR_DEBT 3.299 3.045 1.199 0.987
score SUBJ_YOUR_FAMILY 2.910 2.999 2.999 2.999
score TBIRD_SUSP_MIME_BDRY 2.400 2.400 2.399 2.399
@@ -642,6 +639,18 @@ score FH_HAS_XID 0
###########################################################################
+ifplugin Mail::SpamAssassin::Plugin::Shortcircuit
+score SHORTCIRCUIT 0
+endif
+
+###########################################################################
+
+ifplugin Mail::SpamAssassin::Plugin::AccessDB
+score ACCESSDB 0
+endif
+
+###########################################################################
+
ifplugin Mail::SpamAssassin::Plugin::BodyEval
# <gen:mutable>
score BLANK_LINES_80_90 0 # n=0 n=1 n=2 n=3
@@ -753,8 +762,6 @@ score DNS_FROM_AHBL_RHSBL 0 2.438 0 2.69
score DNS_FROM_RFC_BOGUSMX 0 1.464 0 1.668 # n=0 n=2
score DNS_FROM_RFC_DSN 0 0.001 0 0.001 # n=0 n=2
score NO_DNS_FOR_FROM 0 0.379 0 0.001 # n=0 n=2
-score DKIMDOMAIN_IN_DWL 0 -3.5 0 -3.5
-score DKIMDOMAIN_IN_DWL_UNKNOWN 0 -0.01 0 -0.01
# </gen:mutable>
# Spamhaus CSS does not appear in masschecks thus cannot be
@@ -951,11 +958,6 @@ score SUBJECT_IN_WHITELIST -100
score SUBJECT_IN_BLACKLIST 100
endif # Mail::SpamAssassin::Plugin::WhiteListSubject
-ifplugin Mail::SpamAssassin::Plugin::DKIM
-score USER_IN_DKIM_WHITELIST -100.000
-score USER_IN_DEF_DKIM_WL -7.500
-endif # Mail::SpamAssassin::Plugin::DKIM
-
ifplugin Mail::SpamAssassin::Plugin::SPF
score USER_IN_SPF_WHITELIST -100.000
score USER_IN_DEF_SPF_WL -7.500
@@ -964,6 +966,8 @@ endif # Mail::SpamAssassin::Plugin::SPF
# DKIM
ifplugin Mail::SpamAssassin::Plugin::DKIM
+score USER_IN_DKIM_WHITELIST -100.000
+score USER_IN_DEF_DKIM_WL -7.500
score DKIM_SIGNED 0.1
score DKIM_VALID -0.1
score DKIM_VALID_AU -0.1
@@ -974,14 +978,23 @@ score DKIM_POLICY_TESTING 0
score DKIM_ADSP_CUSTOM_LOW 0.001
score DKIM_ADSP_CUSTOM_MED 0.001
score DKIM_ADSP_CUSTOM_HIGH 0.001
-score DKIM_ADSP_ALL 0 1.1 0 0.8
-score DKIM_ADSP_DISCARD 0 1.8 0 1.8
-score DKIM_ADSP_NXDOMAIN 0 0.8 0 0.9
score NML_ADSP_CUSTOM_LOW 0 0.7 0 0.7
score NML_ADSP_CUSTOM_MED 0 1.2 0 0.9
score NML_ADSP_CUSTOM_HIGH 0 2.6 0 2.5
+# <gen:mutable>
+score DKIM_ADSP_ALL 0 1.1 0 0.8
+score DKIM_ADSP_DISCARD 0 1.8 0 1.8
+score DKIM_ADSP_NXDOMAIN 0 0.8 0 0.9
+# </gen:mutable>
endif # Mail::SpamAssassin::Plugin::DKIM
+ifplugin Mail::SpamAssassin::Plugin::AskDNS
+# <gen:mutable>
+score DKIMDOMAIN_IN_DWL 0 -3.5 0 -3.5
+score DKIMDOMAIN_IN_DWL_UNKNOWN 0 -0.01 0 -0.01
+# </gen:mutable>
+endif
+
# Hashcash
ifplugin Mail::SpamAssassin::Plugin::Hashcash
score HASHCASH_20 -0.5