From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 4 Nov 2013 12:00:24 +0000 (+0000)
Subject: Merge branch 'dbus-1.6'
X-Git-Tag: dbus-1.7.10~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cf2df1355e0f22e86395453d78a615a19fa958d;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.6'

Conflicts:
	NEWS
---

4cf2df1355e0f22e86395453d78a615a19fa958d
diff --cc NEWS
index 825121f8f,95c3c10c6..ccb83aed9
--- a/NEWS
+++ b/NEWS
@@@ -1,25 -1,14 +1,29 @@@
 -D-Bus 1.6.19 (UNRELEASED)
 +D-Bus 1.7.10 (UNRELEASED)
  ==
  
+ Fixes:
+ 
+ • fix undefined behaviour in a regression test (fd.o #69924, DreamNik)
+ 
 -D-Bus 1.6.18 (2013-11-01)
 +D-Bus 1.7.8 (2013-11-01)
  ==
  
 -The “sunflower plains” release.
 +The “extreme hills” release.
 +
 +Dependencies:
 +
 +• If systemd support is enabled, libsystemd-journal is now required.
 +
 +Enhancements:
 +
 +• When activating a non-systemd service under systemd, annotate its
 +  stdout/stderr with its bus name in the Journal. Known limitation:
 +  because the socket is opened before forking, the process will still be
 +  logged as if it had dbus-daemon's process ID and user ID.
 +  (fd.o #68559, Chengwei Yang)
 +
 +• Document more configuration elements in dbus-daemon(1)
 +  (fd.o #69125, Chengwei Yang)
  
  Fixes: