@@ -1,3 +1,7 @@

+Thu Jan 10 14:29:28 CET 2008 (tk)

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

+  * clamdscan: remove dependendcy on libclamav (bb#750), patch from Edwin

+

 Thu Jan 10 11:23:32 GMT 2008 (njh)

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

   * clamav-milter:	Use new cli_rndnum API - thanks to TK for spotting

@@ -38,6 +38,6 @@ clamdscan_SOURCES = \

 endif

-DEFS = @DEFS@ -DCL_NOTHREADS

+DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV

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

-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @FRESHCLAM_LIBS@

@@ -114,7 +114,7 @@ CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

 CYGPATH_W = @CYGPATH_W@

 DBDIR = @DBDIR@

-DEFS = @DEFS@ -DCL_NOTHREADS

+DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV

 DEPDIR = @DEPDIR@

 ECHO = @ECHO@

 ECHO_C = @ECHO_C@

@@ -134,7 +134,7 @@ LDFLAGS = @LDFLAGS@

 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@

 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBOBJS = @LIBOBJS@

-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @FRESHCLAM_LIBS@

 LIBTOOL = @LIBTOOL@

 LN_S = @LN_S@

 LTLIBOBJS = @LTLIBOBJS@

@@ -43,6 +43,20 @@ short printinfected = 0;

 extern int notremoved, notmoved;

+#ifdef CL_EXPERIMENTAL

+#define VERSION_EXP     VERSION"-exp"

+#else

+#define VERSION_EXP     VERSION

+#endif

+

+static void print_server_version(const struct optstruct *opt)

+{

+    if(get_clamd_version(opt)) {

+	/* can't get version from server, fallback */

+	printf("ClamAV "VERSION_EXP"\n");

+    }

+}

+

 int main(int argc, char **argv)

 {

 	int ds, dms, ret, infected;

@@ -74,7 +88,7 @@ int main(int argc, char **argv)

 	mprintf_stdout = 1;

     if(opt_check(opt, "version")) {

-	print_version();

+	print_server_version(opt);

 	opt_free(opt);

 	exit(0);

     }

@@ -390,6 +390,29 @@ static int dconnect(const struct optstruct *opt)

     return sockd;

 }

+int get_clamd_version(const struct optstruct *opt)

+{

+	char buff[64];

+	int bread, sockd;

+

+

+    if((sockd = dconnect(opt)) < 0)

+	return 2;

+

+    if(write(sockd, "VERSION", 7) <= 0) {

+	logg("^Can't write to the socket.\n");

+	return 2;

+    }

+

+    while((bread = read(sockd, buff, sizeof(buff)-1)) > 0) {

+	buff[bread] = '\0';

+	printf("%s\n", buff);

+    }

+

+    close(sockd);

+    return 0;

+}

+

 int client(const struct optstruct *opt, int *infected)

 {

 	char cwd[200], *fullpath;

@@ -22,5 +22,6 @@

 #include "options.h"

 int client(const struct optstruct *opt, int *infected);

+int get_clamd_version(const struct optstruct *opt);

 #endif

@@ -54,6 +54,8 @@

 #define VERSION_EXP	VERSION

 #endif

+/* CL_NOLIBCLAMAV means to omit functions that depends on libclamav */

+#ifndef CL_NOLIBCLAMAV

 char *freshdbdir(void)

 {

 	struct cl_cvd *d1, *d2;

@@ -131,7 +133,7 @@ void print_version(void)

     free(path);

 }

-

+#endif

 int filecopy(const char *src, const char *dest)

 {

@@ -187,6 +189,7 @@ int filecopy(const char *src, const char *dest)

 }

+#ifndef CL_NOLIBCLAMAV

 int dircopy(const char *src, const char *dest)

 {

 	DIR *dd;

@@ -230,6 +233,7 @@ int dircopy(const char *src, const char *dest)

     closedir(dd);

     return 0;

 }

+#endif

 int isnumb(const char *str)

 {

@@ -242,6 +246,7 @@ int isnumb(const char *str)

     return 1;

 }

+#ifndef CL_NOLIBCLAMAV

 int cvd_unpack(const char *cvd, const char *destdir)

 {

 	int fd;

@@ -263,6 +268,7 @@ int cvd_unpack(const char *cvd, const char *destdir)

     return 0;

 }

+#endif

 void daemonize(void)

 {