add ie and ch paypal to skips

[etc/mailfilter.git] / procmail / logging
diff --git a/procmail/logging b/procmail/logging

index a606b2a5b1df442e77b5096c698cf6faa3130db6..a1e199a89e9ead5e6202368ace47ba7452af58ec 100644 (file)
--- a/procmail/logging
+++ b/procmail/logging
@@ -5,7 +5,7 @@ MSGIDDIR=$PMVAR/msgid
  :0
  * MSGID ?? ^<\/[^>]+
  {
  :0
  * MSGID ?? ^<\/[^>]+
  {
-  THISLOGFILE_REL=`echo $MATCH | tr -d "'\"?[:cntrl:]" | tr ' /*' '__+'`%$OURDATE_SHORT
+  THISLOGFILE_REL=`echo $MATCH | tr -d "'\"?[:cntrl:]" | tr ' /*$' '__+S'`%$OURDATE_SHORT
    THISLOGFILE="$MSGIDDIR/$THISLOGFILE_REL"
  }
  
    THISLOGFILE="$MSGIDDIR/$THISLOGFILE_REL"
  }
  
@@ -21,7 +21,9 @@ original-to: $ORIGINAL_TO
  subject:     $SUBJECT$NL"
  
  TRAP="DESTFILE=\"\${LASTFOLDER#$BASE/}\";
  subject:     $SUBJECT$NL"
  
  TRAP="DESTFILE=\"\${LASTFOLDER#$BASE/}\";
-      echo >> '$THISLOGFILE';
-      egrep -v '^XX(procmail:)?[[:space:]\"]' '$THISLOGFILE' >> $MASTERLOGFILE"
+      /usr/bin/lockfile -4 -r50 -l180 $PMVAR/lock;
+      trap \"echo >> '$THISLOGFILE';
+             /bin/cat '$THISLOGFILE' >> $MASTERLOGFILE;
+             /bin/rm -f $PMVAR/lock\" 0"
  
  #VERBOSE=yes
  
  #VERBOSE=yes