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

+Sat Jan 12 23:00:17 EET 2008 (edwin)

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

+  * libclamav/Makefile.am/in, others.c: Fix build problem on OpenBSD: don't compile in

+  functions depending on pthreads into libclamav_internal_utils.a, because

+  clamdscan is compiled without pthreads.

+

 Fri Jan 11 22:50:33 CET 2008 (tk)

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

   * libclamav/cvd.c: fix loading of .cld files on some platforms (bb#770)

@@ -189,12 +189,10 @@ libclamav_la_SOURCES = \

 libclamav_internal_utils_la_SOURCES=str.c \

 				    str.h \

 				    others.c \

-				    others.h \

-				    md5.c \

-				    md5.h

+				    others.h

 libclamav_internal_utils_la_LDFLAGS=-static

-

+libclamav_internal_utils_la_CFLAGS=-DCLI_MEMFUNSONLY

 lib_LTLIBRARIES = libclamav.la

 noinst_LTLIBRARIES = libclamav_internal_utils.la

 EXTRA_DIST = regex/engine.c libclamav.map

@@ -94,13 +94,15 @@ libclamav_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \

 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \

 	$(libclamav_la_LDFLAGS) $(LDFLAGS) -o $@

 libclamav_internal_utils_la_LIBADD =

-am_libclamav_internal_utils_la_OBJECTS = str.lo others.lo md5.lo

+am_libclamav_internal_utils_la_OBJECTS =  \

+	libclamav_internal_utils_la-str.lo \

+	libclamav_internal_utils_la-others.lo

 libclamav_internal_utils_la_OBJECTS =  \

 	$(am_libclamav_internal_utils_la_OBJECTS)

 libclamav_internal_utils_la_LINK = $(LIBTOOL) --tag=CC \

 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \

-	$(AM_CFLAGS) $(CFLAGS) $(libclamav_internal_utils_la_LDFLAGS) \

-	$(LDFLAGS) -o $@

+	$(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) \

+	$(libclamav_internal_utils_la_LDFLAGS) $(LDFLAGS) -o $@

 DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@

 depcomp = $(SHELL) $(top_srcdir)/depcomp

 am__depfiles_maybe = depfiles

@@ -411,11 +413,10 @@ libclamav_la_SOURCES = \

 libclamav_internal_utils_la_SOURCES = str.c \

 				    str.h \

 				    others.c \

-				    others.h \

-				    md5.c \

-				    md5.h

+				    others.h

 libclamav_internal_utils_la_LDFLAGS = -static

+libclamav_internal_utils_la_CFLAGS = -DCLI_MEMFUNSONLY

 lib_LTLIBRARIES = libclamav.la

 noinst_LTLIBRARIES = libclamav_internal_utils.la

 EXTRA_DIST = regex/engine.c libclamav.map

@@ -518,6 +519,8 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htmlnorm.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inflate64.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/is_tar.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-others.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-str.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/line.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzma_iface.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/matcher-ac.Plo@am__quote@

@@ -640,6 +643,20 @@ nulsft.lo: nsis/nulsft.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nulsft.lo `test -f 'nsis/nulsft.c' || echo '$(srcdir)/'`nsis/nulsft.c

+libclamav_internal_utils_la-str.lo: str.c

+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_la-str.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_la-str.Tpo -c -o libclamav_internal_utils_la-str.lo `test -f 'str.c' || echo '$(srcdir)/'`str.c

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libclamav_internal_utils_la-str.Tpo $(DEPDIR)/libclamav_internal_utils_la-str.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='str.c' object='libclamav_internal_utils_la-str.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-str.lo `test -f 'str.c' || echo '$(srcdir)/'`str.c

+

+libclamav_internal_utils_la-others.lo: others.c

+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_la-others.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_la-others.Tpo -c -o libclamav_internal_utils_la-others.lo `test -f 'others.c' || echo '$(srcdir)/'`others.c

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libclamav_internal_utils_la-others.Tpo $(DEPDIR)/libclamav_internal_utils_la-others.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='others.c' object='libclamav_internal_utils_la-others.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-others.lo `test -f 'others.c' || echo '$(srcdir)/'`others.c

+

 mostlyclean-libtool:

 	-rm -f *.lo

@@ -116,6 +116,7 @@ void cli_dbgmsg(const char *str, ...)

     }

 }

+#ifndef CLI_MEMFUNSONLY

 void cl_debug(void)

 {

     cli_debug_flag = 1;

@@ -290,6 +291,7 @@ static char *cli_md5buff(const unsigned char *buffer, unsigned int len, unsigned

     return md5str;

 }

+#endif

 void *cli_malloc(size_t size)

 {

@@ -402,6 +404,7 @@ char *cli_strdup(const char *s)

     return alloc;

 }

+#ifndef CLI_MEMFUNSONLY

 unsigned int cli_rndnum(unsigned int max)

 {

     if(name_salt[0] == 16) { /* minimizes re-seeding after the first call to cli_gentemp() */

@@ -506,6 +509,7 @@ int cli_gentempfd(const char *dir, char **name, int *fd)

     return CL_SUCCESS;

 }

+#endif

 #ifdef	C_WINDOWS

 /*