Merge branch 'dbus-1.8'

Conflicts:
	NEWS
	configure.ac

diff --cc NEWS
index 592515b,8ad8882..807c09c
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,40 -1,14 +1,51 @@@
 +D-Bus 1.9.0 (UNRELEASED)
 +==
 +
 +Requirements:
 +
 +• Support for the systemd: (LISTEN_FDS) pseudo-transport on Linux now
 +  requires the sd-daemon shared library, dropping the embedded convenience
 +  copy (fd.o #71818, Simon)
 +
 +Build-time configuration changes:
 +
 +• The CMake build system now builds the same shared library name as Autotools
 +  on at least Linux and Windows:
 +  - on Linux (and perhaps other Unix platforms), it previously built
 +    libdbus-1.so, but now builds libdbus-1.so.3.* with development
 +    symlink libdbus-1.so and SONAME/symlink libdbus-1.so.3
 +  - on Windows, it previously built either libdbus-1.dll (release) or
 +    libdbus-1d.dll (debug), but now builds libdbus-1-3.dll, copied to
 +    libdbus-1.dll for compatibility with older applications.
 +  (fd.o #74117, Ralf Habacker)
 +
 +Enhancements:
 +
 +• on Unix platforms, disable Nagle's algorithm on TCP connections to improve
 +  initial latency (fd.o #75544, Matt Hoosier)
 +
 +Fixes:
 +
 +• fix an incorrect error message if a Unix socket path is too long
 +  (fd.o #73887, Antoine Jacoutot)
 +
 +• in an MSYS/Cygwin environment, pass Unix-style filenames to xmlto,
 +  fixing documentation generation (fd.o #75860, Руслан Ижбулатов)
 +
 +• in Unix with X11, avoid giving dbus-launch a misleading argv[0]
 +  in ps(1) (fd.o #69716, Chengwei Yang)
 +
+ D-Bus 1.8.4 (2014-06-10)
+ ==
+ 
+ Security fix:
+ 
+ • Alban Crequy at Collabora Ltd. discovered and fixed a denial-of-service
+   flaw in dbus-daemon, part of the reference implementation of D-Bus.
+   Additionally, in highly unusual environments the same flaw could lead to
+   a side channel between processes that should not be able to communicate.
+   (CVE-2014-3477, fd.o #78979)
+ 
  D-Bus 1.8.2 (2014-04-30)
  ==
  

diff --cc configure.ac
Simple merge