1 diff -urN amavisd-snapshot-20020300.org/amavis/amavisd.conf.in amavisd-snapshot-20020300/amavis/amavisd.conf.in
2 --- amavisd-snapshot-20020300.org/amavis/amavisd.conf.in Thu Jun 6 22:51:22 2002
3 +++ amavisd-snapshot-20020300/amavis/amavisd.conf.in Thu Jun 6 22:56:59 2002
6 $AVPDIR = dirname($avp);
8 +# Clam AntiVirus http://www.konarski.edu.pl/~zolw/clam.html
9 +$clamav = "@clamscan@";
11 # KasperskyLab AVPDaemon / AvpDaemonClient
13 # use AvpDaemon and AvpDaemonClient
14 diff -urN amavisd-snapshot-20020300.org/amavis/amavisd.in amavisd-snapshot-20020300/amavis/amavisd.in
15 --- amavisd-snapshot-20020300.org/amavis/amavisd.in Thu Jun 6 22:51:22 2002
16 +++ amavisd-snapshot-20020300/amavis/amavisd.in Thu Jun 6 23:19:59 2002
20 # Av scanners and related vars
21 -use vars qw ( $antivir $avp $avpdc $AVPDIR $csav $fprot $fsav $inocucmd $nod32
22 +use vars qw ( $antivir $avp $avpdc $AVPDIR $csav $fprot $fsav $inocucmd $nod32 $clamav
23 $nod32cli $oav $panda $rav $sophos $sophos_ide_path $cscmdline $scs_host $scs_port $uvscan $vbengcl $vscan
24 $vfind $sophie_sockname $trophie_sockname $mksvir );
30 +@clamav_scanner_frag@
34 diff -urN amavisd-snapshot-20020300.org/amavis/av/clamav amavisd-snapshot-20020300/amavis/av/clamav
35 --- amavisd-snapshot-20020300.org/amavis/av/clamav Thu Jan 1 01:00:00 1970
36 +++ amavisd-snapshot-20020300/amavis/av/clamav Fri Jun 7 00:07:04 2002
39 +# clamav (GPL) http://www.konarski.edu.pl/~zolw/clam.html
44 + do_log(2, "Using $clamav");
45 + chop($output = `$clamav --stdout -r -w --one-virus $TEMPDIR/parts 2>&1`);
46 + $errval = retcode($?);
47 + $scanner_errors &= $errval;
50 + if ($errval >= 51 || $errval <= 53) {
51 + @virusname = ($output =~ /.*: (.+) FOUND/g);
54 + do_log(0,"Virus scanner failure: $clamav (error code: $errval)");
59 diff -urN amavisd-snapshot-20020300.org/configure.in amavisd-snapshot-20020300/configure.in
60 --- amavisd-snapshot-20020300.org/configure.in Thu Jun 6 22:51:22 2002
61 +++ amavisd-snapshot-20020300/configure.in Thu Jun 6 22:59:01 2002
63 avp_scanner_frag=$srcdir/amavis/av/avp
64 avpdc_scanner_frag=$srcdir/amavis/av/avpdc
65 cai_scanner_frag=$srcdir/amavis/av/cai
66 + clamav_scanner_frag=$srcdir/amavis/av/clamav
67 csav_scanner_frag=$srcdir/amavis/av/csav
68 cyber_scanner_frag=$srcdir/amavis/av/cyber
69 fprot_scanner_frag=$srcdir/amavis/av/fprot
71 cai_scanner_frag=$srcdir/amavis/av/cai
74 +### ClamAntiVirus http://www.konarski.edu.pl/~zolw/clam.html
75 +clamav_scanner_frag=/dev/null
76 +AC_CHECKING([*** Clam AntiVirus Scanner ***])
77 +AC_PATH_PROG(clamscan, clamscan, , $PATH:/bin:/usr/bin:/usr/local/bin)
78 +if test "x$clamscan" != "x" ; then
79 + avscanner="$avscanner Clam AntiVirus Scanner"
80 + clamav_scanner_frag=$srcdir/amavis/av/clamav
83 ### Command AntiVirus for Linux
84 csav_scanner_frag=/dev/null
85 AC_CHECKING([*** Command AntiVirus for Linux ***])
89 AC_MSG_CHECKING([if any virus scanners are installed at all])
90 -if test "x$mksvir$antivir$uvscan$ufindvir$fvsco$sophos$avp$avpdc$fsav$vscan$vfind$inocucmd$rav$nod32$nod32cli$csav$vbengcl$sophie$trophie$panda$fprot$oav$cscmdline" = "x" ; then
91 +if test "x$clamav$mksvir$antivir$uvscan$ufindvir$fvsco$sophos$avp$avpdc$fsav$vscan$vfind$inocucmd$rav$nod32$nod32cli$csav$vbengcl$sophie$trophie$panda$fprot$oav$cscmdline" = "x" ; then
96 AC_SUBST_FILE(avp_scanner_frag)
97 AC_SUBST_FILE(avpdc_scanner_frag)
98 AC_SUBST_FILE(cai_scanner_frag)
99 +AC_SUBST_FILE(clamav_scanner_frag)
100 AC_SUBST_FILE(csav_scanner_frag)
101 AC_SUBST_FILE(cyber_scanner_frag)
102 AC_SUBST_FILE(fsec_scanner_frag)