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

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:

add majordomo confirmation exceptions to justme
[etc/mailfilter.git] / procmail / procmailrc
index c30fddb3c96f56de46940d1841d39ea9eaef361d..12a9bdc6f1592b9a29f4b0ba98683b704f90dc56 100755 (executable)
@@ -8,39 +8,6 @@ PMDIR=$HOME/.etc/mailfilter/procmail
 
 INCLUDERC=$PMDIR/defer
 
 
 INCLUDERC=$PMDIR/defer
 
-FROM_ALBATROSS=!
-:0
-* ^X-Been-There: madduck@albatross
-{
-  M=$MATCH
-  :0
-  * M ?? ^\+.+\+\/[^@]+
-  {
-    # we have two +, so it's a virtual domain
-    L=$MATCH
-
-    :0
-    * M ?? ^\+\/[^+]+
-    { D=$MATCH }
-
-    OT="$L@$D"
-    L
-    D
-  }
-  :0 E
-  * M ?? ^\/\+?[^@]*
-  { OT="madduck$MATCH@madduck.net" }
-  M
-
-  :0 fw
-  |formail -I "X-Original-To: $OT" -A'X-From-Albatross: yes'
-  OT
-
-  FROM_ALBATROSS
-  LOG="log:     *** received $MSGID from albatross$NL"
-}
-
 INCLUDERC=$PMDIR/defines
 
 INCLUDERC=$PMDIR/ignore
 INCLUDERC=$PMDIR/defines
 
 INCLUDERC=$PMDIR/ignore
@@ -63,12 +30,17 @@ INCLUDERC=$PMDIR/justme
 INCLUDERC=$PMDIR/spamtraps
 INCLUDERC=$PMDIR/spammers
 INCLUDERC=$PMDIR/spamfilter
 INCLUDERC=$PMDIR/spamtraps
 INCLUDERC=$PMDIR/spammers
 INCLUDERC=$PMDIR/spamfilter
+
+INCLUDERC=$PMDIR/addheaders
+
 INCLUDERC=$PMDIR/handlespam
 
 #INCLUDERC=$PMDIR/autoreplies
 INCLUDERC=$PMDIR/handlespam
 
 #INCLUDERC=$PMDIR/autoreplies
-
-INCLUDERC=$PMDIR/addheaders
+INCLUDERC=$PMDIR/tickle
 
 INCLUDERC=$PMDIR/lurker
 
 INCLUDERC=$PMDIR/lurker
+INCLUDERC=$PMDIR/spool
+
+INCLUDERC=$PMDIR/listquirks
 
 INCLUDERC=$PMRULES/all
 
 INCLUDERC=$PMRULES/all