2 files changed, 28 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index ae8f5c984..64d7df278 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ openssh (1:6.1p1-2) UNRELEASED; urgency=low
     - Drop openssh-blacklist and openssh-blacklist-extra to Suggests.  It's
       been long enough since the relevant vulnerability that we shouldn't
       need these installed by default nowadays.
+    - Add an Upstart job (not currently used by default in Debian).
 
  -- Colin Watson <cjwatson@debian.org>  Fri, 28 Sep 2012 17:54:42 +0100
 
diff --git a/debian/openssh-server.ssh.upstart b/debian/openssh-server.ssh.upstart
new file mode 100644
index 000000000..d8342b9c1
--- /dev/null
+++ b/debian/openssh-server.ssh.upstart
@@ -0,0 +1,27 @@
+# ssh - OpenBSD Secure Shell server
+#
+# The OpenSSH server provides secure shell access to the system.
+
+description     "OpenSSH server"
+
+start on filesystem or runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+respawn limit 10 5
+umask 022
+
+# 'sshd -D' leaks stderr and confuses things in conjunction with 'console log'
+console none
+
+pre-start script
+    test -x /usr/sbin/sshd || { stop; exit 0; }
+    test -e /etc/ssh/sshd_not_to_be_run && { stop; exit 0; }
+    test -c /dev/null || { stop; exit 0; }
+
+    mkdir -p -m0755 /var/run/sshd
+end script
+
+# if you used to set SSHD_OPTS in /etc/default/ssh, you can change the
+# 'exec' line here instead
+exec /usr/sbin/sshd -D