@@ -1,3 +1,9 @@

+Sun May 16 03:00:45 CEST 2004 (tk)

+----------------------------------

+  * clamd: fix logging wording in poll() error message (Joe Maimon

+	   <jmaimon*ttec.com>)

+  * configure: improve tcpwrappers compilation test

+

 Fri May 14 09:16:12 BST 2004 (njh)

 ----------------------------------

   * libclamav/mbox.c:	Use mkstemp() on Cygwin

@@ -2,6 +2,53 @@ Note: This README/NEWS file refers to the source tarball. Some things described

 here may not be available in binary packages.

 --

+0.71

+----

+

+This release fixes all bugs found in 0.70 and introduces a few new features,

+the noteworthy changes include:

+

+-) libclamav:

+    + support nested OLE2 files 

+    + support Word6 macro code

+    + ignore popular file types (media, graphics)

+    + support compress.exe (SZDD) compression (test/test1.msc)

+    + improve virus detection in e-mails

+

+-) clamscan:

+    + automatically decide (by comparing daily.cvd version numbers) which

+      database directory (hardcoded or clamav.conf's one) to use

+    + support compression ratio feature (--max-ratio)

+    + allow regular expressions in --[in|ex]clude

+    + do not overwrite old files in a quarantine directory but add a numerical

+      extension to new files

+    + respect --tempdir in libclamav

+    + fix access problem when calling external unpackers in a superuser mode

+    + fix file permission corruption with --deb in a superuser mode

+

+-) clamd

+    + support log facility specification in syslog style (LogFacility)

+    + new directive LeaveTemporaryFiles (Debug no longer leaves temporary

+      files not removed)

+

+-) clamav-milter:

+    + include the virus name in the 550 rejection

+    + support user defined template for virus notifications (--template-file)

+    + sort quarantine messages by date

+    + improve thread management

+    + add X-Virus-Scanned and X-Infected-Received-From: headers

+    + improve load balancing (when using remote servers with --server)

+    + send 554 after DATA received, not 550

+    + save PID (--pidfile)

+

+-) documentation:

+    + new Japanese documentation

+

+

+--

+The ClamAV team (http://www.clamav.net/team.html)

+

+

 0.70

 ----

@@ -60,7 +107,7 @@ of mirrors by looking at their ip source address when they try to resolve

 database.clamav.net. Our DNS servers can answer with a CNAME to:

 europe.clamav.net, america.clamav.net, asia.clamav.net or other.clamav.net.

 Our advanced push-mirroring mechanism (maintained by Luca Gibelli) allows

-database maintainers to update all the mirrors in less then one minute !

+database maintainers to update all the mirrors in less than one minute !

 There will be no major feature enhancements in the 0.7x series. Our work

@@ -2,6 +2,53 @@ Note: This README/NEWS file refers to the source tarball. Some things described

 here may not be available in binary packages.

 --

+0.71

+----

+

+This release fixes all bugs found in 0.70 and introduces a few new features,

+the noteworthy changes include:

+

+-) libclamav:

+    + support nested OLE2 files 

+    + support Word6 macro code

+    + ignore popular file types (media, graphics)

+    + support compress.exe (SZDD) compression (test/test1.msc)

+    + improve virus detection in e-mails

+

+-) clamscan:

+    + automatically decide (by comparing daily.cvd version numbers) which

+      database directory (hardcoded or clamav.conf's one) to use

+    + support compression ratio feature (--max-ratio)

+    + allow regular expressions in --[in|ex]clude

+    + do not overwrite old files in a quarantine directory but add a numerical

+      extension to new files

+    + respect --tempdir in libclamav

+    + fix access problem when calling external unpackers in a superuser mode

+    + fix file permission corruption with --deb in a superuser mode

+

+-) clamd

+    + support log facility specification in syslog style (LogFacility)

+    + new directive LeaveTemporaryFiles (Debug no longer leaves temporary

+      files not removed)

+

+-) clamav-milter:

+    + include the virus name in the 550 rejection

+    + support user defined template for virus notifications (--template-file)

+    + sort quarantine messages by date

+    + improve thread management

+    + add X-Virus-Scanned and X-Infected-Received-From: headers

+    + improve load balancing (when using remote servers with --server)

+    + send 554 after DATA received, not 550

+    + save PID (--pidfile)

+

+-) documentation:

+    + new Japanese documentation

+

+

+--

+The ClamAV team (http://www.clamav.net/team.html)

+

+

 0.70

 ----

@@ -81,7 +81,7 @@ dnl there is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for

 dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created

 dnl (the prefix is a bit different, since we add an extra -target- and -host-)

 dnl 

-dnl @version: $Id: aclocal.m4,v 1.36 2004/05/09 22:11:29 kojm Exp $

+dnl @version: $Id: aclocal.m4,v 1.37 2004/05/16 01:09:43 kojm Exp $

 dnl @author Guido Draheim <guidod@gmx.de>                 STATUS: used often

 AC_DEFUN([AC_CREATE_TARGET_H],

@@ -4041,7 +4041,7 @@ dnl      AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)

 dnl      AC_COMPILE_CHECK_SIZEOF(off_t, $headers)

 dnl

 dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu>

-dnl @version $Id: aclocal.m4,v 1.36 2004/05/09 22:11:29 kojm Exp $

+dnl @version $Id: aclocal.m4,v 1.37 2004/05/16 01:09:43 kojm Exp $

 dnl

 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],

 [changequote(<<, >>)dnl

@@ -78,6 +78,9 @@

 /* Define to 1 if you have the <dlfcn.h> header file. */

 #undef HAVE_DLFCN_H

+/* Define to 1 if you have the `getpagesize' function. */

+#undef HAVE_GETPAGESIZE

+

 /* have gmp installed */

 #undef HAVE_GMP

@@ -99,6 +102,9 @@

 /* Define to 1 if you have the <memory.h> header file. */

 #undef HAVE_MEMORY_H

+/* Define to 1 if you have a working `mmap' system call. */

+#undef HAVE_MMAP

+

 /* Define to 1 if you have the <ndir.h> header file. */

 #undef HAVE_NDIR_H

@@ -344,11 +344,11 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

     switch(retval) {

 	case 0: /* timeout */

-	    mdprintf(odesc, "Accept timeout ERROR\n");

-	    logg("!ScanStream: accept timeout.\n");

+	    mdprintf(odesc, "read timeout ERROR\n");

+	    logg("!ScanStream: read timeout.\n");

 	case -1:

-	    mdprintf(odesc, "accept poll ERROR\n");

-	    logg("!ScanStream: accept poll failed.\n");

+	    mdprintf(odesc, "read poll ERROR\n");

+	    logg("!ScanStream: read poll failed.\n");

     }

     lseek(tmpd, 0, SEEK_SET);

@@ -8307,6 +8307,368 @@ fi

 done

+

+for ac_header in stdlib.h unistd.h

+do

+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

+if eval "test \"\${$as_ac_Header+set}\" = set"; then

+  echo "$as_me:$LINENO: checking for $ac_header" >&5

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

+if eval "test \"\${$as_ac_Header+set}\" = set"; then

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+fi

+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

+else

+  # Is the header compilable?

+echo "$as_me:$LINENO: checking $ac_header usability" >&5

+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6

+cat >conftest.$ac_ext <<_ACEOF

+#line $LINENO "configure"

+#include "confdefs.h"

+$ac_includes_default

+#include <$ac_header>

+_ACEOF

+rm -f conftest.$ac_objext

+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

+  (eval $ac_compile) 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } &&

+         { ac_try='test -s conftest.$ac_objext'

+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); }; }; then

+  ac_header_compiler=yes

+else

+  echo "$as_me: failed program was:" >&5

+cat conftest.$ac_ext >&5

+ac_header_compiler=no

+fi

+rm -f conftest.$ac_objext conftest.$ac_ext

+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

+echo "${ECHO_T}$ac_header_compiler" >&6

+

+# Is the header present?

+echo "$as_me:$LINENO: checking $ac_header presence" >&5

+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6

+cat >conftest.$ac_ext <<_ACEOF

+#line $LINENO "configure"

+#include "confdefs.h"

+#include <$ac_header>

+_ACEOF

+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

+  ac_status=$?

+  egrep -v '^ *\+' conftest.er1 >conftest.err

+  rm -f conftest.er1

+  cat conftest.err >&5

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } >/dev/null; then

+  if test -s conftest.err; then

+    ac_cpp_err=$ac_c_preproc_warn_flag

+  else

+    ac_cpp_err=

+  fi

+else

+  ac_cpp_err=yes

+fi

+if test -z "$ac_cpp_err"; then

+  ac_header_preproc=yes

+else

+  echo "$as_me: failed program was:" >&5

+  cat conftest.$ac_ext >&5

+  ac_header_preproc=no

+fi

+rm -f conftest.err conftest.$ac_ext

+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

+echo "${ECHO_T}$ac_header_preproc" >&6

+

+# So?  What about this header?

+case $ac_header_compiler:$ac_header_preproc in

+  yes:no )

+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5

+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}

+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5

+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;

+  no:yes )

+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5

+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}

+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5

+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}

+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5

+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;

+esac

+echo "$as_me:$LINENO: checking for $ac_header" >&5

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

+if eval "test \"\${$as_ac_Header+set}\" = set"; then

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+else

+  eval "$as_ac_Header=$ac_header_preproc"

+fi

+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

+

+fi

+if test `eval echo '${'$as_ac_Header'}'` = yes; then

+  cat >>confdefs.h <<_ACEOF

+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

+_ACEOF

+

+fi

+

+done

+

+

+for ac_func in getpagesize

+do

+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

+echo "$as_me:$LINENO: checking for $ac_func" >&5

+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

+if eval "test \"\${$as_ac_var+set}\" = set"; then

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+else

+  cat >conftest.$ac_ext <<_ACEOF

+#line $LINENO "configure"

+#include "confdefs.h"

+/* System header to define __stub macros and hopefully few prototypes,

+    which can conflict with char $ac_func (); below.  */

+#include <assert.h>

+/* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus

+extern "C"

+#endif

+/* We use char because int might match the return type of a gcc2

+   builtin and then its argument prototype would still apply.  */

+char $ac_func ();

+char (*f) ();

+

+#ifdef F77_DUMMY_MAIN

+#  ifdef __cplusplus

+     extern "C"

+#  endif

+   int F77_DUMMY_MAIN() { return 1; }

+#endif

+int

+main ()

+{

+/* The GNU C library defines this for functions which it implements

+    to always fail with ENOSYS.  Some functions are actually named

+    something starting with __ and the normal name is an alias.  */

+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

+choke me

+#else

+f = $ac_func;

+#endif

+

+  ;

+  return 0;

+}

+_ACEOF

+rm -f conftest.$ac_objext conftest$ac_exeext

+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

+  (eval $ac_link) 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } &&

+         { ac_try='test -s conftest$ac_exeext'

+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); }; }; then

+  eval "$as_ac_var=yes"

+else

+  echo "$as_me: failed program was:" >&5

+cat conftest.$ac_ext >&5

+eval "$as_ac_var=no"

+fi

+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

+fi

+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5

+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

+if test `eval echo '${'$as_ac_var'}'` = yes; then

+  cat >>confdefs.h <<_ACEOF

+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

+_ACEOF

+

+fi

+done

+

+echo "$as_me:$LINENO: checking for working mmap" >&5

+echo $ECHO_N "checking for working mmap... $ECHO_C" >&6

+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+else

+  if test "$cross_compiling" = yes; then

+  ac_cv_func_mmap_fixed_mapped=no

+else

+  cat >conftest.$ac_ext <<_ACEOF

+#line $LINENO "configure"

+#include "confdefs.h"

+$ac_includes_default

+/* malloc might have been renamed as rpl_malloc. */

+#undef malloc

+

+/* Thanks to Mike Haertel and Jim Avera for this test.

+   Here is a matrix of mmap possibilities:

+	mmap private not fixed

+	mmap private fixed at somewhere currently unmapped

+	mmap private fixed at somewhere already mapped

+	mmap shared not fixed

+	mmap shared fixed at somewhere currently unmapped

+	mmap shared fixed at somewhere already mapped

+   For private mappings, we should verify that changes cannot be read()

+   back from the file, nor mmap's back from the file at a different

+   address.  (There have been systems where private was not correctly

+   implemented like the infamous i386 svr4.0, and systems where the

+   VM page cache was not coherent with the file system buffer cache

+   like early versions of FreeBSD and possibly contemporary NetBSD.)

+   For shared mappings, we should conversely verify that changes get

+   propagated back to all the places they're supposed to be.

+

+   Grep wants private fixed already mapped.

+   The main things grep needs to know about mmap are:

+   * does it exist and is it safe to write into the mmap'd area

+   * how to use it (BSD variants)  */

+

+#include <fcntl.h>

+#include <sys/mman.h>

+

+#if !STDC_HEADERS && !HAVE_STDLIB_H

+char *malloc ();

+#endif

+

+/* This mess was copied from the GNU getpagesize.h.  */

+#if !HAVE_GETPAGESIZE

+/* Assume that all systems that can run configure have sys/param.h.  */

+# if !HAVE_SYS_PARAM_H

+#  define HAVE_SYS_PARAM_H 1

+# endif

+

+# ifdef _SC_PAGESIZE

+#  define getpagesize() sysconf(_SC_PAGESIZE)

+# else /* no _SC_PAGESIZE */

+#  if HAVE_SYS_PARAM_H

+#   include <sys/param.h>

+#   ifdef EXEC_PAGESIZE

+#    define getpagesize() EXEC_PAGESIZE

+#   else /* no EXEC_PAGESIZE */

+#    ifdef NBPG

+#     define getpagesize() NBPG * CLSIZE

+#     ifndef CLSIZE

+#      define CLSIZE 1

+#     endif /* no CLSIZE */

+#    else /* no NBPG */

+#     ifdef NBPC

+#      define getpagesize() NBPC

+#     else /* no NBPC */

+#      ifdef PAGESIZE

+#       define getpagesize() PAGESIZE

+#      endif /* PAGESIZE */

+#     endif /* no NBPC */

+#    endif /* no NBPG */

+#   endif /* no EXEC_PAGESIZE */

+#  else /* no HAVE_SYS_PARAM_H */

+#   define getpagesize() 8192	/* punt totally */

+#  endif /* no HAVE_SYS_PARAM_H */

+# endif /* no _SC_PAGESIZE */

+

+#endif /* no HAVE_GETPAGESIZE */

+

+int

+main ()

+{

+  char *data, *data2, *data3;

+  int i, pagesize;

+  int fd;

+

+  pagesize = getpagesize ();

+

+  /* First, make a file with some known garbage in it. */

+  data = (char *) malloc (pagesize);

+  if (!data)

+    exit (1);

+  for (i = 0; i < pagesize; ++i)

+    *(data + i) = rand ();

+  umask (0);

+  fd = creat ("conftest.mmap", 0600);

+  if (fd < 0)

+    exit (1);

+  if (write (fd, data, pagesize) != pagesize)

+    exit (1);

+  close (fd);

+

+  /* Next, try to mmap the file at a fixed address which already has

+     something else allocated at it.  If we can, also make sure that

+     we see the same garbage.  */

+  fd = open ("conftest.mmap", O_RDWR);

+  if (fd < 0)

+    exit (1);

+  data2 = (char *) malloc (2 * pagesize);

+  if (!data2)

+    exit (1);

+  data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);

+  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,

+                     MAP_PRIVATE | MAP_FIXED, fd, 0L))

+    exit (1);

+  for (i = 0; i < pagesize; ++i)

+    if (*(data + i) != *(data2 + i))

+      exit (1);

+

+  /* Finally, make sure that changes to the mapped area do not

+     percolate back to the file as seen by read().  (This is a bug on

+     some variants of i386 svr4.0.)  */

+  for (i = 0; i < pagesize; ++i)

+    *(data2 + i) = *(data2 + i) + 1;

+  data3 = (char *) malloc (pagesize);

+  if (!data3)

+    exit (1);

+  if (read (fd, data3, pagesize) != pagesize)

+    exit (1);

+  for (i = 0; i < pagesize; ++i)

+    if (*(data + i) != *(data3 + i))

+      exit (1);

+  close (fd);

+  exit (0);

+}

+_ACEOF

+rm -f conftest$ac_exeext

+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

+  (eval $ac_link) 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); }; }; then

+  ac_cv_func_mmap_fixed_mapped=yes

+else

+  echo "$as_me: program exited with status $ac_status" >&5

+echo "$as_me: failed program was:" >&5

+cat conftest.$ac_ext >&5

+( exit $ac_status )

+ac_cv_func_mmap_fixed_mapped=no

+fi

+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

+fi

+fi

+echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5

+echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6

+if test $ac_cv_func_mmap_fixed_mapped = yes; then

+

+cat >>confdefs.h <<\_ACEOF

+#define HAVE_MMAP 1

+_ACEOF

+

+fi

+rm -f conftest.mmap

+

+

 # Check for broken snprintf

 if test "x$ac_cv_func_snprintf" = "xyes" ; then

         echo "$as_me:$LINENO: checking whether snprintf correctly terminates long strings" >&5

@@ -9402,262 +9764,6 @@ else

 fi

-# tcpwrappers support

-# rules from http://ma.ph-freiburg.de/tng/tng-technical/2002-01/msg00094.html

-

-# Check whether --with-tcpwrappers or --without-tcpwrappers was given.

-if test "${with_tcpwrappers+set}" = set; then

-  withval="$with_tcpwrappers"

-   case "$withval" in

-  yes|no) tcpw="$withval" ;;

-  *)      { { echo "$as_me:$LINENO: error: --with-tcpwrappers does not take an argument" >&5

-echo "$as_me: error: --with-tcpwrappers does not take an argument" >&2;}

-   { (exit 1); exit 1; }; } ;;

-  esac

-else

-   tcpw=auto

-fi;

-

-if test $tcpw != no ; then

-

-for ac_header in tcpd.h

-do

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

-  echo "$as_me:$LINENO: checking for $ac_header" >&5

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

-  echo $ECHO_N "(cached) $ECHO_C" >&6

-fi

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

-else

-  # Is the header compilable?

-echo "$as_me:$LINENO: checking $ac_header usability" >&5

-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6

-cat >conftest.$ac_ext <<_ACEOF

-#line $LINENO "configure"

-#include "confdefs.h"

-$ac_includes_default

-#include <$ac_header>

-_ACEOF

-rm -f conftest.$ac_objext

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

-  (eval $ac_compile) 2>&5

-  ac_status=$?

-  echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } &&

-         { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

-  (eval $ac_try) 2>&5

-  ac_status=$?

-  echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); }; }; then

-  ac_header_compiler=yes

-else

-  echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5

-ac_header_compiler=no

-fi

-rm -f conftest.$ac_objext conftest.$ac_ext

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

-echo "${ECHO_T}$ac_header_compiler" >&6

-

-# Is the header present?

-echo "$as_me:$LINENO: checking $ac_header presence" >&5

-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6

-cat >conftest.$ac_ext <<_ACEOF

-#line $LINENO "configure"

-#include "confdefs.h"

-#include <$ac_header>

-_ACEOF

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

-  ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err

-  rm -f conftest.er1

-  cat conftest.err >&5

-  echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } >/dev/null; then

-  if test -s conftest.err; then

-    ac_cpp_err=$ac_c_preproc_warn_flag

-  else

-    ac_cpp_err=

-  fi

-else

-  ac_cpp_err=yes

-fi

-if test -z "$ac_cpp_err"; then

-  ac_header_preproc=yes

-else

-  echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5

-  ac_header_preproc=no

-fi

-rm -f conftest.err conftest.$ac_ext

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

-echo "${ECHO_T}$ac_header_preproc" >&6

-

-# So?  What about this header?

-case $ac_header_compiler:$ac_header_preproc in

-  yes:no )

-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5

-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}

-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5

-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;

-  no:yes )

-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5

-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}

-    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5

-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}

-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5

-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;

-esac

-echo "$as_me:$LINENO: checking for $ac_header" >&5

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

-  echo $ECHO_N "(cached) $ECHO_C" >&6

-else

-  eval "$as_ac_Header=$ac_header_preproc"

-fi

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

-

-fi

-if test `eval echo '${'$as_ac_Header'}'` = yes; then

-  cat >>confdefs.h <<_ACEOF

-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

-_ACEOF

-

-                echo "$as_me:$LINENO: checking for TCP wrappers library" >&5

-echo $ECHO_N "checking for TCP wrappers library... $ECHO_C" >&6

-                save_LIBS="$LIBS"

-                LIBS="$LIBS -lwrap"

-                cat >conftest.$ac_ext <<_ACEOF

-#line $LINENO "configure"

-#include "confdefs.h"

-

-#include <tcpd.h>

-int allow_severity = 0;

-int deny_severity  = 0;

-

-struct request_info *req;

-

-#ifdef F77_DUMMY_MAIN

-#  ifdef __cplusplus

-     extern "C"

-#  endif

-   int F77_DUMMY_MAIN() { return 1; }

-#endif

-int

-main ()

-{

-

-hosts_access(req)

-

-  ;

-  return 0;

-}

-_ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

-  (eval $ac_link) 2>&5

-  ac_status=$?

-  echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } &&

-         { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

-  (eval $ac_try) 2>&5

-  ac_status=$?

-  echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); }; }; then

-  echo "$as_me:$LINENO: result: -lwrap" >&5

-echo "${ECHO_T}-lwrap" >&6

-                have_wrappers=yes

-		LIBS="$save_LIBS"

-                CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lwrap"

-else

-  echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5

-

-                                LIBS="$LIBS -lnsl"

-                cat >conftest.$ac_ext <<_ACEOF

-#line $LINENO "configure"

-#include "confdefs.h"

-

-#include <tcpd.h>

-int allow_severity = 0;

-int deny_severity  = 0;

-

-struct request_info *req;

-

-#ifdef F77_DUMMY_MAIN

-#  ifdef __cplusplus

-     extern "C"

-#  endif

-   int F77_DUMMY_MAIN() { return 1; }

-#endif

-int

-main ()

-{

-

-hosts_access(req)

-

-  ;

-  return 0;

-}

-_ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

-  (eval $ac_link) 2>&5

-  ac_status=$?

-  echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } &&

-         { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

-  (eval $ac_try) 2>&5

-  ac_status=$?

-  echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); }; }; then

-  echo "$as_me:$LINENO: result: -lwrap -lnsl" >&5

-echo "${ECHO_T}-lwrap -lnsl" >&6

-                have_wrappers=yes

-                CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lwrap"

-else

-  echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5

-

-                echo "$as_me:$LINENO: result: no" >&5

-echo "${ECHO_T}no" >&6

-                have_wrappers=no

-                LIBS=$save_LIBS

-fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

-fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

-else

-  have_wrappers=no

-fi

-

-done

-

-

-        if test $have_wrappers = yes ; then

-

-cat >>confdefs.h <<\_ACEOF

-#define WITH_TCPWRAP 1

-_ACEOF

-

-        elif test $tcpw = yes ; then

-                { { echo "$as_me:$LINENO: error: could not find TCP wrappers" >&5

-echo "$as_me: error: could not find TCP wrappers" >&2;}

-   { (exit 1); exit 1; }; }

-        else

-                { echo "$as_me:$LINENO: WARNING: could not find TCP wrappers, support disabled" >&5

-echo "$as_me: WARNING: could not find TCP wrappers, support disabled" >&2;}

-        fi

-fi

-

 # check for in_port_t definition

 if test "$cross_compiling" = yes; then

   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5

@@ -10081,6 +10187,262 @@ fi

 fi

+# tcpwrappers support

+# rules from http://ma.ph-freiburg.de/tng/tng-technical/2002-01/msg00094.html

+

+# Check whether --with-tcpwrappers or --without-tcpwrappers was given.

+if test "${with_tcpwrappers+set}" = set; then

+  withval="$with_tcpwrappers"

+   case "$withval" in

+  yes|no) tcpw="$withval" ;;

+  *)      { { echo "$as_me:$LINENO: error: --with-tcpwrappers does not take an argument" >&5

+echo "$as_me: error: --with-tcpwrappers does not take an argument" >&2;}

+   { (exit 1); exit 1; }; } ;;

+  esac

+else

+   tcpw=auto

+fi;

+

+if test "$tcpw" != "no" && test "$have_milter" = "yes" ; then

+

+for ac_header in tcpd.h

+do

+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

+if eval "test \"\${$as_ac_Header+set}\" = set"; then

+  echo "$as_me:$LINENO: checking for $ac_header" >&5

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

+if eval "test \"\${$as_ac_Header+set}\" = set"; then

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+fi

+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

+else

+  # Is the header compilable?

+echo "$as_me:$LINENO: checking $ac_header usability" >&5

+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6

+cat >conftest.$ac_ext <<_ACEOF

+#line $LINENO "configure"

+#include "confdefs.h"

+$ac_includes_default

+#include <$ac_header>

+_ACEOF

+rm -f conftest.$ac_objext

+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

+  (eval $ac_compile) 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } &&

+         { ac_try='test -s conftest.$ac_objext'

+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); }; }; then

+  ac_header_compiler=yes

+else

+  echo "$as_me: failed program was:" >&5

+cat conftest.$ac_ext >&5

+ac_header_compiler=no

+fi

+rm -f conftest.$ac_objext conftest.$ac_ext

+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5