@@ -1,3 +1,21 @@

+Wed Oct 11 01:05:37 CEST 2006 (tk)

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

+  * libclamav: apply patches for the anti-phish code from Edwin:

+    - use different signature types for .pdb and .wdb: 'R' for .pdb (regex

+      matching real+displayed URL), 'X' for .wdb (the same as 'R'), 'H' for

+      .wdb (matches displayed host), 'M' for .wdb (matches real+displayed host

+      with a simple pattern)

+    - new signature type 'M' for .wdb (matches real+displayed host with a

+      simple pattern)

+    - libclamav/regex_list.c: fix incorrect OP_CUSTOMCLASS handling in

+      char_insert

+    - use pre-generated tables, instead of runtime setup_matcher_engine/_done

+      and init_hextable

+    - contrib/phishing/test*: add auto-tests for character classes and escaped

+      characters

+    - add phishcheck struct to cl_engine

+    - other cleanups

+

 Tue Oct 10 00:13:59 CEST 2006 (tk)

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

   * shared/cfgparser.c: use OPT_QUOTESTR instead of OPT_STR in all cases

@@ -1,12 +1,11 @@

 MAINTAINERCLEANFILES= Makefile.in aclocal.m4 configure config.h.in config.guess config.sub install-sh ltconfig lt-main.sh mdate-sh missing mkinstalldirs  

 CLEANFILES=phishtest_output.xml

-clam_builddir=clam

-noinst_SUBDIRS=$(clam_builddir)

+clam_builddir=../../../

 TESTS=check_phishing

 noinst_PROGRAMS=check_phishing 

-

+SUBDIRS=$(clam_builddir)

 EXTRA_DIST=regex_test.txt autogen.sh 

-check_phishing_SOURCES= urltest.c urltest.h regex_list_test.c regex_list_test.h runner.c pdomain.c pdomain.h

+check_phishing_SOURCES= urltest.c urltest.h regex_list_test.c regex_list_test.h runner.c pdomain.h pdomain.c 

 check_phishing_INCLUDES= @CHECK_CFLAGS@

 check_phishing_LDADD= @CHECK_LIBS@ $(clam_builddir)/libclamav/libclamav.la

 INCLUDES= -I$(top_srcdir) -I$(clam_builddir) -I$(clam_builddir)/shared -I$(clam_builddir)/libclamav

@@ -50,7 +50,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \

  configure.lineno configure.status.lineno

 mkinstalldirs = $(install_sh) -d

 CONFIG_HEADER = test-config.h

-CONFIG_CLEAN_FILES = clam

+CONFIG_CLEAN_FILES =

 PROGRAMS = $(noinst_PROGRAMS)

 am_check_phishing_OBJECTS = urltest.$(OBJEXT) \

 	regex_list_test.$(OBJEXT) runner.$(OBJEXT) pdomain.$(OBJEXT)

@@ -69,8 +69,15 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \

 	$(AM_LDFLAGS) $(LDFLAGS) -o $@

 SOURCES = $(check_phishing_SOURCES)

 DIST_SOURCES = $(check_phishing_SOURCES)

+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

+	html-recursive info-recursive install-data-recursive \

+	install-exec-recursive install-info-recursive \

+	install-recursive installcheck-recursive installdirs-recursive \

+	pdf-recursive ps-recursive uninstall-info-recursive \

+	uninstall-recursive

 ETAGS = etags

 CTAGS = ctags

+DIST_SUBDIRS = $(SUBDIRS)

 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

 distdir = $(PACKAGE)-$(VERSION)

 top_distdir = $(distdir)

@@ -183,21 +190,20 @@ program_transform_name = @program_transform_name@

 psdir = @psdir@

 sbindir = @sbindir@

 sharedstatedir = @sharedstatedir@

-subdirs = @subdirs@

 sysconfdir = @sysconfdir@

 target_alias = @target_alias@

 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in config.guess config.sub install-sh ltconfig lt-main.sh mdate-sh missing mkinstalldirs  

 CLEANFILES = phishtest_output.xml

-clam_builddir = clam

-noinst_SUBDIRS = $(clam_builddir)

+clam_builddir = ../../../

 TESTS = check_phishing

+SUBDIRS = $(clam_builddir)

 EXTRA_DIST = regex_test.txt autogen.sh 

-check_phishing_SOURCES = urltest.c urltest.h regex_list_test.c regex_list_test.h runner.c pdomain.c pdomain.h

+check_phishing_SOURCES = urltest.c urltest.h regex_list_test.c regex_list_test.h runner.c pdomain.h pdomain.c 

 check_phishing_INCLUDES = @CHECK_CFLAGS@

 check_phishing_LDADD = @CHECK_LIBS@ $(clam_builddir)/libclamav/libclamav.la

 INCLUDES = -I$(top_srcdir) -I$(clam_builddir) -I$(clam_builddir)/shared -I$(clam_builddir)/libclamav

 all: test-config.h

-	$(MAKE) $(AM_MAKEFLAGS) all-am

+	$(MAKE) $(AM_MAKEFLAGS) all-recursive

 .SUFFIXES:

 .SUFFIXES: .c .lo .o .obj

@@ -304,6 +310,77 @@ distclean-libtool:

 	-rm -f libtool

 uninstall-info-am:

+# This directory's subdirectories are mostly independent; you can cd

+# into them and run `make' without going through this Makefile.

+# To change the values of `make' variables: instead of editing Makefiles,

+# (1) if the variable is set in `config.status', edit `config.status'

+#     (which will cause the Makefiles to be regenerated when you run `make');

+# (2) otherwise, pass the desired values on the `make' command line.

+$(RECURSIVE_TARGETS):

+	@failcom='exit 1'; \

+	for f in x $$MAKEFLAGS; do \

+	  case $$f in \

+	    *=* | --[!k]*);; \

+	    *k*) failcom='fail=yes';; \

+	  esac; \

+	done; \

+	dot_seen=no; \

+	target=`echo $@ | sed s/-recursive//`; \

+	list='$(SUBDIRS)'; for subdir in $$list; do \

+	  echo "Making $$target in $$subdir"; \

+	  if test "$$subdir" = "."; then \

+	    dot_seen=yes; \

+	    local_target="$$target-am"; \

+	  else \

+	    local_target="$$target"; \

+	  fi; \

+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

+	  || eval $$failcom; \

+	done; \

+	if test "$$dot_seen" = "no"; then \

+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \

+	fi; test -z "$$fail"

+

+mostlyclean-recursive clean-recursive distclean-recursive \

+maintainer-clean-recursive:

+	@failcom='exit 1'; \

+	for f in x $$MAKEFLAGS; do \

+	  case $$f in \

+	    *=* | --[!k]*);; \

+	    *k*) failcom='fail=yes';; \

+	  esac; \

+	done; \

+	dot_seen=no; \

+	case "$@" in \

+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \

+	  *) list='$(SUBDIRS)' ;; \

+	esac; \

+	rev=''; for subdir in $$list; do \

+	  if test "$$subdir" = "."; then :; else \

+	    rev="$$subdir $$rev"; \

+	  fi; \

+	done; \

+	rev="$$rev ."; \

+	target=`echo $@ | sed s/-recursive//`; \

+	for subdir in $$rev; do \

+	  echo "Making $$target in $$subdir"; \

+	  if test "$$subdir" = "."; then \

+	    local_target="$$target-am"; \

+	  else \

+	    local_target="$$target"; \

+	  fi; \

+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

+	  || eval $$failcom; \

+	done && test -z "$$fail"

+tags-recursive:

+	list='$(SUBDIRS)'; for subdir in $$list; do \

+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

+	done

+ctags-recursive:

+	list='$(SUBDIRS)'; for subdir in $$list; do \

+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

+	done

+

 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

 	unique=`for i in $$list; do \

@@ -314,10 +391,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

 	mkid -fID $$unique

 tags: TAGS

-TAGS:  $(HEADERS) $(SOURCES) test-config.h.in $(TAGS_DEPENDENCIES) \

+TAGS: tags-recursive $(HEADERS) $(SOURCES) test-config.h.in $(TAGS_DEPENDENCIES) \

 		$(TAGS_FILES) $(LISP)

 	tags=; \

 	here=`pwd`; \

+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \

+	  include_option=--etags-include; \

+	  empty_fix=.; \

+	else \

+	  include_option=--include; \

+	  empty_fix=; \

+	fi; \

+	list='$(SUBDIRS)'; for subdir in $$list; do \

+	  if test "$$subdir" = .; then :; else \

+	    test ! -f $$subdir/TAGS || \

+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \

+	  fi; \

+	done; \

 	list='$(SOURCES) $(HEADERS) test-config.h.in $(LISP) $(TAGS_FILES)'; \

 	unique=`for i in $$list; do \

 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

@@ -330,7 +420,7 @@ TAGS:  $(HEADERS) $(SOURCES) test-config.h.in $(TAGS_DEPENDENCIES) \

 	    $$tags $$unique; \

 	fi

 ctags: CTAGS

-CTAGS:  $(HEADERS) $(SOURCES) test-config.h.in $(TAGS_DEPENDENCIES) \

+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) test-config.h.in $(TAGS_DEPENDENCIES) \

 		$(TAGS_FILES) $(LISP)

 	tags=; \

 	here=`pwd`; \

@@ -454,6 +544,21 @@ distdir: $(DISTFILES)

 	    || exit 1; \

 	  fi; \

 	done

+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

+	  if test "$$subdir" = .; then :; else \

+	    test -d "$(distdir)/$$subdir" \

+	    || $(mkdir_p) "$(distdir)/$$subdir" \

+	    || exit 1; \

+	    distdir=`$(am__cd) $(distdir) && pwd`; \

+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \

+	    (cd $$subdir && \

+	      $(MAKE) $(AM_MAKEFLAGS) \

+	        top_distdir="$$top_distdir" \

+	        distdir="$$distdir/$$subdir" \

+	        distdir) \

+	      || exit 1; \

+	  fi; \

+	done

 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \

 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \

 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \

@@ -553,18 +658,19 @@ distcleancheck: distclean

 	       exit 1; } >&2

 check-am: all-am

 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS

-check: check-am

+check: check-recursive

 all-am: Makefile $(PROGRAMS) test-config.h

-installdirs:

-install: install-am

-install-exec: install-exec-am

-install-data: install-data-am

-uninstall: uninstall-am

+installdirs: installdirs-recursive

+installdirs-am:

+install: install-recursive

+install-exec: install-exec-recursive

+install-data: install-data-recursive

+uninstall: uninstall-recursive

 install-am: all-am

 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

-installcheck: installcheck-am

+installcheck: installcheck-recursive

 install-strip:

 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \

 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \

@@ -582,25 +688,25 @@ maintainer-clean-generic:

 	@echo "This command is intended for maintainers to use"

 	@echo "it deletes files that may require special tools to rebuild."

 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)

-clean: clean-am

+clean: clean-recursive

 clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \

 	mostlyclean-am

-distclean: distclean-am

+distclean: distclean-recursive

 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)

 	-rm -rf ./$(DEPDIR)

 	-rm -f Makefile

 distclean-am: clean-am distclean-compile distclean-generic \

 	distclean-hdr distclean-libtool distclean-tags

-dvi: dvi-am

+dvi: dvi-recursive

 dvi-am:

-html: html-am

+html: html-recursive

-info: info-am

+info: info-recursive

 info-am:

@@ -608,47 +714,52 @@ install-data-am:

 install-exec-am:

-install-info: install-info-am

+install-info: install-info-recursive

 install-man:

 installcheck-am:

-maintainer-clean: maintainer-clean-am

+maintainer-clean: maintainer-clean-recursive

 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)

 	-rm -rf $(top_srcdir)/autom4te.cache

 	-rm -rf ./$(DEPDIR)

 	-rm -f Makefile

 maintainer-clean-am: distclean-am maintainer-clean-generic

-mostlyclean: mostlyclean-am

+mostlyclean: mostlyclean-recursive

 mostlyclean-am: mostlyclean-compile mostlyclean-generic \

 	mostlyclean-libtool

-pdf: pdf-am

+pdf: pdf-recursive

 pdf-am:

-ps: ps-am

+ps: ps-recursive

 ps-am:

 uninstall-am: uninstall-info-am

-.PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \

-	clean clean-generic clean-libtool clean-noinstPROGRAMS ctags \

+uninstall-info: uninstall-info-recursive

+

+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \

+	check-TESTS check-am clean clean-generic clean-libtool \

+	clean-noinstPROGRAMS clean-recursive ctags ctags-recursive \

 	dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \

 	dist-zip distcheck distclean distclean-compile \

 	distclean-generic distclean-hdr distclean-libtool \

-	distclean-tags distcleancheck distdir distuninstallcheck dvi \

-	dvi-am html html-am info info-am install install-am \

-	install-data install-data-am install-exec install-exec-am \

-	install-info install-info-am install-man install-strip \

-	installcheck installcheck-am installdirs maintainer-clean \

-	maintainer-clean-generic mostlyclean mostlyclean-compile \

-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \

-	tags uninstall uninstall-am uninstall-info-am

+	distclean-recursive distclean-tags distcleancheck distdir \

+	distuninstallcheck dvi dvi-am html html-am info info-am \

+	install install-am install-data install-data-am install-exec \

+	install-exec-am install-info install-info-am install-man \

+	install-strip installcheck installcheck-am installdirs \

+	installdirs-am maintainer-clean maintainer-clean-generic \

+	maintainer-clean-recursive mostlyclean mostlyclean-compile \

+	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \

+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \

+	uninstall-info-am

 # Tell versions [3.59,3.63) of GNU make to not export all variables.

 # Otherwise a system limit (for SysV at least) may be exceeded.

@@ -147,7 +147,7 @@ int main ()

 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-

-# serial 48 AC_PROG_LIBTOOL

+# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL

 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)

@@ -353,14 +353,6 @@ AC_ARG_WITH([pic],

     [pic_mode=default])

 test -z "$pic_mode" && pic_mode=default

-# Check if we have a version mismatch between libtool.m4 and ltmain.sh.

-#

-# Note:  This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined.

-#        We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually

-#        calls AC_LIBTOOL_CONFIG and creates libtool.

-#

-_LT_VERSION_CHECK

-

 # Use C for the default configuration in the libtool script

 tagname=

 AC_LIBTOOL_LANG_C_CONFIG

@@ -368,41 +360,6 @@ _LT_AC_TAGCONFIG

 ])# AC_LIBTOOL_SETUP

-# _LT_VERSION_CHECK

-# -----------------

-AC_DEFUN([_LT_VERSION_CHECK],

-[AC_MSG_CHECKING([for correct ltmain.sh version])

-if test "x$ltmain" = "x" ; then

-  AC_MSG_RESULT(no)

-  AC_MSG_ERROR([

-

-*** @<:@Gentoo@:>@ sanity check failed! ***

-*** \$ltmain is not defined, please check the patch for consistency! ***

-])

-fi

-gentoo_lt_version="1.5.22"

-gentoo_ltmain_version=`sed -n '/^[[ 	]]*VERSION=/{s/^[[ 	]]*VERSION=//;p;q;}' "$ltmain"`

-if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then

-  AC_MSG_RESULT(no)

-  AC_MSG_ERROR([

-

-*** @<:@Gentoo@:>@ sanity check failed! ***

-*** libtool.m4 and ltmain.sh have a version mismatch! ***

-*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***

-

-Please run:

-

-  libtoolize --copy --force

-

-if appropriate, please contact the maintainer of this

-package (or your distribution) for help.

-])

-else

-  AC_MSG_RESULT(yes)

-fi

-])# _LT_VERSION_CHECK

-

-

 # _LT_AC_SYS_COMPILER

 # -------------------

 AC_DEFUN([_LT_AC_SYS_COMPILER],

@@ -1533,30 +1490,6 @@ cygwin* | mingw* | pw32*)

     esac

     ;;

-  linux*)

-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then

-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

-      supports_anon_versioning=no

-      case `$LD -v 2>/dev/null` in

-        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11

-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...

-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...

-        *\ 2.11.*) ;; # other 2.11 versions

-        *) supports_anon_versioning=yes ;;

-      esac

-      if test $supports_anon_versioning = yes; then

-        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~

-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~

-$echo "local: *; };" >> $output_objdir/$libname.ver~

-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'

-      else

-        $archive_expsym_cmds="$archive_cmds"

-      fi

-    else

-      ld_shlibs=no

-    fi

-    ;;

-

   *)

     library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'

     ;;

@@ -1598,18 +1531,6 @@ freebsd1*)

   dynamic_linker=no

   ;;

-kfreebsd*-gnu)

-  version_type=linux

-  need_lib_prefix=no

-  need_version=no

-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

-  soname_spec='${libname}${release}${shared_ext}$major'

-  shlibpath_var=LD_LIBRARY_PATH

-  shlibpath_overrides_runpath=no

-  hardcode_into_libs=yes

-  dynamic_linker='GNU ld.so'

-  ;;

-

 freebsd* | dragonfly*)

   # DragonFly does not have aout.  When/if they implement a new

   # versioning mechanism, adjust this.

@@ -1621,14 +1542,7 @@ freebsd* | dragonfly*)

     *) objformat=elf ;;

     esac

   fi

-  # Handle Gentoo/FreeBSD as it was Linux

-  case $host_vendor in

-    gentoo)

-      version_type=linux ;;

-    *)

-      version_type=freebsd-$objformat ;;

-  esac

-

+  version_type=freebsd-$objformat

   case $version_type in

     freebsd-elf*)

       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'

@@ -1639,12 +1553,6 @@ freebsd* | dragonfly*)

       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'

       need_version=yes

       ;;

-    linux)

-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

-      soname_spec='${libname}${release}${shared_ext}$major'

-      need_lib_prefix=no

-      need_version=no

-      ;;

   esac

   shlibpath_var=LD_LIBRARY_PATH

   case $host_os in

@@ -1778,7 +1686,7 @@ linux*oldld* | linux*aout* | linux*coff*)

   ;;

 # This must be Linux ELF.

-linux*)

+linux* | k*bsd*-gnu)

   version_type=linux

   need_lib_prefix=no

   need_version=no

@@ -1807,7 +1715,7 @@ linux*)

   dynamic_linker='GNU/Linux ld.so'

   ;;

-knetbsd*-gnu)

+netbsdelf*-gnu)

   version_type=linux

   need_lib_prefix=no

   need_version=no

@@ -1816,7 +1724,7 @@ knetbsd*-gnu)

   shlibpath_var=LD_LIBRARY_PATH

   shlibpath_overrides_runpath=no

   hardcode_into_libs=yes

-  dynamic_linker='GNU ld.so'

+  dynamic_linker='NetBSD ld.elf_so'

   ;;

 netbsd*)

@@ -2524,7 +2432,7 @@ darwin* | rhapsody*)

   lt_cv_deplibs_check_method=pass_all

   ;;

-freebsd* | kfreebsd*-gnu | dragonfly*)

+freebsd* | dragonfly*)

   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

     case $host_cpu in

     i*86 )

@@ -2578,11 +2486,11 @@ irix5* | irix6* | nonstopux*)

   ;;

 # This must be Linux ELF.

-linux*)

+linux* | k*bsd*-gnu)

   lt_cv_deplibs_check_method=pass_all

   ;;

-netbsd*)

+netbsd* | netbsdelf*-gnu)

   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'

   else

@@ -3330,7 +3238,7 @@ case $host_os in

   freebsd-elf*)

     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no

     ;;

-  freebsd* | kfreebsd*-gnu | dragonfly*)

+  freebsd* | dragonfly*)

     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF

     # conventions

     _LT_AC_TAGVAR(ld_shlibs, $1)=yes

@@ -3489,7 +3397,7 @@ case $host_os in

     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'

     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:

     ;;

-  linux*)

+  linux* | k*bsd*-gnu)

     case $cc_basename in

       KCC*)

 	# Kuck and Associates, Inc. (KAI) C++ Compiler

@@ -3591,7 +3499,7 @@ case $host_os in

 	;;

     esac

     ;;

-  netbsd*)

+  netbsd* | netbsdelf*-gnu)

     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'

       wlarc=

@@ -4856,7 +4764,7 @@ hpux*) # Its linker distinguishes data from code symbols

   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"

   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"

   ;;

-linux*)

+linux* | k*bsd*-gnu)

   if test "$host_cpu" = ia64; then

     symcode='[[ABCDGIRSTW]]'

     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"

@@ -5129,7 +5037,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])

 	    ;;

 	esac

 	;;

-      freebsd* | kfreebsd*-gnu | dragonfly*)

+      freebsd* | dragonfly*)

 	# FreeBSD uses GNU C++

 	;;

       hpux9* | hpux10* | hpux11*)

@@ -5172,7 +5080,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])

 	    ;;

 	esac

 	;;

-      linux*)

+      linux* | k*bsd*-gnu)

 	case $cc_basename in

 	  KCC*)

 	    # KAI C++ Compiler

@@ -5215,7 +5123,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])

 	    ;;

 	esac

 	;;

-      netbsd*)

+      netbsd* | netbsdelf*-gnu)

 	;;

       osf3* | osf4* | osf5*)

 	case $cc_basename in

@@ -5426,7 +5334,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])

       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

       ;;

-    linux*)

+    linux* | k*bsd*-gnu)

       case $cc_basename in

       icc* | ecc*)

 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

@@ -5567,6 +5475,9 @@ ifelse([$1],[CXX],[

   cygwin* | mingw*)

     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'

   ;;

+  linux* | k*bsd*-gnu)

+    _LT_AC_TAGVAR(link_all_deplibs, $1)=no

+  ;;

   *)

     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

   ;;

@@ -5737,7 +5648,7 @@ EOF

       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'

       ;;

-    linux*)

+    linux* | k*bsd*-gnu)

       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then

 	tmp_addflag=

 	case $cc_basename,$host_cpu in

@@ -5763,12 +5674,13 @@ EOF

   $echo "local: *; };" >> $output_objdir/$libname.ver~

 	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'

 	fi

+	_LT_AC_TAGVAR(link_all_deplibs, $1)=no

       else

 	_LT_AC_TAGVAR(ld_shlibs, $1)=no

       fi

       ;;

-    netbsd*)

+    netbsd* | netbsdelf*-gnu)

       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

 	wlarc=

@@ -6098,7 +6010,7 @@ _LT_EOF

       ;;

     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.

-    freebsd* | kfreebsd*-gnu | dragonfly*)

+    freebsd* | dragonfly*)

       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'

       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'

       _LT_AC_TAGVAR(hardcode_direct, $1)=yes

@@ -6200,7 +6112,7 @@ _LT_EOF

       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes

       ;;

-    netbsd*)

+    netbsd* | netbsdelf*-gnu)

       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out

       else

@@ -139,23 +139,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown

 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown

 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown

-if [ "${UNAME_SYSTEM}" = "Linux" ] ; then

-	eval $set_cc_for_build

-	cat << EOF > $dummy.c

-	#include <features.h>

-	#ifdef __UCLIBC__

-	# ifdef __UCLIBC_CONFIG_VERSION__

-	LIBC=uclibc __UCLIBC_CONFIG_VERSION__

-	# else

-	LIBC=uclibc

-	# endif

-	#else

-	LIBC=gnu

-	#endif

-EOF

-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`

-fi

-

 # Note: order is significant - the case branches are not exclusive.

 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in

@@ -846,28 +829,28 @@ EOF

 	echo ${UNAME_MACHINE}-pc-minix

 	exit ;;

     arm*:Linux:*:*)

-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}

+	echo ${UNAME_MACHINE}-unknown-linux-gnu

 	exit ;;

     avr32*:Linux:*:*)

-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}

+	echo ${UNAME_MACHINE}-unknown-linux-gnu

 	exit ;;

     cris:Linux:*:*)

-	echo cris-axis-linux-${LIBC}

+	echo cris-axis-linux-gnu

 	exit ;;

     crisv32:Linux:*:*)

-	echo crisv32-axis-linux-${LIBC}

+	echo crisv32-axis-linux-gnu

 	exit ;;

     frv:Linux:*:*)

-    	echo frv-unknown-linux-${LIBC}

+    	echo frv-unknown-linux-gnu

 	exit ;;

     ia64:Linux:*:*)

-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}

+	echo ${UNAME_MACHINE}-unknown-linux-gnu

 	exit ;;

     m32r*:Linux:*:*)

-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}

+	echo ${UNAME_MACHINE}-unknown-linux-gnu

 	exit ;;

     m68*:Linux:*:*)

-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}

+	echo ${UNAME_MACHINE}-unknown-linux-gnu

 	exit ;;

     mips:Linux:*:*)

 	eval $set_cc_for_build

@@ -890,7 +873,7 @@ EOF

 		s: ::g

 		p

 	    }'`"

-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }

+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }

 	;;

     mips64:Linux:*:*)

 	eval $set_cc_for_build

@@ -913,16 +896,16 @@ EOF

 		s: ::g

 		p

 	    }'`"

-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }

+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }

 	;;

     or32:Linux:*:*)

-	echo or32-unknown-linux-${LIBC}

+	echo or32-unknown-linux-gnu

 	exit ;;

     ppc:Linux:*:*)

-	echo powerpc-unknown-linux-${LIBC}

+	echo powerpc-unknown-linux-gnu

 	exit ;;

     ppc64:Linux:*:*)

-	echo powerpc64-unknown-linux-${LIBC}

+	echo powerpc64-unknown-linux-gnu

 	exit ;;

     alpha:Linux:*:*)

 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in

@@ -935,37 +918,37 @@ EOF

 	  EV68*) UNAME_MACHINE=alphaev68 ;;

         esac

 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null

-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi

-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}

+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi

+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}

 	exit ;;

     parisc:Linux:*:* | hppa:Linux:*:*)

 	# Look for CPU level

 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in

-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;

-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;

-	  *)    echo hppa-unknown-linux-${LIBC} ;;

+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;

+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;

+	  *)    echo hppa-unknown-linux-gnu ;;

 	esac

 	exit ;;

     parisc64:Linux:*:* | hppa64:Linux:*:*)

-	echo hppa64-unknown-linux-${LIBC}

+	echo hppa64-unknown-linux-gnu

 	exit ;;

     s390:Linux:*:* | s390x:Linux:*:*)

 	echo ${UNAME_MACHINE}-ibm-linux

 	exit ;;

     sh64*:Linux:*:*)

-    	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}

+    	echo ${UNAME_MACHINE}-unknown-linux-gnu

 	exit ;;

     sh*:Linux:*:*)

-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}

+	echo ${UNAME_MACHINE}-unknown-linux-gnu

 	exit ;;

     sparc:Linux:*:* | sparc64:Linux:*:*)

-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}

+	echo ${UNAME_MACHINE}-unknown-linux-gnu

 	exit ;;

     vax:Linux:*:*)

-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}

+	echo ${UNAME_MACHINE}-dec-linux-gnu

 	exit ;;

     x86_64:Linux:*:*)

-	echo x86_64-unknown-linux-${LIBC}

+	echo x86_64-unknown-linux-gnu

 	exit ;;

     i*86:Linux:*:*)

 	# The BFD linker knows what the default object file format is, so

@@ -980,22 +963,20 @@ EOF

 				    p'`

         case "$ld_supported_targets" in

 	  elf32-i386)

-		TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"

+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"

 		;;

 	  a.out-i386-linux)

-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"

+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"

 		exit ;;

 	  coff-i386)

-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"

+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"

 		exit ;;

 	  "")

 		# Either a pre-BFD a.out linker (linux-gnuoldld) or

 		# one that does not give us useful --help.

-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"

+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"

 		exit ;;

 	esac

-	# This should get integrated into the C code below, but now we hack

-	if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi

 	# Determine whether the default compiler is a.out or elf

 	eval $set_cc_for_build

 	sed 's/^	//' << EOF >$dummy.c

@@ -244,7 +244,7 @@ case $basic_machine in

 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \

 	| bfin \

 	| c4x | clipper \

-	| d10v | d30v | dlx | dsp16xx | dvp \

+	| d10v | d30v | dlx | dsp16xx \

 	| fr30 | frv \

 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \

 	| i370 | i860 | i960 | ia64 \

@@ -276,7 +276,7 @@ case $basic_machine in

 	| pdp10 | pdp11 | pj | pjl \

 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \

 	| pyramid \

-	| sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \

+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \

 	| sh64 | sh64le \

 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \

 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \

@@ -357,7 +357,7 @@ case $basic_machine in

 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \

 	| pyramid-* \

 	| romp-* | rs6000-* \

-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \

+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \

 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \

 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \

 	| sparclite-* \

@@ -689,24 +689,6 @@ case $basic_machine in

 		basic_machine=m68k-atari

 		os=-mint

 		;;

-	mipsEE* | ee | ps2)

-		basic_machine=mips64r5900el-scei

-		case $os in

-		    -linux*)

-			;;

-		    *)

-			os=-elf

-			;;

-		esac

-		;;

-	iop)

-		basic_machine=mipsel-scei

-		os=-irx

-		;;

-	dvp)

-		basic_machine=dvp-scei

-		os=-elf

-		;;

 	mips3*-*)

 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`

 		;;