@@ -63,6 +63,7 @@ Kamil Andrusz <wizz*mniam.net>

 Patrick Bihan-Faou <patrick*mindstep.com>

 Len Budney <lbudney*pobox.com>

 Andrey Cherezov <andrey*cherezov.koenig.su>

+Alex Cherney <alex*cher.id.au>

 Tom G. Christensen <tgc*statsbiblioteket.dk>

 Damien Curtain <damien*pagefault.org>

 Michael Dankov <misha*btrc.ru>

@@ -1,12 +1,20 @@

+Mon May 10 00:05:23 CEST 2004 (tk)

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

+  * clamscan: + allow regular expressions in --[in|ex]clude (patch by

+	        Alex Cherney <alex*cher.id.au>)

+	      + do not overwrite old files in quarantine directory (Alex

+	        Cherney)

+  * configure/Makefiles: improve NetBSD support

+

 Sun May  9 18:40:55 BST 2004 (njh)

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

   * clamav-milter:	Ensure a thread wakes up when another thread dies

-		Fix from Damian Menscher <menscher@uiuc.edu> ensures

+		Fix from Damian Menscher <menscher*uiuc.edu> ensures

 			Only report that we've dropped privilege if the setuid

-		succeeded, fix by Jens Elkner <elkner@linofee.org>

+		succeeded, fix by Jens Elkner <elkner*linofee.org>

 			If logVerbose is set state both starting and started

 		messages (based on an idea by "Sergey Y.  Afonin"

-			<asy@kraft-s.ru>

+			<asy*kraft-s.ru>

 			Also added X-Infected-Received-From: header by Sergey

 			Report an error if inet_ntop fails in tcp_wrappers

  * docs/man:		Clarified suggested use of max-children only on

@@ -85,6 +85,7 @@ target_triplet = @target@

 EXEEXT = @EXEEXT@

 OBJEXT = @OBJEXT@

 PATH_SEPARATOR = @PATH_SEPARATOR@

+ADDITIONAL_LIBS = @ADDITIONAL_LIBS@

 AMTAR = @AMTAR@

 AS = @AS@

 AWK = @AWK@

@@ -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.35 2004/04/20 22:33:18 kojm Exp $

+dnl @version: $Id: aclocal.m4,v 1.36 2004/05/09 22:11:29 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.35 2004/04/20 22:33:18 kojm Exp $

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

 dnl

 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],

 [changequote(<<, >>)dnl

@@ -111,6 +111,9 @@

 /* "pragma pack" */

 #undef HAVE_PRAGMA_PACK

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

+#undef HAVE_REGEX_H

+

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

 #undef HAVE_SETSID

@@ -37,6 +37,6 @@ endif

 DEFS = @DEFS@ -DSENDMAIL_BIN=\"@SENDMAIL@\"

 # CLAMD_LIBS is used, because clamav-milter requires the same libraries as clamd

-LIBS = -L$(top_builddir)/libclamav -lclamav -L/usr/lib/libmilter -lmilter @CLAMAV_MILTER_LIBS@

+LIBS = -L$(top_builddir)/libclamav -lclamav -L/usr/lib/libmilter -lmilter @CLAMAV_MILTER_LIBS@ @ADDITIONAL_LIBS@

 INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared

 EXTRA_DIST = clamav-milter.c INSTALL

@@ -85,6 +85,7 @@ target_triplet = @target@

 EXEEXT = @EXEEXT@

 OBJEXT = @OBJEXT@

 PATH_SEPARATOR = @PATH_SEPARATOR@

+ADDITIONAL_LIBS = @ADDITIONAL_LIBS@

 AMTAR = @AMTAR@

 AS = @AS@

 AWK = @AWK@

@@ -134,7 +135,7 @@ install_sh = @install_sh@

 DEFS = @DEFS@ -DSENDMAIL_BIN=\"@SENDMAIL@\"

 # CLAMD_LIBS is used, because clamav-milter requires the same libraries as clamd

-LIBS = -L$(top_builddir)/libclamav -lclamav -L/usr/lib/libmilter -lmilter @CLAMAV_MILTER_LIBS@

+LIBS = -L$(top_builddir)/libclamav -lclamav -L/usr/lib/libmilter -lmilter @CLAMAV_MILTER_LIBS@ @ADDITIONAL_LIBS@

 INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared

 EXTRA_DIST = clamav-milter.c INSTALL

 subdir = clamav-milter

@@ -61,5 +61,5 @@ clamd_SOURCES = \

 endif

 DEFS = @DEFS@

-LIBS = -L$(top_builddir)/libclamav -lclamav @CLAMD_LIBS@

+LIBS = -L$(top_builddir)/libclamav -lclamav @CLAMD_LIBS@ @ADDITIONAL_LIBS@

 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

@@ -85,6 +85,7 @@ target_triplet = @target@

 EXEEXT = @EXEEXT@

 OBJEXT = @OBJEXT@

 PATH_SEPARATOR = @PATH_SEPARATOR@

+ADDITIONAL_LIBS = @ADDITIONAL_LIBS@

 AMTAR = @AMTAR@

 AS = @AS@

 AWK = @AWK@

@@ -159,7 +160,7 @@ install_sh = @install_sh@

 DEFS = @DEFS@

-LIBS = -L$(top_builddir)/libclamav -lclamav @CLAMD_LIBS@

+LIBS = -L$(top_builddir)/libclamav -lclamav @CLAMD_LIBS@ @ADDITIONAL_LIBS@

 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

 subdir = clamd

 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

@@ -1,5 +1,5 @@

 #

-#  Copyright (C) 2002 Tomasz Kojm <zolw@konarski.edu.pl>

+#  Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>

 #

 #  This program is free software; you can redistribute it and/or modify

 #  it under the terms of the GNU General Public License as published by

@@ -36,4 +36,4 @@ clamdscan_LDADD = $(top_builddir)/clamscan/options.o $(top_builddir)/clamscan/ge

 endif

 INCLUDES = -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

-LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@

+LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@

@@ -15,7 +15,7 @@

 @SET_MAKE@

 #

-#  Copyright (C) 2002 Tomasz Kojm <zolw@konarski.edu.pl>

+#  Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>

 #

 #  This program is free software; you can redistribute it and/or modify

 #  it under the terms of the GNU General Public License as published by

@@ -85,6 +85,7 @@ target_triplet = @target@

 EXEEXT = @EXEEXT@

 OBJEXT = @OBJEXT@

 PATH_SEPARATOR = @PATH_SEPARATOR@

+ADDITIONAL_LIBS = @ADDITIONAL_LIBS@

 AMTAR = @AMTAR@

 AS = @AS@

 AWK = @AWK@

@@ -134,7 +135,7 @@ install_sh = @install_sh@

 @BUILD_CLAMD_TRUE@clamdscan_LDADD = $(top_builddir)/clamscan/options.o $(top_builddir)/clamscan/getopt.o

 INCLUDES = -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

-LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@

+LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@

 subdir = clamdscan

 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

 CONFIG_HEADER = $(top_builddir)/clamav-config.h

@@ -38,5 +38,5 @@ clamscan_SOURCES = \

     defaults.h

 DEFS = @DEFS@

-LIBS = -L$(top_builddir)/libclamav -lclamav

+LIBS = -L$(top_builddir)/libclamav -lclamav @ADDITIONAL_LIBS@

 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

@@ -86,6 +86,7 @@ target_triplet = @target@

 EXEEXT = @EXEEXT@

 OBJEXT = @OBJEXT@

 PATH_SEPARATOR = @PATH_SEPARATOR@

+ADDITIONAL_LIBS = @ADDITIONAL_LIBS@

 AMTAR = @AMTAR@

 AS = @AS@

 AWK = @AWK@

@@ -140,7 +141,7 @@ clamscan_SOURCES = \

 DEFS = @DEFS@

-LIBS = -L$(top_builddir)/libclamav -lclamav

+LIBS = -L$(top_builddir)/libclamav -lclamav @ADDITIONAL_LIBS@

 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

 subdir = clamscan

 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

@@ -203,8 +203,13 @@ void help(void)

     mprintf("    --infected            -i             Print infected files only\n");

     mprintf("    --remove                             Remove infected files. Be careful.\n");

     mprintf("    --move=DIRECTORY                     Move infected files into DIRECTORY\n");

+#ifdef HAVE_REGEX_H

+    mprintf("    --exclude=REGEX                      Don't scan file names matching REGEX\n");

+    mprintf("    --include=REGEX                      Only scan file names matching REGEX\n");

+#else

     mprintf("    --exclude=PATT                       Don't scan file names containing PATT\n");

     mprintf("    --include=PATT                       Only scan file names containing PATT\n");

+#endif

     mprintf("    --bell                               Sound bell on virus detection\n");

     mprintf("    --no-summary                         Disable summary at end of scanning\n");

     mprintf("    --mbox                -m             Treat stdin as a mailbox\n");

@@ -38,6 +38,10 @@

 #include <clamav.h>

 #include <errno.h>

+#ifdef HAVE_REGEX_H

+#include <regex.h>

+#endif

+

 #include "defaults.h"

 #include "others.h"

 #include "options.h"

@@ -303,6 +307,29 @@ int scanmanager(const struct optstruct *opt)

     return ret;

 }

+int match_regex(const char *filename, const char *pattern)

+{

+#ifdef HAVE_REGEX_H

+	regex_t reg;

+	int match, flags;

+#ifndef C_CYGWIN

+	flags = 0;

+#else

+	flags = REG_ICASE; /* case insensitive on Windows */

+#endif	

+	if(regcomp(&reg, pattern, flags) != 0) {

+	    mprintf("!%s: Could not parse regular expression %s.\n", filename, pattern);

+	    logg("!%s: Could not parse regular expression %s.\n", filename, pattern);

+		return 2;

+	}

+	match = (regexec(&reg, filename, 0, NULL, 0) == REG_NOMATCH) ? 0 : 1;

+	regfree(&reg);

+	return match;

+#else /* HAVE_REGEX_H */

+	return strstr(filename, pattern) ? 1 : 0;

+#endif

+}

+

 int scanfile(const char *filename, struct cl_node *root, const struct passwd *user, const struct optstruct *opt, const struct cl_limits *limits)

 {

 	int ret, options = 0, included;

@@ -319,12 +346,12 @@ int scanfile(const char *filename, struct cl_node *root, const struct passwd *us

 		    mprintf("%s: Excluded (/proc).\n", filename);

 		return 0;

 	    }

-#endif

-

+#endif    

+    

     if(optl(opt, "exclude")) {

 	argument = getfirstargl(opt, "exclude", &optnode);

 	while (argument) {

-	    if(strstr(filename, argument)) {

+	    if(match_regex(filename, argument) == 1) {

 		if(!printinfected)

 		    mprintf("%s: Excluded.\n", filename);

 		return 0;

@@ -332,12 +359,12 @@ int scanfile(const char *filename, struct cl_node *root, const struct passwd *us

 	    argument = getnextargl(&optnode, "exclude");

 	}

     }

-

-    if(optl(opt, "include")) {

+     

+   if(optl(opt, "include")) {

 	included = 0;

 	argument = getfirstargl(opt, "include",&optnode);

 	while (argument && !included) {

-	    if(strstr(filename, argument))

+	    if(match_regex(filename, argument) == 1)

 		included = 1;

 	    argument = getnextargl(&optnode, "include");

 	}

@@ -350,7 +377,6 @@ int scanfile(const char *filename, struct cl_node *root, const struct passwd *us

     }

-

     if(fileinfo(filename, 1) == 0) {

 	if(!printinfected)

 	    mprintf("%s: Empty file.\n", filename);

@@ -920,11 +946,12 @@ int clamav_unpack(const char *prog, char **args, const char *tmpdir, const struc

 void move_infected(const char *filename, const struct optstruct *opt)

 {

-    char *movedir, *movefilename, *tmp;

+    char *movedir, *movefilename, *tmp, numext[4 + 1];

     struct stat fstat, mfstat;

+    int n, len, movefilename_size;

-    if(!(movedir = getargl(opt, "move")))

-    {

+

+    if(!(movedir = getargl(opt, "move"))) {

         /* Should never reach here */

         mprintf("@error moving file '%s'.\n", filename);

         mprintf("clamscan: getargc() returned NULL.\n");

@@ -933,35 +960,33 @@ void move_infected(const char *filename, const struct optstruct *opt)

         return;

     }

-    if(access(movedir, W_OK|X_OK) == -1)

-    {

+    if(access(movedir, W_OK|X_OK) == -1) {

         mprintf("@error moving file '%s'.\n", filename);

         mprintf("clamscan: cannot write to '%s': %s.\n", movedir, strerror(errno));

         logg("clamscan: cannot write to '%s': %s.\n", movedir, strerror(errno));

         claminfo.notmoved++;

         return;

     }

-    

-    if(!(tmp = strrchr(filename, '/')))

-    {

+

+    if(!(tmp = strrchr(filename, '/'))) {

         mprintf("@error moving file '%s'.\n", filename);

         mprintf("clamscan: '%s' does not appear to be a valid filename.\n", filename);

         logg("clamscan: '%s' does not appear to be a valid filename.\n", filename);

         claminfo.notmoved++;

         return;

     }

-    

-    if(!(movefilename = malloc(sizeof(char) * (strlen(movedir) + strlen(tmp) + 1))))

-    {

+

+    movefilename_size = sizeof(char) * (strlen(movedir) + strlen(tmp) + sizeof(numext) + 1);

+

+    if(!(movefilename = malloc(movefilename_size))) {

         mprintf("@error moving file '%s'.\n", filename);

         mprintf("clamscan: malloc() returned NULL.\n");

         logg("clamscan: malloc() returned NULL.\n");

         claminfo.notmoved++;

         return;

     }

-    

-    if(!(strrcpy(movefilename, movedir)))

-    {

+

+    if(!(strrcpy(movefilename, movedir))) {

         mprintf("@error moving file '%s'.\n", filename);

         mprintf("clamscan: strrcpy() returned NULL.\n");

         logg("clamscan: strrcpy() returned NULL.\n");

@@ -969,9 +994,8 @@ void move_infected(const char *filename, const struct optstruct *opt)

         free(movefilename);

         return;

     }

-    

-    if(!(strcat(movefilename, tmp)))

-    {

+

+    if(!(strcat(movefilename, tmp))) {

         mprintf("@error moving file '%s'.\n", filename);

         mprintf("clamscan: strcat() returned NULL.\n");

         logg("clamscan: strcat() returned NULL.\n");

@@ -979,22 +1003,36 @@ void move_infected(const char *filename, const struct optstruct *opt)

         free(movefilename);

         return;

     }

-    

+

     stat(filename, &fstat);

-    if(!stat(movefilename, &mfstat))

-    {

+    if(!stat(movefilename, &mfstat)) {

         if(fstat.st_ino == mfstat.st_ino) { /* It's the same file*/

             mprintf("clamscan: file excluded '%s'.\n", filename);

             logg("clamscan: file excluded '%s'.\n", filename);

             claminfo.notmoved++;

             free(movefilename);

             return;

-        }

+        } else {

+            /* file exists - try to append an ordinal number to the

+	     * quranatined file in an attempt not to overwrite existing

+	     * files in quarantine  

+	     */

+            len = strlen(movefilename);

+            n = 0;        		        		

+            do {

+                /* reset the movefilename to it's initial value by

+		 * truncating to the original filename length

+		 */

+                movefilename[len] = 0;

+                /* append .XXX */

+                sprintf(numext, ".%03d", n++);

+                strcat(movefilename, numext);            	

+            } while(!stat(movefilename, &mfstat) && (n < 1000));

+       }

     }

-    

-    if(filecopy(filename, movefilename) == -1)

-    {

+

+    if(filecopy(filename, movefilename) == -1) {

         mprintf("@error moving file '%s'.\n", filename);

         mprintf("clamscan: cannot move '%s' to '%s': %s.\n", filename, movefilename, strerror(errno));

         logg("clamscan: cannot move '%s' to '%s': %s.\n", filename, movefilename, strerror(errno));

@@ -1005,16 +1043,13 @@ void move_infected(const char *filename, const struct optstruct *opt)

     chmod(movefilename, fstat.st_mode);

     chown(movefilename, fstat.st_uid, fstat.st_gid);

-    

-    if(unlink(filename))

-    {

+

+    if(unlink(filename)) {

         mprintf("@error moving file '%s'.\n", filename);

         mprintf("clamscan: cannot unlink '%s': %s.\n", filename, strerror(errno));

         logg("clamscan: cannot unlink '%s': %s.\n", filename, strerror(errno));

         claminfo.notremoved++;            

-    }

-    else

-    {

+    } else {

         mprintf("%s: moved to '%s'.\n", filename, movefilename);

         logg("%s: moved to '%s'.\n", filename, movefilename);

     }

@@ -7695,10 +7695,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'

-

-

-

-

 cat >>confdefs.h <<\_ACEOF

 #define SCANBUFF 131072

 _ACEOF

@@ -7865,7 +7861,8 @@ fi

-for ac_header in stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h

+

+for ac_header in stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h regex.h

 do

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

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

@@ -8699,6 +8696,8 @@ cat >>confdefs.h <<\_ACEOF

 #define HAVE_BZLIB_H 1

 _ACEOF

+else

+  echo "WARNING: Bzip2 support disabled"

 fi

@@ -9208,7 +9207,6 @@ fi

-

 # Check whether --enable-pthreads or --disable-pthreads was given.

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

   enableval="$enable_pthreads"

@@ -9702,7 +9700,6 @@ fi

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

 fi

-

 case "$target_os" in

 linux*)

@@ -9883,7 +9880,7 @@ cat >>confdefs.h <<\_ACEOF

 #define _REENTRANT 1

 _ACEOF

-	LIBS="$LIBS -lpthread"

+	ADDITIONAL_LIBS="$LIBS -lpthread"

      fi

 cat >>confdefs.h <<\_ACEOF

@@ -9923,12 +9920,12 @@ cat >>confdefs.h <<\_ACEOF

 _ACEOF

     use_netinfo="yes"

-            ;;

+    ;;

 sco*)

         FRESHCLAM_LIBS="-lsocket"

     CLAMD_LIBS="-lsocket"

     CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"

-        ;;

+    ;;

 hpux*)

     if test "$have_pthreads" = "yes"; then

 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"

@@ -9997,7 +9994,7 @@ cat >>confdefs.h <<\_ACEOF

 #define C_IRIX 1

 _ACEOF

-        ;;

+    ;;

 *)

     ;;

@@ -10011,6 +10008,7 @@ esac

+

 if test "$have_pthreads" = "yes"; then

   BUILD_CLAMD_TRUE=

   BUILD_CLAMD_FALSE='#'

@@ -11497,6 +11495,7 @@ s,@CLAMD_LIBS@,$CLAMD_LIBS,;t t

 s,@CLAMAV_MILTER_LIBS@,$CLAMAV_MILTER_LIBS,;t t

 s,@FRESHCLAM_LIBS@,$FRESHCLAM_LIBS,;t t

 s,@TH_SAFE@,$TH_SAFE,;t t

+s,@ADDITIONAL_LIBS@,$ADDITIONAL_LIBS,;t t

 s,@BUILD_CLAMD_TRUE@,$BUILD_CLAMD_TRUE,;t t

 s,@BUILD_CLAMD_FALSE@,$BUILD_CLAMD_FALSE,;t t

 s,@HAVE_MILTER_TRUE@,$HAVE_MILTER_TRUE,;t t

@@ -18,7 +18,6 @@ dnl   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 AC_INIT(clamscan/clamscan.c)

 AC_CREATE_TARGET_H(target.h)

 AM_INIT_AUTOMAKE(clamav, "devel-`date +%Y%m%d`")

-dnl AM_INIT_AUTOMAKE(clamav, `date +%Y%m%d`)

 AM_CONFIG_HEADER(clamav-config.h)

 LC_CURRENT=1

@@ -34,25 +33,11 @@ AC_PROG_LN_S

 AC_PROG_MAKE_SET

 AC_PROG_LIBTOOL

-dnl Version numbers for libtool

-

-dnl LT_RELEASE=$CLAMAV_MAJOR_VERSION.$CLAMAV_MINOR_VERSION

-dnl LT_CURRENT=$CLAMAV_MINOR_VERSION

-dnl LT_REVISION=1

-dnl LT_AGE=2

-

-dnl AC_SUBST(LT_RELEASE)

-dnl AC_SUBST(LT_CURRENT)

-dnl AC_SUBST(LT_REVISION)

-dnl AC_SUBST(LT_AGE)

-

-dnl BUFFSIZE must be at least 16 kb !!!

-

 AC_DEFINE(SCANBUFF, 131072, [scan buffer size])

 AC_DEFINE(FILEBUFF, 8192,   [file i/o buffer size])

 AC_HEADER_STDC

-AC_CHECK_HEADERS(stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h)

+AC_CHECK_HEADERS(stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h regex.h)

 AC_TYPE_OFF_T

 AC_COMPILE_CHECK_SIZEOF(short)

 AC_COMPILE_CHECK_SIZEOF(int)

@@ -88,7 +73,7 @@ want_bzip2="no",)

 if test "$want_bzip2" = "yes"

 then

-    AC_CHECK_HEADER(bzlib.h,[LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lbz2"; AC_DEFINE(HAVE_BZLIB_H,1,have bzip2)],)

+    AC_CHECK_HEADER(bzlib.h,[LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lbz2"; AC_DEFINE(HAVE_BZLIB_H,1,have bzip2)],[echo "WARNING: Bzip2 support disabled"])

     AC_CHECK_LIB(bz2, bzReadOpen, AC_DEFINE(NOBZ2PREFIX,1,bzip funtions do not have bz2 prefix),)

 fi

@@ -118,9 +103,6 @@ fi

 AC_CHECK_HEADER(syslog.h,AC_DEFINE(USE_SYSLOG,1,[use syslog]),)

-dnl AC_CHECK_LIB(c, strtok_r,, AC_DEFINE(NO_STRTOK_R))

-dnl AC_CHECK_LIB(c, mkstemp, AC_DEFINE(HAVE_MKSTEMP),)

-

 AC_ARG_ENABLE(pthreads,

 [  --disable-pthreads      Disable POSIX threads support],

 have_pthreads=no, )

@@ -142,12 +124,10 @@ AC_ARG_ENABLE(yp-check,

 [  --enable-yp-check	  Use ypmatch utility instead of /etc/passwd parsing],

 use_yp="yes", use_yp="no")

-dnl clamav user

 AC_ARG_WITH(user, 

 [  --with-user=uid	  name of the clamav user (default=clamav).],

 clamav_user="$withval", clamav_user="clamav")

-dnl clamav group

 AC_ARG_WITH(group, 

 [  --with-group=gid	  name of the clamav group (default=clamav).],

 clamav_group="$withval", clamav_group="clamav")

@@ -168,22 +148,19 @@ AC_ARG_ENABLE(bigstack,

 [  --enable-bigstack	  Increase thread stack size.],

 AC_DEFINE(C_BIGSTACK,1,[Increase thread stack size.]),)

-dnl database directory

 AC_ARG_WITH(dbdir, 

 [  --with-dbdir=path	  Path to virus database directory.],

 db_dir="$withval", db_dir="_default_")

-dnl main.cvd

 AC_ARG_WITH(db1, 

 [  --with-db1=name	  Name of the main database (main.cvd).],

 AC_DEFINE_UNQUOTED(DB1NAME,"$withval",[Name of the main database]), AC_DEFINE(DB1NAME, "main.cvd",[Name of the main database]))

-dnl daily.cvd

 AC_ARG_WITH(db2, 

 [  --with-db2=name	  Name of the daily database (daily.cvd).],

 AC_DEFINE_UNQUOTED(DB2NAME,"$withval",[Name of the daily database]), AC_DEFINE(DB2NAME, "daily.cvd",[Name of the daily database]))

-dnl I had problems with $pkgdatadir, that's why I'm using these funny checks

+dnl I had problems with $pkgdatadir thus these funny checks

 if test "$db_dir" = "_default_"

 then

     if test "$prefix" = "NONE"

@@ -216,7 +193,7 @@ CFGDIR=$cfg_dir

 AC_SUBST(CFGDIR)

 AC_DEFINE_UNQUOTED(CONFDIR,"$cfg_dir",[where to look for the config file])

-dnl Do not overwrite the current config file

+dnl Do not overwrite current config files

 AM_CONDITIONAL(INSTALL_CLAMAV_CONF, test ! -r "$cfg_dir/clamav.conf")

 AM_CONDITIONAL(INSTALL_FRESHCLAM_CONF, test ! -r "$cfg_dir/freshclam.conf")

@@ -281,11 +258,6 @@ AC_TRY_RUN([

 int main(int argc, char **argv) { in_port_t pt; pt = 0; return pt; }

 ], AC_DEFINE(HAVE_IN_PORT_T,1,[in_port_t is defined]), AC_MSG_RESULT(in_port_t is not defined))

-dnl CLAMSCAN_LIBS=""

-dnl FRESHCLAM_LIBS=""

-dnl CLAMD_LIBS=""

-dnl TH_SAFE=""

-

 case "$target_os" in

 linux*)

     AC_DEFINE(C_LINUX,1,[target is linux])

@@ -303,7 +275,6 @@ linux*)

     fi

     ;;

 cygwin*)

-    dnl It probably won't work.

     AC_DEFINE(C_CYGWIN,1,[os is cygwin])

     if test "$test_clamav" = "yes"; then

 	if test ! -r /etc/passwd; then

@@ -379,7 +350,7 @@ netbsd*)

  	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"

 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])

 	AC_DEFINE(_REENTRANT,1,[thread safe])

-	LIBS="$LIBS -lpthread"

+	ADDITIONAL_LIBS="$LIBS -lpthread"

      fi

     AC_DEFINE(C_BSD,1,[os is bsd flavor])

     ;;

@@ -397,15 +368,12 @@ darwin*)

     AC_DEFINE(C_BSD,1,[os is bsd flavor])

     AC_DEFINE(C_DARWIN,1,[os is darwin])

     use_netinfo="yes"

-    dnl have_pthreads="no"

-    dnl AC_MSG_RESULT(Darwin detected. Disabling thread support.)

     ;;

 sco*)

     dnl njh@bandsman.sco.uk: SCO Unix port

     FRESHCLAM_LIBS="-lsocket"

     CLAMD_LIBS="-lsocket"

     CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"

-    dnl AC_DEFINE(NO_SNPRINTF)

     ;;

 hpux*)

     if test "$have_pthreads" = "yes"; then

@@ -439,7 +407,6 @@ irix*)

 	AC_DEFINE(_REENTRANT,1,[thread safe])

     fi

     AC_DEFINE(C_IRIX,1,[os is irix])

-    dnl AC_DEFINE(NO_SNPRINTF,1,no snprintf available)

     ;;

 *)

@@ -451,6 +418,7 @@ AC_SUBST(CLAMD_LIBS)

 AC_SUBST(CLAMAV_MILTER_LIBS)

 AC_SUBST(FRESHCLAM_LIBS)

 AC_SUBST(TH_SAFE)

+AC_SUBST(ADDITIONAL_LIBS)

 AM_CONDITIONAL(BUILD_CLAMD, test "$have_pthreads" = "yes")

 AM_CONDITIONAL(HAVE_MILTER, test "$have_milter" = "yes")

@@ -87,6 +87,7 @@ target_triplet = @target@

 EXEEXT = @EXEEXT@

 OBJEXT = @OBJEXT@

 PATH_SEPARATOR = @PATH_SEPARATOR@

+ADDITIONAL_LIBS = @ADDITIONAL_LIBS@

 AMTAR = @AMTAR@

 AS = @AS@

 AWK = @AWK@

@@ -85,6 +85,7 @@ target_triplet = @target@

 EXEEXT = @EXEEXT@

 OBJEXT = @OBJEXT@

 PATH_SEPARATOR = @PATH_SEPARATOR@

+ADDITIONAL_LIBS = @ADDITIONAL_LIBS@

 AMTAR = @AMTAR@

 AS = @AS@

 AWK = @AWK@

@@ -87,6 +87,7 @@ target_triplet = @target@

 EXEEXT = @EXEEXT@

 OBJEXT = @OBJEXT@

 PATH_SEPARATOR = @PATH_SEPARATOR@

+ADDITIONAL_LIBS = @ADDITIONAL_LIBS@

 AMTAR = @AMTAR@

 AS = @AS@

 AWK = @AWK@

@@ -40,4 +40,4 @@ freshclam_SOURCES = \

 DEFS = @DEFS@

 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

-LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@

+LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@

@@ -86,6 +86,7 @@ target_triplet = @target@

 EXEEXT = @EXEEXT@

 OBJEXT = @OBJEXT@

 PATH_SEPARATOR = @PATH_SEPARATOR@

+ADDITIONAL_LIBS = @ADDITIONAL_LIBS@

 AMTAR = @AMTAR@

 AS = @AS@

 AWK = @AWK@

@@ -141,7 +142,7 @@ freshclam_SOURCES = \

 DEFS = @DEFS@

 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

-LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@

+LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@

 subdir = freshclam

 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

 CONFIG_HEADER = $(top_builddir)/clamav-config.h

@@ -85,6 +85,7 @@ target_triplet = @target@

 EXEEXT = @EXEEXT@

 OBJEXT = @OBJEXT@

 PATH_SEPARATOR = @PATH_SEPARATOR@

+ADDITIONAL_LIBS = @ADDITIONAL_LIBS@

 AMTAR = @AMTAR@

 AS = @AS@

 AWK = @AWK@

@@ -32,4 +32,4 @@ sigtool_LDADD = $(top_builddir)/clamscan/others.o

 DEFS = @DEFS@

 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

-LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@

+LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@

@@ -85,6 +85,7 @@ target_triplet = @target@

 EXEEXT = @EXEEXT@

 OBJEXT = @OBJEXT@

 PATH_SEPARATOR = @PATH_SEPARATOR@

+ADDITIONAL_LIBS = @ADDITIONAL_LIBS@

 AMTAR = @AMTAR@

 AS = @AS@

 AWK = @AWK@

@@ -134,7 +135,7 @@ sigtool_LDADD = $(top_builddir)/clamscan/others.o

 DEFS = @DEFS@

 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

-LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@

+LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@

 subdir = sigtool

 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

 CONFIG_HEADER = $(top_builddir)/clamav-config.h