You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2011/07/25 16:18:03 UTC
svn commit: r1150715 - in /spamassassin/trunk/rulesrc/sandbox:
jhardin/20_misc_testing.cf jm/20_bug_5984.cf khopesh/20_khop_bl.cf
Author: mmartinec
Date: Mon Jul 25 14:18:02 2011
New Revision: 1150715
URL: http://svn.apache.org/viewvc?rev=1150715&view=rev
Log:
Bug 6634: Remove __RCVD_IN_BRBL
Modified:
spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
spamassassin/trunk/rulesrc/sandbox/jm/20_bug_5984.cf
spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_bl.cf
Modified: spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf?rev=1150715&r1=1150714&r2=1150715&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf Mon Jul 25 14:18:02 2011
@@ -326,8 +326,8 @@ tflags TO_EQ_FM_DOM_SPF_FAIL
# Evaluate ReturnPath and blacklist collisions
-meta __RP_SAFE_BRBL RCVD_IN_RP_SAFE && __RCVD_IN_BRBL
-meta __RP_CERTIFIED_BRBL RCVD_IN_RP_CERTIFIED && __RCVD_IN_BRBL
+meta __RP_SAFE_BRBL RCVD_IN_RP_SAFE && RCVD_IN_BRBL_LASTEXT
+meta __RP_CERTIFIED_BRBL RCVD_IN_RP_CERTIFIED && RCVD_IN_BRBL_LASTEXT
tflags __RP_SAFE_BRBL net nopublish
tflags __RP_CERTIFIED_BRBL net nopublish
meta __RP_SAFE_ZEN RCVD_IN_RP_SAFE && __RCVD_IN_ZEN
Modified: spamassassin/trunk/rulesrc/sandbox/jm/20_bug_5984.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/jm/20_bug_5984.cf?rev=1150715&r1=1150714&r2=1150715&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jm/20_bug_5984.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jm/20_bug_5984.cf Mon Jul 25 14:18:02 2011
@@ -1,8 +1,8 @@
ifplugin Mail::SpamAssassin::Plugin::DNSEval
-header __RCVD_IN_BRBL eval:check_rbl('brbl','bb.barracudacentral.org')
-tflags __RCVD_IN_BRBL net
+# header __RCVD_IN_BRBL eval:check_rbl('brbl','bb.barracudacentral.org')
+# tflags __RCVD_IN_BRBL net
# header RCVD_IN_BRBL eval:check_rbl_sub('brbl','127.0.0.2')
# describe RCVD_IN_BRBL Received via a relay in Barracuda BRBL
Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_bl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_bl.cf?rev=1150715&r1=1150714&r2=1150715&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_bl.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_bl.cf Mon Jul 25 14:18:02 2011
@@ -110,14 +110,14 @@ ifplugin Mail::SpamAssassin::Plugin::DNS
# and freemail). my intuition is 35-50% spam, 2-4% ham, but we could get lucky.
# the original version ensured multiple external relays and a hit in either
# spamcop or barracuda. now i've added zen, and sorbs.
-#meta DNSBL_INDIRECT !__DOS_SINGLE_EXT_RELAY && (RCVD_IN_BL_SPAMCOP_NET||__RCVD_IN_BRBL) && !(__VIA_ML||__DOS_HAS_LIST_UNSUB||__SENDER_BOT||__freemail_safe||RCVD_IN_SPAMCOP||RCVD_IN_BRBL_LASTEXT)
-meta DNSBL_INDIRECT !__DOS_SINGLE_EXT_RELAY && (RCVD_IN_BL_SPAMCOP_NET||__RCVD_IN_BRBL||__RCVD_IN_ZEN||__RCVD_IN_SORBS) && !(__VIA_ML||__DOS_HAS_LIST_UNSUB||__SENDER_BOT||__freemail_safe||ALL_TRUSTED||RCVD_IN_SPAMCOP||RCVD_IN_BRBL_LASTEXT||RCVD_IN_SORBS_DUL)
+#meta DNSBL_INDIRECT !__DOS_SINGLE_EXT_RELAY && (RCVD_IN_BL_SPAMCOP_NET||RCVD_IN_BRBL_LASTEXT) && !(__VIA_ML||__DOS_HAS_LIST_UNSUB||__SENDER_BOT||__freemail_safe||RCVD_IN_SPAMCOP||RCVD_IN_BRBL_LASTEXT)
+meta DNSBL_INDIRECT !__DOS_SINGLE_EXT_RELAY && (RCVD_IN_BL_SPAMCOP_NET||RCVD_IN_BRBL_LASTEXT||__RCVD_IN_ZEN||__RCVD_IN_SORBS) && !(__VIA_ML||__DOS_HAS_LIST_UNSUB||__SENDER_BOT||__freemail_safe||ALL_TRUSTED||RCVD_IN_SPAMCOP||RCVD_IN_BRBL_LASTEXT||RCVD_IN_SORBS_DUL)
describe DNSBL_INDIRECT Received indirectly through a relay in a DNSBL
tflags DNSBL_INDIRECT net nopublish # 20091203
-meta DNSBL_INDIRECT_UNSAFE (RCVD_IN_BL_SPAMCOP_NET||__RCVD_IN_BRBL||__RCVD_IN_ZEN||__RCVD_IN_SORBS) && !(ALL_TRUSTED||RCVD_IN_SPAMCOP||RCVD_IN_BRBL_LASTEXT||RCVD_IN_SORBS_DUL)
+meta DNSBL_INDIRECT_UNSAFE (RCVD_IN_BL_SPAMCOP_NET||RCVD_IN_BRBL_LASTEXT||__RCVD_IN_ZEN||__RCVD_IN_SORBS) && !(ALL_TRUSTED||RCVD_IN_SPAMCOP||RCVD_IN_BRBL_LASTEXT||RCVD_IN_SORBS_DUL)
describe DNSBL_INDIRECT_UNSAFE Received ~indirectly through a relay in a DNSBL
tflags DNSBL_INDIRECT_UNSAFE net nopublish # 20091207
-meta DNSBL_INDIRECT_UNSAFE_2 !(ALL_TRUSTED||RCVD_IN_SPAMCOP||RCVD_IN_BRBL_LASTEXT||RCVD_IN_SORBS_DUL) && (RCVD_IN_BL_SPAMCOP_NET+__RCVD_IN_BRBL+__RCVD_IN_ZEN+__RCVD_IN_SORBS+__RCVD_IN_NJABL >1)
+meta DNSBL_INDIRECT_UNSAFE_2 !(ALL_TRUSTED||RCVD_IN_SPAMCOP||RCVD_IN_BRBL_LASTEXT||RCVD_IN_SORBS_DUL) && (RCVD_IN_BL_SPAMCOP_NET+RCVD_IN_BRBL_LASTEXT+__RCVD_IN_ZEN+__RCVD_IN_SORBS+__RCVD_IN_NJABL >1)
describe DNSBL_INDIRECT_UNSAFE_2 Received ~indirectly through a relay in 2+ DNSBLs
tflags DNSBL_INDIRECT_UNSAFE_2 net nopublish # 20091207