Prepare v1.15.4

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

diff --git a/NEWS b/NEWS
index 31da9e3481aa16f78dbadcd8408606aa0aa3ddf3..0caec1d9d9e7d118d40554817b96ff1131c1029c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-dbus 1.15.4 (UNRELEASED)
+dbus 1.15.4 (2023-02-08)
 ========================
 
 Dependencies:
@@ -26,7 +26,20 @@ Build-time configuration changes:
     behaviour similar to Autotools otherwise. The path to the system bus
     socket can be overridden with the system_socket option if required.
 
-New features:
+Denial of service fixes:
+
+• Fix an incorrect assertion that could be used to crash dbus-daemon or
+  other users of DBusServer prior to authentication, if libdbus was compiled
+  with assertions enabled.
+  We recommend that production builds of dbus, for example in OS distributions,
+  should be compiled with checks but without assertions.
+  (dbus#421, Ralf Habacker; thanks to Evgeny Vereshchagin)
+
+Enhancements:
+
+• D-Bus Specification 0.41:
+  · Clarify handling of /run vs. /var/run on Unix systems
+    (dbus#180, Simon McVittie)
 
 • Add dbus_connection_set_builtin_filters_enabled(), intended to be called
   by tools that use BecomeMonitor() such as dbus-monitor
@@ -38,16 +51,7 @@ New features:
   strongly recommended. See test/use-as-subproject for sample code.
   (dbus!368, dbus!388; Daniel Wagner)
 
-Denial of service fixes:
-
-• Fix an incorrect assertion that could be used to crash dbus-daemon or
-  other users of DBusServer prior to authentication, if libdbus was compiled
-  with assertions enabled.
-  We recommend that production builds of dbus, for example in OS distributions,
-  should be compiled with checks but without assertions.
-  (dbus#421, Ralf Habacker; thanks to Evgeny Vereshchagin)
-
-Fixes:
+Other fixes:
 
 • When connected to a dbus-broker, stop dbus-monitor from incorrectly
   replying to Peer method calls that were sent to the dbus-broker with

diff --git a/configure.ac b/configure.ac
index 9a8b14f4f52c6695a719b95cd166a55ef2747156..06c6579b0fa035d1c5ea3750081ab9dddc7299ef 100644 (file)
--- 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], [3])
+m4_define([dbus_micro_version], [4])
 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=38
+LT_CURRENT=39
 
 ## 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=35
+LT_AGE=36
 
 AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)

diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml
index 3b0f4cab3e70e1fc3b9c5746a66134d03da13a9d..cec61b2373c4e80c88b5ad611b15ea676db4693c 100644 (file)
--- 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.40</releaseinfo>
-    <date>2022-10-05</date>
+    <releaseinfo>Version 0.41</releaseinfo>
+    <date>2023-02-08</date>
     <authorgroup>
       <author>
         <firstname>Havoc</firstname>
@@ -78,6 +78,16 @@
          See <ulink url='http://cgit.freedesktop.org/dbus/dbus/log/doc/dbus-specification.xml'>commit log</ulink>
        </revremark>
      </revision>
+     <revision>
+       <revnumber>0.41</revnumber>
+       <date>2023-02-08</date>
+       <authorinitials></authorinitials>
+       <revdescription>
+         <itemizedlist>
+           <listitem><simpara>Clarify intended handling of /run vs. /var/run</simpara></listitem>
+         </itemizedlist>
+       </revdescription>
+     </revision>
      <revision>
        <revnumber>0.40</revnumber>
        <date>2022-10-05</date>

diff --git a/meson.build b/meson.build
index 17b2b61ddfc92a66632f6031b71c3f68859d81fb..8073e0719e922b127716309d20a39bdc0d9241ac 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -20,7 +20,7 @@
 
 project('dbus',
     'c',
-    version: '1.15.3',
+    version: '1.15.4',
     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 = 38
+lt_current = 39
 ## 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 = 35
+lt_age = 36
 
 soversion = (lt_current - lt_age)
 version_info = '@0@.@1@.@2@'.format(soversion, lt_age, lt_revision)