add swan as mail relay

[etc/mailfilter.git] / procmail / logging

diff --git a/procmail/logging b/procmail/logging
index 3695b7167db975d82511e366cde8b461d63b8bba..ac4b8dc4e6924ed9c94e9b0d2720ae34c62af0be 100644 (file)
--- a/procmail/logging
+++ b/procmail/logging
@@ -5,25 +5,52 @@ MSGIDDIR=$PMVAR/msgid
 :0
 * MSGID ?? ^<\/[^>]+
 {
-  THISLOGFILE_REL=`echo $MATCH | tr -d "'\"?[:cntrl:]" | tr ' /*' '__+'`%$OURDATE_SHORT
-  THISLOGFILE="$MSGIDDIR/$THISLOGFILE_REL"
+  MSGID_NAME=`echo -n $MATCH | sha224sum | cut -d' ' -f1`
+
+  :0
+  * MSGID_NAME ?? ^\/.
+  { HASH1="$MATCH" }
+
+  :0
+  * MSGID_NAME ?? ^.\/.
+  { HASH2="$MATCH" }
+
+  THISLOGFILE_REL="${HASH1}/${HASH2}/${MSGID_NAME}_${OURDATE_SHORT}"
+  LOGDIR="${MSGIDDIR}/${HASH1}/${HASH2}"
+  MKDIR=`test -d $LOGDIR || mkdir -p $LOGDIR`
+  MKDIR
+  LOGDIR
+  THISLOGFILE="${MSGIDDIR}/${THISLOGFILE_REL}"
+  HASH2
+  HASH1
+  MSGID_NAME
 }
 
 MASTERLOGFILE="$LOGFILE"
 LOGFILE="$THISLOGFILE"
 
-LOG="==============================================================================
-msgid:       $MSGID
+LOG="==============================================================================$NL"
+
+:0
+* LOGLATER ?? .
+{ LOG="$LOGLATER" }
+
+LOG="msgid:       $MSGID
 logfile:     $THISLOGFILE_REL
 date:        $DATE (@$OURDATE)
-from:        $FROM
+sender:      $SENDER
+from:        $FROMEMAIL ($FROM)
 original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"
 
+:0
+* SUBJECT_ENCODED ?? .
+{ LOG="subject-enc: $SUBJECT_ENCODED$NL" }
+
 TRAP="DESTFILE=\"\${LASTFOLDER#$BASE/}\";
       /usr/bin/lockfile -4 -r50 -l180 $PMVAR/lock;
       trap \"echo >> '$THISLOGFILE';
              /bin/cat '$THISLOGFILE' >> $MASTERLOGFILE;
              /bin/rm -f $PMVAR/lock\" 0"
 
-#VERBOSE=yes
+THISLOGFILE_REL