]> git.madduck.net Git - etc/mailfilter.git/commitdiff

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:

separate from email from sender
authormartin f. krafft <madduck@madduck.net>
Mon, 31 Aug 2009 09:49:29 +0000 (11:49 +0200)
committermartin f. krafft <madduck@madduck.net>
Mon, 31 Aug 2009 09:49:29 +0000 (11:49 +0200)
procmail/defines
procmail/delay-delivery
procmail/logging

index 32a6e8f56b7286103009a8ea971dc3ac66ef6500..218ba89d7830c87688c5624503c99ecbed15b3b2 100644 (file)
@@ -121,6 +121,18 @@ INCLUDERC=$PMDIR/get-msgid
 *$ ^From:$RE_EXTRACT_HEADER_VALUE
 { FROM="$MATCH" }
 
+:0
+*$ FROM ?? ^\/${RE_NOT_SPACE}+@${RE_NOT_SPACE}+
+{ FROMEMAIL="$MATCH" }
+
+:0 E
+* FROM ?? ^.+ <\/[^>]+
+{ FROMEMAIL="$MATCH" }
+
+:0 E
+* FROM ?? ^.+ \(\/[^\)]+
+{ FROMEMAIL="$MATCH" }
+
 # if $SENDER is undefined or not an email address, get it from the message
 :0
 * !SENDER ?? @
@@ -130,16 +142,7 @@ INCLUDERC=$PMDIR/get-msgid
   { SENDER="$MATCH" }
 
   :0 E
-  *$ FROM ?? ^\/${RE_NOT_SPACE}+@${RE_NOT_SPACE}+
-  { SENDER="$MATCH" }
-
-  :0 E
-  * FROM ?? ^.+ <\/[^>]+
-  { SENDER="$MATCH" }
-
-  :0 E
-  * FROM ?? ^.+ \(\/[^\)]+
-  { SENDER="$MATCH" }
+  { SENDER="$FROMEMAIL" }
 }
 
 :0
index 339e3b696916328d5f741ae2993c2f6eb70e48c3..cf4837d1a31646b965dc25a94fb073b64d02ac8a 100644 (file)
@@ -16,7 +16,7 @@
 
 :0 E
 * ! TICKLE ?? .
-* ? echo "$SENDER" | $EGREP -qif $CONF/undelayed-senders
+* ? echo "$FROMEMAIL" | $EGREP -qif $CONF/undelayed-senders
 {
   LOG="delay:       do not delay mail from $SENDER$NL"
 }
index 67d77124efb9ec4aad089dfc6709f743c00fcab4..2f16c839966befbe6e8fec296bceabb5a36a7206 100644 (file)
@@ -36,8 +36,8 @@ LOG="===========================================================================
 LOG="msgid:       $MSGID
 logfile:     $THISLOGFILE_REL
 date:        $DATE (@$OURDATE)
-from:        $FROM
 sender:      $SENDER
+from:        $FROMEMAIL ($FROM)
 original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"