From: Simon McVittie <smcv@collabora.com>
Date: Mon, 13 Nov 2017 17:12:48 +0000 (+0000)
Subject: Merge branch 'dbus-1.12'
X-Git-Tag: dbus-1.13.0~109
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85830f4c5b54e13e51a6bdb1ba6b0590028a0d00;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.12'
---

85830f4c5b54e13e51a6bdb1ba6b0590028a0d00
diff --cc NEWS
index b716ca956,abdfe38c3..dc17773e2
--- a/NEWS
+++ b/NEWS
@@@ -1,11 -1,13 +1,27 @@@
 -dbus 1.12.4 (UNRELEASED)
 +dbus 1.13.0 (UNRELEASED)
  ========================
  
 -...
 +This is a new development branch for the adventurous, and comes with a
 +risk of regressions. OS distributions should stay with the 1.12.x branch,
 +unless they can commit to following the 1.13.x branch until it reaches
 +a 1.14.0 stable release at an unspecified point in the future.
 +
++Internal changes:
++
++• Preparations for future support for restricted sockets used by
++  app containers like Flatpak (fd.o #101354, Simon McVittie)
++
++• Harden the nonce-tcp: transport against resource leaks and
++  use-after-free (fd.o #103597, Simon McVittie)
++
++• Make _DBUS_STRING_DEFINE_STATIC more consistent with
++  _dbus_string_init_const() (fd.o #89104, Simon McVittie)
+ 
+ dbus 1.12.2 (2017-11-13)
+ ========================
+ 
+ The “spider pumpkin” release.
+ 
  Enhancements:
  
  • Log a warning if a new connection cannot be accepted due to an