Commit graph

2682 commits

Author SHA1 Message Date
Simon McVittie
c35e12fda9 Merge branch 'changequote' into dbus-1.4
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-02-25 12:02:02 +00:00
Simon McVittie
be5e2b23c9 Merge branch 'require-display-for-autolaunch-19997' into dbus-1.4
Reviewed-by: Colin Walters <walters@verbum.org>
2011-02-25 12:01:33 +00:00
Simon McVittie
20d2f1702f Merge branch 'modern-autofoo-32245' into dbus-1.4 2011-02-25 11:30:17 +00:00
Simon McVittie
f04e52a2e5 Allow X11 autolaunch to be disabled even if the headers/libraries are there
In an embedded system where the D-Bus session is a core part of the
environment, like Maemo, accidentally auto-launching a second session bus
(for instance for a concurrent ssh session) is a bad idea - it can lead
to a "split brain" situation where half the applications in the GUI are
using a different bus. In these controlled environments, it'd be useful
to prevent autolaunch from ever happening.

(As a side benefit, the changes to configure.in also mean that packagers
can explicitly --enable-x11-autolaunch, to make sure that failure to find
X will make compilation fail cleanly.)

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=19997
Bug-NB: NB#219964
2011-02-24 18:58:18 +00:00
Simon McVittie
407c111672 Don't attempt Unix X11 autolaunching if DISPLAY isn't set
The known use cases for autolaunching (ssh -Y firefox,
run konqueror in legacy DE) all need $DISPLAY too.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=19997
2011-02-24 18:43:34 +00:00
Simon McVittie
7848abe6c2 config-parser regression test: don't require that fd.o #34496 exists
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-02-24 18:40:11 +00:00
Simon McVittie
3681753421 Give XDG_DATA_HOME priority over XDG_DATA_DIRS for servicedirs
According to the XDG Base Directory Specification, “the base directory
defined by $XDG_DATA_HOME is considered more important than any of the
base directories defined by $XDG_DATA_DIRS.”  This makes it easier to
override a system service file as a normal user.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34496
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-02-24 17:17:22 +00:00
Simon McVittie
fb06b43956 Honour aclocal flags in Makefile.am, rather than gluing them onto ACLOCAL
Part of a patch by Javier Jardón.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32245
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-02-24 15:58:01 +00:00
Simon McVittie
260f70e0af Modernize setup of libtool for Windows
Part of a patch by Javier Jardón.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32245
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-02-24 15:56:58 +00:00
Simon McVittie
9af8013cc9 Use AC_CONFIG_HEADERS, not AM_CONFIG_HEADER
Part of a patch by Javier Jardón.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32245
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-02-24 15:53:08 +00:00
Simon McVittie
5595182b65 Modernize AC_INIT usage, with a bug report URL
Part of a patch by Javier Jardón.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32245
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-02-24 15:52:21 +00:00
Simon McVittie
3346c86798 Require a somewhat modern version of autoconf and automake
Part of a patch by Javier Jardón.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32245
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-02-24 15:51:39 +00:00
Simon McVittie
54af6bee3e Modernize AC_OUTPUT usage
Part of a patch by Javier Jardón.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32245
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-02-24 15:48:29 +00:00
Simon McVittie
dbc7637f13 Modernize checks in ld_supports_flag
Part of a patch by Javier Jardón.

(This will conflict with changes from my gc-sections branch -smcv)

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32245
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-02-24 15:48:14 +00:00
Simon McVittie
7fe24aacd2 Modernize checks for DBUS__ACQUIRE_SVC
Part of a patch by Javier Jardón.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32245
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-02-24 15:47:28 +00:00
Simon McVittie
9bedcb0717 Modernize checks for monotonic clock
Part of a patch by Javier Jardón.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32245
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-02-24 15:46:52 +00:00
Simon McVittie
dac0a716ad Modernize checks for cmsgcred
Part of a patch by Javier Jardón.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32245
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-02-24 15:46:34 +00:00
Simon McVittie
5906c072da Modernize checks for ISO/GNU varargs
Part of a patch by Javier Jardón.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32245
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-02-24 15:46:21 +00:00
Simon McVittie
07a54bb2f1 Modernize checks for socklen_t
Part of a patch by Javier Jardón.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32245
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-02-24 15:46:00 +00:00
Simon McVittie
1704a7d483 Modernize checks for non-POSIX getpwnam_r
Part of a patch by Javier Jardón.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32245
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-02-24 15:45:48 +00:00
Simon McVittie
cc2c19c164 Modernize checks for dirfd/dd_fd
Part of a patch by Javier Jardón.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32245
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-02-24 15:45:31 +00:00
Simon McVittie
ff04d7397a Rename configure.in to configure.ac
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32245
2011-02-24 15:43:24 +00:00
Simon McVittie
5cad083069 Don't compress spaces in CFLAGS and friends
Not all sed implementations understand "+" with its POSIX extended regular
expression semantics, and compressing spaces is purely cosmetic anyway.
Let's just drop this.
2011-02-24 15:20:18 +00:00
Simon McVittie
e2d0048421 Remove unnecessary changequote call
Nothing in the changequote'd environment uses square brackets anyway.
2011-02-24 15:16:38 +00:00
Simon McVittie
5c06992e62 Use square brackets (m4 quoting) instead of changequote
For more details, see:
http://www.gnu.org/software/autoconf/manual/html_node/Changequote-is-Evil.html
2011-02-24 15:16:26 +00:00
Simon McVittie
cf33a006dc Post-release version bump 2011-02-18 14:24:35 +00:00
Mark Brand
49d1e3fa5a sysdeps-win needs _dbus_path_is_absolute
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-02-18 13:52:36 +00:00
Simon McVittie
b6142a593b Let's try that again. 2011-02-17 20:06:36 +00:00
Simon McVittie
2497a91b3f Remove unreviewed changes intended to support GTest-based tests
These were committed by mistake. :-(
2011-02-17 20:01:54 +00:00
Simon McVittie
86073fb2a7 Post-release version bump 2011-02-17 19:02:24 +00:00
Simon McVittie
56623cbde7 Prepare version 1.4.4 2011-02-17 18:21:25 +00:00
Simon McVittie
2b5959882a Split acinclude.m4 into separate files in m4/
Drop AM_CHECK_PYTHON_HEADERS (no longer used) and split the others
according to their upstreams.

Otherwise, compiler.m4 won't get included in tarballs.
2011-02-17 18:21:16 +00:00
Simon McVittie
a4102ba51f Merge branch 'leak-fixes-33126'
Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33126
2011-02-17 17:19:15 +00:00
Simon McVittie
9a97f82079 Import compiler.m4 and lcov.am from telepathy-glib, and use them to replace gcov
Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=10887
2011-02-17 17:07:12 +00:00
Simon McVittie
f6e2c958a0 Don't ignore all files in m4, just the libtool ones
Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=10887
2011-02-17 17:06:41 +00:00
Simon McVittie
d5e4fc13e8 Don't distribute dbus-daemon.1 in the tarball
It's generated by configure.

Also use a more normal way to distribute man pages that are actually
source, and use man1_MANS rather than auto-detecting the section from
the man page, which is best-practice and slightly faster.

Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34292
2011-02-17 16:31:44 +00:00
Simon McVittie
2f4c7dd5ba Don't distribute dbus-arch-deps.h in the tarball
It's generated by configure and specific to a system, so there's no point.

Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34292
2011-02-17 16:18:31 +00:00
Simon McVittie
f8d0012ab1 Remove references to dbus-md5, which hasn't been used for at least 8 years
Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34292
2011-02-17 16:16:12 +00:00
Simon McVittie
2acfe412b6 DBusTransport: don't copy DBusAuth's GUID to expected_guid
There was previously a leak in _dbus_transport_get_is_authenticated, if
we hit OOM when copying the server's actual GUID. This would fail the
"SHA1 connection test" if _dbus_iterate was modified to allocate and free
one extra pointer per iteration.

Rather than adding OOM handling everywhere, if we avoid strdup'ing the
GUID, and just re-fetch the const string from the DBusAuth object on demand
instead, we go back to a situation where _dbus_transport_get_is_authenticated
can't fail.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33126
2011-02-16 14:47:08 +00:00
Simon McVittie
d9af45a1fa update_desktop_file_entry: stylistic fixes based on Colin's review 2011-02-16 14:47:08 +00:00
Simon McVittie
75cfd97fc2 update_desktop_file_entry: unify cleanup code for success and failure cases
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33126
2011-02-16 14:47:08 +00:00
Simon McVittie
fbecc33435 update_desktop_file_entry: don't double-free strings if added to entry before failure
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33126
2011-02-16 14:47:08 +00:00
Simon McVittie
65f61236d7 update_desktop_file_entry: free @exec on error
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33126
2011-02-16 14:47:08 +00:00
Simon McVittie
d95cc488a8 update_desktop_file_entry: make scope of exec_tmp as short as possible
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33126
2011-02-16 14:47:08 +00:00
Simon McVittie
fb704ba78f update_desktop_file_entry: use _dbus_strdup for something we'll dbus_free
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33126
2011-02-16 14:47:08 +00:00
Simon McVittie
02b0fa5792 NEWS so far for 1.4.4 2011-02-16 12:37:59 +00:00
Lennart Poettering
509a2e899a build-sys: ignore -Waddress message so that build works on gcc/rawhide
Newer gccs warn if you compare an address of a variable that is allocated
on the stack or is static with NULL. Since we compile dbus with -Werror
this causes the build to fail since we do this check all the time due to
macros such as _DBUS_ASSERT_ERROR_IS_SET().
2011-02-15 13:29:31 +01:00
Matthias Clasen
51e0e91115 Fix syslog string processing
squash_string_nonprintable didn't actually modify the string.

Reviewed-By: Colin Walters <walters@verbum.org>
2011-02-14 11:32:03 -05:00
Colin Walters
66a09fa7c3 bus: Raise file descriptor limit to match configuration
The default configuration has hardcoded 2048 complete connections,
and 64 incomplete.  We need at least that number of file descriptors,
plus some for internal use.

In the bus, attempt to call setrlimit() before we drop privileges.
Practically speaking for this means the system bus gets it, the
session bus doesn't.

http://bugs.freedesktop.org/show_bug.cgi?id=33474

Reviewed-By: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-02-03 13:25:34 -05:00
Simon McVittie
a0e8ae3b77 Merge branch 'dist-30285' into dbus-1.4
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-02-02 15:15:02 +00:00