Commit graph

3109 commits

Author SHA1 Message Date
Simon McVittie
44f2531016 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>
2011-09-21 11:44:38 +01:00
Simon McVittie
bf3d8259ac Merge branch 'dbus-1.4'
Conflicts:
	NEWS
2011-09-21 11:39:32 +01:00
Simon McVittie
bdfec55054 NEWS 2011-09-21 11:38:22 +01:00
Simon McVittie
423ab7cdd0 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>
2011-09-21 11:34:31 +01:00
Simon McVittie
c38e9823da 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>
2011-09-21 11:34:07 +01:00
Simon McVittie
9e93d82862 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>
2011-09-21 11:33:38 +01:00
Simon McVittie
4dd6abc953 NEWS 2011-09-21 11:25:48 +01:00
Simon McVittie
dc632829db 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>
2011-09-21 11:25:48 +01:00
Simon McVittie
3f1af382a1 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>
2011-09-21 11:25:48 +01:00
Simon McVittie
d55b3efbde 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>
2011-09-21 11:25:48 +01:00
Simon McVittie
5defa43b6f 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>
2011-09-21 11:25:48 +01:00
Simon McVittie
7fc9c02666 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>
2011-09-21 11:25:48 +01:00
Simon McVittie
029ecdf402 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>
2011-09-21 11:25:48 +01:00
Simon McVittie
a4e9dc6780 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>
2011-09-21 11:25:48 +01:00
Simon McVittie
14ed371845 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>
2011-09-21 11:25:48 +01:00
Simon McVittie
9708294c05 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>
2011-09-21 11:25:48 +01:00
Simon McVittie
f4c02e7829 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>
2011-09-21 11:25:48 +01:00
Ralf Habacker
c1989c1a4f Merge branch 'dbus-1.4' 2011-09-20 19:37:39 +02:00
Ralf Habacker
70b0ffd501 cmake fix: install version string
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40905
2011-09-20 19:34:38 +02:00
Simon McVittie
9c9d66c1a0 _dbus_pending_call_test: remove stub 2011-09-19 15:05:40 +01:00
Simon McVittie
f5d0b12866 _dbus_marshal_header_test: remove stub 2011-09-19 15:05:39 +01:00
Simon McVittie
c0aff8f86a bus_policy_test: remove stub 2011-09-19 15:05:39 +01:00
Simon McVittie
775f77c719 Merge branch 'dbus-1.4' 2011-08-26 15:07:41 +01:00
Simon McVittie
2f183ac576 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
2011-08-26 15:02:30 +01:00
Simon McVittie
2eddc3265c Merge branch 'dbus-1.4' 2011-08-24 11:26:13 +01:00
Simon McVittie
8c2ab410fb NEWS 2011-08-24 11:26:01 +01:00
Simon McVittie
584d4f60b9 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>
2011-08-24 11:01:45 +01:00
Ralf Habacker
3d170cc4ff Merge branch 'dbus-1.4' 2011-08-15 17:33:42 +02:00
Simon McVittie
8c83422b5f 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>
2011-08-15 17:31:50 +02:00
Simon McVittie
6d4fe188e5 Merge branch 'dbus-1.4' 2011-08-15 10:26:48 +01:00
Simon McVittie
9929df06bf NEWS 2011-08-15 10:26:42 +01:00
Chris Mayo
c82a83fb1b 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>
2011-08-15 10:23:04 +01:00
Simon McVittie
0f72713e5a Merge branch 'dbus-1.4' 2011-08-15 09:56:03 +01:00
Ralf Habacker
4a3e5b0af4 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>
2011-08-13 22:08:26 +02:00
Simon McVittie
21947eb371 NEWS 2011-08-12 10:45:24 +01:00
Simon McVittie
74868224e4 dbus-daemon-eavesdrop test: apply the same Windows fixes as dbus-daemon test
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40003
2011-08-12 10:45:15 +01:00
Simon McVittie
39e3866c0a Fix linking of libdbus-testutils.la with Automake targeting Windows
This regressed in commit 9875480ed - libdbus-testutils.la needs static
linking too.
2011-08-12 10:26:26 +01:00
Simon McVittie
c99a3df254 Merge branch 'dbus-1.4' 2011-08-12 10:26:13 +01:00
Simon McVittie
486c0373f1 NEWS 2011-08-12 10:26:04 +01:00
Simon McVittie
bc643f81a5 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>
2011-08-12 10:21:50 +01:00
Simon McVittie
0611a71c67 Merge branch 'dbus-1.4'
Conflicts:
	NEWS
2011-08-11 11:54:52 +01:00
Simon McVittie
0b9e2b8b49 NEWS for 1.4.x 2011-08-11 11:53:45 +01:00
Simon McVittie
6327adafe2 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>
2011-08-11 11:51:55 +01:00
Simon McVittie
213acdb71c 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>
2011-08-11 11:51:43 +01:00
Simon McVittie
513f137912 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
2011-08-11 11:26:58 +01:00
Steve Grubb
70fb675a10 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
2011-08-11 10:54:45 +01:00
Colin Walters
93731e6c9c autogen.sh: Don't run configure if NOCONFIGURE is set
See http://people.gnome.org/~walters/docs/build-api.txt
2011-08-11 10:54:45 +01:00
Ralf Habacker
995bfef416 Clean up cygwin readme 2011-08-06 00:37:39 +02:00
Ralf Habacker
0631b30cea Clean up cygwin readme 2011-08-06 00:36:42 +02:00
Ralf Habacker
8d55ab4224 Clean author list 2011-08-06 00:15:01 +02:00