@@ -1,3 +1,10 @@

+Thu Nov  6 03:00:44 CET 2003 (tk)

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

+  * database/Makefile: fixed an installation problem with unprivileged user

+		       (thanks to Tomasz Papszun)

+  * configure: + _REENTRANT defined globally (thanks to Ed Phillips)

+	       + test for GMP 2 (and not only v3)

+

 Wed Nov  5 22:31:26 CET 2003 (tk)

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

   * clamd: cl_scanfile() error message fixed (thanks to Ed Phillips)

@@ -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.10 2003/10/31 02:23:54 kojm Exp $

+dnl @version: $Id: aclocal.m4,v 1.11 2003/11/06 02:03:35 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.10 2003/10/31 02:23:54 kojm Exp $

+dnl @version $Id: aclocal.m4,v 1.11 2003/11/06 02:03:35 kojm Exp $

 dnl

 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],

 [changequote(<<, >>)dnl

@@ -8804,7 +8804,70 @@ if test $ac_cv_lib_gmp___gmpz_init = yes; then

 _ACEOF

 else

-  echo "WARNING: GNU MP 3 or newer NOT FOUND - digital signature support will be disabled !"; want_dsig="no"

+  echo "$as_me:$LINENO: checking for mpz_init in -lgmp" >&5

+echo $ECHO_N "checking for mpz_init in -lgmp... $ECHO_C" >&6

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

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

+else

+  ac_check_lib_save_LIBS=$LIBS

+LIBS="-lgmp  $LIBS"

+cat >conftest.$ac_ext <<_ACEOF

+#line $LINENO "configure"

+#include "confdefs.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 mpz_init ();

+#ifdef F77_DUMMY_MAIN

+#  ifdef __cplusplus

+     extern "C"

+#  endif

+   int F77_DUMMY_MAIN() { return 1; }

+#endif

+int

+main ()

+{

+mpz_init ();

+  ;

+  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

+  ac_cv_lib_gmp_mpz_init=yes

+else

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

+cat conftest.$ac_ext >&5

+ac_cv_lib_gmp_mpz_init=no

+fi

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

+LIBS=$ac_check_lib_save_LIBS

+fi

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

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

+if test $ac_cv_lib_gmp_mpz_init = yes; then

+  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lgmp"; cat >>confdefs.h <<\_ACEOF

+#define HAVE_GMP 1

+_ACEOF

+

+else

+  echo "WARNING: GNU MP 2 or newer NOT FOUND - digital signature support will be disabled !"; want_dsig="no"

+fi

+

 fi

 fi

@@ -8924,6 +8987,11 @@ fi

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

   enableval="$enable_pthreads"

   have_pthreads=no

+else

+  cat >>confdefs.h <<\_ACEOF

+#define _REENTRANT 1

+_ACEOF

+

 fi;

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

@@ -88,7 +88,7 @@ want_dsig="no",)

 if test "$want_dsig" = "yes"

 then

-    AC_CHECK_LIB(gmp, __gmpz_init, [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lgmp"; AC_DEFINE(HAVE_GMP)], [echo "WARNING: GNU MP 3 or newer NOT FOUND - digital signature support will be disabled !"; want_dsig="no"])

+    AC_CHECK_LIB(gmp, __gmpz_init, [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lgmp"; AC_DEFINE(HAVE_GMP)], [AC_CHECK_LIB(gmp, mpz_init, [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lgmp"; AC_DEFINE(HAVE_GMP)], [echo "WARNING: GNU MP 2 or newer NOT FOUND - digital signature support will be disabled !"; want_dsig="no"])])

 fi

 AC_CHECK_HEADER(syslog.h,AC_DEFINE(CLAMD_USE_SYSLOG),)

@@ -98,7 +98,7 @@ dnl AC_CHECK_LIB(c, mkstemp, AC_DEFINE(HAVE_MKSTEMP),)

 AC_ARG_ENABLE(pthreads,

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

-have_pthreads=no,)

+have_pthreads=no, AC_DEFINE(_REENTRANT))

 AC_ARG_ENABLE(cr,

 [  --disable-cr      Don't link with C reentrant library (BSD) ],

@@ -24,10 +24,10 @@ CLAMAVGROUP = @CLAMAVGROUP@

 install:

 	$(mkinstalldirs) $(DESTDIR)$(DBINST)

-#	@$(INSTALL_DATA) main.cvd $(DESTDIR)$(DBINST)

-#	@$(INSTALL_DATA) daily.cvd $(DESTDIR)$(DBINST)

+	@$(INSTALL_DATA) main.cvd $(DESTDIR)$(DBINST)

+	@$(INSTALL_DATA) daily.cvd $(DESTDIR)$(DBINST)

 	@$(INSTALL_DATA) mirrors.txt $(DESTDIR)$(DBINST)

-	@if test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \

+	@if test `id -u` -eq 0 && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \

 	    chmod 775 $(DESTDIR)$(DBINST); \

 	    chown ${CLAMAVUSER} $(DESTDIR)$(DBINST); \

 	    chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST); \

@@ -246,10 +246,10 @@ uninstall-am: uninstall-info-am

 install:

 	$(mkinstalldirs) $(DESTDIR)$(DBINST)

-#	@$(INSTALL_DATA) main.cvd $(DESTDIR)$(DBINST)

-#	@$(INSTALL_DATA) daily.cvd $(DESTDIR)$(DBINST)

+	@$(INSTALL_DATA) main.cvd $(DESTDIR)$(DBINST)

+	@$(INSTALL_DATA) daily.cvd $(DESTDIR)$(DBINST)

 	@$(INSTALL_DATA) mirrors.txt $(DESTDIR)$(DBINST)

-	@if test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \

+	@if test `id -u` -eq 0 && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \

 	    chmod 775 $(DESTDIR)$(DBINST); \

 	    chown ${CLAMAVUSER} $(DESTDIR)$(DBINST); \

 	    chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST); \