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 2012/10/22 14:13:44 UTC
svn commit: r1400858 - in /spamassassin/trunk: rules/ rulesrc/
rulesrc/sandbox/jm/ rulesrc/sandbox/mkettler/ rulesrc/sandbox/smf/
Author: kmcgrail
Date: Mon Oct 22 12:13:44 2012
New Revision: 1400858
URL: http://svn.apache.org/viewvc?rev=1400858&view=rev
Log:
Step 1 of bug 6853 to remove SURBL Outblaze (OB) list
Modified:
spamassassin/trunk/rules/25_uribl.cf
spamassassin/trunk/rules/30_text_de.cf
spamassassin/trunk/rules/30_text_pt_br.cf
spamassassin/trunk/rules/50_scores.cf
spamassassin/trunk/rules/active.list
spamassassin/trunk/rulesrc/10_force_active.cf
spamassassin/trunk/rulesrc/sandbox/jm/20_basic.cf
spamassassin/trunk/rulesrc/sandbox/mkettler/25_uribl.cf
spamassassin/trunk/rulesrc/sandbox/smf/20_smf.cf
Modified: spamassassin/trunk/rules/25_uribl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/25_uribl.cf?rev=1400858&r1=1400857&r2=1400858&view=diff
==============================================================================
--- spamassassin/trunk/rules/25_uribl.cf (original)
+++ spamassassin/trunk/rules/25_uribl.cf Mon Oct 22 12:13:44 2012
@@ -90,11 +90,12 @@ describe URIBL_PH_SURBL Contains
tflags URIBL_PH_SURBL net
reuse URIBL_PH_SURBL
-urirhssub URIBL_OB_SURBL multi.surbl.org. A 16
-body URIBL_OB_SURBL eval:check_uridnsbl('URIBL_OB_SURBL')
-describe URIBL_OB_SURBL Contains an URL listed in the OB SURBL blocklist
-tflags URIBL_OB_SURBL net
-reuse URIBL_OB_SURBL
+#DEPRECATED 10/22/2012 - BUG 6853 - TO BECOME MW 5-1-2013
+#urirhssub URIBL_MW_SURBL multi.surbl.org. A 16
+#body URIBL_MW_SURBL eval:check_uridnsbl('URIBL_MW_SURBL')
+#describe URIBL_MW_SURBL Contains a Malware Domain or IP listed in the MW SURBL blocklist
+#tflags URIBL_MW_SURBL net
+#reuse URIBL_MW_SURBL
urirhssub URIBL_AB_SURBL multi.surbl.org. A 32
body URIBL_AB_SURBL eval:check_uridnsbl('URIBL_AB_SURBL')
Modified: spamassassin/trunk/rules/30_text_de.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/30_text_de.cf?rev=1400858&r1=1400857&r2=1400858&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_de.cf (original)
+++ spamassassin/trunk/rules/30_text_de.cf Mon Oct 22 12:13:44 2012
@@ -368,7 +368,7 @@ lang de describe URIBL_SBL Enthält URL
lang de describe URIBL_SC_SURBL Enthält URL in SC-Liste (www.surbl.org)
lang de describe URIBL_WS_SURBL Enthält URL in WS-Liste (www.surbl.org)
lang de describe URIBL_PH_SURBL Enthält URL in PH-Liste (www.surbl.org)
-lang de describe URIBL_OB_SURBL Enthält URL in OB-Liste (www.surbl.org)
+#lang de describe URIBL_OB_SURBL Enthält URL in OB-Liste (www.surbl.org) - REMOVED BUG 6853
lang de describe URIBL_AB_SURBL Enthält URL in AB-Liste (www.surbl.org)
lang de describe URIBL_JP_SURBL Enthält URL in JP-Liste (www.surbl.org)
endif
Modified: spamassassin/trunk/rules/30_text_pt_br.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/30_text_pt_br.cf?rev=1400858&r1=1400857&r2=1400858&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_pt_br.cf (original)
+++ spamassassin/trunk/rules/30_text_pt_br.cf Mon Oct 22 12:13:44 2012
@@ -608,7 +608,7 @@ lang pt_BR describe URIBL_DBL_ERROR Erro
lang pt_BR describe URIBL_SC_SURBL Contém uma URL listada na blacklist SC SURBL
lang pt_BR describe URIBL_WS_SURBL Contém uma URL listada na blacklist WS SURBL
lang pt_BR describe URIBL_PH_SURBL Contém uma URL listada na blacklist PH SURBL
-lang pt_BR describe URIBL_OB_SURBL Contém uma URL listada na blacklist OB SURBL
+#lang pt_BR describe URIBL_OB_SURBL Contém uma URL listada na blacklist OB SURBL - REMOVED BUG 6853
lang pt_BR describe URIBL_AB_SURBL Contém uma URL listada na blacklist AB SURBL
lang pt_BR describe URIBL_JP_SURBL Contém uma URL listada na blacklist JP SURBL
lang pt_BR describe URIBL_BLACK Contém uma URL listada na blacklist URIBL
Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=1400858&r1=1400857&r2=1400858&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Mon Oct 22 12:13:44 2012
@@ -951,7 +951,7 @@ ifplugin Mail::SpamAssassin::Plugin::URI
# <gen:mutable>
score URIBL_AB_SURBL 0 4.499 0 4.499 # n=0 n=2
score URIBL_JP_SURBL 0 1.948 0 1.250 # n=0 n=2
-score URIBL_OB_SURBL 0 0.785 0 0.122 # n=0 n=2
+#score URIBL_OB_SURBL 0 0.785 0 0.122 # n=0 n=2 REMOVED BUG 6853
score URIBL_PH_SURBL 0 0.001 0 0.610 # n=0 n=2
score URIBL_RHS_DOB 0 0.276 0 1.514 # n=0 n=2
score URIBL_SBL 0 0.644 0 1.623 # n=0 n=2
Modified: spamassassin/trunk/rules/active.list
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/active.list?rev=1400858&r1=1400857&r2=1400858&view=diff
==============================================================================
--- spamassassin/trunk/rules/active.list (original)
+++ spamassassin/trunk/rules/active.list Mon Oct 22 12:13:44 2012
@@ -1028,7 +1028,7 @@ URIBL_GREY
URIBL_JP_SURBL
# tflags net
-URIBL_OB_SURBL
+#URIBL_OB_SURBL - REMOVED BUG 6853
# tflags net
URIBL_PH_SURBL
Modified: spamassassin/trunk/rulesrc/10_force_active.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/10_force_active.cf?rev=1400858&r1=1400857&r2=1400858&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/10_force_active.cf (original)
+++ spamassassin/trunk/rulesrc/10_force_active.cf Mon Oct 22 12:13:44 2012
@@ -829,7 +829,7 @@ publish URIBL_BLACK
publish URIBL_BLOCKED
publish URIBL_GREY
publish URIBL_JP_SURBL
-publish URIBL_OB_SURBL
+#publish URIBL_OB_SURBL - REMOVED BUG 6853
publish URIBL_PH_SURBL
publish URIBL_RED
publish URIBL_RHS_DOB
Modified: spamassassin/trunk/rulesrc/sandbox/jm/20_basic.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/jm/20_basic.cf?rev=1400858&r1=1400857&r2=1400858&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jm/20_basic.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jm/20_basic.cf Mon Oct 22 12:13:44 2012
@@ -335,7 +335,7 @@ describe DUH_DIKSBJ Idiot spammer screwe
# a test rule for Jeff
ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-meta URIBL_META_SURBL_ANY (URIBL_AB_SURBL || URIBL_JP_SURBL || URIBL_OB_SURBL || URIBL_PH_SURBL || URIBL_SC_SURBL || URIBL_WS_SURBL)
+meta URIBL_META_SURBL_ANY (URIBL_AB_SURBL || URIBL_JP_SURBL || URIBL_PH_SURBL || URIBL_SC_SURBL || URIBL_WS_SURBL)
tflags URIBL_META_SURBL_ANY net nopublish
endif
Modified: spamassassin/trunk/rulesrc/sandbox/mkettler/25_uribl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/mkettler/25_uribl.cf?rev=1400858&r1=1400857&r2=1400858&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/mkettler/25_uribl.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/mkettler/25_uribl.cf Mon Oct 22 12:13:44 2012
@@ -1,18 +1,18 @@
ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-meta T_SURBL_MULTI1 ((URIBL_JP_SURBL + URIBL_SC_SURBL + URIBL_AB_SURBL + URIBL_OB_SURBL + URIBL_WS_SURBL) > 1)
+meta T_SURBL_MULTI1 ((URIBL_JP_SURBL + URIBL_SC_SURBL + URIBL_AB_SURBL + URIBL_WS_SURBL) > 1)
tflags T_SURBL_MULTI1 nopublish
-meta T_SURBL_MULTI2 ((URIBL_JP_SURBL + URIBL_SC_SURBL + URIBL_AB_SURBL + URIBL_OB_SURBL + URIBL_WS_SURBL) > 2)
+meta T_SURBL_MULTI2 ((URIBL_JP_SURBL + URIBL_SC_SURBL + URIBL_AB_SURBL + URIBL_WS_SURBL) > 2)
tflags T_SURBL_MULTI2 nopublish
-meta T_SURBL_MULTI3 ((URIBL_JP_SURBL + URIBL_SC_SURBL + URIBL_AB_SURBL + URIBL_OB_SURBL + URIBL_WS_SURBL) > 3)
+meta T_SURBL_MULTI3 ((URIBL_JP_SURBL + URIBL_SC_SURBL + URIBL_AB_SURBL + URIBL_WS_SURBL) > 3)
tflags T_SURBL_MULTI3 nopublish
-meta T_SURBL_MULTI4 ((URIBL_JP_SURBL + URIBL_SC_SURBL + URIBL_AB_SURBL + URIBL_OB_SURBL + URIBL_WS_SURBL) > 4)
+meta T_SURBL_MULTI4 ((URIBL_JP_SURBL + URIBL_SC_SURBL + URIBL_AB_SURBL + URIBL_WS_SURBL) > 4)
tflags T_SURBL_MULTI4 nopublish
-meta T_URIBL_BLACK_OVERLAP (URIBL_BLACK && (URIBL_AB_SURBL || URIBL_JP_SURBL || URIBL_OB_SURBL || URIBL_WS_SURBL || URIBL_SC_SURBL))
+meta T_URIBL_BLACK_OVERLAP (URIBL_BLACK && (URIBL_AB_SURBL || URIBL_JP_SURBL || URIBL_WS_SURBL || URIBL_SC_SURBL))
tflags T_URIBL_BLACK_OVERLAP nopublish
endif # Mail::SpamAssassin::Plugin::URIDNSBL
Modified: spamassassin/trunk/rulesrc/sandbox/smf/20_smf.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/smf/20_smf.cf?rev=1400858&r1=1400857&r2=1400858&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/smf/20_smf.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/smf/20_smf.cf Mon Oct 22 12:13:44 2012
@@ -32,7 +32,7 @@ describe SMF_SPAMSIG_3 Signature seen in
score SMF_SPAMSIG_3 0.01
# URIBL meta
-meta __SMF_ANY_URIBL (URIBL_AB_SURBL || URIBL_JP_SURBL || URIBL_OB_SURBL || URIBL_PH_SURBL || URIBL_SC_SURBL || URIBL_WS_SURBL || URIBL_DBL_SPAM || URIBL_RHS_DOB || URIBL_BLACK)
+meta __SMF_ANY_URIBL (URIBL_AB_SURBL || URIBL_JP_SURBL || URIBL_PH_SURBL || URIBL_SC_SURBL || URIBL_WS_SURBL || URIBL_DBL_SPAM || URIBL_RHS_DOB || URIBL_BLACK)
# Google groups test rules
header SMF_TO_GGRPS To:addr =~ /\@googlegroups\.com$/