properly route spam messages

[etc/mailfilter.git] / procmail / deliver

diff --git a/procmail/deliver b/procmail/deliver
index e3db0303f2b7cebe2420d95669b87efd381264a5..168ccdf78796a5b56c15e5ca481775dce2589381 100644 (file)
--- a/procmail/deliver
+++ b/procmail/deliver
@@ -1,30 +1,26 @@
-VERBOSE=yes

 :0
 :0

-*$ $DEST
-{
-  :0
-  * DEST ?? .+[^/]$
-  { DEST="$DEST/" }
+* ! DEST ?? .
+{ DEST=/ }

 
 

-  :0
-  *$ DEST ?? ^$BASE/\.
-  { }
-
-  :0 E
-  *$ DEST ?? ^\.
-  { DEST="$BASE/$DEST" }
+:0
+* DEST ?? .+[^/]$
+{ DEST="$DEST/" }

 
 

-  :0 E
-  { DEST="$BASE/.$DEST" }
+:0
+*$ DEST ?? ^$BASE/\/.+
+{ DEST="$MATCH" }

 
 

-  LOG="deliver:     delivering message $MSGID to $DEST$NL"
-  :0
-  $DEST
-}
+:0
+*$ DEST ?? ^\.
+{ }

 
 :0 E
 
 :0 E

-{
-  LOG="deliver:     delivering message $MSGID to default destination$NL"
-  :0
-  $DEFAULT
-}
+{ DEST=".$DEST" }
+
+TRAP="DEST=\"\${LASTFOLDER#$BASE/}\";
+      echo \"delivered:   \$DEST\" >> '$THISLOGFILE';
+      $TRAP"
+
+LOG="deliver:     delivering message $MSGID to $DEST$NL"
+:0
+$BASE/$DEST