postpone delaying and fix resubmission

diff --git a/procmail/cleanup b/procmail/cleanup
index 286614d1b5d34893548e904a5a9560229609e4b8..be6dd86038dc8b4cb8bf0c7ec46435677506264c 100644 (file)
--- a/procmail/cleanup
+++ b/procmail/cleanup
@@ -6,7 +6,7 @@
 :0 fw
 |$FORMAIL \
           -IX-EqDomain -IX-EqTo -IX-Justme -IX-Spamtrapped \
-          -IX-Delay -IX-Tickle \
+          -IX-Delayed -IX-Tickle \
           -IX-Trained-As \
           -IX-UID -IX-OfflineIMAP- \
           -IX-Status -IStatus -IX-Keywords -IContent-Length

diff --git a/procmail/defines b/procmail/defines
index 62464dd0164114ae67fd6ef2c35f396cee6b4f3f..2e8c1f5926ce7514e2beaddeb2dadd302b2c4b61 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -133,6 +133,10 @@ INCLUDERC=$PMDIR/get-msgid
 *$ ^X-Tickle-Delivered:$RE_EXTRACT_HEADER_VALUE
 { TICKLE_DELIVERED="$MATCH" }
 
+:0
+*$ ^X-Delayed:$RE_EXTRACT_HEADER_VALUE
+{ DELAYED="$MATCH" }
+
 # fix variable values for special cases
 INCLUDERC=$PMDIR/normalise
 

diff --git a/procmail/dejavu b/procmail/dejavu
index 298abaef484831106dc416682597bd2f91139fd2..269e0704644308e3c0ffb7c03aabe8df1d8fc82e 100644 (file)
--- a/procmail/dejavu
+++ b/procmail/dejavu
@@ -4,3 +4,10 @@
   LOG="dejavu:      re-processing message $MSGID$NL"
   MSG_DEJAVU
 }
+
+:0 E
+* DELAYED ?? .
+{
+  LOG="dejavu:      processing delayed message $MSGID$NL"
+  MSG_DEJAVU
+}

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index 543c01ca4dcdb4820d7dba459ca320c7f2038b6a..405cbcba33f504a327233bcc6ec79d7a194593be 100644 (file)
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -1,12 +1,9 @@
-:0
-* ^X-Mailer: swaks
-{ DELAY="30 seconds" }
-
 # create table messages (msgid text unique not null, filename text
 # primary key not null unique, release_ts integer not null);
 
 :0
 * DELAY ?? .
+* ! DELAYED ?? .
 {
   #TODO: for tickling, use header date
   RELEASE="`date -d \"now + $DELAY\" +'%s %c'`"
@@ -30,7 +27,7 @@
   TRAP="$TRAP; $DO_QUERY '$Q'"
 
   :0 fw
-  |$FORMAIL -I "X-Delay: $RELEASE_TS ($RELEASE_TIME)"
+  |$FORMAIL -I "X-Delayed: $RELEASE_TS ($RELEASE_TIME)"
 
   :0
   $DELAYED_QUEUE

diff --git a/procmail/procmailrc b/procmail/procmailrc
index 8ddb567f7420a5bd218443929f7e94b080da31d1..8cf658ac37ec72ad096a213a083c821ecde8b0df 100755 (executable)
--- a/procmail/procmailrc
+++ b/procmail/procmailrc
@@ -36,15 +36,18 @@ INCLUDERC=$PMDIR/spamfilter
 INCLUDERC=$PMDIR/handlespam
 
 #INCLUDERC=$PMDIR/autoreplies
+
 INCLUDERC=$PMDIR/tickle
-INCLUDERC=$PMDIR/delay-delivery
 
 INCLUDERC=$PMDIR/listquirks
 
+INCLUDERC=$PMRULES/all
+
+INCLUDERC=$PMDIR/addheaders
+
 #INCLUDERC=$PMDIR/lurker
 INCLUDERC=$PMDIR/spool
 
-INCLUDERC=$PMRULES/all
+INCLUDERC=$PMDIR/delay-delivery
 
-INCLUDERC=$PMDIR/addheaders
 INCLUDERC=$PMDIR/deliver