fix resubmit script to add received header even when there was none

[etc/mailfilter.git] / procmail / spool

diff --git a/procmail/spool b/procmail/spool
index a224e91c2ae876c6c9991b931618ef56cff9f706..0600c9ab03fd629549083352380101e265af4fb6 100644 (file)
--- a/procmail/spool
+++ b/procmail/spool
@@ -1,13 +1,24 @@
 :0 c
 *$ ! $MSG_DEJAVU
+* ! MSG_TEST ?? .
+* ! IS_SPAM ?? .
 {
-  LOG="spool:       saving message $MSGID to spool$NL"
+  LOG="spool:       saving message $MSGID$NL"
   TRAP
   :0
   $BASE/.spool/
 }
 
 :0 E
-{ LOG="spool:       not saving resubmitted message to spool$NL }
+* MSG_TEST ?? .
+{ LOG="spool:       not saving test message$NL" }
+
+:0 E
+*$ $MSG_DEJAVU
+{ LOG="spool:       not saving resubmitted message$NL" }
+
+:0
+* ORIGINAL_TO ?? ^madduck\+spool@madduck\.net$
+$NULL
 
 # vim:ft=procmail