diff --git a/Change-containers-s-path b/Change-containers-s-path new file mode 100644 index 0000000000000000000000000000000000000000..db64fd29e132afd33910ea7c57f1424b53535be1 --- /dev/null +++ b/Change-containers-s-path @@ -0,0 +1,25 @@ +From a7639e75e8e8db74c5398c552840dfe1af1f65fb Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Tue, 28 Feb 2023 17:15:06 +0800 +Subject: [PATCH] Change containers's path + +--- + bus/tmpfiles.d/dbus.conf.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/bus/tmpfiles.d/dbus.conf.in b/bus/tmpfiles.d/dbus.conf.in +index aaaa9e0..50b0c8d 100644 +--- a/bus/tmpfiles.d/dbus.conf.in ++++ b/bus/tmpfiles.d/dbus.conf.in +@@ -8,6 +8,6 @@ d @EXPANDED_LOCALSTATEDIR@/lib/dbus 0755 - - - + # if it does not already exist + L @EXPANDED_LOCALSTATEDIR@/lib/dbus/machine-id - - - - /etc/machine-id + +-# Create ${runstatedir}/dbus/containers owned by the system bus user. ++# Create ${localstatedir}/dbus/containers owned by the system bus user. + # org.freedesktop.DBus.Containers1 uses this to create sockets. +-d @EXPANDED_RUNSTATEDIR@/dbus/containers 0755 @DBUS_USER@ - - - ++d @EXPANDED_LOCALSTATEDIR@/dbus/containers 0755 @DBUS_USER@ - - - +-- +2.27.0 + diff --git a/Change-containers-s-path.patch b/Change-containers-s-path.patch new file mode 100644 index 0000000000000000000000000000000000000000..db64fd29e132afd33910ea7c57f1424b53535be1 --- /dev/null +++ b/Change-containers-s-path.patch @@ -0,0 +1,25 @@ +From a7639e75e8e8db74c5398c552840dfe1af1f65fb Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Tue, 28 Feb 2023 17:15:06 +0800 +Subject: [PATCH] Change containers's path + +--- + bus/tmpfiles.d/dbus.conf.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/bus/tmpfiles.d/dbus.conf.in b/bus/tmpfiles.d/dbus.conf.in +index aaaa9e0..50b0c8d 100644 +--- a/bus/tmpfiles.d/dbus.conf.in ++++ b/bus/tmpfiles.d/dbus.conf.in +@@ -8,6 +8,6 @@ d @EXPANDED_LOCALSTATEDIR@/lib/dbus 0755 - - - + # if it does not already exist + L @EXPANDED_LOCALSTATEDIR@/lib/dbus/machine-id - - - - /etc/machine-id + +-# Create ${runstatedir}/dbus/containers owned by the system bus user. ++# Create ${localstatedir}/dbus/containers owned by the system bus user. + # org.freedesktop.DBus.Containers1 uses this to create sockets. +-d @EXPANDED_RUNSTATEDIR@/dbus/containers 0755 @DBUS_USER@ - - - ++d @EXPANDED_LOCALSTATEDIR@/dbus/containers 0755 @DBUS_USER@ - - - +-- +2.27.0 + diff --git a/dbus.spec b/dbus.spec index 435e628d8e29c44f7fa25c5471db4b9231be06ed..cd7ab6657263450e69ec5a5f4a3bc28bf24e8f5f 100644 --- a/dbus.spec +++ b/dbus.spec @@ -1,7 +1,7 @@ Name: dbus Epoch: 1 Version: 1.14.0 -Release: 2 +Release: 3 Summary: System Message Bus License: AFLv3.0 or GPLv2+ URL: http://www.freedesktop.org/Software/dbus/ @@ -10,6 +10,7 @@ Source1: 00-start-message-bus.sh Patch0001: bugfix-let-systemd-restart-dbus-when-the-it-enters-failed.patch Patch0002: print-load-average-when-activate-service-timeout.patch +Patch0003: Change-containers-s-path.patch Patch6000: backport-tools-Use-Python3-for-GetAllMatchRules.patch Patch6001: backport-CVE-2022-42012.patch @@ -226,6 +227,9 @@ fi %exclude %{_pkgdocdir}/README %changelog +* Tue Feb 28 2023 hongjinghao - 1:1.14.0-3 +- Change containers's path + * Fri Oct 14 2022 hongjinghao -1:1.14.0-2 - fix CVE-2022-42010,CVE-2022-42011,CVE-2022-42012