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

+Fri Apr  3 11:25:08 EEST 2009 (edwin)

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

+ * configure, configure.in, libclamav/others.c,

+ libclamunrar_iface/libclamunrar_iface.map,

+ libclamunrar_iface/unrar_iface.h: use same symbols as 0.95 for

+ libclamunrar_iface (bb #1535).

+

 Thu Apr  2 23:53:47 EEST 2009 (edwin)

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

  * libclamav/jsparse/js-norm.c: fix possible signedness issue (thanks

@@ -3002,16 +3002,6 @@ LC_AGE=0

 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"

-cat >>confdefs.h <<_ACEOF

-#define LIBCLAMAV_FULLVER "$LC_CURRENT.$LC_AGE.$LC_REVISION"

-_ACEOF

-

-

-cat >>confdefs.h <<_ACEOF

-#define LIBCLAMAV_MAJORVER "$LC_CURRENT"

-_ACEOF

-

-

 for ac_prog in gawk mawk nawk awk

 do

   # Extract the first word of "$ac_prog", so it can be a program name with args.

@@ -4920,13 +4910,13 @@ if test "${lt_cv_nm_interface+set}" = set; then

 else

   lt_cv_nm_interface="BSD nm"

   echo "int some_variable = 0;" > conftest.$ac_ext

-  (eval echo "\"\$as_me:4923: $ac_compile\"" >&5)

+  (eval echo "\"\$as_me:4913: $ac_compile\"" >&5)

   (eval "$ac_compile" 2>conftest.err)

   cat conftest.err >&5

-  (eval echo "\"\$as_me:4926: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

+  (eval echo "\"\$as_me:4916: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)

   cat conftest.err >&5

-  (eval echo "\"\$as_me:4929: output\"" >&5)

+  (eval echo "\"\$as_me:4919: output\"" >&5)

   cat conftest.out >&5

   if $GREP 'External.*some_variable' conftest.out > /dev/null; then

     lt_cv_nm_interface="MS dumpbin"

@@ -6121,7 +6111,7 @@ ia64-*-hpux*)

   ;;

 *-*-irix6*)

   # Find out which ABI we are using.

-  echo '#line 6124 "configure"' > conftest.$ac_ext

+  echo '#line 6114 "configure"' > conftest.$ac_ext

   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5

   ac_status=$?

@@ -7977,11 +7967,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:7980: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:7970: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:7984: \$? = $ac_status" >&5

+   echo "$as_me:7974: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -8316,11 +8306,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8319: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8309: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:8323: \$? = $ac_status" >&5

+   echo "$as_me:8313: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -8421,11 +8411,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8424: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8414: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:8428: \$? = $ac_status" >&5

+   echo "$as_me:8418: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

      # The compiler can only warn and ignore the option if not recognized

@@ -8476,11 +8466,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8479: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8469: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:8483: \$? = $ac_status" >&5

+   echo "$as_me:8473: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

      # The compiler can only warn and ignore the option if not recognized

@@ -11289,7 +11279,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 11292 "configure"

+#line 11282 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -11385,7 +11375,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 11388 "configure"

+#line 11378 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -12536,7 +12526,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 12539 "configure"

+#line 12529 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -13759,6 +13749,17 @@ LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""`

 ac_config_files="$ac_config_files libltdl/Makefile"

+major=`expr $LC_CURRENT - $LC_AGE`

+

+cat >>confdefs.h <<_ACEOF

+#define LIBCLAMAV_FULLVER "$major.$LC_AGE.$LC_REVISION"

+_ACEOF

+

+

+cat >>confdefs.h <<_ACEOF

+#define LIBCLAMAV_MAJORVER $major

+_ACEOF

+

 cat >>confdefs.h <<\_ACEOF

 #define SCANBUFF 131072

@@ -48,10 +48,6 @@ LC_REVISION=2

 LC_AGE=0

 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"

 AC_SUBST([LIBCLAMAV_VERSION])

-AC_DEFINE_UNQUOTED([LIBCLAMAV_FULLVER], "$LC_CURRENT.$LC_AGE.$LC_REVISION",

-	  ["Full library version number"])

-AC_DEFINE_UNQUOTED([LIBCLAMAV_MAJORVER], "$LC_CURRENT",

-	  ["Major library version number"])

 AC_PROG_AWK

 AC_PROG_INSTALL

@@ -63,6 +59,11 @@ LT_INIT([dlopen])

 LTDL_INIT([recursive])

 AC_CONFIG_FILES([libltdl/Makefile])

+major=`expr $LC_CURRENT - $LC_AGE`

+AC_DEFINE_UNQUOTED([LIBCLAMAV_FULLVER], "$major.$LC_AGE.$LC_REVISION",

+	  ["Full library version number"])

+AC_DEFINE_UNQUOTED([LIBCLAMAV_MAJORVER], $major,

+	  ["Major library version number"])

 AC_DEFINE([SCANBUFF], 131072, [scan buffer size])

 AC_DEFINE([FILEBUFF], 8192,   [file i/o buffer size])

@@ -118,11 +118,13 @@ static int lt_init(void) {

     return 0;

 }

+#define PASTE(a,b) a#b

+

 static lt_dlhandle lt_dlfind(const char *name, const char *featurename)

 {

     static const char *suffixes[] = {

 	LT_MODULE_EXT"."LIBCLAMAV_FULLVER,

-	LT_MODULE_EXT"."LIBCLAMAV_MAJORVER,

+	PASTE(LT_MODULE_EXT".", LIBCLAMAV_MAJORVER),

 	LT_MODULE_EXT,

 	"."LT_LIBEXT

     };

@@ -178,10 +180,10 @@ static void cli_rarload(void) {

     if (!rhandle)

 	return;

-    if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t *))lt_dlsym(rhandle, "unrar_open")) ||

-	!(cli_unrar_extract_next_prepare = (int(*)(unrar_state_t *, const char *))lt_dlsym(rhandle, "unrar_extract_next_prepare")) ||

-	!(cli_unrar_extract_next = (int(*)(unrar_state_t *, const char *))lt_dlsym(rhandle, "unrar_extract_next")) ||

-	!(cli_unrar_close = (void(*)(unrar_state_t *))lt_dlsym(rhandle, "unrar_close"))

+    if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t *))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_open")) ||

+	!(cli_unrar_extract_next_prepare = (int(*)(unrar_state_t *, const char *))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_extract_next_prepare")) ||

+	!(cli_unrar_extract_next = (int(*)(unrar_state_t *, const char *))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_extract_next")) ||

+	!(cli_unrar_close = (void(*)(unrar_state_t *))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_close"))

 	) {

 	/* ideally we should never land here, we'd better warn so */

         cli_warnmsg("Cannot resolve: %s (version mismatch?) - unrar support unavailable\n", lt_dlerror());

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

 CLAMAV_PRIVATE {

 	global:

-		unrar_open;

-		unrar_extract_next;

-		unrar_extract_next_prepare;

-		unrar_close;

+		libclamunrar_iface_LTX_unrar_open;

+		libclamunrar_iface_LTX_unrar_extract_next;

+		libclamunrar_iface_LTX_unrar_extract_next_prepare;

+		libclamunrar_iface_LTX_unrar_close;

 	local:

 		*;

 };

@@ -24,6 +24,11 @@

 #include "clamav-config.h"

 #endif

+#define unrar_open libclamunrar_iface_LTX_unrar_open

+#define unrar_extract_next_prepare libclamunrar_iface_LTX_unrar_extract_next_prepare

+#define unrar_extract_next libclamunrar_iface_LTX_unrar_extract_next

+#define unrar_close libclamunrar_iface_LTX_unrar_close

+

 #ifndef HAVE_ATTRIB_PACKED

 #define __attribute__(x)

 #endif