From: martin f. krafft <madduck@madduck.net>
Date: Sun, 23 Sep 2007 20:34:14 +0000 (+0200)
Subject: add and cleanup X-Resubmitted header
X-Git-Url: https://git.madduck.net/etc/mailfilter.git/commitdiff_plain/3d7d576505af2759a6227cec6bef322c688ec3f9?ds=inline

add and cleanup X-Resubmitted header
---

diff --git a/bin/resubmit b/bin/resubmit
index 8405e77..5ef8237 100755
--- a/bin/resubmit
+++ b/bin/resubmit
@@ -2,11 +2,12 @@
 set -eu
 
 PROCMAIL=$HOME/.etc/mailfilter/procmail/procmailrc
+FORMAIL="formail -I 'X-Resubmitted: $(date -R)'"
 
 if [ -z "${1:-}" ]; then
-  cat | exec $PROCMAIL
+  $FORMAIL | exec $PROCMAIL
 else
-  $PROCMAIL < "$1" && rm -f "$1"
+  $FORMAIL "$1" | $PROCMAIL && rm -f "$1"
 fi
 
 exit 0
diff --git a/procmail/cleanup b/procmail/cleanup
index be6dd86..0c57cc8 100644
--- a/procmail/cleanup
+++ b/procmail/cleanup
@@ -6,7 +6,7 @@
 :0 fw
 |$FORMAIL \
           -IX-EqDomain -IX-EqTo -IX-Justme -IX-Spamtrapped \
-          -IX-Delayed -IX-Tickle \
+          -IX-Delayed -IX-Tickle -IX-Resubmitted \
           -IX-Trained-As \
           -IX-UID -IX-OfflineIMAP- \
           -IX-Status -IStatus -IX-Keywords -IContent-Length