diff options
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-core/dbus/dbus-1.2.24/0001-Make-the-default-DBus-reply-timeout-configurable.patch | 78 | ||||
-rw-r--r-- | meta-oe/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch | 13 | ||||
-rw-r--r-- | meta-oe/recipes-core/dbus/dbus.inc | 104 | ||||
-rw-r--r-- | meta-oe/recipes-core/dbus/dbus/add-configurable-reply-timeouts.patch | 48 | ||||
-rw-r--r-- | meta-oe/recipes-core/dbus/dbus/anon.patch | 13 | ||||
-rw-r--r-- | meta-oe/recipes-core/dbus/dbus/dbus-1.init | 111 | ||||
-rw-r--r-- | meta-oe/recipes-core/dbus/dbus/reuseaddr01.patch | 64 | ||||
-rw-r--r-- | meta-oe/recipes-core/dbus/dbus/reuseaddr02.patch | 38 | ||||
-rw-r--r-- | meta-oe/recipes-core/dbus/dbus/tmpdir.patch | 30 | ||||
-rw-r--r-- | meta-oe/recipes-core/dbus/dbus_1.2.24.bb | 19 | ||||
-rw-r--r-- | meta-oe/recipes-core/dbus/dbus_1.4.0.bb | 18 |
11 files changed, 0 insertions, 536 deletions
diff --git a/meta-oe/recipes-core/dbus/dbus-1.2.24/0001-Make-the-default-DBus-reply-timeout-configurable.patch b/meta-oe/recipes-core/dbus/dbus-1.2.24/0001-Make-the-default-DBus-reply-timeout-configurable.patch deleted file mode 100644 index a38e3db0d..000000000 --- a/meta-oe/recipes-core/dbus/dbus-1.2.24/0001-Make-the-default-DBus-reply-timeout-configurable.patch +++ /dev/null | |||
@@ -1,78 +0,0 @@ | |||
1 | From fb546488e93a1638d377b228bbb0d2ab58462168 Mon Sep 17 00:00:00 2001 | ||
2 | From: Daniel Willmann <daniel@totalueberwachung.de> | ||
3 | Date: Thu, 2 Oct 2008 15:50:17 +0800 | ||
4 | Subject: [PATCH] Make the default DBus reply timeout configurable | ||
5 | |||
6 | This patch adds an option --with-dbus-default-reply-timeout to configure | ||
7 | that will set the default reply timeout used by libdbus in milliseconds. | ||
8 | autoconf and autoheader need to be rerun in order to regenerate the | ||
9 | correct configure and config.h.in files. | ||
10 | --- | ||
11 | configure.in | 9 +++++++++ | ||
12 | dbus/dbus-connection-internal.h | 3 --- | ||
13 | dbus/dbus-pending-call.c | 1 + | ||
14 | 3 files changed, 10 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/configure.in b/configure.in | ||
17 | index 62ac387..5c912d7 100644 | ||
18 | --- a/configure.in | ||
19 | +++ b/configure.in | ||
20 | @@ -88,6 +88,7 @@ AC_ARG_WITH(console-auth-dir, AS_HELP_STRING([--with-console-auth-dir=[dirname]] | ||
21 | AC_ARG_WITH(console-owner-file, AS_HELP_STRING([--with-console-owner-file=[filename]],[file whose owner determines current console owner])) | ||
22 | AC_ARG_WITH(dbus_user, AS_HELP_STRING([--with-dbus-user=<user>],[User for running the DBUS daemon (messagebus)])) | ||
23 | AC_ARG_WITH(dbus_daemondir, AS_HELP_STRING([--with-dbus-daemondir=[dirname]],[Directory for installing the DBUS daemon])) | ||
24 | +AC_ARG_WITH(dbus_default_reply_timeout, AS_HELP_STRING([--with-dbus-default-reply-timeout=[milliseconds]],[Default reply timeout for DBus method calls])) | ||
25 | |||
26 | AC_DEFINE(DBUS_UNIX,1,[dbus on unix]) | ||
27 | |||
28 | @@ -986,6 +987,13 @@ if test x$have_libaudit = xyes ; then | ||
29 | AC_DEFINE(HAVE_LIBAUDIT,1,[audit daemon SELinux support]) | ||
30 | fi | ||
31 | |||
32 | +if test -z "$with_dbus_default_reply_timeout" ; then | ||
33 | + DBUS_DEFAULT_REPLY_TIMEOUT=25000 | ||
34 | +else | ||
35 | + DBUS_DEFAULT_REPLY_TIMEOUT=$with_dbus_default_reply_timeout | ||
36 | +fi | ||
37 | +AC_DEFINE_UNQUOTED(_DBUS_DEFAULT_TIMEOUT_VALUE,$DBUS_DEFAULT_REPLY_TIMEOUT,[default timeout value for dbus calls]) | ||
38 | + | ||
39 | #### Set up final flags | ||
40 | DBUS_CLIENT_CFLAGS= | ||
41 | DBUS_CLIENT_LIBS="$THREAD_LIBS" | ||
42 | @@ -1348,6 +1356,7 @@ echo " | ||
43 | Gettext libs (empty OK): ${INTLLIBS} | ||
44 | Using XML parser: ${with_xml} | ||
45 | Init scripts style: ${with_init_scripts} | ||
46 | + Default reply timeout: ${DBUS_DEFAULT_REPLY_TIMEOUT} | ||
47 | Abstract socket names: ${ac_cv_have_abstract_sockets} | ||
48 | System bus socket: ${DBUS_SYSTEM_SOCKET} | ||
49 | System bus address: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} | ||
50 | diff --git a/dbus/dbus-connection-internal.h b/dbus/dbus-connection-internal.h | ||
51 | index df54412..5fe536b 100644 | ||
52 | --- a/dbus/dbus-connection-internal.h | ||
53 | +++ b/dbus/dbus-connection-internal.h | ||
54 | @@ -41,9 +41,6 @@ typedef enum | ||
55 | DBUS_ITERATION_BLOCK = 1 << 2 /**< Block if nothing to do. */ | ||
56 | } DBusIterationFlags; | ||
57 | |||
58 | -/** default timeout value when waiting for a message reply, 25 seconds */ | ||
59 | -#define _DBUS_DEFAULT_TIMEOUT_VALUE (25 * 1000) | ||
60 | - | ||
61 | void _dbus_connection_lock (DBusConnection *connection); | ||
62 | void _dbus_connection_unlock (DBusConnection *connection); | ||
63 | DBusConnection * _dbus_connection_ref_unlocked (DBusConnection *connection); | ||
64 | diff --git a/dbus/dbus-pending-call.c b/dbus/dbus-pending-call.c | ||
65 | index 51b9378..5a7a5f4 100644 | ||
66 | --- a/dbus/dbus-pending-call.c | ||
67 | +++ b/dbus/dbus-pending-call.c | ||
68 | @@ -21,6 +21,7 @@ | ||
69 | * | ||
70 | */ | ||
71 | |||
72 | +#include <config.h> | ||
73 | #include "dbus-internals.h" | ||
74 | #include "dbus-connection-internal.h" | ||
75 | #include "dbus-pending-call-internal.h" | ||
76 | -- | ||
77 | 1.5.6.4 | ||
78 | |||
diff --git a/meta-oe/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch b/meta-oe/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch deleted file mode 100644 index 5e25d1227..000000000 --- a/meta-oe/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: dbus-0.94/bus/Makefile.am | ||
2 | =================================================================== | ||
3 | --- dbus-0.94.orig/bus/Makefile.am 2006-10-01 17:36:18.000000000 +0200 | ||
4 | +++ dbus-0.94/bus/Makefile.am 2006-10-14 21:40:05.000000000 +0200 | ||
5 | @@ -110,7 +110,7 @@ | ||
6 | $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \ | ||
7 | chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \ | ||
8 | fi | ||
9 | - $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) | ||
10 | + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) | ||
11 | $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus | ||
12 | $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d | ||
13 | $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services | ||
diff --git a/meta-oe/recipes-core/dbus/dbus.inc b/meta-oe/recipes-core/dbus/dbus.inc deleted file mode 100644 index 2ae5b1d86..000000000 --- a/meta-oe/recipes-core/dbus/dbus.inc +++ /dev/null | |||
@@ -1,104 +0,0 @@ | |||
1 | DESCRIPTION = "A message bus system for inter-process communication" | ||
2 | HOMEPAGE = "http://dbus.freedesktop.org" | ||
3 | SECTION = "base" | ||
4 | LICENSE = "AFL2.1 | GPLv2+" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ | ||
6 | file://dbus/dbus.h;firstline=6;endline=20;md5=6eea2e0c7750dd8e620dcb1437312fa5" | ||
7 | DEPENDS = "expat virtual/libintl libsm libice virtual/libx11 libxdmcp" | ||
8 | |||
9 | INC_PR = "r20" | ||
10 | |||
11 | SRC_URI = "\ | ||
12 | http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz;name=dbus \ | ||
13 | file://cross.patch \ | ||
14 | file://tmpdir.patch \ | ||
15 | file://fix-install-daemon.patch \ | ||
16 | file://0001-Make-the-default-DBus-reply-timeout-configurable.patch \ | ||
17 | file://dbus-1.init \ | ||
18 | " | ||
19 | |||
20 | S = "${WORKDIR}/dbus-${PV}" | ||
21 | |||
22 | inherit autotools pkgconfig update-rc.d gettext | ||
23 | |||
24 | EXTRA_OECONF_X = "--with-x" | ||
25 | |||
26 | EXTRA_OECONF = "\ | ||
27 | --disable-qt \ | ||
28 | --disable-qt3 \ | ||
29 | --disable-gtk \ | ||
30 | --disable-tests \ | ||
31 | --disable-checks \ | ||
32 | --disable-xml-docs \ | ||
33 | --disable-doxygen-docs \ | ||
34 | --disable-libaudit \ | ||
35 | --with-xml=expat \ | ||
36 | --with-dbus-default-reply-timeout=200000 \ | ||
37 | ${EXTRA_OECONF_X} \ | ||
38 | " | ||
39 | |||
40 | # On mipsel, D-Bus fails to link with --gc-sections and segfaults before main() | ||
41 | # when built with -fPIE/-pie. | ||
42 | do_configure_prepend_mipsel() { | ||
43 | sed -i -e 's/\-fPIE//' \ | ||
44 | -e 's/\-pie\ \-Wl\,\-z\,relro//' \ | ||
45 | -e 's/-Wl,--gc-sections//' \ | ||
46 | ${S}/configure.in | ||
47 | } | ||
48 | |||
49 | do_install_append() { | ||
50 | install -d ${D}${sysconfdir}/init.d | ||
51 | install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 | ||
52 | # the stock install seems to install the libtool wrapper script, so we have to copy this manually :M: | ||
53 | if [ -e bus/.libs/dbus-daemon-launch-helper ]; then | ||
54 | install -d ${D}${libexecdir}/ | ||
55 | install -m 0755 bus/.libs/dbus-daemon-launch-helper ${D}${libexecdir}/ | ||
56 | fi | ||
57 | } | ||
58 | |||
59 | RDEPENDS_${PN}-x11 = "${PN}" | ||
60 | RRECOMMENDS_${PN}-lib = "${PN}" | ||
61 | RCONFLICTS_${PN} = "dbus-1" | ||
62 | RREPLACES_${PN} = "dbus-1" | ||
63 | RPROVIDES_${PN} = "dbus-1" | ||
64 | |||
65 | PACKAGES =+ "${PN}-lib ${PN}-x11" | ||
66 | |||
67 | FILES_${PN} = "\ | ||
68 | ${bindir}/dbus-daemon* \ | ||
69 | ${bindir}/dbus-uuidgen \ | ||
70 | ${bindir}/dbus-cleanup-sockets \ | ||
71 | ${bindir}/dbus-send \ | ||
72 | ${bindir}/dbus-monitor \ | ||
73 | ${libexecdir}/dbus* \ | ||
74 | ${sysconfdir} \ | ||
75 | ${datadir}/dbus-1/services \ | ||
76 | ${datadir}/dbus-1/system-services \ | ||
77 | " | ||
78 | FILES_${PN}-lib = "${libdir}/lib*.so.*" | ||
79 | FILES_${PN}-x11 = "\ | ||
80 | ${bindir}/dbus-launch \ | ||
81 | " | ||
82 | FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool ${libdir}/" | ||
83 | |||
84 | pkg_postinst_${PN}() { | ||
85 | #!/bin/sh | ||
86 | # can't do adduser stuff offline | ||
87 | if [ "x$D" != "x" ]; then | ||
88 | exit 1 | ||
89 | fi | ||
90 | MESSAGEUSER=messagebus | ||
91 | MESSAGEHOME=/var/run/dbus | ||
92 | mkdir -p $MESSAGEHOME || true | ||
93 | grep -q ^$MESSAGEUSER: /etc/group || addgroup "$MESSAGEUSER" | ||
94 | chgrp "$MESSAGEUSER" "$MESSAGEHOME" | ||
95 | grep -q ^$MESSAGEUSER: /etc/passwd || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER" | ||
96 | chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" | ||
97 | grep -q netdev: /etc/group || addgroup netdev | ||
98 | chmod u+s /usr/libexec/dbus-daemon-launch-helper | ||
99 | } | ||
100 | |||
101 | CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" | ||
102 | |||
103 | INITSCRIPT_NAME = "dbus-1" | ||
104 | INITSCRIPT_PARAMS = "start 02 5 2 . stop 20 0 1 6 ." | ||
diff --git a/meta-oe/recipes-core/dbus/dbus/add-configurable-reply-timeouts.patch b/meta-oe/recipes-core/dbus/dbus/add-configurable-reply-timeouts.patch deleted file mode 100644 index 9cca38ddc..000000000 --- a/meta-oe/recipes-core/dbus/dbus/add-configurable-reply-timeouts.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | Index: dbus-1.3.1/configure.in | ||
2 | =================================================================== | ||
3 | --- dbus-1.3.1.orig/configure.in | ||
4 | +++ dbus-1.3.1/configure.in | ||
5 | @@ -137,6 +137,7 @@ | ||
6 | AC_ARG_WITH(console-owner-file, AS_HELP_STRING([--with-console-owner-file=[filename]],[file whose owner determines current console owner])) | ||
7 | AC_ARG_WITH(dbus_user, AS_HELP_STRING([--with-dbus-user=<user>],[User for running the DBUS daemon (messagebus)])) | ||
8 | AC_ARG_WITH(dbus_daemondir, AS_HELP_STRING([--with-dbus-daemondir=[dirname]],[Directory for installing the DBUS daemon])) | ||
9 | +AC_ARG_WITH(dbus_default_reply_timeout, AS_HELP_STRING([--with-dbus-default-reply-timeout=[milliseconds]],[Default reply timeout for DBus method calls])) | ||
10 | |||
11 | dnl DBUS_BUILD_TESTS controls unit tests built in to .c files | ||
12 | dnl and also some stuff in the test/ subdir | ||
13 | @@ -984,6 +985,13 @@ | ||
14 | fi | ||
15 | fi | ||
16 | |||
17 | +if test -z "$with_dbus_default_reply_timeout" ; then | ||
18 | + DBUS_DEFAULT_REPLY_TIMEOUT=25000 | ||
19 | +else | ||
20 | + DBUS_DEFAULT_REPLY_TIMEOUT=$with_dbus_default_reply_timeout | ||
21 | +fi | ||
22 | +AC_DEFINE_UNQUOTED(_DBUS_DEFAULT_TIMEOUT_VALUE,$DBUS_DEFAULT_REPLY_TIMEOUT,[default timeout value for dbus calls]) | ||
23 | + | ||
24 | #### Set up final flags | ||
25 | DBUS_CLIENT_CFLAGS= | ||
26 | DBUS_CLIENT_LIBS="$THREAD_LIBS $NETWORK_libs" | ||
27 | @@ -1625,6 +1633,7 @@ | ||
28 | Gettext libs (empty OK): ${INTLLIBS} | ||
29 | Using XML parser: ${with_xml} | ||
30 | Init scripts style: ${with_init_scripts} | ||
31 | + Default reply timeout: ${DBUS_DEFAULT_REPLY_TIMEOUT} | ||
32 | Abstract socket names: ${ac_cv_have_abstract_sockets} | ||
33 | System bus socket: ${DBUS_SYSTEM_SOCKET} | ||
34 | System bus address: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} | ||
35 | Index: dbus-1.3.1/dbus/dbus-connection-internal.h | ||
36 | =================================================================== | ||
37 | --- dbus-1.3.1.orig/dbus/dbus-connection-internal.h | ||
38 | +++ dbus-1.3.1/dbus/dbus-connection-internal.h | ||
39 | @@ -41,9 +41,6 @@ | ||
40 | DBUS_ITERATION_BLOCK = 1 << 2 /**< Block if nothing to do. */ | ||
41 | } DBusIterationFlags; | ||
42 | |||
43 | -/** default timeout value when waiting for a message reply, 25 seconds */ | ||
44 | -#define _DBUS_DEFAULT_TIMEOUT_VALUE (25 * 1000) | ||
45 | - | ||
46 | void _dbus_connection_lock (DBusConnection *connection); | ||
47 | void _dbus_connection_unlock (DBusConnection *connection); | ||
48 | DBusConnection * _dbus_connection_ref_unlocked (DBusConnection *connection); | ||
diff --git a/meta-oe/recipes-core/dbus/dbus/anon.patch b/meta-oe/recipes-core/dbus/dbus/anon.patch deleted file mode 100644 index c9bf7bfa6..000000000 --- a/meta-oe/recipes-core/dbus/dbus/anon.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | diff -Naur dbus-1.2.1.orig/dbus/dbus-transport.c dbus-1.2.1/dbus/dbus-transport.c | ||
2 | --- dbus-1.2.1.orig/dbus/dbus-transport.c 2008-09-16 15:10:02.000000000 +0000 | ||
3 | +++ dbus-1.2.1/dbus/dbus-transport.c 2008-09-16 15:10:10.000000000 +0000 | ||
4 | @@ -747,6 +747,9 @@ | ||
5 | dbus_bool_t allow; | ||
6 | DBusCredentials *auth_identity; | ||
7 | |||
8 | + // allow anonymous connections | ||
9 | + _dbus_transport_set_allow_anonymous(transport, TRUE); | ||
10 | + | ||
11 | auth_identity = _dbus_auth_get_identity (transport->auth); | ||
12 | _dbus_assert (auth_identity != NULL); | ||
13 | |||
diff --git a/meta-oe/recipes-core/dbus/dbus/dbus-1.init b/meta-oe/recipes-core/dbus/dbus/dbus-1.init deleted file mode 100644 index a70e7a237..000000000 --- a/meta-oe/recipes-core/dbus/dbus/dbus-1.init +++ /dev/null | |||
@@ -1,111 +0,0 @@ | |||
1 | #! /bin/sh | ||
2 | # -*- coding: utf-8 -*- | ||
3 | # Debian init.d script for D-BUS | ||
4 | # Copyright © 2003 Colin Walters <walters@debian.org> | ||
5 | # Copyright 2008 OE Team | ||
6 | |||
7 | set -e | ||
8 | |||
9 | DAEMON=/usr/bin/dbus-daemon | ||
10 | NAME=dbus | ||
11 | DAEMONUSER=messagebus | ||
12 | RUNDIR=/var/run/dbus | ||
13 | PIDFILE=/var/run/dbus/pid | ||
14 | UUIDDIR=/var/lib/dbus | ||
15 | DESC="system message bus" | ||
16 | EVENTDIR=/etc/dbus-1/event.d | ||
17 | |||
18 | test -x $DAEMON || exit 0 | ||
19 | |||
20 | # Source defaults file; edit that file to configure this script. | ||
21 | ENABLED=1 | ||
22 | PARAMS="" | ||
23 | if [ -e /etc/default/dbus ]; then | ||
24 | . /etc/default/dbus | ||
25 | fi | ||
26 | |||
27 | test "$ENABLED" != "0" || exit 0 | ||
28 | |||
29 | start_it_up() | ||
30 | { | ||
31 | if [ ! -d $RUNDIR ]; then | ||
32 | mkdir -p $RUNDIR | ||
33 | chown $DAEMONUSER $RUNDIR | ||
34 | chgrp $DAEMONUSER $RUNDIR | ||
35 | fi | ||
36 | if [ -e $PIDFILE ]; then | ||
37 | PIDDIR=/proc/$(cat $PIDFILE) | ||
38 | if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then | ||
39 | echo "$DESC already started; not starting." | ||
40 | else | ||
41 | echo "Removing stale PID file $PIDFILE." | ||
42 | rm -f $PIDFILE | ||
43 | fi | ||
44 | fi | ||
45 | |||
46 | if [ ! -d $UUIDDIR ]; then | ||
47 | mkdir -p $UUIDDIR | ||
48 | chown $DAEMONUSER $UUIDDIR | ||
49 | chgrp $DAEMONUSER $UUIDDIR | ||
50 | fi | ||
51 | |||
52 | dbus-uuidgen --ensure | ||
53 | |||
54 | echo -n "Starting $DESC: " | ||
55 | start-stop-daemon --start --pidfile $PIDFILE \ | ||
56 | --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS | ||
57 | echo "$NAME." | ||
58 | if [ -d $EVENTDIR ]; then | ||
59 | run-parts --arg=start $EVENTDIR | ||
60 | fi | ||
61 | } | ||
62 | |||
63 | shut_it_down() | ||
64 | { | ||
65 | if [ -d $EVENTDIR ]; then | ||
66 | # TODO: --reverse when busybox supports it | ||
67 | run-parts --arg=stop $EVENTDIR | ||
68 | fi | ||
69 | echo -n "Stopping $DESC: " | ||
70 | start-stop-daemon --stop --oknodo --pidfile $PIDFILE \ | ||
71 | --user $DAEMONUSER | ||
72 | # We no longer include these arguments so that start-stop-daemon | ||
73 | # can do its job even given that we may have been upgraded. | ||
74 | # We rely on the pidfile being sanely managed | ||
75 | # --exec $DAEMON -- --system $PARAMS | ||
76 | echo "$NAME." | ||
77 | rm -f $PIDFILE | ||
78 | } | ||
79 | |||
80 | reload_it() | ||
81 | { | ||
82 | echo -n "Reloading $DESC config: " | ||
83 | dbus-send --print-reply --system --type=method_call \ | ||
84 | --dest=org.freedesktop.DBus \ | ||
85 | / org.freedesktop.DBus.ReloadConfig > /dev/null | ||
86 | # hopefully this is enough time for dbus to reload it's config file. | ||
87 | echo "done." | ||
88 | } | ||
89 | |||
90 | case "$1" in | ||
91 | start) | ||
92 | start_it_up | ||
93 | ;; | ||
94 | stop) | ||
95 | shut_it_down | ||
96 | ;; | ||
97 | reload|force-reload) | ||
98 | reload_it | ||
99 | ;; | ||
100 | restart) | ||
101 | shut_it_down | ||
102 | sleep 1 | ||
103 | start_it_up | ||
104 | ;; | ||
105 | *) | ||
106 | echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2 | ||
107 | exit 1 | ||
108 | ;; | ||
109 | esac | ||
110 | |||
111 | exit 0 | ||
diff --git a/meta-oe/recipes-core/dbus/dbus/reuseaddr01.patch b/meta-oe/recipes-core/dbus/dbus/reuseaddr01.patch deleted file mode 100644 index e291bb894..000000000 --- a/meta-oe/recipes-core/dbus/dbus/reuseaddr01.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | From 8f5f340b77b51fed1f036a9ee9f70a31b201f2c9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sledz <sledz@MOBIL-400-586.intern.dresearch.de> | ||
3 | Date: Tue, 29 Jun 2010 21:04:15 +0000 | ||
4 | Subject: sysdeps-unix: enable address reuse on TCP sockets | ||
5 | |||
6 | This helps to avoid 'Address already in use' problems if server has been shut | ||
7 | down, and then restarted while sockets are still active on its port. | ||
8 | |||
9 | Signed-off-by: Steffen Sledz <sledz@dresearch.de> | ||
10 | --- | ||
11 | diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c | ||
12 | index ce3475a..b58d09a 100644 | ||
13 | --- a/dbus/dbus-sysdeps-unix.c | ||
14 | +++ b/dbus/dbus-sysdeps-unix.c | ||
15 | @@ -623,6 +623,7 @@ _dbus_listen_unix_socket (const char *path, | ||
16 | int listen_fd; | ||
17 | struct sockaddr_un addr; | ||
18 | size_t path_len; | ||
19 | + unsigned int reuseaddr; | ||
20 | |||
21 | _DBUS_ASSERT_ERROR_IS_CLEAR (error); | ||
22 | |||
23 | @@ -696,7 +697,15 @@ _dbus_listen_unix_socket (const char *path, | ||
24 | |||
25 | strncpy (addr.sun_path, path, path_len); | ||
26 | } | ||
27 | - | ||
28 | + | ||
29 | + reuseaddr = 1; | ||
30 | + if (setsockopt (listen_fd, SOL_SOCKET, SO_REUSEADDR, &reuseaddr, sizeof(reuseaddr))==-1) | ||
31 | + { | ||
32 | + dbus_set_error (error, _dbus_error_from_errno (errno), | ||
33 | + "Failed to set socket option\"%s\": %s", | ||
34 | + path, _dbus_strerror (errno)); | ||
35 | + } | ||
36 | + | ||
37 | if (bind (listen_fd, (struct sockaddr*) &addr, _DBUS_STRUCT_OFFSET (struct sockaddr_un, sun_path) + path_len) < 0) | ||
38 | { | ||
39 | dbus_set_error (error, _dbus_error_from_errno (errno), | ||
40 | @@ -870,6 +879,7 @@ _dbus_listen_tcp_socket (const char *host, | ||
41 | int nlisten_fd = 0, *listen_fd = NULL, res, i; | ||
42 | struct addrinfo hints; | ||
43 | struct addrinfo *ai, *tmp; | ||
44 | + unsigned int reuseaddr; | ||
45 | |||
46 | *fds_p = NULL; | ||
47 | _DBUS_ASSERT_ERROR_IS_CLEAR (error); | ||
48 | @@ -915,6 +925,14 @@ _dbus_listen_tcp_socket (const char *host, | ||
49 | } | ||
50 | _DBUS_ASSERT_ERROR_IS_CLEAR(error); | ||
51 | |||
52 | + reuseaddr = 1; | ||
53 | + if (setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &reuseaddr, sizeof(reuseaddr))==-1) | ||
54 | + { | ||
55 | + dbus_set_error (error, _dbus_error_from_errno (errno), | ||
56 | + "Failed to set socket option \"%s:%s\": %s", | ||
57 | + host ? host : "*", port, _dbus_strerror (errno)); | ||
58 | + } | ||
59 | + | ||
60 | if (bind (fd, (struct sockaddr*) tmp->ai_addr, tmp->ai_addrlen) < 0) | ||
61 | { | ||
62 | _dbus_close(fd, NULL); | ||
63 | -- | ||
64 | cgit v0.8.3-6-g21f6 | ||
diff --git a/meta-oe/recipes-core/dbus/dbus/reuseaddr02.patch b/meta-oe/recipes-core/dbus/dbus/reuseaddr02.patch deleted file mode 100644 index 10bc7edfd..000000000 --- a/meta-oe/recipes-core/dbus/dbus/reuseaddr02.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | From d365dd8141e709222f3a619d7b04ec4ded6429fd Mon Sep 17 00:00:00 2001 | ||
2 | From: Havoc Pennington <hp@pobox.com> | ||
3 | Date: Tue, 31 Aug 2010 15:59:09 +0000 | ||
4 | Subject: Change failure of setsockopt SO_REUSEADDR to be a warning, not set an error | ||
5 | |||
6 | It was previously setting an error but then continuing, which is | ||
7 | not allowed since errors can't be "piled up" | ||
8 | --- | ||
9 | diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c | ||
10 | index e4ff6ee..3205bed 100644 | ||
11 | --- a/dbus/dbus-sysdeps-unix.c | ||
12 | +++ b/dbus/dbus-sysdeps-unix.c | ||
13 | @@ -980,9 +980,8 @@ _dbus_listen_unix_socket (const char *path, | ||
14 | reuseaddr = 1; | ||
15 | if (setsockopt (listen_fd, SOL_SOCKET, SO_REUSEADDR, &reuseaddr, sizeof(reuseaddr))==-1) | ||
16 | { | ||
17 | - dbus_set_error (error, _dbus_error_from_errno (errno), | ||
18 | - "Failed to set socket option\"%s\": %s", | ||
19 | - path, _dbus_strerror (errno)); | ||
20 | + _dbus_warn ("Failed to set socket option\"%s\": %s", | ||
21 | + path, _dbus_strerror (errno)); | ||
22 | } | ||
23 | |||
24 | if (bind (listen_fd, (struct sockaddr*) &addr, _DBUS_STRUCT_OFFSET (struct sockaddr_un, sun_path) + path_len) < 0) | ||
25 | @@ -1335,9 +1334,8 @@ _dbus_listen_tcp_socket (const char *host, | ||
26 | reuseaddr = 1; | ||
27 | if (setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &reuseaddr, sizeof(reuseaddr))==-1) | ||
28 | { | ||
29 | - dbus_set_error (error, _dbus_error_from_errno (errno), | ||
30 | - "Failed to set socket option \"%s:%s\": %s", | ||
31 | - host ? host : "*", port, _dbus_strerror (errno)); | ||
32 | + _dbus_warn ("Failed to set socket option \"%s:%s\": %s", | ||
33 | + host ? host : "*", port, _dbus_strerror (errno)); | ||
34 | } | ||
35 | |||
36 | if (bind (fd, (struct sockaddr*) tmp->ai_addr, tmp->ai_addrlen) < 0) | ||
37 | -- | ||
38 | cgit v0.8.3-6-g21f6 | ||
diff --git a/meta-oe/recipes-core/dbus/dbus/tmpdir.patch b/meta-oe/recipes-core/dbus/dbus/tmpdir.patch deleted file mode 100644 index 838b903f0..000000000 --- a/meta-oe/recipes-core/dbus/dbus/tmpdir.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | --- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200 | ||
2 | +++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100 | ||
3 | @@ -1047,15 +1048,18 @@ | ||
4 | AC_SUBST(ABSOLUTE_TOP_BUILDDIR) | ||
5 | |||
6 | #### Find socket directories | ||
7 | -if ! test -z "$TMPDIR" ; then | ||
8 | - DEFAULT_SOCKET_DIR=$TMPDIR | ||
9 | -elif ! test -z "$TEMP" ; then | ||
10 | - DEFAULT_SOCKET_DIR=$TEMP | ||
11 | -elif ! test -z "$TMP" ; then | ||
12 | - DEFAULT_SOCKET_DIR=$TMP | ||
13 | -else | ||
14 | - DEFAULT_SOCKET_DIR=/tmp | ||
15 | -fi | ||
16 | +#if ! test -z "$TMPDIR" ; then | ||
17 | +# DEFAULT_SOCKET_DIR=$TMPDIR | ||
18 | +#elif ! test -z "$TEMP" ; then | ||
19 | +# DEFAULT_SOCKET_DIR=$TEMP | ||
20 | +#elif ! test -z "$TMP" ; then | ||
21 | +# DEFAULT_SOCKET_DIR=$TMP | ||
22 | +#else | ||
23 | +# DEFAULT_SOCKET_DIR=/tmp | ||
24 | +#fi | ||
25 | + | ||
26 | +# checks disabled to avoid expanding this at build time | ||
27 | +DEFAULT_SOCKET_DIR=/tmp | ||
28 | |||
29 | if ! test -z "$with_test_socket_dir" ; then | ||
30 | TEST_SOCKET_DIR="$with_test_socket_dir" | ||
diff --git a/meta-oe/recipes-core/dbus/dbus_1.2.24.bb b/meta-oe/recipes-core/dbus/dbus_1.2.24.bb deleted file mode 100644 index 75825514b..000000000 --- a/meta-oe/recipes-core/dbus/dbus_1.2.24.bb +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | include dbus.inc | ||
2 | |||
3 | PR = "${INC_PR}.1" | ||
4 | |||
5 | SRC_URI = "\ | ||
6 | http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz;name=dbus \ | ||
7 | file://tmpdir.patch \ | ||
8 | file://fix-install-daemon.patch \ | ||
9 | file://0001-Make-the-default-DBus-reply-timeout-configurable.patch \ | ||
10 | file://dbus-1.init \ | ||
11 | file://reuseaddr01.patch \ | ||
12 | file://reuseaddr02.patch \ | ||
13 | " | ||
14 | |||
15 | SRC_URI_append_hipox = "file://anon.patch" | ||
16 | |||
17 | SRC_URI[dbus.md5sum] = "565346cecd9cfecf1463540c6086cc2c" | ||
18 | SRC_URI[dbus.sha256sum] = "f12c748f4a703655e3d4c3db94cdf5a752a0cd0b36958c715804373bd3595c48" | ||
19 | |||
diff --git a/meta-oe/recipes-core/dbus/dbus_1.4.0.bb b/meta-oe/recipes-core/dbus/dbus_1.4.0.bb deleted file mode 100644 index 2c4943b4f..000000000 --- a/meta-oe/recipes-core/dbus/dbus_1.4.0.bb +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | include dbus.inc | ||
2 | PR = "${INC_PR}.0" | ||
3 | |||
4 | BBCLASSEXTEND = "native" | ||
5 | |||
6 | SRC_URI = "\ | ||
7 | http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ | ||
8 | \ | ||
9 | file://tmpdir.patch \ | ||
10 | file://add-configurable-reply-timeouts.patch \ | ||
11 | file://dbus-1.init \ | ||
12 | " | ||
13 | |||
14 | # This needs more testing before pushing as default dbus | ||
15 | DEFAULT_PREFERENCE = "-1" | ||
16 | |||
17 | SRC_URI[md5sum] = "f59618b18d2fb2bd1fce9e1c5a2a3282" | ||
18 | SRC_URI[sha256sum] = "c96d2f86d40e158e2bf405925a0a42cce0533a8466098e2f2238aa1614926652" | ||