log file names based on hash of msgid

[etc/mailfilter.git] / procmail / logging

diff --git a/procmail/logging b/procmail/logging
index 7068e4d3996bbf883ff55f5b905f489e55aac24f..9f1efd0ee530fafbf6d19d6fe0322c10b8d105c9 100644 (file)
--- a/procmail/logging
+++ b/procmail/logging
@@ -5,23 +5,12 @@ MSGIDDIR=$PMVAR/msgid
 :0
 * MSGID ?? ^<\/[^>]+
 {
 :0
 * MSGID ?? ^<\/[^>]+
 {

-  MSGID_NAME=`echo $MATCH | tr -d "'\"?[:cntrl:]" | tr ' /*$' '__+S'`
+  MSGID_NAME=`echo $MATCH | sha224sum | cut -d' ' -f1`

 
 

-  #VERBOSE=yes
-  # check if filename > 228 characters and if so, then shorten it to prevent
-  # hitting filesystem limit after we append the timestamp
-  :0
-  * MSGID_NAME ?? ^.....................................................................................................................................................................................................................................
-  {
-    HASH=`echo $MSGID_NAME | md5sum | cut -d' ' -f1`
-    MSGID_NAME=`echo $MSGID_NAME | cut -c-196`$HASH
-  }
-
-  THISLOGFILE_REL=$MSGID_NAME%$OURDATE_SHORT
-  THISLOGFILE="$MSGIDDIR/$THISLOGFILE_REL"
+  THISLOGFILE_REL=${MSGID_NAME}_${OURDATE_SHORT}
+  THISLOGFILE="${MSGIDDIR}/${THISLOGFILE_REL}"

 
   MSGID_NAME
 
   MSGID_NAME

-  #VERBOSE=no

 }
 
 MASTERLOGFILE="$LOGFILE"
 }
 
 MASTERLOGFILE="$LOGFILE"


@@ -36,7 +25,8 @@ LOG="===========================================================================
 LOG="msgid:       $MSGID
 logfile:     $THISLOGFILE_REL
 date:        $DATE (@$OURDATE)
 LOG="msgid:       $MSGID
 logfile:     $THISLOGFILE_REL
 date:        $DATE (@$OURDATE)

-from:        $FROM
+sender:      $SENDER
+from:        $FROMEMAIL ($FROM)

 original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"
 
 original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"