rpms/openssh
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Remove sshd.socket unit

Browse Source 
Resolves: rhbz#2025716
This commit is contained in:
Dmitry Belyavskiy 2023-08-03 10:38:48 +02:00
parent f4f5944e31
commit 8a294387d0
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openssh.spec
View File

@ -66,7 +66,6 @@ Source5: pam_ssh_agent-rmheaders
Source6: ssh-keycat.pam Source6: ssh-keycat.pam
Source7: sshd.sysconfig Source7: sshd.sysconfig
Source9: sshd@.service Source9: sshd@.service
Source10: sshd.socket
Source11: sshd.service Source11: sshd.service
Source12: sshd-keygen@.service Source12: sshd-keygen@.service
Source13: sshd-keygen Source13: sshd-keygen
@ -574,7 +573,6 @@ install -m644 sshd_config_redhat_cp $RPM_BUILD_ROOT%{_sysconfdir}/ssh/sshd_confi
install -m644 sshd_config_redhat $RPM_BUILD_ROOT%{_sysconfdir}/ssh/sshd_config.d/50-redhat.conf install -m644 sshd_config_redhat $RPM_BUILD_ROOT%{_sysconfdir}/ssh/sshd_config.d/50-redhat.conf
install -d -m755 $RPM_BUILD_ROOT/%{_unitdir} install -d -m755 $RPM_BUILD_ROOT/%{_unitdir}
install -m644 %{SOURCE9} $RPM_BUILD_ROOT/%{_unitdir}/sshd@.service install -m644 %{SOURCE9} $RPM_BUILD_ROOT/%{_unitdir}/sshd@.service
install -m644 %{SOURCE10} $RPM_BUILD_ROOT/%{_unitdir}/sshd.socket
install -m644 %{SOURCE11} $RPM_BUILD_ROOT/%{_unitdir}/sshd.service install -m644 %{SOURCE11} $RPM_BUILD_ROOT/%{_unitdir}/sshd.service
install -m644 %{SOURCE12} $RPM_BUILD_ROOT/%{_unitdir}/sshd-keygen@.service install -m644 %{SOURCE12} $RPM_BUILD_ROOT/%{_unitdir}/sshd-keygen@.service
install -m644 %{SOURCE15} $RPM_BUILD_ROOT/%{_unitdir}/sshd-keygen.target install -m644 %{SOURCE15} $RPM_BUILD_ROOT/%{_unitdir}/sshd-keygen.target
@ -632,7 +630,7 @@ if [ $1 -gt 1 ]; then
# OSTree systems) from running. # OSTree systems) from running.
touch /var/lib/.ssh-host-keys-migration touch /var/lib/.ssh-host-keys-migration
fi fi
%systemd_post sshd.service sshd.socket %systemd_post sshd.service
# Migration scriptlet for Fedora 31 and 32 installations to sshd_config # Migration scriptlet for Fedora 31 and 32 installations to sshd_config
# drop-in directory (in F32+). # drop-in directory (in F32+).
# Do this only if the file generated by anaconda exists, contains our config # Do this only if the file generated by anaconda exists, contains our config
@ -646,7 +644,7 @@ test -f %{sysconfig_anaconda} && \
rm %{sysconfig_anaconda} || : rm %{sysconfig_anaconda} || :
%preun server %preun server
%systemd_preun sshd.service sshd.socket %systemd_preun sshd.service
%postun server %postun server
%systemd_postun_with_restart sshd.service %systemd_postun_with_restart sshd.service
@ -713,7 +711,6 @@ test -f %{sysconfig_anaconda} && \
%attr(0640,root,root) %config(noreplace) /etc/sysconfig/sshd %attr(0640,root,root) %config(noreplace) /etc/sysconfig/sshd
%attr(0644,root,root) %{_unitdir}/sshd.service %attr(0644,root,root) %{_unitdir}/sshd.service
%attr(0644,root,root) %{_unitdir}/sshd@.service %attr(0644,root,root) %{_unitdir}/sshd@.service
%attr(0644,root,root) %{_unitdir}/sshd.socket
%attr(0644,root,root) %{_unitdir}/sshd-keygen@.service %attr(0644,root,root) %{_unitdir}/sshd-keygen@.service
%attr(0644,root,root) %{_unitdir}/sshd-keygen.target %attr(0644,root,root) %{_unitdir}/sshd-keygen.target
%attr(0644,root,root) %{_sysusersdir}/openssh-server.conf %attr(0644,root,root) %{_sysusersdir}/openssh-server.conf
@ -747,6 +744,7 @@ test -f %{sysconfig_anaconda} && \
* Thu Aug 03 2023 Dmitry Belyavskiy <dbelyavs@redhat.com> - 9.3p1-8 * Thu Aug 03 2023 Dmitry Belyavskiy <dbelyavs@redhat.com> - 9.3p1-8
- Split including crypto-policies to a separate config (rhbz#1970566) - Split including crypto-policies to a separate config (rhbz#1970566)
- Disable forking of ssh-agent on startup (rhbz#2148555) - Disable forking of ssh-agent on startup (rhbz#2148555)
- Remove sshd.socket unit (rhbz#2025716)
* Tue Aug 01 2023 Dmitry Belyavskiy <dbelyavs@redhat.com> - 9.3p1-7 * Tue Aug 01 2023 Dmitry Belyavskiy <dbelyavs@redhat.com> - 9.3p1-7
- Relax checks of OpenSSL version - Relax checks of OpenSSL version

11
sshd.socket
View File

@ -1,11 +0,0 @@
[Unit]
Description=OpenSSH Server Socket
Documentation=man:sshd(8) man:sshd_config(5)
Conflicts=sshd.service
[Socket]
ListenStream=22
Accept=yes
[Install]
WantedBy=sockets.target