summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 08:18:23 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 08:18:23 +0000
commitdc8370371e475f5816a0c66c11573b8db69866ce (patch)
tree5ab1ddeb39dad9c265e67760680c1df49f186b5b
parentAdding debian version 1:9.6p1-4. (diff)
downloadopenssh-dc8370371e475f5816a0c66c11573b8db69866ce.tar.xz
openssh-dc8370371e475f5816a0c66c11573b8db69866ce.zip
Adding debian version 1:9.6p1-5.debian/1%9.6p1-5
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--debian/changelog11
-rwxr-xr-xdebian/openssh-server.install1
-rw-r--r--debian/systemd/sshd@.service12
3 files changed, 24 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 873dddc..8a838d6 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 <cjwatson@debian.org> Wed, 06 Mar 2024 09:45:56 +0000
+
openssh (1:9.6p1-4) unstable; urgency=medium
* Add sshd_config checksums for 1:9.2p1-1 to ucf reference file, and add a
diff --git a/debian/openssh-server.install b/debian/openssh-server.install
index cf86dce..5bf99be 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