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 2015/12/21 20:33:05 UTC
svn commit: r1721241 - in /spamassassin/trunk/rules: 25_uribl.cf
30_text_de.cf 30_text_pt_br.cf 50_scores.cf
Author: kmcgrail
Date: Mon Dec 21 19:33:05 2015
New Revision: 1721241
URL: http://svn.apache.org/viewvc?rev=1721241&view=rev
Log:
Change #1 from bug 7279 for SURBL list changes for trunk
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
Modified: spamassassin/trunk/rules/25_uribl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/25_uribl.cf?rev=1721241&r1=1721240&r2=1721241&view=diff
==============================================================================
--- spamassassin/trunk/rules/25_uribl.cf (original)
+++ spamassassin/trunk/rules/25_uribl.cf Mon Dec 21 19:33:05 2015
@@ -111,11 +111,12 @@ endif
###########################################################################
## SURBL
-urirhssub URIBL_SC_SURBL multi.surbl.org. A 2
-body URIBL_SC_SURBL eval:check_uridnsbl('URIBL_SC_SURBL')
-describe URIBL_SC_SURBL Contains an URL listed in the SC SURBL blocklist
-tflags URIBL_SC_SURBL net
-reuse URIBL_SC_SURBL
+#MERGED INTO BIT 64 per bug 7279
+#urirhssub URIBL_SC_SURBL multi.surbl.org. A 2
+#body URIBL_SC_SURBL eval:check_uridnsbl('URIBL_SC_SURBL')
+#describe URIBL_SC_SURBL Contains an URL listed in the SC SURBL blocklist
+#tflags URIBL_SC_SURBL net
+#reuse URIBL_SC_SURBL
urirhssub URIBL_WS_SURBL multi.surbl.org. A 4
body URIBL_WS_SURBL eval:check_uridnsbl('URIBL_WS_SURBL')
@@ -135,17 +136,19 @@ describe URIBL_MW_SURBL Contains
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')
-describe URIBL_AB_SURBL Contains an URL listed in the AB SURBL blocklist
-tflags URIBL_AB_SURBL net
-reuse URIBL_AB_SURBL
-
-urirhssub URIBL_JP_SURBL multi.surbl.org. A 64
-body URIBL_JP_SURBL eval:check_uridnsbl('URIBL_JP_SURBL')
-describe URIBL_JP_SURBL Contains an URL listed in the JP SURBL blocklist
-tflags URIBL_JP_SURBL net
-reuse URIBL_JP_SURBL
+#MERGED INTO BIT 64 per bug 7279
+#urirhssub URIBL_AB_SURBL multi.surbl.org. A 32
+#body URIBL_AB_SURBL eval:check_uridnsbl('URIBL_AB_SURBL')
+#describe URIBL_AB_SURBL Contains an URL listed in the AB SURBL blocklist
+#tflags URIBL_AB_SURBL net
+#reuse URIBL_AB_SURBL
+
+#JP MOVED INTO ABUSE AS WELL AND BIT REUSED per bug 7279
+urirhssub URIBL_ABUSE_SURBL multi.surbl.org. A 64
+body URIBL_ABUSE_SURBL eval:check_uridnsbl('URIBL_ABUSE_SURBL')
+describe URIBL_ABUSE_SURBL Contains an URL listed in the ABUSE SURBL blocklist
+tflags URIBL_ABUSE_SURBL net
+reuse URIBL_ABUSE_SURBL
#SURBL BLOCK RULES - Bit 1 means your DNS has been blocked and this rule should be triggered to notify you.
urirhssub SURBL_BLOCKED multi.surbl.org. A 1
Modified: spamassassin/trunk/rules/30_text_de.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/30_text_de.cf?rev=1721241&r1=1721240&r2=1721241&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_de.cf (original)
+++ spamassassin/trunk/rules/30_text_de.cf Mon Dec 21 19:33:05 2015
@@ -359,12 +359,12 @@ endif
ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
lang de describe URIBL_SBL Enthält URL in SBL-Liste (http://www.spamhaus.org/sbl/)
-lang de describe URIBL_SC_SURBL Enthält URL in SC-Liste (www.surbl.org)
+#lang de describe URIBL_SC_SURBL Enthält URL in SC-Liste (www.surbl.org) - removed bug 7279
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) - 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)
+#lang de describe URIBL_AB_SURBL Enthält URL in AB-Liste (www.surbl.org) - removed bug 7279
+lang de describe URIBL_ABUSE_SURBL Enthält URL in ABUSE-Liste (www.surbl.org) - changed from JP to ABUSE bug 7279
endif
ifplugin Mail::SpamAssassin::Plugin::AWL
Modified: spamassassin/trunk/rules/30_text_pt_br.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/30_text_pt_br.cf?rev=1721241&r1=1721240&r2=1721241&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_pt_br.cf (original)
+++ spamassassin/trunk/rules/30_text_pt_br.cf Mon Dec 21 19:33:05 2015
@@ -598,12 +598,13 @@ endif
lang pt_BR describe URIBL_SBL Contém uma URL listada na blacklist SBL
lang pt_BR describe URIBL_DBL_SPAM Contém uma URL listada na blacklist DBL blocklist
lang pt_BR describe URIBL_DBL_ERROR Erro: Consultou a DBL por um IP
-lang pt_BR describe URIBL_SC_SURBL Contém uma URL listada na blacklist SC SURBL
+#lang pt_BR describe URIBL_SC_SURBL Contém uma URL listada na blacklist SC SURBL - removed bug 7279
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 - 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_AB_SURBL Contém uma URL listada na blacklist AB SURBL - removed bug 7279
+#Changed from JP to ABUSE per bug 7279
+lang pt_BR describe URIBL_ABUSE_SURBL Contém uma URL listada na blacklist ABUSE SURBL
lang pt_BR describe URIBL_BLACK Contém uma URL listada na blacklist URIBL
lang pt_BR describe URIBL_GREY Contém uma URL listada na greylist URIBL
lang pt_BR describe URIBL_RED Contém uma URL listada na redlist URIBL
Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=1721241&r1=1721240&r2=1721241&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Mon Dec 21 19:33:05 2015
@@ -786,13 +786,14 @@ endif # Mail::SpamAssassin::Plugin::SPF
# URIDNSBL
ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
# <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_AB_SURBL 0 4.499 0 4.499 # n=0 n=2 - removed bug 7279
+#Changed below from JP to Abuse - bug 7279
+score URIBL_ABUSE_SURBL 0 1.948 0 1.250 # n=0 n=2
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
score URIBL_SBL_A 0 0.1 0 0.1
-score URIBL_SC_SURBL 0 0.001 0 0.568 # n=0 n=2
+#score URIBL_SC_SURBL 0 0.001 0 0.568 # n=0 n=2 - removed bug 7279
score URIBL_WS_SURBL 0 1.659 0 1.608 # n=0 n=2
score URIBL_MW_SURBL 0 1.263 0 1.263
score URIBL_BLACK 0 1.7 0 1.7 # n=0 n=2