From 3b74069193af906fc156520afdda91b076cc1567 Mon Sep 17 00:00:00 2001
From: Andreas Gungl <a.gungl@gmx.de>
Date: Wed, 28 Jun 2006 08:14:23 +0000
Subject: [PATCH] Forward port of the support for the tools dspam and bsfilter

svn path=/trunk/KDE/kdepim/; revision=555675
---
 kmail.antispamrc | 60 ++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 53 insertions(+), 7 deletions(-)

diff --git a/kmail.antispamrc b/kmail.antispamrc
index a7157e02a..db94bcfcd 100644
--- a/kmail.antispamrc
+++ b/kmail.antispamrc
@@ -1,5 +1,5 @@
 [General]
-tools=8
+tools=10
 
 [Spamtool #1]
 Ident=spamassassin
@@ -10,9 +10,9 @@ Executable=spamassassin -V | grep "SpamAssassin version 2"
 URL=http://spamassassin.org
 PipeFilterName=SpamAssassin Check
 PipeCmdDetect=spamassassin -L
+PipeCmdNoSpam=spamassassin -d
 ExecCmdSpam=sa-learn -L --spam --no-rebuild --single
 ExecCmdHam=sa-learn -L --ham --no-rebuild --single
-PipeCmdNoSpam=spamassassin -d
 DetectionHeader=X-Spam-Flag
 DetectionPattern=yes
 DetectionPattern2=
@@ -35,9 +35,9 @@ Executable=bogofilter -V
 URL=http://bogofilter.sourceforge.net
 PipeFilterName=Bogofilter Check
 PipeCmdDetect=bogofilter -p -e -u
+PipeCmdNoSpam=
 ExecCmdSpam=bogofilter -N -s
 ExecCmdHam=bogofilter -S -n
-PipeCmdNoSpam=
 DetectionHeader=X-Bogosity
 DetectionPattern=(yes)|(spam\b)
 DetectionPattern2=
@@ -60,9 +60,9 @@ Executable=$HOME/.annoyance-filter/annoyance-filter --version
 URL=http://www.fourmilab.ch/annoyance-filter
 PipeFilterName=Annoyance-Filter Check
 PipeCmdDetect=$HOME/.annoyance-filter/annoyance-filter --fread $HOME/.annoyance-filter/FastDict.bin --phrasemin 1 --phrasemax 2 --transcript - --test -
+PipeCmdNoSpam=
 ExecCmdSpam=$HOME/.annoyance-filter/annoyance-filter --read $HOME/.annoyance-filter/Dict.bin --phrasemin 1 --phrasemax 2 --junk - --prune --write $HOME/.annoyance-filter/Dict.bin --fwrite $HOME/.annoyance-filter/FastDict.bin
 ExecCmdHam=$HOME/.annoyance-filter/annoyance-filter --read $HOME/.annoyance-filter/Dict.bin --phrasemin 1 --phrasemax 2 --mail - --prune --write $HOME/.annoyance-filter/Dict.bin --fwrite $HOME/.annoyance-filter/FastDict.bin
-PipeCmdNoSpam=
 DetectionHeader=X-Annoyance-Filter-Classification
 DetectionPattern=Junk
 DetectionPattern2=
@@ -80,9 +80,9 @@ Executable=echo
 URL=http://www.gmx.net/de/produkte/virenschutz/index.html
 PipeFilterName=
 PipeCmdDetect=
+PipeCmdNoSpam=
 ExecCmdSpam=
 ExecCmdHam=
-PipeCmdNoSpam=
 DetectionHeader=X-GMX-Antispam
 DetectionPattern=^[2345]
 DetectionPattern2=
@@ -101,6 +101,7 @@ Executable=sb_filter.py -h
 URL=http://spambayes.sourceforge.net
 PipeFilterName=SpamBayes Check
 PipeCmdDetect=sb_filter.py
+PipeCmdNoSpam=
 ExecCmdSpam=sb_filter.py -s
 ExecCmdHam=sb_filter.py -g
 DetectionHeader=X-Spambayes-Classification
@@ -112,6 +113,7 @@ SupportsBayes=1
 SupportsUnsure=1
 
 [Spamtool #6]
+Ident=razor
 HeadersOnly=yes
 ScoreName=Razor
 ScoreHeader=X-Razor-Spam
@@ -128,9 +130,9 @@ Executable=echo "From: test" | spamc -x && spamassassin -V | grep "SpamAssassin
 URL=http://spamassassin.org
 PipeFilterName=SpamAssassin Service Check
 PipeCmdDetect=spamc
+PipeCmdNoSpam=spamassassin -d
 ExecCmdSpam=sa-learn -L --spam --no-rebuild --single
 ExecCmdHam=sa-learn -L --ham --no-rebuild --single
-PipeCmdNoSpam=spamassassin -d
 DetectionHeader=X-Spam-Flag
 DetectionPattern=yes
 DetectionPattern2=
@@ -153,9 +155,9 @@ Executable=spamassassin -V | grep "SpamAssassin version 3"
 URL=http://spamassassin.org
 PipeFilterName=SpamAssassin Check
 PipeCmdDetect=spamassassin -L
+PipeCmdNoSpam=spamassassin -d
 ExecCmdSpam=sa-learn -L --spam --no-sync
 ExecCmdHam=sa-learn -L --ham --no-sync
-PipeCmdNoSpam=spamassassin -d
 DetectionHeader=X-Spam-Flag
 DetectionPattern=yes
 DetectionPattern2=
@@ -168,3 +170,47 @@ ScoreHeader=X-Spam-Status
 ScoreType=Adjusted
 ScoreValueRegexp=(?:hits|score)=([\d\.-]+)\s
 ScoreThresholdRegexp=required=([\d\.-]+)\s
+
+[Spamtool #9]
+Ident=bsfilter
+Version=1
+Priority=55
+VisibleName=Bsfilter
+Executable=bsfilter --help > /dev/null
+URL=http://bsfilter.org/
+PipeFilterName=Bsfilter Check
+PipeCmdDetect=bsfilter --pipe --insert-flag --insert-probability
+PipeCmdNoSpam=
+ExecCmdSpam=bsfilter --add-spam --update
+ExecCmdHam=bsfilter --add-clean --update
+DetectionHeader=X-Spam-Flag
+DetectionPattern=Yes
+DetectionPattern2=
+DetectionOnly=0
+UseRegExp=0
+SupportsBayes=1
+SupportsUnsure=0
+ScoreName=Bsfilter
+ScoreHeader=X-Spam-Probability
+ScoreType=Decimal
+ScoreValueRegexp=(.+)
+ScoreThresholdRegexp=
+
+[Spamtool #10]
+Ident=dspam
+Version=1
+Priority=70
+VisibleName=DSpam 3.x
+URL=http://dspam.nuclearelephant.org
+HeadersOnly=yes
+DetectionHeader=X-DSPAM-Result
+DetectionPattern=Spam
+DetectionOnly=0
+UseRegExp=0
+ScoreName=DSpam
+SupportsUnsure=0
+ScoreHeader=X-DSPAM-Probability
+ConfidenceHeader=X-DSPAM-Confidence
+ScoreType=Decimal
+ScoreValueRegexp=([\d\.]+)\s*
+ScoreConfidenceRegexp=([\d\.]+)\s*