Mailing List Archive

Author: jm
Date: Mon Jun 6 15:46:50 2005
New Revision: 185084

URL: http://svn.apache.org/viewcvs?rev=185084&view=rev
Log:
bug 4314: avoid overwriting admin-supplied customisations of what plugins to load, by adding a new .pre file for new-in-v3.1.0 plugins

Added:
spamassassin/trunk/rules/v310.pre
Modified:
spamassassin/trunk/MANIFEST
spamassassin/trunk/Makefile.PL
spamassassin/trunk/README
spamassassin/trunk/rules/init.pre
spamassassin/trunk/t/SATest.pm

Modified: spamassassin/trunk/MANIFEST
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/MANIFEST?rev=185084&r1=185083&r2=185084&view=diff
==============================================================================
--- spamassassin/trunk/MANIFEST (original)
+++ spamassassin/trunk/MANIFEST Mon Jun 6 15:46:50 2005
@@ -203,6 +203,7 @@
rules/STATISTICS-set3.txt
rules/STATISTICS.txt
rules/init.pre
+rules/v310.pre
rules/languages
rules/local.cf
rules/name-triplets.txt

Modified: spamassassin/trunk/Makefile.PL
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/Makefile.PL?rev=185084&r1=185083&r2=185084&view=diff
==============================================================================
--- spamassassin/trunk/Makefile.PL (original)
+++ spamassassin/trunk/Makefile.PL Mon Jun 6 15:46:50 2005
@@ -1088,10 +1088,9 @@

conf__install:
-$(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};"
+ $(PERL) -MFile::Copy -e "copy(q{rules/local.cf}, q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf}"
+ $(PERL) -MFile::Copy -e "copy(q{rules/init.pre}, q{$(B_CONFDIR)/init.pre}) unless -f q{$(B_CONFDIR)/init.pre}"
+ $(PERL) -MFile::Copy -e "copy(q{rules/v310.pre}, q{$(B_CONFDIR)/v310.pre}) unless -f q{$(B_CONFDIR)/v310.pre}"

data__install:
-$(MKPATH) $(B_DATADIR)

Modified: spamassassin/trunk/README
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/README?rev=185084&r1=185083&r2=185084&view=diff
==============================================================================
--- spamassassin/trunk/README (original)
+++ spamassassin/trunk/README Mon Jun 6 15:46:50 2005
@@ -85,13 +85,17 @@
add local rules and scores to. Modifications here will be
appended to the config loaded from the above directory.

- - /etc/mail/spamassassin/init.pre:
+ - /etc/mail/spamassassin/*.pre:

- Plugin control file, installed from the distribution. This is used
- to control what plugins are loaded. Modifications here will be
- loaded before any configuration loaded from the above directories.
- You want to modify this file if you want to load additional plugins
- or inhibit loading a plugin that is enabled by default.
+ Plugin control files, installed from the distribution. These are
+ used to control what plugins are loaded. Modifications here will
+ be loaded before any configuration loaded from the above
+ directories.
+
+ You want to modify these files if you want to load additional
+ plugins, or inhibit loading a plugin that is enabled by default.
+ If the files exist in /etc/mail/spamassassin, they will not
+ be overwritten during future installs.

- /usr/share/spamassassin/user_prefs.template:


Modified: spamassassin/trunk/rules/init.pre
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/init.pre?rev=185084&r1=185083&r2=185084&view=diff
==============================================================================
--- spamassassin/trunk/rules/init.pre (original)
+++ spamassassin/trunk/rules/init.pre Mon Jun 6 15:46:50 2005
@@ -3,10 +3,9 @@
# 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.
+# This file contains plugin activation commands for plugins included
+# in SpamAssassin 3.0.x releases. It will not be installed if you
+# already have a file in place called "init.pre".
#
###########################################################################

@@ -27,67 +26,4 @@
# SPF - perform SPF verification.
#
loadplugin Mail::SpamAssassin::Plugin::SPF
-
-# DCC - perform DCC message checks.
-#
-# DCC is disabled here because it is not open source. See the DCC
-# license for more details.
-#
-#loadplugin Mail::SpamAssassin::Plugin::DCC
-
-# Pyzor - perform Pyzor message checks.
-#
-loadplugin Mail::SpamAssassin::Plugin::Pyzor
-
-# Razor2 - perform Razor2 message checks.
-#
-# Razor2 is disabled here because it is not available for unlimited free
-# use. It is currently free for personal use, subject to capacity
-# constraints. See the Cloudmark SpamNet Service Policy for more details.
-#
-#loadplugin Mail::SpamAssassin::Plugin::Razor2
-
-# SpamCop - perform SpamCop message reporting
-#
-loadplugin Mail::SpamAssassin::Plugin::SpamCop
-
-# AntiVirus - some simple anti-virus checks, this is not a replacement
-# for an anti-virus filter like Clam AntiVirus
-#
-#loadplugin Mail::SpamAssassin::Plugin::AntiVirus
-
-# AWL - do auto-whitelist checks
-#
-loadplugin Mail::SpamAssassin::Plugin::AWL
-
-# AutoLearnThreshold - threshold-based discriminator for Bayes auto-learning
-#
-loadplugin Mail::SpamAssassin::Plugin::AutoLearnThreshold
-
-# TextCat - language guesser
-#
-#loadplugin Mail::SpamAssassin::Plugin::TextCat
-
-# AccessDB - lookup from-addresses in access database
-#
-#loadplugin Mail::SpamAssassin::Plugin::AccessDB
-
-# WhitelistSubject - Whitelist/Blacklist certain subject regular expressions
-#
-loadplugin Mail::SpamAssassin::Plugin::WhiteListSubject
-
-###########################################################################
-# experimental plugins
-
-# DomainKeys - perform DomainKeys verification
-#
-#loadplugin Mail::SpamAssassin::Plugin::DomainKeys
-
-# MIMEHeader - apply regexp rules against MIME headers in the message
-#
-loadplugin Mail::SpamAssassin::Plugin::MIMEHeader
-
-# ReplaceTags
-#
-loadplugin Mail::SpamAssassin::Plugin::ReplaceTags


Added: spamassassin/trunk/rules/v310.pre
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/v310.pre?rev=185084&view=auto
==============================================================================
--- spamassassin/trunk/rules/v310.pre (added)
+++ spamassassin/trunk/rules/v310.pre Mon Jun 6 15:46:50 2005
@@ -0,0 +1,76 @@
+# 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 was installed during the installation of SpamAssassin 3.1.0,
+# and contains plugin loading commands for the new plugins added in that
+# release. It will not be overwritten during future SpamAssassin installs,
+# so you can modify it to enable some disabled-by-default plugins below,
+# if you so wish.
+#
+###########################################################################
+
+# DCC - perform DCC message checks.
+#
+# DCC is disabled here because it is not open source. See the DCC
+# license for more details.
+#
+#loadplugin Mail::SpamAssassin::Plugin::DCC
+
+# Pyzor - perform Pyzor message checks.
+#
+loadplugin Mail::SpamAssassin::Plugin::Pyzor
+
+# Razor2 - perform Razor2 message checks.
+#
+# Razor2 is disabled here because it is not available for unlimited free
+# use. It is currently free for personal use, subject to capacity
+# constraints. See the Cloudmark SpamNet Service Policy for more details.
+#
+#loadplugin Mail::SpamAssassin::Plugin::Razor2
+
+# SpamCop - perform SpamCop message reporting
+#
+loadplugin Mail::SpamAssassin::Plugin::SpamCop
+
+# AntiVirus - some simple anti-virus checks, this is not a replacement
+# for an anti-virus filter like Clam AntiVirus
+#
+#loadplugin Mail::SpamAssassin::Plugin::AntiVirus
+
+# AWL - do auto-whitelist checks
+#
+loadplugin Mail::SpamAssassin::Plugin::AWL
+
+# AutoLearnThreshold - threshold-based discriminator for Bayes auto-learning
+#
+loadplugin Mail::SpamAssassin::Plugin::AutoLearnThreshold
+
+# TextCat - language guesser
+#
+#loadplugin Mail::SpamAssassin::Plugin::TextCat
+
+# AccessDB - lookup from-addresses in access database
+#
+#loadplugin Mail::SpamAssassin::Plugin::AccessDB
+
+# WhitelistSubject - Whitelist/Blacklist certain subject regular expressions
+#
+loadplugin Mail::SpamAssassin::Plugin::WhiteListSubject
+
+###########################################################################
+# experimental plugins
+
+# DomainKeys - perform DomainKeys verification
+#
+#loadplugin Mail::SpamAssassin::Plugin::DomainKeys
+
+# MIMEHeader - apply regexp rules against MIME headers in the message
+#
+loadplugin Mail::SpamAssassin::Plugin::MIMEHeader
+
+# ReplaceTags
+#
+loadplugin Mail::SpamAssassin::Plugin::ReplaceTags
+

Modified: spamassassin/trunk/t/SATest.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/t/SATest.pm?rev=185084&r1=185083&r2=185084&view=diff
==============================================================================
--- spamassassin/trunk/t/SATest.pm (original)
+++ spamassassin/trunk/t/SATest.pm Mon Jun 6 15:46:50 2005
@@ -98,8 +98,10 @@

rmtree ("log/user_state");
rmtree ("log/outputdir.tmp");
+
rmtree ("log/test_rules_copy");
mkdir ("log/test_rules_copy", 0755);
+
for $file (<../rules/*.cf>) {
$base = basename $file;
copy ($file, "log/test_rules_copy/$base")
@@ -108,8 +110,12 @@

rmtree ("log/localrules.tmp");
mkdir ("log/localrules.tmp", 0755);
- copy ("../rules/init.pre", "log/localrules.tmp/init.pre")
- or die "init.pre copy failed";
+
+ for $file (<../rules/*.pre>) {
+ $base = basename $file;
+ copy ($file, "log/localrules.tmp/$base")
+ or warn "cannot copy $file to log/localrules.tmp/$base";
+ }

copy ("../rules/user_prefs.template", "log/test_rules_copy/99_test_default.cf")
or die "user prefs copy failed";