diff options
author | Colin Watson <cjwatson@debian.org> | 2012-10-31 11:25:57 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-10-31 11:25:57 +0000 |
commit | 41e9d122631d7783293085b8f7f2b2fcbef12b50 (patch) | |
tree | 4c61849222cc30b22ad35afd161cb5b1f5022eb9 /debian | |
parent | 301aad188299b268452af6b67261336c88f44ab1 (diff) |
Drop openssh-blacklist and openssh-blacklist-extra to Suggests. It's
been long enough since the relevant vulnerability that we shouldn't
need these installed by default nowadays.
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 3 | ||||
-rw-r--r-- | debian/control | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 2c137c99b..ae8f5c984 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -4,6 +4,9 @@ openssh (1:6.1p1-2) UNRELEASED; urgency=low | |||
4 | * Merge from Ubuntu: | 4 | * Merge from Ubuntu: |
5 | - Add support for registering ConsoleKit sessions on login. (This is | 5 | - Add support for registering ConsoleKit sessions on login. (This is |
6 | currently enabled only when building for Ubuntu.) | 6 | currently enabled only when building for Ubuntu.) |
7 | - Drop openssh-blacklist and openssh-blacklist-extra to Suggests. It's | ||
8 | been long enough since the relevant vulnerability that we shouldn't | ||
9 | need these installed by default nowadays. | ||
7 | 10 | ||
8 | -- Colin Watson <cjwatson@debian.org> Fri, 28 Sep 2012 17:54:42 +0100 | 11 | -- Colin Watson <cjwatson@debian.org> Fri, 28 Sep 2012 17:54:42 +0100 |
9 | 12 | ||
diff --git a/debian/control b/debian/control index 1105b0699..c4182d981 100644 --- a/debian/control +++ b/debian/control | |||
@@ -12,10 +12,10 @@ Vcs-Browser: http://anonscm.debian.org/loggerhead/pkg-ssh/openssh/trunk | |||
12 | Package: openssh-client | 12 | Package: openssh-client |
13 | Architecture: any | 13 | Architecture: any |
14 | Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.0) | debconf-2.0, adduser (>= 3.10), dpkg (>= 1.7.0), passwd | 14 | Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.0) | debconf-2.0, adduser (>= 3.10), dpkg (>= 1.7.0), passwd |
15 | Recommends: xauth, openssh-blacklist, openssh-blacklist-extra | 15 | Recommends: xauth |
16 | Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7) | 16 | Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7) |
17 | Replaces: ssh, ssh-krb5 | 17 | Replaces: ssh, ssh-krb5 |
18 | Suggests: ssh-askpass, libpam-ssh, keychain, monkeysphere | 18 | Suggests: ssh-askpass, libpam-ssh, keychain, monkeysphere, openssh-blacklist, openssh-blacklist-extra |
19 | Provides: rsh-client, ssh-client | 19 | Provides: rsh-client, ssh-client |
20 | Multi-Arch: foreign | 20 | Multi-Arch: foreign |
21 | Description: secure shell (SSH) client, for secure access to remote machines | 21 | Description: secure shell (SSH) client, for secure access to remote machines |
@@ -45,10 +45,10 @@ Package: openssh-server | |||
45 | Priority: optional | 45 | Priority: optional |
46 | Architecture: any | 46 | Architecture: any |
47 | 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 | 47 | 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 |
48 | Recommends: xauth, ncurses-term, openssh-blacklist, openssh-blacklist-extra, ${openssh-server:Recommends} | 48 | Recommends: xauth, ncurses-term, ${openssh-server:Recommends} |
49 | 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) | 49 | 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) |
50 | Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 | 50 | Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 |
51 | Suggests: ssh-askpass, rssh, molly-guard, ufw, monkeysphere | 51 | Suggests: ssh-askpass, rssh, molly-guard, ufw, monkeysphere, openssh-blacklist, openssh-blacklist-extra |
52 | Provides: ssh-server | 52 | Provides: ssh-server |
53 | Multi-Arch: foreign | 53 | Multi-Arch: foreign |
54 | Description: secure shell (SSH) server, for secure access from remote machines | 54 | Description: secure shell (SSH) server, for secure access from remote machines |