]> git.madduck.net Git - etc/mailfilter.git/blobdiff - procmail/defines

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

postpone delaying and fix resubmission
[etc/mailfilter.git] / procmail / defines
index 4d3a1882b610e894985f121bfcf01b90391de6c7..2e8c1f5926ce7514e2beaddeb2dadd302b2c4b61 100644 (file)
@@ -17,6 +17,8 @@ REPLIES=$MAILFILT/autoreplies
 LOGFILE=${LOGFILE:-$PMVAR/log}
 LOGABSTRACT=no
 
+LC_CTYPE=de_CH.UTF-8
+
 #NICE='/usr/bin/nice -20'
 
 PROCMAIL="$NICE /usr/bin/procmail -p $PMDIR/procmailrc"
@@ -30,9 +32,11 @@ SA_PREFS="$MAILFILT/spamassassin/user_prefs"
 SPAMASSASSIN="$NICE /usr/bin/spamassassin --prefs-file=$SA_PREFS"
 SPAMC="$NICE /usr/bin/spamc --log-to-stderr --no-safe-fallback"
 #SPAMC="$SPAMASSASSIN"
-TRAINER="$MAILFILT/bin/train"
+TRAINER="$NICE $MAILFILT/bin/train"
+
+SQLITE="$NICE /usr/bin/sqlite3"
 
-OURDATE=`date -R`
+OURDATE="`date -R`"
 OURDATE_SHORT=`date +%Y.%m.%d.%H.%M.%N`
 
 BASE=$HOME/.maildir
@@ -42,7 +46,7 @@ DEFAULT=$BASE/
 ORGMAIL=$HOME/BOUNCED-MAIL
 
 # maximum message size for spam checking
-SPAMCHECK_MAX_MESSAGE_SIZE=2500000
+SPAMCHECK_MAX_MESSAGE_SIZE=512000
 
 # if crm114 is unsure and SA returns a score less-than-or-equal to this,
 # autotrain crm114 with ham
@@ -62,12 +66,18 @@ NL="
 "
 RE_MYDOMAIN="(.+\.)*madduck\.net"
 RE_MAILRELAYS="(seamus|clegg)\.madduck\.net"
-RE_SPACE_NEWLINE="(^|[         ])"
+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_EXTRACT_HEADER_VALUE="$RE_SPACE*\/$RE_NOT_SPACE.*"
+
+DEJAVU_HEADER=X-Deja-Vu
 
 NULL=/dev/null
+DELAYED_QUEUE=$BASE/.delayed/
+TICKLER_QUEUE=$BASE/.tickler/
 DISCARD=$BASE/.discard/
 #DISCARD="'|$DELIVER -m BASE.discard'"
 
@@ -109,17 +119,24 @@ INCLUDERC=$PMDIR/get-msgid
 *$ ^Subject:$RE_EXTRACT_HEADER_VALUE
 { SUBJECT="$MATCH" }
 
-# TODO: can be removed as soon as albatross is out of the loop
-:0 fw
-* ^X-Original-To-Saved: \/.*
-|$FORMAIL -R X-Original-To-Saved X-Original-To
-
 :0
 *$ ^X-Original-To:$RE_EXTRACT_HEADER_VALUE
 { ORIGINAL_TO="$MATCH" }
 :0 E
 { LOG="NO ORIGINAL_TO: $MSGID" }
 
+:0
+*$ ^X-Trained-As:$RE_EXTRACT_HEADER_VALUE
+{ TRAINED_AS="$MATCH" }
+
+:0
+*$ ^X-Tickle-Delivered:$RE_EXTRACT_HEADER_VALUE
+{ TICKLE_DELIVERED="$MATCH" }
+
+:0
+*$ ^X-Delayed:$RE_EXTRACT_HEADER_VALUE
+{ DELAYED="$MATCH" }
+
 # fix variable values for special cases
 INCLUDERC=$PMDIR/normalise
 
@@ -133,11 +150,16 @@ INCLUDERC=$PMDIR/normalise
 
 ### run-time variables
 
-# REPROC_MESSAGE
+# MSG_DEJAVU
 # a procmail-style flag, which is true if unset and false if set (to !).
-# unset by marknew if the message has already been seen by the filter (according
+# unset by dejavu if the message has already been seen by the filter (according
 # to the X-Been-There header).
-REPROC_MESSAGE=!
+MSG_DEJAVU=!
+
+# DEST
+# set this to a folder if the message should be delivered elsewhere than the
+# default
+DEST
 
 # SKIP_SPAMCHECKS
 # if set, cuases spamchecks to be skipped, value lists reason
@@ -171,3 +193,7 @@ SPAM_UNKNOWN
 # RETRAIN
 # if set, causes spamfilters to be retrained, according to the variable's value
 RETRAIN
+
+# JUSTME
+# if set, contains reason why justme message was passed
+JUSTME