]> git.madduck.net Git - etc/mailfilter.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

delete X-Trained-As header after storing value in variable
authormartin f. krafft <madduck@madduck.net>
Sun, 23 Sep 2007 15:11:44 +0000 (17:11 +0200)
committermartin f. krafft <madduck@madduck.net>
Sun, 23 Sep 2007 15:11:44 +0000 (17:11 +0200)
procmail/cleanup
procmail/defines
procmail/spamfilter

index 646d2ab5a11f28fa3f606dbfe539ee9a395532f9..0d71fd81932e2e700a88ddc9d21a3084afa6b97a 100644 (file)
@@ -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
 # remove all headers our mailfilter adds
 :0 fw
 |$FORMAIL -IX-EqDomain -IX-EqTo -IX-Justme -IContent-Length
index 9b404dece944c03fb2de0a44f6409d26c36e6abc..e423f06f502482dcddc8ed8df1eb2e84e29c34cc 100644 (file)
@@ -174,3 +174,7 @@ RETRAIN
 # JUSTME
 # if set, contains reason why justme message was passed
 JUSTME
 # 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
index 95a0cbce80455c10f20afc941ee7b25b871fc52b..9e88642e942f76a32de62fad70bb7bad5e5f13cb 100755 (executable)
@@ -29,21 +29,21 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 #  |$FORMAIL -I"X-Spam: spamtrapped"
 #}
 
 #  |$FORMAIL -I"X-Spam: spamtrapped"
 #}
 
-# check whether this message is being reinjected
+# check whether this message is being resubmitted
 :0
 *$ $MSG_DEJAVU
 {
   :0
 :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
     :0
-    * MATCH ?? spam
+    * TRAINED_AS ?? spam
     { IS_SPAM=already-trained }
   }
 
   :0 E
     { 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
 }
 
 # let earlier parts of the mailfilter cause bypassing the checks