X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/039818c50e3af456c49a920ceaacdef62fa4ea14..135f7352c47d439c1d0577a7587e88202e440bf1:/procmail/defines

diff --git a/procmail/defines b/procmail/defines
index 4d14201..8fe3a44 100644
--- a/procmail/defines
+++ b/procmail/defines
@@ -37,6 +37,8 @@ SPAMC="$NICE /usr/bin/spamc --log-to-stderr --no-safe-fallback"
 #SPAMC="$SPAMASSASSIN"
 TRAINER="$NICE $MAILFILT/bin/train"
 
+VACATION="$NICE /usr/bin/vacation"
+
 SQLITE="$NICE /usr/bin/sqlite3"
 
 BASE=$HOME/.maildir
@@ -65,7 +67,7 @@ CRM_MISCLASSIFY_SA_AUTOTRAIN_LIMIT_SPAM=11
 NL="
 "
 RE_MYDOMAIN="(.+\.)*madduck\.net"
-RE_MAILRELAYS="(seamus|clegg)\.madduck\.net"
+RE_MAILRELAYS="(seamus|swan|clegg)\.madduck\.net"
 RE_SPACE="[ 	]"
 RE_NOT_SPACE="[^ 	]"
 RE_SPACE_NEWLINE="(^|$RE_SPACE)"
@@ -85,9 +87,9 @@ SPAM=$BASE/.spam/
 
 DELAY_NEXT_WEEKEND='next sunday 28 hours ago' # fri night, 20:00
 DELAY_TONIGHT='tomorrow 00:00 4 hours ago' # tonight at 20:00
-DELAY_AFTERNOON='tomorrow 00:00 8 hours ago' # today at 16:00
+DELAY_AFTERNOON='tomorrow 00:00 7 hours ago' # today at 17:00
 
-OURDATE="`$BIN_DATE +'%s %Y%m.d.%H%M.%N %a, %d %b %Y %T %z'`"
+OURDATE="`$BIN_DATE +'%s %Y%m%d.%H%M.%N %a, %d %b %Y %T %z'`"
 :0
 *$ OURDATE ?? ^\/${RE_NOT_SPACE}+
 { OURDATE_TS="$MATCH" }
@@ -123,11 +125,11 @@ INCLUDERC=$PMDIR/get-msgid
 { FROM="$MATCH" }
 
 :0
-* FROM ?? ^.+ <\/.+@[^>]+
+* FROM ?? ^.+<\/.+@[^>]+
 { FROMEMAIL="$MATCH" }
 
 :0 E
-* FROM ?? ^.+ \(\/.+@[^\)]+
+* FROM ?? ^.+\(\/.+@[^\)]+
 { FROMEMAIL="$MATCH" }
 
 :0 E
@@ -158,12 +160,13 @@ INCLUDERC=$PMDIR/get-msgid
 :0
 *$ ^Subject:$RE_EXTRACT_HEADER_VALUE
 {
-  SUBJECT=$MATCH
+  SUBJECT="$MATCH"
 
   :0
   * SUBJECT ?? =\?.+\?[QBqb]\?.+\?=
   {
     SUBJECT="`PERL_UNICODE=S perl -MEncode=decode -e \"print decode(\\\"MIME-Header\\\", \\\"$SUBJECT\\\") . \\\"\n\\\";\"`"
+    SUBJECT_ENCODED="$MATCH"
   }
 }
 
@@ -247,6 +250,14 @@ JUSTME
 # if set, disables delaying messages
 DISABLE_DELAYS
 
+:0
+* ? test -e $HOME/procmail.nodelays
+{ DISABLE_DELAYS=true }
+
+# TZ
+# used to alter the timezone for delay calculations
+#TZ=Pacific/Auckland
+
 # DELAY
 # argument to /bin/date -d to indicate a message delay. This is overridden by
 # RELEASE