improved spamtrapping of msgids

[etc/mailfilter.git] / procmail / logging

diff --git a/procmail/logging b/procmail/logging
index b5de2006728367985fc92c35845898584006cd42..ac4b8dc4e6924ed9c94e9b0d2720ae34c62af0be 100644 (file)
--- a/procmail/logging
+++ b/procmail/logging
@@ -5,7 +5,7 @@ MSGIDDIR=$PMVAR/msgid
 :0
 * MSGID ?? ^<\/[^>]+
 {
 :0
 * MSGID ?? ^<\/[^>]+
 {

-  MSGID_NAME=`echo $MATCH | sha224sum | cut -d' ' -f1`
+  MSGID_NAME=`echo -n $MATCH | sha224sum | cut -d' ' -f1`

 
   :0
   * MSGID_NAME ?? ^\/.
 
   :0
   * MSGID_NAME ?? ^\/.


@@ -15,19 +15,12 @@ MSGIDDIR=$PMVAR/msgid
   * MSGID_NAME ?? ^.\/.
   { HASH2="$MATCH" }
 
   * MSGID_NAME ?? ^.\/.
   { HASH2="$MATCH" }
 

-  THISLOGFILE_REL=${MSGID_NAME}_${OURDATE_SHORT}
+  THISLOGFILE_REL="${HASH1}/${HASH2}/${MSGID_NAME}_${OURDATE_SHORT}"

   LOGDIR="${MSGIDDIR}/${HASH1}/${HASH2}"
   LOGDIR="${MSGIDDIR}/${HASH1}/${HASH2}"

-
-  VERBOSE=yes
-

   MKDIR=`test -d $LOGDIR || mkdir -p $LOGDIR`
   MKDIR
   MKDIR=`test -d $LOGDIR || mkdir -p $LOGDIR`
   MKDIR

-
-  THISLOGFILE="${LOGDIR}/${THISLOGFILE_REL}"
-
-  VERBOSE=no
-

   LOGDIR
   LOGDIR

+  THISLOGFILE="${MSGIDDIR}/${THISLOGFILE_REL}"

   HASH2
   HASH1
   MSGID_NAME
   HASH2
   HASH1
   MSGID_NAME


@@ -50,6 +43,10 @@ from:        $FROMEMAIL ($FROM)
 original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"
 
 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';
 TRAP="DESTFILE=\"\${LASTFOLDER#$BASE/}\";
       /usr/bin/lockfile -4 -r50 -l180 $PMVAR/lock;
       trap \"echo >> '$THISLOGFILE';