From kde-commits  Sun Jul 31 11:14:07 2005
From: Andreas Gungl <a.gungl () gmx ! de>
Date: Sun, 31 Jul 2005 11:14:07 +0000
To: kde-commits
Subject: branches/KDE/3.5/kdepim/kmail
Message-Id: <1122808447.397428.8222.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=112280849127206

SVN commit 441595 by gungl:

better handling of different SpamAssassin versions which need different
params
BUG:108856


 M  +28 -5     kmail.antispamrc  


--- branches/KDE/3.5/kdepim/kmail/kmail.antispamrc #441594:441595
@@ -1,12 +1,12 @@
 [General]
-tools=7
+tools=8
 
 [Spamtool #1]
 Ident=spamassassin
 Version=1
 Priority=40
-VisibleName=SpamAssassin (Perl)
-Executable=spamassassin -V
+VisibleName=SpamAssassin 2.x (Perl)
+Executable=spamassassin -V | grep "SpamAssassin version 2"
 URL=http://spamassassin.org
 PipeFilterName=SpamAssassin Check
 PipeCmdDetect=spamassassin -L
@@ -119,8 +119,8 @@
 Ident=spamd
 Version=1
 Priority=45
-VisibleName=SpamAssassin (Daemon)
-Executable=echo "From: test" | spamc -x && spamassassin -V
+VisibleName=SpamAssassin 3.x (Daemon)
+Executable=echo "From: test" | spamc -x && spamassassin -V | grep "SpamAssassin version 3"
 URL=http://spamassassin.org
 PipeFilterName=SpamAssassin Service Check
 PipeCmdDetect=spamc
@@ -139,3 +139,26 @@
 ScoreValueRegexp=(?:hits|score)=([\d\.-]+)\s
 ScoreThresholdRegexp=required=([\d\.-]+)\s
 
+[Spamtool #8]
+Ident=spamassassin
+Version=1
+Priority=40
+VisibleName=SpamAssassin 3.x (Perl)
+Executable=spamassassin -V | grep "SpamAssassin version 3"
+URL=http://spamassassin.org
+PipeFilterName=SpamAssassin Check
+PipeCmdDetect=spamassassin -L
+ExecCmdSpam=sa-learn -L --spam --no-sync
+ExecCmdHam=sa-learn -L --ham --no-sync
+DetectionHeader=X-Spam-Flag
+DetectionPattern=yes
+DetectionPattern2=
+DetectionOnly=0
+UseRegExp=0
+SupportsBayes=1
+SupportsUnsure=0
+ScoreName=Spamassassin
+ScoreHeader=X-Spam-Status
+ScoreType=Adjusted
+ScoreValueRegexp=(?:hits|score)=([\d\.-]+)\s
+ScoreThresholdRegexp=required=([\d\.-]+)\s