From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 21 Jul 2015 16:20:11 +0000 (+0100)
Subject: Merge branch 'dbus-1.8'
X-Git-Tag: dbus-1.9.18~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dae42b370b7409620f8272d0816a621fd2100ee0;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.8'

Conflicts:
	.gitignore
	NEWS
	tools/dbus-monitor.c
---

dae42b370b7409620f8272d0816a621fd2100ee0
diff --cc NEWS
index 905995814,d323c0035..d90f6c54a
--- a/NEWS
+++ b/NEWS
@@@ -32,15 -6,13 +32,18 @@@ Fixes
  • Fix a memory leak when GetConnectionCredentials() succeeds
    (fd.o #91008, Jacek Bukarewicz)
  
+ • Ensure that dbus-monitor does not reply to messages intended for others
+   (fd.o #90952, Simon McVittie)
+ 
 -D-Bus 1.8.18 (2015-05-14)
 +D-Bus 1.9.16 (2015-05-14)
  ==
  
 -The “unicorn rifts” release.
 +The “titanium barns” release.
 +
 +Dependencies:
 +
 +• Automake 1.13 is now required when compiling from git or modifying
 +  the build system.
  
  Security hardening: