From: martin f. krafft <madduck@madduck.net>
Date: Sun, 23 Sep 2007 19:51:26 +0000 (+0200)
Subject: fix up ourdate variables
X-Git-Url: https://git.madduck.net/etc/mailfilter.git/commitdiff_plain/09d4ef213c4a6e5588c1944107a94da0ab44ee8c?ds=inline

fix up ourdate variables
---

diff --git a/procmail/defines b/procmail/defines
index 2e8c1f5..f9f6ff8 100644
--- a/procmail/defines
+++ b/procmail/defines
@@ -36,9 +36,6 @@ TRAINER="$NICE $MAILFILT/bin/train"
 
 SQLITE="$NICE /usr/bin/sqlite3"
 
-OURDATE="`date -R`"
-OURDATE_SHORT=`date +%Y.%m.%d.%H.%M.%N`
-
 BASE=$HOME/.maildir
 
 #DEFAULT="|$DELIVER"
@@ -81,6 +78,17 @@ TICKLER_QUEUE=$BASE/.tickler/
 DISCARD=$BASE/.discard/
 #DISCARD="'|$DELIVER -m BASE.discard'"
 
+OURDATE="`date +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`"
+:0
+*$ OURDATE ?? ^\/${RE_NOT_SPACE}+
+{ OURDATE_TS="$MATCH" }
+:0
+*$ OURDATE ?? ^[0-9]+${RE_SPACE}+\/${RE_NOT_SPACE}+
+{ OURDATE_SHORT="$MATCH" }
+:0
+*$ OURDATE ?? ^[0-9]+${RE_SPACE}+[0-9.]+${RE_SPACE}+\/${RE_NOT_SPACE}+
+{ OURDATE="$MATCH" }
+
 ### variables from the message
 
 ### local recipient data