You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by du...@apache.org on 2004/01/08 04:06:37 UTC
svn commit: rev 6110 - in incubator/spamassassin/trunk: . lib/Mail/SpamAssassin rules
Author: duncf
Date: Wed Jan 7 19:06:36 2004
New Revision: 6110
Modified:
incubator/spamassassin/trunk/README
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
incubator/spamassassin/trunk/rules/10_misc.cf
incubator/spamassassin/trunk/rules/local.cf
incubator/spamassassin/trunk/spamassassin.raw
Log:
Fixes backwards compat of rewrite_subject -> rewrite_header which I
screwed up the first time... Also removes any reference to
rewrite_subject in the docs. (Closes: #2905)
Modified: incubator/spamassassin/trunk/README
==============================================================================
--- incubator/spamassassin/trunk/README (original)
+++ incubator/spamassassin/trunk/README Wed Jan 7 19:06:36 2004
@@ -222,10 +222,10 @@
different thresholds are available in the "STATISTICS.txt" file in
the "rules" directory.
- - subject_tag
+ - rewrite_header, add_header
- When rewrite_subject is on, the subject stamp is *****SPAM*****.
- This can be used to change it.
+ These options affect the way messages are tagged as spam or
+ non-spam. This makes it easy to identify incoming mail.
- ok_locales
Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Wed Jan 7 19:06:36 2004
@@ -6,7 +6,7 @@
# a comment
- rewrite_subject 1
+ rewrite_header Subject *****SPAM*****
full PARA_A_2_C_OF_1618 /Paragraph .a.{0,10}2.{0,10}C. of S. 1618/i
describe PARA_A_2_C_OF_1618 Claims compliance with senate bill 1618
@@ -1738,7 +1738,11 @@
=cut
if (/^rewrite_subject\s+(\d+)$/) {
- $self->{rewrite_header}->{Subject} = $self->{subject_tag};
+ if ($1) {
+ $self->{rewrite_header}->{Subject} = $self->{subject_tag};
+ } else {
+ delete $self->{rewrite_header}->{Subject};
+ }
next;
}
@@ -1750,7 +1754,8 @@
only use the _HITS_ and _REQD_ tags, if report_safe is 0, or
SpamAssassin will not be able to remove this markup from your message.
-The use of this option is deprecated. Use the rewrite_header option above.
+The use of this option is deprecated. Use the C<rewrite_header> option
+above.
=cut
Modified: incubator/spamassassin/trunk/rules/10_misc.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/10_misc.cf (original)
+++ incubator/spamassassin/trunk/rules/10_misc.cf Wed Jan 7 19:06:36 2004
@@ -161,8 +161,7 @@
# unless the user override them. See the user_prefs.template file for
# explanations.
-# rewrite_subject 0
-# subject_tag *****SPAM*****
+# rewrite_header Subject *****SPAM*****
# skip_rbl_checks 0
# check_mx_attempts 2
# check_mx_delay 5
Modified: incubator/spamassassin/trunk/rules/local.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/local.cf (original)
+++ incubator/spamassassin/trunk/rules/local.cf Wed Jan 7 19:06:36 2004
@@ -5,7 +5,7 @@
#
###########################################################################
#
-# rewrite_subject 0
+# rewrite_header Subject *****SPAM*****
# report_safe 1
# trusted_networks 212.17.35.
Modified: incubator/spamassassin/trunk/spamassassin.raw
==============================================================================
--- incubator/spamassassin/trunk/spamassassin.raw (original)
+++ incubator/spamassassin/trunk/spamassassin.raw Wed Jan 7 19:06:36 2004
@@ -557,12 +557,12 @@
=item Subject: header
-The string C<*****SPAM*****> is also prepended to the subject,
-if the C<rewrite_subject 1> configuration option is given.
-
=item From: header
=item To: header
+
+The above headers can be modified if the relavent C<rewrite_header>
+option is given.
=item Cc: header