diff options
Diffstat (limited to 'debian/patches/openbsd-docs.patch')
-rw-r--r-- | debian/patches/openbsd-docs.patch | 67 |
1 files changed, 40 insertions, 27 deletions
diff --git a/debian/patches/openbsd-docs.patch b/debian/patches/openbsd-docs.patch index d4eeee6e8..afc1fe306 100644 --- a/debian/patches/openbsd-docs.patch +++ b/debian/patches/openbsd-docs.patch | |||
@@ -1,15 +1,28 @@ | |||
1 | Description: Adjust various OpenBSD-specific references in manual pages | 1 | From 98517b1b99dceff74e4a1e50d5a345f5b569ad6f Mon Sep 17 00:00:00 2001 |
2 | No single bug reference for this patch, but history includes: | 2 | From: Colin Watson <cjwatson@debian.org> |
3 | http://bugs.debian.org/154434 (login.conf(5)) | 3 | Date: Sun, 9 Feb 2014 16:10:09 +0000 |
4 | http://bugs.debian.org/513417 (/etc/rc) | 4 | Subject: Adjust various OpenBSD-specific references in manual pages |
5 | http://bugs.debian.org/530692 (ssl(8)) | 5 | |
6 | https://bugs.launchpad.net/bugs/456660 (ssl(8)) | 6 | No single bug reference for this patch, but history includes: |
7 | Author: Colin Watson <cjwatson@debian.org> | 7 | http://bugs.debian.org/154434 (login.conf(5)) |
8 | http://bugs.debian.org/513417 (/etc/rc) | ||
9 | http://bugs.debian.org/530692 (ssl(8)) | ||
10 | https://bugs.launchpad.net/bugs/456660 (ssl(8)) | ||
11 | |||
8 | Forwarded: not-needed | 12 | Forwarded: not-needed |
9 | Last-Update: 2013-09-14 | 13 | Last-Update: 2013-09-14 |
10 | 14 | ||
11 | Index: b/moduli.5 | 15 | Patch-Name: openbsd-docs.patch |
12 | =================================================================== | 16 | --- |
17 | moduli.5 | 4 ++-- | ||
18 | ssh-keygen.1 | 12 ++++-------- | ||
19 | ssh.1 | 4 ++++ | ||
20 | sshd.8 | 5 ++--- | ||
21 | sshd_config.5 | 3 +-- | ||
22 | 5 files changed, 13 insertions(+), 15 deletions(-) | ||
23 | |||
24 | diff --git a/moduli.5 b/moduli.5 | ||
25 | index ef0de08..149846c 100644 | ||
13 | --- a/moduli.5 | 26 | --- a/moduli.5 |
14 | +++ b/moduli.5 | 27 | +++ b/moduli.5 |
15 | @@ -21,7 +21,7 @@ | 28 | @@ -21,7 +21,7 @@ |
@@ -21,7 +34,7 @@ Index: b/moduli.5 | |||
21 | file contains prime numbers and generators for use by | 34 | file contains prime numbers and generators for use by |
22 | .Xr sshd 8 | 35 | .Xr sshd 8 |
23 | in the Diffie-Hellman Group Exchange key exchange method. | 36 | in the Diffie-Hellman Group Exchange key exchange method. |
24 | @@ -110,7 +110,7 @@ | 37 | @@ -110,7 +110,7 @@ first estimates the size of the modulus required to produce enough |
25 | Diffie-Hellman output to sufficiently key the selected symmetric cipher. | 38 | Diffie-Hellman output to sufficiently key the selected symmetric cipher. |
26 | .Xr sshd 8 | 39 | .Xr sshd 8 |
27 | then randomly selects a modulus from | 40 | then randomly selects a modulus from |
@@ -30,11 +43,11 @@ Index: b/moduli.5 | |||
30 | that best meets the size requirement. | 43 | that best meets the size requirement. |
31 | .Sh SEE ALSO | 44 | .Sh SEE ALSO |
32 | .Xr ssh-keygen 1 , | 45 | .Xr ssh-keygen 1 , |
33 | Index: b/ssh-keygen.1 | 46 | diff --git a/ssh-keygen.1 b/ssh-keygen.1 |
34 | =================================================================== | 47 | index 144be7d..753cc62 100644 |
35 | --- a/ssh-keygen.1 | 48 | --- a/ssh-keygen.1 |
36 | +++ b/ssh-keygen.1 | 49 | +++ b/ssh-keygen.1 |
37 | @@ -171,9 +171,7 @@ | 50 | @@ -171,9 +171,7 @@ key in |
38 | .Pa ~/.ssh/id_dsa | 51 | .Pa ~/.ssh/id_dsa |
39 | or | 52 | or |
40 | .Pa ~/.ssh/id_rsa . | 53 | .Pa ~/.ssh/id_rsa . |
@@ -45,7 +58,7 @@ Index: b/ssh-keygen.1 | |||
45 | .Pp | 58 | .Pp |
46 | Normally this program generates the key and asks for a file in which | 59 | Normally this program generates the key and asks for a file in which |
47 | to store the private key. | 60 | to store the private key. |
48 | @@ -219,9 +217,7 @@ | 61 | @@ -219,9 +217,7 @@ The options are as follows: |
49 | For each of the key types (rsa1, rsa, dsa and ecdsa) for which host keys | 62 | For each of the key types (rsa1, rsa, dsa and ecdsa) for which host keys |
50 | do not exist, generate the host keys with the default key file path, | 63 | do not exist, generate the host keys with the default key file path, |
51 | an empty passphrase, default bits for the key type, and default comment. | 64 | an empty passphrase, default bits for the key type, and default comment. |
@@ -56,7 +69,7 @@ Index: b/ssh-keygen.1 | |||
56 | .It Fl a Ar trials | 69 | .It Fl a Ar trials |
57 | Specifies the number of primality tests to perform when screening DH-GEX | 70 | Specifies the number of primality tests to perform when screening DH-GEX |
58 | candidates using the | 71 | candidates using the |
59 | @@ -605,7 +601,7 @@ | 72 | @@ -605,7 +601,7 @@ option. |
60 | Valid generator values are 2, 3, and 5. | 73 | Valid generator values are 2, 3, and 5. |
61 | .Pp | 74 | .Pp |
62 | Screened DH groups may be installed in | 75 | Screened DH groups may be installed in |
@@ -65,7 +78,7 @@ Index: b/ssh-keygen.1 | |||
65 | It is important that this file contains moduli of a range of bit lengths and | 78 | It is important that this file contains moduli of a range of bit lengths and |
66 | that both ends of a connection share common moduli. | 79 | that both ends of a connection share common moduli. |
67 | .Sh CERTIFICATES | 80 | .Sh CERTIFICATES |
68 | @@ -800,7 +796,7 @@ | 81 | @@ -800,7 +796,7 @@ on all machines |
69 | where the user wishes to log in using public key authentication. | 82 | where the user wishes to log in using public key authentication. |
70 | There is no need to keep the contents of this file secret. | 83 | There is no need to keep the contents of this file secret. |
71 | .Pp | 84 | .Pp |
@@ -74,11 +87,11 @@ Index: b/ssh-keygen.1 | |||
74 | Contains Diffie-Hellman groups used for DH-GEX. | 87 | Contains Diffie-Hellman groups used for DH-GEX. |
75 | The file format is described in | 88 | The file format is described in |
76 | .Xr moduli 5 . | 89 | .Xr moduli 5 . |
77 | Index: b/ssh.1 | 90 | diff --git a/ssh.1 b/ssh.1 |
78 | =================================================================== | 91 | index 0b38ae1..b3c3924 100644 |
79 | --- a/ssh.1 | 92 | --- a/ssh.1 |
80 | +++ b/ssh.1 | 93 | +++ b/ssh.1 |
81 | @@ -756,6 +756,10 @@ | 94 | @@ -756,6 +756,10 @@ Protocol 1 is restricted to using only RSA keys, |
82 | but protocol 2 may use any. | 95 | but protocol 2 may use any. |
83 | The HISTORY section of | 96 | The HISTORY section of |
84 | .Xr ssl 8 | 97 | .Xr ssl 8 |
@@ -89,11 +102,11 @@ Index: b/ssh.1 | |||
89 | contains a brief discussion of the DSA and RSA algorithms. | 102 | contains a brief discussion of the DSA and RSA algorithms. |
90 | .Pp | 103 | .Pp |
91 | The file | 104 | The file |
92 | Index: b/sshd.8 | 105 | diff --git a/sshd.8 b/sshd.8 |
93 | =================================================================== | 106 | index a604429..6bdd219 100644 |
94 | --- a/sshd.8 | 107 | --- a/sshd.8 |
95 | +++ b/sshd.8 | 108 | +++ b/sshd.8 |
96 | @@ -70,7 +70,7 @@ | 109 | @@ -70,7 +70,7 @@ over an insecure network. |
97 | .Nm | 110 | .Nm |
98 | listens for connections from clients. | 111 | listens for connections from clients. |
99 | It is normally started at boot from | 112 | It is normally started at boot from |
@@ -102,7 +115,7 @@ Index: b/sshd.8 | |||
102 | It forks a new | 115 | It forks a new |
103 | daemon for each incoming connection. | 116 | daemon for each incoming connection. |
104 | The forked daemons handle | 117 | The forked daemons handle |
105 | @@ -859,7 +859,7 @@ | 118 | @@ -859,7 +859,7 @@ This file is for host-based authentication (see |
106 | .Xr ssh 1 ) . | 119 | .Xr ssh 1 ) . |
107 | It should only be writable by root. | 120 | It should only be writable by root. |
108 | .Pp | 121 | .Pp |
@@ -111,7 +124,7 @@ Index: b/sshd.8 | |||
111 | Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange". | 124 | Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange". |
112 | The file format is described in | 125 | The file format is described in |
113 | .Xr moduli 5 . | 126 | .Xr moduli 5 . |
114 | @@ -957,7 +957,6 @@ | 127 | @@ -957,7 +957,6 @@ The content of this file is not sensitive; it can be world-readable. |
115 | .Xr ssh-vulnkey 1 , | 128 | .Xr ssh-vulnkey 1 , |
116 | .Xr chroot 2 , | 129 | .Xr chroot 2 , |
117 | .Xr hosts_access 5 , | 130 | .Xr hosts_access 5 , |
@@ -119,11 +132,11 @@ Index: b/sshd.8 | |||
119 | .Xr moduli 5 , | 132 | .Xr moduli 5 , |
120 | .Xr sshd_config 5 , | 133 | .Xr sshd_config 5 , |
121 | .Xr inetd 8 , | 134 | .Xr inetd 8 , |
122 | Index: b/sshd_config.5 | 135 | diff --git a/sshd_config.5 b/sshd_config.5 |
123 | =================================================================== | 136 | index eaf8d01..ec4851a 100644 |
124 | --- a/sshd_config.5 | 137 | --- a/sshd_config.5 |
125 | +++ b/sshd_config.5 | 138 | +++ b/sshd_config.5 |
126 | @@ -283,8 +283,7 @@ | 139 | @@ -283,8 +283,7 @@ This option is only available for protocol version 2. |
127 | By default, no banner is displayed. | 140 | By default, no banner is displayed. |
128 | .It Cm ChallengeResponseAuthentication | 141 | .It Cm ChallengeResponseAuthentication |
129 | Specifies whether challenge-response authentication is allowed (e.g. via | 142 | Specifies whether challenge-response authentication is allowed (e.g. via |