Merge branch 'no-more-albatross'

diff --git a/procmail/defines b/procmail/defines
index 5419eae19a6cfd3a0954355661a0fcae8694a859..511e614baa14dc1707865155bed2011fcda819ca 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -111,11 +111,6 @@ INCLUDERC=$PMDIR/get-msgid
 *$ ^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" }

diff --git a/procmail/procmailrc b/procmail/procmailrc
index 37530696ab61447c700555371c1167b0a087b888..9a5562534ae87a0b87d1ed0504572cc85245f91d 100755 (executable)
--- a/procmail/procmailrc
+++ b/procmail/procmailrc
@@ -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

diff --git a/procmail/to-albatross b/procmail/to-albatross
deleted file mode 100644 (file)
index 5ba4a2c..0000000
--- a/procmail/to-albatross
+++ /dev/null
@@ -1,25 +0,0 @@
-:0 c
-*$ ! $FROM_ALBATROSS
-* !^X-Mailer: swaksDISABLED
-{
-  :0 f
-  |$FORMAIL -R X-Original-To X-Original-To-Saved
-
-  :0
-  * ^Return-Path: *<\/[^>]*
-  { SENDMAILFLAGS="$SENDMAILFLAGS -f $MATCH" }
-
-  LOG="log:     *** bouncing message $MSGID to albatross$NL"
-  TRAP=""
-
-  :0
-  ! madduck${EXTENSION:++$EXTENSION}@albatross.madduck.net
-}
-
-:0 E
-{ 
-  LOG="log:     *** received $MSGID from albatross$NL"
-
-  :0 fw
-  |$FORMAIL -A'X-From-Albatross: yes'
-}