Merge branch 'master' of git.clam.sourcefire.com:/var/lib/git/clamav-devel

clamav-config.h.in

@@ -232,6 +232,9 @@
 /* Define to '1' if you have the curses.h library */
 #undef HAVE_LIBPDCURSES
 
+/* Define to 1 if you have the `ssl' library (-lssl). */
+#undef HAVE_LIBSSL
+
 /* Define to 1 if you have the 'libxml2' library (-lxml2). */
 #undef HAVE_LIBXML2
 

configure

@@ -4895,6 +4895,8 @@ LC_AGE=1
 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
 
 
+major=`expr $LC_CURRENT - $LC_AGE`
+
 
 cat >>confdefs.h <<_ACEOF
 #define LIBCLAMAV_FULLVER "$major.$LC_AGE.$LC_REVISION"
@@ -16796,6 +16798,54 @@ else
 fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X509_VERIFY_PARAM_new in -lssl" >&5
+$as_echo_n "checking for X509_VERIFY_PARAM_new in -lssl... " >&6; }
+if ${ac_cv_lib_ssl_X509_VERIFY_PARAM_new+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lssl -lcrypto $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char X509_VERIFY_PARAM_new ();
+int
+main ()
+{
+return X509_VERIFY_PARAM_new ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ssl_X509_VERIFY_PARAM_new=yes
+else
+  ac_cv_lib_ssl_X509_VERIFY_PARAM_new=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_X509_VERIFY_PARAM_new" >&5
+$as_echo "$ac_cv_lib_ssl_X509_VERIFY_PARAM_new" >&6; }
+if test "x$ac_cv_lib_ssl_X509_VERIFY_PARAM_new" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSSL 1
+_ACEOF
+
+  LIBS="-lssl $LIBS"
+
+else
+  as_fn_error $? "Your OpenSSL installation is missing the X509_VERIFY_PARAM function. Please upgrade to a more recent version of OpenSSL." "$LINENO" 5
+fi
+
+
 LDFLAGS="$save_LDFLAGS"
 CFLAGS="$save_CFLAGS"
 

m4/reorganization/libs/openssl.m4

@@ -39,5 +39,8 @@ AC_CHECK_LIB([ssl], [SSL_library_init], [have_ssl="yes"], [AC_MSG_ERROR([Your Op
 
 AC_CHECK_LIB([crypto], [EVP_EncryptInit], [have_crypto="yes"], [AC_MSG_ERROR([Your OpenSSL installation is misconfigured or missing])])
 
+dnl OpenSSL 0.9.8 is the minimum required version due to X509_VERIFY_PARAM
+AC_CHECK_LIB([ssl], [X509_VERIFY_PARAM_new], [], [AC_MSG_ERROR([Your OpenSSL installation is missing the X509_VERIFY_PARAM function. Please upgrade to a more recent version of OpenSSL.])], [-lcrypto])
+
 LDFLAGS="$save_LDFLAGS"
 CFLAGS="$save_CFLAGS"

m4/reorganization/version.m4

@@ -8,6 +8,8 @@ LC_AGE=1
 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
 AC_SUBST([LIBCLAMAV_VERSION])
 
+major=`expr $LC_CURRENT - $LC_AGE`
+
 AC_DEFINE_UNQUOTED([LIBCLAMAV_FULLVER], "$major.$LC_AGE.$LC_REVISION",
         ["Full library version number"])