From 9bbf93829f646ff24323265017cc305fb5d2be2e Mon Sep 17 00:00:00 2001 From: Michal Sekletar Date: Thu, 25 Jul 2024 19:37:56 +0200 Subject: [PATCH] systemd-256-9 Resolves: RHEL-50131 --- systemd.spec | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/systemd.spec b/systemd.spec index cc454b7..d91969e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -48,7 +48,7 @@ Url: https://systemd.io # Allow users to specify the version and release when building the rpm by # setting the %%version_override and %%release_override macros. Version: %{?version_override}%{!?version_override:256} -Release: 8%{?dist} +Release: 9%{?dist} %global stable %(c="%version"; [ "$c" = "${c#*.*}" ]; echo $?) @@ -959,12 +959,11 @@ fi # This is for upgrades from previous versions before systemd restart was moved to %%postun systemctl daemon-reexec || : -%triggerpostun -- systemd < 253~rc1-2 -# This is for upgrades from previous versions where systemd-journald-audit.socket -# had a static enablement symlink. -# We use %%triggerpostun here because rpm doesn't allow a second %%triggerun with -# a different package version. -systemctl --no-reload preset systemd-journald-audit.socket &>/dev/null || : +%triggerpostun -- systemd < 256-9 +if [ -L /etc/ssh/sshd_config.d/20-systemd-userdb.conf ] && \ + [ "$(readlink -f /etc/ssh/sshd_config.d/20-systemd-userdb.conf)" = "/usr/lib/systemd/sshd_config.d/20-systemd-userdb.conf" ] ; then + rm -f /etc/ssh/sshd_config.d/20-systemd-userdb.conf || : +fi %global udev_services systemd-udev{d,-settle,-trigger}.service systemd-udevd-{control,kernel}.socket %{?want_bootloader:systemd-boot-update.service} systemd-pstore.service remote-cryptsetup.target @@ -1107,6 +1106,9 @@ rm -f .file-list-* rm -f %{name}.lang %changelog +* Thu Jul 25 2024 systemd maintenance team - 256-9 +- fix updgrade from versions before removal of systemd-ssh-generator (RHEL-50131) + * Tue Jul 23 2024 systemd maintenance team - 256-8 - Avoid /tmp being mounted as tmpfs without the user's will (RHEL-40924) - unit: don't add Requires for tmp.mount (RHEL-40924)