extract headers early, also tickle-delivered, and clean up those

diff --git a/procmail/cleanup b/procmail/cleanup
index 1ce8cf26f983f4472601c8f9ed135309abf06537..286614d1b5d34893548e904a5a9560229609e4b8 100644 (file)
--- a/procmail/cleanup
+++ b/procmail/cleanup
@@ -1,7 +1,3 @@
-:0
-* ^X-Trained-As: \/(h|sp)am
-{ TRAINED_AS=$MATCH }
-
 # remove all headers added in the *local* mail chain:
 #   1. added by this mailfilter
 #   2. added by the retraining system
@@ -10,6 +6,7 @@
 :0 fw
 |$FORMAIL \
           -IX-EqDomain -IX-EqTo -IX-Justme -IX-Spamtrapped \
+          -IX-Delay -IX-Tickle \
           -IX-Trained-As \
           -IX-UID -IX-OfflineIMAP- \
           -IX-Status -IStatus -IX-Keywords -IContent-Length

diff --git a/procmail/defines b/procmail/defines
index a54408906e09f6f4b6303a4debc208bf18b7fe2a..62464dd0164114ae67fd6ef2c35f396cee6b4f3f 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -125,6 +125,14 @@ INCLUDERC=$PMDIR/get-msgid
 :0 E
 { LOG="NO ORIGINAL_TO: $MSGID" }
 
+:0
+*$ ^X-Trained-As:$RE_EXTRACT_HEADER_VALUE
+{ TRAINED_AS="$MATCH" }
+
+:0
+*$ ^X-Tickle-Delivered:$RE_EXTRACT_HEADER_VALUE
+{ TICKLE_DELIVERED="$MATCH" }
+
 # fix variable values for special cases
 INCLUDERC=$PMDIR/normalise
 
@@ -185,7 +193,3 @@ 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/tickle b/procmail/tickle
index caa09bdb644c8ef812764a6c538e3802edadd9a5..157ed9db23de8f08b109d7d73a770432d4d64255 100644 (file)
--- a/procmail/tickle
+++ b/procmail/tickle
@@ -1,7 +1,7 @@
 :0
 * ! DEST ?? .
+* ! TICKLE_DELIVERED ?? .
 * ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
-* !^X-Tickle-Delivered
 * ORIGINAL_TO ?? ^\/[^@]+
 {
   BIN_DATE=/bin/date