Merge tag 'dbus-1.9.6'

dbus-1.9.6

Conflicts:
	NEWS
	configure.ac

diff --cc NEWS
index 65f4e3a24db72a5b9d44ffae319e20b96d4b2723,3ed896674d4a8d5e9a12ee40f9df0bec5a60365a..e0d80c14137f810a7768f6cccf1a4f391dbe38d0
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,8 -1,34 +1,39 @@@
- D-Bus 1.9.6 (UNRELEASED)
++D-Bus 1.9.8 (UNRELEASED)
 +==
 +
 +...
 +
+ D-Bus 1.9.6 (2015-01-05)
+ ==
+ 
+ The “I do have a bread knife” release.
+ 
+ Security hardening:
+ 
+ • Do not allow calls to UpdateActivationEnvironment from uids other than
+   the uid of the dbus-daemon. If a system service installs unsafe
+   security policy rules that allow arbitrary method calls
+   (such as CVE-2014-8148) then this prevents memory consumption and
+   possible privilege escalation via UpdateActivationEnvironment.
+ 
+   We believe that in practice, privilege escalation here is avoided
+   by dbus-daemon-launch-helper sanitizing its environment; but
+   it seems better to be safe.
+ 
+ • Do not allow calls to UpdateActivationEnvironment or the Stats interface
+   on object paths other than /org/freedesktop/DBus. Some system services
+   install unsafe security policy rules that allow arbitrary method calls
+   to any destination, method and interface with a specified object path;
+   while less bad than allowing arbitrary method calls, these security
+   policies are still harmful, since dbus-daemon normally offers the
+   same API on all object paths and other system services might behave
+   similarly.
+ 
+ Other fixes:
+ 
+ • Add missing initialization so GetExtendedTcpTable doesn't crash on
+   Windows Vista SP0 (fd.o #77008, Илья А. Ткаченко)
+ 
  D-Bus 1.9.4 (2014-11-24)
  ==
  

diff --cc configure.ac
index ce6f9d6cf3431278f97f103f893646cc08011579,6dcb2818c2b4ac2e52d245501da4a96c58eb7e52..70d31b7e994dc7a0681ce9f84a2579c2c3d89686
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -3,7 -3,7 +3,7 @@@ AC_PREREQ([2.63]
  
  m4_define([dbus_major_version], [1])
  m4_define([dbus_minor_version], [9])
- m4_define([dbus_micro_version], [5])
 -m4_define([dbus_micro_version], [6])
++m4_define([dbus_micro_version], [7])
  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])