1 diff -urN amavisd-orig/amavis/amavisd.conf.in amavisd-snapshot-20010714/amavis/amavisd.conf.in
2 --- amavisd-orig/amavis/amavisd.conf.in Sat Apr 20 20:22:04 2002
3 +++ amavisd-snapshot-20010714/amavis/amavisd.conf.in Sat Apr 20 20:23:19 2002
5 # NOTE: don't forget to re-run ./configure if you want to use
6 # another virus scanner!
8 +# mks_vir Antivirus (mks32)
11 # NAI AntiVirus (uvscan)
13 $uvscan_args = "@uvscan_args@";
14 diff -urN amavisd-orig/amavis/amavisd.in amavisd-snapshot-20010714/amavis/amavisd.in
15 --- amavisd-orig/amavis/amavisd.in Sat Apr 20 20:22:04 2002
16 +++ amavisd-snapshot-20010714/amavis/amavisd.in Sat Apr 20 20:22:51 2002
21 -use vars qw ( $uvscan $uvscan_args $uvscan_exitcode $antivir $sophos $sophos_ide $avp $AVPDIR $avpdc $fsav $vscan $vfind $inocucmd $rav $nod32 $csav );
22 +use vars qw ( $uvscan $uvscan_args $uvscan_exitcode $antivir $sophos $sophos_ide $avp $AVPDIR $avpdc $fsav $vscan $vfind $inocucmd $rav $nod32 $csav $mksvir );
24 use vars qw ( $virusbackup $QUARANTINE $VIRUSFILE $viruslist @virusname $warnadmin $warnsender $warnrecip );
27 # more once we've found one.
30 +@mksvir_scanner_frag@
34 diff -urN amavisd-orig/amavis/av/mksvir amavisd-snapshot-20010714/amavis/av/mksvir
35 --- amavisd-orig/amavis/av/mksvir Thu Jan 1 01:00:00 1970
36 +++ amavisd-snapshot-20010714/amavis/av/mksvir Sat Apr 20 20:23:11 2002
39 +# mks_vir (www.mks.com.pl)
44 + $output = `$mksvir -s $TEMPDIR/parts/* 2>&1`;
45 + $errval = ($? >> 8);
48 + if ($output =~ /file.*virus/) { # exit codes aren't as reliable as it seems :(
49 + @virusname = ($output =~ /file.*virus (.+)/g);
52 + do_log(0,"Virus scanner failure: $antivir (error code: $errval)");
57 +# --------- or'ed exit codes --------
58 +# ===================================
66 +# 128 0x80 internal error
67 +# 256 0x100 commandline options error
68 +# 512 0x200 initialization error
69 +# 1024 0x400 IO error
71 diff -urN amavisd-orig/configure.in amavisd-snapshot-20010714/configure.in
72 --- amavisd-orig/configure.in Sat Apr 20 20:22:04 2002
73 +++ amavisd-snapshot-20010714/configure.in Sat Apr 20 20:22:51 2002
75 cyber_scanner_frag=$srcdir/amavis/av/cyber
76 fsec_scanner_frag=$srcdir/amavis/av/fsec
77 hbedv_scanner_frag=$srcdir/amavis/av/hbedv
78 + mksvir_scanner_frag=$srcdir/amavis/av/mksvir
79 nai_scanner_frag=$srcdir/amavis/av/nai
80 nod32_scanner_frag=$srcdir/amavis/av/nod32
81 rav_scanner_frag=$srcdir/amavis/av/rav
83 hbedv_scanner_frag=$srcdir/amavis/av/hbedv
86 +mksvir_scanner_frag=/dev/null
87 +AC_CHECKING([*** mks_vir AntiVirus ***])
88 +AC_PATH_PROGS(mksvir, mks32, , $PATH:/usr/bin:/usr/local/bin)
89 +if test "x$mksvir" = "x" ; then
90 + AC_MSG_WARN([************************************************************])
91 + AC_MSG_WARN([*** mks_vir AntiVirus NOT found ***])
92 + AC_MSG_WARN([*** but that's ok ***])
93 + AC_MSG_WARN([************************************************************])
95 + # This is the first one
96 + avscanner=" mks_vir AntiVirus"
97 + mksvir_scanner_frag=$srcdir/amavis/av/mksvir
100 nai_scanner_frag=/dev/null
101 AC_CHECKING([*** McAfee Virusscan ***])
102 AC_PATH_PROGS(uvscan, uvscan, , $PATH:/usr/bin:/usr/local/bin)
104 AC_SUBST_FILE(cyber_scanner_frag)
105 AC_SUBST_FILE(fsec_scanner_frag)
106 AC_SUBST_FILE(hbedv_scanner_frag)
107 +AC_SUBST_FILE(mksvir_scanner_frag)
108 AC_SUBST_FILE(nai_scanner_frag)
109 AC_SUBST_FILE(nod32_scanner_frag)
110 AC_SUBST_FILE(rav_scanner_frag)