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 2010/03/03 18:54:09 UTC
svn commit: r918602 - in /spamassassin/trunk:
lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm rules/25_uribl.cf
Author: jm
Date: Wed Mar 3 17:54:08 2010
New Revision: 918602
URL: http://svn.apache.org/viewvc?rev=918602&view=rev
Log:
bug 6363: use 'if can()' to avoid publishing URIBL_DBL to 3.3.x updates prematurely
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
spamassassin/trunk/rules/25_uribl.cf
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm?rev=918602&r1=918601&r2=918602&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Wed Mar 3 17:54:08 2010
@@ -1002,4 +1002,8 @@
# ---------------------------------------------------------------------------
+# capability checks for "if can()":
+#
+sub has_tflags_domains_only { 1 }
+
1;
Modified: spamassassin/trunk/rules/25_uribl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/25_uribl.cf?rev=918602&r1=918601&r2=918602&view=diff
==============================================================================
--- spamassassin/trunk/rules/25_uribl.cf (original)
+++ spamassassin/trunk/rules/25_uribl.cf Wed Mar 3 17:54:08 2010
@@ -41,10 +41,12 @@
# DBL, http://www.spamhaus.org/dbl/ . Note that hits return 127.0.1.x
# A records, so we use a 32-bit mask to match that /24 range.
+if can(Mail::SpamAssassin::Plugin::URIDNSBL::has_tflags_domains_only)
urirhssub URIBL_DBL dbl.spamhaus.org. A 2130706688
body URIBL_DBL eval:check_uridnsbl('URIBL_DBL')
describe URIBL_DBL Contains an URL listed in the DBL blocklist
tflags URIBL_DBL net domains_only
+endif
###########################################################################
## SURBL