9 files changed, 29 insertions, 150 deletions

diff --git a/debian/changelog b/debian/changelog
index 9db3f5648..f56fc00ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,14 @@ openssh (1:6.2p2-2) UNRELEASED; urgency=low
     openssh-server.postinst.
   * Replace old manual conffile handling code with dpkg-maintscript-helper,
     via dh_installdeb.
+  * Switch to new unified layout for Upstart jobs as documented in
+    https://wiki.ubuntu.com/UpstartCompatibleInitScripts: the init script
+    checks for a running Upstart, and we now let dh_installinit handle most
+    of the heavy lifting in maintainer scripts.  Ubuntu users should be
+    essentially unaffected except that sshd may no longer start
+    automatically in chroots if the running Upstart predates 0.9.0; but the
+    main goal is simply not to break when openssh-server is installed in a
+    chroot.
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 21 May 2013 17:49:35 +0100
 
diff --git a/debian/control b/debian/control
index a9ef496f6..7c91f74e4 100644
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,7 @@ Package: openssh-server
 Priority: optional
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.0) | debconf-2.0, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 3.2-13), procps, debianutils (>= 4)
+Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.0) | debconf-2.0, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 4.1+Debian3), procps
 Recommends: xauth, ncurses-term, ${openssh-server:Recommends}
 Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7)
 Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5
diff --git a/debian/openssh-server.if-up.in b/debian/openssh-server.if-up
index 871493068..de92866e6 100644
--- a/debian/openssh-server.if-up.in
+++ b/debian/openssh-server.if-up
@@ -30,22 +30,8 @@ if [ ! -f /var/run/sshd.pid ] || \
         exit 0
 fi
 
-case '@DISTRIBUTOR@' in
-    Ubuntu)
-        # Both init script and Upstart job are present; we want to operate
-        # on the Upstart job.
-        stop ssh || true
-        start ssh || true
-        ;;
-    *)
-        # We'd like to use 'reload' here, but it has some problems; see
-        # #502444.
-        if [ -x /usr/sbin/invoke-rc.d ]; then
-                invoke-rc.d ssh restart >/dev/null 2>&1 || true
-        else
-                /etc/init.d/ssh restart >/dev/null 2>&1 || true
-        fi
-        ;;
-esac
+# We'd like to use 'reload' here, but it has some problems; see
+# #502444.
+invoke-rc.d ssh restart >/dev/null 2>&1 || true
 
 exit 0
diff --git a/debian/openssh-server.postinst.in b/debian/openssh-server.postinst
index ce1165ac9..94461083e 100644
--- a/debian/openssh-server.postinst.in
+++ b/debian/openssh-server.postinst
@@ -296,30 +296,6 @@ remove_old_init_links() {
         rm -f /etc/rc0.d/K??ssh /etc/rc1.d/K??ssh /etc/rc6.d/K??ssh
 }
 
-setup_init() {
-        case '@DISTRIBUTOR@' in
-            Ubuntu)
-                # Both init script and Upstart job are present; we want to
-                # operate on the Upstart job.
-                if [ -e /etc/init/ssh.conf ]; then
-                        stop ssh 2>/dev/null || true
-                        start ssh || true
-                fi
-                update-rc.d -f ssh remove >/dev/null || true
-                ;;
-            *)
-                if [ -x /etc/init.d/ssh ]; then
-                        update-rc.d ssh start 16 2 3 4 5 . >/dev/null
-                        if [ -x /usr/sbin/invoke-rc.d ]; then
-                                invoke-rc.d ssh restart
-                        else
-                                /etc/init.d/ssh restart
-                        fi
-                fi
-                ;;
-        esac
-}
-
 if [ "$action" = configure ]; then
         create_sshdconfig
         create_keys
@@ -329,7 +305,6 @@ if [ "$action" = configure ]; then
         if dpkg --compare-versions "$2" lt 1:5.2p1-1; then
             remove_old_init_links
         fi
-        setup_init
         # Renamed to /etc/ssh/moduli in 2.9.9 (!)
         if dpkg --compare-versions "$2" lt 1:4.7p1-1; then
             rm -f /etc/ssh/primes
diff --git a/debian/openssh-server.postrm b/debian/openssh-server.postrm
index 9bb9f1839..fdf0802c9 100644
--- a/debian/openssh-server.postrm
+++ b/debian/openssh-server.postrm
@@ -16,8 +16,6 @@ case $1 in
                 rm -f /etc/ssh/sshd_not_to_be_run
                 rmdir --ignore-fail-on-non-empty /etc/ssh
 
-                update-rc.d ssh remove >/dev/null
-
                 if which deluser >/dev/null 2>&1; then
                         deluser --quiet sshd > /dev/null || true
                 fi
diff --git a/debian/openssh-server.prerm.in b/debian/openssh-server.prerm.in
deleted file mode 100644
index a20e67614..000000000
--- a/debian/openssh-server.prerm.in
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-# prerm script for ssh
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see /usr/share/doc/packaging-manual/
-
-case "$1" in
-    remove|deconfigure)
-        case '@DISTRIBUTOR@' in
-            Ubuntu)
-                # Both init script and Upstart job are present; we want to
-                # operate on the Upstart job.
-                if [ -e /etc/init/ssh.conf ]; then
-                        stop ssh || true
-                fi
-                ;;
-            *)
-                if [ -x /etc/init.d/ssh ]; then
-                        if [ -x /usr/sbin/invoke-rc.d ]; then
-                                invoke-rc.d ssh stop
-                        else
-                                /etc/init.d/ssh stop
-                        fi
-                fi
-                ;;
-        esac
-        ;;
-    upgrade|failed-upgrade)
-        ;;
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 0
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/openssh-server.ssh.init.in b/debian/openssh-server.ssh.init
index e24cb1bed..bda7a92b8 100644
--- a/debian/openssh-server.ssh.init.in
+++ b/debian/openssh-server.ssh.init
@@ -16,15 +16,6 @@ set -e
 test -x /usr/sbin/sshd || exit 0
 ( /usr/sbin/sshd -\? 2>&1 | grep -q OpenSSH ) 2>/dev/null || exit 0
 
-case '@DISTRIBUTOR@' in
-    Ubuntu)
-        # The init.d script is only for chroots.
-        if [ -e /etc/init/ssh.conf ] && ! ischroot; then
-            exec /lib/init/upstart-job ssh "$@"
-        fi
-        ;;
-esac
-
 umask 022
 
 if test -f /etc/default/ssh; then
@@ -42,6 +33,12 @@ run_by_init() {
     ([ "$previous" ] && [ "$runlevel" ]) || [ "$runlevel" = S ]
 }
 
+check_for_upstart() {
+    if init_is_upstart; then
+        exit $1
+    fi
+}
+
 check_for_no_start() {
     # forget it if we're trying to start, and /etc/ssh/sshd_not_to_be_run exists
     if [ -e /etc/ssh/sshd_not_to_be_run ]; then 
@@ -85,6 +82,7 @@ export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
 
 case "$1" in
   start)
+        check_for_upstart 1
         check_privsep_dir
         check_for_no_start
         check_dev_null
@@ -96,6 +94,7 @@ case "$1" in
         fi
         ;;
   stop)
+        check_for_upstart 0
         log_daemon_msg "Stopping OpenBSD Secure Shell server" "sshd" || true
         if start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid; then
             log_end_msg 0 || true
@@ -105,6 +104,7 @@ case "$1" in
         ;;
 
   reload|force-reload)
+        check_for_upstart 1
         check_for_no_start
         check_config
         log_daemon_msg "Reloading OpenBSD Secure Shell server's configuration" "sshd" || true
@@ -116,6 +116,7 @@ case "$1" in
         ;;
 
   restart)
+        check_for_upstart 1
         check_privsep_dir
         check_config
         log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd" || true
@@ -130,6 +131,7 @@ case "$1" in
         ;;
 
   try-restart)
+        check_for_upstart 1
         check_privsep_dir
         check_config
         log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd" || true
@@ -160,6 +162,7 @@ case "$1" in
         ;;
 
   status)
+        check_for_upstart 1
         status_of_proc -p /var/run/sshd.pid /usr/sbin/sshd sshd && exit 0 || exit $?
         ;;
 
diff --git a/debian/rules b/debian/rules
index c78653be0..32cda5bc3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,16 +115,6 @@ confflags_udeb += --with-ldflags='-Wl,--as-needed'
 %:
         dh $@ --with=autoreconf
 
-DISTRIBUTOR_REPLACE := \
-        debian/openssh-server.if-up \
-        debian/openssh-server.ssh.init \
-        debian/openssh-server.postinst \
-        debian/openssh-server.prerm \
-        debian/ssh-krb5.postinst
-
-debian/%: debian/%.in
-        sed 's/@DISTRIBUTOR@/$(DISTRIBUTOR)/g' $< >$@
-
 override_dh_auto_configure:
         dh_auto_configure -Bbuild-deb -- $(confflags)
         dh_auto_configure -Bbuild-udeb -- $(confflags_udeb)
@@ -157,14 +147,10 @@ endif
         (cat debian/copyright.head; iconv -f ISO-8859-1 -t UTF-8 LICENCE) \
                 > debian/copyright
 
-override_dh_clean:
-        dh_clean
-        rm -f $(DISTRIBUTOR_REPLACE)
-
 override_dh_auto_install:
         $(MAKE) -C build-deb DESTDIR=`pwd`/debian/tmp install-nokeys
 
-override_dh_install: $(DISTRIBUTOR_REPLACE)
+override_dh_install:
         rm -f debian/tmp/etc/ssh/sshd_config
 
         dh_install -Nopenssh-client-udeb -Nopenssh-server-udeb --fail-missing
@@ -197,13 +183,7 @@ override_dh_installdocs:
         mkdir -p debian/openssh-server/usr/share/doc/openssh-client
 
 override_dh_installinit:
-        dh_installinit -n --name ssh
-ifeq ($(DISTRIBUTOR),Ubuntu)
-        # We need to keep the init script as well as the Upstart job for
-        # now, for the benefit of people running sshd in chroots.
-        install -D -o root -g root debian/openssh-server.ssh.init debian/openssh-server/etc/init.d/ssh
-        install -D -o root -g root -m 644 debian/openssh-server.ssh.default debian/openssh-server/etc/default/ssh
-endif
+        dh_installinit -R --name ssh -- start 16 2 3 4 5 .
 
 override_dh_installpam:
         dh_installpam --name sshd
@@ -217,9 +197,6 @@ override_dh_shlibdeps:
         dh_shlibdeps
         debian/adjust-openssl-dependencies
 
-override_dh_installdeb: $(DISTRIBUTOR_REPLACE)
-        dh_installdeb
-
 override_dh_gencontrol:
         dh_gencontrol -- -V'openssh-server:Recommends=$(server_recommends)'
 
diff --git a/debian/ssh-krb5.postinst.in b/debian/ssh-krb5.postinst
index 9ed03f343..f799accfe 100644
--- a/debian/ssh-krb5.postinst.in
+++ b/debian/ssh-krb5.postinst
@@ -50,25 +50,9 @@ GSSAPIKeyExchange yes
 EOF
             fi
         fi
-        case '@DISTRIBUTOR@' in
-            Ubuntu)
-                # Both init script and Upstart job are present; we want to
-                # operate on the Upstart job.
-                if [ -n "$changed" ] && [ -e /etc/init/ssh.conf ] ; then
-                    stop ssh || true
-                    start ssh || true
-                fi
-                ;;
-            *)
-                if [ -n "$changed" ] && [ -x /etc/init.d/ssh ] ; then
-                    if [ -x /usr/sbin/invoke-rc.d ] ; then
-                        invoke-rc.d ssh restart
-                    else
-                        /etc/init.d/ssh restart
-                    fi
-                fi
-                ;;
-        esac
+        if [ -n "$changed" ]; then
+            invoke-rc.d ssh restart
+        fi
     fi
 fi