svn commit: r370897 - in /spamassassin: rules/trunk/core/25_uribl2.cf rules/trunk/core/50_scores.cf trunk/rules/70_uribl.cf

[hs...@apache.org]

Author: hstern
Date: Fri Jan 20 12:19:19 2006
New Revision: 370897

URL: http://svn.apache.org/viewcvs?rev=370897&view=rev
Log:
 * rules/70_uribl.cf
 * rulesrc/core/25_uribl2.cf: Moved testing rules to 25_uribl2.cf
 * rulesrc/core/50_scores.cf: Added scores for new URIBL rules.
 	black=3.0
	grey=1.0
	red=0

Added:
    spamassassin/rules/trunk/core/25_uribl2.cf
Removed:
    spamassassin/trunk/rules/70_uribl.cf
Modified:
    spamassassin/rules/trunk/core/50_scores.cf

Added: spamassassin/rules/trunk/core/25_uribl2.cf
URL: http://svn.apache.org/viewcvs/spamassassin/rules/trunk/core/25_uribl2.cf?rev=370897&view=auto
==============================================================================
--- spamassassin/rules/trunk/core/25_uribl2.cf (added)
+++ spamassassin/rules/trunk/core/25_uribl2.cf Fri Jan 20 12:19:19 2006
@@ -0,0 +1,49 @@
+# SpamAssassin - URIDNSBL rules
+#
+# Please don't modify this file as your changes will be overwritten with
+# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
+# See 'perldoc Mail::SpamAssassin::Conf' for details.
+#
+# <@LICENSE>
+# Copyright 2004 Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# </...@LICENSE>
+#
+###########################################################################
+
+# Requires the Mail::SpamAssassin::Plugin::URIDNSBL plugin be loaded.
+# Note that this plugin defines a new config setting, 'uridnsbl',
+# which lists the zones to look up in advance.  The rules will
+# not hit unless each rule has a corresponding 'uridnsbl' line.
+
+ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
+
+# Support for URIBL is discussed in bug 4507
+#
+urirhssub	URIBL_BLACK	multi.uribl.com.        A   2
+body		URIBL_BLACK	eval:check_uridnsbl('URIBL_BLACK')
+describe	URIBL_BLACK	Contains an URL listed in the URIBL blacklist
+tflags		URIBL_BLACK	net
+
+urirhssub	URIBL_GREY	multi.uribl.com.        A   4
+body		URIBL_GREY	eval:check_uridnsbl('URIBL_GREY')
+describe	URIBL_GREY	Contains an URL listed in the URIBL greylist
+tflags		URIBL_GREY	net
+
+urirhssub	URIBL_RED	multi.uribl.com.        A   8
+body		URIBL_RED	eval:check_uridnsbl('URIBL_RED')
+describe	URIBL_RED	Contains an URL listed in the URIBL redlist
+tflags		URIBL_RED	net
+
+endif	# Mail::SpamAssassin::Plugin::URIDNSBL

Modified: spamassassin/rules/trunk/core/50_scores.cf
URL: http://svn.apache.org/viewcvs/spamassassin/rules/trunk/core/50_scores.cf?rev=370897&r1=370896&r2=370897&view=diff
==============================================================================
--- spamassassin/rules/trunk/core/50_scores.cf (original)
+++ spamassassin/rules/trunk/core/50_scores.cf Fri Jan 20 12:19:19 2006
@@ -754,6 +754,9 @@
 score URIBL_SBL 0 1.094 0 1.639
 score URIBL_SC_SURBL 0 3.600 0 4.498
 score URIBL_WS_SURBL 0 1.533 0 2.140
+score URIBL_BLACK 0 3.0 0 3.0
+score URIBL_GREY 0 1.0 0 1.0
+score URIBL_RED 0
 # </gen:mutable>
 endif # Mail::SpamAssassin::Plugin::URIDNSBL