You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by km...@apache.org on 2014/02/17 16:55:44 UTC
svn commit: r1569032 - in /spamassassin/trunk: rules/
rulesrc/sandbox/kmcgrail/
Author: kmcgrail
Date: Mon Feb 17 15:55:44 2014
New Revision: 1569032
URL: http://svn.apache.org/r1569032
Log:
Adding scoring gradient for BAYES_999 to cover 99.9% to 100%
Modified:
spamassassin/trunk/rules/23_bayes.cf
spamassassin/trunk/rules/30_text_de.cf
spamassassin/trunk/rules/30_text_fr.cf
spamassassin/trunk/rules/30_text_nl.cf
spamassassin/trunk/rules/30_text_pl.cf
spamassassin/trunk/rules/30_text_pt_br.cf
spamassassin/trunk/rules/50_scores.cf
spamassassin/trunk/rules/60_shortcircuit.cf
spamassassin/trunk/rulesrc/sandbox/kmcgrail/20_ac_rules_test.cf
Modified: spamassassin/trunk/rules/23_bayes.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/23_bayes.cf?rev=1569032&r1=1569031&r2=1569032&view=diff
==============================================================================
--- spamassassin/trunk/rules/23_bayes.cf (original)
+++ spamassassin/trunk/rules/23_bayes.cf Mon Feb 17 15:55:44 2014
@@ -41,7 +41,8 @@ body BAYES_50 eval:check_bayes('0.40',
body BAYES_60 eval:check_bayes('0.60', '0.80')
body BAYES_80 eval:check_bayes('0.80', '0.95')
body BAYES_95 eval:check_bayes('0.95', '0.99')
-body BAYES_99 eval:check_bayes('0.99', '1.00')
+body BAYES_99 eval:check_bayes('0.99', '0.999')
+body BAYES_999 eval:check_bayes('0.999', '1.00')
tflags BAYES_00 nice learn
tflags BAYES_05 nice learn
@@ -52,6 +53,7 @@ tflags BAYES_60 learn
tflags BAYES_80 learn
tflags BAYES_95 learn
tflags BAYES_99 learn
+tflags BAYES_999 learn
describe BAYES_00 Bayes spam probability is 0 to 1%
describe BAYES_05 Bayes spam probability is 1 to 5%
@@ -61,6 +63,7 @@ describe BAYES_50 Bayes spam probability
describe BAYES_60 Bayes spam probability is 60 to 80%
describe BAYES_80 Bayes spam probability is 80 to 95%
describe BAYES_95 Bayes spam probability is 95 to 99%
-describe BAYES_99 Bayes spam probability is 99 to 100%
+describe BAYES_99 Bayes spam probability is 99 to 99.9%
+describe BAYES_999 Bayes spam probability is 99.9 to 100%
endif
Modified: spamassassin/trunk/rules/30_text_de.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/30_text_de.cf?rev=1569032&r1=1569031&r2=1569032&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_de.cf (original)
+++ spamassassin/trunk/rules/30_text_de.cf Mon Feb 17 15:55:44 2014
@@ -326,7 +326,8 @@ lang de describe BAYES_50 Spamwahrschein
lang de describe BAYES_60 Spamwahrscheinlichkeit nach Bayes-Test: 60-80%
lang de describe BAYES_80 Spamwahrscheinlichkeit nach Bayes-Test: 80-95%
lang de describe BAYES_95 Spamwahrscheinlichkeit nach Bayes-Test: 95-99%
-lang de describe BAYES_99 Spamwahrscheinlichkeit nach Bayes-Test: 99-100%
+lang de describe BAYES_99 Spamwahrscheinlichkeit nach Bayes-Test: 99-99.9%
+lang de describe BAYES_999 Spamwahrscheinlichkeit nach Bayes-Test: 99.9-100%
endif
#
lang de describe USER_IN_BLACKLIST Absenderadresse steht in Ihrer persönlichen schwarzen Liste
Modified: spamassassin/trunk/rules/30_text_fr.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/30_text_fr.cf?rev=1569032&r1=1569031&r2=1569032&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_fr.cf (original)
+++ spamassassin/trunk/rules/30_text_fr.cf Mon Feb 17 15:55:44 2014
@@ -79,7 +79,8 @@ lang fr describe BAYES_50 L'algorithme B
lang fr describe BAYES_60 L'algorithme Bayésien a évalué la probabilité de spam entre 60 et 80%
lang fr describe BAYES_80 L'algorithme Bayésien a évalué la probabilité de spam entre 80 et 95%
lang fr describe BAYES_95 L'algorithme Bayésien a évalué la probabilité de spam entre 95 et 99%
-lang fr describe BAYES_99 L'algorithme Bayésien a évalué la probabilité de spam entre 99 et 100%
+lang fr describe BAYES_99 L'algorithme Bayésien a évalué la probabilité de spam entre 99 et 99.9%
+lang fr describe BAYES_999 L'algorithme Bayésien a évalué la probabilité de spam entre 99.9 et 100%
endif
lang fr describe ACT_NOW_CAPS Demande d'agir immédiatement (en majuscules)
Modified: spamassassin/trunk/rules/30_text_nl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/30_text_nl.cf?rev=1569032&r1=1569031&r2=1569032&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_nl.cf (original)
+++ spamassassin/trunk/rules/30_text_nl.cf Mon Feb 17 15:55:44 2014
@@ -245,7 +245,8 @@ lang nl describe BAYES_50
lang nl describe BAYES_60 Bayesiaanse kans op spam is 60 tot 80%
lang nl describe BAYES_80 Bayesiaanse kans op spam is 80 tot 95%
lang nl describe BAYES_95 Bayesiaanse kans op spam is 95 tot 99%
-lang nl describe BAYES_99 Bayesiaanse kans op spam is 99 tot 100%
+lang nl describe BAYES_99 Bayesiaanse kans op spam is 99 tot 99.9%
+lang nl describe BAYES_999 Bayesiaanse kans op spam is 99.9 tot 100%
endif
#
lang nl describe DRUG_DOSAGE Heeft het over een prijs per dosis
Modified: spamassassin/trunk/rules/30_text_pl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/30_text_pl.cf?rev=1569032&r1=1569031&r2=1569032&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_pl.cf (original)
+++ spamassassin/trunk/rules/30_text_pl.cf Mon Feb 17 15:55:44 2014
@@ -73,7 +73,8 @@ lang pl describe BAYES_50 Bayesowskie p
lang pl describe BAYES_60 Bayesowskie prawdopodobieñstwo spamu wynosi 60 do 80%
lang pl describe BAYES_80 Bayesowskie prawdopodobieñstwo spamu wynosi 80 do 95%
lang pl describe BAYES_95 Bayesowskie prawdopodobieñstwo spamu wynosi 95 do 99%
-lang pl describe BAYES_99 Bayesowskie prawdopodobieñstwo spamu wynosi 99 do 100%
+lang pl describe BAYES_99 Bayesowskie prawdopodobieñstwo spamu wynosi 99 do 99.9%
+lang pl describe BAYES_999 Bayesowskie prawdopodobieñstwo spamu wynosi 99.9 do 100%
endif
#
lang pl describe BILLION_DOLLARS Tre¶æ: o niesamowitej ilo¶ci pieniêdzy
Modified: spamassassin/trunk/rules/30_text_pt_br.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/30_text_pt_br.cf?rev=1569032&r1=1569031&r2=1569032&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_pt_br.cf (original)
+++ spamassassin/trunk/rules/30_text_pt_br.cf Mon Feb 17 15:55:44 2014
@@ -485,7 +485,8 @@ lang pt_BR describe BAYES_50 Probabilida
lang pt_BR describe BAYES_60 Probabilidade de ser spam entre 60 to 80%
lang pt_BR describe BAYES_80 Probabilidade de ser spam entre 80 to 95%
lang pt_BR describe BAYES_95 Probabilidade de ser spam entre 95 to 99%
-lang pt_BR describe BAYES_99 Probabilidade de ser spam entre 99 to 100%
+lang pt_BR describe BAYES_99 Probabilidade de ser spam entre 99 to 99.9%
+lang pt_BR describe BAYES_999 Probabilidade de ser spam entre 99.9 to 100%
endif
#
# 25_accessdb.cf
Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=1569032&r1=1569031&r2=1569032&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Mon Feb 17 15:55:44 2014
@@ -681,6 +681,7 @@ score BAYES_60 0 0 2.5 1.5
score BAYES_80 0 0 2.7 2.0
score BAYES_95 0 0 3.2 3.0
score BAYES_99 0 0 3.8 3.5
+score BAYES_999 0 0 4.0 3.7
endif
# Informational rules about Received header parsing
Modified: spamassassin/trunk/rules/60_shortcircuit.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/60_shortcircuit.cf?rev=1569032&r1=1569031&r2=1569032&view=diff
==============================================================================
--- spamassassin/trunk/rules/60_shortcircuit.cf (original)
+++ spamassassin/trunk/rules/60_shortcircuit.cf Mon Feb 17 15:55:44 2014
@@ -35,6 +35,7 @@ priority USER_IN_BLACKLIST_TO -900
priority USER_IN_BLACKLIST -900
priority BAYES_99 -400
+priority BAYES_999 -400
###########################################################################
Modified: spamassassin/trunk/rulesrc/sandbox/kmcgrail/20_ac_rules_test.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/kmcgrail/20_ac_rules_test.cf?rev=1569032&r1=1569031&r2=1569032&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/kmcgrail/20_ac_rules_test.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/kmcgrail/20_ac_rules_test.cf Mon Feb 17 15:55:44 2014
@@ -132,16 +132,17 @@ tflags AC_SPAMMY_URI_PATTERNS12 publis
# Enhance Bayes scoring for super-spammy mails
# see /var/lib/spamassassin/3.003002/updates_spamassassin_org/23_bayes.cf
# and $samedir/50_scores.cf
-ifplugin Mail::SpamAssassin::Plugin::Bayes
- body BAYES_99 eval:check_bayes('0.99', '0.999')
- body BAYES_999 eval:check_bayes('0.999', '1.00')
- tflags BAYES_99 learn,publish
- tflags BAYES_999 learn,publish
- describe BAYES_99 Bayes spam probability is 99 to 99.9%
- describe BAYES_999 Bayes spam probability is 99.9 to 100%
- score BAYES_99 0 0 4.3 4.0
- score BAYES_999 0 0 4.8 4.5
-endif
+#ifplugin Mail::SpamAssassin::Plugin::Bayes
+# body AC_BAYES_99 eval:check_bayes('0.99', '0.999')
+# tflags AC_BAYES_99 learn,publish
+# describe AC_BAYES_99 Bayes spam probability is 99 to 99.9%
+# score AC_BAYES_99 0 0 4.3 4.0
+#
+# body AC_BAYES_999 eval:check_bayes('0.999', '1.00')
+# tflags AC_BAYES_999 learn,publish
+# describe AC_BAYES_999 Bayes spam probability is 99.9 to 100%
+# score AC_BAYES_999 0 0 4.8 4.5
+#endif
# Too many newlines...
rawbody AC_BR_BONANZA /(?:<br>\s*){30}/i