Merge branch 'dbus-1.8'

Conflicts:
	NEWS
	configure.ac

NEWS

@@ -21,24 +21,11 @@ Build-time configuration changes:
 
 Enhancements:
 
-• in the CMake build system, add some hints for Linux users cross-compiling
-  Windows D-Bus binaries to be able to run tests under Wine
-  (fd.o #41252, Ralf Habacker)
-
 • on Unix platforms, disable Nagle's algorithm on TCP connections to improve
   initial latency (fd.o #75544, Matt Hoosier)
 
-• add Documentation key to dbus.service (fd.o #77447, Cameron Norman)
-
 Fixes:
 
-• in "dbus-uuidgen --ensure", try to copy systemd's /etc/machine-id
-  to /var/lib/dbus/machine-id instead of generating an entirely new ID
-  (fd.o #77941, Simon McVittie)
-
-• on Windows, allow up to 8K connections to the dbus-daemon, instead of the
-  previous 64 (fd.o #71297; Cristian Onet, Ralf Habacker)
-
 • fix an incorrect error message if a Unix socket path is too long
   (fd.o #73887, Antoine Jacoutot)
 
@@ -48,6 +35,34 @@ Fixes:
 • in Unix with X11, avoid giving dbus-launch a misleading argv[0]
   in ps(1) (fd.o #69716, Chengwei Yang)
 
+D-Bus 1.8.2 (2014-04-30)
+==
+
+The “nobody wants red” release.
+
+Enhancements:
+
+• in the CMake build system, add some hints for Linux users cross-compiling
+  Windows D-Bus binaries to be able to run tests under Wine
+  (fd.o #41252, Ralf Habacker)
+
+• add Documentation key to dbus.service (fd.o #77447, Cameron Norman)
+
+Fixes:
+
+• in "dbus-uuidgen --ensure", try to copy systemd's /etc/machine-id
+  to /var/lib/dbus/machine-id instead of generating an entirely new ID
+  (fd.o #77941, Simon McVittie)
+
+• if dbus-launch receives an X error very quickly, do not kill
+  unrelated processes (fd.o #74698, Роман Донченко)
+
+• on Windows, allow up to 8K connections to the dbus-daemon, instead of the
+  previous 64 (fd.o #71297; Cristian Onet, Ralf Habacker)
+
+• cope with \r\n newlines in regression tests, since on Windows,
+  dbus-daemon.exe uses text mode (fd.o #75863, Руслан Ижбулатов)
+
 D-Bus 1.8.0 (2014-01-20)
 ==
 

configure.ac

@@ -4,6 +4,7 @@ AC_PREREQ([2.63])
 m4_define([dbus_major_version], [1])
 m4_define([dbus_minor_version], [8])
 m4_define([dbus_micro_version], [99])
+m4_define([dbus_micro_version], [1])
 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])
@@ -37,7 +38,7 @@ LT_CURRENT=11
 
 ## increment any time the source changes; set to
 ##  0 if you increment CURRENT
-LT_REVISION=3
+LT_REVISION=4
 
 ## increment if any interfaces have been added; set to 0
 ## if any interfaces have been changed or removed. removal has

test/dbus-daemon-eavesdrop.c

@@ -151,6 +151,8 @@ spawn_dbus_daemon (gchar *binary,
 
       if (newline != NULL)
         {
+          if ((newline > address->str) && ('\r' == newline[-1]))
+            newline -= 1;
           g_string_truncate (address, newline - address->str);
           break;
         }

test/dbus-daemon.c

@@ -119,6 +119,8 @@ spawn_dbus_daemon (gchar *binary,
 
       if (newline != NULL)
         {
+          if ((newline > address->str) && ('\r' == newline[-1]))
+            newline -= 1;
           g_string_truncate (address, newline - address->str);
           break;
         }

tools/dbus-launch.c

@@ -406,6 +406,9 @@ static pid_t bus_pid_to_kill = -1;
 static void
 kill_bus(void)
 {
+  if (bus_pid_to_kill <= 0)
+    return;
+
   verbose ("Killing message bus and exiting babysitter\n");
   kill (bus_pid_to_kill, SIGTERM);
   sleep (3);
@@ -1275,6 +1278,10 @@ main (int argc, char **argv)
 
       bus_pid = val;
 
+      /* Have to initialize bus_pid_to_kill ASAP, so that the
+         X error callback can kill it if an error happens. */
+      bus_pid_to_kill = bus_pid;
+
       close (bus_pid_to_launcher_pipe[READ_END]);
 
 #ifdef DBUS_ENABLE_X11_AUTOLAUNCH
@@ -1291,7 +1298,6 @@ main (int argc, char **argv)
                 {
                   char *address = NULL;
                   /* another window got added. Return its address */
-                  bus_pid_to_kill = bus_pid;
                   if (x11_get_address (&address, &bus_pid, &wid)
                        && address != NULL)
                     {