platform/upstream/dbus.git
13 years agoMerge branch 'dbus-1.4'
Ralf Habacker [Wed, 21 Dec 2011 19:42:21 +0000 (20:42 +0100)]
Merge branch 'dbus-1.4'

13 years agoMerge branch 'dbus-1.4' of ssh://git.freedesktop.org/git/dbus/dbus into dbus-1.4
Ralf Habacker [Wed, 21 Dec 2011 19:40:22 +0000 (20:40 +0100)]
Merge branch 'dbus-1.4' of ssh://git.freedesktop.org/git/dbus/dbus into dbus-1.4

13 years agoAdds a configure time key --with-dbus-session-bus-default-address
Siraj Razick [Wed, 21 Dec 2011 18:25:35 +0000 (13:25 -0500)]
Adds a configure time key --with-dbus-session-bus-default-address

With this key we can specifiy the default session bus address
at compile time with autotool builds made with mingw32.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=43639
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
13 years agoMerge branch 'dbus-1.4' of ssh://git.freedesktop.org/git/dbus/dbus into dbus-1.4
Ralf Habacker [Wed, 21 Dec 2011 19:22:53 +0000 (20:22 +0100)]
Merge branch 'dbus-1.4' of ssh://git.freedesktop.org/git/dbus/dbus into dbus-1.4

13 years agoadded notes about supported compilers
Ralf Habacker [Wed, 21 Dec 2011 07:50:08 +0000 (08:50 +0100)]
added notes about supported compilers

13 years agomade session service dirs customizable: autotools part
Ralf Habacker [Mon, 21 Nov 2011 11:18:58 +0000 (12:18 +0100)]
made session service dirs customizable: autotools part

13 years agomade session service dirs customizable: cmake part
Ralf Habacker [Mon, 31 Oct 2011 14:53:25 +0000 (15:53 +0100)]
made session service dirs customizable: cmake part

13 years agoMerge branch 'dbus-1.4'
Simon McVittie [Wed, 2 Nov 2011 15:31:09 +0000 (15:31 +0000)]
Merge branch 'dbus-1.4'

13 years agocorrupt test: compile successfully against older GLib (Debian stable)
Simon McVittie [Thu, 15 Sep 2011 17:27:27 +0000 (18:27 +0100)]
corrupt test: compile successfully against older GLib (Debian stable)

We don't really need g_socket_send_with_blocking here.

Also, don't leak the GLib socket objects.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41219
Reviewed-by: Lennart Poettering <lennart@poettering.net>
13 years agoSet DBUS_TEST_HOMEDIR when running installcheck
Simon McVittie [Fri, 16 Sep 2011 14:01:40 +0000 (15:01 +0100)]
Set DBUS_TEST_HOMEDIR when running installcheck

This avoids spamming ~/.dbus and ~/.dbus-keyrings with filesystem activity
while running the tests.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41218
Reviewed-by: Lennart Poettering <lennart@poettering.net>
13 years ago_dbus_listen_tcp_socket: avoid leaking listen_fd in unlikely circumstances
Simon McVittie [Thu, 3 Feb 2011 17:59:07 +0000 (17:59 +0000)]
_dbus_listen_tcp_socket: avoid leaking listen_fd in unlikely circumstances

If getaddrinfo (with port == 0) succeeds, the kernel gives us a port when
we first listen on a socket, we jump back to redo_lookup_with_port,
and getaddrinfo (with the nonzero port) fails, we leak listen_fd and all
the fds in it.

From the department of "without static analysis we'd never have spotted
this", or possibly "backward goto considered harmful".

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=29881
Bug-NB: NB#180486 CID-2389
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agorefactored cmake version extracting from configure.ac
Ralf Habacker [Fri, 28 Oct 2011 22:25:18 +0000 (00:25 +0200)]
refactored cmake version extracting from configure.ac

13 years agoMerge branch 'dbus-1.4'
Ralf Habacker [Fri, 28 Oct 2011 19:41:55 +0000 (21:41 +0200)]
Merge branch 'dbus-1.4'

13 years agoOptimized error handling of previous patch
Ralf Habacker [Fri, 28 Oct 2011 19:22:53 +0000 (21:22 +0200)]
Optimized error handling of previous patch

13 years agoFind dbus-daemon executable next to dbus shared libaray on windows.
Jesper Dam [Fri, 28 Oct 2011 13:54:30 +0000 (15:54 +0200)]
Find dbus-daemon executable next to dbus shared libaray on windows.

If the dbus shared library and the daemon executable are both in a dir
that is not part of the default search path and dbus-1.dll is dynamically
loaded with LoadLibrary(), it will fail to locate and launch the daemon
without this patch.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41558
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
13 years agoInstall empty session.d config directory using cmake, otherwise dbus-daemon will...
Ralf Habacker [Mon, 17 Oct 2011 11:45:00 +0000 (13:45 +0200)]
Install empty session.d config directory using cmake, otherwise dbus-daemon will not start

Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41319

13 years agocmake: don't include -util sources in the shared library
Simon McVittie [Wed, 15 Jun 2011 09:48:59 +0000 (10:48 +0100)]
cmake: don't include -util sources in the shared library

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34976
Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
13 years agoRemove dbus-auth-script from the shared library
Simon McVittie [Wed, 15 Jun 2011 10:16:54 +0000 (11:16 +0100)]
Remove dbus-auth-script from the shared library

Only the tests use this.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34976
Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
13 years agoMerged cmake and autotools session bus configuration
Ralf Habacker [Thu, 29 Sep 2011 08:30:33 +0000 (10:30 +0200)]
Merged cmake and autotools session bus configuration

cmake and autotools session bus configuration templates are identical,
so cmake now uses the autotools.
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41319

13 years agoRemove EXT variable from CMake, just use Automake-compatible EXEEXT
Simon McVittie [Tue, 27 Sep 2011 09:52:51 +0000 (10:52 +0100)]
Remove EXT variable from CMake, just use Automake-compatible EXEEXT

According to Ralf, there's no standard name for this in CMake, so we
might as well use the standard Automake name.

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222

13 years agosysdeps: remove misleading comments
Simon McVittie [Mon, 26 Sep 2011 11:35:07 +0000 (12:35 +0100)]
sysdeps: remove misleading comments

The comment claims that _dbus_full_duplex_pipe() is only used for
the debug-pipe server, but in fact the process-spawning code uses it now
(on both Unix and Windows platforms).

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222

13 years agoMerge tests' cmake and autotools bus configuration
Simon McVittie [Mon, 26 Sep 2011 16:37:20 +0000 (17:37 +0100)]
Merge tests' cmake and autotools bus configuration

In Unix, the tests listened on both debug-pipe (which is a socketpair,
or a TCP emulation of socketpair on Windows) and a Unix socket.

In the Windows port, the tests were hard-coded to listen on a particular
port, which allowed the dispatch test to connect to that port, as long
as no two tests ran simultaneously (which I don't think was ever guaranteed -
make -j can violate this). That's valid out-of-process, and also
fully-specified, so they only needed one <listen> directive, so the
CMake input only had one.

To make the tests work under CMake on Unix, there was a hack: the string
substituted for the content of the <listen> directive contained
</listen><listen> to get the other address in, which is pretty nasty.

Instead of doing that, I've made both build systems, on both Unix and
Windows, use both debug-pipe and a more normal transport (Unix or TCP).
debug-pipe has a Windows implementation and it's used in
dbus-spawn-win.c, so it'd better work. The use of debug-pipe is now
hard-coded rather than being a configure parameter (there's no reason
to vary it in different builds), and I used TEST_LISTEN as the name of the
Unix/TCP address, because it's a "vague" address (no specific Unix path, no
TCP port), that you can listen on but not connect to.

This in turn means that we can merge the Autoconf .in and CMake .cmake
files, similar to Bug #41033.

You might wonder why I've kept debug-pipe. I did try to get rid of it, but
it turns out that the tests in dispatch.c rely on
dbus_connection_open_private() not blocking, and normal socket
connections block on connect(). Until we fix that by adding an async
version of dbus_connection_open_private(), it won't be safe to have a
test like dispatch.c that "talks to itself", unless it uses a transport
as trivial as debug-pipe in which neither end has to block on the other.

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222

13 years agocmake: remove unused TEST_SERVICE_DIR variable
Simon McVittie [Fri, 16 Sep 2011 16:03:47 +0000 (17:03 +0100)]
cmake: remove unused TEST_SERVICE_DIR variable

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222

13 years agoSimplify substitution of test executables to use fewer variables
Simon McVittie [Fri, 16 Sep 2011 16:03:37 +0000 (17:03 +0100)]
Simplify substitution of test executables to use fewer variables

Also use EXEEXT in all the service files, even in the automake build
system.

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222

13 years agoSimplify generation of bus configuration files
Simon McVittie [Fri, 16 Sep 2011 16:40:29 +0000 (17:40 +0100)]
Simplify generation of bus configuration files

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222

13 years agoMerge branch 'dbus-1.4'
Ralf Habacker [Sat, 24 Sep 2011 06:35:49 +0000 (08:35 +0200)]
Merge branch 'dbus-1.4'

13 years agoUse dbus/dbus-arch-deps.h.in as source for cmake too
Ralf Habacker [Fri, 23 Sep 2011 13:38:12 +0000 (15:38 +0200)]
Use dbus/dbus-arch-deps.h.in as source for cmake too

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41033
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
13 years agoMerge branch 'dbus-1.4'
Ralf Habacker [Thu, 22 Sep 2011 19:26:43 +0000 (21:26 +0200)]
Merge branch 'dbus-1.4'

Conflicts:
cmake/CMakeLists.txt

13 years agoAdded cmake 'help-options' target to print out all available configure options
Ralf Habacker [Sun, 22 May 2011 21:01:13 +0000 (23:01 +0200)]
Added cmake 'help-options' target to print out all available configure options

cherry-picked 5a0c5663ebf0b75503dfa6a60c01df07a29d3334

13 years agofixed cmake error: doc says CACHE needs type *and* doc string
Ralf Habacker [Tue, 14 Jun 2011 16:45:46 +0000 (18:45 +0200)]
fixed cmake error: doc says CACHE needs type *and* doc string

cherry-picked aba867f2422d06393f610c6cd8c6b147b4fd6c38

13 years agoLimit batch file creating to windows
Ralf Habacker [Sat, 2 Jul 2011 22:54:20 +0000 (00:54 +0200)]
Limit batch file creating to windows

cherry-picked 84b03cae585274bfe54e2a234dff72469cef581d

13 years agoFixed cmake buildsystem - option command only supports boolean values
Ralf Habacker [Thu, 22 Sep 2011 18:03:48 +0000 (20:03 +0200)]
Fixed cmake buildsystem - option command only supports boolean values

Conflicts:

cmake/CMakeLists.txt

cherry picked 4ee7b07b208f64f3b76f253c449e86e86849fca8 from master
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
13 years agocmake fix: generate build timestamp
Ralf Habacker [Tue, 20 Sep 2011 07:57:52 +0000 (09:57 +0200)]
cmake fix: generate build timestamp

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41029
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
13 years agoSimplified cmake xml parser dependencies.
Ralf Habacker [Thu, 22 Sep 2011 17:31:38 +0000 (19:31 +0200)]
Simplified cmake xml parser dependencies.

Find either expat or libxml2 xml parser libraries, depending on -DDBUS_USE_EXPAT=ON|OFF

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41027
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
13 years agoMicro version
Simon McVittie [Wed, 21 Sep 2011 18:39:18 +0000 (19:39 +0100)]
Micro version

13 years agoPrepare version 1.5.8 dbus-1.5.8
Simon McVittie [Wed, 21 Sep 2011 17:26:29 +0000 (18:26 +0100)]
Prepare version 1.5.8

13 years agoMerge branch 'dbus-1.4'
Simon McVittie [Wed, 21 Sep 2011 17:21:09 +0000 (18:21 +0100)]
Merge branch 'dbus-1.4'

Conflicts:
NEWS
configure.ac

13 years agoMicro version
Simon McVittie [Wed, 21 Sep 2011 17:14:39 +0000 (18:14 +0100)]
Micro version

13 years agoPrepare version 1.4.16 dbus-1.4.16
Simon McVittie [Wed, 21 Sep 2011 14:26:53 +0000 (15:26 +0100)]
Prepare version 1.4.16

13 years agoEnable more compiler warnings by default
Simon McVittie [Fri, 5 Aug 2011 12:55:48 +0000 (13:55 +0100)]
Enable more compiler warnings by default

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39231
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agorefs test: fix unused variable
Simon McVittie [Wed, 21 Sep 2011 10:54:42 +0000 (11:54 +0100)]
refs test: fix unused variable

This one was added since my more-unused-39231 branch.

13 years agoFix compilation of syslog test in master
Simon McVittie [Wed, 21 Sep 2011 10:53:31 +0000 (11:53 +0100)]
Fix compilation of syslog test in master

13 years agoMerge branch 'more-unused-39231'
Simon McVittie [Wed, 21 Sep 2011 10:45:12 +0000 (11:45 +0100)]
Merge branch 'more-unused-39231'

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39231
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoMerge branch 'remove-stub-tests-41012'
Simon McVittie [Wed, 21 Sep 2011 10:44:34 +0000 (11:44 +0100)]
Merge branch 'remove-stub-tests-41012'

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41012
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoMerge branch 'dbus-1.4'
Simon McVittie [Wed, 21 Sep 2011 10:39:32 +0000 (11:39 +0100)]
Merge branch 'dbus-1.4'

Conflicts:
NEWS

13 years agoNEWS
Simon McVittie [Wed, 21 Sep 2011 10:38:22 +0000 (11:38 +0100)]
NEWS

13 years agoupdate_desktop_file_entry: initialize return value properly, and actually return it
Simon McVittie [Thu, 21 Jul 2011 12:21:29 +0000 (13:21 +0100)]
update_desktop_file_entry: initialize return value properly, and actually return it

Since 1.4.4 (commit 75cfd97f) this function always returned FALSE. As far
as I can see this was actually harmless, because both of its callers
ignore any error that is not NoMemory (and treat it the same as success).

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39230
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoupdate_desktop_file_entry: if the service name already existed, set error
Simon McVittie [Thu, 21 Jul 2011 12:12:15 +0000 (13:12 +0100)]
update_desktop_file_entry: if the service name already existed, set error

If we're going to return FALSE for this (which has apparently always
been the case), then we should set an error properly.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39230
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoupdate_desktop_file_entry: don't leak file_path on one particular OOM
Simon McVittie [Thu, 21 Jul 2011 12:06:21 +0000 (13:06 +0100)]
update_desktop_file_entry: don't leak file_path on one particular OOM

Revenge of #33126: most, but not all, temporary variables were freed on
this code path.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39230
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoNEWS
Simon McVittie [Wed, 21 Sep 2011 10:25:40 +0000 (11:25 +0100)]
NEWS

13 years agoIf --enable-tests=yes, require Python modules for complete test coverage
Simon McVittie [Wed, 24 Aug 2011 11:24:28 +0000 (12:24 +0100)]
If --enable-tests=yes, require Python modules for complete test coverage

The two relevant tests already exit 0 with a message if importing those
modules fails.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37847
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoOnly ask pkg-config for the systemd unit directory if both are installed
Simon McVittie [Fri, 16 Sep 2011 09:50:01 +0000 (10:50 +0100)]
Only ask pkg-config for the systemd unit directory if both are installed

pkg-config is not a hard dependency, and this check avoids errors in a
minimal build environment:

./configure: line 21777: --variable=systemdsystemunitdir: command not found

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37847
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoGive better diagnostics if --enable-tests=yes is given
Simon McVittie [Wed, 24 Aug 2011 10:00:35 +0000 (11:00 +0100)]
Give better diagnostics if --enable-tests=yes is given

We want to indicate why it's a problem that GLib, dbus-glib are missing.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37847
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoCheck for Python; skip Python tests if not found
Simon McVittie [Wed, 24 Aug 2011 09:59:41 +0000 (10:59 +0100)]
Check for Python; skip Python tests if not found

As with the optional test-dependencies on GLib and dbus-glib, we make this
a hard dependency if --enable-tests[=yes], but not if --enable-tests=auto.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37847
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoCope with platforms whose vsnprintf violates both POSIX and C99
Simon McVittie [Tue, 21 Jun 2011 13:09:32 +0000 (14:09 +0100)]
Cope with platforms whose vsnprintf violates both POSIX and C99

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=11668
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoAdd a semi-automatic test for _dbus_system_log
Simon McVittie [Tue, 23 Aug 2011 15:14:21 +0000 (16:14 +0100)]
Add a semi-automatic test for _dbus_system_log

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39987
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoCope with Unixes that don't have LOG_PERROR, like Solaris 10
Simon McVittie [Tue, 23 Aug 2011 15:10:03 +0000 (16:10 +0100)]
Cope with Unixes that don't have LOG_PERROR, like Solaris 10

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39987
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoMake "make -C test clean" idempotent
Simon McVittie [Fri, 5 Aug 2011 12:16:47 +0000 (13:16 +0100)]
Make "make -C test clean" idempotent

Previously, it'd fail when done twice, because you can't rmdir a
nonexistent directory.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40004
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoOn Solaris, define CMSG_ALIGN, CMSG_LEN, CMSG_SPACE if undefined
Simon McVittie [Tue, 23 Aug 2011 11:05:00 +0000 (12:05 +0100)]
On Solaris, define CMSG_ALIGN, CMSG_LEN, CMSG_SPACE if undefined

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40235
Tested-by: Dagobert Michelsen <dam@opencsw.org>
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoFix maintainer-upload-docs target to work out-of-tree
Simon McVittie [Tue, 20 Sep 2011 17:44:25 +0000 (18:44 +0100)]
Fix maintainer-upload-docs target to work out-of-tree

The STATIC_DOCS, DTDS and all dist_ files except XMLTO_OUTPUT are in the
source tree. The XMLTO_OUTPUT and the man2html output are in the build
tree, and the BONUS_FILES already have $(srcdir) in their names.

Also change the rules that generate the dbus-docs directory so that if
they fail, they leave behind a temporary directory, rather than leaving
behind a dbus-docs directory that causes make to not run those rules
if re-run; and change the rules to scp files to the server, to put a
trailing "/" on paths, ensuring that the tarball won't be uploaded as
"www" if the www directory doesn't already exist.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41047
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoMerge branch 'dbus-1.4'
Ralf Habacker [Tue, 20 Sep 2011 17:37:39 +0000 (19:37 +0200)]
Merge branch 'dbus-1.4'

13 years agocmake fix: install version string
Ralf Habacker [Tue, 20 Sep 2011 06:42:31 +0000 (08:42 +0200)]
cmake fix: install version string

Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40905

13 years ago_dbus_pending_call_test: remove stub
Simon McVittie [Wed, 22 Jun 2011 15:13:48 +0000 (16:13 +0100)]
_dbus_pending_call_test: remove stub

13 years ago_dbus_marshal_header_test: remove stub
Simon McVittie [Wed, 22 Jun 2011 15:13:37 +0000 (16:13 +0100)]
_dbus_marshal_header_test: remove stub

13 years agobus_policy_test: remove stub
Simon McVittie [Wed, 22 Jun 2011 14:53:09 +0000 (15:53 +0100)]
bus_policy_test: remove stub

13 years agodbus-internals: make sure function-like macros expand to something non-empty
Simon McVittie [Fri, 5 Aug 2011 12:43:12 +0000 (13:43 +0100)]
dbus-internals: make sure function-like macros expand to something non-empty

This avoids sometimes-surprising semantics, and also compiler warnings
when they're the only statement in an "if" or "else" clause, without {}.

13 years agoUse {}, not semicolon, when the statement of an "if" does nothing
Simon McVittie [Fri, 5 Aug 2011 12:40:44 +0000 (13:40 +0100)]
Use {}, not semicolon, when the statement of an "if" does nothing

The uses in bus/activation.c are also probably wrong because they ignore
the result of the test, but that's orthogonal.
(<https://bugs.freedesktop.org/show_bug.cgi?id=39858>)

13 years agoFix an assortment of variables that aren't used when not checking/asserting
Simon McVittie [Fri, 5 Aug 2011 12:25:14 +0000 (13:25 +0100)]
Fix an assortment of variables that aren't used when not checking/asserting

13 years agoBusConnections: don't assert about BusConnectionData in functions that don't need it
Simon McVittie [Fri, 5 Aug 2011 12:24:24 +0000 (13:24 +0100)]
BusConnections: don't assert about BusConnectionData in functions that don't need it

13 years agobus_driver_handle_message: remove unused label
Simon McVittie [Fri, 5 Aug 2011 12:23:49 +0000 (13:23 +0100)]
bus_driver_handle_message: remove unused label

13 years agoactivation helper: remove unused variable when not being verbose
Simon McVittie [Fri, 5 Aug 2011 12:22:46 +0000 (13:22 +0100)]
activation helper: remove unused variable when not being verbose

13 years agobus_registry_acquire_service: remove unnecessary variable
Simon McVittie [Fri, 5 Aug 2011 12:22:18 +0000 (13:22 +0100)]
bus_registry_acquire_service: remove unnecessary variable

13 years agoDon't refcount TimeoutCallback
Simon McVittie [Fri, 5 Aug 2011 12:21:59 +0000 (13:21 +0100)]
Don't refcount TimeoutCallback

It turns out that timeout_callback_ref() is no longer called anywhere.

13 years agoRemove a never-used callback
Simon McVittie [Fri, 5 Aug 2011 12:20:31 +0000 (13:20 +0100)]
Remove a never-used callback

13 years agoRemove more never-used variables
Simon McVittie [Fri, 5 Aug 2011 12:20:16 +0000 (13:20 +0100)]
Remove more never-used variables

13 years agoMerge branch 'dbus-1.4'
Simon McVittie [Fri, 26 Aug 2011 14:07:41 +0000 (15:07 +0100)]
Merge branch 'dbus-1.4'

13 years agoDon't build any of the reload-pipe code on non-Unix
Simon McVittie [Thu, 11 Aug 2011 10:02:40 +0000 (11:02 +0100)]
Don't build any of the reload-pipe code on non-Unix

In commit ab7b3f9, Ralf notes that handle_reload_watch() is (in principle)
cross-platform. However, there's no way to trigger it on Windows, because
nothing ever writes to the pipe. Make the entire pipe-to-self trick
Unix-specific instead.

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40002

13 years agoMerge branch 'dbus-1.4'
Simon McVittie [Wed, 24 Aug 2011 10:26:13 +0000 (11:26 +0100)]
Merge branch 'dbus-1.4'

13 years agoNEWS
Simon McVittie [Wed, 24 Aug 2011 10:26:01 +0000 (11:26 +0100)]
NEWS

13 years agoAdd missing inclusion of inttypes.h
Simon McVittie [Wed, 24 Aug 2011 10:01:45 +0000 (11:01 +0100)]
Add missing inclusion of inttypes.h

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40313
Reviewed-by: Thiago Macieira <thiago@kde.org>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
13 years agoMerge branch 'dbus-1.4'
Ralf Habacker [Mon, 15 Aug 2011 15:33:42 +0000 (17:33 +0200)]
Merge branch 'dbus-1.4'

13 years agoFix compilation of (no-op) alignment assertions on non-gcc
Simon McVittie [Mon, 15 Aug 2011 08:52:04 +0000 (09:52 +0100)]
Fix compilation of (no-op) alignment assertions on non-gcc

do {} while (0) isn't valid at file scope, so the non-gcc code path
was broken; in particular, this affected MSVC.

Reviewed-by:Ralf Habacker <ralf.habacker@freenet.de>

13 years agoMerge branch 'dbus-1.4'
Simon McVittie [Mon, 15 Aug 2011 09:26:48 +0000 (10:26 +0100)]
Merge branch 'dbus-1.4'

13 years agoNEWS
Simon McVittie [Mon, 15 Aug 2011 09:26:42 +0000 (10:26 +0100)]
NEWS

13 years agoInstall diagrams in htmldir
Chris Mayo [Mon, 15 Aug 2011 09:23:04 +0000 (10:23 +0100)]
Install diagrams in htmldir

diagram.png and diagram.svg are linked from dbus-tutorial.html but recent
changes to doc/Makefile.am mean that if htmldir is set with configure they are
installed such that the relative link from dbus-tutorial.html does not work.

Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
13 years agoMerge branch 'dbus-1.4'
Simon McVittie [Mon, 15 Aug 2011 08:56:03 +0000 (09:56 +0100)]
Merge branch 'dbus-1.4'

13 years agoFix compilation on MSVC, which doesn't understand "inline" with its C99 meaning.
Ralf Habacker [Sat, 13 Aug 2011 20:08:26 +0000 (22:08 +0200)]
Fix compilation on MSVC, which doesn't understand "inline" with its C99 meaning.
This fix is limited to msvc compilers only.

Reviewed-by:Simon McVittie <simon.mcvittie@collabora.co.uk>

13 years agoNEWS
Simon McVittie [Fri, 12 Aug 2011 09:45:24 +0000 (10:45 +0100)]
NEWS

13 years agodbus-daemon-eavesdrop test: apply the same Windows fixes as dbus-daemon test
Simon McVittie [Fri, 12 Aug 2011 09:45:15 +0000 (10:45 +0100)]
dbus-daemon-eavesdrop test: apply the same Windows fixes as dbus-daemon test

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40003

13 years agoFix linking of libdbus-testutils.la with Automake targeting Windows
Simon McVittie [Fri, 5 Aug 2011 12:14:54 +0000 (13:14 +0100)]
Fix linking of libdbus-testutils.la with Automake targeting Windows

This regressed in commit 9875480ed - libdbus-testutils.la needs static
linking too.

13 years agoMerge branch 'dbus-1.4'
Simon McVittie [Fri, 12 Aug 2011 09:26:13 +0000 (10:26 +0100)]
Merge branch 'dbus-1.4'

13 years agoNEWS
Simon McVittie [Fri, 12 Aug 2011 09:26:04 +0000 (10:26 +0100)]
NEWS

13 years agoFix compiler warnings when cross-compiling dbus-daemon test for mingw32
Simon McVittie [Fri, 5 Aug 2011 12:55:09 +0000 (13:55 +0100)]
Fix compiler warnings when cross-compiling dbus-daemon test for mingw32

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40003
Reviewed-by: Colin Walters <walters@verbum.org>
13 years agoMerge branch 'dbus-1.4'
Simon McVittie [Thu, 11 Aug 2011 10:54:52 +0000 (11:54 +0100)]
Merge branch 'dbus-1.4'

Conflicts:
NEWS

13 years agoNEWS for 1.4.x
Simon McVittie [Thu, 11 Aug 2011 10:53:45 +0000 (11:53 +0100)]
NEWS for 1.4.x

13 years agodbus-marshal-basic: assert that the size and (on gcc) alignment of all types is as...
Simon McVittie [Tue, 21 Jun 2011 16:02:10 +0000 (17:02 +0100)]
dbus-marshal-basic: assert that the size and (on gcc) alignment of all types is as expected

The __alignof__() checks here will fail if compiling for an architecture
where more-than-natural alignment is needed.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39636
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoAdd _DBUS_STATIC_ASSERT (based on GLib's G_STATIC_ASSERT) and use it
Simon McVittie [Tue, 21 Jun 2011 15:19:21 +0000 (16:19 +0100)]
Add _DBUS_STATIC_ASSERT (based on GLib's G_STATIC_ASSERT) and use it

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39636
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
13 years agoMerge branch 'dbus-1.4', omitting the DBUS_INLINE stuff
Simon McVittie [Thu, 11 Aug 2011 10:26:58 +0000 (11:26 +0100)]
Merge branch 'dbus-1.4', omitting the DBUS_INLINE stuff

fd.o #40000 had effectively already been fixed (slightly differently)
on master.

Conflicts:
cmake/config.h.cmake

13 years agocapng: Drop supplemental groups when switching to daemon user
Steve Grubb [Mon, 1 Aug 2011 18:28:27 +0000 (14:28 -0400)]
capng: Drop supplemental groups when switching to daemon user

This patch ensures the daemon process doesn't inherit any supplemental
groups for the root user from an administrator login via an init
script.

This is only an issue for pre-systemd systems.

https://bugzilla.redhat.com/show_bug.cgi?id=726953

13 years agoautogen.sh: Don't run configure if NOCONFIGURE is set
Colin Walters [Mon, 1 Aug 2011 16:59:32 +0000 (12:59 -0400)]
autogen.sh: Don't run configure if NOCONFIGURE is set

See http://people.gnome.org/~walters/docs/build-api.txt