Merge Upstart job scripting support from Ubuntu, to handle the Upstart job being primary there.

7 files changed, 106 insertions, 30 deletions

diff --git a/debian/control b/debian/control
index c4182d981..600d5c915 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Description: secure shell (SSH) client, for secure access to remote machines
 Package: openssh-server
 Priority: optional
 Architecture: any
-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
+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)
 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 b/debian/openssh-server.if-up.in
index ce5d4dd17..871493068 100644
--- a/debian/openssh-server.if-up
+++ b/debian/openssh-server.if-up.in
@@ -30,11 +30,22 @@ if [ ! -f /var/run/sshd.pid ] || \
         exit 0
 fi
 
-# 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
+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
 
 exit 0
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst.in
index cf3fa68ea..9aa568292 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst.in
@@ -417,14 +417,27 @@ remove_old_init_links() {
 }
 
 setup_init() {
-        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
+        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
-        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
 }
 
 commit_transfer_conffile () {
diff --git a/debian/openssh-server.prerm b/debian/openssh-server.prerm.in
index 9c3313aac..188434d27 100644
--- a/debian/openssh-server.prerm
+++ b/debian/openssh-server.prerm.in
@@ -17,13 +17,24 @@ set -e
 
 case "$1" in
     remove|deconfigure)
-        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
+        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
-        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)
         # remove symlink on downgrade to when it was a directory
diff --git a/debian/openssh-server.ssh.init b/debian/openssh-server.ssh.init.in
index f4c6f251f..e24cb1bed 100644
--- a/debian/openssh-server.ssh.init
+++ b/debian/openssh-server.ssh.init.in
@@ -16,6 +16,15 @@ 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
diff --git a/debian/rules b/debian/rules
index a2efd3a0b..5cf42b692 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,7 @@ endif
 # Change the version string to include the Debian version
 SSH_EXTRAVERSION := Debian-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//')
 
-DISTRIBUTOR := $(shell dpkg-vendor --derives-from Ubuntu 2>/dev/null && echo Ubuntu)
+DISTRIBUTOR := $(shell if dpkg-vendor --derives-from Ubuntu 2>/dev/null; then echo Ubuntu; else echo Debian; fi)
 ifeq ($(DISTRIBUTOR),Ubuntu)
 DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/usr/games
 else
@@ -115,6 +115,16 @@ confflags_udeb += --with-ldflags='-Wl,--as-needed'
 %:
         dh $@
 
+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)
@@ -147,10 +157,14 @@ 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:
+override_dh_install: $(DISTRIBUTOR_REPLACE)
         rm -f debian/tmp/etc/ssh/sshd_config
 
         dh_install -Nopenssh-client-udeb -Nopenssh-server-udeb --fail-missing
@@ -176,6 +190,12 @@ override_dh_installdocs:
 
 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
 
 override_dh_installpam:
         dh_installpam --name sshd
@@ -189,7 +209,7 @@ override_dh_shlibdeps:
         dh_shlibdeps
         debian/adjust-openssl-dependencies
 
-override_dh_installdeb:
+override_dh_installdeb: $(DISTRIBUTOR_REPLACE)
         dh_installdeb
         perl -i debian/substitute-conffile.pl \
                 ETC_SSH_MODULI debian/openssh-client/etc/ssh/moduli \
diff --git a/debian/ssh-krb5.postinst b/debian/ssh-krb5.postinst.in
index 4d943d861..ce45c86df 100644
--- a/debian/ssh-krb5.postinst
+++ b/debian/ssh-krb5.postinst.in
@@ -58,13 +58,25 @@ GSSAPIKeyExchange yes
 EOF
             fi
         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
+        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
     fi
 fi