qpsmtpd/sme8/qpsmtpd-0.83-subjectrewrite.patch

diff -up qpsmtpd-0.83/plugins/spamassassin.subjectrewrite qpsmtpd-0.83/plugins/spamassassin
--- qpsmtpd-0.83/plugins/spamassassin.subjectrewrite    2009-11-04 10:19:51.000000000 +0100
+++ qpsmtpd-0.83/plugins/spamassassin   2009-11-04 10:48:33.000000000 +0100
@@ -41,7 +41,8 @@ The default is to never reject mail base
 =item munge_subject_threshold [threshold]
 
 Set the threshold where the plugin will prefix the subject with
-'***SPAM***'.  A modified subject is easier to filter on than the
+'***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.
 
@@ -236,8 +237,9 @@ sub check_spam_munge_subject {
 
   return DECLINED unless $score >= $self->{_args}->{munge_subject_threshold};
 
+  my $subject_prefix = $self->qp->config('spamsubjectprefix') || '*** SPAM ***';
   my $subject = $transaction->header->get('Subject') || '';
-  $transaction->header->replace('Subject', "***SPAM*** $subject");
+  $transaction->header->replace('Subject', "$subject_prefix $subject");
 
   return DECLINED;
 }
1	snetram	1.1	diff -up qpsmtpd-0.83/plugins/spamassassin.subjectrewrite qpsmtpd-0.83/plugins/spamassassin
2			--- qpsmtpd-0.83/plugins/spamassassin.subjectrewrite 2009-11-04 10:19:51.000000000 +0100
3			+++ qpsmtpd-0.83/plugins/spamassassin 2009-11-04 10:48:33.000000000 +0100
4			@@ -41,7 +41,8 @@ The default is to never reject mail base
5			=item munge_subject_threshold [threshold]
6
7			Set the threshold where the plugin will prefix the subject with
8			-'*SPAM*'. A modified subject is easier to filter on than the
9			+'*SPAM*' or the value defined in the spamsubjectprefix
10			+configuration file. A modified subject is easier to filter on than the
11			other headers for many people with not so clever mail clients. You
12			might want to make another plugin that does this on a per user basis.
13
14			@@ -236,8 +237,9 @@ sub check_spam_munge_subject {
15
16			return DECLINED unless $score >= $self->{_args}->{munge_subject_threshold};
17
18			+ my $subject_prefix = $self->qp->config('spamsubjectprefix') \|\| '* SPAM *';
19			my $subject = $transaction->header->get('Subject') \|\| '';
20			- $transaction->header->replace('Subject', "*SPAM* $subject");
21			+ $transaction->header->replace('Subject', "$subject_prefix $subject");
22
23			return DECLINED;
24			}