improved spamtrapping of msgids

[etc/mailfilter.git] / bin / resubmit

diff --git a/bin/resubmit b/bin/resubmit
index 62275843097bfa95836b998f5205019504c2a4a9..52967a5dc03afd987a421e2b36182f3d43eb1208 100755 (executable)
--- a/bin/resubmit
+++ b/bin/resubmit
@@ -54,8 +54,9 @@ if [ "$mark_read" -eq 1 ]; then
   PROCMAIL="$PROCMAIL DELIVER_READ=1"
 fi
 
   PROCMAIL="$PROCMAIL DELIVER_READ=1"
 fi
 

-# execute the date -R only during the eval, not immediately
-FILTER='/usr/bin/formail -I"X-Resubmitted: $(date -R)"'
+DATE_R="$(date -R)"
+FILTER="sed -rne ':b;s/^(Received|Date):/&/;tf;p;n;bb' -e ':f;iReceived: by resubmission script; $DATE_R' -e ':e;p;n;be'"
+FILTER="$FILTER | /usr/bin/formail -I'X-Resubmitted: $DATE_R'"

 
 if [ -z "${files:-}" ] && [ $list -eq 0 ]; then
   eval $FILTER | exec $PROCMAIL
 
 if [ -z "${files:-}" ] && [ $list -eq 0 ]; then
   eval $FILTER | exec $PROCMAIL