开源软件构建与测试

_service:tar_scm:systemd.spec Changed

@@ -21,11 +21,10 @@
 Name:           systemd
 Url:            https://www.freedesktop.org/wiki/Software/systemd
 Version:        253
-Release:        3
+Release:        5
 License:        MIT and LGPLv2+ and GPLv2+
 Summary:        System and Service Manager
 
-
 Source0:        https://github.com/systemd/systemd/archive/v%{version}/%{name}-%{version}.tar.gz
 Source3:        purge-nobody-user
 Source4:        yum-protect-systemd.conf
@@ -104,6 +103,8 @@
 Patch9055:      bugfix-for-cgroup-Swap-cgroup-v1-deletion-and-migration.patch
 Patch9056:      delete-journal-files-except-system.journal-when-jour.patch
 Patch9057:      set-the-cpuset.cpus-mems-of-machine.slice-to-all-by-.patch
+Patch9058:      journal-don-t-enable-systemd-journald-audit.socket.patch
+Patch9059:      core-check-for-SERVICE_RELOAD_NOTIFY-in-manager_dbus.patch
 
 BuildRequires:  gcc, gcc-c++
 BuildRequires:  libcap-devel, libmount-devel, pam-devel, libselinux-devel
@@ -1564,6 +1565,12 @@
 %{_libdir}/security/pam_systemd.so
 
 %changelog
+* Mon Sep 18 2023 jiangchuangang <jiangchuangang@huawei.com> - 253-5
+- add core-check-for-SERVICE_RELOAD_NOTIFY-in-manager_dbus.patch for logind session residue
+
+* Fri Sep 15 2023 hongjinghao <hongjinghao@huawei.com> - 253-4
+- journal: don't enable systemd-journald-audit.socket
+
 * Mon Jul 31 2023 huyubiao <huyubiao@huawei.com> - 253-3
 - sync the patch from v249

_service:tar_scm:core-check-for-SERVICE_RELOAD_NOTIFY-in-manager_dbus.patch Added

@@ -0,0 +1,43 @@
+From 845824acddf2e7e08c94afe7cfee6e50a682c947 Mon Sep 17 00:00:00 2001
+From: msizanoen1 <msizanoen@qtmlabs.xyz>
+Date: Tue, 2 May 2023 16:59:07 +0700
+Subject: PATCH core: check for SERVICE_RELOAD_NOTIFY in
+ manager_dbus_is_running
+
+This ensures that systemd won't erronously disconnect from the system
+bus in case a bus recheck is triggered immediately after the bus service
+emits `RELOADING=1`.
+
+This fixes an issue where systemd-logind sometimes randomly stops
+receiving `UnitRemoved` after a system update.
+
+This also handles SERVICE_RELOAD_SIGNAL just in case somebody ever
+creates a D-Bus broker implementation that uses `Type=notify-reload`.
+
+Conflict:NA
+Reference:https://github.com/systemd/systemd/commit/845824acddf2e7e08c94afe7cfee6e50a682c947
+
+---
+ src/core/manager.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/manager.c b/src/core/manager.c
+index 9e91aba632..9226cd2ab7 100644
+--- a/src/core/manager.c
++++ b/src/core/manager.c
+@@ -1822,7 +1822,11 @@ static bool manager_dbus_is_running(Manager *m, bool deserialized) {
+         u = manager_get_unit(m, SPECIAL_DBUS_SERVICE);
+         if (!u)
+                 return false;
+-        if (!IN_SET((deserialized ? SERVICE(u)->deserialized_state : SERVICE(u)->state), SERVICE_RUNNING, SERVICE_RELOAD))
++        if (!IN_SET((deserialized ? SERVICE(u)->deserialized_state : SERVICE(u)->state),
++                    SERVICE_RUNNING,
++                    SERVICE_RELOAD,
++                    SERVICE_RELOAD_NOTIFY,
++                    SERVICE_RELOAD_SIGNAL))
+                 return false;
+ 
+         return true;
+-- 
+2.36.1
+

_service:tar_scm:journal-don-t-enable-systemd-journald-audit.socket.patch Added

Changes of Revision 2