delete X-Trained-As header after storing value in variable

diff --git a/procmail/cleanup b/procmail/cleanup
index 646d2ab5a11f28fa3f606dbfe539ee9a395532f9..0d71fd81932e2e700a88ddc9d21a3084afa6b97a 100644 (file)
--- a/procmail/cleanup
+++ b/procmail/cleanup
@@ -1,3 +1,7 @@
+:0
+* ^X-Trained-As: \/(h|sp)am
+{ TRAINED_AS=$MATCH }
+
 # remove all headers our mailfilter adds
 :0 fw
 |$FORMAIL -IX-EqDomain -IX-EqTo -IX-Justme -IContent-Length

diff --git a/procmail/defines b/procmail/defines
index 9b404dece944c03fb2de0a44f6409d26c36e6abc..e423f06f502482dcddc8ed8df1eb2e84e29c34cc 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -174,3 +174,7 @@ RETRAIN
 # JUSTME
 # if set, contains reason why justme message was passed
 JUSTME
+
+# TRAINED_AS
+# if set, contains category with which this message has just been trained
+TRAINED_AS

diff --git a/procmail/spamfilter b/procmail/spamfilter
index 95a0cbce80455c10f20afc941ee7b25b871fc52b..9e88642e942f76a32de62fad70bb7bad5e5f13cb 100755 (executable)
--- a/procmail/spamfilter
+++ b/procmail/spamfilter
@@ -29,21 +29,21 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 #  |$FORMAIL -I"X-Spam: spamtrapped"
 #}
 
-# check whether this message is being reinjected
+# check whether this message is being resubmitted
 :0
 *$ $MSG_DEJAVU
 {
   :0
-  * ^X-Trained-As: \/(h|sp)am
+  * TRAINED_AS ?? .
   {
-    LOG="spamfilter:  skipping already trained $MATCH$NL"
+    LOG="spamfilter:  skipping already trained $TRAINED_AS$NL"
     :0
-    * MATCH ?? spam
+    * TRAINED_AS ?? spam
     { IS_SPAM=already-trained }
   }
 
   :0 E
-  { LOG="spamfilter:  skipping reinjected message$NL" }
+  { LOG="spamfilter:  skipping resubmitted message$NL" }
 }
 
 # let earlier parts of the mailfilter cause bypassing the checks