X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/451f66ccde1a608fd45bb8d89db3d7bb1320178e..11af75d561b65b76ff0c83062909ba690ee1a2e6:/procmail/defines diff --git a/procmail/defines b/procmail/defines index 464cea3..9503524 100644 --- a/procmail/defines +++ b/procmail/defines @@ -77,10 +77,11 @@ NULL=/dev/null DELAYED_QUEUE=$BASE/.delayed/ TICKLER_QUEUE=$BASE/.tickler/ DISCARD=$BASE/.discard/ +SPAM=$BASE/.spam/ #DISCARD="'|$DELIVER -m BASE.discard'" -DELAY_NEXT_WEEKEND='next sunday 30 hours ago' # fri night, 18:00 -DELAY_TONIGHT='tomorrow 00:00 6 hours ago' # tonight at 18: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 OURDATE="`$BIN_DATE +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`" :0 @@ -90,7 +91,7 @@ OURDATE="`$BIN_DATE +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`" *$ 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 ?? ^[0-9]+${RE_SPACE}+[0-9.]+${RE_SPACE}+\/.+ { OURDATE="$MATCH" } ### variables from the message