From f98acbdc5da7c82e73f1de8fe2c160b75496b03b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Fri, 15 Sep 2023 10:22:41 +0200
Subject: [PATCH] Revert "Remove sshd.socket unit"

This reverts commit 8a294387d01967d610543b05d9b5078cea8a6543.

This change has been pushed to Fedora 40 and is pending discussion /
voting from FESCo.

See: https://pagure.io/fesco/issue/3062
See: https://fedoraproject.org/wiki/Changes/Drop_Sshd_Socket
---
 openssh.spec | 12 +++++++++---
 sshd.socket  | 11 +++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 sshd.socket

diff --git a/openssh.spec b/openssh.spec
index 7198225..cf9ff5c 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -47,7 +47,7 @@
 
 # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
 %global openssh_ver 9.3p1
-%global openssh_rel 9
+%global openssh_rel 10
 %global pam_ssh_agent_ver 0.10.4
 %global pam_ssh_agent_rel 9
 
@@ -66,6 +66,7 @@ Source5: pam_ssh_agent-rmheaders
 Source6: ssh-keycat.pam
 Source7: sshd.sysconfig
 Source9: sshd@.service
+Source10: sshd.socket
 Source11: sshd.service
 Source12: sshd-keygen@.service
 Source13: sshd-keygen
@@ -573,6 +574,7 @@ 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 -d -m755 $RPM_BUILD_ROOT/%{_unitdir}
 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 %{SOURCE12} $RPM_BUILD_ROOT/%{_unitdir}/sshd-keygen@.service
 install -m644 %{SOURCE15} $RPM_BUILD_ROOT/%{_unitdir}/sshd-keygen.target
@@ -630,7 +632,7 @@ if [ $1 -gt 1 ]; then
     # OSTree systems) from running.
     touch /var/lib/.ssh-host-keys-migration
 fi
-%systemd_post sshd.service
+%systemd_post sshd.service sshd.socket
 # Migration scriptlet for Fedora 31 and 32 installations to sshd_config
 # drop-in directory (in F32+).
 # Do this only if the file generated by anaconda exists, contains our config
@@ -644,7 +646,7 @@ test -f %{sysconfig_anaconda} && \
   rm %{sysconfig_anaconda} || :
 
 %preun server
-%systemd_preun sshd.service
+%systemd_preun sshd.service sshd.socket
 
 %postun server
 %systemd_postun_with_restart sshd.service
@@ -711,6 +713,7 @@ test -f %{sysconfig_anaconda} && \
 %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.socket
 %attr(0644,root,root) %{_unitdir}/sshd-keygen@.service
 %attr(0644,root,root) %{_unitdir}/sshd-keygen.target
 %attr(0644,root,root) %{_sysusersdir}/openssh-server.conf
@@ -741,6 +744,9 @@ test -f %{sysconfig_anaconda} && \
 %endif
 
 %changelog
+* Fri Sep 15 2023 Timothée Ravier <tim@siosm.fr> - 9.3p1-10
+- Revert "Remove sshd.socket unit (rhbz#2025716)"
+
 * Thu Aug 03 2023 Norbert Pocs <npocs@redhat.com> - 9.3p1-9
 - pkcs11: Add support for 'serial' in PKCS#11 URI
 - Apply the upstream MR related to the previous pkcs11 issue
diff --git a/sshd.socket b/sshd.socket
new file mode 100644
index 0000000..caa50c4
--- /dev/null
+++ b/sshd.socket
@@ -0,0 +1,11 @@
+[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