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 2018/11/04 11:20:13 UTC
svn commit: r1845724 - in /spamassassin/trunk/rules: 25_uribl.cf 50_scores.cf
Author: hege
Date: Sun Nov 4 11:20:13 2018
New Revision: 1845724
URL: http://svn.apache.org/viewvc?rev=1845724&view=rev
Log:
Change URIBL_SBL_A to zen, add URIBL_CSS tests
Modified:
spamassassin/trunk/rules/25_uribl.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=1845724&r1=1845723&r2=1845724&view=diff
==============================================================================
--- spamassassin/trunk/rules/25_uribl.cf (original)
+++ spamassassin/trunk/rules/25_uribl.cf Sun Nov 4 11:20:13 2018
@@ -39,15 +39,25 @@ describe URIBL_SBL Contain
tflags URIBL_SBL net
reuse URIBL_SBL
-if (version >= 3.004000)
- ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
+uridnssub URIBL_CSS zen.spamhaus.org. A 127.0.0.3
+body URIBL_CSS eval:check_uridnsbl('URIBL_CSS')
+describe URIBL_CSS Contains an URL's NS IP listed in the Spamhaus CSS blocklist
+tflags URIBL_CSS net
+reuse URIBL_CSS
- uridnsbl URIBL_SBL_A sbl.spamhaus.org. A
- body URIBL_SBL_A eval:check_uridnsbl('URIBL_SBL_A')
- describe URIBL_SBL_A Contains URL's A record listed in the Spamhaus SBL blocklist
- tflags URIBL_SBL_A net a
- reuse URIBL_SBL_A
- endif
+# Only works correctly from 3.4.3, earlier versions basically run as URIBL_SBL duplicate
+if can(Mail::SpamAssassin::Plugin::URIDNSBL::has_uridnsbl_for_a)
+ uridnssub URIBL_SBL_A zen.spamhaus.org. A 127.0.0.2
+ body URIBL_SBL_A eval:check_uridnsbl('URIBL_SBL_A')
+ describe URIBL_SBL_A Contains URL's A record listed in the Spamhaus SBL blocklist
+ tflags URIBL_SBL_A net a
+ reuse URIBL_SBL_A
+
+ uridnssub URIBL_CSS_A zen.spamhaus.org. A 127.0.0.3
+ body URIBL_CSS_A eval:check_uridnsbl('URIBL_CSS_A')
+ describe URIBL_CSS_A Contains URL's A record listed in the Spamhaus CSS blocklist
+ tflags URIBL_CSS_A net a
+ reuse URIBL_CSS_A
endif
# DBL, http://www.spamhaus.org/dbl/
Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=1845724&r1=1845723&r2=1845724&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Sun Nov 4 11:20:13 2018
@@ -799,7 +799,9 @@ score URIBL_ABUSE_SURBL 0 1.948 0 1.250
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_CSS 0 0.1 0 0.1
score URIBL_SBL_A 0 0.1 0 0.1
+score URIBL_CSS_A 0 0.1 0 0.1
#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