merge of '42a6f62802ccaf34d8896404bd4683dc7111232f'

     and '6f8490048134c6e6b72e44c0685e72338477cc2a'

21 files changed, 610 insertions, 44 deletions

diff --git a/packages/alsa/alsa-lib_1.0.11.bb b/packages/alsa/alsa-lib_1.0.11.bb
index 0da364071b..fbf1442771 100644
--- a/packages/alsa/alsa-lib_1.0.11.bb
+++ b/packages/alsa/alsa-lib_1.0.11.bb
@@ -25,7 +25,8 @@ do_stage() {
 	install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/
 }
 
-PACKAGES = "libasound alsa-server alsa-conf alsa-doc alsa-dev"
+PACKAGES += "libasound alsa-server alsa-conf alsa-doc alsa-dev"
+PACKAGES_DYNAMIC = "libasound*"
 FILES_libasound = "${libdir}/libasound.so*"
 FILES_alsa-server = "${bindir}"
 FILES_alsa-conf = "${datadir}"
diff --git a/packages/asterisk/asterisk_1.2.9.1.bb b/packages/asterisk/asterisk_1.2.9.1.bb
index 46f24c0e35..00da4ab33f 100644
--- a/packages/asterisk/asterisk_1.2.9.1.bb
+++ b/packages/asterisk/asterisk_1.2.9.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION="The Asterisk open source software PBX"
 HOMEPAGE="www.asterisk.org"
 LICENSE="GPL"
 DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis popt"
-PR = "r5"
+PR = "r6"
 
 SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
 	 file://uclibc-compat-getloadavg.patch;patch=1 \
@@ -15,8 +15,8 @@ export CROSS_COMPILE_BIN="${STAGING_BINDIR}"
 export CROSS_COMPILE_TARGET="${STAGING_DIR}/${HOST_SYS}"
 
 export CROSS_ARCH="Linux"
-export CROSS_PROC="arm"
-export SUB_PROC="xscale"
+
+export CROSS_PROC="${TARGET_ARCH}"
 
 export MAKECMDGOALS="dont-optimize"
 
diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc
index 4b1f8f68e8..ea771a334b 100644
--- a/packages/gcc/gcc-package-cross.inc
+++ b/packages/gcc/gcc-package-cross.inc
@@ -7,6 +7,7 @@ OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
 INHIBIT_PACKAGE_STRIP = "1"
 
 PACKAGES = "libgcc libstdc++ libg2c libg2c-dev libgfortran libgfortran-dev"
+PACKAGES_DYNAMIC = "libgcc* libstdc* libg2c* libgfortran*"
 
 PACKAGE_ARCH_libg2c = "${TARGET_ARCH}"
 PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}"
diff --git a/packages/gnome/libsoup_2.2.93.bb b/packages/gnome/libsoup_2.2.93.bb
index 9ee030d5c9..33a4f16d06 100644
--- a/packages/gnome/libsoup_2.2.93.bb
+++ b/packages/gnome/libsoup_2.2.93.bb
@@ -7,9 +7,10 @@ MAINTAINER = "Chris Lord <chris@openedhand.com>"
 
 inherit autotools pkgconfig
 
+PACKAGES_DYNAMIC = "libsoup-2.2*"
 FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev = "${includedir} ${libdir}"
-FILES_${PN}-doc = "${datadir}"
+FILES_${PN}-dev = "${includedir}/ ${libdir}/"
+FILES_${PN}-doc = "${datadir}/"
 
 do_stage() {
 	autotools_stage_all
diff --git a/packages/gnutls/gnutls_1.4.0.bb b/packages/gnutls/gnutls_1.4.0.bb
index 3c48bc95ff..7a934a8131 100644
--- a/packages/gnutls/gnutls_1.4.0.bb
+++ b/packages/gnutls/gnutls_1.4.0.bb
@@ -11,6 +11,7 @@ SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \
 inherit autotools binconfig
 
 PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin"
+PACKAGES_DYNAMIC = "libgnutls*"
 FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*"
 FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*"
 FILES_${PN} = "${libdir}/libgnutls.so.*"
diff --git a/packages/iputils/iputils_20020927.bb b/packages/iputils/iputils_20020927.bb
index 79a7021b5a..2cd5c92e25 100644
--- a/packages/iputils/iputils_20020927.bb
+++ b/packages/iputils/iputils_20020927.bb
@@ -4,7 +4,7 @@ tracepath, tracepath6, ping, ping6 and arping."
 SECTION = "console/network"
 MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE ="BSD"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://www.tux.org/pub/people/alexey-kuznetsov/ip-routing/iputils-ss020927.tar.gz \
 	    file://debian-fixes.patch;patch=1 \
@@ -16,7 +16,7 @@ SRC_URI = "http://www.tux.org/pub/people/alexey-kuznetsov/ip-routing/iputils-ss0
 	    file://glibc-2.4-compat.patch;patch=1"
 S = "${WORKDIR}/iputils"
 
-PACKAGES = "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6 ${PN}-doc"
+PACKAGES += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6"
 FILES_${PN}		= ""
 FILES_${PN}-ping	= "${base_bindir}/ping.${PN}"
 FILES_${PN}-ping6	= "${base_bindir}/ping6.${PN}"
@@ -35,9 +35,9 @@ do_compile () {
 do_install () {
 	install -m 0755 -d ${D}${base_bindir} ${D}${bindir} ${D}${mandir}/man8
 	# SUID root programs
-	install -m 4755 ping ${D}${base_bindir}/ping.${PN}
-	install -m 4755 ping6 ${D}${base_bindir}/ping6.${PN}
-	install -m 4755 traceroute6 ${D}${bindir}/
+	install -m 4555 ping ${D}${base_bindir}/ping.${PN}
+	install -m 4555 ping6 ${D}${base_bindir}/ping6.${PN}
+	install -m 4555 traceroute6 ${D}${bindir}/
 	# Other programgs
 	for i in arping tracepath tracepath6; do
 	  install -m 0755 $i ${D}${bindir}/
@@ -49,7 +49,9 @@ do_install () {
 }
 
 # Busybox also provides ping and ping6, so use update-alternatives
+# Also fixup SUID bit for applications that need it
 pkg_postinst_${PN}-ping () {
+	chmod 4555 ${base_bindir}/ping.${PN}
 	update-alternatives --install ${base_bindir}/ping ping ping.${PN} 100
 }
 pkg_prerm_${PN}-ping () {
@@ -57,8 +59,13 @@ pkg_prerm_${PN}-ping () {
 }
 
 pkg_postinst_${PN}-ping6 () {
+	chmod 4555 ${base_bindir}/ping6.${PN}
 	update-alternatives --install ${base_bindir}/ping6 ping6 ping6.${PN} 100
 }
 pkg_prerm_${PN}-ping6 () {
 	update-alternatives --remove ping6 ping6.${PN}
 }
+
+pkg_postinst_${PN}-traceroute6 () {
+	chmod 4555 ${bindir}/traceroute6
+}
diff --git a/packages/libmimedir/libmimedir_0.4.0-20060804.bb b/packages/libmimedir/libmimedir_0.4.0-20060804.bb
index f893bccaf2..f3adcc22f4 100644
--- a/packages/libmimedir/libmimedir_0.4.0-20060804.bb
+++ b/packages/libmimedir/libmimedir_0.4.0-20060804.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "intltool-native glib-2.0"
-PR = "r1"
+PR = "r2"
 DEFAULT_PREFERENCE = "5"
 SRCDATE = "20060804"
 PV = "0.4.0+cvs${SRCDATE}"
@@ -23,6 +23,6 @@ do_stage() {
 	autotools_stage_all
 }
 
-PACKAGES += libmimedir-utils
-FILES_libmimedir-utils = "${bindir}"
-FILES_${PN} = "${libdir}"
+PACKAGES =+ libmimedir-utils
+PACKAGES_DYNAMIC = "libmimedir-0.4*"
+FILES_libmimedir-utils = "${bindir}/"
diff --git a/packages/linux/handhelds-sa-2.6_cvs.bb b/packages/linux/handhelds-sa-2.6_cvs.bb
index bdc2f86633..41cab94908 100644
--- a/packages/linux/handhelds-sa-2.6_cvs.bb
+++ b/packages/linux/handhelds-sa-2.6_cvs.bb
@@ -4,7 +4,7 @@ MAINTAINER = "Alex Lange <chicken@handhelds.org>"
 LICENSE = "GPL"
 #
 COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = '(h3600|simpad)'
+COMPATIBLE_MACHINE = '(h3600|simpad|jornada56x)'
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
 
diff --git a/packages/linux/linux-jlime-jornada6xx-2.6.17/defconfig_jlime b/packages/linux/linux-jlime-jornada6xx-2.6.17/defconfig_jlime
index 277a2d92d9..4572f7cf9a 100644
--- a/packages/linux/linux-jlime-jornada6xx-2.6.17/defconfig_jlime
+++ b/packages/linux/linux-jlime-jornada6xx-2.6.17/defconfig_jlime
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.17
-# Tue Aug  1 11:50:57 2006
+# Sun Aug 13 16:30:04 2006
 #
 CONFIG_SUPERH=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
@@ -36,7 +36,7 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_UID16=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_EMBEDDED is not set
+CONFIG_EMBEDDED=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
@@ -425,7 +425,7 @@ CONFIG_WIRELESS_EXT=y
 # Generic Driver Options
 #
 CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_FW_LOADER=y
 
 #
@@ -446,7 +446,13 @@ CONFIG_FW_LOADER=y
 #
 # Plug and Play support
 #
-# CONFIG_PNP is not set
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG is not set
+
+#
+# Protocols
+#
+# CONFIG_ISAPNP is not set
 
 #
 # Block devices
@@ -483,6 +489,7 @@ CONFIG_BLK_DEV_IDECS=y
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=y
+# CONFIG_BLK_DEV_IDEPNP is not set
 CONFIG_IDE_SH=y
 # CONFIG_IDE_ARM is not set
 # CONFIG_IDE_CHIPSETS is not set
@@ -527,6 +534,7 @@ CONFIG_DUMMY=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
+# CONFIG_NET_SB1000 is not set
 
 #
 # ARCnet devices
@@ -544,11 +552,7 @@ CONFIG_DUMMY=y
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_STNIC is not set
-CONFIG_NET_VENDOR_3COM=y
-# CONFIG_EL1 is not set
-# CONFIG_EL2 is not set
-# CONFIG_EL16 is not set
-# CONFIG_EL3 is not set
+# CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NET_VENDOR_SMC is not set
 # CONFIG_SMC91X is not set
 # CONFIG_NET_VENDOR_RACAL is not set
@@ -583,29 +587,33 @@ CONFIG_NET_WIRELESS_RTNETLINK=y
 #
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
-# CONFIG_WAVELAN is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_NETWAVE is not set
+CONFIG_WAVELAN=m
+CONFIG_PCMCIA_WAVELAN=m
+CONFIG_PCMCIA_NETWAVE=m
 
 #
 # Wireless 802.11 Frequency Hopping cards support
 #
-# CONFIG_PCMCIA_RAYCS is not set
+CONFIG_PCMCIA_RAYCS=m
 
 #
 # Wireless 802.11b ISA/PCI cards support
 #
-CONFIG_HERMES=y
-# CONFIG_ATMEL is not set
+CONFIG_HERMES=m
+CONFIG_ATMEL=m
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
 #
-CONFIG_PCMCIA_HERMES=y
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_AIRO_CS is not set
-# CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_HOSTAP is not set
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_CS=m
 CONFIG_NET_WIRELESS=y
 
 #
diff --git a/packages/ndisc6/.mtn2git_empty b/packages/ndisc6/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ndisc6/.mtn2git_empty
diff --git a/packages/ndisc6/files/.mtn2git_empty b/packages/ndisc6/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ndisc6/files/.mtn2git_empty
diff --git a/packages/ndisc6/files/acinclude.m4 b/packages/ndisc6/files/acinclude.m4
new file mode 100644
index 0000000000..5360fff5d2
--- /dev/null
+++ b/packages/ndisc6/files/acinclude.m4
@@ -0,0 +1,197 @@
+# _AC_C_STD_TRY(STANDARD, TEST-PROLOGUE, TEST-BODY, OPTION-LIST,
+#		ACTION-IF-AVAILABLE, ACTION-IF-UNAVAILABLE)
+# --------------------------------------------------------------
+# Check whether the C compiler accepts features of STANDARD (e.g `c89', `c99')
+# by trying to compile a program of TEST-PROLOGUE and TEST-BODY.  If this fails,
+# try again with each compiler option in the space-separated OPTION-LIST; if one
+# helps, append it to CC.  If eventually successful, run ACTION-IF-AVAILABLE,
+# else ACTION-IF-UNAVAILABLE.
+AC_DEFUN([_AC_C_STD_TRY],
+[AC_MSG_CHECKING([for $CC option to accept ISO ]m4_translit($1, [c], [C]))
+AC_CACHE_VAL(ac_cv_prog_cc_$1,
+[ac_cv_prog_cc_$1=no
+ac_save_CC=$CC
+AC_LANG_CONFTEST([AC_LANG_PROGRAM([$2], [$3])])
+for ac_arg in '' $4
+do
+  CC="$ac_save_CC $ac_arg"
+  _AC_COMPILE_IFELSE([], [ac_cv_prog_cc_$1=$ac_arg])
+  test "x$ac_cv_prog_cc_$1" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+])# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_$1" in
+  x)
+    AC_MSG_RESULT([none needed]) ;;
+  xno)
+    AC_MSG_RESULT([unsupported]) ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_$1"
+    AC_MSG_RESULT([$ac_cv_prog_cc_$1]) ;;
+esac
+AS_IF([test "x$ac_cv_prog_cc_$1" != xno], [$5], [$6])
+])# _AC_C_STD_TRY
+
+# _AC_PROG_CC_C99 ([ACTION-IF-AVAILABLE], [ACTION-IF-UNAVAILABLE])
+# ----------------------------------------------------------------
+# If the C compiler is not in ISO C99 mode by default, try to add an
+# option to output variable CC to make it so.  This macro tries
+# various options that select ISO C99 on some system or another.  It
+# considers the compiler to be in ISO C99 mode if it handles mixed
+# code and declarations, _Bool, inline and restrict.
+AC_DEFUN([_AC_PROG_CC_C99],
+[_AC_C_STD_TRY([c99],
+[[#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdio.h>
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict(ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy work.
+static void
+test_varargs(const char *format, ...)
+{
+  va_list args;
+  va_start(args, format);
+  va_list args_copy;
+  va_copy(args_copy, args);
+
+  const char *str;
+  int number;
+  float fnumber;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case 's': // string
+	  str = va_arg(args_copy, const char *);
+	  break;
+	case 'd': // int
+	  number = va_arg(args_copy, int);
+	  break;
+	case 'f': // float
+	  fnumber = (float) va_arg(args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end(args_copy);
+  va_end(args);
+}
+]],
+[[
+  // Check bool and long long datatypes.
+  _Bool success = false;
+  long long int bignum = -1234567890LL;
+  unsigned long long int ubignum = 1234567890uLL;
+
+  // Check restrict.
+  if (test_restrict("String literal") != 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  test_varargs("s, d' f .", "string", 65, 34.234);
+
+  // Check incomplete arrays work.
+  struct incomplete_array *ia =
+    malloc(sizeof(struct incomplete_array) + (sizeof(double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = (double) i * 1.234;
+
+  // Check named initialisers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[43] = 543;
+
+  // work around unused variable warnings
+  return  bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x';
+]],
+dnl Try
+dnl GCC		-std=gnu99 (unused restrictive modes: -std=c99 -std=iso9899:1999)
+dnl AIX		-qlanglvl=extc99 (unused restrictive mode: -qlanglvl=stdc99)
+dnl Intel ICC	-c99
+dnl IRIX	-c99
+dnl Solaris	(unused because it causes the compiler to assume C99 semantics for
+dnl		library functions, and this is invalid before Solaris 10: -xc99)
+dnl Tru64	-c99
+dnl with extended modes being tried first.
+[[-std=gnu99 -c99 -qlanglvl=extc99]], [$1], [$2])[]dnl
+])# _AC_PROG_CC_C99
+
+# AC_PROG_CC_C99
+# --------------
+AC_DEFUN([AC_PROG_CC_C99],
+[ AC_REQUIRE([AC_PROG_CC])dnl
+  _AC_PROG_CC_C99
+])
+
+# AC_USE_SYSTEM_EXTENSIONS
+# ------------------------
+# Enable extensions on systems that normally disable them,
+# typically due to standards-conformance issues.
+AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
+[
+  AC_BEFORE([$0], [AC_COMPILE_IFELSE])
+  AC_BEFORE([$0], [AC_RUN_IFELSE])
+
+  AC_REQUIRE([AC_GNU_SOURCE])
+  AC_REQUIRE([AC_AIX])
+  AC_REQUIRE([AC_MINIX])
+
+  AH_VERBATIM([__EXTENSIONS__],
+[/* Enable extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif])
+  AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
+    [ac_cv_safe_to_define___extensions__],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM([
+#	  define __EXTENSIONS__ 1
+	  AC_INCLUDES_DEFAULT])],
+       [ac_cv_safe_to_define___extensions__=yes],
+       [ac_cv_safe_to_define___extensions__=no])])
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    AC_DEFINE([__EXTENSIONS__])
+  AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
+])
diff --git a/packages/ndisc6/files/autoconf-older-version.patch b/packages/ndisc6/files/autoconf-older-version.patch
new file mode 100644
index 0000000000..0ab0fd13bb
--- /dev/null
+++ b/packages/ndisc6/files/autoconf-older-version.patch
@@ -0,0 +1,14 @@
+Patch the required version back to 2.59
+We'll include the missing macros via acinclude.m4
+
+--- ndisc6-0.6.7/configure.ac~	2006-08-14 16:46:06.000000000 +1000
++++ ndisc6-0.6.7/configure.ac	2006-08-14 16:46:06.000000000 +1000
+@@ -21,7 +21,7 @@
+ 
+ AC_COPYRIGHT([Copyright (C) 2005-2006 Remi Denis-Courmont])
+ AC_INIT(ndisc6, 0.6.7, rdenis@simphalempin.com)
+-AC_PREREQ(2.59c)
++AC_PREREQ(2.59)
+ INVOCATION="$0 $*"
+ 
+ AS_MESSAGE(checking system...)
diff --git a/packages/ndisc6/ndisc6_0.6.7.bb b/packages/ndisc6/ndisc6_0.6.7.bb
new file mode 100644
index 0000000000..a9e2118b39
--- /dev/null
+++ b/packages/ndisc6/ndisc6_0.6.7.bb
@@ -0,0 +1,62 @@
+SECTION = "console/network"
+DESCRIPTION = "This package includes some useful diagnostics tools for \
+IPv6 networks, including ndisc6, rdisc6, tcptraceroute6 and traceroute6."
+SECTION = "console/network"
+MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
+HOMEPAGE = "http://www.simphalempin.com/dev/ndisc6/"
+LICENSE = "GPL"
+PR = "r0"
+
+# The tcptraceroute6 and tracert6 commands depend on rltraceroute6 to
+# perform the actual trace operation.
+RDEPENDS_${PN}-tcptraceroute6 = "${PN}-rltraceroute6"
+RDEPENDS_${PN}-tracert6 = "${PN}-rltraceroute6"
+
+SRC_URI = "http://www.remlab.net/files/ndisc6/ndisc6-${PV}.tar.bz2 \
+	   file://autoconf-older-version.patch;patch=1 \
+	   file://acinclude.m4"
+
+inherit autotools
+
+# Split into seperate packages since we normal don't want them all
+# The main package is left empty and therefore not created.
+PACKAGES += "${PN}-ndisc6 ${PN}-tcpspray6 ${PN}-rdisc6 \
+	     ${PN}-tcptraceroute6 ${PN}-rltraceroute6 ${PN}-tracert6"
+FILES_${PN}			= ""
+FILES_${PN}-ndisc6		= "${bindir}/ndisc6"
+FILES_${PN}-tcpspray6 		= "${bindir}/tcpspray6"
+FILES_${PN}-rdisc6		= "${bindir}/rdisc6"
+FILES_${PN}-tcptraceroute6	= "${bindir}/tcptraceroute6"
+FILES_${PN}-rltraceroute6	= "${bindir}/rltraceroute6"
+FILES_${PN}-tracert6		= "${bindir}/tracert6"
+
+DESCRIPTION_${PN}-ndisc6	= "ICMPv6 Neighbor Discovery tool. \
+Performs IPv6 neighbor discovery in userland. Replaces arping from the \
+IPv4 world."
+DESCRIPTION_${PN}-rdisc6	= "ICMPv6 Router Discovery tool. \
+Queries IPv6 routers on the network for advertised prefixes. Can be used \
+to detect rogue IPv6 routers, monitor legitimate IPv6 routers."
+DESCRITPION_${PN}-tcpspray6	= "Performs bandwidth measurements of TCP \
+sessions between the local system and a remote echo server in either IPv6 \
+or IPv4."
+
+
+
+# Add some macros from the autoconf 2.60 which to let us build with
+# autoconf 2.59. This can be removed when/if we update to autoconf
+# 2.60
+do_configure_prepend() {
+    cp ${WORKDIR}/acinclude.m4 ${S}
+}
+
+
+# Enable SUID bit for applications that need it
+pkg_postinst_${PN}-rltraceroute6 () {
+	chmod 4555 ${bindir}/rltraceroute6
+}
+pkg_postinst_${PN}-ndisc6 () {
+	chmod 4555 ${bindir}/ndisc6
+}
+pkg_postinst_${PN}-rdisc6 () {
+	chmod 4555 ${bindir}/rdisc6
+}
diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb
index d35f07f30a..8514ceb717 100644
--- a/packages/tasks/task-sdk.bb
+++ b/packages/tasks/task-sdk.bb
@@ -30,7 +30,7 @@ RDEPENDS_task-sdk-base := "\
     freetype-dev \
     glib-2.0-dev \
     gstreamer-dev \
-    ice-dev \
+    libice-dev \
     ipkg-dev \
     jpeg-dev \
     libapm-dev \
@@ -43,7 +43,7 @@ RDEPENDS_task-sdk-base := "\
     libgpg-error-dev \ 
     libidl-dev \
     libiw-dev \
-    libmimedir-3.3-dev \
+    libmimedir-0.4-dev \
     libpcap-dev \
     libpixman-dev \
     libpng-dev \
@@ -61,7 +61,7 @@ RDEPENDS_task-sdk-base := "\
     readline-dev \
     sqlite-dev \
     zlib-dev \
-    xmu-dev"
+    libxmu-dev"
 
 RDEPENDS_task-sdk-x11 := "\
     atk-dev \
diff --git a/packages/uclibc/uclibc-0.9.28/dl-startup.h.patch b/packages/uclibc/uclibc-0.9.28/dl-startup.h.patch
new file mode 100644
index 0000000000..c4b699f263
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.28/dl-startup.h.patch
@@ -0,0 +1,22 @@
+--- uClibc-0.9.28/ldso/ldso/arm/dl-startup.h-	2006-08-13 18:56:40.000000000 +0200
++++ uClibc-0.9.28/ldso/ldso/arm/dl-startup.h	2006-08-13 18:56:58.000000000 +0200
+@@ -4,8 +4,8 @@
+  * Copyright (C) 2000-2004 by Erik Andersen <andersen@codepoet.org>
+  */
+ 
+-#if defined(__arm__)
+-asm(
++#if !defined(__thumb__)
++__asm__(
+     "	.text\n"
+     "	.globl	_start\n"
+     "	.type	_start,%function\n"
+@@ -57,7 +57,7 @@
+ 	".previous\n"
+ );
+ #else
+-asm(
++__asm__(
+     "	.text\n"
+     "	.arm\n"
+     "	.globl	_start\n"
diff --git a/packages/uclibc/uclibc-0.9.28/dl-string.h.patch b/packages/uclibc/uclibc-0.9.28/dl-string.h.patch
new file mode 100644
index 0000000000..a2bdb81907
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.28/dl-string.h.patch
@@ -0,0 +1,225 @@
+--- uClibc-0.9.28/ldso/include/dl-string.h.orig	2006-08-14 17:20:02.000000000 +0200
++++ uClibc-0.9.28/ldso/include/dl-string.h	2006-08-14 17:19:38.000000000 +0200
+@@ -1,9 +1,24 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * Copyright (C) 2000-2005 by Erik Andersen <andersen@codepoet.org>
++ *
++ * GNU Lesser General Public License version 2.1 or later.
++ */
++
+ #ifndef _LINUX_STRING_H_
+ #define _LINUX_STRING_H_
+ 
+-#include <dl-sysdep.h> // for do_rem
++#include <dl-sysdep.h> /* for do_rem */
+ #include <features.h>
+ 
++/* provide some sane defaults */
++#ifndef do_rem
++# define do_rem(result, n, base) ((result) = (n) % (base))
++#endif
++#ifndef do_div_10
++# define do_div_10(result, remain) ((result) /= 10)
++#endif
++
+ static size_t _dl_strlen(const char * str);
+ static char *_dl_strcat(char *dst, const char *src);
+ static char * _dl_strcpy(char * dst,const char *src);
+@@ -26,8 +41,8 @@
+ static __always_inline size_t _dl_strlen(const char * str)
+ {
+ 	register const char *ptr = (char *) str-1;
+-
+-	while (*++ptr);
++	while (*++ptr)
++		;/* empty */
+ 	return (ptr - str);
+ }
+ 
+@@ -49,7 +64,8 @@
+ 	register char *ptr = dst;
+ 
+ 	dst--;src--;
+-	while ((*++dst = *++src) != 0);
++	while ((*++dst = *++src) != 0)
++		;/* empty */
+ 
+ 	return ptr;
+ }
+@@ -63,8 +79,7 @@
+ 		c2 = (unsigned char) *++s2;
+ 		if (c1 == '\0')
+ 			return c1 - c2;
+-	}
+-	while (c1 == c2);
++	} while (c1 == c2);
+ 
+ 	return c1 - c2;
+ }
+@@ -98,43 +113,41 @@
+ 	return 0;
+ }
+ 
+-static inline char * _dl_strrchr(const char *str, int c)
++static __always_inline char * _dl_strrchr(const char *str, int c)
+ {
+-    register char *prev = 0;
+-    register char *ptr = (char *) str-1;
++	register char *prev = 0;
++	register char *ptr = (char *) str-1;
+ 
+-    while (*++ptr != '\0') {
+-	if (*ptr == c)
+-	    prev = ptr;
+-    }
+-    if (c == '\0')
+-	return(ptr);
+-    return(prev);
++	while (*++ptr != '\0') {
++		if (*ptr == c)
++			prev = ptr;
++	}
++	if (c == '\0')
++		return(ptr);
++	return(prev);
+ }
+ 
+-static inline char * _dl_strstr(const char *s1, const char *s2)
++static __always_inline char * _dl_strstr(const char *s1, const char *s2)
+ {
+-    register const char *s = s1;
+-    register const char *p = s2;
++	register const char *s = s1;
++	register const char *p = s2;
+ 
+-    do {
+-        if (!*p) {
+-	    return (char *) s1;;
+-	}
+-	if (*p == *s) {
+-	    ++p;
+-	    ++s;
+-	} else {
+-	    p = s2;
+-	    if (!*s) {
+-	      return NULL;
+-	    }
+-	    s = ++s1;
+-	}
+-    } while (1);
++	do {
++		if (!*p)
++			return (char *) s1;;
++		if (*p == *s) {
++			++p;
++			++s;
++		} else {
++			p = s2;
++			if (!*s)
++				return NULL;
++			s = ++s1;
++		}
++	} while (1);
+ }
+ 
+-static inline void * _dl_memcpy(void * dst, const void * src, size_t len)
++static __always_inline void * _dl_memcpy(void * dst, const void * src, size_t len)
+ {
+ 	register char *a = dst-1;
+ 	register const char *b = src-1;
+@@ -163,27 +176,28 @@
+ /* Will generate smaller and faster code due to loop unrolling.*/
+ static __always_inline void * _dl_memset(void *to, int c, size_t n)
+ {
+-        unsigned long chunks;
+-        unsigned long *tmp_to;
++	unsigned long chunks;
++	unsigned long *tmp_to;
+ 	unsigned char *tmp_char;
+ 
+-        chunks = n / 4;
+-        tmp_to = to + n;
+-        c = c << 8 | c;
+-        c = c << 16 | c;
+-        if (!chunks)
+-                goto lessthan4;
+-        do {
+-                *--tmp_to = c;
+-        } while (--chunks);
+- lessthan4:
+-        n = n % 4;
+-        if (!n ) return to;
+-        tmp_char = (unsigned char *)tmp_to;
+-        do {
+-                *--tmp_char = c;
+-        } while (--n);
+-        return to;
++	chunks = n / 4;
++	tmp_to = to + n;
++	c = c << 8 | c;
++	c = c << 16 | c;
++	if (!chunks)
++		goto lessthan4;
++	do {
++		*--tmp_to = c;
++	} while (--chunks);
++lessthan4:
++	n = n % 4;
++	if (!n)
++		return to;
++	tmp_char = (unsigned char *)tmp_to;
++	do {
++		*--tmp_char = c;
++	} while (--n);
++	return to;
+ }
+ #else
+ static __always_inline void * _dl_memset(void * str,int c,size_t len)
+@@ -225,10 +239,10 @@
+ 	char *p = &local[22];
+ 	*--p = '\0';
+ 	do {
+-	    char temp;
+-	    do_rem(temp, i, 10);
+-	    *--p = '0' + temp;
+-	    i /= 10;
++		char temp;
++		do_rem(temp, i, 10);
++		*--p = '0' + temp;
++		do_div_10(i, temp);
+ 	} while (i > 0);
+ 	return p;
+ }
+@@ -242,9 +256,9 @@
+ 	do {
+ 		char temp = i & 0xf;
+ 		if (temp <= 0x09)
+-		    *--p = '0' + temp;
++			*--p = '0' + temp;
+ 		else
+-		    *--p = 'a' - 0x0a + temp;
++			*--p = 'a' - 0x0a + temp;
+ 		i >>= 4;
+ 	} while (i > 0);
+ 	*--p = 'x';
+@@ -270,8 +284,8 @@
+ 
+ /* On some arches constant strings are referenced through the GOT.
+  * This requires that load_addr must already be defined... */
+-#if defined(mc68000) || defined(__arm__) || defined(__thumb__) || defined(__mips__)	\
+-                     || defined(__sh__) ||  defined(__powerpc__)
++#if defined(mc68000)  || defined(__arm__) || defined(__thumb__) || \
++    defined(__mips__) || defined(__sh__)  || defined(__powerpc__)
+ # define CONSTANT_STRING_GOT_FIXUP(X) \
+ 	if ((X) < (const char *) load_addr) (X) += load_addr
+ # define NO_EARLY_SEND_STDERR
+@@ -318,7 +332,7 @@
+ 	do { \
+ 		do_rem(v, (X), 10); \
+ 		*--tmp2 = '0' + v; \
+-		(X) /= 10; \
++		do_div_10((X), v); \
+ 	} while ((X) > 0); \
+ 	_dl_write(2, tmp2, tmp1 - tmp2 + sizeof(tmp) - 1); \
+ }
diff --git a/packages/uclibc/uclibc-0.9.28/dl-sysdep.h.patch b/packages/uclibc/uclibc-0.9.28/dl-sysdep.h.patch
new file mode 100644
index 0000000000..0d271a9ca0
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.28/dl-sysdep.h.patch
@@ -0,0 +1,10 @@
+--- uClibc-0.9.28/ldso/ldso/arm/dl-sysdep.h.orig	2006-08-14 17:22:50.000000000 +0200
++++ uClibc-0.9.28/ldso/ldso/arm/dl-sysdep.h	2006-08-14 17:23:45.000000000 +0200
+@@ -43,6 +43,7 @@
+ 	return m;
+ }
+ #define do_rem(result, n, base) ((result) = arm_modulus(n, base))
++#define do_div_10(result, remain) ((result) = (((result) - (remain)) / 2) * -(-1ul / 5ul))
+ 
+ /* Here we define the magic numbers that this dynamic loader should accept */
+ #define MAGIC1 EM_ARM
diff --git a/packages/uclibc/uclibc_0.9.28.bb b/packages/uclibc/uclibc_0.9.28.bb
index 6f5d81c9e5..1801af2861 100644
--- a/packages/uclibc/uclibc_0.9.28.bb
+++ b/packages/uclibc/uclibc_0.9.28.bb
@@ -1,5 +1,5 @@
 DEFAULT_PREFERENCE = "1"
-PR = "r3"
+PR = "r5"
 
 require uclibc.inc
 
@@ -30,6 +30,9 @@ SRC_URI += " file://thumb-swi-r7.patch;patch=1"
 SRC_URI += " file://thumb-sysnum-h.patch;patch=1"
 SRC_URI += " file://thumb-asm-swi.patch;patch=1"
 SRC_URI += " file://thumb-call-via-rx.patch;patch=1"
+SRC_URI += " file://dl-startup.h.patch;patch=1"
+SRC_URI += " file://dl-string.h.patch;patch=1"
+SRC_URI += " file://dl-sysdep.h.patch;patch=1"
 #
 # This is a core change and is controversial, maybe even wrong
 # on some architectures
diff --git a/packages/xmms/files/xmms.sh b/packages/xmms/files/xmms.sh
new file mode 100644
index 0000000000..7d1a96e129
--- /dev/null
+++ b/packages/xmms/files/xmms.sh
@@ -0,0 +1,4 @@
+#! /bin/sh
+
+XLIB_SKIP_ARGB_VISUALS=1 xmms
+
diff --git a/packages/xmms/xmms_1.2.10.bb b/packages/xmms/xmms_1.2.10.bb
index 5f50534cf5..9ee59cef29 100644
--- a/packages/xmms/xmms_1.2.10.bb
+++ b/packages/xmms/xmms_1.2.10.bb
@@ -3,13 +3,14 @@ HOMEPAGE = "http://www.xmms.org/"
 LICENSE = "GPL"
 SECTION = "x11/multimedia"
 # TODO add esd
-DEPENDS = "gtk+-1.2 libvorbis mikmod"
+DEPENDS = "gtk+-1.2 libvorbis mikmod alsa-lib"
 
 SRC_URI = "http://www.xmms.org/files/1.2.x/xmms-${PV}.tar.bz2 \
            file://gcc4.patch;patch=1 \
            file://xmms-config-dequote.patch;patch=1 \
-	   file://acinclude.m4"
-PR = "r1"
+	   file://acinclude.m4 \
+           file://xmms.sh"
+PR = "r2"
 
 inherit autotools binconfig
 
@@ -22,7 +23,16 @@ EXTRA_OECONF = "--disable-opengl --disable-esd \
 
 do_configure_prepend() {
 	cp ${WORKDIR}/acinclude.m4 ${S}
-	rm ${S}/libxmms/acinclude.m4
+	rm ${S}/libxmms/acinclude.m4 || true
+}
+
+do_install_append() {
+	install -m 0755 ${WORKDIR}/xmms.sh ${D}${bindir}
+	install -d ${D}${datadir}/applications
+	install xmms/xmms.desktop ${D}${datadir}/applications
+	sed -i "s/Exec=xmms/Exec=xmms.sh/" ${D}${datadir}/applications/xmms.desktop
+	install -d ${D}${datadir}/pixmaps
+	install xmms/xmms_mini.xpm ${D}${datadir}/pixmaps
 }
 
 do_stage() {