do not search headers for keywords

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index 569a7df7d3523c73eabf4db3cfa5be887929af4c..6f3f68e1a585e5c2ec85329389f643ef72b8ce72 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -87,7 +87,7 @@ 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_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'`"
+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" }


@@ -123,11 +123,11 @@ INCLUDERC=$PMDIR/get-msgid
 { FROM="$MATCH" }
 
 :0
 { FROM="$MATCH" }
 
 :0

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

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

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

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


@@ -247,6 +247,10 @@ JUSTME
 # if set, disables delaying messages
 DISABLE_DELAYS
 
 # if set, disables delaying messages
 DISABLE_DELAYS
 

+:0
+* ? test -e $HOME/procmail.nodelays
+{ DISABLE_DELAYS=true }
+

 # 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