amavisd-new-clamav.patch

   1 diff -urN amavisd-new-20020630.org/amavis/amavisd.conf.in amavisd-new-20020630/amavis/amavisd.conf.in
   2 --- amavisd-new-20020630.org/amavis/amavisd.conf.in     Mon Sep  9 21:11:20 2002
   3 +++ amavisd-new-20020630/amavis/amavisd.conf.in Mon Sep  9 21:11:31 2002
   4 @@ -39,6 +39,9 @@
   5  $avp = "@avp@";
   6  $AVPDIR = dirname($avp);
   7
   8 +# Clam AntiVirus http://www.konarski.edu.pl/~zolw/clam.html
   9 +$clamav = "@clamav@";
  10 +
  11  # KasperskyLab AVPDaemon / AvpDaemonClient
  12  #
  13  # use AvpDaemon and AvpDaemonClient
  14 diff -urN amavisd-new-20020630.org/amavis/amavisd.in amavisd-new-20020630/amavis/amavisd.in
  15 --- amavisd-new-20020630.org/amavis/amavisd.in  Mon Sep  9 21:11:20 2002
  16 +++ amavisd-new-20020630/amavis/amavisd.in      Mon Sep  9 21:12:05 2002
  17 @@ -76,7 +76,7 @@
  18             $virus_quarantine_to $spam_quarantine_to
  19         )],
  20         'av' => [qw(
  21 -           $antivir $avp $avpdc $AVPDIR $csav $drweb $fprot $fprotd $fsav
  22 +           $antivir $avp $avpdc $AVPDIR $csav $drweb $fprot $fprotd $fsav $clamav
  23             $inocucmd $mks $nod32 $nod32cli $norman $oav $panda $rav $sophos
  24             $sophos_ide_path $cscmdline $scs_host $scs_port $uvscan $vbengcl
  25             $vexira $vfind $vscan $sophie_sockname $trophie_sockname
  26 @@ -3715,6 +3715,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  @drweb_scanner_frag@
  34 diff -urN amavisd-new-20020630.org/amavis/av/clamav amavisd-new-20020630/amavis/av/clamav
  35 --- amavisd-new-20020630.org/amavis/av/clamav   Thu Jan  1 01:00:00 1970
  36 +++ amavisd-new-20020630/amavis/av/clamav       Mon Sep  9 21:11:31 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-new-20020630.org/configure.in amavisd-new-20020630/configure.in
  60 --- amavisd-new-20020630.org/configure.in       Mon Sep  9 21:11:20 2002
  61 +++ amavisd-new-20020630/configure.in   Mon Sep  9 21:15:39 2002
  62 @@ -397,6 +397,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    drweb_scanner_frag=$srcdir/amavis/av/drweb
  70 @@ -472,6 +473,17 @@
  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 +$clamav = $clamscan
  79 +AC_SUBST(clamav)
  80 +if test "x$clamscan" != "x" ; then
  81 +  avscanner="$avscanner Clam AntiVirus Scanner"
  82 +  clamav_scanner_frag=$srcdir/amavis/av/clamav
  83 +fi
  84 +
  85  ### Command AntiVirus for Linux
  86  csav_scanner_frag=/dev/null
  87  AC_CHECKING([*** Command AntiVirus for Linux ***])
  88 @@ -740,7 +752,7 @@
  89  fi
  90
  91  AC_MSG_CHECKING([if any virus scanners are installed at all])
  92 -if test "x$antivir$uvscan$ufindvir$fvsco$sophos$avp$avpdc$fsav$vscan$vfind$inocucmd$rav$nod32$nod32cli$csav$vbengcl$sophie$trophie$panda$fprot$fprotd$oav$cscmdline$drweb$mks$vexira$norman" = "x" ; then
  93 +if test "x$clamav$antivir$uvscan$ufindvir$fvsco$sophos$avp$avpdc$fsav$vscan$vfind$inocucmd$rav$nod32$nod32cli$csav$vbengcl$sophie$trophie$panda$fprot$fprotd$oav$cscmdline$drweb$mks$vexira$norman" = "x" ; then
  94    AC_MSG_RESULT(no)
  95    AC_MSG_ERROR([
  96
  97 @@ -887,6 +899,7 @@
  98  AC_SUBST_FILE(avp_scanner_frag)
  99  AC_SUBST_FILE(avpdc_scanner_frag)
 100  AC_SUBST_FILE(cai_scanner_frag)
 101 +AC_SUBST_FILE(clamav_scanner_frag)
 102  AC_SUBST_FILE(csav_scanner_frag)
 103  AC_SUBST_FILE(cyber_scanner_frag)
 104  AC_SUBST_FILE(drweb_scanner_frag)