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

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:

fix devlivery of messages, now last match wins
[etc/mailfilter.git] / procmail / to-gmail
index 4909c0c5d425ad2f6cd1c5b2a479a0891d69ee07..59df5cc0753ac7d1482e7f2f96e947f6e38f5535 100644 (file)
@@ -1,11 +1,23 @@
-:0 c
+:0
 * ORIG_DOMAIN ?? ^(mass|r2e)\.madduck\.net$
 * ORIG_DOMAIN ?? ^(mass|r2e)\.madduck\.net$
-* !^X-Mailer: swaks
 {
 {
-  LOG="gmail:       archiving message $MSGID with gmail$NL"
-  SENDMAILFLAGS="$SENDMAILFLAGS -f $ID"
-  TRAP=""
+  :0 c
+  *$ ! $MSG_DEJAVU
+  * ! MSG_TEST ?? .
+  {
+    LOG="gmail:       archiving message $MSGID with gmail$NL"
+    SENDMAILFLAGS="$SENDMAILFLAGS -f $ID"
+    TRAP
 
 
-  :0
-  ! martin.krafft@gmail.com
+    :0
+    ! martin.krafft@gmail.com
+  }
+
+  :0 E
+  * MSG_TEST ?? .
+  { LOG="gmail:       not archiving message test message with gmail$NL" }
+
+  :0 E
+  *$ $MSG_DEJAVU
+  { LOG="gmail:       not archiving message resubmitted message with gmail$NL" }
 }
 }