fix short date format

[etc/mailfilter.git] / procmail / logging

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

-  THISLOGFILE_REL=`echo $MATCH | tr -d "'\"?[:cntrl:]" | tr ' /*' '__+'`%$OURDATE_SHORT
-  THISLOGFILE="$MSGIDDIR/$THISLOGFILE_REL"
+  MSGID_NAME=`echo $MATCH | sha224sum | cut -d' ' -f1`
+
+  THISLOGFILE_REL=${MSGID_NAME}_${OURDATE_SHORT}
+  THISLOGFILE="${MSGIDDIR}/${THISLOGFILE_REL}"
+
+  MSGID_NAME

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

-LOG="==============================================================================
-msgid:       $MSGID
+LOG="==============================================================================$NL"
+
+:0
+* LOGLATER ?? .
+{ LOG="$LOGLATER" }
+
+LOG="msgid:       $MSGID

 logfile:     $THISLOGFILE_REL
 date:        $DATE (@$OURDATE)
 logfile:     $THISLOGFILE_REL
 date:        $DATE (@$OURDATE)

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

 original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"
 
 TRAP="DESTFILE=\"\${LASTFOLDER#$BASE/}\";
 original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"
 
 TRAP="DESTFILE=\"\${LASTFOLDER#$BASE/}\";

+      /usr/bin/lockfile -4 -r50 -l180 $PMVAR/lock;

       trap \"echo >> '$THISLOGFILE';
       trap \"echo >> '$THISLOGFILE';

-             cat '$THISLOGFILE' >> $MASTERLOGFILE\" 0"
+             /bin/cat '$THISLOGFILE' >> $MASTERLOGFILE;
+             /bin/rm -f $PMVAR/lock\" 0"

 
 

-#VERBOSE=yes
+THISLOGFILE_REL