X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/519207b89004aa4a4b360767fa30aa48afaa6139..c3d55a5719b81c63c76cd118f47cd56b68a2be9d:/procmail/defines

diff --git a/procmail/defines b/procmail/defines
index dc9663a..32a6e8f 100644
--- a/procmail/defines
+++ b/procmail/defines
@@ -23,7 +23,9 @@ LC_CTYPE=de_CH.UTF-8
 
 PROCMAIL="$NICE /usr/bin/procmail -p $PMDIR/procmailrc"
 FORMAIL="$NICE /usr/bin/formail -f"
+GREP="$NICE /bin/grep"
 EGREP="$NICE /bin/egrep"
+FGREP="$NICE /bin/fgrep"
 SED="$NICE /bin/sed"
 BIN_DATE="/bin/date"
 DELIVER="$NICE /usr/lib/dovecot/deliver"
@@ -48,7 +50,7 @@ SPAMCHECK_MAX_MESSAGE_SIZE=512000
 
 # if crm114 is unsure and SA returns a score less-than-or-equal to this,
 # autotrain crm114 with ham
-CRM_UNSURE_SA_AUTOTRAIN_LIMIT_HAM=2.0
+CRM_UNSURE_SA_AUTOTRAIN_LIMIT_HAM=0.0
 # if crm114 classifies a message as spam but SA returns a score
 # less-than-or-equal to this, retrain crm114
 CRM_MISCLASSIFY_SA_AUTOTRAIN_LIMIT_HAM=-1.0
@@ -82,6 +84,7 @@ 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
 
 OURDATE="`$BIN_DATE +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`"
 :0
@@ -114,33 +117,44 @@ ID="$LOGNAME@$HOSTNAME"
 # message-id
 INCLUDERC=$PMDIR/get-msgid
 
+:0
+*$ ^From:$RE_EXTRACT_HEADER_VALUE
+{ FROM="$MATCH" }
+
 # if $SENDER is undefined or not an email address, get it from the message
 :0
 * !SENDER ?? @
-*$ ^Sender:$RE_EXTRACT_HEADER_VALUE
-{ SENDER="$MATCH" }
+{
+  :0
+  *$ ^Sender:$RE_EXTRACT_HEADER_VALUE
+  { SENDER="$MATCH" }
+
+  :0 E
+  *$ FROM ?? ^\/${RE_NOT_SPACE}+@${RE_NOT_SPACE}+
+  { SENDER="$MATCH" }
+
+  :0 E
+  * FROM ?? ^.+ <\/[^>]+
+  { SENDER="$MATCH" }
+
+  :0 E
+  * FROM ?? ^.+ \(\/[^\)]+
+  { SENDER="$MATCH" }
+}
 
 :0
 *$ ^Date:$RE_EXTRACT_HEADER_VALUE
 { DATE="$MATCH" }
 
-:0
-*$ ^From:$RE_EXTRACT_HEADER_VALUE
-{ FROM="$MATCH" }
-
 :0
 *$ ^Subject:$RE_EXTRACT_HEADER_VALUE
 {
   SUBJECT=$MATCH
 
-  # mimedecode.c: * Disclaimer: We only handle charset of iso-8859-1
   :0
-  * SUBJECT ?? ^=\?iso-8859-1\?[QB]\?.+\?=$
+  * SUBJECT ?? =\?.+\?[QBqb]\?.+\?=
   {
-    DECODED="`echo Subject: $SUBJECT | mimedecode | iconv -f latin1 -t utf-8`"
-    :0
-    *$ DECODED ?? ^Subject:$RE_EXTRACT_HEADER_VALUE
-    { SUBJECT=$MATCH }
+    SUBJECT="`PERL_UNICODE=S perl -MEncode=decode -e \"print decode(\\\"MIME-Header\\\", \\\"$SUBJECT\\\") . \\\"\n\\\";\"`"
   }
 }
 
@@ -149,7 +163,7 @@ INCLUDERC=$PMDIR/get-msgid
 { ORIGINAL_TO="$MATCH" }
 :0 E
 * ^Received:
-{ LOG="NO ORIGINAL_TO: $MSGID" }
+{ LOGLATER="NO ORIGINAL_TO: $MSGID" }
 
 :0
 *$ ^X-Trained-As:$RE_EXTRACT_HEADER_VALUE
@@ -223,3 +237,20 @@ JUSTME
 # DISABLE_DELAYS
 # if set, disables delaying messages
 DISABLE_DELAYS
+
+# DELAY
+# argument to /bin/date -d to indicate a message delay. This is overridden by
+# RELEASE
+DELAY
+
+# RELEASE
+# /bin/date time expression indicating the time at which a message is to be
+# released. Overrides DELAY.
+RELEASE
+
+# MARK_READ
+# when set, causes mails to be marked as read when delivered. Can be
+# initialised with DELIVER_READ
+MARK_READ=$DELIVER_READ
+
+# vim:ft=procmail