From 9414a7ee3baabfb1c1ac7c5e748ebcaaf46d49be Mon Sep 17 00:00:00 2001
From: James Hilliard <james.hilliard1@gmail.com>
Date: Fri, 28 Jul 2023 22:14:18 -0600
Subject: [PATCH] package/dbus: bump to version 1.14.8

Also apply system.conf and session.conf updates to dbus-broker.

License file is changed due to:

-D-Bus is licensed to you under your choice of the Academic Free
+dbus is licensed to you under your choice of the Academic Free

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/dbus-broker/session.conf | 15 +++++++++++++++
 package/dbus-broker/system.conf  | 25 ++++++++++++++++++++++---
 package/dbus/dbus.hash           |  6 +++---
 package/dbus/dbus.mk             |  3 ++-
 4 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/package/dbus-broker/session.conf b/package/dbus-broker/session.conf
index e4758fa218..8e9488b1db 100644
--- a/package/dbus-broker/session.conf
+++ b/package/dbus-broker/session.conf
@@ -12,6 +12,18 @@
        the behavior of child processes. -->
   <keep_umask/>
 
+  <listen>unix:tmpdir=/tmp</listen>
+
+  <!-- On Unix systems, the most secure authentication mechanism is
+  EXTERNAL, which uses credential-passing over Unix sockets.
+
+  This authentication mechanism is not available on Windows,
+  is not suitable for use with the tcp: or nonce-tcp: transports,
+  and will not work on obscure flavours of Unix that do not have
+  a supported credentials-passing mechanism. On those platforms/transports,
+  comment out the <auth> element to allow fallback to DBUS_COOKIE_SHA1. -->
+  <auth>EXTERNAL</auth>
+
   <standard_session_servicedirs />
 
   <policy context="default">
@@ -23,6 +35,9 @@
     <allow own="*"/>
   </policy>
 
+  <!-- Include legacy configuration location -->
+  <include ignore_missing="yes">/etc/dbus-1/session.conf</include>
+
   <!-- Config files are placed here that among other things,
        further restrict the above policy for specific services. -->
   <includedir>session.d</includedir>
diff --git a/package/dbus-broker/system.conf b/package/dbus-broker/system.conf
index 4b17fbd90e..272f92361e 100644
--- a/package/dbus-broker/system.conf
+++ b/package/dbus-broker/system.conf
@@ -14,18 +14,33 @@
   <!-- Our well-known bus type, do not change this -->
   <type>system</type>
 
-  <!-- Fork into daemon mode -->
-  <fork/>
-
   <!-- Run as special user -->
   <user>dbus</user>
 
+  <!-- Fork into daemon mode -->
+  <fork/>
+
   <!-- We use system service launching using a helper -->
   <standard_system_servicedirs/>
 
+  <!-- This is a setuid helper that is used to launch system services -->
+  <servicehelper>/usr/libexec/dbus-daemon-launch-helper</servicehelper>
+
+  <!-- Write a pid file -->
+  <pidfile>/run/messagebus.pid</pidfile>
+
   <!-- Enable logging to syslog -->
   <syslog/>
 
+  <!-- Only allow socket-credentials-based authentication -->
+  <auth>EXTERNAL</auth>
+
+  <!-- Only listen on a local socket. (abstract=/path/to/socket
+       means use abstract namespace, don't really create filesystem
+       file; only Linux supports this. Use path=/whatever on other
+       systems.) -->
+  <listen>unix:path=/run/dbus/system_bus_socket</listen>
+
   <policy context="default">
     <!-- All users can connect to system bus -->
     <allow user="*"/>
@@ -54,6 +69,8 @@
            send_interface="org.freedesktop.DBus.Introspectable"/>
     <allow send_destination="org.freedesktop.DBus"
            send_interface="org.freedesktop.DBus.Properties"/>
+    <allow send_destination="org.freedesktop.DBus"
+           send_interface="org.freedesktop.DBus.Containers1"/>
     <!-- But disallow some specific bus services -->
     <deny send_destination="org.freedesktop.DBus"
           send_interface="org.freedesktop.DBus"
@@ -84,6 +101,8 @@
            send_interface="org.freedesktop.DBus.Debug.Stats"/>
   </policy>
 
+  <!-- Include legacy configuration location -->
+  <include ignore_missing="yes">/etc/dbus-1/system.conf</include>
 
   <!-- The defaults for these limits are hard-coded in dbus-daemon.
        Some clarifications:
diff --git a/package/dbus/dbus.hash b/package/dbus/dbus.hash
index 0e48d4dafd..638bb4bc6f 100644
--- a/package/dbus/dbus.hash
+++ b/package/dbus/dbus.hash
@@ -1,7 +1,7 @@
 # Locally calculated after checking pgp signature
-# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.28.tar.gz.asc
+# https://dbus.freedesktop.org/releases/dbus/dbus-1.14.8.tar.xz.asc
 # using key 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F
-sha256  9da1e3f2b73f75eec0a9e4509d64be43909d1f2853fe809528a0a53984d76420  dbus-1.12.28.tar.gz
+sha256  a6bd5bac5cf19f0c3c594bdae2565a095696980a683a0ef37cb6212e093bde35  dbus-1.14.8.tar.xz
 
 # Locally calculated
-sha256  0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1  COPYING
+sha256  e61807cd1c32ff4e7bd5b4b61dd21997c6dc5642cf19316124fe38d50e1f9fa3  COPYING
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 99d2c4301c..930b1a298b 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -6,7 +6,8 @@
 
 # When updating dbus, check if there are changes in session.conf and
 # system.conf, and update the versions in the dbus-broker package accordingly.
-DBUS_VERSION = 1.12.28
+DBUS_VERSION = 1.14.8
+DBUS_SOURCE = dbus-$(DBUS_VERSION).tar.xz
 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus
 DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools)
 DBUS_LICENSE_FILES = COPYING