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:

fix up tickler
authormartin f. krafft <madduck@madduck.net>
Fri, 29 Feb 2008 14:24:23 +0000 (15:24 +0100)
committermartin f. krafft <madduck@madduck.net>
Fri, 29 Feb 2008 14:24:23 +0000 (15:24 +0100)
procmail/cleanup
procmail/defines
procmail/delay-delivery
procmail/tickle

index b73929142b7507fb64f76993ad665c9d238ad8bb..e22b58bf0d573b25e0d757830cf92e3cb9a2e9ae 100644 (file)
@@ -1,6 +1,6 @@
 # remove all headers added in the *local* mail chain:
 #   1. added by this mailfilter
-#      (but not X-Tickle, X-Delayed, or X-Resubmitted)
+#      (but not X-Tickle, X-Postponed, or X-Resubmitted)
 #   2. added by the retraining system
 #   3. added by offlineimap
 #   4. added by the MUA
index a24641c3d20a5e739a15b16731a172d8f43ecef5..17b3d3cfd61fe9b4bcc929363b9c8238fd24eb1e 100644 (file)
@@ -156,11 +156,7 @@ INCLUDERC=$PMDIR/get-msgid
 { TRAINED_AS="$MATCH" }
 
 :0
-*$ ^X-Tickle-Delivered:$RE_EXTRACT_HEADER_VALUE
-{ TICKLE_DELIVERED="$MATCH" }
-
-:0
-*$ ^X-Delayed:$RE_EXTRACT_HEADER_VALUE
+*$ ^X-Postponed:$RE_EXTRACT_HEADER_VALUE
 { DELAYED="$MATCH" }
 
 # fix variable values for special cases
index e68d829194c0b8d7121a826f315c058c15f90d70..9b795343cf9283ea54d3376ba47bd53c4aeb620b 100644 (file)
@@ -5,10 +5,6 @@
 * DELAY ?? .
 * ! DELAYED ?? .
 {
-  :0
-  * DELAY ?? ^[0-9]
-  { DELAY="now + $DELAY" }
-
   #TODO: for tickling, use header date
   RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s %c'`"
 
@@ -27,7 +23,7 @@
     LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
 
     :0 fw
-    |$FORMAIL -I "X-Delayed: $RELEASE_TS ($RELEASE_TIME)"
+    |$FORMAIL -I "X-Postponed: $RELEASE_TS ($RELEASE_TIME)"
 
     INCLUDERC=$PMDIR/record-delayed-mail
 
index fbb8a760f0eb17603afcc7efa627c00d490409af..65578489063b6d0fe28542b57ab87eedebf93826 100644 (file)
@@ -1,16 +1,16 @@
+# The X-Tickle header has priority over the Original-To address
 :0
-* ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
-* ORIGINAL_TO ?? ^\/[^@]+
+*$ ^X-Tickle:${RE_SPACE}+\/${RE_NOT_SPACE}+
 { TICKLE="$MATCH" }
 
 :0 E
-*$ ^X-Tickle:${RE_SPACE}+\/${RE_NOT_SPACE}+
+* ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
+* ORIGINAL_TO ?? ^\/[^@]+
 { TICKLE="$MATCH" }
 
 :0
 * TICKLE ?? .
 * ! DEST ?? .
-* ! TICKLE_DELIVERED ?? .
 {
   DAILY_DELIVERY_TIME=04:20
   JUST_DATE="`$BIN_DATE -d \"$DATE\" +%x`"