cleanup headers we add earlier in the chain

diff --git a/procmail/cleanup b/procmail/cleanup
new file mode 100644 (file)
index 0000000..646d2ab
--- /dev/null
+++ b/procmail/cleanup
@@ -0,0 +1,6 @@
+# remove all headers our mailfilter adds
+:0 fw
+|$FORMAIL -IX-EqDomain -IX-EqTo -IX-Justme -IContent-Length
+
+# now should be idempotent
+

diff --git a/procmail/pre-spam-cleanup b/procmail/pre-spam-cleanup
index e360aad1deabc5b98a131efa6b5b5a87130cce98..93fee2afde82377998b85a051ebaf537ba6b6ba8 100755 (executable)
--- a/procmail/pre-spam-cleanup
+++ b/procmail/pre-spam-cleanup
@@ -26,6 +26,6 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 # remove other unwanted headers from all messages
 :0 fw
 |$FORMAIL -IX-Virus -IX-UID -IX-OfflineIMAP- -IX-Status -IStatus -IX-Keywords -IX-Greylist \
 # remove other unwanted headers from all messages
 :0 fw
 |$FORMAIL -IX-Virus -IX-UID -IX-OfflineIMAP- -IX-Status -IStatus -IX-Keywords -IX-Greylist \

-          -IX-Spam -IX-CRM114 -IX-Auto -IX-Trained-As -IX-EqDomain -IX-EqTo -IX-Justme
+          -IX-Spam -IX-CRM114 -IX-Auto -IX-Trained-As

 
 # now should be idempotent
 
 # now should be idempotent

diff --git a/procmail/procmailrc b/procmail/procmailrc
index e1f817d200e97d399fd80a2445c326fdfaeaab06..15ef1fb3f7149dddb4c9e3822b35ec13d7b93d79 100755 (executable)
--- a/procmail/procmailrc
+++ b/procmail/procmailrc
@@ -20,6 +20,7 @@ INCLUDERC=$PMDIR/logging
 INCLUDERC=$PMDIR/msgid-index
 
 INCLUDERC=$PMDIR/dejavu
 INCLUDERC=$PMDIR/msgid-index
 
 INCLUDERC=$PMDIR/dejavu

+INCLUDERC=$PMDIR/cleanup

 INCLUDERC=$PMDIR/eqdomains
 
 INCLUDERC=$PMDIR/duplicates
 INCLUDERC=$PMDIR/eqdomains
 
 INCLUDERC=$PMDIR/duplicates