From cb5be46e06d6fffcace909bd57caa6a51fee37d1 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 16 2022 00:10:53 +0000
Subject: import dbus-1.12.8-22.el8


---

diff --git a/SOURCES/dbus-kill-process-with-session b/SOURCES/dbus-kill-process-with-session
index c60199f..dbc9fec 100644
--- a/SOURCES/dbus-kill-process-with-session
+++ b/SOURCES/dbus-kill-process-with-session
@@ -6,7 +6,7 @@
 
 exec >& /dev/null
 
-trap 'kill -TERM $1 $(jobs -p)' EXIT
+trap 'kill -TERM $1; kill -HUP $(jobs -p)' EXIT
 
 export GVFS_DISABLE_FUSE=1
 coproc SESSION_MONITOR (gio monitor -f "/run/systemd/sessions/${XDG_SESSION_ID}")
diff --git a/SOURCES/dbus-systemd-sysusers.conf b/SOURCES/dbus-systemd-sysusers.conf
new file mode 100644
index 0000000..c98ae40
--- /dev/null
+++ b/SOURCES/dbus-systemd-sysusers.conf
@@ -0,0 +1,2 @@
+#Type  Name  ID  GECOS                 Home directory  Shell
+u      dbus  81  "System Message Bus"  -               -
diff --git a/SPECS/dbus.spec b/SPECS/dbus.spec
index 83c06d3..d409f21 100644
--- a/SPECS/dbus.spec
+++ b/SPECS/dbus.spec
@@ -19,7 +19,7 @@
 Name:    dbus
 Epoch:   1
 Version: 1.12.8
-Release: 19%{?dist}
+Release: 22%{?dist}
 Summary: D-BUS message bus
 
 Group:   System Environment/Libraries
@@ -33,6 +33,7 @@ Source1: 00-start-message-bus.sh
 Source2: ssh-x-forwarding.csh
 Source3: ssh-x-forwarding.sh
 Source4: dbus-kill-process-with-session
+Source5: dbus-systemd-sysusers.conf
 Patch0: 0001-tools-Use-Python3-for-GetAllMatchRules.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1725570
 Patch1: dbus-1.12.8-fix-CVE-2019-12749.patch
@@ -208,10 +209,13 @@ find %{buildroot} -name '*.la' -type f -delete
 rm -rf %{buildroot}%{_libdir}/cmake
 %endif
 
+rm -f %{buildroot}%{_sysusersdir}/dbus.conf
+
 install -Dp -m755 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/00-start-message-bus.sh
 install -Dp -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/ssh-x-forwarding.csh
 install -p -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/
 install -Dp -m755 %{SOURCE4} %{buildroot}%{_libexecdir}/dbus-1/dbus-kill-process-with-session
+install -Dp -m644 %{SOURCE5} %{buildroot}%{_sysusersdir}/dbus.conf
 
 # Obsolete, but still widely used, for drop-in configuration snippets.
 install --directory %{buildroot}%{_sysconfdir}/dbus-1/session.d
@@ -411,6 +415,14 @@ popd
 %{_includedir}/*
 
 %changelog
+* Tue Aug 09 2022 Ray Strode <rstrode@redhat.com> - 1:1.12.8-22
+- Use hangup signal instead of termination signal to
+  kill sesssion monitoring script to appeach tcsh.
+  Related: #2089362
+
+* Mon Aug 08 2022 David King <dking@redhat.com> - 1:1.12.8-20
+- Override sysusers configuration (#2090397)
+
 * Thu Jun 16 2022 Ray Strode <rstrode@redhat.com> - 1:1.12.8-19
 - Ensure SSH session monitoring script is cleaned up when the
   session exits.