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

+Wed Jul 21 20:45:49 CEST 2004 (tk)

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

+  * libclamav: pe: enhance UPX skew detection (aCaB)

+  * configure: fix milter test on Solaris 9 (problem reported by

+	       Fletcher Mattox <fletcher*cs.utexas.edu>)

+

 Wed Jul 21 18:46:36 BST 2004 (njh)

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

   * clamav-milter:	Add a note about using sendmail -d0 to see if

@@ -46,7 +46,7 @@ while test $# -gt 0; do

 	;;

     --version)

-	echo devel-20040718

+	echo devel-20040721

 	exit 0

 	;;

@@ -11218,7 +11218,7 @@ if test "$have_milter" = "yes"; then

     if test -d /usr/lib/libmilter ; then

 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"

     fi

-    LDFLAGS="$LDFLAGS $CLAMAV_MILTER_LIBS"

+    LDFLAGS="$LDFLAGS -lmilter $CLAMAV_MILTER_LIBS"

     echo "$as_me:$LINENO: checking for mi_stop in -lmilter" >&5

 echo $ECHO_N "checking for mi_stop in -lmilter... $ECHO_C" >&6

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

@@ -11283,7 +11283,7 @@ fi

 echo "$as_me:$LINENO: result: $ac_cv_lib_milter_mi_stop" >&5

 echo "${ECHO_T}$ac_cv_lib_milter_mi_stop" >&6

 if test $ac_cv_lib_milter_mi_stop = yes; then

-  CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lmilter"

+  CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_LIBS"

 else

 	# Older sendmails require libsm or libsmutil for support functions

@@ -11477,7 +11477,7 @@ fi

 echo "$as_me:$LINENO: result: $ac_cv_lib_milter_mi_stop" >&5

 echo "${ECHO_T}$ac_cv_lib_milter_mi_stop" >&6

 if test $ac_cv_lib_milter_mi_stop = yes; then

-  CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lmilter $CLAMAV_MILTER_XLIB"

+  CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_XLIB $CLAMAV_MILTER_LIBS"

 else

 	    { { echo "$as_me:$LINENO: error: Cannot find libmilter" >&5

@@ -388,13 +388,13 @@ if test "$have_milter" = "yes"; then

     if test -d /usr/lib/libmilter ; then

 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"

     fi

-    LDFLAGS="$LDFLAGS $CLAMAV_MILTER_LIBS"

-    AC_CHECK_LIB(milter, mi_stop,[CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lmilter"],[

+    LDFLAGS="$LDFLAGS -lmilter $CLAMAV_MILTER_LIBS"

+    AC_CHECK_LIB(milter, mi_stop,[CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_LIBS"],[

 	# Older sendmails require libsm or libsmutil for support functions

 	AC_SEARCH_LIBS(strlcpy, [sm smutil], [test "$ac_cv_search_strlcpy" = "none required" || CLAMAV_MILTER_XLIB="$ac_cv_search_strlcpy"])

 	LDFLAGS="$save_LDFLAGS $CLAMAV_MILTER_LIBS $CLAMAV_MILTER_XLIB"

 	$as_unset ac_cv_lib_milter_mi_stop

-	AC_CHECK_LIB(milter, mi_stop,[CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lmilter $CLAMAV_MILTER_XLIB"],[

+	AC_CHECK_LIB(milter, mi_stop,[CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_XLIB $CLAMAV_MILTER_LIBS"],[

 	    AC_MSG_ERROR([Cannot find libmilter])

 	])

     ])

@@ -537,7 +537,7 @@ int cli_scanpe(int desc, const char **virname, long int *scanned, const struct c

 	if(upxfn) {

 		int skew = cli_readint32(buff + 2) - EC32(optional_hdr.ImageBase) - EC32(section_hdr[i+1].VirtualAddress);

-	    if(buff[1] != '\xbe' || skew <= 0 || skew > 0x2e ) { /* FIXME: legit skews?? */

+	    if(buff[1] != '\xbe' || skew <= 0 || skew > 0xfff ) { /* FIXME: legit skews?? */

 		skew = 0; 

 		if(!upxfn(src, ssize, dest, dsize))

 		    upx_success = 1;