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/02/08 15:27:56 UTC
svn commit: r504908 - in /spamassassin: rules/trunk/sandbox/jm/20_basic.cf
trunk/rules/20_dnsbl_tests.cf
Author: jm
Date: Thu Feb 8 06:27:55 2007
New Revision: 504908
URL: http://svn.apache.org/viewvc?view=rev&rev=504908
Log:
bug 5285: reuse NJABL_DUL Dynablock hits as input for RCVD_IN_PBL during the perceptron run
Modified:
spamassassin/rules/trunk/sandbox/jm/20_basic.cf
spamassassin/trunk/rules/20_dnsbl_tests.cf
Modified: spamassassin/rules/trunk/sandbox/jm/20_basic.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/jm/20_basic.cf?view=diff&rev=504908&r1=504907&r2=504908
==============================================================================
--- spamassassin/rules/trunk/sandbox/jm/20_basic.cf (original)
+++ spamassassin/rules/trunk/sandbox/jm/20_basic.cf Thu Feb 8 06:27:55 2007
@@ -240,15 +240,6 @@
tflags URIBL_PBL net nopublish
endif
-# I'm having second thoughts about _not_ just reusing RCVD_IN_NJABL_DUL hits
-# for RCVD_IN_PBL, as Michael suggested. Let's add a test DNSBL rule
-# for NJABL so we can compare/switch after mass-checks, based on results...
-# this is identical to RCVD_IN_PBL, but also reuses RCVD_IN_NJABL_DUL.
-header T_RCVD_IN_PBL_WITH_NJABL_DUL eval:check_rbl('zen-lastexternal', 'zen.spamhaus.org.', '127.0.0.1[01]')
-describe T_RCVD_IN_PBL_WITH_NJABL_DUL Received via a relay in Spamhaus PBL
-tflags T_RCVD_IN_PBL_WITH_NJABL_DUL net
-#reuse T_RCVD_IN_PBL_WITH_NJABL_DUL RCVD_IN_PBL RCVD_IN_NJABL_DUL
-
# http://blog.iloaf.com/2007/01/25/fscked-domain-rule/
# thanks Chris!
uri __URI_C_VAL /^https?:[\/\\]*[0-9a-z\#\.-]{5,99}($|\/|\#|\?|\;\|:)/i
Modified: spamassassin/trunk/rules/20_dnsbl_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_dnsbl_tests.cf?view=diff&rev=504908&r1=504907&r2=504908
==============================================================================
--- spamassassin/trunk/rules/20_dnsbl_tests.cf (original)
+++ spamassassin/trunk/rules/20_dnsbl_tests.cf Thu Feb 8 06:27:55 2007
@@ -157,7 +157,7 @@
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
+#reuse RCVD_IN_PBL T_RCVD_IN_PBL_WITH_NJABL_DUL RCVD_IN_NJABL_DUL
# ---------------------------------------------------------------------------
# RFC-Ignorant blacklists (both name and IP based)