I don't think we should add PBL to 3.1 -- (a) there's no data there
yet, and (b) it'll take a rescore run to figure out appropriate
scoring.

--j.

[EMAIL PROTECTED] writes:
> Author: felicity
> Date: Mon Dec 25 17:40:12 2006
> New Revision: 490206
> 
> URL: http://svn.apache.org/viewvc?view=rev&rev=490206
> Log:
> sbl+xbl is now zen.  add in rule for PBL as well
> 
> Modified:
>     spamassassin/rules/branches/3.1/20_dnsbl_tests.cf
>     spamassassin/rules/branches/3.1/30_text_de.cf
>     spamassassin/rules/branches/3.1/30_text_nl.cf
> 
> Modified: spamassassin/rules/branches/3.1/20_dnsbl_tests.cf
> URL: 
> http://svn.apache.org/viewvc/spamassassin/rules/branches/3.1/20_dnsbl_tests.cf?view=diff&rev=490206&r1=490205&r2=490206
> ==============================================================================
> --- spamassassin/rules/branches/3.1/20_dnsbl_tests.cf (original)
> +++ spamassassin/rules/branches/3.1/20_dnsbl_tests.cf Mon Dec 25 17:40:12 2006
> @@ -129,26 +129,32 @@
>  #reuse RCVD_IN_SORBS_DUL
>  
>  # ---------------------------------------------------------------------------
> -# Spamhaus SBL+XBL
> +# Spamhaus ZEN (was SBL, XBL, and PBL)
>  #
>  # 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.
>  
> -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')
> +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-lastexternal', 
> 'sbl-xbl.spamhaus.org.', '127.0.0.[456]')
> +header RCVD_IN_XBL           eval:check_rbl('zen-lastexternal', 
> 'zen.spamhaus.org.', '127.0.0.[456]')
>  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)
> 
> Modified: spamassassin/rules/branches/3.1/30_text_de.cf
> URL: 
> http://svn.apache.org/viewvc/spamassassin/rules/branches/3.1/30_text_de.cf?view=diff&rev=490206&r1=490205&r2=490206
> ==============================================================================
> --- spamassassin/rules/branches/3.1/30_text_de.cf (original)
> +++ spamassassin/rules/branches/3.1/30_text_de.cf Mon Dec 25 17:40:12 2006
> @@ -99,9 +99,9 @@
>  lang de describe RCVD_IN_SORBS_BLOCK SORBS: Senderechner verweigert Tests
>  lang de describe RCVD_IN_SORBS_ZOMBIE SORBS: Senderechner in Liste 
> "entführter" Adressblöcke
>  lang de describe RCVD_IN_SORBS_DUL SORBS: Senderechner nur temporär mit 
> Internet verbunden
> -lang de describe __RCVD_IN_SBL_XBL Transportiert via Rechner in 
> SBL+XBL-Liste (http://www.spamhaus.org/)
>  lang de describe RCVD_IN_SBL Transportiert via Rechner in SBL-Liste 
> (http://www.spamhaus.org/sbl/)
>  lang de describe RCVD_IN_XBL Transportiert via Rechner in XBL-Liste 
> (http://www.spamhaus.org/xbl/)
> +lang de describe RCVD_IN_PBL Transportiert via Rechner in PBL-Liste 
> (http://www.spamhaus.org/pbl/)
>  lang de describe DNS_FROM_RFC_DSN Absender in dsn-Liste von 
> www.rfc-ignorant.org
>  lang de describe DNS_FROM_RFC_POST Absender in postmaster-Liste von 
> www.rfc-ignorant.org
>  lang de describe DNS_FROM_RFC_ABUSE Absender in abuse-Liste von 
> www.rfc-ignorant.org
> 
> Modified: spamassassin/rules/branches/3.1/30_text_nl.cf
> URL: 
> http://svn.apache.org/viewvc/spamassassin/rules/branches/3.1/30_text_nl.cf?view=diff&rev=490206&r1=490205&r2=490206
> ==============================================================================
> --- spamassassin/rules/branches/3.1/30_text_nl.cf (original)
> +++ spamassassin/rules/branches/3.1/30_text_nl.cf Mon Dec 25 17:40:12 2006
> @@ -61,9 +61,9 @@
>  lang nl describe RCVD_IN_SORBS_BLOCK             SORBS: verzender weigert 
> getest te worden
>  lang nl describe RCVD_IN_SORBS_ZOMBIE            SORBS: verzender is een 
> gekaapt netwerk
>  lang nl describe RCVD_IN_SORBS_DUL               SORBS: bericht is direct 
> verstuurd vanaf een dynamisch IP adres
> -lang nl describe __RCVD_IN_SBL_XBL               Ontvangen via een relay die 
> gevonden is in Spamhaus SBL+XBL
>  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_PBL                     Ontvangen via een relay die 
> gevonden is in Spamhaus PBL
>  lang nl describe RCVD_IN_DSBL                    Ontvangen via een relay die 
> gevonden is in list.dsbl.org
>  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)

Reply via email to