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 2007/01/17 16:05:24 UTC
svn commit: r497038 - in /spamassassin: rules/trunk/sandbox/jm/20_zen.cf
trunk/rules/20_dnsbl_tests.cf
Author: jm
Date: Wed Jan 17 07:05:23 2007
New Revision: 497038
URL: http://svn.apache.org/viewvc?view=rev&rev=497038
Log:
bug 5187: move RCVD_IN_PBL to main ruleset now that it's been released; bug 5285: retire RCVD_IN_NJABL_DUL in favour of RCVD_IN_PBL
Removed:
spamassassin/rules/trunk/sandbox/jm/20_zen.cf
Modified:
spamassassin/trunk/rules/20_dnsbl_tests.cf
Modified: spamassassin/trunk/rules/20_dnsbl_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_dnsbl_tests.cf?view=diff&rev=497038&r1=497037&r2=497038
==============================================================================
--- spamassassin/trunk/rules/20_dnsbl_tests.cf (original)
+++ spamassassin/trunk/rules/20_dnsbl_tests.cf Wed Jan 17 07:05:23 2007
@@ -52,10 +52,7 @@
tflags RCVD_IN_NJABL_RELAY net
#reuse RCVD_IN_NJABL_RELAY
-header RCVD_IN_NJABL_DUL eval:check_rbl('njabl-notfirsthop', 'combined.njabl.org.', '127.0.0.3')
-describe RCVD_IN_NJABL_DUL NJABL: dialup sender did non-local SMTP
-tflags RCVD_IN_NJABL_DUL net
-#reuse RCVD_IN_NJABL_DUL
+# NJABL DUL: obsoleted by PBL (bug 5187)
header RCVD_IN_NJABL_SPAM eval:check_rbl_sub('njabl', '127.0.0.4')
describe RCVD_IN_NJABL_SPAM NJABL: sender is confirmed spam source
@@ -155,6 +152,12 @@
describe RCVD_IN_XBL Received via a relay in Spamhaus XBL
tflags RCVD_IN_XBL net
#reuse RCVD_IN_XBL
+
+# PBL is the Policy Block List: http://www.spamhaus.org/pbl/
+header RCVD_IN_PBL eval:check_rbl('zen-lastexternal', 'zen.spamhaus.org.', '127.0.0.1[01]')
+describe RCVD_IN_PBL Received via a relay in Spamhaus PBL
+tflags RCVD_IN_PBL net
+#reuse RCVD_IN_PBL
# ---------------------------------------------------------------------------
# RFC-Ignorant blacklists (both name and IP based)