From 16614c2167e6b559399db7a0676c167184891e88 Mon Sep 17 00:00:00 2001 From: Michal Sekletar Date: Wed, 17 Jul 2024 15:36:35 +0200 Subject: [PATCH] systemd-256-5 Don't ship systemd-ssh-generator. Related: RHEL-40924 --- systemd.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/systemd.spec b/systemd.spec index cd67dae..2580322 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: 4%{?dist} +Release: 5%{?dist} %global stable %(c="%version"; [ "$c" = "${c#*.*}" ]; echo $?) @@ -887,6 +887,16 @@ mv -v %{buildroot}/usr/sbin/* %{buildroot}%{_bindir}/ rm %{buildroot}/usr/lib/sysusers.d/basic.conf %endif +# We don't want to ship systemd-ssh-generator and it is not possible to disable it via meson_options.txt +rm %{buildroot}%{_sysconfdir}/ssh/sshd_config.d/20-systemd-userdb.conf +rmdir %{buildroot}%{_sysconfdir}/ssh/sshd_config.d/ +rm %{buildroot}%{_prefix}/lib/systemd/sshd_config.d/20-systemd-userdb.conf +rmdir %{buildroot}%{_prefix}/lib/systemd/sshd_config.d/ +rm %{buildroot}%{_prefix}/lib/systemd/system-generators/systemd-ssh-generator +rm %{buildroot}%{_prefix}/lib/systemd/system/ssh-access.target +rm %{buildroot}%{_mandir}/man1/systemd-ssh-proxy.1 +rm %{buildroot}%{_mandir}/man8/systemd-ssh-generator.8 + %find_lang %{name} # Split files in build root into rpms @@ -1092,6 +1102,9 @@ rm -f .file-list-* rm -f %{name}.lang %changelog +* Wed Jul 17 2024 systemd maintenance team - 256-5 +- don't ship systemd-ssh-generator (RHEL-40924) + * Tue Jul 16 2024 systemd maintenance team - 256-4 - reenable systemd-firstboot (RHEL-48822) - don't create /var/log/journal (RHEL-40924)