[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/files/, net-misc/openssh/

["Mike Gilbert" <floppym@gentoo.org>]

commit:     3438f3cce5a672670679a6d091b547cd78d01054
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  6 23:42:50 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jul  6 23:43:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3438f3cc

net-misc/openssh: sshd.service: set Type=notify-reload

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-misc/openssh/files/sshd.service.2                     | 15 +++++++++++++++
 ...{openssh-9.8_p1-r1.ebuild => openssh-9.8_p1-r2.ebuild} |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/net-misc/openssh/files/sshd.service.2 b/net-misc/openssh/files/sshd.service.2
new file mode 100644
index 000000000000..d935ea763f0d
--- /dev/null
+++ b/net-misc/openssh/files/sshd.service.2
@@ -0,0 +1,15 @@
+[Unit]
+Description=OpenSSH server daemon
+After=network.target auditd.service
+
+[Service]
+Type=notify-reload
+ExecStartPre=/usr/bin/ssh-keygen -A
+ExecStart=/usr/sbin/sshd -D -e
+KillMode=process
+OOMPolicy=continue
+Restart=on-failure
+RestartSec=42s
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-misc/openssh/openssh-9.8_p1-r1.ebuild b/net-misc/openssh/openssh-9.8_p1-r2.ebuild
similarity index 99%
rename from net-misc/openssh/openssh-9.8_p1-r1.ebuild
rename to net-misc/openssh/openssh-9.8_p1-r2.ebuild
index 6633e212c19c..b1c11e3796c9 100644
--- a/net-misc/openssh/openssh-9.8_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-9.8_p1-r2.ebuild
@@ -318,7 +318,7 @@ src_install() {
 	rmdir "${ED}"/var/empty || die
 
 	systemd_dounit "${FILESDIR}"/sshd.socket
-	systemd_newunit "${FILESDIR}"/sshd.service.1 sshd.service
+	systemd_newunit "${FILESDIR}"/sshd.service.2 sshd.service
 	systemd_newunit "${FILESDIR}"/sshd_at.service.1 'sshd@.service'
 
 	# Install dropins with explicit mode, bug 906638, 915840