From 2a50cb475bfaf331e2451bbe70c2b3bbdd1ad69d Mon Sep 17 00:00:00 2001 From: Wolfgang Baron Date: Wed, 18 Jul 2012 18:09:44 +0100 Subject: [PATCH 1/6] Fix launching of dbus-daemon on Windows in paths containing spaces If dbus is installed in a path, which contains a space, dbus-launch will not launch the daemon. That is so, because a command line is built from just the path to the daemon and a parameter. The path has to be surrounded with quotes. This can be done unconditionally, because the quotes do not cause any trouble even if they are not needed. Reviewed-by: Ralf Habacker Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49450 --- tools/dbus-launch-win.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 From 93f78602b248c6e2809d449b7d27b399d7a4b208 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 18 Jul 2012 18:11:49 +0100 Subject: [PATCH 2/6] Prepare 1.6.4 release --- NEWS | 6 +++++- configure.ac | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 1d1be192..ed7c01dd 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -D-Bus 1.6.4 (UNRELEASED) +D-Bus 1.6.4 (2012-07-18) == • Detect that users are "at the console" correctly when configured with @@ -11,6 +11,10 @@ D-Bus 1.6.4 (UNRELEASED) • 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 698fcd15..bdee9da3 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.63]) m4_define([dbus_major_version], [1]) m4_define([dbus_minor_version], [6]) -m4_define([dbus_micro_version], [3]) +m4_define([dbus_micro_version], [4]) m4_define([dbus_version], [dbus_major_version.dbus_minor_version.dbus_micro_version]) AC_INIT([dbus],[dbus_version],[https://bugs.freedesktop.org/enter_bug.cgi?product=dbus],[dbus]) From 15e990d68d13ec7df055d7795621f6074f575b32 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 18 Jul 2012 19:30:23 +0100 Subject: [PATCH 3/6] 1.6.5 --- NEWS | 5 +++++ configure.ac | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index ed7c01dd..c2bb54e1 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +D-Bus 1.6.6 (UNRELEASED) +== + +... + D-Bus 1.6.4 (2012-07-18) == diff --git a/configure.ac b/configure.ac index bdee9da3..4f86e9df 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.63]) m4_define([dbus_major_version], [1]) m4_define([dbus_minor_version], [6]) -m4_define([dbus_micro_version], [4]) +m4_define([dbus_micro_version], [5]) m4_define([dbus_version], [dbus_major_version.dbus_minor_version.dbus_micro_version]) AC_INIT([dbus],[dbus_version],[https://bugs.freedesktop.org/enter_bug.cgi?product=dbus],[dbus]) From e98107548c5cd0a9da9d5a15e20177be0e479459 Mon Sep 17 00:00:00 2001 From: Jonathan Perkin Date: Thu, 9 Aug 2012 12:25:02 +0100 Subject: [PATCH 4/6] Check HAVE_DECL_LOG_PERROR with #if, not #ifdef It's always defined. [smcv: commit message added] Reviewed-by: Simon McVittie Bug: https://bugs.freedesktop.org/show_bug.cgi?id=53286 --- dbus/dbus-sysdeps-util-unix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); From ed0e9e982e720d56274d5c0b2cf4fe2f983f9cc4 Mon Sep 17 00:00:00 2001 From: Jonathan Perkin Date: Thu, 9 Aug 2012 12:26:06 +0100 Subject: [PATCH 5/6] Define __EXTENSIONS__ on Solaris to get sockaddr_in6 and sockaddr_storage [smcv: comments updated, commit message added] Reviewed-by: Simon McVittie Bug: https://bugs.freedesktop.org/show_bug.cgi?id=53286 --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index 4f86e9df..e8fc1aef 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" ;; From 9436816175060f038af9c06cf135246f955f9ed4 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 9 Aug 2012 12:31:48 +0100 Subject: [PATCH 6/6] NEWS --- NEWS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index c2bb54e1..769fcadc 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,8 @@ D-Bus 1.6.6 (UNRELEASED) == -... +• Unix-specific: + · Fix compilation on Solaris (fd.o #53286, Jonathan Perkin) D-Bus 1.6.4 (2012-07-18) ==