Simon McVittie [Wed, 8 Feb 2012 19:13:19 +0000 (19:13 +0000)]
NEWS
Simon McVittie [Mon, 6 Jun 2011 16:40:41 +0000 (17:40 +0100)]
dbus-marshal-recursive: make some internal functions static
Having a disabled type writer, comparing type readers by position, and
performing a single step of copying from a reader to a writer all seem pretty
obscure, and were only used within dbus-marshal-recursive.c (to realign
after insertion).
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38285
Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Simon McVittie [Fri, 10 Jun 2011 09:39:10 +0000 (10:39 +0100)]
find_field_for_modification: document where the readers are left pointing
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38285
Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Simon McVittie [Mon, 19 Sep 2011 13:14:49 +0000 (14:14 +0100)]
Reinstate the recursive marshalling test but skip the later parts by default
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38285
Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Simon McVittie [Thu, 9 Jun 2011 11:39:38 +0000 (12:39 +0100)]
dbus-test: only test for memleaks if we actually ran the test
This reduces output spam if you're only running one part.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38285
Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Simon McVittie [Wed, 8 Feb 2012 19:06:51 +0000 (19:06 +0000)]
Merge branch 'dbus-1.4'
Conflicts:
NEWS
Simon McVittie [Wed, 8 Feb 2012 19:06:30 +0000 (19:06 +0000)]
NEWS
Jack Nagel [Fri, 16 Dec 2011 06:21:21 +0000 (00:21 -0600)]
docs: correctly invoke man2html
man2html expects to find its input on stdin, so just passing the
filename will cause it to hang waiting for input.
[man2html 1.6g as shipped in Debian seems to be fine with files on the
command line, but apparently other versions aren't? -smcv]
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=43875
Lennart Poettering [Thu, 2 Feb 2012 01:11:11 +0000 (02:11 +0100)]
systemd: drop machine UUID generation for unit file
To optimize startup a bit, drop machine UUID generation from the unit
file. Since a while D-Bus was already capable of making use of the
/etc/machine-id file, which is guaranteed to exist on systemd systems
(since the first released versions already), hence there's no need to
ever generate a D-Bus specific machine ID.
In times where userspace takes < 800ms to boot up getting rid of this
process optimizes boot time further.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45520
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Tue, 7 Feb 2012 16:09:21 +0000 (16:09 +0000)]
NEWS
Simon McVittie [Tue, 7 Feb 2012 16:00:41 +0000 (16:00 +0000)]
Check for a new enough systemd that sd_uid_get_seats (., ., NULL) is valid
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39609
Lennart Poettering [Thu, 2 Feb 2012 04:06:25 +0000 (05:06 +0100)]
at_console: ask systemd whether a user is at the console
systemd manages seats and users. This patch optionally asks systemd
whether a user is at the console. It used libsystemd-login for that, a
low-level library that allows querying this kind of information without
expensive round trips.
In order to be nice to the Debian folks this patch falls back to
traditional modes of operation if systemd is not found to be around.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39609
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Tue, 7 Feb 2012 15:21:45 +0000 (15:21 +0000)]
NEWS
Simon McVittie [Tue, 7 Feb 2012 15:03:56 +0000 (15:03 +0000)]
Merge branch 'socket-set-33337'
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33337
Simon McVittie [Mon, 23 Jan 2012 12:03:20 +0000 (12:03 +0000)]
NEWS
Simon McVittie [Mon, 23 Jan 2012 12:01:56 +0000 (12:01 +0000)]
talk about stable branches a bit more
Simon McVittie [Mon, 23 Jan 2012 11:14:45 +0000 (11:14 +0000)]
Merge branch 'dbus-1.4' rejecting commit
4ebb275ab7b6f71d5
Conflicts:
configure.ac
Simon McVittie [Mon, 23 Jan 2012 11:13:42 +0000 (11:13 +0000)]
Don't warn about deprecated declarations in this stable branch
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=44413
Simon McVittie [Mon, 23 Jan 2012 11:11:24 +0000 (11:11 +0000)]
Port to glib 2.31.x g_thread API
g_thread_init() is deprecated since glib 2.24, call g_type_init() instead.
Bump glib requirement accordingly.
g_thread_create is deprecated since 2.31, use g_thread_new() instead. When
building with a glib earlier than 2.31, provide a backwards compatibility shim.
[Added a comment about why we're using g_type_init() in a test that
doesn't otherwise use GObject -smcv]
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=44413
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Mon, 23 Jan 2012 10:33:35 +0000 (10:33 +0000)]
Merge branch 'dbus-1.4', rejecting commit
08dd53c14b53b88c
Simon McVittie [Mon, 23 Jan 2012 10:27:32 +0000 (10:27 +0000)]
Revert addition of files which were only meant to exist on master, too
This completes the reversion started in
5df8c3db12590edd68e968.
Simon McVittie [Mon, 23 Jan 2012 10:20:54 +0000 (10:20 +0000)]
update NEWS
Simon McVittie [Mon, 23 Jan 2012 10:20:48 +0000 (10:20 +0000)]
dbus-daemon: fix forgotten counter increase while copying configured auth mechanisms
Previously, only one auth mechanism was used.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45106
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Wed, 4 Jan 2012 20:04:59 +0000 (20:04 +0000)]
Revert "windows fix: use install root as base path for relative pathes in dbus service file"
This reverts commit
10fae2352742d6dfd2ab27545048939f10f4922a and
reopens <https://bugs.freedesktop.org/show_bug.cgi?id=44030>.
Simon McVittie [Wed, 4 Jan 2012 19:14:14 +0000 (19:14 +0000)]
Revert "keep cmake in sync with automake related to default bus addresses"
This reverts commit
fdab4af0f4748f1fb5d23ca41e201cca4adb0b2f.
Further discussion required.
Related to https://bugs.freedesktop.org/show_bug.cgi?id=38201
Simon McVittie [Wed, 4 Jan 2012 18:20:06 +0000 (18:20 +0000)]
Revert "made session service dirs customizable: cmake part"
This reverts commit
89e453216c02bb85c5e53d459997f8bc3b2c73d4.
It makes the tests fail under autotools.
Simon McVittie [Wed, 4 Jan 2012 18:19:58 +0000 (18:19 +0000)]
Revert "made session service dirs customizable: autotools part"
This reverts commit
61760cf7de5af3452423244a8b6f5f1b5d00512b.
Simon McVittie [Wed, 4 Jan 2012 18:15:39 +0000 (18:15 +0000)]
Merge branch 'dbus-1.4'
Simon McVittie [Wed, 4 Jan 2012 18:13:27 +0000 (18:13 +0000)]
Merge commit '
5df8c3db12590edd68e968975a335da9d0415e5a' into new-master
Reject its changes so that git merge-tracking will not want to revert the
changes that were unsuitable for 1.4.
Simon McVittie [Fri, 11 Nov 2011 11:48:20 +0000 (11:48 +0000)]
NEWS so far
eXeC001er [Fri, 11 Nov 2011 11:33:23 +0000 (11:33 +0000)]
Remove some dead code related to fd.o #37258
This would now just attempt to close fd -1, which is useless.
[commit message added by smcv]
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37258
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Wed, 4 Jan 2012 17:44:23 +0000 (17:44 +0000)]
Revert all changes since
a36d4918a6f646e085
Someone seems to have merged part of master into 1.4. Again. Let's go
back to the "last known good" point (the branch-point of some 1.4
branches I had locally), then we can cherry-pick the changes that
should have gone in.
Ralf Habacker [Sun, 25 Dec 2011 13:34:59 +0000 (14:34 +0100)]
Merge branch 'dbus-1.4'
Conflicts:
dbus/dbus-spawn-win.c
Ralf Habacker [Sun, 25 Dec 2011 13:30:47 +0000 (14:30 +0100)]
1.4 branch need a fix to be compilable with msvc
Ralf Habacker [Thu, 22 Dec 2011 11:41:44 +0000 (12:41 +0100)]
keep cmake in sync with automake related to default bus addresses
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38201
Ralf Habacker [Wed, 21 Dec 2011 20:24:03 +0000 (21:24 +0100)]
windows fix: use install root as base path for relative pathes in dbus service file
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=44030
Ralf Habacker [Thu, 22 Dec 2011 11:41:44 +0000 (12:41 +0100)]
keep cmake in sync with automake related to default bus addresses
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38201
Ralf Habacker [Wed, 21 Dec 2011 20:24:03 +0000 (21:24 +0100)]
windows fix: use install root as base path for relative pathes in dbus service file
Ralf Habacker [Wed, 21 Dec 2011 19:42:21 +0000 (20:42 +0100)]
Merge branch '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
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>
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
Ralf Habacker [Wed, 21 Dec 2011 07:50:08 +0000 (08:50 +0100)]
added notes about supported compilers
Ralf Habacker [Mon, 21 Nov 2011 11:18:58 +0000 (12:18 +0100)]
made session service dirs customizable: autotools part
Ralf Habacker [Mon, 31 Oct 2011 14:53:25 +0000 (15:53 +0100)]
made session service dirs customizable: cmake part
Simon McVittie [Wed, 2 Nov 2011 15:50:45 +0000 (15:50 +0000)]
_dbus_loop_new: don't crash on OOM allocating socket set
Also don't leak the socket set if allocating watches failed, or
vice versa. Based on review feedback from wjt.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33337
Simon McVittie [Wed, 2 Nov 2011 15:31:09 +0000 (15:31 +0000)]
Merge branch 'dbus-1.4'
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>
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>
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>
Ralf Habacker [Fri, 28 Oct 2011 22:25:18 +0000 (00:25 +0200)]
refactored cmake version extracting from configure.ac
Ralf Habacker [Fri, 28 Oct 2011 19:41:55 +0000 (21:41 +0200)]
Merge branch 'dbus-1.4'
Ralf Habacker [Fri, 28 Oct 2011 19:22:53 +0000 (21:22 +0200)]
Optimized error handling of previous patch
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>
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
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>
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>
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
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
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
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
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
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
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
Ralf Habacker [Sat, 24 Sep 2011 06:35:49 +0000 (08:35 +0200)]
Merge branch 'dbus-1.4'
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>
Ralf Habacker [Thu, 22 Sep 2011 19:26:43 +0000 (21:26 +0200)]
Merge branch 'dbus-1.4'
Conflicts:
cmake/CMakeLists.txt
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
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
Ralf Habacker [Sat, 2 Jul 2011 22:54:20 +0000 (00:54 +0200)]
Limit batch file creating to windows
cherry-picked
84b03cae585274bfe54e2a234dff72469cef581d
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>
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>
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>
Simon McVittie [Wed, 21 Sep 2011 18:39:18 +0000 (19:39 +0100)]
Micro version
Simon McVittie [Wed, 21 Sep 2011 17:26:29 +0000 (18:26 +0100)]
Prepare version 1.5.8
Simon McVittie [Wed, 21 Sep 2011 17:21:09 +0000 (18:21 +0100)]
Merge branch 'dbus-1.4'
Conflicts:
NEWS
configure.ac
Simon McVittie [Wed, 21 Sep 2011 17:14:39 +0000 (18:14 +0100)]
Micro version
Simon McVittie [Wed, 21 Sep 2011 14:26:53 +0000 (15:26 +0100)]
Prepare version 1.4.16
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>
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.
Simon McVittie [Wed, 21 Sep 2011 10:53:31 +0000 (11:53 +0100)]
Fix compilation of syslog test in master
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>
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>
Simon McVittie [Wed, 21 Sep 2011 10:39:32 +0000 (11:39 +0100)]
Merge branch 'dbus-1.4'
Conflicts:
NEWS
Simon McVittie [Wed, 21 Sep 2011 10:38:22 +0000 (11:38 +0100)]
NEWS
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>
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>
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>
Simon McVittie [Wed, 21 Sep 2011 10:25:40 +0000 (11:25 +0100)]
NEWS
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Ralf Habacker [Tue, 20 Sep 2011 17:37:39 +0000 (19:37 +0200)]
Merge branch 'dbus-1.4'