diff options
-rw-r--r-- | debian/changelog | 3 | ||||
-rw-r--r-- | debian/control | 2 | ||||
-rw-r--r-- | debian/openssh-server.init | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index a0ce59273..28d579080 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -147,6 +147,9 @@ openssh (1:5.1p1-1) UNRELEASED; urgency=low | |||
147 | * Add lintian overrides for empty /usr/share/doc/openssh-client | 147 | * Add lintian overrides for empty /usr/share/doc/openssh-client |
148 | directories in openssh-server and ssh (necessary due to being symlink | 148 | directories in openssh-server and ssh (necessary due to being symlink |
149 | targets). | 149 | targets). |
150 | * Merge from Ubuntu: | ||
151 | - Add 'status' action to openssh-server init script, requiring lsb-base | ||
152 | (>= 3.2-13) (thanks, Dustin Kirkland). | ||
150 | * debconf template translations: | 153 | * debconf template translations: |
151 | - Update Korean (thanks, Sunjae Park; closes: #484821). | 154 | - Update Korean (thanks, Sunjae Park; closes: #484821). |
152 | 155 | ||
diff --git a/debian/control b/debian/control index 12e98fa4a..27b27e756 100644 --- a/debian/control +++ b/debian/control | |||
@@ -37,7 +37,7 @@ Description: secure shell client, an rlogin/rsh/rcp replacement | |||
37 | Package: openssh-server | 37 | Package: openssh-server |
38 | Priority: optional | 38 | Priority: optional |
39 | Architecture: any | 39 | Architecture: any |
40 | 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 | 40 | 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-13), libssl0.9.8 (>= 0.9.8g-9), openssh-blacklist |
41 | Recommends: xauth, openssh-blacklist-extra | 41 | Recommends: xauth, openssh-blacklist-extra |
42 | 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) | 42 | 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) |
43 | Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 | 43 | Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 |
diff --git a/debian/openssh-server.init b/debian/openssh-server.init index 01f00dc0a..a1cc67797 100644 --- a/debian/openssh-server.init +++ b/debian/openssh-server.init | |||
@@ -151,8 +151,12 @@ case "$1" in | |||
151 | esac | 151 | esac |
152 | ;; | 152 | ;; |
153 | 153 | ||
154 | status) | ||
155 | status_of_proc -p /var/run/sshd.pid /usr/sbin/sshd sshd && exit 0 || exit $? | ||
156 | ;; | ||
157 | |||
154 | *) | 158 | *) |
155 | log_action_msg "Usage: /etc/init.d/ssh {start|stop|reload|force-reload|restart|try-restart}" | 159 | log_action_msg "Usage: /etc/init.d/ssh {start|stop|reload|force-reload|restart|try-restart|status}" |
156 | exit 1 | 160 | exit 1 |
157 | esac | 161 | esac |
158 | 162 | ||