bring undelayed senders up to date

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index 218ba89d7830c87688c5624503c99ecbed15b3b2..8fe3a449a37966ef975b5aaf65460de2198b65f4 100644 (file)
--- 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"
 
 #SPAMC="$SPAMASSASSIN"
 TRAINER="$NICE $MAILFILT/bin/train"
 

+VACATION="$NICE /usr/bin/vacation"
+

 SQLITE="$NICE /usr/bin/sqlite3"
 
 BASE=$HOME/.maildir
 SQLITE="$NICE /usr/bin/sqlite3"
 
 BASE=$HOME/.maildir


@@ -65,13 +67,14 @@ CRM_MISCLASSIFY_SA_AUTOTRAIN_LIMIT_SPAM=11
 NL="
 "
 RE_MYDOMAIN="(.+\.)*madduck\.net"
 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)"
 RE_FIRSTNAME="martin($RE_SPACE_NEWLINE+f(\.?|elix))?"
 RE_LASTNAME="kraff?t"
 RE_EXTRACT_HEADER_VALUE="$RE_SPACE*\/$RE_NOT_SPACE.*"
 RE_SPACE="[    ]"
 RE_NOT_SPACE="[^       ]"
 RE_SPACE_NEWLINE="(^|$RE_SPACE)"
 RE_FIRSTNAME="martin($RE_SPACE_NEWLINE+f(\.?|elix))?"
 RE_LASTNAME="kraff?t"
 RE_EXTRACT_HEADER_VALUE="$RE_SPACE*\/$RE_NOT_SPACE.*"

+RE_EMAILADDRESS="${RE_NOT_SPACE}+@${RE_NOT_SPACE}+\.[^         >]+"

 
 DEJAVU_HEADER=X-Deja-Vu
 
 
 DEJAVU_HEADER=X-Deja-Vu
 


@@ -84,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_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" }
 :0
 *$ OURDATE ?? ^\/${RE_NOT_SPACE}+
 { OURDATE_TS="$MATCH" }


@@ -122,15 +125,20 @@ INCLUDERC=$PMDIR/get-msgid
 { FROM="$MATCH" }
 
 :0
 { FROM="$MATCH" }
 
 :0

-*$ FROM ?? ^\/${RE_NOT_SPACE}+@${RE_NOT_SPACE}+
+* FROM ?? ^.+<\/.+@[^>]+

 { FROMEMAIL="$MATCH" }
 
 :0 E
 { FROMEMAIL="$MATCH" }
 
 :0 E

-* FROM ?? ^.+ <\/[^>]+
+* FROM ?? ^.+\(\/.+@[^\)]+

 { FROMEMAIL="$MATCH" }
 
 :0 E
 { FROMEMAIL="$MATCH" }
 
 :0 E

-* FROM ?? ^.+ \(\/[^\)]+
+*$ FROM ?? ^\/$RE_EMAILADDRESS
+{ FROMEMAIL="$MATCH" }
+
+:0
+* FROMEMAIL ?? ^".+"$
+* FROMEMAIL ?? ^"\/[^"]+

 { FROMEMAIL="$MATCH" }
 
 # if $SENDER is undefined or not an email address, get it from the message
 { FROMEMAIL="$MATCH" }
 
 # if $SENDER is undefined or not an email address, get it from the message


@@ -152,12 +160,13 @@ INCLUDERC=$PMDIR/get-msgid
 :0
 *$ ^Subject:$RE_EXTRACT_HEADER_VALUE
 {
 :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\\\";\"`"
 
   :0
   * SUBJECT ?? =\?.+\?[QBqb]\?.+\?=
   {
     SUBJECT="`PERL_UNICODE=S perl -MEncode=decode -e \"print decode(\\\"MIME-Header\\\", \\\"$SUBJECT\\\") . \\\"\n\\\";\"`"

+    SUBJECT_ENCODED="$MATCH"

   }
 }
 
   }
 }
 


@@ -241,6 +250,14 @@ JUSTME
 # if set, disables delaying messages
 DISABLE_DELAYS
 
 # 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
 # DELAY
 # argument to /bin/date -d to indicate a message delay. This is overridden by
 # RELEASE