diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-08-09 12:32:32 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-08-09 12:32:32 +0100 |
| commit | 0e0111304eaf28a4e86c67baecbfeed217393034 (patch) | |
| tree | a1c8cce0a6e79a2a6bce716bbe6dd667aec2c469 | |
| parent | 55024f65a6d20ba268c96b5d42f8084c31e6a6f3 (diff) | |
| parent | 9436816175060f038af9c06cf135246f955f9ed4 (diff) | |
| download | dbus-0e0111304eaf28a4e86c67baecbfeed217393034.tar.gz | |
Merge branch 'dbus-1.6'
Conflicts:
NEWS
configure.ac
| -rw-r--r-- | NEWS | 10 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps-util-unix.c | 2 | ||||
| -rw-r--r-- | tools/dbus-launch-win.c | 7 |
4 files changed, 17 insertions, 4 deletions
@@ -1,6 +1,12 @@ D-Bus 1.7.0 (UNRELEASED) == +• Unix-specific: + · Fix compilation on Solaris (fd.o #53286, Jonathan Perkin) + +D-Bus 1.6.4 (2012-07-18) +== + Enhancements: • D-Bus Specification 0.20 @@ -19,6 +25,10 @@ Fixes: • Make --enable-developer default to "no" (regression in 1.6.2; fd.o #51657, Simon McVittie) +• Windows-specific: + · Launch dbus-daemon correctly if its path contains a space + (fd.o #49450, Wolfgang Baron) + D-Bus 1.6.2 (2012-06-27) == diff --git a/configure.ac b/configure.ac index 4fcaff7b..be498022 100644 --- a/configure.ac +++ b/configure.ac @@ -1379,6 +1379,8 @@ case $host_os in solaris*) # Solaris' C library apparently needs these runes to be threadsafe... CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT" + # ... this opt-in to get sockaddr_in6 and sockaddr_storage... + CFLAGS="$CFLAGS -D__EXTENSIONS__" # ... and this opt-in to get file descriptor passing support CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500" ;; diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c index caa38d0e..76423ab8 100644 --- a/dbus/dbus-sysdeps-util-unix.c +++ b/dbus/dbus-sysdeps-util-unix.c @@ -424,7 +424,7 @@ _dbus_request_file_descriptor_limit (unsigned int limit) void _dbus_init_system_log (void) { -#ifdef HAVE_DECL_LOG_PERROR +#if HAVE_DECL_LOG_PERROR openlog ("dbus", LOG_PID | LOG_PERROR, LOG_DAEMON); #else openlog ("dbus", LOG_PID, LOG_DAEMON); diff --git a/tools/dbus-launch-win.c b/tools/dbus-launch-win.c index ea4bf0dd..215fac3f 100644 --- a/tools/dbus-launch-win.c +++ b/tools/dbus-launch-win.c @@ -130,9 +130,10 @@ main (int argc, char **argv) fprintf (stderr, "%ls %ls\n", dbusDaemonPath, command); #else command[0] = L'\0'; - /* Windows CE has a different interpretation of cmdline: Start with argv[1]. */ - wcscpy_s (command, sizeof (command), dbusDaemonPath); - wcscat_s (command, sizeof (command), L" --session"); + /* Windows cmdline starts with path, which can contain spaces. */ + wcscpy_s (command, sizeof (command), L"\""); + wcscat_s (command, sizeof (command), dbusDaemonPath); + wcscat_s (command, sizeof (command), L"\" --session"); if (verbose) fprintf (stderr, "%ls\n", command); #endif |