fix timestamp in OURDATE

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index e7d991a7aaa772f037e6a89b6eb728085020147b..c825b51fbfdc2326b02bc8316f175302a109aebc 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -23,6 +23,7 @@ PROCMAIL="$NICE /usr/bin/procmail -p $PMDIR/procmailrc"
 FORMAIL="$NICE /usr/bin/formail -f"
 EGREP="$NICE /bin/egrep"
 SED="$NICE /bin/sed"
 FORMAIL="$NICE /usr/bin/formail -f"
 EGREP="$NICE /bin/egrep"
 SED="$NICE /bin/sed"

+DELIVER="$NICE /usr/lib/dovecot/deliver"

 
 CRM114="$NICE /usr/share/crm114/mailreaver.crm -u $MAILFILT/crm114/"
 SA_PREFS="$MAILFILT/spamassassin/user_prefs"
 
 CRM114="$NICE /usr/share/crm114/mailreaver.crm -u $MAILFILT/crm114/"
 SA_PREFS="$MAILFILT/spamassassin/user_prefs"


@@ -32,10 +33,11 @@ SPAMC="$NICE /usr/bin/spamc -lx"
 TRAINER="$MAILFILT/bin/train"
 
 OURDATE=`date -R`
 TRAINER="$MAILFILT/bin/train"
 
 OURDATE=`date -R`

-OURDATE_SHORT=`date +%Y.%m.%d.%H.%m.%N`
+OURDATE_SHORT=`date +%Y.%m.%d.%H.%M.%N`

 
 INBOX=$HOME/.maildir
 
 
 INBOX=$HOME/.maildir
 

+#DEFAULT="|$DELIVER"

 DEFAULT=$INBOX/
 ORGMAIL=$HOME/BOUNCED-MAIL
 
 DEFAULT=$INBOX/
 ORGMAIL=$HOME/BOUNCED-MAIL
 


@@ -67,6 +69,7 @@ RE_EXTRACT_HEADER_VALUE="[    ]*\/[^  ].*"
 
 NULL=/dev/null
 DISCARD=$INBOX/.discard/
 
 NULL=/dev/null
 DISCARD=$INBOX/.discard/

+#DISCARD="'|$DELIVER -m INBOX.discard'"

 
 ### variables from the message
 
 
 ### variables from the message