qpsmtpd/sme8/qpsmtpd-de3fbb565f711bc27e7bfa061e83c3020710dc16.patch

commit de3fbb565f711bc27e7bfa061e83c3020710dc16
Author: Robert <rspier@pobox.com>
Date:   Wed Nov 4 21:43:38 2009 -0800

    Rename spamsubjectprefix to subject_prefix.  Add docs.

diff --git a/plugins/spamassassin b/plugins/spamassassin
index be3a67b..816da4d 100644
--- a/plugins/spamassassin
+++ b/plugins/spamassassin
@@ -40,14 +40,20 @@ The default is to never reject mail based on the SpamAssassin score.
 
 =item munge_subject_threshold [threshold]
 
-Set the threshold where the plugin will prefix the subject with
-'***SPAM***' or the value defined in the spamsubjectprefix 
-configuration file.  A modified subject is easier to filter on than the
-other headers for many people with not so clever mail clients.  You
-might want to make another plugin that does this on a per user basis.
+Set the threshold where the plugin will prefix the subject with the
+value of C<subject_prefix>. A modified subject is easier to filter on
+than the other headers for many people with not so clever mail
+clients.  You might want to make another plugin that does this on a
+per user basis.
 
 The default is to never munge the subject based on the SpamAssassin score.
 
+=item subject_prefix [prefix]
+
+What to prefix the subject with if the message is detected as spam
+(i.e. if score is greater than C<munge_subject_threshold>.  Defaults to
+C<*** SPAM ***>
+
 =item spamd_socket [/path/to/socket|spamd.host:port]
 
 Beginning with Mail::SpamAssassin 2.60, it is possible to use Unix
@@ -237,7 +243,7 @@ sub check_spam_munge_subject {
 
   return DECLINED unless $score >= $self->{_args}->{munge_subject_threshold};
 
-  my $subject_prefix = $self->qp->config('spamsubjectprefix') || '*** SPAM ***';
+  my $subject_prefix = $self->qp->config('subject_prefix') || '*** SPAM ***';
   my $subject = $transaction->header->get('Subject') || '';
   $transaction->header->replace('Subject', "$subject_prefix $subject");
 
1	snetram	1.1	commit de3fbb565f711bc27e7bfa061e83c3020710dc16
2			Author: Robert <rspier@pobox.com>
3			Date: Wed Nov 4 21:43:38 2009 -0800
4
5			Rename spamsubjectprefix to subject_prefix. Add docs.
6
7			diff --git a/plugins/spamassassin b/plugins/spamassassin
8			index be3a67b..816da4d 100644
9			--- a/plugins/spamassassin
10			+++ b/plugins/spamassassin
11			@@ -40,14 +40,20 @@ The default is to never reject mail based on the SpamAssassin score.
12
13			=item munge_subject_threshold [threshold]
14
15			-Set the threshold where the plugin will prefix the subject with
16			-'*SPAM*' or the value defined in the spamsubjectprefix
17			-configuration file. A modified subject is easier to filter on than the
18			-other headers for many people with not so clever mail clients. You
19			-might want to make another plugin that does this on a per user basis.
20			+Set the threshold where the plugin will prefix the subject with the
21			+value of C<subject_prefix>. A modified subject is easier to filter on
22			+than the other headers for many people with not so clever mail
23			+clients. You might want to make another plugin that does this on a
24			+per user basis.
25
26			The default is to never munge the subject based on the SpamAssassin score.
27
28			+=item subject_prefix [prefix]
29			+
30			+What to prefix the subject with if the message is detected as spam
31			+(i.e. if score is greater than C<munge_subject_threshold>. Defaults to
32			+C<* SPAM *>
33			+
34			=item spamd_socket [/path/to/socket\|spamd.host:port]
35
36			Beginning with Mail::SpamAssassin 2.60, it is possible to use Unix
37			@@ -237,7 +243,7 @@ sub check_spam_munge_subject {
38
39			return DECLINED unless $score >= $self->{_args}->{munge_subject_threshold};
40
41			- my $subject_prefix = $self->qp->config('spamsubjectprefix') \|\| '* SPAM *';
42			+ my $subject_prefix = $self->qp->config('subject_prefix') \|\| '* SPAM *';
43			my $subject = $transaction->header->get('Subject') \|\| '';
44			$transaction->header->replace('Subject', "$subject_prefix $subject");
45