diff options
Diffstat (limited to 'meta/recipes-core/dbus/dbus-1.6.8')
-rw-r--r-- | meta/recipes-core/dbus/dbus-1.6.8/dbus-1.init | 116 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus-1.6.8/ptest.patch | 154 | ||||
-rwxr-xr-x | meta/recipes-core/dbus/dbus-1.6.8/run-ptest | 3 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus-1.6.8/systemd-address.patch | 187 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus-1.6.8/test-run-path.patch | 26 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus-1.6.8/tmpdir.patch | 44 |
6 files changed, 0 insertions, 530 deletions
diff --git a/meta/recipes-core/dbus/dbus-1.6.8/dbus-1.init b/meta/recipes-core/dbus/dbus-1.6.8/dbus-1.init deleted file mode 100644 index 64f2170255..0000000000 --- a/meta/recipes-core/dbus/dbus-1.6.8/dbus-1.init +++ /dev/null | |||
@@ -1,116 +0,0 @@ | |||
1 | #! /bin/sh | ||
2 | ### BEGIN INIT INFO | ||
3 | # Provides: dbus | ||
4 | # Required-Start: $remote_fs $syslog | ||
5 | # Required-Stop: $remote_fs $syslog | ||
6 | # Default-Start: 2 3 4 5 | ||
7 | # Default-Stop: 1 | ||
8 | # Short-Description: D-Bus systemwide message bus | ||
9 | # Description: D-Bus is a simple interprocess messaging system, used | ||
10 | # for sending messages between applications. | ||
11 | ### END INIT INFO | ||
12 | # | ||
13 | # -*- coding: utf-8 -*- | ||
14 | # Debian init.d script for D-BUS | ||
15 | # Copyright © 2003 Colin Walters <walters@debian.org> | ||
16 | |||
17 | set -e | ||
18 | |||
19 | DAEMON=@bindir@/dbus-daemon | ||
20 | NAME=dbus | ||
21 | DAEMONUSER=messagebus # must match /etc/dbus-1/system.conf | ||
22 | PIDFILE=/var/run/messagebus.pid # must match /etc/dbus-1/system.conf | ||
23 | UUIDDIR=/var/lib/dbus | ||
24 | DESC="system message bus" | ||
25 | EVENTDIR=/etc/dbus-1/event.d | ||
26 | |||
27 | test -x $DAEMON || exit 0 | ||
28 | |||
29 | # Source defaults file; edit that file to configure this script. | ||
30 | ENABLED=1 | ||
31 | PARAMS="" | ||
32 | if [ -e /etc/default/dbus ]; then | ||
33 | . /etc/default/dbus | ||
34 | fi | ||
35 | |||
36 | test "$ENABLED" != "0" || exit 0 | ||
37 | |||
38 | start_it_up() | ||
39 | { | ||
40 | mkdir -p "`dirname $PIDFILE`" | ||
41 | if [ -e $PIDFILE ]; then | ||
42 | PIDDIR=/proc/$(cat $PIDFILE) | ||
43 | if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then | ||
44 | echo "$DESC already started; not starting." | ||
45 | else | ||
46 | echo "Removing stale PID file $PIDFILE." | ||
47 | rm -f $PIDFILE | ||
48 | fi | ||
49 | fi | ||
50 | |||
51 | if [ ! -d $UUIDDIR ]; then | ||
52 | mkdir -p $UUIDDIR | ||
53 | chown $DAEMONUSER $UUIDDIR | ||
54 | chgrp $DAEMONUSER $UUIDDIR | ||
55 | fi | ||
56 | |||
57 | dbus-uuidgen --ensure | ||
58 | |||
59 | echo -n "Starting $DESC: " | ||
60 | start-stop-daemon --start --quiet --pidfile $PIDFILE \ | ||
61 | --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS | ||
62 | echo "$NAME." | ||
63 | if [ -d $EVENTDIR ]; then | ||
64 | run-parts --arg=start $EVENTDIR | ||
65 | fi | ||
66 | } | ||
67 | |||
68 | shut_it_down() | ||
69 | { | ||
70 | if [ -d $EVENTDIR ]; then | ||
71 | # TODO: --reverse when busybox supports it | ||
72 | run-parts --arg=stop $EVENTDIR | ||
73 | fi | ||
74 | echo -n "Stopping $DESC: " | ||
75 | start-stop-daemon --stop --quiet --pidfile $PIDFILE \ | ||
76 | --user $DAEMONUSER | ||
77 | # We no longer include these arguments so that start-stop-daemon | ||
78 | # can do its job even given that we may have been upgraded. | ||
79 | # We rely on the pidfile being sanely managed | ||
80 | # --exec $DAEMON -- --system $PARAMS | ||
81 | echo "$NAME." | ||
82 | rm -f $PIDFILE | ||
83 | } | ||
84 | |||
85 | reload_it() | ||
86 | { | ||
87 | echo -n "Reloading $DESC config: " | ||
88 | dbus-send --print-reply --system --type=method_call \ | ||
89 | --dest=org.freedesktop.DBus \ | ||
90 | / org.freedesktop.DBus.ReloadConfig > /dev/null | ||
91 | # hopefully this is enough time for dbus to reload it's config file. | ||
92 | echo "done." | ||
93 | } | ||
94 | |||
95 | case "$1" in | ||
96 | start) | ||
97 | start_it_up | ||
98 | ;; | ||
99 | stop) | ||
100 | shut_it_down | ||
101 | ;; | ||
102 | reload|force-reload) | ||
103 | reload_it | ||
104 | ;; | ||
105 | restart) | ||
106 | shut_it_down | ||
107 | sleep 1 | ||
108 | start_it_up | ||
109 | ;; | ||
110 | *) | ||
111 | echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2 | ||
112 | exit 1 | ||
113 | ;; | ||
114 | esac | ||
115 | |||
116 | exit 0 | ||
diff --git a/meta/recipes-core/dbus/dbus-1.6.8/ptest.patch b/meta/recipes-core/dbus/dbus-1.6.8/ptest.patch deleted file mode 100644 index 263d17eff7..0000000000 --- a/meta/recipes-core/dbus/dbus-1.6.8/ptest.patch +++ /dev/null | |||
@@ -1,154 +0,0 @@ | |||
1 | Add install-ptest rules. | ||
2 | Change TEST_ENVIRONMENT to allow running outside build dir. | ||
3 | |||
4 | Makefile.am | 7 +++++++ | ||
5 | bus/Makefile.am | 6 ++++++ | ||
6 | dbus/Makefile.am | 6 ++++++ | ||
7 | doc/Makefile.am | 4 ++++ | ||
8 | test/Makefile.am | 25 ++++++++++++++++++++----- | ||
9 | test/name-test/Makefile.am | 9 +++++++++ | ||
10 | tools/Makefile.am | 12 ++++++++++++ | ||
11 | 7 files changed, 64 insertions(+), 5 deletions(-) | ||
12 | |||
13 | Signed-off-by: Björn Stenberg <bjst@enea.com> | ||
14 | Upstream-Status: Pending | ||
15 | |||
16 | diff -ur a/Makefile.am b/Makefile.am | ||
17 | --- a/Makefile.am 2012-12-06 14:34:01.157414449 +0100 | ||
18 | +++ b/Makefile.am 2012-12-06 15:21:14.447113035 +0100 | ||
19 | @@ -30,4 +30,11 @@ | ||
20 | |||
21 | ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} | ||
22 | |||
23 | +if DBUS_BUILD_TESTS | ||
24 | +install-ptest: | ||
25 | + @for subdir in $(SUBDIRS); do \ | ||
26 | + $(MAKE) -C $$subdir DESTDIR=$(DESTDIR)/$$subdir $@; \ | ||
27 | + done | ||
28 | +endif | ||
29 | + | ||
30 | include tools/lcov.am | ||
31 | diff -ur a/bus/Makefile.am b/bus/Makefile.am | ||
32 | --- a/bus/Makefile.am 2012-12-06 14:34:01.169413931 +0100 | ||
33 | +++ b/bus/Makefile.am 2012-12-06 15:21:14.463112346 +0100 | ||
34 | @@ -290,3 +290,9 @@ | ||
35 | #### Extra dist | ||
36 | |||
37 | EXTRA_DIST=$(CONFIG_IN_FILES) $(SCRIPT_IN_FILES) | ||
38 | + | ||
39 | +if DBUS_BUILD_TESTS | ||
40 | +install-ptest: | ||
41 | + @$(MKDIR_P) $(DESTDIR) | ||
42 | + @install $(dbus_daemon_exec_PROGRAMS) $(noinst_PROGRAMS) $(DESTDIR) | ||
43 | +endif | ||
44 | diff -ur a/dbus/Makefile.am b/dbus/Makefile.am | ||
45 | --- a/dbus/Makefile.am 2012-12-06 14:34:01.161414276 +0100 | ||
46 | +++ b/dbus/Makefile.am 2012-12-06 15:21:14.451112862 +0100 | ||
47 | @@ -310,3 +310,9 @@ | ||
48 | update-systemd: | ||
49 | curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c | ||
50 | curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h > sd-daemon.h | ||
51 | + | ||
52 | +if DBUS_BUILD_TESTS | ||
53 | +install-ptest: | ||
54 | + @$(MKDIR_P) $(DESTDIR) | ||
55 | + @install $(noinst_PROGRAMS) $(DESTDIR) | ||
56 | +endif | ||
57 | diff -ur a/test/Makefile.am b/test/Makefile.am | ||
58 | --- a/test/Makefile.am 2012-12-06 14:34:01.165414103 +0100 | ||
59 | +++ b/test/Makefile.am 2012-12-06 15:21:14.455112690 +0100 | ||
60 | @@ -119,12 +119,13 @@ | ||
61 | DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \ | ||
62 | DBUS_TEST_SYSCONFDIR=$(DESTDIR)$(sysconfdir) | ||
63 | |||
64 | +ptest_run_dir = .. | ||
65 | + | ||
66 | TESTS_ENVIRONMENT = \ | ||
67 | - DBUS_BLOCK_ON_ABORT=1 \ | ||
68 | - DBUS_FATAL_WARNINGS=1 \ | ||
69 | - DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \ | ||
70 | - DBUS_TEST_DATA=@abs_top_builddir@/test/data \ | ||
71 | - DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \ | ||
72 | + DBUS_FATAL_WARNINGS=0 \ | ||
73 | + DBUS_TEST_DAEMON=$(ptest_run_dir)/bus/dbus-daemon$(EXEEXT) \ | ||
74 | + DBUS_TEST_DATA=$(ptest_run_dir)/test/data \ | ||
75 | + DBUS_TEST_HOMEDIR=$(ptest_run_dir)/dbus \ | ||
76 | $(NULL) | ||
77 | |||
78 | test_corrupt_SOURCES = corrupt.c | ||
79 | @@ -325,3 +325,25 @@ | ||
80 | data/valid-config-files/system.conf: $(top_builddir)/bus/system.conf | ||
81 | $(AM_V_at)$(MKDIR_P) data/valid-config-files | ||
82 | $(AM_V_GEN)cp $< $@ | ||
83 | + | ||
84 | +if DBUS_BUILD_TESTS | ||
85 | +install-ptest: install-ptest-nonrecursive | ||
86 | + @for subdir in $(SUBDIRS); do \ | ||
87 | + if [ $$subdir != "." ]; then \ | ||
88 | + $(MAKE) -C $$subdir DESTDIR=$(DESTDIR)/$$subdir $@; \ | ||
89 | + fi; \ | ||
90 | + done | ||
91 | + | ||
92 | +install-ptest-nonrecursive: | ||
93 | + @$(MKDIR_P) $(DESTDIR)/data/valid-config-files/session.d | ||
94 | + @for file in Makefile $(installable_tests) $(noinst_PROGRAMS) $(noinst_DATA) ; do \ | ||
95 | + if [ -f .libs/$$file ]; then \ | ||
96 | + install .libs/$$file $(DESTDIR); \ | ||
97 | + else \ | ||
98 | + install -D $${file%.in} $(DESTDIR)/$${file%.in}; \ | ||
99 | + fi; \ | ||
100 | + done; | ||
101 | + @for file in $(EXTRA_DIST); do \ | ||
102 | + install -D ${srcdir}/$${file%.in} $(DESTDIR)/$${file%.in}; \ | ||
103 | + done; | ||
104 | +endif | ||
105 | diff -ur a/test/name-test/Makefile.am b/test/name-test/Makefile.am | ||
106 | --- a/test/name-test/Makefile.am 2012-12-06 14:34:01.169413931 +0100 | ||
107 | +++ b/test/name-test/Makefile.am 2012-12-06 15:21:14.459112518 +0100 | ||
108 | @@ -36,4 +36,16 @@ | ||
109 | test_privserver_client_LDADD=../libdbus-testutils.la | ||
110 | test_autolaunch_LDADD=../libdbus-testutils.la | ||
111 | |||
112 | +install-ptest: | ||
113 | + @$(MKDIR_P) $(DESTDIR) | ||
114 | + @for file in Makefile $(noinst_PROGRAMS); do \ | ||
115 | + if [ -f .libs/$$file ]; then \ | ||
116 | + install .libs/$$file $(DESTDIR); \ | ||
117 | + else \ | ||
118 | + install $$file $(DESTDIR); \ | ||
119 | + fi \ | ||
120 | + done; | ||
121 | + @for file in $(EXTRA_DIST); do \ | ||
122 | + cp $(srcdir)/$$file $(DESTDIR); \ | ||
123 | + done; | ||
124 | endif | ||
125 | diff -ur a/tools/Makefile.am b/tools/Makefile.am | ||
126 | --- a/tools/Makefile.am 2012-12-06 14:34:01.161414276 +0100 | ||
127 | +++ b/tools/Makefile.am 2012-12-06 15:21:14.455112690 +0100 | ||
128 | @@ -78,3 +78,15 @@ | ||
129 | |||
130 | installcheck-local: | ||
131 | test -d $(DESTDIR)$(localstatedir)/lib/dbus | ||
132 | + | ||
133 | +if DBUS_BUILD_TESTS | ||
134 | +install-ptest: | ||
135 | + @$(MKDIR_P) $(DESTDIR) | ||
136 | + @for file in $(bin_PROGRAMS); do \ | ||
137 | + if [ -f .libs/$$file ]; then \ | ||
138 | + install .libs/$$file $(DESTDIR); \ | ||
139 | + else \ | ||
140 | + install $$file $(DESTDIR); \ | ||
141 | + fi; \ | ||
142 | + done; | ||
143 | +endif | ||
144 | diff -ur a/doc/Makefile.am b/doc/Makefile.am | ||
145 | --- a/doc/Makefile.am 2012-06-06 12:45:55.000000000 +0200 | ||
146 | +++ b/doc/Makefile.am 2012-12-06 16:04:58.990070587 +0100 | ||
147 | @@ -174,3 +174,7 @@ | ||
148 | |||
149 | maintainer-clean-local: | ||
150 | rm -f $(XMLTO_OUTPUT) | ||
151 | + | ||
152 | +if DBUS_BUILD_TESTS | ||
153 | +install-ptest: | ||
154 | +endif | ||
diff --git a/meta/recipes-core/dbus/dbus-1.6.8/run-ptest b/meta/recipes-core/dbus/dbus-1.6.8/run-ptest deleted file mode 100755 index e08ecb1a63..0000000000 --- a/meta/recipes-core/dbus/dbus-1.6.8/run-ptest +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | cd test | ||
3 | make -k runtest-TESTS | ||
diff --git a/meta/recipes-core/dbus/dbus-1.6.8/systemd-address.patch b/meta/recipes-core/dbus/dbus-1.6.8/systemd-address.patch deleted file mode 100644 index ae1291c947..0000000000 --- a/meta/recipes-core/dbus/dbus-1.6.8/systemd-address.patch +++ /dev/null | |||
@@ -1,187 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From d728fdc655f17031da3bb129ab2fd17dadf0fe3a Mon Sep 17 00:00:00 2001 | ||
5 | From: Simon Peeters <peeters.simon@gmail.com> | ||
6 | Date: Sun, 07 Oct 2012 14:59:30 +0000 | ||
7 | Subject: Set correct address when using --address=systemd: | ||
8 | |||
9 | When dbus gets launched through systemd, we need to create an address | ||
10 | string based on the sockets passed. | ||
11 | |||
12 | The _dbus_append_addres_from_socket() function is responsible for | ||
13 | extracting the address information from the file-descriptor and | ||
14 | formatting it in a dbus friendly way. | ||
15 | |||
16 | This fixes bus activation when running dbus under a systemd session. | ||
17 | |||
18 | https://bugs.freedesktop.org/show_bug.cgi?id=50962 | ||
19 | |||
20 | Signed-off-by: Simon Peeters <peeters.simon@gmail.com> | ||
21 | --- | ||
22 | diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c | ||
23 | index 130f66e..d995240 100644 | ||
24 | --- a/dbus/dbus-server-unix.c | ||
25 | +++ b/dbus/dbus-server-unix.c | ||
26 | @@ -149,7 +149,7 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry, | ||
27 | } | ||
28 | else if (strcmp (method, "systemd") == 0) | ||
29 | { | ||
30 | - int n, *fds; | ||
31 | + int i, n, *fds; | ||
32 | DBusString address; | ||
33 | |||
34 | n = _dbus_listen_systemd_sockets (&fds, error); | ||
35 | @@ -159,27 +159,39 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry, | ||
36 | return DBUS_SERVER_LISTEN_DID_NOT_CONNECT; | ||
37 | } | ||
38 | |||
39 | - _dbus_string_init_const (&address, "systemd:"); | ||
40 | + if (!_dbus_string_init (&address)) | ||
41 | + goto systemd_oom; | ||
42 | |||
43 | - *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL); | ||
44 | - if (*server_p == NULL) | ||
45 | + for (i = 0; i < n; i++) | ||
46 | { | ||
47 | - int i; | ||
48 | - | ||
49 | - for (i = 0; i < n; i++) | ||
50 | + if (i > 0) | ||
51 | { | ||
52 | - _dbus_close_socket (fds[i], NULL); | ||
53 | + if (!_dbus_string_append (&address, ";")) | ||
54 | + goto systemd_oom; | ||
55 | } | ||
56 | - dbus_free (fds); | ||
57 | - | ||
58 | - dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); | ||
59 | - return DBUS_SERVER_LISTEN_DID_NOT_CONNECT; | ||
60 | + if (!_dbus_append_address_from_socket (fds[i], &address, error)) | ||
61 | + goto systemd_err; | ||
62 | } | ||
63 | |||
64 | + *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL); | ||
65 | + if (*server_p == NULL) | ||
66 | + goto systemd_oom; | ||
67 | + | ||
68 | dbus_free (fds); | ||
69 | |||
70 | return DBUS_SERVER_LISTEN_OK; | ||
71 | - } | ||
72 | + systemd_oom: | ||
73 | + _DBUS_SET_OOM (error); | ||
74 | + systemd_err: | ||
75 | + for (i = 0; i < n; i++) | ||
76 | + { | ||
77 | + _dbus_close_socket (fds[i], NULL); | ||
78 | + } | ||
79 | + dbus_free (fds); | ||
80 | + _dbus_string_free (&address); | ||
81 | + | ||
82 | + return DBUS_SERVER_LISTEN_DID_NOT_CONNECT; | ||
83 | + } | ||
84 | #ifdef DBUS_ENABLE_LAUNCHD | ||
85 | else if (strcmp (method, "launchd") == 0) | ||
86 | { | ||
87 | diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c | ||
88 | index b4ecc96..55743b1 100644 | ||
89 | --- a/dbus/dbus-sysdeps-unix.c | ||
90 | +++ b/dbus/dbus-sysdeps-unix.c | ||
91 | @@ -55,6 +55,7 @@ | ||
92 | #include <netinet/in.h> | ||
93 | #include <netdb.h> | ||
94 | #include <grp.h> | ||
95 | +#include <arpa/inet.h> | ||
96 | |||
97 | #ifdef HAVE_ERRNO_H | ||
98 | #include <errno.h> | ||
99 | @@ -4160,4 +4161,71 @@ _dbus_check_setuid (void) | ||
100 | #endif | ||
101 | } | ||
102 | |||
103 | +/** | ||
104 | + * Read the address from the socket and append it to the string | ||
105 | + * | ||
106 | + * @param fd the socket | ||
107 | + * @param address | ||
108 | + * @param error return location for error code | ||
109 | + */ | ||
110 | +dbus_bool_t | ||
111 | +_dbus_append_address_from_socket (int fd, | ||
112 | + DBusString *address, | ||
113 | + DBusError *error) | ||
114 | +{ | ||
115 | + union { | ||
116 | + struct sockaddr sa; | ||
117 | + struct sockaddr_storage storage; | ||
118 | + struct sockaddr_un un; | ||
119 | + struct sockaddr_in ipv4; | ||
120 | + struct sockaddr_in6 ipv6; | ||
121 | + } socket; | ||
122 | + char hostip[INET6_ADDRSTRLEN]; | ||
123 | + int size = sizeof (socket); | ||
124 | + | ||
125 | + if (getsockname (fd, &socket.sa, &size)) | ||
126 | + goto err; | ||
127 | + | ||
128 | + switch (socket.sa.sa_family) | ||
129 | + { | ||
130 | + case AF_UNIX: | ||
131 | + if (socket.un.sun_path[0]=='\0') | ||
132 | + { | ||
133 | + if (_dbus_string_append_printf (address, "unix:abstract=%s", &(socket.un.sun_path[1]))) | ||
134 | + return TRUE; | ||
135 | + } | ||
136 | + else | ||
137 | + { | ||
138 | + if (_dbus_string_append_printf (address, "unix:path=%s", socket.un.sun_path)) | ||
139 | + return TRUE; | ||
140 | + } | ||
141 | + break; | ||
142 | + case AF_INET: | ||
143 | + if (inet_ntop (AF_INET, &socket.ipv4.sin_addr, hostip, sizeof (hostip))) | ||
144 | + if (_dbus_string_append_printf (address, "tcp:family=ipv4,host=%s,port=%u", | ||
145 | + hostip, ntohs (socket.ipv4.sin_port))) | ||
146 | + return TRUE; | ||
147 | + break; | ||
148 | +#ifdef AF_INET6 | ||
149 | + case AF_INET6: | ||
150 | + if (inet_ntop (AF_INET6, &socket.ipv6.sin6_addr, hostip, sizeof (hostip))) | ||
151 | + if (_dbus_string_append_printf (address, "tcp:family=ipv6,host=%s,port=%u", | ||
152 | + hostip, ntohs (socket.ipv6.sin6_port))) | ||
153 | + return TRUE; | ||
154 | + break; | ||
155 | +#endif | ||
156 | + default: | ||
157 | + dbus_set_error (error, | ||
158 | + _dbus_error_from_errno (EINVAL), | ||
159 | + "Failed to read address from socket: Unknown socket type."); | ||
160 | + return FALSE; | ||
161 | + } | ||
162 | + err: | ||
163 | + dbus_set_error (error, | ||
164 | + _dbus_error_from_errno (errno), | ||
165 | + "Failed to open socket: %s", | ||
166 | + _dbus_strerror (errno)); | ||
167 | + return FALSE; | ||
168 | +} | ||
169 | + | ||
170 | /* tests in dbus-sysdeps-util.c */ | ||
171 | diff --git a/dbus/dbus-sysdeps-unix.h b/dbus/dbus-sysdeps-unix.h | ||
172 | index 9b70896..a265b33 100644 | ||
173 | --- a/dbus/dbus-sysdeps-unix.h | ||
174 | +++ b/dbus/dbus-sysdeps-unix.h | ||
175 | @@ -138,6 +138,10 @@ dbus_bool_t _dbus_parse_uid (const DBusString *uid_str, | ||
176 | |||
177 | void _dbus_close_all (void); | ||
178 | |||
179 | +dbus_bool_t _dbus_append_address_from_socket (int fd, | ||
180 | + DBusString *address, | ||
181 | + DBusError *error); | ||
182 | + | ||
183 | /** @} */ | ||
184 | |||
185 | DBUS_END_DECLS | ||
186 | -- | ||
187 | cgit v0.9.0.2-2-gbebe | ||
diff --git a/meta/recipes-core/dbus/dbus-1.6.8/test-run-path.patch b/meta/recipes-core/dbus/dbus-1.6.8/test-run-path.patch deleted file mode 100644 index 5c08c9354a..0000000000 --- a/meta/recipes-core/dbus/dbus-1.6.8/test-run-path.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | |||
2 | |||
3 | Signed-off-by: Björn Stenberg <bjst@enea.com> | ||
4 | Upstream-Status: Pending | ||
5 | |||
6 | --- a/test/Makefile.am 2012-06-15 15:25:43.000000000 +0200 | ||
7 | +++ b/test/Makefile.am 2012-11-16 09:24:44.263140840 +0100 | ||
8 | @@ -119,12 +119,13 @@ | ||
9 | DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \ | ||
10 | DBUS_TEST_SYSCONFDIR=$(DESTDIR)$(sysconfdir) | ||
11 | |||
12 | +ptest_run_dir = .. | ||
13 | + | ||
14 | TESTS_ENVIRONMENT = \ | ||
15 | - DBUS_BLOCK_ON_ABORT=1 \ | ||
16 | - DBUS_FATAL_WARNINGS=1 \ | ||
17 | - DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \ | ||
18 | - DBUS_TEST_DATA=@abs_top_builddir@/test/data \ | ||
19 | - DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \ | ||
20 | + DBUS_FATAL_WARNINGS=0 \ | ||
21 | + DBUS_TEST_DAEMON=$(ptest_run_dir)/bus/dbus-daemon$(EXEEXT) \ | ||
22 | + DBUS_TEST_DATA=$(ptest_run_dir)/test/data \ | ||
23 | + DBUS_TEST_HOMEDIR=$(ptest_run_dir)/dbus \ | ||
24 | $(NULL) | ||
25 | |||
26 | test_corrupt_SOURCES = corrupt.c | ||
diff --git a/meta/recipes-core/dbus/dbus-1.6.8/tmpdir.patch b/meta/recipes-core/dbus/dbus-1.6.8/tmpdir.patch deleted file mode 100644 index bf086e1788..0000000000 --- a/meta/recipes-core/dbus/dbus-1.6.8/tmpdir.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From 5105fedd7fa13dadd2d0d864fb77873b83b79a4b Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Thu, 23 Jun 2011 13:52:09 +0200 | ||
4 | Subject: [PATCH] buildsys: hardcode socketdir to /tmp | ||
5 | |||
6 | the TMPDIR env var isn't always pointing to the right target path | ||
7 | |||
8 | Upstream-Status: Inappropriate [embedded] | ||
9 | |||
10 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
11 | |||
12 | Original comment: | ||
13 | |||
14 | avoid to check tmp dir at build time. instead uses hard coded /tmp here | ||
15 | comment added by Kevin Tian <kevin.tian@intel.com> | ||
16 | --- | ||
17 | configure.ac | 11 +---------- | ||
18 | 1 files changed, 1 insertions(+), 10 deletions(-) | ||
19 | |||
20 | diff --git a/configure.ac b/configure.ac | ||
21 | index 408054b..6d26180 100644 | ||
22 | --- a/configure.ac | ||
23 | +++ b/configure.ac | ||
24 | @@ -1483,16 +1483,7 @@ AC_SUBST(TEST_LAUNCH_HELPER_BINARY) | ||
25 | AC_DEFINE_UNQUOTED(DBUS_TEST_LAUNCH_HELPER_BINARY, "$TEST_LAUNCH_HELPER_BINARY", | ||
26 | [Full path to the launch helper test program in the builddir]) | ||
27 | |||
28 | -#### Find socket directories | ||
29 | -if ! test -z "$TMPDIR" ; then | ||
30 | - DEFAULT_SOCKET_DIR=$TMPDIR | ||
31 | -elif ! test -z "$TEMP" ; then | ||
32 | - DEFAULT_SOCKET_DIR=$TEMP | ||
33 | -elif ! test -z "$TMP" ; then | ||
34 | - DEFAULT_SOCKET_DIR=$TMP | ||
35 | -else | ||
36 | - DEFAULT_SOCKET_DIR=/tmp | ||
37 | -fi | ||
38 | +DEFAULT_SOCKET_DIR=/tmp | ||
39 | |||
40 | DEFAULT_SOCKET_DIR=`echo $DEFAULT_SOCKET_DIR | sed 's/+/%2B/g'` | ||
41 | |||
42 | -- | ||
43 | 1.6.6.1 | ||
44 | |||