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

+Fri Jul 25 02:24:53 CEST 2008 (acab)

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

+  * libclamav/scanners.c: warn if no bzip2 support - bb#1060

+

 Wed Jul 23 23:44:59 CEST 2008 (tk)

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

   * freshclam/mirman.c: fix handling of IPv6 addresses

@@ -24,9 +24,7 @@

 #include "regex/regex.h"

 struct regex_list {

-#ifdef CL_DEBUG

 	const char *pattern;

-#endif

 	regex_t preg;

 	struct regex_list *nxt;

 };

@@ -536,7 +536,14 @@ static int cli_scangzip(int desc, cli_ctx *ctx)

     return ret;

 }

-#ifdef HAVE_BZLIB_H

+

+#ifndef HAVE_BZLIB_H

+static int cli_scanbzip(int desc, cli_ctx *ctx) {

+    cli_warnmsg("cli_scanbzip: bzip2 support not compiled in\n");

+    return CL_CLEAN;

+}

+

+#else

 #ifdef NOBZ2PREFIX

 #define BZ2_bzReadOpen bzReadOpen

@@ -1891,10 +1898,8 @@ int cli_magic_scandesc(int desc, cli_ctx *ctx)

 	    break;

 	case CL_TYPE_BZ:

-#ifdef HAVE_BZLIB_H

 	    if(SCAN_ARCHIVE && (DCONF_ARCH & ARCH_CONF_BZ))

 		ret = cli_scanbzip(desc, ctx);

-#endif

 	    break;

 	case CL_TYPE_ARJ:

 	    if(SCAN_ARCHIVE && (DCONF_ARCH & ARCH_CONF_ARJ))