]> git.madduck.net Git - etc/mailfilter.git/blobdiff - procmail/spamfilter

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:

also skip spamfiltering for reinjected messages
[etc/mailfilter.git] / procmail / spamfilter
index 066b9cbd7845ca878c43036ee08559eb33e55bd0..95a0cbce80455c10f20afc941ee7b25b871fc52b 100755 (executable)
@@ -30,15 +30,20 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 #}
 
 # check whether this message is being reinjected
 #}
 
 # check whether this message is being reinjected
-TRAINED_AS
 :0
 *$ $MSG_DEJAVU
 :0
 *$ $MSG_DEJAVU
-* ^X-Trained-As: \/(h|sp)am
 {
 {
-  LOG="spamfilter:  skipping already trained $MATCH$NL"
   :0
   :0
-  * MATCH ?? spam
-  { IS_SPAM=already-trained }
+  * ^X-Trained-As: \/(h|sp)am
+  {
+    LOG="spamfilter:  skipping already trained $MATCH$NL"
+    :0
+    * MATCH ?? spam
+    { IS_SPAM=already-trained }
+  }
+
+  :0 E
+  { LOG="spamfilter:  skipping reinjected message$NL" }
 }
 
 # let earlier parts of the mailfilter cause bypassing the checks
 }
 
 # let earlier parts of the mailfilter cause bypassing the checks
@@ -261,6 +266,7 @@ TRAINED_AS
   |$FORMAIL -I"X-Spam: spamtrapped ham"
   IS_SPAM=spamtrapped-ham
   RETRAIN=spam
   |$FORMAIL -I"X-Spam: spamtrapped ham"
   IS_SPAM=spamtrapped-ham
   RETRAIN=spam
+  SPAM_UNSURE
 }
 
 #VERBOSE=no
 }
 
 #VERBOSE=no