summaryrefslogtreecommitdiff
path: root/packages/dbus
diff options
context:
space:
mode:
Diffstat (limited to 'packages/dbus')
-rw-r--r--packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch21
-rw-r--r--packages/dbus/dbus-1.0.2/.mtn2git_empty (renamed from packages/dbus/dbus-0.95/.mtn2git_empty)0
-rw-r--r--packages/dbus/dbus-1.0.2/cross.patch (renamed from packages/dbus/dbus-0.95/cross.patch)0
-rw-r--r--packages/dbus/dbus-1.0.2/dbus-1.init (renamed from packages/dbus/dbus-0.95/dbus-1.init)8
-rw-r--r--packages/dbus/dbus-1.0.2/fix-install-daemon.patch (renamed from packages/dbus/dbus-0.95/fix-install-daemon.patch)0
-rw-r--r--packages/dbus/dbus.inc2
-rw-r--r--packages/dbus/dbus_0.95.bb63
-rw-r--r--packages/dbus/dbus_1.0.1.bb4
-rw-r--r--packages/dbus/dbus_1.0.2.bb3
9 files changed, 36 insertions, 65 deletions
diff --git a/packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch b/packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch
new file mode 100644
index 0000000000..7d36dbdf22
--- /dev/null
+++ b/packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch
@@ -0,0 +1,21 @@
+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-0.95/.mtn2git_empty b/packages/dbus/dbus-1.0.2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/dbus/dbus-0.95/.mtn2git_empty
+++ b/packages/dbus/dbus-1.0.2/.mtn2git_empty
diff --git a/packages/dbus/dbus-0.95/cross.patch b/packages/dbus/dbus-1.0.2/cross.patch
index 268a3ae3de..268a3ae3de 100644
--- a/packages/dbus/dbus-0.95/cross.patch
+++ b/packages/dbus/dbus-1.0.2/cross.patch
diff --git a/packages/dbus/dbus-0.95/dbus-1.init b/packages/dbus/dbus-1.0.2/dbus-1.init
index 4829c0d4a8..38e7574ad5 100644
--- a/packages/dbus/dbus-0.95/dbus-1.init
+++ b/packages/dbus/dbus-1.0.2/dbus-1.init
@@ -10,6 +10,7 @@ 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
@@ -40,8 +41,15 @@ start_it_up()
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
diff --git a/packages/dbus/dbus-0.95/fix-install-daemon.patch b/packages/dbus/dbus-1.0.2/fix-install-daemon.patch
index c31786357d..c31786357d 100644
--- a/packages/dbus/dbus-0.95/fix-install-daemon.patch
+++ b/packages/dbus/dbus-1.0.2/fix-install-daemon.patch
diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc
index d87975a20e..8baf8d9feb 100644
--- a/packages/dbus/dbus.inc
+++ b/packages/dbus/dbus.inc
@@ -2,7 +2,7 @@ SECTION = "base"
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"
+DEPENDS = "expat virtual/libintl"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://tmpdir.patch;patch=1 \
diff --git a/packages/dbus/dbus_0.95.bb b/packages/dbus/dbus_0.95.bb
deleted file mode 100644
index 688e5c630f..0000000000
--- a/packages/dbus/dbus_0.95.bb
+++ /dev/null
@@ -1,63 +0,0 @@
-DEFAULT_PREFERENCE = "-1"
-
-SECTION = "base"
-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://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
- file://tmpdir.patch;patch=1 \
- file://dbus-1.init \
- file://fix-segfault.patch;patch=1 \
- file://cross.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 ${bindir}/dbus-uuidgen ${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/dbus/dbus_1.0.1.bb b/packages/dbus/dbus_1.0.1.bb
index 0198fa62c8..3c45ee8bd6 100644
--- a/packages/dbus/dbus_1.0.1.bb
+++ b/packages/dbus/dbus_1.0.1.bb
@@ -1,3 +1,5 @@
require dbus.inc
-PR = "r1"
+SRC_URI += "file://dbus-exploit-fix.patch;patch=1"
+
+PR = "r3"
diff --git a/packages/dbus/dbus_1.0.2.bb b/packages/dbus/dbus_1.0.2.bb
new file mode 100644
index 0000000000..0198fa62c8
--- /dev/null
+++ b/packages/dbus/dbus_1.0.2.bb
@@ -0,0 +1,3 @@
+require dbus.inc
+
+PR = "r1"