]> 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:

properly mime-decode subject lines
[etc/mailfilter.git] / procmail / spamfilter
index 37c3c33297f968ecd20fe4f5a0d799d12db20205..491f157939f95f423f179921b24fd06e7430c42e 100755 (executable)
@@ -37,13 +37,19 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
   * TRAINED_AS ?? .
   {
     LOG="spamfilter:  skipping already trained $TRAINED_AS$NL"
+    :0 fw
+    |$FORMAIL -I"X-Spam: $TRAINED_AS (already trained)"
     :0
     * TRAINED_AS ?? spam
     { IS_SPAM=already-trained }
   }
 
   :0 E
-  { LOG="spamfilter:  skipping resubmitted message$NL" }
+  {
+    LOG="spamfilter:  skipping resubmitted message$NL"
+    :0 fw
+    |$FORMAIL -I"X-Spam: unknown (resubmitted)"
+  }
 }
 
 # do not run spamfilters if the message destination is already set
@@ -51,6 +57,8 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 * DEST ?? .
 {
   LOG="spamfilter:  message already routed to '$DEST'$NL"
+  :0 fw
+  |$FORMAIL -I"X-Spam: unknown (already routed)"
   SPAM_UNKNOWN=already-destined
 }
 
@@ -91,6 +99,7 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 {
   INCLUDERC=$PMDIR/spamtraps
   INCLUDERC=$PMDIR/spammers
+  INCLUDERC=$PMDIR/spampat
   INCLUDERC=$PMDIR/pre-spam-cleanup
 
   # crm114
@@ -99,6 +108,7 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
   :0
   * !SKIP_CRM ?? .
   {
+    #TODO: somehow filter out headers we added
     :0 fw
     |$CRM114