Merge branch 'dbus-1.6'

Conflicts:
	NEWS

diff --cc NEWS
index 72f392c,e41971b..7dae9f9
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,55 -1,33 +1,70 @@@
 -D-Bus 1.6.16 (UNRELEASED)
 +D-Bus 1.7.6 (UNRELEASED)
  ==
  
 -The “Fortify Agility” release.
 +Build-time configuration changes:
  
 -Fixes:
 +• Directory change notification via dnotify on Linux is no longer
 +  supported; it hadn't compiled successfully since 2010 in any case.
 +  If you don't have inotify (Linux) or kqueue (*BSD), you will need
 +  to send SIGHUP to the dbus-daemon when its configuration changes.
 +  (fd.o #33001, Chengwei Yang)
  
 -• 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)
 +• Compiling with --disable-userdb-cache is no longer supported;
 +  it didn't work since at least 2008, and would lead to an extremely
 +  slow dbus-daemon even it worked. (fd.o #15589, #17133, #66947;
 +  Chengwei Yang)
 +
 +• The DBUS_DISABLE_ASSERTS CMake option didn't actually disable most
 +  assertions. It has been renamed to DBUS_DISABLE_ASSERT to be consistent
 +  with the Autotools build system. (fd.o #66142, Chengwei Yang)
  
 -D-Bus 1.6.14 (2013-09-05)
 -==
+ • Fix a NULL pointer dereference on an unlikely error path
+   (fd.o #69327, Sviatoslav Chagaev)
+ 
+ • 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)
+   · Fix compilation if writev() is unavailable (fd.o #69409,
+     Vasiliy Balyasnyy)
+ 
 +Dependencies:
 +
 +• GNU make is now (documented to be) required. (fd.o #48277, Simon McVittie)
 +
 +• Full test coverage no longer requires dbus-glib, although the tests do not
 +  exercise the shared library (only a static copy) if dbus-glib is missing.
 +  (fd.o #68852, Simon McVittie)
 +
 +Enhancements:
 +
 +• D-Bus Specification 0.22
 +  · Document GetAdtAuditSessionData() and
 +    GetConnectionSELinuxSecurityContext() (fd.o #54445, Simon)
 +  · Fix example .service file (fd.o #66481, Chengwei Yang)
 +  · Don't claim D-Bus is "low-latency" (lower than what?), just
 +    give factual statements about it supporting async use
 +    (fd.o #65141, Justin Lee)
  
 -The “Restore Fatigue” release.
 +• Be thread-safe by default on all platforms, even if
 +  dbus_threads_init_default() has not been called. For compatibility with
 +  older libdbus, library users should continue to call
 +  dbus_threads_init_default(): it is harmless to do so.
 +  (fd.o #54972, Simon McVittie)
 +
 +• Add GetConnectionCredentials() method (fd.o #54445, Simon)
 +
 +• New API: dbus_setenv(), a simple wrapper around setenv().
 +  Note that this is not thread-safe. (fd.o #39196, Simon)
 +
 +• Windows-specific:
 +  · "dbus-daemon --nofork" is allowed on Windows again. (fd.o #68852,
 +    Simon McVittie)
  
  Fixes: