Merge branch 'dbus-1.6'

Conflicts:
	NEWS
	configure.ac

diff --cc NEWS
index 02767921889697de29676cdddeb3703068475890,2a34fef5256538d74cd688eb5617b5568358bf29..230daefa1b4474899c8e1547aa317829abfadec1
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -45,6 -26,9 +45,13 @@@ Enhancements
  
  Fixes:
  
+ • Avoid an infinite busy-loop if a signal interrupts waitpid()
+   (fd.o #68945, Simon McVittie)
+ 
++• Make dbus_connection_set_route_peer_messages(x, FALSE) behave as
++  documented. Previously, it assumed its second parameter was TRUE.
++  (fd.o #69165, Chengwei Yang)
++
  • Escape addresses containing non-ASCII characters correctly
    (fd.o #53499, Chengwei Yang)
  
@@@ -65,40 -44,14 +72,48 @@@
  • Avoid calling function parameters "interface" since certain Windows headers
    have a namespace-polluting macro of that name (fd.o #66493, Ivan Romanov)
  
 +• Assorted Doxygen fixes (fd.o #65755, Chengwei Yang)
 +
 +• Various thread-safety improvements to static variables (fd.o #68610,
 +  Simon McVittie)
 +
  • Make "make -j check" work (fd.o #68852, Simon McVittie)
  
 -D-Bus 1.6.12 (2013-06-13)
 +• Unix-specific:
++  · If accept4() fails with EINVAL, as it can on older Linux kernels
++    with newer glibc, try accept() instead of going into a busy-loop.
++    (fd.o #69026, Chengwei Yang)
++  · If socket() or socketpair() fails with EINVAL or EPROTOTYPE,
++    for instance on Hurd or older Linux with a new glibc, try without
++    SOCK_CLOEXEC. (fd.o #69073; Pino Toscano, Chengwei Yang)
++  · Fix a file descriptor leak on an error code path.
++    (fd.o #69182, Sviatoslav Chagaev)
 +  · dbus-run-session: clear some unwanted environment variables
 +    (fd.o #39196, Simon)
 +  · dbus-run-session: compile on FreeBSD (fd.o #66197, Chengwei Yang)
 +
 +• Windows-specific:
 +  · Remove unavailable command-line options from 'dbus-daemon --help'
 +    (fd.o #42441, Ralf Habacker)
 +  · Add support for looking up local TCPv4 clients' credentials on
 +    Windows XP via the undocumented AllocateAndGetTcpExTableFromStack
 +    function (fd.o #66060, Ralf Habacker)
 +  · Fix insufficient dependency-tracking (fd.o #68505, Simon McVittie)
 +
 +• Internal changes:
 +  · add DBUS_ENABLE_ASSERT, DBUS_ENABLE_CHECKS for less confusing
 +    conditionals (fd.o #66142, Chengwei Yang)
 +  · improve verbose-mode output (fd.o #63047, Colin Walters)
 +  · consolidate Autotools and CMake build (fd.o #64875, Ralf Habacker)
 +  · fix various unused variables, unusual build configurations
 +    etc. (fd.o #65712, #65990, #66005, #66257; Chengwei Yang)
 +
 +D-Bus 1.7.4 (2013-06-13)
  ==
  
 -The “does this unit have a soul?” release.
 +The “but is your thread-safety thread-safe?” release.
  
 -Fixes:
 +Security fixes:
  
  • CVE-2013-2168: Fix misuse of va_list that could be used as a denial
    of service for system services. Vulnerability reported by Alexandru Cornea.

diff --cc dbus/dbus-connection.c
Simple merge

diff --cc dbus/dbus-spawn.c
Simple merge

diff --cc dbus/dbus-sysdeps-unix.c
Simple merge

diff --cc dbus/dbus-sysdeps-util-unix.c
Simple merge