You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2006/12/04 14:03:51 UTC
svn commit: r482161 - in /spamassassin: rules/trunk/sandbox/jm/20_zen.cf
trunk/rules/20_dnsbl_tests.cf
Author: jm
Date: Mon Dec 4 05:03:48 2006
New Revision: 482161
URL: http://svn.apache.org/viewvc?view=rev&rev=482161
Log:
bug 5187: replace use of sbl-xbl.spamhaus.org with new zen.spamhaus.org zone; leave RCVD_IN_PBL in sandbox as it's still unreleased
Modified:
spamassassin/rules/trunk/sandbox/jm/20_zen.cf
spamassassin/trunk/rules/20_dnsbl_tests.cf
Modified: spamassassin/rules/trunk/sandbox/jm/20_zen.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/jm/20_zen.cf?view=diff&rev=482161&r1=482160&r2=482161
==============================================================================
--- spamassassin/rules/trunk/sandbox/jm/20_zen.cf (original)
+++ spamassassin/rules/trunk/sandbox/jm/20_zen.cf Mon Dec 4 05:03:48 2006
@@ -1,20 +1,4 @@
-header __RCVD_IN_ZEN eval:check_rbl('zen', 'zen.spamhaus.org.')
-describe __RCVD_IN_ZEN Received via a relay in Spamhaus Zen
-tflags __RCVD_IN_ZEN net
-
-# SBL is the Spamhaus Block List: http://www.spamhaus.org/sbl/
-header RCVD_IN_ZENSBL eval:check_rbl_sub('zen', '127.0.0.2')
-describe RCVD_IN_ZENSBL Received via a relay in Spamhaus SBL
-tflags RCVD_IN_ZENSBL net
-#reuse RCVD_IN_ZENSBL
-
-# XBL is the Exploits Block List: http://www.spamhaus.org/xbl/
-header RCVD_IN_ZENXBL eval:check_rbl('zen-notfirsthop', 'zen.spamhaus.org.', '127.0.0.[45678]')
-describe RCVD_IN_ZENXBL Received via a relay in Spamhaus XBL
-tflags RCVD_IN_ZENXBL net
-#reuse RCVD_IN_ZENXBL
-
# PBL is the Policy Block List: http://www.spamhaus.org/pbl/
header RCVD_IN_PBL eval:check_rbl('zen-notfirsthop', 'zen.spamhaus.org.', '127.0.0.1[01]')
describe RCVD_IN_PBL Received via a relay in Spamhaus PBL
Modified: spamassassin/trunk/rules/20_dnsbl_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_dnsbl_tests.cf?view=diff&rev=482161&r1=482160&r2=482161
==============================================================================
--- spamassassin/trunk/rules/20_dnsbl_tests.cf (original)
+++ spamassassin/trunk/rules/20_dnsbl_tests.cf Mon Dec 4 05:03:48 2006
@@ -135,27 +135,25 @@
#reuse RCVD_IN_SORBS_DUL
# ---------------------------------------------------------------------------
-# Spamhaus SBL+XBL
+# Spamhaus SBL+XBL, now called Zen
#
# Spamhaus XBL contains both the Abuseat CBL (cbl.abuseat.org) and Blitzed
# OPM (opm.blitzed.org) lists so it's not necessary to query those as well.
-# TODO: replace with ZEN from rulesrc/sandbox/jm/20_zen.cf. For now,
-# allow both to run for 1 weekend to verify sanity of results...
-header __RCVD_IN_SBL_XBL eval:check_rbl('sblxbl', 'sbl-xbl.spamhaus.org.')
-describe __RCVD_IN_SBL_XBL Received via a relay in Spamhaus SBL+XBL
-tflags __RCVD_IN_SBL_XBL net
+header __RCVD_IN_ZEN eval:check_rbl('zen', 'zen.spamhaus.org.')
+describe __RCVD_IN_ZEN Received via a relay in Spamhaus Zen
+tflags __RCVD_IN_ZEN net
# SBL is the Spamhaus Block List: http://www.spamhaus.org/sbl/
-header RCVD_IN_SBL eval:check_rbl_sub('sblxbl', '127.0.0.2')
-describe RCVD_IN_SBL Received via a relay in Spamhaus SBL
-tflags RCVD_IN_SBL net
+header RCVD_IN_SBL eval:check_rbl_sub('zen', '127.0.0.2')
+describe RCVD_IN_SBL Received via a relay in Spamhaus SBL
+tflags RCVD_IN_SBL net
#reuse RCVD_IN_SBL
# XBL is the Exploits Block List: http://www.spamhaus.org/xbl/
-header RCVD_IN_XBL eval:check_rbl('sblxbl-notfirsthop', 'sbl-xbl.spamhaus.org.', '127.0.0.[456]')
-describe RCVD_IN_XBL Received via a relay in Spamhaus XBL
-tflags RCVD_IN_XBL net
+header RCVD_IN_XBL eval:check_rbl('zen-notfirsthop', 'zen.spamhaus.org.', '127.0.0.[45678]')
+describe RCVD_IN_XBL Received via a relay in Spamhaus XBL
+tflags RCVD_IN_XBL net
#reuse RCVD_IN_XBL
# ---------------------------------------------------------------------------