]> 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 sqlite msgid index
[etc/mailfilter.git] / procmail / procmailrc
index fc4b83dcba3145adb3a52a58dd6be72139cb7314..e1f817d200e97d399fd80a2445c326fdfaeaab06 100755 (executable)
@@ -8,39 +8,6 @@ PMDIR=$HOME/.etc/mailfilter/procmail
 
 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
@@ -50,6 +17,7 @@ INCLUDERC=$PMDIR/smsmail
 #VERBOSE=yes
 
 INCLUDERC=$PMDIR/logging
+INCLUDERC=$PMDIR/msgid-index
 
 INCLUDERC=$PMDIR/dejavu
 INCLUDERC=$PMDIR/eqdomains
@@ -69,8 +37,10 @@ INCLUDERC=$PMDIR/addheaders
 INCLUDERC=$PMDIR/handlespam
 
 #INCLUDERC=$PMDIR/autoreplies
+INCLUDERC=$PMDIR/tickle
 
-INCLUDERC=$PMDIR/lurker
+#INCLUDERC=$PMDIR/lurker
+INCLUDERC=$PMDIR/spool
 
 INCLUDERC=$PMDIR/listquirks