clean up dbus directory, remove unused patches, make better use of .inc file

31 files changed, 64 insertions, 1516 deletions

diff --git a/packages/dbus/dbus-1.0.1/.mtn2git_empty b/packages/dbus/dbus-1.0.1/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/dbus/dbus-1.0.1/.mtn2git_empty
+++ /dev/null
diff --git a/packages/dbus/dbus-1.0.1/cross.patch b/packages/dbus/dbus-1.0.1/cross.patch
deleted file mode 100644
index 268a3ae3de..0000000000
--- a/packages/dbus/dbus-1.0.1/cross.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- /tmp/configure.in	2006-11-09 21:47:10.000000000 +0100
-+++ dbus-0.95/configure.in	2006-11-09 21:48:13.108554000 +0100
-@@ -719,6 +719,7 @@
-     exit (0);
- ]])],
-               [ac_cv_have_abstract_sockets=yes],
-+	      [ac_cv_have_abstract_sockets=no],
-               [ac_cv_have_abstract_sockets=no]
- )])
- AC_LANG_POP(C)
diff --git a/packages/dbus/dbus-1.0.1/dbus-1.init b/packages/dbus/dbus-1.0.1/dbus-1.init
deleted file mode 100644
index 38e7574ad5..0000000000
--- a/packages/dbus/dbus-1.0.1/dbus-1.init
+++ /dev/null
@@ -1,96 +0,0 @@
-#! /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
-DAEMONUSER=messagebus
-PIDDIR=/var/run/dbus
-PIDFILE=$PIDDIR/pid
-UUIDDIR=/var/lib/dbus
-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 ]; then
-  . /etc/default/dbus
-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
-
-  if [ ! -d $UUIDDIR ]; then
-    mkdir -p $UUIDDIR
-    chown $DAEMONUSER $UUIDDIR
-    chgrp $DAEMONUSER $UUIDDIR
-  fi
- 
-  dbus-uuidgen --ensure  
-
-  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-1.0.1/dbus-exploit-fix.patch b/packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch
deleted file mode 100644
index 7d36dbdf22..0000000000
--- a/packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.freedesktop.org/show_bug.cgi?id=9142
-
-[..] the use case was the following. There
-are three processes A, B, and C. All of them add the same match (same value). A
-is started first, then B, and lastly C. Now, B and C are closed: if B is closed
-before C, A's match is removed; but if C is closed before B, A's match is not
-removed (no buggy behaviour). (B and C call dbus_bus_remove_match on exit.)
-
-diff -pur 0.61-osso23/bus/signals.c 0.61-osso23.new/bus/signals.c
---- 0.61-osso23/bus/signals.c	2006-11-23 16:46:52.589602192 +0200
-+++ 0.61-osso23.new/bus/signals.c	2006-11-23 16:49:28.873843376 +0200
-@@ -1067,6 +1067,9 @@ match_rule_equal (BusMatchRule *a,
-   if (a->flags != b->flags)
-     return FALSE;
- 
-+  if (a->matches_go_to != b->matches_go_to)
-+    return FALSE;
-+
-   if ((a->flags & BUS_MATCH_MESSAGE_TYPE) &&
-       a->message_type != b->message_type)
-     return FALSE;
diff --git a/packages/dbus/dbus-1.0.1/fix-install-daemon.patch b/packages/dbus/dbus-1.0.1/fix-install-daemon.patch
deleted file mode 100644
index c31786357d..0000000000
--- a/packages/dbus/dbus-1.0.1/fix-install-daemon.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: dbus-0.94/bus/Makefile.am
-===================================================================
---- dbus-0.94.orig/bus/Makefile.am	2006-10-01 17:36:18.000000000 +0200
-+++ dbus-0.94/bus/Makefile.am	2006-10-14 21:40:05.000000000 +0200
-@@ -110,7 +110,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/tmpdir.patch b/packages/dbus/dbus-1.0.2/tmpdir.patch
index 838b903f0a..838b903f0a 100644
--- a/packages/dbus/dbus/tmpdir.patch
+++ b/packages/dbus/dbus-1.0.2/tmpdir.patch
diff --git a/packages/dbus/dbus-glib-native/.mtn2git_empty b/packages/dbus/dbus-glib-native/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/dbus/dbus-glib-native/.mtn2git_empty
+++ /dev/null
diff --git a/packages/dbus/dbus-glib-native/run-with-tmp-session-bus.patch b/packages/dbus/dbus-glib-native/run-with-tmp-session-bus.patch
deleted file mode 100644
index 186abdb56b..0000000000
--- a/packages/dbus/dbus-glib-native/run-with-tmp-session-bus.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- dbus-glib-0.71/tools/Makefile.am.orig	2006-08-27 12:54:34.351198198 +0200
-+++ dbus-glib-0.71/tools/Makefile.am	2006-08-27 12:55:12.533584373 +0200
-@@ -9,7 +9,7 @@
- BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
- 
- dbus-bus-introspect.xml:
--	DBUS_TOP_BUILDDIR=$(top_builddir) dbus-send --system --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
-+	DBUS_TOP_BUILDDIR=$(top_builddir) ./run-with-tmp-session-bus.sh dbus-send --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
- 
- EXTRA_DIST = run-with-tmp-session-bus.sh
- 
---- dbus-glib-0.71/tools/run-with-tmp-session-bus.sh.orig	2006-08-27 11:52:17.497666746 +0200
-+++ dbus-glib-0.71/tools/run-with-tmp-session-bus.sh	2006-08-27 12:53:22.626715838 +0200
-@@ -27,16 +27,15 @@
- echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2
- 
- ## create a configuration file based on the standard session.conf
--cat $DBUS_TOP_BUILDDIR/tools/session.conf |  \
-+cat $datadir/dbus/session.conf |  \
-     sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' |  \
-     sed -e 's/<include.*$//g'                \
-   > $CONFIG_FILE
- 
- echo "Created configuration file $CONFIG_FILE" >&2
- 
--export PATH=$DBUS_TOP_BUILDDIR/bus:$PATH
- ## the libtool script found by the path search should already do this, but
--export LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH
-+export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
- 
- unset DBUS_SESSION_BUS_ADDRESS
- unset DBUS_SESSION_BUS_PID
diff --git a/packages/dbus/dbus-native_1.0.1.bb b/packages/dbus/dbus-native_1.0.1.bb
deleted file mode 100644
index 1ad5cf246a..0000000000
--- a/packages/dbus/dbus-native_1.0.1.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "Message bus system for applications to talk to one another"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-LICENSE = "GPL"
-SECTION = "base"
-
-PR = "r0"
-
-DEPENDS = "glib-2.0-native libxml2-native expat-native"
-
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-1.0.1"
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
-	   file://cross.patch;patch=1 \
-	   "
-
-inherit autotools pkgconfig gettext native
-
-S = "${WORKDIR}/dbus-${PV}"
-
-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_runmake install
-	autotools_stage_all
-
-	# for dbus-glib-native introspection generation
-	install -d ${STAGING_DATADIR}/dbus
-	install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
-}
diff --git a/packages/dbus/dbus-native_1.0.2.bb b/packages/dbus/dbus-native_1.0.2.bb
new file mode 100644
index 0000000000..ebd57b2876
--- /dev/null
+++ b/packages/dbus/dbus-native_1.0.2.bb
@@ -0,0 +1,28 @@
+require dbus.inc
+DEFAULT_PREFERENCE = "1"
+
+inherit native
+
+DEPENDS = "glib-2.0-native libxml2-native expat-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
+
+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 \
+"
+
+do_stage() {
+	oe_runmake install
+	autotools_stage_all
+
+	# for dbus-glib-native introspection generation
+	install -d ${STAGING_DATADIR}/dbus
+	install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
+}
+
+do_install() {
+	:
+}
+
diff --git a/packages/dbus/dbus-native_1.1.1.bb b/packages/dbus/dbus-native_1.1.1.bb
deleted file mode 100644
index 72e2190f78..0000000000
--- a/packages/dbus/dbus-native_1.1.1.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "message bus system for applications to talk to one another"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-LICENSE = "GPL"
-SECTION = "base"
-
-PR = "r0"
-
-DEPENDS = "glib-2.0-native libxml2-native expat-native"
-
-DEFAULT_PREFERENCE = "-1"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-1.0.2"
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
-	   file://cross.patch;patch=1 \
-	   "
-
-inherit autotools pkgconfig gettext native
-
-S = "${WORKDIR}/dbus-${PV}"
-
-EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \
-                 --disable-doxygen-docs --with-xml=expat --without-x"
-
-do_stage () {
-	oe_runmake install
-	autotools_stage_all
-
-	# for dbus-glib-native introspection generation
-	install -d ${STAGING_DATADIR}/dbus
-	install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
-}
diff --git a/packages/dbus/dbus-native_1.1.4.bb b/packages/dbus/dbus-native_1.1.4.bb
new file mode 100644
index 0000000000..a006965a32
--- /dev/null
+++ b/packages/dbus/dbus-native_1.1.4.bb
@@ -0,0 +1,25 @@
+require dbus.inc
+inherit native
+
+DEPENDS = "glib-2.0-native libxml2-native expat-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
+
+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 \
+"
+
+do_stage() {
+	oe_runmake install
+	autotools_stage_all
+
+	# for dbus-glib-native introspection generation
+	install -d ${STAGING_DATADIR}/dbus
+	install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
+}
+
+do_install() {
+	:
+}
diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc
index ecd3d18e70..09fc7e389a 100644
--- a/packages/dbus/dbus.inc
+++ b/packages/dbus/dbus.inc
@@ -1,16 +1,18 @@
-SECTION = "base"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+HOMEPAGE = "http://dbus.freedesktop.org"
 DESCRIPTION = "Message bus system for applications to talk to one another"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl"
 
 DEFAULT_PREFERENCE = "-1"
 
-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 \
-          "
+SRC_URI = "\
+  http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
+  file://cross.patch;patch=1 \
+  file://tmpdir.patch;patch=1 \
+  file://fix-install-daemon.patch;patch=1 \
+  file://dbus-1.init \
+"
+S = "${WORKDIR}/dbus-${PV}"
 
 inherit autotools pkgconfig update-rc.d gettext
 
@@ -51,7 +53,7 @@ EXTRA_OECONF = "--disable-qt --disable-qt3  --disable-gtk --disable-tests \
 		--with-xml=expat --without-x"
 
 
-do_stage () {
+do_stage() {
 	oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
 
 	autotools_stage_includes
@@ -60,8 +62,7 @@ do_stage () {
 	install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
 }
 
-do_install_append () {
+do_install_append() {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
 }
-
diff --git a/packages/dbus/dbus/.mtn2git_empty b/packages/dbus/dbus/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/dbus/dbus/.mtn2git_empty
+++ /dev/null
diff --git a/packages/dbus/dbus/0.23.1.diff b/packages/dbus/dbus/0.23.1.diff
deleted file mode 100644
index d56e1afc9c..0000000000
--- a/packages/dbus/dbus/0.23.1.diff
+++ /dev/null
@@ -1,308 +0,0 @@
-diff -ur dbus-0.23/ChangeLog dbus-0.23.1/ChangeLog
---- dbus-0.23/ChangeLog	2005-01-13 00:48:43.000000000 +0200
-+++ dbus-0.23.1/ChangeLog	2005-02-11 20:25:48.000000000 +0200
-@@ -1,3 +1,33 @@
-+2005-02-11  Joe Shaw  <joeshaw@novell.com>
-+
-+	* NEWS: Update for 0.23.1
-+
-+	* configure.in: Release 0.23.1
-+
-+2005-02-10  Joe Shaw  <joeshaw@novell.com>
-+
-+	* dbus/dbus-connection.c
-+	(_dbus_connection_queue_received_message_link,
-+	_dbus_connection_message_sent): Add the path to
-+	the verbose output.
-+	(_dbus_connection_send_preallocated_and_unlock): Added.  Calls
-+	_dbus_connection_send_preallocated_unlocked(), updated the
-+	dispatch status, and unlocks.  Fixes a bug where certain
-+	situations (like a broken pipe) could cause a Disconnect message
-+	to not be sent, tricking the bus into thinking a service was still
-+	there when the process had quit.
-+	(_dbus_connection_send_preallocated): Call
-+	_dbus_connection_send_preallocated_and_unlock().
-+	(_dbus_connection_send_and_unlock): Added.  Calls
-+	_dbus_connection_send_preallocated_and_unlock().
-+	(dbus_connection_send): Call _dbus_connection_send_and_unlock().
-+	(dbus_connection_send_with_reply): Update the dispatch status and
-+	unlock.
-+
-+	* mono/Service.cs (~Service): Added.  Removes the filter so that
-+	we don't get unmanaged code calling back into a GCed delegate.
-+	(RemoveFilter); Added.
-+
- 2005-01-12  Joe Shaw  <joeshaw@novell.com>
- 
- 	* NEWS: Update for 0.23.
-diff -ur dbus-0.23/NEWS dbus-0.23.1/NEWS
---- dbus-0.23/NEWS	2005-01-13 00:20:40.000000000 +0200
-+++ dbus-0.23.1/NEWS	2005-02-11 20:25:16.000000000 +0200
-@@ -1,3 +1,11 @@
-+D-BUS 0.23.1 (11 Feb 2005)
-+===
-+- fix a bug in which the bus daemon wouldn't recognize that a service
-+  owner quit
-+- fix a bug in the mono bindings that would cause unmanaged code to
-+  call back into a delegate that had been garbage collected and
-+  crashed.
-+
- D-BUS 0.23 (11 Jan 2005)
- ===
- 
-diff -ur dbus-0.23/configure dbus-0.23.1/configure
---- dbus-0.23/configure	2005-01-13 00:21:25.000000000 +0200
-+++ dbus-0.23.1/configure	2005-02-11 19:53:33.000000000 +0200
-@@ -1826,7 +1826,7 @@
- 
- # Define the identity of the package.
-  PACKAGE=dbus
-- VERSION=0.23
-+ VERSION=0.23.1
- 
- 
- cat >>confdefs.h <<_ACEOF
-diff -ur dbus-0.23/configure.in dbus-0.23.1/configure.in
---- dbus-0.23/configure.in	2005-01-13 00:20:40.000000000 +0200
-+++ dbus-0.23.1/configure.in	2005-02-11 19:53:09.000000000 +0200
-@@ -3,7 +3,7 @@
- 
- AC_INIT(dbus/dbus.h)
- 
--AM_INIT_AUTOMAKE(dbus, 0.23)
-+AM_INIT_AUTOMAKE(dbus, 0.23.1)
- 
- AM_CONFIG_HEADER(config.h)
- 
-diff -ur dbus-0.23/dbus/dbus-connection.c dbus-0.23.1/dbus/dbus-connection.c
---- dbus-0.23/dbus/dbus-connection.c	2005-01-11 21:31:56.000000000 +0200
-+++ dbus-0.23.1/dbus/dbus-connection.c	2005-02-11 19:52:47.000000000 +0200
-@@ -358,9 +358,10 @@
- 
-   _dbus_connection_wakeup_mainloop (connection);
-   
--  _dbus_verbose ("Message %p (%d %s %s '%s') added to incoming queue %p, %d incoming\n",
-+  _dbus_verbose ("Message %p (%d %s %s %s '%s') added to incoming queue %p, %d incoming\n",
-                  message,
-                  dbus_message_get_type (message),
-+		 dbus_message_get_path (message),
-                  dbus_message_get_interface (message) ?
-                  dbus_message_get_interface (message) :
-                  "no interface",
-@@ -473,9 +474,10 @@
-   
-   connection->n_outgoing -= 1;
- 
--  _dbus_verbose ("Message %p (%d %s %s '%s') removed from outgoing queue %p, %d left to send\n",
-+  _dbus_verbose ("Message %p (%d %s %s %s '%s') removed from outgoing queue %p, %d left to send\n",
-                  message,
-                  dbus_message_get_type (message),
-+		 dbus_message_get_path (message),
-                  dbus_message_get_interface (message) ?
-                  dbus_message_get_interface (message) :
-                  "no interface",
-@@ -1572,9 +1574,10 @@
-   }
- #endif
-   
--  _dbus_verbose ("Message %p (%d %s %s '%s') added to outgoing queue %p, %d pending to send\n",
-+  _dbus_verbose ("Message %p (%d %s %s %s '%s') added to outgoing queue %p, %d pending to send\n",
-                  message,
-                  dbus_message_get_type (message),
-+		 dbus_message_get_path (message),
-                  dbus_message_get_interface (message) ?
-                  dbus_message_get_interface (message) :
-                  "no interface",
-@@ -1606,12 +1609,30 @@
-   _dbus_connection_do_iteration (connection,
-                                  DBUS_ITERATION_DO_WRITING,
-                                  -1);
--  
-+
-   /* If stuff is still queued up, be sure we wake up the main loop */
-   if (connection->n_outgoing > 0)
-     _dbus_connection_wakeup_mainloop (connection);
- }
- 
-+static void
-+_dbus_connection_send_preallocated_and_unlock (DBusConnection       *connection,
-+					       DBusPreallocatedSend *preallocated,
-+					       DBusMessage          *message,
-+					       dbus_uint32_t        *client_serial)
-+{
-+  DBusDispatchStatus status;
-+
-+  _dbus_connection_send_preallocated_unlocked (connection,
-+                                               preallocated,
-+                                               message, client_serial);
-+
-+  status = _dbus_connection_get_dispatch_status_unlocked (connection);
-+
-+  /* this calls out to user code */
-+  _dbus_connection_update_dispatch_status_and_unlock (connection, status);
-+}
-+
- /**
-  * Sends a message using preallocated resources. This function cannot fail.
-  * It works identically to dbus_connection_send() in other respects.
-@@ -1642,10 +1663,9 @@
-                          dbus_message_get_member (message) != NULL));
-   
-   CONNECTION_LOCK (connection);
--  _dbus_connection_send_preallocated_unlocked (connection,
--                                               preallocated,
--                                               message, client_serial);
--  CONNECTION_UNLOCK (connection);  
-+  _dbus_connection_send_preallocated_and_unlock (connection,
-+						 preallocated,
-+						 message, client_serial);
- }
- 
- static dbus_bool_t
-@@ -1670,6 +1690,27 @@
-   return TRUE;
- }
- 
-+static dbus_bool_t
-+_dbus_connection_send_and_unlock (DBusConnection *connection,
-+				  DBusMessage    *message,
-+				  dbus_uint32_t  *client_serial)
-+{
-+  DBusPreallocatedSend *preallocated;
-+
-+  _dbus_assert (connection != NULL);
-+  _dbus_assert (message != NULL);
-+  
-+  preallocated = _dbus_connection_preallocate_send_unlocked (connection);
-+  if (preallocated == NULL)
-+    return FALSE;
-+
-+  _dbus_connection_send_preallocated_and_unlock (connection,
-+						 preallocated,
-+						 message,
-+						 client_serial);
-+  return TRUE;
-+}
-+
- /**
-  * Adds a message to the outgoing message queue. Does not block to
-  * write the message to the network; that happens asynchronously. To
-@@ -1698,14 +1739,9 @@
- 
-   CONNECTION_LOCK (connection);
- 
--  if (!_dbus_connection_send_unlocked (connection, message, client_serial))
--    {
--      CONNECTION_UNLOCK (connection);
--      return FALSE;
--    }
--
--  CONNECTION_UNLOCK (connection);
--  return TRUE;
-+  return _dbus_connection_send_and_unlock (connection,
-+					   message,
-+					   client_serial);
- }
- 
- static dbus_bool_t
-@@ -1784,6 +1820,7 @@
-   DBusMessage *reply;
-   DBusList *reply_link;
-   dbus_int32_t serial = -1;
-+  DBusDispatchStatus status;
- 
-   _dbus_return_val_if_fail (connection != NULL, FALSE);
-   _dbus_return_val_if_fail (message != NULL, FALSE);
-@@ -1845,8 +1882,11 @@
-   else
-     dbus_pending_call_unref (pending);
- 
--  CONNECTION_UNLOCK (connection);
--  
-+  status = _dbus_connection_get_dispatch_status_unlocked (connection);
-+
-+  /* this calls out to user code */
-+  _dbus_connection_update_dispatch_status_and_unlock (connection, status);
-+
-   return TRUE;
- 
-  error:
-@@ -2256,9 +2296,10 @@
-       link = _dbus_list_pop_first_link (&connection->incoming_messages);
-       connection->n_incoming -= 1;
- 
--      _dbus_verbose ("Message %p (%d %s %s '%s') removed from incoming queue %p, %d incoming\n",
-+      _dbus_verbose ("Message %p (%d %s %s %s '%s') removed from incoming queue %p, %d incoming\n",
-                      link->data,
-                      dbus_message_get_type (link->data),
-+		     dbus_message_get_path (link->data), 
-                      dbus_message_get_interface (link->data) ?
-                      dbus_message_get_interface (link->data) :
-                      "no interface",
-diff -ur dbus-0.23/mono/Service.cs dbus-0.23.1/mono/Service.cs
---- dbus-0.23/mono/Service.cs	2004-08-31 06:59:14.000000000 +0300
-+++ dbus-0.23.1/mono/Service.cs	2005-02-11 19:52:47.000000000 +0200
-@@ -23,6 +23,9 @@
-     private static AssemblyBuilder proxyAssembly;
-     private ModuleBuilder module = null;
- 
-+    // Add a match for signals. FIXME: Can we filter the service?
-+    private const string MatchRule = "type='signal'";
-+
-     internal Service(string name, Connection connection)
-     {
-       this.name = name;
-@@ -47,6 +50,12 @@
-       this.local = true;
-     }
- 
-+    ~Service ()
-+    {
-+      if (this.filterCalled != null)
-+        RemoveFilter ();
-+    }
-+
-     public static bool Exists(Connection connection, string name)
-     {
-       Error error = new Error();
-@@ -113,9 +122,17 @@
- 				      IntPtr.Zero))
- 	throw new OutOfMemoryException();
- 
--      // Add a match for signals. FIXME: Can we filter the service?
--      string rule = "type='signal'";
--      dbus_bus_add_match(connection.RawConnection, rule, IntPtr.Zero);
-+      dbus_bus_add_match(connection.RawConnection, MatchRule, IntPtr.Zero);
-+    }
-+
-+    private void RemoveFilter()
-+    {
-+      dbus_connection_remove_filter (Connection.RawConnection,
-+                                    this.filterCalled,
-+                                    IntPtr.Zero);
-+      this.filterCalled = null;
-+
-+      dbus_bus_remove_match (connection.RawConnection, MatchRule, IntPtr.Zero);
-     }
- 
-     private int Service_FilterCalled(IntPtr rawConnection,
-@@ -200,9 +217,19 @@
- 							  IntPtr freeData);
- 
-     [DllImport("dbus-1")]
-+    private extern static void dbus_connection_remove_filter(IntPtr rawConnection,
-+							     DBusHandleMessageFunction filter,
-+							     IntPtr userData);
-+
-+    [DllImport("dbus-1")]
-     private extern static void dbus_bus_add_match(IntPtr rawConnection,
- 						  string rule,
- 						  IntPtr erro);
- 
-+    [DllImport("dbus-1")]
-+    private extern static void dbus_bus_remove_match(IntPtr rawConnection,
-+						     string rule,
-+						     IntPtr erro);
-+
-   }
- }
diff --git a/packages/dbus/dbus/config.diff b/packages/dbus/dbus/config.diff
deleted file mode 100644
index b67c8d72fe..0000000000
--- a/packages/dbus/dbus/config.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Only in /home/kihamala/svn/dbus/bus: .svn
-diff -ur bus/session.conf.in /home/kihamala/svn/dbus/bus/session.conf.in
---- bus/session.conf.in	2004-10-25 21:48:58.000000000 +0300
-+++ /home/kihamala/svn/dbus/bus/session.conf.in	2005-02-15 11:03:26.000000000 +0200
-@@ -8,9 +8,10 @@
-   <!-- Our well-known bus type, don't change this -->
-   <type>session</type>
- 
--  <listen>unix:tmpdir=@DBUS_SESSION_SOCKET_DIR@</listen>
-+  <listen>unix:path=/tmp/session_bus_socket</listen>
- 
--  <servicedir>@EXPANDED_DATADIR@/dbus-1/services</servicedir>
-+  <servicedir>@EXPANDED_LIBDIR@/dbus-1.0/services</servicedir>
-+  <!-- <servicedir>/var/lib/install/usr/lib/dbus-1.0/services</servicedir> -->
- 
-   <policy context="default">
-     <!-- Allow everything to be sent -->
diff --git a/packages/dbus/dbus/cross.patch b/packages/dbus/dbus/cross.patch
deleted file mode 100644
index 6d1d9d8e7e..0000000000
--- a/packages/dbus/dbus/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- dbus-0.20/configure.in~cross
-+++ dbus-0.20/configure.in
-@@ -466,6 +466,7 @@
-     exit (0);
- ]])],
-               [have_abstract_sockets=yes],
-+              [have_abstract_sockets=no],
-               [have_abstract_sockets=no])
- AC_LANG_POP(C)
- AC_MSG_RESULT($have_abstract_sockets)
diff --git a/packages/dbus/dbus/dbus-1.init b/packages/dbus/dbus/dbus-1.init
deleted file mode 100644
index adefe7c5b1..0000000000
--- a/packages/dbus/dbus/dbus-1.init
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /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-1
-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
-
-te