diff options
author | Ross Burton <ross@openedhand.com> | 2008-01-16 08:15:45 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2008-01-16 08:15:45 +0000 |
commit | 531a9963094ae919680105319fd1a9281b568772 (patch) | |
tree | 421d821871ab0a4e027d03bfa6fb2540f3e00dad /meta/packages/dbus/dbus-1.1.2 | |
parent | 2172d34f67ad7bbeb8cf2a81f3f1285c779a2ec5 (diff) | |
download | openembedded-core-531a9963094ae919680105319fd1a9281b568772.tar.gz openembedded-core-531a9963094ae919680105319fd1a9281b568772.tar.bz2 openembedded-core-531a9963094ae919680105319fd1a9281b568772.tar.xz openembedded-core-531a9963094ae919680105319fd1a9281b568772.zip |
dbus: upgrade poky-bleeding to dbus 1.1.3
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3493 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/dbus/dbus-1.1.2')
-rw-r--r-- | meta/packages/dbus/dbus-1.1.2/cross.patch | 10 | ||||
-rw-r--r-- | meta/packages/dbus/dbus-1.1.2/dbus-1.init | 110 | ||||
-rw-r--r-- | meta/packages/dbus/dbus-1.1.2/fix-install-daemon.patch | 13 | ||||
-rw-r--r-- | meta/packages/dbus/dbus-1.1.2/fix-validate.patch | 49 | ||||
-rw-r--r-- | meta/packages/dbus/dbus-1.1.2/tmpdir.patch | 30 |
5 files changed, 0 insertions, 212 deletions
diff --git a/meta/packages/dbus/dbus-1.1.2/cross.patch b/meta/packages/dbus/dbus-1.1.2/cross.patch deleted file mode 100644 index 268a3ae3d..000000000 --- a/meta/packages/dbus/dbus-1.1.2/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/meta/packages/dbus/dbus-1.1.2/dbus-1.init b/meta/packages/dbus/dbus-1.1.2/dbus-1.init deleted file mode 100644 index 0725083c6..000000000 --- a/meta/packages/dbus/dbus-1.1.2/dbus-1.init +++ /dev/null @@ -1,110 +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 - # 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 diff --git a/meta/packages/dbus/dbus-1.1.2/fix-install-daemon.patch b/meta/packages/dbus/dbus-1.1.2/fix-install-daemon.patch deleted file mode 100644 index c31786357..000000000 --- a/meta/packages/dbus/dbus-1.1.2/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/meta/packages/dbus/dbus-1.1.2/fix-validate.patch b/meta/packages/dbus/dbus-1.1.2/fix-validate.patch deleted file mode 100644 index 3bfddca60..000000000 --- a/meta/packages/dbus/dbus-1.1.2/fix-validate.patch +++ /dev/null @@ -1,49 +0,0 @@ -commit ae4a1586969aaca534508837830d7d3de4ade070 -Author: Havoc Pennington <hp@redhat.com> -Date: Mon Jul 30 16:16:47 2007 +0000 - - 2007-07-30 Havoc Pennington <hp@redhat.com> - - * bus/activation-helper.c (check_bus_name): don't use - _dbus_check_valid_bus_name() which is only around with - --enable-checks, instead use _dbus_validate_bus_name(). - Bug #11766 from Diego <diego@pemas.net> - -diff --git a/bus/activation-helper.c b/bus/activation-helper.c -index 1636660..36006a4 100644 ---- a/bus/activation-helper.c -+++ b/bus/activation-helper.c -@@ -381,14 +381,20 @@ exec_for_correct_user (char *exec, char *user, DBusError *error) - } - - static dbus_bool_t --check_bus_name (const char *bus_name, DBusError *error) -+check_bus_name (const char *bus_name, -+ DBusError *error) - { -- if (!_dbus_check_is_valid_bus_name (bus_name)) -+ DBusString str; -+ -+ _dbus_string_init_const (&str, bus_name); -+ if (!_dbus_validate_bus_name (&str, 0, _dbus_string_get_length (&str))) - { - dbus_set_error (error, DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND, -- "bus name '%s' not found\n", bus_name); -+ "bus name '%s' is not a valid bus name\n", -+ bus_name); - return FALSE; - } -+ - return TRUE; - } - -@@ -517,7 +523,8 @@ check_dbus_user (BusConfigParser *parser, DBusError *error) - } - - dbus_bool_t --run_launch_helper (const char *bus_name, DBusError *error) -+run_launch_helper (const char *bus_name, -+ DBusError *error) - { - BusConfigParser *parser; - dbus_bool_t retval; diff --git a/meta/packages/dbus/dbus-1.1.2/tmpdir.patch b/meta/packages/dbus/dbus-1.1.2/tmpdir.patch deleted file mode 100644 index 838b903f0..000000000 --- a/meta/packages/dbus/dbus-1.1.2/tmpdir.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200 -+++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100 -@@ -1047,15 +1048,18 @@ - AC_SUBST(ABSOLUTE_TOP_BUILDDIR) - - #### Find socket directories --if ! test -z "$TMPDIR" ; then -- DEFAULT_SOCKET_DIR=$TMPDIR --elif ! test -z "$TEMP" ; then -- DEFAULT_SOCKET_DIR=$TEMP --elif ! test -z "$TMP" ; then -- DEFAULT_SOCKET_DIR=$TMP --else -- DEFAULT_SOCKET_DIR=/tmp --fi -+#if ! test -z "$TMPDIR" ; then -+# DEFAULT_SOCKET_DIR=$TMPDIR -+#elif ! test -z "$TEMP" ; then -+# DEFAULT_SOCKET_DIR=$TEMP -+#elif ! test -z "$TMP" ; then -+# DEFAULT_SOCKET_DIR=$TMP -+#else -+# DEFAULT_SOCKET_DIR=/tmp -+#fi -+ -+# checks disabled to avoid expanding this at build time -+DEFAULT_SOCKET_DIR=/tmp - - if ! test -z "$with_test_socket_dir" ; then - TEST_SOCKET_DIR="$with_test_socket_dir" |