]> 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:

compact short date format
[etc/mailfilter.git] / procmail / defines
index 218ba89d7830c87688c5624503c99ecbed15b3b2..4d14201f2d3daa43f3a268612e3a324b53b50ef2 100644 (file)
@@ -72,6 +72,7 @@ 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
 
@@ -86,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
 
-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" }
@@ -122,15 +123,20 @@ INCLUDERC=$PMDIR/get-msgid
 { FROM="$MATCH" }
 
 :0
-*$ FROM ?? ^\/${RE_NOT_SPACE}+@${RE_NOT_SPACE}+
+* FROM ?? ^.+ <\/.+@[^>]+
 { FROMEMAIL="$MATCH" }
 
 :0 E
-* FROM ?? ^.+ <\/[^>]+
+* FROM ?? ^.+ \(\/.+@[^\)]+
 { 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