merge of 2694ea866aead6f6639b0c69c13127c90f95e5ff

     and c02b3cdfadfa7f433fd5ca7a0ffcb6f329cadbaf

70 files changed, 1658 insertions, 320 deletions

diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb
new file mode 100644
index 0000000000..55d644bc15
--- /dev/null
+++ b/packages/angstrom/task-angstrom-x11.bb
@@ -0,0 +1,118 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r19"
+ALLOW_EMPTY = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+DEPENDS = "task-angstrom"
+
+PACKAGES = "\
+    angstrom-x11-base-depends \
+    angstrom-gpe-task-base \
+    angstrom-gpe-task-settings \
+    angstrom-gpe-task-pim \
+    angstrom-gpe-task-apps \
+    angstrom-gpe-task-games \ 
+    angstrom-task-office \
+    angstrom-task-printing \
+    angstrom-task-sectest"
+
+RDEPENDS_angstrom-x11-base-depends := "\
+    virtual/libx11 \
+    virtual/xserver \
+    ttf-dejavu-sans \
+    ttf-dejavu-sans-mono \
+    "
+
+RDEPENDS_angstrom-gpe-task-base := "\
+    matchbox \
+    xcursor-transparent-theme \
+    rxvt-unicode \
+    matchbox-themes-gtk \
+    xst \
+    xhost \
+    xrdb \
+    gpe-soundserver \
+    gpe-dm \
+    gpe-login \
+    gpe-session-scripts \
+    gpe-icons \
+    gpe-confd \
+    gpe-autostarter \
+    libgtkstylus \
+    libgtkinput \
+    suspend-desktop \
+    teleport \
+    xauth \
+    gdk-pixbuf-loader-png \
+    gdk-pixbuf-loader-xpm \
+    gdk-pixbuf-loader-jpeg \
+    pango-module-basic-x \
+    pango-module-basic-fc"
+
+RDEPENDS_angstrom-gpe-task-pim := "\
+    gpe-timesheet \
+    gpe-todo \
+    gpe-calendar \
+    gpe-contacts \
+    gpesyncd"
+
+RDEPENDS_angstrom-gpe-task-settings := "\
+    matchbox-panel-manager \
+    gpe-su \
+    gpe-conf \
+    gpe-package \
+    gpe-shield \
+    gpe-taskmanager \
+    minilite \
+    minimix \
+    xmonobut"
+
+RDEPENDS_angstrom-gpe-task-apps := "\
+    gpe-edit \
+    gpe-gallery \
+    gpe-calculator \
+    gpe-clock \
+    gpe-plucker \
+    gpe-terminal \
+    gpe-watch \
+    gpe-what \
+    matchbox-panel-hacks \
+    gpe-aerial \
+    gpe-soundbite \
+    rosetta \
+    gpe-screenshot \
+    gpe-windowlist"
+
+RDEPENDS_angstrom-gpe-task-games := "\
+    gpe-go \
+    gpe-lights \
+    gpe-othello \
+    gpe-tetris \
+    gsoko \
+    xdemineur"
+
+RDEPENDS_angstrom-task-office := "\
+    gnumeric \
+    abiword \
+    imposter \
+#    evince \
+    gqview"
+
+RDEPENDS_angstrom-task-printing := "\
+    cups \
+    gnome-cups-manager"
+
+RDEPENDS_angstrom-task-sectest := "\
+    nmap \
+    ettercap \
+    stunnel \
+    curl \
+#    dsniff \
+    prismstumbler \
+#    tcpdump \
+    kismet \
+    hydra \
+    thcrut \
+#    driftnet \
+    miniclipboard"
diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb
index c8c84c3e5e..9f31f0b640 100644
--- a/packages/angstrom/task-angstrom.bb
+++ b/packages/angstrom/task-angstrom.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r17"
+PR = "r19"
 ALLOW_EMPTY = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -12,20 +12,11 @@ PCMCIA_MANAGER ?= "pcmciautils"
 
 PACKAGES = "\
     angstrom-base-depends \
-    angstrom-base-wifi \
-    angstrom-x11-base-depends \
-    angstrom-gpe-task-base \
-    angstrom-gpe-task-settings \
-    angstrom-gpe-task-pim \
-    angstrom-gpe-task-apps \
-    angstrom-gpe-task-games \ 
-    angstrom-task-office \
-    angstrom-task-printing \
-    angstrom-task-sectest"
+    angstrom-base-wifi "
 
 RDEPENDS_angstrom-base-depends = "\
     base-files keymaps \
-    base-passwd tinylogin \ 
+    base-passwd tinylogin \
     busybox \
     udev \
     update-modules module-init-tools modutils-initscripts \
@@ -33,132 +24,44 @@ RDEPENDS_angstrom-base-depends = "\
     netbase dropbear \
     angstrom-version \
     ipkg ipkg-collateral \
-    wireless-tools \
     tslib-tests tslib-calibrate \
     util-linux-mount util-linux-umount \
     ${EXTRA_STUFF} \
     ${DEBUG_APPS} \
-    ${PCMCIA_MANAGER} \	
+    ${PCMCIA_MANAGER} \
+    angstrom-base-wifi \
 "
 
 RDEPENDS_angstrom-base-depends_append_ipaq-pxa270 = " tiinit acx-firmware "
-
+RDEPENDS_angstrom-base-depends_append_h4000 = " tiinit acx-firmware "
+RDEPENDS_angstrom-base-depends_append_htcuniversal = " tiinit acx-firmware "
 
 RRECOMMENDS_angstrom-base-depends = "\
-        ${BOOTMODULES_RRECOMMENDS} \
-	kernel-module-evdev \
-	kernel-module-uinput \
-	kernel-module-g-ether \
-	kernel-module-hostap-cs \
-	kernel-module-af-packet \
-	"
+    ${BOOTMODULES_RRECOMMENDS} \
+    kernel-module-evdev \
+    kernel-module-uinput \
+    kernel-module-g-ether \
+    kernel-module-af-packet \
+"
 
 RDEPENDS_angstrom-base-wifi = "\
     hostap-utils \
     hostap-conf \
     prism3-support \
     prism3-firmware \
-    acx-firmware \
     wireless-tools \
     wpa-supplicant \
-    "
-
-RDEPENDS_angstrom-x11-base-depends := "\
-    virtual/libx11 \
-    virtual/xserver \
-    ttf-dejavu-sans \
-    ttf-dejavu-sans-mono \
-    "
-
-RDEPENDS_angstrom-gpe-task-base := "\
-    matchbox \
-    xcursor-transparent-theme \
-    rxvt-unicode \
-    matchbox-themes-gtk \
-    xst \
-    xhost \
-    xrdb \
-    gpe-soundserver \
-    gpe-dm \
-    gpe-login \
-    gpe-session-scripts \
-    gpe-icons \
-    gpe-confd \
-    gpe-autostarter \
-    libgtkstylus \
-    libgtkinput \
-    suspend-desktop \
-    teleport \
-    xauth \
-    gdk-pixbuf-loader-png \
-    gdk-pixbuf-loader-xpm \
-    gdk-pixbuf-loader-jpeg \
-    pango-module-basic-x \
-    pango-module-basic-fc"
-
-RDEPENDS_angstrom-gpe-task-pim := "\
-    gpe-timesheet \
-    gpe-todo \
-    gpe-calendar \
-    gpe-contacts \
-    gpesyncd"
-
-RDEPENDS_angstrom-gpe-task-settings := "\
-    matchbox-panel-manager \
-    gpe-su \
-    gpe-conf \
-    gpe-package \
-    gpe-shield \
-    gpe-taskmanager \
-    minilite \
-    minimix \
-    xmonobut"
-
-RDEPENDS_angstrom-gpe-task-apps := "\
-    gpe-edit \
-    gpe-gallery \
-    gpe-calculator \
-    gpe-clock \
-    gpe-plucker \
-    gpe-terminal \
-    gpe-watch \
-    gpe-what \
-    matchbox-panel-hacks \
-    gpe-aerial \
-    gpe-soundbite \
-    rosetta \
-    gpe-screenshot \
-    gpe-windowlist"
-
-RDEPENDS_angstrom-gpe-task-games := "\
-    gpe-go \
-    gpe-lights \
-    gpe-othello \
-    gpe-tetris \
-    gsoko \
-    xdemineur"
-
-RDEPENDS_angstrom-task-office := "\
-    gnumeric \
-    abiword \
-    imposter \
-    evince \
-    gqview"
-
-RDEPENDS_angstrom-task-printing := "\
-    cups \
-    gnome-cups-manager"
+"
 
-RDEPENDS_angstrom-task-sectest := "\
-    nmap \
-    ettercap \
-    stunnel \
-    curl \
-    dsniff \
-    prismstumbler \
-    tcpdump \
-    kismet \
-    hydra \
-    thcrut \
-    driftnet \
-    miniclipboard"
+RRECOMMENDS_angstrom-base-wifi = "\
+    kernel-module-hostap-cs \
+    kernel-module-orinoco-cs \
+    kernel-module-spectrum-cs \
+    kernel-module-arc4 \
+    kernel-module-michael-mic \
+    kernel-module-aes \
+    kernel-module-ieee80211-crypt-tkip \
+    kernel-module-ieee80211-crypt-wep \
+    kernel-module-ieee80211-crypt \
+    kernel-module-ieee80211-crypt-ccmp \
+"
diff --git a/packages/base-files/base-files/tosa/usbd b/packages/base-files/base-files/tosa/usbd
index 40931ee8e9..8c80044167 100644
--- a/packages/base-files/base-files/tosa/usbd
+++ b/packages/base-files/base-files/tosa/usbd
@@ -1 +1,5 @@
-usbdmodule=pxa_bi
+# I know that this was created for usb-client stuff
+# but tosa/2.6 need (un)loading USB Host module
+# on suspend/resume and this way is simplest one ;)
+
+usbdmodule=ohci-hcd
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 85c0e84d6e..d4c03bdefe 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r53"
+PR = "r54"
 LICENSE = "GPL"
 
 SRC_URI = " \
diff --git a/packages/php/php-5.0.5/.mtn2git_empty b/packages/dbus/dbus-0.92/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/php/php-5.0.5/.mtn2git_empty
+++ b/packages/dbus/dbus-0.92/.mtn2git_empty
diff --git a/packages/dbus/dbus-0.92/dbus-1.init b/packages/dbus/dbus-0.92/dbus-1.init
new file mode 100644
index 0000000000..60440b7223
--- /dev/null
+++ b/packages/dbus/dbus-0.92/dbus-1.init
@@ -0,0 +1,86 @@
+#! /bin/sh
+# -*- coding: utf-8 -*-
+# Debian init.d script for D-BUS
+# Copyright © 2003 Colin Walters <walters@debian.org>
+
+set -e
+
+DAEMON=/usr/bin/dbus-daemon
+NAME=dbus-1
+DAEMONUSER=messagebus
+PIDDIR=/var/run/dbus
+PIDFILE=$PIDDIR/pid
+DESC="system message bus"
+EVENTDIR=/etc/dbus-1/event.d
+
+test -x $DAEMON || exit 0
+
+# Source defaults file; edit that file to configure this script.
+ENABLED=1
+PARAMS=""
+if [ -e /etc/default/dbus-1 ]; then
+  . /etc/default/dbus-1
+fi
+
+test "$ENABLED" != "0" || exit 0
+
+start_it_up()
+{
+  if [ ! -d $PIDDIR ]; then
+    mkdir -p $PIDDIR
+    chown $DAEMONUSER $PIDDIR
+    chgrp $DAEMONUSER $PIDDIR
+  fi
+  if [ -e $PIDFILE ]; then
+    PIDDIR=/proc/$(cat $PIDFILE)
+    if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then 
+      echo "$DESC already started; not starting."
+    else
+      echo "Removing stale PID file $PIDFILE."
+      rm -f $PIDFILE
+    fi
+  fi
+  echo -n "Starting $DESC: "
+  start-stop-daemon --start --quiet --pidfile $PIDFILE \
+    --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  if [ -d $EVENTDIR ]; then
+      run-parts --arg=start $EVENTDIR
+  fi
+}
+
+shut_it_down()
+{
+  if [ -d $EVENTDIR ]; then
+      run-parts --reverse --arg=stop $EVENTDIR
+  fi
+  echo -n "Stopping $DESC: "
+  start-stop-daemon --stop  --quiet --pidfile $PIDFILE \
+    --user $DAEMONUSER
+  # We no longer include these arguments so that start-stop-daemon
+  # can do its job even given that we may have been upgraded.
+  # We rely on the pidfile being sanely managed
+  # --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  rm -f $PIDFILE
+}
+
+case "$1" in
+  start)
+    start_it_up
+  ;;
+  stop)
+    shut_it_down
+  ;;
+  restart|force-reload)
+    shut_it_down
+    sleep 1
+    start_it_up
+  ;;
+  *)
+    echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
+    exit 1
+  ;;
+esac
+
+exit 0
diff --git a/packages/dbus/dbus-0.92/fix-install-daemon.patch b/packages/dbus/dbus-0.92/fix-install-daemon.patch
new file mode 100644
index 0000000000..0cfe5db650
--- /dev/null
+++ b/packages/dbus/dbus-0.92/fix-install-daemon.patch
@@ -0,0 +1,11 @@
+--- dbus-0.92/bus/Makefile.am.orig	2006-08-20 14:37:07.393810316 +0200
++++ dbus-0.92/bus/Makefile.am	2006-08-20 14:38:01.509274554 +0200
+@@ -107,7 +107,7 @@
+  		$(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
+  		chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
+  	fi
+-	$(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
++	$(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
+ 	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
+ 	$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
diff --git a/packages/dbus/dbus-0.92/fix-segfault.patch b/packages/dbus/dbus-0.92/fix-segfault.patch
new file mode 100644
index 0000000000..de5bcff774
--- /dev/null
+++ b/packages/dbus/dbus-0.92/fix-segfault.patch
@@ -0,0 +1,11 @@
+--- /tmp/dbus-marshal-recursive.c	2006-07-28 14:58:08.000000000 +0200
++++ dbus-0.90/dbus/dbus-marshal-recursive.c	2006-07-28 14:58:18.724411000 +0200
+@@ -1294,7 +1294,7 @@
+                                                _dbus_string_get_length (&block->replacement) - block->padding,
+                                                &fixups))
+     goto oom;
+-
++printf("%s(%d)""got here", __FILE__, __LINE__);
+ #if RECURSIVE_MARSHAL_WRITE_TRACE
+   _dbus_verbose ("REPLACEMENT at padding %d len %d\n", block->padding,
+                  _dbus_string_get_length (&block->replacement) - block->padding);
diff --git a/packages/dbus/dbus_0.92.bb b/packages/dbus/dbus_0.92.bb
new file mode 100644
index 0000000000..a4ab61322f
--- /dev/null
+++ b/packages/dbus/dbus_0.92.bb
@@ -0,0 +1,64 @@
+DEFAULT_PREFERENCE="-1"
+
+SECTION = "base"
+PR = "r1"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+DESCRIPTION = "message bus system for applications to talk to one another"
+LICENSE = "GPL"
+DEPENDS = "expat glib-2.0 virtual/libintl"
+
+SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
+	   file://cross.patch;patch=1 \
+	   file://tmpdir.patch;patch=1 \
+	   file://dbus-1.init \
+	   file://fix-segfault.patch;patch=1 \
+	   file://fix-install-daemon.patch;patch=1"
+
+inherit autotools pkgconfig update-rc.d gettext
+
+INITSCRIPT_NAME = "dbus-1"
+INITSCRIPT_PARAMS = "defaults"
+
+CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
+
+FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/dbus-1.0/include"
+
+pkg_postinst_dbus() {
+#!/bin/sh
+
+# can't do adduser stuff offline
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+MESSAGEUSER=messagebus
+MESSAGEHOME=/var/run/dbus
+
+mkdir -p $MESSAGEHOME || true
+chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
+chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
+}
+
+EXTRA_OECONF = "--disable-qt  --disable-qt3 --disable-gtk --disable-tests \
+		--disable-checks --disable-xml-docs --disable-doxygen-docs \
+		--with-xml=expat --without-x"
+
+do_stage () {
+	oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
+
+	autotools_stage_includes
+
+	mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+	install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+}
+
+do_install_append () {
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
+}
+
+python populate_packages_prepend () {
+	if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+		bb.data.setVar('PKG_dbus', 'dbus-1', d)
+}
diff --git a/packages/gnome/libsoup_2.2.96.bb b/packages/gnome/libsoup_2.2.