diff -u openssh-4.7p1/debian/openssh-server.init openssh-4.7p1/debian/openssh-server.init --- openssh-4.7p1/debian/openssh-server.init +++ openssh-4.7p1/debian/openssh-server.init @@ -151,8 +151,12 @@ esac ;; + status) + status_of_proc /usr/sbin/sshd sshd && exit 0 || exit $? + ;; + *) - log_action_msg "Usage: /etc/init.d/ssh {start|stop|reload|force-reload|restart|try-restart}" + log_action_msg "Usage: /etc/init.d/ssh {start|stop|reload|force-reload|restart|try-restart|status}" exit 1 esac diff -u openssh-4.7p1/debian/control openssh-4.7p1/debian/control --- openssh-4.7p1/debian/control +++ openssh-4.7p1/debian/control @@ -38,7 +38,7 @@ Package: openssh-server Priority: optional Architecture: any -Depends: ${shlibs: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.0-6), libssl0.9.8 (>= 0.9.8g-9), openssh-blacklist +Depends: ${shlibs: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-12ubuntu2), libssl0.9.8 (>= 0.9.8g-9), openssh-blacklist Recommends: xauth, openssh-blacklist-extra 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 -u openssh-4.7p1/debian/changelog openssh-4.7p1/debian/changelog --- openssh-4.7p1/debian/changelog +++ openssh-4.7p1/debian/changelog @@ -1,3 +1,11 @@ +openssh (1:4.7p1-12ubuntu2) intrepid; urgency=low + + * debian/control: Depend on lsb >= 3.2-12ubuntu2, which has the + status_of_proc() function. + * debian/openssh-server.init: Add the 'status' action (LP: #203169). + + -- Dustin Kirkland Tue, 08 Jul 2008 16:31:21 -0500 + openssh (1:4.7p1-12ubuntu1) intrepid; urgency=low * Resynchronise with Debian. Remaining changes: