diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/control | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index cd10a0878..0d91e31e2 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -19,6 +19,8 @@ openssh (1:4.7p1-11) UNRELEASED; urgency=low | |||
19 | they differ, to defend against recurrences of the recent Debian OpenSSL | 19 | they differ, to defend against recurrences of the recent Debian OpenSSL |
20 | vulnerability. | 20 | vulnerability. |
21 | * Recommend openssh-blacklist from openssh-client. | 21 | * Recommend openssh-blacklist from openssh-client. |
22 | * Recommend openssh-blacklist-extra from openssh-client and | ||
23 | openssh-server. | ||
22 | 24 | ||
23 | -- Colin Watson <cjwatson@debian.org> Sat, 17 May 2008 08:48:45 +0200 | 25 | -- Colin Watson <cjwatson@debian.org> Sat, 17 May 2008 08:48:45 +0200 |
24 | 26 | ||
diff --git a/debian/control b/debian/control index f53bbc97b..fbb4f2c81 100644 --- a/debian/control +++ b/debian/control | |||
@@ -9,7 +9,7 @@ Uploaders: Colin Watson <cjwatson@debian.org>, Matthew Vernon <matthew@debian.or | |||
9 | Package: openssh-client | 9 | Package: openssh-client |
10 | Architecture: any | 10 | Architecture: any |
11 | Depends: ${shlibs:Depends}, debconf (>= 1.2.0) | debconf-2.0, adduser (>= 3.10), dpkg (>= 1.7.0), passwd, libssl0.9.8 (>= 0.9.8g-9) | 11 | Depends: ${shlibs:Depends}, debconf (>= 1.2.0) | debconf-2.0, adduser (>= 3.10), dpkg (>= 1.7.0), passwd, libssl0.9.8 (>= 0.9.8g-9) |
12 | Recommends: xauth, openssh-blacklist | 12 | Recommends: xauth, openssh-blacklist, openssh-blacklist-extra |
13 | Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7) | 13 | Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7) |
14 | Replaces: ssh, ssh-krb5 | 14 | Replaces: ssh, ssh-krb5 |
15 | Suggests: ssh-askpass, libpam-ssh, keychain | 15 | Suggests: ssh-askpass, libpam-ssh, keychain |
@@ -38,7 +38,7 @@ 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.0-6), libssl0.9.8 (>= 0.9.8g-9), openssh-blacklist |
41 | Recommends: xauth | 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 |
44 | Suggests: ssh-askpass, rssh, molly-guard | 44 | Suggests: ssh-askpass, rssh, molly-guard |