]> git.madduck.net Git - etc/mailfilter.git/commitdiff

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:

do not use addheaders for postpone
authormartin f. krafft <madduck@madduck.net>
Mon, 3 Mar 2008 11:52:20 +0000 (12:52 +0100)
committermartin f. krafft <madduck@madduck.net>
Mon, 3 Mar 2008 11:52:20 +0000 (12:52 +0100)
procmail/addheaders
procmail/delay-delivery

index 6d739c119a5605a67905da40aff6605a15bada99..cbfc9ed6a3069b5edd2e391e0b6fb268fa32954d 100644 (file)
@@ -14,8 +14,4 @@
 * EQ_DOMAIN ?? .
 |$FORMAIL -A"X-EqDomain: $ORIG_DOMAIN" -A"X-EqTo: $EQ_LOCAL@$EQ_DOMAIN"
 
 * EQ_DOMAIN ?? .
 |$FORMAIL -A"X-EqDomain: $ORIG_DOMAIN" -A"X-EqTo: $EQ_LOCAL@$EQ_DOMAIN"
 
-:0 fw
-* POSTPONED ?? .
-|$FORMAIL -I"X-Postponed: $POSTPONED"
-
 # vim:ft=procmail
 # vim:ft=procmail
index 6a4717c3227479caba0b5f8922bfbfad885504ff..65f02e5eb64b3053662fc4aec0f4a7eb8e0c7145 100644 (file)
     { RELEASE_TIME="$MATCH" }
 
     LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
     { RELEASE_TIME="$MATCH" }
 
     LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
-    POSTPONED="$RELEASE_TS ($RELEASE_TIME)"
 
 
-    INCLUDERC=$PMDIR/record-delayed-mail
-    INCLUDERC=$PMDIR/addheaders
+    :0 fw
+    |$FORMAIL -I"X-Postponed: $RELEASE_TS ($RELEASE_TIME)"
 
 
+    INCLUDERC=$PMDIR/record-delayed-mail
     :0
     $DELAYED_QUEUE
   }
     :0
     $DELAYED_QUEUE
   }