proper handling of X-Postponed header

diff --git a/procmail/addheaders b/procmail/addheaders
index cbfc9ed6a3069b5edd2e391e0b6fb268fa32954d..6d739c119a5605a67905da40aff6605a15bada99 100644 (file)
--- a/procmail/addheaders
+++ b/procmail/addheaders
@@ -14,4 +14,8 @@
 * 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

diff --git a/procmail/defines b/procmail/defines
index 17b3d3cfd61fe9b4bcc929363b9c8238fd24eb1e..dc9663a22014f3c103f9a0c9ded08a573316fe7b 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -157,7 +157,7 @@ INCLUDERC=$PMDIR/get-msgid
 
 :0
 *$ ^X-Postponed:$RE_EXTRACT_HEADER_VALUE
 
 :0
 *$ ^X-Postponed:$RE_EXTRACT_HEADER_VALUE

-{ DELAYED="$MATCH" }
+{ POSTPONED="$MATCH" }

 
 # fix variable values for special cases
 INCLUDERC=$PMDIR/normalise
 
 # fix variable values for special cases
 INCLUDERC=$PMDIR/normalise

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index 9b795343cf9283ea54d3376ba47bd53c4aeb620b..cfe3403fad23061460a6b48d55141d6674593f18 100644 (file)
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -1,9 +1,12 @@
 #TODO: create config/delay-(disabled|tonight|weekend)
 
 #TODO: create config/delay-(disabled|tonight|weekend)
 

-:0
+:0 fw
+* POSTPONED ?? .
+|$FORMAIL -R X-Postponed X-Was-Postponed
+
+:0 E

 * ! DISABLE_DELAYS ?? .
 * DELAY ?? .
 * ! DISABLE_DELAYS ?? .
 * DELAY ?? .

-* ! DELAYED ?? .

 {
   #TODO: for tickling, use header date
   RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s %c'`"
 {
   #TODO: for tickling, use header date
   RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s %c'`"


@@ -21,9 +24,7 @@
     { 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"

-
-    :0 fw
-    |$FORMAIL -I "X-Postponed: $RELEASE_TS ($RELEASE_TIME)"
+    POSTPONED="$RELEASE_TS ($RELEASE_TIME)"

 
     INCLUDERC=$PMDIR/record-delayed-mail
 
 
     INCLUDERC=$PMDIR/record-delayed-mail
 

diff --git a/procmail/tickle b/procmail/tickle
index 65578489063b6d0fe28542b57ab87eedebf93826..6b0276a70cd045d7c4ed4e4ca5a83c8e7a745e6d 100644 (file)
--- a/procmail/tickle
+++ b/procmail/tickle
@@ -1,9 +1,14 @@
 # The X-Tickle header has priority over the Original-To address
 :0
 *$ ^X-Tickle:${RE_SPACE}+\/${RE_NOT_SPACE}+
 # The X-Tickle header has priority over the Original-To address
 :0
 *$ ^X-Tickle:${RE_SPACE}+\/${RE_NOT_SPACE}+

-{ TICKLE="$MATCH" }
+{ 
+  TICKLE="$MATCH"
+  :0 fw
+  |$FORMAIL -IX-Tickle
+}

 
 :0 E
 
 :0 E

+* ! POSTPONED ?? .

 * ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
 * ORIGINAL_TO ?? ^\/[^@]+
 { TICKLE="$MATCH" }
 * ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
 * ORIGINAL_TO ?? ^\/[^@]+
 { TICKLE="$MATCH" }