amavisd-mks_vir.patch

   1 diff -urN amavis-snapshot-20010714-orig/amavis/amavisd.conf.in amavis-snapshot-20010714/amavis/amavisd.conf.in
   2 --- amavis-snapshot-20010714-orig/amavis/amavisd.conf.in        Fri Mar 16 20:11:11 2001
   3 +++ amavis-snapshot-20010714/amavis/amavisd.conf.in     Wed Apr 24 13:35:03 2002
   4 @@ -25,6 +25,9 @@
   5  # NOTE: don't forget to re-run ./configure if you want to use
   6  # another virus scanner!
   7
   8 +# mks_vir Antivirus (mks32)
   9 +$mksvir = "@mksvir@";
  10 +
  11  # NAI AntiVirus (uvscan)
  12  $uvscan = "@uvscan@";
  13  $uvscan_args = "@uvscan_args@";
  14 diff -urN amavis-snapshot-20010714-orig/amavis/amavisd.in amavis-snapshot-20010714/amavis/amavisd.in
  15 --- amavis-snapshot-20010714-orig/amavis/amavisd.in     Wed Jul 11 23:14:41 2001
  16 +++ amavis-snapshot-20010714/amavis/amavisd.in  Wed Apr 24 13:35:03 2002
  17 @@ -82,7 +82,7 @@
  18  # Virus related
  19
  20  # Av scanners
  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 );
  23
  24  use vars qw ( $virusbackup $QUARANTINE $VIRUSFILE $viruslist @virusname $warnadmin $warnsender $warnrecip );
  25
  26 @@ -350,6 +350,7 @@
  27         # more once we've found one.
  28         #
  29
  30 +@mksvir_scanner_frag@
  31  @hbedv_scanner_frag@
  32  @nai_scanner_frag@
  33  @sophos_scanner_frag@
  34 diff -urN amavis-snapshot-20010714-orig/amavis/av/mksvir amavis-snapshot-20010714/amavis/av/mksvir
  35 --- amavis-snapshot-20010714-orig/amavis/av/mksvir      Thu Jan  1 01:00:00 1970
  36 +++ amavis-snapshot-20010714/amavis/av/mksvir   Wed Apr 24 13:35:03 2002
  37 @@ -0,0 +1,33 @@
  38 +#
  39 +# mks_vir (www.mks.com.pl)
  40 +#
  41 +
  42 +
  43 +if ($mksvir ne "") {
  44 +        $output = `$mksvir -s $TEMPDIR/parts/* 2>&1`;
  45 +        $errval = ($? >> 8);
  46 +        do_log(2,$output);
  47 +        if ($errval != 0) {
  48 +                if ($errval == 1) {
  49 +                        @virusname = ($output =~ /file.*virus (.+)/g);
  50 +                        do_virus($output);
  51 +                } else {
  52 +                        do_log(0,"Virus scanner failure: $antivir (error code: $errval)");
  53 +                }
  54 +        }
  55 +}
  56 +
  57 +# --------- or'ed exit codes --------
  58 +# ===================================
  59 +#
  60 +# 0  OK
  61 +#
  62 +# 1  virus FOUND
  63 +# 2  file repaired
  64 +# 4  file DELETED
  65 +#
  66 +# 128  0x80  internal error
  67 +# 256  0x100 commandline options error
  68 +# 512  0x200 initialization error
  69 +# 1024 0x400 IO error
  70 +
  71 diff -urN amavis-snapshot-20010714-orig/configure.in amavis-snapshot-20010714/configure.in
  72 --- amavis-snapshot-20010714-orig/configure.in  Sat Jul 14 18:23:35 2001
  73 +++ amavis-snapshot-20010714/configure.in       Wed Apr 24 14:01:52 2002
  74 @@ -365,6 +365,7 @@
  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
  82 @@ -388,6 +389,20 @@
  83    hbedv_scanner_frag=$srcdir/amavis/av/hbedv
  84  fi
  85
  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([************************************************************])
  94 +else
  95 +  # This is the first one
  96 +  avscanner=" mks_vir AntiVirus"
  97 +  mksvir_scanner_frag=$srcdir/amavis/av/mksvir
  98 +fi
  99 +
 100  nai_scanner_frag=/dev/null
 101  AC_CHECKING([*** McAfee Virusscan ***])
 102  AC_PATH_PROGS(uvscan, uvscan, , $PATH:/usr/bin:/usr/local/bin)
 103 @@ -615,7 +630,7 @@
 104  fi
 105
 106  AC_MSG_CHECKING([if any virus scanners are installed at all])
 107 -if test "x$antivir$uvscan$ufindvir$fvsco$sophos$avp$avpdc$fsav$vscan$vfind$inocucmd$rav$nod32$csav" = "x" ; then
 108 +if test "x$mks_vir$antivir$uvscan$ufindvir$fvsco$sophos$avp$avpdc$fsav$vscan$vfind$inocucmd$rav$nod32$csav" = "x" ; then
 109    AC_MSG_RESULT([no])
 110    AC_MSG_ERROR([
 111
 112 @@ -768,6 +783,7 @@
 113  AC_SUBST_FILE(cyber_scanner_frag)
 114  AC_SUBST_FILE(fsec_scanner_frag)
 115  AC_SUBST_FILE(hbedv_scanner_frag)
 116 +AC_SUBST_FILE(mksvir_scanner_frag)
 117  AC_SUBST_FILE(nai_scanner_frag)
 118  AC_SUBST_FILE(nod32_scanner_frag)
 119  AC_SUBST_FILE(rav_scanner_frag)