[oe-commits] org.oe.dreambox dbus: backport from .dev
tmbinc commit
openembedded-commits at lists.openembedded.org
Sun Nov 25 18:36:18 UTC 2007
dbus: backport from .dev
Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: 4395fe86480dd9fbf3bc25e7f9f025b011ff7254
ViewMTN: http://monotone.openembedded.org/revision/info/4395fe86480dd9fbf3bc25e7f9f025b011ff7254
Files:
1
packages/dbus/dbus-1.0.1
packages/dbus/dbus-1.0.2
packages/dbus/dbus-c++
packages/dbus/dbus-glib-0.74
packages/dbus/dbus-glib-native-0.74
packages/dbus/dbus-1.0.1/cross.patch
packages/dbus/dbus-1.0.1/dbus-1.init
packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch
packages/dbus/dbus-1.0.1/fix-install-daemon.patch
packages/dbus/dbus-1.0.2/cross.patch
packages/dbus/dbus-1.0.2/dbus-1.init
packages/dbus/dbus-1.0.2/fix-install-daemon.patch
packages/dbus/dbus-1.0.2/fix-waitpid.patch
packages/dbus/dbus-c++/fix-linking.patch
packages/dbus/dbus-c++-native_svn.bb
packages/dbus/dbus-c++_svn.bb
packages/dbus/dbus-glib-0.74/no-examples.patch
packages/dbus/dbus-glib-0.74/no-introspect.patch
packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch
packages/dbus/dbus-glib-native_0.74.bb
packages/dbus/dbus-glib_0.74.bb
packages/dbus/dbus-native_1.0.1.bb
packages/dbus/dbus.inc
packages/dbus/dbus_1.0.1.bb
packages/dbus/dbus_1.0.2.bb
packages/dbus/dbus-python_0.71.bb
Diffs:
#
# mt diff -r7069315932d8d84f2f7a97441dac2050a4a7bb9e -r4395fe86480dd9fbf3bc25e7f9f025b011ff7254
#
#
#
# add_dir "packages/dbus/dbus-1.0.1"
#
# add_dir "packages/dbus/dbus-1.0.2"
#
# add_dir "packages/dbus/dbus-c++"
#
# add_dir "packages/dbus/dbus-glib-0.74"
#
# add_dir "packages/dbus/dbus-glib-native-0.74"
#
# add_file "packages/dbus/dbus-1.0.1/cross.patch"
# content [8893afa8766367ecce4e78b1bbede8c7e4781336]
#
# add_file "packages/dbus/dbus-1.0.1/dbus-1.init"
# content [bc3a39440ac2899bf95874522964413b2f7b584a]
#
# add_file "packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch"
# content [2c52ca724f0c399dff9f2e7f08e6a29660239109]
#
# add_file "packages/dbus/dbus-1.0.1/fix-install-daemon.patch"
# content [a130a0f9e1442b0848f09d45516d4c1fae678502]
#
# add_file "packages/dbus/dbus-1.0.2/cross.patch"
# content [8893afa8766367ecce4e78b1bbede8c7e4781336]
#
# add_file "packages/dbus/dbus-1.0.2/dbus-1.init"
# content [9bdceca2b1986db6ec905e8b53e6402be0b88e9a]
#
# add_file "packages/dbus/dbus-1.0.2/fix-install-daemon.patch"
# content [a130a0f9e1442b0848f09d45516d4c1fae678502]
#
# add_file "packages/dbus/dbus-1.0.2/fix-waitpid.patch"
# content [170cd83f6af4ab89522dd6f3d88a6079a3ddcb21]
#
# add_file "packages/dbus/dbus-c++/fix-linking.patch"
# content [e5f0399bc17b259bc61d3e586878c0e6673e4364]
#
# add_file "packages/dbus/dbus-c++-native_svn.bb"
# content [2687357d87d457007559964f5aa6f9cab8341da3]
#
# add_file "packages/dbus/dbus-c++_svn.bb"
# content [7b9016b6a0003a62f07983fb64cf288c46a87c17]
#
# add_file "packages/dbus/dbus-glib-0.74/no-examples.patch"
# content [212f8de63efa6cfd81d365c5684896be6bd77220]
#
# add_file "packages/dbus/dbus-glib-0.74/no-introspect.patch"
# content [eb74c635af538597efb4a14a9d5617198d392a3b]
#
# add_file "packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch"
# content [80764981ad7dabe1a9e4f43dba8bc9745f95bf86]
#
# add_file "packages/dbus/dbus-glib-native_0.74.bb"
# content [d4ea0635819a397d0e6d56b2801272629daaf604]
#
# add_file "packages/dbus/dbus-glib_0.74.bb"
# content [58e13a7d2c191154fc3aa8fdadca4c0675c7f149]
#
# add_file "packages/dbus/dbus-native_1.0.1.bb"
# content [833883e0548ac4f60201dad953b020969a952971]
#
# add_file "packages/dbus/dbus.inc"
# content [d8a78dad8d5e12e99e3fd73efe849de865f3e6c8]
#
# add_file "packages/dbus/dbus_1.0.1.bb"
# content [e01bd6fd36c624af9c31cd0f6020204db116a678]
#
# add_file "packages/dbus/dbus_1.0.2.bb"
# content [9de1f18991491d917d3af33afea1153ea2e6aca2]
#
# patch "packages/dbus/dbus-python_0.71.bb"
# from [f3ba0753e54211a9155fd055602ac478f4ffb024]
# to [222487d3f7e5dc5e948ab3338e763387a5f79a6d]
#
============================================================
--- packages/dbus/dbus-1.0.1/cross.patch 8893afa8766367ecce4e78b1bbede8c7e4781336
+++ packages/dbus/dbus-1.0.1/cross.patch 8893afa8766367ecce4e78b1bbede8c7e4781336
@@ -0,0 +1,10 @@
+--- /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)
============================================================
--- packages/dbus/dbus-1.0.1/dbus-1.init bc3a39440ac2899bf95874522964413b2f7b584a
+++ packages/dbus/dbus-1.0.1/dbus-1.init bc3a39440ac2899bf95874522964413b2f7b584a
@@ -0,0 +1,96 @@
+#! /bin/sh
+# -*- coding: utf-8 -*-
+# Debian init.d script for D-BUS
+# Copyright © 2003 Colin Walters <walters at 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
============================================================
--- packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch 2c52ca724f0c399dff9f2e7f08e6a29660239109
+++ packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch 2c52ca724f0c399dff9f2e7f08e6a29660239109
@@ -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;
============================================================
--- packages/dbus/dbus-1.0.1/fix-install-daemon.patch a130a0f9e1442b0848f09d45516d4c1fae678502
+++ packages/dbus/dbus-1.0.1/fix-install-daemon.patch a130a0f9e1442b0848f09d45516d4c1fae678502
@@ -0,0 +1,13 @@
+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
============================================================
--- packages/dbus/dbus-1.0.2/cross.patch 8893afa8766367ecce4e78b1bbede8c7e4781336
+++ packages/dbus/dbus-1.0.2/cross.patch 8893afa8766367ecce4e78b1bbede8c7e4781336
@@ -0,0 +1,10 @@
+--- /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)
============================================================
--- packages/dbus/dbus-1.0.2/dbus-1.init 9bdceca2b1986db6ec905e8b53e6402be0b88e9a
+++ packages/dbus/dbus-1.0.2/dbus-1.init 9bdceca2b1986db6ec905e8b53e6402be0b88e9a
@@ -0,0 +1,110 @@
+#! /bin/sh
+# -*- coding: utf-8 -*-
+# Debian init.d script for D-BUS
+# Copyright © 2003 Colin Walters <walters at 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
+ # TODO: --reverse when busybox supports it
+ run-parts --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
+}
+
+reload_it()
+{
+ echo -n "Reloading $DESC config: "
+ dbus-send --print-reply --system --type=method_call \
+ --dest=org.freedesktop.DBus \
+ / org.freedesktop.DBus.ReloadConfig > /dev/null
+ # hopefully this is enough time for dbus to reload it's config file.
+ echo "done."
+}
+
+case "$1" in
+ start)
+ start_it_up
+ ;;
+ stop)
+ shut_it_down
+ ;;
+ reload|force-reload)
+ reload_it
+ ;;
+ restart)
+ shut_it_down
+ sleep 1
+ start_it_up
+ ;;
+ *)
+ echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
============================================================
--- packages/dbus/dbus-1.0.2/fix-install-daemon.patch a130a0f9e1442b0848f09d45516d4c1fae678502
+++ packages/dbus/dbus-1.0.2/fix-install-daemon.patch a130a0f9e1442b0848f09d45516d4c1fae678502
@@ -0,0 +1,13 @@
+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
============================================================
--- packages/dbus/dbus-1.0.2/fix-waitpid.patch 170cd83f6af4ab89522dd6f3d88a6079a3ddcb21
+++ packages/dbus/dbus-1.0.2/fix-waitpid.patch 170cd83f6af4ab89522dd6f3d88a6079a3ddcb21
@@ -0,0 +1,11 @@
+--- /tmp/dbus-launch.c 2007-02-05 18:43:24.000000000 +0100
++++ dbus-1.0.2/tools/dbus-launch.c 2007-02-05 18:43:37.675251000 +0100
+@@ -622,7 +622,7 @@
+
+ exit_with_session = FALSE;
+ config_file = NULL;
+-
++ signal(SIGCHLD, SIG_DFL);
+ prev_arg = NULL;
+ i = 1;
+ while (i < argc)
============================================================
--- packages/dbus/dbus-c++/fix-linking.patch e5f0399bc17b259bc61d3e586878c0e6673e4364
+++ packages/dbus/dbus-c++/fix-linking.patch e5f0399bc17b259bc61d3e586878c0e6673e4364
@@ -0,0 +1,13 @@
+Index: dbus/tools/Makefile.am
+===================================================================
+--- dbus.orig/tools/Makefile.am
++++ dbus/tools/Makefile.am
+@@ -16,7 +16,7 @@ endif
+ bin_PROGRAMS = dbusxx-xml2cpp dbusxx-introspect
+
+ dbusxx_xml2cpp_SOURCES = xml.h xml.cpp xml2cpp.h xml2cpp.cpp
+-dbusxx_xml2cpp_LDADD = $(libdbus_cxx_la)
++dbusxx_xml2cpp_LDADD = $(libdbus_cxx_la) -lexpat
+
+ dbusxx_introspect_SOURCES = introspect.h introspect.cpp
+ dbusxx_introspect_LDADD = $(libdbus_cxx_la)
============================================================
--- packages/dbus/dbus-c++-native_svn.bb 2687357d87d457007559964f5aa6f9cab8341da3
+++ packages/dbus/dbus-c++-native_svn.bb 2687357d87d457007559964f5aa6f9cab8341da3
@@ -0,0 +1,21 @@
+require dbus-c++_${PV}.bb
+inherit native
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-c++"
+# actually dbus-native and expat-native, but even the bearest build machine should have that nowadays...
+DEPENDS = ""
+
+do_compile() {
+ oe_runmake -C src libdbus-c++-1.la
+ oe_runmake -C tools dbusxx-xml2cpp
+ install -m 0755 tools/dbusxx-xml2cpp ${STAGING_BINDIR_NATIVE}
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
+do_install() {
+ :
+}
+
============================================================
--- packages/dbus/dbus-c++_svn.bb 7b9016b6a0003a62f07983fb64cf288c46a87c17
+++ packages/dbus/dbus-c++_svn.bb 7b9016b6a0003a62f07983fb64cf288c46a87c17
@@ -0,0 +1,19 @@
+DESCRIPTION = "C++ bindings for dbus"
+LICENSE = "LGPL"
+SECTION = "libs"
+DEPENDS = "dbus dbus-c++-native expat"
+
+SRC_URI = "svn://dev.openwengo.org/svn/openwengo/wengophone-ng/branches/wengophone-dbus-api/libs;module=dbus;proto=http"
+# file://fix-linking.patch;patch=1"
+S = "${WORKDIR}/dbus"
+
+inherit autotools pkgconfig
+
+do_compile_prepend() {
+ find . -name "Makefile.am" |xargs sed -i -e 's,$(top_builddir)/tools/dbusxx-xml2cpp,dbusxx-xml2cpp,'
+}
+
+FILES_${PN}-dbg += "${bindir}/dbusxx-xml2cpp ${bindir}/dbusxx-introspect"
+FILES_${PN}-dev += "${bindir}/.dev"
+FILES_${PN} = "${libdir}/*.so.*"
+
============================================================
--- packages/dbus/dbus-glib-0.74/no-examples.patch 212f8de63efa6cfd81d365c5684896be6bd77220
+++ packages/dbus/dbus-glib-0.74/no-examples.patch 212f8de63efa6cfd81d365c5684896be6bd77220
@@ -0,0 +1,8 @@
+--- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200
++++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = . examples
++SUBDIRS = .
+
+ INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
+
============================================================
--- packages/dbus/dbus-glib-0.74/no-introspect.patch eb74c635af538597efb4a14a9d5617198d392a3b
+++ packages/dbus/dbus-glib-0.74/no-introspect.patch eb74c635af538597efb4a14a9d5617198d392a3b
@@ -0,0 +1,14 @@
+Index: dbus-glib-0.73/tools/Makefile.am
+===================================================================
+--- dbus-glib-0.73.orig/tools/Makefile.am 2006-10-25 21:10:36.000000000 +0200
++++ dbus-glib-0.73/tools/Makefile.am 2006-10-27 10:07:35.000000000 +0200
+@@ -3,9 +3,6 @@
+ nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
+ libdbus_glibdir = $(includedir)/dbus-1.0/dbus
+
+-dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
+- $(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
+-
+ BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
+
+ if USE_INTROSPECT_XML
========================================================%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list