amavisd-clamav.patch

   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
   4 @@ -42,6 +42,9 @@
   5  $avp = "@avp@";
   6  $AVPDIR = dirname($avp);
   7
   8 +# Clam AntiVirus http://www.konarski.edu.pl/~zolw/clam.html
   9 +$clamav = "@clamscan@";
  10 +
  11  # KasperskyLab AVPDaemon / AvpDaemonClient
  12  #
  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
  17 @@ -85,7 +85,7 @@
  18  # Virus related
  19
  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 );
  25
  26 @@ -353,6 +353,7 @@
  27  @avp_scanner_frag@
  28  @avpdc_scanner_frag@
  29  @cai_scanner_frag@
  30 +@clamav_scanner_frag@
  31  @csav_scanner_frag@
  32  @cyber_scanner_frag@
  33  @fprot_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
  37 @@ -0,0 +1,21 @@
  38 +#
  39 +# clamav (GPL) http://www.konarski.edu.pl/~zolw/clam.html
  40 +#
  41 +
  42 +
  43 +if ($clamav) {
  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;
  48 +        do_log(2,$output);
  49 +        if ($errval != 0) {
  50 +                if ($errval >= 51 || $errval <= 53) {
  51 +                        @virusname = ($output =~ /.*: (.+) FOUND/g);
  52 +                        do_virus($output);
  53 +                } else {
  54 +                        do_log(0,"Virus scanner failure: $clamav (error code: $errval)");
  55 +                }
  56 +        }
  57 +}
  58 +
  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
  62 @@ -385,6 +385,7 @@
  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
  70 @@ -456,6 +457,15 @@
  71    cai_scanner_frag=$srcdir/amavis/av/cai
  72  fi
  73
  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
  81 +fi
  82 +
  83  ### Command AntiVirus for Linux
  84  csav_scanner_frag=/dev/null
  85  AC_CHECKING([*** Command AntiVirus for Linux ***])
  86 @@ -698,7 +708,7 @@
  87
  88
  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
  92    AC_MSG_RESULT([no])
  93    AC_MSG_ERROR([
  94
  95 @@ -849,6 +859,7 @@
  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)