merge of '98c11111632ec1f22cd780bfc86f7f03dc5bfbcb'

     and 'f34d4b68a24b0179a8f2bdb573db7a7be933641a'

71 files changed, 2361 insertions, 536 deletions

diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass
index c48bd1a980..0b90e754df 100644
--- a/classes/cpan.bbclass
+++ b/classes/cpan.bbclass
@@ -17,7 +17,7 @@ cpan_do_configure () {
 }
 
 cpan_do_compile () {
-        oe_runmake PASTHRU_INC="${CFLAGS}"
+        oe_runmake PASTHRU_INC="${CFLAGS}" CCFLAGS="${CFLAGS}"
 }
 
 cpan_do_install () {
diff --git a/classes/cpan_build.bbclass b/classes/cpan_build.bbclass
index b7cdf7d821..0660ef9b82 100644
--- a/classes/cpan_build.bbclass
+++ b/classes/cpan_build.bbclass
@@ -7,6 +7,23 @@ FILES_${PN} += '${libdir}/perl5'
 DEPENDS  += "perl-native"
 RDEPENDS += "perl"
 
+#
+# We also need to have built libmodule-build-perl-native for
+# everything except libmodule-build-perl-native itself (which uses
+# this class, but uses itself as the probider of
+# libmodule-build-perl)
+#
+def cpan_build_dep_prepend(d):
+	import bb;
+	if bb.data.getVar('CPAN_BUILD_DEPS', d, 1):
+		return ''
+	pn = bb.data.getVar('PN', d, 1)
+	if pn in ['libmodule-build-perl', 'libmodule-build-perl-native']:
+		return ''
+	return 'libmodule-build-perl-native '
+
+DEPENDS_prepend = "${@cpan_build_dep_prepend(d)}"
+
 def is_crosscompiling(d):
     import bb
     if not bb.data.inherits_class('native', d):
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 3993bf6ec0..e015314d92 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -185,5 +185,16 @@ PREFERRED_VERSION_wpa-supplicant ?= "0.5.1"
 PREFERRED_PROVIDER_virtual/db = "db"
 PREFERRED_PROVIDER_virtual/db-native = "db-native"
 
+SRCDATE_ipkg-utils ?= "20060106"
+SRCDATE_ipkg-utils-native ?= "20060106"
+SRCDATE_ipkg-link ?= "20060106"
+SRCDATE_irssi ?= "20050930"
+
+CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
+INHERIT += "nslu2-mirrors"
+
+PREFERRED_VERSION_ipkg ?= "0.99.154"
+PREFERRED_VERSION_ipkg-native ?= "0.99.154"
+
 #FIXME: HACK: REMOVE THIS
 IGNORE_STRIP_ERRORS = ""
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index da1efa9cc4..541eaef852 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -63,3 +63,15 @@ PREFERRED_VERSION_unslung-rootfs         ?= "2.3r63"
 PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63"
 PREFERRED_VERSION_nslu2-linksys-libs     ?= "2.3r63"
 PREFERRED_VERSION_nslu2-linksys-ramdisk  ?= "2.3r63"
+
+SRCDATE_ipkg-utils ?= "20060106"
+SRCDATE_ipkg-utils-native ?= "20060106"
+SRCDATE_ipkg-link ?= "20060106"
+SRCDATE_irssi ?= "20050930"
+
+CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
+INHERIT += "nslu2-mirrors"
+
+PREFERRED_VERSION_ipkg ?= "0.99.154"
+PREFERRED_VERSION_ipkg-native ?= "0.99.154"
+
diff --git a/conf/machine/gumstix.conf b/conf/machine/gumstix.conf
index 75c671a3d4..0fccf05b3b 100644
--- a/conf/machine/gumstix.conf
+++ b/conf/machine/gumstix.conf
@@ -19,6 +19,6 @@ GUMSTIX_400MHZ = "y"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel-modules-mmc kernel-modules-usb kernel-modules-fat kernel-modules-bluetooth kernel-module-jfs udev lrzsz"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel-module-mmc kernel-module-usb kernel-module-fat kernel-module-bluetooth kernel-module-jfs udev lrzsz"
 PREFERRED_VERSION_task-bootstrap = "1.0unionroot"
 
diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf
index 93befb92ce..541d350f21 100644
--- a/conf/machine/include/ixp4xx.conf
+++ b/conf/machine/include/ixp4xx.conf
@@ -149,22 +149,6 @@ IPKG_EXTRA_ARCHS = "ixp4xx ${MACHINE} \
 IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_EXTRA_ARCHS}"
 
 #-------------------------------------------------------------------------------
-# Package versions
-#-------------------------------------------------------------------------------
-# Warning: these are shared across the different machine and distro
-# configurations but can be overridden therein if required.
-SRCDATE_ipkg-utils ?= "20060106"
-SRCDATE_ipkg-utils-native ?= "20060106"
-SRCDATE_ipkg-link ?= "20060106"
-SRCDATE_irssi ?= "20050930"
-
-CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
-INHERIT += "nslu2-mirrors"
-
-PREFERRED_VERSION_ipkg ?= "0.99.154"
-PREFERRED_VERSION_ipkg-native ?= "0.99.154"
-
-#-------------------------------------------------------------------------------
 # Board defaults
 #-------------------------------------------------------------------------------
 # These values are board specific but they seem to be common to a large number
diff --git a/packages/bluez/bluez-hcidump_1.32.bb b/packages/bluez/bluez-hcidump_1.32.bb
new file mode 100644
index 0000000000..877c8db33c
--- /dev/null
+++ b/packages/bluez/bluez-hcidump_1.32.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
+SECTION = "console"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz"
+S = "${WORKDIR}/bluez-hcidump-${PV}"
+
+EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
+
+inherit autotools
diff --git a/packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.c.gcc4.patch b/packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.c.gcc4.patch
new file mode 100644
index 0000000000..821fc9ad7f
--- /dev/null
+++ b/packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.c.gcc4.patch
@@ -0,0 +1,11 @@
+--- cyrus-imapd-2.2.12/lib/imapopts.c.orig	2006-08-10 14:43:19.000000000 +0200
++++ cyrus-imapd-2.2.12/lib/imapopts.c	2006-08-10 14:43:48.000000000 +0200
+@@ -24,7 +24,7 @@
+ 
+ 
+ 
+-struct imapopt_s imapopts[] =
++struct imapopt_s * imapopts =
+ 
+ {
+ 
diff --git a/packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.h.gcc4.patch b/packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.h.gcc4.patch
new file mode 100644
index 0000000000..d1ab605801
--- /dev/null
+++ b/packages/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.h.gcc4.patch
@@ -0,0 +1,11 @@
+--- cyrus-imapd-2.2.12/lib/imapopts.h.orig	2006-08-10 14:43:26.000000000 +0200
++++ cyrus-imapd-2.2.12/lib/imapopts.h	2006-08-10 14:44:58.000000000 +0200
+@@ -178,7 +178,7 @@
+ 
+ };
+ 
+-extern struct imapopt_s imapopts[];
++extern struct imapopt_s * imapopts;
+ 
+ 
+ 
diff --git a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
index e18f21bf6f..1bb806cb22 100644
--- a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
+++ b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
@@ -7,6 +7,8 @@ DEPENDS += "install-native"
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \
            file://autotools.patch;patch=1 \
            file://tail.patch;patch=1 \
+           file://imapopts.c.gcc4.patch;patch=1 \
+           file://imapopts.h.gcc4.patch;patch=1 \
 	   file://cyrus \
 	   file://cyrus.conf_2.2 \
 	   file://imapd.conf_2.2 \
diff --git a/packages/glib-2.0/glib-2.0-2.12.3/.mtn2git_empty b/packages/glib-2.0/glib-2.0-2.12.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0-2.12.3/.mtn2git_empty
diff --git a/packages/glib-2.0/glib-2.0-2.12.3/configure-libtool.patch b/packages/glib-2.0/glib-2.0-2.12.3/configure-libtool.patch
new file mode 100644
index 0000000000..478ef132af
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0-2.12.3/configure-libtool.patch
@@ -0,0 +1,20 @@
+--- glib-2.12.0/configure.in.orig	2006-07-07 09:21:56.000000000 +0100
++++ glib-2.12.0/configure.in	2006-07-07 09:25:44.000000000 +0100
+@@ -1169,7 +1169,7 @@
+   dnl No use for this on Win32
+   G_MODULE_LDFLAGS=
+ else
+-  G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++  G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+ fi
+ dnl G_MODULE_IMPL= don't reset, so cmd-line can override
+ G_MODULE_NEED_USCORE=0
+@@ -1234,7 +1234,7 @@
+ 	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
+ dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
+ 	echo "void glib_plugin_test(void) { }" > plugin.c
+-	${SHELL} ./libtool --mode=compile ${CC} -shared \
++	${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \
+ 		-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
+ 	AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
+ 		glib_cv_rtldglobal_broken,[
diff --git a/packages/glib-2.0/glib-2.0_2.12.3.bb b/packages/glib-2.0/glib-2.0_2.12.3.bb
new file mode 100644
index 0000000000..c796f08090
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0_2.12.3.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "GLib is a general-purpose utility library, \
+which provides many useful data types, macros, \
+type conversions, string utilities, file utilities, a main \
+loop abstraction, and so on. It works on many \
+UNIX-like platforms, Windows, OS/2 and BeOS."
+LICENSE = "LGPL"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS += "glib-2.0-native gtk-doc"
+DEPENDS += "virtual/libiconv virtual/libintl"
+PACKAGES =+ "glib-2.0-utils "
+PR = "r0"
+
+LEAD_SONAME = "libglib-2.0.*"
+FILES_glib-2.0-utils = "${bindir}/*"
+
+EXTRA_OECONF = "--disable-debug"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
+           file://glibconfig-sysdefs.h \
+           file://configure-libtool.patch;patch=1"
+
+S = "${WORKDIR}/glib-${PV}"
+
+inherit autotools pkgconfig gettext
+
+python () {
+	if bb.data.getVar("USE_NLS", d, 1) == "no":
+		raise bb.parse.SkipPackage("${PN} requires native language support.")
+}
+
+acpaths = ""
+do_configure_prepend () {
+	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
+}
+
+do_stage () {
+	oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
+	autotools_stage_includes
+	install -d ${STAGING_INCDIR}/glib-2.0/glib
+	install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
+	install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
+}
diff --git a/packages/glibc/glibc-2.4/fix-fchownat-20060808.patch b/packages/glibc/glibc-2.4/fix-fchownat-20060808.patch
deleted file mode 100644
index 057cb779c3..0000000000
--- a/packages/glibc/glibc-2.4/fix-fchownat-20060808.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-From libc-hacker-return-8994-listarch-libc-hacker=sources dot redhat dot com at sourceware dot org Tue Aug 08 11:49:18 2006
-Return-Path: <libc-hacker-return-8994-listarch-libc-hacker=sources dot redhat dot com at sourceware dot org>
-Delivered-To: listarch-libc-hacker at sources dot redhat dot com
-Received: (qmail 21223 invoked by alias); 8 Aug 2006 11:49:17 -0000
-Received: (qmail 21202 invoked by uid 22791); 8 Aug 2006 11:49:15 -0000
-X-Spam-Check-By: sourceware.org
-Received: from sunsite.ms.mff.cuni.cz (HELO sunsite.mff.cuni.cz) (195.113.15.26)
-    by sourceware dot org (qpsmtpd/0 dot 31) with ESMTP; Tue, 08 Aug 2006 11:49:13 +0000
-Received: from sunsite.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1])
-	by sunsite dot mff dot cuni dot cz (8 dot 13 dot 1/8 dot 13 dot 1) with ESMTP id k78Bn8f9003038;
-	Tue, 8 Aug 2006 13:49:08 +0200
-Received: (from jj@localhost)
-	by sunsite dot mff dot cuni dot cz (8 dot 13 dot 1/8 dot 13 dot 1/Submit) id k78Bn82P003037;
-	Tue, 8 Aug 2006 13:49:08 +0200
-Date: Tue, 8 Aug 2006 13:49:07 +0200
-From: Jakub Jelinek <jakub at redhat dot com>
-To: Ulrich Drepper <drepper at redhat dot com>
-Cc: Glibc hackers <libc-hacker at sources dot redhat dot com>
-Subject: [PATCH] Fix fchownat
-Message-ID: <20060808114907.GA4556@sunsite.mff.cuni.cz>
-Reply-To: Jakub Jelinek <jakub at redhat dot com>
-Mime-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-User-Agent: Mutt/1.4.1i
-Mailing-List: contact libc-hacker-help at sourceware dot org; run by ezmlm
-Precedence: bulk
-List-Subscribe: <mailto:libc-hacker-subscribe at sourceware dot org>
-List-Archive: <http://sourceware.org/ml/libc-hacker/>
-List-Post: <mailto:libc-hacker at sourceware dot org>
-List-Help: <mailto:libc-hacker-help at sourceware dot org>, <http://sourceware dot org/ml/#faqs>
-Sender: libc-hacker-owner at sourceware dot org
-Delivered-To: mailing list libc-hacker at sourceware dot org
-
-Hi!
-
-Apparently fchownat was only changed to use the direct syscall if available
-in the generic linux version, not in the various arch specializations.
-
-2006-08-08  Jakub Jelinek  <jakub@redhat.com>
-
-	* sysdeps/unix/sysv/linux/s390/s390-32/fchownat.c (fchownat): Use
-	fchownat syscall if available.
-	* sysdeps/unix/sysv/linux/powerpc/fchownat.c (fchownat): Likewise.
-	* sysdeps/unix/sysv/linux/sh/fchownat.c (fchownat): Likewise.
-	* sysdeps/unix/sysv/linux/i386/fchownat.c (fchownat): Likewise.
-
---- libc/sysdeps/unix/sysv/linux/s390/s390-32/fchownat.c.jj	2006-01-11 16:55:32.000000000 +0100
-+++ libc/sysdeps/unix/sysv/linux/s390/s390-32/fchownat.c	2006-08-08 11:11:23.000000000 +0200
-@@ -53,6 +53,24 @@ extern int __libc_missing_32bit_uids;
- int
- fchownat (int fd, const char *file, uid_t owner, gid_t group, int flag)
- {
-+  int result;
-+
-+#ifdef __NR_fchownat
-+# ifndef __ASSUME_ATFCTS
-+  if (__have_atfcts >= 0)
-+# endif
-+    {
-+      result = INLINE_SYSCALL (fchownat, 5, fd, file, owner, group, flag);
-+# ifndef __ASSUME_ATFCTS
-+      if (result == -1 && errno == ENOSYS)
-+	__have_atfcts = -1;
-+      else
-+# endif
-+	return result;
-+    }
-+#endif
-+
-+#ifndef __ASSUME_ATFCTS
-   if (flag & ~AT_SYMLINK_NOFOLLOW)
-     {
-       __set_errno (EINVAL);
-@@ -79,16 +97,15 @@ fchownat (int fd, const char *file, uid_
-       file = buf;
-     }
- 
--  int result;
-   INTERNAL_SYSCALL_DECL (err);
- 
--#if __ASSUME_32BITUIDS > 0
-+# if __ASSUME_32BITUIDS > 0
-   result = INTERNAL_SYSCALL (chown32, err, 3, CHECK_STRING (file), owner,
- 			     group);
--#else
-+# else
-   static int __libc_old_chown;
- 
--# ifdef __NR_chown32
-+#  ifdef __NR_chown32
-   if (__libc_missing_32bit_uids <= 0)
-     {
-       if (flag & AT_SYMLINK_NOFOLLOW)
-@@ -105,7 +122,7 @@ fchownat (int fd, const char *file, uid_
- 
-       __libc_missing_32bit_uids = 1;
-     }
--# endif /* __NR_chown32 */
-+#  endif /* __NR_chown32 */
-   if (((owner + 1) > (uid_t) ((__kernel_uid_t) -1U))
-       || ((group + 1) > (gid_t) ((__kernel_gid_t) -1U)))
-     {
-@@ -128,7 +145,7 @@ fchownat (int fd, const char *file, uid_
- 
-   result = INTERNAL_SYSCALL (lchown, err, 3, CHECK_STRING (file), owner,
- 			     group);
--#endif
-+# endif
- 
-   if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (result, err), 0))
-     {
-@@ -138,4 +155,5 @@ fchownat (int fd, const char *file, uid_
-     }
- 
-   return result;
-+#endif
- }
---- libc/sysdeps/unix/sysv/linux/powerpc/fchownat.c.jj	2005-11