port spammers and spamtraps from albatross

[etc/mailfilter.git] / procmail / tickle

diff --git a/procmail/tickle b/procmail/tickle
index dac3fb72a1e23ea5e196b27c1e330c1aab0d5353..8ad5ac99a0b6836c992dafa4c214b3b2bc407917 100644 (file)
--- a/procmail/tickle
+++ b/procmail/tickle
@@ -5,26 +5,26 @@
   STAMP
   :0
   * MATCH ?? ^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$
   STAMP
   :0
   * MATCH ?? ^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$

-  { STAMP=$MATCH }
+  { STAMP="$MATCH (`/bin/date -d @$MATCH +%c`)" }

 
   :0 E
   * MATCH ?? ^[0-9]+m$
 
   :0 E
   * MATCH ?? ^[0-9]+m$

-  * MATCH ?? ^\/[^m]
+  * MATCH ?? ^\/[^m]+

   { DATESTR="$DATE + $MATCH months 00:00" }
 
   :0 E
   * MATCH ?? ^[0-9]+w$
   { DATESTR="$DATE + $MATCH months 00:00" }
 
   :0 E
   * MATCH ?? ^[0-9]+w$

-  * MATCH ?? ^\/[^w]
+  * MATCH ?? ^\/[^w]+

   { DATESTR="$DATE + $MATCH weeks 00:00" }
 
   :0 E
   * MATCH ?? ^[0-9]+d?$
   { DATESTR="$DATE + $MATCH weeks 00:00" }
 
   :0 E
   * MATCH ?? ^[0-9]+d?$

-  * MATCH ?? ^\/[^d]
+  * MATCH ?? ^\/[^d]+

   { DATESTR="$DATE + $MATCH days 00:00" }
 
   :0 E
   * MATCH ?? ^[0-9]+h$
   { DATESTR="$DATE + $MATCH days 00:00" }
 
   :0 E
   * MATCH ?? ^[0-9]+h$

-  * MATCH ?? ^\/[^h]
+  * MATCH ?? ^\/[^h]+

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


@@ -36,7 +36,7 @@
 
   :0
   * ! STAMP ?? .
 
   :0
   * ! STAMP ?? .

-  { STAMP=`/bin/date +%s -d "$DATESTR"` }
+  { STAMP=`/bin/date +'%s (%c)' -d "$DATESTR"` }

 
   LOG="tickle:      stamping message $MSGID with $STAMP$NL"
 
 
   LOG="tickle:      stamping message $MSGID with $STAMP$NL"