improve SA whitelisting

[etc/mailfilter.git] / procmail / tickle

diff --git a/procmail/tickle b/procmail/tickle
index 4ba44e30ec5e2a73d65274756048e2d159b0b8f9..21287138597b719f7903d76bfb72444953c2c685 100644 (file)
--- a/procmail/tickle
+++ b/procmail/tickle
@@ -1,52 +1,69 @@
+# The X-Tickle header has priority over the Original-To address

 :0
 :0

-* ! DEST ?? .
-* ! TICKLE_DELIVERED ?? .
+* ! POSTPONED ?? .
+*$ ^X-Tickle:${RE_SPACE}+\/${RE_NOT_SPACE}+
+{ TICKLE="$MATCH" }
+
+:0 E
+* ! POSTPONED ?? .

 * ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
 * ORIGINAL_TO ?? ^\/[^@]+
 * ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
 * ORIGINAL_TO ?? ^\/[^@]+

+{ TICKLE="$MATCH" }
+
+:0
+* TICKLE ?? .
+* ! DEST ?? .

 {
   DAILY_DELIVERY_TIME=04:20
   JUST_DATE="`$BIN_DATE -d \"$DATE\" +%x`"
 
   :0
 {
   DAILY_DELIVERY_TIME=04:20
   JUST_DATE="`$BIN_DATE -d \"$DATE\" +%x`"
 
   :0

-  * MATCH ?? ^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$
-  { DELAY="@$MATCH" }
+  * TICKLE ?? ^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$
+  { DELAY="@$TICKLE" }

 
   :0 E
 
   :0 E

-  * MATCH ?? ^[0-9]+h$
-  * MATCH ?? ^\/[^h]+
+  * TICKLE ?? ^[0-9]+h$
+  * TICKLE ?? ^\/[^h]+

   { DELAY="$DATE + $MATCH hours" }
 
   :0 E
   { DELAY="$DATE + $MATCH hours" }
 
   :0 E

-  * MATCH ?? ^[0-9]+m$
-  * MATCH ?? ^\/[^m]+
+  * TICKLE ?? ^[0-9]+m$
+  * TICKLE ?? ^\/[^m]+

   { DELAY="$JUST_DATE + $MATCH months $DAILY_DELIVERY_TIME" }
 
   :0 E
   { DELAY="$JUST_DATE + $MATCH months $DAILY_DELIVERY_TIME" }
 
   :0 E

-  * MATCH ?? ^[0-9]+w$
-  * MATCH ?? ^\/[^w]+
+  * TICKLE ?? ^[0-9]+w$
+  * TICKLE ?? ^\/[^w]+

   { DELAY="$JUST_DATE + $MATCH weeks $DAILY_DELIVERY_TIME" }
 
   :0 E
   { DELAY="$JUST_DATE + $MATCH weeks $DAILY_DELIVERY_TIME" }
 
   :0 E

-  * MATCH ?? ^[0-9]+d?$
-  * MATCH ?? ^\/[^d]+
+  * TICKLE ?? ^[0-9]+d?$
+  * TICKLE ?? ^\/[^d]+

   { DELAY="$JUST_DATE + $MATCH days $DAILY_DELIVERY_TIME" }
 
   { DELAY="$JUST_DATE + $MATCH days $DAILY_DELIVERY_TIME" }
 

-  JUST_DATE
-  DAILY_DELIVERY_TIME
-

   :0 E
   {
   :0 E
   {

-    LOG="tickle:      invalid date string: $MATCH$NL"
+    LOG="tickle:      invalid tickler date string: $TICKLE$NL"

     EXITCODE=69
     HOST
   }
 
     EXITCODE=69
     HOST
   }
 

+  JUST_DATE
+  DAILY_DELIVERY_TIME
+
+  :0
+  { RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s (%c)'`" }
+
+  LOG="tickle:      delaying message until $RELEASE$NL"
+  DELAYED_QUEUE=$TICKLER_QUEUE
+

   :0 fw
   :0 fw

-  |$FORMAIL -i "X-Tickle: $DELAY"
+  |$FORMAIL -I"X-Tickle: $RELEASE"

 
 

-  LOG="tickle:      delaying message until $DELAY$NL"
+  # store messages as read
+  MARK_READ=tickler

 
 

-  # unset DISABLE_DELAYS to enable delaying for tickle messages
+  # unset DISABLE_DELAYS to always enable delaying for tickle messages

   DISABLE_DELAYS
 }
 
   DISABLE_DELAYS
 }