From 2346c5bd1a3bcaf5545836a5aae10d60ea401f13 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 13 Apr 2024 10:19:38 +0200 Subject: Merging debian version 1:9.6p1-5. Signed-off-by: Daniel Baumann --- debian/changelog | 11 +++++++++++ debian/openssh-server.install | 1 + debian/systemd/sshd@.service | 12 ++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 debian/systemd/sshd@.service diff --git a/debian/changelog b/debian/changelog index 4096e5d..7414f0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +openssh (1:9.6p1-5) unstable; urgency=medium + + * Restore systemd template unit for per-connection sshd instances, + although without any corresponding .socket unit for now; this is mainly + for use with the forthcoming systemd-ssh-generator (closes: #1061516). + It's now called sshd@.service, since unlike the main service there's no + need to be concerned about compatibility with the slightly confusing + "ssh" service name that Debian has traditionally used. + + -- Colin Watson Wed, 06 Mar 2024 09:45:56 +0000 + openssh (1:9.6p1-4~progress7.99u1) graograman-backports; urgency=medium * Initial reupload to graograman-backports. diff --git a/debian/openssh-server.install b/debian/openssh-server.install index d3e28e7..84e2f6d 100755 --- a/debian/openssh-server.install +++ b/debian/openssh-server.install @@ -14,6 +14,7 @@ debian/openssh-server.ufw.profile => etc/ufw/applications.d/openssh-server debian/systemd/ssh.service lib/systemd/system debian/systemd/ssh.socket lib/systemd/system debian/systemd/rescue-ssh.target lib/systemd/system +debian/systemd/sshd@.service lib/systemd/system debian/systemd/ssh-session-cleanup usr/lib/openssh # dh_apport would be neater, but at the time of writing it isn't in unstable diff --git a/debian/systemd/sshd@.service b/debian/systemd/sshd@.service new file mode 100644 index 0000000..29864a8 --- /dev/null +++ b/debian/systemd/sshd@.service @@ -0,0 +1,12 @@ +[Unit] +Description=OpenBSD Secure Shell server per-connection daemon +Documentation=man:sshd(8) man:sshd_config(5) +After=auditd.service + +[Service] +EnvironmentFile=-/etc/default/ssh +ExecStart=-/usr/sbin/sshd -i $SSHD_OPTS +StandardInput=socket +RuntimeDirectory=sshd +RuntimeDirectoryPreserve=yes +RuntimeDirectoryMode=0755 -- cgit v1.2.3