]> 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:

leave X-Tickle header for tickle messages
authormartin f. krafft <madduck@madduck.net>
Mon, 3 Mar 2008 15:35:04 +0000 (16:35 +0100)
committermartin f. krafft <madduck@madduck.net>
Mon, 3 Mar 2008 15:35:04 +0000 (16:35 +0100)
procmail/defines
procmail/delay-delivery
procmail/tickle

index 1c55b63f4cda5c10c4001b798d463dc3bacbd1c1..514a69023bf3997f47059162ab74fc46726339f7 100644 (file)
@@ -224,3 +224,12 @@ JUSTME
 # DISABLE_DELAYS
 # if set, disables delaying messages
 DISABLE_DELAYS
+
+# DELAY
+# argument to /bin/date -d to indicate a message delay. This is overridden by
+# RELEASE
+DELAY
+
+# RELEASE
+# /bin/date time expression indicating the time at which a message is to be
+# released. Overrides DELAY.
index 65f02e5eb64b3053662fc4aec0f4a7eb8e0c7145..9e8e02a5345c7d8876982928c69ff4f3999e8a5d 100644 (file)
 }
 
 :0 E
-* DELAY ?? .
+* 1^0 DELAY ?? .
+* 1^0 RELEASE ?? .
 {
-  #TODO: for tickling, use header date
-  RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s %c'`"
+  :0
+  * ! RELEASE ?? .
+  { RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s (%c)'`" }
+  DELAY
 
   :0
   *$ RELEASE ?? ^\/${RE_NOT_SPACE}+
   *$ -$OURDATE_TS ^0
   {
     :0
-    *$ RELEASE ?? ^[0-9]+${RE_SPACE}+\/.+
+    *$ RELEASE ?? ^[0-9]+${RE_SPACE}+\(\/[^)]+
     { RELEASE_TIME="$MATCH" }
 
     LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
 
+    RELEASE_TIME
+
     :0 fw
-    |$FORMAIL -I"X-Postponed: $RELEASE_TS ($RELEASE_TIME)"
+    |$FORMAIL -I"X-Postponed: $RELEASE"
 
     INCLUDERC=$PMDIR/record-delayed-mail
     :0
     $DELAYED_QUEUE
   }
+  RELEASE_TS
 }
index 1a3388d860617a01b0dcec93eba56ff943352697..0a40a1bcabedf03393fa818cb2507101dd512171 100644 (file)
@@ -1,11 +1,7 @@
 # The X-Tickle header has priority over the Original-To address
 :0
 *$ ^X-Tickle:${RE_SPACE}+\/${RE_NOT_SPACE}+
-{ 
-  TICKLE="$MATCH"
-  :0 fw
-  |$FORMAIL -IX-Tickle
-}
+{ TICKLE="$MATCH" }
 
 :0 E
 * ! POSTPONED ?? .
   JUST_DATE
   DAILY_DELIVERY_TIME
 
-  LOG="tickle:      delaying message until $DELAY$NL"
+  :0
+  { RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s (%c)'`" }
+
+  LOG="tickle:      delaying message until $RELEASE$NL"
   DELAYED_QUEUE=$TICKLER_QUEUE
 
+  :0 fw
+  |$FORMAIL -I"X-Tickle: $RELEASE"
+
   # unset DISABLE_DELAYS to always enable delaying for tickle messages
   DISABLE_DELAYS
 }