Attachment 4647 Details for Bug 6651 – Full backport to v3-4-test

[patch] Full backport to v3-4-test

tmp.diff (text/plain), 274.50 KB, created by Stefan Metzmacher on 2009-09-04 06:29:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2009-09-04 06:29:57 UTC

Size: 274.50 KB

patch

obsolete

>From 8ddef59d7bcaec1e939e1058e74655501b08e6d4 Mon Sep 17 00:00:00 2001
>From: Andrew Tridgell <tridge@samba.org>
>Date: Thu, 19 Mar 2009 11:21:36 +1100
>Subject: [PATCH] fixed a logic bug in the tevent nesting code
>
>The event nesting code never triggered as nesting.level was never
>greater than 1. The main event loop needs to increase the nesting
>level by 1.
>
>I also added a paranoia check to the nesting setup call. The API as
>currently written cannot support multiple nesting hooks, so we need to
>abort if multiple hooks are tried.
>(cherry picked from commit 13b6663e23a424473d14324ac229a21e1e90580a)
>---
> lib/tevent/tevent.c |   14 +++++++++++++-
> 1 files changed, 13 insertions(+), 1 deletions(-)
>
>diff --git a/lib/tevent/tevent.c b/lib/tevent/tevent.c
>index ba2d93f..56fd6ae 100644
>--- a/lib/tevent/tevent.c
>+++ b/lib/tevent/tevent.c
>@@ -427,6 +427,14 @@ void tevent_loop_set_nesting_hook(struct tevent_context *ev,
> 				  tevent_nesting_hook hook,
> 				  void *private_data)
> {
>+	if (ev->nesting.hook_fn && 
>+	    (ev->nesting.hook_fn != hook ||
>+	     ev->nesting.hook_private != private_data)) {
>+		/* the way the nesting hook code is currently written
>+		   we cannot support two different nesting hooks at the
>+		   same time. */
>+		tevent_abort(ev, "tevent: Violation of nesting hook rules\n");
>+	}
> 	ev->nesting.hook_fn = hook;
> 	ev->nesting.hook_private = private_data;
> }
>@@ -593,5 +601,9 @@ int tevent_common_loop_wait(struct tevent_context *ev,
> */
> int _tevent_loop_wait(struct tevent_context *ev, const char *location)
> {
>-	return ev->ops->loop_wait(ev, location);
>+	int ret;
>+	ev->nesting.level++;
>+	ret = ev->ops->loop_wait(ev, location);
>+	ev->nesting.level--;
>+	return ret;
> }
>-- 
>1.5.4.3
>
>
>From 601eeb52d3e023bae05b3f6f5f665cd2e98eb6c7 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Thu, 19 Mar 2009 14:31:43 +0100
>Subject: [PATCH] tevent: fix the nesting logic
>
>Only tevent_loop_once and tevent_loop_until() should care
>about the nesting level.
>
>This fixes the samba3 printing code where we use tevent_loop_wait()
>and don't allow nested events.
>
>We still call the nesting hook for all levels, we need to decide
>if we really want this...
>
>metze
>(cherry picked from commit 36e7045340bbc7d6567008bdd87c4cdf717835bd)
>---
> lib/tevent/tevent.c |   14 +++++++-------
> 1 files changed, 7 insertions(+), 7 deletions(-)
>
>diff --git a/lib/tevent/tevent.c b/lib/tevent/tevent.c
>index 56fd6ae..0c02e46 100644
>--- a/lib/tevent/tevent.c
>+++ b/lib/tevent/tevent.c
>@@ -468,6 +468,8 @@ int _tevent_loop_once(struct tevent_context *ev, const char *location)
> 			errno = ELOOP;
> 			return -1;
> 		}
>+	}
>+	if (ev->nesting.level > 0) {
> 		if (ev->nesting.hook_fn) {
> 			int ret2;
> 			ret2 = ev->nesting.hook_fn(ev,
>@@ -485,7 +487,7 @@ int _tevent_loop_once(struct tevent_context *ev, const char *location)
> 
> 	ret = ev->ops->loop_once(ev, location);
> 
>-	if (ev->nesting.level > 1) {
>+	if (ev->nesting.level > 0) {
> 		if (ev->nesting.hook_fn) {
> 			int ret2;
> 			ret2 = ev->nesting.hook_fn(ev,
>@@ -525,6 +527,8 @@ int _tevent_loop_until(struct tevent_context *ev,
> 			errno = ELOOP;
> 			return -1;
> 		}
>+	}
>+	if (ev->nesting.level > 0) {
> 		if (ev->nesting.hook_fn) {
> 			int ret2;
> 			ret2 = ev->nesting.hook_fn(ev,
>@@ -547,7 +551,7 @@ int _tevent_loop_until(struct tevent_context *ev,
> 		}
> 	}
> 
>-	if (ev->nesting.level > 1) {
>+	if (ev->nesting.level > 0) {
> 		if (ev->nesting.hook_fn) {
> 			int ret2;
> 			ret2 = ev->nesting.hook_fn(ev,
>@@ -601,9 +605,5 @@ int tevent_common_loop_wait(struct tevent_context *ev,
> */
> int _tevent_loop_wait(struct tevent_context *ev, const char *location)
> {
>-	int ret;
>-	ev->nesting.level++;
>-	ret = ev->ops->loop_wait(ev, location);
>-	ev->nesting.level--;
>-	return ret;
>+	return ev->ops->loop_wait(ev, location);
> }
>-- 
>1.5.4.3
>
>
>From bc728ce60c220adf2685d6999a38eb38d9d1bf77 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Fri, 1 May 2009 17:45:39 +0200
>Subject: [PATCH] tevent: fix typo async_req_done() => tevent_req_done()
>
>metze
>(cherry picked from commit 6f7cd213dd38e770224cf131054862b76069aed8)
>---
> lib/tevent/tevent_req.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/lib/tevent/tevent_req.c b/lib/tevent/tevent_req.c
>index 380a638..0170000 100644
>--- a/lib/tevent/tevent_req.c
>+++ b/lib/tevent/tevent_req.c
>@@ -132,7 +132,7 @@ static void tevent_req_finish(struct tevent_req *req,
>  * @brief An async request has successfully finished
>  * @param[in] req	The finished request
>  *
>- * async_req_done is to be used by implementors of async requests. When a
>+ * tevent_req_done is to be used by implementors of async requests. When a
>  * request is successfully finished, this function calls the user's completion
>  * function.
>  */
>-- 
>1.5.4.3
>
>
>From 9cb14c6056ddb70b60a1ec98206efc4fb58158de Mon Sep 17 00:00:00 2001
>From: Jelmer Vernooij <jelmer@samba.org>
>Date: Sat, 16 May 2009 01:54:10 +0200
>Subject: [PATCH] tevent: Don't install headers, since we don't install a shared lib
> either (from Samba).
> (cherry picked from commit 06864b4469f5f3d77637f8e6c97ec0558289cd29)
>
>---
> lib/tevent/samba.m4 |    5 -----
> 1 files changed, 0 insertions(+), 5 deletions(-)
>
>diff --git a/lib/tevent/samba.m4 b/lib/tevent/samba.m4
>index 89b0b70..549f39d 100644
>--- a/lib/tevent/samba.m4
>+++ b/lib/tevent/samba.m4
>@@ -9,8 +9,3 @@ SMB_SUBSYSTEM(LIBTEVENT,
> 	[\$(addprefix \$(libteventsrcdir)/, ${TEVENT_OBJ})],
> 	[LIBTEVENT_EXT],
> 	[${TEVENT_CFLAGS}])
>-
>-SMB_MAKE_SETTINGS([
>-PUBLIC_HEADERS += \$(addprefix \$(libteventsrcdir)/, tevent.h tevent_internal.h)
>-])
>-
>-- 
>1.5.4.3
>
>
>From f2ffa1589a565c9598f3f84b18219f6ff306da98 Mon Sep 17 00:00:00 2001
>From: Jelmer Vernooij <jelmer@samba.org>
>Date: Sat, 16 May 2009 04:03:12 +0200
>Subject: [PATCH] Update copies of config.guess and config.sub.
> (cherry picked from commit 6230eb94af2305f479db3b76479a0dc841c3d1d5)
>
>---
> lib/replace/config.guess     |  153 +++++++++++++++++++++++++------
> lib/replace/config.sub       |  205 ++++++++++++++++++++++++++++++++----------
> lib/talloc/config.guess      |  153 +++++++++++++++++++++++++------
> lib/talloc/config.sub        |  205 ++++++++++++++++++++++++++++++++----------
> lib/tdb/config.guess         |  153 +++++++++++++++++++++++++------
> lib/tdb/config.sub           |  205 ++++++++++++++++++++++++++++++++----------
> lib/tevent/config.guess      |  153 +++++++++++++++++++++++++------
> lib/tevent/config.sub        |  205 ++++++++++++++++++++++++++++++++----------
> source3/config.guess         |   10 ++-
> source3/config.sub           |    8 +-
> source3/lib/ldb/config.guess |  153 +++++++++++++++++++++++++------
> source3/lib/ldb/config.sub   |  205 ++++++++++++++++++++++++++++++++----------
> source4/config.guess         |  153 +++++++++++++++++++++++++------
> source4/config.sub           |  205 ++++++++++++++++++++++++++++++++----------
> source4/lib/ldb/config.guess |  153 +++++++++++++++++++++++++------
> source4/lib/ldb/config.sub   |  205 ++++++++++++++++++++++++++++++++----------
> 16 files changed, 1985 insertions(+), 539 deletions(-)
>
>diff --git a/lib/replace/config.guess b/lib/replace/config.guess
>index 354dbe1..da83314 100755
>--- a/lib/replace/config.guess
>+++ b/lib/replace/config.guess
>@@ -1,13 +1,14 @@
> #! /bin/sh
> # Attempt to guess a canonical system name.
> #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
>-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
>+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
>+#   Free Software Foundation, Inc.
> 
>-timestamp='2005-08-03'
>+timestamp='2009-04-27'
> 
> # This file is free software; you can redistribute it and/or modify it
> # under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 3 of the License, or
>+# the Free Software Foundation; either version 2 of the License, or
> # (at your option) any later version.
> #
> # This program is distributed in the hope that it will be useful, but
>@@ -16,7 +17,9 @@ timestamp='2005-08-03'
> # General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
>-# along with this program; if not, see <http://www.gnu.org/licenses/>.
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
>+# 02110-1301, USA.
> #
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
>@@ -53,8 +56,8 @@ version="\
> GNU config.guess ($timestamp)
> 
> Originally written by Per Bothner.
>-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
>-Free Software Foundation, Inc.
>+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
>+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
> 
> This is free software; see the source for copying conditions.  There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
>@@ -104,7 +107,7 @@ set_cc_for_build='
> trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
> trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
> : ${TMPDIR=/tmp} ;
>- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
>+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
>  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
>  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
>  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
>@@ -158,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> 	    arm*) machine=arm-unknown ;;
> 	    sh3el) machine=shl-unknown ;;
> 	    sh3eb) machine=sh-unknown ;;
>+	    sh5el) machine=sh5le-unknown ;;
> 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
> 	esac
> 	# The Operating System including object format, if it has switched
>@@ -204,8 +208,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
>     *:ekkoBSD:*:*)
> 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
> 	exit ;;
>+    *:SolidBSD:*:*)
>+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
>+	exit ;;
>     macppc:MirBSD:*:*)
>-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
>+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
> 	exit ;;
>     *:MirBSD:*:*)
> 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
>@@ -317,14 +324,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> 	case `/usr/bin/uname -p` in
> 	    sparc) echo sparc-icl-nx7; exit ;;
> 	esac ;;
>+    s390x:SunOS:*:*)
>+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
>+	exit ;;
>     sun4H:SunOS:5.*:*)
> 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit ;;
>     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
> 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit ;;
>-    i86pc:SunOS:5.*:*)
>-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
>+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
>+	eval $set_cc_for_build
>+	SUN_ARCH="i386"
>+	# If there is a compiler, see if it is configured for 64-bit objects.
>+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
>+	# This test works for both compilers.
>+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
>+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
>+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
>+		grep IS_64BIT_ARCH >/dev/null
>+	    then
>+		SUN_ARCH="x86_64"
>+	    fi
>+	fi
>+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit ;;
>     sun4*:SunOS:6*:*)
> 	# According to config.sub, this is the proper way to canonicalize
>@@ -525,7 +548,7 @@ EOF
> 		echo rs6000-ibm-aix3.2
> 	fi
> 	exit ;;
>-    *:AIX:*:[45])
>+    *:AIX:*:[456])
> 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
> 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
> 		IBM_ARCH=rs6000
>@@ -762,12 +785,19 @@ EOF
> 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
> 	exit ;;
>     *:FreeBSD:*:*)
>-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
>+	case ${UNAME_MACHINE} in
>+	    pc98)
>+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
>+	    amd64)
>+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
>+	    *)
>+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
>+	esac
> 	exit ;;
>     i*:CYGWIN*:*)
> 	echo ${UNAME_MACHINE}-pc-cygwin
> 	exit ;;
>-    i*:MINGW*:*)
>+    *:MINGW*:*)
> 	echo ${UNAME_MACHINE}-pc-mingw32
> 	exit ;;
>     i*:windows32*:*)
>@@ -777,9 +807,18 @@ EOF
>     i*:PW*:*)
> 	echo ${UNAME_MACHINE}-pc-pw32
> 	exit ;;
>-    x86:Interix*:[34]*)
>-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
>-	exit ;;
>+    *:Interix*:[3456]*)
>+    	case ${UNAME_MACHINE} in
>+	    x86)
>+		echo i586-pc-interix${UNAME_RELEASE}
>+		exit ;;
>+	    EM64T | authenticamd | genuineintel)
>+		echo x86_64-unknown-interix${UNAME_RELEASE}
>+		exit ;;
>+	    IA64)
>+		echo ia64-unknown-interix${UNAME_RELEASE}
>+		exit ;;
>+	esac ;;
>     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
> 	echo i${UNAME_MACHINE}-pc-mks
> 	exit ;;
>@@ -813,6 +852,16 @@ EOF
> 	echo ${UNAME_MACHINE}-pc-minix
> 	exit ;;
>     arm*:Linux:*:*)
>+	eval $set_cc_for_build
>+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
>+	    | grep -q __ARM_EABI__
>+	then
>+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	else
>+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
>+	fi
>+	exit ;;
>+    avr32*:Linux:*:*)
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu
> 	exit ;;
>     cris:Linux:*:*)
>@@ -849,7 +898,11 @@ EOF
> 	#endif
> 	#endif
> EOF
>-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
>+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
>+	    /^CPU/{
>+		s: ::g
>+		p
>+	    }'`"
> 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
> 	;;
>     mips64:Linux:*:*)
>@@ -868,7 +921,11 @@ EOF
> 	#endif
> 	#endif
> EOF
>-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
>+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
>+	    /^CPU/{
>+		s: ::g
>+		p
>+	    }'`"
> 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
> 	;;
>     or32:Linux:*:*)
>@@ -894,6 +951,9 @@ EOF
> 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
> 	exit ;;
>+    padre:Linux:*:*)
>+	echo sparc-unknown-linux-gnu
>+	exit ;;
>     parisc:Linux:*:* | hppa:Linux:*:*)
> 	# Look for CPU level
> 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
>@@ -917,9 +977,15 @@ EOF
>     sparc:Linux:*:* | sparc64:Linux:*:*)
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu
> 	exit ;;
>+    vax:Linux:*:*)
>+	echo ${UNAME_MACHINE}-dec-linux-gnu
>+	exit ;;
>     x86_64:Linux:*:*)
> 	echo x86_64-unknown-linux-gnu
> 	exit ;;
>+    xtensa*:Linux:*:*)
>+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	exit ;;
>     i*86:Linux:*:*)
> 	# The BFD linker knows what the default object file format is, so
> 	# first see if it will tell us. cd to the root directory to prevent
>@@ -938,9 +1004,6 @@ EOF
> 	  a.out-i386-linux)
> 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
> 		exit ;;
>-	  coff-i386)
>-		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.
>@@ -962,7 +1025,7 @@ EOF
> 	LIBC=gnulibc1
> 	# endif
> 	#else
>-	#ifdef __INTEL_COMPILER
>+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
> 	LIBC=gnu
> 	#else
> 	LIBC=gnuaout
>@@ -972,7 +1035,11 @@ EOF
> 	LIBC=dietlibc
> 	#endif
> EOF
>-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
>+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
>+	    /^LIBC/{
>+		s: ::g
>+		p
>+	    }'`"
> 	test x"${LIBC}" != x && {
> 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
> 		exit
>@@ -1051,8 +1118,11 @@ EOF
>     pc:*:*:*)
> 	# Left here for compatibility:
>         # uname -m prints for DJGPP always 'pc', but it prints nothing about
>-        # the processor, so we play safe by assuming i386.
>-	echo i386-pc-msdosdjgpp
>+        # the processor, so we play safe by assuming i586.
>+	# Note: whatever this is, it MUST be the same as what config.sub
>+	# prints for the "djgpp" host, or else GDB configury will decide that
>+	# this is a cross-build.
>+	echo i586-pc-msdosdjgpp
>         exit ;;
>     Intel:Mach:3*:*)
> 	echo i386-pc-mach3
>@@ -1090,6 +1160,16 @@ EOF
>     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
>         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
>           && { echo i486-ncr-sysv4; exit; } ;;
>+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
>+	OS_REL='.3'
>+	test -r /etc/.relid \
>+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
>+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
>+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
>+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
>+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
>+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
>+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
>     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
> 	echo m68k-unknown-lynxos${UNAME_RELEASE}
> 	exit ;;
>@@ -1165,6 +1245,9 @@ EOF
>     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
> 	echo i586-pc-beos
> 	exit ;;
>+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
>+	echo i586-pc-haiku
>+	exit ;;
>     SX-4:SUPER-UX:*:*)
> 	echo sx4-nec-superux${UNAME_RELEASE}
> 	exit ;;
>@@ -1174,6 +1257,15 @@ EOF
>     SX-6:SUPER-UX:*:*)
> 	echo sx6-nec-superux${UNAME_RELEASE}
> 	exit ;;
>+    SX-7:SUPER-UX:*:*)
>+	echo sx7-nec-superux${UNAME_RELEASE}
>+	exit ;;
>+    SX-8:SUPER-UX:*:*)
>+	echo sx8-nec-superux${UNAME_RELEASE}
>+	exit ;;
>+    SX-8R:SUPER-UX:*:*)
>+	echo sx8r-nec-superux${UNAME_RELEASE}
>+	exit ;;
>     Power*:Rhapsody:*:*)
> 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
> 	exit ;;
>@@ -1183,7 +1275,6 @@ EOF
>     *:Darwin:*:*)
> 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
> 	case $UNAME_PROCESSOR in
>-	    *86) UNAME_PROCESSOR=i686 ;;
> 	    unknown) UNAME_PROCESSOR=powerpc ;;
> 	esac
> 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
>@@ -1262,6 +1353,12 @@ EOF
>     i*86:skyos:*:*)
> 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
> 	exit ;;
>+    i*86:rdos:*:*)
>+	echo ${UNAME_MACHINE}-pc-rdos
>+	exit ;;
>+    i*86:AROS:*:*)
>+	echo ${UNAME_MACHINE}-pc-aros
>+	exit ;;
> esac
> 
> #echo '(No uname command or uname output not recognized.)' 1>&2
>@@ -1422,9 +1519,9 @@ This script, last modified $timestamp, has failed to recognize
> the operating system you are using. It is advised that you
> download the most up to date version of the config scripts from
> 
>-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
>+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
> and
>-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
>+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
> 
> If the version you run ($0) is already up to date, please
> send the following data and any information you think might be
>diff --git a/lib/replace/config.sub b/lib/replace/config.sub
>index 23cd6fd..a39437d 100755
>--- a/lib/replace/config.sub
>+++ b/lib/replace/config.sub
>@@ -1,9 +1,10 @@
> #! /bin/sh
> # Configuration validation subroutine script.
> #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
>-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
>+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
>+#   Free Software Foundation, Inc.
> 
>-timestamp='2005-07-08'
>+timestamp='2009-04-17'
> 
> # This file is (in principle) common to ALL GNU software.
> # The presence of a machine in this file suggests that SOME GNU software
>@@ -11,7 +12,7 @@ timestamp='2005-07-08'
> #
> # This file is free software; you can redistribute it and/or modify
> # it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 3 of the License, or
>+# the Free Software Foundation; either version 2 of the License, or
> # (at your option) any later version.
> #
> # This program is distributed in the hope that it will be useful,
>@@ -20,7 +21,9 @@ timestamp='2005-07-08'
> # GNU General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
>-# along with this program; if not, see <http://www.gnu.org/licenses/>.
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
>+# 02110-1301, USA.
> #
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
>@@ -69,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
> version="\
> GNU config.sub ($timestamp)
> 
>-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
>-Free Software Foundation, Inc.
>+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
>+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
> 
> This is free software; see the source for copying conditions.  There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
>@@ -117,8 +120,10 @@ esac
> # Here we must recognize all the valid KERNEL-OS combinations.
> maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`
> case $maybe_os in
>-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
>-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
>+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
>+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
>+  kopensolaris*-gnu* | \
>+  storm-chaos* | os2-emx* | rtmk-nova*)
>     os=-$maybe_os
>     basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
>     ;;
>@@ -169,6 +174,10 @@ case $os in
> 	-hiux*)
> 		os=-hiuxwe2
> 		;;
>+	-sco6)
>+		os=-sco5v6
>+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>+		;;
> 	-sco5)
> 		os=-sco3.2v5
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>@@ -185,6 +194,10 @@ case $os in
> 		# Don't forget version if it is 3.2v4 or newer.
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
> 		;;
>+	-sco5v6*)
>+		# Don't forget version if it is 3.2v4 or newer.
>+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>+		;;
> 	-sco*)
> 		os=-sco3.2v2
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>@@ -229,20 +242,24 @@ case $basic_machine in
> 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
> 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
> 	| am33_2.0 \
>-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
>+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
> 	| bfin \
> 	| c4x | clipper \
> 	| d10v | d30v | dlx | dsp16xx \
>-	| fr30 | frv \
>+	| fido | fr30 | frv \
> 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
> 	| i370 | i860 | i960 | ia64 \
> 	| ip2k | iq2000 \
>-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
>+	| lm32 \
>+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
>+	| maxq | mb | microblaze | mcore | mep | metag \
> 	| mips | mipsbe | mipseb | mipsel | mipsle \
> 	| mips16 \
> 	| mips64 | mips64el \
>-	| mips64vr | mips64vrel \
>+	| mips64octeon | mips64octeonel \
> 	| mips64orion | mips64orionel \
>+	| mips64r5900 | mips64r5900el \
>+	| mips64vr | mips64vrel \
> 	| mips64vr4100 | mips64vr4100el \
> 	| mips64vr4300 | mips64vr4300el \
> 	| mips64vr5000 | mips64vr5000el \
>@@ -255,26 +272,26 @@ case $basic_machine in
> 	| mipsisa64sr71k | mipsisa64sr71kel \
> 	| mipstx39 | mipstx39el \
> 	| mn10200 | mn10300 \
>-	| ms1 \
>+	| moxie \
>+	| mt \
> 	| msp430 \
>+	| nios | nios2 \
> 	| ns16k | ns32k \
> 	| or32 \
> 	| pdp10 | pdp11 | pj | pjl \
> 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
> 	| pyramid \
>-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
>+	| score \
>+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
> 	| sh64 | sh64le \
>-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
>-	| sparcv8 | sparcv9 | sparcv9b \
>-	| strongarm \
>+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
>+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
>+	| spu | strongarm \
> 	| tahoe | thumb | tic4x | tic80 | tron \
> 	| v850 | v850e \
> 	| we32k \
>-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
>-	| z8k)
>-		basic_machine=$basic_machine-unknown
>-		;;
>-	m32c)
>+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
>+	| z8k | z80)
> 		basic_machine=$basic_machine-unknown
> 		;;
> 	m6811 | m68hc11 | m6812 | m68hc12)
>@@ -284,6 +301,9 @@ case $basic_machine in
> 		;;
> 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
> 		;;
>+	ms1)
>+		basic_machine=mt-unknown
>+		;;
> 
> 	# We use `pc' rather than `unknown'
> 	# because (1) that's what they normally are, and
>@@ -303,25 +323,28 @@ case $basic_machine in
> 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
> 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
> 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
>-	| avr-* \
>+	| avr-* | avr32-* \
> 	| bfin-* | bs2000-* \
> 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
> 	| clipper-* | craynv-* | cydra-* \
> 	| d10v-* | d30v-* | dlx-* \
> 	| elxsi-* \
>-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
>+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
> 	| h8300-* | h8500-* \
> 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
> 	| i*86-* | i860-* | i960-* | ia64-* \
> 	| ip2k-* | iq2000-* \
>-	| m32r-* | m32rle-* \
>+	| lm32-* \
>+	| m32c-* | m32r-* | m32rle-* \
> 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
>-	| m88110-* | m88k-* | maxq-* | mcore-* \
>+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
> 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
> 	| mips16-* \
> 	| mips64-* | mips64el-* \
>-	| mips64vr-* | mips64vrel-* \
>+	| mips64octeon-* | mips64octeonel-* \
> 	| mips64orion-* | mips64orionel-* \
>+	| mips64r5900-* | mips64r5900el-* \
>+	| mips64vr-* | mips64vrel-* \
> 	| mips64vr4100-* | mips64vr4100el-* \
> 	| mips64vr4300-* | mips64vr4300el-* \
> 	| mips64vr5000-* | mips64vr5000el-* \
>@@ -334,30 +357,33 @@ case $basic_machine in
> 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
> 	| mipstx39-* | mipstx39el-* \
> 	| mmix-* \
>-	| ms1-* \
>+	| mt-* \
> 	| msp430-* \
>+	| nios-* | nios2-* \
> 	| none-* | np1-* | ns16k-* | ns32k-* \
> 	| orion-* \
> 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
> 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
> 	| pyramid-* \
> 	| romp-* | rs6000-* \
>-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
>+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
> 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
>-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
>+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
> 	| sparclite-* \
>-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
>+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
> 	| tahoe-* | thumb-* \
>-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
>+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
> 	| tron-* \
> 	| v850-* | v850e-* | vax-* \
> 	| we32k-* \
>-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
>-	| xstormy16-* | xtensa-* \
>+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
>+	| xstormy16-* | xtensa*-* \
> 	| ymp-* \
>-	| z8k-*)
>+	| z8k-* | z80-*)
> 		;;
>-	m32c-*)
>+	# Recognize the basic CPU types without company name, with glob match.
>+	xtensa*)
>+		basic_machine=$basic_machine-unknown
> 		;;
> 	# Recognize the various machine names and aliases which stand
> 	# for a CPU type and a company and sometimes even an OS.
>@@ -421,6 +447,10 @@ case $basic_machine in
> 		basic_machine=m68k-apollo
> 		os=-bsd
> 		;;
>+	aros)
>+		basic_machine=i386-pc
>+		os=-aros
>+		;;
> 	aux)
> 		basic_machine=m68k-apple
> 		os=-aux
>@@ -429,10 +459,22 @@ case $basic_machine in
> 		basic_machine=ns32k-sequent
> 		os=-dynix
> 		;;
>+	blackfin)
>+		basic_machine=bfin-unknown
>+		os=-linux
>+		;;
>+	blackfin-*)
>+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	c90)
> 		basic_machine=c90-cray
> 		os=-unicos
> 		;;
>+        cegcc)
>+		basic_machine=arm-unknown
>+		os=-cegcc
>+		;;
> 	convex-c1)
> 		basic_machine=c1-convex
> 		os=-bsd
>@@ -461,8 +503,8 @@ case $basic_machine in
> 		basic_machine=craynv-cray
> 		os=-unicosmp
> 		;;
>-	cr16c)
>-		basic_machine=cr16c-unknown
>+	cr16)
>+		basic_machine=cr16-unknown
> 		os=-elf
> 		;;
> 	crds | unos)
>@@ -500,6 +542,10 @@ case $basic_machine in
> 		basic_machine=m88k-motorola
> 		os=-sysv3
> 		;;
>+	dicos)
>+		basic_machine=i686-pc
>+		os=-dicos
>+		;;
> 	djgpp)
> 		basic_machine=i586-pc
> 		os=-msdosdjgpp
>@@ -654,6 +700,14 @@ case $basic_machine in
> 		basic_machine=m68k-isi
> 		os=-sysv
> 		;;
>+	m68knommu)
>+		basic_machine=m68k-unknown
>+		os=-linux
>+		;;
>+	m68knommu-*)
>+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	m88k-omron*)
> 		basic_machine=m88k-omron
> 		;;
>@@ -669,6 +723,10 @@ case $basic_machine in
> 		basic_machine=i386-pc
> 		os=-mingw32
> 		;;
>+	mingw32ce)
>+		basic_machine=arm-unknown
>+		os=-mingw32ce
>+		;;
> 	miniframe)
> 		basic_machine=m68000-convergent
> 		;;
>@@ -694,6 +752,9 @@ case $basic_machine in
> 		basic_machine=i386-pc
> 		os=-msdos
> 		;;
>+	ms1-*)
>+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
>+		;;
> 	mvs)
> 		basic_machine=i370-ibm
> 		os=-mvs
>@@ -792,6 +853,14 @@ case $basic_machine in
> 		basic_machine=i860-intel
> 		os=-osf
> 		;;
>+	parisc)
>+		basic_machine=hppa-unknown
>+		os=-linux
>+		;;
>+	parisc-*)
>+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	pbd)
> 		basic_machine=sparc-tti
> 		;;
>@@ -801,6 +870,12 @@ case $basic_machine in
> 	pc532 | pc532-*)
> 		basic_machine=ns32k-pc532
> 		;;
>+	pc98)
>+		basic_machine=i386-pc
>+		;;
>+	pc98-*)
>+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		;;
> 	pentium | p5 | k5 | k6 | nexgen | viac3)
> 		basic_machine=i586-pc
> 		;;
>@@ -857,6 +932,10 @@ case $basic_machine in
> 		basic_machine=i586-unknown
> 		os=-pw32
> 		;;
>+	rdos)
>+		basic_machine=i386-pc
>+		os=-rdos
>+		;;
> 	rom68k)
> 		basic_machine=m68k-rom68k
> 		os=-coff
>@@ -883,6 +962,10 @@ case $basic_machine in
> 	sb1el)
> 		basic_machine=mipsisa64sb1el-unknown
> 		;;
>+	sde)
>+		basic_machine=mipsisa32-sde
>+		os=-elf
>+		;;
> 	sei)
> 		basic_machine=mips-sei
> 		os=-seiux
>@@ -894,6 +977,9 @@ case $basic_machine in
> 		basic_machine=sh-hitachi
> 		os=-hms
> 		;;
>+	sh5el)
>+		basic_machine=sh5le-unknown
>+		;;
> 	sh64)
> 		basic_machine=sh64-unknown
> 		;;
>@@ -983,6 +1069,10 @@ case $basic_machine in
> 		basic_machine=tic6x-unknown
> 		os=-coff
> 		;;
>+	tile*)
>+		basic_machine=tile-unknown
>+		os=-linux-gnu
>+		;;
> 	tx39)
> 		basic_machine=mipstx39-unknown
> 		;;
>@@ -1058,6 +1148,10 @@ case $basic_machine in
> 		basic_machine=z8k-unknown
> 		os=-sim
> 		;;
>+	z80-*-coff)
>+		basic_machine=z80-unknown
>+		os=-sim
>+		;;
> 	none)
> 		basic_machine=none-none
> 		os=-none
>@@ -1096,10 +1190,10 @@ case $basic_machine in
> 	we32k)
> 		basic_machine=we32k-att
> 		;;
>-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
>+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
> 		basic_machine=sh-unknown
> 		;;
>-	sparc | sparcv8 | sparcv9 | sparcv9b)
>+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
> 		basic_machine=sparc-sun
> 		;;
> 	cydra)
>@@ -1168,25 +1262,28 @@ case $os in
> 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
> 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
> 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
>+	      | -kopensolaris* \
> 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
>-	      | -aos* \
>+	      | -aos* | -aros* \
> 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
> 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
>-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
>+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
>+	      | -openbsd* | -solidbsd* \
> 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
> 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
> 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
> 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
>-	      | -chorusos* | -chorusrdb* \
>+	      | -chorusos* | -chorusrdb* | -cegcc* \
> 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
>-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
>+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
>+	      | -uxpv* | -beos* | -mpeix* | -udk* \
> 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
> 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
> 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
> 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
> 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
> 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
>-	      | -skyos* | -haiku*)
>+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
> 	# Remember, each alternative MUST END IN *, to match a version number.
> 		;;
> 	-qnx*)
>@@ -1316,6 +1413,9 @@ case $os in
> 	-zvmoe)
> 		os=-zvmoe
> 		;;
>+	-dicos*)
>+		os=-dicos
>+		;;
> 	-none)
> 		;;
> 	*)
>@@ -1338,6 +1438,12 @@ else
> # system, and we'll never get to this point.
> 
> case $basic_machine in
>+        score-*)
>+		os=-elf
>+		;;
>+        spu-*)
>+		os=-elf
>+		;;
> 	*-acorn)
> 		os=-riscix1.2
> 		;;
>@@ -1347,9 +1453,9 @@ case $basic_machine in
> 	arm*-semi)
> 		os=-aout
> 		;;
>-    c4x-* | tic4x-*)
>-        os=-coff
>-        ;;
>+        c4x-* | tic4x-*)
>+        	os=-coff
>+		;;
> 	# This must come before the *-dec entry.
> 	pdp10-*)
> 		os=-tops20
>@@ -1375,6 +1481,9 @@ case $basic_machine in
> 	m68*-cisco)
> 		os=-aout
> 		;;
>+        mep-*)
>+		os=-elf
>+		;;
> 	mips*-cisco)
> 		os=-elf
> 		;;
>diff --git a/lib/talloc/config.guess b/lib/talloc/config.guess
>index 354dbe1..da83314 100755
>--- a/lib/talloc/config.guess
>+++ b/lib/talloc/config.guess
>@@ -1,13 +1,14 @@
> #! /bin/sh
> # Attempt to guess a canonical system name.
> #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
>-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
>+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
>+#   Free Software Foundation, Inc.
> 
>-timestamp='2005-08-03'
>+timestamp='2009-04-27'
> 
> # This file is free software; you can redistribute it and/or modify it
> # under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 3 of the License, or
>+# the Free Software Foundation; either version 2 of the License, or
> # (at your option) any later version.
> #
> # This program is distributed in the hope that it will be useful, but
>@@ -16,7 +17,9 @@ timestamp='2005-08-03'
> # General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
>-# along with this program; if not, see <http://www.gnu.org/licenses/>.
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
>+# 02110-1301, USA.
> #
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
>@@ -53,8 +56,8 @@ version="\
> GNU config.guess ($timestamp)
> 
> Originally written by Per Bothner.
>-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
>-Free Software Foundation, Inc.
>+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
>+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
> 
> This is free software; see the source for copying conditions.  There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
>@@ -104,7 +107,7 @@ set_cc_for_build='
> trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
> trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
> : ${TMPDIR=/tmp} ;
>- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
>+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
>  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
>  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
>  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
>@@ -158,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> 	    arm*) machine=arm-unknown ;;
> 	    sh3el) machine=shl-unknown ;;
> 	    sh3eb) machine=sh-unknown ;;
>+	    sh5el) machine=sh5le-unknown ;;
> 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
> 	esac
> 	# The Operating System including object format, if it has switched
>@@ -204,8 +208,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
>     *:ekkoBSD:*:*)
> 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
> 	exit ;;
>+    *:SolidBSD:*:*)
>+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
>+	exit ;;
>     macppc:MirBSD:*:*)
>-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
>+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
> 	exit ;;
>     *:MirBSD:*:*)
> 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
>@@ -317,14 +324,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> 	case `/usr/bin/uname -p` in
> 	    sparc) echo sparc-icl-nx7; exit ;;
> 	esac ;;
>+    s390x:SunOS:*:*)
>+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
>+	exit ;;
>     sun4H:SunOS:5.*:*)
> 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit ;;
>     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
> 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit ;;
>-    i86pc:SunOS:5.*:*)
>-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
>+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
>+	eval $set_cc_for_build
>+	SUN_ARCH="i386"
>+	# If there is a compiler, see if it is configured for 64-bit objects.
>+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
>+	# This test works for both compilers.
>+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
>+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
>+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
>+		grep IS_64BIT_ARCH >/dev/null
>+	    then
>+		SUN_ARCH="x86_64"
>+	    fi
>+	fi
>+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit ;;
>     sun4*:SunOS:6*:*)
> 	# According to config.sub, this is the proper way to canonicalize
>@@ -525,7 +548,7 @@ EOF
> 		echo rs6000-ibm-aix3.2
> 	fi
> 	exit ;;
>-    *:AIX:*:[45])
>+    *:AIX:*:[456])
> 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
> 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
> 		IBM_ARCH=rs6000
>@@ -762,12 +785,19 @@ EOF
> 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
> 	exit ;;
>     *:FreeBSD:*:*)
>-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
>+	case ${UNAME_MACHINE} in
>+	    pc98)
>+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
>+	    amd64)
>+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
>+	    *)
>+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
>+	esac
> 	exit ;;
>     i*:CYGWIN*:*)
> 	echo ${UNAME_MACHINE}-pc-cygwin
> 	exit ;;
>-    i*:MINGW*:*)
>+    *:MINGW*:*)
> 	echo ${UNAME_MACHINE}-pc-mingw32
> 	exit ;;
>     i*:windows32*:*)
>@@ -777,9 +807,18 @@ EOF
>     i*:PW*:*)
> 	echo ${UNAME_MACHINE}-pc-pw32
> 	exit ;;
>-    x86:Interix*:[34]*)
>-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
>-	exit ;;
>+    *:Interix*:[3456]*)
>+    	case ${UNAME_MACHINE} in
>+	    x86)
>+		echo i586-pc-interix${UNAME_RELEASE}
>+		exit ;;
>+	    EM64T | authenticamd | genuineintel)
>+		echo x86_64-unknown-interix${UNAME_RELEASE}
>+		exit ;;
>+	    IA64)
>+		echo ia64-unknown-interix${UNAME_RELEASE}
>+		exit ;;
>+	esac ;;
>     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
> 	echo i${UNAME_MACHINE}-pc-mks
> 	exit ;;
>@@ -813,6 +852,16 @@ EOF
> 	echo ${UNAME_MACHINE}-pc-minix
> 	exit ;;
>     arm*:Linux:*:*)
>+	eval $set_cc_for_build
>+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
>+	    | grep -q __ARM_EABI__
>+	then
>+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	else
>+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
>+	fi
>+	exit ;;
>+    avr32*:Linux:*:*)
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu
> 	exit ;;
>     cris:Linux:*:*)
>@@ -849,7 +898,11 @@ EOF
> 	#endif
> 	#endif
> EOF
>-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
>+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
>+	    /^CPU/{
>+		s: ::g
>+		p
>+	    }'`"
> 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
> 	;;
>     mips64:Linux:*:*)
>@@ -868,7 +921,11 @@ EOF
> 	#endif
> 	#endif
> EOF
>-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
>+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
>+	    /^CPU/{
>+		s: ::g
>+		p
>+	    }'`"
> 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
> 	;;
>     or32:Linux:*:*)
>@@ -894,6 +951,9 @@ EOF
> 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
> 	exit ;;
>+    padre:Linux:*:*)
>+	echo sparc-unknown-linux-gnu
>+	exit ;;
>     parisc:Linux:*:* | hppa:Linux:*:*)
> 	# Look for CPU level
> 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
>@@ -917,9 +977,15 @@ EOF
>     sparc:Linux:*:* | sparc64:Linux:*:*)
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu
> 	exit ;;
>+    vax:Linux:*:*)
>+	echo ${UNAME_MACHINE}-dec-linux-gnu
>+	exit ;;
>     x86_64:Linux:*:*)
> 	echo x86_64-unknown-linux-gnu
> 	exit ;;
>+    xtensa*:Linux:*:*)
>+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	exit ;;
>     i*86:Linux:*:*)
> 	# The BFD linker knows what the default object file format is, so
> 	# first see if it will tell us. cd to the root directory to prevent
>@@ -938,9 +1004,6 @@ EOF
> 	  a.out-i386-linux)
> 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
> 		exit ;;
>-	  coff-i386)
>-		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.
>@@ -962,7 +1025,7 @@ EOF
> 	LIBC=gnulibc1
> 	# endif
> 	#else
>-	#ifdef __INTEL_COMPILER
>+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
> 	LIBC=gnu
> 	#else
> 	LIBC=gnuaout
>@@ -972,7 +1035,11 @@ EOF
> 	LIBC=dietlibc
> 	#endif
> EOF
>-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
>+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
>+	    /^LIBC/{
>+		s: ::g
>+		p
>+	    }'`"
> 	test x"${LIBC}" != x && {
> 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
> 		exit
>@@ -1051,8 +1118,11 @@ EOF
>     pc:*:*:*)
> 	# Left here for compatibility:
>         # uname -m prints for DJGPP always 'pc', but it prints nothing about
>-        # the processor, so we play safe by assuming i386.
>-	echo i386-pc-msdosdjgpp
>+        # the processor, so we play safe by assuming i586.
>+	# Note: whatever this is, it MUST be the same as what config.sub
>+	# prints for the "djgpp" host, or else GDB configury will decide that
>+	# this is a cross-build.
>+	echo i586-pc-msdosdjgpp
>         exit ;;
>     Intel:Mach:3*:*)
> 	echo i386-pc-mach3
>@@ -1090,6 +1160,16 @@ EOF
>     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
>         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
>           && { echo i486-ncr-sysv4; exit; } ;;
>+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
>+	OS_REL='.3'
>+	test -r /etc/.relid \
>+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
>+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
>+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
>+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
>+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
>+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
>+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
>     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
> 	echo m68k-unknown-lynxos${UNAME_RELEASE}
> 	exit ;;
>@@ -1165,6 +1245,9 @@ EOF
>     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
> 	echo i586-pc-beos
> 	exit ;;
>+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
>+	echo i586-pc-haiku
>+	exit ;;
>     SX-4:SUPER-UX:*:*)
> 	echo sx4-nec-superux${UNAME_RELEASE}
> 	exit ;;
>@@ -1174,6 +1257,15 @@ EOF
>     SX-6:SUPER-UX:*:*)
> 	echo sx6-nec-superux${UNAME_RELEASE}
> 	exit ;;
>+    SX-7:SUPER-UX:*:*)
>+	echo sx7-nec-superux${UNAME_RELEASE}
>+	exit ;;
>+    SX-8:SUPER-UX:*:*)
>+	echo sx8-nec-superux${UNAME_RELEASE}
>+	exit ;;
>+    SX-8R:SUPER-UX:*:*)
>+	echo sx8r-nec-superux${UNAME_RELEASE}
>+	exit ;;
>     Power*:Rhapsody:*:*)
> 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
> 	exit ;;
>@@ -1183,7 +1275,6 @@ EOF
>     *:Darwin:*:*)
> 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
> 	case $UNAME_PROCESSOR in
>-	    *86) UNAME_PROCESSOR=i686 ;;
> 	    unknown) UNAME_PROCESSOR=powerpc ;;
> 	esac
> 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
>@@ -1262,6 +1353,12 @@ EOF
>     i*86:skyos:*:*)
> 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
> 	exit ;;
>+    i*86:rdos:*:*)
>+	echo ${UNAME_MACHINE}-pc-rdos
>+	exit ;;
>+    i*86:AROS:*:*)
>+	echo ${UNAME_MACHINE}-pc-aros
>+	exit ;;
> esac
> 
> #echo '(No uname command or uname output not recognized.)' 1>&2
>@@ -1422,9 +1519,9 @@ This script, last modified $timestamp, has failed to recognize
> the operating system you are using. It is advised that you
> download the most up to date version of the config scripts from
> 
>-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
>+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
> and
>-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
>+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
> 
> If the version you run ($0) is already up to date, please
> send the following data and any information you think might be
>diff --git a/lib/talloc/config.sub b/lib/talloc/config.sub
>index 23cd6fd..a39437d 100755
>--- a/lib/talloc/config.sub
>+++ b/lib/talloc/config.sub
>@@ -1,9 +1,10 @@
> #! /bin/sh
> # Configuration validation subroutine script.
> #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
>-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
>+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
>+#   Free Software Foundation, Inc.
> 
>-timestamp='2005-07-08'
>+timestamp='2009-04-17'
> 
> # This file is (in principle) common to ALL GNU software.
> # The presence of a machine in this file suggests that SOME GNU software
>@@ -11,7 +12,7 @@ timestamp='2005-07-08'
> #
> # This file is free software; you can redistribute it and/or modify
> # it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 3 of the License, or
>+# the Free Software Foundation; either version 2 of the License, or
> # (at your option) any later version.
> #
> # This program is distributed in the hope that it will be useful,
>@@ -20,7 +21,9 @@ timestamp='2005-07-08'
> # GNU General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
>-# along with this program; if not, see <http://www.gnu.org/licenses/>.
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
>+# 02110-1301, USA.
> #
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
>@@ -69,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
> version="\
> GNU config.sub ($timestamp)
> 
>-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
>-Free Software Foundation, Inc.
>+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
>+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
> 
> This is free software; see the source for copying conditions.  There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
>@@ -117,8 +120,10 @@ esac
> # Here we must recognize all the valid KERNEL-OS combinations.
> maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`
> case $maybe_os in
>-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
>-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
>+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
>+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
>+  kopensolaris*-gnu* | \
>+  storm-chaos* | os2-emx* | rtmk-nova*)
>     os=-$maybe_os
>     basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
>     ;;
>@@ -169,6 +174,10 @@ case $os in
> 	-hiux*)
> 		os=-hiuxwe2
> 		;;
>+	-sco6)
>+		os=-sco5v6
>+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>+		;;
> 	-sco5)
> 		os=-sco3.2v5
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>@@ -185,6 +194,10 @@ case $os in
> 		# Don't forget version if it is 3.2v4 or newer.
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
> 		;;
>+	-sco5v6*)
>+		# Don't forget version if it is 3.2v4 or newer.
>+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>+		;;
> 	-sco*)
> 		os=-sco3.2v2
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>@@ -229,20 +242,24 @@ case $basic_machine in
> 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
> 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
> 	| am33_2.0 \
>-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
>+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
> 	| bfin \
> 	| c4x | clipper \
> 	| d10v | d30v | dlx | dsp16xx \
>-	| fr30 | frv \
>+	| fido | fr30 | frv \
> 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
> 	| i370 | i860 | i960 | ia64 \
> 	| ip2k | iq2000 \
>-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
>+	| lm32 \
>+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
>+	| maxq | mb | microblaze | mcore | mep | metag \
> 	| mips | mipsbe | mipseb | mipsel | mipsle \
> 	| mips16 \
> 	| mips64 | mips64el \
>-	| mips64vr | mips64vrel \
>+	| mips64octeon | mips64octeonel \
> 	| mips64orion | mips64orionel \
>+	| mips64r5900 | mips64r5900el \
>+	| mips64vr | mips64vrel \
> 	| mips64vr4100 | mips64vr4100el \
> 	| mips64vr4300 | mips64vr4300el \
> 	| mips64vr5000 | mips64vr5000el \
>@@ -255,26 +272,26 @@ case $basic_machine in
> 	| mipsisa64sr71k | mipsisa64sr71kel \
> 	| mipstx39 | mipstx39el \
> 	| mn10200 | mn10300 \
>-	| ms1 \
>+	| moxie \
>+	| mt \
> 	| msp430 \
>+	| nios | nios2 \
> 	| ns16k | ns32k \
> 	| or32 \
> 	| pdp10 | pdp11 | pj | pjl \
> 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
> 	| pyramid \
>-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
>+	| score \
>+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
> 	| sh64 | sh64le \
>-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
>-	| sparcv8 | sparcv9 | sparcv9b \
>-	| strongarm \
>+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
>+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
>+	| spu | strongarm \
> 	| tahoe | thumb | tic4x | tic80 | tron \
> 	| v850 | v850e \
> 	| we32k \
>-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
>-	| z8k)
>-		basic_machine=$basic_machine-unknown
>-		;;
>-	m32c)
>+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
>+	| z8k | z80)
> 		basic_machine=$basic_machine-unknown
> 		;;
> 	m6811 | m68hc11 | m6812 | m68hc12)
>@@ -284,6 +301,9 @@ case $basic_machine in
> 		;;
> 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
> 		;;
>+	ms1)
>+		basic_machine=mt-unknown
>+		;;
> 
> 	# We use `pc' rather than `unknown'
> 	# because (1) that's what they normally are, and
>@@ -303,25 +323,28 @@ case $basic_machine in
> 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
> 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
> 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
>-	| avr-* \
>+	| avr-* | avr32-* \
> 	| bfin-* | bs2000-* \
> 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
> 	| clipper-* | craynv-* | cydra-* \
> 	| d10v-* | d30v-* | dlx-* \
> 	| elxsi-* \
>-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
>+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
> 	| h8300-* | h8500-* \
> 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
> 	| i*86-* | i860-* | i960-* | ia64-* \
> 	| ip2k-* | iq2000-* \
>-	| m32r-* | m32rle-* \
>+	| lm32-* \
>+	| m32c-* | m32r-* | m32rle-* \
> 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
>-	| m88110-* | m88k-* | maxq-* | mcore-* \
>+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
> 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
> 	| mips16-* \
> 	| mips64-* | mips64el-* \
>-	| mips64vr-* | mips64vrel-* \
>+	| mips64octeon-* | mips64octeonel-* \
> 	| mips64orion-* | mips64orionel-* \
>+	| mips64r5900-* | mips64r5900el-* \
>+	| mips64vr-* | mips64vrel-* \
> 	| mips64vr4100-* | mips64vr4100el-* \
> 	| mips64vr4300-* | mips64vr4300el-* \
> 	| mips64vr5000-* | mips64vr5000el-* \
>@@ -334,30 +357,33 @@ case $basic_machine in
> 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
> 	| mipstx39-* | mipstx39el-* \
> 	| mmix-* \
>-	| ms1-* \
>+	| mt-* \
> 	| msp430-* \
>+	| nios-* | nios2-* \
> 	| none-* | np1-* | ns16k-* | ns32k-* \
> 	| orion-* \
> 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
> 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
> 	| pyramid-* \
> 	| romp-* | rs6000-* \
>-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
>+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
> 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
>-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
>+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
> 	| sparclite-* \
>-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
>+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
> 	| tahoe-* | thumb-* \
>-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
>+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
> 	| tron-* \
> 	| v850-* | v850e-* | vax-* \
> 	| we32k-* \
>-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
>-	| xstormy16-* | xtensa-* \
>+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
>+	| xstormy16-* | xtensa*-* \
> 	| ymp-* \
>-	| z8k-*)
>+	| z8k-* | z80-*)
> 		;;
>-	m32c-*)
>+	# Recognize the basic CPU types without company name, with glob match.
>+	xtensa*)
>+		basic_machine=$basic_machine-unknown
> 		;;
> 	# Recognize the various machine names and aliases which stand
> 	# for a CPU type and a company and sometimes even an OS.
>@@ -421,6 +447,10 @@ case $basic_machine in
> 		basic_machine=m68k-apollo
> 		os=-bsd
> 		;;
>+	aros)
>+		basic_machine=i386-pc
>+		os=-aros
>+		;;
> 	aux)
> 		basic_machine=m68k-apple
> 		os=-aux
>@@ -429,10 +459,22 @@ case $basic_machine in
> 		basic_machine=ns32k-sequent
> 		os=-dynix
> 		;;
>+	blackfin)
>+		basic_machine=bfin-unknown
>+		os=-linux
>+		;;
>+	blackfin-*)
>+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	c90)
> 		basic_machine=c90-cray
> 		os=-unicos
> 		;;
>+        cegcc)
>+		basic_machine=arm-unknown
>+		os=-cegcc
>+		;;
> 	convex-c1)
> 		basic_machine=c1-convex
> 		os=-bsd
>@@ -461,8 +503,8 @@ case $basic_machine in
> 		basic_machine=craynv-cray
> 		os=-unicosmp
> 		;;
>-	cr16c)
>-		basic_machine=cr16c-unknown
>+	cr16)
>+		basic_machine=cr16-unknown
> 		os=-elf
> 		;;
> 	crds | unos)
>@@ -500,6 +542,10 @@ case $basic_machine in
> 		basic_machine=m88k-motorola
> 		os=-sysv3
> 		;;
>+	dicos)
>+		basic_machine=i686-pc
>+		os=-dicos
>+		;;
> 	djgpp)
> 		basic_machine=i586-pc
> 		os=-msdosdjgpp
>@@ -654,6 +700,14 @@ case $basic_machine in
> 		basic_machine=m68k-isi
> 		os=-sysv
> 		;;
>+	m68knommu)
>+		basic_machine=m68k-unknown
>+		os=-linux
>+		;;
>+	m68knommu-*)
>+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	m88k-omron*)
> 		basic_machine=m88k-omron
> 		;;
>@@ -669,6 +723,10 @@ case $basic_machine in
> 		basic_machine=i386-pc
> 		os=-mingw32
> 		;;
>+	mingw32ce)
>+		basic_machine=arm-unknown
>+		os=-mingw32ce
>+		;;
> 	miniframe)
> 		basic_machine=m68000-convergent
> 		;;
>@@ -694,6 +752,9 @@ case $basic_machine in
> 		basic_machine=i386-pc
> 		os=-msdos
> 		;;
>+	ms1-*)
>+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
>+		;;
> 	mvs)
> 		basic_machine=i370-ibm
> 		os=-mvs
>@@ -792,6 +853,14 @@ case $basic_machine in
> 		basic_machine=i860-intel
> 		os=-osf
> 		;;
>+	parisc)
>+		basic_machine=hppa-unknown
>+		os=-linux
>+		;;
>+	parisc-*)
>+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	pbd)
> 		basic_machine=sparc-tti
> 		;;
>@@ -801,6 +870,12 @@ case $basic_machine in
> 	pc532 | pc532-*)
> 		basic_machine=ns32k-pc532
> 		;;
>+	pc98)
>+		basic_machine=i386-pc
>+		;;
>+	pc98-*)
>+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		;;
> 	pentium | p5 | k5 | k6 | nexgen | viac3)
> 		basic_machine=i586-pc
> 		;;
>@@ -857,6 +932,10 @@ case $basic_machine in
> 		basic_machine=i586-unknown
> 		os=-pw32
> 		;;
>+	rdos)
>+		basic_machine=i386-pc
>+		os=-rdos
>+		;;
> 	rom68k)
> 		basic_machine=m68k-rom68k
> 		os=-coff
>@@ -883,6 +962,10 @@ case $basic_machine in
> 	sb1el)
> 		basic_machine=mipsisa64sb1el-unknown
> 		;;
>+	sde)
>+		basic_machine=mipsisa32-sde
>+		os=-elf
>+		;;
> 	sei)
> 		basic_machine=mips-sei
> 		os=-seiux
>@@ -894,6 +977,9 @@ case $basic_machine in
> 		basic_machine=sh-hitachi
> 		os=-hms
> 		;;
>+	sh5el)
>+		basic_machine=sh5le-unknown
>+		;;
> 	sh64)
> 		basic_machine=sh64-unknown
> 		;;
>@@ -983,6 +1069,10 @@ case $basic_machine in
> 		basic_machine=tic6x-unknown
> 		os=-coff
> 		;;
>+	tile*)
>+		basic_machine=tile-unknown
>+		os=-linux-gnu
>+		;;
> 	tx39)
> 		basic_machine=mipstx39-unknown
> 		;;
>@@ -1058,6 +1148,10 @@ case $basic_machine in
> 		basic_machine=z8k-unknown
> 		os=-sim
> 		;;
>+	z80-*-coff)
>+		basic_machine=z80-unknown
>+		os=-sim
>+		;;
> 	none)
> 		basic_machine=none-none
> 		os=-none
>@@ -1096,10 +1190,10 @@ case $basic_machine in
> 	we32k)
> 		basic_machine=we32k-att
> 		;;
>-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
>+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
> 		basic_machine=sh-unknown
> 		;;
>-	sparc | sparcv8 | sparcv9 | sparcv9b)
>+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
> 		basic_machine=sparc-sun
> 		;;
> 	cydra)
>@@ -1168,25 +1262,28 @@ case $os in
> 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
> 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
> 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
>+	      | -kopensolaris* \
> 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
>-	      | -aos* \
>+	      | -aos* | -aros* \
> 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
> 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
>-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
>+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
>+	      | -openbsd* | -solidbsd* \
> 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
> 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
> 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
> 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
>-	      | -chorusos* | -chorusrdb* \
>+	      | -chorusos* | -chorusrdb* | -cegcc* \
> 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
>-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
>+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
>+	      | -uxpv* | -beos* | -mpeix* | -udk* \
> 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
> 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
> 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
> 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
> 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
> 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
>-	      | -skyos* | -haiku*)
>+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
> 	# Remember, each alternative MUST END IN *, to match a version number.
> 		;;
> 	-qnx*)
>@@ -1316,6 +1413,9 @@ case $os in
> 	-zvmoe)
> 		os=-zvmoe
> 		;;
>+	-dicos*)
>+		os=-dicos
>+		;;
> 	-none)
> 		;;
> 	*)
>@@ -1338,6 +1438,12 @@ else
> # system, and we'll never get to this point.
> 
> case $basic_machine in
>+        score-*)
>+		os=-elf
>+		;;
>+        spu-*)
>+		os=-elf
>+		;;
> 	*-acorn)
> 		os=-riscix1.2
> 		;;
>@@ -1347,9 +1453,9 @@ case $basic_machine in
> 	arm*-semi)
> 		os=-aout
> 		;;
>-    c4x-* | tic4x-*)
>-        os=-coff
>-        ;;
>+        c4x-* | tic4x-*)
>+        	os=-coff
>+		;;
> 	# This must come before the *-dec entry.
> 	pdp10-*)
> 		os=-tops20
>@@ -1375,6 +1481,9 @@ case $basic_machine in
> 	m68*-cisco)
> 		os=-aout
> 		;;
>+        mep-*)
>+		os=-elf
>+		;;
> 	mips*-cisco)
> 		os=-elf
> 		;;
>diff --git a/lib/tdb/config.guess b/lib/tdb/config.guess
>index 354dbe1..da83314 100755
>--- a/lib/tdb/config.guess
>+++ b/lib/tdb/config.guess
>@@ -1,13 +1,14 @@
> #! /bin/sh
> # Attempt to guess a canonical system name.
> #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
>-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
>+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
>+#   Free Software Foundation, Inc.
> 
>-timestamp='2005-08-03'
>+timestamp='2009-04-27'
> 
> # This file is free software; you can redistribute it and/or modify it
> # under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 3 of the License, or
>+# the Free Software Foundation; either version 2 of the License, or
> # (at your option) any later version.
> #
> # This program is distributed in the hope that it will be useful, but
>@@ -16,7 +17,9 @@ timestamp='2005-08-03'
> # General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
>-# along with this program; if not, see <http://www.gnu.org/licenses/>.
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
>+# 02110-1301, USA.
> #
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
>@@ -53,8 +56,8 @@ version="\
> GNU config.guess ($timestamp)
> 
> Originally written by Per Bothner.
>-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
>-Free Software Foundation, Inc.
>+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
>+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
> 
> This is free software; see the source for copying conditions.  There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
>@@ -104,7 +107,7 @@ set_cc_for_build='
> trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
> trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
> : ${TMPDIR=/tmp} ;
>- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
>+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
>  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
>  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
>  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
>@@ -158,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> 	    arm*) machine=arm-unknown ;;
> 	    sh3el) machine=shl-unknown ;;
> 	    sh3eb) machine=sh-unknown ;;
>+	    sh5el) machine=sh5le-unknown ;;
> 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
> 	esac
> 	# The Operating System including object format, if it has switched
>@@ -204,8 +208,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
>     *:ekkoBSD:*:*)
> 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
> 	exit ;;
>+    *:SolidBSD:*:*)
>+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
>+	exit ;;
>     macppc:MirBSD:*:*)
>-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
>+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
> 	exit ;;
>     *:MirBSD:*:*)
> 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
>@@ -317,14 +324,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> 	case `/usr/bin/uname -p` in
> 	    sparc) echo sparc-icl-nx7; exit ;;
> 	esac ;;
>+    s390x:SunOS:*:*)
>+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
>+	exit ;;
>     sun4H:SunOS:5.*:*)
> 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit ;;
>     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
> 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit ;;
>-    i86pc:SunOS:5.*:*)
>-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
>+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
>+	eval $set_cc_for_build
>+	SUN_ARCH="i386"
>+	# If there is a compiler, see if it is configured for 64-bit objects.
>+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
>+	# This test works for both compilers.
>+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
>+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
>+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
>+		grep IS_64BIT_ARCH >/dev/null
>+	    then
>+		SUN_ARCH="x86_64"
>+	    fi
>+	fi
>+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit ;;
>     sun4*:SunOS:6*:*)
> 	# According to config.sub, this is the proper way to canonicalize
>@@ -525,7 +548,7 @@ EOF
> 		echo rs6000-ibm-aix3.2
> 	fi
> 	exit ;;
>-    *:AIX:*:[45])
>+    *:AIX:*:[456])
> 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
> 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
> 		IBM_ARCH=rs6000
>@@ -762,12 +785,19 @@ EOF
> 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
> 	exit ;;
>     *:FreeBSD:*:*)
>-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
>+	case ${UNAME_MACHINE} in
>+	    pc98)
>+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
>+	    amd64)
>+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
>+	    *)
>+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
>+	esac
> 	exit ;;
>     i*:CYGWIN*:*)
> 	echo ${UNAME_MACHINE}-pc-cygwin
> 	exit ;;
>-    i*:MINGW*:*)
>+    *:MINGW*:*)
> 	echo ${UNAME_MACHINE}-pc-mingw32
> 	exit ;;
>     i*:windows32*:*)
>@@ -777,9 +807,18 @@ EOF
>     i*:PW*:*)
> 	echo ${UNAME_MACHINE}-pc-pw32
> 	exit ;;
>-    x86:Interix*:[34]*)
>-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
>-	exit ;;
>+    *:Interix*:[3456]*)
>+    	case ${UNAME_MACHINE} in
>+	    x86)
>+		echo i586-pc-interix${UNAME_RELEASE}
>+		exit ;;
>+	    EM64T | authenticamd | genuineintel)
>+		echo x86_64-unknown-interix${UNAME_RELEASE}
>+		exit ;;
>+	    IA64)
>+		echo ia64-unknown-interix${UNAME_RELEASE}
>+		exit ;;
>+	esac ;;
>     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
> 	echo i${UNAME_MACHINE}-pc-mks
> 	exit ;;
>@@ -813,6 +852,16 @@ EOF
> 	echo ${UNAME_MACHINE}-pc-minix
> 	exit ;;
>     arm*:Linux:*:*)
>+	eval $set_cc_for_build
>+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
>+	    | grep -q __ARM_EABI__
>+	then
>+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	else
>+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
>+	fi
>+	exit ;;
>+    avr32*:Linux:*:*)
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu
> 	exit ;;
>     cris:Linux:*:*)
>@@ -849,7 +898,11 @@ EOF
> 	#endif
> 	#endif
> EOF
>-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
>+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
>+	    /^CPU/{
>+		s: ::g
>+		p
>+	    }'`"
> 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
> 	;;
>     mips64:Linux:*:*)
>@@ -868,7 +921,11 @@ EOF
> 	#endif
> 	#endif
> EOF
>-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
>+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
>+	    /^CPU/{
>+		s: ::g
>+		p
>+	    }'`"
> 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
> 	;;
>     or32:Linux:*:*)
>@@ -894,6 +951,9 @@ EOF
> 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
> 	exit ;;
>+    padre:Linux:*:*)
>+	echo sparc-unknown-linux-gnu
>+	exit ;;
>     parisc:Linux:*:* | hppa:Linux:*:*)
> 	# Look for CPU level
> 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
>@@ -917,9 +977,15 @@ EOF
>     sparc:Linux:*:* | sparc64:Linux:*:*)
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu
> 	exit ;;
>+    vax:Linux:*:*)
>+	echo ${UNAME_MACHINE}-dec-linux-gnu
>+	exit ;;
>     x86_64:Linux:*:*)
> 	echo x86_64-unknown-linux-gnu
> 	exit ;;
>+    xtensa*:Linux:*:*)
>+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	exit ;;
>     i*86:Linux:*:*)
> 	# The BFD linker knows what the default object file format is, so
> 	# first see if it will tell us. cd to the root directory to prevent
>@@ -938,9 +1004,6 @@ EOF
> 	  a.out-i386-linux)
> 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
> 		exit ;;
>-	  coff-i386)
>-		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.
>@@ -962,7 +1025,7 @@ EOF
> 	LIBC=gnulibc1
> 	# endif
> 	#else
>-	#ifdef __INTEL_COMPILER
>+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
> 	LIBC=gnu
> 	#else
> 	LIBC=gnuaout
>@@ -972,7 +1035,11 @@ EOF
> 	LIBC=dietlibc
> 	#endif
> EOF
>-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
>+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
>+	    /^LIBC/{
>+		s: ::g
>+		p
>+	    }'`"
> 	test x"${LIBC}" != x && {
> 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
> 		exit
>@@ -1051,8 +1118,11 @@ EOF
>     pc:*:*:*)
> 	# Left here for compatibility:
>         # uname -m prints for DJGPP always 'pc', but it prints nothing about
>-        # the processor, so we play safe by assuming i386.
>-	echo i386-pc-msdosdjgpp
>+        # the processor, so we play safe by assuming i586.
>+	# Note: whatever this is, it MUST be the same as what config.sub
>+	# prints for the "djgpp" host, or else GDB configury will decide that
>+	# this is a cross-build.
>+	echo i586-pc-msdosdjgpp
>         exit ;;
>     Intel:Mach:3*:*)
> 	echo i386-pc-mach3
>@@ -1090,6 +1160,16 @@ EOF
>     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
>         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
>           && { echo i486-ncr-sysv4; exit; } ;;
>+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
>+	OS_REL='.3'
>+	test -r /etc/.relid \
>+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
>+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
>+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
>+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
>+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
>+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
>+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
>     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
> 	echo m68k-unknown-lynxos${UNAME_RELEASE}
> 	exit ;;
>@@ -1165,6 +1245,9 @@ EOF
>     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
> 	echo i586-pc-beos
> 	exit ;;
>+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
>+	echo i586-pc-haiku
>+	exit ;;
>     SX-4:SUPER-UX:*:*)
> 	echo sx4-nec-superux${UNAME_RELEASE}
> 	exit ;;
>@@ -1174,6 +1257,15 @@ EOF
>     SX-6:SUPER-UX:*:*)
> 	echo sx6-nec-superux${UNAME_RELEASE}
> 	exit ;;
>+    SX-7:SUPER-UX:*:*)
>+	echo sx7-nec-superux${UNAME_RELEASE}
>+	exit ;;
>+    SX-8:SUPER-UX:*:*)
>+	echo sx8-nec-superux${UNAME_RELEASE}
>+	exit ;;
>+    SX-8R:SUPER-UX:*:*)
>+	echo sx8r-nec-superux${UNAME_RELEASE}
>+	exit ;;
>     Power*:Rhapsody:*:*)
> 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
> 	exit ;;
>@@ -1183,7 +1275,6 @@ EOF
>     *:Darwin:*:*)
> 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
> 	case $UNAME_PROCESSOR in
>-	    *86) UNAME_PROCESSOR=i686 ;;
> 	    unknown) UNAME_PROCESSOR=powerpc ;;
> 	esac
> 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
>@@ -1262,6 +1353,12 @@ EOF
>     i*86:skyos:*:*)
> 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
> 	exit ;;
>+    i*86:rdos:*:*)
>+	echo ${UNAME_MACHINE}-pc-rdos
>+	exit ;;
>+    i*86:AROS:*:*)
>+	echo ${UNAME_MACHINE}-pc-aros
>+	exit ;;
> esac
> 
> #echo '(No uname command or uname output not recognized.)' 1>&2
>@@ -1422,9 +1519,9 @@ This script, last modified $timestamp, has failed to recognize
> the operating system you are using. It is advised that you
> download the most up to date version of the config scripts from
> 
>-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
>+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
> and
>-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
>+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
> 
> If the version you run ($0) is already up to date, please
> send the following data and any information you think might be
>diff --git a/lib/tdb/config.sub b/lib/tdb/config.sub
>index 23cd6fd..a39437d 100755
>--- a/lib/tdb/config.sub
>+++ b/lib/tdb/config.sub
>@@ -1,9 +1,10 @@
> #! /bin/sh
> # Configuration validation subroutine script.
> #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
>-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
>+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
>+#   Free Software Foundation, Inc.
> 
>-timestamp='2005-07-08'
>+timestamp='2009-04-17'
> 
> # This file is (in principle) common to ALL GNU software.
> # The presence of a machine in this file suggests that SOME GNU software
>@@ -11,7 +12,7 @@ timestamp='2005-07-08'
> #
> # This file is free software; you can redistribute it and/or modify
> # it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 3 of the License, or
>+# the Free Software Foundation; either version 2 of the License, or
> # (at your option) any later version.
> #
> # This program is distributed in the hope that it will be useful,
>@@ -20,7 +21,9 @@ timestamp='2005-07-08'
> # GNU General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
>-# along with this program; if not, see <http://www.gnu.org/licenses/>.
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
>+# 02110-1301, USA.
> #
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
>@@ -69,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
> version="\
> GNU config.sub ($timestamp)
> 
>-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
>-Free Software Foundation, Inc.
>+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
>+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
> 
> This is free software; see the source for copying conditions.  There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
>@@ -117,8 +120,10 @@ esac
> # Here we must recognize all the valid KERNEL-OS combinations.
> maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`
> case $maybe_os in
>-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
>-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
>+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
>+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
>+  kopensolaris*-gnu* | \
>+  storm-chaos* | os2-emx* | rtmk-nova*)
>     os=-$maybe_os
>     basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
>     ;;
>@@ -169,6 +174,10 @@ case $os in
> 	-hiux*)
> 		os=-hiuxwe2
> 		;;
>+	-sco6)
>+		os=-sco5v6
>+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>+		;;
> 	-sco5)
> 		os=-sco3.2v5
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>@@ -185,6 +194,10 @@ case $os in
> 		# Don't forget version if it is 3.2v4 or newer.
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
> 		;;
>+	-sco5v6*)
>+		# Don't forget version if it is 3.2v4 or newer.
>+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>+		;;
> 	-sco*)
> 		os=-sco3.2v2
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>@@ -229,20 +242,24 @@ case $basic_machine in
> 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
> 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
> 	| am33_2.0 \
>-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
>+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
> 	| bfin \
> 	| c4x | clipper \
> 	| d10v | d30v | dlx | dsp16xx \
>-	| fr30 | frv \
>+	| fido | fr30 | frv \
> 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
> 	| i370 | i860 | i960 | ia64 \
> 	| ip2k | iq2000 \
>-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
>+	| lm32 \
>+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
>+	| maxq | mb | microblaze | mcore | mep | metag \
> 	| mips | mipsbe | mipseb | mipsel | mipsle \
> 	| mips16 \
> 	| mips64 | mips64el \
>-	| mips64vr | mips64vrel \
>+	| mips64octeon | mips64octeonel \
> 	| mips64orion | mips64orionel \
>+	| mips64r5900 | mips64r5900el \
>+	| mips64vr | mips64vrel \
> 	| mips64vr4100 | mips64vr4100el \
> 	| mips64vr4300 | mips64vr4300el \
> 	| mips64vr5000 | mips64vr5000el \
>@@ -255,26 +272,26 @@ case $basic_machine in
> 	| mipsisa64sr71k | mipsisa64sr71kel \
> 	| mipstx39 | mipstx39el \
> 	| mn10200 | mn10300 \
>-	| ms1 \
>+	| moxie \
>+	| mt \
> 	| msp430 \
>+	| nios | nios2 \
> 	| ns16k | ns32k \
> 	| or32 \
> 	| pdp10 | pdp11 | pj | pjl \
> 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
> 	| pyramid \
>-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
>+	| score \
>+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
> 	| sh64 | sh64le \
>-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
>-	| sparcv8 | sparcv9 | sparcv9b \
>-	| strongarm \
>+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
>+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
>+	| spu | strongarm \
> 	| tahoe | thumb | tic4x | tic80 | tron \
> 	| v850 | v850e \
> 	| we32k \
>-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
>-	| z8k)
>-		basic_machine=$basic_machine-unknown
>-		;;
>-	m32c)
>+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
>+	| z8k | z80)
> 		basic_machine=$basic_machine-unknown
> 		;;
> 	m6811 | m68hc11 | m6812 | m68hc12)
>@@ -284,6 +301,9 @@ case $basic_machine in
> 		;;
> 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
> 		;;
>+	ms1)
>+		basic_machine=mt-unknown
>+		;;
> 
> 	# We use `pc' rather than `unknown'
> 	# because (1) that's what they normally are, and
>@@ -303,25 +323,28 @@ case $basic_machine in
> 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
> 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
> 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
>-	| avr-* \
>+	| avr-* | avr32-* \
> 	| bfin-* | bs2000-* \
> 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
> 	| clipper-* | craynv-* | cydra-* \
> 	| d10v-* | d30v-* | dlx-* \
> 	| elxsi-* \
>-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
>+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
> 	| h8300-* | h8500-* \
> 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
> 	| i*86-* | i860-* | i960-* | ia64-* \
> 	| ip2k-* | iq2000-* \
>-	| m32r-* | m32rle-* \
>+	| lm32-* \
>+	| m32c-* | m32r-* | m32rle-* \
> 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
>-	| m88110-* | m88k-* | maxq-* | mcore-* \
>+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
> 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
> 	| mips16-* \
> 	| mips64-* | mips64el-* \
>-	| mips64vr-* | mips64vrel-* \
>+	| mips64octeon-* | mips64octeonel-* \
> 	| mips64orion-* | mips64orionel-* \
>+	| mips64r5900-* | mips64r5900el-* \
>+	| mips64vr-* | mips64vrel-* \
> 	| mips64vr4100-* | mips64vr4100el-* \
> 	| mips64vr4300-* | mips64vr4300el-* \
> 	| mips64vr5000-* | mips64vr5000el-* \
>@@ -334,30 +357,33 @@ case $basic_machine in
> 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
> 	| mipstx39-* | mipstx39el-* \
> 	| mmix-* \
>-	| ms1-* \
>+	| mt-* \
> 	| msp430-* \
>+	| nios-* | nios2-* \
> 	| none-* | np1-* | ns16k-* | ns32k-* \
> 	| orion-* \
> 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
> 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
> 	| pyramid-* \
> 	| romp-* | rs6000-* \
>-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
>+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
> 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
>-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
>+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
> 	| sparclite-* \
>-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
>+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
> 	| tahoe-* | thumb-* \
>-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
>+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
> 	| tron-* \
> 	| v850-* | v850e-* | vax-* \
> 	| we32k-* \
>-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
>-	| xstormy16-* | xtensa-* \
>+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
>+	| xstormy16-* | xtensa*-* \
> 	| ymp-* \
>-	| z8k-*)
>+	| z8k-* | z80-*)
> 		;;
>-	m32c-*)
>+	# Recognize the basic CPU types without company name, with glob match.
>+	xtensa*)
>+		basic_machine=$basic_machine-unknown
> 		;;
> 	# Recognize the various machine names and aliases which stand
> 	# for a CPU type and a company and sometimes even an OS.
>@@ -421,6 +447,10 @@ case $basic_machine in
> 		basic_machine=m68k-apollo
> 		os=-bsd
> 		;;
>+	aros)
>+		basic_machine=i386-pc
>+		os=-aros
>+		;;
> 	aux)
> 		basic_machine=m68k-apple
> 		os=-aux
>@@ -429,10 +459,22 @@ case $basic_machine in
> 		basic_machine=ns32k-sequent
> 		os=-dynix
> 		;;
>+	blackfin)
>+		basic_machine=bfin-unknown
>+		os=-linux
>+		;;
>+	blackfin-*)
>+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	c90)
> 		basic_machine=c90-cray
> 		os=-unicos
> 		;;
>+        cegcc)
>+		basic_machine=arm-unknown
>+		os=-cegcc
>+		;;
> 	convex-c1)
> 		basic_machine=c1-convex
> 		os=-bsd
>@@ -461,8 +503,8 @@ case $basic_machine in
> 		basic_machine=craynv-cray
> 		os=-unicosmp
> 		;;
>-	cr16c)
>-		basic_machine=cr16c-unknown
>+	cr16)
>+		basic_machine=cr16-unknown
> 		os=-elf
> 		;;
> 	crds | unos)
>@@ -500,6 +542,10 @@ case $basic_machine in
> 		basic_machine=m88k-motorola
> 		os=-sysv3
> 		;;
>+	dicos)
>+		basic_machine=i686-pc
>+		os=-dicos
>+		;;
> 	djgpp)
> 		basic_machine=i586-pc
> 		os=-msdosdjgpp
>@@ -654,6 +700,14 @@ case $basic_machine in
> 		basic_machine=m68k-isi
> 		os=-sysv
> 		;;
>+	m68knommu)
>+		basic_machine=m68k-unknown
>+		os=-linux
>+		;;
>+	m68knommu-*)
>+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	m88k-omron*)
> 		basic_machine=m88k-omron
> 		;;
>@@ -669,6 +723,10 @@ case $basic_machine in
> 		basic_machine=i386-pc
> 		os=-mingw32
> 		;;
>+	mingw32ce)
>+		basic_machine=arm-unknown
>+		os=-mingw32ce
>+		;;
> 	miniframe)
> 		basic_machine=m68000-convergent
> 		;;
>@@ -694,6 +752,9 @@ case $basic_machine in
> 		basic_machine=i386-pc
> 		os=-msdos
> 		;;
>+	ms1-*)
>+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
>+		;;
> 	mvs)
> 		basic_machine=i370-ibm
> 		os=-mvs
>@@ -792,6 +853,14 @@ case $basic_machine in
> 		basic_machine=i860-intel
> 		os=-osf
> 		;;
>+	parisc)
>+		basic_machine=hppa-unknown
>+		os=-linux
>+		;;
>+	parisc-*)
>+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	pbd)
> 		basic_machine=sparc-tti
> 		;;
>@@ -801,6 +870,12 @@ case $basic_machine in
> 	pc532 | pc532-*)
> 		basic_machine=ns32k-pc532
> 		;;
>+	pc98)
>+		basic_machine=i386-pc
>+		;;
>+	pc98-*)
>+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		;;
> 	pentium | p5 | k5 | k6 | nexgen | viac3)
> 		basic_machine=i586-pc
> 		;;
>@@ -857,6 +932,10 @@ case $basic_machine in
> 		basic_machine=i586-unknown
> 		os=-pw32
> 		;;
>+	rdos)
>+		basic_machine=i386-pc
>+		os=-rdos
>+		;;
> 	rom68k)
> 		basic_machine=m68k-rom68k
> 		os=-coff
>@@ -883,6 +962,10 @@ case $basic_machine in
> 	sb1el)
> 		basic_machine=mipsisa64sb1el-unknown
> 		;;
>+	sde)
>+		basic_machine=mipsisa32-sde
>+		os=-elf
>+		;;
> 	sei)
> 		basic_machine=mips-sei
> 		os=-seiux
>@@ -894,6 +977,9 @@ case $basic_machine in
> 		basic_machine=sh-hitachi
> 		os=-hms
> 		;;
>+	sh5el)
>+		basic_machine=sh5le-unknown
>+		;;
> 	sh64)
> 		basic_machine=sh64-unknown
> 		;;
>@@ -983,6 +1069,10 @@ case $basic_machine in
> 		basic_machine=tic6x-unknown
> 		os=-coff
> 		;;
>+	tile*)
>+		basic_machine=tile-unknown
>+		os=-linux-gnu
>+		;;
> 	tx39)
> 		basic_machine=mipstx39-unknown
> 		;;
>@@ -1058,6 +1148,10 @@ case $basic_machine in
> 		basic_machine=z8k-unknown
> 		os=-sim
> 		;;
>+	z80-*-coff)
>+		basic_machine=z80-unknown
>+		os=-sim
>+		;;
> 	none)
> 		basic_machine=none-none
> 		os=-none
>@@ -1096,10 +1190,10 @@ case $basic_machine in
> 	we32k)
> 		basic_machine=we32k-att
> 		;;
>-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
>+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
> 		basic_machine=sh-unknown
> 		;;
>-	sparc | sparcv8 | sparcv9 | sparcv9b)
>+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
> 		basic_machine=sparc-sun
> 		;;
> 	cydra)
>@@ -1168,25 +1262,28 @@ case $os in
> 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
> 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
> 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
>+	      | -kopensolaris* \
> 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
>-	      | -aos* \
>+	      | -aos* | -aros* \
> 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
> 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
>-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
>+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
>+	      | -openbsd* | -solidbsd* \
> 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
> 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
> 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
> 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
>-	      | -chorusos* | -chorusrdb* \
>+	      | -chorusos* | -chorusrdb* | -cegcc* \
> 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
>-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
>+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
>+	      | -uxpv* | -beos* | -mpeix* | -udk* \
> 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
> 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
> 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
> 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
> 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
> 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
>-	      | -skyos* | -haiku*)
>+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
> 	# Remember, each alternative MUST END IN *, to match a version number.
> 		;;
> 	-qnx*)
>@@ -1316,6 +1413,9 @@ case $os in
> 	-zvmoe)
> 		os=-zvmoe
> 		;;
>+	-dicos*)
>+		os=-dicos
>+		;;
> 	-none)
> 		;;
> 	*)
>@@ -1338,6 +1438,12 @@ else
> # system, and we'll never get to this point.
> 
> case $basic_machine in
>+        score-*)
>+		os=-elf
>+		;;
>+        spu-*)
>+		os=-elf
>+		;;
> 	*-acorn)
> 		os=-riscix1.2
> 		;;
>@@ -1347,9 +1453,9 @@ case $basic_machine in
> 	arm*-semi)
> 		os=-aout
> 		;;
>-    c4x-* | tic4x-*)
>-        os=-coff
>-        ;;
>+        c4x-* | tic4x-*)
>+        	os=-coff
>+		;;
> 	# This must come before the *-dec entry.
> 	pdp10-*)
> 		os=-tops20
>@@ -1375,6 +1481,9 @@ case $basic_machine in
> 	m68*-cisco)
> 		os=-aout
> 		;;
>+        mep-*)
>+		os=-elf
>+		;;
> 	mips*-cisco)
> 		os=-elf
> 		;;
>diff --git a/lib/tevent/config.guess b/lib/tevent/config.guess
>index 354dbe1..da83314 100755
>--- a/lib/tevent/config.guess
>+++ b/lib/tevent/config.guess
>@@ -1,13 +1,14 @@
> #! /bin/sh
> # Attempt to guess a canonical system name.
> #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
>-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
>+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
>+#   Free Software Foundation, Inc.
> 
>-timestamp='2005-08-03'
>+timestamp='2009-04-27'
> 
> # This file is free software; you can redistribute it and/or modify it
> # under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 3 of the License, or
>+# the Free Software Foundation; either version 2 of the License, or
> # (at your option) any later version.
> #
> # This program is distributed in the hope that it will be useful, but
>@@ -16,7 +17,9 @@ timestamp='2005-08-03'
> # General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
>-# along with this program; if not, see <http://www.gnu.org/licenses/>.
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
>+# 02110-1301, USA.
> #
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
>@@ -53,8 +56,8 @@ version="\
> GNU config.guess ($timestamp)
> 
> Originally written by Per Bothner.
>-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
>-Free Software Foundation, Inc.
>+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
>+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
> 
> This is free software; see the source for copying conditions.  There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
>@@ -104,7 +107,7 @@ set_cc_for_build='
> trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
> trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
> : ${TMPDIR=/tmp} ;
>- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
>+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
>  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
>  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
>  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
>@@ -158,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> 	    arm*) machine=arm-unknown ;;
> 	    sh3el) machine=shl-unknown ;;
> 	    sh3eb) machine=sh-unknown ;;
>+	    sh5el) machine=sh5le-unknown ;;
> 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
> 	esac
> 	# The Operating System including object format, if it has switched
>@@ -204,8 +208,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
>     *:ekkoBSD:*:*)
> 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
> 	exit ;;
>+    *:SolidBSD:*:*)
>+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
>+	exit ;;
>     macppc:MirBSD:*:*)
>-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
>+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
> 	exit ;;
>     *:MirBSD:*:*)
> 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
>@@ -317,14 +324,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> 	case `/usr/bin/uname -p` in
> 	    sparc) echo sparc-icl-nx7; exit ;;
> 	esac ;;
>+    s390x:SunOS:*:*)
>+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
>+	exit ;;
>     sun4H:SunOS:5.*:*)
> 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit ;;
>     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
> 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit ;;
>-    i86pc:SunOS:5.*:*)
>-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
>+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
>+	eval $set_cc_for_build
>+	SUN_ARCH="i386"
>+	# If there is a compiler, see if it is configured for 64-bit objects.
>+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
>+	# This test works for both compilers.
>+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
>+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
>+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
>+		grep IS_64BIT_ARCH >/dev/null
>+	    then
>+		SUN_ARCH="x86_64"
>+	    fi
>+	fi
>+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit ;;
>     sun4*:SunOS:6*:*)
> 	# According to config.sub, this is the proper way to canonicalize
>@@ -525,7 +548,7 @@ EOF
> 		echo rs6000-ibm-aix3.2
> 	fi
> 	exit ;;
>-    *:AIX:*:[45])
>+    *:AIX:*:[456])
> 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
> 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
> 		IBM_ARCH=rs6000
>@@ -762,12 +785,19 @@ EOF
> 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
> 	exit ;;
>     *:FreeBSD:*:*)
>-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
>+	case ${UNAME_MACHINE} in
>+	    pc98)
>+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
>+	    amd64)
>+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
>+	    *)
>+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
>+	esac
> 	exit ;;
>     i*:CYGWIN*:*)
> 	echo ${UNAME_MACHINE}-pc-cygwin
> 	exit ;;
>-    i*:MINGW*:*)
>+    *:MINGW*:*)
> 	echo ${UNAME_MACHINE}-pc-mingw32
> 	exit ;;
>     i*:windows32*:*)
>@@ -777,9 +807,18 @@ EOF
>     i*:PW*:*)
> 	echo ${UNAME_MACHINE}-pc-pw32
> 	exit ;;
>-    x86:Interix*:[34]*)
>-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
>-	exit ;;
>+    *:Interix*:[3456]*)
>+    	case ${UNAME_MACHINE} in
>+	    x86)
>+		echo i586-pc-interix${UNAME_RELEASE}
>+		exit ;;
>+	    EM64T | authenticamd | genuineintel)
>+		echo x86_64-unknown-interix${UNAME_RELEASE}
>+		exit ;;
>+	    IA64)
>+		echo ia64-unknown-interix${UNAME_RELEASE}
>+		exit ;;
>+	esac ;;
>     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
> 	echo i${UNAME_MACHINE}-pc-mks
> 	exit ;;
>@@ -813,6 +852,16 @@ EOF
> 	echo ${UNAME_MACHINE}-pc-minix
> 	exit ;;
>     arm*:Linux:*:*)
>+	eval $set_cc_for_build
>+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
>+	    | grep -q __ARM_EABI__
>+	then
>+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	else
>+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
>+	fi
>+	exit ;;
>+    avr32*:Linux:*:*)
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu
> 	exit ;;
>     cris:Linux:*:*)
>@@ -849,7 +898,11 @@ EOF
> 	#endif
> 	#endif
> EOF
>-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
>+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
>+	    /^CPU/{
>+		s: ::g
>+		p
>+	    }'`"
> 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
> 	;;
>     mips64:Linux:*:*)
>@@ -868,7 +921,11 @@ EOF
> 	#endif
> 	#endif
> EOF
>-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
>+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
>+	    /^CPU/{
>+		s: ::g
>+		p
>+	    }'`"
> 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
> 	;;
>     or32:Linux:*:*)
>@@ -894,6 +951,9 @@ EOF
> 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
> 	exit ;;
>+    padre:Linux:*:*)
>+	echo sparc-unknown-linux-gnu
>+	exit ;;
>     parisc:Linux:*:* | hppa:Linux:*:*)
> 	# Look for CPU level
> 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
>@@ -917,9 +977,15 @@ EOF
>     sparc:Linux:*:* | sparc64:Linux:*:*)
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu
> 	exit ;;
>+    vax:Linux:*:*)
>+	echo ${UNAME_MACHINE}-dec-linux-gnu
>+	exit ;;
>     x86_64:Linux:*:*)
> 	echo x86_64-unknown-linux-gnu
> 	exit ;;
>+    xtensa*:Linux:*:*)
>+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	exit ;;
>     i*86:Linux:*:*)
> 	# The BFD linker knows what the default object file format is, so
> 	# first see if it will tell us. cd to the root directory to prevent
>@@ -938,9 +1004,6 @@ EOF
> 	  a.out-i386-linux)
> 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
> 		exit ;;
>-	  coff-i386)
>-		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.
>@@ -962,7 +1025,7 @@ EOF
> 	LIBC=gnulibc1
> 	# endif
> 	#else
>-	#ifdef __INTEL_COMPILER
>+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
> 	LIBC=gnu
> 	#else
> 	LIBC=gnuaout
>@@ -972,7 +1035,11 @@ EOF
> 	LIBC=dietlibc
> 	#endif
> EOF
>-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
>+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
>+	    /^LIBC/{
>+		s: ::g
>+		p
>+	    }'`"
> 	test x"${LIBC}" != x && {
> 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
> 		exit
>@@ -1051,8 +1118,11 @@ EOF
>     pc:*:*:*)
> 	# Left here for compatibility:
>         # uname -m prints for DJGPP always 'pc', but it prints nothing about
>-        # the processor, so we play safe by assuming i386.
>-	echo i386-pc-msdosdjgpp
>+        # the processor, so we play safe by assuming i586.
>+	# Note: whatever this is, it MUST be the same as what config.sub
>+	# prints for the "djgpp" host, or else GDB configury will decide that
>+	# this is a cross-build.
>+	echo i586-pc-msdosdjgpp
>         exit ;;
>     Intel:Mach:3*:*)
> 	echo i386-pc-mach3
>@@ -1090,6 +1160,16 @@ EOF
>     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
>         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
>           && { echo i486-ncr-sysv4; exit; } ;;
>+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
>+	OS_REL='.3'
>+	test -r /etc/.relid \
>+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
>+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
>+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
>+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
>+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
>+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
>+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
>     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
> 	echo m68k-unknown-lynxos${UNAME_RELEASE}
> 	exit ;;
>@@ -1165,6 +1245,9 @@ EOF
>     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
> 	echo i586-pc-beos
> 	exit ;;
>+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
>+	echo i586-pc-haiku
>+	exit ;;
>     SX-4:SUPER-UX:*:*)
> 	echo sx4-nec-superux${UNAME_RELEASE}
> 	exit ;;
>@@ -1174,6 +1257,15 @@ EOF
>     SX-6:SUPER-UX:*:*)
> 	echo sx6-nec-superux${UNAME_RELEASE}
> 	exit ;;
>+    SX-7:SUPER-UX:*:*)
>+	echo sx7-nec-superux${UNAME_RELEASE}
>+	exit ;;
>+    SX-8:SUPER-UX:*:*)
>+	echo sx8-nec-superux${UNAME_RELEASE}
>+	exit ;;
>+    SX-8R:SUPER-UX:*:*)
>+	echo sx8r-nec-superux${UNAME_RELEASE}
>+	exit ;;
>     Power*:Rhapsody:*:*)
> 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
> 	exit ;;
>@@ -1183,7 +1275,6 @@ EOF
>     *:Darwin:*:*)
> 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
> 	case $UNAME_PROCESSOR in
>-	    *86) UNAME_PROCESSOR=i686 ;;
> 	    unknown) UNAME_PROCESSOR=powerpc ;;
> 	esac
> 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
>@@ -1262,6 +1353,12 @@ EOF
>     i*86:skyos:*:*)
> 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
> 	exit ;;
>+    i*86:rdos:*:*)
>+	echo ${UNAME_MACHINE}-pc-rdos
>+	exit ;;
>+    i*86:AROS:*:*)
>+	echo ${UNAME_MACHINE}-pc-aros
>+	exit ;;
> esac
> 
> #echo '(No uname command or uname output not recognized.)' 1>&2
>@@ -1422,9 +1519,9 @@ This script, last modified $timestamp, has failed to recognize
> the operating system you are using. It is advised that you
> download the most up to date version of the config scripts from
> 
>-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
>+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
> and
>-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
>+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
> 
> If the version you run ($0) is already up to date, please
> send the following data and any information you think might be
>diff --git a/lib/tevent/config.sub b/lib/tevent/config.sub
>index 23cd6fd..a39437d 100755
>--- a/lib/tevent/config.sub
>+++ b/lib/tevent/config.sub
>@@ -1,9 +1,10 @@
> #! /bin/sh
> # Configuration validation subroutine script.
> #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
>-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
>+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
>+#   Free Software Foundation, Inc.
> 
>-timestamp='2005-07-08'
>+timestamp='2009-04-17'
> 
> # This file is (in principle) common to ALL GNU software.
> # The presence of a machine in this file suggests that SOME GNU software
>@@ -11,7 +12,7 @@ timestamp='2005-07-08'
> #
> # This file is free software; you can redistribute it and/or modify
> # it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 3 of the License, or
>+# the Free Software Foundation; either version 2 of the License, or
> # (at your option) any later version.
> #
> # This program is distributed in the hope that it will be useful,
>@@ -20,7 +21,9 @@ timestamp='2005-07-08'
> # GNU General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
>-# along with this program; if not, see <http://www.gnu.org/licenses/>.
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
>+# 02110-1301, USA.
> #
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
>@@ -69,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
> version="\
> GNU config.sub ($timestamp)
> 
>-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
>-Free Software Foundation, Inc.
>+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
>+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
> 
> This is free software; see the source for copying conditions.  There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
>@@ -117,8 +120,10 @@ esac
> # Here we must recognize all the valid KERNEL-OS combinations.
> maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`
> case $maybe_os in
>-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
>-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
>+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
>+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
>+  kopensolaris*-gnu* | \
>+  storm-chaos* | os2-emx* | rtmk-nova*)
>     os=-$maybe_os
>     basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
>     ;;
>@@ -169,6 +174,10 @@ case $os in
> 	-hiux*)
> 		os=-hiuxwe2
> 		;;
>+	-sco6)
>+		os=-sco5v6
>+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>+		;;
> 	-sco5)
> 		os=-sco3.2v5
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>@@ -185,6 +194,10 @@ case $os in
> 		# Don't forget version if it is 3.2v4 or newer.
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
> 		;;
>+	-sco5v6*)
>+		# Don't forget version if it is 3.2v4 or newer.
>+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>+		;;
> 	-sco*)
> 		os=-sco3.2v2
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>@@ -229,20 +242,24 @@ case $basic_machine in
> 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
> 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
> 	| am33_2.0 \
>-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
>+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
> 	| bfin \
> 	| c4x | clipper \
> 	| d10v | d30v | dlx | dsp16xx \
>-	| fr30 | frv \
>+	| fido | fr30 | frv \
> 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
> 	| i370 | i860 | i960 | ia64 \
> 	| ip2k | iq2000 \
>-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
>+	| lm32 \
>+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
>+	| maxq | mb | microblaze | mcore | mep | metag \
> 	| mips | mipsbe | mipseb | mipsel | mipsle \
> 	| mips16 \
> 	| mips64 | mips64el \
>-	| mips64vr | mips64vrel \
>+	| mips64octeon | mips64octeonel \
> 	| mips64orion | mips64orionel \
>+	| mips64r5900 | mips64r5900el \
>+	| mips64vr | mips64vrel \
> 	| mips64vr4100 | mips64vr4100el \
> 	| mips64vr4300 | mips64vr4300el \
> 	| mips64vr5000 | mips64vr5000el \
>@@ -255,26 +272,26 @@ case $basic_machine in
> 	| mipsisa64sr71k | mipsisa64sr71kel \
> 	| mipstx39 | mipstx39el \
> 	| mn10200 | mn10300 \
>-	| ms1 \
>+	| moxie \
>+	| mt \
> 	| msp430 \
>+	| nios | nios2 \
> 	| ns16k | ns32k \
> 	| or32 \
> 	| pdp10 | pdp11 | pj | pjl \
> 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
> 	| pyramid \
>-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
>+	| score \
>+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
> 	| sh64 | sh64le \
>-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
>-	| sparcv8 | sparcv9 | sparcv9b \
>-	| strongarm \
>+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
>+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
>+	| spu | strongarm \
> 	| tahoe | thumb | tic4x | tic80 | tron \
> 	| v850 | v850e \
> 	| we32k \
>-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
>-	| z8k)
>-		basic_machine=$basic_machine-unknown
>-		;;
>-	m32c)
>+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
>+	| z8k | z80)
> 		basic_machine=$basic_machine-unknown
> 		;;
> 	m6811 | m68hc11 | m6812 | m68hc12)
>@@ -284,6 +301,9 @@ case $basic_machine in
> 		;;
> 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
> 		;;
>+	ms1)
>+		basic_machine=mt-unknown
>+		;;
> 
> 	# We use `pc' rather than `unknown'
> 	# because (1) that's what they normally are, and
>@@ -303,25 +323,28 @@ case $basic_machine in
> 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
> 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
> 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
>-	| avr-* \
>+	| avr-* | avr32-* \
> 	| bfin-* | bs2000-* \
> 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
> 	| clipper-* | craynv-* | cydra-* \
> 	| d10v-* | d30v-* | dlx-* \
> 	| elxsi-* \
>-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
>+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
> 	| h8300-* | h8500-* \
> 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
> 	| i*86-* | i860-* | i960-* | ia64-* \
> 	| ip2k-* | iq2000-* \
>-	| m32r-* | m32rle-* \
>+	| lm32-* \
>+	| m32c-* | m32r-* | m32rle-* \
> 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
>-	| m88110-* | m88k-* | maxq-* | mcore-* \
>+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
> 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
> 	| mips16-* \
> 	| mips64-* | mips64el-* \
>-	| mips64vr-* | mips64vrel-* \
>+	| mips64octeon-* | mips64octeonel-* \
> 	| mips64orion-* | mips64orionel-* \
>+	| mips64r5900-* | mips64r5900el-* \
>+	| mips64vr-* | mips64vrel-* \
> 	| mips64vr4100-* | mips64vr4100el-* \
> 	| mips64vr4300-* | mips64vr4300el-* \
> 	| mips64vr5000-* | mips64vr5000el-* \
>@@ -334,30 +357,33 @@ case $basic_machine in
> 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
> 	| mipstx39-* | mipstx39el-* \
> 	| mmix-* \
>-	| ms1-* \
>+	| mt-* \
> 	| msp430-* \
>+	| nios-* | nios2-* \
> 	| none-* | np1-* | ns16k-* | ns32k-* \
> 	| orion-* \
> 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
> 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
> 	| pyramid-* \
> 	| romp-* | rs6000-* \
>-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
>+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
> 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
>-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
>+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
> 	| sparclite-* \
>-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
>+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
> 	| tahoe-* | thumb-* \
>-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
>+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
> 	| tron-* \
> 	| v850-* | v850e-* | vax-* \
> 	| we32k-* \
>-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
>-	| xstormy16-* | xtensa-* \
>+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
>+	| xstormy16-* | xtensa*-* \
> 	| ymp-* \
>-	| z8k-*)
>+	| z8k-* | z80-*)
> 		;;
>-	m32c-*)
>+	# Recognize the basic CPU types without company name, with glob match.
>+	xtensa*)
>+		basic_machine=$basic_machine-unknown
> 		;;
> 	# Recognize the various machine names and aliases which stand
> 	# for a CPU type and a company and sometimes even an OS.
>@@ -421,6 +447,10 @@ case $basic_machine in
> 		basic_machine=m68k-apollo
> 		os=-bsd
> 		;;
>+	aros)
>+		basic_machine=i386-pc
>+		os=-aros
>+		;;
> 	aux)
> 		basic_machine=m68k-apple
> 		os=-aux
>@@ -429,10 +459,22 @@ case $basic_machine in
> 		basic_machine=ns32k-sequent
> 		os=-dynix
> 		;;
>+	blackfin)
>+		basic_machine=bfin-unknown
>+		os=-linux
>+		;;
>+	blackfin-*)
>+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	c90)
> 		basic_machine=c90-cray
> 		os=-unicos
> 		;;
>+        cegcc)
>+		basic_machine=arm-unknown
>+		os=-cegcc
>+		;;
> 	convex-c1)
> 		basic_machine=c1-convex
> 		os=-bsd
>@@ -461,8 +503,8 @@ case $basic_machine in
> 		basic_machine=craynv-cray
> 		os=-unicosmp
> 		;;
>-	cr16c)
>-		basic_machine=cr16c-unknown
>+	cr16)
>+		basic_machine=cr16-unknown
> 		os=-elf
> 		;;
> 	crds | unos)
>@@ -500,6 +542,10 @@ case $basic_machine in
> 		basic_machine=m88k-motorola
> 		os=-sysv3
> 		;;
>+	dicos)
>+		basic_machine=i686-pc
>+		os=-dicos
>+		;;
> 	djgpp)
> 		basic_machine=i586-pc
> 		os=-msdosdjgpp
>@@ -654,6 +700,14 @@ case $basic_machine in
> 		basic_machine=m68k-isi
> 		os=-sysv
> 		;;
>+	m68knommu)
>+		basic_machine=m68k-unknown
>+		os=-linux
>+		;;
>+	m68knommu-*)
>+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	m88k-omron*)
> 		basic_machine=m88k-omron
> 		;;
>@@ -669,6 +723,10 @@ case $basic_machine in
> 		basic_machine=i386-pc
> 		os=-mingw32
> 		;;
>+	mingw32ce)
>+		basic_machine=arm-unknown
>+		os=-mingw32ce
>+		;;
> 	miniframe)
> 		basic_machine=m68000-convergent
> 		;;
>@@ -694,6 +752,9 @@ case $basic_machine in
> 		basic_machine=i386-pc
> 		os=-msdos
> 		;;
>+	ms1-*)
>+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
>+		;;
> 	mvs)
> 		basic_machine=i370-ibm
> 		os=-mvs
>@@ -792,6 +853,14 @@ case $basic_machine in
> 		basic_machine=i860-intel
> 		os=-osf
> 		;;
>+	parisc)
>+		basic_machine=hppa-unknown
>+		os=-linux
>+		;;
>+	parisc-*)
>+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	pbd)
> 		basic_machine=sparc-tti
> 		;;
>@@ -801,6 +870,12 @@ case $basic_machine in
> 	pc532 | pc532-*)
> 		basic_machine=ns32k-pc532
> 		;;
>+	pc98)
>+		basic_machine=i386-pc
>+		;;
>+	pc98-*)
>+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		;;
> 	pentium | p5 | k5 | k6 | nexgen | viac3)
> 		basic_machine=i586-pc
> 		;;
>@@ -857,6 +932,10 @@ case $basic_machine in
> 		basic_machine=i586-unknown
> 		os=-pw32
> 		;;
>+	rdos)
>+		basic_machine=i386-pc
>+		os=-rdos
>+		;;
> 	rom68k)
> 		basic_machine=m68k-rom68k
> 		os=-coff
>@@ -883,6 +962,10 @@ case $basic_machine in
> 	sb1el)
> 		basic_machine=mipsisa64sb1el-unknown
> 		;;
>+	sde)
>+		basic_machine=mipsisa32-sde
>+		os=-elf
>+		;;
> 	sei)
> 		basic_machine=mips-sei
> 		os=-seiux
>@@ -894,6 +977,9 @@ case $basic_machine in
> 		basic_machine=sh-hitachi
> 		os=-hms
> 		;;
>+	sh5el)
>+		basic_machine=sh5le-unknown
>+		;;
> 	sh64)
> 		basic_machine=sh64-unknown
> 		;;
>@@ -983,6 +1069,10 @@ case $basic_machine in
> 		basic_machine=tic6x-unknown
> 		os=-coff
> 		;;
>+	tile*)
>+		basic_machine=tile-unknown
>+		os=-linux-gnu
>+		;;
> 	tx39)
> 		basic_machine=mipstx39-unknown
> 		;;
>@@ -1058,6 +1148,10 @@ case $basic_machine in
> 		basic_machine=z8k-unknown
> 		os=-sim
> 		;;
>+	z80-*-coff)
>+		basic_machine=z80-unknown
>+		os=-sim
>+		;;
> 	none)
> 		basic_machine=none-none
> 		os=-none
>@@ -1096,10 +1190,10 @@ case $basic_machine in
> 	we32k)
> 		basic_machine=we32k-att
> 		;;
>-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
>+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
> 		basic_machine=sh-unknown
> 		;;
>-	sparc | sparcv8 | sparcv9 | sparcv9b)
>+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
> 		basic_machine=sparc-sun
> 		;;
> 	cydra)
>@@ -1168,25 +1262,28 @@ case $os in
> 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
> 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
> 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
>+	      | -kopensolaris* \
> 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
>-	      | -aos* \
>+	      | -aos* | -aros* \
> 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
> 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
>-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
>+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
>+	      | -openbsd* | -solidbsd* \
> 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
> 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
> 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
> 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
>-	      | -chorusos* | -chorusrdb* \
>+	      | -chorusos* | -chorusrdb* | -cegcc* \
> 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
>-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
>+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
>+	      | -uxpv* | -beos* | -mpeix* | -udk* \
> 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
> 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
> 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
> 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
> 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
> 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
>-	      | -skyos* | -haiku*)
>+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
> 	# Remember, each alternative MUST END IN *, to match a version number.
> 		;;
> 	-qnx*)
>@@ -1316,6 +1413,9 @@ case $os in
> 	-zvmoe)
> 		os=-zvmoe
> 		;;
>+	-dicos*)
>+		os=-dicos
>+		;;
> 	-none)
> 		;;
> 	*)
>@@ -1338,6 +1438,12 @@ else
> # system, and we'll never get to this point.
> 
> case $basic_machine in
>+        score-*)
>+		os=-elf
>+		;;
>+        spu-*)
>+		os=-elf
>+		;;
> 	*-acorn)
> 		os=-riscix1.2
> 		;;
>@@ -1347,9 +1453,9 @@ case $basic_machine in
> 	arm*-semi)
> 		os=-aout
> 		;;
>-    c4x-* | tic4x-*)
>-        os=-coff
>-        ;;
>+        c4x-* | tic4x-*)
>+        	os=-coff
>+		;;
> 	# This must come before the *-dec entry.
> 	pdp10-*)
> 		os=-tops20
>@@ -1375,6 +1481,9 @@ case $basic_machine in
> 	m68*-cisco)
> 		os=-aout
> 		;;
>+        mep-*)
>+		os=-elf
>+		;;
> 	mips*-cisco)
> 		os=-elf
> 		;;
>diff --git a/source3/config.guess b/source3/config.guess
>index cb5b959..da83314 100755
>--- a/source3/config.guess
>+++ b/source3/config.guess
>@@ -8,7 +8,7 @@ timestamp='2009-04-27'
> 
> # This file is free software; you can redistribute it and/or modify it
> # under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 3 of the License, or
>+# the Free Software Foundation; either version 2 of the License, or
> # (at your option) any later version.
> #
> # This program is distributed in the hope that it will be useful, but
>@@ -17,7 +17,9 @@ timestamp='2009-04-27'
> # General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
>-# along with this program; if not, see <http://www.gnu.org/licenses/>.
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
>+# 02110-1301, USA.
> #
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
>@@ -806,7 +808,7 @@ EOF
> 	echo ${UNAME_MACHINE}-pc-pw32
> 	exit ;;
>     *:Interix*:[3456]*)
>-	case ${UNAME_MACHINE} in
>+    	case ${UNAME_MACHINE} in
> 	    x86)
> 		echo i586-pc-interix${UNAME_RELEASE}
> 		exit ;;
>@@ -982,7 +984,7 @@ EOF
> 	echo x86_64-unknown-linux-gnu
> 	exit ;;
>     xtensa*:Linux:*:*)
>-	echo ${UNAME_MACHINE}-unknown-linux-gnu
>+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
> 	exit ;;
>     i*86:Linux:*:*)
> 	# The BFD linker knows what the default object file format is, so
>diff --git a/source3/config.sub b/source3/config.sub
>index 69fc6b0..a39437d 100755
>--- a/source3/config.sub
>+++ b/source3/config.sub
>@@ -12,7 +12,7 @@ timestamp='2009-04-17'
> #
> # This file is free software; you can redistribute it and/or modify
> # it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 3 of the License, or
>+# the Free Software Foundation; either version 2 of the License, or
> # (at your option) any later version.
> #
> # This program is distributed in the hope that it will be useful,
>@@ -21,7 +21,9 @@ timestamp='2009-04-17'
> # GNU General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
>-# along with this program; if not, see <http://www.gnu.org/licenses/>.
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
>+# 02110-1301, USA.
> #
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
>@@ -1452,7 +1454,7 @@ case $basic_machine in
> 		os=-aout
> 		;;
>         c4x-* | tic4x-*)
>-		os=-coff
>+        	os=-coff
> 		;;
> 	# This must come before the *-dec entry.
> 	pdp10-*)
>diff --git a/source3/lib/ldb/config.guess b/source3/lib/ldb/config.guess
>index 354dbe1..da83314 100755
>--- a/source3/lib/ldb/config.guess
>+++ b/source3/lib/ldb/config.guess
>@@ -1,13 +1,14 @@
> #! /bin/sh
> # Attempt to guess a canonical system name.
> #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
>-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
>+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
>+#   Free Software Foundation, Inc.
> 
>-timestamp='2005-08-03'
>+timestamp='2009-04-27'
> 
> # This file is free software; you can redistribute it and/or modify it
> # under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 3 of the License, or
>+# the Free Software Foundation; either version 2 of the License, or
> # (at your option) any later version.
> #
> # This program is distributed in the hope that it will be useful, but
>@@ -16,7 +17,9 @@ timestamp='2005-08-03'
> # General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
>-# along with this program; if not, see <http://www.gnu.org/licenses/>.
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
>+# 02110-1301, USA.
> #
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
>@@ -53,8 +56,8 @@ version="\
> GNU config.guess ($timestamp)
> 
> Originally written by Per Bothner.
>-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
>-Free Software Foundation, Inc.
>+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
>+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
> 
> This is free software; see the source for copying conditions.  There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
>@@ -104,7 +107,7 @@ set_cc_for_build='
> trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
> trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
> : ${TMPDIR=/tmp} ;
>- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
>+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
>  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
>  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
>  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
>@@ -158,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> 	    arm*) machine=arm-unknown ;;
> 	    sh3el) machine=shl-unknown ;;
> 	    sh3eb) machine=sh-unknown ;;
>+	    sh5el) machine=sh5le-unknown ;;
> 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
> 	esac
> 	# The Operating System including object format, if it has switched
>@@ -204,8 +208,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
>     *:ekkoBSD:*:*)
> 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
> 	exit ;;
>+    *:SolidBSD:*:*)
>+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
>+	exit ;;
>     macppc:MirBSD:*:*)
>-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
>+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
> 	exit ;;
>     *:MirBSD:*:*)
> 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
>@@ -317,14 +324,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> 	case `/usr/bin/uname -p` in
> 	    sparc) echo sparc-icl-nx7; exit ;;
> 	esac ;;
>+    s390x:SunOS:*:*)
>+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
>+	exit ;;
>     sun4H:SunOS:5.*:*)
> 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit ;;
>     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
> 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit ;;
>-    i86pc:SunOS:5.*:*)
>-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
>+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
>+	eval $set_cc_for_build
>+	SUN_ARCH="i386"
>+	# If there is a compiler, see if it is configured for 64-bit objects.
>+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
>+	# This test works for both compilers.
>+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
>+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
>+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
>+		grep IS_64BIT_ARCH >/dev/null
>+	    then
>+		SUN_ARCH="x86_64"
>+	    fi
>+	fi
>+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit ;;
>     sun4*:SunOS:6*:*)
> 	# According to config.sub, this is the proper way to canonicalize
>@@ -525,7 +548,7 @@ EOF
> 		echo rs6000-ibm-aix3.2
> 	fi
> 	exit ;;
>-    *:AIX:*:[45])
>+    *:AIX:*:[456])
> 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
> 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
> 		IBM_ARCH=rs6000
>@@ -762,12 +785,19 @@ EOF
> 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
> 	exit ;;
>     *:FreeBSD:*:*)
>-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
>+	case ${UNAME_MACHINE} in
>+	    pc98)
>+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
>+	    amd64)
>+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
>+	    *)
>+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
>+	esac
> 	exit ;;
>     i*:CYGWIN*:*)
> 	echo ${UNAME_MACHINE}-pc-cygwin
> 	exit ;;
>-    i*:MINGW*:*)
>+    *:MINGW*:*)
> 	echo ${UNAME_MACHINE}-pc-mingw32
> 	exit ;;
>     i*:windows32*:*)
>@@ -777,9 +807,18 @@ EOF
>     i*:PW*:*)
> 	echo ${UNAME_MACHINE}-pc-pw32
> 	exit ;;
>-    x86:Interix*:[34]*)
>-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
>-	exit ;;
>+    *:Interix*:[3456]*)
>+    	case ${UNAME_MACHINE} in
>+	    x86)
>+		echo i586-pc-interix${UNAME_RELEASE}
>+		exit ;;
>+	    EM64T | authenticamd | genuineintel)
>+		echo x86_64-unknown-interix${UNAME_RELEASE}
>+		exit ;;
>+	    IA64)
>+		echo ia64-unknown-interix${UNAME_RELEASE}
>+		exit ;;
>+	esac ;;
>     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
> 	echo i${UNAME_MACHINE}-pc-mks
> 	exit ;;
>@@ -813,6 +852,16 @@ EOF
> 	echo ${UNAME_MACHINE}-pc-minix
> 	exit ;;
>     arm*:Linux:*:*)
>+	eval $set_cc_for_build
>+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
>+	    | grep -q __ARM_EABI__
>+	then
>+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	else
>+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
>+	fi
>+	exit ;;
>+    avr32*:Linux:*:*)
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu
> 	exit ;;
>     cris:Linux:*:*)
>@@ -849,7 +898,11 @@ EOF
> 	#endif
> 	#endif
> EOF
>-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
>+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
>+	    /^CPU/{
>+		s: ::g
>+		p
>+	    }'`"
> 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
> 	;;
>     mips64:Linux:*:*)
>@@ -868,7 +921,11 @@ EOF
> 	#endif
> 	#endif
> EOF
>-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
>+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
>+	    /^CPU/{
>+		s: ::g
>+		p
>+	    }'`"
> 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
> 	;;
>     or32:Linux:*:*)
>@@ -894,6 +951,9 @@ EOF
> 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
> 	exit ;;
>+    padre:Linux:*:*)
>+	echo sparc-unknown-linux-gnu
>+	exit ;;
>     parisc:Linux:*:* | hppa:Linux:*:*)
> 	# Look for CPU level
> 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
>@@ -917,9 +977,15 @@ EOF
>     sparc:Linux:*:* | sparc64:Linux:*:*)
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu
> 	exit ;;
>+    vax:Linux:*:*)
>+	echo ${UNAME_MACHINE}-dec-linux-gnu
>+	exit ;;
>     x86_64:Linux:*:*)
> 	echo x86_64-unknown-linux-gnu
> 	exit ;;
>+    xtensa*:Linux:*:*)
>+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	exit ;;
>     i*86:Linux:*:*)
> 	# The BFD linker knows what the default object file format is, so
> 	# first see if it will tell us. cd to the root directory to prevent
>@@ -938,9 +1004,6 @@ EOF
> 	  a.out-i386-linux)
> 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
> 		exit ;;
>-	  coff-i386)
>-		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.
>@@ -962,7 +1025,7 @@ EOF
> 	LIBC=gnulibc1
> 	# endif
> 	#else
>-	#ifdef __INTEL_COMPILER
>+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
> 	LIBC=gnu
> 	#else
> 	LIBC=gnuaout
>@@ -972,7 +1035,11 @@ EOF
> 	LIBC=dietlibc
> 	#endif
> EOF
>-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
>+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
>+	    /^LIBC/{
>+		s: ::g
>+		p
>+	    }'`"
> 	test x"${LIBC}" != x && {
> 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
> 		exit
>@@ -1051,8 +1118,11 @@ EOF
>     pc:*:*:*)
> 	# Left here for compatibility:
>         # uname -m prints for DJGPP always 'pc', but it prints nothing about
>-        # the processor, so we play safe by assuming i386.
>-	echo i386-pc-msdosdjgpp
>+        # the processor, so we play safe by assuming i586.
>+	# Note: whatever this is, it MUST be the same as what config.sub
>+	# prints for the "djgpp" host, or else GDB configury will decide that
>+	# this is a cross-build.
>+	echo i586-pc-msdosdjgpp
>         exit ;;
>     Intel:Mach:3*:*)
> 	echo i386-pc-mach3
>@@ -1090,6 +1160,16 @@ EOF
>     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
>         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
>           && { echo i486-ncr-sysv4; exit; } ;;
>+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
>+	OS_REL='.3'
>+	test -r /etc/.relid \
>+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
>+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
>+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
>+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
>+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
>+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
>+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
>     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
> 	echo m68k-unknown-lynxos${UNAME_RELEASE}
> 	exit ;;
>@@ -1165,6 +1245,9 @@ EOF
>     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
> 	echo i586-pc-beos
> 	exit ;;
>+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
>+	echo i586-pc-haiku
>+	exit ;;
>     SX-4:SUPER-UX:*:*)
> 	echo sx4-nec-superux${UNAME_RELEASE}
> 	exit ;;
>@@ -1174,6 +1257,15 @@ EOF
>     SX-6:SUPER-UX:*:*)
> 	echo sx6-nec-superux${UNAME_RELEASE}
> 	exit ;;
>+    SX-7:SUPER-UX:*:*)
>+	echo sx7-nec-superux${UNAME_RELEASE}
>+	exit ;;
>+    SX-8:SUPER-UX:*:*)
>+	echo sx8-nec-superux${UNAME_RELEASE}
>+	exit ;;
>+    SX-8R:SUPER-UX:*:*)
>+	echo sx8r-nec-superux${UNAME_RELEASE}
>+	exit ;;
>     Power*:Rhapsody:*:*)
> 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
> 	exit ;;
>@@ -1183,7 +1275,6 @@ EOF
>     *:Darwin:*:*)
> 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
> 	case $UNAME_PROCESSOR in
>-	    *86) UNAME_PROCESSOR=i686 ;;
> 	    unknown) UNAME_PROCESSOR=powerpc ;;
> 	esac
> 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
>@@ -1262,6 +1353,12 @@ EOF
>     i*86:skyos:*:*)
> 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
> 	exit ;;
>+    i*86:rdos:*:*)
>+	echo ${UNAME_MACHINE}-pc-rdos
>+	exit ;;
>+    i*86:AROS:*:*)
>+	echo ${UNAME_MACHINE}-pc-aros
>+	exit ;;
> esac
> 
> #echo '(No uname command or uname output not recognized.)' 1>&2
>@@ -1422,9 +1519,9 @@ This script, last modified $timestamp, has failed to recognize
> the operating system you are using. It is advised that you
> download the most up to date version of the config scripts from
> 
>-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
>+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
> and
>-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
>+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
> 
> If the version you run ($0) is already up to date, please
> send the following data and any information you think might be
>diff --git a/source3/lib/ldb/config.sub b/source3/lib/ldb/config.sub
>index 23cd6fd..a39437d 100755
>--- a/source3/lib/ldb/config.sub
>+++ b/source3/lib/ldb/config.sub
>@@ -1,9 +1,10 @@
> #! /bin/sh
> # Configuration validation subroutine script.
> #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
>-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
>+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
>+#   Free Software Foundation, Inc.
> 
>-timestamp='2005-07-08'
>+timestamp='2009-04-17'
> 
> # This file is (in principle) common to ALL GNU software.
> # The presence of a machine in this file suggests that SOME GNU software
>@@ -11,7 +12,7 @@ timestamp='2005-07-08'
> #
> # This file is free software; you can redistribute it and/or modify
> # it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 3 of the License, or
>+# the Free Software Foundation; either version 2 of the License, or
> # (at your option) any later version.
> #
> # This program is distributed in the hope that it will be useful,
>@@ -20,7 +21,9 @@ timestamp='2005-07-08'
> # GNU General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
>-# along with this program; if not, see <http://www.gnu.org/licenses/>.
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
>+# 02110-1301, USA.
> #
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
>@@ -69,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
> version="\
> GNU config.sub ($timestamp)
> 
>-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
>-Free Software Foundation, Inc.
>+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
>+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
> 
> This is free software; see the source for copying conditions.  There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
>@@ -117,8 +120,10 @@ esac
> # Here we must recognize all the valid KERNEL-OS combinations.
> maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`
> case $maybe_os in
>-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
>-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
>+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
>+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
>+  kopensolaris*-gnu* | \
>+  storm-chaos* | os2-emx* | rtmk-nova*)
>     os=-$maybe_os
>     basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
>     ;;
>@@ -169,6 +174,10 @@ case $os in
> 	-hiux*)
> 		os=-hiuxwe2
> 		;;
>+	-sco6)
>+		os=-sco5v6
>+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>+		;;
> 	-sco5)
> 		os=-sco3.2v5
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>@@ -185,6 +194,10 @@ case $os in
> 		# Don't forget version if it is 3.2v4 or newer.
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
> 		;;
>+	-sco5v6*)
>+		# Don't forget version if it is 3.2v4 or newer.
>+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>+		;;
> 	-sco*)
> 		os=-sco3.2v2
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>@@ -229,20 +242,24 @@ case $basic_machine in
> 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
> 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
> 	| am33_2.0 \
>-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
>+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
> 	| bfin \
> 	| c4x | clipper \
> 	| d10v | d30v | dlx | dsp16xx \
>-	| fr30 | frv \
>+	| fido | fr30 | frv \
> 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
> 	| i370 | i860 | i960 | ia64 \
> 	| ip2k | iq2000 \
>-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
>+	| lm32 \
>+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
>+	| maxq | mb | microblaze | mcore | mep | metag \
> 	| mips | mipsbe | mipseb | mipsel | mipsle \
> 	| mips16 \
> 	| mips64 | mips64el \
>-	| mips64vr | mips64vrel \
>+	| mips64octeon | mips64octeonel \
> 	| mips64orion | mips64orionel \
>+	| mips64r5900 | mips64r5900el \
>+	| mips64vr | mips64vrel \
> 	| mips64vr4100 | mips64vr4100el \
> 	| mips64vr4300 | mips64vr4300el \
> 	| mips64vr5000 | mips64vr5000el \
>@@ -255,26 +272,26 @@ case $basic_machine in
> 	| mipsisa64sr71k | mipsisa64sr71kel \
> 	| mipstx39 | mipstx39el \
> 	| mn10200 | mn10300 \
>-	| ms1 \
>+	| moxie \
>+	| mt \
> 	| msp430 \
>+	| nios | nios2 \
> 	| ns16k | ns32k \
> 	| or32 \
> 	| pdp10 | pdp11 | pj | pjl \
> 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
> 	| pyramid \
>-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
>+	| score \
>+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
> 	| sh64 | sh64le \
>-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
>-	| sparcv8 | sparcv9 | sparcv9b \
>-	| strongarm \
>+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
>+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
>+	| spu | strongarm \
> 	| tahoe | thumb | tic4x | tic80 | tron \
> 	| v850 | v850e \
> 	| we32k \
>-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
>-	| z8k)
>-		basic_machine=$basic_machine-unknown
>-		;;
>-	m32c)
>+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
>+	| z8k | z80)
> 		basic_machine=$basic_machine-unknown
> 		;;
> 	m6811 | m68hc11 | m6812 | m68hc12)
>@@ -284,6 +301,9 @@ case $basic_machine in
> 		;;
> 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
> 		;;
>+	ms1)
>+		basic_machine=mt-unknown
>+		;;
> 
> 	# We use `pc' rather than `unknown'
> 	# because (1) that's what they normally are, and
>@@ -303,25 +323,28 @@ case $basic_machine in
> 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
> 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
> 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
>-	| avr-* \
>+	| avr-* | avr32-* \
> 	| bfin-* | bs2000-* \
> 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
> 	| clipper-* | craynv-* | cydra-* \
> 	| d10v-* | d30v-* | dlx-* \
> 	| elxsi-* \
>-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
>+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
> 	| h8300-* | h8500-* \
> 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
> 	| i*86-* | i860-* | i960-* | ia64-* \
> 	| ip2k-* | iq2000-* \
>-	| m32r-* | m32rle-* \
>+	| lm32-* \
>+	| m32c-* | m32r-* | m32rle-* \
> 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
>-	| m88110-* | m88k-* | maxq-* | mcore-* \
>+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
> 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
> 	| mips16-* \
> 	| mips64-* | mips64el-* \
>-	| mips64vr-* | mips64vrel-* \
>+	| mips64octeon-* | mips64octeonel-* \
> 	| mips64orion-* | mips64orionel-* \
>+	| mips64r5900-* | mips64r5900el-* \
>+	| mips64vr-* | mips64vrel-* \
> 	| mips64vr4100-* | mips64vr4100el-* \
> 	| mips64vr4300-* | mips64vr4300el-* \
> 	| mips64vr5000-* | mips64vr5000el-* \
>@@ -334,30 +357,33 @@ case $basic_machine in
> 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
> 	| mipstx39-* | mipstx39el-* \
> 	| mmix-* \
>-	| ms1-* \
>+	| mt-* \
> 	| msp430-* \
>+	| nios-* | nios2-* \
> 	| none-* | np1-* | ns16k-* | ns32k-* \
> 	| orion-* \
> 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
> 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
> 	| pyramid-* \
> 	| romp-* | rs6000-* \
>-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
>+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
> 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
>-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
>+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
> 	| sparclite-* \
>-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
>+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
> 	| tahoe-* | thumb-* \
>-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
>+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
> 	| tron-* \
> 	| v850-* | v850e-* | vax-* \
> 	| we32k-* \
>-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
>-	| xstormy16-* | xtensa-* \
>+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
>+	| xstormy16-* | xtensa*-* \
> 	| ymp-* \
>-	| z8k-*)
>+	| z8k-* | z80-*)
> 		;;
>-	m32c-*)
>+	# Recognize the basic CPU types without company name, with glob match.
>+	xtensa*)
>+		basic_machine=$basic_machine-unknown
> 		;;
> 	# Recognize the various machine names and aliases which stand
> 	# for a CPU type and a company and sometimes even an OS.
>@@ -421,6 +447,10 @@ case $basic_machine in
> 		basic_machine=m68k-apollo
> 		os=-bsd
> 		;;
>+	aros)
>+		basic_machine=i386-pc
>+		os=-aros
>+		;;
> 	aux)
> 		basic_machine=m68k-apple
> 		os=-aux
>@@ -429,10 +459,22 @@ case $basic_machine in
> 		basic_machine=ns32k-sequent
> 		os=-dynix
> 		;;
>+	blackfin)
>+		basic_machine=bfin-unknown
>+		os=-linux
>+		;;
>+	blackfin-*)
>+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	c90)
> 		basic_machine=c90-cray
> 		os=-unicos
> 		;;
>+        cegcc)
>+		basic_machine=arm-unknown
>+		os=-cegcc
>+		;;
> 	convex-c1)
> 		basic_machine=c1-convex
> 		os=-bsd
>@@ -461,8 +503,8 @@ case $basic_machine in
> 		basic_machine=craynv-cray
> 		os=-unicosmp
> 		;;
>-	cr16c)
>-		basic_machine=cr16c-unknown
>+	cr16)
>+		basic_machine=cr16-unknown
> 		os=-elf
> 		;;
> 	crds | unos)
>@@ -500,6 +542,10 @@ case $basic_machine in
> 		basic_machine=m88k-motorola
> 		os=-sysv3
> 		;;
>+	dicos)
>+		basic_machine=i686-pc
>+		os=-dicos
>+		;;
> 	djgpp)
> 		basic_machine=i586-pc
> 		os=-msdosdjgpp
>@@ -654,6 +700,14 @@ case $basic_machine in
> 		basic_machine=m68k-isi
> 		os=-sysv
> 		;;
>+	m68knommu)
>+		basic_machine=m68k-unknown
>+		os=-linux
>+		;;
>+	m68knommu-*)
>+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	m88k-omron*)
> 		basic_machine=m88k-omron
> 		;;
>@@ -669,6 +723,10 @@ case $basic_machine in
> 		basic_machine=i386-pc
> 		os=-mingw32
> 		;;
>+	mingw32ce)
>+		basic_machine=arm-unknown
>+		os=-mingw32ce
>+		;;
> 	miniframe)
> 		basic_machine=m68000-convergent
> 		;;
>@@ -694,6 +752,9 @@ case $basic_machine in
> 		basic_machine=i386-pc
> 		os=-msdos
> 		;;
>+	ms1-*)
>+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
>+		;;
> 	mvs)
> 		basic_machine=i370-ibm
> 		os=-mvs
>@@ -792,6 +853,14 @@ case $basic_machine in
> 		basic_machine=i860-intel
> 		os=-osf
> 		;;
>+	parisc)
>+		basic_machine=hppa-unknown
>+		os=-linux
>+		;;
>+	parisc-*)
>+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	pbd)
> 		basic_machine=sparc-tti
> 		;;
>@@ -801,6 +870,12 @@ case $basic_machine in
> 	pc532 | pc532-*)
> 		basic_machine=ns32k-pc532
> 		;;
>+	pc98)
>+		basic_machine=i386-pc
>+		;;
>+	pc98-*)
>+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		;;
> 	pentium | p5 | k5 | k6 | nexgen | viac3)
> 		basic_machine=i586-pc
> 		;;
>@@ -857,6 +932,10 @@ case $basic_machine in
> 		basic_machine=i586-unknown
> 		os=-pw32
> 		;;
>+	rdos)
>+		basic_machine=i386-pc
>+		os=-rdos
>+		;;
> 	rom68k)
> 		basic_machine=m68k-rom68k
> 		os=-coff
>@@ -883,6 +962,10 @@ case $basic_machine in
> 	sb1el)
> 		basic_machine=mipsisa64sb1el-unknown
> 		;;
>+	sde)
>+		basic_machine=mipsisa32-sde
>+		os=-elf
>+		;;
> 	sei)
> 		basic_machine=mips-sei
> 		os=-seiux
>@@ -894,6 +977,9 @@ case $basic_machine in
> 		basic_machine=sh-hitachi
> 		os=-hms
> 		;;
>+	sh5el)
>+		basic_machine=sh5le-unknown
>+		;;
> 	sh64)
> 		basic_machine=sh64-unknown
> 		;;
>@@ -983,6 +1069,10 @@ case $basic_machine in
> 		basic_machine=tic6x-unknown
> 		os=-coff
> 		;;
>+	tile*)
>+		basic_machine=tile-unknown
>+		os=-linux-gnu
>+		;;
> 	tx39)
> 		basic_machine=mipstx39-unknown
> 		;;
>@@ -1058,6 +1148,10 @@ case $basic_machine in
> 		basic_machine=z8k-unknown
> 		os=-sim
> 		;;
>+	z80-*-coff)
>+		basic_machine=z80-unknown
>+		os=-sim
>+		;;
> 	none)
> 		basic_machine=none-none
> 		os=-none
>@@ -1096,10 +1190,10 @@ case $basic_machine in
> 	we32k)
> 		basic_machine=we32k-att
> 		;;
>-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
>+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
> 		basic_machine=sh-unknown
> 		;;
>-	sparc | sparcv8 | sparcv9 | sparcv9b)
>+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
> 		basic_machine=sparc-sun
> 		;;
> 	cydra)
>@@ -1168,25 +1262,28 @@ case $os in
> 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
> 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
> 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
>+	      | -kopensolaris* \
> 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
>-	      | -aos* \
>+	      | -aos* | -aros* \
> 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
> 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
>-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
>+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
>+	      | -openbsd* | -solidbsd* \
> 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
> 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
> 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
> 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
>-	      | -chorusos* | -chorusrdb* \
>+	      | -chorusos* | -chorusrdb* | -cegcc* \
> 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
>-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
>+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
>+	      | -uxpv* | -beos* | -mpeix* | -udk* \
> 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
> 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
> 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
> 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
> 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
> 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
>-	      | -skyos* | -haiku*)
>+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
> 	# Remember, each alternative MUST END IN *, to match a version number.
> 		;;
> 	-qnx*)
>@@ -1316,6 +1413,9 @@ case $os in
> 	-zvmoe)
> 		os=-zvmoe
> 		;;
>+	-dicos*)
>+		os=-dicos
>+		;;
> 	-none)
> 		;;
> 	*)
>@@ -1338,6 +1438,12 @@ else
> # system, and we'll never get to this point.
> 
> case $basic_machine in
>+        score-*)
>+		os=-elf
>+		;;
>+        spu-*)
>+		os=-elf
>+		;;
> 	*-acorn)
> 		os=-riscix1.2
> 		;;
>@@ -1347,9 +1453,9 @@ case $basic_machine in
> 	arm*-semi)
> 		os=-aout
> 		;;
>-    c4x-* | tic4x-*)
>-        os=-coff
>-        ;;
>+        c4x-* | tic4x-*)
>+        	os=-coff
>+		;;
> 	# This must come before the *-dec entry.
> 	pdp10-*)
> 		os=-tops20
>@@ -1375,6 +1481,9 @@ case $basic_machine in
> 	m68*-cisco)
> 		os=-aout
> 		;;
>+        mep-*)
>+		os=-elf
>+		;;
> 	mips*-cisco)
> 		os=-elf
> 		;;
>diff --git a/source4/config.guess b/source4/config.guess
>index 354dbe1..da83314 100755
>--- a/source4/config.guess
>+++ b/source4/config.guess
>@@ -1,13 +1,14 @@
> #! /bin/sh
> # Attempt to guess a canonical system name.
> #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
>-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
>+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
>+#   Free Software Foundation, Inc.
> 
>-timestamp='2005-08-03'
>+timestamp='2009-04-27'
> 
> # This file is free software; you can redistribute it and/or modify it
> # under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 3 of the License, or
>+# the Free Software Foundation; either version 2 of the License, or
> # (at your option) any later version.
> #
> # This program is distributed in the hope that it will be useful, but
>@@ -16,7 +17,9 @@ timestamp='2005-08-03'
> # General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
>-# along with this program; if not, see <http://www.gnu.org/licenses/>.
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
>+# 02110-1301, USA.
> #
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
>@@ -53,8 +56,8 @@ version="\
> GNU config.guess ($timestamp)
> 
> Originally written by Per Bothner.
>-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
>-Free Software Foundation, Inc.
>+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
>+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
> 
> This is free software; see the source for copying conditions.  There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
>@@ -104,7 +107,7 @@ set_cc_for_build='
> trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
> trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
> : ${TMPDIR=/tmp} ;
>- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
>+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
>  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
>  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
>  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
>@@ -158,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> 	    arm*) machine=arm-unknown ;;
> 	    sh3el) machine=shl-unknown ;;
> 	    sh3eb) machine=sh-unknown ;;
>+	    sh5el) machine=sh5le-unknown ;;
> 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
> 	esac
> 	# The Operating System including object format, if it has switched
>@@ -204,8 +208,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
>     *:ekkoBSD:*:*)
> 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
> 	exit ;;
>+    *:SolidBSD:*:*)
>+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
>+	exit ;;
>     macppc:MirBSD:*:*)
>-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
>+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
> 	exit ;;
>     *:MirBSD:*:*)
> 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
>@@ -317,14 +324,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> 	case `/usr/bin/uname -p` in
> 	    sparc) echo sparc-icl-nx7; exit ;;
> 	esac ;;
>+    s390x:SunOS:*:*)
>+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
>+	exit ;;
>     sun4H:SunOS:5.*:*)
> 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit ;;
>     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
> 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit ;;
>-    i86pc:SunOS:5.*:*)
>-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
>+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
>+	eval $set_cc_for_build
>+	SUN_ARCH="i386"
>+	# If there is a compiler, see if it is configured for 64-bit objects.
>+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
>+	# This test works for both compilers.
>+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
>+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
>+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
>+		grep IS_64BIT_ARCH >/dev/null
>+	    then
>+		SUN_ARCH="x86_64"
>+	    fi
>+	fi
>+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit ;;
>     sun4*:SunOS:6*:*)
> 	# According to config.sub, this is the proper way to canonicalize
>@@ -525,7 +548,7 @@ EOF
> 		echo rs6000-ibm-aix3.2
> 	fi
> 	exit ;;
>-    *:AIX:*:[45])
>+    *:AIX:*:[456])
> 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
> 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
> 		IBM_ARCH=rs6000
>@@ -762,12 +785,19 @@ EOF
> 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
> 	exit ;;
>     *:FreeBSD:*:*)
>-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
>+	case ${UNAME_MACHINE} in
>+	    pc98)
>+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
>+	    amd64)
>+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
>+	    *)
>+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
>+	esac
> 	exit ;;
>     i*:CYGWIN*:*)
> 	echo ${UNAME_MACHINE}-pc-cygwin
> 	exit ;;
>-    i*:MINGW*:*)
>+    *:MINGW*:*)
> 	echo ${UNAME_MACHINE}-pc-mingw32
> 	exit ;;
>     i*:windows32*:*)
>@@ -777,9 +807,18 @@ EOF
>     i*:PW*:*)
> 	echo ${UNAME_MACHINE}-pc-pw32
> 	exit ;;
>-    x86:Interix*:[34]*)
>-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
>-	exit ;;
>+    *:Interix*:[3456]*)
>+    	case ${UNAME_MACHINE} in
>+	    x86)
>+		echo i586-pc-interix${UNAME_RELEASE}
>+		exit ;;
>+	    EM64T | authenticamd | genuineintel)
>+		echo x86_64-unknown-interix${UNAME_RELEASE}
>+		exit ;;
>+	    IA64)
>+		echo ia64-unknown-interix${UNAME_RELEASE}
>+		exit ;;
>+	esac ;;
>     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
> 	echo i${UNAME_MACHINE}-pc-mks
> 	exit ;;
>@@ -813,6 +852,16 @@ EOF
> 	echo ${UNAME_MACHINE}-pc-minix
> 	exit ;;
>     arm*:Linux:*:*)
>+	eval $set_cc_for_build
>+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
>+	    | grep -q __ARM_EABI__
>+	then
>+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	else
>+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
>+	fi
>+	exit ;;
>+    avr32*:Linux:*:*)
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu
> 	exit ;;
>     cris:Linux:*:*)
>@@ -849,7 +898,11 @@ EOF
> 	#endif
> 	#endif
> EOF
>-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
>+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
>+	    /^CPU/{
>+		s: ::g
>+		p
>+	    }'`"
> 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
> 	;;
>     mips64:Linux:*:*)
>@@ -868,7 +921,11 @@ EOF
> 	#endif
> 	#endif
> EOF
>-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
>+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
>+	    /^CPU/{
>+		s: ::g
>+		p
>+	    }'`"
> 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
> 	;;
>     or32:Linux:*:*)
>@@ -894,6 +951,9 @@ EOF
> 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
> 	exit ;;
>+    padre:Linux:*:*)
>+	echo sparc-unknown-linux-gnu
>+	exit ;;
>     parisc:Linux:*:* | hppa:Linux:*:*)
> 	# Look for CPU level
> 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
>@@ -917,9 +977,15 @@ EOF
>     sparc:Linux:*:* | sparc64:Linux:*:*)
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu
> 	exit ;;
>+    vax:Linux:*:*)
>+	echo ${UNAME_MACHINE}-dec-linux-gnu
>+	exit ;;
>     x86_64:Linux:*:*)
> 	echo x86_64-unknown-linux-gnu
> 	exit ;;
>+    xtensa*:Linux:*:*)
>+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	exit ;;
>     i*86:Linux:*:*)
> 	# The BFD linker knows what the default object file format is, so
> 	# first see if it will tell us. cd to the root directory to prevent
>@@ -938,9 +1004,6 @@ EOF
> 	  a.out-i386-linux)
> 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
> 		exit ;;
>-	  coff-i386)
>-		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.
>@@ -962,7 +1025,7 @@ EOF
> 	LIBC=gnulibc1
> 	# endif
> 	#else
>-	#ifdef __INTEL_COMPILER
>+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
> 	LIBC=gnu
> 	#else
> 	LIBC=gnuaout
>@@ -972,7 +1035,11 @@ EOF
> 	LIBC=dietlibc
> 	#endif
> EOF
>-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
>+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
>+	    /^LIBC/{
>+		s: ::g
>+		p
>+	    }'`"
> 	test x"${LIBC}" != x && {
> 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
> 		exit
>@@ -1051,8 +1118,11 @@ EOF
>     pc:*:*:*)
> 	# Left here for compatibility:
>         # uname -m prints for DJGPP always 'pc', but it prints nothing about
>-        # the processor, so we play safe by assuming i386.
>-	echo i386-pc-msdosdjgpp
>+        # the processor, so we play safe by assuming i586.
>+	# Note: whatever this is, it MUST be the same as what config.sub
>+	# prints for the "djgpp" host, or else GDB configury will decide that
>+	# this is a cross-build.
>+	echo i586-pc-msdosdjgpp
>         exit ;;
>     Intel:Mach:3*:*)
> 	echo i386-pc-mach3
>@@ -1090,6 +1160,16 @@ EOF
>     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
>         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
>           && { echo i486-ncr-sysv4; exit; } ;;
>+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
>+	OS_REL='.3'
>+	test -r /etc/.relid \
>+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
>+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
>+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
>+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
>+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
>+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
>+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
>     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
> 	echo m68k-unknown-lynxos${UNAME_RELEASE}
> 	exit ;;
>@@ -1165,6 +1245,9 @@ EOF
>     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
> 	echo i586-pc-beos
> 	exit ;;
>+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
>+	echo i586-pc-haiku
>+	exit ;;
>     SX-4:SUPER-UX:*:*)
> 	echo sx4-nec-superux${UNAME_RELEASE}
> 	exit ;;
>@@ -1174,6 +1257,15 @@ EOF
>     SX-6:SUPER-UX:*:*)
> 	echo sx6-nec-superux${UNAME_RELEASE}
> 	exit ;;
>+    SX-7:SUPER-UX:*:*)
>+	echo sx7-nec-superux${UNAME_RELEASE}
>+	exit ;;
>+    SX-8:SUPER-UX:*:*)
>+	echo sx8-nec-superux${UNAME_RELEASE}
>+	exit ;;
>+    SX-8R:SUPER-UX:*:*)
>+	echo sx8r-nec-superux${UNAME_RELEASE}
>+	exit ;;
>     Power*:Rhapsody:*:*)
> 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
> 	exit ;;
>@@ -1183,7 +1275,6 @@ EOF
>     *:Darwin:*:*)
> 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
> 	case $UNAME_PROCESSOR in
>-	    *86) UNAME_PROCESSOR=i686 ;;
> 	    unknown) UNAME_PROCESSOR=powerpc ;;
> 	esac
> 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
>@@ -1262,6 +1353,12 @@ EOF
>     i*86:skyos:*:*)
> 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
> 	exit ;;
>+    i*86:rdos:*:*)
>+	echo ${UNAME_MACHINE}-pc-rdos
>+	exit ;;
>+    i*86:AROS:*:*)
>+	echo ${UNAME_MACHINE}-pc-aros
>+	exit ;;
> esac
> 
> #echo '(No uname command or uname output not recognized.)' 1>&2
>@@ -1422,9 +1519,9 @@ This script, last modified $timestamp, has failed to recognize
> the operating system you are using. It is advised that you
> download the most up to date version of the config scripts from
> 
>-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
>+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
> and
>-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
>+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
> 
> If the version you run ($0) is already up to date, please
> send the following data and any information you think might be
>diff --git a/source4/config.sub b/source4/config.sub
>index 23cd6fd..a39437d 100755
>--- a/source4/config.sub
>+++ b/source4/config.sub
>@@ -1,9 +1,10 @@
> #! /bin/sh
> # Configuration validation subroutine script.
> #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
>-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
>+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
>+#   Free Software Foundation, Inc.
> 
>-timestamp='2005-07-08'
>+timestamp='2009-04-17'
> 
> # This file is (in principle) common to ALL GNU software.
> # The presence of a machine in this file suggests that SOME GNU software
>@@ -11,7 +12,7 @@ timestamp='2005-07-08'
> #
> # This file is free software; you can redistribute it and/or modify
> # it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 3 of the License, or
>+# the Free Software Foundation; either version 2 of the License, or
> # (at your option) any later version.
> #
> # This program is distributed in the hope that it will be useful,
>@@ -20,7 +21,9 @@ timestamp='2005-07-08'
> # GNU General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
>-# along with this program; if not, see <http://www.gnu.org/licenses/>.
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
>+# 02110-1301, USA.
> #
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
>@@ -69,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
> version="\
> GNU config.sub ($timestamp)
> 
>-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
>-Free Software Foundation, Inc.
>+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
>+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
> 
> This is free software; see the source for copying conditions.  There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
>@@ -117,8 +120,10 @@ esac
> # Here we must recognize all the valid KERNEL-OS combinations.
> maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`
> case $maybe_os in
>-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
>-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
>+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
>+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
>+  kopensolaris*-gnu* | \
>+  storm-chaos* | os2-emx* | rtmk-nova*)
>     os=-$maybe_os
>     basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
>     ;;
>@@ -169,6 +174,10 @@ case $os in
> 	-hiux*)
> 		os=-hiuxwe2
> 		;;
>+	-sco6)
>+		os=-sco5v6
>+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>+		;;
> 	-sco5)
> 		os=-sco3.2v5
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>@@ -185,6 +194,10 @@ case $os in
> 		# Don't forget version if it is 3.2v4 or newer.
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
> 		;;
>+	-sco5v6*)
>+		# Don't forget version if it is 3.2v4 or newer.
>+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>+		;;
> 	-sco*)
> 		os=-sco3.2v2
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>@@ -229,20 +242,24 @@ case $basic_machine in
> 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
> 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
> 	| am33_2.0 \
>-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
>+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
> 	| bfin \
> 	| c4x | clipper \
> 	| d10v | d30v | dlx | dsp16xx \
>-	| fr30 | frv \
>+	| fido | fr30 | frv \
> 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
> 	| i370 | i860 | i960 | ia64 \
> 	| ip2k | iq2000 \
>-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
>+	| lm32 \
>+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
>+	| maxq | mb | microblaze | mcore | mep | metag \
> 	| mips | mipsbe | mipseb | mipsel | mipsle \
> 	| mips16 \
> 	| mips64 | mips64el \
>-	| mips64vr | mips64vrel \
>+	| mips64octeon | mips64octeonel \
> 	| mips64orion | mips64orionel \
>+	| mips64r5900 | mips64r5900el \
>+	| mips64vr | mips64vrel \
> 	| mips64vr4100 | mips64vr4100el \
> 	| mips64vr4300 | mips64vr4300el \
> 	| mips64vr5000 | mips64vr5000el \
>@@ -255,26 +272,26 @@ case $basic_machine in
> 	| mipsisa64sr71k | mipsisa64sr71kel \
> 	| mipstx39 | mipstx39el \
> 	| mn10200 | mn10300 \
>-	| ms1 \
>+	| moxie \
>+	| mt \
> 	| msp430 \
>+	| nios | nios2 \
> 	| ns16k | ns32k \
> 	| or32 \
> 	| pdp10 | pdp11 | pj | pjl \
> 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
> 	| pyramid \
>-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
>+	| score \
>+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
> 	| sh64 | sh64le \
>-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
>-	| sparcv8 | sparcv9 | sparcv9b \
>-	| strongarm \
>+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
>+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
>+	| spu | strongarm \
> 	| tahoe | thumb | tic4x | tic80 | tron \
> 	| v850 | v850e \
> 	| we32k \
>-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
>-	| z8k)
>-		basic_machine=$basic_machine-unknown
>-		;;
>-	m32c)
>+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
>+	| z8k | z80)
> 		basic_machine=$basic_machine-unknown
> 		;;
> 	m6811 | m68hc11 | m6812 | m68hc12)
>@@ -284,6 +301,9 @@ case $basic_machine in
> 		;;
> 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
> 		;;
>+	ms1)
>+		basic_machine=mt-unknown
>+		;;
> 
> 	# We use `pc' rather than `unknown'
> 	# because (1) that's what they normally are, and
>@@ -303,25 +323,28 @@ case $basic_machine in
> 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
> 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
> 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
>-	| avr-* \
>+	| avr-* | avr32-* \
> 	| bfin-* | bs2000-* \
> 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
> 	| clipper-* | craynv-* | cydra-* \
> 	| d10v-* | d30v-* | dlx-* \
> 	| elxsi-* \
>-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
>+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
> 	| h8300-* | h8500-* \
> 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
> 	| i*86-* | i860-* | i960-* | ia64-* \
> 	| ip2k-* | iq2000-* \
>-	| m32r-* | m32rle-* \
>+	| lm32-* \
>+	| m32c-* | m32r-* | m32rle-* \
> 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
>-	| m88110-* | m88k-* | maxq-* | mcore-* \
>+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
> 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
> 	| mips16-* \
> 	| mips64-* | mips64el-* \
>-	| mips64vr-* | mips64vrel-* \
>+	| mips64octeon-* | mips64octeonel-* \
> 	| mips64orion-* | mips64orionel-* \
>+	| mips64r5900-* | mips64r5900el-* \
>+	| mips64vr-* | mips64vrel-* \
> 	| mips64vr4100-* | mips64vr4100el-* \
> 	| mips64vr4300-* | mips64vr4300el-* \
> 	| mips64vr5000-* | mips64vr5000el-* \
>@@ -334,30 +357,33 @@ case $basic_machine in
> 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
> 	| mipstx39-* | mipstx39el-* \
> 	| mmix-* \
>-	| ms1-* \
>+	| mt-* \
> 	| msp430-* \
>+	| nios-* | nios2-* \
> 	| none-* | np1-* | ns16k-* | ns32k-* \
> 	| orion-* \
> 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
> 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
> 	| pyramid-* \
> 	| romp-* | rs6000-* \
>-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
>+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
> 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
>-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
>+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
> 	| sparclite-* \
>-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
>+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
> 	| tahoe-* | thumb-* \
>-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
>+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
> 	| tron-* \
> 	| v850-* | v850e-* | vax-* \
> 	| we32k-* \
>-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
>-	| xstormy16-* | xtensa-* \
>+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
>+	| xstormy16-* | xtensa*-* \
> 	| ymp-* \
>-	| z8k-*)
>+	| z8k-* | z80-*)
> 		;;
>-	m32c-*)
>+	# Recognize the basic CPU types without company name, with glob match.
>+	xtensa*)
>+		basic_machine=$basic_machine-unknown
> 		;;
> 	# Recognize the various machine names and aliases which stand
> 	# for a CPU type and a company and sometimes even an OS.
>@@ -421,6 +447,10 @@ case $basic_machine in
> 		basic_machine=m68k-apollo
> 		os=-bsd
> 		;;
>+	aros)
>+		basic_machine=i386-pc
>+		os=-aros
>+		;;
> 	aux)
> 		basic_machine=m68k-apple
> 		os=-aux
>@@ -429,10 +459,22 @@ case $basic_machine in
> 		basic_machine=ns32k-sequent
> 		os=-dynix
> 		;;
>+	blackfin)
>+		basic_machine=bfin-unknown
>+		os=-linux
>+		;;
>+	blackfin-*)
>+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	c90)
> 		basic_machine=c90-cray
> 		os=-unicos
> 		;;
>+        cegcc)
>+		basic_machine=arm-unknown
>+		os=-cegcc
>+		;;
> 	convex-c1)
> 		basic_machine=c1-convex
> 		os=-bsd
>@@ -461,8 +503,8 @@ case $basic_machine in
> 		basic_machine=craynv-cray
> 		os=-unicosmp
> 		;;
>-	cr16c)
>-		basic_machine=cr16c-unknown
>+	cr16)
>+		basic_machine=cr16-unknown
> 		os=-elf
> 		;;
> 	crds | unos)
>@@ -500,6 +542,10 @@ case $basic_machine in
> 		basic_machine=m88k-motorola
> 		os=-sysv3
> 		;;
>+	dicos)
>+		basic_machine=i686-pc
>+		os=-dicos
>+		;;
> 	djgpp)
> 		basic_machine=i586-pc
> 		os=-msdosdjgpp
>@@ -654,6 +700,14 @@ case $basic_machine in
> 		basic_machine=m68k-isi
> 		os=-sysv
> 		;;
>+	m68knommu)
>+		basic_machine=m68k-unknown
>+		os=-linux
>+		;;
>+	m68knommu-*)
>+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	m88k-omron*)
> 		basic_machine=m88k-omron
> 		;;
>@@ -669,6 +723,10 @@ case $basic_machine in
> 		basic_machine=i386-pc
> 		os=-mingw32
> 		;;
>+	mingw32ce)
>+		basic_machine=arm-unknown
>+		os=-mingw32ce
>+		;;
> 	miniframe)
> 		basic_machine=m68000-convergent
> 		;;
>@@ -694,6 +752,9 @@ case $basic_machine in
> 		basic_machine=i386-pc
> 		os=-msdos
> 		;;
>+	ms1-*)
>+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
>+		;;
> 	mvs)
> 		basic_machine=i370-ibm
> 		os=-mvs
>@@ -792,6 +853,14 @@ case $basic_machine in
> 		basic_machine=i860-intel
> 		os=-osf
> 		;;
>+	parisc)
>+		basic_machine=hppa-unknown
>+		os=-linux
>+		;;
>+	parisc-*)
>+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	pbd)
> 		basic_machine=sparc-tti
> 		;;
>@@ -801,6 +870,12 @@ case $basic_machine in
> 	pc532 | pc532-*)
> 		basic_machine=ns32k-pc532
> 		;;
>+	pc98)
>+		basic_machine=i386-pc
>+		;;
>+	pc98-*)
>+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		;;
> 	pentium | p5 | k5 | k6 | nexgen | viac3)
> 		basic_machine=i586-pc
> 		;;
>@@ -857,6 +932,10 @@ case $basic_machine in
> 		basic_machine=i586-unknown
> 		os=-pw32
> 		;;
>+	rdos)
>+		basic_machine=i386-pc
>+		os=-rdos
>+		;;
> 	rom68k)
> 		basic_machine=m68k-rom68k
> 		os=-coff
>@@ -883,6 +962,10 @@ case $basic_machine in
> 	sb1el)
> 		basic_machine=mipsisa64sb1el-unknown
> 		;;
>+	sde)
>+		basic_machine=mipsisa32-sde
>+		os=-elf
>+		;;
> 	sei)
> 		basic_machine=mips-sei
> 		os=-seiux
>@@ -894,6 +977,9 @@ case $basic_machine in
> 		basic_machine=sh-hitachi
> 		os=-hms
> 		;;
>+	sh5el)
>+		basic_machine=sh5le-unknown
>+		;;
> 	sh64)
> 		basic_machine=sh64-unknown
> 		;;
>@@ -983,6 +1069,10 @@ case $basic_machine in
> 		basic_machine=tic6x-unknown
> 		os=-coff
> 		;;
>+	tile*)
>+		basic_machine=tile-unknown
>+		os=-linux-gnu
>+		;;
> 	tx39)
> 		basic_machine=mipstx39-unknown
> 		;;
>@@ -1058,6 +1148,10 @@ case $basic_machine in
> 		basic_machine=z8k-unknown
> 		os=-sim
> 		;;
>+	z80-*-coff)
>+		basic_machine=z80-unknown
>+		os=-sim
>+		;;
> 	none)
> 		basic_machine=none-none
> 		os=-none
>@@ -1096,10 +1190,10 @@ case $basic_machine in
> 	we32k)
> 		basic_machine=we32k-att
> 		;;
>-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
>+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
> 		basic_machine=sh-unknown
> 		;;
>-	sparc | sparcv8 | sparcv9 | sparcv9b)
>+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
> 		basic_machine=sparc-sun
> 		;;
> 	cydra)
>@@ -1168,25 +1262,28 @@ case $os in
> 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
> 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
> 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
>+	      | -kopensolaris* \
> 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
>-	      | -aos* \
>+	      | -aos* | -aros* \
> 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
> 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
>-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
>+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
>+	      | -openbsd* | -solidbsd* \
> 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
> 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
> 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
> 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
>-	      | -chorusos* | -chorusrdb* \
>+	      | -chorusos* | -chorusrdb* | -cegcc* \
> 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
>-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
>+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
>+	      | -uxpv* | -beos* | -mpeix* | -udk* \
> 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
> 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
> 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
> 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
> 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
> 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
>-	      | -skyos* | -haiku*)
>+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
> 	# Remember, each alternative MUST END IN *, to match a version number.
> 		;;
> 	-qnx*)
>@@ -1316,6 +1413,9 @@ case $os in
> 	-zvmoe)
> 		os=-zvmoe
> 		;;
>+	-dicos*)
>+		os=-dicos
>+		;;
> 	-none)
> 		;;
> 	*)
>@@ -1338,6 +1438,12 @@ else
> # system, and we'll never get to this point.
> 
> case $basic_machine in
>+        score-*)
>+		os=-elf
>+		;;
>+        spu-*)
>+		os=-elf
>+		;;
> 	*-acorn)
> 		os=-riscix1.2
> 		;;
>@@ -1347,9 +1453,9 @@ case $basic_machine in
> 	arm*-semi)
> 		os=-aout
> 		;;
>-    c4x-* | tic4x-*)
>-        os=-coff
>-        ;;
>+        c4x-* | tic4x-*)
>+        	os=-coff
>+		;;
> 	# This must come before the *-dec entry.
> 	pdp10-*)
> 		os=-tops20
>@@ -1375,6 +1481,9 @@ case $basic_machine in
> 	m68*-cisco)
> 		os=-aout
> 		;;
>+        mep-*)
>+		os=-elf
>+		;;
> 	mips*-cisco)
> 		os=-elf
> 		;;
>diff --git a/source4/lib/ldb/config.guess b/source4/lib/ldb/config.guess
>index 354dbe1..da83314 100755
>--- a/source4/lib/ldb/config.guess
>+++ b/source4/lib/ldb/config.guess
>@@ -1,13 +1,14 @@
> #! /bin/sh
> # Attempt to guess a canonical system name.
> #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
>-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
>+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
>+#   Free Software Foundation, Inc.
> 
>-timestamp='2005-08-03'
>+timestamp='2009-04-27'
> 
> # This file is free software; you can redistribute it and/or modify it
> # under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 3 of the License, or
>+# the Free Software Foundation; either version 2 of the License, or
> # (at your option) any later version.
> #
> # This program is distributed in the hope that it will be useful, but
>@@ -16,7 +17,9 @@ timestamp='2005-08-03'
> # General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
>-# along with this program; if not, see <http://www.gnu.org/licenses/>.
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
>+# 02110-1301, USA.
> #
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
>@@ -53,8 +56,8 @@ version="\
> GNU config.guess ($timestamp)
> 
> Originally written by Per Bothner.
>-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
>-Free Software Foundation, Inc.
>+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
>+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
> 
> This is free software; see the source for copying conditions.  There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
>@@ -104,7 +107,7 @@ set_cc_for_build='
> trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
> trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
> : ${TMPDIR=/tmp} ;
>- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
>+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
>  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
>  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
>  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
>@@ -158,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> 	    arm*) machine=arm-unknown ;;
> 	    sh3el) machine=shl-unknown ;;
> 	    sh3eb) machine=sh-unknown ;;
>+	    sh5el) machine=sh5le-unknown ;;
> 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
> 	esac
> 	# The Operating System including object format, if it has switched
>@@ -204,8 +208,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
>     *:ekkoBSD:*:*)
> 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
> 	exit ;;
>+    *:SolidBSD:*:*)
>+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
>+	exit ;;
>     macppc:MirBSD:*:*)
>-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
>+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
> 	exit ;;
>     *:MirBSD:*:*)
> 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
>@@ -317,14 +324,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
> 	case `/usr/bin/uname -p` in
> 	    sparc) echo sparc-icl-nx7; exit ;;
> 	esac ;;
>+    s390x:SunOS:*:*)
>+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
>+	exit ;;
>     sun4H:SunOS:5.*:*)
> 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit ;;
>     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
> 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit ;;
>-    i86pc:SunOS:5.*:*)
>-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
>+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
>+	eval $set_cc_for_build
>+	SUN_ARCH="i386"
>+	# If there is a compiler, see if it is configured for 64-bit objects.
>+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
>+	# This test works for both compilers.
>+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
>+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
>+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
>+		grep IS_64BIT_ARCH >/dev/null
>+	    then
>+		SUN_ARCH="x86_64"
>+	    fi
>+	fi
>+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> 	exit ;;
>     sun4*:SunOS:6*:*)
> 	# According to config.sub, this is the proper way to canonicalize
>@@ -525,7 +548,7 @@ EOF
> 		echo rs6000-ibm-aix3.2
> 	fi
> 	exit ;;
>-    *:AIX:*:[45])
>+    *:AIX:*:[456])
> 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
> 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
> 		IBM_ARCH=rs6000
>@@ -762,12 +785,19 @@ EOF
> 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
> 	exit ;;
>     *:FreeBSD:*:*)
>-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
>+	case ${UNAME_MACHINE} in
>+	    pc98)
>+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
>+	    amd64)
>+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
>+	    *)
>+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
>+	esac
> 	exit ;;
>     i*:CYGWIN*:*)
> 	echo ${UNAME_MACHINE}-pc-cygwin
> 	exit ;;
>-    i*:MINGW*:*)
>+    *:MINGW*:*)
> 	echo ${UNAME_MACHINE}-pc-mingw32
> 	exit ;;
>     i*:windows32*:*)
>@@ -777,9 +807,18 @@ EOF
>     i*:PW*:*)
> 	echo ${UNAME_MACHINE}-pc-pw32
> 	exit ;;
>-    x86:Interix*:[34]*)
>-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
>-	exit ;;
>+    *:Interix*:[3456]*)
>+    	case ${UNAME_MACHINE} in
>+	    x86)
>+		echo i586-pc-interix${UNAME_RELEASE}
>+		exit ;;
>+	    EM64T | authenticamd | genuineintel)
>+		echo x86_64-unknown-interix${UNAME_RELEASE}
>+		exit ;;
>+	    IA64)
>+		echo ia64-unknown-interix${UNAME_RELEASE}
>+		exit ;;
>+	esac ;;
>     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
> 	echo i${UNAME_MACHINE}-pc-mks
> 	exit ;;
>@@ -813,6 +852,16 @@ EOF
> 	echo ${UNAME_MACHINE}-pc-minix
> 	exit ;;
>     arm*:Linux:*:*)
>+	eval $set_cc_for_build
>+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
>+	    | grep -q __ARM_EABI__
>+	then
>+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	else
>+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
>+	fi
>+	exit ;;
>+    avr32*:Linux:*:*)
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu
> 	exit ;;
>     cris:Linux:*:*)
>@@ -849,7 +898,11 @@ EOF
> 	#endif
> 	#endif
> EOF
>-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
>+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
>+	    /^CPU/{
>+		s: ::g
>+		p
>+	    }'`"
> 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
> 	;;
>     mips64:Linux:*:*)
>@@ -868,7 +921,11 @@ EOF
> 	#endif
> 	#endif
> EOF
>-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
>+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
>+	    /^CPU/{
>+		s: ::g
>+		p
>+	    }'`"
> 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
> 	;;
>     or32:Linux:*:*)
>@@ -894,6 +951,9 @@ EOF
> 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
> 	exit ;;
>+    padre:Linux:*:*)
>+	echo sparc-unknown-linux-gnu
>+	exit ;;
>     parisc:Linux:*:* | hppa:Linux:*:*)
> 	# Look for CPU level
> 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
>@@ -917,9 +977,15 @@ EOF
>     sparc:Linux:*:* | sparc64:Linux:*:*)
> 	echo ${UNAME_MACHINE}-unknown-linux-gnu
> 	exit ;;
>+    vax:Linux:*:*)
>+	echo ${UNAME_MACHINE}-dec-linux-gnu
>+	exit ;;
>     x86_64:Linux:*:*)
> 	echo x86_64-unknown-linux-gnu
> 	exit ;;
>+    xtensa*:Linux:*:*)
>+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
>+	exit ;;
>     i*86:Linux:*:*)
> 	# The BFD linker knows what the default object file format is, so
> 	# first see if it will tell us. cd to the root directory to prevent
>@@ -938,9 +1004,6 @@ EOF
> 	  a.out-i386-linux)
> 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
> 		exit ;;
>-	  coff-i386)
>-		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.
>@@ -962,7 +1025,7 @@ EOF
> 	LIBC=gnulibc1
> 	# endif
> 	#else
>-	#ifdef __INTEL_COMPILER
>+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
> 	LIBC=gnu
> 	#else
> 	LIBC=gnuaout
>@@ -972,7 +1035,11 @@ EOF
> 	LIBC=dietlibc
> 	#endif
> EOF
>-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
>+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
>+	    /^LIBC/{
>+		s: ::g
>+		p
>+	    }'`"
> 	test x"${LIBC}" != x && {
> 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
> 		exit
>@@ -1051,8 +1118,11 @@ EOF
>     pc:*:*:*)
> 	# Left here for compatibility:
>         # uname -m prints for DJGPP always 'pc', but it prints nothing about
>-        # the processor, so we play safe by assuming i386.
>-	echo i386-pc-msdosdjgpp
>+        # the processor, so we play safe by assuming i586.
>+	# Note: whatever this is, it MUST be the same as what config.sub
>+	# prints for the "djgpp" host, or else GDB configury will decide that
>+	# this is a cross-build.
>+	echo i586-pc-msdosdjgpp
>         exit ;;
>     Intel:Mach:3*:*)
> 	echo i386-pc-mach3
>@@ -1090,6 +1160,16 @@ EOF
>     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
>         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
>           && { echo i486-ncr-sysv4; exit; } ;;
>+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
>+	OS_REL='.3'
>+	test -r /etc/.relid \
>+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
>+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
>+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
>+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
>+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
>+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
>+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
>     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
> 	echo m68k-unknown-lynxos${UNAME_RELEASE}
> 	exit ;;
>@@ -1165,6 +1245,9 @@ EOF
>     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
> 	echo i586-pc-beos
> 	exit ;;
>+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
>+	echo i586-pc-haiku
>+	exit ;;
>     SX-4:SUPER-UX:*:*)
> 	echo sx4-nec-superux${UNAME_RELEASE}
> 	exit ;;
>@@ -1174,6 +1257,15 @@ EOF
>     SX-6:SUPER-UX:*:*)
> 	echo sx6-nec-superux${UNAME_RELEASE}
> 	exit ;;
>+    SX-7:SUPER-UX:*:*)
>+	echo sx7-nec-superux${UNAME_RELEASE}
>+	exit ;;
>+    SX-8:SUPER-UX:*:*)
>+	echo sx8-nec-superux${UNAME_RELEASE}
>+	exit ;;
>+    SX-8R:SUPER-UX:*:*)
>+	echo sx8r-nec-superux${UNAME_RELEASE}
>+	exit ;;
>     Power*:Rhapsody:*:*)
> 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
> 	exit ;;
>@@ -1183,7 +1275,6 @@ EOF
>     *:Darwin:*:*)
> 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
> 	case $UNAME_PROCESSOR in
>-	    *86) UNAME_PROCESSOR=i686 ;;
> 	    unknown) UNAME_PROCESSOR=powerpc ;;
> 	esac
> 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
>@@ -1262,6 +1353,12 @@ EOF
>     i*86:skyos:*:*)
> 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
> 	exit ;;
>+    i*86:rdos:*:*)
>+	echo ${UNAME_MACHINE}-pc-rdos
>+	exit ;;
>+    i*86:AROS:*:*)
>+	echo ${UNAME_MACHINE}-pc-aros
>+	exit ;;
> esac
> 
> #echo '(No uname command or uname output not recognized.)' 1>&2
>@@ -1422,9 +1519,9 @@ This script, last modified $timestamp, has failed to recognize
> the operating system you are using. It is advised that you
> download the most up to date version of the config scripts from
> 
>-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
>+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
> and
>-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
>+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
> 
> If the version you run ($0) is already up to date, please
> send the following data and any information you think might be
>diff --git a/source4/lib/ldb/config.sub b/source4/lib/ldb/config.sub
>index 23cd6fd..a39437d 100755
>--- a/source4/lib/ldb/config.sub
>+++ b/source4/lib/ldb/config.sub
>@@ -1,9 +1,10 @@
> #! /bin/sh
> # Configuration validation subroutine script.
> #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
>-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
>+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
>+#   Free Software Foundation, Inc.
> 
>-timestamp='2005-07-08'
>+timestamp='2009-04-17'
> 
> # This file is (in principle) common to ALL GNU software.
> # The presence of a machine in this file suggests that SOME GNU software
>@@ -11,7 +12,7 @@ timestamp='2005-07-08'
> #
> # This file is free software; you can redistribute it and/or modify
> # it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 3 of the License, or
>+# the Free Software Foundation; either version 2 of the License, or
> # (at your option) any later version.
> #
> # This program is distributed in the hope that it will be useful,
>@@ -20,7 +21,9 @@ timestamp='2005-07-08'
> # GNU General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
>-# along with this program; if not, see <http://www.gnu.org/licenses/>.
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
>+# 02110-1301, USA.
> #
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
>@@ -69,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
> version="\
> GNU config.sub ($timestamp)
> 
>-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
>-Free Software Foundation, Inc.
>+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
>+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
> 
> This is free software; see the source for copying conditions.  There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
>@@ -117,8 +120,10 @@ esac
> # Here we must recognize all the valid KERNEL-OS combinations.
> maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`
> case $maybe_os in
>-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
>-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
>+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
>+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
>+  kopensolaris*-gnu* | \
>+  storm-chaos* | os2-emx* | rtmk-nova*)
>     os=-$maybe_os
>     basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
>     ;;
>@@ -169,6 +174,10 @@ case $os in
> 	-hiux*)
> 		os=-hiuxwe2
> 		;;
>+	-sco6)
>+		os=-sco5v6
>+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>+		;;
> 	-sco5)
> 		os=-sco3.2v5
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>@@ -185,6 +194,10 @@ case $os in
> 		# Don't forget version if it is 3.2v4 or newer.
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
> 		;;
>+	-sco5v6*)
>+		# Don't forget version if it is 3.2v4 or newer.
>+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>+		;;
> 	-sco*)
> 		os=-sco3.2v2
> 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
>@@ -229,20 +242,24 @@ case $basic_machine in
> 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
> 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
> 	| am33_2.0 \
>-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
>+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
> 	| bfin \
> 	| c4x | clipper \
> 	| d10v | d30v | dlx | dsp16xx \
>-	| fr30 | frv \
>+	| fido | fr30 | frv \
> 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
> 	| i370 | i860 | i960 | ia64 \
> 	| ip2k | iq2000 \
>-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
>+	| lm32 \
>+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
>+	| maxq | mb | microblaze | mcore | mep | metag \
> 	| mips | mipsbe | mipseb | mipsel | mipsle \
> 	| mips16 \
> 	| mips64 | mips64el \
>-	| mips64vr | mips64vrel \
>+	| mips64octeon | mips64octeonel \
> 	| mips64orion | mips64orionel \
>+	| mips64r5900 | mips64r5900el \
>+	| mips64vr | mips64vrel \
> 	| mips64vr4100 | mips64vr4100el \
> 	| mips64vr4300 | mips64vr4300el \
> 	| mips64vr5000 | mips64vr5000el \
>@@ -255,26 +272,26 @@ case $basic_machine in
> 	| mipsisa64sr71k | mipsisa64sr71kel \
> 	| mipstx39 | mipstx39el \
> 	| mn10200 | mn10300 \
>-	| ms1 \
>+	| moxie \
>+	| mt \
> 	| msp430 \
>+	| nios | nios2 \
> 	| ns16k | ns32k \
> 	| or32 \
> 	| pdp10 | pdp11 | pj | pjl \
> 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
> 	| pyramid \
>-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
>+	| score \
>+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
> 	| sh64 | sh64le \
>-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
>-	| sparcv8 | sparcv9 | sparcv9b \
>-	| strongarm \
>+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
>+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
>+	| spu | strongarm \
> 	| tahoe | thumb | tic4x | tic80 | tron \
> 	| v850 | v850e \
> 	| we32k \
>-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
>-	| z8k)
>-		basic_machine=$basic_machine-unknown
>-		;;
>-	m32c)
>+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
>+	| z8k | z80)
> 		basic_machine=$basic_machine-unknown
> 		;;
> 	m6811 | m68hc11 | m6812 | m68hc12)
>@@ -284,6 +301,9 @@ case $basic_machine in
> 		;;
> 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
> 		;;
>+	ms1)
>+		basic_machine=mt-unknown
>+		;;
> 
> 	# We use `pc' rather than `unknown'
> 	# because (1) that's what they normally are, and
>@@ -303,25 +323,28 @@ case $basic_machine in
> 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
> 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
> 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
>-	| avr-* \
>+	| avr-* | avr32-* \
> 	| bfin-* | bs2000-* \
> 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
> 	| clipper-* | craynv-* | cydra-* \
> 	| d10v-* | d30v-* | dlx-* \
> 	| elxsi-* \
>-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
>+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
> 	| h8300-* | h8500-* \
> 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
> 	| i*86-* | i860-* | i960-* | ia64-* \
> 	| ip2k-* | iq2000-* \
>-	| m32r-* | m32rle-* \
>+	| lm32-* \
>+	| m32c-* | m32r-* | m32rle-* \
> 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
>-	| m88110-* | m88k-* | maxq-* | mcore-* \
>+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
> 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
> 	| mips16-* \
> 	| mips64-* | mips64el-* \
>-	| mips64vr-* | mips64vrel-* \
>+	| mips64octeon-* | mips64octeonel-* \
> 	| mips64orion-* | mips64orionel-* \
>+	| mips64r5900-* | mips64r5900el-* \
>+	| mips64vr-* | mips64vrel-* \
> 	| mips64vr4100-* | mips64vr4100el-* \
> 	| mips64vr4300-* | mips64vr4300el-* \
> 	| mips64vr5000-* | mips64vr5000el-* \
>@@ -334,30 +357,33 @@ case $basic_machine in
> 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
> 	| mipstx39-* | mipstx39el-* \
> 	| mmix-* \
>-	| ms1-* \
>+	| mt-* \
> 	| msp430-* \
>+	| nios-* | nios2-* \
> 	| none-* | np1-* | ns16k-* | ns32k-* \
> 	| orion-* \
> 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
> 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
> 	| pyramid-* \
> 	| romp-* | rs6000-* \
>-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
>+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
> 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
>-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
>+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
> 	| sparclite-* \
>-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
>+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
> 	| tahoe-* | thumb-* \
>-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
>+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
> 	| tron-* \
> 	| v850-* | v850e-* | vax-* \
> 	| we32k-* \
>-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
>-	| xstormy16-* | xtensa-* \
>+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
>+	| xstormy16-* | xtensa*-* \
> 	| ymp-* \
>-	| z8k-*)
>+	| z8k-* | z80-*)
> 		;;
>-	m32c-*)
>+	# Recognize the basic CPU types without company name, with glob match.
>+	xtensa*)
>+		basic_machine=$basic_machine-unknown
> 		;;
> 	# Recognize the various machine names and aliases which stand
> 	# for a CPU type and a company and sometimes even an OS.
>@@ -421,6 +447,10 @@ case $basic_machine in
> 		basic_machine=m68k-apollo
> 		os=-bsd
> 		;;
>+	aros)
>+		basic_machine=i386-pc
>+		os=-aros
>+		;;
> 	aux)
> 		basic_machine=m68k-apple
> 		os=-aux
>@@ -429,10 +459,22 @@ case $basic_machine in
> 		basic_machine=ns32k-sequent
> 		os=-dynix
> 		;;
>+	blackfin)
>+		basic_machine=bfin-unknown
>+		os=-linux
>+		;;
>+	blackfin-*)
>+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	c90)
> 		basic_machine=c90-cray
> 		os=-unicos
> 		;;
>+        cegcc)
>+		basic_machine=arm-unknown
>+		os=-cegcc
>+		;;
> 	convex-c1)
> 		basic_machine=c1-convex
> 		os=-bsd
>@@ -461,8 +503,8 @@ case $basic_machine in
> 		basic_machine=craynv-cray
> 		os=-unicosmp
> 		;;
>-	cr16c)
>-		basic_machine=cr16c-unknown
>+	cr16)
>+		basic_machine=cr16-unknown
> 		os=-elf
> 		;;
> 	crds | unos)
>@@ -500,6 +542,10 @@ case $basic_machine in
> 		basic_machine=m88k-motorola
> 		os=-sysv3
> 		;;
>+	dicos)
>+		basic_machine=i686-pc
>+		os=-dicos
>+		;;
> 	djgpp)
> 		basic_machine=i586-pc
> 		os=-msdosdjgpp
>@@ -654,6 +700,14 @@ case $basic_machine in
> 		basic_machine=m68k-isi
> 		os=-sysv
> 		;;
>+	m68knommu)
>+		basic_machine=m68k-unknown
>+		os=-linux
>+		;;
>+	m68knommu-*)
>+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	m88k-omron*)
> 		basic_machine=m88k-omron
> 		;;
>@@ -669,6 +723,10 @@ case $basic_machine in
> 		basic_machine=i386-pc
> 		os=-mingw32
> 		;;
>+	mingw32ce)
>+		basic_machine=arm-unknown
>+		os=-mingw32ce
>+		;;
> 	miniframe)
> 		basic_machine=m68000-convergent
> 		;;
>@@ -694,6 +752,9 @@ case $basic_machine in
> 		basic_machine=i386-pc
> 		os=-msdos
> 		;;
>+	ms1-*)
>+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
>+		;;
> 	mvs)
> 		basic_machine=i370-ibm
> 		os=-mvs
>@@ -792,6 +853,14 @@ case $basic_machine in
> 		basic_machine=i860-intel
> 		os=-osf
> 		;;
>+	parisc)
>+		basic_machine=hppa-unknown
>+		os=-linux
>+		;;
>+	parisc-*)
>+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		os=-linux
>+		;;
> 	pbd)
> 		basic_machine=sparc-tti
> 		;;
>@@ -801,6 +870,12 @@ case $basic_machine in
> 	pc532 | pc532-*)
> 		basic_machine=ns32k-pc532
> 		;;
>+	pc98)
>+		basic_machine=i386-pc
>+		;;
>+	pc98-*)
>+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
>+		;;
> 	pentium | p5 | k5 | k6 | nexgen | viac3)
> 		basic_machine=i586-pc
> 		;;
>@@ -857,6 +932,10 @@ case $basic_machine in
> 		basic_machine=i586-unknown
> 		os=-pw32
> 		;;
>+	rdos)
>+		basic_machine=i386-pc
>+		os=-rdos
>+		;;
> 	rom68k)
> 		basic_machine=m68k-rom68k
> 		os=-coff
>@@ -883,6 +962,10 @@ case $basic_machine in
> 	sb1el)
> 		basic_machine=mipsisa64sb1el-unknown
> 		;;
>+	sde)
>+		basic_machine=mipsisa32-sde
>+		os=-elf
>+		;;
> 	sei)
> 		basic_machine=mips-sei
> 		os=-seiux
>@@ -894,6 +977,9 @@ case $basic_machine in
> 		basic_machine=sh-hitachi
> 		os=-hms
> 		;;
>+	sh5el)
>+		basic_machine=sh5le-unknown
>+		;;
> 	sh64)
> 		basic_machine=sh64-unknown
> 		;;
>@@ -983,6 +1069,10 @@ case $basic_machine in
> 		basic_machine=tic6x-unknown
> 		os=-coff
> 		;;
>+	tile*)
>+		basic_machine=tile-unknown
>+		os=-linux-gnu
>+		;;
> 	tx39)
> 		basic_machine=mipstx39-unknown
> 		;;
>@@ -1058,6 +1148,10 @@ case $basic_machine in
> 		basic_machine=z8k-unknown
> 		os=-sim
> 		;;
>+	z80-*-coff)
>+		basic_machine=z80-unknown
>+		os=-sim
>+		;;
> 	none)
> 		basic_machine=none-none
> 		os=-none
>@@ -1096,10 +1190,10 @@ case $basic_machine in
> 	we32k)
> 		basic_machine=we32k-att
> 		;;
>-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
>+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
> 		basic_machine=sh-unknown
> 		;;
>-	sparc | sparcv8 | sparcv9 | sparcv9b)
>+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
> 		basic_machine=sparc-sun
> 		;;
> 	cydra)
>@@ -1168,25 +1262,28 @@ case $os in
> 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
> 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
> 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
>+	      | -kopensolaris* \
> 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
>-	      | -aos* \
>+	      | -aos* | -aros* \
> 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
> 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
>-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
>+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
>+	      | -openbsd* | -solidbsd* \
> 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
> 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
> 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
> 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
>-	      | -chorusos* | -chorusrdb* \
>+	      | -chorusos* | -chorusrdb* | -cegcc* \
> 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
>-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
>+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
>+	      | -uxpv* | -beos* | -mpeix* | -udk* \
> 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
> 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
> 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
> 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
> 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
> 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
>-	      | -skyos* | -haiku*)
>+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
> 	# Remember, each alternative MUST END IN *, to match a version number.
> 		;;
> 	-qnx*)
>@@ -1316,6 +1413,9 @@ case $os in
> 	-zvmoe)
> 		os=-zvmoe
> 		;;
>+	-dicos*)
>+		os=-dicos
>+		;;
> 	-none)
> 		;;
> 	*)
>@@ -1338,6 +1438,12 @@ else
> # system, and we'll never get to this point.
> 
> case $basic_machine in
>+        score-*)
>+		os=-elf
>+		;;
>+        spu-*)
>+		os=-elf
>+		;;
> 	*-acorn)
> 		os=-riscix1.2
> 		;;
>@@ -1347,9 +1453,9 @@ case $basic_machine in
> 	arm*-semi)
> 		os=-aout
> 		;;
>-    c4x-* | tic4x-*)
>-        os=-coff
>-        ;;
>+        c4x-* | tic4x-*)
>+        	os=-coff
>+		;;
> 	# This must come before the *-dec entry.
> 	pdp10-*)
> 		os=-tops20
>@@ -1375,6 +1481,9 @@ case $basic_machine in
> 	m68*-cisco)
> 		os=-aout
> 		;;
>+        mep-*)
>+		os=-elf
>+		;;
> 	mips*-cisco)
> 		os=-elf
> 		;;
>-- 
>1.5.4.3
>
>
>From 065dfc01310b9e49b7bb00eed400ab01f8a03230 Mon Sep 17 00:00:00 2001
>From: Jelmer Vernooij <jelmer@samba.org>
>Date: Sat, 16 May 2009 04:14:21 +0200
>Subject: [PATCH] tevent: Install tevent_internal.h in the standalone build.
>
>This is not ideal, but at least it fixes the build of samba-gtk for now.
>I've also added a warning about API guarantees at the top of the header.
>(cherry picked from commit 857c3f8322005efd460c2f516a9486a2de059e9f)
>---
> lib/tevent/tevent.mk         |    1 +
> lib/tevent/tevent_internal.h |    4 +++-
> 2 files changed, 4 insertions(+), 1 deletions(-)
>
>diff --git a/lib/tevent/tevent.mk b/lib/tevent/tevent.mk
>index ac5710f..ff01bd9 100644
>--- a/lib/tevent/tevent.mk
>+++ b/lib/tevent/tevent.mk
>@@ -22,6 +22,7 @@ installdirs::
> 
> installheaders:: installdirs
> 	cp $(srcdir)/tevent.h $(DESTDIR)$(includedir)
>+	cp $(srcdir)/tevent_internal.h $(DESTDIR)$(includedir)
> 
> installlibs:: installdirs
> 	cp tevent.pc $(DESTDIR)$(libdir)/pkgconfig
>diff --git a/lib/tevent/tevent_internal.h b/lib/tevent/tevent_internal.h
>index eebf767..36abfa4 100644
>--- a/lib/tevent/tevent_internal.h
>+++ b/lib/tevent/tevent_internal.h
>@@ -3,7 +3,9 @@
> 
>    generalised event loop handling
> 
>-   Internal structs
>+   INTERNAL STRUCTS. THERE ARE NO API GUARANTEES.
>+   External users should only ever have to include this header when 
>+   implementing new tevent backends.
> 
>    Copyright (C) Stefan Metzmacher 2005-2009
> 
>-- 
>1.5.4.3
>
>
>From 59f603f83f677f2f954d63a33f1228a69c8afeb2 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Fri, 4 Sep 2009 13:10:56 +0200
>Subject: [PATCH] tevent: Remove python module.
>
>This module didn't have any functionality that we actually used yet, and
>it was quite small.
>
>Tevent is quite low level and perhaps doesn't make much sense to expose
>directly as a Python module. It was also causing build problems when used with a
>system-tevent. We can always back later if necessary.
>(cherry picked from commit 5065cf70f8bf41193d6d33413f2285f62bba0502)
>---
> lib/tevent/configure.ac   |   13 ----
> lib/tevent/pytevent.c     |  143 ---------------------------------------------
> lib/tevent/python.mk      |    5 --
> lib/tevent/rules.mk       |    3 -
> lib/tevent/tests.py       |   35 -----------
> lib/tevent/tevent.mk      |   20 ------
> source4/selftest/tests.sh |    1 -
> 7 files changed, 0 insertions(+), 220 deletions(-)
> delete mode 100644 lib/tevent/pytevent.c
> delete mode 100644 lib/tevent/python.mk
> delete mode 100644 lib/tevent/tests.py
>
>diff --git a/lib/tevent/configure.ac b/lib/tevent/configure.ac
>index 171a408..1c62a70 100644
>--- a/lib/tevent/configure.ac
>+++ b/lib/tevent/configure.ac
>@@ -20,18 +20,5 @@ m4_include(pkg.m4)
> m4_include(libtalloc.m4)
> 
> m4_include(libtevent.m4)
>-AC_PATH_PROGS([PYTHON_CONFIG], [python2.6-config python2.5-config python2.4-config python-config])
>-AC_PATH_PROGS([PYTHON], [python2.6 python2.5 python2.4 python])
> 
>-PYTHON_BUILD_TARGET="build-python"
>-PYTHON_INSTALL_TARGET="install-python"
>-PYTHON_CHECK_TARGET="check-python"
>-AC_SUBST(PYTHON_BUILD_TARGET)
>-AC_SUBST(PYTHON_INSTALL_TARGET)
>-AC_SUBST(PYTHON_CHECK_TARGET)
>-if test -z "$PYTHON_CONFIG"; then
>-	PYTHON_BUILD_TARGET=""
>-	PYTHON_INSTALL_TARGET=""
>-	PYTHON_CHECK_TARGET=""
>-fi
> AC_OUTPUT(Makefile tevent.pc)
>diff --git a/lib/tevent/pytevent.c b/lib/tevent/pytevent.c
>deleted file mode 100644
>index fe7e7e3..0000000
>--- a/lib/tevent/pytevent.c
>+++ /dev/null
>@@ -1,143 +0,0 @@
>-/* 
>-   Unix SMB/CIFS implementation.
>-   Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007-2008
>-
>-     ** NOTE! The following LGPL license applies to the tevent
>-     ** library. This does NOT imply that all of Samba is released
>-     ** under the LGPL
>-
>-   This library is free software; you can redistribute it and/or
>-   modify it under the terms of the GNU Lesser General Public
>-   License as published by the Free Software Foundation; either
>-   version 3 of the License, or (at your option) any later version.
>-
>-   This library is distributed in the hope that it will be useful,
>-   but WITHOUT ANY WARRANTY; without even the implied warranty of
>-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>-   Lesser General Public License for more details.
>-
>-   You should have received a copy of the GNU Lesser General Public
>-   License along with this library; if not, see <http://www.gnu.org/licenses/>.
>-*/
>-
>-#include "replace.h"
>-#include <Python.h>
>-
>-#ifndef Py_RETURN_NONE
>-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
>-#endif
>-
>-#include <tevent.h>
>-#include <stdbool.h>
>-
>-typedef struct {
>-	PyObject_HEAD
>-	struct tevent_context *ev_ctx;
>-} PyTEventContextObject;
>-
>-PyAPI_DATA(PyTypeObject) PyTEventContext;
>-
>-static PyObject *py_set_default_backend(PyObject *self, PyObject *args)
>-{
>-    char *name;
>-
>-    if (!PyArg_ParseTuple(args, "s", &name))
>-        return NULL;
>-    tevent_set_default_backend(name);
>-    Py_RETURN_NONE;
>-}
>-
>-static PyObject *py_backend_list(PyObject *self)
>-{
>-    const char **backends = tevent_backend_list(NULL);
>-    PyObject *ret;
>-    int i, len;
>-
>-    for (len = 0; backends[len]; len++);
>-
>-    ret = PyList_New(len);
>-    for (i = 0; i < len; i++)
>-        PyList_SetItem(ret, i, PyString_FromString(backends[i]));
>-    talloc_free(backends);
>-
>-    return ret;
>-}
>-
>-static PyMethodDef tevent_methods[] = {
>-    { "set_default_backend", (PyCFunction)py_set_default_backend, 
>-        METH_VARARGS, "set_default_backend(name) -> None" },
>-    { "backend_list", (PyCFunction)py_backend_list,
>-        METH_NOARGS, "backend_list() -> list" },
>-    { NULL },
>-};
>-
>-static PyObject *py_event_ctx_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
>-{
>-    const char *kwnames[] = { "name", NULL };
>-    char *name = NULL;
>-    struct tevent_context *ev_ctx;
>-    PyTEventContextObject *ret;
>-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|s",
>-				     discard_const_p(char *, kwnames),
>-				     &name))
>-        return NULL;
>-
>-    if (name == NULL)
>-        ev_ctx = tevent_context_init(NULL);
>-    else
>-        ev_ctx = tevent_context_init_byname(NULL, name);
>-
>-    ret = (PyTEventContextObject *)type->tp_alloc(type, 0);
>-    ret->ev_ctx = ev_ctx;
>-    return (PyObject *)ret;
>-}
>-
>-static PyObject *py_event_ctx_loop_once(PyTEventContextObject *self)
>-{
>-    return PyInt_FromLong(tevent_loop_once(self->ev_ctx));
>-}
>-
>-static PyObject *py_event_ctx_loop_wait(PyTEventContextObject *self)
>-{
>-    return PyInt_FromLong(tevent_loop_wait(self->ev_ctx));
>-}
>-
>-static PyMethodDef py_event_ctx_methods[] = {
>-    { "loop_once", (PyCFunction)py_event_ctx_loop_once, METH_NOARGS, 
>-        "S.loop_once() -> int" },
>-    { "loop_wait", (PyCFunction)py_event_ctx_loop_wait, METH_NOARGS, 
>-        "S.loop_wait() -> int" },
>-    { NULL }
>-};
>-
>-static void py_event_ctx_dealloc(PyTEventContextObject * self)
>-{
>-	talloc_free(self->ev_ctx);
>-	self->ob_type->tp_free(self);
>-}
>-
>-
>-PyTypeObject PyTEventContext = {
>-    .tp_name = "TEventContext",
>-    .tp_methods = py_event_ctx_methods,
>-    .tp_basicsize = sizeof(PyTEventContextObject),
>-    .tp_dealloc = (destructor)py_event_ctx_dealloc,
>-    .tp_flags = Py_TPFLAGS_DEFAULT,
>-    .tp_new = py_event_ctx_new,
>-};
>-
>-void inittevent(void)
>-{
>-    PyObject *m;
>-
>-    if (PyType_Ready(&PyTEventContext) < 0)
>-    	return;
>-
>-    m = Py_InitModule3("tevent", tevent_methods, "Event management.");
>-    if (m == NULL)
>-        return;
>-
>-    Py_INCREF(&PyTEventContext);
>-    PyModule_AddObject(m, "TEventContext", (PyObject *)&PyTEventContext);
>-}
>-
>diff --git a/lib/tevent/python.mk b/lib/tevent/python.mk
>deleted file mode 100644
>index 0c1beca..0000000
>--- a/lib/tevent/python.mk
>+++ /dev/null
>@@ -1,5 +0,0 @@
>-[PYTHON::pytevent]
>-LIBRARY_REALNAME = tevent.$(SHLIBEXT)
>-PRIVATE_DEPENDENCIES = LIBTEVENT PYTALLOC LIBSAMBA-UTIL LIBREPLACE
>-
>-pytevent_OBJ_FILES = $(libteventsrcdir)/pytevent.o
>diff --git a/lib/tevent/rules.mk b/lib/tevent/rules.mk
>index 6fd990f..28a2515 100644
>--- a/lib/tevent/rules.mk
>+++ b/lib/tevent/rules.mk
>@@ -1,8 +1,5 @@
> .SUFFIXES: .i _wrap.c
> 
>-.i_wrap.c: 
>-	$(SWIG) -O -Wall -python -keyword $<
>-
> showflags::
> 	@echo 'libtevent will be compiled with flags:'
> 	@echo '  CFLAGS = $(CFLAGS)'
>diff --git a/lib/tevent/tests.py b/lib/tevent/tests.py
>deleted file mode 100644
>index 53e00b0..0000000
>--- a/lib/tevent/tests.py
>+++ /dev/null
>@@ -1,35 +0,0 @@
>-#!/usr/bin/python
>-
>-# Unix SMB/CIFS implementation.
>-# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007
>-#
>-#  ** NOTE! The following LGPL license applies to the tevent
>-#  ** library. This does NOT imply that all of Samba is released
>-#  ** under the LGPL
>-#
>-# This library is free software; you can redistribute it and/or
>-# modify it under the terms of the GNU Lesser General Public
>-# License as published by the Free Software Foundation; either
>-# version 3 of the License, or (at your option) any later version.
>-#
>-# This library is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>-# Lesser General Public License for more details.
>-#
>-# You should have received a copy of the GNU Lesser General Public
>-# License along with this library; if not, see <http://www.gnu.org/licenses/>.
>-#
>-
>-import tevent
>-import unittest
>-
>-# Just test the bindings are there and that calling them doesn't crash
>-# anything.
>-
>-class TEventTestCase(unittest.TestCase):
>-    def test_create(self):
>-        self.assertTrue(tevent.TEventContext() is not None)
>-
>-    def test_loop_wait(self):
>-        self.assertEquals(0, tevent.TEventContext().loop_wait())
>diff --git a/lib/tevent/tevent.mk b/lib/tevent/tevent.mk
>index ff01bd9..82cc4a0 100644
>--- a/lib/tevent/tevent.mk
>+++ b/lib/tevent/tevent.mk
>@@ -33,23 +33,3 @@ install:: all installdirs installheaders installlibs $(PYTHON_INSTALL_TARGET)
> clean::
> 	rm -f $(TEVENT_SOBASE) $(TEVENT_SONAME) $(TEVENT_SOLIB) $(TEVENT_STLIB)
> 	rm -f tevent.pc
>-	rm -f tevent.$(SHLIBEXT)
>-
>-#python stuff
>-
>-check-python:: build-python
>-	$(LIB_PATH_VAR)=. PYTHONPATH=".:$(teventdir)" $(PYTHON) $(teventdir)/tests.py
>-
>-build-python:: tevent.$(SHLIBEXT)
>-
>-pytevent.o: $(teventdir)/pytevent.c
>-	$(CC) $(PICFLAG) -c $(teventdir)/pytevent.c $(CFLAGS) `$(PYTHON_CONFIG) --cflags`
>-
>-tevent.$(SHLIBEXT): $(TEVENT_SOBASE) $(TEVENT_SONAME) pytevent.o
>-	$(SHLD) $(SHLD_FLAGS) -o $@ pytevent.o -L. -ltevent `$(PYTHON_CONFIG) --libs`
>-
>-install-python:: build-python
>-	mkdir -p $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(0, prefix='$(prefix)')"` \
>-		$(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"`
>-	cp tevent.$(SHLIBEXT) $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"`
>-
>diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
>index 821db06..92ac104 100755
>--- a/source4/selftest/tests.sh
>+++ b/source4/selftest/tests.sh
>@@ -415,7 +415,6 @@ plantest "samr.python" dc:local $SUBUNITRUN samba.tests.dcerpc.sam
> plantest "dcerpc.bare.python" dc:local $SUBUNITRUN samba.tests.dcerpc.bare
> plantest "unixinfo.python" dc:local $SUBUNITRUN samba.tests.dcerpc.unix
> plantest "samdb.python" none $SUBUNITRUN samba.tests.samdb
>-plantest "tevent.python" none PYTHONPATH="$PYTHONPATH:../lib/tevent" $SUBUNITRUN tests
> plantest "messaging.python" none PYTHONPATH="$PYTHONPATH:$samba4srcdir/lib/messaging/tests" $SUBUNITRUN bindings
> plantest "samba3sam.python" none PYTHONPATH="$PYTHONPATH:$samba4srcdir/dsdb/samdb/ldb_modules/tests" $SUBUNITRUN samba3sam
> plantest "subunit.python" none $SUBUNITRUN subunit
>-- 
>1.5.4.3
>
>
>From 3630a2c024e9367c29e64ac896723a3bcd088228 Mon Sep 17 00:00:00 2001
>From: Jelmer Vernooij <jelmer@samba.org>
>Date: Sat, 16 May 2009 20:31:59 +0200
>Subject: [PATCH] tevent: Define TALLOC_FREE() if it's not defined yet, to allow building
> with released versions of talloc.
> (cherry picked from commit 72b744f38ebb9f9576c05c7bb0a00de26697ec8f)
>
>---
> lib/tevent/tevent_util.h |    6 ++++++
> 1 files changed, 6 insertions(+), 0 deletions(-)
>
>diff --git a/lib/tevent/tevent_util.h b/lib/tevent/tevent_util.h
>index c4d4378..829cbc2 100644
>--- a/lib/tevent/tevent_util.h
>+++ b/lib/tevent/tevent_util.h
>@@ -116,3 +116,9 @@ do { \
> const char **ev_str_list_add(const char **list, const char *s);
> int ev_set_blocking(int fd, bool set);
> size_t ev_str_list_length(const char **list);
>+
>+/* Defined here so we can build against older talloc versions that don't
>+ * have this define yet. */
>+#ifndef TALLOC_FREE
>+#define TALLOC_FREE(ctx) do { talloc_free(ctx); ctx=NULL; } while(0)
>+#endif
>-- 
>1.5.4.3
>
>
>From 44113da36fdfca720ea84a0b9f04e2132df953e6 Mon Sep 17 00:00:00 2001
>From: Jelmer Vernooij <jelmer@samba.org>
>Date: Tue, 19 May 2009 23:31:34 +0200
>Subject: [PATCH] tevent/python: Makefile was still trying to build some non AC_SUBST python targets
>
>Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>(cherry picked from commit cf9636ea99bb5063a8c7d771c1e29f684b4b753a)
>---
> lib/tevent/Makefile.in |    8 +-------
> 1 files changed, 1 insertions(+), 7 deletions(-)
>
>diff --git a/lib/tevent/Makefile.in b/lib/tevent/Makefile.in
>index d188e6b..253b1e1 100644
>--- a/lib/tevent/Makefile.in
>+++ b/lib/tevent/Makefile.in
>@@ -22,11 +22,6 @@ SHLD_FLAGS = @SHLD_FLAGS@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PICFLAG = @PICFLAG@
> SHLIBEXT = @SHLIBEXT@
>-PYTHON = @PYTHON@
>-PYTHON_CONFIG = @PYTHON_CONFIG@
>-PYTHON_BUILD_TARGET = @PYTHON_BUILD_TARGET@
>-PYTHON_INSTALL_TARGET = @PYTHON_INSTALL_TARGET@
>-PYTHON_CHECK_TARGET = @PYTHON_CHECK_TARGET@
> LIB_PATH_VAR = @LIB_PATH_VAR@
> teventdir = @teventdir@
> 
>@@ -49,7 +44,7 @@ default: all
> include $(teventdir)/tevent.mk
> include $(teventdir)/rules.mk
> 
>-all:: showflags dirs $(PROGS) $(TEVENT_SOLIB) libtevent.a $(PYTHON_BUILD_TARGET)
>+all:: showflags dirs $(PROGS) $(TEVENT_SOLIB) libtevent.a
> 
> install:: all
> $(TEVENT_SOLIB): $(TEVENT_OBJ)
>@@ -66,7 +61,6 @@ shared-build: all
> 
> check: test
> 
>-test:: $(PYTHON_CHECK_TARGET)
> installcheck:: test install
> 
> clean::
>-- 
>1.5.4.3
>
>
>From 8f88d62fdc3bf5f57d9f3c1ab8bf6c3dc1fdf2b2 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Thu, 4 Jun 2009 17:26:23 +0200
>Subject: [PATCH] Add tevent_req_notify_callback
>
>This is necessary for requests that have multiple results. Examples would be
>SMBEcho and ldap_search.
>(cherry picked from commit c6f39b46a7b0505331612a1bee15a82f97009f0d)
>---
> lib/tevent/tevent.h     |    4 ++++
> lib/tevent/tevent_req.c |   13 +++++++++----
> 2 files changed, 13 insertions(+), 4 deletions(-)
>
>diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h
>index 6c5df63..2cbd175 100644
>--- a/lib/tevent/tevent.h
>+++ b/lib/tevent/tevent.h
>@@ -252,6 +252,10 @@ bool tevent_req_set_endtime(struct tevent_req *req,
> 			    struct tevent_context *ev,
> 			    struct timeval endtime);
> 
>+void _tevent_req_notify_callback(struct tevent_req *req, const char *location);
>+#define tevent_req_notify_callback(req)		\
>+	_tevent_req_notify_callback(req, __location__)
>+
> void _tevent_req_done(struct tevent_req *req,
> 		      const char *location);
> #define tevent_req_done(req) \
>diff --git a/lib/tevent/tevent_req.c b/lib/tevent/tevent_req.c
>index 0170000..541f93f 100644
>--- a/lib/tevent/tevent_req.c
>+++ b/lib/tevent/tevent_req.c
>@@ -117,17 +117,22 @@ struct tevent_req *_tevent_req_create(TALLOC_CTX *mem_ctx,
> 	return req;
> }
> 
>-static void tevent_req_finish(struct tevent_req *req,
>-			      enum tevent_req_state state,
>-			      const char *location)
>+void _tevent_req_notify_callback(struct tevent_req *req, const char *location)
> {
>-	req->internal.state = state;
> 	req->internal.finish_location = location;
> 	if (req->async.fn != NULL) {
> 		req->async.fn(req);
> 	}
> }
> 
>+static void tevent_req_finish(struct tevent_req *req,
>+			      enum tevent_req_state state,
>+			      const char *location)
>+{
>+	req->internal.state = state;
>+	_tevent_req_notify_callback(req, location);
>+}
>+
> /**
>  * @brief An async request has successfully finished
>  * @param[in] req	The finished request
>-- 
>1.5.4.3
>
>
>From ae6dea8f53e589eb2b3e0c7f5a2a53a389d81262 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Fri, 4 Sep 2009 13:12:42 +0200
>Subject: [PATCH] Increase tevent version for tevent_req_notify_callback()
> (cherry picked from commit d0aedeb46e5d2da582b5c030114186f8d755b528)
>
>---
> lib/tevent/configure.ac |    2 +-
> source4/min_versions.m4 |    2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/lib/tevent/configure.ac b/lib/tevent/configure.ac
>index 1c62a70..0d3f21d 100644
>--- a/lib/tevent/configure.ac
>+++ b/lib/tevent/configure.ac
>@@ -1,5 +1,5 @@
> AC_PREREQ(2.50)
>-AC_INIT(tevent, 0.9.5)
>+AC_INIT(tevent, 0.9.6)
> AC_CONFIG_SRCDIR([tevent.c])
> AC_CONFIG_HEADER(config.h)
> 
>diff --git a/source4/min_versions.m4 b/source4/min_versions.m4
>index eaefbd5..a5a9079 100644
>--- a/source4/min_versions.m4
>+++ b/source4/min_versions.m4
>@@ -3,4 +3,4 @@
> TDB_MIN_VERSION=1.1.3
> TALLOC_MIN_VERSION=1.3.0
> LDB_REQUIRED_VERSION=0.9.3
>-TEVENT_REQUIRED_VERSION=0.9.5
>+TEVENT_REQUIRED_VERSION=0.9.6
>-- 
>1.5.4.3
>
>
>From 7b7641026dacf0e621559a917f3175d412ae4cd6 Mon Sep 17 00:00:00 2001
>From: Simo Sorce <ssorce@redhat.com>
>Date: Sun, 7 Jun 2009 14:10:15 -0400
>Subject: [PATCH] Add exports file and abi checker for tevent
>
>This is a first attempt at exporting symbols only for public functions
>We also provide a rudimentary ABI checker that tries to check that
>function signatures are not changed by mistake.
>Given our use of macros this is not an API checker.
>It's all based on tevent.h contents and the gcc -aux-info option
>(cherry picked from commit efccef09aec93180a06955b5e03f1ceb99dc39e8)
>---
> lib/tevent/Makefile.in       |    7 ++++-
> lib/tevent/abi_checks.sh     |   31 ++++++++++++++++++++++
> lib/tevent/configure.ac      |    1 +
> lib/tevent/libtevent.m4      |    5 +++
> lib/tevent/rules.mk          |    2 +-
> lib/tevent/tevent.exports    |   59 ++++++++++++++++++++++++++++++++++++++++++
> lib/tevent/tevent.signatures |   54 ++++++++++++++++++++++++++++++++++++++
> 7 files changed, 157 insertions(+), 2 deletions(-)
> create mode 100755 lib/tevent/abi_checks.sh
> create mode 100644 lib/tevent/tevent.exports
> create mode 100644 lib/tevent/tevent.signatures
>
>diff --git a/lib/tevent/Makefile.in b/lib/tevent/Makefile.in
>index 253b1e1..f3deb9d 100644
>--- a/lib/tevent/Makefile.in
>+++ b/lib/tevent/Makefile.in
>@@ -39,6 +39,10 @@ LIBS = $(TALLOC_LIBS) $(TEVENT_LIBS) @LIBS@
> 
> TEVENT_OBJ = @TEVENT_OBJ@ @LIBREPLACEOBJ@
> 
>+SONAMEFLAG = @SONAMEFLAG@
>+VERSIONSCRIPT = @VERSIONSCRIPT@
>+EXPORTSFILE = @EXPORTSFILE@
>+
> default: all
> 
> include $(teventdir)/tevent.mk
>@@ -48,7 +52,7 @@ all:: showflags dirs $(PROGS) $(TEVENT_SOLIB) libtevent.a
> 
> install:: all
> $(TEVENT_SOLIB): $(TEVENT_OBJ)
>-	$(SHLD) $(SHLD_FLAGS) $(LDFLAGS) $(LIBS) -o $@ $(TEVENT_OBJ) @SONAMEFLAG@$(TEVENT_SONAME)
>+	$(SHLD) $(SHLD_FLAGS) $(LDFLAGS) $(LIBS) -o $@ $(TEVENT_OBJ) $(VERSIONSCRIPT) $(EXPORTSFILE) $(SONAMEFLAG)$(TEVENT_SONAME)
> 
> shared-build: all
> 	${INSTALLCMD} -d $(sharedbuilddir)/lib
>@@ -65,6 +69,7 @@ installcheck:: test install
> 
> clean::
> 	rm -f *.o *.a */*.o
>+	rm -fr abi
> 
> distclean:: clean
> 	rm -f config.log config.status config.h config.cache
>diff --git a/lib/tevent/abi_checks.sh b/lib/tevent/abi_checks.sh
>new file mode 100755
>index 0000000..83082ad
>--- /dev/null
>+++ b/lib/tevent/abi_checks.sh
>@@ -0,0 +1,31 @@
>+#!/bin/bash
>+make clean
>+
>+mkdir abi
>+ABI_CHECKS="-aux-info abi/\$@.X"
>+make ABI_CHECK="$ABI_CHECKS"
>+
>+for i in abi/*.X; do cat $i | grep 'tevent\.h'; done | sort | uniq | awk -F "extern " '{ print $2 }' > abi/signatures
>+
>+cat > abi/exports << EOF
>+{
>+    global:
>+EOF
>+cat abi/signatures | awk -F '(' '{ print $1 }' | awk -F ' ' '{ print "           "$NF";" }' | tr -d '*' | sort >> abi/exports
>+cat >> abi/exports << EOF
>+
>+    local: *;
>+};
>+EOF
>+
>+rm -fr abi/*.X
>+
>+diff -u tevent.signatures abi/signatures
>+if [ "$?" != "0" ]; then
>+    echo "WARNING: Possible ABI Change!!"
>+fi
>+
>+diff -u tevent.exports abi/exports
>+if [ "$?" != "0" ]; then
>+    echo "WARNING: Export file may be outdated!!"
>+fi
>diff --git a/lib/tevent/configure.ac b/lib/tevent/configure.ac
>index 0d3f21d..d40e02e 100644
>--- a/lib/tevent/configure.ac
>+++ b/lib/tevent/configure.ac
>@@ -7,6 +7,7 @@ AC_LIBREPLACE_ALL_CHECKS
> 
> AC_LD_EXPORT_DYNAMIC
> AC_LD_SONAMEFLAG
>+AC_LD_VERSIONSCRIPT
> AC_LD_PICFLAG
> AC_LD_SHLIBEXT
> AC_LIBREPLACE_SHLD
>diff --git a/lib/tevent/libtevent.m4 b/lib/tevent/libtevent.m4
>index 20730b1..4162ba3 100644
>--- a/lib/tevent/libtevent.m4
>+++ b/lib/tevent/libtevent.m4
>@@ -38,3 +38,8 @@ if test x"$ac_cv_header_sys_epoll_h" = x"yes" -a x"$ac_cv_func_epoll_create" = x
>    AC_DEFINE(HAVE_EPOLL, 1, [Whether epoll available])
> fi
> 
>+if test x"$VERSIONSCRIPT" != "x"; then
>+    EXPORTSFILE=tevent.exports
>+    AC_SUBST(EXPORTSFILE)
>+fi
>+
>diff --git a/lib/tevent/rules.mk b/lib/tevent/rules.mk
>index 28a2515..c197e93 100644
>--- a/lib/tevent/rules.mk
>+++ b/lib/tevent/rules.mk
>@@ -12,7 +12,7 @@ showflags::
> .c.o:
> 	@echo Compiling $*.c
> 	@mkdir -p `dirname $@`
>-	@$(CC) $(PICFLAG) $(CFLAGS) -c $< -o $@
>+	@$(CC) $(PICFLAG) $(CFLAGS) $(ABI_CHECK) -c $< -o $@
> 
> distclean::
> 	rm -f *~ */*~
>diff --git a/lib/tevent/tevent.exports b/lib/tevent/tevent.exports
>new file mode 100644
>index 0000000..7d55c17
>--- /dev/null
>+++ b/lib/tevent/tevent.exports
>@@ -0,0 +1,59 @@
>+{
>+    global:
>+           _tevent_add_fd;
>+           _tevent_add_signal;
>+           _tevent_add_timer;
>+           tevent_backend_list;
>+           tevent_context_init;
>+           tevent_context_init_byname;
>+           _tevent_create_immediate;
>+           tevent_fd_get_flags;
>+           tevent_fd_set_auto_close;
>+           tevent_fd_set_close_fn;
>+           tevent_fd_set_flags;
>+           tevent_loop_allow_nesting;
>+           _tevent_loop_once;
>+           tevent_loop_set_nesting_hook;
>+           _tevent_loop_until;
>+           _tevent_loop_wait;
>+           tevent_queue_add;
>+           _tevent_queue_create;
>+           tevent_queue_length;
>+           tevent_queue_start;
>+           tevent_queue_stop;
>+           _tevent_req_callback_data;
>+           _tevent_req_create;
>+           _tevent_req_data;
>+           tevent_req_default_print;
>+           _tevent_req_done;
>+           _tevent_req_error;
>+           tevent_req_is_error;
>+           tevent_req_is_in_progress;
>+           _tevent_req_nomem;
>+           _tevent_req_notify_callback;
>+           tevent_req_poll;
>+           tevent_req_post;
>+           tevent_req_print;
>+           tevent_req_received;
>+           tevent_req_set_callback;
>+           tevent_req_set_endtime;
>+           tevent_req_set_print_fn;
>+           _tevent_schedule_immediate;
>+           tevent_set_abort_fn;
>+           tevent_set_debug;
>+           tevent_set_debug_stderr;
>+           tevent_set_default_backend;
>+           tevent_signal_support;
>+           tevent_timeval_add;
>+           tevent_timeval_compare;
>+           tevent_timeval_current;
>+           tevent_timeval_current_ofs;
>+           tevent_timeval_is_zero;
>+           tevent_timeval_set;
>+           tevent_timeval_until;
>+           tevent_timeval_zero;
>+           tevent_wakeup_recv;
>+           tevent_wakeup_send;
>+
>+    local: *;
>+};
>diff --git a/lib/tevent/tevent.signatures b/lib/tevent/tevent.signatures
>new file mode 100644
>index 0000000..fab5f64
>--- /dev/null
>+++ b/lib/tevent/tevent.signatures
>@@ -0,0 +1,54 @@
>+struct tevent_signal *_tevent_add_signal (struct tevent_context *, TALLOC_CTX *, int, int, tevent_signal_handler_t, void *, const char *, const char *);
>+int _tevent_loop_once (struct tevent_context *, const char *);
>+int _tevent_loop_wait (struct tevent_context *, const char *);
>+void tevent_fd_set_close_fn (struct tevent_fd *, tevent_fd_close_fn_t);
>+void tevent_fd_set_auto_close (struct tevent_fd *);
>+uint16_t tevent_fd_get_flags (struct tevent_fd *);
>+void tevent_fd_set_flags (struct tevent_fd *, uint16_t);
>+_Bool tevent_signal_support (struct tevent_context *);
>+void tevent_set_abort_fn (void (*) (const char *));
>+int tevent_set_debug (struct tevent_context *, void (*) (void *, enum tevent_debug_level, const char *, __va_list_tag *), void *);
>+int tevent_set_debug_stderr (struct tevent_context *);
>+void tevent_req_set_callback (struct tevent_req *, tevent_req_fn, void *);
>+void *_tevent_req_callback_data (struct tevent_req *);
>+void *_tevent_req_data (struct tevent_req *);
>+void tevent_req_set_print_fn (struct tevent_req *, tevent_req_print_fn);
>+char *tevent_req_default_print (struct tevent_req *, TALLOC_CTX *);
>+char *tevent_req_print (TALLOC_CTX *, struct tevent_req *);
>+struct tevent_req *_tevent_req_create (TALLOC_CTX *, void *, size_t, const char *, const char *);
>+_Bool tevent_req_set_endtime (struct tevent_req *, struct tevent_context *, struct timeval);
>+void _tevent_req_notify_callback (struct tevent_req *, const char *);
>+void _tevent_req_done (struct tevent_req *, const char *);
>+_Bool _tevent_req_error (struct tevent_req *, uint64_t, const char *);
>+_Bool _tevent_req_nomem (const void *, struct tevent_req *, const char *);
>+struct tevent_req *tevent_req_post (struct tevent_req *, struct tevent_context *);
>+_Bool tevent_req_is_in_progress (struct tevent_req *);
>+_Bool tevent_req_poll (struct tevent_req *, struct tevent_context *);
>+_Bool tevent_req_is_error (struct tevent_req *, enum tevent_req_state *, uint64_t *);
>+void tevent_req_received (struct tevent_req *);
>+struct tevent_req *tevent_wakeup_send (TALLOC_CTX *, struct tevent_context *, struct timeval);
>+_Bool tevent_wakeup_recv (struct tevent_req *);
>+int tevent_timeval_compare (const struct timeval *, const struct timeval *);
>+struct timeval tevent_timeval_zero (void);
>+struct timeval tevent_timeval_current (void);
>+struct timeval tevent_timeval_set (uint32_t, uint32_t);
>+struct timeval tevent_timeval_until (const struct timeval *, const struct timeval *);
>+_Bool tevent_timeval_is_zero (const struct timeval *);
>+struct timeval tevent_timeval_add (const struct timeval *, uint32_t, uint32_t);
>+struct timeval tevent_timeval_current_ofs (uint32_t, uint32_t);
>+struct tevent_queue *_tevent_queue_create (TALLOC_CTX *, const char *, const char *);
>+_Bool tevent_queue_add (struct tevent_queue *, struct tevent_context *, struct tevent_req *, tevent_queue_trigger_fn_t, void *);
>+void tevent_queue_start (struct tevent_queue *);
>+void tevent_queue_stop (struct tevent_queue *);
>+size_t tevent_queue_length (struct tevent_queue *);
>+void tevent_loop_allow_nesting (struct tevent_context *);
>+void tevent_loop_set_nesting_hook (struct tevent_context *, tevent_nesting_hook, void *);
>+int _tevent_loop_until (struct tevent_context *, _Bool (*) (void *), void *, const char *);
>+struct tevent_context *tevent_context_init (TALLOC_CTX *);
>+struct tevent_context *tevent_context_init_byname (TALLOC_CTX *, const char *);
>+const char **tevent_backend_list (TALLOC_CTX *);
>+void tevent_set_default_backend (const char *);
>+struct tevent_fd *_tevent_add_fd (struct tevent_context *, TALLOC_CTX *, int, uint16_t, tevent_fd_handler_t, void *, const char *, const char *);
>+struct tevent_timer *_tevent_add_timer (struct tevent_context *, TALLOC_CTX *, struct timeval, tevent_timer_handler_t, void *, const char *, const char *);
>+struct tevent_immediate *_tevent_create_immediate (TALLOC_CTX *, const char *);
>+void _tevent_schedule_immediate (struct tevent_immediate *, struct tevent_context *, tevent_immediate_handler_t, void *, const char *, const char *);
>-- 
>1.5.4.3
>
>
>From 2a7207e0a61a44d94d99556014b4b17f72466a47 Mon Sep 17 00:00:00 2001
>From: Eric Sandall <sandalle@sourcemage.org>
>Date: Fri, 12 Jun 2009 13:24:30 +0200
>Subject: [PATCH] For tevent to install tevent_util.h
>
>Patch for bug #6270
>
>This patch is for the future when samba4 builds using external libraries. With
>this patch, tevent now installs tevent_util.h which is required by samba4.
>(cherry picked from commit b112cc5503350b248949bdbcce8072f5523ce877)
>---
> lib/tevent/tevent.mk |    1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
>diff --git a/lib/tevent/tevent.mk b/lib/tevent/tevent.mk
>index 82cc4a0..903876b 100644
>--- a/lib/tevent/tevent.mk
>+++ b/lib/tevent/tevent.mk
>@@ -23,6 +23,7 @@ installdirs::
> installheaders:: installdirs
> 	cp $(srcdir)/tevent.h $(DESTDIR)$(includedir)
> 	cp $(srcdir)/tevent_internal.h $(DESTDIR)$(includedir)
>+	cp $(srcdir)/tevent_util.h $(DESTDIR)$(includedir)
> 
> installlibs:: installdirs
> 	cp tevent.pc $(DESTDIR)$(libdir)/pkgconfig
>-- 
>1.5.4.3
>
>
>From f7bc13ac8b6870969e8cbd74eac99be74449ad3c Mon Sep 17 00:00:00 2001
>From: Simo Sorce <idra@samba.org>
>Date: Thu, 18 Jun 2009 07:56:51 -0400
>Subject: [PATCH] Revert "For tevent to install tevent_util.h"
>
>This reverts commit b112cc5503350b248949bdbcce8072f5523ce877.
>
>tevent_util.h is a private header. Must not be installed.
>(cherry picked from commit c92505817d6453c100ed52c9c3ab289f5589ce25)
>---
> lib/tevent/tevent.mk |    1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
>diff --git a/lib/tevent/tevent.mk b/lib/tevent/tevent.mk
>index 903876b..82cc4a0 100644
>--- a/lib/tevent/tevent.mk
>+++ b/lib/tevent/tevent.mk
>@@ -23,7 +23,6 @@ installdirs::
> installheaders:: installdirs
> 	cp $(srcdir)/tevent.h $(DESTDIR)$(includedir)
> 	cp $(srcdir)/tevent_internal.h $(DESTDIR)$(includedir)
>-	cp $(srcdir)/tevent_util.h $(DESTDIR)$(includedir)
> 
> installlibs:: installdirs
> 	cp tevent.pc $(DESTDIR)$(libdir)/pkgconfig
>-- 
>1.5.4.3
>
>
>From 82e7708fc8daa5a4b0dfc439ae37f40d0ab0c9c0 Mon Sep 17 00:00:00 2001
>From: Simo Sorce <idra@samba.org>
>Date: Thu, 18 Jun 2009 20:06:00 -0400
>Subject: [PATCH] Expose functions need by backend writers
>
>move publicly needed structures and functions in the public header.
>Stop installing internal headers.
>Update the signature and exports files with the new exposed
>function.
>(cherry picked from commit 30b2014a01b31d66dd76e0562c5d769dfacf167b)
>---
> lib/tevent/tevent.exports    |    1 +
> lib/tevent/tevent.h          |   64 ++++++++++++++++++++++++++++++++++++++++++
> lib/tevent/tevent.mk         |    1 -
> lib/tevent/tevent.signatures |    3 +-
> lib/tevent/tevent_internal.h |   50 --------------------------------
> 5 files changed, 67 insertions(+), 52 deletions(-)
>
>diff --git a/lib/tevent/tevent.exports b/lib/tevent/tevent.exports
>index 7d55c17..b1554df 100644
>--- a/lib/tevent/tevent.exports
>+++ b/lib/tevent/tevent.exports
>@@ -21,6 +21,7 @@
>            tevent_queue_length;
>            tevent_queue_start;
>            tevent_queue_stop;
>+           tevent_register_backend;
>            _tevent_req_callback_data;
>            _tevent_req_create;
>            _tevent_req_data;
>diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h
>index 2cbd175..56ae0ee 100644
>--- a/lib/tevent/tevent.h
>+++ b/lib/tevent/tevent.h
>@@ -358,6 +358,70 @@ int _tevent_loop_until(struct tevent_context *ev,
> 	_tevent_loop_until(ev, finished, private_data, __location__)
> #endif
> 
>+
>+/**
>+ * The following structure and registration functions are exclusively
>+ * needed for people writing and pluggin a different event engine.
>+ * There is nothing useful for normal tevent user in here.
>+ */
>+
>+struct tevent_ops {
>+	/* context init */
>+	int (*context_init)(struct tevent_context *ev);
>+
>+	/* fd_event functions */
>+	struct tevent_fd *(*add_fd)(struct tevent_context *ev,
>+				    TALLOC_CTX *mem_ctx,
>+				    int fd, uint16_t flags,
>+				    tevent_fd_handler_t handler,
>+				    void *private_data,
>+				    const char *handler_name,
>+				    const char *location);
>+	void (*set_fd_close_fn)(struct tevent_fd *fde,
>+				tevent_fd_close_fn_t close_fn);
>+	uint16_t (*get_fd_flags)(struct tevent_fd *fde);
>+	void (*set_fd_flags)(struct tevent_fd *fde, uint16_t flags);
>+
>+	/* timed_event functions */
>+	struct tevent_timer *(*add_timer)(struct tevent_context *ev,
>+					  TALLOC_CTX *mem_ctx,
>+					  struct timeval next_event,
>+					  tevent_timer_handler_t handler,
>+					  void *private_data,
>+					  const char *handler_name,
>+					  const char *location);
>+
>+	/* immediate event functions */
>+	void (*schedule_immediate)(struct tevent_immediate *im,
>+				   struct tevent_context *ev,
>+				   tevent_immediate_handler_t handler,
>+				   void *private_data,
>+				   const char *handler_name,
>+				   const char *location);
>+
>+	/* signal functions */
>+	struct tevent_signal *(*add_signal)(struct tevent_context *ev,
>+					    TALLOC_CTX *mem_ctx,
>+					    int signum, int sa_flags,
>+					    tevent_signal_handler_t handler,
>+					    void *private_data,
>+					    const char *handler_name,
>+					    const char *location);
>+
>+	/* loop functions */
>+	int (*loop_once)(struct tevent_context *ev, const char *location);
>+	int (*loop_wait)(struct tevent_context *ev, const char *location);
>+};
>+
>+bool tevent_register_backend(const char *name, const struct tevent_ops *ops);
>+
>+
>+/**
>+ * The following definitions are usueful only for compatibility with the
>+ * implementation originally developed within the samba4 code and will be
>+ * soon removed. Please NEVER use in new code.
>+ */
>+
> #ifdef TEVENT_COMPAT_DEFINES
> 
> #define event_context	tevent_context
>diff --git a/lib/tevent/tevent.mk b/lib/tevent/tevent.mk
>index 82cc4a0..480366e 100644
>--- a/lib/tevent/tevent.mk
>+++ b/lib/tevent/tevent.mk
>@@ -22,7 +22,6 @@ installdirs::
> 
> installheaders:: installdirs
> 	cp $(srcdir)/tevent.h $(DESTDIR)$(includedir)
>-	cp $(srcdir)/tevent_internal.h $(DESTDIR)$(includedir)
> 
> installlibs:: installdirs
> 	cp tevent.pc $(DESTDIR)$(libdir)/pkgconfig
>diff --git a/lib/tevent/tevent.signatures b/lib/tevent/tevent.signatures
>index fab5f64..190522f 100644
>--- a/lib/tevent/tevent.signatures
>+++ b/lib/tevent/tevent.signatures
>@@ -7,7 +7,7 @@ uint16_t tevent_fd_get_flags (struct tevent_fd *);
> void tevent_fd_set_flags (struct tevent_fd *, uint16_t);
> _Bool tevent_signal_support (struct tevent_context *);
> void tevent_set_abort_fn (void (*) (const char *));
>-int tevent_set_debug (struct tevent_context *, void (*) (void *, enum tevent_debug_level, const char *, __va_list_tag *), void *);
>+int tevent_set_debug (struct tevent_context *, void (*) (void *, enum tevent_debug_level, const char *, va_list), void *);
> int tevent_set_debug_stderr (struct tevent_context *);
> void tevent_req_set_callback (struct tevent_req *, tevent_req_fn, void *);
> void *_tevent_req_callback_data (struct tevent_req *);
>@@ -44,6 +44,7 @@ size_t tevent_queue_length (struct tevent_queue *);
> void tevent_loop_allow_nesting (struct tevent_context *);
> void tevent_loop_set_nesting_hook (struct tevent_context *, tevent_nesting_hook, void *);
> int _tevent_loop_until (struct tevent_context *, _Bool (*) (void *), void *, const char *);
>+_Bool tevent_register_backend (const char *, const struct tevent_ops *);
> struct tevent_context *tevent_context_init (TALLOC_CTX *);
> struct tevent_context *tevent_context_init_byname (TALLOC_CTX *, const char *);
> const char **tevent_backend_list (TALLOC_CTX *);
>diff --git a/lib/tevent/tevent_internal.h b/lib/tevent/tevent_internal.h
>index 36abfa4..e260524 100644
>--- a/lib/tevent/tevent_internal.h
>+++ b/lib/tevent/tevent_internal.h
>@@ -130,54 +130,6 @@ struct tevent_req {
> 	} internal;
> };
> 
>-struct tevent_ops {
>-	/* conntext init */
>-	int (*context_init)(struct tevent_context *ev);
>-
>-	/* fd_event functions */
>-	struct tevent_fd *(*add_fd)(struct tevent_context *ev,
>-				    TALLOC_CTX *mem_ctx,
>-				    int fd, uint16_t flags,
>-				    tevent_fd_handler_t handler,
>-				    void *private_data,
>-				    const char *handler_name,
>-				    const char *location);
>-	void (*set_fd_close_fn)(struct tevent_fd *fde,
>-				tevent_fd_close_fn_t close_fn);
>-	uint16_t (*get_fd_flags)(struct tevent_fd *fde);
>-	void (*set_fd_flags)(struct tevent_fd *fde, uint16_t flags);
>-
>-	/* timed_event functions */
>-	struct tevent_timer *(*add_timer)(struct tevent_context *ev,
>-					  TALLOC_CTX *mem_ctx,
>-					  struct timeval next_event,
>-					  tevent_timer_handler_t handler,
>-					  void *private_data,
>-					  const char *handler_name,
>-					  const char *location);
>-
>-	/* immediate event functions */
>-	void (*schedule_immediate)(struct tevent_immediate *im,
>-				   struct tevent_context *ev,
>-				   tevent_immediate_handler_t handler,
>-				   void *private_data,
>-				   const char *handler_name,
>-				   const char *location);
>-
>-	/* signal functions */
>-	struct tevent_signal *(*add_signal)(struct tevent_context *ev,
>-					    TALLOC_CTX *mem_ctx,
>-					    int signum, int sa_flags,
>-					    tevent_signal_handler_t handler,
>-					    void *private_data,
>-					    const char *handler_name,
>-					    const char *location);
>-
>-	/* loop functions */
>-	int (*loop_once)(struct tevent_context *ev, const char *location);
>-	int (*loop_wait)(struct tevent_context *ev, const char *location);
>-};
>-
> struct tevent_fd {
> 	struct tevent_fd *prev, *next;
> 	struct tevent_context *event_ctx;
>@@ -283,8 +235,6 @@ struct tevent_context {
> };
> 
> 
>-bool tevent_register_backend(const char *name, const struct tevent_ops *ops);
>-
> int tevent_common_context_destructor(struct tevent_context *ev);
> int tevent_common_loop_wait(struct tevent_context *ev,
> 			    const char *location);
>-- 
>1.5.4.3
>
>
>From d4f4f2b2a590849eca35130bddf1a2962de17b49 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Fri, 4 Sep 2009 13:13:53 +0200
>Subject: [PATCH] Sort the signature files
> (cherry picked from commit 7119241c0d12768b31ebdb489aa0bbba6ca21e40)
>
>---
> lib/tevent/abi_checks.sh     |    4 +-
> lib/tevent/tevent.signatures |   86 +++++++++++++++++++++---------------------
> 2 files changed, 45 insertions(+), 45 deletions(-)
>
>diff --git a/lib/tevent/abi_checks.sh b/lib/tevent/abi_checks.sh
>index 83082ad..9518209 100755
>--- a/lib/tevent/abi_checks.sh
>+++ b/lib/tevent/abi_checks.sh
>@@ -3,9 +3,9 @@ make clean
> 
> mkdir abi
> ABI_CHECKS="-aux-info abi/\$@.X"
>-make ABI_CHECK="$ABI_CHECKS"
>+make ABI_CHECK="$ABI_CHECKS" CC="/usr/bin/gcc"
> 
>-for i in abi/*.X; do cat $i | grep 'tevent\.h'; done | sort | uniq | awk -F "extern " '{ print $2 }' > abi/signatures
>+for i in abi/*.X; do cat $i | grep 'tevent\.h'; done | sort | uniq | awk -F "extern " '{ print $2 }' | sort> abi/signatures
> 
> cat > abi/exports << EOF
> {
>diff --git a/lib/tevent/tevent.signatures b/lib/tevent/tevent.signatures
>index 190522f..75f43af 100644
>--- a/lib/tevent/tevent.signatures
>+++ b/lib/tevent/tevent.signatures
>@@ -1,55 +1,55 @@
>-struct tevent_signal *_tevent_add_signal (struct tevent_context *, TALLOC_CTX *, int, int, tevent_signal_handler_t, void *, const char *, const char *);
>-int _tevent_loop_once (struct tevent_context *, const char *);
>-int _tevent_loop_wait (struct tevent_context *, const char *);
>-void tevent_fd_set_close_fn (struct tevent_fd *, tevent_fd_close_fn_t);
>-void tevent_fd_set_auto_close (struct tevent_fd *);
>-uint16_t tevent_fd_get_flags (struct tevent_fd *);
>-void tevent_fd_set_flags (struct tevent_fd *, uint16_t);
>+_Bool tevent_queue_add (struct tevent_queue *, struct tevent_context *, struct tevent_req *, tevent_queue_trigger_fn_t, void *);
>+_Bool tevent_register_backend (const char *, const struct tevent_ops *);
>+_Bool _tevent_req_error (struct tevent_req *, uint64_t, const char *);
>+_Bool tevent_req_is_error (struct tevent_req *, enum tevent_req_state *, uint64_t *);
>+_Bool tevent_req_is_in_progress (struct tevent_req *);
>+_Bool _tevent_req_nomem (const void *, struct tevent_req *, const char *);
>+_Bool tevent_req_poll (struct tevent_req *, struct tevent_context *);
>+_Bool tevent_req_set_endtime (struct tevent_req *, struct tevent_context *, struct timeval);
> _Bool tevent_signal_support (struct tevent_context *);
>-void tevent_set_abort_fn (void (*) (const char *));
>-int tevent_set_debug (struct tevent_context *, void (*) (void *, enum tevent_debug_level, const char *, va_list), void *);
>-int tevent_set_debug_stderr (struct tevent_context *);
>-void tevent_req_set_callback (struct tevent_req *, tevent_req_fn, void *);
>-void *_tevent_req_callback_data (struct tevent_req *);
>-void *_tevent_req_data (struct tevent_req *);
>-void tevent_req_set_print_fn (struct tevent_req *, tevent_req_print_fn);
>+_Bool tevent_timeval_is_zero (const struct timeval *);
>+_Bool tevent_wakeup_recv (struct tevent_req *);
> char *tevent_req_default_print (struct tevent_req *, TALLOC_CTX *);
> char *tevent_req_print (TALLOC_CTX *, struct tevent_req *);
>+const char **tevent_backend_list (TALLOC_CTX *);
>+int _tevent_loop_once (struct tevent_context *, const char *);
>+int _tevent_loop_until (struct tevent_context *, _Bool (*) (void *), void *, const char *);
>+int _tevent_loop_wait (struct tevent_context *, const char *);
>+int tevent_set_debug_stderr (struct tevent_context *);
>+int tevent_set_debug (struct tevent_context *, void (*) (void *, enum tevent_debug_level, const char *, va_list), void *);
>+int tevent_timeval_compare (const struct timeval *, const struct timeval *);
>+size_t tevent_queue_length (struct tevent_queue *);
>+struct tevent_context *tevent_context_init_byname (TALLOC_CTX *, const char *);
>+struct tevent_context *tevent_context_init (TALLOC_CTX *);
>+struct tevent_fd *_tevent_add_fd (struct tevent_context *, TALLOC_CTX *, int, uint16_t, tevent_fd_handler_t, void *, const char *, const char *);
>+struct tevent_immediate *_tevent_create_immediate (TALLOC_CTX *, const char *);
>+struct tevent_queue *_tevent_queue_create (TALLOC_CTX *, const char *, const char *);
> struct tevent_req *_tevent_req_create (TALLOC_CTX *, void *, size_t, const char *, const char *);
>-_Bool tevent_req_set_endtime (struct tevent_req *, struct tevent_context *, struct timeval);
>-void _tevent_req_notify_callback (struct tevent_req *, const char *);
>-void _tevent_req_done (struct tevent_req *, const char *);
>-_Bool _tevent_req_error (struct tevent_req *, uint64_t, const char *);
>-_Bool _tevent_req_nomem (const void *, struct tevent_req *, const char *);
> struct tevent_req *tevent_req_post (struct tevent_req *, struct tevent_context *);
>-_Bool tevent_req_is_in_progress (struct tevent_req *);
>-_Bool tevent_req_poll (struct tevent_req *, struct tevent_context *);
>-_Bool tevent_req_is_error (struct tevent_req *, enum tevent_req_state *, uint64_t *);
>-void tevent_req_received (struct tevent_req *);
> struct tevent_req *tevent_wakeup_send (TALLOC_CTX *, struct tevent_context *, struct timeval);
>-_Bool tevent_wakeup_recv (struct tevent_req *);
>-int tevent_timeval_compare (const struct timeval *, const struct timeval *);
>-struct timeval tevent_timeval_zero (void);
>+struct tevent_signal *_tevent_add_signal (struct tevent_context *, TALLOC_CTX *, int, int, tevent_signal_handler_t, void *, const char *, const char *);
>+struct tevent_timer *_tevent_add_timer (struct tevent_context *, TALLOC_CTX *, struct timeval, tevent_timer_handler_t, void *, const char *, const char *);
>+struct timeval tevent_timeval_add (const struct timeval *, uint32_t, uint32_t);
>+struct timeval tevent_timeval_current_ofs (uint32_t, uint32_t);
> struct timeval tevent_timeval_current (void);
> struct timeval tevent_timeval_set (uint32_t, uint32_t);
> struct timeval tevent_timeval_until (const struct timeval *, const struct timeval *);
>-_Bool tevent_timeval_is_zero (const struct timeval *);
>-struct timeval tevent_timeval_add (const struct timeval *, uint32_t, uint32_t);
>-struct timeval tevent_timeval_current_ofs (uint32_t, uint32_t);
>-struct tevent_queue *_tevent_queue_create (TALLOC_CTX *, const char *, const char *);
>-_Bool tevent_queue_add (struct tevent_queue *, struct tevent_context *, struct tevent_req *, tevent_queue_trigger_fn_t, void *);
>-void tevent_queue_start (struct tevent_queue *);
>-void tevent_queue_stop (struct tevent_queue *);
>-size_t tevent_queue_length (struct tevent_queue *);
>+struct timeval tevent_timeval_zero (void);
>+uint16_t tevent_fd_get_flags (struct tevent_fd *);
>+void tevent_fd_set_auto_close (struct tevent_fd *);
>+void tevent_fd_set_close_fn (struct tevent_fd *, tevent_fd_close_fn_t);
>+void tevent_fd_set_flags (struct tevent_fd *, uint16_t);
> void tevent_loop_allow_nesting (struct tevent_context *);
> void tevent_loop_set_nesting_hook (struct tevent_context *, tevent_nesting_hook, void *);
>-int _tevent_loop_until (struct tevent_context *, _Bool (*) (void *), void *, const char *);
>-_Bool tevent_register_backend (const char *, const struct tevent_ops *);
>-struct tevent_context *tevent_context_init (TALLOC_CTX *);
>-struct tevent_context *tevent_context_init_byname (TALLOC_CTX *, const char *);
>-const char **tevent_backend_list (TALLOC_CTX *);
>-void tevent_set_default_backend (const char *);
>-struct tevent_fd *_tevent_add_fd (struct tevent_context *, TALLOC_CTX *, int, uint16_t, tevent_fd_handler_t, void *, const char *, const char *);
>-struct tevent_timer *_tevent_add_timer (struct tevent_context *, TALLOC_CTX *, struct timeval, tevent_timer_handler_t, void *, const char *, const char *);
>-struct tevent_immediate *_tevent_create_immediate (TALLOC_CTX *, const char *);
>+void tevent_queue_start (struct tevent_queue *);
>+void tevent_queue_stop (struct tevent_queue *);
>+void *_tevent_req_callback_data (struct tevent_req *);
>+void *_tevent_req_data (struct tevent_req *);
>+void _tevent_req_done (struct tevent_req *, const char *);
>+void _tevent_req_notify_callback (struct tevent_req *, const char *);
>+void tevent_req_received (struct tevent_req *);
>+void tevent_req_set_callback (struct tevent_req *, tevent_req_fn, void *);
>+void tevent_req_set_print_fn (struct tevent_req *, tevent_req_print_fn);
> void _tevent_schedule_immediate (struct tevent_immediate *, struct tevent_context *, tevent_immediate_handler_t, void *, const char *, const char *);
>+void tevent_set_abort_fn (void (*) (const char *));
>+void tevent_set_default_backend (const char *);
>-- 
>1.5.4.3
>
>
>From 554051664a529eaa4c0c5e159644deedf386724c Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Tue, 14 Jul 2009 16:42:21 -0700
>Subject: [PATCH] When tallocing a memory block for the state in a tevent_req struct,
> ensure it's zeroed out. Vl & Metze please check.
> Jeremy.
> (cherry picked from commit 7be1d727a31b34debbcf8faa1e0bea911112d145)
>
>---
> lib/tevent/tevent_req.c |    1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
>diff --git a/lib/tevent/tevent_req.c b/lib/tevent/tevent_req.c
>index 541f93f..1ddf9ef 100644
>--- a/lib/tevent/tevent_req.c
>+++ b/lib/tevent/tevent_req.c
>@@ -109,6 +109,7 @@ struct tevent_req *_tevent_req_create(TALLOC_CTX *mem_ctx,
> 		talloc_free(req);
> 		return NULL;
> 	}
>+	memset(data, '\0', data_size);
> 	talloc_set_name_const(data, type);
> 
> 	req->data = data;
>-- 
>1.5.4.3
>
>
>From 706588fe24ebde83b5eec4a8e065172ea766a1a9 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Tue, 14 Jul 2009 16:54:01 -0700
>Subject: [PATCH] Change to talloc_zero_size instead of extra memset.
> Jeremy.
> (cherry picked from commit 5927ca7067a0ead65c00042a62545b0d940f2b2a)
>
>---
> lib/tevent/tevent_req.c |    3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
>diff --git a/lib/tevent/tevent_req.c b/lib/tevent/tevent_req.c
>index 1ddf9ef..0feabb5 100644
>--- a/lib/tevent/tevent_req.c
>+++ b/lib/tevent/tevent_req.c
>@@ -104,12 +104,11 @@ struct tevent_req *_tevent_req_create(TALLOC_CTX *mem_ctx,
> 		return NULL;
> 	}
> 
>-	data = talloc_size(req, data_size);
>+	data = talloc_zero_size(req, data_size);
> 	if (data == NULL) {
> 		talloc_free(req);
> 		return NULL;
> 	}
>-	memset(data, '\0', data_size);
> 	talloc_set_name_const(data, type);
> 
> 	req->data = data;
>-- 
>1.5.4.3
>
>
>From e5a71c131366d26b99af3495d11b5a3897519e11 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Thu, 16 Jul 2009 09:06:42 +0200
>Subject: [PATCH] tevent: try to fix the build on QNX qnx18 6.4.1 it doesn't have SA_RESTART defined
>
>metze
>(cherry picked from commit 39684d2cbe1c8c69dc9ca5c6e05861e24091bb83)
>---
> lib/tevent/testsuite.c |   12 +++++++++++-
> 1 files changed, 11 insertions(+), 1 deletions(-)
>
>diff --git a/lib/tevent/testsuite.c b/lib/tevent/testsuite.c
>index d964fb3..f9aca91 100644
>--- a/lib/tevent/testsuite.c
>+++ b/lib/tevent/testsuite.c
>@@ -66,7 +66,13 @@ static bool test_event_context(struct torture_context *test,
> 	const char *backend = (const char *)test_data;
> 	int alarm_count=0, info_count=0;
> 	struct tevent_fd *fde;
>-	struct signal_event *se1, *se2, *se3;
>+#ifdef SA_RESTART
>+	struct tevent_signal *se1 = NULL;
>+#endif
>+	struct tevent_signal *se2 = NULL;
>+#ifdef SA_SIGINFO
>+	struct tevent_signal *se3 = NULL;
>+#endif
> 	int finished=0;
> 	struct timeval t;
> 	char c = 0;
>@@ -92,7 +98,9 @@ static bool test_event_context(struct torture_context *test,
> 	event_add_timed(ev_ctx, ev_ctx, timeval_current_ofs(2,0), 
> 			finished_handler, &finished);
> 
>+#ifdef SA_RESTART
> 	se1 = event_add_signal(ev_ctx, ev_ctx, SIGALRM, SA_RESTART, count_handler, &alarm_count);
>+#endif
> 	se2 = event_add_signal(ev_ctx, ev_ctx, SIGALRM, SA_RESETHAND, count_handler, &alarm_count);
> #ifdef SA_SIGINFO
> 	se3 = event_add_signal(ev_ctx, ev_ctx, SIGUSR1, SA_SIGINFO, count_handler, &info_count);
>@@ -120,7 +128,9 @@ static bool test_event_context(struct torture_context *test,
> 
> 	torture_comment(test, "Got %.2f pipe events/sec\n", fde_count/timeval_elapsed(&t));
> 
>+#ifdef SA_RESTART
> 	talloc_free(se1);
>+#endif
> 
> 	torture_assert_int_equal(test, alarm_count, 1+fde_count, "alarm count mismatch");
> 
>-- 
>1.5.4.3
>
>
>From 52e09fbaf00aa3b455d4cd470886b9499a72ff99 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Sat, 15 Aug 2009 09:45:39 +0200
>Subject: [PATCH] tevent: add some more doxygen comments for tevent_req functions
>
>metze
>(cherry picked from commit 95c3d3b5d8fdc05f20c826a48312f1230f036029)
>---
> lib/tevent/tevent_req.c |   38 ++++++++++++++++++++++++++++++++++++++
> 1 files changed, 38 insertions(+), 0 deletions(-)
>
>diff --git a/lib/tevent/tevent_req.c b/lib/tevent/tevent_req.c
>index 0feabb5..c6b1160 100644
>--- a/lib/tevent/tevent_req.c
>+++ b/lib/tevent/tevent_req.c
>@@ -256,6 +256,16 @@ struct tevent_req *tevent_req_post(struct tevent_req *req,
> 	return req;
> }
> 
>+/**
>+ * @brief This function destroys the attached private data
>+ * @param[in] req	The request to poll
>+ * @retval		The boolean form of "is in progress".
>+ *
>+ * This function can be used to ask if the given request
>+ * is still in progress.
>+ *
>+ * This function is typically used by sync wrapper functions.
>+ */
> bool tevent_req_is_in_progress(struct tevent_req *req)
> {
> 	if (req->internal.state == TEVENT_REQ_IN_PROGRESS) {
>@@ -283,6 +293,23 @@ void tevent_req_received(struct tevent_req *req)
> 	req->internal.state = TEVENT_REQ_RECEIVED;
> }
> 
>+/**
>+ * @brief This function destroys the attached private data
>+ * @param[in] req	The request to poll
>+ * @param[in] ev	The tevent_context to be used
>+ * @retval		If a critical error has happened in the
>+ * 			tevent loop layer false is returned.
>+ * 			Otherwise true is returned.
>+ * 			This is not the return value of the given request!
>+ *
>+ * This function can be used to actively poll for the
>+ * given request to finish.
>+ *
>+ * Note: this should only be used if the given tevent context
>+ *       was created by the caller, to avoid event loop nesting.
>+ *
>+ * This function is typically used by sync wrapper functions.
>+ */
> bool tevent_req_poll(struct tevent_req *req,
> 		     struct tevent_context *ev)
> {
>@@ -356,6 +383,17 @@ void *_tevent_req_data(struct tevent_req *req)
> 	return req->data;
> }
> 
>+/**
>+ * @brief This function sets a print function for the given request
>+ * @param[in] req	The given request
>+ * @param[in] fn	A pointer to the print function
>+ *
>+ * This function can be used to setup a print function for the given request.
>+ * This will be triggered if the tevent_req_print() function was
>+ * called on the given request.
>+ *
>+ * Note: this function should only be used for debugging.
>+ */
> void tevent_req_set_print_fn(struct tevent_req *req, tevent_req_print_fn fn)
> {
> 	req->private_print = fn;
>-- 
>1.5.4.3
>
>
>From 02f1464c50900bdc36e2e4c858d8223a7f3b168f Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Sat, 15 Aug 2009 09:46:23 +0200
>Subject: [PATCH] tevent: add tevent_req_cancel() infrastructure
>
>This offers a generic way for callers to cancel an
>async request.
>
>metze
>(cherry picked from commit 45e4be0d96abdc729252df1e97bb9a56302e5a4a)
>---
> lib/tevent/tevent.h          |    8 +++++++
> lib/tevent/tevent_internal.h |   19 ++++++++++++++++++
> lib/tevent/tevent_req.c      |   43 ++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 70 insertions(+), 0 deletions(-)
>
>diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h
>index 56ae0ee..d355605 100644
>--- a/lib/tevent/tevent.h
>+++ b/lib/tevent/tevent.h
>@@ -238,6 +238,14 @@ char *tevent_req_default_print(struct tevent_req *req, TALLOC_CTX *mem_ctx);
> 
> char *tevent_req_print(TALLOC_CTX *mem_ctx, struct tevent_req *req);
> 
>+typedef bool (*tevent_req_cancel_fn)(struct tevent_req *);
>+
>+void tevent_req_set_cancel_fn(struct tevent_req *req, tevent_req_cancel_fn fn);
>+
>+bool _tevent_req_cancel(struct tevent_req *req, const char *location);
>+#define tevent_req_cancel(req) \
>+	_tevent_req_cancel(req, __location__)
>+
> struct tevent_req *_tevent_req_create(TALLOC_CTX *mem_ctx,
> 				      void *pstate,
> 				      size_t state_size,
>diff --git a/lib/tevent/tevent_internal.h b/lib/tevent/tevent_internal.h
>index e260524..513ca1c 100644
>--- a/lib/tevent/tevent_internal.h
>+++ b/lib/tevent/tevent_internal.h
>@@ -65,6 +65,15 @@ struct tevent_req {
> 	tevent_req_print_fn private_print;
> 
> 	/**
>+	 * @brief A function to cancel the request
>+	 *
>+	 * The implementation might want to set a function
>+	 * that is called when the tevent_req_cancel() function
>+	 * was called.
>+	 */
>+	tevent_req_cancel_fn private_cancel;
>+
>+	/**
> 	 * @brief Internal state of the request
> 	 *
> 	 * Callers should only access this via functions and never directly.
>@@ -100,6 +109,16 @@ struct tevent_req {
> 		const char *finish_location;
> 
> 		/**
>+		 * @brief The location where the request was canceled
>+		 *
>+		 * This uses the __location__ macro via the
>+		 * tevent_req_cancel() macro.
>+		 *
>+		 * This for debugging only.
>+		 */
>+		const char *cancel_location;
>+
>+		/**
> 		 * @brief The external state - will be queried by the caller
> 		 *
> 		 * While the async request is being processed, state will remain in
>diff --git a/lib/tevent/tevent_req.c b/lib/tevent/tevent_req.c
>index c6b1160..345a2fd 100644
>--- a/lib/tevent/tevent_req.c
>+++ b/lib/tevent/tevent_req.c
>@@ -398,3 +398,46 @@ void tevent_req_set_print_fn(struct tevent_req *req, tevent_req_print_fn fn)
> {
> 	req->private_print = fn;
> }
>+
>+/**
>+ * @brief This function sets a cancel function for the given request
>+ * @param[in] req	The given request
>+ * @param[in] fn	A pointer to the cancel function
>+ *
>+ * This function can be used to setup a cancel function for the given request.
>+ * This will be triggered if the tevent_req_cancel() function was
>+ * called on the given request.
>+ *
>+ */
>+void tevent_req_set_cancel_fn(struct tevent_req *req, tevent_req_cancel_fn fn)
>+{
>+	req->private_cancel = fn;
>+}
>+
>+/**
>+ * @brief This function tries to cancel the given request
>+ * @param[in] req	The given request
>+ * @param[in] location	Automaticly filled with the __location__ macro
>+ * 			via the tevent_req_cancel() macro. This is for debugging
>+ * 			only!
>+ * @retval		This function returns true is the request is cancelable.
>+ * 			Otherwise false is returned.
>+ *
>+ * This function can be used to cancel the given request.
>+ *
>+ * It is only possible to cancel a request when the implementation
>+ * has registered a cancel function via the tevent_req_set_cancel_fn().
>+ *
>+ * Note: Even if the function returns true, the caller need to wait
>+ *       for the function to complete normally.
>+ *       Only the _recv() function of the given request indicates
>+ *       if the request was really canceled.
>+ */
>+bool _tevent_req_cancel(struct tevent_req *req, const char *location)
>+{
>+	if (req->private_cancel == NULL) {
>+		return false;
>+	}
>+
>+	return req->private_cancel(req);
>+}
>-- 
>1.5.4.3
>
>
>From 61aad5f461568922f441db58dbea80c241764810 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Sat, 15 Aug 2009 10:44:50 +0200
>Subject: [PATCH] tevent: change version to 0.9.7 after adding tevent_req_cancel infrastructure
>
>metze
>(cherry picked from commit 97a1ed53ca4255ac7fc5643292019ad30c276de5)
>---
> lib/tevent/configure.ac |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/lib/tevent/configure.ac b/lib/tevent/configure.ac
>index d40e02e..89190af 100644
>--- a/lib/tevent/configure.ac
>+++ b/lib/tevent/configure.ac
>@@ -1,5 +1,5 @@
> AC_PREREQ(2.50)
>-AC_INIT(tevent, 0.9.6)
>+AC_INIT(tevent, 0.9.7)
> AC_CONFIG_SRCDIR([tevent.c])
> AC_CONFIG_HEADER(config.h)
> 
>-- 
>1.5.4.3
>
>
>From 7920baf996bee811f927826ffc06c701767106fa Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Tue, 18 Aug 2009 11:53:42 +0200
>Subject: [PATCH] tevent: fix a comment
>
>Michael
>(cherry picked from commit 5270efab1a8dd06158aa45467958939b677e4b7b)
>---
> lib/tevent/tevent_fd.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/lib/tevent/tevent_fd.c b/lib/tevent/tevent_fd.c
>index 7ba6e5b..c58e8e1 100644
>--- a/lib/tevent/tevent_fd.c
>+++ b/lib/tevent/tevent_fd.c
>@@ -5,7 +5,7 @@
> 
>    Copyright (C) Stefan Metzmacher 2009
> 
>-     ** NOTE! The following LGPL license applies to the talloc
>+     ** NOTE! The following LGPL license applies to the tevent
>      ** library. This does NOT imply that all of Samba is released
>      ** under the LGPL
> 
>-- 
>1.5.4.3
>
>
>From 6570b8a32a4114eb54b3fa8cc3ee40461bcc16dc Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Fri, 21 Aug 2009 15:07:25 -0700
>Subject: [PATCH] Fix for bug 6651 - smbd SIGSEGV when breaking oplocks.
> Based on a patch submitted by Petr Vandrovec <petr@vandrovec.name>.
> Multiple pending signals with siginfo_t's weren't being handled correctly
> leading to smbd abort with kernel oplock signals.
> Jeremy
> (cherry picked from commit ba52f18bfecfd7b0ba22c4ad9e9b5bfd18f34c93)
>
>---
> lib/tevent/tevent_signal.c |   71 +++++++++++++++++++++++++++++++++----------
> 1 files changed, 54 insertions(+), 17 deletions(-)
>
>diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c
>index 4a58a8b..27e8624 100644
>--- a/lib/tevent/tevent_signal.c
>+++ b/lib/tevent/tevent_signal.c
>@@ -97,7 +97,11 @@ static void tevent_common_signal_handler_info(int signum, siginfo_t *info,
> 					      void *uctx)
> {
> 	uint32_t count = sig_count(sig_state->signal_count[signum]);
>-	sig_state->sig_info[signum][count] = *info;
>+	/* sig_state->signal_count[signum].seen % SA_INFO_QUEUE_COUNT
>+	 * is the base of the unprocessed signals in the ringbuffer. */
>+	uint32_t ofs = (sig_state->signal_count[signum].seen + count) %
>+				SA_INFO_QUEUE_COUNT;
>+	sig_state->sig_info[signum][ofs] = *info;
> 
> 	tevent_common_signal_handler(signum);
> 
>@@ -229,7 +233,7 @@ struct tevent_signal *tevent_common_add_signal(struct tevent_context *ev,
> 			act.sa_handler   = NULL;
> 			act.sa_sigaction = tevent_common_signal_handler_info;
> 			if (sig_state->sig_info[signum] == NULL) {
>-				sig_state->sig_info[signum] = talloc_array(sig_state, siginfo_t, SA_INFO_QUEUE_COUNT);
>+				sig_state->sig_info[signum] = talloc_zero_array(sig_state, siginfo_t, SA_INFO_QUEUE_COUNT);
> 				if (sig_state->sig_info[signum] == NULL) {
> 					talloc_free(se);
> 					return NULL;
>@@ -294,6 +298,11 @@ int tevent_common_check_signal(struct tevent_context *ev)
> 		struct tevent_common_signal_list *sl, *next;
> 		struct sigcounter counter = sig_state->signal_count[i];
> 		uint32_t count = sig_count(counter);
>+#ifdef SA_SIGINFO
>+		/* Ensure we null out any stored siginfo_t entries
>+		 * after processing for debugging purposes. */
>+		bool clear_processed_siginfo = false;
>+#endif
> 
> 		if (count == 0) {
> 			continue;
>@@ -303,25 +312,21 @@ int tevent_common_check_signal(struct tevent_context *ev)
> 			next = sl->next;
> #ifdef SA_SIGINFO
> 			if (se->sa_flags & SA_SIGINFO) {
>-				int j;
>+				uint32_t j;
>+
>+				clear_processed_siginfo = true;
>+
> 				for (j=0;j<count;j++) {
>-					/* note the use of the sig_info array as a
>-					   ring buffer */
>-					int ofs = ((count-1) + j) % SA_INFO_QUEUE_COUNT;
>-					se->handler(ev, se, i, 1, 
>+					/* sig_state->signal_count[i].seen
>+					 * % SA_INFO_QUEUE_COUNT is
>+					 * the base position of the unprocessed
>+					 * signals in the ringbuffer. */
>+					uint32_t ofs = (counter.seen + j)
>+						% SA_INFO_QUEUE_COUNT;
>+					se->handler(ev, se, i, 1,
> 						    (void*)&sig_state->sig_info[i][ofs], 
> 						    se->private_data);
> 				}
>-				if (SIG_PENDING(sig_state->sig_blocked[i])) {
>-					/* we'd filled the queue, unblock the
>-					   signal now */
>-					sigset_t set;
>-					sigemptyset(&set);
>-					sigaddset(&set, i);
>-					SIG_SEEN(sig_state->sig_blocked[i], 
>-						 sig_count(sig_state->sig_blocked[i]));
>-					sigprocmask(SIG_UNBLOCK, &set, NULL);
>-				}
> 				if (se->sa_flags & SA_RESETHAND) {
> 					talloc_free(se);
> 				}
>@@ -333,8 +338,40 @@ int tevent_common_check_signal(struct tevent_context *ev)
> 				talloc_free(se);
> 			}
> 		}
>+
>+#ifdef SA_SIGINFO
>+		if (clear_processed_siginfo) {
>+			uint32_t j;
>+			for (j=0;j<count;j++) {
>+				uint32_t ofs = (counter.seen + j)
>+					% SA_INFO_QUEUE_COUNT;
>+				memset((void*)&sig_state->sig_info[i][ofs],
>+					'\0',
>+					sizeof(siginfo_t));
>+			}
>+		}
>+#endif
>+
> 		SIG_SEEN(sig_state->signal_count[i], count);
> 		SIG_SEEN(sig_state->got_signal, count);
>+
>+#ifdef SA_SIGINFO
>+		if (SIG_PENDING(sig_state->sig_blocked[i])) {
>+			/* We'd filled the queue, unblock the
>+			   signal now the queue is empty again.
>+			   Note we MUST do this after the
>+			   SIG_SEEN(sig_state->signal_count[i], count)
>+			   call to prevent a new signal running
>+			   out of room in the sig_state->sig_info[i][]
>+			   ring buffer. */
>+			sigset_t set;
>+			sigemptyset(&set);
>+			sigaddset(&set, i);
>+			SIG_SEEN(sig_state->sig_blocked[i],
>+				 sig_count(sig_state->sig_blocked[i]));
>+			sigprocmask(SIG_UNBLOCK, &set, NULL);
>+		}
>+#endif
> 	}
> 
> 	return 1;
>-- 
>1.5.4.3
>
>
>From 6797d9e7f81e8dbc14e6f165d2342c174c4dbc6f Mon Sep 17 00:00:00 2001
>From: =?utf-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
>Date: Mon, 24 Aug 2009 14:27:13 +0200
>Subject: [PATCH] tevent: avoid using reserved c++ word.
>
>Guenther
>(cherry picked from commit 965a079535bd11a7870d45991a0d0628d6579b3b)
>---
> lib/tevent/tevent_signal.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c
>index 27e8624..f07de83 100644
>--- a/lib/tevent/tevent_signal.c
>+++ b/lib/tevent/tevent_signal.c
>@@ -158,7 +158,7 @@ static int tevent_signal_destructor(struct tevent_signal *se)
>   this is part of the pipe hack needed to avoid the signal race condition
> */
> static void signal_pipe_handler(struct tevent_context *ev, struct tevent_fd *fde, 
>-				uint16_t flags, void *private)
>+				uint16_t flags, void *_private)
> {
> 	char c[16];
> 	ssize_t res;
>-- 
>1.5.4.3
>
>
>From 554a24cca404680a42a697db0de5b3e25e3a9e64 Mon Sep 17 00:00:00 2001
>From: Rusty Russell <rusty@rustcorp.com.au>
>Date: Wed, 26 Aug 2009 17:30:32 +0930
>Subject: [PATCH] lib/tevent: remove spectacularly complicated manual subtraction
>
>To be completely honest, I don't quite know whether to laugh or cry at
>this one:
>
>	1 + (0xFFFFFFFF & ~(s.seen - s.count))
>	== 1 + (~(s.seen - s.count))		# s.seen, s.count are uint32_t
>	== s.count - s.seen			# -A == ~A + 1
>
>Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
>(cherry picked from commit 4279879c9847ca069527e11ca934b8906009cad8)
>---
> lib/tevent/tevent_signal.c |    5 +----
> 1 files changed, 1 insertions(+), 4 deletions(-)
>
>diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c
>index f07de83..4299953 100644
>--- a/lib/tevent/tevent_signal.c
>+++ b/lib/tevent/tevent_signal.c
>@@ -70,10 +70,7 @@ static struct sig_state {
> */
> static uint32_t sig_count(struct sigcounter s)
> {
>-	if (s.count >= s.seen) {
>-		return s.count - s.seen;
>-	}
>-	return 1 + (0xFFFFFFFF & ~(s.seen - s.count));
>+	return s.count - s.seen;
> }
> 
> /*
>-- 
>1.5.4.3
>
>
>From b354858e50f577c08bf867e8819b2fcb2e812855 Mon Sep 17 00:00:00 2001
>From: Rusty Russell <rusty@rustcorp.com.au>
>Date: Fri, 28 Aug 2009 12:04:22 +0930
>Subject: [PATCH] lib/tevent: fix race with signals and tevent_common_add_signal
>
>We carefully preserve the old signal handler, but we replace it before
>we've set up everything; in particular, if we fail setting up the
>pipe_hack we could write a NUL char to stdout (fd 0), instead of
>calling the old signal handler.
>
>Replace the signal handler as the very last thing we do.
>
>Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
>(cherry picked from commit 6abb637e3e0d23635fdbbb91c163731b325d696d)
>---
> lib/tevent/tevent_signal.c |   40 ++++++++++++++++++++--------------------
> 1 files changed, 20 insertions(+), 20 deletions(-)
>
>diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c
>index 4299953..5e4e81b 100644
>--- a/lib/tevent/tevent_signal.c
>+++ b/lib/tevent/tevent_signal.c
>@@ -219,6 +219,26 @@ struct tevent_signal *tevent_common_add_signal(struct tevent_context *ev,
> 		return NULL;
> 	}
> 
>+	/* we need to setup the pipe hack handler if not already
>+	   setup */
>+	if (ev->pipe_fde == NULL) {
>+		if (sig_state->pipe_hack[0] == 0 && 
>+		    sig_state->pipe_hack[1] == 0) {
>+			if (pipe(sig_state->pipe_hack) == -1) {
>+				talloc_free(se);
>+				return NULL;
>+			}
>+			ev_set_blocking(sig_state->pipe_hack[0], false);
>+			ev_set_blocking(sig_state->pipe_hack[1], false);
>+		}
>+		ev->pipe_fde = tevent_add_fd(ev, ev, sig_state->pipe_hack[0],
>+					     TEVENT_FD_READ, signal_pipe_handler, NULL);
>+		if (!ev->pipe_fde) {
>+			talloc_free(se);
>+			return NULL;
>+		}
>+	}
>+
> 	/* only install a signal handler if not already installed */
> 	if (sig_state->sig_handlers[signum] == NULL) {
> 		struct sigaction act;
>@@ -255,26 +275,6 @@ struct tevent_signal *tevent_common_add_signal(struct tevent_context *ev,
> 	talloc_set_destructor(se, tevent_signal_destructor);
> 	talloc_set_destructor(sl, tevent_common_signal_list_destructor);
> 
>-	/* we need to setup the pipe hack handler if not already
>-	   setup */
>-	if (ev->pipe_fde == NULL) {
>-		if (sig_state->pipe_hack[0] == 0 && 
>-		    sig_state->pipe_hack[1] == 0) {
>-			if (pipe(sig_state->pipe_hack) == -1) {
>-				talloc_free(se);
>-				return NULL;
>-			}
>-			ev_set_blocking(sig_state->pipe_hack[0], false);
>-			ev_set_blocking(sig_state->pipe_hack[1], false);
>-		}
>-		ev->pipe_fde = tevent_add_fd(ev, ev, sig_state->pipe_hack[0],
>-					     TEVENT_FD_READ, signal_pipe_handler, NULL);
>-		if (!ev->pipe_fde) {
>-			talloc_free(se);
>-			return NULL;
>-		}
>-	}
>-
> 	return se;
> }
> 
>-- 
>1.5.4.3
>
>
>From 2d64694a63ceeff039d827db1bd32b6a7b5a7098 Mon Sep 17 00:00:00 2001
>From: Rusty Russell <rusty@rustcorp.com.au>
>Date: Fri, 28 Aug 2009 12:08:47 +0930
>Subject: [PATCH] lib/tevent: handle tevent_common_add_signal on different event contexts.
>
>I don't know if this is a problem in real life.
>
>The code assumes there's only one tevent_context; all signals will notify
>the first event context.  That's counter-intuitive if you ever use more
>than one, and there's nothing else in this code which prevents it AFAICT.
>
>Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
>(cherry picked from commit be4ac227842530d484659f2db683453366326d8b)
>---
> lib/tevent/tevent_internal.h |    1 +
> lib/tevent/tevent_signal.c   |   44 ++++++++++++++++++++++++++++-------------
> 2 files changed, 31 insertions(+), 14 deletions(-)
>
>diff --git a/lib/tevent/tevent_internal.h b/lib/tevent/tevent_internal.h
>index 513ca1c..4e3b7b5 100644
>--- a/lib/tevent/tevent_internal.h
>+++ b/lib/tevent/tevent_internal.h
>@@ -240,6 +240,7 @@ struct tevent_context {
> 
> 	/* pipe hack used with signal handlers */
> 	struct tevent_fd *pipe_fde;
>+	int pipe_fds[2];
> 
> 	/* debugging operations */
> 	struct tevent_debug_ops debug_ops;
>diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c
>index 5e4e81b..0333325 100644
>--- a/lib/tevent/tevent_signal.c
>+++ b/lib/tevent/tevent_signal.c
>@@ -57,7 +57,6 @@ static struct sig_state {
> 	struct sigaction *oldact[NUM_SIGNALS+1];
> 	struct sigcounter signal_count[NUM_SIGNALS+1];
> 	struct sigcounter got_signal;
>-	int pipe_hack[2];
> #ifdef SA_SIGINFO
> 	/* with SA_SIGINFO we get quite a lot of info per signal */
> 	siginfo_t *sig_info[NUM_SIGNALS+1];
>@@ -80,10 +79,20 @@ static void tevent_common_signal_handler(int signum)
> {
> 	char c = 0;
> 	ssize_t res;
>+	struct tevent_common_signal_list *sl;
>+	struct tevent_context *ev = NULL;
>+
> 	SIG_INCREMENT(sig_state->signal_count[signum]);
> 	SIG_INCREMENT(sig_state->got_signal);
>-	/* doesn't matter if this pipe overflows */
>-	res = write(sig_state->pipe_hack[1], &c, 1);
>+
>+	/* Write to each unique event context. */
>+	for (sl = sig_state->sig_handlers[signum]; sl; sl = sl->next) {
>+		if (sl->se->event_ctx != ev) {
>+			/* doesn't matter if this pipe overflows */
>+			res = write(ev->pipe_fds[1], &c, 1);
>+			ev = sl->se->event_ctx;
>+		}
>+	}
> }
> 
> #ifdef SA_SIGINFO
>@@ -160,7 +169,7 @@ static void signal_pipe_handler(struct tevent_context *ev, struct tevent_fd *fde
> 	char c[16];
> 	ssize_t res;
> 	/* its non-blocking, doesn't matter if we read too much */
>-	res = read(sig_state->pipe_hack[0], c, sizeof(c));
>+	res = read(fde->fd, c, sizeof(c));
> }
> 
> /*
>@@ -178,6 +187,7 @@ struct tevent_signal *tevent_common_add_signal(struct tevent_context *ev,
> {
> 	struct tevent_signal *se;
> 	struct tevent_common_signal_list *sl;
>+	sigset_t set, oldset;
> 
> 	if (signum >= NUM_SIGNALS) {
> 		errno = EINVAL;
>@@ -222,18 +232,18 @@ struct tevent_signal *tevent_common_add_signal(struct tevent_context *ev,
> 	/* we need to setup the pipe hack handler if not already
> 	   setup */
> 	if (ev->pipe_fde == NULL) {
>-		if (sig_state->pipe_hack[0] == 0 && 
>-		    sig_state->pipe_hack[1] == 0) {
>-			if (pipe(sig_state->pipe_hack) == -1) {
>-				talloc_free(se);
>-				return NULL;
>-			}
>-			ev_set_blocking(sig_state->pipe_hack[0], false);
>-			ev_set_blocking(sig_state->pipe_hack[1], false);
>+		if (pipe(ev->pipe_fds) == -1) {
>+			talloc_free(se);
>+			return NULL;
> 		}
>-		ev->pipe_fde = tevent_add_fd(ev, ev, sig_state->pipe_hack[0],
>-					     TEVENT_FD_READ, signal_pipe_handler, NULL);
>+		ev_set_blocking(ev->pipe_fds[0], false);
>+		ev_set_blocking(ev->pipe_fds[1], false);
>+		ev->pipe_fde = tevent_add_fd(ev, ev, ev->pipe_fds[0],
>+					     TEVENT_FD_READ,
>+					     signal_pipe_handler, NULL);
> 		if (!ev->pipe_fde) {
>+			close(ev->pipe_fds[0]);
>+			close(ev->pipe_fds[1]);
> 			talloc_free(se);
> 			return NULL;
> 		}
>@@ -270,7 +280,13 @@ struct tevent_signal *tevent_common_add_signal(struct tevent_context *ev,
> 	}
> 
> 	DLIST_ADD(se->event_ctx->signal_events, se);
>+
>+	/* Make sure the signal doesn't come in while we're mangling list. */
>+	sigemptyset(&set);
>+	sigaddset(&set, signum);
>+	sigprocmask(SIG_BLOCK, &set, &oldset);
> 	DLIST_ADD(sig_state->sig_handlers[signum], sl);
>+	sigprocmask(SIG_SETMASK, &oldset, NULL);
> 
> 	talloc_set_destructor(se, tevent_signal_destructor);
> 	talloc_set_destructor(sl, tevent_common_signal_list_destructor);
>-- 
>1.5.4.3
>
>
>From ee40b9f42a4bc3129e052361f7940d77c7ad3738 Mon Sep 17 00:00:00 2001
>From: Rusty Russell <rusty@rustcorp.com.au>
>Date: Fri, 28 Aug 2009 12:11:23 +0930
>Subject: [PATCH] lib/tevent: close pipe_fds on event_context destruction
>
>The "hack_fds" were never closed before; now they're inside event_context
>they should be closed when that is destroyed.
>
>Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
>(cherry picked from commit 76d91156c82e20bbd68c752376cb814d71759033)
>---
> lib/tevent/tevent.c |    2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
>diff --git a/lib/tevent/tevent.c b/lib/tevent/tevent.c
>index 0c02e46..56d0da3 100644
>--- a/lib/tevent/tevent.c
>+++ b/lib/tevent/tevent.c
>@@ -148,6 +148,8 @@ int tevent_common_context_destructor(struct tevent_context *ev)
> 
> 	if (ev->pipe_fde) {
> 		talloc_free(ev->pipe_fde);
>+		close(ev->pipe_fds[0]);
>+		close(ev->pipe_fds[1]);
> 		ev->pipe_fde = NULL;
> 	}
> 
>-- 
>1.5.4.3
>
>
>From 29204c4ccf8b715f6a3bbb3f5b7a3e1b6a6b176d Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Sat, 29 Aug 2009 09:41:32 +0200
>Subject: [PATCH] tevent: Fix a segfault upon the first signal
>
>When the first signal arrives, tevent_common_signal_handler() crashed: "ev" is
>initialized to NULL, so the first "write(ev->pipe_fds[1], &c, 1);" dereferences
>NULL.
>
>Rusty, Tridge, please check. Also, can you tell me a bit more about the
>environment you tested this in? I'd be curious to see where this survived.
>
>Thanks,
>
>Volker
>(cherry picked from commit 23abcd2318c69753aa2a144e1dc0f9cf9efdb705)
>---
> lib/tevent/tevent_signal.c |    6 ++++++
> 1 files changed, 6 insertions(+), 0 deletions(-)
>
>diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c
>index 0333325..b329f8c 100644
>--- a/lib/tevent/tevent_signal.c
>+++ b/lib/tevent/tevent_signal.c
>@@ -85,6 +85,12 @@ static void tevent_common_signal_handler(int signum)
> 	SIG_INCREMENT(sig_state->signal_count[signum]);
> 	SIG_INCREMENT(sig_state->got_signal);
> 
>+	if (sig_state->sig_handlers[signum] != NULL) {
>+		ev = sig_state->sig_handlers[signum]->se->event_ctx;
>+		/* doesn't matter if this pipe overflows */
>+		res = write(ev->pipe_fds[1], &c, 1);
>+	}
>+
> 	/* Write to each unique event context. */
> 	for (sl = sig_state->sig_handlers[signum]; sl; sl = sl->next) {
> 		if (sl->se->event_ctx != ev) {
>-- 
>1.5.4.3
>
>
>From 0a16f38441ac2423e15855cf9171dbdd621a823d Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Thu, 3 Sep 2009 07:38:21 -0700
>Subject: [PATCH] Another part of the fix for bug 6651 - smbd SIGSEGV when breaking oplocks.
> SA_INFO_QUEUE_COUNT *MUST* be a power of 2, in order for the ring buffer
> wrap to work correctly at the 32 bit boundary. Thanks to Petr
> Vandrovec <petr@vandrovec.name> for this.
> (cherry picked from commit c97698e762b1ea8d7133f04ae822225676a6f135)
>
>---
> lib/tevent/tevent_signal.c |    8 ++++++--
> 1 files changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c
>index b329f8c..ef9c0cf 100644
>--- a/lib/tevent/tevent_signal.c
>+++ b/lib/tevent/tevent_signal.c
>@@ -32,8 +32,12 @@
> 
> #define NUM_SIGNALS 64
> 
>-/* maximum number of SA_SIGINFO signals to hold in the queue */
>-#define SA_INFO_QUEUE_COUNT 100
>+/* maximum number of SA_SIGINFO signals to hold in the queue.
>+  NB. This *MUST* be a power of 2, in order for the ring buffer
>+  wrap to work correctly. Thanks to Petr Vandrovec <petr@vandrovec.name>
>+  for this. */
>+
>+#define SA_INFO_QUEUE_COUNT 64
> 
> struct sigcounter {
> 	uint32_t count;
>-- 
>1.5.4.3
>
>
>From e8a687ec1b8e9744dee254b851b37b8266394da4 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Fri, 4 Sep 2009 12:56:39 +0200
>Subject: [PATCH] tevent: change version to 0.9.8 after some critical bugs have been fixed
>
>metze
>(cherry picked from commit 1bb68402a2e37f39118eaaaa039ac69e03ba66f2)
>---
> lib/tevent/configure.ac |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/lib/tevent/configure.ac b/lib/tevent/configure.ac
>index 89190af..c759b83 100644
>--- a/lib/tevent/configure.ac
>+++ b/lib/tevent/configure.ac
>@@ -1,5 +1,5 @@
> AC_PREREQ(2.50)
>-AC_INIT(tevent, 0.9.7)
>+AC_INIT(tevent, 0.9.8)
> AC_CONFIG_SRCDIR([tevent.c])
> AC_CONFIG_HEADER(config.h)
> 
>-- 
>1.5.4.3
>
>
>From 44ca8938d9cdc58c2eb4bd4ac2fcc00d64f4584f Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Mon, 24 Aug 2009 21:14:52 -0700
>Subject: [PATCH] Help debug for bug 6651 - smbd SIGSEGV when breaking oplocks.
> Should help track if we get invoked with an invalid fd from
> the signal handler.
> Jeremy.
> (cherry picked from commit 213546103749c30dbb3ad8472872b9a8fad34205)
>
>---
> source3/smbd/oplock_linux.c |    4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
>diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c
>index 273fbfd..7f215df 100644
>--- a/source3/smbd/oplock_linux.c
>+++ b/source3/smbd/oplock_linux.c
>@@ -98,6 +98,10 @@ static void linux_oplock_signal_handler(struct tevent_context *ev_ctx,
> 	files_struct *fsp;
> 
> 	fsp = file_find_fd(fd);
>+	if (fsp == NULL) {
>+		DEBUG(0,("linux_oplock_signal_handler: failed to find fsp for file fd=%d\n", fd ));
>+		smb_panic("linux_oplock_signal_handler\n");
>+	}
> 	break_kernel_oplock(smbd_messaging_context(), fsp);
> }
> 
>-- 
>1.5.4.3
>
>
>From eaafa0921b8acd868253fa10635daa5016293063 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Thu, 3 Sep 2009 07:40:48 -0700
>Subject: [PATCH] Hopefully last part of the fix for bug 6651 - smbd SIGSEGV when breaking oplocks.
> This one is subtle. There is a race condition where a signal can be
> queued for oplock break, and then the file can be closed by the client
> before the signal can be processed. Currently if this occurs we panic
> (we can't match an incoming signal fd with a fsp pointer). Simply log
> the error (at debug level 10 right now, might be too much) and then
> return without processing the break request. It looks like there is
> another race condition with this fix, but here's why it won't happen.
> If the signal was pending (caused by a kernel oplock break from a
> local file open), and the client closed the file and then re-opened
> another file which happened to use the same file descriptor as the
> file just closed, then theoretically the oplock break requests could
> be processed on the wrong fd. Here's why this should be very rare..
> Processing a pending signal always take precedence over an incoming
> network request, so as long as the client close request is non-chained
> then the break signal should always be harmlessly processed *before*
> the open can be called. If the open is chained onto the close, and
> the fd on the new open is the same as the old closed fd, then it's
> possible this race will occur. However, all that will happen is that
> we'll lose the oplock on this file. A shame, but not a fatal event.
> Jeremy.
> (cherry picked from commit bdc7bdb0d3e02d04477906dbda8995bc5789ce22)
>
>---
> source3/smbd/oplock_linux.c |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c
>index 7f215df..2bc0a55 100644
>--- a/source3/smbd/oplock_linux.c
>+++ b/source3/smbd/oplock_linux.c
>@@ -99,8 +99,8 @@ static void linux_oplock_signal_handler(struct tevent_context *ev_ctx,
> 
> 	fsp = file_find_fd(fd);
> 	if (fsp == NULL) {
>-		DEBUG(0,("linux_oplock_signal_handler: failed to find fsp for file fd=%d\n", fd ));
>-		smb_panic("linux_oplock_signal_handler\n");
>+		DEBUG(0,("linux_oplock_signal_handler: failed to find fsp for file fd=%d (file was closed ?)\n", fd ));
>+		return;
> 	}
> 	break_kernel_oplock(smbd_messaging_context(), fsp);
> }
>-- 
>1.5.4.3
>

Actions: View

Attachments on bug 6651: 4580 | 4585 | 4586 | 4595 | 4639 | 4640 | 4647