Merge branch 'no-more-albatross'

diff --combined procmail/defines
index 5419eae19a6cfd3a0954355661a0fcae8694a859,f37bdcac7b4e2914ae19549159f7bef9aec28604..511e614baa14dc1707865155bed2011fcda819ca
--- 1/procmail/defines
--- 2/procmail/defines
+++ b/procmail/defines
@@@ -67,8 -67,6 +67,8 @@@ RE_FIRSTNAME="martin($RE_SPACE_NEWLINE+
  RE_LASTNAME="kraff?t"
  RE_EXTRACT_HEADER_VALUE="[    ]*\/[^  ].*"
  
 +DEJAVU_HEADER=X-Deja-Vu
 +
  NULL=/dev/null
  DISCARD=$BASE/.discard/
  #DISCARD="'|$DELIVER -m BASE.discard'"
@@@ -111,11 -109,6 +111,6 @@@ INCLUDERC=$PMDIR/get-msgi
  *$ ^Subject:$RE_EXTRACT_HEADER_VALUE
  { SUBJECT="$MATCH" }
  
- # TODO: can be removed as soon as albatross is out of the loop
- :0 fw
- * ^X-Original-To-Saved: \/.*
- |$FORMAIL -R X-Original-To-Saved X-Original-To
- 
  :0
  *$ ^X-Original-To:$RE_EXTRACT_HEADER_VALUE
  { ORIGINAL_TO="$MATCH" }
@@@ -135,11 -128,11 +130,11 @@@ INCLUDERC=$PMDIR/normalis
  
  ### run-time variables
  
 -# REPROC_MESSAGE
 +# MSG_DEJAVU
  # a procmail-style flag, which is true if unset and false if set (to !).
 -# unset by marknew if the message has already been seen by the filter (according
 +# unset by dejavu if the message has already been seen by the filter (according
  # to the X-Been-There header).
 -REPROC_MESSAGE=!
 +MSG_DEJAVU=!
  
  # SKIP_SPAMCHECKS
  # if set, cuases spamchecks to be skipped, value lists reason
@@@ -173,7 -166,3 +168,7 @@@ SPAM_UNKNOW
  # RETRAIN
  # if set, causes spamfilters to be retrained, according to the variable's value
  RETRAIN
 +
 +# JUSTME
 +# if set, contains reason why justme message was passed
 +JUSTME

diff --combined procmail/procmailrc
index 37530696ab61447c700555371c1167b0a087b888,0ecd6929668e6f449d7269180b30a3b34353fbcc..9a5562534ae87a0b87d1ed0504572cc85245f91d
--- 1/procmail/procmailrc
--- 2/procmail/procmailrc
+++ b/procmail/procmailrc
@@@ -8,39 -8,6 +8,6 @@@ PMDIR=$HOME/.etc/mailfilter/procmai
  
  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
@@@ -51,7 -18,7 +18,7 @@@ INCLUDERC=$PMDIR/smsmai
  
  INCLUDERC=$PMDIR/logging
  
 -INCLUDERC=$PMDIR/marknew
 +INCLUDERC=$PMDIR/dejavu
  INCLUDERC=$PMDIR/eqdomains
  
  INCLUDERC=$PMDIR/duplicates
@@@ -64,14 -31,8 +31,14 @@@ INCLUDERC=$PMDIR/spamtrap
  INCLUDERC=$PMDIR/spammers
  INCLUDERC=$PMDIR/spamfilter
  
 +INCLUDERC=$PMDIR/addheaders
 +
 +INCLUDERC=$PMDIR/handlespam
 +
  #INCLUDERC=$PMDIR/autoreplies
  
  INCLUDERC=$PMDIR/lurker
  
 +INCLUDERC=$PMDIR/listquirks
 +
  INCLUDERC=$PMRULES/all