You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by qu...@apache.org on 2004/05/29 01:52:51 UTC
svn commit: rev 20559 - incubator/spamassassin/trunk/rules
Author: quinlan
Date: Fri May 28 16:52:51 2004
New Revision: 20559
Modified:
incubator/spamassassin/trunk/rules/20_dnsbl_tests.cf
incubator/spamassassin/trunk/rules/30_text_de.cf
incubator/spamassassin/trunk/rules/30_text_fr.cf
incubator/spamassassin/trunk/rules/30_text_nl.cf
incubator/spamassassin/trunk/rules/30_text_pl.cf
incubator/spamassassin/trunk/rules/50_scores.cf
incubator/spamassassin/trunk/rules/70_testing.cf
Log:
switch NJABL dynamic test to use new zone
rename RCVD_IN_NJABL_DIALUP to RCVD_IN_NJABL_DUL to match other rules
(maybe they should all be named *DYN instead, though)
Modified: incubator/spamassassin/trunk/rules/20_dnsbl_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_dnsbl_tests.cf (original)
+++ incubator/spamassassin/trunk/rules/20_dnsbl_tests.cf Fri May 28 16:52:51 2004
@@ -38,17 +38,17 @@
# NJABL
# URL: http://www.dnsbl.njabl.org/
-header __RCVD_IN_NJABL eval:check_rbl('njabl', 'dnsbl.njabl.org.')
-describe __RCVD_IN_NJABL Received via a relay in dnsbl.njabl.org
+header __RCVD_IN_NJABL eval:check_rbl('njabl', 'combined.njabl.org.')
+describe __RCVD_IN_NJABL Received via a relay in combined.njabl.org
tflags __RCVD_IN_NJABL net
header RCVD_IN_NJABL_RELAY eval:check_rbl_sub('njabl', '127.0.0.2')
describe RCVD_IN_NJABL_RELAY NJABL: sender is confirmed open relay
tflags RCVD_IN_NJABL_RELAY net
-header RCVD_IN_NJABL_DIALUP eval:check_rbl('njabl-notfirsthop', 'dnsbl.njabl.org.', '127.0.0.3')
-describe RCVD_IN_NJABL_DIALUP NJABL: dialup sender did non-local SMTP
-tflags RCVD_IN_NJABL_DIALUP net
+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
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
Modified: incubator/spamassassin/trunk/rules/30_text_de.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/30_text_de.cf (original)
+++ incubator/spamassassin/trunk/rules/30_text_de.cf Fri May 28 16:52:51 2004
@@ -91,7 +91,7 @@
lang de describe BLANK_LINES_80_90 Nachrichtentext besteht zu 80-90% aus Leerzeilen
lang de describe BLANK_LINES_90_100 Nachrichtentext besteht zu 90-100% aus Leerzeilen
lang de describe RCVD_IN_NJABL_RELAY NJABL: Senderechner als "Open Relay" best�tigt
-lang de describe RCVD_IN_NJABL_DIALUP NJABL: Senderechner nur tempor�r mit Internet verbunden
+lang de describe RCVD_IN_NJABL_DUL NJABL: Senderechner nur tempor�r mit Internet verbunden
lang de describe RCVD_IN_NJABL_SPAM NJABL: Senderechner ist best�tigter Spam-Versender
lang de describe RCVD_IN_NJABL_MULTI NJABL: mehrfach �ber "open relay"-Rechner weitergeleitet
lang de describe RCVD_IN_NJABL_CGI NJABL: gesendet �ber ein veraltetes und ungesichertes Webformular
Modified: incubator/spamassassin/trunk/rules/30_text_fr.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/30_text_fr.cf (original)
+++ incubator/spamassassin/trunk/rules/30_text_fr.cf Fri May 28 16:52:51 2004
@@ -539,7 +539,7 @@
lang fr describe RCVD_IN_MAPS_RBL Relais list� dans RBL, http://www.mail-abuse.org/rbl/
lang fr describe RCVD_IN_MAPS_RSS Relais list� dans RSS, http://www.mail-abuse.org/rss/
lang fr describe RCVD_IN_NJABL_CGI NJABL: Emis par un script formmail vuln�rable
-lang fr describe RCVD_IN_NJABL_DIALUP NJABL: Envoy� depuis une adresse IP dynamique
+lang fr describe RCVD_IN_NJABL_DUL NJABL: Envoy� depuis une adresse IP dynamique
lang fr describe RCVD_IN_NJABL_MULTI NJABL: Envoy� par un relais ouvert multi-�tages
lang fr describe RCVD_IN_NJABL_PROXY NJABL: Envoy� depuis un proxy ouvert
lang fr describe RCVD_IN_NJABL_RELAY NJABL: Envoy� par un relais ouvert confirm�
Modified: incubator/spamassassin/trunk/rules/30_text_nl.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/30_text_nl.cf (original)
+++ incubator/spamassassin/trunk/rules/30_text_nl.cf Fri May 28 16:52:51 2004
@@ -65,7 +65,7 @@
lang nl describe HABEAS_SWE Bevat een Habeas watermerk (http://www.habeas.com/)
lang nl describe __RCVD_IN_NJABL Ontvangen via een relay die gevonden is in dnsbl.njabl.org
lang nl describe RCVD_IN_NJABL_RELAY NJABL: verzender is een bevestigde open relay
-lang nl describe RCVD_IN_NJABL_DIALUP NJABL: inbellende verzender verstuurde nier via local SMTP
+lang nl describe RCVD_IN_NJABL_DUL NJABL: inbellende verzender verstuurde nier via local SMTP
lang nl describe RCVD_IN_NJABL_SPAM NJABL: is een bevestigde SPAM bron
lang nl describe RCVD_IN_NJABL_MULTI NJABL: verzonden via multi-stage open relay
lang nl describe RCVD_IN_NJABL_CGI NJABL: verzender is een open formmail
Modified: incubator/spamassassin/trunk/rules/30_text_pl.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/30_text_pl.cf (original)
+++ incubator/spamassassin/trunk/rules/30_text_pl.cf Fri May 28 16:52:51 2004
@@ -552,7 +552,7 @@
lang pl describe RCVD_IN_MAPS_RBL "open relay" wed�ug RBL, http://www.mail-abuse.org/rbl/
lang pl describe RCVD_IN_MAPS_RSS "open relay" wed�ug RSS, http://www.mail-abuse.org/rss/
lang pl describe RCVD_IN_NJABL_CGI NJABL: nadawca ma niezabezpieczone formularze na WWW
-lang pl describe RCVD_IN_NJABL_DIALUP NJABL: nadawca dial-up u�ywa nie lokalnego SMTP
+lang pl describe RCVD_IN_NJABL_DUL NJABL: nadawca dial-up u�ywa nie lokalnego SMTP
lang pl describe RCVD_IN_NJABL_MULTI NJABL: wys�ano przez wielostopniowy Open Relay
lang pl describe RCVD_IN_NJABL_PROXY NJABL: nadawca to Otwarte Proxy
lang pl describe RCVD_IN_NJABL_RELAY NJABL: nadawca to potwierdzony Open Relay
Modified: incubator/spamassassin/trunk/rules/50_scores.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/50_scores.cf (original)
+++ incubator/spamassassin/trunk/rules/50_scores.cf Fri May 28 16:52:51 2004
@@ -703,7 +703,7 @@
score RCVD_IN_BSP_TRUSTED 0 -4.3 0 -4.3
score RCVD_IN_DSBL 0 1.101 0 0.706
score RCVD_IN_NJABL_CGI 0 0.1 0.1
-score RCVD_IN_NJABL_DIALUP 0 0.625 0 3.636
+score RCVD_IN_NJABL_DUL 0 0.625 0 3.636
score RCVD_IN_NJABL_MULTI 0 0.101 0 0.101
score RCVD_IN_NJABL_PROXY 0 1.201 0 0.6
score RCVD_IN_NJABL_RELAY 0 1.414 0 0.101
Modified: incubator/spamassassin/trunk/rules/70_testing.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/70_testing.cf (original)
+++ incubator/spamassassin/trunk/rules/70_testing.cf Fri May 28 16:52:51 2004
@@ -262,17 +262,17 @@
# technique on most blacklists since it helps so much with XBL
# (just prefixed set name with 'x' and added T_ to start of test name)
-header __T_RCVD_IN_NJABL eval:check_rbl('xnjabl-firsttrusted', 'dnsbl.njabl.org.')
-describe __T_RCVD_IN_NJABL Received via a relay in dnsbl.njabl.org
+header __T_RCVD_IN_NJABL eval:check_rbl('xnjabl-firsttrusted', 'combined.njabl.org.')
+describe __T_RCVD_IN_NJABL Received via a relay in combined.njabl.org
tflags __T_RCVD_IN_NJABL net
header T_RCVD_IN_NJABL_RELAY eval:check_rbl_sub('xnjabl-firsttrusted', '127.0.0.2')
describe T_RCVD_IN_NJABL_RELAY NJABL: sender is confirmed open relay
tflags T_RCVD_IN_NJABL_RELAY net
-header T_RCVD_IN_NJABL_DIALUP eval:check_rbl('xnjabl-firsttrusted', 'dnsbl.njabl.org.', '127.0.0.3')
-describe T_RCVD_IN_NJABL_DIALUP NJABL: dialup sender did non-local SMTP
-tflags T_RCVD_IN_NJABL_DIALUP net
+header T_RCVD_IN_NJABL_DUL eval:check_rbl('xnjabl-firsttrusted', 'combined.njabl.org.', '127.0.0.3')
+describe T_RCVD_IN_NJABL_DUL NJABL: dialup sender did non-local SMTP
+tflags T_RCVD_IN_NJABL_DUL net
header T_RCVD_IN_NJABL_SPAM eval:check_rbl_sub('xnjabl-firsttrusted', '127.0.0.4')
describe T_RCVD_IN_NJABL_SPAM NJABL: sender is confirmed spam source