update

git-svn: trunk@985

clamav-devel/ChangeLog

@@ -1,3 +1,11 @@
+Sun Oct 10 01:12:04 CEST 2004 (tk)
+----------------------------------
+  * configure: check libcurl's version number
+  * clamd/others.c: fix compilation error on Solaris (thanks to "Christopher
+		    X. Candreva" <chris*westnet.com>)
+  * freshclam: display additional info for "SECURITY WARNING: NO SUPPORT..."
+	       (requested by Kevin Spicer <kevins*bmrb.co.uk>)
+
 Sat Oct  9 23:11:35 BST 2004 (njh)
 ----------------------------------
   * clamav-milter:	Correct fix for systems where BINDTODEVICE is not

clamav-devel/clamav-config

@@ -46,7 +46,7 @@ while test $# -gt 0; do
 	;;
 
     --version)
-	echo devel-20041007
+	echo devel-20041010
 	exit 0
 	;;
 

clamav-devel/clamav-config.h.in

@@ -189,6 +189,9 @@
 /* Define to 1 if you have the `strlcpy' function. */
 #undef HAVE_STRLCPY
 
+/* Define to 1 if you have the <sys/filio.h> header file. */
+#undef HAVE_SYS_FILIO_H
+
 /* Define to 1 if you have the <sys/inttypes.h> header file. */
 #undef HAVE_SYS_INTTYPES_H
 

clamav-devel/clamd/others.c

@@ -35,6 +35,9 @@
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
+#if HAVE_SYS_FILIO_H
+#include <sys/filio.h>
+#endif
 
 /* submitted by breiter@wolfereiter.com: do not use poll(2) on Interix */
 #ifdef C_INTERIX

clamav-devel/configure

@@ -8544,7 +8544,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 regex.h limits.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 limits.h sys/filio.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -11018,21 +11019,40 @@ fi;
 
 if test "$lcurl" != "no"
 then
-    echo "$as_me:$LINENO: checking for libcurl" >&5
-echo $ECHO_N "checking for libcurl... $ECHO_C" >&6
+    my_cv_curl_vers=NONE
+        check="7.11.0"
+        check_hex="070B00"
+
+    echo "$as_me:$LINENO: checking for curl >= $check" >&5
+echo $ECHO_N "checking for curl >= $check... $ECHO_C" >&6
+
     if eval curl-config --version 2>/dev/null >/dev/null; then
+	ver=`curl-config --version | sed -e "s/libcurl //g"`
+	hex_ver=`curl-config --vernum | tr 'a-f' 'A-F'`
+	ok=`echo "ibase=16; if($hex_ver>=$check_hex) $hex_ver else 0" | bc`
+
+	if test x$ok != x0; then
+	    curl_libs=`curl-config --libs`
+	    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $curl_libs"
+	    my_cv_curl_vers="$ver"
+	    echo "$as_me:$LINENO: result: $my_cv_curl_vers" >&5
+echo "${ECHO_T}$my_cv_curl_vers" >&6
 
 cat >>confdefs.h <<\_ACEOF
 #define WITH_CURL 1
 _ACEOF
 
-	curl_libs=`curl-config --libs`
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $curl_libs"
-	echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+	else
+	    echo "$as_me:$LINENO: result: FAILED" >&5
+echo "${ECHO_T}FAILED" >&6
+	    { echo "$as_me:$LINENO: WARNING: $ver is too old. Need version $check or higher." >&5
+echo "$as_me: WARNING: $ver is too old. Need version $check or higher." >&2;}
+	fi
     else
-	echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+	echo "$as_me:$LINENO: result: FAILED" >&5
+echo "${ECHO_T}FAILED" >&6
+	{ echo "$as_me:$LINENO: WARNING: curl-config was not found" >&5
+echo "$as_me: WARNING: curl-config was not found" >&2;}
     fi
 fi
 

clamav-devel/configure.in

@@ -38,7 +38,7 @@ 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 regex.h limits.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 limits.h sys/filio.h)
 AC_CHECK_HEADER(syslog.h,AC_DEFINE(USE_SYSLOG,1,[use syslog]),)
 
 AC_TYPE_OFF_T
@@ -125,16 +125,35 @@ AC_ARG_WITH(libcurl,
   esac],
 [ lcurl=auto ])
 
+dnl Based on http://curl.signal42.com/libcurl/using/autoconf.html
 if test "$lcurl" != "no"
 then
-    AC_MSG_CHECKING([for libcurl])
+    my_cv_curl_vers=NONE
+    dnl check is the plain-text version of the required version
+    check="7.11.0"
+    dnl check_hex must be UPPERCASE if any hex letters are present
+    check_hex="070B00"
+
+    AC_MSG_CHECKING([for curl >= $check])
+
     if eval curl-config --version 2>/dev/null >/dev/null; then
-	AC_DEFINE(WITH_CURL,1,use libcurl in mbox code)
-	curl_libs=`curl-config --libs`
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $curl_libs"
-	AC_MSG_RESULT(yes)
+	ver=`curl-config --version | sed -e "s/libcurl //g"`
+	hex_ver=`curl-config --vernum | tr 'a-f' 'A-F'`
+	ok=`echo "ibase=16; if($hex_ver>=$check_hex) $hex_ver else 0" | bc`
+
+	if test x$ok != x0; then
+	    curl_libs=`curl-config --libs`
+	    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $curl_libs"
+	    my_cv_curl_vers="$ver"
+	    AC_MSG_RESULT([$my_cv_curl_vers])
+	    AC_DEFINE(WITH_CURL,1,use libcurl in mbox code)
+	else
+	    AC_MSG_RESULT(FAILED)
+	    AC_MSG_WARN([$ver is too old. Need version $check or higher.])
+	fi
     else
-	AC_MSG_RESULT(no, curl-config not found)
+	AC_MSG_RESULT(FAILED)
+	AC_MSG_WARN([curl-config was not found])
     fi
 fi
 

clamav-devel/freshclam/manager.c

@@ -64,7 +64,9 @@ int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, c
 
 #ifndef HAVE_GMP
     mprintf("SECURITY WARNING: NO SUPPORT FOR DIGITAL SIGNATURES\n");
+    mprintf("See the FAQ at http://www.clamav.net/faq.html for an explanation.\n");
     logg("SECURITY WARNING: NO SUPPORT FOR DIGITAL SIGNATURES\n");
+    logg("See the FAQ at http://www.clamav.net/faq.html for an explanation.\n");
 #endif
 
     optl(opt, "no-dns") ? (usedns = 0) : (usedns = 1);