Prepare v1.15.2dbus-1.15.2

Signed-off-by: Simon McVittie <smcv@collabora.com>

4 files changed, 30 insertions, 9 deletions

diff --git a/NEWS b/NEWS
index 28137caa..fb579109 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
-dbus 1.15.2 (UNRELEASED)
+dbus 1.15.2 (2022-10-05)
 ========================
 
+This development release incorporates the same denial-of-service fixes and
+security hardening as dbus 1.14.4.
+
 Behaviour changes:
 
 • On Linux, dbus-daemon and other uses of DBusServer now create a
@@ -47,6 +50,13 @@ these could potentially be carried out by an authenticated remote attacker.
   builds, or an assertion failure in debug builds. This was a regression in
   version 1.3.0. (dbus#417, CVE-2022-42012; Simon McVittie)
 
+Enhancements:
+
+• D-Bus Specification 0.40 (dbus#416, Simon McVittie)
+  · Clarify that unix:tmpdir is not required to use abstract sockets,
+    even where supported
+  · Mention implications of abstract sockets for Linux namespacing
+
 dbus 1.15.0 (2022-09-22)
 ========================
 
diff --git a/configure.ac b/configure.ac
index 77636cd2..a168b49a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.63])
 
 m4_define([dbus_major_version], [1])
 m4_define([dbus_minor_version], [15])
-m4_define([dbus_micro_version], [1])
+m4_define([dbus_micro_version], [2])
 m4_define([dbus_version],
           [dbus_major_version.dbus_minor_version.dbus_micro_version])
 AC_INIT([dbus], [dbus_version], [https://gitlab.freedesktop.org/dbus/dbus/issues], [dbus])
@@ -38,7 +38,7 @@ AC_DEFINE_UNQUOTED(DBUS_DAEMON_NAME,"dbus-daemon",[Name of executable])
 #
 
 ## increment if the interface has additions, changes, removals.
-LT_CURRENT=37
+LT_CURRENT=38
 
 ## increment any time the source changes; set to
 ##  0 if you increment CURRENT
@@ -47,7 +47,7 @@ LT_REVISION=0
 ## increment if any interfaces have been added; set to 0
 ## if any interfaces have been changed or removed. removal has
 ## precedence over adding, so set to 0 if both happened.
-LT_AGE=34
+LT_AGE=35
 
 AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)
diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml
index 88cb0557..9b02f5cd 100644
--- a/doc/dbus-specification.xml
+++ b/doc/dbus-specification.xml
@@ -6,8 +6,8 @@
 <article id="index">
   <articleinfo>
     <title>D-Bus Specification</title>
-    <releaseinfo>Version 0.39</releaseinfo>
-    <date>2022-09-22</date>
+    <releaseinfo>Version 0.40</releaseinfo>
+    <date>2022-10-05</date>
     <authorgroup>
       <author>
         <firstname>Havoc</firstname>
@@ -79,6 +79,17 @@
        </revremark>
      </revision>
      <revision>
+       <revnumber>0.40</revnumber>
+       <date>2022-10-05</date>
+       <authorinitials></authorinitials>
+       <revdescription>
+         <itemizedlist>
+           <listitem><simpara>Clarify that unix:tmpdir is not required to use an abstract socket on Linux</simpara></listitem>
+           <listitem><simpara>Mention implications of abstract sockets for Linux namespacing</simpara></listitem>
+         </itemizedlist>
+       </revdescription>
+     </revision>
+     <revision>
        <revnumber>0.39</revnumber>
        <date>2022-09-22</date>
        <authorinitials></authorinitials>
diff --git a/meson.build b/meson.build
index 0e693b46..4cf0b54b 100644
--- a/meson.build
+++ b/meson.build
@@ -20,7 +20,7 @@
 
 project('dbus',
     'c',
-    version: '1.15.1',
+    version: '1.15.2',
     meson_version: '>=0.56',
 )
 
@@ -63,14 +63,14 @@ config.set_quoted('DBUS_DAEMON_NAME', 'dbus-daemon')
 # http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91
 
 ## increment if the interface has additions, changes, removals.
-lt_current = 37
+lt_current = 38
 ## increment any time the source changes;
 ## set to 0 if you increment CURRENT
 lt_revision = 0
 ## increment if any interfaces have been added;
 ## set to 0 if any interfaces have been changed or removed.
 ## removal has precedence over adding, so set to 0 if both happened.
-lt_age = 34
+lt_age = 35
 
 soversion = (lt_current - lt_age)
 version_info = '@0@.@1@.@2@'.format(soversion, lt_age, lt_revision)