From a2fa6dfccfcdca47c350a28f49ff3bf59e15120c Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@seamus.madduck.net>
Date: Thu, 16 Aug 2007 00:41:16 +0200
Subject: [PATCH] clean up more headers before spam training

---
 procmail/pre-spam-cleanup |  5 ++---
 spamassassin/user_prefs   | 13 ++++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/procmail/pre-spam-cleanup b/procmail/pre-spam-cleanup
index cb19128..e360aad 100755
--- a/procmail/pre-spam-cleanup
+++ b/procmail/pre-spam-cleanup
@@ -25,8 +25,7 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 
 # remove other unwanted headers from all messages
 :0 fw
-|$FORMAIL -IX-Virus-Scanned -IX-SenderIP -IX-ASN -IX-CIDR -IX-UID -IX-OfflineIMAP- \
-          -IX-Status -IStatus -IX-Keywords -IX-Greylist \
-          -IX-Spam -IX-CRM114 -IX-Auto -IX-Trained-As -IX-EqDomain -IX-EqTo
+|$FORMAIL -IX-Virus -IX-UID -IX-OfflineIMAP- -IX-Status -IStatus -IX-Keywords -IX-Greylist \
+          -IX-Spam -IX-CRM114 -IX-Auto -IX-Trained-As -IX-EqDomain -IX-EqTo -IX-Justme
 
 # now should be idempotent
diff --git a/spamassassin/user_prefs b/spamassassin/user_prefs
index 7aa67c5..961e603 100644
--- a/spamassassin/user_prefs
+++ b/spamassassin/user_prefs
@@ -45,9 +45,9 @@ report_safe_copy_headers X-Greylist
 rewrite_header SUBJECT
 
 #bayes_path ~/.var/spamassassin/bayes
-bayes_auto_learn 1
+bayes_auto_learn 0
 bayes_ignore_header X-Original-To
-bayes_ignore_header X-Original-To-Saved #
+#bayes_ignore_header X-Original-To-Saved #
 bayes_ignore_header X-EqDomain
 bayes_ignore_header X-EqTo
 bayes_ignore_header X-Been-There
@@ -59,9 +59,9 @@ bayes_ignore_header X-CRM114-Status
 bayes_ignore_header X-CRM114-CacheID
 bayes_ignore_header X-CRM114-Notice
 bayes_ignore_header X-CRM114-Version
-bayes_ignore_header X-Sender-IP #
-bayes_ignore_header X-CIDR #
-bayes_ignore_header X-ASN #
+#bayes_ignore_header X-Sender-IP #
+#bayes_ignore_header X-CIDR #
+#bayes_ignore_header X-ASN #
 bayes_ignore_header X-Spam-Relays-External 
 bayes_ignore_header X-Spam-Relays-Internal
 bayes_ignore_header X-Spam-Relays-Trusted
@@ -69,6 +69,9 @@ bayes_ignore_header X-Spam-Relays-Untrusted
 bayes_ignore_header X-Spam-Status
 bayes_ignore_header X-Spam-Bayes
 bayes_ignore_header X-Spam-Level
+bayes_ignore_header X-Spam
+bayes_ignore_header X-Justme
+bayes_ignore_header X-Trained-As
 bayes_ignore_from add@ress.com #
 bayes_learn_to_journal 1
 
-- 
2.39.5