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 2004/03/15 07:07:57 UTC

svn commit: rev 9485 - in incubator/spamassassin/trunk: . rules

Author: jm
Date: Sun Mar 14 22:07:57 2004
New Revision: 9485

Added:
   incubator/spamassassin/trunk/rules/init.pre
Removed:
   incubator/spamassassin/trunk/rules/10_plugins.cf
Modified:
   incubator/spamassassin/trunk/MANIFEST
   incubator/spamassassin/trunk/Makefile.PL
   incubator/spamassassin/trunk/rules/25_uribl.cf
Log:
added init.pre file.  NOTE: filename will probably change based on review, so get making suggestions ;)

Modified: incubator/spamassassin/trunk/MANIFEST
==============================================================================
--- incubator/spamassassin/trunk/MANIFEST	(original)
+++ incubator/spamassassin/trunk/MANIFEST	Sun Mar 14 22:07:57 2004
@@ -318,3 +318,4 @@
 rules/20_drugs.cf
 rules/30_text_pl.cf
 t/rcvd_parser.t
+rules/init.pre

Modified: incubator/spamassassin/trunk/Makefile.PL
==============================================================================
--- incubator/spamassassin/trunk/Makefile.PL	(original)
+++ incubator/spamassassin/trunk/Makefile.PL	Sun Mar 14 22:07:57 2004
@@ -1071,6 +1071,8 @@
 	-$(MKPATH) $(B_CONFDIR)
 	$(PERL) -MFile::Spec -MFile::Copy \
 	  -e "copy(q{rules/local.cf}, q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf};"
+	$(PERL) -MFile::Spec -MFile::Copy \
+	  -e "copy(q{rules/init.pre}, q{$(B_CONFDIR)/init.pre}) unless -f q{$(B_CONFDIR)/init.pre};"
 
 data__install:
 	-$(MKPATH) $(B_DATADIR)

Modified: incubator/spamassassin/trunk/rules/25_uribl.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/25_uribl.cf	(original)
+++ incubator/spamassassin/trunk/rules/25_uribl.cf	Sun Mar 14 22:07:57 2004
@@ -1,7 +1,29 @@
+# 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>
+#
+###########################################################################
 
-loadplugin Mail::SpamAssassin::Plugin::URIDNSBL
-
-# note that this plugin defines a new config setting, 'uridnsbl',
+# 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.
 
@@ -9,14 +31,10 @@
 # normal DNSBL lookups.
 uridnsbl_timeout	2
 
-# interestingly -- 0 hits from XBL.  Just use SBL
-#uridnsbl	URIBL_SBLXBL	sbl-xbl.spamhaus.org.	TXT
-#header		URIBL_SBLXBL	eval:check_uridnsbl('URIBL_SBLXBL')
-#describe	URIBL_SBLXBL	Contains a URL listed in the SBL/XBL blocklist
-tflags		URIBL_SBLXBL	net
-
 uridnsbl	URIBL_SBL	sbl.spamhaus.org.	TXT
 header		URIBL_SBL	eval:check_uridnsbl('URIBL_SBL')
+describe	URIBL_SBL	Contains a URL listed in the SBL blocklist
+tflags		URIBL_SBL	net
 
 uridnsbl	URIBL_DSBL	list.dsbl.org.		TXT
 header		URIBL_DSBL	eval:check_uridnsbl('URIBL_DSBL')

Added: incubator/spamassassin/trunk/rules/init.pre
==============================================================================
--- (empty file)
+++ incubator/spamassassin/trunk/rules/init.pre	Sun Mar 14 22:07:57 2004
@@ -0,0 +1,22 @@
+# This is the right place to customize your installation of SpamAssassin.
+#
+# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be
+# tweaked.
+#
+# This file will be loaded before *all other* configuration files, including
+# the system configuration.  As such, it's a good place to set things that
+# will affect how those files are parsed, like which plugins are loaded
+# etc.
+#
+###########################################################################
+
+# RelayCountry - add metadata for Bayes learning, marking the countries
+# a message was relayed through
+#
+# loadplugin Mail::SpamAssassin::Plugin::RelayCountry
+
+# URIDNSBL - look up URLs found in the message against several DNS
+# blocklists.
+#
+loadplugin Mail::SpamAssassin::Plugin::URIDNSBL
+