summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2020-02-23 11:30:38 +0000
committerColin Watson <cjwatson@debian.org>2020-02-23 11:30:39 +0000
commitbf4505e2f7f476cb71e852d54717dfde44af2dff (patch)
tree42117c86130b009f9f4453d5a482f9e26f778655 /debian
parent0278d31aafdb3b96a5c4c3c8d521bda0507e4cac (diff)
Move ssh-sk-helper into openssh-client
... rather than shipping it in a separate package. The extra library dependencies are pretty small, so it doesn't seem worth bloating the Packages file. Suggested by Bastian Blank.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog9
-rw-r--r--debian/control18
-rwxr-xr-xdebian/openssh-client.install2
-rw-r--r--debian/openssh-sk-helper.install2
-rwxr-xr-xdebian/rules6
5 files changed, 17 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog
index 0ccbe5ad8..94b68540f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
1openssh (1:8.2p1-2) UNRELEASED; urgency=medium
2
3 * Move ssh-sk-helper into openssh-client rather than shipping it in a
4 separate package. The extra library dependencies are pretty small, so
5 it doesn't seem worth bloating the Packages file. Suggested by Bastian
6 Blank.
7
8 -- Colin Watson <cjwatson@debian.org> Sun, 23 Feb 2020 10:40:19 +0000
9
1openssh (1:8.2p1-1) unstable; urgency=medium 10openssh (1:8.2p1-1) unstable; urgency=medium
2 11
3 * New upstream release (https://www.openssh.com/txt/release-8.2, closes: 12 * New upstream release (https://www.openssh.com/txt/release-8.2, closes:
diff --git a/debian/control b/debian/control
index f71033f18..98ee0189a 100644
--- a/debian/control
+++ b/debian/control
@@ -35,10 +35,11 @@ Depends: adduser (>= 3.10),
35 passwd, 35 passwd,
36 ${misc:Depends}, 36 ${misc:Depends},
37 ${shlibs:Depends}, 37 ${shlibs:Depends},
38Recommends: openssh-sk-helper, 38Recommends: xauth,
39 xauth,
40Conflicts: sftp, 39Conflicts: sftp,
41Replaces: ssh, 40Breaks: openssh-sk-helper
41Replaces: openssh-sk-helper,
42 ssh,
42 ssh-krb5, 43 ssh-krb5,
43Suggests: keychain, 44Suggests: keychain,
44 libpam-ssh, 45 libpam-ssh,
@@ -159,23 +160,12 @@ Description: secure shell (SSH) sftp server module, for SFTP access from remote
159 Newer versions of the draft will not be supported, though some features 160 Newer versions of the draft will not be supported, though some features
160 are individually implemented as extensions. 161 are individually implemented as extensions.
161 162
162Package: openssh-sk-helper
163Priority: optional
164Architecture: any
165Depends: ${misc:Depends},
166 ${shlibs:Depends}
167Multi-Arch: foreign
168Description: OpenSSH helper for FIDO authenticator support
169 This package provides ssh-sk-helper, which is used by ssh-agent to access
170 SSH keys provided by a FIDO authenticator for second-factor authentication.
171
172Package: openssh-tests 163Package: openssh-tests
173Priority: optional 164Priority: optional
174Architecture: any 165Architecture: any
175Depends: openssh-client (= ${binary:Version}), 166Depends: openssh-client (= ${binary:Version}),
176 openssh-server (= ${binary:Version}), 167 openssh-server (= ${binary:Version}),
177 openssh-sftp-server (= ${binary:Version}), 168 openssh-sftp-server (= ${binary:Version}),
178 openssh-sk-helper (= ${binary:Version}),
179 openssl, 169 openssl,
180 putty-tools (>= 0.67-2), 170 putty-tools (>= 0.67-2),
181 python3-twisted, 171 python3-twisted,
diff --git a/debian/openssh-client.install b/debian/openssh-client.install
index 24376514f..f6dad4805 100755
--- a/debian/openssh-client.install
+++ b/debian/openssh-client.install
@@ -10,6 +10,7 @@ usr/bin/ssh-keygen
10usr/bin/ssh-keyscan 10usr/bin/ssh-keyscan
11usr/lib/openssh/ssh-keysign 11usr/lib/openssh/ssh-keysign
12usr/lib/openssh/ssh-pkcs11-helper 12usr/lib/openssh/ssh-pkcs11-helper
13[linux-any] usr/lib/openssh/ssh-sk-helper
13usr/share/man/man1/scp.1 14usr/share/man/man1/scp.1
14usr/share/man/man1/sftp.1 15usr/share/man/man1/sftp.1
15usr/share/man/man1/ssh-add.1 16usr/share/man/man1/ssh-add.1
@@ -20,6 +21,7 @@ usr/share/man/man1/ssh.1
20usr/share/man/man5/ssh_config.5 21usr/share/man/man5/ssh_config.5
21usr/share/man/man8/ssh-keysign.8 22usr/share/man/man8/ssh-keysign.8
22usr/share/man/man8/ssh-pkcs11-helper.8 23usr/share/man/man8/ssh-pkcs11-helper.8
24[linux-any] usr/share/man/man8/ssh-sk-helper.8
23 25
24contrib/ssh-copy-id usr/bin 26contrib/ssh-copy-id usr/bin
25debian/ssh-argv0 usr/bin 27debian/ssh-argv0 usr/bin
diff --git a/debian/openssh-sk-helper.install b/debian/openssh-sk-helper.install
deleted file mode 100644
index 65fc98e66..000000000
--- a/debian/openssh-sk-helper.install
+++ /dev/null
@@ -1,2 +0,0 @@
1usr/lib/openssh/ssh-sk-helper
2usr/share/man/man8/ssh-sk-helper.8
diff --git a/debian/rules b/debian/rules
index b4dbec715..73a53c309 100755
--- a/debian/rules
+++ b/debian/rules
@@ -185,10 +185,8 @@ override_dh_install-indep:
185 dh_install 185 dh_install
186 186
187override_dh_installdocs: 187override_dh_installdocs:
188 dh_installdocs \ 188 dh_installdocs -Nopenssh-server -Nopenssh-sftp-server
189 -Nopenssh-server -Nopenssh-sftp-server -Nopenssh-sk-helper 189 dh_installdocs -popenssh-server -popenssh-sftp-server \
190 dh_installdocs \
191 -popenssh-server -popenssh-sftp-server -popenssh-sk-helper \
192 --link-doc=openssh-client 190 --link-doc=openssh-client
193 # Avoid breaking dh_installexamples later. 191 # Avoid breaking dh_installexamples later.
194 mkdir -p debian/openssh-server/usr/share/doc/openssh-client 192 mkdir -p debian/openssh-server/usr/share/doc/openssh-client