scripts/dc-dlvr: ClamAV support via clamdscan

SpamAssassin often misses messages which contain viruses,
so ClamAV should fill that gap nicely.

diff --git a/scripts/dc-dlvr b/scripts/dc-dlvr
index 2f82ff2a583df3b006434f42bd2c7b140dde192c..5ebca3fedc23ea1c0eacbe111c64cc8e7ef3cb2e 100755 (executable)
--- a/scripts/dc-dlvr
+++ b/scripts/dc-dlvr
@@ -4,6 +4,7 @@
 # This is installed as /etc/dc-dcvr on my system
 # to use with postfix main.cf: mailbox_command = /etc/dc-dlvr "$EXTENSION"
 DELIVER=/usr/lib/dovecot/deliver
+CLAMDSCAN=clamdscan
 
 # change if your spamc/spamd listens elsewhere
 spamc='spamc'
@@ -17,19 +18,27 @@ trainham,) exec $spamc -L ham > /dev/null 2>&1 ;;
 esac
 
 TMPMSG=$(mktemp -t dc-dlvr.orig.$USER.XXXXXX || exit 1)
-rm_list=$TMPMSG
+CDMSG=$(mktemp -t dc-dlvr.orig.$USER.XXXXXX || exit 1)
+rm_list="$TMPMSG $CDMSG"
+
+cat >$CDMSG
+$CLAMDSCAN --quiet - <$CDMSG
+if test $? -eq 1
+then
+       exec $DELIVER -m INBOX.spam <$CDMSG
+fi
 
 # pre-filter, for infrequently read lists which do their own spam filtering:
 if test -r ~/.dc-dlvr.pre
 then
        set -e
-       cat > $TMPMSG
+       mv -f $CDMSG $TMPMSG
        DEFAULT_INBOX=$(. ~/.dc-dlvr.pre)
        case $DEFAULT_INBOX in
        '') exec rm -f $rm_list ;;
        INBOX) ;; # do nothing
        *)
-               $DELIVER -m $DEFAULT_INBOX < $TMPMSG
+               $DELIVER -m $DEFAULT_INBOX <$TMPMSG
                exec rm -f $rm_list
                ;;
        esac
@@ -37,9 +46,9 @@ then
        rm_list="$rm_list $PREMSG"
        set +e
        mv -f $TMPMSG $PREMSG
-       $spamc -E --headers < $PREMSG > $TMPMSG
+       $spamc -E --headers <$PREMSG >$TMPMSG
 else
-       $spamc -E --headers > $TMPMSG
+       $spamc -E --headers <$CDMSG >$TMPMSG
 fi
 err=$?