Commit graph

3882 commits

Author SHA1 Message Date
Simon McVittie
7fb57c7576 Only support systemd: transport if we have systemd libraries
This means we can drop our convenience copy of sd-daemon.[ch]. We're
checking for libsd-daemon anyway, to support journald and logind
integration.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71818
Reviewed-by: Lennart Poettering <lennart@poettering.net>
2014-02-19 16:52:29 +00:00
Ralf Habacker
ea1884e3e5 Keep cmake generated shared dbus-1 library file name in sync with autotools.
Autotools uses a versioned shared library name derived from libtool.
This patch adds a versioned shared library name to cmake builds for all
supported platforms. Binary compatibility for clients build against older
cmake generated binary packages of dbus is provided; on unix like os
with symbolic links and on Windows with a copy of the shared library.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=74117
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-30 17:09:41 +01:00
Ralf Habacker
fb84b3e592 Merge branch 'dbus-1.8' 2014-01-27 19:33:32 +01:00
Cristian Onet
3dbd8edc35 Fix of 'dbus-daemon can only handle 64 simultaneous connections on Windows'.
[Slightly modified by -rh]

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71297
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-27 19:32:41 +01:00
Ralf Habacker
4224ba6213 Merge branch 'dbus-1.8' 2014-01-21 21:11:25 +01:00
Ralf Habacker
c39722e286 Give cmake users some hints/requirements when cross compiling for Windows on Linux.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-21 21:09:55 +01:00
Simon McVittie
51c9a15922 start spec 0.24 2014-01-20 16:12:56 +00:00
Simon McVittie
d48a2891de start towards 1.9 2014-01-20 16:12:45 +00:00
Simon McVittie
469ef6e082 1.8.1 2014-01-20 16:11:58 +00:00
Simon McVittie
6528b0973b D-Bus 1.8.0 2014-01-20 14:25:48 +00:00
Simon McVittie
41b3f5b86c Revert "start spec 0.24"
It hasn't otherwise changed since 1.7.10.

This reverts commit fb16f80d45.
2014-01-20 13:40:30 +00:00
Ralf Habacker
5dfc800644 Let cmake 'make check' run test applications as test group.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-17 16:29:37 +00:00
Ralf Habacker
7e373d4527 Rename bus-test-launch-helper to test-bus-launch_helper to match common test application naming scheme.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-17 16:29:37 +00:00
Ralf Habacker
cf41239d66 Rename bus-test-system to test-bus-system to match common test application naming scheme.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-17 16:29:37 +00:00
Ralf Habacker
3ce5d21edf Rename bus-test to test-bus to match common test application naming scheme.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-17 16:29:37 +00:00
Ralf Habacker
54440baa21 Rename spawn-test to test-spawn to match common test application naming scheme.
[Same change as for shell-test in the previous commit. -smcv]

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-17 16:29:19 +00:00
Ralf Habacker
e782b0806e Rename shell-test to test-shell to match common test application naming scheme.
[Add its source file to SOURCES: this test was previously relying on the
Automake feature that the default value of foo_bar_SOURCES is foo-bar.c. -smcv]

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-17 16:28:39 +00:00
Ralf Habacker
0cd0714994 Rename dbus-test to test-dbus to match common test application naming scheme.
[reverted the dbus-specification part -smcv]
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-17 16:17:02 +00:00
Simon McVittie
8875cdf025 Correct test for LIBTOOLIZE by quoting it
Based on a patch from Roland <blueburn85 gmail com>.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73278
2014-01-17 15:58:43 +00:00
Ralf Habacker
d1699118c9 CMake warning--.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-17 12:09:33 +01:00
Simon McVittie
08e3ab8682 NEWS 2014-01-14 11:07:39 +00:00
Matt Hoosier
fc3bf2f304 Don't forget allow_anonymous when merging configs
The algorithm to collapse a subsidiary config file's data into the
master data structure forgot to examine this flag.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73475
Reviewed-by: Chengwei Yang <chengwei.yang@intel.com>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-14 11:04:18 +00:00
Ralf Habacker
46f591b2be Fix compile error on opensuse 12.2 with systemd 44 and glibc-2.15.
The specific systemd/glibc version do not include syslog.h by default.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73455
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-10 15:34:11 +01:00
Simon McVittie
7457a44011 tests: don't block and wait for a debugger on abort
In general, I think developers running the tests would expect
them to terminate rather than hanging. Developers who want to debug
such an abort by attaching a debugger to a live process can still set
DBUS_BLOCK_ON_ABORT in the environment.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
2014-01-10 01:36:16 +01:00
Ralf Habacker
8e728f36d1 Use macros for test and helper executable targets on cmake build system.
The new macros add_test_executables and add helper_executables provides a
platform independent way for specifing dbus test and service applications.

On native Windows and Linux/UNIX systems the test applications are
directly runable.

When cross compiling for Windows on Linux test applications could be
executed on the Linux host system with the help of wine and activated
binfmt_misc support for wine.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-10 01:24:56 +01:00
Ralf Habacker
79a7a30cdb Add 'check' cmake target to keep in sync with autotools.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-10 01:07:38 +01:00
Ralf Habacker
05ed22c926 Fix mentioned files in Building section. 2014-01-10 01:03:44 +01:00
Ralf Habacker
21ad24ada5 Create session.conf and system.conf for test/data/valid-config-files from *.in files on cmake.
We need to patch the listen address.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-10 00:48:50 +01:00
Ralf Habacker
67a78c4ef6 Define TEST_BUS_LAUNCH_BINARY for cmake to keep in sync with autotools.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-10 00:41:02 +01:00
Ralf Habacker
720afc64b8 Use cmake build in executable suffix.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-10 00:34:38 +01:00
Ralf Habacker
9866c2d785 Remove obsolete cmake project tags in sub directories; we only have one project.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68506
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-08 01:35:49 +01:00
Simon McVittie
e74f0b1efa test/dbus-daemon, test/dbus-daemon-eavesdrop: allow external dbus-daemon
It's easier to automate these tests if they launch their own
dbus-daemon, but easier to debug them if they don't: you can launch
a dbus-daemon separately, under gdb. However, tests that need a
specially-configured dbus-daemon will have to be skipped.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68852
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
2014-01-07 23:02:18 +01:00
Ralf Habacker
e09eb12683 Add glib support to cmake buildsystem.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68506
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-07 19:06:26 +01:00
Ralf Habacker
497cc68c02 MSVC compile fix.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73345
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-07 11:33:00 +00:00
Ralf Habacker
6e2ad3c8ca Use dbus provided version of va_copy().
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72840
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-07 11:32:37 +00:00
Ralf Habacker
710bd4a944 Skip unix only syslog test.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06 21:38:39 +01:00
Simon McVittie
fb16f80d45 start spec 0.24 2014-01-06 20:17:11 +00:00
Simon McVittie
d511fd96e6 start 1.7.11 2014-01-06 20:17:05 +00:00
Simon McVittie
127ef144f3 1.7.10 2014-01-06 18:40:26 +00:00
Chengwei Yang
ee4f946d05 Do not install systemd unit files if build without systemd
If dbus buid without systemd (--disable-systemd or no systemd libs
available when building), we expect not to install dbus systemd unit
files because they're only for systemd environment.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71818
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06 16:42:45 +00:00
Simon McVittie
e04bd56a34 Merge remote-tracking branch 'origin/master' 2014-01-06 16:30:34 +00:00
Matt Fischer
5cef4cbf5a Define WIN32_LEAN_AND_MEAN in Windows port
<windows.h> somewhat cloyingly attempts to include <winsock.h>
by default, which causes problems if the rest of the program
is trying to use the incompatible <winsock2.h>.  The Windows
sysdep header attempts to prevent this by forcibly defining
the winsock header guard macro, so that it will not be included.
However, this does not work on MinGW because it uses a different
guard macro name.

This patch changes the code to instead define WIN32_LEAN_AND_MEAN,
which is a more portable way to ensure that <winsock.h> will not
be included.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71405
Reviewed-By: Ralf Habacker <ralf.habacker@freenet.de>
2014-01-06 17:09:43 +01:00
Chengwei Yang
a77f64d5e1 dbus-daemon(1): align document about "bind" with DBus Spec
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72301
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06 16:08:52 +00:00
Chengwei Yang
7628af5924 DBus Spec: add document of bind for tcp/nonce-tcp transport
tcp/nonce-tcp transport has a "bind" key, which can be specified a
hostname and will override hostname specified in "host" key.

"bind" has a special value "*" which means ip address 0.0.0.0 and will
cause dbus-daemon listen on all interfaces.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72301
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06 16:08:18 +00:00
Chengwei Yang
eeae8a6b1c DBus Spec: replace tab with 8 spaces
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72301
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06 16:07:22 +00:00
Chengwei Yang
15a5b2637c Ensure DBusError is set if _dbus_read_nonce() fail
In _dbus_send_nonce() which call in _dbus_read_nonce() and assert on an
error is set if _dbus_read_nonce() fail. However, in _dbus_read_nonce(),
it may fail on fopen() and left error is unset. This will crash us if
assertions hasn't been disabled.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72298
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06 16:05:45 +00:00
Chengwei Yang
f4618906b0 kqueue: open watched directories with close-on-exec flag
[FreeBSD and OpenBSD contributors clarified that O_CLOEXEC has been
supported for ~ 2 years on both, so for the moment we're assuming
that every platform with kqueue also has working O_CLOEXEC. Please reopen
the bug, with a tested patch that uses _dbus_fd_set_close_on_exec() instead,
if this assumption turns out to be false. -smcv]

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72213
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06 16:04:44 +00:00
Chengwei Yang
854554c3a6 BusTransaction: remove confusing getter of connections
There is a DBusList* member of BusTransaction named "connections", while
its getter function bus_transaction_get_connections() returns
context->connections which in fact is a BusConnections pointer, this is
quite confusing. Because this is what bus_context_get_connections()
returns.

This patch call out to bus_context_get_connections() directly and remove
the then unused bus_transaction_get_connections().

https://bugs.freedesktop.org/show_bug.cgi?id=71597
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06 15:59:18 +00:00
Chengwei Yang
b2a517040c _dbus_auth_return_buffer(): remove unused argument
The argument bytes_read of _dbus_auth_return_buffer() function isn't
used at all, so remove it.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71477
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06 15:58:11 +00:00
Simon McVittie
14d72882c9 _dbus_listen_unix_socket: don't try to set SO_REUSEADDR
On Hurd, the setsockopt() fails. Svante Signell confirmed that on
at least Linux and kFreeBSD, SO_REUSEADDR "succeeds" on Unix sockets,
but doesn't have any practical effect; so rather than making the
failure not issue a warning, we might as well not bother with the
syscall at all.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69492
Reviewed-by: Chengwei Yang <chengwei.yang@intel.com>
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-06 15:55:42 +00:00