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

+Mon Jul 31 14:23:30 CEST 2006 (acab)

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

+  * libclamav: share aPLib code

+

 Mon Jul 31 12:59:30 CEST 2006 (acab)

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

   * libclamav: packers review

@@ -139,6 +139,7 @@ EGREP = @EGREP@

 EXEEXT = @EXEEXT@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

 GETENT = @GETENT@

+GREP = @GREP@

 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@

 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@

 INSTALL_DATA = @INSTALL_DATA@

@@ -172,8 +173,6 @@ STRIP = @STRIP@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

 ac_ct_CC = @ac_ct_CC@

-ac_ct_RANLIB = @ac_ct_RANLIB@

-ac_ct_STRIP = @ac_ct_STRIP@

 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@

 am__include = @am__include@

@@ -189,23 +188,29 @@ build_os = @build_os@

 build_vendor = @build_vendor@

 datadir = @datadir@

 datarootdir = @datarootdir@

+docdir = @docdir@

+dvidir = @dvidir@

 exec_prefix = @exec_prefix@

 host = @host@

 host_alias = @host_alias@

 host_cpu = @host_cpu@

 host_os = @host_os@

 host_vendor = @host_vendor@

+htmldir = @htmldir@

 includedir = @includedir@

 infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+localedir = @localedir@

 localstatedir = @localstatedir@

 mandir = @mandir@

 mkdir_p = @mkdir_p@

 oldincludedir = @oldincludedir@

+pdfdir = @pdfdir@

 prefix = @prefix@

 program_transform_name = @program_transform_name@

+psdir = @psdir@

 sbindir = @sbindir@

 sendmailprog = @sendmailprog@

 sharedstatedir = @sharedstatedir@

@@ -1,6 +1,6 @@

 #! /bin/sh

 # Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.59e.

+# Generated by GNU Autoconf 2.60.

 #

 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,

 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

@@ -230,8 +230,8 @@ IFS=$as_save_IFS

       for as_shell in $as_candidate_shells $SHELL; do

-	 # Try only shells which exist, to save several forks.

-	 if test -f "$as_shell" &&

+	 # Try only shells that exist, to save several forks.

+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&

 		{ ("$as_shell") 2> /dev/null <<\_ASEOF

 # Be Bourne compatible

 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

@@ -1574,7 +1574,7 @@ test -n "$ac_init_help" && exit $ac_status

 if $ac_init_version; then

   cat <<\_ACEOF

 configure

-generated by GNU Autoconf 2.59e

+generated by GNU Autoconf 2.60

 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,

 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

@@ -1588,7 +1588,7 @@ This file contains any messages produced by compilers while

 running configure, to aid debugging if configure makes a mistake.

 It was created by $as_me, which was

-generated by GNU Autoconf 2.59e.  Invocation command line was

+generated by GNU Autoconf 2.60.  Invocation command line was

   $ $0 $@

@@ -2505,7 +2505,7 @@ done

 { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5

 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }

-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`

+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`

 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then

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

 else

@@ -3409,7 +3409,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_compiler_gnu=no

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 ac_cv_c_compiler_gnu=$ac_compiler_gnu

 fi

@@ -3595,13 +3595,13 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

    ac_c_werror_flag=$ac_save_c_werror_flag

 fi

 { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5

@@ -3666,6 +3666,11 @@ static char *f (char * (*g) (char **, int), char **p, ...)

    that's true only with -std.  */

 int osf4_cc_array ['\x00' == 0 ? 1 : -1];

+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters

+   inside strings and character constants.  */

+#define FOO(x) 'x'

+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];

+

 int test (int i, double x);

 struct s1 {int (*f) (int a);};

 struct s2 {int (*f) (double a);};

@@ -3726,7 +3731,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f conftest.err conftest.$ac_objext

+rm -f core conftest.err conftest.$ac_objext

   test "x$ac_cv_prog_cc_c89" != "xno" && break

 done

 rm -f conftest.$ac_ext

@@ -4021,7 +4026,7 @@ fi

 { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5

 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }

-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`

+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`

 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then

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

 else

@@ -5149,7 +5154,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_header_stdc=no

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 if test $ac_cv_header_stdc = yes; then

   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.

@@ -5345,7 +5350,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	eval "$as_ac_Header=no"

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 fi

 ac_res=`eval echo '${'$as_ac_Header'}'`

 	       { echo "$as_me:$LINENO: result: $ac_res" >&5

@@ -5428,7 +5433,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_header_compiler=no

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

 echo "${ECHO_T}$ac_header_compiler" >&6; }

@@ -5875,7 +5880,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes

 case $host in

 *-*-irix6*)

   # Find out which ABI we are using.

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

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

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

   (eval $ac_compile) 2>&5

   ac_status=$?

@@ -5987,7 +5992,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	lt_cv_cc_needs_belf=no

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

      ac_ext=c

 ac_cpp='$CPP $CPPFLAGS'

@@ -6365,7 +6370,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

     CFLAGS="$save_CFLAGS"

 fi

@@ -6463,7 +6468,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

   LDFLAGS="$save_LDFLAGS"

@@ -6508,7 +6513,7 @@ chmod -w .

 save_CFLAGS="$CFLAGS"

 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"

 compiler_c_o=no

-if { (eval echo configure:6511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then

+if { (eval echo configure:6516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then

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

   # So say no if there are warnings

   if test -s out/conftest.err; then

@@ -6612,7 +6617,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

   ac_objext="$save_objext"

   CFLAGS="$save_CFLAGS"

@@ -6728,7 +6733,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

   CFLAGS="$save_CFLAGS"

   { echo "$as_me:$LINENO: result: $compiler_rtti_exceptions" >&5

 echo "${ECHO_T}$compiler_rtti_exceptions" >&6; }

@@ -8069,7 +8074,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_func_shl_load=no

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 fi

 { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5

@@ -8148,7 +8153,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_dld_shl_load=no

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -8249,7 +8254,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_func_dlopen=no

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 fi

 { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5

@@ -8328,7 +8333,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_dl_dlopen=no

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -8408,7 +8413,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_svld_dlopen=no

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -8488,7 +8493,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_dld_dld_link=no

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -8544,7 +8549,7 @@ else

     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 8547 "configure"

+#line 8552 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -8642,7 +8647,7 @@ else

     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 8645 "configure"

+#line 8650 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -9455,7 +9460,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_header_stdc=no

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 if test $ac_cv_header_stdc = yes; then

   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.

@@ -9669,7 +9674,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_header_compiler=no

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

 echo "${ECHO_T}$ac_header_compiler" >&6; }

@@ -9828,7 +9833,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_header_compiler=no

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

 echo "${ECHO_T}$ac_header_compiler" >&6; }

@@ -9990,7 +9995,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_type_off_t=no

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 fi

 { echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5

 echo "${ECHO_T}$ac_cv_type_off_t" >&6; }

@@ -10070,7 +10075,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

   if test x$ac_cv_sizeof_short != x ; then break; fi

 done

@@ -10155,7 +10160,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

   if test x$ac_cv_sizeof_int != x ; then break; fi

 done

@@ -10240,7 +10245,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

   if test x$ac_cv_sizeof_long != x ; then break; fi

 done

@@ -10325,7 +10330,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

   if test x$ac_cv_sizeof_long_long != x ; then break; fi

 done

@@ -10416,7 +10421,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_socket_bind=no

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -10497,7 +10502,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_nsl_gethostent=no

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -10615,7 +10620,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	eval "$as_ac_var=no"

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 fi

 ac_res=`eval echo '${'$as_ac_var'}'`

@@ -10698,7 +10703,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_header_compiler=no

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

 echo "${ECHO_T}$ac_header_compiler" >&6; }

@@ -10890,7 +10895,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	eval "$as_ac_var=no"

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 fi

 ac_res=`eval echo '${'$as_ac_var'}'`

@@ -11154,7 +11159,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

   cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */

 _ACEOF

@@ -11213,7 +11218,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

   break

 done

 fi

@@ -11293,7 +11298,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_func_fseeko=no

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 fi

 { echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5

@@ -11439,7 +11444,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_header_compiler=no

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

 echo "${ECHO_T}$ac_header_compiler" >&6; }

@@ -11689,7 +11694,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_z_inflateEnd=no

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -11779,7 +11784,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_z_inflateEnd=no

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -11881,7 +11886,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_bz2_bzReadOpen=no

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -11958,7 +11963,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_header_compiler=no

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

 echo "${ECHO_T}$ac_header_compiler" >&6; }

@@ -12139,7 +12144,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_sn_sigscan_sn_sigscan_initdb=no

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -12214,7 +12219,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_header_compiler=no

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

 echo "${ECHO_T}$ac_header_compiler" >&6; }

@@ -12395,7 +12400,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_resolv___dn_expand=no

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -12477,7 +12482,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_resolv_dn_expand=no

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -12551,7 +12556,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_header_compiler=no

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

 echo "${ECHO_T}$ac_header_compiler" >&6; }

@@ -12908,7 +12913,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_gmp___gmpz_init=no

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -12992,7 +12997,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_gmp_mpz_init=no

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -13867,7 +13872,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_milter_mi_stop=no

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -13954,7 +13959,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext

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

   break

@@ -14049,7 +14054,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_lib_milter_mi_stop=no

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

@@ -14137,7 +14142,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_header_compiler=no

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

 echo "${ECHO_T}$ac_header_compiler" >&6; }

@@ -14368,7 +14373,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	eval "$as_ac_var=no"

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 fi

 ac_res=`eval echo '${'$as_ac_var'}'`

@@ -14623,7 +14628,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_header_compiler=no

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

 echo "${ECHO_T}$ac_header_compiler" >&6; }

@@ -14859,11 +14864,11 @@ echo "${ECHO_T}no" >&6; }

                 LIBS=$save_LIBS

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 fi

-rm -f conftest.err conftest.$ac_objext \

+rm -f core conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext

 else

   have_wrappers=no

@@ -14958,7 +14963,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 fi

 if test -z "$ac_cv_gethostbyname_args"; then

 cat >conftest.$ac_ext <<_ACEOF

@@ -15027,7 +15032,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 fi

 if test -z "$ac_cv_gethostbyname_args"; then

 cat >conftest.$ac_ext <<_ACEOF

@@ -15099,7 +15104,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 fi

 # Check whether --enable-gethostbyname_r was given.

@@ -15206,7 +15211,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 fi

 if test -z "$ac_cv_readdir_args"; then

     cat >conftest.$ac_ext <<_ACEOF

@@ -15274,7 +15279,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 fi

 # Check whether --enable-readdir_r was given.

@@ -15389,7 +15394,7 @@ _ACEOF

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

     { echo "$as_me:$LINENO: result: yes, and it takes $ac_cv_ctime_args arguments" >&5

 echo "${ECHO_T}yes, and it takes $ac_cv_ctime_args arguments" >&6; }

@@ -15603,7 +15608,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_c_const=no

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 fi

 { echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5

 echo "${ECHO_T}$ac_cv_c_const" >&6; }

@@ -15677,7 +15682,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

   test "$ac_cv_c_inline" != no && break

 done

@@ -15824,7 +15829,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	ac_cv_c_bigendian=no

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 else

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

 sed 's/^/| /' conftest.$ac_ext >&5

@@ -15905,7 +15910,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 else

   cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */

@@ -15966,7 +15971,7 @@ fi

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 fi

 { echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5

 echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }

@@ -16064,7 +16069,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	have_attrib_packed=no

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 fi

@@ -16204,7 +16209,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	have_attrib_aligned=no

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 fi

@@ -16292,7 +16297,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

 	have_fd_set=no

 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 if test $have_fd_set = yes; then

     { echo "$as_me:$LINENO: result: yes, found in sys/types.h" >&5

 echo "${ECHO_T}yes, found in sys/types.h" >&6; }

@@ -16817,7 +16822,7 @@ exec 6>&1

 # values after options handling.

 ac_log="

 This file was extended by $as_me, which was

-generated by GNU Autoconf 2.59e.  Invocation command line was

+generated by GNU Autoconf 2.60.  Invocation command line was

   CONFIG_FILES    = $CONFIG_FILES

   CONFIG_HEADERS  = $CONFIG_HEADERS

@@ -16870,7 +16875,7 @@ _ACEOF

 cat >>$CONFIG_STATUS <<_ACEOF

 ac_cs_version="\\

 config.status

-configured by $0, generated by GNU Autoconf 2.59e,

+configured by $0, generated by GNU Autoconf 2.60,

   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

 Copyright (C) 2006 Free Software Foundation, Inc.

@@ -17507,6 +17512,7 @@ $ac_datarootdir_hack

 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&

   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&

+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&

   { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'

 which seems to be undefined.  Please make sure it is defined." >&5

 echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'

@@ -94,6 +94,8 @@ libclamav_la_SOURCES = \

 	petite.h \

 	wwunpack.c \

 	wwunpack.h \

+	packlibs.c \

+	packlibs.h \

 	fsg.c \

 	fsg.h \

 	line.c \

@@ -82,11 +82,11 @@ am_libclamav_la_OBJECTS = matcher-ac.lo matcher-bm.lo matcher.lo \

 	filetypes.lo blob.lo mbox.lo message.lo snprintf.lo table.lo \

 	text.lo ole2_extract.lo vba_extract.lo msexpand.lo pe.lo \

 	cabd.lo lzxd.lo mszipd.lo qtmd.lo system.lo upx.lo htmlnorm.lo \

-	chmunpack.lo rebuildpe.lo petite.lo wwunpack.lo fsg.lo line.lo \

-	untar.lo unzip.lo special.lo binhex.lo is_tar.lo tnef.lo \

-	unrar15.lo unrarvm.lo unrar.lo unrarfilter.lo unrarppm.lo \

-	unrar20.lo unrarcmd.lo pdf.lo spin.lo yc.lo elf.lo sis.lo \

-	uuencode.lo pst.lo

+	chmunpack.lo rebuildpe.lo petite.lo wwunpack.lo packlibs.lo \

+	fsg.lo line.lo untar.lo unzip.lo special.lo binhex.lo \

+	is_tar.lo tnef.lo unrar15.lo unrarvm.lo unrar.lo \

+	unrarfilter.lo unrarppm.lo unrar20.lo unrarcmd.lo pdf.lo \

+	spin.lo yc.lo elf.lo sis.lo uuencode.lo pst.lo

 libclamav_la_OBJECTS = $(am_libclamav_la_OBJECTS)

 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)

 depcomp = $(SHELL) $(top_srcdir)/depcomp

@@ -293,6 +293,8 @@ libclamav_la_SOURCES = \

 	petite.h \

 	wwunpack.c \

 	wwunpack.h \

+	packlibs.c \

+	packlibs.h \

 	fsg.c \

 	fsg.h \

 	line.c \

@@ -432,6 +434,7 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mszipd.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ole2_extract.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/others.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packlibs.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdf.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/petite.Plo@am__quote@

@@ -48,155 +48,14 @@

 #include "pe.h"

 #include "rebuildpe.h"

 #include "others.h"

+#include "packlibs.h"

-static int doubledl(char **scur, uint8_t *mydlptr, char *buffer, uint32_t buffersize)

-{

-  unsigned char mydl = *mydlptr;

-  unsigned char olddl = mydl;

-

-  mydl*=2;

-  if ( !(olddl & 0x7f)) {

-    if ( *scur < buffer || *scur >= buffer+buffersize-1 )

-      return -1;

-    olddl = **scur;

-    mydl = olddl*2+1;

-    *scur=*scur + 1;

-  }

-  *mydlptr = mydl;

-  return (olddl>>7)&1;

-}

-

-static int unfsg(char *source, char *dest, int ssize, int dsize, char **endsrc, char **enddst) {

-  uint8_t mydl=0x80;

-  uint32_t backbytes, backsize, oldback = 0;

-  char *csrc = source, *cdst = dest;

-  int oob, lostbit = 1;

-

-  /* I assume buffers size is >0 - No checking! */

-  *cdst++=*csrc++;

-

-  while ( 1 ) {

-    if ((oob=doubledl(&csrc, &mydl, source, ssize))) {

-      if (oob == -1)

-	return -1;

-      /* 164 */

-      backsize = 0;

-      if ((oob=doubledl(&csrc, &mydl, source, ssize))) {

-	if (oob == -1)

-	  return -1;

-	/* 16a */

-	backbytes = 0;

-	if ((oob=doubledl(&csrc, &mydl, source, ssize))) {

-	  if (oob == -1)

-	    return -1;

-	  /* 170 */

-	  lostbit = 1;

-	  backsize++;

-	  backbytes = 0x10;

-	  while ( backbytes < 0x100 ) {

-	    if ((oob=doubledl(&csrc, &mydl, source, ssize)) == -1)

-	      return -1;

-	    backbytes = backbytes*2+oob;

-	  }

-	  backbytes &= 0xff;

-	  if ( ! backbytes ) {

-	    if (cdst >= dest+dsize)

-	      return -1;

-	    *cdst++=0x00;

-	    continue;

-	  }

-	} else {

-	  /* 18f */

-	  if (csrc >= source+ssize)

-	    return -1;

-	  backbytes = *(unsigned char*)csrc;

-	  backsize = backsize * 2 + (backbytes & 1);

-	  backbytes = (backbytes & 0xff)>>1;

-	  csrc++;

-	  if (! backbytes)

-	    break;

-	  backsize+=2;

-	  oldback = backbytes;

-	  lostbit = 0;

-	}