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 2009/03/14 22:52:56 UTC
svn commit: r754535 - in /spamassassin/trunk/rules: 20_dnsbl_tests.cf
30_text_de.cf 30_text_fr.cf 30_text_nl.cf 30_text_pl.cf 50_scores.cf
active.list
Author: jm
Date: Sat Mar 14 21:52:56 2009
New Revision: 754535
URL: http://svn.apache.org/viewvc?rev=754535&view=rev
Log:
bug 6079: remove RCVD_IN_BSP_OTHER & HABEAS_CHECKED, as recommended by JD Falk
Modified:
spamassassin/trunk/rules/20_dnsbl_tests.cf
spamassassin/trunk/rules/30_text_de.cf
spamassassin/trunk/rules/30_text_fr.cf
spamassassin/trunk/rules/30_text_nl.cf
spamassassin/trunk/rules/30_text_pl.cf
spamassassin/trunk/rules/50_scores.cf
spamassassin/trunk/rules/active.list
Modified: spamassassin/trunk/rules/20_dnsbl_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_dnsbl_tests.cf?rev=754535&r1=754534&r2=754535&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_dnsbl_tests.cf (original)
+++ spamassassin/trunk/rules/20_dnsbl_tests.cf Sat Mar 14 21:52:56 2009
@@ -242,11 +242,6 @@
tflags RCVD_IN_BSP_TRUSTED net nice
reuse RCVD_IN_BSP_TRUSTED
-header RCVD_IN_BSP_OTHER eval:check_rbl_txt('bsp-untrusted', 'sa-other.bondedsender.org.', '(?i:bonded)')
-describe RCVD_IN_BSP_OTHER Sender is in Sender Score Certified (other relay)
-tflags RCVD_IN_BSP_OTHER net nice
-reuse RCVD_IN_BSP_OTHER
-
# confirmed-opt-in list; see bug 5476
header RCVD_IN_SSC_TRUSTED_COI eval:check_rbl('ssc-firsttrusted', 'plus.bondedsender.org.')
describe RCVD_IN_SSC_TRUSTED_COI Sender is in Sender Score Certified (confirmed opt-in)
@@ -282,10 +277,6 @@
describe HABEAS_ACCREDITED_SOI Habeas Accredited Opt-In or Better
tflags HABEAS_ACCREDITED_SOI net nice
-header HABEAS_CHECKED eval:check_rbl_sub('habeas-firsttrusted', '127\.\d+\.\d+\.[6789]\d')
-describe HABEAS_CHECKED Habeas Checked
-tflags HABEAS_CHECKED net nice
-
# Habeas Accredited Senders, with check for "Accreditor Assertion"
# Same Habeas whitelist checks as above, but performed only if the Sender
# has specified Habeas as their accreditor in either the EnvelopeFrom or
@@ -300,8 +291,4 @@
# describe HABEAS_ACCREDITED_SOI Habeas Accredited Opt-In or Better
# tflags HABEAS_ACCREDITED_SOI net nice
#
-# header HABEAS_CHECKED eval:check_rbl_accreditor('accredit-firsttrusted', 'sa-accredit.habeas.com.', '127\.\d+\.\d+\.[6789]\d', 'habeas')
-# describe HABEAS_CHECKED Habeas Checked
-# tflags HABEAS_CHECKED net nice
-
endif
Modified: spamassassin/trunk/rules/30_text_de.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/30_text_de.cf?rev=754535&r1=754534&r2=754535&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_de.cf (original)
+++ spamassassin/trunk/rules/30_text_de.cf Sat Mar 14 21:52:56 2009
@@ -98,7 +98,6 @@
lang de describe DNS_FROM_RFC_BOGUSMX Absender in bogusmx-Liste von www.rfc-ignorant.org
lang de describe DNS_FROM_AHBL_RHSBL Absenderadresse in Liste von dnsbl.ahbl.org
lang de describe RCVD_IN_BSP_TRUSTED Senderechner in Liste von http://www.bondedsender.org/
-lang de describe RCVD_IN_BSP_OTHER Senderechner in Liste von http://www.bondedsender.org/
lang de describe RCVD_IN_BL_SPAMCOP_NET Transportiert via Rechner in Liste von www.spamcop.net
lang de describe RCVD_IN_MAPS_RBL Transportiert via Rechner in Liste von http://www.mail-abuse.org/rbl/
lang de describe RCVD_IN_MAPS_DUL Transportiert via Rechner in Liste von http://www.mail-abuse.org/dul/
Modified: spamassassin/trunk/rules/30_text_fr.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/30_text_fr.cf?rev=754535&r1=754534&r2=754535&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_fr.cf (original)
+++ spamassassin/trunk/rules/30_text_fr.cf Sat Mar 14 21:52:56 2009
@@ -211,7 +211,6 @@
lang fr describe RCVD_AM_PM En-tête Received: falsifié (AM/PM)
lang fr describe RCVD_FAKE_HELO_DOTCOM En-tête Received contient nom d'hôte falsifié dans le HELO
lang fr describe RCVD_IN_BL_SPAMCOP_NET Relais listé dans http://spamcop.net/bl.shtml
-lang fr describe RCVD_IN_BSP_OTHER Relais participant au Bonded Sender Program (autre relais)
lang fr describe RCVD_IN_BSP_TRUSTED Relais participant au Bonded Sender Program (relais connu)
lang fr describe RCVD_IN_SORBS_DUL Envoyé directement depuis une adresse IP dynamique
lang fr describe RCVD_IN_MAPS_DUL Relais listé dans DUL, http://www.mail-abuse.org/dul/
Modified: spamassassin/trunk/rules/30_text_nl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/30_text_nl.cf?rev=754535&r1=754534&r2=754535&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_nl.cf (original)
+++ spamassassin/trunk/rules/30_text_nl.cf Sat Mar 14 21:52:56 2009
@@ -82,7 +82,6 @@
lang nl describe RCVD_IN_SBL Ontvangen via een relay die gevonden is in Spamhaus SBL
lang nl describe RCVD_IN_XBL Ontvangen via een relay die gevonden is in Spamhaus XBL
lang nl describe RCVD_IN_BSP_TRUSTED Verzender is opgenomen in het Bonded Sender Program (trusted relay)
-lang nl describe RCVD_IN_BSP_OTHER Verzender is opgenomen in het Bonded Sender Program (other relay)
lang nl describe RCVD_IN_BL_SPAMCOP_NET Ontvangen via een relay die gevonden is in bl.spamcop.net
lang nl describe RCVD_IN_MAPS_RBL Relay in RBL, http://www.mail-abuse.org/rbl/
lang nl describe RCVD_IN_MAPS_DUL Relay in DUL, http://www.mail-abuse.org/dul/
Modified: spamassassin/trunk/rules/30_text_pl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/30_text_pl.cf?rev=754535&r1=754534&r2=754535&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_pl.cf (original)
+++ spamassassin/trunk/rules/30_text_pl.cf Sat Mar 14 21:52:56 2009
@@ -194,7 +194,6 @@
lang pl describe RCVD_AM_PM Sfa³szowane nag³ówki Received (AM/PM)
lang pl describe RCVD_FAKE_HELO_DOTCOM Nag³ówek Received zawiera sfa³szowan± nazwê hosta HELO
lang pl describe RCVD_IN_BL_SPAMCOP_NET Odebrane od systemu klasy RELAY w/g: bl.spamcop.net
-lang pl describe RCVD_IN_BSP_OTHER Nadawca bierze udzia³ w 'Bonded Sender Program' (inny relay)
lang pl describe RCVD_IN_BSP_TRUSTED Nadawca bierze udzia³ w 'Bonded Sender Program' (zaufany relay)
lang pl describe RCVD_IN_MAPS_DUL "open relay" wed³ug DUL, http://www.mail-abuse.org/dul/
lang pl describe RCVD_IN_MAPS_NML "open relay" wed³ug NML, http://www.mail-abuse.org/nml/
Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=754535&r1=754534&r2=754535&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Sat Mar 14 21:52:56 2009
@@ -679,14 +679,12 @@
# http://www.senderscorecertified.com/ . See bug 5476.
# note: RCVD_IN_SSC_TRUSTED_COI-listed IPs are also in RCVD_IN_BSP_TRUSTED,
# hence score is additive (-4.3 + -3.7 = -8.0)
-score RCVD_IN_BSP_OTHER 0 -0.1 0 -0.1
score RCVD_IN_BSP_TRUSTED 0 -4.3 0 -4.3
score RCVD_IN_SSC_TRUSTED_COI 0 -3.7 0 -3.7
# Habeas: http://www.habeas.com/
score HABEAS_ACCREDITED_COI 0 -8.0 0 -8.0
score HABEAS_ACCREDITED_SOI 0 -4.3 0 -4.3
-score HABEAS_CHECKED 0 -0.2 0 -0.2
# DNSWL
score RCVD_IN_DNSWL_LOW 0 -1 0 -1
Modified: spamassassin/trunk/rules/active.list
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/active.list?rev=754535&r1=754534&r2=754535&view=diff
==============================================================================
--- spamassassin/trunk/rules/active.list (original)
+++ spamassassin/trunk/rules/active.list Sat Mar 14 21:52:56 2009
@@ -130,9 +130,6 @@
# tflags net
HABEAS_ACCREDITED_SOI
-# tflags net
-HABEAS_CHECKED
-
# tflags userconf
HASHCASH_20
@@ -266,9 +263,6 @@
RCVD_IN_BRBL_LASTEXT
# tflags net
-RCVD_IN_BSP_OTHER
-
-# tflags net
RCVD_IN_BSP_TRUSTED
# tflags net