| 45fcf982 |
1 | --- amavisd-0.1/amavis/amavisd.conf.in Fri Mar 7 18:07:55 2003 |
| 2 | +++ amavisd-0.1-aqq/amavis/amavisd.conf.in Sun May 18 16:48:17 2003 |
| 3 | @@ -105,6 +105,9 @@ |
| 4 | # MkS_Vir for Linux (beta) |
| 5 | $mks = "@mks@"; |
| 6 | |
| 7 | +# MkS_Vir Daemon for Linux (beta) |
| 8 | +$mksd = "@mksd@"; |
| 9 | + |
| 10 | # Norman Virus Control |
| 11 | $norman = "@norman@"; |
| 12 | |
| 13 | --- amavisd-0.1/amavis/amavisd.in Tue Mar 4 20:00:43 2003 |
| 14 | +++ amavisd-0.1-aqq/amavis/amavisd.in Sun May 18 16:51:03 2003 |
| 15 | @@ -56,7 +56,7 @@ |
| 16 | |
| 17 | # Av scanners and related vars |
| 18 | use vars qw ( $antivir $avp $avpdc $AVPDIR $clamscan $clamd $csav $drweb $fprot |
| 19 | - $fprotd $fsav $ikarus $inocucmd $mks $nod32 $nod32cli $norman $oav $panda |
| 20 | + $fprotd $fsav $ikarus $inocucmd $mks $mksd $nod32 $nod32cli $norman $oav $panda |
| 21 | $rav $sophos $sophos_ide_path $cscmdline $scs_host $scs_port $uvscan $vbengcl |
| 22 | $vexira $vfind $vscan $sophie_sockname $trophie_sockname ); |
| 23 | |
| 24 | @@ -353,6 +353,7 @@ |
| 25 | @hbedv_scanner_frag@ |
| 26 | @ikarus_scanner_frag@ |
| 27 | @mks_scanner_frag@ |
| 28 | +@mksd_scanner_frag@ |
| 29 | @nai_scanner_frag@ |
| 30 | @nod32_scanner_frag@ |
| 31 | @nod32cli_scanner_frag@ |
| 32 | --- amavisd-0.1/amavis/av/mksd Thu Jan 1 01:00:00 1970 |
| 33 | +++ amavisd-0.1-aqq/amavis/av/mksd Sun May 18 16:48:17 2003 |
| 34 | @@ -0,0 +1,29 @@ |
| 35 | +# |
| 36 | +# MkS_Vir Daemon for Linux (beta) |
| 37 | +# |
| 38 | + |
| 39 | +if ($mksd) { |
| 40 | + my (@mksd_nok, @mksd_vir, $mksd_v, %mksd_hash); |
| 41 | + do_log(2,"Using $mksd"); |
| 42 | + |
| 43 | + chop($output = `$mksd -s $TEMPDIR/parts/* 2>&1`); |
| 44 | + $errval = retcode($?); |
| 45 | + do_log(2,$output); |
| 46 | + |
| 47 | + @mksd_nok = grep { $_ !~ /^OK / } split /\n/, $output; |
| 48 | + @mksd_vir = grep { $_ !~ /^ERR / and $_ !~ /^AWARIA/ } @mksd_nok; |
| 49 | + |
| 50 | + if (scalar(@mksd_nok) == 0) { # no errors, no viruses |
| 51 | + $scanner_errors = 0; |
| 52 | + } elsif (scalar(@mksd_vir) != 0) { # virus(es) found |
| 53 | + $scanner_errors = 0; |
| 54 | + foreach $mksd_v (map { split / /; $_[1] } @mksd_vir) { |
| 55 | + $mksd_hash{$mksd_v}++; |
| 56 | + } |
| 57 | + @virusname = map { "$_ (".$mksd_hash{$_}.")" } keys %mksd_hash; |
| 58 | + do_virus($output); |
| 59 | + } else { # scanner error |
| 60 | + do_log(0, "Virus scanner ERROR: $mksd (error code: $errval)"); |
| 61 | + } |
| 62 | +} |
| 63 | + |
| 64 | --- amavisd-0.1/configure.in Wed Feb 19 15:13:56 2003 |
| 65 | +++ amavisd-0.1-aqq/configure.in Sun May 18 16:52:50 2003 |
| 66 | @@ -213,7 +213,7 @@ |
| 67 | |
| 68 | AC_CHECK_HEADERS(sm/gen.h, |
| 69 | [AC_EGREP_HEADER([typedef.*bool],sm/gen.h, |
| 70 | - [AC_DEFINE(HAVE_SM_GEN_BOOL_TYPE, 1, |
| 71 | + [AC_DEFINE([HAVE_SM_GEN_BOOL_TYPE], 1, |
| 72 | [ Define if <sm/gen.h> defines the bool type. ])])]) |
| 73 | |
| 74 | # maybe sendmail is using sfio (for TLS encryption) |
| 75 | @@ -398,6 +398,7 @@ |
| 76 | fsec_scanner_frag=$srcdir/amavis/av/fsec |
| 77 | hbedv_scanner_frag=$srcdir/amavis/av/hbedv |
| 78 | mks_scanner_frag=$srcdir/amavis/av/mks |
| 79 | + mksd_scanner_frag=$srcdir/amavis/av/mksd |
| 80 | nai_scanner_frag=$srcdir/amavis/av/nai |
| 81 | nod32_scanner_frag=$srcdir/amavis/av/nod32 |
| 82 | nod32cli_scanner_frag=$srcdir/amavis/av/nod32cli |
| 83 | @@ -576,6 +577,15 @@ |
| 84 | mks_scanner_frag=$srcdir/amavis/av/mks |
| 85 | fi |
| 86 | |
| 87 | +### MkS_Vir Daemon for Linux |
| 88 | +mksd_scanner_frag=/dev/null |
| 89 | +AC_CHECKING([*** MkS_Vir Daemon for Linux ***]) |
| 90 | +AC_PATH_PROG(mksd, mkschk, , $PATH:/usr/bin) |
| 91 | +if test "x$mksd" != "x" ; then |
| 92 | + avscanner="$avscanner MkS_Vir Daemon for Linux" |
| 93 | + mksd_scanner_frag=$srcdir/amavis/av/mksd |
| 94 | +fi |
| 95 | + |
| 96 | ### ESET Software NOD32 |
| 97 | nod32_scanner_frag=/dev/null |
| 98 | AC_CHECKING([*** ESET Software NOD32 ***]) |
| 99 | @@ -755,7 +765,7 @@ |
| 100 | fi |
| 101 | |
| 102 | AC_MSG_CHECKING([if any virus scanners are installed at all]) |
| 103 | -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$clamscan$clamd$ikarus" = "x" ; then |
| 104 | +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$mksd$vexira$norman$clamscan$clamd$ikarus" = "x" ; then |
| 105 | AC_MSG_RESULT(no) |
| 106 | AC_MSG_ERROR([ |
| 107 | |
| 108 | @@ -935,6 +945,7 @@ |
| 109 | AC_SUBST_FILE(hbedv_scanner_frag) |
| 110 | AC_SUBST_FILE(vexira_scanner_frag) |
| 111 | AC_SUBST_FILE(mks_scanner_frag) |
| 112 | +AC_SUBST_FILE(mksd_scanner_frag) |
| 113 | AC_SUBST_FILE(nai_scanner_frag) |
| 114 | AC_SUBST_FILE(nod32_scanner_frag) |
| 115 | AC_SUBST_FILE(nod32cli_scanner_frag) |
projects / packages / amavisd.git / blame